From c4882cc6b25d9c755a656aed458318028476c33d Mon Sep 17 00:00:00 2001
From: Stefan Feilmeier <stefan.feilmeier@fenecon.de>
Date: Sat, 5 Mar 2022 23:22:20 +0100
Subject: [PATCH 01/96] Update io.openems.edge.batteryinverter.api

---
 .../api/BatteryInverterConstraint.java        |  2 +-
 ...HybridManagedSymmetricBatteryInverter.java | 19 ++++----
 .../api/ManagedSymmetricBatteryInverter.java  | 25 ++++++-----
 .../api/OffGridBatteryInverter.java           | 14 +++---
 .../api/SymmetricBatteryInverter.java         | 44 +++++++++----------
 5 files changed, 53 insertions(+), 51 deletions(-)

diff --git a/io.openems.edge.batteryinverter.api/src/io/openems/edge/batteryinverter/api/BatteryInverterConstraint.java b/io.openems.edge.batteryinverter.api/src/io/openems/edge/batteryinverter/api/BatteryInverterConstraint.java
index cb71904da74..017e6f59b3c 100644
--- a/io.openems.edge.batteryinverter.api/src/io/openems/edge/batteryinverter/api/BatteryInverterConstraint.java
+++ b/io.openems.edge.batteryinverter.api/src/io/openems/edge/batteryinverter/api/BatteryInverterConstraint.java
@@ -15,7 +15,7 @@ public class BatteryInverterConstraint {
 	public final Relationship relationship;
 	public final double value;
 
-	public static BatteryInverterConstraint[] NO_CONSTRAINTS = new BatteryInverterConstraint[] {};
+	public static BatteryInverterConstraint[] NO_CONSTRAINTS = {};
 
 	public BatteryInverterConstraint(String description, Phase phase, Pwr pwr, Relationship relationship,
 			double value) {
diff --git a/io.openems.edge.batteryinverter.api/src/io/openems/edge/batteryinverter/api/HybridManagedSymmetricBatteryInverter.java b/io.openems.edge.batteryinverter.api/src/io/openems/edge/batteryinverter/api/HybridManagedSymmetricBatteryInverter.java
index c437ec3d204..87edce970b1 100644
--- a/io.openems.edge.batteryinverter.api/src/io/openems/edge/batteryinverter/api/HybridManagedSymmetricBatteryInverter.java
+++ b/io.openems.edge.batteryinverter.api/src/io/openems/edge/batteryinverter/api/HybridManagedSymmetricBatteryInverter.java
@@ -24,7 +24,7 @@ public interface HybridManagedSymmetricBatteryInverter
 	public enum ChannelId implements io.openems.edge.common.channel.ChannelId {
 		/**
 		 * DC Discharge Power.
-		 * 
+		 *
 		 * <ul>
 		 * <li>Interface: HybridManagedSymmetricBatteryInverter
 		 * <li>Type: Integer
@@ -44,7 +44,7 @@ public enum ChannelId implements io.openems.edge.common.channel.ChannelId {
 		),
 		/**
 		 * DC Charge Energy.
-		 * 
+		 *
 		 * <ul>
 		 * <li>Interface: HybridEss
 		 * <li>Type: Long
@@ -57,7 +57,7 @@ public enum ChannelId implements io.openems.edge.common.channel.ChannelId {
 		),
 		/**
 		 * DC Discharge Energy.
-		 * 
+		 *
 		 * <ul>
 		 * <li>Interface: HybridEss
 		 * <li>Type: Long
@@ -75,6 +75,7 @@ private ChannelId(Doc doc) {
 			this.doc = doc;
 		}
 
+		@Override
 		public Doc doc() {
 			return this.doc;
 		}
@@ -83,7 +84,7 @@ public Doc doc() {
 	/**
 	 * Gets the DC-PV Power, i.e. the sum of the {@link EssDcCharger}s of this
 	 * {@link HybridManagedSymmetricBatteryInverter}.
-	 * 
+	 *
 	 * @return the DC-PV power, or 'null' if there is no {@link EssDcCharger}
 	 */
 	public Integer getDcPvPower();
@@ -91,18 +92,18 @@ public Doc doc() {
 	/**
 	 * Gets the Surplus Power of the {@link EssDcCharger}s of this
 	 * {@link HybridManagedSymmetricBatteryInverter}.
-	 * 
+	 *
 	 * <p>
 	 * This value is usually calculated from the
 	 * {@link EssDcCharger#getActualPower()} when the battery is full
-	 * 
+	 *
 	 * @return the surplus power, or 'null' if there is no surplus power
 	 */
 	public Integer getSurplusPower();
 
 	/**
 	 * Gets the Channel for {@link ChannelId#DC_DISCHARGE_POWER}.
-	 * 
+	 *
 	 * @return the Channel
 	 */
 	public default IntegerReadChannel getDcDischargePowerChannel() {
@@ -112,7 +113,7 @@ public default IntegerReadChannel getDcDischargePowerChannel() {
 	/**
 	 * Gets the DC Discharge Power in [W]. Negative values for Charge; positive for
 	 * Discharge. See {@link ChannelId#DC_DISCHARGE_POWER}.
-	 * 
+	 *
 	 * @return the Channel {@link Value}
 	 */
 	public default Value<Integer> getDcDischargePower() {
@@ -122,7 +123,7 @@ public default Value<Integer> getDcDischargePower() {
 	/**
 	 * Internal method to set the 'nextValue' on
 	 * {@link ChannelId#DC_DISCHARGE_POWER} Channel.
-	 * 
+	 *
 	 * @param value the next value
 	 */
 	public default void _setDcDischargePower(Integer value) {
diff --git a/io.openems.edge.batteryinverter.api/src/io/openems/edge/batteryinverter/api/ManagedSymmetricBatteryInverter.java b/io.openems.edge.batteryinverter.api/src/io/openems/edge/batteryinverter/api/ManagedSymmetricBatteryInverter.java
index 1ff8ca536e7..1360667cf4d 100644
--- a/io.openems.edge.batteryinverter.api/src/io/openems/edge/batteryinverter/api/ManagedSymmetricBatteryInverter.java
+++ b/io.openems.edge.batteryinverter.api/src/io/openems/edge/batteryinverter/api/ManagedSymmetricBatteryInverter.java
@@ -12,11 +12,11 @@
 
 /**
  * Represents a Symmetric Battery-Inverter that can be controlled.
- * 
+ *
  * <p>
  * To indicate, that the Battery-Inverter is ready for charging/discharging, the
  * following Channels need to be set:
- * 
+ *
  * <ul>
  * <li>StartStoppable.ChannelId.START_STOP must be set to 'START'
  * <li>No 'Fault'-StateChannels are set (i.e. 'OpenemsComponent.ChannelId.STATE'
@@ -35,6 +35,7 @@ private ChannelId(Doc doc) {
 			this.doc = doc;
 		}
 
+		@Override
 		public Doc doc() {
 			return this.doc;
 		}
@@ -42,7 +43,7 @@ public Doc doc() {
 
 	/**
 	 * Gets the {@link ModbusSlaveNatureTable} for Modbus/TCP Api.
-	 * 
+	 *
 	 * @param accessMode the {@link AccessMode}
 	 * @return the {@link ModbusSlaveNatureTable}
 	 */
@@ -53,16 +54,16 @@ public static ModbusSlaveNatureTable getModbusSlaveNatureTable(AccessMode access
 
 	/**
 	 * Run the Battery-Inverter.
-	 * 
+	 *
 	 * <ul>
 	 * <li>bring the Battery-Inverter in the desired state
 	 * <li>apply information from {@link Battery} as required
 	 * <li>set the target Active and Reactive Power.
 	 * </ul>
-	 * 
+	 *
 	 * <p>
 	 * This is called on ManagedSymmetricEss::applyPower()
-	 * 
+	 *
 	 * @param battery          the {@link Battery}
 	 * @param setActivePower   the active power setpoint
 	 * @param setReactivePower the reactive power setpoint
@@ -73,7 +74,7 @@ public static ModbusSlaveNatureTable getModbusSlaveNatureTable(AccessMode access
 	/**
 	 * Gets static Constraints for this Battery-Inverter. Override this method to
 	 * provide specific Constraints for this Battery-Inverter on every Cycle.
-	 * 
+	 *
 	 * @return the Constraints
 	 * @throws OpenemsException on error
 	 */
@@ -89,18 +90,18 @@ public default BatteryInverterConstraint[] getStaticConstraints() throws Openems
 	 * <li>KACO blueplanet gridsave 50 allows setting of power in 0.1 % of 52 VA. It
 	 * should return 52 (= 52000 * 0.001)
 	 * </ul>
-	 * 
+	 *
 	 * @return the power precision
 	 */
 	public int getPowerPrecision();
 
 	/**
 	 * Gets a boolean if the battery inverter is managed or not.
-	 * 
+	 *
 	 * <p>
 	 * Returns false if the battery inverter itself is not managed or in a read only
 	 * mode.
-	 * 
+	 *
 	 * @return is managed or not
 	 */
 	public default boolean isManaged() {
@@ -110,10 +111,10 @@ public default boolean isManaged() {
 	/**
 	 * Gets a boolean if the battery inverter is able to build a micro-grid in
 	 * off-grid.
-	 * 
+	 *
 	 * <p>
 	 * Returns false if the battery inverter is not able to build a micro-grid.
-	 * 
+	 *
 	 * @return is managed or not
 	 */
 	public default boolean isOffGridPossible() {
diff --git a/io.openems.edge.batteryinverter.api/src/io/openems/edge/batteryinverter/api/OffGridBatteryInverter.java b/io.openems.edge.batteryinverter.api/src/io/openems/edge/batteryinverter/api/OffGridBatteryInverter.java
index 9e8c51920cd..f3c39876753 100644
--- a/io.openems.edge.batteryinverter.api/src/io/openems/edge/batteryinverter/api/OffGridBatteryInverter.java
+++ b/io.openems.edge.batteryinverter.api/src/io/openems/edge/batteryinverter/api/OffGridBatteryInverter.java
@@ -22,10 +22,10 @@ public interface OffGridBatteryInverter
 	public enum ChannelId implements io.openems.edge.common.channel.ChannelId {
 		/**
 		 * Off-Grid-Frequency.
-		 * 
+		 *
 		 * <p>
 		 * In Off-Grid Mode the Battery-Inverter should generate this frequency.
-		 * 
+		 *
 		 * <ul>
 		 * <li>Interface: {@link OffGridBatteryInverter}
 		 * <li>Type: Integer
@@ -39,7 +39,7 @@ public enum ChannelId implements io.openems.edge.common.channel.ChannelId {
 
 		/**
 		 * Inverter-State.
-		 * 
+		 *
 		 * <ul>
 		 * <li>Interface: {@link OffGridBatteryInverter}
 		 * <li>Type: Boolean
@@ -112,7 +112,7 @@ public default IntegerWriteChannel getSetOffGridFrequencyChannel() {
 	/**
 	 * Sets an Off Grid Frequency set point in [Hz]. See
 	 * {@link ChannelId#SET_ACTIVE_POWER_EQUALS}.
-	 * 
+	 *
 	 * @param value the next write value
 	 * @throws OpenemsNamedException on error
 	 */
@@ -122,7 +122,7 @@ public default void setTargetOffGridFrequency(Integer value) throws OpenemsNamed
 
 	/**
 	 * Gets the Channel for {@link ChannelId#STATE_ON}.
-	 * 
+	 *
 	 * @return the Channel
 	 */
 	public default BooleanReadChannel getBatteryInverterStateChannel() {
@@ -131,7 +131,7 @@ public default BooleanReadChannel getBatteryInverterStateChannel() {
 
 	/**
 	 * Gets the {@link StateChannel} for {@link ChannelId#STATE_ON}.
-	 * 
+	 *
 	 * @return the Channel {@link Value}
 	 */
 	public default Value<Boolean> getBatteryInverterState() {
@@ -145,7 +145,7 @@ public static enum TargetGridMode {
 	/**
 	 * Tells the Battery-Inverter to go to ON_GRID or OFF_GRID mode. Be sure to call
 	 * this method before you call {@link #start()}.
-	 * 
+	 *
 	 * @param targetGridMode the {@link TargetGridMode}
 	 */
 	public void setTargetGridMode(TargetGridMode targetGridMode);
diff --git a/io.openems.edge.batteryinverter.api/src/io/openems/edge/batteryinverter/api/SymmetricBatteryInverter.java b/io.openems.edge.batteryinverter.api/src/io/openems/edge/batteryinverter/api/SymmetricBatteryInverter.java
index 6b86e6d54ce..3b99f49baa1 100644
--- a/io.openems.edge.batteryinverter.api/src/io/openems/edge/batteryinverter/api/SymmetricBatteryInverter.java
+++ b/io.openems.edge.batteryinverter.api/src/io/openems/edge/batteryinverter/api/SymmetricBatteryInverter.java
@@ -27,7 +27,7 @@ public interface SymmetricBatteryInverter extends OpenemsComponent {
 	public enum ChannelId implements io.openems.edge.common.channel.ChannelId {
 		/**
 		 * Grid-Mode.
-		 * 
+		 *
 		 * <ul>
 		 * <li>Interface: SymmetricBatteryInverter
 		 * <li>Type: Integer/Enum
@@ -39,7 +39,7 @@ public enum ChannelId implements io.openems.edge.common.channel.ChannelId {
 		),
 		/**
 		 * Active Power.
-		 * 
+		 *
 		 * <ul>
 		 * <li>Interface: SymmetricBatteryInverter
 		 * <li>Type: Integer
@@ -54,7 +54,7 @@ public enum ChannelId implements io.openems.edge.common.channel.ChannelId {
 		),
 		/**
 		 * Reactive Power.
-		 * 
+		 *
 		 * <ul>
 		 * <li>Interface: SymmetricBatteryInverter
 		 * <li>Type: Integer
@@ -70,7 +70,7 @@ public enum ChannelId implements io.openems.edge.common.channel.ChannelId {
 		/**
 		 * Holds the currently maximum possible apparent power. This value is commonly
 		 * defined by the inverter limitations.
-		 * 
+		 *
 		 * <ul>
 		 * <li>Interface: SymmetricBatteryInverter
 		 * <li>Type: Integer
@@ -84,7 +84,7 @@ public enum ChannelId implements io.openems.edge.common.channel.ChannelId {
 		),
 		/**
 		 * Active Charge Energy.
-		 * 
+		 *
 		 * <ul>
 		 * <li>Interface: SymmetricBatteryInverter
 		 * <li>Type: Integer
@@ -97,7 +97,7 @@ public enum ChannelId implements io.openems.edge.common.channel.ChannelId {
 		),
 		/**
 		 * Active Discharge Energy.
-		 * 
+		 *
 		 * <ul>
 		 * <li>Interface: SymmetricBatteryInverter
 		 * <li>Type: Integer
@@ -125,7 +125,7 @@ public Doc doc() {
 	/**
 	 * Gets the {@link ModbusSlaveNatureTable} for {@link SymmetricBatteryInverter}
 	 * used by the Modbus/TCP Slave API.
-	 * 
+	 *
 	 * @param accessMode the {@link AccessMode}
 	 * @return the {@link ModbusSlaveNatureTable}
 	 */
@@ -138,7 +138,7 @@ public static ModbusSlaveNatureTable getModbusSlaveNatureTable(AccessMode access
 
 	/**
 	 * Gets the Channel for {@link ChannelId#GRID_MODE}.
-	 * 
+	 *
 	 * @return the Channel
 	 */
 	public default Channel<GridMode> getGridModeChannel() {
@@ -147,7 +147,7 @@ public default Channel<GridMode> getGridModeChannel() {
 
 	/**
 	 * Is the Battery-Inverter On-Grid? See {@link ChannelId#GRID_MODE}.
-	 * 
+	 *
 	 * @return the Channel {@link Value}
 	 */
 	public default GridMode getGridMode() {
@@ -157,7 +157,7 @@ public default GridMode getGridMode() {
 	/**
 	 * Internal method to set the 'nextValue' on {@link ChannelId#GRID_MODE}
 	 * Channel.
-	 * 
+	 *
 	 * @param value the next value
 	 */
 	public default void _setGridMode(GridMode value) {
@@ -166,7 +166,7 @@ public default void _setGridMode(GridMode value) {
 
 	/**
 	 * Gets the Channel for {@link ChannelId#ACTIVE_POWER}.
-	 * 
+	 *
 	 * @return the Channel
 	 */
 	public default IntegerReadChannel getActivePowerChannel() {
@@ -176,7 +176,7 @@ public default IntegerReadChannel getActivePowerChannel() {
 	/**
 	 * Gets the Active Power in [W]. Negative values for Charge; positive for
 	 * Discharge. See {@link ChannelId#ACTIVE_POWER}.
-	 * 
+	 *
 	 * @return the Channel {@link Value}
 	 */
 	public default Value<Integer> getActivePower() {
@@ -186,7 +186,7 @@ public default Value<Integer> getActivePower() {
 	/**
 	 * Internal method to set the 'nextValue' on {@link ChannelId#ACTIVE_POWER}
 	 * Channel.
-	 * 
+	 *
 	 * @param value the next value
 	 */
 	public default void _setActivePower(Integer value) {
@@ -196,7 +196,7 @@ public default void _setActivePower(Integer value) {
 	/**
 	 * Internal method to set the 'nextValue' on {@link ChannelId#ACTIVE_POWER}
 	 * Channel.
-	 * 
+	 *
 	 * @param value the next value
 	 */
 	public default void _setActivePower(int value) {
@@ -205,7 +205,7 @@ public default void _setActivePower(int value) {
 
 	/**
 	 * Gets the Channel for {@link ChannelId#REACTIVE_POWER}.
-	 * 
+	 *
 	 * @return the Channel
 	 */
 	public default IntegerReadChannel getReactivePowerChannel() {
@@ -214,7 +214,7 @@ public default IntegerReadChannel getReactivePowerChannel() {
 
 	/**
 	 * Gets the Reactive Power in [var]. See {@link ChannelId#REACTIVE_POWER}.
-	 * 
+	 *
 	 * @return the Channel {@link Value}
 	 */
 	public default Value<Integer> getReactivePower() {
@@ -224,7 +224,7 @@ public default Value<Integer> getReactivePower() {
 	/**
 	 * Internal method to set the 'nextValue' on {@link ChannelId#REACTIVE_POWER}
 	 * Channel.
-	 * 
+	 *
 	 * @param value the next value
 	 */
 	public default void _setReactivePower(Integer value) {
@@ -234,7 +234,7 @@ public default void _setReactivePower(Integer value) {
 	/**
 	 * Internal method to set the 'nextValue' on {@link ChannelId#REACTIVE_POWER}
 	 * Channel.
-	 * 
+	 *
 	 * @param value the next value
 	 */
 	public default void _setReactivePower(int value) {
@@ -243,7 +243,7 @@ public default void _setReactivePower(int value) {
 
 	/**
 	 * Gets the Channel for {@link ChannelId#MAX_APPARENT_POWER}.
-	 * 
+	 *
 	 * @return the Channel
 	 */
 	public default IntegerReadChannel getMaxApparentPowerChannel() {
@@ -253,7 +253,7 @@ public default IntegerReadChannel getMaxApparentPowerChannel() {
 	/**
 	 * Gets the Maximum Apparent Power in [VA], range "&gt;= 0". See
 	 * {@link ChannelId#MAX_APPARENT_POWER}.
-	 * 
+	 *
 	 * @return the Channel {@link Value}
 	 */
 	public default Value<Integer> getMaxApparentPower() {
@@ -263,7 +263,7 @@ public default Value<Integer> getMaxApparentPower() {
 	/**
 	 * Internal method to set the 'nextValue' on
 	 * {@link ChannelId#MAX_APPARENT_POWER} Channel.
-	 * 
+	 *
 	 * @param value the next value
 	 */
 	public default void _setMaxApparentPower(Integer value) {
@@ -273,7 +273,7 @@ public default void _setMaxApparentPower(Integer value) {
 	/**
 	 * Internal method to set the 'nextValue' on
 	 * {@link ChannelId#MAX_APPARENT_POWER} Channel.
-	 * 
+	 *
 	 * @param value the next value
 	 */
 	public default void _setMaxApparentPower(int value) {

From d8ecc35333c5eca0657062e0cdd2625d276507c7 Mon Sep 17 00:00:00 2001
From: Stefan Feilmeier <stefan.feilmeier@fenecon.de>
Date: Sat, 5 Mar 2022 23:33:04 +0100
Subject: [PATCH 02/96] Update
 io.openems.edge.batteryinverter.kaco.blueplanetgridsave

---
 .../kaco/blueplanetgridsave/Config.java       |  2 +-
 .../KacoBlueplanetGridsave.java               | 25 ++++-----
 .../KacoBlueplanetGridsaveImpl.java           | 53 ++++++++++---------
 .../kaco/blueplanetgridsave/MyChannelId.java  |  1 +
 .../statemachine/ErrorHandler.java            |  3 +-
 .../statemachine/GoRunningHandler.java        | 36 ++++++-------
 .../statemachine/GoStoppedHandler.java        | 34 ++++++------
 .../statemachine/RunningHandler.java          | 11 ++--
 .../statemachine/StoppedHandler.java          |  3 +-
 .../statemachine/UndefinedHandler.java        |  3 +-
 .../KacoBlueplanetGridsaveTest.java           |  7 ++-
 .../kaco/blueplanetgridsave/MyConfig.java     |  4 +-
 12 files changed, 86 insertions(+), 96 deletions(-)

diff --git a/io.openems.edge.batteryinverter.kaco.blueplanetgridsave/src/io/openems/edge/batteryinverter/kaco/blueplanetgridsave/Config.java b/io.openems.edge.batteryinverter.kaco.blueplanetgridsave/src/io/openems/edge/batteryinverter/kaco/blueplanetgridsave/Config.java
index ccacdf58560..58a6da69b5e 100644
--- a/io.openems.edge.batteryinverter.kaco.blueplanetgridsave/src/io/openems/edge/batteryinverter/kaco/blueplanetgridsave/Config.java
+++ b/io.openems.edge.batteryinverter.kaco.blueplanetgridsave/src/io/openems/edge/batteryinverter/kaco/blueplanetgridsave/Config.java
@@ -21,7 +21,7 @@
 
 	@AttributeDefinition(name = "Start/stop behaviour?", description = "Should this Component be forced to start or stop?")
 	StartStopConfig startStop() default StartStopConfig.AUTO;
-	
+
 	@AttributeDefinition(name = "Activate watchdog", description = "Activate watchdog or not?")
 	boolean activateWatchdog() default true;
 
diff --git a/io.openems.edge.batteryinverter.kaco.blueplanetgridsave/src/io/openems/edge/batteryinverter/kaco/blueplanetgridsave/KacoBlueplanetGridsave.java b/io.openems.edge.batteryinverter.kaco.blueplanetgridsave/src/io/openems/edge/batteryinverter/kaco/blueplanetgridsave/KacoBlueplanetGridsave.java
index ca99d015bc3..e7f2b545393 100644
--- a/io.openems.edge.batteryinverter.kaco.blueplanetgridsave/src/io/openems/edge/batteryinverter/kaco/blueplanetgridsave/KacoBlueplanetGridsave.java
+++ b/io.openems.edge.batteryinverter.kaco.blueplanetgridsave/src/io/openems/edge/batteryinverter/kaco/blueplanetgridsave/KacoBlueplanetGridsave.java
@@ -26,7 +26,8 @@ public interface KacoBlueplanetGridsave
 	 */
 	public static final int WATCHDOG_TIMEOUT_SECONDS = 60;
 	/**
-	 * The watchdog gets triggered every WATCHDOG_TRIGGER_CYCLES seconds. This must be less than WATCHDOG_TIMEOUT_SECONDS.
+	 * The watchdog gets triggered every WATCHDOG_TRIGGER_CYCLES seconds. This must
+	 * be less than WATCHDOG_TIMEOUT_SECONDS.
 	 */
 	public static final int WATCHDOG_TRIGGER_SECONDS = 10;
 
@@ -68,14 +69,14 @@ public Doc doc() {
 
 	/**
 	 * Gets the target Start/Stop mode from config or StartStop-Channel.
-	 * 
+	 *
 	 * @return {@link StartStop}
 	 */
 	public StartStop getStartStopTarget();
 
 	/**
 	 * Get the Channel for the given Point or throw an error if it is not available.
-	 * 
+	 *
 	 * @param <T>   the Channel type
 	 * @param point the SunSpec Point
 	 * @return the optional Channel
@@ -85,14 +86,14 @@ public Doc doc() {
 
 	/**
 	 * Gets the Current State.
-	 * 
+	 *
 	 * @return the {@link S64201CurrentState}
 	 */
 	public S64201CurrentState getCurrentState();
 
 	/**
 	 * Gets the Channel for {@link ChannelId#MAX_START_ATTEMPTS}.
-	 * 
+	 *
 	 * @return the Channel
 	 */
 	public default StateChannel getMaxStartAttemptsChannel() {
@@ -101,7 +102,7 @@ public default StateChannel getMaxStartAttemptsChannel() {
 
 	/**
 	 * Gets the {@link StateChannel} for {@link ChannelId#MAX_START_ATTEMPTS}.
-	 * 
+	 *
 	 * @return the Channel {@link Value}
 	 */
 	public default Value<Boolean> getMaxStartAttempts() {
@@ -111,7 +112,7 @@ public default Value<Boolean> getMaxStartAttempts() {
 	/**
 	 * Internal method to set the 'nextValue' on
 	 * {@link ChannelId#MAX_START_ATTEMPTS} Channel.
-	 * 
+	 *
 	 * @param value the next value
 	 */
 	public default void _setMaxStartAttempts(Boolean value) {
@@ -120,7 +121,7 @@ public default void _setMaxStartAttempts(Boolean value) {
 
 	/**
 	 * Gets the Channel for {@link ChannelId#MAX_STOP_ATTEMPTS}.
-	 * 
+	 *
 	 * @return the Channel
 	 */
 	public default StateChannel getMaxStopAttemptsChannel() {
@@ -129,7 +130,7 @@ public default StateChannel getMaxStopAttemptsChannel() {
 
 	/**
 	 * Gets the {@link StateChannel} for {@link ChannelId#MAX_STOP_ATTEMPTS}.
-	 * 
+	 *
 	 * @return the Channel {@link Value}
 	 */
 	public default Value<Boolean> getMaxStopAttempts() {
@@ -139,7 +140,7 @@ public default Value<Boolean> getMaxStopAttempts() {
 	/**
 	 * Internal method to set the 'nextValue' on {@link ChannelId#MAX_STOP_ATTEMPTS}
 	 * Channel.
-	 * 
+	 *
 	 * @param value the next value
 	 */
 	public default void _setMaxStopAttempts(Boolean value) {
@@ -148,7 +149,7 @@ public default void _setMaxStopAttempts(Boolean value) {
 
 	/**
 	 * Gets the Channel for KacoSunSpecModel.S64201.REQUESTED_STATE.
-	 * 
+	 *
 	 * @return the Channel
 	 * @throws OpenemsException on error
 	 */
@@ -158,7 +159,7 @@ public default WriteChannel<S64201RequestedState> getRequestedStateChannel() thr
 
 	/**
 	 * Writes the value to the KacoSunSpecModel.S64201.REQUESTED_STATE Register.
-	 * 
+	 *
 	 * @param value the next value
 	 * @throws OpenemsNamedException on error
 	 */
diff --git a/io.openems.edge.batteryinverter.kaco.blueplanetgridsave/src/io/openems/edge/batteryinverter/kaco/blueplanetgridsave/KacoBlueplanetGridsaveImpl.java b/io.openems.edge.batteryinverter.kaco.blueplanetgridsave/src/io/openems/edge/batteryinverter/kaco/blueplanetgridsave/KacoBlueplanetGridsaveImpl.java
index 26a77f33d0e..748b9de6e28 100644
--- a/io.openems.edge.batteryinverter.kaco.blueplanetgridsave/src/io/openems/edge/batteryinverter/kaco/blueplanetgridsave/KacoBlueplanetGridsaveImpl.java
+++ b/io.openems.edge.batteryinverter.kaco.blueplanetgridsave/src/io/openems/edge/batteryinverter/kaco/blueplanetgridsave/KacoBlueplanetGridsaveImpl.java
@@ -148,6 +148,7 @@ public KacoBlueplanetGridsaveImpl() throws OpenemsException {
 		this._setGridMode(GridMode.ON_GRID);
 	}
 
+	@Override
 	@Reference(policy = ReferencePolicy.STATIC, policyOption = ReferencePolicyOption.GREEDY, cardinality = ReferenceCardinality.MANDATORY)
 	protected void setModbus(BridgeModbus modbus) {
 		super.setModbus(modbus);
@@ -162,6 +163,7 @@ void activate(ComponentContext context, Config config) throws OpenemsException {
 		this.config = config;
 	}
 
+	@Override
 	@Deactivate
 	protected void deactivate() {
 		super.deactivate();
@@ -198,7 +200,7 @@ public void run(Battery battery, int setActivePower, int setReactivePower) throw
 		this.setStateChannels();
 
 		// Prepare Context
-		Context context = new Context(this, battery, this.config, setActivePower, setReactivePower);
+		var context = new Context(this, battery, this.config, setActivePower, setReactivePower);
 
 		// Call the StateMachine
 		try {
@@ -217,27 +219,26 @@ public BatteryInverterConstraint[] getStaticConstraints() throws OpenemsExceptio
 		if (this.stateMachine.getCurrentState() == State.RUNNING) {
 			return BatteryInverterConstraint.NO_CONSTRAINTS;
 
-		} else {
-			// Block any power as long as we are not RUNNING
-			return new BatteryInverterConstraint[] { //
-					new BatteryInverterConstraint("KACO inverter not ready", Phase.ALL, Pwr.REACTIVE, //
-							Relationship.EQUALS, 0d), //
-					new BatteryInverterConstraint("KACO inverter not ready", Phase.ALL, Pwr.ACTIVE, //
-							Relationship.EQUALS, 0d) //
-			};
 		}
+		// Block any power as long as we are not RUNNING
+		return new BatteryInverterConstraint[] { //
+				new BatteryInverterConstraint("KACO inverter not ready", Phase.ALL, Pwr.REACTIVE, //
+						Relationship.EQUALS, 0d), //
+				new BatteryInverterConstraint("KACO inverter not ready", Phase.ALL, Pwr.ACTIVE, //
+						Relationship.EQUALS, 0d) //
+		};
 	}
 
 	/**
 	 * Sets the Battery Limits.
-	 * 
+	 *
 	 * @param battery the linked {@link Battery}
 	 * @throws OpenemsNamedException on error
 	 */
 	private void setBatteryLimits(Battery battery) throws OpenemsNamedException {
 		// Discharge Min Voltage
 		FloatWriteChannel disMinVChannel = this.getSunSpecChannelOrError(KacoSunSpecModel.S64202.DIS_MIN_V_0);
-		Integer dischargeMinVoltage = battery.getDischargeMinVoltage().get();
+		var dischargeMinVoltage = battery.getDischargeMinVoltage().get();
 		if (Objects.equal(dischargeMinVoltage, 0)) {
 			dischargeMinVoltage = null; // according to setup manual DIS_MIN_V must not be zero
 		}
@@ -245,7 +246,7 @@ private void setBatteryLimits(Battery battery) throws OpenemsNamedException {
 
 		// Charge Max Voltage
 		FloatWriteChannel chaMaxVChannel = this.getSunSpecChannelOrError(KacoSunSpecModel.S64202.CHA_MAX_V_0);
-		Integer chargeMaxVoltage = battery.getChargeMaxVoltage().get();
+		var chargeMaxVoltage = battery.getChargeMaxVoltage().get();
 		if (Objects.equal(chargeMaxVoltage, 0)) {
 			chargeMaxVoltage = null; // according to setup manual CHA_MAX_V must not be zero
 		}
@@ -269,7 +270,7 @@ private void setBatteryLimits(Battery battery) throws OpenemsNamedException {
 	/**
 	 * Sets the information that is shown on the Display, like State-of-Charge,
 	 * State-of-Health and Max-Cell-Temperature.
-	 * 
+	 *
 	 * @param battery the linked {@link Battery}
 	 * @throws OpenemsNamedException on error
 	 */
@@ -293,11 +294,11 @@ private void setDisplayInformation(Battery battery) throws OpenemsNamedException
 
 	/**
 	 * Triggers the Watchdog after WATCHDOG_TRIGGER passed.
-	 * 
+	 *
 	 * @throws OpenemsNamedException on error
 	 */
 	private void triggerWatchdog() throws OpenemsNamedException {
-		Instant now = Instant.now(this.componentManager.getClock());
+		var now = Instant.now(this.componentManager.getClock());
 		if (Duration.between(this.lastTriggerWatchdog, now)
 				.getSeconds() >= KacoBlueplanetGridsave.WATCHDOG_TRIGGER_SECONDS) {
 			IntegerWriteChannel watchdogChannel = this.getSunSpecChannelOrError(KacoSunSpecModel.S64201.WATCHDOG);
@@ -308,7 +309,7 @@ private void triggerWatchdog() throws OpenemsNamedException {
 
 	/**
 	 * Sets the State-Channels, e.g. Warnings and Faults.
-	 * 
+	 *
 	 * @throws OpenemsNamedException on error
 	 */
 	private void setStateChannels() throws OpenemsNamedException {
@@ -362,9 +363,8 @@ public S64201CurrentState getCurrentState() {
 		Optional<EnumReadChannel> channel = this.getSunSpecChannel(KacoSunSpecModel.S64201.CURRENT_STATE);
 		if (channel.isPresent()) {
 			return channel.get().value().asEnum();
-		} else {
-			return S64201CurrentState.UNDEFINED;
 		}
+		return S64201CurrentState.UNDEFINED;
 	}
 
 	@Override
@@ -382,8 +382,8 @@ public int getPowerPrecision() {
 		if (!scalefactorChannel.isPresent()) {
 			return 1;
 		}
-		Value<Integer> scalefactor = scalefactorChannel.get().value();
-		Value<Integer> maxApparentPower = this.getMaxApparentPower();
+		var scalefactor = scalefactorChannel.get().value();
+		var maxApparentPower = this.getMaxApparentPower();
 		if (!scalefactor.isDefined() || !maxApparentPower.isDefined()) {
 			return 1;
 		}
@@ -393,11 +393,11 @@ public int getPowerPrecision() {
 
 	@Override
 	public String debugLog() {
-		return this.stateMachine.getCurrentState().asCamelCase() + //
-				"|" + this.getCurrentState().asCamelCase();
+		return this.stateMachine.getCurrentState().asCamelCase() //
+				+ "|" + this.getCurrentState().asCamelCase();
 	}
 
-	private final AtomicReference<StartStop> startStopTarget = new AtomicReference<StartStop>(StartStop.UNDEFINED);
+	private final AtomicReference<StartStop> startStopTarget = new AtomicReference<>(StartStop.UNDEFINED);
 
 	@Override
 	public void setStartStop(StartStop value) {
@@ -430,14 +430,14 @@ public StartStop getStartStopTarget() {
 	/**
 	 * Adds a Copy-Listener. It listens on setNextValue() and copies the value to
 	 * the target channel.
-	 * 
+	 *
 	 * @param <T>             the Channel type
 	 * @param sourceChannel   the source Channel
 	 * @param targetChannelId the target ChannelId
 	 */
 	private <T> void addCopyListener(Channel<T> sourceChannel,
 			io.openems.edge.common.channel.ChannelId targetChannelId) {
-		Consumer<Value<T>> callback = (value) -> {
+		Consumer<Value<T>> callback = value -> {
 			Channel<T> targetChannel = this.channel(targetChannelId);
 			targetChannel.setNextValue(value);
 		};
@@ -455,7 +455,7 @@ public <T extends Channel<?>> T getSunSpecChannelOrError(SunSpecPoint point) thr
 	 */
 	private void calculateEnergy() {
 		// Calculate Energy
-		Integer activePower = this.getActivePower().get();
+		var activePower = this.getActivePower().get();
 		if (activePower == null) {
 			// Not available
 			this.calculateChargeEnergy.update(null);
@@ -476,6 +476,7 @@ public Timedata getTimedata() {
 		return this.timedata;
 	}
 
+	@Override
 	protected void addBlock(int startAddress, SunSpecModel model, Priority priority) throws OpenemsException {
 		super.addBlock(startAddress, model, priority);
 
diff --git a/io.openems.edge.batteryinverter.kaco.blueplanetgridsave/src/io/openems/edge/batteryinverter/kaco/blueplanetgridsave/MyChannelId.java b/io.openems.edge.batteryinverter.kaco.blueplanetgridsave/src/io/openems/edge/batteryinverter/kaco/blueplanetgridsave/MyChannelId.java
index 280013083f5..4b23dc4f1f4 100644
--- a/io.openems.edge.batteryinverter.kaco.blueplanetgridsave/src/io/openems/edge/batteryinverter/kaco/blueplanetgridsave/MyChannelId.java
+++ b/io.openems.edge.batteryinverter.kaco.blueplanetgridsave/src/io/openems/edge/batteryinverter/kaco/blueplanetgridsave/MyChannelId.java
@@ -11,6 +11,7 @@ private MyChannelId(Doc doc) {
 		this.doc = doc;
 	}
 
+	@Override
 	public Doc doc() {
 		return this.doc;
 	}
diff --git a/io.openems.edge.batteryinverter.kaco.blueplanetgridsave/src/io/openems/edge/batteryinverter/kaco/blueplanetgridsave/statemachine/ErrorHandler.java b/io.openems.edge.batteryinverter.kaco.blueplanetgridsave/src/io/openems/edge/batteryinverter/kaco/blueplanetgridsave/statemachine/ErrorHandler.java
index 79c162789c2..5000e50caa6 100644
--- a/io.openems.edge.batteryinverter.kaco.blueplanetgridsave/src/io/openems/edge/batteryinverter/kaco/blueplanetgridsave/statemachine/ErrorHandler.java
+++ b/io.openems.edge.batteryinverter.kaco.blueplanetgridsave/src/io/openems/edge/batteryinverter/kaco/blueplanetgridsave/statemachine/ErrorHandler.java
@@ -4,7 +4,6 @@
 import java.time.Instant;
 
 import io.openems.common.exceptions.OpenemsError.OpenemsNamedException;
-import io.openems.edge.batteryinverter.kaco.blueplanetgridsave.KacoBlueplanetGridsave;
 import io.openems.edge.batteryinverter.kaco.blueplanetgridsave.KacoSunSpecModel.S64201.S64201RequestedState;
 import io.openems.edge.batteryinverter.kaco.blueplanetgridsave.statemachine.StateMachine.State;
 import io.openems.edge.common.statemachine.StateHandler;
@@ -22,7 +21,7 @@ protected void onEntry(Context context) throws OpenemsNamedException {
 
 	@Override
 	public State runAndGetNextState(Context context) throws OpenemsNamedException {
-		KacoBlueplanetGridsave inverter = context.getParent();
+		var inverter = context.getParent();
 		switch (inverter.getCurrentState()) {
 		case STANDBY:
 		case GRID_CONNECTED:
diff --git a/io.openems.edge.batteryinverter.kaco.blueplanetgridsave/src/io/openems/edge/batteryinverter/kaco/blueplanetgridsave/statemachine/GoRunningHandler.java b/io.openems.edge.batteryinverter.kaco.blueplanetgridsave/src/io/openems/edge/batteryinverter/kaco/blueplanetgridsave/statemachine/GoRunningHandler.java
index 4504b35bc45..f93779a8161 100644
--- a/io.openems.edge.batteryinverter.kaco.blueplanetgridsave/src/io/openems/edge/batteryinverter/kaco/blueplanetgridsave/statemachine/GoRunningHandler.java
+++ b/io.openems.edge.batteryinverter.kaco.blueplanetgridsave/src/io/openems/edge/batteryinverter/kaco/blueplanetgridsave/statemachine/GoRunningHandler.java
@@ -18,13 +18,13 @@ public class GoRunningHandler extends StateHandler<State, Context> {
 	protected void onEntry(Context context) throws OpenemsNamedException {
 		this.lastAttempt = Instant.MIN;
 		this.attemptCounter = 0;
-		KacoBlueplanetGridsave inverter = context.getParent();
+		var inverter = context.getParent();
 		inverter._setMaxStartAttempts(false);
 	}
 
 	@Override
 	public State runAndGetNextState(Context context) throws OpenemsNamedException {
-		KacoBlueplanetGridsave inverter = context.getParent();
+		var inverter = context.getParent();
 
 		// Has Faults -> abort
 		if (inverter.hasFaults()) {
@@ -54,28 +54,24 @@ public State runAndGetNextState(Context context) throws OpenemsNamedException {
 			// Not yet running...
 		}
 
-		boolean isMaxStartTimePassed = Duration.between(this.lastAttempt, Instant.now())
+		var isMaxStartTimePassed = Duration.between(this.lastAttempt, Instant.now())
 				.getSeconds() > KacoBlueplanetGridsave.RETRY_COMMAND_SECONDS;
-		if (isMaxStartTimePassed) {
-			// First try - or waited long enough for next try
-
-			if (this.attemptCounter > KacoBlueplanetGridsave.RETRY_COMMAND_MAX_ATTEMPTS) {
-				// Too many tries
-				inverter._setMaxStartAttempts(true);
-				return State.UNDEFINED;
-
-			} else {
-				// Trying to switch on
-				inverter.setRequestedState(S64201RequestedState.GRID_CONNECTED);
-				this.lastAttempt = Instant.now();
-				this.attemptCounter++;
-				return State.GO_RUNNING;
-
-			}
+		if (!isMaxStartTimePassed) {
+			// Still waiting...
+			return State.GO_RUNNING;
+		}
+		if (this.attemptCounter > KacoBlueplanetGridsave.RETRY_COMMAND_MAX_ATTEMPTS) {
+			// Too many tries
+			inverter._setMaxStartAttempts(true);
+			return State.UNDEFINED;
 
 		} else {
-			// Still waiting...
+			// Trying to switch on
+			inverter.setRequestedState(S64201RequestedState.GRID_CONNECTED);
+			this.lastAttempt = Instant.now();
+			this.attemptCounter++;
 			return State.GO_RUNNING;
+
 		}
 	}
 
diff --git a/io.openems.edge.batteryinverter.kaco.blueplanetgridsave/src/io/openems/edge/batteryinverter/kaco/blueplanetgridsave/statemachine/GoStoppedHandler.java b/io.openems.edge.batteryinverter.kaco.blueplanetgridsave/src/io/openems/edge/batteryinverter/kaco/blueplanetgridsave/statemachine/GoStoppedHandler.java
index 2b1732c31d3..ac8d5aa7cdb 100644
--- a/io.openems.edge.batteryinverter.kaco.blueplanetgridsave/src/io/openems/edge/batteryinverter/kaco/blueplanetgridsave/statemachine/GoStoppedHandler.java
+++ b/io.openems.edge.batteryinverter.kaco.blueplanetgridsave/src/io/openems/edge/batteryinverter/kaco/blueplanetgridsave/statemachine/GoStoppedHandler.java
@@ -22,7 +22,7 @@ protected void onEntry(Context context) {
 
 	@Override
 	public State runAndGetNextState(Context context) throws OpenemsNamedException {
-		KacoBlueplanetGridsave inverter = context.getParent();
+		var inverter = context.getParent();
 
 		switch (inverter.getCurrentState()) {
 		case OFF:
@@ -44,28 +44,24 @@ public State runAndGetNextState(Context context) throws OpenemsNamedException {
 			// Not yet running...
 		}
 
-		boolean isMaxStartTimePassed = Duration.between(this.lastAttempt, Instant.now())
+		var isMaxStartTimePassed = Duration.between(this.lastAttempt, Instant.now())
 				.getSeconds() > KacoBlueplanetGridsave.RETRY_COMMAND_SECONDS;
-		if (isMaxStartTimePassed) {
-			// First try - or waited long enough for next try
-
-			if (this.attemptCounter > KacoBlueplanetGridsave.RETRY_COMMAND_MAX_ATTEMPTS) {
-				// Too many tries
-				inverter._setMaxStopAttempts(true);
-				return State.UNDEFINED;
-
-			} else {
-				// Trying to switch off
-				inverter.setRequestedState(S64201RequestedState.OFF);
-				this.lastAttempt = Instant.now();
-				this.attemptCounter++;
-				return State.GO_STOPPED;
-
-			}
+		if (!isMaxStartTimePassed) {
+			// Still waiting...
+			return State.GO_STOPPED;
+		}
+		if (this.attemptCounter > KacoBlueplanetGridsave.RETRY_COMMAND_MAX_ATTEMPTS) {
+			// Too many tries
+			inverter._setMaxStopAttempts(true);
+			return State.UNDEFINED;
 
 		} else {
-			// Still waiting...
+			// Trying to switch off
+			inverter.setRequestedState(S64201RequestedState.OFF);
+			this.lastAttempt = Instant.now();
+			this.attemptCounter++;
 			return State.GO_STOPPED;
+
 		}
 	}
 
diff --git a/io.openems.edge.batteryinverter.kaco.blueplanetgridsave/src/io/openems/edge/batteryinverter/kaco/blueplanetgridsave/statemachine/RunningHandler.java b/io.openems.edge.batteryinverter.kaco.blueplanetgridsave/src/io/openems/edge/batteryinverter/kaco/blueplanetgridsave/statemachine/RunningHandler.java
index 7e4d59baffc..be6a05cb2d7 100644
--- a/io.openems.edge.batteryinverter.kaco.blueplanetgridsave/src/io/openems/edge/batteryinverter/kaco/blueplanetgridsave/statemachine/RunningHandler.java
+++ b/io.openems.edge.batteryinverter.kaco.blueplanetgridsave/src/io/openems/edge/batteryinverter/kaco/blueplanetgridsave/statemachine/RunningHandler.java
@@ -2,7 +2,6 @@
 
 import io.openems.common.exceptions.OpenemsError.OpenemsNamedException;
 import io.openems.edge.batteryinverter.api.SymmetricBatteryInverter;
-import io.openems.edge.batteryinverter.kaco.blueplanetgridsave.KacoBlueplanetGridsave;
 import io.openems.edge.batteryinverter.kaco.blueplanetgridsave.KacoSunSpecModel;
 import io.openems.edge.batteryinverter.kaco.blueplanetgridsave.statemachine.StateMachine.State;
 import io.openems.edge.common.channel.FloatWriteChannel;
@@ -14,7 +13,7 @@ public class RunningHandler extends StateHandler<State, Context> {
 
 	@Override
 	public State runAndGetNextState(Context context) throws OpenemsNamedException {
-		KacoBlueplanetGridsave inverter = context.getParent();
+		var inverter = context.getParent();
 
 		if (inverter.hasFaults()) {
 			return State.UNDEFINED;
@@ -53,12 +52,12 @@ public State runAndGetNextState(Context context) throws OpenemsNamedException {
 
 	/**
 	 * Applies the Active and Reactive Power Set-Points.
-	 * 
+	 *
 	 * @param context the {@link Context}
 	 * @throws OpenemsNamedException on error
 	 */
 	private void applyPower(Context context) throws OpenemsNamedException {
-		KacoBlueplanetGridsave inverter = context.getParent();
+		var inverter = context.getParent();
 
 		IntegerReadChannel maxApparentPowerChannel = inverter
 				.channel(SymmetricBatteryInverter.ChannelId.MAX_APPARENT_POWER);
@@ -66,12 +65,12 @@ private void applyPower(Context context) throws OpenemsNamedException {
 
 		// Active Power Set-Point is set in % of maximum active power
 		FloatWriteChannel wSetPctChannel = inverter.getSunSpecChannelOrError(KacoSunSpecModel.S64201.W_SET_PCT);
-		float wSetPct = context.setActivePower * 100F / maxApparentPower;
+		var wSetPct = context.setActivePower * 100F / maxApparentPower;
 		wSetPctChannel.setNextWriteValue(wSetPct);
 
 		// Reactive Power Set-Point is set in % of maximum active power
 		FloatWriteChannel varSetPctChannel = inverter.getSunSpecChannelOrError(KacoSunSpecModel.S64201.VAR_SET_PCT);
-		float varSetPct = context.setReactivePower * 100F / maxApparentPower;
+		var varSetPct = context.setReactivePower * 100F / maxApparentPower;
 		varSetPctChannel.setNextWriteValue(varSetPct);
 	}
 
diff --git a/io.openems.edge.batteryinverter.kaco.blueplanetgridsave/src/io/openems/edge/batteryinverter/kaco/blueplanetgridsave/statemachine/StoppedHandler.java b/io.openems.edge.batteryinverter.kaco.blueplanetgridsave/src/io/openems/edge/batteryinverter/kaco/blueplanetgridsave/statemachine/StoppedHandler.java
index fcb3c55a001..75a415711ed 100644
--- a/io.openems.edge.batteryinverter.kaco.blueplanetgridsave/src/io/openems/edge/batteryinverter/kaco/blueplanetgridsave/statemachine/StoppedHandler.java
+++ b/io.openems.edge.batteryinverter.kaco.blueplanetgridsave/src/io/openems/edge/batteryinverter/kaco/blueplanetgridsave/statemachine/StoppedHandler.java
@@ -1,6 +1,5 @@
 package io.openems.edge.batteryinverter.kaco.blueplanetgridsave.statemachine;
 
-import io.openems.edge.batteryinverter.kaco.blueplanetgridsave.KacoBlueplanetGridsave;
 import io.openems.edge.batteryinverter.kaco.blueplanetgridsave.statemachine.StateMachine.State;
 import io.openems.edge.common.startstop.StartStop;
 import io.openems.edge.common.statemachine.StateHandler;
@@ -10,7 +9,7 @@ public class StoppedHandler extends StateHandler<State, Context> {
 	@Override
 	public State runAndGetNextState(Context context) {
 		// Mark as stopped
-		KacoBlueplanetGridsave inverter = context.getParent();
+		var inverter = context.getParent();
 		inverter._setStartStop(StartStop.STOP);
 
 		return State.STOPPED;
diff --git a/io.openems.edge.batteryinverter.kaco.blueplanetgridsave/src/io/openems/edge/batteryinverter/kaco/blueplanetgridsave/statemachine/UndefinedHandler.java b/io.openems.edge.batteryinverter.kaco.blueplanetgridsave/src/io/openems/edge/batteryinverter/kaco/blueplanetgridsave/statemachine/UndefinedHandler.java
index a7f36a63128..bd6b4927bac 100644
--- a/io.openems.edge.batteryinverter.kaco.blueplanetgridsave/src/io/openems/edge/batteryinverter/kaco/blueplanetgridsave/statemachine/UndefinedHandler.java
+++ b/io.openems.edge.batteryinverter.kaco.blueplanetgridsave/src/io/openems/edge/batteryinverter/kaco/blueplanetgridsave/statemachine/UndefinedHandler.java
@@ -1,6 +1,5 @@
 package io.openems.edge.batteryinverter.kaco.blueplanetgridsave.statemachine;
 
-import io.openems.edge.batteryinverter.kaco.blueplanetgridsave.KacoBlueplanetGridsave;
 import io.openems.edge.batteryinverter.kaco.blueplanetgridsave.statemachine.StateMachine.State;
 import io.openems.edge.common.statemachine.StateHandler;
 
@@ -8,7 +7,7 @@ public class UndefinedHandler extends StateHandler<State, Context> {
 
 	@Override
 	public State runAndGetNextState(Context context) {
-		KacoBlueplanetGridsave inverter = context.getParent();
+		var inverter = context.getParent();
 
 		switch (inverter.getStartStopTarget()) {
 		case UNDEFINED:
diff --git a/io.openems.edge.batteryinverter.kaco.blueplanetgridsave/test/io/openems/edge/batteryinverter/kaco/blueplanetgridsave/KacoBlueplanetGridsaveTest.java b/io.openems.edge.batteryinverter.kaco.blueplanetgridsave/test/io/openems/edge/batteryinverter/kaco/blueplanetgridsave/KacoBlueplanetGridsaveTest.java
index a9dcc82c603..94ed446106c 100644
--- a/io.openems.edge.batteryinverter.kaco.blueplanetgridsave/test/io/openems/edge/batteryinverter/kaco/blueplanetgridsave/KacoBlueplanetGridsaveTest.java
+++ b/io.openems.edge.batteryinverter.kaco.blueplanetgridsave/test/io/openems/edge/batteryinverter/kaco/blueplanetgridsave/KacoBlueplanetGridsaveTest.java
@@ -1,6 +1,5 @@
 package io.openems.edge.batteryinverter.kaco.blueplanetgridsave;
 
-import java.lang.reflect.Method;
 import java.time.Instant;
 import java.time.ZoneOffset;
 import java.time.temporal.ChronoUnit;
@@ -65,10 +64,10 @@ protected void handleEvent(String topic) throws Exception {
 
 	@Before
 	public void prepareTest() throws Exception {
-		final long start = 1577836800L;
+		final var start = 1577836800L;
 		clock = new TimeLeapClock(Instant.ofEpochSecond(start) /* starts at 1. January 2020 00:00:00 */,
 				ZoneOffset.UTC);
-		KacoBlueplanetGridsaveImpl sut = new KacoBlueplanetGridsaveImpl();
+		var sut = new KacoBlueplanetGridsaveImpl();
 
 		test = new MyComponentTest(sut) //
 				.addReference("cycle", new DummyCycle(1000)) //
@@ -78,7 +77,7 @@ public void prepareTest() throws Exception {
 
 		// TODO implement proper Dummy-Modbus-Bridge with SunSpec support. Till then...
 		test.addReference("isSunSpecInitializationCompleted", true); //
-		Method addChannel = AbstractOpenemsComponent.class.getDeclaredMethod("addChannel", ChannelId.class);
+		var addChannel = AbstractOpenemsComponent.class.getDeclaredMethod("addChannel", ChannelId.class);
 		addChannel.setAccessible(true);
 		addChannel.invoke(sut, KacoSunSpecModel.S64203.BAT_SOC_0.getChannelId());
 		addChannel.invoke(sut, KacoSunSpecModel.S64203.BAT_SOH_0.getChannelId());
diff --git a/io.openems.edge.batteryinverter.kaco.blueplanetgridsave/test/io/openems/edge/batteryinverter/kaco/blueplanetgridsave/MyConfig.java b/io.openems.edge.batteryinverter.kaco.blueplanetgridsave/test/io/openems/edge/batteryinverter/kaco/blueplanetgridsave/MyConfig.java
index 357955e558c..1f6daed8776 100644
--- a/io.openems.edge.batteryinverter.kaco.blueplanetgridsave/test/io/openems/edge/batteryinverter/kaco/blueplanetgridsave/MyConfig.java
+++ b/io.openems.edge.batteryinverter.kaco.blueplanetgridsave/test/io/openems/edge/batteryinverter/kaco/blueplanetgridsave/MyConfig.java
@@ -35,7 +35,7 @@ public Builder setActivateWatchdog(boolean activateWatchdog) {
 			this.activateWatchdog = activateWatchdog;
 			return this;
 		}
-		
+
 		public MyConfig build() {
 			return new MyConfig(this);
 		}
@@ -43,7 +43,7 @@ public MyConfig build() {
 
 	/**
 	 * Create a Config builder.
-	 * 
+	 *
 	 * @return a {@link Builder}
 	 */
 	public static Builder create() {

From 1afee64e6bada769125007806ef4dc112a32c654 Mon Sep 17 00:00:00 2001
From: Stefan Feilmeier <stefan.feilmeier@fenecon.de>
Date: Sat, 5 Mar 2022 23:53:08 +0100
Subject: [PATCH 03/96] Update io.openems.edge.batteryinverter.refu88k

---
 .../edge/batteryinverter/refu88k/Config.java  |  7 +--
 .../edge/batteryinverter/refu88k/Conn.java    | 33 ----------
 .../edge/batteryinverter/refu88k/DerTyp.java  | 34 -----------
 .../edge/batteryinverter/refu88k/Event1.java  | 52 ----------------
 .../batteryinverter/refu88k/LocRemCtl.java    | 35 -----------
 .../refu88k/OperatingState.java               | 41 -------------
 .../batteryinverter/refu88k/OutPFSetEna.java  | 33 ----------
 .../refu88k/PCSSetOperation.java              | 38 ------------
 .../batteryinverter/refu88k/RefuStore88k.java | 52 ++++++++--------
 .../refu88k/RefuStore88kChannelId.java        |  8 +--
 .../refu88k/RefuStore88kImpl.java             | 61 +++++++++----------
 .../batteryinverter/refu88k/VArPctEna.java    | 33 ----------
 .../refu88k/VendorOperatingState.java         | 32 ----------
 .../batteryinverter/refu88k/WMaxLimEna.java   | 37 -----------
 .../batteryinverter/refu88k/enums/Conn.java   |  4 +-
 .../batteryinverter/refu88k/enums/DerTyp.java |  4 +-
 .../batteryinverter/refu88k/enums/Event1.java |  4 +-
 .../refu88k/enums/LocRemCtl.java              |  4 +-
 .../refu88k/enums/OperatingState.java         |  4 +-
 .../{OutPFSetEna.java => OutPfSetEna.java}    |  8 +--
 ...SetOperation.java => PcsSetOperation.java} |  8 +--
 .../refu88k/enums/VArPctEna.java              |  4 +-
 .../refu88k/enums/VendorOperatingState.java   |  4 +-
 .../refu88k/enums/WMaxLimEna.java             |  4 +-
 .../refu88k/statemachine/ErrorHandler.java    |  3 +-
 .../statemachine/GoRunningHandler.java        |  5 +-
 .../statemachine/GoStoppedHandler.java        |  3 +-
 .../refu88k/statemachine/RunningHandler.java  | 51 ++++++++--------
 .../refu88k/statemachine/StoppedHandler.java  |  3 +-
 .../statemachine/UndefinedHandler.java        |  3 +-
 .../batteryinverter/refu88k/MyConfig.java     |  2 +-
 31 files changed, 116 insertions(+), 498 deletions(-)
 delete mode 100644 io.openems.edge.batteryinverter.refu88k/src/io/openems/edge/batteryinverter/refu88k/Conn.java
 delete mode 100644 io.openems.edge.batteryinverter.refu88k/src/io/openems/edge/batteryinverter/refu88k/DerTyp.java
 delete mode 100644 io.openems.edge.batteryinverter.refu88k/src/io/openems/edge/batteryinverter/refu88k/Event1.java
 delete mode 100644 io.openems.edge.batteryinverter.refu88k/src/io/openems/edge/batteryinverter/refu88k/LocRemCtl.java
 delete mode 100644 io.openems.edge.batteryinverter.refu88k/src/io/openems/edge/batteryinverter/refu88k/OperatingState.java
 delete mode 100644 io.openems.edge.batteryinverter.refu88k/src/io/openems/edge/batteryinverter/refu88k/OutPFSetEna.java
 delete mode 100644 io.openems.edge.batteryinverter.refu88k/src/io/openems/edge/batteryinverter/refu88k/PCSSetOperation.java
 delete mode 100644 io.openems.edge.batteryinverter.refu88k/src/io/openems/edge/batteryinverter/refu88k/VArPctEna.java
 delete mode 100644 io.openems.edge.batteryinverter.refu88k/src/io/openems/edge/batteryinverter/refu88k/VendorOperatingState.java
 delete mode 100644 io.openems.edge.batteryinverter.refu88k/src/io/openems/edge/batteryinverter/refu88k/WMaxLimEna.java
 rename io.openems.edge.batteryinverter.refu88k/src/io/openems/edge/batteryinverter/refu88k/enums/{OutPFSetEna.java => OutPfSetEna.java} (76%)
 rename io.openems.edge.batteryinverter.refu88k/src/io/openems/edge/batteryinverter/refu88k/enums/{PCSSetOperation.java => PcsSetOperation.java} (80%)

diff --git a/io.openems.edge.batteryinverter.refu88k/src/io/openems/edge/batteryinverter/refu88k/Config.java b/io.openems.edge.batteryinverter.refu88k/src/io/openems/edge/batteryinverter/refu88k/Config.java
index b65ebf63e7f..2e4bcf32279 100644
--- a/io.openems.edge.batteryinverter.refu88k/src/io/openems/edge/batteryinverter/refu88k/Config.java
+++ b/io.openems.edge.batteryinverter.refu88k/src/io/openems/edge/batteryinverter/refu88k/Config.java
@@ -5,11 +5,10 @@
 
 import io.openems.edge.common.startstop.StartStopConfig;
 
-@ObjectClassDefinition( //
+@ObjectClassDefinition(//
 		name = "Battery-Inverter REFUstore88k", //
 		description = "Implements the REFUstore 88K Battery Inverter")
-public
-@interface Config {
+public @interface Config {
 	@AttributeDefinition(name = "Component-ID", description = "Unique ID of this Component")
 	String id() default "batteryInverter0";
 
@@ -27,7 +26,7 @@
 
 	@AttributeDefinition(name = "Time Limit", description = "Time no Power is applied")
 	int timeLimitNoPower() default 60;
-	
+
 	@AttributeDefinition(name = "Start/stop behaviour?", description = "Should this Component be forced to start or stop?")
 	StartStopConfig startStop() default StartStopConfig.AUTO;
 
diff --git a/io.openems.edge.batteryinverter.refu88k/src/io/openems/edge/batteryinverter/refu88k/Conn.java b/io.openems.edge.batteryinverter.refu88k/src/io/openems/edge/batteryinverter/refu88k/Conn.java
deleted file mode 100644
index 9e5c12c0650..00000000000
--- a/io.openems.edge.batteryinverter.refu88k/src/io/openems/edge/batteryinverter/refu88k/Conn.java
+++ /dev/null
@@ -1,33 +0,0 @@
-package io.openems.edge.batteryinverter.refu88k;
-
-import io.openems.common.types.OptionsEnum;
-
-public enum Conn implements OptionsEnum {
-	UNDEFINED(-1, "Undefined"),
-	DISCONNECT(0, "Disconnect"),
-	CONNECT(1, "Connect")
-	;
-
-	private final int value;
-	private final String name;
-
-	private Conn(int value, String name) {
-		this.value = value;
-		this.name = name;
-	}
-
-	@Override
-	public int getValue() {
-		return value;
-	}
-
-	@Override
-	public String getName() {
-		return name;
-	}
-
-	@Override
-	public OptionsEnum getUndefined() {
-		return UNDEFINED;
-	} 
-}
diff --git a/io.openems.edge.batteryinverter.refu88k/src/io/openems/edge/batteryinverter/refu88k/DerTyp.java b/io.openems.edge.batteryinverter.refu88k/src/io/openems/edge/batteryinverter/refu88k/DerTyp.java
deleted file mode 100644
index 6d64a458358..00000000000
--- a/io.openems.edge.batteryinverter.refu88k/src/io/openems/edge/batteryinverter/refu88k/DerTyp.java
+++ /dev/null
@@ -1,34 +0,0 @@
-package io.openems.edge.batteryinverter.refu88k;
-
-import io.openems.common.types.OptionsEnum;
-
-public enum DerTyp implements OptionsEnum {
-	UNDEFINED(-1, "Undefined"),
-	PV(4, "PV"),
-	PV_STOR(82, "PVStor")
-	;
-
-	private final int value;
-	private final String name;
-
-	private DerTyp(int value, String name) {
-		this.value = value;
-		this.name = name;
-	}
-
-	@Override
-	public int getValue() {
-		return value;
-	}
-
-	@Override
-	public String getName() {
-		return name;
-	}
-
-	@Override
-	public OptionsEnum getUndefined() {
-		return UNDEFINED;
-	}
-	
-}
diff --git a/io.openems.edge.batteryinverter.refu88k/src/io/openems/edge/batteryinverter/refu88k/Event1.java b/io.openems.edge.batteryinverter.refu88k/src/io/openems/edge/batteryinverter/refu88k/Event1.java
deleted file mode 100644
index 9dda414daf6..00000000000
--- a/io.openems.edge.batteryinverter.refu88k/src/io/openems/edge/batteryinverter/refu88k/Event1.java
+++ /dev/null
@@ -1,52 +0,0 @@
-package io.openems.edge.batteryinverter.refu88k;
-
-import io.openems.common.types.OptionsEnum;
-
-public enum Event1 implements OptionsEnum {
-	UNDEFINED(-1, "Undefined"),
-	GROUND_FAULT(0, "Ground fault"),
-	DC_OVER_VOLTAGE(1, "Dc over voltage"),
-	AC_DISCONNECT(2, "AC disconnect open"),
-	DC_DISCONNECT(3, "DC disconnect open"),
-	GRID_DISCONNECT(4, "Grid shutdown"),
-	CABINET_OPEN(5, "Cabinet open"),
-	MANUAL_SHUTDOWN(6, "Manual shutdown"),
-	OVER_TEMP(7, "Over temperature"),
-	OVER_FREQUENCY(8, "Frequency above limit"),
-	UNDER_FREQUENCY(9, "Frequency under limit"),
-	AC_OVER_VOLT(10, "AC Voltage above limit"),
-	AC_UNDER_VOLT(11, "AC Voltage under limit"),
-	BLOWN_STRING_FUSE(12, "Blown String fuse on input"),
-	UNDER_TEMP(13, "Under temperature"),
-	MEMORY_LOSS(14, "Generic Memory or Communication error (internal)"), 
-	HW_TEST_FAILURE(15, "Hardware test failure"),
-	OTHER_ALARM(16, "Other alarm"),		// When OTHER_ALARM is set, it indicates that some other alarm has occurred in the PCS (i.e. an alarm which does not map to one of the other alarm categories).
-	OTHER_WARNING(17, "Other warning")	// When OTHER_WARNING is set, it indicates that some other warning has occurred in the PCS (i.e. a warning which does not map to one of the other warning categories).
-	;
-
-	private final int value;
-	private final String name;
-
-	private Event1 (int value, String name) {
-		this.value = value;
-		this.name = name;
-	}
-
-	@Override
-	public int getValue() {
-		return value;
-	}
-
-	@Override
-	public String getName() {
-		return name;
-	}
-
-	@Override
-	public OptionsEnum getUndefined() {
-		return UNDEFINED;
-	}
-	
-	
-	
-}
diff --git a/io.openems.edge.batteryinverter.refu88k/src/io/openems/edge/batteryinverter/refu88k/LocRemCtl.java b/io.openems.edge.batteryinverter.refu88k/src/io/openems/edge/batteryinverter/refu88k/LocRemCtl.java
deleted file mode 100644
index da1072109d1..00000000000
--- a/io.openems.edge.batteryinverter.refu88k/src/io/openems/edge/batteryinverter/refu88k/LocRemCtl.java
+++ /dev/null
@@ -1,35 +0,0 @@
-package io.openems.edge.batteryinverter.refu88k;
-
-import io.openems.common.types.OptionsEnum;
-
-public enum LocRemCtl implements OptionsEnum {
-		
-	UNDEFINED(-1, "Undefined"),
-	REMOTE(0, "PCS Remote Control"),
-	LOCAL(1, "PCS Local Control"),
-	;
-
-	private final int value;
-	private final String name;
-
-	private LocRemCtl(int value, String name) {
-		this.value = value;
-		this.name = name;
-	}
-
-	@Override
-	public int getValue() {
-		return value;
-	}
-
-	@Override
-	public String getName() {
-		return name;
-	}
-
-	@Override
-	public OptionsEnum getUndefined() {
-		return UNDEFINED;
-	}
-
-}
diff --git a/io.openems.edge.batteryinverter.refu88k/src/io/openems/edge/batteryinverter/refu88k/OperatingState.java b/io.openems.edge.batteryinverter.refu88k/src/io/openems/edge/batteryinverter/refu88k/OperatingState.java
deleted file mode 100644
index 364245d5a1f..00000000000
--- a/io.openems.edge.batteryinverter.refu88k/src/io/openems/edge/batteryinverter/refu88k/OperatingState.java
+++ /dev/null
@@ -1,41 +0,0 @@
-package io.openems.edge.batteryinverter.refu88k;
-
-import io.openems.common.types.OptionsEnum;
-
-public enum OperatingState implements OptionsEnum {
-	UNDEFINED(-1, "Undefined"),
-	OFF(1, "Off"),
-	SLEEPING(2, "Sleeping"),
-	STARTING(3, "Starting"),
-	MPPT(4, "MPPT"),
-	THROTTLED(5, "Throttled"),
-	SHUTTING_DOWN(6, "Shutting Down"),
-	FAULT(7, "Fault"),
-	STANDBY(8, "Standby"),
-	STARTED(9, "Started")
-	;
-
-	private final int value;
-	private final String name;
-
-	private OperatingState(int value, String name) {
-		this.value = value;
-		this.name = name;
-	}
-
-	@Override
-	public int getValue() {
-		return value;
-	}
-
-	@Override
-	public String getName() {
-		return name;
-	}
-
-	@Override
-	public OptionsEnum getUndefined() {
-		return UNDEFINED;
-	}
-
-}
diff --git a/io.openems.edge.batteryinverter.refu88k/src/io/openems/edge/batteryinverter/refu88k/OutPFSetEna.java b/io.openems.edge.batteryinverter.refu88k/src/io/openems/edge/batteryinverter/refu88k/OutPFSetEna.java
deleted file mode 100644
index 1be819ce922..00000000000
--- a/io.openems.edge.batteryinverter.refu88k/src/io/openems/edge/batteryinverter/refu88k/OutPFSetEna.java
+++ /dev/null
@@ -1,33 +0,0 @@
-package io.openems.edge.batteryinverter.refu88k;
-
-import io.openems.common.types.OptionsEnum;
-
-public enum OutPFSetEna implements OptionsEnum {
-	UNDEFINED(-1, "Undefined"),
-	DISABLED(0, "Disabled"),
-	ENABLED(1, "Enabled")
-	;
-
-	private final int value;
-	private final String name;
-
-	private OutPFSetEna(int value, String name) {
-		this.value = value;
-		this.name = name;
-	}
-
-	@Override
-	public int getValue() {
-		return value;
-	}
-
-	@Override
-	public String getName() {
-		return name;
-	}
-
-	@Override
-	public OptionsEnum getUndefined() {
-		return UNDEFINED;
-	}
-}
diff --git a/io.openems.edge.batteryinverter.refu88k/src/io/openems/edge/batteryinverter/refu88k/PCSSetOperation.java b/io.openems.edge.batteryinverter.refu88k/src/io/openems/edge/batteryinverter/refu88k/PCSSetOperation.java
deleted file mode 100644
index 52751ba54ea..00000000000
--- a/io.openems.edge.batteryinverter.refu88k/src/io/openems/edge/batteryinverter/refu88k/PCSSetOperation.java
+++ /dev/null
@@ -1,38 +0,0 @@
-package io.openems.edge.batteryinverter.refu88k;
-
-import io.openems.common.types.OptionsEnum;
-
-public enum PCSSetOperation implements OptionsEnum {
-		
-	UNDEFINED(-1, "Undefined"),
-	NO_COMMAND(0, "No Command"),
-	START_PCS(1, "Connect to grid"),
-	STOP_PCS(2, "Stop system"),
-	ENTER_STANDBY_MODE(3, "Enter Standby Mode"),
-	EXIT_STANDBY_MODE(4, "Exit Standby Mode"),
-	;
-
-	private final int value;
-	private final String name;
-
-	private PCSSetOperation(int value, String name) {
-		this.value = value;
-		this.name = name;
-	}
-
-	@Override
-	public int getValue() {
-		return value;
-	}
-
-	@Override
-	public String getName() {
-		return name;
-	}
-
-	@Override
-	public OptionsEnum getUndefined() {
-		return UNDEFINED;
-	}
-
-}
diff --git a/io.openems.edge.batteryinverter.refu88k/src/io/openems/edge/batteryinverter/refu88k/RefuStore88k.java b/io.openems.edge.batteryinverter.refu88k/src/io/openems/edge/batteryinverter/refu88k/RefuStore88k.java
index 63056f36210..b0b8ce2930b 100644
--- a/io.openems.edge.batteryinverter.refu88k/src/io/openems/edge/batteryinverter/refu88k/RefuStore88k.java
+++ b/io.openems.edge.batteryinverter.refu88k/src/io/openems/edge/batteryinverter/refu88k/RefuStore88k.java
@@ -5,7 +5,7 @@
 import io.openems.edge.batteryinverter.api.ManagedSymmetricBatteryInverter;
 import io.openems.edge.batteryinverter.api.SymmetricBatteryInverter;
 import io.openems.edge.batteryinverter.refu88k.enums.OperatingState;
-import io.openems.edge.batteryinverter.refu88k.enums.PCSSetOperation;
+import io.openems.edge.batteryinverter.refu88k.enums.PcsSetOperation;
 import io.openems.edge.batteryinverter.refu88k.statemachine.StateMachine;
 import io.openems.edge.common.channel.Channel;
 import io.openems.edge.common.channel.Doc;
@@ -59,14 +59,14 @@ public Doc doc() {
 
 	/**
 	 * Gets the target Start/Stop mode from config or StartStop-Channel.
-	 * 
+	 *
 	 * @return {@link StartStop}
 	 */
 	public StartStop getStartStopTarget();
 
 	/**
 	 * Gets the Channel for {@link ChannelId#MAX_START_ATTEMPTS}.
-	 * 
+	 *
 	 * @return the Channel
 	 */
 	public default StateChannel getMaxStartAttemptsChannel() {
@@ -75,7 +75,7 @@ public default StateChannel getMaxStartAttemptsChannel() {
 
 	/**
 	 * Gets the {@link StateChannel} for {@link ChannelId#MAX_START_ATTEMPTS}.
-	 * 
+	 *
 	 * @return the Channel {@link Value}
 	 */
 	public default Value<Boolean> getMaxStartAttempts() {
@@ -85,7 +85,7 @@ public default Value<Boolean> getMaxStartAttempts() {
 	/**
 	 * Internal method to set the 'nextValue' on
 	 * {@link ChannelId#MAX_START_ATTEMPTS} Channel.
-	 * 
+	 *
 	 * @param value the next value
 	 */
 	public default void _setMaxStartAttempts(Boolean value) {
@@ -94,7 +94,7 @@ public default void _setMaxStartAttempts(Boolean value) {
 
 	/**
 	 * Gets the Channel for {@link ChannelId#MAX_STOP_ATTEMPTS}.
-	 * 
+	 *
 	 * @return the Channel
 	 */
 	public default StateChannel getMaxStopAttemptsChannel() {
@@ -103,7 +103,7 @@ public default StateChannel getMaxStopAttemptsChannel() {
 
 	/**
 	 * Gets the {@link StateChannel} for {@link ChannelId#MAX_STOP_ATTEMPTS}.
-	 * 
+	 *
 	 * @return the Channel {@link Value}
 	 */
 	public default Value<Boolean> getMaxStopAttempts() {
@@ -113,7 +113,7 @@ public default Value<Boolean> getMaxStopAttempts() {
 	/**
 	 * Internal method to set the 'nextValue' on {@link ChannelId#MAX_STOP_ATTEMPTS}
 	 * Channel.
-	 * 
+	 *
 	 * @param value the next value
 	 */
 	public default void _setMaxStopAttempts(Boolean value) {
@@ -121,51 +121,47 @@ public default void _setMaxStopAttempts(Boolean value) {
 	}
 
 	/**
-	 * 
-	 * Exit the STANDBY mode!
-	 * 
+	 * Exit the STANDBY mode.
+	 *
 	 * @throws OpenemsNamedException
-	 * 
+	 *
 	 */
 	public default void exitStandbyMode() throws OpenemsNamedException {
 		EnumWriteChannel pcsSetOperation = this.channel(RefuStore88kChannelId.PCS_SET_OPERATION);
-		pcsSetOperation.setNextWriteValue(PCSSetOperation.EXIT_STANDBY_MODE);
+		pcsSetOperation.setNextWriteValue(PcsSetOperation.EXIT_STANDBY_MODE);
 	}
 
 	/**
-	 * 
-	 * Enter the STARTED mode!
-	 * 
+	 * Enter the STARTED mode.
+	 *
 	 * @throws OpenemsNamedException
-	 * 
+	 *
 	 */
 	public default void enterStartedMode() throws OpenemsNamedException {
 		EnumWriteChannel pcsSetOperation = this.channel(RefuStore88kChannelId.PCS_SET_OPERATION);
-		pcsSetOperation.setNextWriteValue(PCSSetOperation.STOP_PCS);
+		pcsSetOperation.setNextWriteValue(PcsSetOperation.STOP_PCS);
 	}
 
 	/**
-	 * 
-	 * Enter the Throttled or MPPT mode!
-	 * 
+	 * Enter the Throttled or MPPT mode.
+	 *
 	 * @throws OpenemsNamedException
-	 * 
+	 *
 	 */
 	public default void enterThrottledMpptMode() throws OpenemsNamedException {
 		EnumWriteChannel pcsSetOperation = this.channel(RefuStore88kChannelId.PCS_SET_OPERATION);
-		pcsSetOperation.setNextWriteValue(PCSSetOperation.START_PCS);
+		pcsSetOperation.setNextWriteValue(PcsSetOperation.START_PCS);
 	}
 
 	/**
-	 * 
-	 * STOP the inverter by setting the power to zero and entering the STARTED mode!
-	 * 
+	 * STOP the inverter by setting the power to zero and entering the STARTED mode.
+	 *
 	 * @throws OpenemsNamedException
-	 * 
+	 *
 	 */
 	public default void stopInverter() throws OpenemsNamedException {
 		EnumWriteChannel pcsSetOperation = this.channel(RefuStore88kChannelId.PCS_SET_OPERATION);
-		pcsSetOperation.setNextWriteValue(PCSSetOperation.ENTER_STANDBY_MODE);
+		pcsSetOperation.setNextWriteValue(PcsSetOperation.ENTER_STANDBY_MODE);
 	}
 
 	public default String getSerialNumber() {
diff --git a/io.openems.edge.batteryinverter.refu88k/src/io/openems/edge/batteryinverter/refu88k/RefuStore88kChannelId.java b/io.openems.edge.batteryinverter.refu88k/src/io/openems/edge/batteryinverter/refu88k/RefuStore88kChannelId.java
index 80eb5f870b2..d82b60fa17f 100644
--- a/io.openems.edge.batteryinverter.refu88k/src/io/openems/edge/batteryinverter/refu88k/RefuStore88kChannelId.java
+++ b/io.openems.edge.batteryinverter.refu88k/src/io/openems/edge/batteryinverter/refu88k/RefuStore88kChannelId.java
@@ -8,8 +8,8 @@
 import io.openems.edge.batteryinverter.refu88k.enums.DerTyp;
 import io.openems.edge.batteryinverter.refu88k.enums.LocRemCtl;
 import io.openems.edge.batteryinverter.refu88k.enums.OperatingState;
-import io.openems.edge.batteryinverter.refu88k.enums.OutPFSetEna;
-import io.openems.edge.batteryinverter.refu88k.enums.PCSSetOperation;
+import io.openems.edge.batteryinverter.refu88k.enums.OutPfSetEna;
+import io.openems.edge.batteryinverter.refu88k.enums.PcsSetOperation;
 import io.openems.edge.batteryinverter.refu88k.enums.VArPctEna;
 import io.openems.edge.batteryinverter.refu88k.enums.VendorOperatingState;
 import io.openems.edge.batteryinverter.refu88k.enums.WMaxLimEna;
@@ -168,7 +168,7 @@ public enum RefuStore88kChannelId implements ChannelId {
 	W_MAX_LIM_PCT(Doc.of(OpenemsType.INTEGER).unit(Unit.NONE).accessMode(AccessMode.READ_WRITE)), // % WMax
 	W_MAX_LIM_ENA(Doc.of(WMaxLimEna.values()).accessMode(AccessMode.READ_WRITE)), //
 	OUT_PF_SET(Doc.of(OpenemsType.INTEGER).unit(Unit.NONE).accessMode(AccessMode.READ_WRITE)), // // cos()
-	OUT_PF_SET_ENA(Doc.of(OutPFSetEna.values())), //
+	OUT_PF_SET_ENA(Doc.of(OutPfSetEna.values())), //
 	VAR_W_MAX_PCT(Doc.of(OpenemsType.INTEGER).unit(Unit.NONE).accessMode(AccessMode.READ_WRITE)), // // % WMax
 	VAR_PCT_ENA(Doc.of(VArPctEna.values()).accessMode(AccessMode.READ_WRITE)), //
 	W_MAX_LIM_PCT_SF(Doc.of(OpenemsType.INTEGER).unit(Unit.NONE).accessMode(AccessMode.READ_ONLY)), //
@@ -204,7 +204,7 @@ public enum RefuStore88kChannelId implements ChannelId {
 	LOC_REM_CTL(Doc.of(LocRemCtl.values()).accessMode(AccessMode.READ_WRITE)), //
 	PCS_HB(Doc.of(OpenemsType.INTEGER).unit(Unit.NONE).accessMode(AccessMode.READ_WRITE)), //
 	CONTROLLER_HB(Doc.of(OpenemsType.INTEGER).unit(Unit.NONE).accessMode(AccessMode.READ_WRITE)), //
-	PCS_SET_OPERATION(Doc.of(PCSSetOperation.values()).accessMode(AccessMode.READ_WRITE)), //
+	PCS_SET_OPERATION(Doc.of(PcsSetOperation.values()).accessMode(AccessMode.READ_WRITE)), //
 	MAX_BAT_A_CHA(Doc.of(OpenemsType.INTEGER).unit(Unit.AMPERE).accessMode(AccessMode.READ_WRITE)), //
 	MAX_BAT_A_DISCHA(Doc.of(OpenemsType.INTEGER).unit(Unit.AMPERE).accessMode(AccessMode.READ_WRITE)), //
 	MAX_A(Doc.of(OpenemsType.INTEGER).unit(Unit.AMPERE).accessMode(AccessMode.READ_WRITE)), //
diff --git a/io.openems.edge.batteryinverter.refu88k/src/io/openems/edge/batteryinverter/refu88k/RefuStore88kImpl.java b/io.openems.edge.batteryinverter.refu88k/src/io/openems/edge/batteryinverter/refu88k/RefuStore88kImpl.java
index d810dbb5573..96e0d676425 100644
--- a/io.openems.edge.batteryinverter.refu88k/src/io/openems/edge/batteryinverter/refu88k/RefuStore88kImpl.java
+++ b/io.openems.edge.batteryinverter.refu88k/src/io/openems/edge/batteryinverter/refu88k/RefuStore88kImpl.java
@@ -61,7 +61,8 @@
 		name = "Battery-Inverter.Refu.REFUstore88k", //
 		immediate = true, //
 		configurationPolicy = ConfigurationPolicy.REQUIRE, //
-		property = { EventConstants.EVENT_TOPIC + "=" + EdgeEventConstants.TOPIC_CYCLE_AFTER_PROCESS_IMAGE,//
+		property = { //
+				EventConstants.EVENT_TOPIC + "=" + EdgeEventConstants.TOPIC_CYCLE_AFTER_PROCESS_IMAGE,//
 		}
 
 )
@@ -72,7 +73,6 @@ public class RefuStore88kImpl extends AbstractOpenemsModbusComponent implements
 	private Config config;
 
 	public static final int DEFAULT_UNIT_ID = 1;
-	private int MAX_APPARENT_POWER = 0;
 	protected static final double EFFICIENCY_FACTOR = 0.98;
 
 	private final CalculateEnergyFromPower calculateChargeEnergy = new CalculateEnergyFromPower(this,
@@ -80,6 +80,8 @@ public class RefuStore88kImpl extends AbstractOpenemsModbusComponent implements
 	private final CalculateEnergyFromPower calculateDischargeEnergy = new CalculateEnergyFromPower(this,
 			SymmetricBatteryInverter.ChannelId.ACTIVE_DISCHARGE_ENERGY);
 
+	private int maxApparentPower = 0;
+
 	@Reference
 	private Power power;
 
@@ -106,6 +108,7 @@ public RefuStore88kImpl() {
 		this._setGridMode(GridMode.ON_GRID);
 	}
 
+	@Override
 	@Reference(policy = ReferencePolicy.STATIC, policyOption = ReferencePolicyOption.GREEDY, cardinality = ReferenceCardinality.MANDATORY)
 	protected void setModbus(BridgeModbus modbus) {
 		super.setModbus(modbus);
@@ -120,21 +123,22 @@ void activate(ComponentContext context, Config config) throws OpenemsException {
 		this.config = config;
 		this.channel(SymmetricBatteryInverter.ChannelId.MAX_APPARENT_POWER).onChange((oldValue, newValue) -> {
 			@SuppressWarnings("unchecked")
-			Optional<Integer> valueOpt = (Optional<Integer>) newValue.asOptional();
+			var valueOpt = (Optional<Integer>) newValue.asOptional();
 			if (!valueOpt.isPresent()) {
 				return;
 			}
-			MAX_APPARENT_POWER = valueOpt.get();
 			IntegerWriteChannel wMaxChannel = this.channel(RefuStore88kChannelId.W_MAX);
+			this.maxApparentPower = valueOpt.get();
 			try {
 				// Set WMax
-				wMaxChannel.setNextWriteValue(MAX_APPARENT_POWER);
+				wMaxChannel.setNextWriteValue(this.maxApparentPower);
 			} catch (OpenemsNamedException e) {
-				log.error(e.getMessage());
+				this.log.error(e.getMessage());
 			}
 		});
 	}
 
+	@Override
 	@Deactivate
 	protected void deactivate() {
 		super.deactivate();
@@ -155,7 +159,7 @@ public void run(Battery battery, int setActivePower, int setReactivePower) throw
 		this.calculateEnergy();
 
 		// Prepare Context
-		Context context = new Context(this, battery, this.config, setActivePower, setReactivePower);
+		var context = new Context(this, battery, this.config, setActivePower, setReactivePower);
 
 		// Call the StateMachine
 		try {
@@ -171,21 +175,18 @@ public void run(Battery battery, int setActivePower, int setReactivePower) throw
 
 	@Override
 	public BatteryInverterConstraint[] getStaticConstraints() throws OpenemsException {
-		BatteryInverterConstraint noReactivePower = new BatteryInverterConstraint("Reactive power is not allowed",
-				Phase.ALL, Pwr.REACTIVE, Relationship.EQUALS, 0d);
+		var noReactivePower = new BatteryInverterConstraint("Reactive power is not allowed", Phase.ALL, Pwr.REACTIVE,
+				Relationship.EQUALS, 0d);
 
 		if (this.stateMachine.getCurrentState() == State.RUNNING) {
 			return new BatteryInverterConstraint[] { noReactivePower };
 
-		} else {
-			// Block any power as long as we are not RUNNING
-			return new BatteryInverterConstraint[] { //
-					noReactivePower, //
-					new BatteryInverterConstraint("Refu inverter not ready", Phase.ALL, Pwr.ACTIVE, Relationship.EQUALS,
-							0d) //
-			};
-
 		}
+		// Block any power as long as we are not RUNNING
+		return new BatteryInverterConstraint[] { //
+				noReactivePower, //
+				new BatteryInverterConstraint("Refu inverter not ready", Phase.ALL, Pwr.ACTIVE, Relationship.EQUALS, 0d) //
+		};
 	}
 
 	private void setBatteryLimits(Battery battery) throws OpenemsNamedException {
@@ -202,22 +203,22 @@ private void setBatteryLimits(Battery battery) throws OpenemsNamedException {
 
 	@Override
 	public int getPowerPrecision() {
-		return MAX_APPARENT_POWER / 1000;
+		return this.maxApparentPower / 1000;
 	}
 
 	/*
 	 * Supported Models First available Model = Start Address + 2 = 40002 Then 40002
 	 * + Length of Model ....
 	 */
-	private final static int START_ADDRESS = 40000;
-	private final static int SUNSPEC_1 = START_ADDRESS + 2; // Common
-	private final static int SUNSPEC_103 = 40070; // Inverter (Three Phase)
-	private final static int SUNSPEC_120 = 40122; // Nameplate
-	private final static int SUNSPEC_121 = 40150; // Basic Settings
-	private final static int SUNSPEC_123 = 40182; // Immediate Controls
-	private final static int SUNSPEC_64040 = 40208; // REFU Parameter
-	private final static int SUNSPEC_64041 = 40213; // REFU Parameter Value
-	private final static int SUNSPEC_64800 = 40225; // MESA-PCS Extensions
+	private static final int START_ADDRESS = 40000;
+	private static final int SUNSPEC_1 = START_ADDRESS + 2; // Common
+	private static final int SUNSPEC_103 = 40070; // Inverter (Three Phase)
+	private static final int SUNSPEC_120 = 40122; // Nameplate
+	private static final int SUNSPEC_121 = 40150; // Basic Settings
+	private static final int SUNSPEC_123 = 40182; // Immediate Controls
+	private static final int SUNSPEC_64040 = 40208; // REFU Parameter
+	private static final int SUNSPEC_64041 = 40213; // REFU Parameter Value
+	private static final int SUNSPEC_64800 = 40225; // MESA-PCS Extensions
 
 	@Override
 	protected ModbusProtocol defineModbusProtocol() throws OpenemsException { // Register
@@ -259,7 +260,6 @@ protected ModbusProtocol defineModbusProtocol() throws OpenemsException { // Reg
 								ElementToChannelConverter.SCALE_FACTOR_MINUS_1),
 						m(RefuStore88kChannelId.V_SF, new UnsignedWordElement(SUNSPEC_103 + 13)), // 40083
 						m(SymmetricBatteryInverter.ChannelId.ACTIVE_POWER, new SignedWordElement(SUNSPEC_103 + 14), // 40084
-																													// //
 								ElementToChannelConverter.SCALE_FACTOR_1), // REFUStore88KChannelId.W//
 						m(RefuStore88kChannelId.W_SF, new SignedWordElement(SUNSPEC_103 + 15)), // 40085
 						m(RefuStore88kChannelId.HZ, new SignedWordElement(SUNSPEC_103 + 16), // 40086
@@ -269,7 +269,6 @@ protected ModbusProtocol defineModbusProtocol() throws OpenemsException { // Reg
 								ElementToChannelConverter.SCALE_FACTOR_1),
 						m(RefuStore88kChannelId.VA_SF, new SignedWordElement(SUNSPEC_103 + 19)), // 40089
 						m(SymmetricBatteryInverter.ChannelId.REACTIVE_POWER, new SignedWordElement(SUNSPEC_103 + 20), // 40090
-																														// //
 								ElementToChannelConverter.SCALE_FACTOR_1), // REFUStore88KChannelId.VA_R
 						m(RefuStore88kChannelId.VA_R_SF, new SignedWordElement(SUNSPEC_103 + 21)), // 40091
 						new DummyRegisterElement(SUNSPEC_103 + 22, SUNSPEC_103 + 23),
@@ -459,7 +458,7 @@ public String debugLog() {
 				+ "|" + this.stateMachine.getCurrentState().asCamelCase();
 	}
 
-	private AtomicReference<StartStop> startStopTarget = new AtomicReference<StartStop>(StartStop.UNDEFINED);
+	private final AtomicReference<StartStop> startStopTarget = new AtomicReference<>(StartStop.UNDEFINED);
 
 	@Override
 	public void setStartStop(StartStop value) {
@@ -494,7 +493,7 @@ public StartStop getStartStopTarget() {
 	 */
 	private void calculateEnergy() {
 		// Calculate Energy
-		Integer activePower = this.getActivePower().get();
+		var activePower = this.getActivePower().get();
 		if (activePower == null) {
 			// Not available
 			this.calculateChargeEnergy.update(null);
diff --git a/io.openems.edge.batteryinverter.refu88k/src/io/openems/edge/batteryinverter/refu88k/VArPctEna.java b/io.openems.edge.batteryinverter.refu88k/src/io/openems/edge/batteryinverter/refu88k/VArPctEna.java
deleted file mode 100644
index bdea8c31608..00000000000
--- a/io.openems.edge.batteryinverter.refu88k/src/io/openems/edge/batteryinverter/refu88k/VArPctEna.java
+++ /dev/null
@@ -1,33 +0,0 @@
-package io.openems.edge.batteryinverter.refu88k;
-
-import io.openems.common.types.OptionsEnum;
-
-public enum VArPctEna implements OptionsEnum {
-	UNDEFINED(-1, "Undefined"),
-	DISABLED(0, "Disabled"),
-	ENABLED(1, "Enabled")
-	;
-
-	private final int value;
-	private final String name;
-
-	private VArPctEna(int value, String name) {
-		this.value = value;
-		this.name = name;
-	}
-
-	@Override
-	public int getValue() {
-		return value;
-	}
-
-	@Override
-	public String getName() {
-		return name;
-	}
-
-	@Override
-	public OptionsEnum getUndefined() {
-		return UNDEFINED;
-	}
-}
diff --git a/io.openems.edge.batteryinverter.refu88k/src/io/openems/edge/batteryinverter/refu88k/VendorOperatingState.java b/io.openems.edge.batteryinverter.refu88k/src/io/openems/edge/batteryinverter/refu88k/VendorOperatingState.java
deleted file mode 100644
index b0dcf74ffbf..00000000000
--- a/io.openems.edge.batteryinverter.refu88k/src/io/openems/edge/batteryinverter/refu88k/VendorOperatingState.java
+++ /dev/null
@@ -1,32 +0,0 @@
-package io.openems.edge.batteryinverter.refu88k;
-
-import io.openems.common.types.OptionsEnum;
-
-public enum VendorOperatingState implements OptionsEnum {
-	UNDEFINED (-1, "Undefinded")	
-	;
-
-	private final int value;
-	private final String name;
-
-	private VendorOperatingState(int value, String name) {
-		this.value = value;
-		this.name = name;
-	}
-
-	@Override
-	public int getValue() {
-		return value;
-	}
-
-	@Override
-	public String getName() {
-		return name;
-	}
-
-	@Override
-	public OptionsEnum getUndefined() {
-		return UNDEFINED;
-	}
-
-}
diff --git a/io.openems.edge.batteryinverter.refu88k/src/io/openems/edge/batteryinverter/refu88k/WMaxLimEna.java b/io.openems.edge.batteryinverter.refu88k/src/io/openems/edge/batteryinverter/refu88k/WMaxLimEna.java
deleted file mode 100644
index cf70df89ad7..00000000000
--- a/io.openems.edge.batteryinverter.refu88k/src/io/openems/edge/batteryinverter/refu88k/WMaxLimEna.java
+++ /dev/null
@@ -1,37 +0,0 @@
-package io.openems.edge.batteryinverter.refu88k;
-
-import io.openems.common.types.OptionsEnum;
-
-public enum WMaxLimEna implements OptionsEnum {
-
-	UNDEFINED(-1, "Undefined"),
-	DISABLED(0, "Disabled"),
-	ENABLED(1, "Enabled")
-	;
-
-	private final int value;
-	private final String name;
-
-	private WMaxLimEna(int value, String name) {
-		this.value = value;
-		this.name = name;
-	}
-
-	@Override
-	public int getValue() {
-		return value;
-	}
-
-	@Override
-	public String getName() {
-		return name;
-	}
-
-	@Override
-	public OptionsEnum getUndefined() {
-		return UNDEFINED;
-	}
-	
-	
-	
-}
diff --git a/io.openems.edge.batteryinverter.refu88k/src/io/openems/edge/batteryinverter/refu88k/enums/Conn.java b/io.openems.edge.batteryinverter.refu88k/src/io/openems/edge/batteryinverter/refu88k/enums/Conn.java
index c884a52d93d..db5b1066130 100644
--- a/io.openems.edge.batteryinverter.refu88k/src/io/openems/edge/batteryinverter/refu88k/enums/Conn.java
+++ b/io.openems.edge.batteryinverter.refu88k/src/io/openems/edge/batteryinverter/refu88k/enums/Conn.java
@@ -17,12 +17,12 @@ private Conn(int value, String name) {
 
 	@Override
 	public int getValue() {
-		return value;
+		return this.value;
 	}
 
 	@Override
 	public String getName() {
-		return name;
+		return this.name;
 	}
 
 	@Override
diff --git a/io.openems.edge.batteryinverter.refu88k/src/io/openems/edge/batteryinverter/refu88k/enums/DerTyp.java b/io.openems.edge.batteryinverter.refu88k/src/io/openems/edge/batteryinverter/refu88k/enums/DerTyp.java
index bf72a352faa..cc728124306 100644
--- a/io.openems.edge.batteryinverter.refu88k/src/io/openems/edge/batteryinverter/refu88k/enums/DerTyp.java
+++ b/io.openems.edge.batteryinverter.refu88k/src/io/openems/edge/batteryinverter/refu88k/enums/DerTyp.java
@@ -17,12 +17,12 @@ private DerTyp(int value, String name) {
 
 	@Override
 	public int getValue() {
-		return value;
+		return this.value;
 	}
 
 	@Override
 	public String getName() {
-		return name;
+		return this.name;
 	}
 
 	@Override
diff --git a/io.openems.edge.batteryinverter.refu88k/src/io/openems/edge/batteryinverter/refu88k/enums/Event1.java b/io.openems.edge.batteryinverter.refu88k/src/io/openems/edge/batteryinverter/refu88k/enums/Event1.java
index a6d7568be52..cd7ff1538ba 100644
--- a/io.openems.edge.batteryinverter.refu88k/src/io/openems/edge/batteryinverter/refu88k/enums/Event1.java
+++ b/io.openems.edge.batteryinverter.refu88k/src/io/openems/edge/batteryinverter/refu88k/enums/Event1.java
@@ -43,12 +43,12 @@ private Event1(int value, String name) {
 
 	@Override
 	public int getValue() {
-		return value;
+		return this.value;
 	}
 
 	@Override
 	public String getName() {
-		return name;
+		return this.name;
 	}
 
 	@Override
diff --git a/io.openems.edge.batteryinverter.refu88k/src/io/openems/edge/batteryinverter/refu88k/enums/LocRemCtl.java b/io.openems.edge.batteryinverter.refu88k/src/io/openems/edge/batteryinverter/refu88k/enums/LocRemCtl.java
index c5d714482be..fcc85562d66 100644
--- a/io.openems.edge.batteryinverter.refu88k/src/io/openems/edge/batteryinverter/refu88k/enums/LocRemCtl.java
+++ b/io.openems.edge.batteryinverter.refu88k/src/io/openems/edge/batteryinverter/refu88k/enums/LocRemCtl.java
@@ -17,12 +17,12 @@ private LocRemCtl(int value, String name) {
 
 	@Override
 	public int getValue() {
-		return value;
+		return this.value;
 	}
 
 	@Override
 	public String getName() {
-		return name;
+		return this.name;
 	}
 
 	@Override
diff --git a/io.openems.edge.batteryinverter.refu88k/src/io/openems/edge/batteryinverter/refu88k/enums/OperatingState.java b/io.openems.edge.batteryinverter.refu88k/src/io/openems/edge/batteryinverter/refu88k/enums/OperatingState.java
index 24c44a08d5d..6dd2dd87aa4 100644
--- a/io.openems.edge.batteryinverter.refu88k/src/io/openems/edge/batteryinverter/refu88k/enums/OperatingState.java
+++ b/io.openems.edge.batteryinverter.refu88k/src/io/openems/edge/batteryinverter/refu88k/enums/OperatingState.java
@@ -24,12 +24,12 @@ private OperatingState(int value, String name) {
 
 	@Override
 	public int getValue() {
-		return value;
+		return this.value;
 	}
 
 	@Override
 	public String getName() {
-		return name;
+		return this.name;
 	}
 
 	@Override
diff --git a/io.openems.edge.batteryinverter.refu88k/src/io/openems/edge/batteryinverter/refu88k/enums/OutPFSetEna.java b/io.openems.edge.batteryinverter.refu88k/src/io/openems/edge/batteryinverter/refu88k/enums/OutPfSetEna.java
similarity index 76%
rename from io.openems.edge.batteryinverter.refu88k/src/io/openems/edge/batteryinverter/refu88k/enums/OutPFSetEna.java
rename to io.openems.edge.batteryinverter.refu88k/src/io/openems/edge/batteryinverter/refu88k/enums/OutPfSetEna.java
index 55a280b5155..c92d05ff6ca 100644
--- a/io.openems.edge.batteryinverter.refu88k/src/io/openems/edge/batteryinverter/refu88k/enums/OutPFSetEna.java
+++ b/io.openems.edge.batteryinverter.refu88k/src/io/openems/edge/batteryinverter/refu88k/enums/OutPfSetEna.java
@@ -2,7 +2,7 @@
 
 import io.openems.common.types.OptionsEnum;
 
-public enum OutPFSetEna implements OptionsEnum {
+public enum OutPfSetEna implements OptionsEnum {
 	UNDEFINED(-1, "Undefined"), //
 	DISABLED(0, "Disabled"), //
 	ENABLED(1, "Enabled");
@@ -10,19 +10,19 @@ public enum OutPFSetEna implements OptionsEnum {
 	private final int value;
 	private final String name;
 
-	private OutPFSetEna(int value, String name) {
+	private OutPfSetEna(int value, String name) {
 		this.value = value;
 		this.name = name;
 	}
 
 	@Override
 	public int getValue() {
-		return value;
+		return this.value;
 	}
 
 	@Override
 	public String getName() {
-		return name;
+		return this.name;
 	}
 
 	@Override
diff --git a/io.openems.edge.batteryinverter.refu88k/src/io/openems/edge/batteryinverter/refu88k/enums/PCSSetOperation.java b/io.openems.edge.batteryinverter.refu88k/src/io/openems/edge/batteryinverter/refu88k/enums/PcsSetOperation.java
similarity index 80%
rename from io.openems.edge.batteryinverter.refu88k/src/io/openems/edge/batteryinverter/refu88k/enums/PCSSetOperation.java
rename to io.openems.edge.batteryinverter.refu88k/src/io/openems/edge/batteryinverter/refu88k/enums/PcsSetOperation.java
index b9e8c8bcd4c..0cde35b42ff 100644
--- a/io.openems.edge.batteryinverter.refu88k/src/io/openems/edge/batteryinverter/refu88k/enums/PCSSetOperation.java
+++ b/io.openems.edge.batteryinverter.refu88k/src/io/openems/edge/batteryinverter/refu88k/enums/PcsSetOperation.java
@@ -2,7 +2,7 @@
 
 import io.openems.common.types.OptionsEnum;
 
-public enum PCSSetOperation implements OptionsEnum {
+public enum PcsSetOperation implements OptionsEnum {
 	UNDEFINED(-1, "Undefined"), //
 	NO_COMMAND(0, "No Command"), //
 	START_PCS(1, "Connect to grid"), //
@@ -13,19 +13,19 @@ public enum PCSSetOperation implements OptionsEnum {
 	private final int value;
 	private final String name;
 
-	private PCSSetOperation(int value, String name) {
+	private PcsSetOperation(int value, String name) {
 		this.value = value;
 		this.name = name;
 	}
 
 	@Override
 	public int getValue() {
-		return value;
+		return this.value;
 	}
 
 	@Override
 	public String getName() {
-		return name;
+		return this.name;
 	}
 
 	@Override
diff --git a/io.openems.edge.batteryinverter.refu88k/src/io/openems/edge/batteryinverter/refu88k/enums/VArPctEna.java b/io.openems.edge.batteryinverter.refu88k/src/io/openems/edge/batteryinverter/refu88k/enums/VArPctEna.java
index 39f80763e00..80c64e3b959 100644
--- a/io.openems.edge.batteryinverter.refu88k/src/io/openems/edge/batteryinverter/refu88k/enums/VArPctEna.java
+++ b/io.openems.edge.batteryinverter.refu88k/src/io/openems/edge/batteryinverter/refu88k/enums/VArPctEna.java
@@ -17,12 +17,12 @@ private VArPctEna(int value, String name) {
 
 	@Override
 	public int getValue() {
-		return value;
+		return this.value;
 	}
 
 	@Override
 	public String getName() {
-		return name;
+		return this.name;
 	}
 
 	@Override
diff --git a/io.openems.edge.batteryinverter.refu88k/src/io/openems/edge/batteryinverter/refu88k/enums/VendorOperatingState.java b/io.openems.edge.batteryinverter.refu88k/src/io/openems/edge/batteryinverter/refu88k/enums/VendorOperatingState.java
index 73041bdeafa..9d277150aec 100644
--- a/io.openems.edge.batteryinverter.refu88k/src/io/openems/edge/batteryinverter/refu88k/enums/VendorOperatingState.java
+++ b/io.openems.edge.batteryinverter.refu88k/src/io/openems/edge/batteryinverter/refu88k/enums/VendorOperatingState.java
@@ -15,12 +15,12 @@ private VendorOperatingState(int value, String name) {
 
 	@Override
 	public int getValue() {
-		return value;
+		return this.value;
 	}
 
 	@Override
 	public String getName() {
-		return name;
+		return this.name;
 	}
 
 	@Override
diff --git a/io.openems.edge.batteryinverter.refu88k/src/io/openems/edge/batteryinverter/refu88k/enums/WMaxLimEna.java b/io.openems.edge.batteryinverter.refu88k/src/io/openems/edge/batteryinverter/refu88k/enums/WMaxLimEna.java
index cc0fbe27771..af194fe56fa 100644
--- a/io.openems.edge.batteryinverter.refu88k/src/io/openems/edge/batteryinverter/refu88k/enums/WMaxLimEna.java
+++ b/io.openems.edge.batteryinverter.refu88k/src/io/openems/edge/batteryinverter/refu88k/enums/WMaxLimEna.java
@@ -17,12 +17,12 @@ private WMaxLimEna(int value, String name) {
 
 	@Override
 	public int getValue() {
-		return value;
+		return this.value;
 	}
 
 	@Override
 	public String getName() {
-		return name;
+		return this.name;
 	}
 
 	@Override
diff --git a/io.openems.edge.batteryinverter.refu88k/src/io/openems/edge/batteryinverter/refu88k/statemachine/ErrorHandler.java b/io.openems.edge.batteryinverter.refu88k/src/io/openems/edge/batteryinverter/refu88k/statemachine/ErrorHandler.java
index 3190b3fb643..a522074b108 100644
--- a/io.openems.edge.batteryinverter.refu88k/src/io/openems/edge/batteryinverter/refu88k/statemachine/ErrorHandler.java
+++ b/io.openems.edge.batteryinverter.refu88k/src/io/openems/edge/batteryinverter/refu88k/statemachine/ErrorHandler.java
@@ -1,7 +1,6 @@
 package io.openems.edge.batteryinverter.refu88k.statemachine;
 
 import io.openems.common.exceptions.OpenemsError.OpenemsNamedException;
-import io.openems.edge.batteryinverter.refu88k.RefuStore88k;
 import io.openems.edge.batteryinverter.refu88k.statemachine.StateMachine.State;
 import io.openems.edge.common.statemachine.StateHandler;
 
@@ -9,7 +8,7 @@ public class ErrorHandler extends StateHandler<State, Context> {
 
 	@Override
 	public StateMachine.State runAndGetNextState(Context context) throws OpenemsNamedException {
-		RefuStore88k inverter = context.getParent();
+		var inverter = context.getParent();
 
 		inverter._setActivePower(0);
 		inverter._setReactivePower(0);
diff --git a/io.openems.edge.batteryinverter.refu88k/src/io/openems/edge/batteryinverter/refu88k/statemachine/GoRunningHandler.java b/io.openems.edge.batteryinverter.refu88k/src/io/openems/edge/batteryinverter/refu88k/statemachine/GoRunningHandler.java
index 5fbc1f44c43..4e28a0ab7fe 100644
--- a/io.openems.edge.batteryinverter.refu88k/src/io/openems/edge/batteryinverter/refu88k/statemachine/GoRunningHandler.java
+++ b/io.openems.edge.batteryinverter.refu88k/src/io/openems/edge/batteryinverter/refu88k/statemachine/GoRunningHandler.java
@@ -1,7 +1,6 @@
 package io.openems.edge.batteryinverter.refu88k.statemachine;
 
 import io.openems.common.exceptions.OpenemsError.OpenemsNamedException;
-import io.openems.edge.batteryinverter.refu88k.RefuStore88k;
 import io.openems.edge.batteryinverter.refu88k.statemachine.StateMachine.State;
 import io.openems.edge.common.statemachine.StateHandler;
 
@@ -9,14 +8,14 @@ public class GoRunningHandler extends StateHandler<State, Context> {
 
 	@Override
 	protected void onEntry(Context context) throws OpenemsNamedException {
-		RefuStore88k inverter = context.getParent();
+		var inverter = context.getParent();
 
 		inverter._setMaxStartAttempts(false);
 	}
 
 	@Override
 	public State runAndGetNextState(Context context) throws OpenemsNamedException {
-		RefuStore88k inverter = context.getParent();
+		var inverter = context.getParent();
 
 		// Has Faults -> abort
 		if (inverter.hasFaults()) {
diff --git a/io.openems.edge.batteryinverter.refu88k/src/io/openems/edge/batteryinverter/refu88k/statemachine/GoStoppedHandler.java b/io.openems.edge.batteryinverter.refu88k/src/io/openems/edge/batteryinverter/refu88k/statemachine/GoStoppedHandler.java
index d96d13b067b..c40457bc2f2 100644
--- a/io.openems.edge.batteryinverter.refu88k/src/io/openems/edge/batteryinverter/refu88k/statemachine/GoStoppedHandler.java
+++ b/io.openems.edge.batteryinverter.refu88k/src/io/openems/edge/batteryinverter/refu88k/statemachine/GoStoppedHandler.java
@@ -1,7 +1,6 @@
 package io.openems.edge.batteryinverter.refu88k.statemachine;
 
 import io.openems.common.exceptions.OpenemsError.OpenemsNamedException;
-import io.openems.edge.batteryinverter.refu88k.RefuStore88k;
 import io.openems.edge.batteryinverter.refu88k.statemachine.StateMachine.State;
 import io.openems.edge.common.statemachine.StateHandler;
 
@@ -9,7 +8,7 @@ public class GoStoppedHandler extends StateHandler<State, Context> {
 
 	@Override
 	public State runAndGetNextState(Context context) throws OpenemsNamedException {
-		RefuStore88k inverter = context.getParent();
+		var inverter = context.getParent();
 
 		switch (inverter.getOperatingState()) {
 		case STARTING:
diff --git a/io.openems.edge.batteryinverter.refu88k/src/io/openems/edge/batteryinverter/refu88k/statemachine/RunningHandler.java b/io.openems.edge.batteryinverter.refu88k/src/io/openems/edge/batteryinverter/refu88k/statemachine/RunningHandler.java
index 500b59c6932..c2237c8fee8 100644
--- a/io.openems.edge.batteryinverter.refu88k/src/io/openems/edge/batteryinverter/refu88k/statemachine/RunningHandler.java
+++ b/io.openems.edge.batteryinverter.refu88k/src/io/openems/edge/batteryinverter/refu88k/statemachine/RunningHandler.java
@@ -4,7 +4,6 @@
 
 import io.openems.common.exceptions.OpenemsError.OpenemsNamedException;
 import io.openems.edge.batteryinverter.api.SymmetricBatteryInverter;
-import io.openems.edge.batteryinverter.refu88k.RefuStore88k;
 import io.openems.edge.batteryinverter.refu88k.RefuStore88kChannelId;
 import io.openems.edge.batteryinverter.refu88k.enums.VArPctEna;
 import io.openems.edge.batteryinverter.refu88k.enums.WMaxLimEna;
@@ -21,7 +20,7 @@ public class RunningHandler extends StateHandler<State, Context> {
 
 	@Override
 	public State runAndGetNextState(Context context) throws OpenemsNamedException {
-		RefuStore88k inverter = context.getParent();
+		var inverter = context.getParent();
 
 		if (inverter.hasFaults()) {
 			return State.UNDEFINED;
@@ -53,61 +52,59 @@ public State runAndGetNextState(Context context) throws OpenemsNamedException {
 
 	/**
 	 * Applies the Active and Reactive Power Set-Points.
-	 * 
+	 *
 	 * @param context the {@link Context}
 	 * @throws OpenemsNamedException on error
 	 */
-
 	private void applyPower(Context context) throws OpenemsNamedException {
-		RefuStore88k inverter = context.getParent();
-		doGridConnectedHandling(context, context.setActivePower, context.setReactivePower);
+		var inverter = context.getParent();
+		this.doGridConnectedHandling(context, context.setActivePower, context.setReactivePower);
 
 		IntegerReadChannel maxApparentPowerChannel = inverter
 				.channel(SymmetricBatteryInverter.ChannelId.MAX_APPARENT_POWER);
 		int maxApparentPower = maxApparentPowerChannel.value().getOrError();
 
-		int wSetPct = 0;
-		int varSetPct = 0;
+		var wSetPct = 0;
+		var varSetPct = 0;
 
 		// Calculate Active Power as a percentage of WMAX
-		wSetPct = ((1000 * context.setActivePower) / maxApparentPower);
+		wSetPct = 1000 * context.setActivePower / maxApparentPower;
 		// Calculate Reactive Power as a percentage of WMAX
-		varSetPct = ((100 * context.setReactivePower) / maxApparentPower);
+		varSetPct = 100 * context.setReactivePower / maxApparentPower;
 
 		IntegerWriteChannel wMaxLimPctChannel = inverter.channel(RefuStore88kChannelId.W_MAX_LIM_PCT);
-		EnumWriteChannel wMaxLim_EnaChannel = inverter.channel(RefuStore88kChannelId.W_MAX_LIM_ENA);
-
-		IntegerWriteChannel varMaxLimPctChannel = inverter.channel(RefuStore88kChannelId.VAR_W_MAX_PCT);
-		EnumWriteChannel varMaxLim_EnaChannel = inverter.channel(RefuStore88kChannelId.VAR_PCT_ENA);
-
 		wMaxLimPctChannel.setNextWriteValue(wSetPct);
-		wMaxLim_EnaChannel.setNextWriteValue(WMaxLimEna.ENABLED);
 
+		EnumWriteChannel wMaxLimEnaChannel = inverter.channel(RefuStore88kChannelId.W_MAX_LIM_ENA);
+		wMaxLimEnaChannel.setNextWriteValue(WMaxLimEna.ENABLED);
+
+		IntegerWriteChannel varMaxLimPctChannel = inverter.channel(RefuStore88kChannelId.VAR_W_MAX_PCT);
 		varMaxLimPctChannel.setNextWriteValue(varSetPct);
-		varMaxLim_EnaChannel.setNextWriteValue(VArPctEna.ENABLED);
+
+		EnumWriteChannel varMaxLimEnaChannel = inverter.channel(RefuStore88kChannelId.VAR_PCT_ENA);
+		varMaxLimEnaChannel.setNextWriteValue(VArPctEna.ENABLED);
 	}
 
 	/**
+	 * Checks if power is required from the system.
 	 * 
-	 * Checks if power is required from the system!
-	 * 
-	 * @throws OpenemsNamedException
-	 * 
+	 * @param context       the {@link Context}
+	 * @param activePower   the active power setpoint
+	 * @param reactivePower the reactive power setpoint
 	 */
-
 	private void doGridConnectedHandling(Context context, int activePower, int reactivePower)
 			throws OpenemsNamedException {
-		RefuStore88k inverter = context.getParent();
+		var inverter = context.getParent();
 
 		if (activePower == 0 && reactivePower == 0) {
-			if (timeNoPower == null) {
-				timeNoPower = LocalDateTime.now();
+			if (this.timeNoPower == null) {
+				this.timeNoPower = LocalDateTime.now();
 			}
-			if ((timeNoPower.plusSeconds(context.config.timeLimitNoPower())).isBefore(LocalDateTime.now())) {
+			if (this.timeNoPower.plusSeconds(context.config.timeLimitNoPower()).isBefore(LocalDateTime.now())) {
 				inverter.enterStartedMode();
 			}
 		} else {
-			timeNoPower = null;
+			this.timeNoPower = null;
 			inverter.enterThrottledMpptMode();
 		}
 	}
diff --git a/io.openems.edge.batteryinverter.refu88k/src/io/openems/edge/batteryinverter/refu88k/statemachine/StoppedHandler.java b/io.openems.edge.batteryinverter.refu88k/src/io/openems/edge/batteryinverter/refu88k/statemachine/StoppedHandler.java
index aaf2f026aae..926e38adf9c 100644
--- a/io.openems.edge.batteryinverter.refu88k/src/io/openems/edge/batteryinverter/refu88k/statemachine/StoppedHandler.java
+++ b/io.openems.edge.batteryinverter.refu88k/src/io/openems/edge/batteryinverter/refu88k/statemachine/StoppedHandler.java
@@ -1,6 +1,5 @@
 package io.openems.edge.batteryinverter.refu88k.statemachine;
 
-import io.openems.edge.batteryinverter.refu88k.RefuStore88k;
 import io.openems.edge.batteryinverter.refu88k.statemachine.StateMachine.State;
 import io.openems.edge.common.startstop.StartStop;
 import io.openems.edge.common.statemachine.StateHandler;
@@ -9,7 +8,7 @@ public class StoppedHandler extends StateHandler<State, Context> {
 
 	@Override
 	public State runAndGetNextState(Context context) {
-		RefuStore88k inverter = context.getParent();
+		var inverter = context.getParent();
 
 		switch (inverter.getOperatingState()) {
 		case STANDBY:
diff --git a/io.openems.edge.batteryinverter.refu88k/src/io/openems/edge/batteryinverter/refu88k/statemachine/UndefinedHandler.java b/io.openems.edge.batteryinverter.refu88k/src/io/openems/edge/batteryinverter/refu88k/statemachine/UndefinedHandler.java
index 98d462f915d..7a0c4b26780 100644
--- a/io.openems.edge.batteryinverter.refu88k/src/io/openems/edge/batteryinverter/refu88k/statemachine/UndefinedHandler.java
+++ b/io.openems.edge.batteryinverter.refu88k/src/io/openems/edge/batteryinverter/refu88k/statemachine/UndefinedHandler.java
@@ -1,6 +1,5 @@
 package io.openems.edge.batteryinverter.refu88k.statemachine;
 
-import io.openems.edge.batteryinverter.refu88k.RefuStore88k;
 import io.openems.edge.batteryinverter.refu88k.statemachine.StateMachine.State;
 import io.openems.edge.common.statemachine.StateHandler;
 
@@ -8,7 +7,7 @@ public class UndefinedHandler extends StateHandler<State, Context> {
 
 	@Override
 	public State runAndGetNextState(Context context) {
-		RefuStore88k inverter = context.getParent();
+		var inverter = context.getParent();
 
 		switch (inverter.getStartStopTarget()) {
 		case UNDEFINED:
diff --git a/io.openems.edge.batteryinverter.refu88k/test/io/openems/edge/batteryinverter/refu88k/MyConfig.java b/io.openems.edge.batteryinverter.refu88k/test/io/openems/edge/batteryinverter/refu88k/MyConfig.java
index 72272861d60..96c6b434591 100644
--- a/io.openems.edge.batteryinverter.refu88k/test/io/openems/edge/batteryinverter/refu88k/MyConfig.java
+++ b/io.openems.edge.batteryinverter.refu88k/test/io/openems/edge/batteryinverter/refu88k/MyConfig.java
@@ -50,7 +50,7 @@ public MyConfig build() {
 
 	/**
 	 * Create a Config builder.
-	 * 
+	 *
 	 * @return a {@link Builder}
 	 */
 	public static Builder create() {

From a686dfd8625a11eaff22aed74d5860e927a40cda Mon Sep 17 00:00:00 2001
From: Stefan Feilmeier <stefan.feilmeier@fenecon.de>
Date: Sun, 6 Mar 2022 21:40:01 +0100
Subject: [PATCH 04/96] Update io.openems.edge.batteryinverter.sinexcel

---
 .../batteryinverter/sinexcel/Sinexcel.java    | 24 +++++-------
 .../sinexcel/SinexcelImpl.java                | 37 +++++++++----------
 .../enums/ReactivePowerControlMode.java       |  5 +--
 .../sinexcel/statemachine/ErrorHandler.java   |  3 +-
 .../statemachine/GoRunningHandler.java        | 12 +++---
 .../statemachine/GoStoppedHandler.java        |  8 ++--
 .../sinexcel/statemachine/RunningHandler.java |  7 ++--
 .../sinexcel/statemachine/StoppedHandler.java |  3 +-
 .../statemachine/UndefinedHandler.java        |  3 +-
 .../batteryinverter/sinexcel/MyConfig.java    |  4 +-
 .../sinexcel/SinexcelImplTest.java            | 10 ++---
 11 files changed, 50 insertions(+), 66 deletions(-)

diff --git a/io.openems.edge.batteryinverter.sinexcel/src/io/openems/edge/batteryinverter/sinexcel/Sinexcel.java b/io.openems.edge.batteryinverter.sinexcel/src/io/openems/edge/batteryinverter/sinexcel/Sinexcel.java
index 110534a63be..352754d5f0a 100644
--- a/io.openems.edge.batteryinverter.sinexcel/src/io/openems/edge/batteryinverter/sinexcel/Sinexcel.java
+++ b/io.openems.edge.batteryinverter.sinexcel/src/io/openems/edge/batteryinverter/sinexcel/Sinexcel.java
@@ -1,7 +1,5 @@
 package io.openems.edge.batteryinverter.sinexcel;
 
-import java.util.Optional;
-
 import io.openems.common.channel.AccessMode;
 import io.openems.common.channel.Level;
 import io.openems.common.channel.Unit;
@@ -107,18 +105,16 @@ public enum ChannelId implements io.openems.edge.common.channel.ChannelId {
 		INVERTER_GRID_MODE(Doc.of(OpenemsType.BOOLEAN) //
 				.text("On Grid") //
 				.onInit(c -> { //
-					BooleanReadChannel channel = (BooleanReadChannel) c;
-					Sinexcel self = (Sinexcel) channel.getComponent();
+					var channel = (BooleanReadChannel) c;
+					var self = (Sinexcel) channel.getComponent();
 					channel.onChange((oldValue, newValue) -> {
-						Optional<Boolean> value = newValue.asOptional();
+						var value = newValue.asOptional();
 						if (!value.isPresent()) {
 							self._setGridMode(GridMode.UNDEFINED);
+						} else if (value.get()) {
+							self._setGridMode(GridMode.ON_GRID);
 						} else {
-							if (value.get()) {
-								self._setGridMode(GridMode.ON_GRID);
-							} else {
-								self._setGridMode(GridMode.OFF_GRID);
-							}
+							self._setGridMode(GridMode.OFF_GRID);
 						}
 					});
 				})),
@@ -844,7 +840,7 @@ public default Value<Boolean> getSetOnGridMode() {
 
 	/**
 	 * Sets a the On-Grid-Mode. See {@link ChannelId#SET_ON_GRID_MODE}.
-	 * 
+	 *
 	 * @param value the next write value
 	 * @throws OpenemsNamedException on error
 	 */
@@ -872,7 +868,7 @@ public default Value<Boolean> getSetOffGridMode() {
 
 	/**
 	 * Sets a the Off-Grid-Mode. See {@link ChannelId#SET_OFF_GRID_MODE}.
-	 * 
+	 *
 	 * @param value the next write value
 	 * @throws OpenemsNamedException on error
 	 */
@@ -891,7 +887,7 @@ public default BooleanWriteChannel getStartInverterChannel() {
 
 	/**
 	 * Sends a START command to the inverter. See {@link ChannelId#START_INVERTER}.
-	 * 
+	 *
 	 * @throws OpenemsNamedException on error
 	 */
 	public default void setStartInverter() throws OpenemsNamedException {
@@ -909,7 +905,7 @@ public default BooleanWriteChannel getStopInverterChannel() {
 
 	/**
 	 * Sends a STOP command to the inverter. See {@link ChannelId#STOP_INVERTER}.
-	 * 
+	 *
 	 * @throws OpenemsNamedException on error
 	 */
 	public default void setStopInverter() throws OpenemsNamedException {
diff --git a/io.openems.edge.batteryinverter.sinexcel/src/io/openems/edge/batteryinverter/sinexcel/SinexcelImpl.java b/io.openems.edge.batteryinverter.sinexcel/src/io/openems/edge/batteryinverter/sinexcel/SinexcelImpl.java
index 9950e953a51..5242b8c7ba4 100644
--- a/io.openems.edge.batteryinverter.sinexcel/src/io/openems/edge/batteryinverter/sinexcel/SinexcelImpl.java
+++ b/io.openems.edge.batteryinverter.sinexcel/src/io/openems/edge/batteryinverter/sinexcel/SinexcelImpl.java
@@ -48,7 +48,6 @@
 import io.openems.edge.bridge.modbus.api.task.FC6WriteRegisterTask;
 import io.openems.edge.common.channel.BooleanWriteChannel;
 import io.openems.edge.common.channel.WriteChannel;
-import io.openems.edge.common.channel.value.Value;
 import io.openems.edge.common.component.ComponentManager;
 import io.openems.edge.common.component.OpenemsComponent;
 import io.openems.edge.common.event.EdgeEventConstants;
@@ -115,6 +114,7 @@ public SinexcelImpl() throws OpenemsNamedException {
 		this._setMaxApparentPower(SinexcelImpl.MAX_APPARENT_POWER);
 	}
 
+	@Override
 	@Reference(policy = ReferencePolicy.STATIC, policyOption = ReferencePolicyOption.GREEDY, cardinality = ReferenceCardinality.MANDATORY)
 	protected void setModbus(BridgeModbus modbus) {
 		super.setModbus(modbus);
@@ -125,10 +125,10 @@ protected void activate(ComponentContext context, Config config) throws OpenemsN
 		this.config = config;
 		if (super.activate(context, config.id(), config.alias(), config.enabled(), DEFAULT_UNIT_ID, this.cm, "Modbus",
 				config.modbus_id())) {
-			return;
 		}
 	}
 
+	@Override
 	@Deactivate
 	protected void deactivate() {
 		super.deactivate();
@@ -149,7 +149,7 @@ public void run(Battery battery, int setActivePower, int setReactivePower) throw
 		this.setBatteryLimits(battery);
 
 		// Prepare Context
-		Context context = new Context(this, this.config, this.targetGridMode.get(), setActivePower, setReactivePower);
+		var context = new Context(this, this.config, this.targetGridMode.get(), setActivePower, setReactivePower);
 
 		// Call the StateMachine
 		try {
@@ -165,7 +165,7 @@ public void run(Battery battery, int setActivePower, int setReactivePower) throw
 
 	/**
 	 * Updates the Channel if its current value is not equal to the new value.
-	 * 
+	 *
 	 * @param channelId Sinexcel Channel-Id
 	 * @param newValue  {@link OptionsEnum} value.
 	 * @throws IllegalArgumentException on error
@@ -177,14 +177,14 @@ private void updateIfNotEqual(Sinexcel.ChannelId channelId, OptionsEnum value)
 
 	/**
 	 * Updates the Channel if its current value is not equal to the new value.
-	 * 
+	 *
 	 * @param channelId Sinexcel Channel-Id
 	 * @param newValue  Integer value.
 	 * @throws IllegalArgumentException on error
 	 */
 	private void updateIfNotEqual(Sinexcel.ChannelId channelId, Integer newValue) throws IllegalArgumentException {
 		WriteChannel<Integer> channel = this.channel(channelId);
-		Value<Integer> currentValue = channel.value();
+		var currentValue = channel.value();
 		if (currentValue.isDefined() && !Objects.equals(currentValue.get(), newValue)) {
 			try {
 				channel.setNextWriteValue(newValue);
@@ -198,7 +198,7 @@ private void updateIfNotEqual(Sinexcel.ChannelId channelId, Integer newValue) th
 
 	/**
 	 * Sets some default settings on the inverter, like Timeout.
-	 * 
+	 *
 	 * @throws OpenemsNamedException on error
 	 */
 	private void setDefaultSettings() throws OpenemsNamedException {
@@ -210,7 +210,7 @@ private void setDefaultSettings() throws OpenemsNamedException {
 
 	/**
 	 * Sets the Battery Limits.
-	 * 
+	 *
 	 * @param battery the linked {@link Battery}
 	 * @throws OpenemsNamedException on error
 	 */
@@ -293,15 +293,14 @@ public BatteryInverterConstraint[] getStaticConstraints() throws OpenemsExceptio
 		if (this.stateMachine.getCurrentState() == State.RUNNING) {
 			return BatteryInverterConstraint.NO_CONSTRAINTS;
 
-		} else {
-			// Block any power as long as we are not RUNNING
-			return new BatteryInverterConstraint[] { //
-					new BatteryInverterConstraint("Sinexcel inverter not ready", Phase.ALL, Pwr.REACTIVE, //
-							Relationship.EQUALS, 0d), //
-					new BatteryInverterConstraint("Sinexcel inverter not ready", Phase.ALL, Pwr.ACTIVE, //
-							Relationship.EQUALS, 0d) //
-			};
 		}
+		// Block any power as long as we are not RUNNING
+		return new BatteryInverterConstraint[] { //
+				new BatteryInverterConstraint("Sinexcel inverter not ready", Phase.ALL, Pwr.REACTIVE, //
+						Relationship.EQUALS, 0d), //
+				new BatteryInverterConstraint("Sinexcel inverter not ready", Phase.ALL, Pwr.ACTIVE, //
+						Relationship.EQUALS, 0d) //
+		};
 	}
 
 	@Override
@@ -318,6 +317,7 @@ public ModbusSlaveTable getModbusSlaveTable(AccessMode accessMode) {
 		);
 	}
 
+	@Override
 	protected ModbusProtocol defineModbusProtocol() throws OpenemsException {
 		return new ModbusProtocol(this, //
 				new FC3ReadRegistersTask(1, Priority.HIGH, //
@@ -1097,9 +1097,8 @@ protected ModbusProtocol defineModbusProtocol() throws OpenemsException {
 				int value = (Short) obj;
 				if (Math.abs(value) < 100) {
 					return 0;
-				} else {
-					return value;
 				}
+				return value;
 			}, //
 			value -> value);
 
@@ -1116,6 +1115,6 @@ protected ModbusProtocol defineModbusProtocol() throws OpenemsException {
 	 */
 	public void softStart(boolean switchOn) throws OpenemsNamedException {
 		BooleanWriteChannel setSoftStart = this.channel(Sinexcel.ChannelId.SET_SOFT_START);
-		setSoftStart.setNextWriteValue(switchOn ? true : false);
+		setSoftStart.setNextWriteValue(switchOn == true);
 	}
 }
diff --git a/io.openems.edge.batteryinverter.sinexcel/src/io/openems/edge/batteryinverter/sinexcel/enums/ReactivePowerControlMode.java b/io.openems.edge.batteryinverter.sinexcel/src/io/openems/edge/batteryinverter/sinexcel/enums/ReactivePowerControlMode.java
index 1b5a15ea1d8..3d01ba612d9 100644
--- a/io.openems.edge.batteryinverter.sinexcel/src/io/openems/edge/batteryinverter/sinexcel/enums/ReactivePowerControlMode.java
+++ b/io.openems.edge.batteryinverter.sinexcel/src/io/openems/edge/batteryinverter/sinexcel/enums/ReactivePowerControlMode.java
@@ -5,11 +5,10 @@
 public enum ReactivePowerControlMode implements OptionsEnum {
 	UNDEFINED(-1, "Undefined"), //
 	CONSTANT_REACTIVE_POWER(0, "Constant Reactive Power"), //
-	VOLT_VAR_ENABLED(1, "Volt Var Enabled"),//
+	VOLT_VAR_ENABLED(1, "Volt Var Enabled"), //
 	CONSTANT_PF(2, "Constanr Power Factor"), //
 	WATT_PF_ENABLED(3, "Watt Power Factor Enabled"); //
-	
-	
+
 	private final int value;
 	private final String name;
 
diff --git a/io.openems.edge.batteryinverter.sinexcel/src/io/openems/edge/batteryinverter/sinexcel/statemachine/ErrorHandler.java b/io.openems.edge.batteryinverter.sinexcel/src/io/openems/edge/batteryinverter/sinexcel/statemachine/ErrorHandler.java
index 9e244e83e85..7161d8698c4 100644
--- a/io.openems.edge.batteryinverter.sinexcel/src/io/openems/edge/batteryinverter/sinexcel/statemachine/ErrorHandler.java
+++ b/io.openems.edge.batteryinverter.sinexcel/src/io/openems/edge/batteryinverter/sinexcel/statemachine/ErrorHandler.java
@@ -5,7 +5,6 @@
 
 import io.openems.common.exceptions.OpenemsError.OpenemsNamedException;
 import io.openems.edge.batteryinverter.sinexcel.Sinexcel;
-import io.openems.edge.batteryinverter.sinexcel.SinexcelImpl;
 import io.openems.edge.batteryinverter.sinexcel.statemachine.StateMachine.State;
 import io.openems.edge.common.channel.BooleanWriteChannel;
 import io.openems.edge.common.statemachine.StateHandler;
@@ -24,7 +23,7 @@ protected void onEntry(Context context) throws OpenemsNamedException {
 		this.setClearFailureCommand(context);
 
 		// Try to stop systems
-		final SinexcelImpl inverter = context.getParent();
+		final var inverter = context.getParent();
 		inverter.softStart(false);
 		inverter.setStopInverter();
 	}
diff --git a/io.openems.edge.batteryinverter.sinexcel/src/io/openems/edge/batteryinverter/sinexcel/statemachine/GoRunningHandler.java b/io.openems.edge.batteryinverter.sinexcel/src/io/openems/edge/batteryinverter/sinexcel/statemachine/GoRunningHandler.java
index 63574e43c03..13769d96c5b 100644
--- a/io.openems.edge.batteryinverter.sinexcel/src/io/openems/edge/batteryinverter/sinexcel/statemachine/GoRunningHandler.java
+++ b/io.openems.edge.batteryinverter.sinexcel/src/io/openems/edge/batteryinverter/sinexcel/statemachine/GoRunningHandler.java
@@ -1,7 +1,6 @@
 package io.openems.edge.batteryinverter.sinexcel.statemachine;
 
 import io.openems.common.exceptions.OpenemsError.OpenemsNamedException;
-import io.openems.edge.batteryinverter.sinexcel.SinexcelImpl;
 import io.openems.edge.batteryinverter.sinexcel.statemachine.StateMachine.State;
 import io.openems.edge.common.statemachine.StateHandler;
 
@@ -9,13 +8,13 @@ public class GoRunningHandler extends StateHandler<State, Context> {
 
 	@Override
 	public State runAndGetNextState(Context context) throws OpenemsNamedException {
-		final SinexcelImpl inverter = context.getParent();
+		final var inverter = context.getParent();
 
 		/*
 		 * Be sure to set the correct target grid mode
 		 */
-		Boolean setOnGridMode = inverter.getSetOnGridMode().get();
-		Boolean setOffGridMode = inverter.getSetOffGridMode().get();
+		var setOnGridMode = inverter.getSetOnGridMode().get();
+		var setOffGridMode = inverter.getSetOffGridMode().get();
 		switch (context.targetGridMode) {
 		case GO_ON_GRID:
 			if (setOnGridMode == Boolean.FALSE || setOffGridMode == Boolean.TRUE) {
@@ -39,10 +38,9 @@ public State runAndGetNextState(Context context) throws OpenemsNamedException {
 		if (inverter.getBatteryInverterState().get() == Boolean.TRUE) {
 			// Inverter is ON
 			return State.RUNNING;
-		} else {
-			// Still waiting
-			return State.GO_RUNNING;
 		}
+		// Still waiting
+		return State.GO_RUNNING;
 	}
 
 }
diff --git a/io.openems.edge.batteryinverter.sinexcel/src/io/openems/edge/batteryinverter/sinexcel/statemachine/GoStoppedHandler.java b/io.openems.edge.batteryinverter.sinexcel/src/io/openems/edge/batteryinverter/sinexcel/statemachine/GoStoppedHandler.java
index 7c51ce24738..3d486519b7f 100644
--- a/io.openems.edge.batteryinverter.sinexcel/src/io/openems/edge/batteryinverter/sinexcel/statemachine/GoStoppedHandler.java
+++ b/io.openems.edge.batteryinverter.sinexcel/src/io/openems/edge/batteryinverter/sinexcel/statemachine/GoStoppedHandler.java
@@ -1,7 +1,6 @@
 package io.openems.edge.batteryinverter.sinexcel.statemachine;
 
 import io.openems.common.exceptions.OpenemsError.OpenemsNamedException;
-import io.openems.edge.batteryinverter.sinexcel.SinexcelImpl;
 import io.openems.edge.batteryinverter.sinexcel.statemachine.StateMachine.State;
 import io.openems.edge.common.statemachine.StateHandler;
 
@@ -9,7 +8,7 @@ public class GoStoppedHandler extends StateHandler<State, Context> {
 
 	@Override
 	public State runAndGetNextState(Context context) throws OpenemsNamedException {
-		final SinexcelImpl inverter = context.getParent();
+		final var inverter = context.getParent();
 
 		inverter.softStart(false);
 		inverter.setStopInverter();
@@ -17,10 +16,9 @@ public State runAndGetNextState(Context context) throws OpenemsNamedException {
 		if (inverter.getBatteryInverterState().get() == Boolean.FALSE) {
 			// Inverter is OFF
 			return State.STOPPED;
-		} else {
-			// Still waiting
-			return State.GO_STOPPED;
 		}
+		// Still waiting
+		return State.GO_STOPPED;
 	}
 
 }
diff --git a/io.openems.edge.batteryinverter.sinexcel/src/io/openems/edge/batteryinverter/sinexcel/statemachine/RunningHandler.java b/io.openems.edge.batteryinverter.sinexcel/src/io/openems/edge/batteryinverter/sinexcel/statemachine/RunningHandler.java
index 2de4e315942..af86a0decfb 100644
--- a/io.openems.edge.batteryinverter.sinexcel/src/io/openems/edge/batteryinverter/sinexcel/statemachine/RunningHandler.java
+++ b/io.openems.edge.batteryinverter.sinexcel/src/io/openems/edge/batteryinverter/sinexcel/statemachine/RunningHandler.java
@@ -2,7 +2,6 @@
 
 import io.openems.common.exceptions.OpenemsError.OpenemsNamedException;
 import io.openems.edge.batteryinverter.sinexcel.Sinexcel;
-import io.openems.edge.batteryinverter.sinexcel.SinexcelImpl;
 import io.openems.edge.batteryinverter.sinexcel.statemachine.StateMachine.State;
 import io.openems.edge.common.channel.IntegerWriteChannel;
 import io.openems.edge.common.startstop.StartStop;
@@ -12,7 +11,7 @@ public class RunningHandler extends StateHandler<State, Context> {
 
 	@Override
 	public State runAndGetNextState(Context context) throws OpenemsNamedException {
-		final SinexcelImpl inverter = context.getParent();
+		final var inverter = context.getParent();
 
 		if (inverter.hasFaults() || inverter.getBatteryInverterState().get() == Boolean.FALSE) {
 			return State.UNDEFINED;
@@ -31,12 +30,12 @@ public State runAndGetNextState(Context context) throws OpenemsNamedException {
 
 	/**
 	 * Applies the Active and Reactive Power Set-Points.
-	 * 
+	 *
 	 * @param context the {@link Context}
 	 * @throws OpenemsNamedException on error
 	 */
 	private void applyPower(Context context) throws OpenemsNamedException {
-		final SinexcelImpl inverter = context.getParent();
+		final var inverter = context.getParent();
 
 		IntegerWriteChannel setActivePower = inverter.channel(Sinexcel.ChannelId.SET_ACTIVE_POWER);
 		setActivePower.setNextWriteValue(context.setActivePower);
diff --git a/io.openems.edge.batteryinverter.sinexcel/src/io/openems/edge/batteryinverter/sinexcel/statemachine/StoppedHandler.java b/io.openems.edge.batteryinverter.sinexcel/src/io/openems/edge/batteryinverter/sinexcel/statemachine/StoppedHandler.java
index 6b4a30c65ff..1b5d0d4e84d 100644
--- a/io.openems.edge.batteryinverter.sinexcel/src/io/openems/edge/batteryinverter/sinexcel/statemachine/StoppedHandler.java
+++ b/io.openems.edge.batteryinverter.sinexcel/src/io/openems/edge/batteryinverter/sinexcel/statemachine/StoppedHandler.java
@@ -1,7 +1,6 @@
 package io.openems.edge.batteryinverter.sinexcel.statemachine;
 
 import io.openems.common.exceptions.OpenemsError.OpenemsNamedException;
-import io.openems.edge.batteryinverter.sinexcel.SinexcelImpl;
 import io.openems.edge.batteryinverter.sinexcel.statemachine.StateMachine.State;
 import io.openems.edge.common.startstop.StartStop;
 import io.openems.edge.common.statemachine.StateHandler;
@@ -10,7 +9,7 @@ public class StoppedHandler extends StateHandler<State, Context> {
 
 	@Override
 	public State runAndGetNextState(Context context) throws OpenemsNamedException {
-		final SinexcelImpl inverter = context.getParent();
+		final var inverter = context.getParent();
 
 		// Mark as stopped
 		inverter._setStartStop(StartStop.STOP);
diff --git a/io.openems.edge.batteryinverter.sinexcel/src/io/openems/edge/batteryinverter/sinexcel/statemachine/UndefinedHandler.java b/io.openems.edge.batteryinverter.sinexcel/src/io/openems/edge/batteryinverter/sinexcel/statemachine/UndefinedHandler.java
index 9a5e4bbc1c8..cb2346bc3fe 100644
--- a/io.openems.edge.batteryinverter.sinexcel/src/io/openems/edge/batteryinverter/sinexcel/statemachine/UndefinedHandler.java
+++ b/io.openems.edge.batteryinverter.sinexcel/src/io/openems/edge/batteryinverter/sinexcel/statemachine/UndefinedHandler.java
@@ -1,7 +1,6 @@
 package io.openems.edge.batteryinverter.sinexcel.statemachine;
 
 import io.openems.common.exceptions.OpenemsError.OpenemsNamedException;
-import io.openems.edge.batteryinverter.sinexcel.SinexcelImpl;
 import io.openems.edge.batteryinverter.sinexcel.statemachine.StateMachine.State;
 import io.openems.edge.common.statemachine.StateHandler;
 
@@ -9,7 +8,7 @@ public class UndefinedHandler extends StateHandler<State, Context> {
 
 	@Override
 	public State runAndGetNextState(Context context) throws OpenemsNamedException {
-		final SinexcelImpl inverter = context.getParent();
+		final var inverter = context.getParent();
 		switch (inverter.getStartStopTarget()) {
 		case UNDEFINED:
 			// Stuck in UNDEFINED State
diff --git a/io.openems.edge.batteryinverter.sinexcel/test/io/openems/edge/batteryinverter/sinexcel/MyConfig.java b/io.openems.edge.batteryinverter.sinexcel/test/io/openems/edge/batteryinverter/sinexcel/MyConfig.java
index d5c9037f981..76f5937afa9 100644
--- a/io.openems.edge.batteryinverter.sinexcel/test/io/openems/edge/batteryinverter/sinexcel/MyConfig.java
+++ b/io.openems.edge.batteryinverter.sinexcel/test/io/openems/edge/batteryinverter/sinexcel/MyConfig.java
@@ -1,7 +1,6 @@
 package io.openems.edge.batteryinverter.sinexcel;
 
 import io.openems.common.utils.ConfigUtils;
-import io.openems.edge.batteryinverter.sinexcel.Config;
 import io.openems.edge.common.startstop.StartStopConfig;
 import io.openems.edge.common.test.AbstractComponentConfig;
 
@@ -12,7 +11,6 @@ protected static class Builder {
 		private String id = null;
 		private String modbusId = null;
 		private StartStopConfig startStopConfig = null;
-		private int modbusUnitId;
 
 		private Builder() {
 		}
@@ -39,7 +37,7 @@ public MyConfig build() {
 
 	/**
 	 * Create a Config builder.
-	 * 
+	 *
 	 * @return a {@link Builder}
 	 */
 	public static Builder create() {
diff --git a/io.openems.edge.batteryinverter.sinexcel/test/io/openems/edge/batteryinverter/sinexcel/SinexcelImplTest.java b/io.openems.edge.batteryinverter.sinexcel/test/io/openems/edge/batteryinverter/sinexcel/SinexcelImplTest.java
index 408d2582961..cc8a82b0637 100644
--- a/io.openems.edge.batteryinverter.sinexcel/test/io/openems/edge/batteryinverter/sinexcel/SinexcelImplTest.java
+++ b/io.openems.edge.batteryinverter.sinexcel/test/io/openems/edge/batteryinverter/sinexcel/SinexcelImplTest.java
@@ -58,8 +58,8 @@ protected void handleEvent(String topic) throws Exception {
 
 	@Test
 	public void testStart() throws Exception {
-		final TimeLeapClock clock = new TimeLeapClock(
-				Instant.ofEpochSecond(1577836800L) /* starts at 1. January 2020 00:00:00 */, ZoneOffset.UTC);
+		final var clock = new TimeLeapClock(Instant.ofEpochSecond(1577836800L) /* starts at 1. January 2020 00:00:00 */,
+				ZoneOffset.UTC);
 		new MyComponentTest(new SinexcelImpl()) //
 				.addReference("cm", new DummyConfigurationAdmin()) //
 				.addReference("componentManager", new DummyComponentManager(clock)) //
@@ -92,9 +92,9 @@ public void testStart() throws Exception {
 
 	@Test
 	public void testOffGrid() throws Exception {
-		final TimeLeapClock clock = new TimeLeapClock(
-				Instant.ofEpochSecond(1577836800L) /* starts at 1. January 2020 00:00:00 */, ZoneOffset.UTC);
-		SinexcelImpl sut = new SinexcelImpl();
+		final var clock = new TimeLeapClock(Instant.ofEpochSecond(1577836800L) /* starts at 1. January 2020 00:00:00 */,
+				ZoneOffset.UTC);
+		var sut = new SinexcelImpl();
 		new MyComponentTest(sut) //
 				.addReference("cm", new DummyConfigurationAdmin()) //
 				.addReference("componentManager", new DummyComponentManager(clock)) //

From 7b25fd07caf15b6f2a1e9995b67cb4cd2439b3e7 Mon Sep 17 00:00:00 2001
From: Stefan Feilmeier <stefan.feilmeier@fenecon.de>
Date: Sun, 6 Mar 2022 21:40:52 +0100
Subject: [PATCH 05/96] Update io.openems.edge.batteryinverter.sunspec

---
 .../sunspec/AbstractSunSpecBatteryInverter.java                | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/io.openems.edge.batteryinverter.sunspec/src/io/openems/edge/batteryinverter/sunspec/AbstractSunSpecBatteryInverter.java b/io.openems.edge.batteryinverter.sunspec/src/io/openems/edge/batteryinverter/sunspec/AbstractSunSpecBatteryInverter.java
index 1cce13e82e5..646ca7f453b 100644
--- a/io.openems.edge.batteryinverter.sunspec/src/io/openems/edge/batteryinverter/sunspec/AbstractSunSpecBatteryInverter.java
+++ b/io.openems.edge.batteryinverter.sunspec/src/io/openems/edge/batteryinverter/sunspec/AbstractSunSpecBatteryInverter.java
@@ -29,7 +29,7 @@ public AbstractSunSpecBatteryInverter(Map<SunSpecModel, Priority> activeModels,
 
 	/**
 	 * Make sure to call this method from the inheriting OSGi Component.
-	 * 
+	 *
 	 * @throws OpenemsException on error
 	 */
 	@Override
@@ -43,6 +43,7 @@ protected boolean activate(ComponentContext context, String id, String alias, bo
 	/**
 	 * Make sure to call this method from the inheriting OSGi Component.
 	 */
+	@Override
 	@Deactivate
 	protected void deactivate() {
 		super.deactivate();

From e1a548729b744d65aa389845f79f4119acfc4948 Mon Sep 17 00:00:00 2001
From: Stefan Feilmeier <stefan.feilmeier@fenecon.de>
Date: Sun, 6 Mar 2022 21:41:49 +0100
Subject: [PATCH 06/96] Update io.openems.edge.bosch.bpts5hybrid

---
 .../core/BoschBpts5HybridApiClient.java       | 186 ++++++++----------
 .../core/BoschBpts5HybridCore.java            |  10 +-
 .../core/BoschBpts5HybridCoreImpl.java        |  15 +-
 .../core/BoschBpts5HybridReadWorker.java      |  56 +++---
 .../edge/bosch/bpts5hybrid/core/Config.java   |   5 +-
 .../bpts5hybrid/ess/BoschBpts5HybridEss.java  |   3 +-
 .../meter/BoschBpts5HybridMeter.java          |  16 +-
 .../bpts5hybrid/pv/BoschBpts5HybridPv.java    |  24 +--
 .../edge/bosch/bpts5hybrid/core/MyConfig.java |   3 +-
 .../ess/BoschBpts5HybridEssTest.java          |   2 +-
 .../edge/bosch/bpts5hybrid/ess/MyConfig.java  |   2 +-
 .../meter/BoschBpts5HybridMeterTest.java      |   2 +-
 .../bosch/bpts5hybrid/meter/MyConfig.java     |   2 +-
 .../pv/BoschBpts5HybridPvTest.java            |   2 +-
 .../edge/bosch/bpts5hybrid/pv/MyConfig.java   |   2 +-
 15 files changed, 160 insertions(+), 170 deletions(-)

diff --git a/io.openems.edge.bosch.bpts5hybrid/src/io/openems/edge/bosch/bpts5hybrid/core/BoschBpts5HybridApiClient.java b/io.openems.edge.bosch.bpts5hybrid/src/io/openems/edge/bosch/bpts5hybrid/core/BoschBpts5HybridApiClient.java
index bde63137db6..f43cc6ed482 100644
--- a/io.openems.edge.bosch.bpts5hybrid/src/io/openems/edge/bosch/bpts5hybrid/core/BoschBpts5HybridApiClient.java
+++ b/io.openems.edge.bosch.bpts5hybrid/src/io/openems/edge/bosch/bpts5hybrid/core/BoschBpts5HybridApiClient.java
@@ -6,15 +6,12 @@
 
 import org.eclipse.jetty.client.HttpClient;
 import org.eclipse.jetty.client.api.ContentResponse;
-import org.eclipse.jetty.client.api.Request;
 import org.eclipse.jetty.client.util.StringContentProvider;
 import org.eclipse.jetty.http.HttpHeader;
 import org.jsoup.Jsoup;
-import org.jsoup.nodes.Document;
-import org.jsoup.nodes.Element;
 
-import io.openems.common.exceptions.OpenemsException;
 import io.openems.common.exceptions.OpenemsError.OpenemsNamedException;
+import io.openems.common.exceptions.OpenemsException;
 
 public class BoschBpts5HybridApiClient {
 
@@ -23,49 +20,47 @@ public class BoschBpts5HybridApiClient {
 	private static final String GET_VALUES_URL_PART = "/cgi-bin/ipcclient.fcgi?";
 	private static String BASE_URL;
 	private String wui_sid;
-	private Integer pvLeistungWatt  = Integer.valueOf(0);
+	private Integer pvLeistungWatt = Integer.valueOf(0);
 	private Integer soc = Integer.valueOf(0);
-	private Integer einspeisung  = Integer.valueOf(0);
+	private Integer einspeisung = Integer.valueOf(0);
 	private Integer batterieLadeStrom = Integer.valueOf(0);
 	private Integer verbrauchVonPv = Integer.valueOf(0);
 	private Integer verbrauchVonBatterie = Integer.valueOf(0);
 	private Integer strombezugAusNetz = Integer.valueOf(0);
-	private HttpClient httpClient;
+	private final HttpClient httpClient;
 
 	public BoschBpts5HybridApiClient(String ipaddress) {
-		BASE_URL = "http://"+ipaddress;
-		httpClient = new HttpClient();
-		httpClient.setConnectTimeout(5000);
-		httpClient.setFollowRedirects(true);
+		BASE_URL = "http://" + ipaddress;
+		this.httpClient = new HttpClient();
+		this.httpClient.setConnectTimeout(5000);
+		this.httpClient.setFollowRedirects(true);
 		try {
-			httpClient.start();
+			this.httpClient.start();
 		} catch (Exception e) {
 			e.printStackTrace();
 		}
-		connect();
+		this.connect();
 	}
-	
+
 	public void connect() {
 		try {
-			wui_sid = getWuiSidRequest();
+			this.wui_sid = this.getWuiSidRequest();
 		} catch (OpenemsNamedException e) {
-			wui_sid = "";
+			this.wui_sid = "";
 			e.printStackTrace();
 		}
 	}
 
 	private String getWuiSidRequest() throws OpenemsNamedException {
 		try {
-			ContentResponse response = httpClient.GET(BASE_URL);
-			
-			int status = response.getStatus();
-			if(status < 300) {
-				String body = response.getContentAsString();
-				return extractWuiSidFromBody(body);
-			} else {
-				throw new OpenemsException(
-						"Error while reading from Bosch BPT-S 5. Response code: " + status);
+			var response = this.httpClient.GET(BASE_URL);
+
+			var status = response.getStatus();
+			if (status < 300) {
+				var body = response.getContentAsString();
+				return this.extractWuiSidFromBody(body);
 			}
+			throw new OpenemsException("Error while reading from Bosch BPT-S 5. Response code: " + status);
 		} catch (InterruptedException | ExecutionException | TimeoutException e) {
 			throw new OpenemsException(
 					"Unable to read from Bosch BPT-S 5. " + e.getClass().getSimpleName() + ": " + e.getMessage());
@@ -73,61 +68,55 @@ private String getWuiSidRequest() throws OpenemsNamedException {
 	}
 
 	private String extractWuiSidFromBody(String body) throws OpenemsException {
-		int index = body.indexOf("WUI_SID=");
-		
-		if(index < 0) {
-			throw new OpenemsException(
-					"Error while extracting WUI_SID. Body was= " + body);
+		var index = body.indexOf("WUI_SID=");
+
+		if (index < 0) {
+			throw new OpenemsException("Error while extracting WUI_SID. Body was= " + body);
 		}
-		
+
 		return body.substring(index + 9, index + 9 + 15);
 	}
 
 	public void retreiveValues() throws OpenemsException {
-		Request postRequest = httpClient.POST(BASE_URL+GET_VALUES_URL_PART+wui_sid);
+		var postRequest = this.httpClient.POST(BASE_URL + GET_VALUES_URL_PART + this.wui_sid);
 		postRequest.timeout(5, TimeUnit.SECONDS);
 		postRequest.header(HttpHeader.CONTENT_TYPE, "text/plain");
 		postRequest.content(new StringContentProvider(POST_REQUEST_DATA));
-		
+
 		ContentResponse response;
-		
+
 		try {
 			response = postRequest.send();
-			
-			int status = response.getStatus();
-			
-			if (status < 300) {
-				extractValuesFromAnswer(response.getContentAsString());
-			} else {
-				throw new OpenemsException(
-						"Error while reading from Bosch BPT-S 5. Response code: " + status);
+
+			var status = response.getStatus();
+
+			if (status >= 300) {
+				throw new OpenemsException("Error while reading from Bosch BPT-S 5. Response code: " + status);
 			}
+			this.extractValuesFromAnswer(response.getContentAsString());
 		} catch (InterruptedException | TimeoutException | ExecutionException | OpenemsNamedException e) {
 			throw new OpenemsException(
 					"Unable to read from Bosch BPT-S 5. " + e.getClass().getSimpleName() + ": " + e.getMessage());
 		}
 	}
-	
+
 	public int retreiveBatterieStatus() throws OpenemsException {
 		try {
-			ContentResponse response = httpClient.GET(BASE_URL+GET_VALUES_URL_PART+wui_sid+REQUEST_LOG_BOOK_VIEW);
-			
-			int status = response.getStatus();
-			if(status < 300) {
-				String content = response.getContentAsString();
-				Document document = Jsoup.parse(content);
-				Element tableNode = document.select("table").get(0);
-				Element firstRow = tableNode.select("tr").get(0);
-				String firstRowText = firstRow.text();
-				if(firstRowText.contains("Störung") && !firstRowText.contains("Keine")) {
-					return 1;
-				}
-				else {
-					return 0;
-				}
+			var response = this.httpClient.GET(BASE_URL + GET_VALUES_URL_PART + this.wui_sid + REQUEST_LOG_BOOK_VIEW);
+
+			var status = response.getStatus();
+			if (status >= 300) {
+				throw new OpenemsException("Error while reading from Bosch BPT-S 5. Response code: " + status);
+			}
+			var content = response.getContentAsString();
+			var document = Jsoup.parse(content);
+			var tableNode = document.select("table").get(0);
+			var firstRow = tableNode.select("tr").get(0);
+			var firstRowText = firstRow.text();
+			if (firstRowText.contains("Störung") && !firstRowText.contains("Keine")) {
+				return 1;
 			} else {
-				throw new OpenemsException(
-						"Error while reading from Bosch BPT-S 5. Response code: " + status);
+				return 0;
 			}
 		} catch (InterruptedException | ExecutionException | TimeoutException e) {
 			throw new OpenemsException(
@@ -136,77 +125,76 @@ public int retreiveBatterieStatus() throws OpenemsException {
 	}
 
 	private void extractValuesFromAnswer(String body) throws OpenemsNamedException {
-		if(body.contains("session invalid")) {
-			getWuiSidRequest();
+		if (body.contains("session invalid")) {
+			this.getWuiSidRequest();
 			return;
 		}
-		
-		String[] values = body.split("\\|");
-		
+
+		var values = body.split("\\|");
+
 //		pvLeistungProzent = Integer.valueOf(values[1]);
-		
-		pvLeistungWatt = parseWattValue(values[2]);
-		
-		soc = Integer.valueOf(values[3]);
-		
+
+		this.pvLeistungWatt = this.parseWattValue(values[2]);
+
+		this.soc = Integer.valueOf(values[3]);
+
 //		autarkieGrad = Float.valueOf(values[5]).floatValue();
-		
+
 //		currentOverallConsumption = parseWattValue(values[6]);
-		
+
 //		gridStatusString = values[7];
-				
+
 //		systemStatusString = values[9];
-		
-		batterieLadeStrom = parseWattValue(values[10]);
-		
-		einspeisung = parseWattValue(values[11]);
-		
-		verbrauchVonPv = parseWattValue(values[12]);
-		
-		verbrauchVonBatterie = parseWattValue(values[13]);
-		
-		if(values.length<15) {
-			strombezugAusNetz = 0;
-		}
-		else {
-			strombezugAusNetz = parseWattValue(values[14]);
+
+		this.batterieLadeStrom = this.parseWattValue(values[10]);
+
+		this.einspeisung = this.parseWattValue(values[11]);
+
+		this.verbrauchVonPv = this.parseWattValue(values[12]);
+
+		this.verbrauchVonBatterie = this.parseWattValue(values[13]);
+
+		if (values.length < 15) {
+			this.strombezugAusNetz = 0;
+		} else {
+			this.strombezugAusNetz = this.parseWattValue(values[14]);
 		}
 	}
-	
+
 	private Integer parseWattValue(String inputString) {
-		if(inputString.trim().length() == 0 || inputString.contains("nbsp;")) {
+		if (inputString.trim().length() == 0 || inputString.contains("nbsp;")) {
 			return Integer.valueOf(0);
 		}
-		
-		String wattString = inputString.replace("kW", " ").replace("von"," ").trim();
+
+		var wattString = inputString.replace("kW", " ").replace("von", " ").trim();
 		return Integer.valueOf((int) (Float.parseFloat(wattString) * 1000.0f));
 	}
 
 	public Integer getCurrentSoc() {
-		return soc;
+		return this.soc;
 	}
 
 	public Integer getCurrentChargePower() {
-		return batterieLadeStrom;
+		return this.batterieLadeStrom;
 	}
 
 	public Integer getCurrentStromAusNetz() {
-		return strombezugAusNetz;
+		return this.strombezugAusNetz;
 	}
 
 	public Integer getCurrentEinspeisung() {
-		return einspeisung;
+		return this.einspeisung;
 	}
 
 	public Integer getCurrentDischargePower() {
-		return verbrauchVonBatterie;
+		return this.verbrauchVonBatterie;
 	}
 
 	public Integer getCurrentPvProduction() {
-		return pvLeistungWatt;
+		return this.pvLeistungWatt;
 	}
-	
+
 	public Integer getCurrentVerbrauchVonPv() {
-		return verbrauchVonPv;
+		return this.verbrauchVonPv;
 	}
 }
diff --git a/io.openems.edge.bosch.bpts5hybrid/src/io/openems/edge/bosch/bpts5hybrid/core/BoschBpts5HybridCore.java b/io.openems.edge.bosch.bpts5hybrid/src/io/openems/edge/bosch/bpts5hybrid/core/BoschBpts5HybridCore.java
index 043e0553529..054ab6cf48b 100644
--- a/io.openems.edge.bosch.bpts5hybrid/src/io/openems/edge/bosch/bpts5hybrid/core/BoschBpts5HybridCore.java
+++ b/io.openems.edge.bosch.bpts5hybrid/src/io/openems/edge/bosch/bpts5hybrid/core/BoschBpts5HybridCore.java
@@ -20,9 +20,9 @@ public interface BoschBpts5HybridCore extends OpenemsComponent {
 	public void setMeter(BoschBpts5HybridMeter boschBpts5HybridMeter);
 
 	public Optional<BoschBpts5HybridEss> getEss();
-	
+
 	public Optional<BoschBpts5HybridPv> getPv();
-	
+
 	public Optional<BoschBpts5HybridMeter> getMeter();
 
 	public enum CoreChannelId implements io.openems.edge.common.channel.ChannelId {
@@ -42,7 +42,7 @@ public Doc doc() {
 
 	/**
 	 * Gets the Channel for {@link ChannelId#SLAVE_COMMUNICATION_FAILED}.
-	 * 
+	 *
 	 * @return the Channel
 	 */
 	public default StateChannel getSlaveCommunicationFailedChannel() {
@@ -52,7 +52,7 @@ public default StateChannel getSlaveCommunicationFailedChannel() {
 	/**
 	 * Gets the Slave Communication Failed State. See
 	 * {@link ChannelId#SLAVE_COMMUNICATION_FAILED}.
-	 * 
+	 *
 	 * @return the Channel {@link Value}
 	 */
 	public default Value<Boolean> getSlaveCommunicationFailed() {
@@ -62,7 +62,7 @@ public default Value<Boolean> getSlaveCommunicationFailed() {
 	/**
 	 * Internal method to set the 'nextValue' on
 	 * {@link ChannelId#SLAVE_COMMUNICATION_FAILED} Channel.
-	 * 
+	 *
 	 * @param value the next value
 	 */
 	public default void _setSlaveCommunicationFailed(boolean value) {
diff --git a/io.openems.edge.bosch.bpts5hybrid/src/io/openems/edge/bosch/bpts5hybrid/core/BoschBpts5HybridCoreImpl.java b/io.openems.edge.bosch.bpts5hybrid/src/io/openems/edge/bosch/bpts5hybrid/core/BoschBpts5HybridCoreImpl.java
index 89e7ca15c00..ffb31f1e378 100644
--- a/io.openems.edge.bosch.bpts5hybrid/src/io/openems/edge/bosch/bpts5hybrid/core/BoschBpts5HybridCoreImpl.java
+++ b/io.openems.edge.bosch.bpts5hybrid/src/io/openems/edge/bosch/bpts5hybrid/core/BoschBpts5HybridCoreImpl.java
@@ -41,9 +41,9 @@ public class BoschBpts5HybridCoreImpl extends AbstractOpenemsComponent
 
 	private BoschBpts5HybridReadWorker worker = null;
 
-	private AtomicReference<BoschBpts5HybridEss> ess = new AtomicReference<>();
-	private AtomicReference<BoschBpts5HybridPv> pv = new AtomicReference<>();
-	private AtomicReference<BoschBpts5HybridMeter> meter = new AtomicReference<>();
+	private final AtomicReference<BoschBpts5HybridEss> ess = new AtomicReference<>();
+	private final AtomicReference<BoschBpts5HybridPv> pv = new AtomicReference<>();
+	private final AtomicReference<BoschBpts5HybridMeter> meter = new AtomicReference<>();
 
 	public BoschBpts5HybridCoreImpl() {
 		super(//
@@ -58,6 +58,7 @@ void activate(ComponentContext context, Config config) throws ConfigurationExcep
 		this.worker.activate(config.id());
 	}
 
+	@Override
 	@Deactivate
 	protected void deactivate() {
 		if (this.worker != null) {
@@ -79,12 +80,14 @@ public void handleEvent(Event event) {
 		}
 	}
 
+	@Override
 	public void setEss(BoschBpts5HybridEss boschBpts5HybridEss) {
 		this.ess.set(boschBpts5HybridEss);
 	}
 
+	@Override
 	public Optional<BoschBpts5HybridEss> getEss() {
-		return Optional.ofNullable(ess.get());
+		return Optional.ofNullable(this.ess.get());
 	}
 
 	@Override
@@ -94,7 +97,7 @@ public void setPv(BoschBpts5HybridPv boschBpts5HybridPv) {
 
 	@Override
 	public Optional<BoschBpts5HybridPv> getPv() {
-		return Optional.ofNullable(pv.get());
+		return Optional.ofNullable(this.pv.get());
 	}
 
 	@Override
@@ -104,6 +107,6 @@ public void setMeter(BoschBpts5HybridMeter boschBpts5HybridMeter) {
 
 	@Override
 	public Optional<BoschBpts5HybridMeter> getMeter() {
-		return Optional.ofNullable(meter.get());
+		return Optional.ofNullable(this.meter.get());
 	}
 }
diff --git a/io.openems.edge.bosch.bpts5hybrid/src/io/openems/edge/bosch/bpts5hybrid/core/BoschBpts5HybridReadWorker.java b/io.openems.edge.bosch.bpts5hybrid/src/io/openems/edge/bosch/bpts5hybrid/core/BoschBpts5HybridReadWorker.java
index 35cbb2076a4..3c10bd22457 100644
--- a/io.openems.edge.bosch.bpts5hybrid/src/io/openems/edge/bosch/bpts5hybrid/core/BoschBpts5HybridReadWorker.java
+++ b/io.openems.edge.bosch.bpts5hybrid/src/io/openems/edge/bosch/bpts5hybrid/core/BoschBpts5HybridReadWorker.java
@@ -8,74 +8,70 @@
 import io.openems.common.exceptions.OpenemsException;
 import io.openems.common.worker.AbstractCycleWorker;
 
-public class BoschBpts5HybridReadWorker extends AbstractCycleWorker{
-	
+public class BoschBpts5HybridReadWorker extends AbstractCycleWorker {
+
 	private final Logger log = LoggerFactory.getLogger(BoschBpts5HybridReadWorker.class);
 	private final BoschBpts5HybridCoreImpl parent;
 	private final BoschBpts5HybridApiClient apiClient;
-	private int refreshIntervalSeconds;
+	private final int refreshIntervalSeconds;
 	private LocalDateTime refreshTime;
-	
+
 	public BoschBpts5HybridReadWorker(BoschBpts5HybridCoreImpl parent, String ipaddress, int interval) {
 		this.parent = parent;
 		this.refreshIntervalSeconds = interval;
 		this.apiClient = new BoschBpts5HybridApiClient(ipaddress);
 	}
-	
+
 	@Override
 	public void activate(String name) {
 		super.activate(name);
 		this.refreshTime = LocalDateTime.now();
 	}
-	
+
 	@Override
 	protected void forever() throws Throwable {
-		if (this.refreshTime.plusSeconds(refreshIntervalSeconds).isBefore(LocalDateTime.now())) {
+		if (this.refreshTime.plusSeconds(this.refreshIntervalSeconds).isBefore(LocalDateTime.now())) {
 			this.refreshTime = LocalDateTime.now();
-		
+
 			try {
 				this.apiClient.retreiveValues();
-				int batterieStatus = this.apiClient.retreiveBatterieStatus();
-				if(batterieStatus == 0) {
+				var batterieStatus = this.apiClient.retreiveBatterieStatus();
+				if (batterieStatus == 0) {
 					this.parent._setSlaveCommunicationFailed(false);
-				}
-				else {
+				} else {
 					this.parent._setSlaveCommunicationFailed(true);
 				}
 			} catch (OpenemsException e) {
-				log.error(e.getMessage());
+				this.log.error(e.getMessage());
 				this.parent._setSlaveCommunicationFailed(true);
 				this.apiClient.connect();
 				return;
 			}
 		}
-		
+
 		this.parent.getEss().ifPresent(ess -> {
-			if(this.apiClient.getCurrentDischargePower() > 0) {
-				ess._setActivePower(this.apiClient.getCurrentDischargePower() + this.apiClient.getCurrentVerbrauchVonPv());
-			}
-			else {
-				int currentDirectUsageOfPv = this.apiClient.getCurrentVerbrauchVonPv() + this.apiClient.getCurrentEinspeisung();
+			if (this.apiClient.getCurrentDischargePower() > 0) {
+				ess._setActivePower(
+						this.apiClient.getCurrentDischargePower() + this.apiClient.getCurrentVerbrauchVonPv());
+			} else {
+				var currentDirectUsageOfPv = this.apiClient.getCurrentVerbrauchVonPv()
+						+ this.apiClient.getCurrentEinspeisung();
 				ess._setActivePower(currentDirectUsageOfPv);
 			}
 			ess._setSoc(this.apiClient.getCurrentSoc());
 		});
-		
+
 		this.parent.getPv().ifPresent(pv -> {
 			pv._setActualPower(this.apiClient.getCurrentPvProduction());
 		});
-		
+
 		this.parent.getMeter().ifPresent(meter -> {
-			if(this.apiClient.getCurrentStromAusNetz() > 0) {
+			if (this.apiClient.getCurrentStromAusNetz() > 0) {
 				meter._setActivePower(this.apiClient.getCurrentStromAusNetz());
-			}
-			else {
-				if(this.apiClient.getCurrentEinspeisung() > 0) {
-					meter._setActivePower(-1 * this.apiClient.getCurrentEinspeisung());					
-				}
-				else{
-					meter._setActivePower(0);
-				}
+			} else if (this.apiClient.getCurrentEinspeisung() > 0) {
+				meter._setActivePower(-1 * this.apiClient.getCurrentEinspeisung());
+			} else {
+				meter._setActivePower(0);
 			}
 		});
 	}
diff --git a/io.openems.edge.bosch.bpts5hybrid/src/io/openems/edge/bosch/bpts5hybrid/core/Config.java b/io.openems.edge.bosch.bpts5hybrid/src/io/openems/edge/bosch/bpts5hybrid/core/Config.java
index 877e909cc2a..fd4a55e848e 100644
--- a/io.openems.edge.bosch.bpts5hybrid/src/io/openems/edge/bosch/bpts5hybrid/core/Config.java
+++ b/io.openems.edge.bosch.bpts5hybrid/src/io/openems/edge/bosch/bpts5hybrid/core/Config.java
@@ -3,7 +3,6 @@
 import org.osgi.service.metatype.annotations.AttributeDefinition;
 import org.osgi.service.metatype.annotations.ObjectClassDefinition;
 
-
 @ObjectClassDefinition(//
 		name = "Bosch BPT-S 5 Core", //
 		description = "Bosch BPT-S 5 Hybrid core component")
@@ -17,10 +16,10 @@
 
 	@AttributeDefinition(name = "Is enabled?", description = "Is this Component enabled?")
 	boolean enabled() default true;
-	
+
 	@AttributeDefinition(name = "IP-Address", description = "IPv4 address of the Bosch BPT-S 5 Hybrid")
 	String ipaddress() default "192.168.178.22";
-	
+
 	@AttributeDefinition(name = "Update Interval", description = "Update interval in seconds")
 	int interval() default 2;
 
diff --git a/io.openems.edge.bosch.bpts5hybrid/src/io/openems/edge/bosch/bpts5hybrid/ess/BoschBpts5HybridEss.java b/io.openems.edge.bosch.bpts5hybrid/src/io/openems/edge/bosch/bpts5hybrid/ess/BoschBpts5HybridEss.java
index efadd0a58f2..09981e3a4aa 100644
--- a/io.openems.edge.bosch.bpts5hybrid/src/io/openems/edge/bosch/bpts5hybrid/ess/BoschBpts5HybridEss.java
+++ b/io.openems.edge.bosch.bpts5hybrid/src/io/openems/edge/bosch/bpts5hybrid/ess/BoschBpts5HybridEss.java
@@ -49,7 +49,7 @@ public BoschBpts5HybridEss() {
 				SymmetricEss.ChannelId.values(), //
 				ChannelId.values() //
 		);
-		this._setCapacity(CAPACITY); // TODO: get from read worker
+		this._setCapacity(this.CAPACITY); // TODO: get from read worker
 	}
 
 	@Activate
@@ -64,6 +64,7 @@ void activate(ComponentContext context, Config config)
 		this.core.setEss(this);
 	}
 
+	@Override
 	@Deactivate
 	protected void deactivate() {
 		if (this.core != null) {
diff --git a/io.openems.edge.bosch.bpts5hybrid/src/io/openems/edge/bosch/bpts5hybrid/meter/BoschBpts5HybridMeter.java b/io.openems.edge.bosch.bpts5hybrid/src/io/openems/edge/bosch/bpts5hybrid/meter/BoschBpts5HybridMeter.java
index 203b7e19877..ee55f1e2584 100644
--- a/io.openems.edge.bosch.bpts5hybrid/src/io/openems/edge/bosch/bpts5hybrid/meter/BoschBpts5HybridMeter.java
+++ b/io.openems.edge.bosch.bpts5hybrid/src/io/openems/edge/bosch/bpts5hybrid/meter/BoschBpts5HybridMeter.java
@@ -34,24 +34,25 @@
 				EventConstants.EVENT_TOPIC + "=" + EdgeEventConstants.TOPIC_CYCLE_EXECUTE_WRITE //
 		} //
 )
-public class BoschBpts5HybridMeter extends AbstractOpenemsComponent implements SymmetricMeter, OpenemsComponent{
-	
+public class BoschBpts5HybridMeter extends AbstractOpenemsComponent implements SymmetricMeter, OpenemsComponent {
+
 	@Reference(policy = ReferencePolicy.STATIC, policyOption = ReferencePolicyOption.GREEDY, cardinality = ReferenceCardinality.MANDATORY)
 	private BoschBpts5HybridCore core;
-	
+
 	@Reference
 	private ConfigurationAdmin cm;
-	
+
 	public BoschBpts5HybridMeter() {
 		super(//
 				OpenemsComponent.ChannelId.values(), //
-				SymmetricMeter.ChannelId.values(),//
+				SymmetricMeter.ChannelId.values(), //
 				ChannelId.values() //
 		);
 	}
 
 	@Activate
-	void activate(ComponentContext context, Config config) throws OpenemsNamedException, ConfigurationException, IOException {
+	void activate(ComponentContext context, Config config)
+			throws OpenemsNamedException, ConfigurationException, IOException {
 		super.activate(context, config.id(), config.alias(), config.enabled());
 
 		// update filter for 'core'
@@ -60,7 +61,8 @@ void activate(ComponentContext context, Config config) throws OpenemsNamedExcept
 		}
 		this.core.setMeter(this);
 	}
-	
+
+	@Override
 	@Deactivate
 	protected void deactivate() {
 		if (this.core != null) {
diff --git a/io.openems.edge.bosch.bpts5hybrid/src/io/openems/edge/bosch/bpts5hybrid/pv/BoschBpts5HybridPv.java b/io.openems.edge.bosch.bpts5hybrid/src/io/openems/edge/bosch/bpts5hybrid/pv/BoschBpts5HybridPv.java
index 6d38cd186cb..da9c8e5727a 100644
--- a/io.openems.edge.bosch.bpts5hybrid/src/io/openems/edge/bosch/bpts5hybrid/pv/BoschBpts5HybridPv.java
+++ b/io.openems.edge.bosch.bpts5hybrid/src/io/openems/edge/bosch/bpts5hybrid/pv/BoschBpts5HybridPv.java
@@ -1,5 +1,7 @@
 package io.openems.edge.bosch.bpts5hybrid.pv;
 
+import java.io.IOException;
+
 import org.osgi.service.cm.ConfigurationAdmin;
 import org.osgi.service.cm.ConfigurationException;
 import org.osgi.service.component.ComponentContext;
@@ -22,8 +24,6 @@
 import io.openems.edge.common.event.EdgeEventConstants;
 import io.openems.edge.ess.dccharger.api.EssDcCharger;
 
-import java.io.IOException;
-
 @Designate(ocd = Config.class, factory = true)
 @Component(//
 		name = "Bosch.BPTS5Hybrid.Pv", //
@@ -33,27 +33,28 @@
 				EventConstants.EVENT_TOPIC + "=" + EdgeEventConstants.TOPIC_CYCLE_EXECUTE_WRITE //
 		} //
 )
-public class BoschBpts5HybridPv extends AbstractOpenemsComponent implements EssDcCharger, OpenemsComponent{
-	
+public class BoschBpts5HybridPv extends AbstractOpenemsComponent implements EssDcCharger, OpenemsComponent {
+
 	private final int PEAK_POWER = 5_500;
-	
+
 	@Reference(policy = ReferencePolicy.STATIC, policyOption = ReferencePolicyOption.GREEDY, cardinality = ReferenceCardinality.MANDATORY)
 	private BoschBpts5HybridCore core;
-	
+
 	@Reference
 	private ConfigurationAdmin cm;
-	
+
 	public BoschBpts5HybridPv() {
 		super(//
 				OpenemsComponent.ChannelId.values(), //
-				EssDcCharger.ChannelId.values(),//
+				EssDcCharger.ChannelId.values(), //
 				ChannelId.values() //
 		);
-		this._setMaxActualPower(PEAK_POWER); //TODO: get from read worker
+		this._setMaxActualPower(this.PEAK_POWER); // TODO: get from read worker
 	}
 
 	@Activate
-	void activate(ComponentContext context, Config config) throws OpenemsNamedException, ConfigurationException, IOException {
+	void activate(ComponentContext context, Config config)
+			throws OpenemsNamedException, ConfigurationException, IOException {
 		super.activate(context, config.id(), config.alias(), config.enabled());
 
 		// update filter for 'core'
@@ -62,7 +63,8 @@ void activate(ComponentContext context, Config config) throws OpenemsNamedExcept
 		}
 		this.core.setPv(this);
 	}
-	
+
+	@Override
 	@Deactivate
 	protected void deactivate() {
 		if (this.core != null) {
diff --git a/io.openems.edge.bosch.bpts5hybrid/test/io/openems/edge/bosch/bpts5hybrid/core/MyConfig.java b/io.openems.edge.bosch.bpts5hybrid/test/io/openems/edge/bosch/bpts5hybrid/core/MyConfig.java
index cedfbf17dfb..4dad9074be8 100644
--- a/io.openems.edge.bosch.bpts5hybrid/test/io/openems/edge/bosch/bpts5hybrid/core/MyConfig.java
+++ b/io.openems.edge.bosch.bpts5hybrid/test/io/openems/edge/bosch/bpts5hybrid/core/MyConfig.java
@@ -7,7 +7,6 @@ public class MyConfig extends AbstractComponentConfig implements Config {
 
 	public static class Builder {
 		private String id = null;
-		private String modbusId = null;
 		public String ipaddress;
 		public int interval;
 
@@ -36,7 +35,7 @@ public MyConfig build() {
 
 	/**
 	 * Create a Config builder.
-	 * 
+	 *
 	 * @return a {@link Builder}
 	 */
 	public static Builder create() {
diff --git a/io.openems.edge.bosch.bpts5hybrid/test/io/openems/edge/bosch/bpts5hybrid/ess/BoschBpts5HybridEssTest.java b/io.openems.edge.bosch.bpts5hybrid/test/io/openems/edge/bosch/bpts5hybrid/ess/BoschBpts5HybridEssTest.java
index 2cc138b0caf..6b452fa12b9 100644
--- a/io.openems.edge.bosch.bpts5hybrid/test/io/openems/edge/bosch/bpts5hybrid/ess/BoschBpts5HybridEssTest.java
+++ b/io.openems.edge.bosch.bpts5hybrid/test/io/openems/edge/bosch/bpts5hybrid/ess/BoschBpts5HybridEssTest.java
@@ -13,7 +13,7 @@ public class BoschBpts5HybridEssTest {
 
 	@Test
 	public void test() throws Exception {
-		BoschBpts5HybridCoreImpl core = new BoschBpts5HybridCoreImpl();
+		var core = new BoschBpts5HybridCoreImpl();
 		new ComponentTest(new BoschBpts5HybridCoreImpl()) //
 				.addReference("cm", new DummyConfigurationAdmin()) //
 				.activate(io.openems.edge.bosch.bpts5hybrid.core.MyConfig.create() //
diff --git a/io.openems.edge.bosch.bpts5hybrid/test/io/openems/edge/bosch/bpts5hybrid/ess/MyConfig.java b/io.openems.edge.bosch.bpts5hybrid/test/io/openems/edge/bosch/bpts5hybrid/ess/MyConfig.java
index 9bcff8f1db0..f749f6d8ed6 100644
--- a/io.openems.edge.bosch.bpts5hybrid/test/io/openems/edge/bosch/bpts5hybrid/ess/MyConfig.java
+++ b/io.openems.edge.bosch.bpts5hybrid/test/io/openems/edge/bosch/bpts5hybrid/ess/MyConfig.java
@@ -30,7 +30,7 @@ public MyConfig build() {
 
 	/**
 	 * Create a Config builder.
-	 * 
+	 *
 	 * @return a {@link Builder}
 	 */
 	public static Builder create() {
diff --git a/io.openems.edge.bosch.bpts5hybrid/test/io/openems/edge/bosch/bpts5hybrid/meter/BoschBpts5HybridMeterTest.java b/io.openems.edge.bosch.bpts5hybrid/test/io/openems/edge/bosch/bpts5hybrid/meter/BoschBpts5HybridMeterTest.java
index 066a955a29b..9faee25108c 100644
--- a/io.openems.edge.bosch.bpts5hybrid/test/io/openems/edge/bosch/bpts5hybrid/meter/BoschBpts5HybridMeterTest.java
+++ b/io.openems.edge.bosch.bpts5hybrid/test/io/openems/edge/bosch/bpts5hybrid/meter/BoschBpts5HybridMeterTest.java
@@ -13,7 +13,7 @@ public class BoschBpts5HybridMeterTest {
 
 	@Test
 	public void test() throws Exception {
-		BoschBpts5HybridCoreImpl core = new BoschBpts5HybridCoreImpl();
+		var core = new BoschBpts5HybridCoreImpl();
 		new ComponentTest(new BoschBpts5HybridCoreImpl()) //
 				.addReference("cm", new DummyConfigurationAdmin()) //
 				.activate(io.openems.edge.bosch.bpts5hybrid.core.MyConfig.create() //
diff --git a/io.openems.edge.bosch.bpts5hybrid/test/io/openems/edge/bosch/bpts5hybrid/meter/MyConfig.java b/io.openems.edge.bosch.bpts5hybrid/test/io/openems/edge/bosch/bpts5hybrid/meter/MyConfig.java
index d03ebf8e596..3dce8b0e8e3 100644
--- a/io.openems.edge.bosch.bpts5hybrid/test/io/openems/edge/bosch/bpts5hybrid/meter/MyConfig.java
+++ b/io.openems.edge.bosch.bpts5hybrid/test/io/openems/edge/bosch/bpts5hybrid/meter/MyConfig.java
@@ -30,7 +30,7 @@ public MyConfig build() {
 
 	/**
 	 * Create a Config builder.
-	 * 
+	 *
 	 * @return a {@link Builder}
 	 */
 	public static Builder create() {
diff --git a/io.openems.edge.bosch.bpts5hybrid/test/io/openems/edge/bosch/bpts5hybrid/pv/BoschBpts5HybridPvTest.java b/io.openems.edge.bosch.bpts5hybrid/test/io/openems/edge/bosch/bpts5hybrid/pv/BoschBpts5HybridPvTest.java
index 21b71389758..f85686dfe02 100644
--- a/io.openems.edge.bosch.bpts5hybrid/test/io/openems/edge/bosch/bpts5hybrid/pv/BoschBpts5HybridPvTest.java
+++ b/io.openems.edge.bosch.bpts5hybrid/test/io/openems/edge/bosch/bpts5hybrid/pv/BoschBpts5HybridPvTest.java
@@ -13,7 +13,7 @@ public class BoschBpts5HybridPvTest {
 
 	@Test
 	public void test() throws Exception {
-		BoschBpts5HybridCoreImpl core = new BoschBpts5HybridCoreImpl();
+		var core = new BoschBpts5HybridCoreImpl();
 		new ComponentTest(new BoschBpts5HybridCoreImpl()) //
 				.addReference("cm", new DummyConfigurationAdmin()) //
 				.activate(io.openems.edge.bosch.bpts5hybrid.core.MyConfig.create() //
diff --git a/io.openems.edge.bosch.bpts5hybrid/test/io/openems/edge/bosch/bpts5hybrid/pv/MyConfig.java b/io.openems.edge.bosch.bpts5hybrid/test/io/openems/edge/bosch/bpts5hybrid/pv/MyConfig.java
index 69e0d65e4e2..3c834f3da4e 100644
--- a/io.openems.edge.bosch.bpts5hybrid/test/io/openems/edge/bosch/bpts5hybrid/pv/MyConfig.java
+++ b/io.openems.edge.bosch.bpts5hybrid/test/io/openems/edge/bosch/bpts5hybrid/pv/MyConfig.java
@@ -30,7 +30,7 @@ public MyConfig build() {
 
 	/**
 	 * Create a Config builder.
-	 * 
+	 *
 	 * @return a {@link Builder}
 	 */
 	public static Builder create() {

From d2f733d272e90f1259960f099c75ab86e0889229 Mon Sep 17 00:00:00 2001
From: Stefan Feilmeier <stefan.feilmeier@fenecon.de>
Date: Sun, 6 Mar 2022 21:42:25 +0100
Subject: [PATCH 07/96] Update io.openems.edge.bridge.mbus

---
 .../src/io/openems/edge/bridge/mbus/BridgeMbusImpl.java   | 7 ++++---
 .../bridge/mbus/api/AbstractOpenemsMbusComponent.java     | 4 ++--
 .../edge/bridge/mbus/api/ChannelDataRecordMapper.java     | 6 +++---
 .../io/openems/edge/bridge/mbus/api/ChannelRecord.java    | 8 ++++----
 4 files changed, 13 insertions(+), 12 deletions(-)

diff --git a/io.openems.edge.bridge.mbus/src/io/openems/edge/bridge/mbus/BridgeMbusImpl.java b/io.openems.edge.bridge.mbus/src/io/openems/edge/bridge/mbus/BridgeMbusImpl.java
index b4997cd5e55..454df6d2eb0 100644
--- a/io.openems.edge.bridge.mbus/src/io/openems/edge/bridge/mbus/BridgeMbusImpl.java
+++ b/io.openems.edge.bridge.mbus/src/io/openems/edge/bridge/mbus/BridgeMbusImpl.java
@@ -7,7 +7,6 @@
 import org.openmuc.jmbus.DecodingException;
 import org.openmuc.jmbus.MBusConnection;
 import org.openmuc.jmbus.MBusConnection.MBusSerialBuilder;
-import org.openmuc.jmbus.VariableDataStructure;
 import org.osgi.service.component.ComponentContext;
 import org.osgi.service.component.annotations.Activate;
 import org.osgi.service.component.annotations.Component;
@@ -61,6 +60,7 @@ protected void activate(ComponentContext context, Config config) {
 		this.builder = MBusConnection.newSerialBuilder(this.portName).setBaudrate(config.baudrate());
 	}
 
+	@Override
 	@Deactivate
 	protected void deactivate() {
 		super.deactivate();
@@ -80,6 +80,7 @@ public void handleEvent(Event event) {
 		}
 	}
 
+	@Override
 	public MBusConnection getmBusConnection() {
 		return this.mBusConnection;
 	}
@@ -94,7 +95,7 @@ protected void forever() throws OpenemsException, DecodingException {
 
 				for (MbusTask task : BridgeMbusImpl.this.tasks.values()) {
 					try {
-						VariableDataStructure data = task.getRequest();
+						var data = task.getRequest();
 						data.decode();
 						// "Before accessing elements of a variable data structure it has to be decoded
 						// using the decode method." ??
@@ -107,7 +108,7 @@ protected void forever() throws OpenemsException, DecodingException {
 				BridgeMbusImpl.this.mBusConnection.close();
 			} catch (IOException e) {
 				BridgeMbusImpl.this.logError(BridgeMbusImpl.this.log,
-						"Connection via [" + portName + "] failed: " + e.getMessage());
+						"Connection via [" + BridgeMbusImpl.this.portName + "] failed: " + e.getMessage());
 			}
 		}
 	}
diff --git a/io.openems.edge.bridge.mbus/src/io/openems/edge/bridge/mbus/api/AbstractOpenemsMbusComponent.java b/io.openems.edge.bridge.mbus/src/io/openems/edge/bridge/mbus/api/AbstractOpenemsMbusComponent.java
index 46aa10779f9..136b6eddee7 100644
--- a/io.openems.edge.bridge.mbus/src/io/openems/edge/bridge/mbus/api/AbstractOpenemsMbusComponent.java
+++ b/io.openems.edge.bridge.mbus/src/io/openems/edge/bridge/mbus/api/AbstractOpenemsMbusComponent.java
@@ -11,7 +11,7 @@
 
 public abstract class AbstractOpenemsMbusComponent extends AbstractOpenemsComponent {
 
-	protected final List<ChannelRecord> channelDataRecordsList = new ArrayList<ChannelRecord>();
+	protected final List<ChannelRecord> channelDataRecordsList = new ArrayList<>();
 
 	private Integer primaryAddress = null;
 
@@ -30,7 +30,7 @@ public Integer getPrimaryAddress() {
 
 	/**
 	 * Call this method from Component implementations activate().
-	 * 
+	 *
 	 * @param context        ComponentContext of this component. Receive it from
 	 *                       parameter for @Activate
 	 * @param id             ID of this component. Typically 'config.id()'
diff --git a/io.openems.edge.bridge.mbus/src/io/openems/edge/bridge/mbus/api/ChannelDataRecordMapper.java b/io.openems.edge.bridge.mbus/src/io/openems/edge/bridge/mbus/api/ChannelDataRecordMapper.java
index a77d5635817..b29a514d949 100644
--- a/io.openems.edge.bridge.mbus/src/io/openems/edge/bridge/mbus/api/ChannelDataRecordMapper.java
+++ b/io.openems.edge.bridge.mbus/src/io/openems/edge/bridge/mbus/api/ChannelDataRecordMapper.java
@@ -17,13 +17,13 @@ public ChannelDataRecordMapper(VariableDataStructure data, List<ChannelRecord> c
 		this.channelDataRecordsList = channelDataRecordsList;
 
 		for (ChannelRecord channelRecord : channelDataRecordsList) {
-			mapDataToChannel(data, channelRecord.getdataRecordPosition(), channelRecord.getChannel(),
+			this.mapDataToChannel(data, channelRecord.getdataRecordPosition(), channelRecord.getChannel(),
 					channelRecord.getDataType());
 		}
 	}
 
 	public VariableDataStructure getData() {
-		return data;
+		return this.data;
 	}
 
 	public void setData(VariableDataStructure data) {
@@ -31,7 +31,7 @@ public void setData(VariableDataStructure data) {
 	}
 
 	public List<ChannelRecord> getChannelDataRecordsList() {
-		return channelDataRecordsList;
+		return this.channelDataRecordsList;
 	}
 
 	public void setChannelDataRecordsList(List<ChannelRecord> channelDataRecordsList) {
diff --git a/io.openems.edge.bridge.mbus/src/io/openems/edge/bridge/mbus/api/ChannelRecord.java b/io.openems.edge.bridge.mbus/src/io/openems/edge/bridge/mbus/api/ChannelRecord.java
index d26f5bc1d44..88468734dc6 100644
--- a/io.openems.edge.bridge.mbus/src/io/openems/edge/bridge/mbus/api/ChannelRecord.java
+++ b/io.openems.edge.bridge.mbus/src/io/openems/edge/bridge/mbus/api/ChannelRecord.java
@@ -16,7 +16,7 @@ public enum DataType {
 	/**
 	 * In this case you will request secondary address values. eg. manufacturer,
 	 * device id or meter type.
-	 * 
+	 *
 	 * @param channel  the Channel
 	 * @param dataType the dataType
 	 */
@@ -27,7 +27,7 @@ public ChannelRecord(Channel<?> channel, DataType dataType) {
 
 	/**
 	 * In this case you will request usage data.
-	 * 
+	 *
 	 * @param channel            the Channel
 	 * @param dataRecordPosition the dataRecordPosition
 	 */
@@ -37,7 +37,7 @@ public ChannelRecord(Channel<?> channel, int dataRecordPosition) {
 	}
 
 	public Channel<?> getChannel() {
-		return channel;
+		return this.channel;
 	}
 
 	public void setChannelId(Channel<?> channel) {
@@ -45,7 +45,7 @@ public void setChannelId(Channel<?> channel) {
 	}
 
 	public int getdataRecordPosition() {
-		return dataRecordPosition;
+		return this.dataRecordPosition;
 	}
 
 	public void setdataRecordPosition(int dataRecordPosition) {

From b587c224481dd5ba8b417192607b7c83d31aefee Mon Sep 17 00:00:00 2001
From: Stefan Feilmeier <stefan.feilmeier@fenecon.de>
Date: Sun, 6 Mar 2022 21:47:12 +0100
Subject: [PATCH 08/96] Update io.openems.edge.bridge.modbus

---
 .../bridge/modbus/BridgeModbusSerialImpl.java |   9 +-
 .../bridge/modbus/BridgeModbusTcpImpl.java    |  10 +-
 .../modbus/api/AbstractModbusBridge.java      |  15 +-
 .../api/AbstractOpenemsModbusComponent.java   |  78 +++---
 .../edge/bridge/modbus/api/BridgeModbus.java  |  16 +-
 .../bridge/modbus/api/BridgeModbusSerial.java |  10 +-
 .../bridge/modbus/api/BridgeModbusTcp.java    |   2 +-
 .../bridge/modbus/api/ChannelMetaInfo.java    |   6 +-
 .../bridge/modbus/api/ChannelMetaInfoBit.java |   6 +-
 .../api/ChannelMetaInfoReadAndWrite.java      |   6 +-
 .../modbus/api/ChannelToElementConverter.java |  28 +-
 .../modbus/api/ElementToChannelConverter.java |  36 ++-
 .../api/ElementToChannelConverterChain.java   |   8 +-
 .../api/ElementToChannelOffsetConverter.java  |  32 +--
 .../ElementToChannelScaleFactorConverter.java |  35 +--
 .../bridge/modbus/api/ModbusComponent.java    |   8 +-
 .../bridge/modbus/api/ModbusProtocol.java     |  22 +-
 .../edge/bridge/modbus/api/ModbusUtils.java   |  17 +-
 .../edge/bridge/modbus/api/ModbusWorker.java  |  79 +++---
 .../element/AbstractDoubleWordElement.java    |  23 +-
 .../api/element/AbstractModbusElement.java    |  17 +-
 .../AbstractModbusRegisterElement.java        |  25 +-
 .../element/AbstractQuadrupleWordElement.java |  18 +-
 .../api/element/AbstractWordElement.java      |  14 +-
 .../modbus/api/element/BitsWordElement.java   |  54 ++--
 .../modbus/api/element/CoilElement.java       |   5 +-
 .../modbus/api/element/DummyCoilElement.java  |   1 -
 .../api/element/DummyRegisterElement.java     |   6 +-
 .../api/element/FloatDoublewordElement.java   |   6 +-
 .../element/FloatQuadruplewordElement.java    |   6 +-
 .../modbus/api/element/ModbusCoilElement.java |  10 +-
 .../modbus/api/element/ModbusElement.java     |  16 +-
 .../api/element/ModbusRegisterElement.java    |  10 +-
 .../api/element/SignedDoublewordElement.java  |   6 +-
 .../element/SignedQuadruplewordElement.java   |   6 +-
 .../modbus/api/element/SignedWordElement.java |   4 +-
 .../modbus/api/element/StringWordElement.java |  23 +-
 .../element/UnsignedDoublewordElement.java    |   2 +
 .../element/UnsignedQuadruplewordElement.java |   2 +
 .../api/element/UnsignedWordElement.java      |   2 +
 .../bridge/modbus/api/element/WordOrder.java  |   2 +-
 .../task/AbstractReadDigitalInputsTask.java   |   6 +-
 .../task/AbstractReadInputRegistersTask.java  |   4 +-
 .../modbus/api/task/AbstractReadTask.java     |  33 ++-
 .../bridge/modbus/api/task/AbstractTask.java  |  23 +-
 .../api/task/FC16WriteRegistersTask.java      |  32 +--
 .../modbus/api/task/FC1ReadCoilsTask.java     |   4 +-
 .../modbus/api/task/FC2ReadInputsTask.java    |   4 +-
 .../modbus/api/task/FC3ReadRegistersTask.java |   9 +-
 .../api/task/FC4ReadInputRegistersTask.java   |   9 +-
 .../modbus/api/task/FC5WriteCoilTask.java     |  13 +-
 .../modbus/api/task/FC6WriteRegisterTask.java |  19 +-
 .../edge/bridge/modbus/api/task/Task.java     |  16 +-
 .../edge/bridge/modbus/api/task/Utils.java    |  26 +-
 .../edge/bridge/modbus/api/task/WaitTask.java |   2 +-
 .../bridge/modbus/api/task/WriteTask.java     |   3 +-
 .../AbstractOpenemsSunSpecComponent.java      |  78 +++---
 .../modbus/sunspec/DefaultSunSpecModel.java   | 264 +++++++++---------
 .../modbus/sunspec/SunSpecCodeGenerator.java  | 249 ++++++++---------
 .../bridge/modbus/sunspec/SunSpecModel.java   |   8 +-
 .../bridge/modbus/sunspec/SunSpecPoint.java   |  22 +-
 .../modbus/BridgeModbusTcpImplTest.java       |  14 +-
 .../bridge/modbus/DummyModbusComponent.java   |   6 +-
 .../bridge/modbus/ModbusSlaveSimulator.java   |   7 +-
 .../edge/bridge/modbus/MyConfigSerial.java    |   2 +-
 .../edge/bridge/modbus/MyConfigTcp.java       |   2 +-
 .../bridge/modbus/api/ConversionTest.java     |   4 +-
 .../bridge/modbus/api/task/UtilsTest.java     |  12 +-
 68 files changed, 765 insertions(+), 787 deletions(-)

diff --git a/io.openems.edge.bridge.modbus/src/io/openems/edge/bridge/modbus/BridgeModbusSerialImpl.java b/io.openems.edge.bridge.modbus/src/io/openems/edge/bridge/modbus/BridgeModbusSerialImpl.java
index c34b61bcdbc..1660f9dd48d 100644
--- a/io.openems.edge.bridge.modbus/src/io/openems/edge/bridge/modbus/BridgeModbusSerialImpl.java
+++ b/io.openems.edge.bridge.modbus/src/io/openems/edge/bridge/modbus/BridgeModbusSerialImpl.java
@@ -91,6 +91,7 @@ void activate(ComponentContext context, ConfigSerial config) {
 		this.parity = config.parity();
 	}
 
+	@Override
 	@Deactivate
 	protected void deactivate() {
 		super.deactivate();
@@ -111,8 +112,8 @@ public void closeModbusConnection() {
 
 	@Override
 	public ModbusTransaction getNewModbusTransaction() throws OpenemsException {
-		SerialConnection connection = this.getModbusConnection();
-		ModbusSerialTransaction transaction = new ModbusSerialTransaction(connection);
+		var connection = this.getModbusConnection();
+		var transaction = new ModbusSerialTransaction(connection);
 		transaction.setRetries(AbstractModbusBridge.DEFAULT_RETRIES);
 		return transaction;
 	}
@@ -124,7 +125,7 @@ private synchronized SerialConnection getModbusConnection() throws OpenemsExcept
 			/*
 			 * create new connection
 			 */
-			SerialParameters params = new SerialParameters();
+			var params = new SerialParameters();
 			params.setPortName(this.portName);
 			params.setBaudRate(this.baudrate);
 			params.setDatabits(this.databits);
@@ -132,7 +133,7 @@ private synchronized SerialConnection getModbusConnection() throws OpenemsExcept
 			params.setParity(this.parity.getValue());
 			params.setEncoding(Modbus.SERIAL_ENCODING_RTU);
 			params.setEcho(false);
-			SerialConnection connection = new SerialConnection(params);
+			var connection = new SerialConnection(params);
 			this._connection = connection;
 		}
 		if (!this._connection.isOpen()) {
diff --git a/io.openems.edge.bridge.modbus/src/io/openems/edge/bridge/modbus/BridgeModbusTcpImpl.java b/io.openems.edge.bridge.modbus/src/io/openems/edge/bridge/modbus/BridgeModbusTcpImpl.java
index 6b82fcfd90f..813be89f7c1 100644
--- a/io.openems.edge.bridge.modbus/src/io/openems/edge/bridge/modbus/BridgeModbusTcpImpl.java
+++ b/io.openems.edge.bridge.modbus/src/io/openems/edge/bridge/modbus/BridgeModbusTcpImpl.java
@@ -65,6 +65,7 @@ protected void activate(ComponentContext context, ConfigTcp config) throws Unkno
 		this.port = config.port();
 	}
 
+	@Override
 	@Deactivate
 	protected void deactivate() {
 		super.deactivate();
@@ -85,8 +86,8 @@ public void closeModbusConnection() {
 
 	@Override
 	public ModbusTransaction getNewModbusTransaction() throws OpenemsException {
-		TCPMasterConnection connection = this.getModbusConnection();
-		ModbusTCPTransaction transaction = new ModbusTCPTransaction(connection);
+		var connection = this.getModbusConnection();
+		var transaction = new ModbusTCPTransaction(connection);
 		transaction.setRetries(AbstractModbusBridge.DEFAULT_RETRIES);
 		return transaction;
 	}
@@ -98,7 +99,7 @@ private synchronized TCPMasterConnection getModbusConnection() throws OpenemsExc
 			/*
 			 * create new connection
 			 */
-			TCPMasterConnection connection = new TCPMasterConnection(this.getIpAddress());
+			var connection = new TCPMasterConnection(this.getIpAddress());
 			connection.setPort(this.port);
 			this._connection = connection;
 		}
@@ -114,8 +115,9 @@ private synchronized TCPMasterConnection getModbusConnection() throws OpenemsExc
 		return this._connection;
 	}
 
+	@Override
 	public InetAddress getIpAddress() {
-		return ipAddress;
+		return this.ipAddress;
 	}
 
 	public void setIpAddress(InetAddress ipAddress) {
diff --git a/io.openems.edge.bridge.modbus/src/io/openems/edge/bridge/modbus/api/AbstractModbusBridge.java b/io.openems.edge.bridge.modbus/src/io/openems/edge/bridge/modbus/api/AbstractModbusBridge.java
index a735044f333..74b68106c99 100644
--- a/io.openems.edge.bridge.modbus/src/io/openems/edge/bridge/modbus/api/AbstractModbusBridge.java
+++ b/io.openems.edge.bridge.modbus/src/io/openems/edge/bridge/modbus/api/AbstractModbusBridge.java
@@ -19,7 +19,7 @@ public abstract class AbstractModbusBridge extends AbstractOpenemsComponent impl
 
 	/**
 	 * Default Modbus timeout in [ms].
-	 * 
+	 *
 	 * <p>
 	 * Modbus library default is 3000 ms
 	 */
@@ -27,7 +27,7 @@ public abstract class AbstractModbusBridge extends AbstractOpenemsComponent impl
 
 	/**
 	 * Default Modbus retries.
-	 * 
+	 *
 	 * <p>
 	 * Modbus library default is 5
 	 */
@@ -55,6 +55,7 @@ protected void activate(ComponentContext context, String id, String alias, boole
 		}
 	}
 
+	@Override
 	protected void deactivate() {
 		super.deactivate();
 		this.worker.deactivate();
@@ -65,19 +66,21 @@ protected void deactivate() {
 
 	/**
 	 * Adds the protocol.
-	 * 
+	 *
 	 * @param sourceId Component-ID of the source
 	 * @param protocol the ModbusProtocol
 	 */
+	@Override
 	public void addProtocol(String sourceId, ModbusProtocol protocol) {
 		this.worker.addProtocol(sourceId, protocol);
 	}
 
 	/**
 	 * Removes the protocol.
-	 * 
+	 *
 	 * @param sourceId Component-ID of the source
 	 */
+	@Override
 	public void removeProtocol(String sourceId) {
 		this.worker.removeProtocol(sourceId);
 	}
@@ -99,7 +102,7 @@ public void handleEvent(Event event) {
 
 	/**
 	 * Creates a new Modbus Transaction on an open Modbus connection.
-	 * 
+	 *
 	 * @return the Modbus Transaction
 	 * @throws OpenemsException on error
 	 */
@@ -131,7 +134,7 @@ protected void logError(Logger log, String message) {
 
 	/**
 	 * After how many errors should a element be invalidated?.
-	 * 
+	 *
 	 * @return value
 	 */
 	public int invalidateElementsAfterReadErrors() {
diff --git a/io.openems.edge.bridge.modbus/src/io/openems/edge/bridge/modbus/api/AbstractOpenemsModbusComponent.java b/io.openems.edge.bridge.modbus/src/io/openems/edge/bridge/modbus/api/AbstractOpenemsModbusComponent.java
index ea893270706..20f2e224c44 100644
--- a/io.openems.edge.bridge.modbus/src/io/openems/edge/bridge/modbus/api/AbstractOpenemsModbusComponent.java
+++ b/io.openems.edge.bridge.modbus/src/io/openems/edge/bridge/modbus/api/AbstractOpenemsModbusComponent.java
@@ -39,20 +39,20 @@ public abstract class AbstractOpenemsModbusComponent extends AbstractOpenemsComp
 
 	/**
 	 * Default constructor for AbstractOpenemsModbusComponent.
-	 * 
+	 *
 	 * <p>
 	 * Automatically initializes (i.e. creates {@link Channel} instances for each
 	 * given ChannelId using the Channel-{@link Doc}.
-	 * 
+	 *
 	 * <p>
 	 * It is important to list all Channel-ID enums of all inherited
 	 * OpenEMS-Natures, i.e. for every OpenEMS Java interface you are implementing,
 	 * you need to list the interface' ChannelID-enum here like
 	 * Interface.ChannelId.values().
-	 * 
+	 *
 	 * <p>
 	 * Use as follows:
-	 * 
+	 *
 	 * <pre>
 	 * public YourPhantasticOpenemsComponent() {
 	 * 	super(//
@@ -60,17 +60,17 @@ public abstract class AbstractOpenemsModbusComponent extends AbstractOpenemsComp
 	 * 			YourPhantasticOpenemsComponent.ChannelId.values());
 	 * }
 	 * </pre>
-	 * 
+	 *
 	 * <p>
 	 * Note: the separation in firstInitialChannelIds and furtherInitialChannelIds
 	 * is only there to enforce that calling the constructor cannot be forgotten.
 	 * This way it needs to be called with at least one parameter - which is always
 	 * at least "OpenemsComponent.ChannelId.values()". Just use it as if it was:
-	 * 
+	 *
 	 * <pre>
 	 * AbstractOpenemsComponent(ChannelId[]... channelIds)
 	 * </pre>
-	 * 
+	 *
 	 * @param firstInitialChannelIds   the Channel-IDs to initialize.
 	 * @param furtherInitialChannelIds the Channel-IDs to initialize.
 	 */
@@ -85,7 +85,7 @@ protected void activate(String id) {
 
 	/**
 	 * Call this method from Component implementations activate().
-	 * 
+	 *
 	 * @param context         ComponentContext of this component. Receive it from
 	 *                        parameter for @Activate
 	 * @param id              ID of this component. Typically 'config.id()'
@@ -116,7 +116,7 @@ protected boolean activate(ComponentContext context, String id, String alias, bo
 			return true;
 		}
 		this.unitId = unitId;
-		BridgeModbus modbus = this.modbus.get();
+		var modbus = this.modbus.get();
 		if (this.isEnabled() && modbus != null) {
 			modbus.addProtocol(this.id(), this.getModbusProtocol());
 		}
@@ -130,7 +130,7 @@ protected void activate(ComponentContext context, String id, String alias, boole
 
 	/**
 	 * Call this method from Component implementations activate().
-	 * 
+	 *
 	 * @param context         ComponentContext of this component. Receive it from
 	 *                        parameter for @Activate
 	 * @param id              ID of this component. Typically 'config.id()'
@@ -158,7 +158,7 @@ protected boolean modified(ComponentContext context, String id, String alias, bo
 			return true;
 		}
 		this.unitId = unitId;
-		BridgeModbus modbus = this.modbus.get();
+		var modbus = this.modbus.get();
 		modbus.removeProtocol(this.id());
 		if (this.isEnabled() && modbus != null) {
 			modbus.addProtocol(this.id(), this.getModbusProtocol());
@@ -174,7 +174,7 @@ protected void modified(ComponentContext context, String id, String alias, boole
 	@Override
 	protected void deactivate() {
 		super.deactivate();
-		BridgeModbus modbus = this.modbus.getAndSet(null);
+		var modbus = this.modbus.getAndSet(null);
 		if (modbus != null) {
 			modbus.removeProtocol(this.id());
 		}
@@ -182,18 +182,18 @@ protected void deactivate() {
 
 	/**
 	 * Gets the Modbus Unit-ID.
-	 * 
+	 *
 	 * @return the Modbus Unit-ID
 	 */
 	public Integer getUnitId() {
 		return this.unitId;
 	}
 
-	private AtomicReference<BridgeModbus> modbus = new AtomicReference<BridgeModbus>(null);
+	private final AtomicReference<BridgeModbus> modbus = new AtomicReference<>(null);
 
 	/**
 	 * Set the Modbus bridge. Should be called by @Reference
-	 * 
+	 *
 	 * @param modbus the BridgeModbus Reference
 	 */
 	protected void setModbus(BridgeModbus modbus) {
@@ -202,7 +202,7 @@ protected void setModbus(BridgeModbus modbus) {
 
 	/**
 	 * Unset the Modbus bridge. Should be called by @Reference
-	 * 
+	 *
 	 * @param modbus the BridgeModbus Reference
 	 */
 	protected void unsetModbus(BridgeModbus modbus) {
@@ -214,7 +214,7 @@ protected void unsetModbus(BridgeModbus modbus) {
 
 	/**
 	 * Gets the Modbus-Bridge.
-	 * 
+	 *
 	 * @return the {@link BridgeModbus} - either {@link BridgeModbusSerial} or
 	 *         {@link BridgeModbusTcp}
 	 */
@@ -225,12 +225,12 @@ public BridgeModbus getBridgeModbus() {
 	/**
 	 * Gets the {@link ModbusProtocol}. Creates it via
 	 * {@link #defineModbusProtocol()} if it does not yet exist.
-	 * 
+	 *
 	 * @return the {@link ModbusProtocol}
 	 * @throws OpenemsException on error
 	 */
 	protected ModbusProtocol getModbusProtocol() throws OpenemsException {
-		ModbusProtocol protocol = this.protocol;
+		var protocol = this.protocol;
 		if (protocol != null) {
 			return protocol;
 		}
@@ -240,7 +240,7 @@ protected ModbusProtocol getModbusProtocol() throws OpenemsException {
 
 	/**
 	 * Defines the Modbus protocol.
-	 * 
+	 *
 	 * @return the ModbusProtocol
 	 * @throws OpenemsException on error
 	 */
@@ -253,7 +253,7 @@ protected ModbusProtocol getModbusProtocol() throws OpenemsException {
 	public class ChannelMapper<T extends AbstractModbusElement<?>> {
 
 		private final T element;
-		private Map<Channel<?>, ElementToChannelConverter> channelMaps = new HashMap<>();
+		private final Map<Channel<?>, ElementToChannelConverter> channelMaps = new HashMap<>();
 
 		public ChannelMapper(T element) {
 			this.element = element;
@@ -261,19 +261,19 @@ public ChannelMapper(T element) {
 
 		/**
 		 * Maps the given element 1-to-1 to the Channel identified by channelId.
-		 * 
+		 *
 		 * @param channelId the Channel-ID
 		 * @param converter the {@link ElementToChannelConverter}
 		 * @return the element parameter
 		 */
 		public ChannelMapper<T> m(io.openems.edge.common.channel.ChannelId channelId,
 				ElementToChannelConverter converter) {
-			return this.m(channelId, converter, new ChannelMetaInfo(element.getStartAddress()));
+			return this.m(channelId, converter, new ChannelMetaInfo(this.element.getStartAddress()));
 		}
 
 		/**
 		 * Maps the given element 1-to-1 to the Channel identified by channelId.
-		 * 
+		 *
 		 * @param channelId       the Channel-ID
 		 * @param converter       the {@link ElementToChannelConverter}
 		 * @param channelMetaInfo an object that holds meta information about the
@@ -282,7 +282,7 @@ public ChannelMapper<T> m(io.openems.edge.common.channel.ChannelId channelId,
 		 */
 		public ChannelMapper<T> m(io.openems.edge.common.channel.ChannelId channelId,
 				ElementToChannelConverter converter, ChannelMetaInfo channelMetaInfo) {
-			Channel<?> channel = channel(channelId);
+			Channel<?> channel = AbstractOpenemsModbusComponent.this.channel(channelId);
 			channel.setMetaInfo(channelMetaInfo);
 			this.channelMaps.put(channel, converter);
 			return this;
@@ -291,7 +291,7 @@ public ChannelMapper<T> m(io.openems.edge.common.channel.ChannelId channelId,
 		/**
 		 * Maps the given element to the Channel identified by channelId, applying the
 		 * given @link{ElementToChannelConverter}.
-		 * 
+		 *
 		 * @param channelId        the Channel-ID
 		 * @param elementToChannel the Element-To-Channel converter function for
 		 *                         {@link ReadTask}s
@@ -301,13 +301,13 @@ public ChannelMapper<T> m(io.openems.edge.common.channel.ChannelId channelId,
 		 */
 		public ChannelMapper<T> m(io.openems.edge.common.channel.ChannelId channelId,
 				Function<Object, Object> elementToChannel, Function<Object, Object> channelToElement) {
-			ElementToChannelConverter converter = new ElementToChannelConverter(elementToChannel, channelToElement);
+			var converter = new ElementToChannelConverter(elementToChannel, channelToElement);
 			return this.m(channelId, converter);
 		}
 
 		/**
 		 * Builds the {@link ChannelMapper}.
-		 * 
+		 *
 		 * @return the {@link ChannelMapper}
 		 */
 		public T build() {
@@ -337,8 +337,8 @@ public T build() {
 				if (channel instanceof WriteChannel<?>) {
 					((WriteChannel<?>) channel).onSetNextWrite(value -> {
 						// dynamically get the Converter; this allows the converter to be changed
-						ElementToChannelConverter converter = this.channelMaps.get(channel);
-						Object convertedValue = converter.channelToElement(value);
+						var converter = this.channelMaps.get(channel);
+						var convertedValue = converter.channelToElement(value);
 						if (this.element instanceof ModbusRegisterElement) {
 							try {
 								((ModbusRegisterElement<?>) this.element)
@@ -380,18 +380,18 @@ public T build() {
 	/**
 	 * Creates a ChannelMapper that can be used with builder pattern inside the
 	 * protocol definition.
-	 * 
+	 *
 	 * @param <T>     the type of the {@link AbstractModbusElement}d
 	 * @param element the ModbusElement
 	 * @return a {@link ChannelMapper}
 	 */
 	protected final <T extends AbstractModbusElement<?>> ChannelMapper<T> m(T element) {
-		return new ChannelMapper<T>(element);
+		return new ChannelMapper<>(element);
 	}
 
 	/**
 	 * Maps the given BitsWordElement.
-	 * 
+	 *
 	 * @param bitsWordElement the ModbusElement
 	 * @return the element parameter
 	 */
@@ -401,7 +401,7 @@ protected final AbstractModbusElement<?> m(BitsWordElement bitsWordElement) {
 
 	/**
 	 * Maps the given element 1-to-1 to the Channel identified by channelId.
-	 * 
+	 *
 	 * @param <T>       the type of the {@link AbstractModbusElement}d
 	 * @param channelId the Channel-ID
 	 * @param element   the ModbusElement
@@ -414,7 +414,7 @@ protected final <T extends AbstractModbusElement<?>> T m(io.openems.edge.common.
 
 	/**
 	 * Maps the given element 1-to-1 to the Channel identified by channelId.
-	 * 
+	 *
 	 * @param <T>             the type of the {@link AbstractModbusElement}d
 	 * @param channelId       the Channel-ID
 	 * @param element         the ModbusElement
@@ -430,7 +430,7 @@ protected final <T extends AbstractModbusElement<?>> T m(io.openems.edge.common.
 	/**
 	 * Maps the given element to the Channel identified by channelId, applying the
 	 * given @link{ElementToChannelConverter}.
-	 * 
+	 *
 	 * @param <T>       the type of the {@link AbstractModbusElement}d
 	 * @param channelId the Channel-ID
 	 * @param element   the ModbusElement
@@ -439,7 +439,7 @@ protected final <T extends AbstractModbusElement<?>> T m(io.openems.edge.common.
 	 */
 	protected final <T extends AbstractModbusElement<?>> T m(io.openems.edge.common.channel.ChannelId channelId,
 			T element, ElementToChannelConverter converter) {
-		return new ChannelMapper<T>(element) //
+		return new ChannelMapper<>(element) //
 				.m(channelId, converter) //
 				.build();
 	}
@@ -447,7 +447,7 @@ protected final <T extends AbstractModbusElement<?>> T m(io.openems.edge.common.
 	/**
 	 * Maps the given element to the Channel identified by channelId, applying the
 	 * given @link{ElementToChannelConverter}.
-	 * 
+	 *
 	 * @param <T>             the type of the {@link AbstractModbusElement}d
 	 * @param channelId       the Channel-ID
 	 * @param element         the ModbusElement
@@ -458,7 +458,7 @@ protected final <T extends AbstractModbusElement<?>> T m(io.openems.edge.common.
 	 */
 	protected final <T extends AbstractModbusElement<?>> T m(io.openems.edge.common.channel.ChannelId channelId,
 			T element, ElementToChannelConverter converter, ChannelMetaInfo channelMetaInfo) {
-		return new ChannelMapper<T>(element) //
+		return new ChannelMapper<>(element) //
 				.m(channelId, converter, channelMetaInfo) //
 				.build();
 	}
diff --git a/io.openems.edge.bridge.modbus/src/io/openems/edge/bridge/modbus/api/BridgeModbus.java b/io.openems.edge.bridge.modbus/src/io/openems/edge/bridge/modbus/api/BridgeModbus.java
index 6b910a34b3b..60c2e365ef4 100644
--- a/io.openems.edge.bridge.modbus/src/io/openems/edge/bridge/modbus/api/BridgeModbus.java
+++ b/io.openems.edge.bridge.modbus/src/io/openems/edge/bridge/modbus/api/BridgeModbus.java
@@ -35,7 +35,7 @@ public Doc doc() {
 
 	/**
 	 * Gets the Channel for {@link ChannelId#CYCLE_TIME_IS_TOO_SHORT}.
-	 * 
+	 *
 	 * @return the Channel
 	 */
 	public default StateChannel getCycleTimeIsTooShortChannel() {
@@ -45,7 +45,7 @@ public default StateChannel getCycleTimeIsTooShortChannel() {
 	/**
 	 * Gets the Cycle-Time-is-too-short State. See
 	 * {@link ChannelId#CYCLE_TIME_IS_TOO_SHORT}.
-	 * 
+	 *
 	 * @return the Channel {@link Value}
 	 */
 	public default Value<Boolean> getCycleTimeIsTooShort() {
@@ -55,7 +55,7 @@ public default Value<Boolean> getCycleTimeIsTooShort() {
 	/**
 	 * Internal method to set the 'nextValue' on
 	 * {@link ChannelId#CYCLE_TIME_IS_TOO_SHORT} Channel.
-	 * 
+	 *
 	 * @param value the next value
 	 */
 	public default void _setCycleTimeIsTooShort(boolean value) {
@@ -64,7 +64,7 @@ public default void _setCycleTimeIsTooShort(boolean value) {
 
 	/**
 	 * Gets the Channel for {@link ChannelId#EXECUTION_DURATION}.
-	 * 
+	 *
 	 * @return the Channel
 	 */
 	public default LongReadChannel getExecutionDurationChannel() {
@@ -74,7 +74,7 @@ public default LongReadChannel getExecutionDurationChannel() {
 	/**
 	 * Gets the Execution Duration in [ms], see
 	 * {@link ChannelId#EXECUTION_DURATION}.
-	 * 
+	 *
 	 * @return the Channel {@link Value}
 	 */
 	public default Value<Long> getExecutionDuration() {
@@ -84,7 +84,7 @@ public default Value<Long> getExecutionDuration() {
 	/**
 	 * Internal method to set the 'nextValue' on
 	 * {@link ChannelId#EXECUTION_DURATION} Channel.
-	 * 
+	 *
 	 * @param value the next value
 	 */
 	public default void _setExecutionDuration(long value) {
@@ -93,7 +93,7 @@ public default void _setExecutionDuration(long value) {
 
 	/**
 	 * Adds a Protocol with a source identifier to this Modbus Bridge.
-	 * 
+	 *
 	 * @param sourceId the unique source identifier
 	 * @param protocol the Modbus Protocol
 	 */
@@ -101,7 +101,7 @@ public default void _setExecutionDuration(long value) {
 
 	/**
 	 * Removes a Protocol from this Modbus Bridge.
-	 * 
+	 *
 	 * @param sourceId the unique source identifier
 	 */
 	public void removeProtocol(String sourceId);
diff --git a/io.openems.edge.bridge.modbus/src/io/openems/edge/bridge/modbus/api/BridgeModbusSerial.java b/io.openems.edge.bridge.modbus/src/io/openems/edge/bridge/modbus/api/BridgeModbusSerial.java
index 61ada4314f5..70d9dde5443 100644
--- a/io.openems.edge.bridge.modbus/src/io/openems/edge/bridge/modbus/api/BridgeModbusSerial.java
+++ b/io.openems.edge.bridge.modbus/src/io/openems/edge/bridge/modbus/api/BridgeModbusSerial.java
@@ -24,35 +24,35 @@ public Doc doc() {
 
 	/**
 	 * Gets the Port-Name (e.g. '/dev/ttyUSB0' or 'COM3').
-	 * 
+	 *
 	 * @return the Port-Name
 	 */
 	public String getPortName();
 
 	/**
 	 * Gets the Baudrate (e.g. 9600).
-	 * 
+	 *
 	 * @return the Baudrate
 	 */
 	public int getBaudrate();
 
 	/**
 	 * Gets the Databits (e.g. 8).
-	 * 
+	 *
 	 * @return the Databits
 	 */
 	public int getDatabits();
 
 	/**
 	 * Gets the Stopbits.
-	 * 
+	 *
 	 * @return the Stopbits
 	 */
 	public Stopbit getStopbits();
 
 	/**
 	 * Gets the Parity.
-	 * 
+	 *
 	 * @return the Parity.
 	 */
 	public Parity getParity();
diff --git a/io.openems.edge.bridge.modbus/src/io/openems/edge/bridge/modbus/api/BridgeModbusTcp.java b/io.openems.edge.bridge.modbus/src/io/openems/edge/bridge/modbus/api/BridgeModbusTcp.java
index 3b1ad9bd3b9..ddd6bdaec3c 100644
--- a/io.openems.edge.bridge.modbus/src/io/openems/edge/bridge/modbus/api/BridgeModbusTcp.java
+++ b/io.openems.edge.bridge.modbus/src/io/openems/edge/bridge/modbus/api/BridgeModbusTcp.java
@@ -26,7 +26,7 @@ public Doc doc() {
 
 	/**
 	 * Gets the IP address.
-	 * 
+	 *
 	 * @return the IP address
 	 */
 	public InetAddress getIpAddress();
diff --git a/io.openems.edge.bridge.modbus/src/io/openems/edge/bridge/modbus/api/ChannelMetaInfo.java b/io.openems.edge.bridge.modbus/src/io/openems/edge/bridge/modbus/api/ChannelMetaInfo.java
index f7b69b9c100..f9a55fb7ad6 100644
--- a/io.openems.edge.bridge.modbus/src/io/openems/edge/bridge/modbus/api/ChannelMetaInfo.java
+++ b/io.openems.edge.bridge.modbus/src/io/openems/edge/bridge/modbus/api/ChannelMetaInfo.java
@@ -19,7 +19,7 @@ public ChannelMetaInfo(int address) {
 
 	@Override
 	public String toString() {
-		StringBuilder b = new StringBuilder();
+		var b = new StringBuilder();
 		b.append("0x").append(Integer.toHexString(this.address));
 		return b.toString();
 	}
@@ -37,10 +37,10 @@ public boolean equals(Object obj) {
 		if (obj == null) {
 			return false;
 		}
-		if (getClass() != obj.getClass()) {
+		if (this.getClass() != obj.getClass()) {
 			return false;
 		}
-		ChannelMetaInfo other = (ChannelMetaInfo) obj;
+		var other = (ChannelMetaInfo) obj;
 		return this.address == other.address;
 	}
 
diff --git a/io.openems.edge.bridge.modbus/src/io/openems/edge/bridge/modbus/api/ChannelMetaInfoBit.java b/io.openems.edge.bridge.modbus/src/io/openems/edge/bridge/modbus/api/ChannelMetaInfoBit.java
index 05d0fabad22..83e8a3f93d3 100644
--- a/io.openems.edge.bridge.modbus/src/io/openems/edge/bridge/modbus/api/ChannelMetaInfoBit.java
+++ b/io.openems.edge.bridge.modbus/src/io/openems/edge/bridge/modbus/api/ChannelMetaInfoBit.java
@@ -19,7 +19,7 @@ public ChannelMetaInfoBit(int address, int bit) {
 
 	@Override
 	public String toString() {
-		StringBuilder b = new StringBuilder();
+		var b = new StringBuilder();
 		b.append("0x").append(Integer.toHexString(this.address));
 		if (this.bit >= 0) {
 			b.append("|bit").append(String.format("%02d", this.bit));
@@ -40,10 +40,10 @@ public boolean equals(Object obj) {
 		if (obj == null) {
 			return false;
 		}
-		if (getClass() != obj.getClass()) {
+		if (this.getClass() != obj.getClass()) {
 			return false;
 		}
-		ChannelMetaInfoBit other = (ChannelMetaInfoBit) obj;
+		var other = (ChannelMetaInfoBit) obj;
 		return this.address == other.address && this.bit == other.bit;
 	}
 
diff --git a/io.openems.edge.bridge.modbus/src/io/openems/edge/bridge/modbus/api/ChannelMetaInfoReadAndWrite.java b/io.openems.edge.bridge.modbus/src/io/openems/edge/bridge/modbus/api/ChannelMetaInfoReadAndWrite.java
index ae6cff010a0..4d8e7c40d0e 100644
--- a/io.openems.edge.bridge.modbus/src/io/openems/edge/bridge/modbus/api/ChannelMetaInfoReadAndWrite.java
+++ b/io.openems.edge.bridge.modbus/src/io/openems/edge/bridge/modbus/api/ChannelMetaInfoReadAndWrite.java
@@ -20,7 +20,7 @@ public ChannelMetaInfoReadAndWrite(int readAddress, int writeAaddress) {
 
 	@Override
 	public String toString() {
-		StringBuilder b = new StringBuilder();
+		var b = new StringBuilder();
 		b.append("READ:0x").append(Integer.toHexString(this.address));
 		b.append(" | WRITE:0x").append(Integer.toHexString(this.writeAddress));
 		return b.toString();
@@ -39,10 +39,10 @@ public boolean equals(Object obj) {
 		if (obj == null) {
 			return false;
 		}
-		if (getClass() != obj.getClass()) {
+		if (this.getClass() != obj.getClass()) {
 			return false;
 		}
-		ChannelMetaInfoReadAndWrite other = (ChannelMetaInfoReadAndWrite) obj;
+		var other = (ChannelMetaInfoReadAndWrite) obj;
 		return this.address == other.address && this.writeAddress == other.writeAddress;
 	}
 
diff --git a/io.openems.edge.bridge.modbus/src/io/openems/edge/bridge/modbus/api/ChannelToElementConverter.java b/io.openems.edge.bridge.modbus/src/io/openems/edge/bridge/modbus/api/ChannelToElementConverter.java
index c555352403e..f9ae2dc05f8 100644
--- a/io.openems.edge.bridge.modbus/src/io/openems/edge/bridge/modbus/api/ChannelToElementConverter.java
+++ b/io.openems.edge.bridge.modbus/src/io/openems/edge/bridge/modbus/api/ChannelToElementConverter.java
@@ -25,42 +25,42 @@ public Object apply(Object t) {
 	}
 //	/**
 //	 * Applies a scale factor of -1. Converts value [1] to [0.1].
-//	 * 
+//	 *
 //	 * @see ElementToChannelScaleFactorConverter
 //	 */
 //	public static final ChannelToElementConverter SCALE_FACTOR_MINUS_1 = new ElementToChannelScaleFactorConverter(-1);
 //
 //	/**
 //	 * Applies a scale factor of -2. Converts value [1] to [0.01].
-//	 * 
+//	 *
 //	 * @see ElementToChannelScaleFactorConverter
 //	 */
 //	public static final ChannelToElementConverter SCALE_FACTOR_MINUS_2 = new ElementToChannelScaleFactorConverter(-2);
 //
 //	/**
 //	 * Applies a scale factor of -3. Converts value [1] to [0.001].
-//	 * 
+//	 *
 //	 * @see ElementToChannelScaleFactorConverter
 //	 */
 //	public static final ChannelToElementConverter SCALE_FACTOR_MINUS_3 = new ElementToChannelScaleFactorConverter(-3);
 //
 //	/**
 //	 * Applies a scale factor of 1. Converts value [1] to [10].
-//	 * 
+//	 *
 //	 * @see ElementToChannelScaleFactorConverter
 //	 */
 //	public static final ChannelToElementConverter SCALE_FACTOR_1 = new ElementToChannelScaleFactorConverter(1);
 //
 //	/**
 //	 * Applies a scale factor of 2. Converts value [1] to [100].
-//	 * 
+//	 *
 //	 * @see ElementToChannelScaleFactorConverter
 //	 */
 //	public static final ChannelToElementConverter SCALE_FACTOR_2 = new ElementToChannelScaleFactorConverter(2);
 //
 //	/**
 //	 * Applies a scale factor of 3. Converts value [1] to [1000].
-//	 * 
+//	 *
 //	 * @see ElementToChannelScaleFactorConverter
 //	 */
 //	public static final ChannelToElementConverter SCALE_FACTOR_3 = new ElementToChannelScaleFactorConverter(3);
@@ -86,12 +86,12 @@ public Object apply(Object t) {
 //	/**
 //	 * Sets the value to 'zero' if parameter is true; otherwise
 //	 * {@link #DIRECT_1_TO_1}.
-//	 * 
+//	 *
 //	 * <ul>
 //	 * <li>true: set zero
 //	 * <li>false: apply {@link #DIRECT_1_TO_1}
 //	 * </ul>
-//	 * 
+//	 *
 //	 * @param setZero true to set to null
 //	 * @return the {@link ChannelToElementConverter}
 //	 */
@@ -111,12 +111,12 @@ public Object apply(Object t) {
 //
 //	/**
 //	 * Converts depending on the given parameter.
-//	 * 
+//	 *
 //	 * <ul>
 //	 * <li>true: invert value
 //	 * <li>false: keep value (1-to-1)
 //	 * </ul>
-//	 * 
+//	 *
 //	 * @param invert true if Converter should invert
 //	 * @return the {@link ChannelToElementConverter}
 //	 */
@@ -213,7 +213,7 @@ public Object apply(Object t) {
 //	/**
 //	 * This constructs and back-and-forth converter from Element to Channel and
 //	 * back.
-//	 * 
+//	 *
 //	 * @param elementToChannel from Element to Channel
 //	 * @param channelToElement from Channel to Element
 //	 */
@@ -226,7 +226,7 @@ public Object apply(Object t) {
 //	/**
 //	 * This constructs a forward-only converter from Element to Channel.
 //	 * Back-conversion throws an Exception.
-//	 * 
+//	 *
 //	 * @param elementToChannel Element to Channel
 //	 */
 //	public ChannelToElementConverter(Function<Object, Object> elementToChannel) {
@@ -239,7 +239,7 @@ public Object apply(Object t) {
 //	/**
 //	 * Convert an Element value to a Channel value. If the value can or should not
 //	 * be converted, this method returns null.
-//	 * 
+//	 *
 //	 * @param value the Element value
 //	 * @return the converted value or null
 //	 */
@@ -250,7 +250,7 @@ public Object apply(Object t) {
 //	/**
 //	 * Convert a Channel value to an Element value. If the value can or should not
 //	 * be converted, this method returns null.
-//	 * 
+//	 *
 //	 * @param value the Channel value
 //	 * @return the converted value or null
 //	 */
diff --git a/io.openems.edge.bridge.modbus/src/io/openems/edge/bridge/modbus/api/ElementToChannelConverter.java b/io.openems.edge.bridge.modbus/src/io/openems/edge/bridge/modbus/api/ElementToChannelConverter.java
index b937dff67ca..3abff7a10e4 100644
--- a/io.openems.edge.bridge.modbus/src/io/openems/edge/bridge/modbus/api/ElementToChannelConverter.java
+++ b/io.openems.edge.bridge.modbus/src/io/openems/edge/bridge/modbus/api/ElementToChannelConverter.java
@@ -21,42 +21,42 @@ public class ElementToChannelConverter {
 
 	/**
 	 * Applies a scale factor of -1. Converts value [1] to [0.1].
-	 * 
+	 *
 	 * @see ElementToChannelScaleFactorConverter
 	 */
 	public static final ElementToChannelConverter SCALE_FACTOR_MINUS_1 = new ElementToChannelScaleFactorConverter(-1);
 
 	/**
 	 * Applies a scale factor of -2. Converts value [1] to [0.01].
-	 * 
+	 *
 	 * @see ElementToChannelScaleFactorConverter
 	 */
 	public static final ElementToChannelConverter SCALE_FACTOR_MINUS_2 = new ElementToChannelScaleFactorConverter(-2);
 
 	/**
 	 * Applies a scale factor of -3. Converts value [1] to [0.001].
-	 * 
+	 *
 	 * @see ElementToChannelScaleFactorConverter
 	 */
 	public static final ElementToChannelConverter SCALE_FACTOR_MINUS_3 = new ElementToChannelScaleFactorConverter(-3);
 
 	/**
 	 * Applies a scale factor of 1. Converts value [1] to [10].
-	 * 
+	 *
 	 * @see ElementToChannelScaleFactorConverter
 	 */
 	public static final ElementToChannelConverter SCALE_FACTOR_1 = new ElementToChannelScaleFactorConverter(1);
 
 	/**
 	 * Applies a scale factor of 2. Converts value [1] to [100].
-	 * 
+	 *
 	 * @see ElementToChannelScaleFactorConverter
 	 */
 	public static final ElementToChannelConverter SCALE_FACTOR_2 = new ElementToChannelScaleFactorConverter(2);
 
 	/**
 	 * Applies a scale factor of 3. Converts value [1] to [1000].
-	 * 
+	 *
 	 * @see ElementToChannelScaleFactorConverter
 	 */
 	public static final ElementToChannelConverter SCALE_FACTOR_3 = new ElementToChannelScaleFactorConverter(3);
@@ -82,12 +82,12 @@ public class ElementToChannelConverter {
 	/**
 	 * Sets the value to 'zero' if parameter is true; otherwise
 	 * {@link #DIRECT_1_TO_1}.
-	 * 
+	 *
 	 * <ul>
 	 * <li>true: set zero
 	 * <li>false: apply {@link #DIRECT_1_TO_1}
 	 * </ul>
-	 * 
+	 *
 	 * @param setZero true to set to null
 	 * @return the {@link ElementToChannelConverter}
 	 */
@@ -100,19 +100,18 @@ public static ElementToChannelConverter SET_ZERO_IF_TRUE(boolean setZero) {
 					value -> 0, //
 					// channel -> element
 					value -> 0);
-		} else {
-			return DIRECT_1_TO_1;
 		}
+		return DIRECT_1_TO_1;
 	}
 
 	/**
 	 * Converts depending on the given parameter.
-	 * 
+	 *
 	 * <ul>
 	 * <li>true: invert value
 	 * <li>false: keep value (1-to-1)
 	 * </ul>
-	 * 
+	 *
 	 * @param invert true if Converter should invert
 	 * @return the {@link ElementToChannelConverter}
 	 */
@@ -121,9 +120,8 @@ public static ElementToChannelConverter INVERT_IF_TRUE(boolean invert) {
 		// CHECKSTYLE:ON
 		if (invert) {
 			return INVERT;
-		} else {
-			return DIRECT_1_TO_1;
 		}
+		return DIRECT_1_TO_1;
 	}
 
 	/**
@@ -209,7 +207,7 @@ public static final ElementToChannelConverter SCALE_FACTOR_MINUS_1_AND_INVERT_IF
 	/**
 	 * This constructs and back-and-forth converter from Element to Channel and
 	 * back.
-	 * 
+	 *
 	 * @param elementToChannel from Element to Channel
 	 * @param channelToElement from Channel to Element
 	 */
@@ -222,12 +220,12 @@ public ElementToChannelConverter(Function<Object, Object> elementToChannel,
 	/**
 	 * This constructs a forward-only converter from Element to Channel.
 	 * Back-conversion throws an Exception.
-	 * 
+	 *
 	 * @param elementToChannel Element to Channel
 	 */
 	public ElementToChannelConverter(Function<Object, Object> elementToChannel) {
 		this.elementToChannel = elementToChannel;
-		this.channelToElement = (value) -> {
+		this.channelToElement = value -> {
 			throw new IllegalArgumentException("Backwards-Conversion for [" + value + "] is not implemented.");
 		};
 	}
@@ -235,7 +233,7 @@ public ElementToChannelConverter(Function<Object, Object> elementToChannel) {
 	/**
 	 * Convert an Element value to a Channel value. If the value can or should not
 	 * be converted, this method returns null.
-	 * 
+	 *
 	 * @param value the Element value
 	 * @return the converted value or null
 	 */
@@ -246,7 +244,7 @@ public Object elementToChannel(Object value) {
 	/**
 	 * Convert a Channel value to an Element value. If the value can or should not
 	 * be converted, this method returns null.
-	 * 
+	 *
 	 * @param value the Channel value
 	 * @return the converted value or null
 	 */
diff --git a/io.openems.edge.bridge.modbus/src/io/openems/edge/bridge/modbus/api/ElementToChannelConverterChain.java b/io.openems.edge.bridge.modbus/src/io/openems/edge/bridge/modbus/api/ElementToChannelConverterChain.java
index 9c247f64615..9310addf1ff 100644
--- a/io.openems.edge.bridge.modbus/src/io/openems/edge/bridge/modbus/api/ElementToChannelConverterChain.java
+++ b/io.openems.edge.bridge.modbus/src/io/openems/edge/bridge/modbus/api/ElementToChannelConverterChain.java
@@ -5,13 +5,9 @@ public class ElementToChannelConverterChain extends ElementToChannelConverter {
 	public ElementToChannelConverterChain(ElementToChannelConverter converter1, ElementToChannelConverter converter2) {
 		super(
 				// element -> channel
-				value -> {
-					return converter2.elementToChannel(converter1.elementToChannel(value));
-				},
+				value -> converter2.elementToChannel(converter1.elementToChannel(value)),
 				// channel -> element
-				value -> {
-					return converter1.channelToElement(converter2.channelToElement(value));
-				});
+				value -> converter1.channelToElement(converter2.channelToElement(value)));
 	}
 
 }
diff --git a/io.openems.edge.bridge.modbus/src/io/openems/edge/bridge/modbus/api/ElementToChannelOffsetConverter.java b/io.openems.edge.bridge.modbus/src/io/openems/edge/bridge/modbus/api/ElementToChannelOffsetConverter.java
index fe9eef5b66c..4ded48ae686 100644
--- a/io.openems.edge.bridge.modbus/src/io/openems/edge/bridge/modbus/api/ElementToChannelOffsetConverter.java
+++ b/io.openems.edge.bridge.modbus/src/io/openems/edge/bridge/modbus/api/ElementToChannelOffsetConverter.java
@@ -4,7 +4,7 @@
 
 /**
  * Converts between Element and Channel by applying an offset.
- * 
+ *
  * <p>
  * (channel = element + offset)
  */
@@ -13,14 +13,10 @@ public class ElementToChannelOffsetConverter extends ElementToChannelConverter {
 	public ElementToChannelOffsetConverter(int offset) {
 		super(//
 				// element -> channel
-				value -> {
-					return apply(value, offset);
-				}, //
+				value -> apply(value, offset), //
 
 				// channel -> element
-				value -> {
-					return apply(value, offset * -1);
-				});
+				value -> apply(value, offset * -1));
 	}
 
 	private static Object apply(Object value, int offset) {
@@ -43,40 +39,38 @@ private static Object apply(Object value, int offset) {
 					return (boolean) value;
 				}
 				if (value instanceof Short) {
-					long result = ((Short) value) + offset;
+					long result = (Short) value + offset;
 					if (result >= Short.MIN_VALUE && result <= Short.MAX_VALUE) {
 						return Short.valueOf((short) result);
-					} else if (result > Integer.MIN_VALUE && result < Integer.MAX_VALUE) {
+					}
+					if (result > Integer.MIN_VALUE && result < Integer.MAX_VALUE) {
 						return Integer.valueOf((int) result);
 					} else {
 						return Long.valueOf(result);
 					}
 				}
 				if (value instanceof Integer) {
-					long result = ((Integer) value) + offset;
+					long result = (Integer) value + offset;
 					if (result >= Integer.MIN_VALUE && result <= Integer.MAX_VALUE) {
 						return Integer.valueOf((int) result);
-					} else {
-						return Long.valueOf(result);
 					}
+					return Long.valueOf(result);
 				}
 				if (value instanceof Long) {
-					long result = ((Long) value) + offset;
-					return result;
+					return (Long) value + offset;
 				}
 				if (value instanceof Float) {
-					double result = ((Float) value) + offset;
+					double result = (Float) value + offset;
 					if (result >= Float.MIN_VALUE && result <= Float.MAX_VALUE) {
 						return Float.valueOf((float) result);
-					} else {
-						return Double.valueOf(result);
 					}
+					return Double.valueOf(result);
 				}
 				if (value instanceof Double) {
-					return Double.valueOf(((Double) value) + offset);
+					return Double.valueOf((Double) value + offset);
 				}
 				if (value instanceof String) {
-					return (String) value;
+					return value;
 				}
 			}
 			break;
diff --git a/io.openems.edge.bridge.modbus/src/io/openems/edge/bridge/modbus/api/ElementToChannelScaleFactorConverter.java b/io.openems.edge.bridge.modbus/src/io/openems/edge/bridge/modbus/api/ElementToChannelScaleFactorConverter.java
index cae0a4b83d8..5c3c14264b4 100644
--- a/io.openems.edge.bridge.modbus/src/io/openems/edge/bridge/modbus/api/ElementToChannelScaleFactorConverter.java
+++ b/io.openems.edge.bridge.modbus/src/io/openems/edge/bridge/modbus/api/ElementToChannelScaleFactorConverter.java
@@ -9,10 +9,10 @@
 
 /**
  * Converts between Element and Channel by applying a scale factor.
- * 
+ *
  * <p>
  * (channel = element * 10^scaleFactor)
- * 
+ *
  * <p>
  * Example: if the Register is in unit [0.1 V] and this converter has a
  * scaleFactor of '2', it converts to unit [1 mV]
@@ -49,18 +49,14 @@ public ElementToChannelScaleFactorConverter(OpenemsComponent component, SunSpecP
 	public ElementToChannelScaleFactorConverter(int scaleFactor) {
 		super(//
 				// element -> channel
-				value -> {
-					return apply(value, scaleFactor * -1);
-				}, //
+				value -> apply(value, scaleFactor * -1), //
 
 				// channel -> element
-				value -> {
-					return apply(value, scaleFactor);
-				});
+				value -> apply(value, scaleFactor));
 	}
 
 	private static Object apply(Object value, int scaleFactor) {
-		double factor = Math.pow(10, scaleFactor * -1);
+		var factor = Math.pow(10, scaleFactor * -1);
 		if (value == null) {
 			return null;
 		}
@@ -80,40 +76,39 @@ private static Object apply(Object value, int scaleFactor) {
 					return (boolean) value;
 				}
 				if (value instanceof Short) {
-					double result = ((Short) value) * factor;
+					var result = (Short) value * factor;
 					if (result >= Short.MIN_VALUE && result <= Short.MAX_VALUE) {
 						return Short.valueOf((short) result);
-					} else if (result > Integer.MIN_VALUE && result < Integer.MAX_VALUE) {
+					}
+					if (result > Integer.MIN_VALUE && result < Integer.MAX_VALUE) {
 						return Integer.valueOf((int) result);
 					} else {
 						return Double.valueOf(Math.round(result));
 					}
 				}
 				if (value instanceof Integer) {
-					double result = ((Integer) value) * factor;
+					var result = (Integer) value * factor;
 					if (result >= Integer.MIN_VALUE && result <= Integer.MAX_VALUE) {
 						return Integer.valueOf((int) result);
-					} else {
-						return Double.valueOf(Math.round(result));
 					}
+					return Double.valueOf(Math.round(result));
 				}
 				if (value instanceof Long) {
-					double result = ((Long) value) * factor;
+					var result = (Long) value * factor;
 					return Math.round(result);
 				}
 				if (value instanceof Float) {
-					double result = ((Float) value) * factor;
+					var result = (Float) value * factor;
 					if (result >= Float.MIN_VALUE && result <= Float.MAX_VALUE) {
 						return Float.valueOf((float) result);
-					} else {
-						return Double.valueOf(result);
 					}
+					return Double.valueOf(result);
 				}
 				if (value instanceof Double) {
-					return Double.valueOf(((Double) value) * factor);
+					return Double.valueOf((Double) value * factor);
 				}
 				if (value instanceof String) {
-					return (String) value;
+					return value;
 				}
 			}
 			break;
diff --git a/io.openems.edge.bridge.modbus/src/io/openems/edge/bridge/modbus/api/ModbusComponent.java b/io.openems.edge.bridge.modbus/src/io/openems/edge/bridge/modbus/api/ModbusComponent.java
index f161ff6f18f..128f457eadd 100644
--- a/io.openems.edge.bridge.modbus/src/io/openems/edge/bridge/modbus/api/ModbusComponent.java
+++ b/io.openems.edge.bridge.modbus/src/io/openems/edge/bridge/modbus/api/ModbusComponent.java
@@ -11,7 +11,7 @@
 
 /**
  * A OpenEMS Component that uses Modbus communication.
- * 
+ *
  * <p>
  * Classes implementing this interface typically inherit
  * {@link AbstractOpenemsModbusComponent}.
@@ -39,7 +39,7 @@ public Doc doc() {
 
 	/**
 	 * Gets the Channel for {@link ChannelId#MODBUS_COMMUNICATION_FAILED}.
-	 * 
+	 *
 	 * @return the Channel
 	 */
 	public default StateChannel getModbusCommunicationFailedChannel() {
@@ -49,7 +49,7 @@ public default StateChannel getModbusCommunicationFailedChannel() {
 	/**
 	 * Gets the Modbus Communication Failed State. See
 	 * {@link ChannelId#MODBUS_COMMUNICATION_FAILED}.
-	 * 
+	 *
 	 * @return the Channel {@link Value}
 	 */
 	public default Value<Boolean> getModbusCommunicationFailed() {
@@ -59,7 +59,7 @@ public default Value<Boolean> getModbusCommunicationFailed() {
 	/**
 	 * Internal method to set the 'nextValue' on
 	 * {@link ChannelId#MODBUS_COMMUNICATION_FAILED} Channel.
-	 * 
+	 *
 	 * @param value the next value
 	 */
 	public default void _setModbusCommunicationFailed(boolean value) {
diff --git a/io.openems.edge.bridge.modbus/src/io/openems/edge/bridge/modbus/api/ModbusProtocol.java b/io.openems.edge.bridge.modbus/src/io/openems/edge/bridge/modbus/api/ModbusProtocol.java
index 59003023b3b..c6f09fc7719 100644
--- a/io.openems.edge.bridge.modbus/src/io/openems/edge/bridge/modbus/api/ModbusProtocol.java
+++ b/io.openems.edge.bridge.modbus/src/io/openems/edge/bridge/modbus/api/ModbusProtocol.java
@@ -1,7 +1,5 @@
 package io.openems.edge.bridge.modbus.api;
 
-import java.util.List;
-
 import io.openems.common.exceptions.OpenemsException;
 import io.openems.edge.bridge.modbus.api.element.ModbusElement;
 import io.openems.edge.bridge.modbus.api.task.ReadTask;
@@ -28,7 +26,7 @@ public class ModbusProtocol {
 
 	/**
 	 * Creates a new {@link ModbusProtocol}.
-	 * 
+	 *
 	 * @param parent the {@link AbstractOpenemsModbusComponent} parent
 	 * @param tasks  the {@link Task}s
 	 * @throws OpenemsException on error
@@ -36,25 +34,25 @@ public class ModbusProtocol {
 	public ModbusProtocol(AbstractOpenemsModbusComponent parent, Task... tasks) throws OpenemsException {
 		this.parent = parent;
 		for (Task task : tasks) {
-			addTask(task);
+			this.addTask(task);
 		}
 	}
 
 	/**
 	 * Adds Tasks to the Protocol.
-	 * 
+	 *
 	 * @param tasks the tasks
 	 * @throws OpenemsException on error
 	 */
 	public synchronized void addTasks(Task... tasks) throws OpenemsException {
 		for (Task task : tasks) {
-			addTask(task);
+			this.addTask(task);
 		}
 	}
 
 	/**
 	 * Adds a Task to the Protocol.
-	 * 
+	 *
 	 * @param task the task
 	 * @throws OpenemsException on plausibility error
 	 */
@@ -88,7 +86,7 @@ public synchronized void removeTask(Task task) {
 
 	/**
 	 * Gets the Read-Tasks Manager.
-	 * 
+	 *
 	 * @return a the TaskManager
 	 */
 	public TasksManager<ReadTask> getReadTasksManager() {
@@ -97,7 +95,7 @@ public TasksManager<ReadTask> getReadTasksManager() {
 
 	/**
 	 * Gets the Write-Tasks Manager.
-	 * 
+	 *
 	 * @return a the TaskManager
 	 */
 	public TasksManager<WriteTask> getWriteTasksManager() {
@@ -111,7 +109,7 @@ public TasksManager<WriteTask> getWriteTasksManager() {
 	 * @throws OpenemsException
 	 */
 	private synchronized void checkTask(Task task) throws OpenemsException {
-		int address = task.getStartAddress();
+		var address = task.getStartAddress();
 		for (ModbusElement<?> element : task.getElements()) {
 			if (element.getStartAddress() != address) {
 				throw new OpenemsException("Start address is wrong. It is [" + element.getStartAddress() + "/0x"
@@ -124,12 +122,12 @@ private synchronized void checkTask(Task task) throws OpenemsException {
 	}
 
 	public void deactivate() {
-		List<ReadTask> readTasks = this.readTaskManager.getAllTasks();
+		var readTasks = this.readTaskManager.getAllTasks();
 		for (ReadTask readTask : readTasks) {
 			readTask.deactivate();
 		}
 
-		List<WriteTask> writeTasks = this.writeTaskManager.getAllTasks();
+		var writeTasks = this.writeTaskManager.getAllTasks();
 		for (WriteTask writeTask : writeTasks) {
 			writeTask.deactivate();
 		}
diff --git a/io.openems.edge.bridge.modbus/src/io/openems/edge/bridge/modbus/api/ModbusUtils.java b/io.openems.edge.bridge.modbus/src/io/openems/edge/bridge/modbus/api/ModbusUtils.java
index 8e45f2f49e1..43522be2481 100644
--- a/io.openems.edge.bridge.modbus/src/io/openems/edge/bridge/modbus/api/ModbusUtils.java
+++ b/io.openems.edge.bridge.modbus/src/io/openems/edge/bridge/modbus/api/ModbusUtils.java
@@ -14,7 +14,7 @@ public class ModbusUtils {
 
 	/**
 	 * Reads given Element once from Modbus.
-	 * 
+	 *
 	 * @param <T>             the Type of the element
 	 * @param modbusProtocol  the {@link ModbusProtocol}, that is linked with a
 	 *                        {@link BridgeModbus}
@@ -27,7 +27,7 @@ public class ModbusUtils {
 	public static <T> CompletableFuture<T> readELementOnce(ModbusProtocol modbusProtocol,
 			AbstractModbusElement<T> element, boolean tryAgainOnError) throws OpenemsException {
 		// Prepare result
-		final CompletableFuture<T> result = new CompletableFuture<T>();
+		final var result = new CompletableFuture<T>();
 
 		// Activate task
 		final Task task = new FC3ReadRegistersTask(element.getStartAddress(), Priority.HIGH, element);
@@ -38,9 +38,8 @@ public static <T> CompletableFuture<T> readELementOnce(ModbusProtocol modbusProt
 			if (value == null) {
 				if (tryAgainOnError) {
 					return;
-				} else {
-					result.complete(null);
 				}
+				result.complete(null);
 			}
 			// do not try again
 			modbusProtocol.removeTask(task);
@@ -52,20 +51,20 @@ public static <T> CompletableFuture<T> readELementOnce(ModbusProtocol modbusProt
 
 	/**
 	 * Converts upper/lower bytes to Short.
-	 * 
+	 *
 	 * @param value      the int value
 	 * @param upperBytes 1 = upper two bytes, 0 = lower two bytes
 	 * @return the Short
 	 */
 	public static Short convert(int value, int upperBytes) {
-		ByteBuffer b = ByteBuffer.allocate(4);
+		var b = ByteBuffer.allocate(4);
 		b.order(ByteOrder.LITTLE_ENDIAN);
 		b.putInt(value);
 
-		byte byte0 = b.get(upperBytes * 2);
-		byte byte1 = b.get(upperBytes * 2 + 1);
+		var byte0 = b.get(upperBytes * 2);
+		var byte1 = b.get(upperBytes * 2 + 1);
 
-		ByteBuffer shortBuf = ByteBuffer.allocate(2);
+		var shortBuf = ByteBuffer.allocate(2);
 		shortBuf.order(ByteOrder.LITTLE_ENDIAN);
 		shortBuf.put(0, byte0);
 		shortBuf.put(1, byte1);
diff --git a/io.openems.edge.bridge.modbus/src/io/openems/edge/bridge/modbus/api/ModbusWorker.java b/io.openems.edge.bridge.modbus/src/io/openems/edge/bridge/modbus/api/ModbusWorker.java
index 26981ad9f54..6959c0357d7 100644
--- a/io.openems.edge.bridge.modbus/src/io/openems/edge/bridge/modbus/api/ModbusWorker.java
+++ b/io.openems.edge.bridge.modbus/src/io/openems/edge/bridge/modbus/api/ModbusWorker.java
@@ -3,7 +3,6 @@
 import java.util.ArrayList;
 import java.util.Collection;
 import java.util.Deque;
-import java.util.Iterator;
 import java.util.LinkedList;
 import java.util.List;
 import java.util.concurrent.LinkedBlockingDeque;
@@ -28,7 +27,7 @@
 /**
  * The ModbusWorker schedules the execution of all Modbus-Tasks, like reading
  * and writing modbus registers.
- * 
+ *
  * <p>
  * It tries to execute all Write-Tasks as early as possible (directly after the
  * TOPIC_CYCLE_EXECUTE_WRITE event) and all Read-Tasks as late as possible to
@@ -57,7 +56,7 @@ protected ModbusWorker(AbstractModbusBridge parent) {
 	 * This is called on TOPIC_CYCLE_BEFORE_PROCESS_IMAGE cycle event.
 	 */
 	protected void onBeforeProcessImage() {
-		int cycleTime = this.parent.getCycle().getCycleTime();
+		var cycleTime = this.parent.getCycle().getCycleTime();
 		this.stopwatch.reset();
 		this.stopwatch.start();
 
@@ -69,27 +68,27 @@ protected void onBeforeProcessImage() {
 
 		// Collect the next read-tasks
 		List<ReadTask> nextReadTasks = new ArrayList<>();
-		ReadTask lowPriorityTask = this.getOneLowPriorityReadTask();
+		var lowPriorityTask = this.getOneLowPriorityReadTask();
 		if (lowPriorityTask != null) {
 			nextReadTasks.add(lowPriorityTask);
 		}
 		nextReadTasks.addAll(this.getAllHighPriorityReadTasks());
-		long readTasksDuration = 0;
+		var readTasksDuration = 0L;
 		for (ReadTask task : nextReadTasks) {
 			readTasksDuration += task.getExecuteDuration();
 		}
 
 		// collect the next write-tasks
-		long writeTasksDuration = 0;
-		List<WriteTask> nextWriteTasks = this.getAllWriteTasks();
+		var writeTasksDuration = 0L;
+		var nextWriteTasks = this.getAllWriteTasks();
 		for (WriteTask task : nextWriteTasks) {
 			writeTasksDuration += task.getExecuteDuration();
 		}
 
 		// plan the execution for the next cycles
-		long totalDuration = readTasksDuration + writeTasksDuration;
-		long totalDurationWithBuffer = totalDuration + TASK_DURATION_BUFFER;
-		long noOfRequiredCycles = ceilDiv(totalDurationWithBuffer, cycleTime);
+		var totalDuration = readTasksDuration + writeTasksDuration;
+		var totalDurationWithBuffer = totalDuration + TASK_DURATION_BUFFER;
+		var noOfRequiredCycles = ceilDiv(totalDurationWithBuffer, cycleTime);
 
 		// Set EXECUTION_DURATION channel
 		this.parent._setExecutionDuration(totalDuration);
@@ -101,8 +100,8 @@ protected void onBeforeProcessImage() {
 			this.parent._setCycleTimeIsTooShort(false);
 		}
 
-		long durationOfTasksBeforeExecuteWriteEvent = 0;
-		int noOfTasksBeforeExecuteWriteEvent = 0;
+		var durationOfTasksBeforeExecuteWriteEvent = 0L;
+		var noOfTasksBeforeExecuteWriteEvent = 0;
 		for (ReadTask task : nextReadTasks) {
 			if (durationOfTasksBeforeExecuteWriteEvent > this.durationBetweenBeforeProcessImageTillExecuteWrite) {
 				break;
@@ -118,8 +117,8 @@ protected void onBeforeProcessImage() {
 		tasksQueue.addAll(nextWriteTasks);
 
 		// Add all read-tasks to the queue
-		for (int i = 0; i < nextReadTasks.size(); i++) {
-			ReadTask task = nextReadTasks.get(i);
+		for (var i = 0; i < nextReadTasks.size(); i++) {
+			var task = nextReadTasks.get(i);
 			if (i < noOfTasksBeforeExecuteWriteEvent) {
 				// this Task will be executed before ExecuteWrite event -> add it to the end of
 				// the queue
@@ -132,7 +131,7 @@ protected void onBeforeProcessImage() {
 		}
 
 		// Add a waiting-task to the end of the queue
-		long waitTillStart = noOfRequiredCycles * cycleTime - totalDurationWithBuffer;
+		var waitTillStart = noOfRequiredCycles * cycleTime - totalDurationWithBuffer;
 		tasksQueue.addLast(new WaitTask(waitTillStart));
 
 		// Copy all Tasks to the global tasks-queue
@@ -155,7 +154,7 @@ public void onExecuteWrite() {
 
 	@Override
 	protected void forever() throws InterruptedException {
-		Task task = this.tasksQueue.takeLast();
+		var task = this.tasksQueue.takeLast();
 
 		// If there are no tasks in the bridge, there will always be only one
 		// 'WaitTask'.
@@ -163,10 +162,10 @@ protected void forever() throws InterruptedException {
 			return;
 		}
 
-		ModbusComponent modbusComponent = task.getParent();
+		var modbusComponent = task.getParent();
 		try {
 			// execute the task
-			int noOfExecutedSubTasks = task.execute(this.parent);
+			var noOfExecutedSubTasks = task.execute(this.parent);
 
 			if (noOfExecutedSubTasks > 0) {
 				// no exception & at least one sub-task executed -> remove this component from
@@ -193,56 +192,52 @@ protected void forever() throws InterruptedException {
 
 	/**
 	 * Gets one Read-Tasks with priority Low or Once.
-	 * 
+	 *
 	 * @return a list of ReadTasks by Source-ID
 	 */
 	private ReadTask getOneLowPriorityReadTask() {
 		// Get next Priority ONCE task
-		ReadTask oncePriorityTask = this.readTasksManager.getOneTask(Priority.ONCE);
+		var oncePriorityTask = this.readTasksManager.getOneTask(Priority.ONCE);
 		if (oncePriorityTask != null && !oncePriorityTask.hasBeenExecuted()) {
 			return oncePriorityTask;
 
-		} else {
-			// No more Priority ONCE tasks available -> add Priority LOW task
-			ReadTask lowPriorityTask = this.readTasksManager.getOneTask(Priority.LOW);
-			if (lowPriorityTask != null) {
-				return lowPriorityTask;
-			}
 		}
-		return null;
+		// No more Priority ONCE tasks available -> add Priority LOW task
+		var lowPriorityTask = this.readTasksManager.getOneTask(Priority.LOW);
+		return lowPriorityTask;
 	}
 
 	/**
 	 * Gets all the High-Priority Read-Tasks.
-	 * 
+	 *
 	 * <p>
 	 * This checks if a device is listed as defective and - if it is - adds only one
 	 * ReadTask of this Source-Component to the queue
-	 * 
+	 *
 	 * @return a list of ReadTasks
 	 */
 	private List<ReadTask> getAllHighPriorityReadTasks() {
-		Multimap<String, ReadTask> tasks = this.readTasksManager.getAllTasksBySourceId(Priority.HIGH);
+		var tasks = this.readTasksManager.getAllTasksBySourceId(Priority.HIGH);
 		return this.filterDefectiveComponents(tasks);
 	}
 
 	/**
 	 * Gets the Write-Tasks by Source-ID.
-	 * 
+	 *
 	 * <p>
 	 * This checks if a device is listed as defective and - if it is - adds only one
 	 * WriteTask of this Source-Component to the queue
-	 * 
+	 *
 	 * @return a list of WriteTasks by Source-ID
 	 */
 	private List<WriteTask> getAllWriteTasks() {
-		Multimap<String, WriteTask> tasks = this.writeTasksManager.getAllTasksBySourceId();
+		var tasks = this.writeTasksManager.getAllTasksBySourceId();
 		return this.filterDefectiveComponents(tasks);
 	}
 
 	/**
 	 * Does this {@link ModbusWorker} have any Tasks?.
-	 * 
+	 *
 	 * @return true if there are Tasks
 	 */
 	private boolean hasTasks() {
@@ -253,7 +248,7 @@ private boolean hasTasks() {
 	 * Filters a Multimap with Tasks by Component-ID. For Components that are known
 	 * to be defective, only one task is added; otherwise all tasks are added to the
 	 * result. The idea is to not execute tasks that are known to fail.
-	 * 
+	 *
 	 * @param <T>   the Task type
 	 * @param tasks Tasks by Component-ID
 	 * @return a list of filtered tasks
@@ -261,10 +256,10 @@ private boolean hasTasks() {
 	private <T extends Task> List<T> filterDefectiveComponents(Multimap<String, T> tasks) {
 		List<T> result = new ArrayList<>();
 		for (Collection<T> tasksOfComponent : tasks.asMap().values()) {
-			Iterator<T> iterator = tasksOfComponent.iterator();
+			var iterator = tasksOfComponent.iterator();
 			if (iterator.hasNext()) {
-				T task = iterator.next(); // get first task
-				ModbusComponent modbusComponent = task.getParent();
+				var task = iterator.next(); // get first task
+				var modbusComponent = task.getParent();
 				if (modbusComponent.getModbusCommunicationFailed().get() == Boolean.TRUE) {
 					// Component is known to be erroneous -> add only one Task
 					result.add(task);
@@ -279,7 +274,7 @@ private <T extends Task> List<T> filterDefectiveComponents(Multimap<String, T> t
 
 	/**
 	 * Adds the protocol.
-	 * 
+	 *
 	 * @param sourceId Component-ID of the source
 	 * @param protocol the ModbusProtocol
 	 */
@@ -290,7 +285,7 @@ public void addProtocol(String sourceId, ModbusProtocol protocol) {
 
 	/**
 	 * Removes the protocol.
-	 * 
+	 *
 	 * @param sourceId Component-ID of the source
 	 */
 	public void removeProtocol(String sourceId) {
@@ -300,11 +295,11 @@ public void removeProtocol(String sourceId) {
 
 	/**
 	 * This is a helper function. It calculates the opposite of Math.floorDiv().
-	 * 
+	 *
 	 * <p>
 	 * Source:
 	 * https://stackoverflow.com/questions/27643616/ceil-conterpart-for-math-floordiv-in-java
-	 * 
+	 *
 	 * @param x the dividend
 	 * @param y the divisor
 	 * @return the result of the division, rounded up
diff --git a/io.openems.edge.bridge.modbus/src/io/openems/edge/bridge/modbus/api/element/AbstractDoubleWordElement.java b/io.openems.edge.bridge.modbus/src/io/openems/edge/bridge/modbus/api/element/AbstractDoubleWordElement.java
index 7626269734e..7ac4e5933ba 100644
--- a/io.openems.edge.bridge.modbus/src/io/openems/edge/bridge/modbus/api/element/AbstractDoubleWordElement.java
+++ b/io.openems.edge.bridge.modbus/src/io/openems/edge/bridge/modbus/api/element/AbstractDoubleWordElement.java
@@ -29,9 +29,10 @@ public AbstractDoubleWordElement(OpenemsType type, int startAddress) {
 
 	/**
 	 * Gets an instance of the correct subclass of myself.
-	 * 
+	 *
 	 * @return myself
 	 */
+	@Override
 	protected abstract E self();
 
 	@Override
@@ -42,8 +43,8 @@ public final int getLength() {
 	@Override
 	protected final void _setInputRegisters(InputRegister... registers) {
 		// fill buffer
-		ByteBuffer buff = ByteBuffer.allocate(4).order(this.getByteOrder());
-		if (wordOrder == WordOrder.MSWLSW) {
+		var buff = ByteBuffer.allocate(4).order(this.getByteOrder());
+		if (this.wordOrder == WordOrder.MSWLSW) {
 			buff.put(registers[0].toBytes());
 			buff.put(registers[1].toBytes());
 		} else {
@@ -52,14 +53,14 @@ protected final void _setInputRegisters(InputRegister... registers) {
 		}
 		buff.rewind();
 		// convert registers to Long
-		T value = fromByteBuffer(buff);
+		var value = this.fromByteBuffer(buff);
 		// set value
 		super.setValue(value);
 	}
 
 	/**
 	 * Converts a 4-byte ByteBuffer to the the current OpenemsType.
-	 * 
+	 *
 	 * @param buff the ByteBuffer
 	 * @return an instance of the given OpenemsType
 	 */
@@ -69,12 +70,12 @@ protected final void _setInputRegisters(InputRegister... registers) {
 	public final void _setNextWriteValue(Optional<T> valueOpt) throws OpenemsException {
 		if (valueOpt.isPresent()) {
 			if (this.isDebug()) {
-				log.info("Element [" + this + "] set next write value to [" + valueOpt.orElse(null) + "].");
+				this.log.info("Element [" + this + "] set next write value to [" + valueOpt.orElse(null) + "].");
 			}
-			ByteBuffer buff = ByteBuffer.allocate(4).order(this.getByteOrder());
+			var buff = ByteBuffer.allocate(4).order(this.getByteOrder());
 			buff = this.toByteBuffer(buff, valueOpt.get());
-			byte[] b = buff.array();
-			if (wordOrder == WordOrder.MSWLSW) {
+			var b = buff.array();
+			if (this.wordOrder == WordOrder.MSWLSW) {
 				this.setNextWriteValueRegisters(Optional.of(new Register[] { //
 						new SimpleRegister(b[0], b[1]), new SimpleRegister(b[2], b[3]) }));
 			} else {
@@ -89,7 +90,7 @@ public final void _setNextWriteValue(Optional<T> valueOpt) throws OpenemsExcepti
 
 	/**
 	 * Converts the current OpenemsType to a 4-byte ByteBuffer.
-	 * 
+	 *
 	 * @param buff  the target ByteBuffer
 	 * @param value an instance of the given OpenemsType
 	 * @return the ByteBuffer
@@ -99,7 +100,7 @@ public final void _setNextWriteValue(Optional<T> valueOpt) throws OpenemsExcepti
 	/**
 	 * Sets the Word-Order. Default is "MSWLSW" - "Most Significant Word; Least
 	 * Significant Word". See http://www.simplymodbus.ca/FAQ.htm#Order.
-	 * 
+	 *
 	 * @param wordOrder the new Word-Order
 	 * @return myself
 	 */
diff --git a/io.openems.edge.bridge.modbus/src/io/openems/edge/bridge/modbus/api/element/AbstractModbusElement.java b/io.openems.edge.bridge.modbus/src/io/openems/edge/bridge/modbus/api/element/AbstractModbusElement.java
index b87bb507e6f..9479d0c9c76 100644
--- a/io.openems.edge.bridge.modbus/src/io/openems/edge/bridge/modbus/api/element/AbstractModbusElement.java
+++ b/io.openems.edge.bridge.modbus/src/io/openems/edge/bridge/modbus/api/element/AbstractModbusElement.java
@@ -57,11 +57,11 @@ public OpenemsType getType() {
 
 	/**
 	 * The onUpdateCallback is called on reception of a new value.
-	 * 
+	 *
 	 * <p>
 	 * Be aware, that this is the original, untouched value.
 	 * ChannelToElementConverters are not applied here yet!
-	 * 
+	 *
 	 * @param onUpdateCallback the Callback
 	 * @return myself
 	 */
@@ -72,12 +72,12 @@ public AbstractModbusElement<T> onUpdateCallback(Consumer<T> onUpdateCallback) {
 
 	@Override
 	public int getStartAddress() {
-		return startAddress;
+		return this.startAddress;
 	}
 
 	@Override
 	public boolean isIgnored() {
-		return isIgnored;
+		return this.isIgnored;
 	}
 
 	@Override
@@ -86,12 +86,12 @@ public void setModbusTask(AbstractTask abstractTask) {
 	}
 
 	public AbstractTask getModbusTask() {
-		return abstractTask;
+		return this.abstractTask;
 	}
 
 	protected void setValue(T value) {
 		if (this.isDebug) {
-			log.info("Element [" + this + "] set value to [" + value + "].");
+			this.log.info("Element [" + this + "] set value to [" + value + "].");
 		}
 		if (value != null) {
 			this.invalidValueCounter = 0;
@@ -107,9 +107,8 @@ public boolean invalidate(AbstractModbusBridge bridge) {
 		if (bridge.invalidateElementsAfterReadErrors() <= this.invalidValueCounter) {
 			this.setValue(null);
 			return true;
-		} else {
-			return false;
 		}
+		return false;
 	}
 
 	/*
@@ -123,7 +122,7 @@ public AbstractModbusElement<T> debug() {
 	}
 
 	protected boolean isDebug() {
-		return isDebug;
+		return this.isDebug;
 	}
 
 	@Override
diff --git a/io.openems.edge.bridge.modbus/src/io/openems/edge/bridge/modbus/api/element/AbstractModbusRegisterElement.java b/io.openems.edge.bridge.modbus/src/io/openems/edge/bridge/modbus/api/element/AbstractModbusRegisterElement.java
index 195c79f41c9..319968a6981 100644
--- a/io.openems.edge.bridge.modbus/src/io/openems/edge/bridge/modbus/api/element/AbstractModbusRegisterElement.java
+++ b/io.openems.edge.bridge.modbus/src/io/openems/edge/bridge/modbus/api/element/AbstractModbusRegisterElement.java
@@ -1,14 +1,16 @@
 package io.openems.edge.bridge.modbus.api.element;
 
+import java.nio.ByteOrder;
+import java.util.Optional;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
 import com.ghgande.j2mod.modbus.procimg.InputRegister;
 import com.ghgande.j2mod.modbus.procimg.Register;
+
 import io.openems.common.exceptions.OpenemsException;
 import io.openems.common.types.OpenemsType;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-import java.nio.ByteOrder;
-import java.util.Optional;
 
 /**
  * A ModbusRegisterElement represents one or more Modbus Registers.
@@ -29,7 +31,7 @@ public AbstractModbusRegisterElement(OpenemsType type, int startAddress) {
 
 	/**
 	 * Gets an instance of the correct subclass of myself.
-	 * 
+	 *
 	 * @return myself
 	 */
 	protected abstract E self();
@@ -42,6 +44,7 @@ protected void setNextWriteValueRegisters(Optional<Register[]> writeValueOpt) th
 		this.nextWriteValue = writeValueOpt;
 	}
 
+	@Override
 	public Optional<Register[]> getNextWriteValue() {
 		return this.nextWriteValue;
 	}
@@ -54,7 +57,7 @@ public Optional<Register[]> getNextWriteValue() {
 	/**
 	 * Sets the Byte-Order. Default is "BIG_ENDIAN". See
 	 * http://www.simplymodbus.ca/FAQ.htm#Order.
-	 * 
+	 *
 	 * @param byteOrder the ByteOrder
 	 * @return myself
 	 */
@@ -64,21 +67,21 @@ public final E byteOrder(ByteOrder byteOrder) {
 	}
 
 	public ByteOrder getByteOrder() {
-		return byteOrder;
+		return this.byteOrder;
 	}
 
 	@Override
 	public void setInputRegisters(InputRegister... registers) throws OpenemsException {
 		if (this.isDebug()) {
-			StringBuilder b = new StringBuilder("Element [" + this + "] set input registers to [");
-			for (int i = 0; i < registers.length; i++) {
+			var b = new StringBuilder("Element [" + this + "] set input registers to [");
+			for (var i = 0; i < registers.length; i++) {
 				b.append(registers[i].getValue());
 				if (i < registers.length - 1) {
 					b.append(",");
 				}
 			}
 			b.append("].");
-			log.info(b.toString());
+			this.log.info(b.toString());
 		}
 		if (registers.length != this.getLength()) {
 			throw new OpenemsException("Modbus Element [" + this + "]: registers length [" + registers.length
diff --git a/io.openems.edge.bridge.modbus/src/io/openems/edge/bridge/modbus/api/element/AbstractQuadrupleWordElement.java b/io.openems.edge.bridge.modbus/src/io/openems/edge/bridge/modbus/api/element/AbstractQuadrupleWordElement.java
index db0cbb0c591..74cd62919fe 100644
--- a/io.openems.edge.bridge.modbus/src/io/openems/edge/bridge/modbus/api/element/AbstractQuadrupleWordElement.java
+++ b/io.openems.edge.bridge.modbus/src/io/openems/edge/bridge/modbus/api/element/AbstractQuadrupleWordElement.java
@@ -35,7 +35,7 @@ public final int getLength() {
 	@Override
 	protected final void _setInputRegisters(InputRegister... registers) {
 		// fill buffer
-		ByteBuffer buff = ByteBuffer.allocate(8).order(this.getByteOrder());
+		var buff = ByteBuffer.allocate(8).order(this.getByteOrder());
 		if (this.wordOrder == WordOrder.MSWLSW) {
 			buff.put(registers[0].toBytes());
 			buff.put(registers[1].toBytes());
@@ -49,14 +49,14 @@ protected final void _setInputRegisters(InputRegister... registers) {
 		}
 		buff.rewind();
 		// convert registers to Long
-		T value = fromByteBuffer(buff);
+		var value = this.fromByteBuffer(buff);
 		// set value
 		super.setValue(value);
 	}
 
 	/**
 	 * Converts a 8-byte ByteBuffer to the current OpenemsType.
-	 * 
+	 *
 	 * @param buff the ByteBuffer
 	 * @return an instance of the current OpenemsType
 	 */
@@ -65,13 +65,13 @@ protected final void _setInputRegisters(InputRegister... registers) {
 	@Override
 	public final void _setNextWriteValue(Optional<T> valueOpt) throws OpenemsException {
 		if (this.isDebug()) {
-			log.info("Element [" + this + "] set next write value to [" + valueOpt.orElse(null) + "].");
+			this.log.info("Element [" + this + "] set next write value to [" + valueOpt.orElse(null) + "].");
 		}
 		if (valueOpt.isPresent()) {
-			ByteBuffer buff = ByteBuffer.allocate(8).order(this.getByteOrder());
+			var buff = ByteBuffer.allocate(8).order(this.getByteOrder());
 			buff = this.toByteBuffer(buff, valueOpt.get());
-			byte[] b = buff.array();
-			if (wordOrder == WordOrder.MSWLSW) {
+			var b = buff.array();
+			if (this.wordOrder == WordOrder.MSWLSW) {
 				this.setNextWriteValueRegisters(Optional.of(new Register[] { //
 						new SimpleRegister(b[0], b[1]), //
 						new SimpleRegister(b[2], b[3]), //
@@ -94,7 +94,7 @@ public final void _setNextWriteValue(Optional<T> valueOpt) throws OpenemsExcepti
 
 	/**
 	 * Converts the current OpenemsType to a 8-byte ByteBuffer.
-	 * 
+	 *
 	 * @param buff  the target ByteBuffer
 	 * @param value the value
 	 * @return the ByteBuffer
@@ -104,7 +104,7 @@ public final void _setNextWriteValue(Optional<T> valueOpt) throws OpenemsExcepti
 	/**
 	 * Sets the Word-Order. Default is "MWSLSW" - "Most Significant Word; Least
 	 * Significant Word". See http://www.simplymodbus.ca/FAQ.htm#Order.
-	 * 
+	 *
 	 * @param wordOrder the WordOrder
 	 * @return myself
 	 */
diff --git a/io.openems.edge.bridge.modbus/src/io/openems/edge/bridge/modbus/api/element/AbstractWordElement.java b/io.openems.edge.bridge.modbus/src/io/openems/edge/bridge/modbus/api/element/AbstractWordElement.java
index 62ed9079495..b35a9d88efe 100644
--- a/io.openems.edge.bridge.modbus/src/io/openems/edge/bridge/modbus/api/element/AbstractWordElement.java
+++ b/io.openems.edge.bridge.modbus/src/io/openems/edge/bridge/modbus/api/element/AbstractWordElement.java
@@ -35,16 +35,16 @@ public final int getLength() {
 	@Override
 	protected void _setInputRegisters(InputRegister... registers) {
 		// convert registers
-		ByteBuffer buff = ByteBuffer.allocate(2).order(getByteOrder());
+		var buff = ByteBuffer.allocate(2).order(this.getByteOrder());
 		buff.put(registers[0].toBytes());
-		T value = fromByteBuffer(buff);
+		var value = this.fromByteBuffer(buff);
 		// set value
 		super.setValue(value);
 	}
 
 	/**
 	 * Converts a 2-byte ByteBuffer to the the current OpenemsType.
-	 * 
+	 *
 	 * @param buff the ByteBuffer
 	 * @return an instance of the current OpenemsType
 	 */
@@ -53,12 +53,12 @@ protected void _setInputRegisters(InputRegister... registers) {
 	@Override
 	public void _setNextWriteValue(Optional<T> valueOpt) throws OpenemsException {
 		if (this.isDebug()) {
-			log.info("Element [" + this + "] set next write value to [" + valueOpt.orElse(null) + "].");
+			this.log.info("Element [" + this + "] set next write value to [" + valueOpt.orElse(null) + "].");
 		}
 		if (valueOpt.isPresent()) {
-			ByteBuffer buff = ByteBuffer.allocate(2).order(this.getByteOrder());
+			var buff = ByteBuffer.allocate(2).order(this.getByteOrder());
 			buff = this.toByteBuffer(buff, valueOpt.get());
-			byte[] b = buff.array();
+			var b = buff.array();
 			this.setNextWriteValueRegisters(Optional.of(new Register[] { //
 					new SimpleRegister(b[0], b[1]) }));
 		} else {
@@ -69,7 +69,7 @@ public void _setNextWriteValue(Optional<T> valueOpt) throws OpenemsException {
 
 	/**
 	 * Converts the current OpenemsType to a 2-byte ByteBuffer.
-	 * 
+	 *
 	 * @param buff  the target ByteBuffer
 	 * @param value the value
 	 * @return the ByteBuffer
diff --git a/io.openems.edge.bridge.modbus/src/io/openems/edge/bridge/modbus/api/element/BitsWordElement.java b/io.openems.edge.bridge.modbus/src/io/openems/edge/bridge/modbus/api/element/BitsWordElement.java
index 0a40ddf1607..2743fe81bfe 100644
--- a/io.openems.edge.bridge.modbus/src/io/openems/edge/bridge/modbus/api/element/BitsWordElement.java
+++ b/io.openems.edge.bridge.modbus/src/io/openems/edge/bridge/modbus/api/element/BitsWordElement.java
@@ -51,7 +51,7 @@ protected BitsWordElement self() {
 
 	/**
 	 * Adds a mapping for a given bit.
-	 * 
+	 *
 	 * @param bitIndex  the index of the bit; a number between 0 and 15
 	 * @param channelId the Channel-ID
 	 * @param converter the Bit-Converter
@@ -67,9 +67,9 @@ public BitsWordElement bit(int bitIndex, ChannelId channelId, BitConverter conve
 			throw new IllegalArgumentException("Channel [" + channelId + "] must be of type [BOOLEAN] for bit-mapping");
 		}
 		@SuppressWarnings("unchecked")
-		Channel<Boolean> booleanChannel = (Channel<Boolean>) channel;
+		var booleanChannel = (Channel<Boolean>) channel;
 
-		ChannelWrapper channelWrapper = new ChannelWrapper(booleanChannel, converter);
+		var channelWrapper = new ChannelWrapper(booleanChannel, converter);
 
 		// Set Channel-Source
 		channel.setMetaInfo(new ChannelMetaInfoBit(this.getStartAddress(), bitIndex));
@@ -77,7 +77,7 @@ public BitsWordElement bit(int bitIndex, ChannelId channelId, BitConverter conve
 		// Add Modbus Address and Bit-Index to Channel Source
 		if (channel instanceof WriteChannel<?>) {
 			// Handle Writes to Bit-Channels
-			WriteChannel<Boolean> booleanWriteChannel = (WriteChannel<Boolean>) booleanChannel;
+			var booleanWriteChannel = (WriteChannel<Boolean>) booleanChannel;
 			booleanWriteChannel.onSetNextWrite(value -> {
 				// Listen on Writes to the BooleanChannel and store the value
 				channelWrapper.setWriteValue(value);
@@ -90,7 +90,7 @@ public BitsWordElement bit(int bitIndex, ChannelId channelId, BitConverter conve
 
 	/**
 	 * Adds a mapping for a given bit.
-	 * 
+	 *
 	 * @param bitIndex  the index of the bit; a number between 0 and 15
 	 * @param channelId the Channel-ID
 	 * @return myself for builder pattern
@@ -101,9 +101,10 @@ public BitsWordElement bit(int bitIndex, ChannelId channelId) {
 
 	/**
 	 * Sets the individual BooleanChannel-Values from an InputRegister.
-	 * 
+	 *
 	 * @param registers the InputRegisters
 	 */
+	@Override
 	protected void _setInputRegisters(InputRegister... registers) {
 		if (registers.length != 1) {
 			throw new IllegalArgumentException("Expected only one Register instead of [" + registers.length
@@ -111,19 +112,19 @@ protected void _setInputRegisters(InputRegister... registers) {
 		}
 
 		// convert Register to int
-		ByteBuffer buff = ByteBuffer.allocate(2).order(this.getByteOrder());
+		var buff = ByteBuffer.allocate(2).order(this.getByteOrder());
 		buff.put(registers[0].toBytes());
-		int value = Short.toUnsignedInt(buff.getShort(0));
+		var value = Short.toUnsignedInt(buff.getShort(0));
 
-		for (int bitIndex = 0; bitIndex < 16; bitIndex++) {
+		for (var bitIndex = 0; bitIndex < 16; bitIndex++) {
 			// Get Wrapper
-			ChannelWrapper wrapper = this.channels[bitIndex];
+			var wrapper = this.channels[bitIndex];
 			if (wrapper == null) {
 				continue;
 			}
 
 			// Get Value
-			boolean setValue = value << ~bitIndex < 0;
+			var setValue = value << ~bitIndex < 0;
 
 			// Apply Bit-Conversion
 			switch (wrapper.converter) {
@@ -141,20 +142,20 @@ protected void _setInputRegisters(InputRegister... registers) {
 
 	/**
 	 * Gets the next write value from all Bits and resets them.
-	 * 
+	 *
 	 * <p>
 	 * This method should be called once in every cycle on the
 	 * TOPIC_CYCLE_EXECUTE_WRITE event. It makes sure, that the nextWriteValue gets
 	 * initialized in every Cycle. If registers need to be written again in every
 	 * cycle, next setNextWriteValue()-method needs to called on every Cycle.
-	 * 
+	 *
 	 * @return the next value as an Optional array of Registers
 	 */
 	@Override
 	public Optional<Register[]> getNextWriteValueAndReset() {
 		// Check if any BooleanWriteChannel has a Write-Value; if none: return
 		// Optional.empty.
-		boolean isAnyBooleanWriteChannelSet = false;
+		var isAnyBooleanWriteChannelSet = false;
 		for (ChannelWrapper wrapper : this.channels) {
 			if (wrapper != null && wrapper.getWriteValue().isPresent()) {
 				isAnyBooleanWriteChannelSet = true;
@@ -166,28 +167,28 @@ public Optional<Register[]> getNextWriteValueAndReset() {
 		}
 
 		// Get value of each BooleanChannel
-		byte b0 = (byte) 0;
-		byte b1 = (byte) 0;
+		var b0 = (byte) 0;
+		var b1 = (byte) 0;
 		List<ChannelAddress> channelsWithMissingWriteValue = new ArrayList<>();
-		for (int bitIndex = 0; bitIndex < this.channels.length; bitIndex++) {
-			ChannelWrapper wrapper = this.channels[bitIndex];
+		for (var bitIndex = 0; bitIndex < this.channels.length; bitIndex++) {
+			var wrapper = this.channels[bitIndex];
 			if (wrapper == null) {
 				continue;
 			}
-			Optional<Boolean> valueOpt = wrapper.getWriteValue();
+			var valueOpt = wrapper.getWriteValue();
 			if (!valueOpt.isPresent()) {
 				channelsWithMissingWriteValue.add(wrapper.channel.address());
 				continue;
 			}
 			// Write-Value exists
 			boolean value = valueOpt.get();
-			if ((value && wrapper.converter == BitConverter.DIRECT_1_TO_1) //
-					|| (!value && wrapper.converter == BitConverter.INVERT)) {
+			if ((value ? wrapper.converter == BitConverter.DIRECT_1_TO_1 //
+					: wrapper.converter == BitConverter.INVERT)) {
 				// Value is true -> set the bit of the byte
 				if (bitIndex < 8) {
 					b0 |= 1 << bitIndex;
 				} else {
-					b1 |= 1 << (bitIndex - 8);
+					b1 |= 1 << bitIndex - 8;
 				}
 			}
 		}
@@ -219,7 +220,7 @@ public Optional<Register[]> getNextWriteValueAndReset() {
 
 		// Log Debug
 		if (this.isDebug()) {
-			log.info("BitsWordElement [" + this + "]: next write value is to [" //
+			this.log.info("BitsWordElement [" + this + "]: next write value is to [" //
 					+ String.format("%16s", Integer.toBinaryString(result.getValue())).replace(' ', '0') + //
 					"/0x" + String.format("%4s", Integer.toHexString(result.getValue())).replace(' ', '0') + "].");
 		}
@@ -228,14 +229,17 @@ public Optional<Register[]> getNextWriteValueAndReset() {
 
 	}
 
+	@Override
 	protected Integer fromByteBuffer(ByteBuffer buff) {
 		throw new IllegalArgumentException("BitsWordElement.fromByteBuffer() should never be called");
 	}
 
+	@Override
 	public Optional<Register[]> getNextWriteValue() {
 		throw new IllegalArgumentException("BitsWordElement.getNextWriteValue() should never be called");
 	}
 
+	@Override
 	public void _setNextWriteValue(Optional<Integer> valueOpt) throws OpenemsException {
 		throw new IllegalArgumentException("BitsWordElement._setNextWriteValue() should never be called");
 	}
@@ -244,7 +248,7 @@ protected ByteBuffer toByteBuffer(ByteBuffer buff, Integer value) {
 		throw new IllegalArgumentException("BitsWordElement.toByteBuffer() should never be called");
 	}
 
-	private class ChannelWrapper {
+	private static class ChannelWrapper {
 		private final Channel<?> channel;
 		private final BitConverter converter;
 		private Optional<Boolean> writeValue = Optional.empty();
@@ -259,7 +263,7 @@ protected void setWriteValue(Boolean value) {
 		}
 
 		protected Optional<Boolean> getWriteValue() {
-			return writeValue;
+			return this.writeValue;
 		}
 	}
 }
diff --git a/io.openems.edge.bridge.modbus/src/io/openems/edge/bridge/modbus/api/element/CoilElement.java b/io.openems.edge.bridge.modbus/src/io/openems/edge/bridge/modbus/api/element/CoilElement.java
index b45651cd799..7ff4ba419b0 100644
--- a/io.openems.edge.bridge.modbus/src/io/openems/edge/bridge/modbus/api/element/CoilElement.java
+++ b/io.openems.edge.bridge.modbus/src/io/openems/edge/bridge/modbus/api/element/CoilElement.java
@@ -25,6 +25,7 @@ public CoilElement(int startAddress) {
 		super(OpenemsType.BOOLEAN, startAddress);
 	}
 
+	@Override
 	public Optional<Boolean> getNextWriteValue() {
 		return this.nextWriteValue;
 	}
@@ -37,7 +38,7 @@ public int getLength() {
 	@Override
 	public void _setNextWriteValue(Optional<Boolean> valueOpt) throws OpenemsException {
 		if (this.isDebug()) {
-			log.info("Element [" + this + "] set next write value to [" + valueOpt.orElse(null) + "].");
+			this.log.info("Element [" + this + "] set next write value to [" + valueOpt.orElse(null) + "].");
 		}
 		this.nextWriteValue = valueOpt;
 		this.onSetNextWriteCallbacks.forEach(callback -> callback.accept(valueOpt));
@@ -46,7 +47,7 @@ public void _setNextWriteValue(Optional<Boolean> valueOpt) throws OpenemsExcepti
 	@Override
 	public void setInputCoil(Boolean coil) throws OpenemsException {
 		if (this.isDebug()) {
-			log.info("Element [" + this + "] set input coil to [" + coil + "]");
+			this.log.info("Element [" + this + "] set input coil to [" + coil + "]");
 		}
 		// set value
 		super.setValue(coil);
diff --git a/io.openems.edge.bridge.modbus/src/io/openems/edge/bridge/modbus/api/element/DummyCoilElement.java b/io.openems.edge.bridge.modbus/src/io/openems/edge/bridge/modbus/api/element/DummyCoilElement.java
index a8c82550613..f0a501fbb8e 100644
--- a/io.openems.edge.bridge.modbus/src/io/openems/edge/bridge/modbus/api/element/DummyCoilElement.java
+++ b/io.openems.edge.bridge.modbus/src/io/openems/edge/bridge/modbus/api/element/DummyCoilElement.java
@@ -29,7 +29,6 @@ public void _setNextWriteValue(Optional<Boolean> valueOpt) {
 	 */
 	@Override
 	public void setInputCoil(Boolean coil) {
-		return;
 	}
 
 	@Override
diff --git a/io.openems.edge.bridge.modbus/src/io/openems/edge/bridge/modbus/api/element/DummyRegisterElement.java b/io.openems.edge.bridge.modbus/src/io/openems/edge/bridge/modbus/api/element/DummyRegisterElement.java
index 44e40854236..50c54f1faf4 100644
--- a/io.openems.edge.bridge.modbus/src/io/openems/edge/bridge/modbus/api/element/DummyRegisterElement.java
+++ b/io.openems.edge.bridge.modbus/src/io/openems/edge/bridge/modbus/api/element/DummyRegisterElement.java
@@ -11,7 +11,8 @@
  * A DummyRegisterElement is a placeholder for an empty
  * {@link ModbusRegisterElement}.
  */
-public class DummyRegisterElement extends AbstractModbusElement<Void> implements ModbusRegisterElement<Void>, DummyElement {
+public class DummyRegisterElement extends AbstractModbusElement<Void>
+		implements ModbusRegisterElement<Void>, DummyElement {
 
 	private final int length;
 
@@ -26,7 +27,7 @@ public DummyRegisterElement(int fromAddress, int toAddress) {
 
 	@Override
 	public int getLength() {
-		return length;
+		return this.length;
 	}
 
 	/**
@@ -34,7 +35,6 @@ public int getLength() {
 	 */
 	@Override
 	public void setInputRegisters(InputRegister... registers) {
-		return;
 	}
 
 	@Override
diff --git a/io.openems.edge.bridge.modbus/src/io/openems/edge/bridge/modbus/api/element/FloatDoublewordElement.java b/io.openems.edge.bridge.modbus/src/io/openems/edge/bridge/modbus/api/element/FloatDoublewordElement.java
index 505b44f17dc..6b20b9a6f25 100644
--- a/io.openems.edge.bridge.modbus/src/io/openems/edge/bridge/modbus/api/element/FloatDoublewordElement.java
+++ b/io.openems.edge.bridge.modbus/src/io/openems/edge/bridge/modbus/api/element/FloatDoublewordElement.java
@@ -1,9 +1,9 @@
 package io.openems.edge.bridge.modbus.api.element;
 
-import io.openems.common.types.OpenemsType;
-
 import java.nio.ByteBuffer;
 
+import io.openems.common.types.OpenemsType;
+
 /**
  * A FloatDoublewordElement represents a Float value according to IEEE-754 in an
  * {@link AbstractDoubleWordElement}.
@@ -19,10 +19,12 @@ protected FloatDoublewordElement self() {
 		return this;
 	}
 
+	@Override
 	protected Float fromByteBuffer(ByteBuffer buff) {
 		return buff.order(this.getByteOrder()).getFloat(0);
 	}
 
+	@Override
 	protected ByteBuffer toByteBuffer(ByteBuffer buff, Float value) {
 		return buff.putFloat(value.floatValue());
 	}
diff --git a/io.openems.edge.bridge.modbus/src/io/openems/edge/bridge/modbus/api/element/FloatQuadruplewordElement.java b/io.openems.edge.bridge.modbus/src/io/openems/edge/bridge/modbus/api/element/FloatQuadruplewordElement.java
index 7fad114bc35..aa7ed1122cb 100644
--- a/io.openems.edge.bridge.modbus/src/io/openems/edge/bridge/modbus/api/element/FloatQuadruplewordElement.java
+++ b/io.openems.edge.bridge.modbus/src/io/openems/edge/bridge/modbus/api/element/FloatQuadruplewordElement.java
@@ -1,9 +1,9 @@
 package io.openems.edge.bridge.modbus.api.element;
 
-import io.openems.common.types.OpenemsType;
-
 import java.nio.ByteBuffer;
 
+import io.openems.common.types.OpenemsType;
+
 /**
  * A FloatQuadruplewordElement represents a Float value in an
  * {@link AbstractQuadrupleWordElement}.
@@ -19,10 +19,12 @@ protected FloatQuadruplewordElement self() {
 		return this;
 	}
 
+	@Override
 	protected Double fromByteBuffer(ByteBuffer buff) {
 		return Double.valueOf(buff.getDouble());
 	}
 
+	@Override
 	protected ByteBuffer toByteBuffer(ByteBuffer buff, Double value) {
 		return buff.putDouble(value.doubleValue());
 	}
diff --git a/io.openems.edge.bridge.modbus/src/io/openems/edge/bridge/modbus/api/element/ModbusCoilElement.java b/io.openems.edge.bridge.modbus/src/io/openems/edge/bridge/modbus/api/element/ModbusCoilElement.java
index 1368baaf197..6f1fa41a86f 100644
--- a/io.openems.edge.bridge.modbus/src/io/openems/edge/bridge/modbus/api/element/ModbusCoilElement.java
+++ b/io.openems.edge.bridge.modbus/src/io/openems/edge/bridge/modbus/api/element/ModbusCoilElement.java
@@ -13,7 +13,7 @@ public interface ModbusCoilElement extends ModbusElement<Boolean> {
 
 	/**
 	 * Sets the boolean value of this Element from Modbus Coil.
-	 * 
+	 *
 	 * @param coil the value
 	 * @throws OpenemsException on error
 	 */
@@ -21,7 +21,7 @@ public interface ModbusCoilElement extends ModbusElement<Boolean> {
 
 	/**
 	 * Sets a value that should be written to the Modbus device.
-	 * 
+	 *
 	 * @param valueOpt the Optional value
 	 * @throws OpenemsException on error
 	 */
@@ -37,17 +37,17 @@ public default void setNextWriteValue(Optional<Boolean> valueOpt) throws Openems
 
 	/**
 	 * Gets the next write value and resets it.
-	 * 
+	 *
 	 * <p>
 	 * This method should be called once in every cycle on the
 	 * TOPIC_CYCLE_EXECUTE_WRITE event. It makes sure, that the nextWriteValue gets
 	 * initialized in every Cycle. If registers need to be written again in every
 	 * cycle, next setNextWriteValue()-method needs to called on every Cycle.
-	 * 
+	 *
 	 * @return the Optional next write value
 	 */
 	public default Optional<Boolean> getNextWriteValueAndReset() {
-		Optional<Boolean> valueOpt = this.getNextWriteValue();
+		var valueOpt = this.getNextWriteValue();
 		try {
 			if (valueOpt.isPresent()) {
 				this._setNextWriteValue(Optional.empty());
diff --git a/io.openems.edge.bridge.modbus/src/io/openems/edge/bridge/modbus/api/element/ModbusElement.java b/io.openems.edge.bridge.modbus/src/io/openems/edge/bridge/modbus/api/element/ModbusElement.java
index 3488ff70a2b..e9cbb687595 100644
--- a/io.openems.edge.bridge.modbus/src/io/openems/edge/bridge/modbus/api/element/ModbusElement.java
+++ b/io.openems.edge.bridge.modbus/src/io/openems/edge/bridge/modbus/api/element/ModbusElement.java
@@ -16,21 +16,21 @@ public interface ModbusElement<T> {
 
 	/**
 	 * Gets the start address of this Modbus element.
-	 * 
+	 *
 	 * @return the start address
 	 */
 	public int getStartAddress();
 
 	/**
 	 * Number of Registers or Coils.
-	 * 
+	 *
 	 * @return the number of Registers or Coils
 	 */
 	public abstract int getLength();
 
 	/**
 	 * Set the {@link AbstractTask}, where this Element belongs to.
-	 * 
+	 *
 	 * <p>
 	 * This is called by the {@link AbstractTask} constructor.
 	 *
@@ -40,21 +40,21 @@ public interface ModbusElement<T> {
 
 	/**
 	 * Whether this Element should be ignored (= DummyElement).
-	 * 
+	 *
 	 * @return true for ignored elements
 	 */
 	public boolean isIgnored();
 
 	/**
 	 * Gets the type of this Register, e.g. INTEGER, BOOLEAN,..
-	 * 
+	 *
 	 * @return the OpenemsType
 	 */
 	public OpenemsType getType();
 
 	/**
 	 * Sets a value that should be written to the Modbus device.
-	 * 
+	 *
 	 * @param valueOpt the Optional value
 	 * @throws OpenemsException         on error
 	 * @throws IllegalArgumentException on error
@@ -64,7 +64,7 @@ public interface ModbusElement<T> {
 	/**
 	 * Add an onSetNextWrite callback. It is called when a 'next write value' was
 	 * set.
-	 * 
+	 *
 	 * @param callback the callback
 	 */
 	public void onSetNextWrite(Consumer<Optional<T>> callback);
@@ -73,7 +73,7 @@ public interface ModbusElement<T> {
 	 * Invalidates the Channel in case it could not be read from the Modbus device,
 	 * i.e. sets the value to 'UNDEFINED'/null. Applies the
 	 * 'invalidateElementsAfterReadErrors' config setting of the bridge.
-	 * 
+	 *
 	 * @param the {@link AbstractModbusBridge}
 	 * @return true if Channel was invalidated
 	 */
diff --git a/io.openems.edge.bridge.modbus/src/io/openems/edge/bridge/modbus/api/element/ModbusRegisterElement.java b/io.openems.edge.bridge.modbus/src/io/openems/edge/bridge/modbus/api/element/ModbusRegisterElement.java
index 1fc4a22ae70..c6cebda0528 100644
--- a/io.openems.edge.bridge.modbus/src/io/openems/edge/bridge/modbus/api/element/ModbusRegisterElement.java
+++ b/io.openems.edge.bridge.modbus/src/io/openems/edge/bridge/modbus/api/element/ModbusRegisterElement.java
@@ -15,7 +15,7 @@ public interface ModbusRegisterElement<T> extends ModbusElement<T> {
 
 	/**
 	 * Sets the value of this Element from InputRegisters.
-	 * 
+	 *
 	 * @param registers the InputRegisters
 	 * @throws OpenemsException on error
 	 */
@@ -23,7 +23,7 @@ public interface ModbusRegisterElement<T> extends ModbusElement<T> {
 
 	/**
 	 * Sets a value that should be written to the Modbus device.
-	 * 
+	 *
 	 * @param valueOpt the Optional value
 	 * @throws OpenemsException         on error
 	 * @throws IllegalArgumentException on error
@@ -40,17 +40,17 @@ public default void setNextWriteValue(Optional<Object> valueOpt) throws OpenemsE
 
 	/**
 	 * Gets the next write value and resets it.
-	 * 
+	 *
 	 * <p>
 	 * This method should be called once in every cycle on the
 	 * TOPIC_CYCLE_EXECUTE_WRITE event. It makes sure, that the nextWriteValue gets
 	 * initialized in every Cycle. If registers need to be written again in every
 	 * cycle, next setNextWriteValue()-method needs to called on every Cycle.
-	 * 
+	 *
 	 * @return the next value as an Optional array of Registers
 	 */
 	public default Optional<Register[]> getNextWriteValueAndReset() {
-		Optional<Register[]> valueOpt = this.getNextWriteValue();
+		var valueOpt = this.getNextWriteValue();
 		try {
 			if (valueOpt.isPresent()) {
 				this._setNextWriteValue(Optional.empty());
diff --git a/io.openems.edge.bridge.modbus/src/io/openems/edge/bridge/modbus/api/element/SignedDoublewordElement.java b/io.openems.edge.bridge.modbus/src/io/openems/edge/bridge/modbus/api/element/SignedDoublewordElement.java
index 8db921315a0..ff15c3de78c 100644
--- a/io.openems.edge.bridge.modbus/src/io/openems/edge/bridge/modbus/api/element/SignedDoublewordElement.java
+++ b/io.openems.edge.bridge.modbus/src/io/openems/edge/bridge/modbus/api/element/SignedDoublewordElement.java
@@ -1,9 +1,9 @@
 package io.openems.edge.bridge.modbus.api.element;
 
-import io.openems.common.types.OpenemsType;
-
 import java.nio.ByteBuffer;
 
+import io.openems.common.types.OpenemsType;
+
 /**
  * A SignedDoublewordElement represents a Long value in an
  * {@link AbstractDoubleWordElement}.
@@ -19,10 +19,12 @@ protected SignedDoublewordElement self() {
 		return this;
 	}
 
+	@Override
 	protected Long fromByteBuffer(ByteBuffer buff) {
 		return Long.valueOf(buff.getInt());
 	}
 
+	@Override
 	protected ByteBuffer toByteBuffer(ByteBuffer buff, Long value) {
 		return buff.putInt(value.intValue());
 	}
diff --git a/io.openems.edge.bridge.modbus/src/io/openems/edge/bridge/modbus/api/element/SignedQuadruplewordElement.java b/io.openems.edge.bridge.modbus/src/io/openems/edge/bridge/modbus/api/element/SignedQuadruplewordElement.java
index 56949696a91..aeb2f8ca58d 100644
--- a/io.openems.edge.bridge.modbus/src/io/openems/edge/bridge/modbus/api/element/SignedQuadruplewordElement.java
+++ b/io.openems.edge.bridge.modbus/src/io/openems/edge/bridge/modbus/api/element/SignedQuadruplewordElement.java
@@ -1,9 +1,9 @@
 package io.openems.edge.bridge.modbus.api.element;
 
-import io.openems.common.types.OpenemsType;
-
 import java.nio.ByteBuffer;
 
+import io.openems.common.types.OpenemsType;
+
 /**
  * A SignedQuadruplewordElement represents a Long value in an
  * {@link AbstractQuadrupleWordElement}.
@@ -19,10 +19,12 @@ protected SignedQuadruplewordElement self() {
 		return this;
 	}
 
+	@Override
 	protected Long fromByteBuffer(ByteBuffer buff) {
 		return Long.valueOf(buff.getLong());
 	}
 
+	@Override
 	protected ByteBuffer toByteBuffer(ByteBuffer buff, Long value) {
 		return buff.putLong(value.longValue());
 	}
diff --git a/io.openems.edge.bridge.modbus/src/io/openems/edge/bridge/modbus/api/element/SignedWordElement.java b/io.openems.edge.bridge.modbus/src/io/openems/edge/bridge/modbus/api/element/SignedWordElement.java
index 4c89de8e217..2a416bfc2d3 100644
--- a/io.openems.edge.bridge.modbus/src/io/openems/edge/bridge/modbus/api/element/SignedWordElement.java
+++ b/io.openems.edge.bridge.modbus/src/io/openems/edge/bridge/modbus/api/element/SignedWordElement.java
@@ -20,10 +20,12 @@ protected SignedWordElement self() {
 		return this;
 	}
 
+	@Override
 	protected Short fromByteBuffer(ByteBuffer buff) {
-		return buff.order(getByteOrder()).getShort(0);
+		return buff.order(this.getByteOrder()).getShort(0);
 	}
 
+	@Override
 	protected ByteBuffer toByteBuffer(ByteBuffer buff, Object object) {
 		Short value = TypeUtils.getAsType(OpenemsType.SHORT, object);
 		return buff.putShort(value.shortValue());
diff --git a/io.openems.edge.bridge.modbus/src/io/openems/edge/bridge/modbus/api/element/StringWordElement.java b/io.openems.edge.bridge.modbus/src/io/openems/edge/bridge/modbus/api/element/StringWordElement.java
index 815494629af..160e23052f7 100644
--- a/io.openems.edge.bridge.modbus/src/io/openems/edge/bridge/modbus/api/element/StringWordElement.java
+++ b/io.openems.edge.bridge.modbus/src/io/openems/edge/bridge/modbus/api/element/StringWordElement.java
@@ -25,7 +25,7 @@ public class StringWordElement extends AbstractModbusRegisterElement<StringWordE
 	private final Logger log = LoggerFactory.getLogger(AbstractWordElement.class);
 
 	protected ByteOrder byteOrder = DEFAULT_BYTE_ORDER;
-	private int length;
+	private final int length;
 
 	public StringWordElement(int startAddress, int length) {
 		super(OpenemsType.STRING, startAddress);
@@ -40,10 +40,10 @@ public final int getLength() {
 	@Override
 	protected final void _setInputRegisters(InputRegister... registers) {
 		// convert registers
-		ByteBuffer buff = ByteBuffer.allocate(this.length * 2).order(getByteOrder());
+		var buff = ByteBuffer.allocate(this.length * 2).order(this.getByteOrder());
 		for (InputRegister r : registers) {
-			byte[] bs = r.toBytes();
-			for (int i = 0; i < bs.length; i++) {
+			var bs = r.toBytes();
+			for (var i = 0; i < bs.length; i++) {
 				if (bs[i] == 0) {
 					bs[i] = 32; // replace '0' with ASCII space
 				}
@@ -51,7 +51,7 @@ protected final void _setInputRegisters(InputRegister... registers) {
 			buff.put(bs);
 		}
 
-		String value = this.fromByteBuffer(buff);
+		var value = this.fromByteBuffer(buff);
 		// set value
 		super.setValue(value);
 	}
@@ -59,15 +59,15 @@ protected final void _setInputRegisters(InputRegister... registers) {
 	@Override
 	public void _setNextWriteValue(Optional<String> valueOpt) throws OpenemsException {
 		if (this.isDebug()) {
-			log.info("Element [" + this + "] set next write value to [" + valueOpt.orElse(null) + "].");
+			this.log.info("Element [" + this + "] set next write value to [" + valueOpt.orElse(null) + "].");
 		}
 		if (valueOpt.isPresent()) {
-			ByteBuffer buff = ByteBuffer.allocate(2 * this.length).order(this.getByteOrder());
+			var buff = ByteBuffer.allocate(2 * this.length).order(this.getByteOrder());
 			buff = this.toByteBuffer(buff, valueOpt.get());
-			byte[] b = buff.array();
+			var b = buff.array();
 
-			Register[] registers = new Register[this.length];
-			for (int i = 0; i < this.length; i = i + 1) {
+			var registers = new Register[this.length];
+			for (var i = 0; i < this.length; i = i + 1) {
 				registers[i] = new SimpleRegister(b[i * 2], b[i * 2 + 1]);
 			}
 
@@ -83,8 +83,7 @@ protected String fromByteBuffer(ByteBuffer buff) {
 	}
 
 	protected ByteBuffer toByteBuffer(ByteBuffer buff, String value) {
-		ByteBuffer b = ByteBuffer.wrap(value.getBytes());
-		return b;
+		return ByteBuffer.wrap(value.getBytes());
 	}
 
 	@Override
diff --git a/io.openems.edge.bridge.modbus/src/io/openems/edge/bridge/modbus/api/element/UnsignedDoublewordElement.java b/io.openems.edge.bridge.modbus/src/io/openems/edge/bridge/modbus/api/element/UnsignedDoublewordElement.java
index 42dc6605b36..d57d6192d6e 100644
--- a/io.openems.edge.bridge.modbus/src/io/openems/edge/bridge/modbus/api/element/UnsignedDoublewordElement.java
+++ b/io.openems.edge.bridge.modbus/src/io/openems/edge/bridge/modbus/api/element/UnsignedDoublewordElement.java
@@ -19,10 +19,12 @@ protected UnsignedDoublewordElement self() {
 		return this;
 	}
 
+	@Override
 	protected Long fromByteBuffer(ByteBuffer buff) {
 		return Integer.toUnsignedLong(buff.getInt(0));
 	}
 
+	@Override
 	protected ByteBuffer toByteBuffer(ByteBuffer buff, Long value) {
 		return buff.putInt(value.intValue());
 	}
diff --git a/io.openems.edge.bridge.modbus/src/io/openems/edge/bridge/modbus/api/element/UnsignedQuadruplewordElement.java b/io.openems.edge.bridge.modbus/src/io/openems/edge/bridge/modbus/api/element/UnsignedQuadruplewordElement.java
index 13a80fc4aab..20a869fa332 100644
--- a/io.openems.edge.bridge.modbus/src/io/openems/edge/bridge/modbus/api/element/UnsignedQuadruplewordElement.java
+++ b/io.openems.edge.bridge.modbus/src/io/openems/edge/bridge/modbus/api/element/UnsignedQuadruplewordElement.java
@@ -19,11 +19,13 @@ protected UnsignedQuadruplewordElement self() {
 		return this;
 	}
 
+	@Override
 	protected Long fromByteBuffer(ByteBuffer buff) {
 
 		return buff.getLong(0);
 	}
 
+	@Override
 	protected ByteBuffer toByteBuffer(ByteBuffer buff, Long value) {
 
 		return buff.putLong(value);
diff --git a/io.openems.edge.bridge.modbus/src/io/openems/edge/bridge/modbus/api/element/UnsignedWordElement.java b/io.openems.edge.bridge.modbus/src/io/openems/edge/bridge/modbus/api/element/UnsignedWordElement.java
index 9658f19b9d0..18ccda2170c 100644
--- a/io.openems.edge.bridge.modbus/src/io/openems/edge/bridge/modbus/api/element/UnsignedWordElement.java
+++ b/io.openems.edge.bridge.modbus/src/io/openems/edge/bridge/modbus/api/element/UnsignedWordElement.java
@@ -20,10 +20,12 @@ protected UnsignedWordElement self() {
 		return this;
 	}
 
+	@Override
 	protected Integer fromByteBuffer(ByteBuffer buff) {
 		return Short.toUnsignedInt(buff.getShort(0));
 	}
 
+	@Override
 	protected ByteBuffer toByteBuffer(ByteBuffer buff, Object object) {
 		Integer value = TypeUtils.getAsType(OpenemsType.INTEGER, object);
 		return buff.putShort(value.shortValue());
diff --git a/io.openems.edge.bridge.modbus/src/io/openems/edge/bridge/modbus/api/element/WordOrder.java b/io.openems.edge.bridge.modbus/src/io/openems/edge/bridge/modbus/api/element/WordOrder.java
index f6df54b8b23..0a3d508f1bd 100644
--- a/io.openems.edge.bridge.modbus/src/io/openems/edge/bridge/modbus/api/element/WordOrder.java
+++ b/io.openems.edge.bridge.modbus/src/io/openems/edge/bridge/modbus/api/element/WordOrder.java
@@ -2,7 +2,7 @@
 
 /**
  * Defines the word order.
- * 
+ *
  * <p>
  * <ul>
  * <li>LSWMSW = Least significant word, most significant word
diff --git a/io.openems.edge.bridge.modbus/src/io/openems/edge/bridge/modbus/api/task/AbstractReadDigitalInputsTask.java b/io.openems.edge.bridge.modbus/src/io/openems/edge/bridge/modbus/api/task/AbstractReadDigitalInputsTask.java
index daa0579eb61..5dac008b417 100644
--- a/io.openems.edge.bridge.modbus/src/io/openems/edge/bridge/modbus/api/task/AbstractReadDigitalInputsTask.java
+++ b/io.openems.edge.bridge.modbus/src/io/openems/edge/bridge/modbus/api/task/AbstractReadDigitalInputsTask.java
@@ -28,7 +28,7 @@ protected String getRequiredElementName() {
 	@Override
 	protected void doElementSetInput(ModbusElement<?> modbusElement, int position, Boolean[] response)
 			throws OpenemsException {
-		((ModbusCoilElement) modbusElement).setInputCoil((Boolean) response[position]);
+		((ModbusCoilElement) modbusElement).setInputCoil(response[position]);
 	}
 
 	@Override
@@ -39,9 +39,9 @@ protected int increasePosition(int position, ModbusElement<?> modbusElement) {
 	@Override
 	protected Boolean[] handleResponse(ModbusResponse response) throws OpenemsException {
 		try {
-			return (Utils.toBooleanArray(getBitVector(response)));
+			return Utils.toBooleanArray(this.getBitVector(response));
 		} catch (ClassCastException e) {
-			throw new OpenemsException("Unexpected Modbus response. Expected [" + getExpectedInputClassname()
+			throw new OpenemsException("Unexpected Modbus response. Expected [" + this.getExpectedInputClassname()
 					+ "], got [" + response.getClass().getSimpleName() + "]");
 		}
 	}
diff --git a/io.openems.edge.bridge.modbus/src/io/openems/edge/bridge/modbus/api/task/AbstractReadInputRegistersTask.java b/io.openems.edge.bridge.modbus/src/io/openems/edge/bridge/modbus/api/task/AbstractReadInputRegistersTask.java
index 55a282a033d..5f0b665db7e 100644
--- a/io.openems.edge.bridge.modbus/src/io/openems/edge/bridge/modbus/api/task/AbstractReadInputRegistersTask.java
+++ b/io.openems.edge.bridge.modbus/src/io/openems/edge/bridge/modbus/api/task/AbstractReadInputRegistersTask.java
@@ -24,8 +24,8 @@ protected boolean isCorrectElementInstance(ModbusElement<?> modbusElement) {
 	@Override
 	protected void doElementSetInput(ModbusElement<?> modbusElement, int position, InputRegister[] response)
 			throws OpenemsException {
-		((ModbusRegisterElement<?>) modbusElement).setInputRegisters(
-				(InputRegister[]) Arrays.copyOfRange(response, position, position + modbusElement.getLength()));
+		((ModbusRegisterElement<?>) modbusElement)
+				.setInputRegisters(Arrays.copyOfRange(response, position, position + modbusElement.getLength()));
 	}
 
 	@Override
diff --git a/io.openems.edge.bridge.modbus/src/io/openems/edge/bridge/modbus/api/task/AbstractReadTask.java b/io.openems.edge.bridge.modbus/src/io/openems/edge/bridge/modbus/api/task/AbstractReadTask.java
index 6679332fc51..fce9a74db32 100644
--- a/io.openems.edge.bridge.modbus/src/io/openems/edge/bridge/modbus/api/task/AbstractReadTask.java
+++ b/io.openems.edge.bridge.modbus/src/io/openems/edge/bridge/modbus/api/task/AbstractReadTask.java
@@ -33,6 +33,7 @@ public AbstractReadTask(int startAddress, Priority priority, AbstractModbusEleme
 		this.priority = priority;
 	}
 
+	@Override
 	public int _execute(AbstractModbusBridge bridge) throws OpenemsException {
 		T[] response;
 		try {
@@ -60,9 +61,9 @@ public int _execute(AbstractModbusBridge bridge) throws OpenemsException {
 		}
 
 		// Verify response length
-		if (response.length < getLength()) {
-			throw new OpenemsException(
-					"Received message is too short. Expected [" + getLength() + "], got [" + response.length + "]");
+		if (response.length < this.getLength()) {
+			throw new OpenemsException("Received message is too short. Expected [" + this.getLength() + "], got ["
+					+ response.length + "]");
 		}
 
 		this.fillElements(response);
@@ -70,11 +71,11 @@ public int _execute(AbstractModbusBridge bridge) throws OpenemsException {
 	}
 
 	protected T[] readElements(AbstractModbusBridge bridge) throws OpenemsException, ModbusException {
-		ModbusRequest request = this.getRequest();
+		var request = this.getRequest();
 		int unitId = this.getParent().getUnitId();
-		ModbusResponse response = Utils.getResponse(request, this.getParent().getUnitId(), bridge);
+		var response = Utils.getResponse(request, this.getParent().getUnitId(), bridge);
 
-		T[] result = this.handleResponse(response);
+		var result = this.handleResponse(response);
 
 		// debug output
 		switch (this.getLogVerbosity(bridge)) {
@@ -86,8 +87,9 @@ protected T[] readElements(AbstractModbusBridge bridge) throws OpenemsException,
 						if (r instanceof InputRegister) {
 							return String.format("%4s", Integer.toHexString(((InputRegister) r).getValue()))
 									.replace(' ', '0');
-						} else if (r instanceof Boolean) {
-							return ((Boolean) r) ? "x" : "-";
+						}
+						if (r instanceof Boolean) {
+							return (Boolean) r ? "x" : "-";
 						} else {
 							return r.toString();
 						}
@@ -103,9 +105,9 @@ protected T[] readElements(AbstractModbusBridge bridge) throws OpenemsException,
 	}
 
 	protected void fillElements(T[] response) {
-		int position = 0;
+		var position = 0;
 		for (ModbusElement<?> modbusElement : this.getElements()) {
-			if (!(this.isCorrectElementInstance(modbusElement))) {
+			if (!this.isCorrectElementInstance(modbusElement)) {
 				this.doErrorLog(modbusElement);
 			} else {
 				try {
@@ -120,8 +122,9 @@ protected void fillElements(T[] response) {
 		}
 	}
 
+	@Override
 	public Priority getPriority() {
-		return priority;
+		return this.priority;
 	}
 
 	protected abstract int increasePosition(int position, ModbusElement<?> modbusElement);
@@ -138,13 +141,13 @@ protected abstract void doElementSetInput(ModbusElement<?> modbusElement, int po
 	protected abstract T[] handleResponse(ModbusResponse response) throws OpenemsException;
 
 	private void doWarnLog(OpenemsException e) {
-		log.warn("Unable to fill modbus element. UnitId [" + this.getParent().getUnitId() + "] Address ["
-				+ getStartAddress() + "] Length [" + getLength() + "]: " + e.getMessage());
+		this.log.warn("Unable to fill modbus element. UnitId [" + this.getParent().getUnitId() + "] Address ["
+				+ this.getStartAddress() + "] Length [" + this.getLength() + "]: " + e.getMessage());
 	}
 
 	private void doErrorLog(ModbusElement<?> modbusElement) {
-		log.error("A " + getRequiredElementName() + " is required for a " + getActiondescription() + "Task! Element ["
-				+ modbusElement + "]");
+		this.log.error("A " + this.getRequiredElementName() + " is required for a " + this.getActiondescription()
+				+ "Task! Element [" + modbusElement + "]");
 	}
 
 }
diff --git a/io.openems.edge.bridge.modbus/src/io/openems/edge/bridge/modbus/api/task/AbstractTask.java b/io.openems.edge.bridge.modbus/src/io/openems/edge/bridge/modbus/api/task/AbstractTask.java
index 79b3496da04..1286166fbea 100644
--- a/io.openems.edge.bridge.modbus/src/io/openems/edge/bridge/modbus/api/task/AbstractTask.java
+++ b/io.openems.edge.bridge.modbus/src/io/openems/edge/bridge/modbus/api/task/AbstractTask.java
@@ -22,7 +22,7 @@ public abstract class AbstractTask implements Task {
 	private final int startAddress;
 	private final Stopwatch stopwatch = Stopwatch.createUnstarted();
 
-	private ModbusElement<?>[] elements;
+	private final ModbusElement<?>[] elements;
 	private AbstractOpenemsModbusComponent parent = null; // this is always set by ModbusProtocol.addTask()
 	private boolean hasBeenExecutedSuccessfully = false;
 	private long lastExecuteDuration = DEFAULT_EXECUTION_DURATION; // initialize to some default
@@ -33,7 +33,7 @@ public AbstractTask(int startAddress, ModbusElement<?>... elements) {
 		for (ModbusElement<?> element : elements) {
 			element.setModbusTask(this);
 		}
-		int length = 0;
+		var length = 0;
 		for (ModbusElement<?> element : elements) {
 			length += element.getLength();
 		}
@@ -55,31 +55,33 @@ public int getStartAddress() {
 		return this.startAddress;
 	}
 
+	@Override
 	public void setParent(AbstractOpenemsModbusComponent parent) {
 		this.parent = parent;
 	}
 
 	@Override
 	public AbstractOpenemsModbusComponent getParent() {
-		return parent;
+		return this.parent;
 	}
 
 	/**
 	 * Executes the tasks - i.e. sends the query of a ReadTask or writes a
 	 * WriteTask.
-	 * 
+	 *
 	 * <p>
 	 * Internally the _execute()-method of the specific subclass gets called.
-	 * 
+	 *
 	 * @param bridge the Modbus-Bridge
 	 * @return the number of executed Sub-Tasks
 	 * @throws OpenemsException on error
 	 */
+	@Override
 	public final synchronized int execute(AbstractModbusBridge bridge) throws OpenemsException {
 		this.stopwatch.reset();
 		this.stopwatch.start();
 		try {
-			int noOfSubTasksExecuted = this._execute(bridge);
+			var noOfSubTasksExecuted = this._execute(bridge);
 
 			// no exception -> mark this task as successfully executed
 			this.hasBeenExecutedSuccessfully = true;
@@ -104,12 +106,12 @@ public AbstractTask debug() {
 	}
 
 	public boolean isDebug() {
-		return isDebug;
+		return this.isDebug;
 	}
 
 	/**
 	 * Combines the global and local (via {@link #isDebug} log verbosity.
-	 * 
+	 *
 	 * @param bridge the parent Bridge
 	 * @return the combined LogVerbosity
 	 */
@@ -134,7 +136,7 @@ public void deactivate() {
 
 	@Override
 	public String toString() {
-		StringBuffer sb = new StringBuffer();
+		var sb = new StringBuilder();
 		sb.append(this.getActiondescription());
 		sb.append(" [");
 		sb.append(this.parent.id());
@@ -150,8 +152,9 @@ public String toString() {
 		return sb.toString();
 	}
 
+	@Override
 	public long getExecuteDuration() {
-		return lastExecuteDuration;
+		return this.lastExecuteDuration;
 	}
 
 	protected abstract String getActiondescription();
diff --git a/io.openems.edge.bridge.modbus/src/io/openems/edge/bridge/modbus/api/task/FC16WriteRegistersTask.java b/io.openems.edge.bridge.modbus/src/io/openems/edge/bridge/modbus/api/task/FC16WriteRegistersTask.java
index fc85e4a78c4..7b42ef8a5bb 100644
--- a/io.openems.edge.bridge.modbus/src/io/openems/edge/bridge/modbus/api/task/FC16WriteRegistersTask.java
+++ b/io.openems.edge.bridge.modbus/src/io/openems/edge/bridge/modbus/api/task/FC16WriteRegistersTask.java
@@ -2,15 +2,14 @@
 
 import java.util.ArrayList;
 import java.util.Arrays;
+import java.util.Collections;
 import java.util.List;
-import java.util.Optional;
 import java.util.stream.Collectors;
 
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
 import com.ghgande.j2mod.modbus.ModbusException;
-import com.ghgande.j2mod.modbus.msg.ModbusResponse;
 import com.ghgande.j2mod.modbus.msg.WriteMultipleRegistersRequest;
 import com.ghgande.j2mod.modbus.msg.WriteMultipleRegistersResponse;
 import com.ghgande.j2mod.modbus.procimg.Register;
@@ -33,7 +32,7 @@ public FC16WriteRegistersTask(int startAddress, AbstractModbusElement<?>... elem
 		super(startAddress, elements);
 	}
 
-	private class CombinedWriteRegisters {
+	private static class CombinedWriteRegisters {
 		public final int startAddress;
 		private final List<Register> registers = new ArrayList<>();
 
@@ -42,9 +41,7 @@ public CombinedWriteRegisters(int startAddress) {
 		}
 
 		public void add(Register... registers) {
-			for (Register register : registers) {
-				this.registers.add(register);
-			}
+			Collections.addAll(this.registers, registers);
 		}
 
 		public Register[] getRegisters() {
@@ -52,17 +49,17 @@ public Register[] getRegisters() {
 		}
 
 		public int getLastAddress() {
-			return this.startAddress + registers.size() - 1;
+			return this.startAddress + this.registers.size() - 1;
 		}
 	}
 
 	@Override
 	public int _execute(AbstractModbusBridge bridge) throws OpenemsException {
-		int noOfWrittenRegisters = 0;
-		List<CombinedWriteRegisters> writes = mergeWriteRegisters();
+		var noOfWrittenRegisters = 0;
+		var writes = this.mergeWriteRegisters();
 		// Execute combined writes
 		for (CombinedWriteRegisters write : writes) {
-			Register[] registers = write.getRegisters();
+			var registers = write.getRegisters();
 			try {
 				/*
 				 * First try
@@ -87,8 +84,8 @@ public int _execute(AbstractModbusBridge bridge) throws OpenemsException {
 
 	private void writeMultipleRegisters(AbstractModbusBridge bridge, int unitId, int startAddress, Register[] registers)
 			throws ModbusException, OpenemsException {
-		WriteMultipleRegistersRequest request = new WriteMultipleRegistersRequest(startAddress, registers);
-		ModbusResponse response = Utils.getResponse(request, unitId, bridge);
+		var request = new WriteMultipleRegistersRequest(startAddress, registers);
+		var response = Utils.getResponse(request, unitId, bridge);
 
 		// debug output
 		switch (this.getLogVerbosity(bridge)) {
@@ -112,16 +109,15 @@ private void writeMultipleRegisters(AbstractModbusBridge bridge, int unitId, int
 
 	/**
 	 * Combine WriteRegisters without holes in between.
-	 * 
+	 *
 	 * @return a list of CombinedWriteRegisters
 	 */
 	private List<CombinedWriteRegisters> mergeWriteRegisters() {
 		List<CombinedWriteRegisters> writes = new ArrayList<>();
-		ModbusElement<?>[] elements = this.getElements();
-		for (int i = 0; i < elements.length; i++) {
-			ModbusElement<?> element = elements[i];
+		var elements = this.getElements();
+		for (ModbusElement<?> element : elements) {
 			if (element instanceof ModbusRegisterElement) {
-				Optional<Register[]> valueOpt = ((ModbusRegisterElement<?>) element).getNextWriteValueAndReset();
+				var valueOpt = ((ModbusRegisterElement<?>) element).getNextWriteValueAndReset();
 				if (valueOpt.isPresent()) {
 					// found value -> add to 'writes'
 					CombinedWriteRegisters write;
@@ -136,7 +132,7 @@ private List<CombinedWriteRegisters> mergeWriteRegisters() {
 					write.add(valueOpt.get());
 				}
 			} else {
-				log.warn("Unable to execute Write for ModbusElement [" + element + "]: No ModbusRegisterElement!");
+				this.log.warn("Unable to execute Write for ModbusElement [" + element + "]: No ModbusRegisterElement!");
 			}
 		}
 		return writes;
diff --git a/io.openems.edge.bridge.modbus/src/io/openems/edge/bridge/modbus/api/task/FC1ReadCoilsTask.java b/io.openems.edge.bridge.modbus/src/io/openems/edge/bridge/modbus/api/task/FC1ReadCoilsTask.java
index 0eea4c7b6b9..8158194f1b3 100644
--- a/io.openems.edge.bridge.modbus/src/io/openems/edge/bridge/modbus/api/task/FC1ReadCoilsTask.java
+++ b/io.openems.edge.bridge.modbus/src/io/openems/edge/bridge/modbus/api/task/FC1ReadCoilsTask.java
@@ -21,7 +21,7 @@ public FC1ReadCoilsTask(int startAddress, Priority priority, AbstractModbusEleme
 
 	@Override
 	protected BitVector getBitVector(ModbusResponse response) {
-		ReadCoilsResponse coilsResponse = (ReadCoilsResponse) response;
+		var coilsResponse = (ReadCoilsResponse) response;
 		return coilsResponse.getCoils();
 	}
 
@@ -32,7 +32,7 @@ protected String getExpectedInputClassname() {
 
 	@Override
 	protected ModbusRequest getRequest() {
-		return new ReadCoilsRequest(getStartAddress(), getLength());
+		return new ReadCoilsRequest(this.getStartAddress(), this.getLength());
 	}
 
 	@Override
diff --git a/io.openems.edge.bridge.modbus/src/io/openems/edge/bridge/modbus/api/task/FC2ReadInputsTask.java b/io.openems.edge.bridge.modbus/src/io/openems/edge/bridge/modbus/api/task/FC2ReadInputsTask.java
index 39632001c8e..65ecd9a0f83 100644
--- a/io.openems.edge.bridge.modbus/src/io/openems/edge/bridge/modbus/api/task/FC2ReadInputsTask.java
+++ b/io.openems.edge.bridge.modbus/src/io/openems/edge/bridge/modbus/api/task/FC2ReadInputsTask.java
@@ -21,7 +21,7 @@ public FC2ReadInputsTask(int startAddress, Priority priority, AbstractModbusElem
 
 	@Override
 	protected BitVector getBitVector(ModbusResponse response) {
-		ReadInputDiscretesResponse readInputDiscretesResponse = (ReadInputDiscretesResponse) response;
+		var readInputDiscretesResponse = (ReadInputDiscretesResponse) response;
 		return readInputDiscretesResponse.getDiscretes();
 	}
 
@@ -37,6 +37,6 @@ protected String getExpectedInputClassname() {
 
 	@Override
 	protected ModbusRequest getRequest() {
-		return new ReadInputDiscretesRequest(getStartAddress(), getLength());
+		return new ReadInputDiscretesRequest(this.getStartAddress(), this.getLength());
 	}
 }
diff --git a/io.openems.edge.bridge.modbus/src/io/openems/edge/bridge/modbus/api/task/FC3ReadRegistersTask.java b/io.openems.edge.bridge.modbus/src/io/openems/edge/bridge/modbus/api/task/FC3ReadRegistersTask.java
index 128eced5fe2..e18679c8aa8 100644
--- a/io.openems.edge.bridge.modbus/src/io/openems/edge/bridge/modbus/api/task/FC3ReadRegistersTask.java
+++ b/io.openems.edge.bridge.modbus/src/io/openems/edge/bridge/modbus/api/task/FC3ReadRegistersTask.java
@@ -22,18 +22,17 @@ public FC3ReadRegistersTask(int startAddress, Priority priority, AbstractModbusE
 
 	@Override
 	protected ModbusRequest getRequest() {
-		return new ReadMultipleRegistersRequest(getStartAddress(), getLength());
+		return new ReadMultipleRegistersRequest(this.getStartAddress(), this.getLength());
 	}
 
 	@Override
 	protected InputRegister[] handleResponse(ModbusResponse response) throws OpenemsException {
 		if (response instanceof ReadMultipleRegistersResponse) {
-			ReadMultipleRegistersResponse registersResponse = (ReadMultipleRegistersResponse) response;
+			var registersResponse = (ReadMultipleRegistersResponse) response;
 			return registersResponse.getRegisters();
-		} else {
-			throw new OpenemsException("Unexpected Modbus response. Expected [ReadMultipleRegistersResponse], got ["
-					+ response.getClass().getSimpleName() + "]");
 		}
+		throw new OpenemsException("Unexpected Modbus response. Expected [ReadMultipleRegistersResponse], got ["
+				+ response.getClass().getSimpleName() + "]");
 	}
 
 	@Override
diff --git a/io.openems.edge.bridge.modbus/src/io/openems/edge/bridge/modbus/api/task/FC4ReadInputRegistersTask.java b/io.openems.edge.bridge.modbus/src/io/openems/edge/bridge/modbus/api/task/FC4ReadInputRegistersTask.java
index abdc3c7548f..f9f6b37e8d4 100644
--- a/io.openems.edge.bridge.modbus/src/io/openems/edge/bridge/modbus/api/task/FC4ReadInputRegistersTask.java
+++ b/io.openems.edge.bridge.modbus/src/io/openems/edge/bridge/modbus/api/task/FC4ReadInputRegistersTask.java
@@ -27,17 +27,16 @@ protected String getActiondescription() {
 
 	@Override
 	protected ModbusRequest getRequest() {
-		return new ReadInputRegistersRequest(getStartAddress(), getLength());
+		return new ReadInputRegistersRequest(this.getStartAddress(), this.getLength());
 	}
 
 	@Override
 	protected InputRegister[] handleResponse(ModbusResponse response) throws OpenemsException {
 		if (response instanceof ReadInputRegistersResponse) {
-			ReadInputRegistersResponse registersResponse = (ReadInputRegistersResponse) response;
+			var registersResponse = (ReadInputRegistersResponse) response;
 			return registersResponse.getRegisters();
-		} else {
-			throw new OpenemsException("Unexpected Modbus response. Expected [ReadInputRegistersResponse], got ["
-					+ response.getClass().getSimpleName() + "]");
 		}
+		throw new OpenemsException("Unexpected Modbus response. Expected [ReadInputRegistersResponse], got ["
+				+ response.getClass().getSimpleName() + "]");
 	}
 }
\ No newline at end of file
diff --git a/io.openems.edge.bridge.modbus/src/io/openems/edge/bridge/modbus/api/task/FC5WriteCoilTask.java b/io.openems.edge.bridge.modbus/src/io/openems/edge/bridge/modbus/api/task/FC5WriteCoilTask.java
index a3c5a858ec2..848e57e1d9a 100644
--- a/io.openems.edge.bridge.modbus/src/io/openems/edge/bridge/modbus/api/task/FC5WriteCoilTask.java
+++ b/io.openems.edge.bridge.modbus/src/io/openems/edge/bridge/modbus/api/task/FC5WriteCoilTask.java
@@ -1,12 +1,9 @@
 package io.openems.edge.bridge.modbus.api.task;
 
-import java.util.Optional;
-
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
 import com.ghgande.j2mod.modbus.ModbusException;
-import com.ghgande.j2mod.modbus.msg.ModbusResponse;
 import com.ghgande.j2mod.modbus.msg.WriteCoilRequest;
 import com.ghgande.j2mod.modbus.msg.WriteCoilResponse;
 
@@ -29,10 +26,10 @@ public FC5WriteCoilTask(int startAddress, ModbusCoilElement element) {
 
 	@Override
 	public int _execute(AbstractModbusBridge bridge) throws OpenemsException {
-		int noOfWrittenCoils = 0;
+		var noOfWrittenCoils = 0;
 		ModbusElement<?> element = this.getElements()[0];
 		if (element instanceof ModbusCoilElement) {
-			Optional<Boolean> valueOpt = ((ModbusCoilElement) element).getNextWriteValueAndReset();
+			var valueOpt = ((ModbusCoilElement) element).getNextWriteValueAndReset();
 			if (valueOpt.isPresent()) {
 				// found value -> write
 				boolean value = valueOpt.get();
@@ -56,15 +53,15 @@ public int _execute(AbstractModbusBridge bridge) throws OpenemsException {
 				}
 			}
 		} else {
-			log.warn("Unable to execute Write for ModbusElement [" + element + "]: No ModbusCoilElement!");
+			this.log.warn("Unable to execute Write for ModbusElement [" + element + "]: No ModbusCoilElement!");
 		}
 		return noOfWrittenCoils;
 	}
 
 	private void writeCoil(AbstractModbusBridge bridge, int unitId, int startAddress, boolean value)
 			throws OpenemsException, ModbusException {
-		WriteCoilRequest request = new WriteCoilRequest(startAddress, value);
-		ModbusResponse response = Utils.getResponse(request, unitId, bridge);
+		var request = new WriteCoilRequest(startAddress, value);
+		var response = Utils.getResponse(request, unitId, bridge);
 
 		// debug output
 		switch (this.getLogVerbosity(bridge)) {
diff --git a/io.openems.edge.bridge.modbus/src/io/openems/edge/bridge/modbus/api/task/FC6WriteRegisterTask.java b/io.openems.edge.bridge.modbus/src/io/openems/edge/bridge/modbus/api/task/FC6WriteRegisterTask.java
index 4e42416bf6d..28e0564c140 100644
--- a/io.openems.edge.bridge.modbus/src/io/openems/edge/bridge/modbus/api/task/FC6WriteRegisterTask.java
+++ b/io.openems.edge.bridge.modbus/src/io/openems/edge/bridge/modbus/api/task/FC6WriteRegisterTask.java
@@ -1,12 +1,9 @@
 package io.openems.edge.bridge.modbus.api.task;
 
-import java.util.Optional;
-
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
 import com.ghgande.j2mod.modbus.ModbusException;
-import com.ghgande.j2mod.modbus.msg.ModbusResponse;
 import com.ghgande.j2mod.modbus.msg.WriteSingleRegisterRequest;
 import com.ghgande.j2mod.modbus.msg.WriteSingleRegisterResponse;
 import com.ghgande.j2mod.modbus.procimg.Register;
@@ -27,18 +24,18 @@ public FC6WriteRegisterTask(int startAddress, AbstractModbusElement<?> element)
 
 	@Override
 	public int _execute(AbstractModbusBridge bridge) throws OpenemsException {
-		int noOfWrittenRegisters = 0;
+		var noOfWrittenRegisters = 0;
 		ModbusElement<?> element = this.getElements()[0];
 
 		if (element instanceof AbstractWordElement<?, ?>) {
 
-			Optional<Register[]> valueOpt = ((AbstractWordElement<?, ?>) element).getNextWriteValueAndReset();
+			var valueOpt = ((AbstractWordElement<?, ?>) element).getNextWriteValueAndReset();
 			if (valueOpt.isPresent()) {
-				Register[] registers = valueOpt.get();
+				var registers = valueOpt.get();
 
 				if (registers.length == 1 && registers[0] != null) {
 					// found value -> write
-					Register register = registers[0];
+					var register = registers[0];
 					try {
 						/*
 						 * First try
@@ -61,11 +58,11 @@ public int _execute(AbstractModbusBridge bridge) throws OpenemsException {
 						}
 					}
 				} else {
-					log.warn("Expecting exactly one register. Got [" + registers.length + "]");
+					this.log.warn("Expecting exactly one register. Got [" + registers.length + "]");
 				}
 			}
 		} else {
-			log.warn("Unable to execute Write for ModbusElement [" + element + "]: No AbstractWordElement!");
+			this.log.warn("Unable to execute Write for ModbusElement [" + element + "]: No AbstractWordElement!");
 		}
 		return noOfWrittenRegisters;
 	}
@@ -77,8 +74,8 @@ protected String getActiondescription() {
 
 	private void writeSingleRegister(AbstractModbusBridge bridge, int unitId, int startAddress, Register register)
 			throws ModbusException, OpenemsException {
-		WriteSingleRegisterRequest request = new WriteSingleRegisterRequest(startAddress, register);
-		ModbusResponse response = Utils.getResponse(request, unitId, bridge);
+		var request = new WriteSingleRegisterRequest(startAddress, register);
+		var response = Utils.getResponse(request, unitId, bridge);
 
 		// debug output
 		switch (this.getLogVerbosity(bridge)) {
diff --git a/io.openems.edge.bridge.modbus/src/io/openems/edge/bridge/modbus/api/task/Task.java b/io.openems.edge.bridge.modbus/src/io/openems/edge/bridge/modbus/api/task/Task.java
index 46269b7d894..3477c22e426 100644
--- a/io.openems.edge.bridge.modbus/src/io/openems/edge/bridge/modbus/api/task/Task.java
+++ b/io.openems.edge.bridge.modbus/src/io/openems/edge/bridge/modbus/api/task/Task.java
@@ -11,35 +11,35 @@ public interface Task extends ManagedTask {
 
 	/**
 	 * Gets the ModbusElements.
-	 * 
+	 *
 	 * @return an array of ModbusElements
 	 */
 	ModbusElement<?>[] getElements();
 
 	/**
 	 * Gets the start Modbus register address.
-	 * 
+	 *
 	 * @return the address
 	 */
 	int getStartAddress();
 
 	/**
 	 * Gets the length from first to last Modbus register address.
-	 * 
+	 *
 	 * @return the address
 	 */
 	int getLength();
 
 	/**
 	 * Sets the parent.
-	 * 
+	 *
 	 * @param parent the parent {@link AbstractOpenemsModbusComponent}.
 	 */
 	void setParent(AbstractOpenemsModbusComponent parent);
 
 	/**
 	 * Gets the parent.
-	 * 
+	 *
 	 * @return the parent
 	 */
 	public ModbusComponent getParent();
@@ -53,7 +53,7 @@ public interface Task extends ManagedTask {
 	/**
 	 * Executes the tasks - i.e. sends the query of a ReadTask or writes a
 	 * WriteTask.
-	 * 
+	 *
 	 * @param bridge the Modbus-Bridge
 	 * @param <T>    the Modbus-Element
 	 * @throws OpenemsException on error
@@ -63,7 +63,7 @@ public interface Task extends ManagedTask {
 
 	/**
 	 * Gets whether this ReadTask has been successfully executed before.
-	 * 
+	 *
 	 * @return true if this Task has been executed successfully at least once
 	 */
 	boolean hasBeenExecuted();
@@ -71,7 +71,7 @@ public interface Task extends ManagedTask {
 	/**
 	 * Gets the execution duration of the last execution (successful or not not
 	 * successful) in [ms].
-	 * 
+	 *
 	 * @return the duration in [ms]
 	 */
 	long getExecuteDuration();
diff --git a/io.openems.edge.bridge.modbus/src/io/openems/edge/bridge/modbus/api/task/Utils.java b/io.openems.edge.bridge.modbus/src/io/openems/edge/bridge/modbus/api/task/Utils.java
index e18f88036c0..21ecb200b1b 100644
--- a/io.openems.edge.bridge.modbus/src/io/openems/edge/bridge/modbus/api/task/Utils.java
+++ b/io.openems.edge.bridge.modbus/src/io/openems/edge/bridge/modbus/api/task/Utils.java
@@ -5,7 +5,6 @@
 import java.util.stream.IntStream;
 
 import com.ghgande.j2mod.modbus.ModbusException;
-import com.ghgande.j2mod.modbus.io.ModbusTransaction;
 import com.ghgande.j2mod.modbus.msg.ModbusRequest;
 import com.ghgande.j2mod.modbus.msg.ModbusResponse;
 import com.ghgande.j2mod.modbus.procimg.InputRegister;
@@ -17,17 +16,17 @@
 public class Utils {
 
 	public static Boolean[] toBooleanArray(BitVector v) {
-		Boolean[] bools = new Boolean[v.size()];
-		for (int i = 0; i < v.size(); i++) {
+		var bools = new Boolean[v.size()];
+		for (var i = 0; i < v.size(); i++) {
 			bools[i] = v.getBit(i);
 		}
 		return bools;
 	}
-	
+
 	public static Boolean[] toBooleanArray(byte[] bytes) {
-		Boolean[] bools = new Boolean[bytes.length * 8];
-		for (int i = 0; i < bytes.length * 8; i++) {
-			int byteIndex = i / 8;
+		var bools = new Boolean[bytes.length * 8];
+		for (var i = 0; i < bytes.length * 8; i++) {
+			var byteIndex = i / 8;
 			bools[i] = (bytes[byteIndex] & (byte) (128 / Math.pow(2, i % 8))) != 0;
 		}
 		return bools;
@@ -36,16 +35,15 @@ public static Boolean[] toBooleanArray(byte[] bytes) {
 	public static ModbusResponse getResponse(ModbusRequest request, int unitId, AbstractModbusBridge bridge)
 			throws OpenemsException, ModbusException {
 		request.setUnitID(unitId);
-		ModbusTransaction transaction = bridge.getNewModbusTransaction();
+		var transaction = bridge.getNewModbusTransaction();
 		transaction.setRequest(request);
 		transaction.execute();
-		ModbusResponse response = transaction.getResponse();
-		return response;
+		return transaction.getResponse();
 	}
 
 	public static String toBitString(InputRegister[] registers) {
 		return Arrays.stream(registers).map(register -> {
-			byte[] bs = register.toBytes();
+			var bs = register.toBytes();
 
 			return String.format("%8s", //
 					Integer.toBinaryString(bs[0] & 0xFF)).replace(' ', '0') //
@@ -56,9 +54,7 @@ public static String toBitString(InputRegister[] registers) {
 	}
 
 	public static String toBitString(byte[] bs) {
-		return IntStream.range(0, bs.length).map(idx -> bs[idx]).mapToObj(b -> {
-			return String.format("%8s", //
-					Integer.toBinaryString((byte) b & 0xFF)).replace(' ', '0');
-		}).collect(Collectors.joining(" "));
+		return IntStream.range(0, bs.length).map(idx -> bs[idx]).mapToObj(b -> String.format("%8s", //
+				Integer.toBinaryString((byte) b & 0xFF)).replace(' ', '0')).collect(Collectors.joining(" "));
 	}
 }
diff --git a/io.openems.edge.bridge.modbus/src/io/openems/edge/bridge/modbus/api/task/WaitTask.java b/io.openems.edge.bridge.modbus/src/io/openems/edge/bridge/modbus/api/task/WaitTask.java
index a49d7b8bca8..a1a8e5e087b 100644
--- a/io.openems.edge.bridge.modbus/src/io/openems/edge/bridge/modbus/api/task/WaitTask.java
+++ b/io.openems.edge.bridge.modbus/src/io/openems/edge/bridge/modbus/api/task/WaitTask.java
@@ -57,7 +57,7 @@ public void deactivate() {
 	@Override
 	public <T> int execute(AbstractModbusBridge bridge) throws OpenemsException {
 		try {
-			Thread.sleep(delay);
+			Thread.sleep(this.delay);
 		} catch (InterruptedException e) {
 			this.log.warn(e.getMessage());
 		}
diff --git a/io.openems.edge.bridge.modbus/src/io/openems/edge/bridge/modbus/api/task/WriteTask.java b/io.openems.edge.bridge.modbus/src/io/openems/edge/bridge/modbus/api/task/WriteTask.java
index a898fb8059e..d62ef072f9c 100644
--- a/io.openems.edge.bridge.modbus/src/io/openems/edge/bridge/modbus/api/task/WriteTask.java
+++ b/io.openems.edge.bridge.modbus/src/io/openems/edge/bridge/modbus/api/task/WriteTask.java
@@ -7,9 +7,10 @@ public interface WriteTask extends Task, ManagedTask {
 
 	/**
 	 * Priority for WriteTasks is by default always HIGH.
-	 * 
+	 *
 	 * @return the Priority
 	 */
+	@Override
 	public default Priority getPriority() {
 		return Priority.HIGH;
 	}
diff --git a/io.openems.edge.bridge.modbus/src/io/openems/edge/bridge/modbus/sunspec/AbstractOpenemsSunSpecComponent.java b/io.openems.edge.bridge.modbus/src/io/openems/edge/bridge/modbus/sunspec/AbstractOpenemsSunSpecComponent.java
index 4ac18cada20..fb1d961b15d 100644
--- a/io.openems.edge.bridge.modbus/src/io/openems/edge/bridge/modbus/sunspec/AbstractOpenemsSunSpecComponent.java
+++ b/io.openems.edge.bridge.modbus/src/io/openems/edge/bridge/modbus/sunspec/AbstractOpenemsSunSpecComponent.java
@@ -49,7 +49,7 @@ public abstract class AbstractOpenemsSunSpecComponent extends AbstractOpenemsMod
 
 	/**
 	 * Constructs a AbstractOpenemsSunSpecComponent.
-	 * 
+	 *
 	 * @param activeModels             the active SunSpec Models (i.e.
 	 *                                 {@link SunSpecModel}) that should be
 	 *                                 considered and their reading-priority
@@ -79,7 +79,7 @@ protected boolean activate(ComponentContext context, String id, String alias, bo
 		this.readFromCommonBlockNo = readFromCommonBlockNo;
 
 		var expectedBlocks = this.activeModels.keySet().stream() //
-				.map(m -> m.getBlockId()) //
+				.map(SunSpecModel::getBlockId) //
 				.collect(Collectors.toSet());
 
 		// Start the SunSpec read procedure...
@@ -111,15 +111,15 @@ protected final ModbusProtocol defineModbusProtocol() {
 
 	/**
 	 * Validates that this device complies to SunSpec specification.
-	 * 
+	 *
 	 * <p>
 	 * Tests if first registers are 0x53756e53 ("SunS").
-	 * 
+	 *
 	 * @return a future true if it is SunSpec; otherwise false
 	 * @throws OpenemsException on error
 	 */
 	private CompletableFuture<Boolean> isSunSpec() throws OpenemsException {
-		final CompletableFuture<Boolean> result = new CompletableFuture<Boolean>();
+		final var result = new CompletableFuture<Boolean>();
 		ModbusUtils.readELementOnce(this.modbusProtocol, new UnsignedDoublewordElement(40_000), true)
 				.thenAccept(value -> {
 					if (value == 0x53756e53) {
@@ -133,7 +133,7 @@ private CompletableFuture<Boolean> isSunSpec() throws OpenemsException {
 
 	/**
 	 * Reads the next SunSpec block.
-	 * 
+	 *
 	 * @param startAddress    the startAddress
 	 * @param remainingBlocks the remaining blocks expected to read
 	 * @return a future that completes once reading the block finished
@@ -141,7 +141,7 @@ private CompletableFuture<Boolean> isSunSpec() throws OpenemsException {
 	 */
 	private CompletableFuture<Void> readNextBlock(int startAddress, Set<Integer> remainingBlocks)
 			throws OpenemsException {
-		final CompletableFuture<Void> finished = new CompletableFuture<Void>();
+		final var finished = new CompletableFuture<Void>();
 
 		// Finish if all expected Blocks have been read
 		if (remainingBlocks.isEmpty()) {
@@ -151,7 +151,7 @@ private CompletableFuture<Void> readNextBlock(int startAddress, Set<Integer> rem
 		/*
 		 * Try to read block by block until all required blocks have been read or an
 		 * END_OF_MAP register has been found.
-		 * 
+		 *
 		 * It may still happen that a device does not have a valid END_OF_MAP register
 		 * and that some blocks are not read - especially when one component is used for
 		 * multiple devices like single and three phase inverter.
@@ -179,10 +179,10 @@ private CompletableFuture<Void> readNextBlock(int startAddress, Set<Integer> rem
 					} else {
 
 						// Should this Block be considered?
-						Entry<SunSpecModel, Priority> activeEntry = this.getActiveModelForId(blockId);
+						var activeEntry = this.getActiveModelForId(blockId);
 						if (activeEntry != null) {
-							SunSpecModel sunSpecModel = activeEntry.getKey();
-							Priority priority = activeEntry.getValue();
+							var sunSpecModel = activeEntry.getKey();
+							var priority = activeEntry.getValue();
 							try {
 								this.addBlock(startAddress, sunSpecModel, priority);
 								remainingBlocks.remove(activeEntry.getKey().getBlockId());
@@ -200,11 +200,10 @@ private CompletableFuture<Void> readNextBlock(int startAddress, Set<Integer> rem
 					}
 
 					// Read next block recursively
-					int nextBlockStartAddress = startAddress + 2 + length;
+					var nextBlockStartAddress = startAddress + 2 + length;
 					try {
 
-						final CompletableFuture<Void> readNextBlockFuture = this.readNextBlock(nextBlockStartAddress,
-								remainingBlocks);
+						final var readNextBlockFuture = this.readNextBlock(nextBlockStartAddress, remainingBlocks);
 						// Announce finished when next block (recursively) is finished
 						readNextBlockFuture.thenRun(() -> {
 							finished.complete(null);
@@ -223,7 +222,7 @@ private CompletableFuture<Void> readNextBlock(int startAddress, Set<Integer> rem
 	/**
 	 * Gets the Model and its reading priority; or null if the Model is not
 	 * 'active', i.e. not used by this implementation.
-	 * 
+	 *
 	 * @param blockId the SunSpec Block-ID
 	 * @return the entry with Model and priority
 	 */
@@ -238,7 +237,7 @@ private Entry<SunSpecModel, Priority> getActiveModelForId(int blockId) {
 
 	/**
 	 * Overwrite to provide custom SunSpecModel.
-	 * 
+	 *
 	 * @param blockId the Block-Id
 	 * @return the {@link SunSpecModel}
 	 * @throws IllegalArgumentException on error
@@ -249,10 +248,10 @@ protected SunSpecModel getSunSpecModel(int blockId) throws IllegalArgumentExcept
 
 	/**
 	 * Is the SunSpec initialization completed?.
-	 * 
+	 *
 	 * <p>
 	 * If this returns true, all Channels are available.
-	 * 
+	 *
 	 * @return true if initialization is completed
 	 */
 	public boolean isSunSpecInitializationCompleted() {
@@ -261,7 +260,7 @@ public boolean isSunSpecInitializationCompleted() {
 
 	/**
 	 * This method is called after the SunSpec initialization was completed.
-	 * 
+	 *
 	 * <p>
 	 * The purpose of this method is to add mappings between SunSpec Channel-Points
 	 * to OpenEMS Nature Channels.
@@ -270,7 +269,7 @@ public boolean isSunSpecInitializationCompleted() {
 
 	/**
 	 * Adds the block starting from startAddress.
-	 * 
+	 *
 	 * @param startAddress the address to start reading from
 	 * @param model        the SunSpecModel
 	 * @param priority     the reading priority
@@ -281,8 +280,8 @@ protected void addBlock(int startAddress, SunSpecModel model, Priority priority)
 				+ startAddress + "]");
 		AbstractModbusElement<?>[] elements = new AbstractModbusElement[model.points().length];
 		startAddress += 2;
-		for (int i = 0; i < model.points().length; i++) {
-			SunSpecPoint point = model.points()[i];
+		for (var i = 0; i < model.points().length; i++) {
+			var point = model.points()[i];
 			AbstractModbusElement<?> element = point.get().generateModbusElement(startAddress);
 			startAddress += element.getLength();
 			elements[i] = element;
@@ -293,7 +292,7 @@ protected void addBlock(int startAddress, SunSpecModel model, Priority priority)
 			if (point.get().scaleFactor.isPresent()) {
 				// This Point needs a ScaleFactor
 				// - find the ScaleFactor-Point
-				String scaleFactorName = SunSpecCodeGenerator.toUpperUnderscore(point.get().scaleFactor.get());
+				var scaleFactorName = SunSpecCodeGenerator.toUpperUnderscore(point.get().scaleFactor.get());
 				SunSpecPoint scaleFactorPoint = null;
 				for (SunSpecPoint sfPoint : model.points()) {
 					if (sfPoint.name().equals(scaleFactorName)) {
@@ -308,24 +307,23 @@ protected void addBlock(int startAddress, SunSpecModel model, Priority priority)
 				}
 
 				// Add a scale-factor mapping between Element and Channel
-				element = m(channelId, element,
+				element = this.m(channelId, element,
 						new ElementToChannelScaleFactorConverter(this, point, scaleFactorPoint.getChannelId()));
 
 			} else {
 				// Add a direct mapping between Element and Channel
-				element = m(channelId, element, new ElementToChannelConverter(
+				element = this.m(channelId, element, new ElementToChannelConverter(
 						// Element -> Channel
-						(value) -> {
+						value -> {
 							if (!point.isDefined(value)) {
 								// This value is set to be 'UNDEFINED' for the given type by SunSpec
 								return null;
-							} else {
-								return value;
 							}
+							return value;
 						},
 						// Channel -> Element
 						value -> value));
-				;
+
 			}
 
 			// Evaluate Access-Mode of the Channel
@@ -350,7 +348,7 @@ protected void addBlock(int startAddress, SunSpecModel model, Priority priority)
 
 	/**
 	 * Reads given Elements once from Modbus.
-	 * 
+	 *
 	 * @param <T>      the Type of the elements
 	 * @param elements the elements
 	 * @return a future list with the values, e.g. a list of integers
@@ -361,12 +359,12 @@ private final <T> CompletableFuture<List<T>> readElementsOnceTyped(AbstractModbu
 			throws OpenemsException {
 		// Register listeners for elements
 		@SuppressWarnings("unchecked")
-		final CompletableFuture<T>[] subResults = (CompletableFuture<T>[]) new CompletableFuture<?>[elements.length];
-		for (int i = 0; i < elements.length; i++) {
-			CompletableFuture<T> subResult = new CompletableFuture<T>();
+		final var subResults = (CompletableFuture<T>[]) new CompletableFuture<?>[elements.length];
+		for (var i = 0; i < elements.length; i++) {
+			var subResult = new CompletableFuture<T>();
 			subResults[i] = subResult;
 
-			AbstractModbusElement<T> element = elements[i];
+			var element = elements[i];
 			element.onUpdateCallback(value -> {
 				if (value == null) {
 					// try again
@@ -381,14 +379,14 @@ private final <T> CompletableFuture<List<T>> readElementsOnceTyped(AbstractModbu
 		this.modbusProtocol.addTask(task);
 
 		// Prepare result
-		final CompletableFuture<List<T>> result = new CompletableFuture<List<T>>();
+		final var result = new CompletableFuture<List<T>>();
 		CompletableFuture.allOf(subResults).thenRun(() -> {
 			// do not try again
 			this.modbusProtocol.removeTask(task);
 
 			// get all results and complete result
 			List<T> values = Stream.of(subResults) //
-					.map(future -> future.join()) //
+					.map(CompletableFuture::join) //
 					.collect(Collectors.toCollection(ArrayList::new));
 			result.complete(values);
 		});
@@ -398,7 +396,7 @@ private final <T> CompletableFuture<List<T>> readElementsOnceTyped(AbstractModbu
 
 	/**
 	 * Get the Channel for the given Point.
-	 * 
+	 *
 	 * @param <T>   the Channel type
 	 * @param point the SunSpec Point
 	 * @return the optional Channel
@@ -413,7 +411,7 @@ protected <T extends Channel<?>> Optional<T> getSunSpecChannel(SunSpecPoint poin
 
 	/**
 	 * Get the Channel for the given Point or throw an error if it is not available.
-	 * 
+	 *
 	 * @param <T>   the Channel type
 	 * @param point the SunSpec Point
 	 * @return the optional Channel
@@ -434,11 +432,11 @@ protected <T extends Channel<?>> T getSunSpecChannelOrError(SunSpecPoint point)
 	 *
 	 * <p>
 	 * The logic checks in order if a point is defined and uses that point.
-	 * 
+	 *
 	 * <p>
 	 * Call this method only after all SunSpec models were completely read - i.e.
 	 * onSunSpecInitializationCompleted()
-	 * 
+	 *
 	 * @param targetChannel the targetChannel
 	 * @param converter     convert from Point value to the Unit of the Channel
 	 * @param points        the points.
diff --git a/io.openems.edge.bridge.modbus/src/io/openems/edge/bridge/modbus/sunspec/DefaultSunSpecModel.java b/io.openems.edge.bridge.modbus/src/io/openems/edge/bridge/modbus/sunspec/DefaultSunSpecModel.java
index 0b283b6ac99..d23060843db 100644
--- a/io.openems.edge.bridge.modbus/src/io/openems/edge/bridge/modbus/sunspec/DefaultSunSpecModel.java
+++ b/io.openems.edge.bridge.modbus/src/io/openems/edge/bridge/modbus/sunspec/DefaultSunSpecModel.java
@@ -537,12 +537,12 @@ private S2_St(int value, String name) {
 
 		@Override
 		public int getValue() {
-			return value;
+			return this.value;
 		}
 
 		@Override
 		public String getName() {
-			return name;
+			return this.name;
 		}
 
 		@Override
@@ -585,12 +585,12 @@ private S2_Evt(int value, String name) {
 
 		@Override
 		public int getValue() {
-			return value;
+			return this.value;
 		}
 
 		@Override
 		public String getName() {
-			return name;
+			return this.name;
 		}
 
 		@Override
@@ -617,12 +617,12 @@ private S2_Ctl(int value, String name) {
 
 		@Override
 		public int getValue() {
-			return value;
+			return this.value;
 		}
 
 		@Override
 		public String getName() {
-			return name;
+			return this.name;
 		}
 
 		@Override
@@ -1365,12 +1365,12 @@ private S101_St(int value, String name) {
 
 		@Override
 		public int getValue() {
-			return value;
+			return this.value;
 		}
 
 		@Override
 		public String getName() {
-			return name;
+			return this.name;
 		}
 
 		@Override
@@ -1408,12 +1408,12 @@ private S101_Evt1(int value, String name) {
 
 		@Override
 		public int getValue() {
-			return value;
+			return this.value;
 		}
 
 		@Override
 		public String getName() {
-			return name;
+			return this.name;
 		}
 
 		@Override
@@ -1930,12 +1930,12 @@ private S102_St(int value, String name) {
 
 		@Override
 		public int getValue() {
-			return value;
+			return this.value;
 		}
 
 		@Override
 		public String getName() {
-			return name;
+			return this.name;
 		}
 
 		@Override
@@ -1973,12 +1973,12 @@ private S102_Evt1(int value, String name) {
 
 		@Override
 		public int getValue() {
-			return value;
+			return this.value;
 		}
 
 		@Override
 		public String getName() {
-			return name;
+			return this.name;
 		}
 
 		@Override
@@ -2495,12 +2495,12 @@ private S103_St(int value, String name) {
 
 		@Override
 		public int getValue() {
-			return value;
+			return this.value;
 		}
 
 		@Override
 		public String getName() {
-			return name;
+			return this.name;
 		}
 
 		@Override
@@ -2538,12 +2538,12 @@ private S103_Evt1(int value, String name) {
 
 		@Override
 		public int getValue() {
-			return value;
+			return this.value;
 		}
 
 		@Override
 		public String getName() {
-			return name;
+			return this.name;
 		}
 
 		@Override
@@ -2928,12 +2928,12 @@ private S111_St(int value, String name) {
 
 		@Override
 		public int getValue() {
-			return value;
+			return this.value;
 		}
 
 		@Override
 		public String getName() {
-			return name;
+			return this.name;
 		}
 
 		@Override
@@ -2971,12 +2971,12 @@ private S111_Evt1(int value, String name) {
 
 		@Override
 		public int getValue() {
-			return value;
+			return this.value;
 		}
 
 		@Override
 		public String getName() {
-			return name;
+			return this.name;
 		}
 
 		@Override
@@ -3361,12 +3361,12 @@ private S112_St(int value, String name) {
 
 		@Override
 		public int getValue() {
-			return value;
+			return this.value;
 		}
 
 		@Override
 		public String getName() {
-			return name;
+			return this.name;
 		}
 
 		@Override
@@ -3404,12 +3404,12 @@ private S112_Evt1(int value, String name) {
 
 		@Override
 		public int getValue() {
-			return value;
+			return this.value;
 		}
 
 		@Override
 		public String getName() {
-			return name;
+			return this.name;
 		}
 
 		@Override
@@ -3794,12 +3794,12 @@ private S113_St(int value, String name) {
 
 		@Override
 		public int getValue() {
-			return value;
+			return this.value;
 		}
 
 		@Override
 		public String getName() {
-			return name;
+			return this.name;
 		}
 
 		@Override
@@ -3837,12 +3837,12 @@ private S113_Evt1(int value, String name) {
 
 		@Override
 		public int getValue() {
-			return value;
+			return this.value;
 		}
 
 		@Override
 		public String getName() {
-			return name;
+			return this.name;
 		}
 
 		@Override
@@ -4166,12 +4166,12 @@ private S120_DERTyp(int value, String name) {
 
 		@Override
 		public int getValue() {
-			return value;
+			return this.value;
 		}
 
 		@Override
 		public String getName() {
-			return name;
+			return this.name;
 		}
 
 		@Override
@@ -4539,12 +4539,12 @@ private S121_VArAct(int value, String name) {
 
 		@Override
 		public int getValue() {
-			return value;
+			return this.value;
 		}
 
 		@Override
 		public String getName() {
-			return name;
+			return this.name;
 		}
 
 		@Override
@@ -4568,12 +4568,12 @@ private S121_ClcTotVA(int value, String name) {
 
 		@Override
 		public int getValue() {
-			return value;
+			return this.value;
 		}
 
 		@Override
 		public String getName() {
-			return name;
+			return this.name;
 		}
 
 		@Override
@@ -4598,12 +4598,12 @@ private S121_ConnPh(int value, String name) {
 
 		@Override
 		public int getValue() {
-			return value;
+			return this.value;
 		}
 
 		@Override
 		public String getName() {
-			return name;
+			return this.name;
 		}
 
 		@Override
@@ -4863,12 +4863,12 @@ private S122_PVConn(int value, String name) {
 
 		@Override
 		public int getValue() {
-			return value;
+			return this.value;
 		}
 
 		@Override
 		public String getName() {
-			return name;
+			return this.name;
 		}
 
 		@Override
@@ -4894,12 +4894,12 @@ private S122_StorConn(int value, String name) {
 
 		@Override
 		public int getValue() {
-			return value;
+			return this.value;
 		}
 
 		@Override
 		public String getName() {
-			return name;
+			return this.name;
 		}
 
 		@Override
@@ -4922,12 +4922,12 @@ private S122_ECPConn(int value, String name) {
 
 		@Override
 		public int getValue() {
-			return value;
+			return this.value;
 		}
 
 		@Override
 		public String getName() {
-			return name;
+			return this.name;
 		}
 
 		@Override
@@ -4960,12 +4960,12 @@ private S122_StSetLimMsk(int value, String name) {
 
 		@Override
 		public int getValue() {
-			return value;
+			return this.value;
 		}
 
 		@Override
 		public String getName() {
-			return name;
+			return this.name;
 		}
 
 		@Override
@@ -5001,12 +5001,12 @@ private S122_StActCtl(int value, String name) {
 
 		@Override
 		public int getValue() {
-			return value;
+			return this.value;
 		}
 
 		@Override
 		public String getName() {
-			return name;
+			return this.name;
 		}
 
 		@Override
@@ -5032,12 +5032,12 @@ private S122_RtSt(int value, String name) {
 
 		@Override
 		public int getValue() {
-			return value;
+			return this.value;
 		}
 
 		@Override
 		public String getName() {
-			return name;
+			return this.name;
 		}
 
 		@Override
@@ -5339,12 +5339,12 @@ private S123_Conn(int value, String name) {
 
 		@Override
 		public int getValue() {
-			return value;
+			return this.value;
 		}
 
 		@Override
 		public String getName() {
-			return name;
+			return this.name;
 		}
 
 		@Override
@@ -5368,12 +5368,12 @@ private S123_WMaxLim_Ena(int value, String name) {
 
 		@Override
 		public int getValue() {
-			return value;
+			return this.value;
 		}
 
 		@Override
 		public String getName() {
-			return name;
+			return this.name;
 		}
 
 		@Override
@@ -5397,12 +5397,12 @@ private S123_OutPFSet_Ena(int value, String name) {
 
 		@Override
 		public int getValue() {
-			return value;
+			return this.value;
 		}
 
 		@Override
 		public String getName() {
-			return name;
+			return this.name;
 		}
 
 		@Override
@@ -5428,12 +5428,12 @@ private S123_VArPct_Mod(int value, String name) {
 
 		@Override
 		public int getValue() {
-			return value;
+			return this.value;
 		}
 
 		@Override
 		public String getName() {
-			return name;
+			return this.name;
 		}
 
 		@Override
@@ -5457,12 +5457,12 @@ private S123_VArPct_Ena(int value, String name) {
 
 		@Override
 		public int getValue() {
-			return value;
+			return this.value;
 		}
 
 		@Override
 		public String getName() {
-			return name;
+			return this.name;
 		}
 
 		@Override
@@ -5764,12 +5764,12 @@ private S124_StorCtl_Mod(int value, String name) {
 
 		@Override
 		public int getValue() {
-			return value;
+			return this.value;
 		}
 
 		@Override
 		public String getName() {
-			return name;
+			return this.name;
 		}
 
 		@Override
@@ -5798,12 +5798,12 @@ private S124_ChaSt(int value, String name) {
 
 		@Override
 		public int getValue() {
-			return value;
+			return this.value;
 		}
 
 		@Override
 		public String getName() {
-			return name;
+			return this.name;
 		}
 
 		@Override
@@ -5827,12 +5827,12 @@ private S124_ChaGriSet(int value, String name) {
 
 		@Override
 		public int getValue() {
-			return value;
+			return this.value;
 		}
 
 		@Override
 		public String getName() {
-			return name;
+			return this.name;
 		}
 
 		@Override
@@ -5957,12 +5957,12 @@ private S125_ModEna(int value, String name) {
 
 		@Override
 		public int getValue() {
-			return value;
+			return this.value;
 		}
 
 		@Override
 		public String getName() {
-			return name;
+			return this.name;
 		}
 
 		@Override
@@ -5989,12 +5989,12 @@ private S125_SigType(int value, String name) {
 
 		@Override
 		public int getValue() {
-			return value;
+			return this.value;
 		}
 
 		@Override
 		public String getName() {
-			return name;
+			return this.name;
 		}
 
 		@Override
@@ -6141,12 +6141,12 @@ private S127_HysEna(int value, String name) {
 
 		@Override
 		public int getValue() {
-			return value;
+			return this.value;
 		}
 
 		@Override
 		public String getName() {
-			return name;
+			return this.name;
 		}
 
 		@Override
@@ -6169,12 +6169,12 @@ private S127_ModEna(int value, String name) {
 
 		@Override
 		public int getValue() {
-			return value;
+			return this.value;
 		}
 
 		@Override
 		public String getName() {
-			return name;
+			return this.name;
 		}
 
 		@Override
@@ -6366,12 +6366,12 @@ private S128_ArGraMod(int value, String name) {
 
 		@Override
 		public int getValue() {
-			return value;
+			return this.value;
 		}
 
 		@Override
 		public String getName() {
-			return name;
+			return this.name;
 		}
 
 		@Override
@@ -6394,12 +6394,12 @@ private S128_ModEna(int value, String name) {
 
 		@Override
 		public int getValue() {
-			return value;
+			return this.value;
 		}
 
 		@Override
 		public String getName() {
-			return name;
+			return this.name;
 		}
 
 		@Override
@@ -7350,12 +7350,12 @@ private S201_Evt(int value, String name) {
 
 		@Override
 		public int getValue() {
-			return value;
+			return this.value;
 		}
 
 		@Override
 		public String getName() {
-			return name;
+			return this.name;
 		}
 
 		@Override
@@ -8212,12 +8212,12 @@ private S202_Evt(int value, String name) {
 
 		@Override
 		public int getValue() {
-			return value;
+			return this.value;
 		}
 
 		@Override
 		public String getName() {
-			return name;
+			return this.name;
 		}
 
 		@Override
@@ -9074,12 +9074,12 @@ private S203_Evt(int value, String name) {
 
 		@Override
 		public int getValue() {
-			return value;
+			return this.value;
 		}
 
 		@Override
 		public String getName() {
-			return name;
+			return this.name;
 		}
 
 		@Override
@@ -9936,12 +9936,12 @@ private S204_Evt(int value, String name) {
 
 		@Override
 		public int getValue() {
-			return value;
+			return this.value;
 		}
 
 		@Override
 		public String getName() {
-			return name;
+			return this.name;
 		}
 
 		@Override
@@ -11097,12 +11097,12 @@ private S802_ChaSt(int value, String name) {
 
 		@Override
 		public int getValue() {
-			return value;
+			return this.value;
 		}
 
 		@Override
 		public String getName() {
-			return name;
+			return this.name;
 		}
 
 		@Override
@@ -11126,12 +11126,12 @@ private S802_LocRemCtl(int value, String name) {
 
 		@Override
 		public int getValue() {
-			return value;
+			return this.value;
 		}
 
 		@Override
 		public String getName() {
-			return name;
+			return this.name;
 		}
 
 		@Override
@@ -11165,12 +11165,12 @@ private S802_Typ(int value, String name) {
 
 		@Override
 		public int getValue() {
-			return value;
+			return this.value;
 		}
 
 		@Override
 		public String getName() {
-			return name;
+			return this.name;
 		}
 
 		@Override
@@ -11199,12 +11199,12 @@ private S802_State(int value, String name) {
 
 		@Override
 		public int getValue() {
-			return value;
+			return this.value;
 		}
 
 		@Override
 		public String getName() {
-			return name;
+			return this.name;
 		}
 
 		@Override
@@ -11256,12 +11256,12 @@ private S802_Evt1(int value, String name) {
 
 		@Override
 		public int getValue() {
-			return value;
+			return this.value;
 		}
 
 		@Override
 		public String getName() {
-			return name;
+			return this.name;
 		}
 
 		@Override
@@ -11286,12 +11286,12 @@ private S802_ReqInvState(int value, String name) {
 
 		@Override
 		public int getValue() {
-			return value;
+			return this.value;
 		}
 
 		@Override
 		public String getName() {
-			return name;
+			return this.name;
 		}
 
 		@Override
@@ -11315,12 +11315,12 @@ private S802_SetOp(int value, String name) {
 
 		@Override
 		public int getValue() {
-			return value;
+			return this.value;
 		}
 
 		@Override
 		public String getName() {
-			return name;
+			return this.name;
 		}
 
 		@Override
@@ -11345,12 +11345,12 @@ private S802_SetInvState(int value, String name) {
 
 		@Override
 		public int getValue() {
-			return value;
+			return this.value;
 		}
 
 		@Override
 		public String getName() {
-			return name;
+			return this.name;
 		}
 
 		@Override
@@ -12395,12 +12395,12 @@ private S64110_SMTP_enable_SSL(int value, String name) {
 
 		@Override
 		public int getValue() {
-			return value;
+			return this.value;
 		}
 
 		@Override
 		public String getName() {
-			return name;
+			return this.name;
 		}
 
 		@Override
@@ -12424,12 +12424,12 @@ private S64110_Alarm_email_en(int value, String name) {
 
 		@Override
 		public int getValue() {
-			return value;
+			return this.value;
 		}
 
 		@Override
 		public String getName() {
-			return name;
+			return this.name;
 		}
 
 		@Override
@@ -12454,12 +12454,12 @@ private S64110_Log_mode(int value, String name) {
 
 		@Override
 		public int getValue() {
-			return value;
+			return this.value;
 		}
 
 		@Override
 		public String getName() {
-			return name;
+			return this.name;
 		}
 
 		@Override
@@ -12483,12 +12483,12 @@ private S64110_NTP_enable(int value, String name) {
 
 		@Override
 		public int getValue() {
-			return value;
+			return this.value;
 		}
 
 		@Override
 		public String getName() {
-			return name;
+			return this.name;
 		}
 
 		@Override
@@ -12782,12 +12782,12 @@ private S64111_ChargerSt(int value, String name) {
 
 		@Override
 		public int getValue() {
-			return value;
+			return this.value;
 		}
 
 		@Override
 		public String getName() {
-			return name;
+			return this.name;
 		}
 
 		@Override
@@ -13530,12 +13530,12 @@ private S64112_CC_Config_MPPT_mode(int value, String name) {
 
 		@Override
 		public int getValue() {
-			return value;
+			return this.value;
 		}
 
 		@Override
 		public String getName() {
-			return name;
+			return this.name;
 		}
 
 		@Override
@@ -13559,12 +13559,12 @@ private S64112_CC_Config_sweep_width(int value, String name) {
 
 		@Override
 		public int getValue() {
-			return value;
+			return this.value;
 		}
 
 		@Override
 		public String getName() {
-			return name;
+			return this.name;
 		}
 
 		@Override
@@ -13590,12 +13590,12 @@ private S64112_CC_Config_sweep_max(int value, String name) {
 
 		@Override
 		public int getValue() {
-			return value;
+			return this.value;
 		}
 
 		@Override
 		public String getName() {
-			return name;
+			return this.name;
 		}
 
 		@Override
@@ -13619,12 +13619,12 @@ private S64112_CC_Config_grid_tie(int value, String name) {
 
 		@Override
 		public int getValue() {
-			return value;
+			return this.value;
 		}
 
 		@Override
 		public String getName() {
-			return name;
+			return this.name;
 		}
 
 		@Override
@@ -13648,12 +13648,12 @@ private S64112_CC_Config_temp_comp(int value, String name) {
 
 		@Override
 		public int getValue() {
-			return value;
+			return this.value;
 		}
 
 		@Override
 		public String getName() {
-			return name;
+			return this.name;
 		}
 
 		@Override
@@ -13678,12 +13678,12 @@ private S64112_CC_Config_auto_restart(int value, String name) {
 
 		@Override
 		public int getValue() {
-			return value;
+			return this.value;
 		}
 
 		@Override
 		public String getName() {
-			return name;
+			return this.name;
 		}
 
 		@Override
@@ -13714,12 +13714,12 @@ private S64112_CC_Config_AUX_mode(int value, String name) {
 
 		@Override
 		public int getValue() {
-			return value;
+			return this.value;
 		}
 
 		@Override
 		public String getName() {
-			return name;
+			return this.name;
 		}
 
 		@Override
@@ -13744,12 +13744,12 @@ private S64112_CC_Config_AUX_control(int value, String name) {
 
 		@Override
 		public int getValue() {
-			return value;
+			return this.value;
 		}
 
 		@Override
 		public String getName() {
-			return name;
+			return this.name;
 		}
 
 		@Override
@@ -13773,12 +13773,12 @@ private S64112_CC_Config_AUX_state(int value, String name) {
 
 		@Override
 		public int getValue() {
-			return value;
+			return this.value;
 		}
 
 		@Override
 		public String getName() {
-			return name;
+			return this.name;
 		}
 
 		@Override
@@ -13802,12 +13802,12 @@ private S64112_CC_Config_AUX_polarity(int value, String name) {
 
 		@Override
 		public int getValue() {
-			return value;
+			return this.value;
 		}
 
 		@Override
 		public String getName() {
-			return name;
+			return this.name;
 		}
 
 		@Override
diff --git a/io.openems.edge.bridge.modbus/src/io/openems/edge/bridge/modbus/sunspec/SunSpecCodeGenerator.java b/io.openems.edge.bridge.modbus/src/io/openems/edge/bridge/modbus/sunspec/SunSpecCodeGenerator.java
index 5bbad7b592a..8568119f58b 100644
--- a/io.openems.edge.bridge.modbus/src/io/openems/edge/bridge/modbus/sunspec/SunSpecCodeGenerator.java
+++ b/io.openems.edge.bridge.modbus/src/io/openems/edge/bridge/modbus/sunspec/SunSpecCodeGenerator.java
@@ -1,6 +1,5 @@
 package io.openems.edge.bridge.modbus.sunspec;
 
-import java.io.BufferedWriter;
 import java.io.File;
 import java.io.IOException;
 import java.nio.file.Files;
@@ -13,12 +12,9 @@
 import java.util.Set;
 import java.util.function.Function;
 
-import javax.xml.parsers.DocumentBuilder;
 import javax.xml.parsers.DocumentBuilderFactory;
 
-import org.w3c.dom.Document;
 import org.w3c.dom.Element;
-import org.w3c.dom.NamedNodeMap;
 import org.w3c.dom.Node;
 import org.w3c.dom.NodeList;
 
@@ -37,7 +33,7 @@
 /**
  * This tool converts SunSpec XML definitions to Java code suitable for the
  * OpenEMS SunSpec implementation.
- * 
+ *
  * <p>
  * Download XML files from https://github.com/sunspec/models.
  */
@@ -117,19 +113,19 @@ public class SunSpecCodeGenerator {
 
 	/**
 	 * Run this method to start the code generator.
-	 * 
+	 *
 	 * @param args not supported
 	 * @throws Exception on error
 	 */
 	public static void main(String[] args) throws Exception {
-		SunSpecCodeGenerator generator = new SunSpecCodeGenerator();
-		List<Model> models = generator.parseSunSpecXmlFiles();
+		var generator = new SunSpecCodeGenerator();
+		var models = generator.parseSunSpecXmlFiles();
 		generator.writeSunSpecModelJavaFile(models);
 	}
 
 	/**
 	 * Parses all SunSpec XML files in a directory.
-	 * 
+	 *
 	 * @return a list of Models
 	 * @throws Exception on error
 	 */
@@ -140,7 +136,7 @@ private List<Model> parseSunSpecXmlFiles() throws Exception {
 				&& file.getName().endsWith(".xml") //
 				&& !IGNORE_FILES.contains(file.getName()))) {
 			try {
-				Model model = this.parseSunSpecXmlFile(file);
+				var model = this.parseSunSpecXmlFile(file);
 				result.add(model);
 
 			} catch (Exception e) {
@@ -152,47 +148,45 @@ private List<Model> parseSunSpecXmlFiles() throws Exception {
 
 	/**
 	 * Parses a SunSpec XML file.
-	 * 
+	 *
 	 * @param file the SunSpec XML file handler
 	 * @return the Model
 	 * @throws Exception on error
 	 */
 	private Model parseSunSpecXmlFile(File file) throws Exception {
-		DocumentBuilderFactory dbFactory = DocumentBuilderFactory.newInstance();
-		DocumentBuilder dBuilder = dbFactory.newDocumentBuilder();
-		Document doc = dBuilder.parse(file);
+		var dbFactory = DocumentBuilderFactory.newInstance();
+		var dBuilder = dbFactory.newDocumentBuilder();
+		var doc = dBuilder.parse(file);
 		doc.getDocumentElement().normalize();
 
-		SunSpecCodeGenerator generator = new SunSpecCodeGenerator();
-		Model model = generator.parseSunSpecModels(doc.getDocumentElement());
-
-		return model;
+		var generator = new SunSpecCodeGenerator();
+		return generator.parseSunSpecModels(doc.getDocumentElement());
 	}
 
 	/**
 	 * Parses the element sunSpecModels.
-	 * 
+	 *
 	 * <pre>
 	 *   &lt;sunSpecModels v="1"&gt;
 	 * </pre>
-	 * 
+	 *
 	 * <ul>
 	 * <li>xs:attribute name="v" type="xs:string" default="1"
 	 * </ul>
-	 * 
+	 *
 	 * @param sunSpecModelsElement the 'sunSpecModels' node
 	 * @return the Model
 	 * @throws OpenemsNamedException on error
 	 */
 	private Model parseSunSpecModels(Element sunSpecModelsElement) throws OpenemsNamedException {
 		// parse all "model" XML elements
-		NodeList modelNodes = sunSpecModelsElement.getElementsByTagName("model");
-		Node modelNode = this.assertExactlyOneNode(modelNodes, (node) -> node.getAttributes().getLength() != 0);
-		Model model = this.parseModel(modelNode);
+		var modelNodes = sunSpecModelsElement.getElementsByTagName("model");
+		var modelNode = this.assertExactlyOneNode(modelNodes, node -> node.getAttributes().getLength() != 0);
+		var model = this.parseModel(modelNode);
 
 		// parse all "strings" XML elements
-		NodeList stringsNodes = sunSpecModelsElement.getElementsByTagName("strings");
-		Node stringsNode = this.assertExactlyOneNode(stringsNodes);
+		var stringsNodes = sunSpecModelsElement.getElementsByTagName("strings");
+		var stringsNode = this.assertExactlyOneNode(stringsNodes);
 		this.parseStrings(stringsNode, model);
 
 		return model;
@@ -200,48 +194,48 @@ private Model parseSunSpecModels(Element sunSpecModelsElement) throws OpenemsNam
 
 	/**
 	 * Parses the element sunSpecModels -&gt; model.
-	 * 
+	 *
 	 * <pre>
 	 *   &lt;model id="1" len="66" name="common"&gt;
 	 * </pre>
-	 * 
+	 *
 	 * <ul>
 	 * <li>xs:attribute name="id" type="xs:integer"
 	 * <li>xs:attribute name="len" type="xs:integer"
 	 * </ul>
-	 * 
+	 *
 	 * @param node the 'model' node
 	 * @return the Model
 	 * @throws OpenemsNamedException on error
 	 */
 	private Model parseModel(Node node) throws OpenemsNamedException {
 		// read attributes
-		NamedNodeMap attrs = node.getAttributes();
-		int id = XmlUtils.getAsInt(attrs, "id");
-		int len = XmlUtils.getAsInt(attrs, "len");
-		String name = XmlUtils.getAsStringOrElse(attrs, "name", "");
+		var attrs = node.getAttributes();
+		var id = XmlUtils.getAsInt(attrs, "id");
+		var len = XmlUtils.getAsInt(attrs, "len");
+		var name = XmlUtils.getAsStringOrElse(attrs, "name", "");
 
 		// read points
-		Element element = (Element) node;
-		NodeList blockNodes = element.getElementsByTagName("block");
-		Node blockNode = this.assertExactlyOneNode(blockNodes);
-		List<Point> points = this.parseModelBlock(blockNode);
+		var element = (Element) node;
+		var blockNodes = element.getElementsByTagName("block");
+		var blockNode = this.assertExactlyOneNode(blockNodes);
+		var points = this.parseModelBlock(blockNode);
 
 		return new Model(id, len, name, points);
 	}
 
 	/**
 	 * Parses the element sunSpecModels -&gt; model -&gt; block.
-	 * 
+	 *
 	 * <pre>
 	 *   &lt;block len="66"&gt;
 	 * </pre>
-	 * 
+	 *
 	 * <ul>
 	 * <li>xs:attribute name="id" type="xs:integer"
 	 * <li>xs:attribute name="len" type="xs:integer"
 	 * </ul>
-	 * 
+	 *
 	 * @param node the 'block' node
 	 * @return a list Points
 	 * @throws OpenemsNamedException on error
@@ -249,10 +243,10 @@ private Model parseModel(Node node) throws OpenemsNamedException {
 	private List<Point> parseModelBlock(Node node) throws OpenemsNamedException {
 		// TODO implement "repeating" blocks
 		List<Point> points = new ArrayList<>();
-		Element element = (Element) node;
-		NodeList pointNodes = element.getElementsByTagName("point");
-		for (int i = 0; i < pointNodes.getLength(); i++) {
-			Node pointNode = pointNodes.item(i);
+		var element = (Element) node;
+		var pointNodes = element.getElementsByTagName("point");
+		for (var i = 0; i < pointNodes.getLength(); i++) {
+			var pointNode = pointNodes.item(i);
 			points.add(this.parseModelBlockPoint(pointNode));
 		}
 		return points;
@@ -260,11 +254,11 @@ private List<Point> parseModelBlock(Node node) throws OpenemsNamedException {
 
 	/**
 	 * Parses the element sunSpecModels -&gt; model -&gt; block -&gt; point.
-	 * 
+	 *
 	 * <pre>
 	 *   &lt;point id="Mn" offset="0" type="string" len="16" mandatory="true" /&gt;
 	 * </pre>
-	 * 
+	 *
 	 * <ul>
 	 * <li>xs:attribute name="id" type="xs:string" use="required"
 	 * <li>xs:attribute name="len" type="xs:integer"
@@ -277,17 +271,17 @@ private List<Point> parseModelBlock(Node node) throws OpenemsNamedException {
 	 * <li>xs:attribute name="category" type="CategoryDefinition"
 	 * default="measurement"
 	 * </ul>
-	 * 
+	 *
 	 * @param node the 'point' node.
 	 * @return the Point
 	 * @throws OpenemsNamedException on error
 	 */
 	private Point parseModelBlockPoint(Node node) throws OpenemsNamedException {
-		NamedNodeMap attrs = node.getAttributes();
+		var attrs = node.getAttributes();
 
 		int len;
 		PointType type;
-		String typeString = XmlUtils.getAsString(attrs, "type");
+		var typeString = XmlUtils.getAsString(attrs, "type");
 		if (typeString.equals("string")) {
 			len = XmlUtils.getAsInt(attrs, "len");
 			type = PointType.valueOf("STRING" + len);
@@ -296,9 +290,9 @@ private Point parseModelBlockPoint(Node node) throws OpenemsNamedException {
 			len = type.length;
 		}
 
-		String scaleFactor = XmlUtils.getAsStringOrElse(attrs, "sf", null);
-		String unitString = XmlUtils.getAsStringOrElse(attrs, "units", "");
-		final ThrowingFunction<String, Unit, OpenemsNamedException> toUnit = (s) -> {
+		var scaleFactor = XmlUtils.getAsStringOrElse(attrs, "sf", null);
+		var unitString = XmlUtils.getAsStringOrElse(attrs, "units", "");
+		final ThrowingFunction<String, Unit, OpenemsNamedException> toUnit = s -> {
 			s = s.trim();
 			if (s.contains(" ")) {
 				s = s.substring(0, s.indexOf(" "));
@@ -369,9 +363,9 @@ private Point parseModelBlockPoint(Node node) throws OpenemsNamedException {
 			}
 			throw new OpenemsException("Unhandled unit [" + s + "]");
 		};
-		Unit unit = toUnit.apply(unitString);
+		var unit = toUnit.apply(unitString);
 
-		String accessModeString = XmlUtils.getAsStringOrElse(attrs, "access", "r");
+		var accessModeString = XmlUtils.getAsStringOrElse(attrs, "access", "r");
 		AccessMode accessMode;
 		switch (accessModeString.toLowerCase()) {
 		case "wo":
@@ -386,66 +380,64 @@ private Point parseModelBlockPoint(Node node) throws OpenemsNamedException {
 			accessMode = AccessMode.READ_ONLY;
 			break;
 		}
-		boolean mandatory = XmlUtils.getAsBooleanOrElse(attrs, "mandatory", false);
-		PointCategory category = XmlUtils.getAsEnumOrElse(PointCategory.class, attrs, "category",
-				PointCategory.MEASUREMENT);
+		var mandatory = XmlUtils.getAsBooleanOrElse(attrs, "mandatory", false);
+		var category = XmlUtils.getAsEnumOrElse(PointCategory.class, attrs, "category", PointCategory.MEASUREMENT);
 
 		// read symbols
-		Element element = (Element) node;
-		NodeList symbolNodes = element.getElementsByTagName("symbol");
+		var element = (Element) node;
+		var symbolNodes = element.getElementsByTagName("symbol");
 		Symbol[] symbols;
 		if (symbolNodes.getLength() > 0) {
 			symbols = new Symbol[symbolNodes.getLength()];
-			for (int i = 0; i < symbolNodes.getLength(); i++) {
-				Node symbolNode = symbolNodes.item(i);
+			for (var i = 0; i < symbolNodes.getLength(); i++) {
+				var symbolNode = symbolNodes.item(i);
 				symbols[i] = this.parseModelBlockPointSymbol(symbolNode);
 			}
 		} else {
 			symbols = new Symbol[0];
 		}
 
-		String id = XmlUtils.getAsString(attrs, "id");
-		int offset = XmlUtils.getAsInt(attrs, "offset");
+		var id = XmlUtils.getAsString(attrs, "id");
+		var offset = XmlUtils.getAsInt(attrs, "offset");
 
-		Point point = new Point(id, len, offset, type, scaleFactor, unit, accessMode, mandatory, category, symbols);
-		return point;
+		return new Point(id, len, offset, type, scaleFactor, unit, accessMode, mandatory, category, symbols);
 	}
 
 	/**
 	 * Parses the element sunSpecModels -&gt; model -&gt; block -&gt; point -&gt;
 	 * symbol.
-	 * 
+	 *
 	 * <pre>
 	 *   &lt;symbol id="OFF"&gt1&ltsymbol&gt;
 	 * </pre>
-	 * 
+	 *
 	 * <ul>
 	 * <li>xs:attribute name="id" type="xs:string" use="required"
 	 * </ul>
-	 * 
+	 *
 	 * @param node the 'symbol' node
 	 * @return the Symbol
 	 * @throws OpenemsNamedException on error
 	 */
 	private Symbol parseModelBlockPointSymbol(Node node) throws OpenemsNamedException {
-		NamedNodeMap attrs = node.getAttributes();
-		String id = XmlUtils.getAsString(attrs, "id");
-		int value = XmlUtils.getContentAsInt(node);
+		var attrs = node.getAttributes();
+		var id = XmlUtils.getAsString(attrs, "id");
+		var value = XmlUtils.getContentAsInt(node);
 		return new Symbol(id, value);
 	}
 
 	/**
 	 * Parses the element sunSpecModels -&gt; strings.
-	 * 
+	 *
 	 * <pre>
 	 *   &lt;strings id="1" locale="en"&gt;
 	 * </pre>
-	 * 
+	 *
 	 * <ul>
 	 * <li>xs:attribute name="id" type="xs:integer" use="required"
 	 * <li>xs:attribute name="locale" type="xs:string"
 	 * </ul>
-	 * 
+	 *
 	 * @param node  the 'strings' node
 	 * @param model the Model, that needs to be completed.
 	 * @throws OpenemsNamedException on error
@@ -453,36 +445,36 @@ private Symbol parseModelBlockPointSymbol(Node node) throws OpenemsNamedExceptio
 	@SuppressWarnings("unused")
 	private void parseStrings(Node node, Model model) throws OpenemsNamedException {
 		// read attributes
-		NamedNodeMap attrs = node.getAttributes();
-		int id = XmlUtils.getAsInt(attrs, "id");
-		String locale = XmlUtils.getAsString(attrs, "locale");
+		var attrs = node.getAttributes();
+		var id = XmlUtils.getAsInt(attrs, "id");
+		var locale = XmlUtils.getAsString(attrs, "locale");
 
 		if (model.id != id) {
 			throw new OpenemsException("Model-IDs are not matching");
 		}
 
-		Element element = (Element) node;
+		var element = (Element) node;
 
 		// read model
-		NodeList modelNodes = element.getElementsByTagName("model");
-		Node modelNode = this.assertExactlyOneNode(modelNodes);
+		var modelNodes = element.getElementsByTagName("model");
+		var modelNode = this.assertExactlyOneNode(modelNodes);
 		this.parseStringsModel(modelNode, model);
 
 		// read points
-		NodeList pointNodes = element.getElementsByTagName("point");
-		for (int i = 0; i < pointNodes.getLength(); i++) {
-			Node pointNode = pointNodes.item(i);
+		var pointNodes = element.getElementsByTagName("point");
+		for (var i = 0; i < pointNodes.getLength(); i++) {
+			var pointNode = pointNodes.item(i);
 			this.parseStringsPoint(pointNode, model);
 		}
 	}
 
 	/**
 	 * Parses the element sunSpecModels -&gt; strings -&gt; model.
-	 * 
+	 *
 	 * <pre>
 	 *   &lt;model&gt;
 	 * </pre>
-	 * 
+	 *
 	 * @param node  the 'model' node.
 	 * @param model the Model, that needs to be completed.
 	 * @throws OpenemsNamedException on error
@@ -495,18 +487,18 @@ private void parseStringsModel(Node node, Model model) throws OpenemsNamedExcept
 
 	/**
 	 * Parses the element sunSpecModels -&gt; strings -&gt; point.
-	 * 
+	 *
 	 * <pre>
 	 *   &lt;point&gt;
 	 * </pre>
-	 * 
+	 *
 	 * @param node  the 'point' node
 	 * @param model the Model, that needs to be completed.
 	 * @throws OpenemsNamedException on error
 	 */
 	private void parseStringsPoint(Node node, Model model) throws OpenemsNamedException {
-		NamedNodeMap attrs = node.getAttributes();
-		String id = XmlUtils.getAsString(attrs, "id");
+		var attrs = node.getAttributes();
+		var id = XmlUtils.getAsString(attrs, "id");
 		switch (id) {
 		case "VArWMaxPct_SF":
 		case "TotVArhExpQ4Ph":
@@ -520,12 +512,12 @@ private void parseStringsPoint(Node node, Model model) throws OpenemsNamedExcept
 			return;
 		}
 
-		Point point = model.getPoint(id);
+		var point = model.getPoint(id);
 
-		Element element = (Element) node;
-		NodeList subNodes = element.getChildNodes();
-		for (int i = 0; i < subNodes.getLength(); i++) {
-			Node subNode = subNodes.item(i);
+		var element = (Element) node;
+		var subNodes = element.getChildNodes();
+		for (var i = 0; i < subNodes.getLength(); i++) {
+			var subNode = subNodes.item(i);
 			switch (subNode.getNodeName()) {
 			case "label":
 				point.label = XmlUtils.getContentAsString(subNode);
@@ -550,18 +542,18 @@ private void parseStringsPoint(Node node, Model model) throws OpenemsNamedExcept
 
 	/**
 	 * Parses the element sunSpecModels -&gt; strings -&gt; point -&gt; symbol.
-	 * 
+	 *
 	 * <pre>
 	 *   &lt;point&gt;
 	 * </pre>
-	 * 
+	 *
 	 * @param node  the 'symbol' node
 	 * @param point the Model, that needs to be completed.
 	 * @throws OpenemsNamedException on error
 	 */
 	private void parseStringsPointSymbol(Node node, Point point) throws OpenemsNamedException {
-		NamedNodeMap attrs = node.getAttributes();
-		String id = XmlUtils.getAsString(attrs, "id");
+		var attrs = node.getAttributes();
+		var id = XmlUtils.getAsString(attrs, "id");
 		switch (id) {
 		case "OEM16":
 			// Special handling for ID 201
@@ -569,12 +561,12 @@ private void parseStringsPointSymbol(Node node, Point point) throws OpenemsNamed
 			return;
 		}
 
-		Symbol symbol = point.getSymbol(id);
+		var symbol = point.getSymbol(id);
 
-		Element element = (Element) node;
-		NodeList subNodes = element.getChildNodes();
-		for (int i = 0; i < subNodes.getLength(); i++) {
-			Node subNode = subNodes.item(i);
+		var element = (Element) node;
+		var subNodes = element.getChildNodes();
+		for (var i = 0; i < subNodes.getLength(); i++) {
+			var subNode = subNodes.item(i);
 			switch (subNode.getNodeName()) {
 			case "label":
 				symbol.label = XmlUtils.getContentAsString(subNode);
@@ -596,12 +588,12 @@ private void parseStringsPointSymbol(Node node, Point point) throws OpenemsNamed
 
 	/**
 	 * Writes the SunSpecModel.java file.
-	 * 
+	 *
 	 * @param models a list of Models
 	 * @throws IOException on error
 	 */
 	private void writeSunSpecModelJavaFile(List<Model> models) throws IOException {
-		try (BufferedWriter w = Files.newBufferedWriter(Paths.get(OUT_FILE_PATH))) {
+		try (var w = Files.newBufferedWriter(Paths.get(OUT_FILE_PATH))) {
 			w.write("package io.openems.edge.bridge.modbus.sunspec;");
 			w.newLine();
 			w.newLine();
@@ -624,8 +616,8 @@ private void writeSunSpecModelJavaFile(List<Model> models) throws IOException {
 			/*
 			 * Write main Model enum
 			 */
-			for (int i = 0; i < models.size(); i++) {
-				Model model = models.get(i);
+			for (var i = 0; i < models.size(); i++) {
+				var model = models.get(i);
 				w.write("	S_" + model.id + "(//");
 				w.newLine();
 				w.write("			\"" + esc(model.label) + "\", //");
@@ -656,9 +648,9 @@ private void writeSunSpecModelJavaFile(List<Model> models) throws IOException {
 			for (Model model : models) {
 				w.write("	public static enum S" + model.id + " implements SunSpecPoint {");
 				w.newLine();
-				for (int i = 0; i < model.points.size(); i++) {
-					Point point = model.points.get(i);
-					String pointUpperId = toUpperUnderscore(point.id);
+				for (var i = 0; i < model.points.size(); i++) {
+					var point = model.points.get(i);
+					var pointUpperId = toUpperUnderscore(point.id);
 					w.write("		" + pointUpperId + "(new PointImpl(//");
 					w.newLine();
 					w.write("				\"S" + model.id + "_" + pointUpperId + "\", //");
@@ -678,8 +670,7 @@ private void writeSunSpecModelJavaFile(List<Model> models) throws IOException {
 					w.write("				Unit." + point.unit.name() + ", //");
 					w.newLine();
 					w.write("				"
-							+ (point.scaleFactor.isPresent() ? ("\"" + point.scaleFactor.get() + "\"") : null)
-							+ ", //");
+							+ (point.scaleFactor.isPresent() ? "\"" + point.scaleFactor.get() + "\"" : null) + ", //");
 					w.newLine();
 					if (point.symbols.length == 0) {
 						w.write("				new OptionsEnum[0]))");
@@ -729,9 +720,9 @@ private void writeSunSpecModelJavaFile(List<Model> models) throws IOException {
 					w.newLine();
 					w.write("		UNDEFINED(-1, \"Undefined\"), //");
 					w.newLine();
-					for (int i = 0; i < point.symbols.length; i++) {
-						Symbol symbol = point.symbols[i];
-						String symbolId = symbol.id;
+					for (var i = 0; i < point.symbols.length; i++) {
+						var symbol = point.symbols[i];
+						var symbolId = symbol.id;
 						symbolId = toUpperUnderscore(symbolId);
 
 						switch (symbolId) {
@@ -833,7 +824,7 @@ private void writeSunSpecModelJavaFile(List<Model> models) throws IOException {
 
 	/**
 	 * Helper method to escape a string.
-	 * 
+	 *
 	 * @param string original string
 	 * @return escaped string
 	 */
@@ -850,7 +841,7 @@ private static final String esc(String string) {
 	/**
 	 * Throws an exception if the list does not have exactly one Node that matches
 	 * the filters. Returns that node otherwise.
-	 * 
+	 *
 	 * @param nodes   the list of nodes
 	 * @param filters the filters that need to be matched by the node
 	 * @return the Node
@@ -862,8 +853,8 @@ private final Node assertExactlyOneNode(NodeList nodes, Function<Node, Boolean>.
 			return nodes.item(0);
 		}
 		Node result = null;
-		for (int i = 0; i < nodes.getLength(); i++) {
-			Node node = nodes.item(i);
+		for (var i = 0; i < nodes.getLength(); i++) {
+			var node = nodes.item(i);
 			for (Function<Node, Boolean> filter : filters) {
 				if (filter.apply(node)) {
 					if (result != null) {
@@ -876,22 +867,21 @@ private final Node assertExactlyOneNode(NodeList nodes, Function<Node, Boolean>.
 
 		if (result != null) {
 			return result;
-		} else {
-			throw new IllegalArgumentException("Exactly one node matching the filters was expected!");
 		}
+		throw new IllegalArgumentException("Exactly one node matching the filters was expected!");
 	}
 
 	/**
 	 * Gets the Content of a Sub-Node.
-	 * 
+	 *
 	 * @param node    the Node
 	 * @param tagName the tag name of the Sub-Node
 	 * @return the Content as a String
 	 */
 	private String getTextContent(Node node, String tagName) {
-		Element element = (Element) node;
-		NodeList nodes = element.getElementsByTagName(tagName);
-		Node subNode = this.assertExactlyOneNode(nodes);
+		var element = (Element) node;
+		var nodes = element.getElementsByTagName(tagName);
+		var subNode = this.assertExactlyOneNode(nodes);
 		return subNode.getTextContent();
 	}
 
@@ -919,7 +909,7 @@ public Model(int id, int len, String name, List<Point> points) {
 
 		/**
 		 * Gets the Point with the given Id.
-		 * 
+		 *
 		 * @param id the Point-ID
 		 * @return the Point
 		 * @throws OpenemsException on error
@@ -963,7 +953,6 @@ public static class Point {
 
 		public Point(String id, int len, int offset, PointType type, String scaleFactor, Unit unit,
 				AccessMode accessMode, boolean mandatory, PointCategory category, Symbol[] symbols) {
-			super();
 			this.id = id;
 			this.len = len;
 			this.offset = offset;
@@ -978,7 +967,7 @@ public Point(String id, int len, int offset, PointType type, String scaleFactor,
 
 		/**
 		 * Gets the Symbol with the given Id.
-		 * 
+		 *
 		 * @param id the Symbol-Id
 		 * @return the Symbol
 		 * @throws OpenemsException on error
@@ -1012,7 +1001,7 @@ public static class Symbol {
 			protected String description;
 			protected String notes;
 
-			private static Function<String, String> idCleaner = (id) -> {
+			private static Function<String, String> idCleaner = id -> {
 				switch (id) {
 				case "ggOFF":
 				case "ggSLEEPING":
@@ -1074,7 +1063,7 @@ protected static String toUpperUnderscore(String string) {
 		if (!string.toUpperCase().equals(string)) {
 			string = CaseFormat.UPPER_CAMEL.to(CaseFormat.UPPER_UNDERSCORE, string);
 		}
-		return string.replaceAll("__", "_");
+		return string.replace("__", "_");
 	}
 
 }
diff --git a/io.openems.edge.bridge.modbus/src/io/openems/edge/bridge/modbus/sunspec/SunSpecModel.java b/io.openems.edge.bridge.modbus/src/io/openems/edge/bridge/modbus/sunspec/SunSpecModel.java
index 54575eaf49c..45f16a5f858 100644
--- a/io.openems.edge.bridge.modbus/src/io/openems/edge/bridge/modbus/sunspec/SunSpecModel.java
+++ b/io.openems.edge.bridge.modbus/src/io/openems/edge/bridge/modbus/sunspec/SunSpecModel.java
@@ -7,21 +7,21 @@ public interface SunSpecModel {
 
 	/**
 	 * The name of the SunSpec Model.
-	 * 
+	 *
 	 * It is expected to be "S_&lt;Block-ID&gt;", e.g. for the common Block-ID "1"
 	 * the expected name is "S_1".
-	 * 
+	 *
 	 * @return the name as String
 	 */
 	public String name();
 
 	/**
 	 * Gets the SunSpec Block-ID as integer.
-	 * 
+	 *
 	 * @return the Block-ID
 	 */
 	public default int getBlockId() {
-		return Integer.valueOf(this.name().substring(2));
+		return Integer.parseInt(this.name().substring(2));
 	}
 
 	public String label();
diff --git a/io.openems.edge.bridge.modbus/src/io/openems/edge/bridge/modbus/sunspec/SunSpecPoint.java b/io.openems.edge.bridge.modbus/src/io/openems/edge/bridge/modbus/sunspec/SunSpecPoint.java
index 0260cb9d2b8..f0ef6492ce4 100644
--- a/io.openems.edge.bridge.modbus/src/io/openems/edge/bridge/modbus/sunspec/SunSpecPoint.java
+++ b/io.openems.edge.bridge.modbus/src/io/openems/edge/bridge/modbus/sunspec/SunSpecPoint.java
@@ -27,24 +27,24 @@ public interface SunSpecPoint {
 
 	/**
 	 * Gets the Point-ID.
-	 * 
+	 *
 	 * <p>
 	 * This method refers to {@link Enum#name()}.
-	 * 
+	 *
 	 * @return the ID.
 	 */
 	public String name();
 
 	/**
 	 * The internal PointImpl object for easier handling in Enums.
-	 * 
+	 *
 	 * @return the internal PointImpl
 	 */
 	public PointImpl get();
 
 	/**
 	 * Returns true if the value represents a 'defined' value in SunSpec.
-	 * 
+	 *
 	 * @param value the value
 	 * @return true for defined values
 	 */
@@ -54,7 +54,7 @@ public default boolean isDefined(Object value) {
 
 	/**
 	 * Gets the {@link ChannelId} for this Point.
-	 * 
+	 *
 	 * @return the ChannelId.
 	 */
 	public default SunSChannelId<?> getChannelId() {
@@ -92,7 +92,7 @@ public PointImpl(String channelId, String label, String description, String note
 								.unit(unit) //
 								.accessMode(accessMode));
 			} else {
-				this.channelId = new SunSChannelId<Integer>(channelId, //
+				this.channelId = new SunSChannelId<>(channelId, //
 						new EnumDoc(options) //
 								.accessMode(accessMode));
 			}
@@ -101,7 +101,7 @@ public PointImpl(String channelId, String label, String description, String note
 
 		/**
 		 * Generates a Modbus Element for the given point + startAddress.
-		 * 
+		 *
 		 * @param startAddress the startAddress of the Point
 		 * @return a new Modbus Element
 		 */
@@ -167,17 +167,17 @@ public final AbstractModbusElement<?> generateModbusElement(Integer startAddress
 
 		/**
 		 * Gets the {@link OpenemsType} that matches this SunSpec-Type.
-		 * 
+		 *
 		 * @param hasScaleFactor true if this Point has a ScaleFactor. If true, a
 		 *                       floating point type is applied to avoid rounding
 		 *                       errors.
 		 * @return the {@link OpenemsType}
 		 */
 		public final OpenemsType getMatchingOpenemsType(boolean hasScaleFactor) {
-			if(hasScaleFactor) {
+			if (hasScaleFactor) {
 				return OpenemsType.FLOAT;
 			}
-			
+
 			// TODO: map to floating point OpenemsType when appropriate
 			switch (this.type) {
 			case UINT16:
@@ -234,7 +234,7 @@ private PointType(int length) {
 
 		/**
 		 * Returns true if the value represents a 'defined' value in SunSpec.
-		 * 
+		 *
 		 * @param type  the PointType
 		 * @param value the value
 		 * @return true for defined values
diff --git a/io.openems.edge.bridge.modbus/test/io/openems/edge/bridge/modbus/BridgeModbusTcpImplTest.java b/io.openems.edge.bridge.modbus/test/io/openems/edge/bridge/modbus/BridgeModbusTcpImplTest.java
index d44ee1db1d3..6ae119eeb13 100644
--- a/io.openems.edge.bridge.modbus/test/io/openems/edge/bridge/modbus/BridgeModbusTcpImplTest.java
+++ b/io.openems.edge.bridge.modbus/test/io/openems/edge/bridge/modbus/BridgeModbusTcpImplTest.java
@@ -39,14 +39,14 @@ public class BridgeModbusTcpImplTest {
 	public void test() throws Exception {
 		final ThrowingRunnable<Exception> sleep = () -> Thread.sleep(CYCLE_TIME);
 
-		int port = TestUtils.findRandomOpenPortOnAllLocalInterfaces();
+		var port = TestUtils.findRandomOpenPortOnAllLocalInterfaces();
 		ModbusSlave slave = null;
 		try {
 			/*
 			 * Open Modbus/TCP Slave
 			 */
 			slave = ModbusSlaveFactory.createTCPSlave(port, 1);
-			SimpleProcessImage processImage = new SimpleProcessImage(UNIT_ID);
+			var processImage = new SimpleProcessImage(UNIT_ID);
 			Register register100 = new SimpleRegister(123);
 			processImage.addRegister(100, register100);
 			slave.addProcessImage(UNIT_ID, processImage);
@@ -55,9 +55,9 @@ public void test() throws Exception {
 			/*
 			 * Instantiate Modbus-Bridge
 			 */
-			BridgeModbusTcpImpl sut = new BridgeModbusTcpImpl();
-			MyModbusComponent device = new MyModbusComponent(DEVICE_ID, sut, UNIT_ID);
-			ComponentTest test = new ComponentTest(sut) //
+			var sut = new BridgeModbusTcpImpl();
+			var device = new MyModbusComponent(DEVICE_ID, sut, UNIT_ID);
+			var test = new ComponentTest(sut) //
 					.addComponent(device) //
 					.addReference("cycle", new DummyCycle(CYCLE_TIME)) //
 					.activate(MyConfigTcp.create() //
@@ -83,7 +83,7 @@ public void test() throws Exception {
 			 * Reading Register fails after debounce of 10
 			 */
 			processImage.removeRegister(register100);
-			for (int i = 0; i < 9; i++) {
+			for (var i = 0; i < 9; i++) {
 				test.next(new TestCase() //
 						.onAfterProcessImage(sleep));
 			}
@@ -136,7 +136,7 @@ public Doc doc() {
 		protected ModbusProtocol defineModbusProtocol() throws OpenemsException {
 			return new ModbusProtocol(this, //
 					new FC3ReadRegistersTask(100, Priority.HIGH, //
-							m(ChannelId.REGISTER_100, new UnsignedWordElement(100) //
+							this.m(ChannelId.REGISTER_100, new UnsignedWordElement(100) //
 							))); //
 		}
 
diff --git a/io.openems.edge.bridge.modbus/test/io/openems/edge/bridge/modbus/DummyModbusComponent.java b/io.openems.edge.bridge.modbus/test/io/openems/edge/bridge/modbus/DummyModbusComponent.java
index 1427278de34..14716d88017 100644
--- a/io.openems.edge.bridge.modbus/test/io/openems/edge/bridge/modbus/DummyModbusComponent.java
+++ b/io.openems.edge.bridge.modbus/test/io/openems/edge/bridge/modbus/DummyModbusComponent.java
@@ -27,10 +27,10 @@ public DummyModbusComponent(String id, AbstractModbusBridge bridge, int unitId,
 			channel.nextProcessImage();
 		}
 		this.setModbus(bridge);
-		DummyComponentContext context = new DummyComponentContext();
+		var context = new DummyComponentContext();
 		context.addProperty(Constants.SERVICE_PID, Constants.SERVICE_PID);
-		DummyConfigurationAdmin cm = new DummyConfigurationAdmin();
-		DummyConfiguration dummyConfiguration = new DummyConfiguration();
+		var cm = new DummyConfigurationAdmin();
+		var dummyConfiguration = new DummyConfiguration();
 		dummyConfiguration.addProperty("Modbus.target",
 				ConfigUtils.generateReferenceTargetFilter(Constants.SERVICE_PID, bridge.id()));
 		cm.addConfiguration(Constants.SERVICE_PID, dummyConfiguration);
diff --git a/io.openems.edge.bridge.modbus/test/io/openems/edge/bridge/modbus/ModbusSlaveSimulator.java b/io.openems.edge.bridge.modbus/test/io/openems/edge/bridge/modbus/ModbusSlaveSimulator.java
index 54df0346a65..1e6cf017e9f 100644
--- a/io.openems.edge.bridge.modbus/test/io/openems/edge/bridge/modbus/ModbusSlaveSimulator.java
+++ b/io.openems.edge.bridge.modbus/test/io/openems/edge/bridge/modbus/ModbusSlaveSimulator.java
@@ -4,7 +4,6 @@
 import com.ghgande.j2mod.modbus.procimg.ProcessImage;
 import com.ghgande.j2mod.modbus.procimg.SimpleProcessImage;
 import com.ghgande.j2mod.modbus.procimg.SimpleRegister;
-import com.ghgande.j2mod.modbus.slave.ModbusSlave;
 import com.ghgande.j2mod.modbus.slave.ModbusSlaveFactory;
 
 public class ModbusSlaveSimulator {
@@ -15,8 +14,8 @@ public class ModbusSlaveSimulator {
 
 	public static void main(String[] args) throws ModbusException {
 		// Start Modbus/TCP slave
-		ProcessImage image = createProcessImage();
-		ModbusSlave slave = ModbusSlaveFactory.createTCPSlave(PORT, CONCURRENT_CONNECTIONS);
+		var image = createProcessImage();
+		var slave = ModbusSlaveFactory.createTCPSlave(PORT, CONCURRENT_CONNECTIONS);
 		slave.addProcessImage(1, image);
 		slave.open();
 
@@ -42,7 +41,7 @@ public void run() {
 	}
 
 	private static ProcessImage createProcessImage() {
-		SimpleProcessImage image = new SimpleProcessImage(UNIT_ID);
+		var image = new SimpleProcessImage(UNIT_ID);
 		image.addRegister(1000, new SimpleRegister(500));
 		image.addRegister(1001, new SimpleRegister(100));
 		image.addRegister(2000, new SimpleRegister(123));
diff --git a/io.openems.edge.bridge.modbus/test/io/openems/edge/bridge/modbus/MyConfigSerial.java b/io.openems.edge.bridge.modbus/test/io/openems/edge/bridge/modbus/MyConfigSerial.java
index f040a8b02e2..5f0eea200f5 100644
--- a/io.openems.edge.bridge.modbus/test/io/openems/edge/bridge/modbus/MyConfigSerial.java
+++ b/io.openems.edge.bridge.modbus/test/io/openems/edge/bridge/modbus/MyConfigSerial.java
@@ -68,7 +68,7 @@ public MyConfigSerial build() {
 
 	/**
 	 * Create a Config builder.
-	 * 
+	 *
 	 * @return a {@link Builder}
 	 */
 	public static Builder create() {
diff --git a/io.openems.edge.bridge.modbus/test/io/openems/edge/bridge/modbus/MyConfigTcp.java b/io.openems.edge.bridge.modbus/test/io/openems/edge/bridge/modbus/MyConfigTcp.java
index 60c78715eee..83a47f99210 100644
--- a/io.openems.edge.bridge.modbus/test/io/openems/edge/bridge/modbus/MyConfigTcp.java
+++ b/io.openems.edge.bridge.modbus/test/io/openems/edge/bridge/modbus/MyConfigTcp.java
@@ -48,7 +48,7 @@ public MyConfigTcp build() {
 
 	/**
 	 * Create a Config builder.
-	 * 
+	 *
 	 * @return a {@link Builder}
 	 */
 	public static Builder create() {
diff --git a/io.openems.edge.bridge.modbus/test/io/openems/edge/bridge/modbus/api/ConversionTest.java b/io.openems.edge.bridge.modbus/test/io/openems/edge/bridge/modbus/api/ConversionTest.java
index c878d8dd2ed..e4c7ffa96b4 100644
--- a/io.openems.edge.bridge.modbus/test/io/openems/edge/bridge/modbus/api/ConversionTest.java
+++ b/io.openems.edge.bridge.modbus/test/io/openems/edge/bridge/modbus/api/ConversionTest.java
@@ -9,8 +9,8 @@ public class ConversionTest {
 	@Test
 	public void testShortConversions() {
 
-		int v1 = 0;
-		Short result = ModbusUtils.convert(v1, 0);
+		var v1 = 0;
+		var result = ModbusUtils.convert(v1, 0);
 		Short expected = 0;
 		assertEquals(expected, result);
 
diff --git a/io.openems.edge.bridge.modbus/test/io/openems/edge/bridge/modbus/api/task/UtilsTest.java b/io.openems.edge.bridge.modbus/test/io/openems/edge/bridge/modbus/api/task/UtilsTest.java
index a20557f5a16..76b19006f4d 100644
--- a/io.openems.edge.bridge.modbus/test/io/openems/edge/bridge/modbus/api/task/UtilsTest.java
+++ b/io.openems.edge.bridge.modbus/test/io/openems/edge/bridge/modbus/api/task/UtilsTest.java
@@ -8,13 +8,11 @@ public class UtilsTest {
 
 	@Test
 	public void testToBooleanArray() {
-		
-		byte[] bs = new byte[] {
-			(byte)0xAA, (byte) 0xAA 	
-		};
-		
-		Boolean[] bools = Utils.toBooleanArray(bs);
-		
+
+		byte[] bs = { (byte) 0xAA, (byte) 0xAA };
+
+		var bools = Utils.toBooleanArray(bs);
+
 		assertEquals(true, bools[0]);
 		assertEquals(false, bools[1]);
 		assertEquals(true, bools[2]);

From ef36f9457f3756337cd23560d22ee1d123fe9b27 Mon Sep 17 00:00:00 2001
From: Stefan Feilmeier <stefan.feilmeier@fenecon.de>
Date: Mon, 7 Mar 2022 21:39:31 +0100
Subject: [PATCH 09/96] Update io.openems.edge.bridge.onewire

---
 .../onewire/OneWireAccessProvider.java        |  112 +-
 .../com/dalsemi/onewire/OneWireException.java |    1 -
 .../onewire/adapter/DSPortAdapter.java        |  210 +-
 .../dalsemi/onewire/adapter/DumbAdapter.java  |  241 +-
 .../onewire/adapter/LSerialAdapter.java       |  470 ++--
 .../onewire/adapter/MulticastListener.java    |   59 +-
 .../dalsemi/onewire/adapter/NetAdapter.java   |  618 ++---
 .../onewire/adapter/NetAdapterHost.java       |  403 ++--
 .../onewire/adapter/NetAdapterSim.java        |  749 ++++---
 .../onewire/adapter/OneWireIOException.java   |    1 -
 .../dalsemi/onewire/adapter/OneWireState.java |   30 +-
 .../onewire/adapter/PDKAdapterUSB.java        |  309 +--
 .../onewire/adapter/RawSendPacket.java        |    6 +-
 .../onewire/adapter/SerialService.java        |  392 ++--
 .../dalsemi/onewire/adapter/TMEXAdapter.java  |  156 +-
 .../onewire/adapter/UAdapterState.java        |   40 +-
 .../onewire/adapter/UPacketBuilder.java       |  424 ++--
 .../onewire/adapter/UParameterSettings.java   |   10 +-
 .../onewire/adapter/USerialAdapter.java       | 1296 ++++++-----
 .../onewire/application/file/MemoryCache.java |  858 +++----
 .../onewire/application/file/OWFile.java      |  193 +-
 .../application/file/OWFileDescriptor.java    | 1997 +++++++++--------
 .../application/file/OWFileInputStream.java   |  132 +-
 .../file/OWFileNotFoundException.java         |    1 -
 .../application/file/OWFileOutputStream.java  |   92 +-
 .../monitor/AbstractDeviceMonitor.java        |  144 +-
 .../application/monitor/ChainMonitor.java     |  181 +-
 .../application/monitor/DeviceMonitor.java    |   78 +-
 .../monitor/DeviceMonitorEvent.java           |   15 +-
 .../monitor/DeviceMonitorException.java       |    7 +-
 .../monitor/NetworkDeviceMonitor.java         |  130 +-
 .../onewire/application/sha/SHADebit.java     |  150 +-
 .../application/sha/SHADebitUnsigned.java     |  207 +-
 .../onewire/application/sha/SHASoftAuth.java  |  235 +-
 .../application/sha/SHATransaction.java       |    2 +-
 .../application/sha/SHAiButtonCopr.java       |  251 ++-
 .../application/sha/SHAiButtonCoprVM.java     |  225 +-
 .../application/sha/SHAiButtonUser.java       |   32 +-
 .../application/sha/SHAiButtonUser18.java     |  128 +-
 .../application/sha/SHAiButtonUser33.java     |  145 +-
 .../onewire/application/tag/Contact.java      |   14 +-
 .../dalsemi/onewire/application/tag/D2A.java  |   48 +-
 .../onewire/application/tag/Event.java        |   14 +-
 .../onewire/application/tag/Humidity.java     |   20 +-
 .../onewire/application/tag/Level.java        |   14 +-
 .../onewire/application/tag/SAXParser.java    |   25 +-
 .../onewire/application/tag/Switch.java       |   54 +-
 .../onewire/application/tag/TAGHandler.java   |  139 +-
 .../onewire/application/tag/TAGParser.java    |   30 +-
 .../onewire/application/tag/TaggedDevice.java |   22 +-
 .../onewire/application/tag/Thermal.java      |   18 +-
 .../dalsemi/onewire/application/tag/XML.java  |   14 +-
 .../onewire/container/ADContainer.java        |    8 +-
 .../onewire/container/ClockContainer.java     |    2 +-
 .../onewire/container/CommandAPDU.java        |  125 +-
 .../onewire/container/HumidityContainer.java  |    4 +-
 .../dalsemi/onewire/container/MemoryBank.java |   18 +-
 .../onewire/container/MemoryBankAD.java       |  176 +-
 .../onewire/container/MemoryBankAppReg.java   |  170 +-
 .../onewire/container/MemoryBankEE.java       |  186 +-
 .../onewire/container/MemoryBankEEPROM.java   |  310 +--
 .../container/MemoryBankEEPROMblock.java      |  412 ++--
 .../container/MemoryBankEEPROMstatus.java     |  336 +--
 .../onewire/container/MemoryBankEPROM.java    |  524 +++--
 .../onewire/container/MemoryBankNV.java       |  219 +-
 .../onewire/container/MemoryBankNVCRC.java    |   81 +-
 .../onewire/container/MemoryBankNVCRCPW.java  |  195 +-
 .../onewire/container/MemoryBankSBM.java      |  198 +-
 .../onewire/container/MemoryBankSHAEE.java    |  319 +--
 .../onewire/container/MemoryBankScratch.java  |  291 +--
 .../container/MemoryBankScratchCRC.java       |   49 +-
 .../container/MemoryBankScratchCRCPW.java     |  151 +-
 .../container/MemoryBankScratchEE.java        |   63 +-
 .../container/MemoryBankScratchEx.java        |   49 +-
 .../container/MemoryBankScratchSHA.java       |   33 +-
 .../container/MemoryBankScratchSHAEE.java     |  734 +++---
 .../container/MemoryBankScratchTemp.java      |  224 +-
 .../onewire/container/MissionContainer.java   |    6 +-
 .../onewire/container/OTPMemoryBank.java      |   12 +-
 .../onewire/container/OneWireContainer.java   |  114 +-
 .../onewire/container/OneWireContainer01.java |    4 +-
 .../onewire/container/OneWireContainer02.java |  186 +-
 .../onewire/container/OneWireContainer04.java |  147 +-
 .../onewire/container/OneWireContainer05.java |   69 +-
 .../onewire/container/OneWireContainer06.java |   26 +-
 .../onewire/container/OneWireContainer08.java |   26 +-
 .../onewire/container/OneWireContainer09.java |   29 +-
 .../onewire/container/OneWireContainer0A.java |   27 +-
 .../onewire/container/OneWireContainer0B.java |   35 +-
 .../onewire/container/OneWireContainer0C.java |   31 +-
 .../onewire/container/OneWireContainer0F.java |   36 +-
 .../onewire/container/OneWireContainer10.java |  265 +--
 .../onewire/container/OneWireContainer12.java |  240 +-
 .../onewire/container/OneWireContainer13.java |   35 +-
 .../onewire/container/OneWireContainer14.java |   25 +-
 .../onewire/container/OneWireContainer18.java |  575 ++---
 .../onewire/container/OneWireContainer1A.java |   26 +-
 .../onewire/container/OneWireContainer1C.java |  243 +-
 .../onewire/container/OneWireContainer1D.java |   67 +-
 .../onewire/container/OneWireContainer1F.java |  189 +-
 .../onewire/container/OneWireContainer20.java |  308 +--
 .../onewire/container/OneWireContainer21.java |  842 +++----
 .../onewire/container/OneWireContainer22.java |    4 +-
 .../onewire/container/OneWireContainer23.java |   30 +-
 .../onewire/container/OneWireContainer24.java |   67 +-
 .../onewire/container/OneWireContainer26.java |  413 ++--
 .../onewire/container/OneWireContainer27.java |   24 +-
 .../onewire/container/OneWireContainer28.java |  282 +--
 .../onewire/container/OneWireContainer29.java |  164 +-
 .../onewire/container/OneWireContainer2C.java |  131 +-
 .../onewire/container/OneWireContainer2D.java |   90 +-
 .../onewire/container/OneWireContainer30.java |  396 ++--
 .../onewire/container/OneWireContainer33.java |  514 +++--
 .../onewire/container/OneWireContainer37.java |  217 +-
 .../onewire/container/OneWireContainer3A.java |   93 +-
 .../onewire/container/OneWireContainer41.java | 1646 ++++++++------
 .../onewire/container/OneWireContainer42.java |  367 +--
 .../onewire/container/OneWireContainer43.java |  108 +-
 .../onewire/container/OneWireSensor.java      |   12 +-
 .../onewire/container/PagedMemoryBank.java    |   26 +-
 .../onewire/container/PasswordContainer.java  |   68 +-
 .../container/PotentiometerContainer.java     |    2 +-
 .../onewire/container/ResponseAPDU.java       |   88 +-
 .../container/TemperatureContainer.java       |    8 +-
 .../src/com/dalsemi/onewire/debug/Debug.java  |   41 +-
 .../com/dalsemi/onewire/utils/Address.java    |   44 +-
 .../src/com/dalsemi/onewire/utils/Bit.java    |   17 +-
 .../src/com/dalsemi/onewire/utils/CRC16.java  |   20 +-
 .../src/com/dalsemi/onewire/utils/CRC8.java   |   20 +-
 .../com/dalsemi/onewire/utils/Convert.java    |  178 +-
 .../com/dalsemi/onewire/utils/IOHelper.java   |   96 +-
 .../src/com/dalsemi/onewire/utils/OWPath.java |   47 +-
 .../dalsemi/onewire/utils/OWPathElement.java  |  117 +-
 .../src/com/dalsemi/onewire/utils/SHA.java    |   45 +-
 .../edge/bridge/onewire/BridgeOnewire.java    |   12 +-
 .../onewire/impl/BridgeOnewireImpl.java       |    1 +
 .../onewire/impl/OneWireTaskWorker.java       |   13 +-
 .../onewire/jsonrpc/GetDeviceResponse.java    |   17 +-
 .../onewire/jsonrpc/GetDevicesRequest.java    |    2 +-
 139 files changed, 13657 insertions(+), 11345 deletions(-)

diff --git a/io.openems.edge.bridge.onewire/src/com/dalsemi/onewire/OneWireAccessProvider.java b/io.openems.edge.bridge.onewire/src/com/dalsemi/onewire/OneWireAccessProvider.java
index 6605e12b544..2a29d5bdeef 100644
--- a/io.openems.edge.bridge.onewire/src/com/dalsemi/onewire/OneWireAccessProvider.java
+++ b/io.openems.edge.bridge.onewire/src/com/dalsemi/onewire/OneWireAccessProvider.java
@@ -54,7 +54,7 @@
  * <DD>
  * <H4>Example 1</H4> Get an instance of the default 1-Wire adapter. The adapter
  * will be ready to use if no exceptions are thrown.
- * 
+ *
  * <PRE>
  *  <CODE>
  *  try
@@ -77,7 +77,7 @@
  * <DL>
  * <DD>
  * <H4>Example 2</H4> Enumerate through the available adapters and ports.
- * 
+ *
  * <PRE>
  *  <CODE>
  *  DSPortAdapter adapter;
@@ -112,7 +112,7 @@
  * <DD>
  * <H4>Example 3</H4> Display the default adapter name and port without getting
  * an instance of the adapter.
- * 
+ *
  * <PRE>
  *  <CODE>
  *  System.out.println("Default Adapter: " +
@@ -128,14 +128,8 @@
  * @version 0.00, 30 August 2000
  * @author DS
  */
-@SuppressWarnings({ "unused" })
 public class OneWireAccessProvider {
 
-	/**
-	 * Smart default port
-	 */
-	private static String smartDefaultPort = "COM1";
-
 	/**
 	 * Override adapter variables
 	 */
@@ -188,28 +182,28 @@ public static void main(String[] args) {
 	 * @return <code>Enumeration</code> of <code>DSPortAdapters</code> in the system
 	 */
 	public static Enumeration<DSPortAdapter> enumerateAllAdapters() {
-		Vector<DSPortAdapter> adapter_vector = new Vector<>(3, 1);
+		var adapter_vector = new Vector<DSPortAdapter>(3, 1);
 		DSPortAdapter adapter_instance;
 		Class<?> adapter_class;
 		String class_name = null;
-		boolean TMEX_loaded = false;
-		boolean serial_loaded = false;
+		var TMEX_loaded = false;
+		var serial_loaded = false;
 
 		// check for override
 		if (useOverrideAdapter) {
 			adapter_vector.addElement(overrideAdapter);
-			return (adapter_vector.elements());
+			return adapter_vector.elements();
 		}
 
 		// only try native TMEX if on Windows platform
 		if (System.getProperty("os.name").indexOf("Windows") != -1) {
 
 			// loop through the TMEX adapters
-			for (int port_type = 0; port_type <= 15; port_type++) {
+			for (var port_type = 0; port_type <= 15; port_type++) {
 
 				// try to load the adapter classes
 				try {
-					adapter_instance = (DSPortAdapter) (new com.dalsemi.onewire.adapter.TMEXAdapter(port_type));
+					adapter_instance = new com.dalsemi.onewire.adapter.TMEXAdapter(port_type);
 
 					// only add it if it has some ports
 					if (adapter_instance.getPortNames().hasMoreElements()) {
@@ -294,12 +288,13 @@ public static Enumeration<DSPortAdapter> enumerateAllAdapters() {
 		// get adapters from property file with keys 'onewire.register.adapter0-15'
 		try {
 			// loop through the possible registered adapters
-			for (int reg_num = 0; reg_num <= 15; reg_num++) {
+			for (var reg_num = 0; reg_num <= 15; reg_num++) {
 				class_name = getProperty("onewire.register.adapter" + reg_num);
 
 				// done if no property by that name
-				if (class_name == null)
+				if (class_name == null) {
 					break;
+				}
 
 				// add it to the enum
 				adapter_class = Class.forName(class_name);
@@ -317,10 +312,11 @@ public static Enumeration<DSPortAdapter> enumerateAllAdapters() {
 		}
 
 		// check for no adapters
-		if (adapter_vector.isEmpty())
+		if (adapter_vector.isEmpty()) {
 			System.err.println("No 1-Wire adapter classes found");
+		}
 
-		return (adapter_vector.elements());
+		return adapter_vector.elements();
 	}
 
 	/**
@@ -341,16 +337,17 @@ public static DSPortAdapter getAdapter(String adapterName, String portName)
 		DSPortAdapter adapter, found_adapter = null;
 
 		// check for override
-		if (useOverrideAdapter)
+		if (useOverrideAdapter) {
 			return overrideAdapter;
+		}
 
 		// enumerature through available adapters to find the correct one
-		for (Enumeration<DSPortAdapter> adapter_enum = enumerateAllAdapters(); adapter_enum.hasMoreElements();) {
+		for (var adapter_enum = enumerateAllAdapters(); adapter_enum.hasMoreElements();) {
 			// cast the enum as a DSPortAdapter
-			adapter = (DSPortAdapter) adapter_enum.nextElement();
+			adapter = adapter_enum.nextElement();
 
 			// see if this is the type of adapter we want
-			if ((found_adapter != null) || (!adapter.getAdapterName().equals(adapterName))) {
+			if (found_adapter != null || !adapter.getAdapterName().equals(adapterName)) {
 				// not this adapter, then just cleanup
 				try {
 					adapter.freePort();
@@ -361,32 +358,33 @@ public static DSPortAdapter getAdapter(String adapterName, String portName)
 			}
 
 			// attempt to open and verify the adapter
-			if (adapter.selectPort(portName)) {
-				adapter.beginExclusive(true);
+			if (!adapter.selectPort(portName)) {
+				throw new OneWireException("Specified port \"" + portName + "\" could not be selected for adapter \""
+						+ adapterName + "\"");
+			}
+			adapter.beginExclusive(true);
 
-				try {
-					// check for the adapter
-					if (adapter.adapterDetected())
-						found_adapter = adapter;
-					else {
+			try {
+				// check for the adapter
+				if (adapter.adapterDetected()) {
+					found_adapter = adapter;
+				} else {
 
-						// close the port just opened
-						adapter.freePort();
+					// close the port just opened
+					adapter.freePort();
 
-						throw new OneWireException(
-								"Port found \"" + portName + "\" but Adapter \"" + adapterName + "\" not detected");
-					}
-				} finally {
-					adapter.endExclusive();
+					throw new OneWireException(
+							"Port found \"" + portName + "\" but Adapter \"" + adapterName + "\" not detected");
 				}
-			} else
-				throw new OneWireException("Specified port \"" + portName + "\" could not be selected for adapter \""
-						+ adapterName + "\"");
+			} finally {
+				adapter.endExclusive();
+			}
 		}
 
 		// if adapter found then return it
-		if (found_adapter != null)
+		if (found_adapter != null) {
 			return found_adapter;
+		}
 
 		// adapter by that name not found
 		throw new OneWireException("Specified adapter name \"" + adapterName + "\" is not known");
@@ -448,16 +446,18 @@ public static DSPortAdapter getDefaultAdapter() throws OneWireIOException, OneWi
 	public static String getProperty(String propName) {
 		try {
 			if (useOverrideAdapter) {
-				if (propName.equals("onewire.adapter.default"))
+				if (propName.equals("onewire.adapter.default")) {
 					return overrideAdapter.getAdapterName();
-				if (propName.equals("onewire.port.default"))
+				}
+				if (propName.equals("onewire.port.default")) {
 					return overrideAdapter.getPortName();
+				}
 			}
 		} catch (Exception e) {
 			// just drain it and let the normal method run...
 		}
 
-		Properties onewire_properties = new Properties();
+		var onewire_properties = new Properties();
 		FileInputStream prop_file = null;
 		String ret_str = null;
 		DSPortAdapter adapter_instance;
@@ -475,9 +475,9 @@ public static String getProperty(String propName) {
 
 			// loop to attempt to open the onewire.properties file in two locations
 			// .\onewire.properties or <java.home>\lib\onewire.properties
-			String path = new String("");
+			var path = "";
 
-			for (int i = 0; i <= 1; i++) {
+			for (var i = 0; i <= 1; i++) {
 
 				// attempt to open the onewire.properties file
 				try {
@@ -500,8 +500,9 @@ public static String getProperty(String propName) {
 				}
 
 				// check to see if we now have the value
-				if (ret_str != null)
+				if (ret_str != null) {
 					break;
+				}
 
 				// try the second path
 				path = System.getProperty("java.home") + File.separator + "lib" + File.separator;
@@ -511,15 +512,17 @@ public static String getProperty(String propName) {
 		// if defaults still not found then check TMEX default
 		if (ret_str == null) {
 			try {
-				if (propName.equals("onewire.adapter.default"))
+				if (propName.equals("onewire.adapter.default")) {
 					ret_str = TMEXAdapter.getDefaultAdapterName();
-				else if (propName.equals("onewire.port.default"))
+				} else if (propName.equals("onewire.port.default")) {
 					ret_str = TMEXAdapter.getDefaultPortName();
+				}
 
 				// if did not get real string then null out
 				if (ret_str != null) {
-					if (ret_str.length() <= 0)
+					if (ret_str.length() <= 0) {
 						ret_str = null;
+					}
 				}
 			} catch (Exception e) {
 				// DRAIN
@@ -531,16 +534,17 @@ else if (propName.equals("onewire.port.default"))
 
 		// if STILL not found then just pick DS9097U on 'smartDefaultPort'
 		if (ret_str == null) {
-			if (propName.equals("onewire.adapter.default"))
+			if (propName.equals("onewire.adapter.default")) {
 				ret_str = "DS9097U";
-			else if (propName.equals("onewire.port.default")) {
+			} else if (propName.equals("onewire.port.default")) {
 				try {
 					adapter_class = Class.forName("com.dalsemi.onewire.adapter.USerialAdapter");
 					adapter_instance = (DSPortAdapter) adapter_class.getConstructor().newInstance();
 
 					// check if has any ports (common javax.comm problem)
-					if (adapter_instance.getPortNames().hasMoreElements())
-						ret_str = (String) adapter_instance.getPortNames().nextElement();
+					if (adapter_instance.getPortNames().hasMoreElements()) {
+						ret_str = adapter_instance.getPortNames().nextElement();
+					}
 				} catch (Exception e) {
 					// DRAIN
 				} catch (Error e) {
diff --git a/io.openems.edge.bridge.onewire/src/com/dalsemi/onewire/OneWireException.java b/io.openems.edge.bridge.onewire/src/com/dalsemi/onewire/OneWireException.java
index 55a7054a105..db546c406d4 100644
--- a/io.openems.edge.bridge.onewire/src/com/dalsemi/onewire/OneWireException.java
+++ b/io.openems.edge.bridge.onewire/src/com/dalsemi/onewire/OneWireException.java
@@ -45,7 +45,6 @@ public class OneWireException extends Exception {
 	 * Constructs a <code>OneWireException</code> with no detail message.
 	 */
 	public OneWireException() {
-		super();
 	}
 
 	/**
diff --git a/io.openems.edge.bridge.onewire/src/com/dalsemi/onewire/adapter/DSPortAdapter.java b/io.openems.edge.bridge.onewire/src/com/dalsemi/onewire/adapter/DSPortAdapter.java
index 634495c2be4..3d086b1ec46 100644
--- a/io.openems.edge.bridge.onewire/src/com/dalsemi/onewire/adapter/DSPortAdapter.java
+++ b/io.openems.edge.bridge.onewire/src/com/dalsemi/onewire/adapter/DSPortAdapter.java
@@ -246,7 +246,7 @@ public abstract class DSPortAdapter {
 	/**
 	 * Hashtable to contain the user replaced OneWireContainers
 	 */
-	private Hashtable<Integer, Class<?>> registeredOneWireContainerClasses = new Hashtable<>(5);
+	private final Hashtable<Integer, Class<?>> registeredOneWireContainerClasses = new Hashtable<>(5);
 
 	/**
 	 * Byte array of families to include in search
@@ -332,20 +332,18 @@ public void registerOneWireContainerClass(int family, Class<?> OneWireContainerC
 			throw new OneWireException("Could not find OneWireContainer class");
 		}
 
-		Integer familyInt = Integer.valueOf(family);
+		var familyInt = Integer.valueOf(family);
 
 		if (OneWireContainerClass == null) {
 
 			// If a null is passed, remove the old container class.
-			registeredOneWireContainerClasses.remove(familyInt);
-		} else {
-			if (defaultibc.isAssignableFrom(OneWireContainerClass)) {
+			this.registeredOneWireContainerClasses.remove(familyInt);
+		} else if (defaultibc.isAssignableFrom(OneWireContainerClass)) {
 
-				// Put the new container class in the hashtable, replacing any old one.
-				registeredOneWireContainerClasses.put(familyInt, OneWireContainerClass);
-			} else {
-				throw new ClassCastException("Does not extend com.dalsemi.onewire.container.OneWireContainer");
-			}
+			// Put the new container class in the hashtable, replacing any old one.
+			this.registeredOneWireContainerClasses.put(familyInt, OneWireContainerClass);
+		} else {
+			throw new ClassCastException("Does not extend com.dalsemi.onewire.container.OneWireContainer");
 		}
 	}
 
@@ -559,20 +557,21 @@ public boolean canBreak() throws OneWireIOException, OneWireException {
 	 * @throws OneWireException   on a setup error with the 1-Wire adapter
 	 */
 	public Enumeration<OneWireContainer> getAllDeviceContainers() throws OneWireIOException, OneWireException {
-		Vector<OneWireContainer> ibutton_vector = new Vector<>();
+		var ibutton_vector = new Vector<OneWireContainer>();
 		OneWireContainer temp_ibutton;
 
-		temp_ibutton = getFirstDeviceContainer();
+		temp_ibutton = this.getFirstDeviceContainer();
 
 		if (temp_ibutton != null) {
 			ibutton_vector.addElement(temp_ibutton);
 
 			// loop to get all of the ibuttons
 			do {
-				temp_ibutton = getNextDeviceContainer();
+				temp_ibutton = this.getNextDeviceContainer();
 
-				if (temp_ibutton != null)
+				if (temp_ibutton != null) {
 					ibutton_vector.addElement(temp_ibutton);
+				}
 			} while (temp_ibutton != null);
 		}
 
@@ -593,10 +592,10 @@ public Enumeration<OneWireContainer> getAllDeviceContainers() throws OneWireIOEx
 	 * @throws OneWireException   on a setup error with the 1-Wire adapter
 	 */
 	public OneWireContainer getFirstDeviceContainer() throws OneWireIOException, OneWireException {
-		if (findFirstDevice() == true) {
-			return getDeviceContainer();
-		} else
-			return null;
+		if (this.findFirstDevice() == true) {
+			return this.getDeviceContainer();
+		}
+		return null;
 	}
 
 	/**
@@ -614,10 +613,10 @@ public OneWireContainer getFirstDeviceContainer() throws OneWireIOException, One
 	 * @throws OneWireException   on a setup error with the 1-Wire adapter
 	 */
 	public OneWireContainer getNextDeviceContainer() throws OneWireIOException, OneWireException {
-		if (findNextDevice() == true) {
-			return getDeviceContainer();
-		} else
-			return null;
+		if (this.findNextDevice() == true) {
+			return this.getDeviceContainer();
+		}
+		return null;
 	}
 
 	/**
@@ -665,9 +664,9 @@ public OneWireContainer getNextDeviceContainer() throws OneWireIOException, OneW
 	 * @see com.dalsemi.onewire.utils.Address
 	 */
 	public long getAddressAsLong() {
-		byte[] address = new byte[8];
+		var address = new byte[8];
 
-		getAddress(address);
+		this.getAddress(address);
 
 		return Address.toLong(address);
 	}
@@ -681,9 +680,9 @@ public long getAddressAsLong() {
 	 * @see com.dalsemi.onewire.utils.Address
 	 */
 	public String getAddressAsString() {
-		byte[] address = new byte[8];
+		var address = new byte[8];
 
-		getAddress(address);
+		this.getAddress(address);
 
 		return Address.toString(address);
 	}
@@ -703,10 +702,10 @@ public String getAddressAsString() {
 	 * @see com.dalsemi.onewire.utils.Address
 	 */
 	public boolean isPresent(byte[] address) throws OneWireIOException, OneWireException {
-		reset();
-		putByte(0xF0); // Search ROM command
+		this.reset();
+		this.putByte(0xF0); // Search ROM command
 
-		return strongAccess(address);
+		return this.strongAccess(address);
 	}
 
 	/**
@@ -724,7 +723,7 @@ public boolean isPresent(byte[] address) throws OneWireIOException, OneWireExcep
 	 * @see com.dalsemi.onewire.utils.Address
 	 */
 	public boolean isPresent(long address) throws OneWireIOException, OneWireException {
-		return isPresent(Address.toByteArray(address));
+		return this.isPresent(Address.toByteArray(address));
 	}
 
 	/**
@@ -742,7 +741,7 @@ public boolean isPresent(long address) throws OneWireIOException, OneWireExcepti
 	 * @see com.dalsemi.onewire.utils.Address
 	 */
 	public boolean isPresent(String address) throws OneWireIOException, OneWireException {
-		return isPresent(Address.toByteArray(address));
+		return this.isPresent(Address.toByteArray(address));
 	}
 
 	/**
@@ -761,10 +760,10 @@ public boolean isPresent(String address) throws OneWireIOException, OneWireExcep
 	 * @see com.dalsemi.onewire.utils.Address
 	 */
 	public boolean isAlarming(byte[] address) throws OneWireIOException, OneWireException {
-		reset();
-		putByte(0xEC); // Conditional search commands
+		this.reset();
+		this.putByte(0xEC); // Conditional search commands
 
-		return strongAccess(address);
+		return this.strongAccess(address);
 	}
 
 	/**
@@ -783,7 +782,7 @@ public boolean isAlarming(byte[] address) throws OneWireIOException, OneWireExce
 	 * @see com.dalsemi.onewire.utils.Address
 	 */
 	public boolean isAlarming(long address) throws OneWireIOException, OneWireException {
-		return isAlarming(Address.toByteArray(address));
+		return this.isAlarming(Address.toByteArray(address));
 	}
 
 	/**
@@ -802,7 +801,7 @@ public boolean isAlarming(long address) throws OneWireIOException, OneWireExcept
 	 * @see com.dalsemi.onewire.utils.Address
 	 */
 	public boolean isAlarming(String address) throws OneWireIOException, OneWireException {
-		return isAlarming(Address.toByteArray(address));
+		return this.isAlarming(Address.toByteArray(address));
 	}
 
 	/**
@@ -827,18 +826,18 @@ public boolean isAlarming(String address) throws OneWireIOException, OneWireExce
 	 */
 	public boolean select(byte[] address) throws OneWireIOException, OneWireException {
 		// send 1-Wire Reset
-		int rslt = reset();
+		var rslt = this.reset();
 
 		// broadcast the MATCH ROM command and address
-		byte[] send_packet = new byte[9];
+		var send_packet = new byte[9];
 
 		send_packet[0] = 0x55; // MATCH ROM command
 
 		System.arraycopy(address, 0, send_packet, 1, 8);
-		dataBlock(send_packet, 0, 9);
+		this.dataBlock(send_packet, 0, 9);
 
 		// success if any device present on 1-Wire Network
-		return ((rslt == RESET_PRESENCE) || (rslt == RESET_ALARM));
+		return rslt == RESET_PRESENCE || rslt == RESET_ALARM;
 	}
 
 	/**
@@ -862,7 +861,7 @@ public boolean select(byte[] address) throws OneWireIOException, OneWireExceptio
 	 * @see com.dalsemi.onewire.utils.Address
 	 */
 	public boolean select(long address) throws OneWireIOException, OneWireException {
-		return select(Address.toByteArray(address));
+		return this.select(Address.toByteArray(address));
 	}
 
 	/**
@@ -886,7 +885,7 @@ public boolean select(long address) throws OneWireIOException, OneWireException
 	 * @see com.dalsemi.onewire.utils.Address
 	 */
 	public boolean select(String address) throws OneWireIOException, OneWireException {
-		return select(Address.toByteArray(address));
+		return this.select(Address.toByteArray(address));
 	}
 
 	/**
@@ -911,8 +910,9 @@ public boolean select(String address) throws OneWireIOException, OneWireExceptio
 	 * @see com.dalsemi.onewire.utils.Address
 	 */
 	public void assertSelect(byte[] address) throws OneWireIOException, OneWireException {
-		if (!select(address))
+		if (!this.select(address)) {
 			throw new OneWireIOException("Device " + Address.toString(address) + " not present.");
+		}
 	}
 
 	/**
@@ -940,8 +940,9 @@ public void assertSelect(byte[] address) throws OneWireIOException, OneWireExcep
 	 * @see com.dalsemi.onewire.utils.Address
 	 */
 	public void assertSelect(long address) throws OneWireIOException, OneWireException {
-		if (!select(Address.toByteArray(address)))
+		if (!this.select(Address.toByteArray(address))) {
 			throw new OneWireIOException("Device " + Address.toString(address) + " not present.");
+		}
 	}
 
 	/**
@@ -966,8 +967,9 @@ public void assertSelect(long address) throws OneWireIOException, OneWireExcepti
 	 * @see com.dalsemi.onewire.utils.Address
 	 */
 	public void assertSelect(String address) throws OneWireIOException, OneWireException {
-		if (!select(Address.toByteArray(address)))
+		if (!this.select(Address.toByteArray(address))) {
 			throw new OneWireIOException("Device " + address + " not present.");
+		}
 	}
 
 	// --------
@@ -1005,15 +1007,15 @@ public void assertSelect(String address) throws OneWireIOException, OneWireExcep
 	 * Removes any selectivity during a search for iButtons or 1-Wire devices by
 	 * family type. The unique address for each iButton and 1-Wire device contains a
 	 * family descriptor that indicates the capabilities of the device.
-	 * 
+	 *
 	 * @see #targetFamily
 	 * @see #targetFamily(byte[])
 	 * @see #excludeFamily
 	 * @see #excludeFamily(byte[])
 	 */
 	public void targetAllFamilies() {
-		include = null;
-		exclude = null;
+		this.include = null;
+		this.exclude = null;
 	}
 
 	/**
@@ -1026,10 +1028,11 @@ public void targetAllFamilies() {
 	 * @see #targetAllFamilies
 	 */
 	public void targetFamily(int family) {
-		if ((include == null) || (include.length != 1))
-			include = new byte[1];
+		if (this.include == null || this.include.length != 1) {
+			this.include = new byte[1];
+		}
 
-		include[0] = (byte) family;
+		this.include[0] = (byte) family;
 	}
 
 	/**
@@ -1042,10 +1045,11 @@ public void targetFamily(int family) {
 	 * @see #targetAllFamilies
 	 */
 	public void targetFamily(byte family[]) {
-		if ((include == null) || (include.length != family.length))
-			include = new byte[family.length];
+		if (this.include == null || this.include.length != family.length) {
+			this.include = new byte[family.length];
+		}
 
-		System.arraycopy(family, 0, include, 0, family.length);
+		System.arraycopy(family, 0, this.include, 0, family.length);
 	}
 
 	/**
@@ -1058,10 +1062,11 @@ public void targetFamily(byte family[]) {
 	 * @see #targetAllFamilies
 	 */
 	public void excludeFamily(int family) {
-		if ((exclude == null) || (exclude.length != 1))
-			exclude = new byte[1];
+		if (this.exclude == null || this.exclude.length != 1) {
+			this.exclude = new byte[1];
+		}
 
-		exclude[0] = (byte) family;
+		this.exclude[0] = (byte) family;
 	}
 
 	/**
@@ -1074,10 +1079,11 @@ public void excludeFamily(int family) {
 	 * @see #targetAllFamilies
 	 */
 	public void excludeFamily(byte family[]) {
-		if ((exclude == null) || (exclude.length != family.length))
-			exclude = new byte[family.length];
+		if (this.exclude == null || this.exclude.length != family.length) {
+			this.exclude = new byte[family.length];
+		}
 
-		System.arraycopy(family, 0, exclude, 0, family.length);
+		System.arraycopy(family, 0, this.exclude, 0, family.length);
 	}
 
 	// --------
@@ -1376,7 +1382,6 @@ public void startBreak() throws OneWireIOException, OneWireException {
 	 *                            adapter does not support this operation
 	 */
 	public void setPowerNormal() throws OneWireIOException, OneWireException {
-		return;
 	}
 
 	// --------
@@ -1404,8 +1409,9 @@ public void setPowerNormal() throws OneWireIOException, OneWireException {
 	 *                            adapter does not support this operation
 	 */
 	public void setSpeed(int speed) throws OneWireIOException, OneWireException {
-		if (speed != SPEED_REGULAR)
+		if (speed != SPEED_REGULAR) {
 			throw new OneWireException("Non-regular 1-Wire speed not supported by this adapter type");
+		}
 	}
 
 	/**
@@ -1442,18 +1448,18 @@ public int getSpeed() {
 	 * @see com.dalsemi.onewire.utils.Address
 	 */
 	public OneWireContainer getDeviceContainer(byte[] address) {
-		int family_code = address[0] & 0x7F;
-		String family_string = ((family_code) < 16) ? ("0" + Integer.toHexString(family_code)).toUpperCase()
-				: (Integer.toHexString(family_code)).toUpperCase();
+		var family_code = address[0] & 0x7F;
+		var family_string = family_code < 16 ? ("0" + Integer.toHexString(family_code)).toUpperCase()
+				: Integer.toHexString(family_code).toUpperCase();
 		Class<?> ibutton_class = null;
 		OneWireContainer new_ibutton;
 
 		// If any user registered button exist, check the hashtable.
-		if (!registeredOneWireContainerClasses.isEmpty()) {
-			Integer familyInt = Integer.valueOf(family_code);
+		if (!this.registeredOneWireContainerClasses.isEmpty()) {
+			var familyInt = Integer.valueOf(family_code);
 
 			// Try and get a user provided container class first.
-			ibutton_class = (Class<?>) registeredOneWireContainerClasses.get(familyInt);
+			ibutton_class = this.registeredOneWireContainerClasses.get(familyInt);
 		}
 
 		// If we don't get one, do the normal lookup method.
@@ -1507,7 +1513,7 @@ public OneWireContainer getDeviceContainer(byte[] address) {
 	 * @see com.dalsemi.onewire.utils.Address
 	 */
 	public OneWireContainer getDeviceContainer(long address) {
-		return getDeviceContainer(Address.toByteArray(address));
+		return this.getDeviceContainer(Address.toByteArray(address));
 	}
 
 	/**
@@ -1520,7 +1526,7 @@ public OneWireContainer getDeviceContainer(long address) {
 	 * @see com.dalsemi.onewire.utils.Address
 	 */
 	public OneWireContainer getDeviceContainer(String address) {
-		return getDeviceContainer(Address.toByteArray(address));
+		return this.getDeviceContainer(Address.toByteArray(address));
 	}
 
 	/**
@@ -1533,11 +1539,11 @@ public OneWireContainer getDeviceContainer(String address) {
 	public OneWireContainer getDeviceContainer() {
 
 		// Mask off the upper bit.
-		byte[] address = new byte[8];
+		var address = new byte[8];
 
-		getAddress(address);
+		this.getAddress(address);
 
-		return getDeviceContainer(address);
+		return this.getDeviceContainer(address);
 	}
 
 	/**
@@ -1546,19 +1552,19 @@ public OneWireContainer getDeviceContainer() {
 	 * @return <code>true</code> if in include group
 	 */
 	protected boolean isValidFamily(byte[] address) {
-		byte familyCode = address[0];
+		var familyCode = address[0];
 
-		if (exclude != null) {
-			for (int i = 0; i < exclude.length; i++) {
-				if (familyCode == exclude[i]) {
+		if (this.exclude != null) {
+			for (byte element : this.exclude) {
+				if (familyCode == element) {
 					return false;
 				}
 			}
 		}
 
-		if (include != null) {
-			for (int i = 0; i < include.length; i++) {
-				if (familyCode == include[i]) {
+		if (this.include != null) {
+			for (byte element : this.include) {
+				if (familyCode == element) {
 					return true;
 				}
 			}
@@ -1579,26 +1585,28 @@ protected boolean isValidFamily(byte[] address) {
 	 *         search
 	 */
 	private boolean strongAccess(byte[] address) throws OneWireIOException, OneWireException {
-		byte[] send_packet = new byte[24];
+		var send_packet = new byte[24];
 		int i;
 
 		// set all bits at first
-		for (i = 0; i < 24; i++)
+		for (i = 0; i < 24; i++) {
 			send_packet[i] = (byte) 0xFF;
+		}
 
 		// now set or clear appropriate bits for search
-		for (i = 0; i < 64; i++)
-			arrayWriteBit(arrayReadBit(i, address), (i + 1) * 3 - 1, send_packet);
+		for (i = 0; i < 64; i++) {
+			this.arrayWriteBit(this.arrayReadBit(i, address), (i + 1) * 3 - 1, send_packet);
+		}
 
 		// send to 1-Wire Net
-		dataBlock(send_packet, 0, 24);
+		this.dataBlock(send_packet, 0, 24);
 
 		// check the results of last 8 triplets (should be no conflicts)
 		int cnt = 56, goodbits = 0, tst, s;
 
 		for (i = 168; i < 192; i += 3) {
-			tst = (arrayReadBit(i, send_packet) << 1) | arrayReadBit(i + 1, send_packet);
-			s = arrayReadBit(cnt++, address);
+			tst = this.arrayReadBit(i, send_packet) << 1 | this.arrayReadBit(i + 1, send_packet);
+			s = this.arrayReadBit(cnt++, address);
 
 			if (tst == 0x03) // no device on line
 			{
@@ -1607,12 +1615,13 @@ private boolean strongAccess(byte[] address) throws OneWireIOException, OneWireE
 				break; // quit
 			}
 
-			if (((s == 0x01) && (tst == 0x02)) || ((s == 0x00) && (tst == 0x01))) // correct bit
+			if (s == 0x01 && tst == 0x02 || s == 0x00 && tst == 0x01) {
 				goodbits++; // count as a good bit
+			}
 		}
 
 		// check too see if there were enough good bits to be successful
-		return (goodbits >= 8);
+		return goodbits >= 8;
 	}
 
 	/**
@@ -1623,13 +1632,14 @@ private boolean strongAccess(byte[] address) throws OneWireIOException, OneWireE
 	 * @param buf   byte array to manipulate
 	 */
 	private void arrayWriteBit(int state, int index, byte[] buf) {
-		int nbyt = (index >>> 3);
-		int nbit = index - (nbyt << 3);
+		var nbyt = index >>> 3;
+		var nbit = index - (nbyt << 3);
 
-		if (state == 1)
-			buf[nbyt] |= (0x01 << nbit);
-		else
+		if (state == 1) {
+			buf[nbyt] |= 0x01 << nbit;
+		} else {
 			buf[nbyt] &= ~(0x01 << nbit);
+		}
 	}
 
 	/**
@@ -1641,10 +1651,10 @@ private void arrayWriteBit(int state, int index, byte[] buf) {
 	 * @return bit state 1 or 0
 	 */
 	private int arrayReadBit(int index, byte[] buf) {
-		int nbyt = (index >>> 3);
-		int nbit = index - (nbyt << 3);
+		var nbyt = index >>> 3;
+		var nbit = index - (nbyt << 3);
 
-		return ((buf[nbyt] >>> nbit) & 0x01);
+		return buf[nbyt] >>> nbit & 0x01;
 	}
 
 	// --------
@@ -1653,7 +1663,7 @@ private int arrayReadBit(int index, byte[] buf) {
 
 	/**
 	 * Returns a hashcode for this object
-	 * 
+	 *
 	 * @return a hascode for this object
 	 */
 	/*
@@ -1668,8 +1678,9 @@ private int arrayReadBit(int index, byte[] buf) {
 	 * @return true if the given object is the same or equivalent to this
 	 *         DSPortAdapter.
 	 */
+	@Override
 	public boolean equals(Object o) {
-		if (o != null && o instanceof DSPortAdapter) {
+		if (o instanceof DSPortAdapter) {
 			if (o == this || o.toString().equals(this.toString())) {
 				return true;
 			}
@@ -1683,6 +1694,7 @@ public boolean equals(Object o) {
 	 *
 	 * @return a string representation of this DSPortAdapter
 	 */
+	@Override
 	public String toString() {
 		try {
 			return this.getAdapterName() + " " + this.getPortName();
diff --git a/io.openems.edge.bridge.onewire/src/com/dalsemi/onewire/adapter/DumbAdapter.java b/io.openems.edge.bridge.onewire/src/com/dalsemi/onewire/adapter/DumbAdapter.java
index ddae5e63756..baa5c695daa 100644
--- a/io.openems.edge.bridge.onewire/src/com/dalsemi/onewire/adapter/DumbAdapter.java
+++ b/io.openems.edge.bridge.onewire/src/com/dalsemi/onewire/adapter/DumbAdapter.java
@@ -68,7 +68,7 @@ public class DumbAdapter extends DSPortAdapter {
 
 	int containers_index = 0;
 
-	private Vector<OneWireContainer> containers = new Vector<>();
+	private final Vector<OneWireContainer> containers = new Vector<>();
 
 	/**
 	 * Adds a <code>OneWireContainer</code> to the list of containers that this
@@ -78,8 +78,8 @@ public class DumbAdapter extends DSPortAdapter {
 	 *          search
 	 */
 	public void addContainer(OneWireContainer c) {
-		synchronized (containers) {
-			containers.addElement(c);
+		synchronized (this.containers) {
+			this.containers.addElement(c);
 		}
 	}
 
@@ -91,15 +91,15 @@ public void addContainer(OneWireContainer c) {
 	 *          as found by a search
 	 */
 	public void removeContainer(OneWireContainer c) {
-		synchronized (containers) {
-			containers.removeElement(c);
+		synchronized (this.containers) {
+			this.containers.removeElement(c);
 		}
 	}
 
 	/**
 	 * Hashtable to contain the user replaced OneWireContainers
 	 */
-	private Hashtable<Integer, OneWireContainer> registeredOneWireContainerClasses = new Hashtable<>(5);
+	private final Hashtable<Integer, OneWireContainer> registeredOneWireContainerClasses = new Hashtable<>(5);
 
 	/**
 	 * Byte array of families to include in search
@@ -122,6 +122,7 @@ public void removeContainer(OneWireContainer c) {
 	 *
 	 * @return <code>String</code> representation of the port adapter.
 	 */
+	@Override
 	public String getAdapterName() {
 		return "DumbAdapter";
 	}
@@ -132,6 +133,7 @@ public String getAdapterName() {
 	 *
 	 * @return <code>String</code> description of the port type required.
 	 */
+	@Override
 	public String getPortTypeDescription() {
 		return "Virtual Emulated Port";
 	}
@@ -141,6 +143,7 @@ public String getPortTypeDescription() {
 	 *
 	 * @return version string
 	 */
+	@Override
 	public String getClassVersion() {
 		return "0.00";
 	}
@@ -158,8 +161,9 @@ public String getClassVersion() {
 	 * @return <code>Enumeration</code> of type <code>String</code> that contains
 	 *         the port names
 	 */
+	@Override
 	public Enumeration<String> getPortNames() {
-		Vector<String> portNames = new Vector<>();
+		var portNames = new Vector<String>();
 		portNames.addElement("NULL0");
 		return portNames.elements();
 	}
@@ -168,6 +172,7 @@ public Enumeration<String> getPortNames() {
 	 * This method does nothing in <code>DumbAdapter</code>.
 	 *
 	 */
+	@Override
 	public void registerOneWireContainerClass(int family, Class<?> OneWireContainerClass) {
 	}
 
@@ -178,6 +183,7 @@ public void registerOneWireContainerClass(int family, Class<?> OneWireContainerC
 	 *
 	 * @return always returns <code>true</code>
 	 */
+	@Override
 	public boolean selectPort(String portName) {
 		// be lazy, allow anything
 		return true;
@@ -186,6 +192,7 @@ public boolean selectPort(String portName) {
 	/**
 	 * This method does nothing in <code>DumbAdapter</code>.
 	 */
+	@Override
 	public void freePort() {
 		// airball
 	}
@@ -195,6 +202,7 @@ public void freePort() {
 	 *
 	 * @return always returns the <code>String</code> "NULL0"
 	 */
+	@Override
 	public String getPortName() {
 		return "NULL0";
 	}
@@ -209,6 +217,7 @@ public String getPortName() {
 	 *
 	 * @return <code>true</code>
 	 */
+	@Override
 	public boolean adapterDetected() {
 		return true;
 	}
@@ -231,6 +240,7 @@ public boolean adapterDetected() {
 	 * @return <code>true</code>
 	 *
 	 */
+	@Override
 	public boolean canOverdrive() {
 		// don't want someone to bail because of this
 		return true;
@@ -244,6 +254,7 @@ public boolean canOverdrive() {
 	 *
 	 * @return <code>true</code>
 	 */
+	@Override
 	public boolean canHyperdrive() {
 		// don't want someone to bail because of this, although it doesn't exist yet
 		return true;
@@ -257,6 +268,7 @@ public boolean canHyperdrive() {
 	 *
 	 * @return <code>true</code>
 	 */
+	@Override
 	public boolean canFlex() {
 		// don't want someone to bail because of this
 		return true;
@@ -270,6 +282,7 @@ public boolean canFlex() {
 	 *
 	 * @return <code>true</code>
 	 */
+	@Override
 	public boolean canProgram() {
 		// don't want someone to bail because of this
 		return true;
@@ -283,6 +296,7 @@ public boolean canProgram() {
 	 *
 	 * @return <code>true</code>
 	 */
+	@Override
 	public boolean canDeliverPower() {
 		// don't want someone to bail because of this
 		return true;
@@ -296,6 +310,7 @@ public boolean canDeliverPower() {
 	 *
 	 * @return <code>true</code>
 	 */
+	@Override
 	public boolean canDeliverSmartPower() {
 		// don't want someone to bail because of this
 		return true;
@@ -309,6 +324,7 @@ public boolean canDeliverSmartPower() {
 	 *
 	 * @return <code>true</code>
 	 */
+	@Override
 	public boolean canBreak() {
 		// don't want someone to bail because of this
 		return true;
@@ -328,11 +344,12 @@ public boolean canBreak() {
 	 * @return <code>Enumeration</code> of <code>OneWireContainer</code> objects
 	 *         found on the 1-Wire Network.
 	 */
+	@Override
 	public Enumeration<OneWireContainer> getAllDeviceContainers() {
-		Vector<OneWireContainer> copy_vector = new Vector<>();
-		synchronized (containers) {
-			for (int i = 0; i < containers.size(); i++) {
-				copy_vector.addElement(containers.elementAt(i));
+		var copy_vector = new Vector<OneWireContainer>();
+		synchronized (this.containers) {
+			for (var i = 0; i < this.containers.size(); i++) {
+				copy_vector.addElement(this.containers.elementAt(i));
 			}
 		}
 		return copy_vector.elements();
@@ -348,13 +365,14 @@ public Enumeration<OneWireContainer> getAllDeviceContainers() {
 	 * @return The first <code>OneWireContainer</code> object found on the 1-Wire
 	 *         Network, or <code>null</code> if no devices found.
 	 */
+	@Override
 	public OneWireContainer getFirstDeviceContainer() {
-		synchronized (containers) {
-			if (containers.size() > 0) {
-				containers_index = 1;
-				return (OneWireContainer) containers.elementAt(0);
-			} else
-				return null;
+		synchronized (this.containers) {
+			if (this.containers.size() > 0) {
+				this.containers_index = 1;
+				return this.containers.elementAt(0);
+			}
+			return null;
 		}
 	}
 
@@ -369,13 +387,14 @@ public OneWireContainer getFirstDeviceContainer() {
 	 * @return The next <code>OneWireContainer</code> object found on the 1-Wire
 	 *         Network, or <code>null</code> if no iButtons found.
 	 */
+	@Override
 	public OneWireContainer getNextDeviceContainer() {
-		synchronized (containers) {
-			if (containers.size() > containers_index) {
-				containers_index++;
-				return (OneWireContainer) containers.elementAt(containers_index - 1);
-			} else
-				return null;
+		synchronized (this.containers) {
+			if (this.containers.size() > this.containers_index) {
+				this.containers_index++;
+				return this.containers.elementAt(this.containers_index - 1);
+			}
+			return null;
 		}
 	}
 
@@ -386,13 +405,14 @@ public OneWireContainer getNextDeviceContainer() {
 	 *
 	 * @return <code>true</code> if an iButton or 1-Wire device is found.
 	 */
+	@Override
 	public boolean findFirstDevice() {
-		synchronized (containers) {
-			if (containers.size() > 0) {
-				containers_index = 1;
+		synchronized (this.containers) {
+			if (this.containers.size() > 0) {
+				this.containers_index = 1;
 				return true;
-			} else
-				return false;
+			}
+			return false;
 		}
 	}
 
@@ -403,13 +423,14 @@ public boolean findFirstDevice() {
 	 *
 	 * @return <code>true</code> if an iButton or 1-Wire device is found.
 	 */
+	@Override
 	public boolean findNextDevice() {
-		synchronized (containers) {
-			if (containers.size() > containers_index) {
-				containers_index++;
+		synchronized (this.containers) {
+			if (this.containers.size() > this.containers_index) {
+				this.containers_index++;
 				return true;
-			} else
-				return false;
+			}
+			return false;
 		}
 	}
 
@@ -423,8 +444,9 @@ public boolean findNextDevice() {
 	 * @param address An array to be filled with the current iButton address.
 	 * @see com.dalsemi.onewire.utils.Address
 	 */
+	@Override
 	public void getAddress(byte[] address) {
-		OneWireContainer temp = (OneWireContainer) containers.elementAt(containers_index - 1);
+		var temp = this.containers.elementAt(this.containers_index - 1);
 		if (temp != null) {
 			System.arraycopy(temp.getAddress(), 0, address, 0, 8);
 		}
@@ -438,10 +460,11 @@ public void getAddress(byte[] address) {
 	 * @return <code>long</code> representation of the iButton address
 	 * @see com.dalsemi.onewire.utils.Address
 	 */
+	@Override
 	public long getAddressAsLong() {
-		byte[] address = new byte[8];
+		var address = new byte[8];
 
-		getAddress(address);
+		this.getAddress(address);
 
 		return Address.toLong(address);
 	}
@@ -454,10 +477,11 @@ public long getAddressAsLong() {
 	 * @return <code>String</code> representation of the iButton address
 	 * @see com.dalsemi.onewire.utils.Address
 	 */
+	@Override
 	public String getAddressAsString() {
-		byte[] address = new byte[8];
+		var address = new byte[8];
 
-		getAddress(address);
+		this.getAddress(address);
 
 		return Address.toString(address);
 	}
@@ -473,8 +497,9 @@ public String getAddressAsString() {
 	 *
 	 * @see com.dalsemi.onewire.utils.Address
 	 */
+	@Override
 	public boolean isPresent(byte[] address) {
-		return isPresent(Address.toLong(address));
+		return this.isPresent(Address.toLong(address));
 	}
 
 	/**
@@ -488,13 +513,15 @@ public boolean isPresent(byte[] address) {
 	 *
 	 * @see com.dalsemi.onewire.utils.Address
 	 */
+	@Override
 	public boolean isPresent(long address) {
-		synchronized (containers) {
-			for (int i = 0; i < containers.size(); i++) {
-				OneWireContainer temp = (OneWireContainer) containers.elementAt(i);
-				long addr = temp.getAddressAsLong();
-				if (addr == address)
+		synchronized (this.containers) {
+			for (var i = 0; i < this.containers.size(); i++) {
+				var temp = this.containers.elementAt(i);
+				var addr = temp.getAddressAsLong();
+				if (addr == address) {
 					return true;
+				}
 			}
 		}
 		return false;
@@ -511,8 +538,9 @@ public boolean isPresent(long address) {
 	 *
 	 * @see com.dalsemi.onewire.utils.Address
 	 */
+	@Override
 	public boolean isPresent(String address) {
-		return isPresent(Address.toByteArray(address));
+		return this.isPresent(Address.toByteArray(address));
 	}
 
 	/**
@@ -526,6 +554,7 @@ public boolean isPresent(String address) {
 	 *
 	 * @see com.dalsemi.onewire.utils.Address
 	 */
+	@Override
 	public boolean isAlarming(byte[] address) {
 		return false;
 	}
@@ -541,8 +570,9 @@ public boolean isAlarming(byte[] address) {
 	 *
 	 * @see com.dalsemi.onewire.utils.Address
 	 */
+	@Override
 	public boolean isAlarming(long address) {
-		return isAlarming(Address.toByteArray(address));
+		return this.isAlarming(Address.toByteArray(address));
 	}
 
 	/**
@@ -556,8 +586,9 @@ public boolean isAlarming(long address) {
 	 *
 	 * @see com.dalsemi.onewire.utils.Address
 	 */
+	@Override
 	public boolean isAlarming(String address) {
-		return isAlarming(Address.toByteArray(address));
+		return this.isAlarming(Address.toByteArray(address));
 	}
 
 	/**
@@ -575,8 +606,9 @@ public boolean isAlarming(String address) {
 	 * @see #isPresent(byte[])
 	 * @see com.dalsemi.onewire.utils.Address
 	 */
+	@Override
 	public boolean select(byte[] address) {
-		return isPresent(address);
+		return this.isPresent(address);
 	}
 
 	/**
@@ -594,8 +626,9 @@ public boolean select(byte[] address) {
 	 * @see #isPresent(byte[])
 	 * @see com.dalsemi.onewire.utils.Address
 	 */
+	@Override
 	public boolean select(long address) throws OneWireIOException, OneWireException {
-		return select(Address.toByteArray(address));
+		return this.select(Address.toByteArray(address));
 	}
 
 	/**
@@ -613,8 +646,9 @@ public boolean select(long address) throws OneWireIOException, OneWireException
 	 * @see #isPresent(byte[])
 	 * @see com.dalsemi.onewire.utils.Address
 	 */
+	@Override
 	public boolean select(String address) throws OneWireIOException, OneWireException {
-		return select(Address.toByteArray(address));
+		return this.select(Address.toByteArray(address));
 	}
 
 	// --------
@@ -626,6 +660,7 @@ public boolean select(String address) throws OneWireIOException, OneWireExceptio
 	 *
 	 * @see #setNoResetSearch
 	 */
+	@Override
 	public void setSearchOnlyAlarmingDevices() {
 	}
 
@@ -633,6 +668,7 @@ public void setSearchOnlyAlarmingDevices() {
 	 * This method does nothing in <code>DumbAdapter</code>.
 	 *
 	 */
+	@Override
 	public void setNoResetSearch() {
 	}
 
@@ -641,6 +677,7 @@ public void setNoResetSearch() {
 	 *
 	 * @see #setNoResetSearch
 	 */
+	@Override
 	public void setSearchAllDevices() {
 	}
 
@@ -652,9 +689,10 @@ public void setSearchAllDevices() {
 	 * @see #excludeFamily
 	 * @see #excludeFamily(byte[])
 	 */
+	@Override
 	public void targetAllFamilies() {
-		include = null;
-		exclude = null;
+		this.include = null;
+		this.exclude = null;
 	}
 
 	/**
@@ -664,11 +702,13 @@ public void targetAllFamilies() {
 	 * @see com.dalsemi.onewire.utils.Address
 	 * @see #targetAllFamilies
 	 */
+	@Override
 	public void targetFamily(int family) {
-		if ((include == null) || (include.length != 1))
-			include = new byte[1];
+		if (this.include == null || this.include.length != 1) {
+			this.include = new byte[1];
+		}
 
-		include[0] = (byte) family;
+		this.include[0] = (byte) family;
 	}
 
 	/**
@@ -678,11 +718,13 @@ public void targetFamily(int family) {
 	 * @see com.dalsemi.onewire.utils.Address
 	 * @see #targetAllFamilies
 	 */
+	@Override
 	public void targetFamily(byte family[]) {
-		if ((include == null) || (include.length != family.length))
-			include = new byte[family.length];
+		if (this.include == null || this.include.length != family.length) {
+			this.include = new byte[family.length];
+		}
 
-		System.arraycopy(family, 0, include, 0, family.length);
+		System.arraycopy(family, 0, this.include, 0, family.length);
 	}
 
 	/**
@@ -692,11 +734,13 @@ public void targetFamily(byte family[]) {
 	 * @see com.dalsemi.onewire.utils.Address
 	 * @see #targetAllFamilies
 	 */
+	@Override
 	public void excludeFamily(int family) {
-		if ((exclude == null) || (exclude.length != 1))
-			exclude = new byte[1];
+		if (this.exclude == null || this.exclude.length != 1) {
+			this.exclude = new byte[1];
+		}
 
-		exclude[0] = (byte) family;
+		this.exclude[0] = (byte) family;
 	}
 
 	/**
@@ -706,11 +750,13 @@ public void excludeFamily(int family) {
 	 * @see com.dalsemi.onewire.utils.Address
 	 * @see #targetAllFamilies
 	 */
+	@Override
 	public void excludeFamily(byte family[]) {
-		if ((exclude == null) || (exclude.length != family.length))
-			exclude = new byte[family.length];
+		if (this.exclude == null || this.exclude.length != family.length) {
+			this.exclude = new byte[family.length];
+		}
 
-		System.arraycopy(family, 0, exclude, 0, family.length);
+		System.arraycopy(family, 0, this.exclude, 0, family.length);
 	}
 
 	// --------
@@ -724,6 +770,7 @@ public void excludeFamily(byte family[]) {
 	 *                 access to the adapter
 	 * @return <code>true</code>
 	 */
+	@Override
 	public boolean beginExclusive(boolean blocking) {
 		// DEBUG!!! RIGHT NOW THIS IS NOT IMPLEMENTED!!!
 		return true;
@@ -733,6 +780,7 @@ public boolean beginExclusive(boolean blocking) {
 	 * This method does nothing in <code>DumbAdapter</code>.
 	 *
 	 */
+	@Override
 	public void endExclusive() {
 		// DEBUG!!! RIGHT NOW THIS IS NOT IMPLEMENTED!!!
 	}
@@ -747,6 +795,7 @@ public void endExclusive() {
 	 *
 	 * @param bitValue the bit value to send to the 1-Wire Network.
 	 */
+	@Override
 	public void putBit(boolean bitValue) {
 		// this will not be implemented
 	}
@@ -757,6 +806,7 @@ public void putBit(boolean bitValue) {
 	 *
 	 * @return <code>true</code>
 	 */
+	@Override
 	public boolean getBit() {
 		// this will not be implemented
 		return true;
@@ -767,6 +817,7 @@ public boolean getBit() {
 	 *
 	 * @param byteValue the byte value to send to the 1-Wire Network.
 	 */
+	@Override
 	public void putByte(int byteValue) {
 		// this will not be implemented
 	}
@@ -776,6 +827,7 @@ public void putByte(int byteValue) {
 	 *
 	 * @return the value 0x0ff
 	 */
+	@Override
 	public int getByte() {
 		// this will not be implemented
 		return 0x0ff;
@@ -788,6 +840,7 @@ public int getByte() {
 	 *
 	 * @return a new byte array of length <code>len</code>
 	 */
+	@Override
 	public byte[] getBlock(int len) {
 		// this will not be implemented
 		return new byte[len];
@@ -799,6 +852,7 @@ public byte[] getBlock(int len) {
 	 * @param arr array in which to write the received bytes
 	 * @param len length of data bytes to receive
 	 */
+	@Override
 	public void getBlock(byte[] arr, int len) {
 		// this will not be implemented
 	}
@@ -810,6 +864,7 @@ public void getBlock(byte[] arr, int len) {
 	 * @param off offset into the array to start
 	 * @param len length of data bytes to receive
 	 */
+	@Override
 	public void getBlock(byte[] arr, int off, int len) {
 		// this will not be implemented
 	}
@@ -821,6 +876,7 @@ public void getBlock(byte[] arr, int off, int len) {
 	 * @param off       offset into the array of data to start
 	 * @param len       length of data to send / receive starting at 'off'
 	 */
+	@Override
 	public void dataBlock(byte dataBlock[], int off, int len) {
 		// this will not be implemented
 	}
@@ -843,10 +899,12 @@ public void dataBlock(byte dataBlock[], int off, int len) {
 	 *         Note that in <code>DumbAdapter</code>, the only possible results are
 	 *         0 and 1.
 	 */
+	@Override
 	public int reset() {
 		// this will not be implemented
-		if (containers.size() > 0)
+		if (this.containers.size() > 0) {
 			return 1;
+		}
 		return 0;
 	}
 
@@ -869,6 +927,7 @@ public int reset() {
 	 *                   setPowerNormal() method is called.
 	 *                   </ul>
 	 */
+	@Override
 	public void setPowerDuration(int timeFactor) {
 	}
 
@@ -888,6 +947,7 @@ public void setPowerDuration(int timeFactor) {
 	 *
 	 * @return <code>true</code>
 	 */
+	@Override
 	public boolean startPowerDelivery(int changeCondition) {
 		return true;
 	}
@@ -903,6 +963,7 @@ public boolean startPowerDelivery(int changeCondition) {
 	 *                   setPowerNormal() method is called.
 	 *                   </ul>
 	 */
+	@Override
 	public void setProgramPulseDuration(int timeFactor) {
 	}
 
@@ -922,6 +983,7 @@ public void setProgramPulseDuration(int timeFactor) {
 	 *
 	 * @return <code>true</code>
 	 */
+	@Override
 	public boolean startProgramPulse(int changeCondition) {
 		return true;
 	}
@@ -930,6 +992,7 @@ public boolean startProgramPulse(int changeCondition) {
 	 * This method does nothing in <code>DumbAdapter</code>.
 	 *
 	 */
+	@Override
 	public void startBreak() {
 	}
 
@@ -937,8 +1000,8 @@ public void startBreak() {
 	 * This method does nothing in <code>DumbAdapter</code>.
 	 *
 	 */
+	@Override
 	public void setPowerNormal() {
-		return;
 	}
 
 	// --------
@@ -961,8 +1024,9 @@ public void setPowerNormal() {
 	 *              </ul>
 	 *
 	 */
+	@Override
 	public void setSpeed(int speed) {
-		sp = speed;
+		this.sp = speed;
 	}
 
 	private int sp = 0;
@@ -972,8 +1036,9 @@ public void setSpeed(int speed) {
 	 *
 	 * @return <the last value passed to the <code>setSpeed(int)</code> method, or 0
 	 */
+	@Override
 	public int getSpeed() {
-		return sp;
+		return this.sp;
 	}
 
 	// --------
@@ -991,12 +1056,14 @@ public int getSpeed() {
 	 *         match could be found.
 	 * @see com.dalsemi.onewire.utils.Address
 	 */
+	@Override
 	public OneWireContainer getDeviceContainer(byte[] address) {
-		long addr = Address.toLong(address);
-		synchronized (containers) {
-			for (int i = 0; i < containers.size(); i++) {
-				if (((OneWireContainer) containers.elementAt(i)).getAddressAsLong() == addr)
-					return (OneWireContainer) containers.elementAt(i);
+		var addr = Address.toLong(address);
+		synchronized (this.containers) {
+			for (var i = 0; i < this.containers.size(); i++) {
+				if (this.containers.elementAt(i).getAddressAsLong() == addr) {
+					return this.containers.elementAt(i);
+				}
 			}
 		}
 		return null;
@@ -1014,8 +1081,9 @@ public OneWireContainer getDeviceContainer(byte[] address) {
 	 *         match could be found.
 	 * @see com.dalsemi.onewire.utils.Address
 	 */
+	@Override
 	public OneWireContainer getDeviceContainer(long address) {
-		return getDeviceContainer(Address.toByteArray(address));
+		return this.getDeviceContainer(Address.toByteArray(address));
 	}
 
 	/**
@@ -1029,8 +1097,9 @@ public OneWireContainer getDeviceContainer(long address) {
 	 *         match could be found.
 	 * @see com.dalsemi.onewire.utils.Address
 	 */
+	@Override
 	public OneWireContainer getDeviceContainer(String address) {
-		return getDeviceContainer(Address.toByteArray(address));
+		return this.getDeviceContainer(Address.toByteArray(address));
 	}
 
 	/**
@@ -1040,14 +1109,15 @@ public OneWireContainer getDeviceContainer(String address) {
 	 *
 	 * @return the <code>OneWireContainer</code> object
 	 */
+	@Override
 	public OneWireContainer getDeviceContainer() {
 
 		// Mask off the upper bit.
-		byte[] address = new byte[8];
+		var address = new byte[8];
 
-		getAddress(address);
+		this.getAddress(address);
 
-		return getDeviceContainer(address);
+		return this.getDeviceContainer(address);
 	}
 
 	/**
@@ -1055,20 +1125,21 @@ public OneWireContainer getDeviceContainer() {
 	 *
 	 * @return <code>true</code> if in include group
 	 */
+	@Override
 	protected boolean isValidFamily(byte[] address) {
-		byte familyCode = address[0];
+		var familyCode = address[0];
 
-		if (exclude != null) {
-			for (int i = 0; i < exclude.length; i++) {
-				if (familyCode == exclude[i]) {
+		if (this.exclude != null) {
+			for (byte element : this.exclude) {
+				if (familyCode == element) {
 					return false;
 				}
 			}
 		}
 
-		if (include != null) {
-			for (int i = 0; i < include.length; i++) {
-				if (familyCode == include[i]) {
+		if (this.include != null) {
+			for (byte element : this.include) {
+				if (familyCode == element) {
 					return true;
 				}
 			}
diff --git a/io.openems.edge.bridge.onewire/src/com/dalsemi/onewire/adapter/LSerialAdapter.java b/io.openems.edge.bridge.onewire/src/com/dalsemi/onewire/adapter/LSerialAdapter.java
index e2de81e3e70..5e80935521b 100644
--- a/io.openems.edge.bridge.onewire/src/com/dalsemi/onewire/adapter/LSerialAdapter.java
+++ b/io.openems.edge.bridge.onewire/src/com/dalsemi/onewire/adapter/LSerialAdapter.java
@@ -203,14 +203,11 @@ public class LSerialAdapter extends DSPortAdapter {
 	/** flag to indicate the last discrepancy */
 	private int LastDiscrepancy;
 
-	/** flag to indicate the last descrepancy with the family code byte */
-	private int LastFamilyDiscrepancy;
-
 	/** true if device found is the last device */
 	private boolean LastDevice;
 
 	/** current device */
-	private byte[] CurrentDevice = new byte[8];
+	private final byte[] CurrentDevice = new byte[8];
 
 	/**
 	 * Whether we are searching only alarming iButtons. This is currently ignored.
@@ -227,7 +224,7 @@ public class LSerialAdapter extends DSPortAdapter {
 	private boolean haveLocalUse;
 
 	/** Field syncObject */
-	private Object syncObject;
+	private final Object syncObject;
 
 	/** Enable/disable debug messages */
 	private static boolean doDebugMessages = false;
@@ -241,10 +238,10 @@ public class LSerialAdapter extends DSPortAdapter {
 	 *
 	 */
 	public LSerialAdapter() {
-		serial = null;
-		adapterPresent = false;
-		haveLocalUse = false;
-		syncObject = new Object();
+		this.serial = null;
+		this.adapterPresent = false;
+		this.haveLocalUse = false;
+		this.syncObject = new Object();
 	}
 
 	// --------
@@ -258,6 +255,7 @@ public LSerialAdapter() {
 	 *
 	 * @return <code>String</code> representation of the port adapter.
 	 */
+	@Override
 	public String getAdapterName() {
 		return "DS9097";
 	}
@@ -268,6 +266,7 @@ public String getAdapterName() {
 	 *
 	 * @return <code>String</code> description of the port type required.
 	 */
+	@Override
 	public String getPortTypeDescription() {
 		return "serial communication port";
 	}
@@ -277,6 +276,7 @@ public String getPortTypeDescription() {
 	 *
 	 * @return version string
 	 */
+	@Override
 	public String getClassVersion() {
 		return classVersion;
 	}
@@ -293,6 +293,7 @@ public String getClassVersion() {
 	 *
 	 * @return enumeration of type <code>String</code> that contains the port names
 	 */
+	@Override
 	public Enumeration<String> getPortNames() {
 		return SerialService.getSerialPortIdentifiers();
 	}
@@ -313,23 +314,25 @@ public Enumeration<String> getPortNames() {
 	 *                            with port.
 	 * @throws OneWireException   If port does not exist
 	 */
+	@Override
 	public boolean selectPort(String newPortName) throws OneWireIOException, OneWireException {
 
 		// find the port reference
-		serial = SerialService.getSerialService(newPortName);
+		this.serial = SerialService.getSerialService(newPortName);
 
 		// check if there is no such port
-		if (serial == null)
+		if (this.serial == null) {
 			throw new OneWireException("DS9097EAdapter: selectPort(), Not such serial port: " + newPortName);
+		}
 
 		try {
 
 			// acquire exclusive use of the port
-			beginLocalExclusive();
+			this.beginLocalExclusive();
 
 			// attempt to open the port
-			serial.openPort();
-			serial.setBaudRate(115200);
+			this.serial.openPort();
+			this.serial.setBaudRate(115200);
 
 			return true;
 		} catch (IOException ioe) {
@@ -337,7 +340,7 @@ public boolean selectPort(String newPortName) throws OneWireIOException, OneWire
 		} finally {
 
 			// release local exclusive use of port
-			endLocalExclusive();
+			this.endLocalExclusive();
 		}
 	}
 
@@ -348,11 +351,12 @@ public boolean selectPort(String newPortName) throws OneWireIOException, OneWire
 	 *
 	 * @throws OneWireException if valid port not yet selected
 	 */
+	@Override
 	public String getPortName() throws OneWireException {
-		if (serial != null)
-			return serial.getPortName();
-		else
-			throw new OneWireException("DS9097EAdapter-getPortName, port not selected");
+		if (this.serial != null) {
+			return this.serial.getPortName();
+		}
+		throw new OneWireException("DS9097EAdapter-getPortName, port not selected");
 	}
 
 	/**
@@ -362,20 +366,21 @@ public String getPortName() throws OneWireException {
 	 *
 	 * @throws OneWireException If port does not exist
 	 */
+	@Override
 	public void freePort() throws OneWireException {
 		try {
 			// acquire exclusive use of the port
-			beginLocalExclusive();
+			this.beginLocalExclusive();
 
-			adapterPresent = false;
+			this.adapterPresent = false;
 
 			// attempt to open the port
-			serial.closePort();
+			this.serial.closePort();
 		} catch (IOException ioe) {
 			throw new OneWireException("Error closing serial port");
 		} finally {
 			// release local exclusive use of port
-			endLocalExclusive();
+			this.endLocalExclusive();
 		}
 	}
 
@@ -392,22 +397,23 @@ public void freePort() throws OneWireException {
 	 * @throws OneWireIOException
 	 * @throws OneWireException
 	 */
+	@Override
 	public boolean adapterDetected() throws OneWireIOException, OneWireException {
-		if (!adapterPresent) {
+		if (!this.adapterPresent) {
 			try {
 				// acquire exclusive use of the port
-				beginLocalExclusive();
+				this.beginLocalExclusive();
 
-				adapterPresent();
+				this.adapterPresent();
 			} catch (OneWireIOException e) {
 				System.err.println("DS9097EAdapter: Not detected " + e);
 			} finally {
 				// release local exclusive use of port
-				endLocalExclusive();
+				this.endLocalExclusive();
 			}
 		}
 
-		return adapterPresent;
+		return this.adapterPresent;
 	}
 
 	/**
@@ -424,10 +430,9 @@ public boolean adapterDetected() throws OneWireIOException, OneWireException {
 	 * @throws OneWireException   on a communication or setup error with the 1-Wire
 	 *                            adapter
 	 */
+	@Override
 	public String getAdapterVersion() throws OneWireIOException, OneWireException {
-		String version_string = "DS9097 adapter"; // Does not look for DS9097E yet
-
-		return version_string;
+		return "DS9097 adapter";
 	}
 
 	/**
@@ -446,6 +451,7 @@ public String getAdapterVersion() throws OneWireIOException, OneWireException {
 	 *                            adapter
 	 * @see com.dalsemi.onewire.utils.Address
 	 */
+	@Override
 	public String getAdapterAddress() throws OneWireIOException, OneWireException {
 		// there is no ID
 		return "<no adapter address>";
@@ -468,11 +474,12 @@ public String getAdapterAddress() throws OneWireIOException, OneWireException {
 	 * @throws OneWireIOException on a 1-Wire communication error
 	 * @throws OneWireException   on a setup error with the 1-Wire adapter
 	 */
+	@Override
 	public boolean findFirstDevice() throws OneWireIOException, OneWireException {
 		// reset the internal rom buffer
-		resetSearch = true;
+		this.resetSearch = true;
 
-		return findNextDevice();
+		return this.findNextDevice();
 	}
 
 	/**
@@ -485,33 +492,32 @@ public boolean findFirstDevice() throws OneWireIOException, OneWireException {
 	 * @throws OneWireIOException on a 1-Wire communication error
 	 * @throws OneWireException   on a setup error with the 1-Wire adapter
 	 */
+	@Override
 	public boolean findNextDevice() throws OneWireIOException, OneWireException {
 		boolean retval;
 
 		try {
 			// acquire exclusive use of the port
-			beginLocalExclusive();
+			this.beginLocalExclusive();
 
 			while (true) {
-				retval = search(resetSearch);
+				retval = this.search(this.resetSearch);
 
-				if (retval) {
-					resetSearch = false;
-
-					// check if this is an OK family type
-					if (isValidFamily(CurrentDevice))
-						return true;
-
-					// Else, loop to the top and do another search.
-				} else {
-					resetSearch = true;
+				if (!retval) {
+					this.resetSearch = true;
 
 					return false;
 				}
+				this.resetSearch = false;
+
+				// check if this is an OK family type
+				if (this.isValidFamily(this.CurrentDevice)) {
+					return true;
+				}
 			}
 		} finally {
 			// release local exclusive use of port
-			endLocalExclusive();
+			this.endLocalExclusive();
 		}
 	}
 
@@ -523,8 +529,9 @@ public boolean findNextDevice() throws OneWireIOException, OneWireException {
 	 * @param address An array to be filled with the current iButton address.
 	 * @see com.dalsemi.onewire.utils.Address
 	 */
+	@Override
 	public void getAddress(byte[] address) {
-		System.arraycopy(CurrentDevice, 0, address, 0, 8);
+		System.arraycopy(this.CurrentDevice, 0, address, 0, 8);
 	}
 
 	/**
@@ -535,7 +542,7 @@ public void getAddress(byte[] address) {
 	 * @param address An array to be copied into the current iButton address.
 	 */
 	public void setAddress(byte[] address) {
-		System.arraycopy(address, 0, CurrentDevice, 0, 8);
+		System.arraycopy(address, 0, this.CurrentDevice, 0, 8);
 	}
 
 	// --------
@@ -550,8 +557,9 @@ public void setAddress(byte[] address) {
 	 *
 	 * @see #setNoResetSearch
 	 */
+	@Override
 	public void setSearchOnlyAlarmingDevices() {
-		searchOnlyAlarmingButtons = true;
+		this.searchOnlyAlarmingButtons = true;
 	}
 
 	/**
@@ -559,8 +567,9 @@ public void setSearchOnlyAlarmingDevices() {
 	 * This feature is chiefly used with the DS2409 1-Wire coupler. The normal reset
 	 * before each search can be restored with the 'setSearchAllDevices()' method.
 	 */
+	@Override
 	public void setNoResetSearch() {
-		skipResetOnSearch = true;
+		this.skipResetOnSearch = true;
 	}
 
 	/**
@@ -571,9 +580,10 @@ public void setNoResetSearch() {
 	 *
 	 * @see #setNoResetSearch
 	 */
+	@Override
 	public void setSearchAllDevices() {
-		searchOnlyAlarmingButtons = false;
-		skipResetOnSearch = false;
+		this.searchOnlyAlarmingButtons = false;
+		this.skipResetOnSearch = false;
 	}
 
 	// --------
@@ -596,8 +606,9 @@ public void setSearchAllDevices() {
 	 *
 	 * @throws OneWireException on a setup error with the 1-Wire adapter
 	 */
+	@Override
 	public boolean beginExclusive(boolean blocking) throws OneWireException {
-		return serial.beginExclusive(blocking);
+		return this.serial.beginExclusive(blocking);
 	}
 
 	/**
@@ -605,8 +616,9 @@ public boolean beginExclusive(boolean blocking) throws OneWireException {
 	 * dynamically marks the end of a critical section and should be used when
 	 * exclusive control is no longer needed.
 	 */
+	@Override
 	public void endExclusive() {
-		serial.endExclusive();
+		this.serial.endExclusive();
 	}
 
 	/**
@@ -618,18 +630,18 @@ public void endExclusive() {
 	private void beginLocalExclusive() throws OneWireException {
 
 		// check if there is no such port
-		if (serial == null)
+		if (this.serial == null) {
 			throw new OneWireException("DS9097EAdapter: port not selected ");
+		}
 
 		// check if already have exclusive use
-		if (serial.haveExclusive())
-			return;
-		else {
-			while (!haveLocalUse) {
-				synchronized (syncObject) {
-					haveLocalUse = serial.beginExclusive(false);
+		if (this.serial.haveExclusive()) {
+		} else {
+			while (!this.haveLocalUse) {
+				synchronized (this.syncObject) {
+					this.haveLocalUse = this.serial.beginExclusive(false);
 				}
-				if (!haveLocalUse) {
+				if (!this.haveLocalUse) {
 					try {
 						Thread.sleep(50);
 					} catch (Exception e) {
@@ -644,11 +656,11 @@ private void beginLocalExclusive() throws OneWireException {
 	 * if we did our own 'beginExclusive' block and frees it.
 	 */
 	private void endLocalExclusive() {
-		synchronized (syncObject) {
-			if (haveLocalUse) {
-				haveLocalUse = false;
+		synchronized (this.syncObject) {
+			if (this.haveLocalUse) {
+				this.haveLocalUse = false;
 
-				serial.endExclusive();
+				this.serial.endExclusive();
 			}
 		}
 	}
@@ -665,35 +677,37 @@ private void endLocalExclusive() {
 	 * @throws OneWireIOException on a 1-Wire communication error
 	 * @throws OneWireException   on a setup error with the 1-Wire adapter
 	 */
+	@Override
 	public void putBit(boolean bitValue) throws OneWireIOException, OneWireException {
 		char send_byte;
 
 		try {
 			// acquire exclusive use of the port
-			beginLocalExclusive();
+			this.beginLocalExclusive();
 
 			// make sure adapter is present
-			if (adapterDetected()) {
-				if (bitValue)
-					send_byte = (char) 0xFF;
-				else
-					send_byte = (char) 0x00;
+			if (!this.adapterDetected()) {
+				throw new OneWireIOException("Error communicating with adapter");
+			}
+			if (bitValue) {
+				send_byte = (char) 0xFF;
+			} else {
+				send_byte = (char) 0x00;
+			}
 
-				serial.flush();
+			this.serial.flush();
 
-				serial.write(send_byte);
-				char[] result = serial.readWithTimeout(1);
+			this.serial.write(send_byte);
+			var result = this.serial.readWithTimeout(1);
 
-				if (result[0] != send_byte)
-					throw new OneWireIOException("Error during putBit(), echo was incorrect");
-			} else {
-				throw new OneWireIOException("Error communicating with adapter");
+			if (result[0] != send_byte) {
+				throw new OneWireIOException("Error during putBit(), echo was incorrect");
 			}
 		} catch (IOException ioe) {
 			throw new OneWireIOException(ioe.toString());
 		} finally {
 			// release local exclusive use of port
-			endLocalExclusive();
+			this.endLocalExclusive();
 		}
 	}
 
@@ -705,27 +719,27 @@ public void putBit(boolean bitValue) throws OneWireIOException, OneWireException
 	 * @throws OneWireIOException on a 1-Wire communication error
 	 * @throws OneWireException   on a setup error with the 1-Wire adapter
 	 */
+	@Override
 	public boolean getBit() throws OneWireIOException, OneWireException {
 		try {
 			// acquire exclusive use of the port
-			beginLocalExclusive();
+			this.beginLocalExclusive();
 
 			// make sure adapter is present
-			if (adapterDetected()) {
-				serial.flush();
+			if (this.adapterDetected()) {
+				this.serial.flush();
 
-				serial.write((char) 0x00FF);
-				char[] result = serial.readWithTimeout(1);
+				this.serial.write((char) 0x00FF);
+				var result = this.serial.readWithTimeout(1);
 
-				return (result[0] == 0xFF);
-			} else {
-				throw new OneWireIOException("Error communicating with adapter");
+				return result[0] == 0xFF;
 			}
+			throw new OneWireIOException("Error communicating with adapter");
 		} catch (IOException ioe) {
 			throw new OneWireIOException(ioe.toString());
 		} finally {
 			// release local exclusive use of port
-			endLocalExclusive();
+			this.endLocalExclusive();
 		}
 	}
 
@@ -737,12 +751,13 @@ public boolean getBit() throws OneWireIOException, OneWireException {
 	 * @throws OneWireIOException on a 1-Wire communication error
 	 * @throws OneWireException   on a setup error with the 1-Wire adapter
 	 */
+	@Override
 	public void putByte(int byteValue) throws OneWireIOException, OneWireException {
-		byte[] temp_block = new byte[1];
+		var temp_block = new byte[1];
 
 		temp_block[0] = (byte) byteValue;
 
-		dataBlock(temp_block, 0, 1);
+		this.dataBlock(temp_block, 0, 1);
 	}
 
 	/**
@@ -753,17 +768,18 @@ public void putByte(int byteValue) throws OneWireIOException, OneWireException {
 	 * @throws OneWireIOException on a 1-Wire communication error
 	 * @throws OneWireException   on a setup error with the 1-Wire adapter
 	 */
+	@Override
 	public int getByte() throws OneWireIOException, OneWireException {
-		byte[] temp_block = new byte[1];
+		var temp_block = new byte[1];
 
 		temp_block[0] = (byte) 0xFF;
 
-		dataBlock(temp_block, 0, 1);
+		this.dataBlock(temp_block, 0, 1);
 
-		if (temp_block.length == 1)
-			return (temp_block[0] & 0xFF);
-		else
-			throw new OneWireIOException("Error communicating with adapter");
+		if (temp_block.length == 1) {
+			return temp_block[0] & 0xFF;
+		}
+		throw new OneWireIOException("Error communicating with adapter");
 	}
 
 	/**
@@ -776,14 +792,16 @@ public int getByte() throws OneWireIOException, OneWireException {
 	 * @throws OneWireIOException on a 1-Wire communication error
 	 * @throws OneWireException   on a setup error with the 1-Wire adapter
 	 */
+	@Override
 	public byte[] getBlock(int len) throws OneWireIOException, OneWireException {
-		byte[] temp_block = new byte[len];
+		var temp_block = new byte[len];
 
 		// set block to read 0xFF
-		for (int i = 0; i < len; i++)
+		for (var i = 0; i < len; i++) {
 			temp_block[i] = (byte) 0xFF;
+		}
 
-		getBlock(temp_block, len);
+		this.getBlock(temp_block, len);
 
 		return temp_block;
 	}
@@ -798,8 +816,9 @@ public byte[] getBlock(int len) throws OneWireIOException, OneWireException {
 	 * @throws OneWireIOException on a 1-Wire communication error
 	 * @throws OneWireException   on a setup error with the 1-Wire adapter
 	 */
+	@Override
 	public void getBlock(byte[] arr, int len) throws OneWireIOException, OneWireException {
-		getBlock(arr, 0, len);
+		this.getBlock(arr, 0, len);
 	}
 
 	/**
@@ -813,12 +832,14 @@ public void getBlock(byte[] arr, int len) throws OneWireIOException, OneWireExce
 	 * @throws OneWireIOException on a 1-Wire communication error
 	 * @throws OneWireException   on a setup error with the 1-Wire adapter
 	 */
+	@Override
 	public void getBlock(byte[] arr, int off, int len) throws OneWireIOException, OneWireException {
 		// set block to read 0xFF
-		for (int i = off; i < len; i++)
+		for (var i = off; i < len; i++) {
 			arr[i] = (byte) 0xFF;
+		}
 
-		dataBlock(arr, off, len);
+		this.dataBlock(arr, off, len);
 	}
 
 	/**
@@ -834,44 +855,45 @@ public void getBlock(byte[] arr, int off, int len) throws OneWireIOException, On
 	 * @throws OneWireIOException on a 1-Wire communication error
 	 * @throws OneWireException   on a setup error with the 1-Wire adapter
 	 */
+	@Override
 	public void dataBlock(byte dataBlock[], int off, int len) throws OneWireIOException, OneWireException {
 		try {
 			// acquire exclusive use of the port
-			beginLocalExclusive();
+			this.beginLocalExclusive();
 
 			// make sure adapter is present
-			if (adapterDetected()) {
-				int t_off, t_len;
-				t_off = off;
-				t_len = len;
+			if (!this.adapterDetected()) {
+				throw new OneWireIOException("Error communicating with adapter");
+			}
+			int t_off, t_len;
+			t_off = off;
+			t_len = len;
 
-				// break up large blocks to not exceed 128 bytes at a time
-				do {
-					if (t_len > 128)
-						t_len = 128;
+			// break up large blocks to not exceed 128 bytes at a time
+			do {
+				if (t_len > 128) {
+					t_len = 128;
+				}
 
-					char[] send_block = constructSendBlock(dataBlock, t_off, t_len);
+				var send_block = this.constructSendBlock(dataBlock, t_off, t_len);
 
-					serial.flush();
+				this.serial.flush();
 
-					serial.write(send_block);
-					char[] raw_recv = serial.readWithTimeout(send_block.length);
+				this.serial.write(send_block);
+				var raw_recv = this.serial.readWithTimeout(send_block.length);
 
-					byte[] recv = interpretRecvBlock(raw_recv);
+				var recv = this.interpretRecvBlock(raw_recv);
 
-					System.arraycopy(recv, 0, dataBlock, t_off, t_len);
+				System.arraycopy(recv, 0, dataBlock, t_off, t_len);
 
-					t_off += t_len;
-					t_len = off + len - t_off;
-				} while (t_len > 0);
-			} else {
-				throw new OneWireIOException("Error communicating with adapter");
-			}
+				t_off += t_len;
+				t_len = off + len - t_off;
+			} while (t_len > 0);
 		} catch (IOException ioe) {
 			throw new OneWireIOException(ioe.toString());
 		} finally {
 			// release local exclusive use of port
-			endLocalExclusive();
+			this.endLocalExclusive();
 		}
 	}
 
@@ -894,36 +916,38 @@ public void dataBlock(byte dataBlock[], int off, int len) throws OneWireIOExcept
 	 * @throws OneWireIOException on a 1-Wire communication error
 	 * @throws OneWireException   on a setup error with the 1-Wire adapter
 	 */
+	@Override
 	public int reset() throws OneWireIOException, OneWireException {
 		try {
 			// acquire exclusive use of the port
-			beginLocalExclusive();
+			this.beginLocalExclusive();
 
 			// make sure adapter is present
-			if (adapterDetected()) {
-				serial.flush();
+			if (this.adapterDetected()) {
+				this.serial.flush();
 
 				// send a break to reset 1-Wire
-				serial.sendBreak(1);
+				this.serial.sendBreak(1);
 
 				// get the result
-				char[] c = serial.readWithTimeout(1);
+				var c = this.serial.readWithTimeout(1);
 
 				// does not work: return ((c.length > 1) ? RESET_PRESENCE : RESET_NOPRESENCE);
 
 				return RESET_PRESENCE;
-			} else
-				return RESET_NOPRESENCE;
+			}
+			return RESET_NOPRESENCE;
 		} catch (IOException ioe) {
 			return RESET_NOPRESENCE;
 		} catch (OneWireIOException e) {
-			if (doDebugMessages)
+			if (doDebugMessages) {
 				System.err.println("DS9097EAdapter: Not detected " + e);
+			}
 
 			return RESET_NOPRESENCE;
 		} finally {
 			// release local exclusive use of port
-			endLocalExclusive();
+			this.endLocalExclusive();
 		}
 	}
 
@@ -958,103 +982,103 @@ private boolean search(boolean resetSearch) throws OneWireIOException, OneWireEx
 
 		// check for a force reset of the search
 		if (resetSearch) {
-			LastDiscrepancy = 0;
-			LastDevice = false;
-			LastFamilyDiscrepancy = 0;
+			this.LastDiscrepancy = 0;
+			this.LastDevice = false;
 		}
 
 		// if the last call was not the last one
-		if (!LastDevice) {
+		if (!this.LastDevice) {
 			// check if reset first is requested
-			if (!skipResetOnSearch) {
+			if (!this.skipResetOnSearch) {
 				// reset the 1-wire
 				// if there are no parts on 1-wire, return false
-				if (reset() != RESET_PRESENCE) {
+				if (this.reset() != RESET_PRESENCE) {
 					// reset the search
-					LastDiscrepancy = 0;
-					LastFamilyDiscrepancy = 0;
+					this.LastDiscrepancy = 0;
 					return false;
 				}
 			}
 
 			// If finding alarming devices issue a different command
-			if (searchOnlyAlarmingButtons)
-				putByte(ALARM_SEARCH_CMD); // issue the alarming search command
-			else
-				putByte(NORMAL_SEARCH_CMD); // issue the search command
+			if (this.searchOnlyAlarmingButtons) {
+				this.putByte(ALARM_SEARCH_CMD); // issue the alarming search command
+			} else {
+				this.putByte(NORMAL_SEARCH_CMD); // issue the search command
+			}
 
 			// loop to do the search
 			do {
 				// read a bit and its compliment
-				bit_test = (getBit() ? 1 : 0) << 1;
-				bit_test |= (getBit() ? 1 : 0);
+				bit_test = (this.getBit() ? 1 : 0) << 1;
+				bit_test |= this.getBit() ? 1 : 0;
 
 				// check for no devices on 1-wire
-				if (bit_test == 3)
+				if (bit_test == 3) {
 					break;
-				else {
-					// all devices coupled have 0 or 1
-					if (bit_test > 0)
-						search_direction = !((bit_test & 0x01) == 0x01); // bit write value for search
-					else {
-						// if this discrepancy if before the Last Discrepancy
-						// on a previous next then pick the same as last time
-						if (bit_number < LastDiscrepancy)
-							search_direction = ((CurrentDevice[serial_byte_number] & serial_byte_mask) > 0);
-						else
-							// if equal to last pick 1, if not then pick 0
-							search_direction = (bit_number == LastDiscrepancy);
-
-						// if 0 was picked then record its position in LastZero
-						if (!search_direction)
-							last_zero = bit_number;
-
-						// check for Last discrepancy in family
-						if (last_zero < 9)
-							LastFamilyDiscrepancy = last_zero;
+				}
+				// all devices coupled have 0 or 1
+				if (bit_test > 0) {
+					search_direction = !((bit_test & 0x01) == 0x01); // bit write value for search
+				} else {
+					// if this discrepancy if before the Last Discrepancy
+					// on a previous next then pick the same as last time
+					if (bit_number < this.LastDiscrepancy) {
+						search_direction = (this.CurrentDevice[serial_byte_number] & serial_byte_mask) > 0;
+					} else {
+						// if equal to last pick 1, if not then pick 0
+						search_direction = bit_number == this.LastDiscrepancy;
 					}
 
-					// set or clear the bit in the CurrentDevice byte serial_byte_number
-					// with mask serial_byte_mask
-					if (search_direction)
-						CurrentDevice[serial_byte_number] |= serial_byte_mask;
-					else
-						CurrentDevice[serial_byte_number] &= ~serial_byte_mask;
-
-					// serial number search direction write bit
-					putBit(search_direction);
-
-					// increment the byte counter bit_number
-					// and shift the mask serial_byte_mask
-					bit_number++;
-					serial_byte_mask = (serial_byte_mask <<= 1) & 0x00FF;
-
-					// if the mask is 0 then go to new CurrentDevice byte serial_byte_number
-					// and reset mask
-					if (serial_byte_mask == 0) {
-						// accumulate the CRC
-						lastcrc8 = CRC8.compute(CurrentDevice[serial_byte_number], lastcrc8);
-						serial_byte_number++;
-						serial_byte_mask = 1;
+					// if 0 was picked then record its position in LastZero
+					if (!search_direction) {
+						last_zero = bit_number;
 					}
+
+					// check for Last discrepancy in family
+					if (last_zero < 9) {
+					}
+				}
+
+				// set or clear the bit in the CurrentDevice byte serial_byte_number
+				// with mask serial_byte_mask
+				if (search_direction) {
+					this.CurrentDevice[serial_byte_number] |= serial_byte_mask;
+				} else {
+					this.CurrentDevice[serial_byte_number] &= ~serial_byte_mask;
+				}
+
+				// serial number search direction write bit
+				this.putBit(search_direction);
+
+				// increment the byte counter bit_number
+				// and shift the mask serial_byte_mask
+				bit_number++;
+				serial_byte_mask = (serial_byte_mask <<= 1) & 0x00FF;
+
+				// if the mask is 0 then go to new CurrentDevice byte serial_byte_number
+				// and reset mask
+				if (serial_byte_mask == 0) {
+					// accumulate the CRC
+					lastcrc8 = CRC8.compute(this.CurrentDevice[serial_byte_number], lastcrc8);
+					serial_byte_number++;
+					serial_byte_mask = 1;
 				}
 			} while (serial_byte_number < 8); // loop until through all CurrentDevice bytes 0-7
 
 			// if the search was successful then
-			if (!((bit_number < 65) || (lastcrc8 != 0))) {
+			if (!(bit_number < 65 || lastcrc8 != 0)) {
 				// search successful so set LastDiscrepancy,LastDevice,next_result
-				LastDiscrepancy = last_zero;
-				LastDevice = (LastDiscrepancy == 0);
+				this.LastDiscrepancy = last_zero;
+				this.LastDevice = this.LastDiscrepancy == 0;
 				next_result = true;
 			}
 		}
 
 		// if no device found then reset counters so next 'next' will be
 		// like a first
-		if (!next_result || (CurrentDevice[0] == 0)) {
-			LastDiscrepancy = 0;
-			LastDevice = false;
-			LastFamilyDiscrepancy = 0;
+		if (!next_result || this.CurrentDevice[0] == 0) {
+			this.LastDiscrepancy = 0;
+			this.LastDevice = false;
 			next_result = false;
 		}
 
@@ -1068,37 +1092,37 @@ private boolean search(boolean resetSearch) throws OneWireIOException, OneWireEx
 	 * @return true if adapter likely present
 	 */
 	private boolean adapterPresent() {
-		if (!adapterPresent) {
+		if (!this.adapterPresent) {
 			char[] test_buf = { 0xFF, 0x00, 0xFF, 0x00, 0xFF, 0x00, 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
 					0x00, 0x00, 0xE3, 0xC1, 'A', 'T', 'E', '0', 0x0D, 'A' };
 
 			try {
 				// do reset
-				serial.flush();
+				this.serial.flush();
 
 				// send a break to reset 1-Wire
-				serial.sendBreak(1);
+				this.serial.sendBreak(1);
 
 				// get the result
-				char[] c = serial.readWithTimeout(1);
+				var c = this.serial.readWithTimeout(1);
 
 				// send the test message
-				serial.flush();
-				serial.write(test_buf);
+				this.serial.flush();
+				this.serial.write(test_buf);
 
 				// get echo
-				char[] result = serial.readWithTimeout(test_buf.length);
+				var result = this.serial.readWithTimeout(test_buf.length);
 
-				serial.flush();
+				this.serial.flush();
 
 				// if get entire echo then must be OK
-				adapterPresent = true;
+				this.adapterPresent = true;
 			} catch (IOException ioe) {
 				// DRAIN
 			}
 		}
 
-		return adapterPresent;
+		return this.adapterPresent;
 	}
 
 	/**
@@ -1113,16 +1137,17 @@ private boolean adapterPresent() {
 	 */
 	private char[] constructSendBlock(byte[] data, int off, int len) {
 		int shift_byte, cnt = 0;
-		char[] send_block = new char[len * 8];
+		var send_block = new char[len * 8];
 
-		for (int i = 0; i < len; i++) {
+		for (var i = 0; i < len; i++) {
 			shift_byte = data[i + off];
 
-			for (int j = 0; j < 8; j++) {
-				if ((shift_byte & 0x01) == 0x01)
+			for (var j = 0; j < 8; j++) {
+				if ((shift_byte & 0x01) == 0x01) {
 					send_block[cnt++] = 0x00FF;
-				else
+				} else {
 					send_block[cnt++] = 0x00;
+				}
 
 				shift_byte >>>= 1;
 			}
@@ -1141,13 +1166,14 @@ private char[] constructSendBlock(byte[] data, int off, int len) {
 	 */
 	private byte[] interpretRecvBlock(char[] rawBlock) {
 		int shift_byte = 0, bit_cnt = 0, byte_cnt = 0;
-		byte[] recv_block = new byte[rawBlock.length / 8];
+		var recv_block = new byte[rawBlock.length / 8];
 
-		for (int i = 0; i < rawBlock.length; i++) {
+		for (char element : rawBlock) {
 			shift_byte >>>= 1;
 
-			if (rawBlock[i] == 0x00FF)
+			if (element == 0x00FF) {
 				shift_byte |= 0x80;
+			}
 
 			bit_cnt++;
 
@@ -1171,23 +1197,23 @@ private byte[] interpretRecvBlock(char[] rawBlock) {
 	 */
 	/*
 	 * static {
-	 * 
+	 *
 	 * // create a SerialServices instance for each port available and put in hash
 	 * Enumeration com_enum = CommPortIdentifier.getPortIdentifiers();
 	 * CommPortIdentifier port_id; SerialService serial_instance;
-	 * 
+	 *
 	 * // loop through all of the serial port elements while
 	 * (com_enum.hasMoreElements()) {
-	 * 
+	 *
 	 * // get the next com port port_id = (CommPortIdentifier)
 	 * com_enum.nextElement();
-	 * 
+	 *
 	 * // only collect the names of the serial ports if (port_id.getPortType() ==
 	 * CommPortIdentifier.PORT_SERIAL) { serial_instance = new
 	 * SerialService(port_id.getName());
-	 * 
+	 *
 	 * serialServiceHash.put(port_id.getName(), serial_instance);
-	 * 
+	 *
 	 * if (doDebugMessages) System.out.println("DEBUG: Serial port: " +
 	 * port_id.getName()); } } }
 	 */
diff --git a/io.openems.edge.bridge.onewire/src/com/dalsemi/onewire/adapter/MulticastListener.java b/io.openems.edge.bridge.onewire/src/com/dalsemi/onewire/adapter/MulticastListener.java
index 577e3519573..c4bb3d7ed26 100644
--- a/io.openems.edge.bridge.onewire/src/com/dalsemi/onewire/adapter/MulticastListener.java
+++ b/io.openems.edge.bridge.onewire/src/com/dalsemi/onewire/adapter/MulticastListener.java
@@ -50,9 +50,9 @@ public class MulticastListener implements Runnable {
 	/** multicast socket to receive datagram packets on */
 	private MulticastSocket socket = null;
 	/** the message we're expecting to receive on the multicast socket */
-	private byte[] expectedMessage;
+	private final byte[] expectedMessage;
 	/** the message we should reply with when we get the expected message */
-	private byte[] returnMessage;
+	private final byte[] returnMessage;
 
 	/** boolean to stop the thread from listening for messages */
 	private volatile boolean listenerStopped = false;
@@ -62,8 +62,8 @@ public class MulticastListener implements Runnable {
 	/**
 	 * Creates a multicast listener on the specified multicast port, bound to the
 	 * specified multicast group. Whenever the byte[] pattern specified by
-	 * "expectedMessage" is received, the byte[] pattern specified by "returnMessage"
-	 * is sent to the sender of the "expected message".
+	 * "expectedMessage" is received, the byte[] pattern specified by
+	 * "returnMessage" is sent to the sender of the "expected message".
 	 *
 	 * @param multicastPort   Port to bind this listener to.
 	 * @param multicastGroup  Group to bind this listener to.
@@ -84,47 +84,49 @@ public MulticastListener(int multicastPort, String multicastGroup, byte[] expect
 		// \\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\
 
 		// create multicast socket
-		socket = new MulticastSocket(multicastPort);
+		this.socket = new MulticastSocket(multicastPort);
 		// set timeout at 3 seconds
-		socket.setSoTimeout(timeoutInSeconds * 1000);
+		this.socket.setSoTimeout(timeoutInSeconds * 1000);
 		// join the multicast group
-		InetAddress group = InetAddress.getByName(multicastGroup);
-		socket.joinGroup(group);
+		var group = InetAddress.getByName(multicastGroup);
+		this.socket.joinGroup(group);
 	}
 
 	/**
 	 * Run method waits for Multicast packets with the specified contents and
 	 * replies with the specified message.
 	 */
+	@Override
 	public void run() {
-		byte[] receiveBuffer = new byte[expectedMessage.length];
+		var receiveBuffer = new byte[this.expectedMessage.length];
 
-		listenerRunning = true;
-		while (!listenerStopped) {
+		this.listenerRunning = true;
+		while (!this.listenerStopped) {
 			try {
 				// packet for receiving messages
-				DatagramPacket inPacket = new DatagramPacket(receiveBuffer, receiveBuffer.length);
+				var inPacket = new DatagramPacket(receiveBuffer, receiveBuffer.length);
 				// \\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\
-				if (DEBUG)
+				if (DEBUG) {
 					System.out.println("DEBUG: waiting for multicast packet");
+				}
 				// \\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\
 				// blocks for message until timeout occurs
-				socket.receive(inPacket);
+				this.socket.receive(inPacket);
 
 				// check to see if the received data matches the expected message
-				int length = inPacket.getLength();
+				var length = inPacket.getLength();
 
 				// \\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\
 				if (DEBUG) {
 					System.out.println("DEBUG: packet.length=" + length);
-					System.out.println("DEBUG: expecting=" + expectedMessage.length);
+					System.out.println("DEBUG: expecting=" + this.expectedMessage.length);
 				}
 				// \\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\
 
-				if (length == expectedMessage.length) {
-					boolean dataMatch = true;
-					for (int i = 0; dataMatch && i < length; i++) {
-						dataMatch = (expectedMessage[i] == receiveBuffer[i]);
+				if (length == this.expectedMessage.length) {
+					var dataMatch = true;
+					for (var i = 0; dataMatch && i < length; i++) {
+						dataMatch = this.expectedMessage[i] == receiveBuffer[i];
 					}
 					// check to see if we received the expected message
 					if (dataMatch) {
@@ -134,30 +136,31 @@ public void run() {
 						}
 						// \\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\
 						// packet for sending messages
-						DatagramPacket outPacket = new DatagramPacket(returnMessage, returnMessage.length,
+						var outPacket = new DatagramPacket(this.returnMessage, this.returnMessage.length,
 								inPacket.getAddress(), inPacket.getPort());
 						// send return message
-						socket.send(outPacket);
+						this.socket.send(outPacket);
 					}
 				}
 			} catch (IOException ioe) {
 				/* drain */}
 		}
-		listenerRunning = false;
+		this.listenerRunning = false;
 	}
 
 	/**
 	 * Waits for datagram listener to finish, with a timeout.
 	 */
 	public void stopListener() {
-		listenerStopped = true;
-		int i = 0;
-		int timeout = timeoutInSeconds * 100;
-		while (listenerRunning && i++ < timeout)
+		this.listenerStopped = true;
+		var i = 0;
+		var timeout = timeoutInSeconds * 100;
+		while (this.listenerRunning && i++ < timeout) {
 			try {
 				Thread.sleep(10);
 			} catch (Exception e) {
-				;
+
 			}
+		}
 	}
 }
\ No newline at end of file
diff --git a/io.openems.edge.bridge.onewire/src/com/dalsemi/onewire/adapter/NetAdapter.java b/io.openems.edge.bridge.onewire/src/com/dalsemi/onewire/adapter/NetAdapter.java
index 2a8f812e115..7a5473deb32 100644
--- a/io.openems.edge.bridge.onewire/src/com/dalsemi/onewire/adapter/NetAdapter.java
+++ b/io.openems.edge.bridge.onewire/src/com/dalsemi/onewire/adapter/NetAdapter.java
@@ -161,14 +161,14 @@
  * similar custom socket implementation) can be used by circumventing the
  * standard DSPortAdapter's <code>selectPort(String)</code> and using the
  * NetAdapter-specific <code>selectPort(Socket)</code>. For example:
- * 
+ *
  * <pre>
  * NetAdapter na = new NetAdapter();
  *
  * Socket secureSocket = // insert fancy secure socket implementation here
  *
  * na.selectPort(secureSocket);
- * 
+ *
  * <pre>
  * </P>
  *
@@ -223,9 +223,9 @@ public class NetAdapter extends DSPortAdapter implements NetAdapterConstants {
 	 */
 	public NetAdapter() {
 		try {
-			resetSecret();
+			this.resetSecret();
 		} catch (Throwable t) {
-			setSecret(DEFAULT_SECRET);
+			this.setSecret(DEFAULT_SECRET);
 		}
 	}
 
@@ -238,8 +238,9 @@ public NetAdapter() {
 	public void setSecret(String secret) {
 		if (secret != null) {
 			this.netAdapterSecret = secret.getBytes();
-		} else
-			resetSecret();
+		} else {
+			this.resetSecret();
+		}
 	}
 
 	/**
@@ -247,11 +248,12 @@ public void setSecret(String secret) {
 	 * there is one), or the default as defined by NetAdapterConstants.
 	 */
 	public void resetSecret() {
-		String secret = OneWireAccessProvider.getProperty("NetAdapter.Secret");
-		if (secret != null)
+		var secret = OneWireAccessProvider.getProperty("NetAdapter.Secret");
+		if (secret != null) {
 			this.netAdapterSecret = secret.getBytes();
-		else
+		} else {
 			this.netAdapterSecret = DEFAULT_SECRET.getBytes();
+		}
 	}
 
 	/**
@@ -262,7 +264,7 @@ public void resetSecret() {
 	 * occurred and attempts a reconnect.
 	 */
 	private void checkReturnValue(Connection conn) throws IOException, OneWireException, OneWireIOException {
-		byte retVal = conn.input.readByte();
+		var retVal = conn.input.readByte();
 		if (retVal != RET_SUCCESS) {
 			// an error occurred
 			String errorMsg;
@@ -275,8 +277,8 @@ private void checkReturnValue(Connection conn) throws IOException, OneWireExcept
 
 				// that probably means we have a major communication error.
 				// better to disconnect and reconnect.
-				freePort();
-				selectPort(portNameForReconnect);
+				this.freePort();
+				this.selectPort(this.portNameForReconnect);
 			}
 
 			throw new OneWireIOException(errorMsg);
@@ -291,12 +293,12 @@ private void checkReturnValue(Connection conn) throws IOException, OneWireExcept
 	 */
 	public void pingHost() throws OneWireException, OneWireIOException {
 		try {
-			synchronized (conn) {
+			synchronized (this.conn) {
 				// send beginExclusive command
-				conn.output.writeByte(CMD_PINGCONNECTION);
-				conn.output.flush();
+				this.conn.output.writeByte(CMD_PINGCONNECTION);
+				this.conn.output.flush();
 
-				checkReturnValue(conn);
+				this.checkReturnValue(this.conn);
 			}
 		} catch (IOException ioe) {
 			throw new OneWireException(COMM_FAILED + ioe.getMessage());
@@ -316,9 +318,10 @@ public void pingHost() throws OneWireException, OneWireIOException {
 	 * @throws OneWireIOException
 	 * @throws OneWireException
 	 */
+	@Override
 	public boolean adapterDetected() throws OneWireIOException, OneWireException {
-		synchronized (conn) {
-			return conn != EMPTY_CONNECTION && conn.sock != null;
+		synchronized (this.conn) {
+			return this.conn != EMPTY_CONNECTION && this.conn.sock != null;
 		}
 	}
 
@@ -329,6 +332,7 @@ public boolean adapterDetected() throws OneWireIOException, OneWireException {
 	 *
 	 * @return <code>String</code> representation of the port adapter.
 	 */
+	@Override
 	public String getAdapterName() {
 		return "NetAdapter";
 	}
@@ -339,6 +343,7 @@ public String getAdapterName() {
 	 *
 	 * @return <code>String</code> description of the port type required.
 	 */
+	@Override
 	public String getPortTypeDescription() {
 		return "Network 'Hostname:Port'";
 	}
@@ -348,6 +353,7 @@ public String getPortTypeDescription() {
 	 *
 	 * @return version string
 	 */
+	@Override
 	public String getClassVersion() {
 		return "" + versionUID;
 	}
@@ -365,52 +371,56 @@ public String getClassVersion() {
 	 * @return <code>Enumeration</code> of type <code>String</code> that contains
 	 *         the port names
 	 */
+	@Override
 	public Enumeration<String> getPortNames() {
-		Vector<String> v = new Vector<>();
+		var v = new Vector<String>();
 
 		// figure out if multicast is enabled
-		if (multicastEnabled == null) {
+		if (this.multicastEnabled == null) {
 			String enabled = null;
 			try {
 				enabled = OneWireAccessProvider.getProperty("NetAdapter.MulticastEnabled");
 			} catch (Throwable t) {
-				;
+
+			}
+			if (enabled != null) {
+				this.multicastEnabled = Boolean.valueOf(enabled);
+			} else {
+				this.multicastEnabled = Boolean.FALSE;
 			}
-			if (enabled != null)
-				multicastEnabled = Boolean.valueOf(enabled);
-			else
-				multicastEnabled = Boolean.FALSE;
 		}
 
 		// if multicasting is enabled, we'll look for servers dynamically
 		// and add them to the list
-		if (multicastEnabled.booleanValue()) {
+		if (this.multicastEnabled.booleanValue()) {
 			// figure out what the datagram listen port is
-			if (datagramPort == -1) {
+			if (this.datagramPort == -1) {
 				String strPort = null;
 				try {
 					strPort = OneWireAccessProvider.getProperty("NetAdapter.MulticastPort");
 				} catch (Throwable t) {
-					;
+
+				}
+				if (strPort == null) {
+					this.datagramPort = DEFAULT_MULTICAST_PORT;
+				} else {
+					this.datagramPort = Integer.parseInt(strPort);
 				}
-				if (strPort == null)
-					datagramPort = DEFAULT_MULTICAST_PORT;
-				else
-					datagramPort = Integer.parseInt(strPort);
 			}
 
 			// figure out what the multicast group is
-			if (multicastGroup == null) {
+			if (this.multicastGroup == null) {
 				String group = null;
 				try {
 					group = OneWireAccessProvider.getProperty("NetAdapter.MulticastGroup");
 				} catch (Throwable t) {
-					;
+
+				}
+				if (group == null) {
+					this.multicastGroup = DEFAULT_MULTICAST_GROUP;
+				} else {
+					this.multicastGroup = group;
 				}
-				if (group == null)
-					multicastGroup = DEFAULT_MULTICAST_GROUP;
-				else
-					multicastGroup = group;
 			}
 
 			MulticastSocket socket = null;
@@ -418,39 +428,40 @@ public Enumeration<String> getPortNames() {
 			try {
 				// \\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//
 				if (DEBUG) {
-					System.out.println("DEBUG: Opening multicast on port: " + datagramPort);
-					System.out.println("DEBUG: joining group: " + multicastGroup);
+					System.out.println("DEBUG: Opening multicast on port: " + this.datagramPort);
+					System.out.println("DEBUG: joining group: " + this.multicastGroup);
 				}
 				// \\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//
 
 				// create the multi-cast socket
-				socket = new MulticastSocket(datagramPort);
+				socket = new MulticastSocket(this.datagramPort);
 				// create the group's InetAddress
-				group = InetAddress.getByName(multicastGroup);
+				group = InetAddress.getByName(this.multicastGroup);
 				// join the group
 				socket.joinGroup(group);
 
 				// convert the versionUID to a byte[]
-				byte[] versionBytes = Convert.toByteArray(versionUID);
+				var versionBytes = Convert.toByteArray(versionUID);
 
 				// send a packet with the versionUID
-				DatagramPacket outPacket = new DatagramPacket(versionBytes, 4, group, datagramPort);
+				var outPacket = new DatagramPacket(versionBytes, 4, group, this.datagramPort);
 				socket.send(outPacket);
 
 				// set a timeout of 1/2 second for the receive
 				socket.setSoTimeout(500);
 
-				byte[] receiveBuffer = new byte[32];
+				var receiveBuffer = new byte[32];
 				for (;;) {
 					// \\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//
-					if (DEBUG)
+					if (DEBUG) {
 						System.out.println("DEBUG: waiting for multicast packet");
+					}
 					// \\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//
-					DatagramPacket inPacket = new DatagramPacket(receiveBuffer, receiveBuffer.length);
+					var inPacket = new DatagramPacket(receiveBuffer, receiveBuffer.length);
 					socket.receive(inPacket);
 
-					int length = inPacket.getLength();
-					byte[] data = inPacket.getData();
+					var length = inPacket.getLength();
+					var data = inPacket.getData();
 					// \\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//
 					if (DEBUG) {
 						System.out.println("DEBUG: packet.length=" + length);
@@ -458,32 +469,33 @@ public Enumeration<String> getPortNames() {
 					}
 					// \\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//
 					if (length == 5 && data[4] == (byte) 0xFF) {
-						int listenPort = Convert.toInt(data, 0, 4);
+						var listenPort = Convert.toInt(data, 0, 4);
 						v.addElement(inPacket.getAddress().getHostName() + ":" + listenPort);
 					}
 				}
 			} catch (Exception e) {
-				/* drain */;
+				/* drain */
 			} finally {
 				try {
 					socket.leaveGroup(group);
 					socket.close();
 				} catch (Exception e) {
-					/* drain */;
+					/* drain */
 				}
 			}
 		}
 
 		// get all servers from the properties file
-		String server = "";
+		var server = "";
 		try {
-			for (int i = 0; server != null; i++) {
+			for (var i = 0; server != null; i++) {
 				server = OneWireAccessProvider.getProperty("NetAdapter.host" + i);
-				if (server != null)
+				if (server != null) {
 					v.addElement(server);
+				}
 			}
 		} catch (Throwable t) {
-			;
+
 		}
 
 		return v.elements();
@@ -508,40 +520,42 @@ public Enumeration<String> getPortNames() {
 	 *                            with port.
 	 * @throws OneWireException   If port does not exist
 	 */
+	@Override
 	public boolean selectPort(String portName) throws OneWireIOException, OneWireException {
-		synchronized (conn) {
+		synchronized (this.conn) {
 			Socket s = null;
 			try {
-				int port = DEFAULT_PORT;
+				var port = DEFAULT_PORT;
 				// should be of the format "hostname:port" or hostname
-				int index = portName.indexOf(':');
+				var index = portName.indexOf(':');
 				if (index >= 0) {
-					int index2 = portName.indexOf(':', index + 1);
+					var index2 = portName.indexOf(':', index + 1);
 					if (index2 < 0) // no custom secret specified
 					{
 						port = Integer.parseInt(portName.substring(index + 1));
 						// reset the secret to default
-						resetSecret();
-						useCustomSecret = false;
+						this.resetSecret();
+						this.useCustomSecret = false;
 					} else {
 						// custom secret is specified
-						setSecret(portName.substring(index2 + 1));
-						useCustomSecret = true;
-						if (index < index2 - 1) // port number is specified
+						this.setSecret(portName.substring(index2 + 1));
+						this.useCustomSecret = true;
+						if (index < index2 - 1) {
 							port = Integer.parseInt(portName.substring(index + 1, index2));
+						}
 					}
 					portName = portName.substring(0, index);
 				} else {
 					// reset the secret
-					resetSecret();
-					useCustomSecret = false;
+					this.resetSecret();
+					this.useCustomSecret = false;
 				}
 				s = new Socket(portName, port);
 			} catch (IOException ioe) {
 				throw new OneWireIOException("Can't reach server: " + ioe.getMessage());
 			}
 
-			return selectPort(s);
+			return this.selectPort(s);
 		}
 	}
 
@@ -558,9 +572,9 @@ public boolean selectPort(String portName) throws OneWireIOException, OneWireExc
 	 * @throws OneWireException   If port does not exist
 	 */
 	public boolean selectPort(Socket sock) throws OneWireIOException, OneWireException {
-		boolean bSuccess = false;
-		synchronized (conn) {
-			Connection tmpConn = new Connection();
+		var bSuccess = false;
+		synchronized (this.conn) {
+			var tmpConn = new Connection();
 			tmpConn.sock = sock;
 
 			try {
@@ -572,7 +586,7 @@ public boolean selectPort(Socket sock) throws OneWireIOException, OneWireExcepti
 				}
 
 				// check host version
-				int hostVersionUID = tmpConn.input.readInt();
+				var hostVersionUID = tmpConn.input.readInt();
 
 				if (hostVersionUID == versionUID) {
 					// tell the server that the versionUID matched
@@ -581,18 +595,18 @@ public boolean selectPort(Socket sock) throws OneWireIOException, OneWireExcepti
 
 					// if the versionUID matches, we need to authenticate ourselves
 					// using the challenge from the server.
-					byte[] chlg = new byte[8];
+					var chlg = new byte[8];
 					tmpConn.input.read(chlg, 0, 8);
 
 					// compute the crc of the secret and the challenge
-					int crc = CRC16.compute(netAdapterSecret, 0);
+					var crc = CRC16.compute(this.netAdapterSecret, 0);
 					crc = CRC16.compute(chlg, crc);
 					// and send it back to the server
 					tmpConn.output.writeInt(crc);
 					tmpConn.output.flush();
 
 					// check to see if it matched
-					checkReturnValue(tmpConn);
+					this.checkReturnValue(tmpConn);
 
 					bSuccess = true;
 				} else {
@@ -606,8 +620,8 @@ public boolean selectPort(Socket sock) throws OneWireIOException, OneWireExcepti
 			}
 
 			if (bSuccess) {
-				portNameForReconnect = sock.getInetAddress().getHostName() + ":" + sock.getPort();
-				conn = tmpConn;
+				this.portNameForReconnect = sock.getInetAddress().getHostName() + ":" + sock.getPort();
+				this.conn = tmpConn;
 			}
 		}
 
@@ -622,13 +636,14 @@ public boolean selectPort(Socket sock) throws OneWireIOException, OneWireExcepti
 	 *
 	 * @throws OneWireException If port does not exist
 	 */
+	@Override
 	public void freePort() throws OneWireException {
 		try {
-			synchronized (conn) {
-				conn.output.writeByte(CMD_CLOSECONNECTION);
-				conn.output.flush();
-				conn.sock.close();
-				conn = EMPTY_CONNECTION;
+			synchronized (this.conn) {
+				this.conn.output.writeByte(CMD_CLOSECONNECTION);
+				this.conn.output.flush();
+				this.conn.sock.close();
+				this.conn = EMPTY_CONNECTION;
 			}
 		} catch (Exception e) {
 			throw new OneWireException(COMM_FAILED + e.getMessage());
@@ -642,15 +657,18 @@ public void freePort() throws OneWireException {
 	 *
 	 * @throws OneWireException if valid port not yet selected
 	 */
+	@Override
 	public String getPortName() throws OneWireException {
-		synchronized (conn) {
-			if (!adapterDetected())
+		synchronized (this.conn) {
+			if (!this.adapterDetected()) {
 				return "Not Connected";
-			else if (useCustomSecret)
-				return conn.sock.getInetAddress().getHostName() + ":" + conn.sock.getPort() + ":"
+			}
+			if (this.useCustomSecret) {
+				return this.conn.sock.getInetAddress().getHostName() + ":" + this.conn.sock.getPort() + ":"
 						+ new String(this.netAdapterSecret);
-			else
-				return conn.sock.getInetAddress().getHostName() + ":" + conn.sock.getPort();
+			} else {
+				return this.conn.sock.getInetAddress().getHostName() + ":" + this.conn.sock.getPort();
+			}
 		}
 	}
 
@@ -663,18 +681,19 @@ else if (useCustomSecret)
 	 * @throws OneWireIOException on a 1-Wire communication error with the adapter
 	 * @throws OneWireException   on a setup error with the 1-Wire adapter
 	 */
+	@Override
 	public boolean canOverdrive() throws OneWireIOException, OneWireException {
 		try {
-			synchronized (conn) {
+			synchronized (this.conn) {
 				// send beginExclusive command
-				conn.output.writeByte(CMD_CANOVERDRIVE);
-				conn.output.flush();
+				this.conn.output.writeByte(CMD_CANOVERDRIVE);
+				this.conn.output.flush();
 
 				// check return value for success
-				checkReturnValue(conn);
+				this.checkReturnValue(this.conn);
 
 				// next parameter should be the return from beginExclusive
-				return conn.input.readBoolean();
+				return this.conn.input.readBoolean();
 			}
 		} catch (IOException ioe) {
 			throw new OneWireException(COMM_FAILED + ioe.getMessage());
@@ -690,18 +709,19 @@ public boolean canOverdrive() throws OneWireIOException, OneWireException {
 	 * @throws OneWireIOException on a 1-Wire communication error with the adapter
 	 * @throws OneWireException   on a setup error with the 1-Wire adapter
 	 */
+	@Override
 	public boolean canHyperdrive() throws OneWireIOException, OneWireException {
 		try {
-			synchronized (conn) {
+			synchronized (this.conn) {
 				// send beginExclusive command
-				conn.output.writeByte(CMD_CANHYPERDRIVE);
-				conn.output.flush();
+				this.conn.output.writeByte(CMD_CANHYPERDRIVE);
+				this.conn.output.flush();
 
 				// check return value for success
-				checkReturnValue(conn);
+				this.checkReturnValue(this.conn);
 
 				// next parameter should be the return from beginExclusive
-				return conn.input.readBoolean();
+				return this.conn.input.readBoolean();
 			}
 		} catch (IOException ioe) {
 			throw new OneWireException(COMM_FAILED + ioe.getMessage());
@@ -717,18 +737,19 @@ public boolean canHyperdrive() throws OneWireIOException, OneWireException {
 	 * @throws OneWireIOException on a 1-Wire communication error with the adapter
 	 * @throws OneWireException   on a setup error with the 1-Wire adapter
 	 */
+	@Override
 	public boolean canFlex() throws OneWireIOException, OneWireException {
 		try {
-			synchronized (conn) {
+			synchronized (this.conn) {
 				// send beginExclusive command
-				conn.output.writeByte(CMD_CANFLEX);
-				conn.output.flush();
+				this.conn.output.writeByte(CMD_CANFLEX);
+				this.conn.output.flush();
 
 				// check return value for success
-				checkReturnValue(conn);
+				this.checkReturnValue(this.conn);
 
 				// next parameter should be the return from beginExclusive
-				return conn.input.readBoolean();
+				return this.conn.input.readBoolean();
 			}
 		} catch (IOException ioe) {
 			throw new OneWireException(COMM_FAILED + ioe.getMessage());
@@ -744,18 +765,19 @@ public boolean canFlex() throws OneWireIOException, OneWireException {
 	 * @throws OneWireIOException on a 1-Wire communication error with the adapter
 	 * @throws OneWireException   on a setup error with the 1-Wire adapter
 	 */
+	@Override
 	public boolean canProgram() throws OneWireIOException, OneWireException {
 		try {
-			synchronized (conn) {
+			synchronized (this.conn) {
 				// send beginExclusive command
-				conn.output.writeByte(CMD_CANPROGRAM);
-				conn.output.flush();
+				this.conn.output.writeByte(CMD_CANPROGRAM);
+				this.conn.output.flush();
 
 				// check return value for success
-				checkReturnValue(conn);
+				this.checkReturnValue(this.conn);
 
 				// next parameter should be the return from beginExclusive
-				return conn.input.readBoolean();
+				return this.conn.input.readBoolean();
 			}
 		} catch (IOException ioe) {
 			throw new OneWireException(COMM_FAILED + ioe.getMessage());
@@ -771,18 +793,19 @@ public boolean canProgram() throws OneWireIOException, OneWireException {
 	 * @throws OneWireIOException on a 1-Wire communication error with the adapter
 	 * @throws OneWireException   on a setup error with the 1-Wire adapter
 	 */
+	@Override
 	public boolean canDeliverPower() throws OneWireIOException, OneWireException {
 		try {
-			synchronized (conn) {
+			synchronized (this.conn) {
 				// send beginExclusive command
-				conn.output.writeByte(CMD_CANDELIVERPOWER);
-				conn.output.flush();
+				this.conn.output.writeByte(CMD_CANDELIVERPOWER);
+				this.conn.output.flush();
 
 				// check return value for success
-				checkReturnValue(conn);
+				this.checkReturnValue(this.conn);
 
 				// next parameter should be the return from beginExclusive
-				return conn.input.readBoolean();
+				return this.conn.input.readBoolean();
 			}
 		} catch (IOException ioe) {
 			throw new OneWireException(COMM_FAILED + ioe.getMessage());
@@ -801,18 +824,19 @@ public boolean canDeliverPower() throws OneWireIOException, OneWireException {
 	 * @throws OneWireIOException on a 1-Wire communication error with the adapter
 	 * @throws OneWireException   on a setup error with the 1-Wire adapter
 	 */
+	@Override
 	public boolean canDeliverSmartPower() throws OneWireIOException, OneWireException {
 		try {
-			synchronized (conn) {
+			synchronized (this.conn) {
 				// send beginExclusive command
-				conn.output.writeByte(CMD_CANDELIVERSMARTPOWER);
-				conn.output.flush();
+				this.conn.output.writeByte(CMD_CANDELIVERSMARTPOWER);
+				this.conn.output.flush();
 
 				// check return value for success
-				checkReturnValue(conn);
+				this.checkReturnValue(this.conn);
 
 				// next parameter should be the return from beginExclusive
-				return conn.input.readBoolean();
+				return this.conn.input.readBoolean();
 			}
 		} catch (IOException ioe) {
 			throw new OneWireException(COMM_FAILED + ioe.getMessage());
@@ -828,18 +852,19 @@ public boolean canDeliverSmartPower() throws OneWireIOException, OneWireExceptio
 	 * @throws OneWireIOException on a 1-Wire communication error with the adapter
 	 * @throws OneWireException   on a setup error with the 1-Wire adapter
 	 */
+	@Override
 	public boolean canBreak() throws OneWireIOException, OneWireException {
 		try {
-			synchronized (conn) {
+			synchronized (this.conn) {
 				// send beginExclusive command
-				conn.output.writeByte(CMD_CANBREAK);
-				conn.output.flush();
+				this.conn.output.writeByte(CMD_CANBREAK);
+				this.conn.output.flush();
 
 				// check return value for success
-				checkReturnValue(conn);
+				this.checkReturnValue(this.conn);
 
 				// next parameter should be the return from beginExclusive
-				return conn.input.readBoolean();
+				return this.conn.input.readBoolean();
 			}
 		} catch (IOException ioe) {
 			throw new OneWireException(COMM_FAILED + ioe.getMessage());
@@ -860,18 +885,19 @@ public boolean canBreak() throws OneWireIOException, OneWireException {
 	 * @throws OneWireIOException on a 1-Wire communication error
 	 * @throws OneWireException   on a setup error with the 1-Wire adapter
 	 */
+	@Override
 	public boolean findFirstDevice() throws OneWireIOException, OneWireException {
 		try {
-			synchronized (conn) {
+			synchronized (this.conn) {
 				// send findFirstDevice command
-				conn.output.writeByte(CMD_FINDFIRSTDEVICE);
-				conn.output.flush();
+				this.conn.output.writeByte(CMD_FINDFIRSTDEVICE);
+				this.conn.output.flush();
 
 				// check return value for success
-				checkReturnValue(conn);
+				this.checkReturnValue(this.conn);
 
 				// return boolean from findFirstDevice
-				return conn.input.readBoolean();
+				return this.conn.input.readBoolean();
 			}
 		} catch (IOException ioe) {
 			throw new OneWireException(COMM_FAILED + ioe.getMessage());
@@ -888,18 +914,19 @@ public boolean findFirstDevice() throws OneWireIOException, OneWireException {
 	 * @throws OneWireIOException on a 1-Wire communication error
 	 * @throws OneWireException   on a setup error with the 1-Wire adapter
 	 */
+	@Override
 	public boolean findNextDevice() throws OneWireIOException, OneWireException {
 		try {
-			synchronized (conn) {
+			synchronized (this.conn) {
 				// send findNextDevice command
-				conn.output.writeByte(CMD_FINDNEXTDEVICE);
-				conn.output.flush();
+				this.conn.output.writeByte(CMD_FINDNEXTDEVICE);
+				this.conn.output.flush();
 
 				// check return value for success
-				checkReturnValue(conn);
+				this.checkReturnValue(this.conn);
 
 				// return boolean from findNextDevice
-				return conn.input.readBoolean();
+				return this.conn.input.readBoolean();
 			}
 		} catch (IOException ioe) {
 			throw new OneWireException(COMM_FAILED + ioe.getMessage());
@@ -916,18 +943,19 @@ public boolean findNextDevice() throws OneWireIOException, OneWireException {
 	 * @param address An array to be filled with the current iButton address.
 	 * @see com.dalsemi.onewire.utils.Address
 	 */
+	@Override
 	public void getAddress(byte[] address) {
 		try {
-			synchronized (conn) {
+			synchronized (this.conn) {
 				// send getAddress command
-				conn.output.writeByte(CMD_GETADDRESS);
-				conn.output.flush();
+				this.conn.output.writeByte(CMD_GETADDRESS);
+				this.conn.output.flush();
 
 				// check return value for success
-				checkReturnValue(conn);
+				this.checkReturnValue(this.conn);
 
 				// get the address
-				conn.input.read(address, 0, 8);
+				this.conn.input.read(address, 0, 8);
 			}
 		} catch (Exception e) {
 			/* drain */ }
@@ -941,15 +969,16 @@ public void getAddress(byte[] address) {
 	 *
 	 * @see #setNoResetSearch
 	 */
+	@Override
 	public void setSearchOnlyAlarmingDevices() {
 		try {
-			synchronized (conn) {
+			synchronized (this.conn) {
 				// send setSearchOnlyAlarmingDevices command
-				conn.output.writeByte(CMD_SETSEARCHONLYALARMINGDEVICES);
-				conn.output.flush();
+				this.conn.output.writeByte(CMD_SETSEARCHONLYALARMINGDEVICES);
+				this.conn.output.flush();
 
 				// check return value for success
-				checkReturnValue(conn);
+				this.checkReturnValue(this.conn);
 			}
 		} catch (Exception e) {
 			/* drain */ }
@@ -960,15 +989,16 @@ public void setSearchOnlyAlarmingDevices() {
 	 * This feature is chiefly used with the DS2409 1-Wire coupler. The normal reset
 	 * before each search can be restored with the 'setSearchAllDevices()' method.
 	 */
+	@Override
 	public void setNoResetSearch() {
 		try {
-			synchronized (conn) {
+			synchronized (this.conn) {
 				// send setNoResetSearch command
-				conn.output.writeByte(CMD_SETNORESETSEARCH);
-				conn.output.flush();
+				this.conn.output.writeByte(CMD_SETNORESETSEARCH);
+				this.conn.output.flush();
 
 				// check return value for success
-				checkReturnValue(conn);
+				this.checkReturnValue(this.conn);
 			}
 		} catch (Exception e) {
 			/* drain */ }
@@ -982,15 +1012,16 @@ public void setNoResetSearch() {
 	 *
 	 * @see #setNoResetSearch
 	 */
+	@Override
 	public void setSearchAllDevices() {
 		try {
-			synchronized (conn) {
+			synchronized (this.conn) {
 				// send setSearchAllDevices command
-				conn.output.writeByte(CMD_SETSEARCHALLDEVICES);
-				conn.output.flush();
+				this.conn.output.writeByte(CMD_SETSEARCHALLDEVICES);
+				this.conn.output.flush();
 
 				// check return value for success
-				checkReturnValue(conn);
+				this.checkReturnValue(this.conn);
 			}
 		} catch (Exception e) {
 			/* drain */ }
@@ -1000,21 +1031,22 @@ public void setSearchAllDevices() {
 	 * Removes any selectivity during a search for iButtons or 1-Wire devices by
 	 * family type. The unique address for each iButton and 1-Wire device contains a
 	 * family descriptor that indicates the capabilities of the device.
-	 * 
+	 *
 	 * @see #targetFamily
 	 * @see #targetFamily(byte[])
 	 * @see #excludeFamily
 	 * @see #excludeFamily(byte[])
 	 */
+	@Override
 	public void targetAllFamilies() {
 		try {
-			synchronized (conn) {
+			synchronized (this.conn) {
 				// send targetAllFamilies command
-				conn.output.writeByte(CMD_TARGETALLFAMILIES);
-				conn.output.flush();
+				this.conn.output.writeByte(CMD_TARGETALLFAMILIES);
+				this.conn.output.flush();
 
 				// check return value for success
-				checkReturnValue(conn);
+				this.checkReturnValue(this.conn);
 			}
 		} catch (Exception e) {
 			/* drain */ }
@@ -1029,17 +1061,18 @@ public void targetAllFamilies() {
 	 * @see com.dalsemi.onewire.utils.Address
 	 * @see #targetAllFamilies
 	 */
+	@Override
 	public void targetFamily(int family) {
 		try {
-			synchronized (conn) {
+			synchronized (this.conn) {
 				// send targetFamily command
-				conn.output.writeByte(CMD_TARGETFAMILY);
-				conn.output.writeInt(1);
-				conn.output.writeByte((byte) family);
-				conn.output.flush();
+				this.conn.output.writeByte(CMD_TARGETFAMILY);
+				this.conn.output.writeInt(1);
+				this.conn.output.writeByte((byte) family);
+				this.conn.output.flush();
 
 				// check return value for success
-				checkReturnValue(conn);
+				this.checkReturnValue(this.conn);
 			}
 		} catch (Exception e) {
 			/* drain */ }
@@ -1054,17 +1087,18 @@ public void targetFamily(int family) {
 	 * @see com.dalsemi.onewire.utils.Address
 	 * @see #targetAllFamilies
 	 */
+	@Override
 	public void targetFamily(byte family[]) {
 		try {
-			synchronized (conn) {
+			synchronized (this.conn) {
 				// send targetFamily command
-				conn.output.writeByte(CMD_TARGETFAMILY);
-				conn.output.writeInt(family.length);
-				conn.output.write(family, 0, family.length);
-				conn.output.flush();
+				this.conn.output.writeByte(CMD_TARGETFAMILY);
+				this.conn.output.writeInt(family.length);
+				this.conn.output.write(family, 0, family.length);
+				this.conn.output.flush();
 
 				// check return value for success
-				checkReturnValue(conn);
+				this.checkReturnValue(this.conn);
 			}
 		} catch (Exception e) {
 			/* drain */ }
@@ -1079,17 +1113,18 @@ public void targetFamily(byte family[]) {
 	 * @see com.dalsemi.onewire.utils.Address
 	 * @see #targetAllFamilies
 	 */
+	@Override
 	public void excludeFamily(int family) {
 		try {
-			synchronized (conn) {
+			synchronized (this.conn) {
 				// send excludeFamily command
-				conn.output.writeByte(CMD_EXCLUDEFAMILY);
-				conn.output.writeInt(1);
-				conn.output.writeByte((byte) family);
-				conn.output.flush();
+				this.conn.output.writeByte(CMD_EXCLUDEFAMILY);
+				this.conn.output.writeInt(1);
+				this.conn.output.writeByte((byte) family);
+				this.conn.output.flush();
 
 				// check return value for success
-				checkReturnValue(conn);
+				this.checkReturnValue(this.conn);
 			}
 		} catch (Exception e) {
 			/* drain */ }
@@ -1104,17 +1139,18 @@ public void excludeFamily(int family) {
 	 * @see com.dalsemi.onewire.utils.Address
 	 * @see #targetAllFamilies
 	 */
+	@Override
 	public void excludeFamily(byte family[]) {
 		try {
-			synchronized (conn) {
+			synchronized (this.conn) {
 				// send excludeFamily command
-				conn.output.writeByte(CMD_EXCLUDEFAMILY);
-				conn.output.writeInt(family.length);
-				conn.output.write(family, 0, family.length);
-				conn.output.flush();
+				this.conn.output.writeByte(CMD_EXCLUDEFAMILY);
+				this.conn.output.writeInt(family.length);
+				this.conn.output.write(family, 0, family.length);
+				this.conn.output.flush();
 
 				// check return value for success
-				checkReturnValue(conn);
+				this.checkReturnValue(this.conn);
 			}
 		} catch (Exception e) {
 			/* drain */ }
@@ -1144,10 +1180,11 @@ public void excludeFamily(byte family[]) {
 	 *
 	 * @throws OneWireException on a setup error with the 1-Wire adapter
 	 */
+	@Override
 	public boolean beginExclusive(boolean blocking) throws OneWireException {
 		boolean bGotLocalBlock = false, bGotServerBlock = false;
 		if (blocking) {
-			while (!beginExclusive()) {
+			while (!this.beginExclusive()) {
 				try {
 					Thread.sleep(50);
 				} catch (Exception e) {
@@ -1155,21 +1192,22 @@ public boolean beginExclusive(boolean blocking) throws OneWireException {
 			}
 
 			bGotLocalBlock = true;
-		} else
-			bGotLocalBlock = beginExclusive();
+		} else {
+			bGotLocalBlock = this.beginExclusive();
+		}
 
 		try {
-			synchronized (conn) {
+			synchronized (this.conn) {
 				// send beginExclusive command
-				conn.output.writeByte(CMD_BEGINEXCLUSIVE);
-				conn.output.writeBoolean(blocking);
-				conn.output.flush();
+				this.conn.output.writeByte(CMD_BEGINEXCLUSIVE);
+				this.conn.output.writeBoolean(blocking);
+				this.conn.output.flush();
 
 				// check return value for success
-				checkReturnValue(conn);
+				this.checkReturnValue(this.conn);
 
 				// next parameter should be the return from beginExclusive
-				bGotServerBlock = conn.input.readBoolean();
+				bGotServerBlock = this.conn.input.readBoolean();
 			}
 		} catch (IOException ioe) {
 			throw new OneWireException(COMM_FAILED + ioe.getMessage());
@@ -1193,10 +1231,10 @@ public boolean beginExclusive(boolean blocking) throws OneWireException {
 	 * @throws OneWireException
 	 */
 	private boolean beginExclusive() throws OneWireException {
-		synchronized (currentThreadHash) {
-			if (currentThreadHash == NOT_OWNED) {
+		synchronized (this.currentThreadHash) {
+			if (this.currentThreadHash == NOT_OWNED) {
 				// not owned so take
-				currentThreadHash = Integer.valueOf(Thread.currentThread().hashCode());
+				this.currentThreadHash = Integer.valueOf(Thread.currentThread().hashCode());
 
 				// provided debug on standard out
 				if (DEBUG) {
@@ -1204,7 +1242,8 @@ private boolean beginExclusive() throws OneWireException {
 				}
 
 				return true;
-			} else if (currentThreadHash.intValue() == Thread.currentThread().hashCode()) {
+			}
+			if (this.currentThreadHash.intValue() == Thread.currentThread().hashCode()) {
 				// provided debug on standard out
 				if (DEBUG) {
 					System.out.println("beginExclusive, already owned by: " + Thread.currentThread().getName());
@@ -1224,23 +1263,25 @@ private boolean beginExclusive() throws OneWireException {
 	 * dynamically marks the end of a critical section and should be used when
 	 * exclusive control is no longer needed.
 	 */
+	@Override
 	public void endExclusive() {
-		synchronized (currentThreadHash) {
+		synchronized (this.currentThreadHash) {
 			// if own then release
-			if (currentThreadHash != NOT_OWNED && currentThreadHash.intValue() == Thread.currentThread().hashCode()) {
+			if (this.currentThreadHash != NOT_OWNED
+					&& this.currentThreadHash.intValue() == Thread.currentThread().hashCode()) {
 				if (DEBUG) {
 					System.out.println("endExclusive, was owned by: " + Thread.currentThread().getName());
 				}
 
-				currentThreadHash = NOT_OWNED;
+				this.currentThreadHash = NOT_OWNED;
 				try {
-					synchronized (conn) {
+					synchronized (this.conn) {
 						// send endExclusive command
-						conn.output.writeByte(CMD_ENDEXCLUSIVE);
-						conn.output.flush();
+						this.conn.output.writeByte(CMD_ENDEXCLUSIVE);
+						this.conn.output.flush();
 
 						// check return value for success
-						checkReturnValue(conn);
+						this.checkReturnValue(this.conn);
 					}
 				} catch (Exception e) {
 					/* drain */ }
@@ -1271,18 +1312,19 @@ public void endExclusive() {
 	 * @throws OneWireIOException on a 1-Wire communication error
 	 * @throws OneWireException   on a setup error with the 1-Wire adapter
 	 */
+	@Override
 	public int reset() throws OneWireIOException, OneWireException {
 		try {
-			synchronized (conn) {
+			synchronized (this.conn) {
 				// send reset command
-				conn.output.writeByte(CMD_RESET);
-				conn.output.flush();
+				this.conn.output.writeByte(CMD_RESET);
+				this.conn.output.flush();
 
 				// check return value for success
-				checkReturnValue(conn);
+				this.checkReturnValue(this.conn);
 
 				// next parameter should be the return from reset
-				return conn.input.readInt();
+				return this.conn.input.readInt();
 			}
 		} catch (IOException ioe) {
 			throw new OneWireException(COMM_FAILED + ioe.getMessage());
@@ -1297,17 +1339,18 @@ public int reset() throws OneWireIOException, OneWireException {
 	 * @throws OneWireIOException on a 1-Wire communication error
 	 * @throws OneWireException   on a setup error with the 1-Wire adapter
 	 */
+	@Override
 	public void putBit(boolean bitValue) throws OneWireIOException, OneWireException {
 		try {
-			synchronized (conn) {
+			synchronized (this.conn) {
 				// send putBit command
-				conn.output.writeByte(CMD_PUTBIT);
+				this.conn.output.writeByte(CMD_PUTBIT);
 				// followed by the bit
-				conn.output.writeBoolean(bitValue);
-				conn.output.flush();
+				this.conn.output.writeBoolean(bitValue);
+				this.conn.output.flush();
 
 				// check return value for success
-				checkReturnValue(conn);
+				this.checkReturnValue(this.conn);
 			}
 		} catch (IOException ioe) {
 			throw new OneWireException(COMM_FAILED + ioe.getMessage());
@@ -1322,18 +1365,19 @@ public void putBit(boolean bitValue) throws OneWireIOException, OneWireException
 	 * @throws OneWireIOException on a 1-Wire communication error
 	 * @throws OneWireException   on a setup error with the 1-Wire adapter
 	 */
+	@Override
 	public boolean getBit() throws OneWireIOException, OneWireException {
 		try {
-			synchronized (conn) {
+			synchronized (this.conn) {
 				// send getBit command
-				conn.output.writeByte(CMD_GETBIT);
-				conn.output.flush();
+				this.conn.output.writeByte(CMD_GETBIT);
+				this.conn.output.flush();
 
 				// check return value for success
-				checkReturnValue(conn);
+				this.checkReturnValue(this.conn);
 
 				// next parameter should be the return from getBit
-				return conn.input.readBoolean();
+				return this.conn.input.readBoolean();
 			}
 		} catch (IOException ioe) {
 			throw new OneWireException(COMM_FAILED + ioe.getMessage());
@@ -1348,17 +1392,18 @@ public boolean getBit() throws OneWireIOException, OneWireException {
 	 * @throws OneWireIOException on a 1-Wire communication error
 	 * @throws OneWireException   on a setup error with the 1-Wire adapter
 	 */
+	@Override
 	public void putByte(int byteValue) throws OneWireIOException, OneWireException {
 		try {
-			synchronized (conn) {
+			synchronized (this.conn) {
 				// send putByte command
-				conn.output.writeByte(CMD_PUTBYTE);
+				this.conn.output.writeByte(CMD_PUTBYTE);
 				// followed by the byte
-				conn.output.writeByte(byteValue);
-				conn.output.flush();
+				this.conn.output.writeByte(byteValue);
+				this.conn.output.flush();
 
 				// check return value for success
-				checkReturnValue(conn);
+				this.checkReturnValue(this.conn);
 			}
 		} catch (IOException ioe) {
 			throw new OneWireException(COMM_FAILED + ioe.getMessage());
@@ -1373,18 +1418,19 @@ public void putByte(int byteValue) throws OneWireIOException, OneWireException {
 	 * @throws OneWireIOException on a 1-Wire communication error
 	 * @throws OneWireException   on a setup error with the 1-Wire adapter
 	 */
+	@Override
 	public int getByte() throws OneWireIOException, OneWireException {
 		try {
-			synchronized (conn) {
+			synchronized (this.conn) {
 				// send getByte command
-				conn.output.writeByte(CMD_GETBYTE);
-				conn.output.flush();
+				this.conn.output.writeByte(CMD_GETBYTE);
+				this.conn.output.flush();
 
 				// check return value for success
-				checkReturnValue(conn);
+				this.checkReturnValue(this.conn);
 
 				// next parameter should be the return from getByte
-				return conn.input.readByte() & 0x0FF;
+				return this.conn.input.readByte() & 0x0FF;
 			}
 		} catch (IOException ioe) {
 			throw new OneWireException(COMM_FAILED + ioe.getMessage());
@@ -1401,9 +1447,10 @@ public int getByte() throws OneWireIOException, OneWireException {
 	 * @throws OneWireIOException on a 1-Wire communication error
 	 * @throws OneWireException   on a setup error with the 1-Wire adapter
 	 */
+	@Override
 	public byte[] getBlock(int len) throws OneWireIOException, OneWireException {
-		byte[] buffer = new byte[len];
-		getBlock(buffer, 0, len);
+		var buffer = new byte[len];
+		this.getBlock(buffer, 0, len);
 		return buffer;
 	}
 
@@ -1417,8 +1464,9 @@ public byte[] getBlock(int len) throws OneWireIOException, OneWireException {
 	 * @throws OneWireIOException on a 1-Wire communication error
 	 * @throws OneWireException   on a setup error with the 1-Wire adapter
 	 */
+	@Override
 	public void getBlock(byte[] arr, int len) throws OneWireIOException, OneWireException {
-		getBlock(arr, 0, len);
+		this.getBlock(arr, 0, len);
 	}
 
 	/**
@@ -1432,20 +1480,21 @@ public void getBlock(byte[] arr, int len) throws OneWireIOException, OneWireExce
 	 * @throws OneWireIOException on a 1-Wire communication error
 	 * @throws OneWireException   on a setup error with the 1-Wire adapter
 	 */
+	@Override
 	public void getBlock(byte[] arr, int off, int len) throws OneWireIOException, OneWireException {
 		try {
-			synchronized (conn) {
+			synchronized (this.conn) {
 				// send getBlock command
-				conn.output.writeByte(CMD_GETBLOCK);
+				this.conn.output.writeByte(CMD_GETBLOCK);
 				// followed by the number of bytes to get
-				conn.output.writeInt(len);
-				conn.output.flush();
+				this.conn.output.writeInt(len);
+				this.conn.output.flush();
 
 				// check return value for success
-				checkReturnValue(conn);
+				this.checkReturnValue(this.conn);
 
 				// next should be the bytes
-				conn.input.readFully(arr, off, len);
+				this.conn.input.readFully(arr, off, len);
 			}
 		} catch (IOException ioe) {
 			throw new OneWireException(COMM_FAILED + ioe.getMessage());
@@ -1465,25 +1514,26 @@ public void getBlock(byte[] arr, int off, int len) throws OneWireIOException, On
 	 * @throws OneWireIOException on a 1-Wire communication error
 	 * @throws OneWireException   on a setup error with the 1-Wire adapter
 	 */
+	@Override
 	public void dataBlock(byte[] dataBlock, int off, int len) throws OneWireIOException, OneWireException {
 		if (DEBUG) {
 			System.out.println("DataBlock called for " + len + " bytes");
 		}
 		try {
-			synchronized (conn) {
+			synchronized (this.conn) {
 				// send dataBlock command
-				conn.output.writeByte(CMD_DATABLOCK);
+				this.conn.output.writeByte(CMD_DATABLOCK);
 				// followed by the number of bytes to block
-				conn.output.writeInt(len);
+				this.conn.output.writeInt(len);
 				// followed by the bytes
-				conn.output.write(dataBlock, off, len);
-				conn.output.flush();
+				this.conn.output.write(dataBlock, off, len);
+				this.conn.output.flush();
 
 				// check return value for success
-				checkReturnValue(conn);
+				this.checkReturnValue(this.conn);
 
 				// next should be the bytes returned
-				conn.input.readFully(dataBlock, off, len);
+				this.conn.input.readFully(dataBlock, off, len);
 			}
 		} catch (IOException ioe) {
 			throw new OneWireException(COMM_FAILED + ioe.getMessage());
@@ -1522,17 +1572,18 @@ public void dataBlock(byte[] dataBlock, int off, int len) throws OneWireIOExcept
 	 * @throws OneWireIOException on a 1-Wire communication error
 	 * @throws OneWireException   on a setup error with the 1-Wire adapter
 	 */
+	@Override
 	public void setPowerDuration(int timeFactor) throws OneWireIOException, OneWireException {
 		try {
-			synchronized (conn) {
+			synchronized (this.conn) {
 				// send setPowerDuration command
-				conn.output.writeByte(CMD_SETPOWERDURATION);
+				this.conn.output.writeByte(CMD_SETPOWERDURATION);
 				// followed by the timeFactor
-				conn.output.writeInt(timeFactor);
-				conn.output.flush();
+				this.conn.output.writeInt(timeFactor);
+				this.conn.output.flush();
 
 				// check return value for success
-				checkReturnValue(conn);
+				this.checkReturnValue(this.conn);
 			}
 		} catch (IOException ioe) {
 			throw new OneWireException(COMM_FAILED + ioe.getMessage());
@@ -1566,20 +1617,21 @@ public void setPowerDuration(int timeFactor) throws OneWireIOException, OneWireE
 	 * @throws OneWireIOException on a 1-Wire communication error
 	 * @throws OneWireException   on a setup error with the 1-Wire adapter
 	 */
+	@Override
 	public boolean startPowerDelivery(int changeCondition) throws OneWireIOException, OneWireException {
 		try {
-			synchronized (conn) {
+			synchronized (this.conn) {
 				// send startPowerDelivery command
-				conn.output.writeByte(CMD_STARTPOWERDELIVERY);
+				this.conn.output.writeByte(CMD_STARTPOWERDELIVERY);
 				// followed by the changeCondition
-				conn.output.writeInt(changeCondition);
-				conn.output.flush();
+				this.conn.output.writeInt(changeCondition);
+				this.conn.output.flush();
 
 				// check return value for success
-				checkReturnValue(conn);
+				this.checkReturnValue(this.conn);
 
 				// and get the return value from startPowerDelivery
-				return conn.input.readBoolean();
+				return this.conn.input.readBoolean();
 			}
 		} catch (IOException ioe) {
 			throw new OneWireException(COMM_FAILED + ioe.getMessage());
@@ -1607,17 +1659,18 @@ public boolean startPowerDelivery(int changeCondition) throws OneWireIOException
 	 * @throws OneWireIOException on a 1-Wire communication error
 	 * @throws OneWireException   on a setup error with the 1-Wire adapter
 	 */
+	@Override
 	public void setProgramPulseDuration(int timeFactor) throws OneWireIOException, OneWireException {
 		try {
-			synchronized (conn) {
+			synchronized (this.conn) {
 				// send setProgramPulseDuration command
-				conn.output.writeByte(CMD_SETPROGRAMPULSEDURATION);
+				this.conn.output.writeByte(CMD_SETPROGRAMPULSEDURATION);
 				// followed by the timeFactor
-				conn.output.writeInt(timeFactor);
-				conn.output.flush();
+				this.conn.output.writeInt(timeFactor);
+				this.conn.output.flush();
 
 				// check return value for success
-				checkReturnValue(conn);
+				this.checkReturnValue(this.conn);
 			}
 		} catch (IOException ioe) {
 			throw new OneWireException(COMM_FAILED + ioe.getMessage());
@@ -1652,20 +1705,21 @@ public void setProgramPulseDuration(int timeFactor) throws OneWireIOException, O
 	 * @throws OneWireException   on a setup error with the 1-Wire adapter or the
 	 *                            adapter does not support this operation
 	 */
+	@Override
 	public boolean startProgramPulse(int changeCondition) throws OneWireIOException, OneWireException {
 		try {
-			synchronized (conn) {
+			synchronized (this.conn) {
 				// send startProgramPulse command
-				conn.output.writeByte(CMD_STARTPROGRAMPULSE);
+				this.conn.output.writeByte(CMD_STARTPROGRAMPULSE);
 				// followed by the changeCondition
-				conn.output.writeInt(changeCondition);
-				conn.output.flush();
+				this.conn.output.writeInt(changeCondition);
+				this.conn.output.flush();
 
 				// check return value for success
-				checkReturnValue(conn);
+				this.checkReturnValue(this.conn);
 
 				// and get the return value from startPowerDelivery
-				return conn.input.readBoolean();
+				return this.conn.input.readBoolean();
 			}
 		} catch (IOException ioe) {
 			throw new OneWireException(COMM_FAILED + ioe.getMessage());
@@ -1681,15 +1735,16 @@ public boolean startProgramPulse(int changeCondition) throws OneWireIOException,
 	 * @throws OneWireException   on a setup error with the 1-Wire adapter or the
 	 *                            adapter does not support this operation
 	 */
+	@Override
 	public void startBreak() throws OneWireIOException, OneWireException {
 		try {
-			synchronized (conn) {
+			synchronized (this.conn) {
 				// send startBreak command
-				conn.output.writeByte(CMD_STARTBREAK);
-				conn.output.flush();
+				this.conn.output.writeByte(CMD_STARTBREAK);
+				this.conn.output.flush();
 
 				// check return value for success
-				checkReturnValue(conn);
+				this.checkReturnValue(this.conn);
 			}
 		} catch (IOException ioe) {
 			throw new OneWireException(COMM_FAILED);
@@ -1707,15 +1762,16 @@ public void startBreak() throws OneWireIOException, OneWireException {
 	 * @throws OneWireException   on a setup error with the 1-Wire adapter or the
 	 *                            adapter does not support this operation
 	 */
+	@Override
 	public void setPowerNormal() throws OneWireIOException, OneWireException {
 		try {
-			synchronized (conn) {
+			synchronized (this.conn) {
 				// send startBreak command
-				conn.output.writeByte(CMD_SETPOWERNORMAL);
-				conn.output.flush();
+				this.conn.output.writeByte(CMD_SETPOWERNORMAL);
+				this.conn.output.flush();
 
 				// check return value for success
-				checkReturnValue(conn);
+				this.checkReturnValue(this.conn);
 			}
 		} catch (IOException ioe) {
 			throw new OneWireException(COMM_FAILED + ioe.getMessage());
@@ -1746,17 +1802,18 @@ public void setPowerNormal() throws OneWireIOException, OneWireException {
 	 * @throws OneWireException   on a setup error with the 1-Wire adapter or the
 	 *                            adapter does not support this operation
 	 */
+	@Override
 	public void setSpeed(int speed) throws OneWireIOException, OneWireException {
 		try {
-			synchronized (conn) {
+			synchronized (this.conn) {
 				// send startBreak command
-				conn.output.writeByte(CMD_SETSPEED);
+				this.conn.output.writeByte(CMD_SETSPEED);
 				// followed by the speed
-				conn.output.writeInt(speed);
-				conn.output.flush();
+				this.conn.output.writeInt(speed);
+				this.conn.output.flush();
 
 				// check return value for success
-				checkReturnValue(conn);
+				this.checkReturnValue(this.conn);
 			}
 		} catch (IOException ioe) {
 			throw new OneWireException(COMM_FAILED + ioe.getMessage());
@@ -1779,18 +1836,19 @@ public void setSpeed(int speed) throws OneWireIOException, OneWireException {
 	 *         <li>>3 future speeds
 	 *         </ul>
 	 */
+	@Override
 	public int getSpeed() {
 		try {
-			synchronized (conn) {
+			synchronized (this.conn) {
 				// send startBreak command
-				conn.output.writeByte(CMD_GETSPEED);
-				conn.output.flush();
+				this.conn.output.writeByte(CMD_GETSPEED);
+				this.conn.output.flush();
 
 				// check return value for success
-				checkReturnValue(conn);
+				this.checkReturnValue(this.conn);
 
 				// and return the return value from getSpeed()
-				return conn.input.readInt();
+				return this.conn.input.readInt();
 			}
 		} catch (Exception e) {
 			/* drain */
diff --git a/io.openems.edge.bridge.onewire/src/com/dalsemi/onewire/adapter/NetAdapterHost.java b/io.openems.edge.bridge.onewire/src/com/dalsemi/onewire/adapter/NetAdapterHost.java
index eeb0d9e9404..8804df02b80 100644
--- a/io.openems.edge.bridge.onewire/src/com/dalsemi/onewire/adapter/NetAdapterHost.java
+++ b/io.openems.edge.bridge.onewire/src/com/dalsemi/onewire/adapter/NetAdapterHost.java
@@ -34,7 +34,6 @@
 import java.net.ServerSocket;
 import java.net.Socket;
 import java.net.UnknownHostException;
-import java.util.Enumeration;
 import java.util.Hashtable;
 import java.util.Random;
 
@@ -223,11 +222,12 @@ public NetAdapterHost(DSPortAdapter adapter, int listenPort, boolean multiThread
 		}
 
 		// get the shared secret
-		String secret = OneWireAccessProvider.getProperty("NetAdapter.secret");
-		if (secret != null)
-			netAdapterSecret = secret.getBytes();
-		else
-			netAdapterSecret = DEFAULT_SECRET.getBytes();
+		var secret = OneWireAccessProvider.getProperty("NetAdapter.secret");
+		if (secret != null) {
+			this.netAdapterSecret = secret.getBytes();
+		} else {
+			this.netAdapterSecret = DEFAULT_SECRET.getBytes();
+		}
 	}
 
 	/**
@@ -289,11 +289,12 @@ public NetAdapterHost(DSPortAdapter adapter, ServerSocket serverSock, boolean mu
 		}
 
 		// get the shared secret
-		String secret = OneWireAccessProvider.getProperty("NetAdapter.secret");
-		if (secret != null)
-			netAdapterSecret = secret.getBytes();
-		else
-			netAdapterSecret = DEFAULT_SECRET.getBytes();
+		var secret = OneWireAccessProvider.getProperty("NetAdapter.secret");
+		if (secret != null) {
+			this.netAdapterSecret = secret.getBytes();
+		} else {
+			this.netAdapterSecret = DEFAULT_SECRET.getBytes();
+		}
 	}
 
 	/**
@@ -303,7 +304,7 @@ public NetAdapterHost(DSPortAdapter adapter, ServerSocket serverSock, boolean mu
 	 *               client connections.
 	 */
 	public void setSecret(String secret) {
-		netAdapterSecret = secret.getBytes();
+		this.netAdapterSecret = secret.getBytes();
 	}
 
 	/**
@@ -311,7 +312,7 @@ public void setSecret(String secret) {
 	 * NetAdapterHost automatically. Uses defaults for Multicast group and port.
 	 */
 	public void createMulticastListener() throws IOException, UnknownHostException {
-		createMulticastListener(DEFAULT_MULTICAST_PORT);
+		this.createMulticastListener(DEFAULT_MULTICAST_PORT);
 	}
 
 	/**
@@ -321,10 +322,11 @@ public void createMulticastListener() throws IOException, UnknownHostException {
 	 * @param port The port the Multicast socket will receive packets on
 	 */
 	public void createMulticastListener(int port) throws IOException, UnknownHostException {
-		String group = OneWireAccessProvider.getProperty("NetAdapter.MulticastGroup");
-		if (group == null)
+		var group = OneWireAccessProvider.getProperty("NetAdapter.MulticastGroup");
+		if (group == null) {
 			group = DEFAULT_MULTICAST_GROUP;
-		createMulticastListener(port, group);
+		}
+		this.createMulticastListener(port, group);
 	}
 
 	/**
@@ -335,18 +337,18 @@ public void createMulticastListener(int port) throws IOException, UnknownHostExc
 	 * @param group The group the Multicast socket will join
 	 */
 	public void createMulticastListener(int port, String group) throws IOException, UnknownHostException {
-		if (multicastListener == null) {
+		if (this.multicastListener == null) {
 			// 4 bytes for integer versionUID
-			byte[] versionBytes = Convert.toByteArray(versionUID);
+			var versionBytes = Convert.toByteArray(versionUID);
 
 			// this byte array is 5 because length is used to determine different
 			// packet types by client
-			byte[] listenPortBytes = new byte[5];
-			Convert.toByteArray(serverSocket.getLocalPort(), listenPortBytes, 0, 4);
+			var listenPortBytes = new byte[5];
+			Convert.toByteArray(this.serverSocket.getLocalPort(), listenPortBytes, 0, 4);
 			listenPortBytes[4] = (byte) 0x0FF;
 
-			multicastListener = new MulticastListener(port, group, versionBytes, listenPortBytes);
-			(new Thread(multicastListener)).start();
+			this.multicastListener = new MulticastListener(port, group, versionBytes, listenPortBytes);
+			new Thread(this.multicastListener).start();
 		}
 	}
 
@@ -356,23 +358,25 @@ public void createMulticastListener(int port, String group) throws IOException,
 	 * services the socket or (optionally) launches a new thread for servicing the
 	 * socket.
 	 */
+	@Override
 	public void run() {
-		hostRunning = true;
-		while (!hostStopped) {
+		this.hostRunning = true;
+		while (!this.hostStopped) {
 			Socket sock = null;
 			try {
-				sock = serverSocket.accept();
-				handleConnection(sock);
+				sock = this.serverSocket.accept();
+				this.handleConnection(sock);
 			} catch (IOException ioe1) {
 				try {
-					if (sock != null)
+					if (sock != null) {
 						sock.close();
+					}
 				} catch (IOException ioe2) {
-					;
+
 				}
 			}
 		}
-		hostRunning = false;
+		this.hostRunning = false;
 	}
 
 	/**
@@ -381,16 +385,16 @@ public void run() {
 	 * servicing this connection.
 	 */
 	public void handleConnection(Socket sock) throws IOException {
-		SocketHandler sh = new SocketHandler(sock);
-		if (singleThreaded) {
+		var sh = new SocketHandler(sock);
+		if (this.singleThreaded) {
 			// single-threaded
 			sh.run();
 		} else {
 			// multi-threaded
-			Thread t = new Thread(sh);
+			var t = new Thread(sh);
 			t.start();
-			synchronized (hashHandlers) {
-				hashHandlers.put(t, sh);
+			synchronized (this.hashHandlers) {
+				this.hashHandlers.put(t, sh);
 			}
 		}
 	}
@@ -403,31 +407,34 @@ public void stopHost() {
 		try {
 			this.serverSocket.close();
 		} catch (IOException ioe) {
-			;
+
 		}
 
 		// wait for run method to quit, with a timeout of 1 second
-		int i = 0;
-		while (hostRunning && i++ < 100)
+		var i = 0;
+		while (this.hostRunning && i++ < 100) {
 			try {
 				Thread.sleep(10);
 			} catch (Exception e) {
-				;
+
 			}
+		}
 
-		if (!singleThreaded) {
-			synchronized (hashHandlers) {
-				Enumeration<SocketHandler> e = hashHandlers.elements();
-				while (e.hasMoreElements())
-					((SocketHandler) e.nextElement()).stopHandler();
+		if (!this.singleThreaded) {
+			synchronized (this.hashHandlers) {
+				var e = this.hashHandlers.elements();
+				while (e.hasMoreElements()) {
+					e.nextElement().stopHandler();
+				}
 			}
 		}
 
-		if (multicastListener != null)
-			multicastListener.stopListener();
+		if (this.multicastListener != null) {
+			this.multicastListener.stopListener();
+		}
 
 		// ensure that there is no exclusive use of the adapter
-		adapter.endExclusive();
+		this.adapter.endExclusive();
 	}
 
 	/**
@@ -443,9 +450,9 @@ private boolean sendVersionUID(Connection conn) throws IOException {
 		conn.output.writeInt(versionUID);
 		conn.output.flush();
 
-		byte retVal = conn.input.readByte();
+		var retVal = conn.input.readByte();
 
-		return (retVal == RET_SUCCESS);
+		return retVal == RET_SUCCESS;
 	}
 
 	/**
@@ -456,9 +463,10 @@ private boolean sendVersionUID(Connection conn) throws IOException {
 	 */
 	private void processRequests(Connection conn) throws IOException {
 		// \\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\
-		if (DEBUG)
+		if (DEBUG) {
 			System.out.println("\n------------------------------------------");
-		// \\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\
+			// \\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\
+		}
 
 		// get the next command
 		byte cmd = 0x00;
@@ -466,9 +474,10 @@ private void processRequests(Connection conn) throws IOException {
 		cmd = conn.input.readByte();
 
 		// \\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\
-		if (DEBUG)
+		if (DEBUG) {
 			System.out.println("CMD received: " + Integer.toHexString(cmd));
-		// \\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\
+			// \\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\
+		}
 
 		try {
 			// ... and fire the appropriate method
@@ -480,112 +489,112 @@ private void processRequests(Connection conn) throws IOException {
 				conn.output.flush();
 				break;
 			case CMD_CLOSECONNECTION:
-				close(conn);
+				this.close(conn);
 				break;
 			/* Raw Data commands */
 			case CMD_RESET:
-				adapterReset(conn);
+				this.adapterReset(conn);
 				break;
 			case CMD_PUTBIT:
-				adapterPutBit(conn);
+				this.adapterPutBit(conn);
 				break;
 			case CMD_PUTBYTE:
-				adapterPutByte(conn);
+				this.adapterPutByte(conn);
 				break;
 			case CMD_GETBIT:
-				adapterGetBit(conn);
+				this.adapterGetBit(conn);
 				break;
 			case CMD_GETBYTE:
-				adapterGetByte(conn);
+				this.adapterGetByte(conn);
 				break;
 			case CMD_GETBLOCK:
-				adapterGetBlock(conn);
+				this.adapterGetBlock(conn);
 				break;
 			case CMD_DATABLOCK:
-				adapterDataBlock(conn);
+				this.adapterDataBlock(conn);
 				break;
 			/* Power methods */
 			case CMD_SETPOWERDURATION:
-				adapterSetPowerDuration(conn);
+				this.adapterSetPowerDuration(conn);
 				break;
 			case CMD_STARTPOWERDELIVERY:
-				adapterStartPowerDelivery(conn);
+				this.adapterStartPowerDelivery(conn);
 				break;
 			case CMD_SETPROGRAMPULSEDURATION:
-				adapterSetProgramPulseDuration(conn);
+				this.adapterSetProgramPulseDuration(conn);
 				break;
 			case CMD_STARTPROGRAMPULSE:
-				adapterStartProgramPulse(conn);
+				this.adapterStartProgramPulse(conn);
 				break;
 			case CMD_STARTBREAK:
-				adapterStartBreak(conn);
+				this.adapterStartBreak(conn);
 				break;
 			case CMD_SETPOWERNORMAL:
-				adapterSetPowerNormal(conn);
+				this.adapterSetPowerNormal(conn);
 				break;
 			/* Speed methods */
 			case CMD_SETSPEED:
-				adapterSetSpeed(conn);
+				this.adapterSetSpeed(conn);
 				break;
 			case CMD_GETSPEED:
-				adapterGetSpeed(conn);
+				this.adapterGetSpeed(conn);
 				break;
 			/* Network Semaphore methods */
 			case CMD_BEGINEXCLUSIVE:
-				adapterBeginExclusive(conn);
+				this.adapterBeginExclusive(conn);
 				break;
 			case CMD_ENDEXCLUSIVE:
-				adapterEndExclusive(conn);
+				this.adapterEndExclusive(conn);
 				break;
 			/* Searching methods */
 			case CMD_FINDFIRSTDEVICE:
-				adapterFindFirstDevice(conn);
+				this.adapterFindFirstDevice(conn);
 				break;
 			case CMD_FINDNEXTDEVICE:
-				adapterFindNextDevice(conn);
+				this.adapterFindNextDevice(conn);
 				break;
 			case CMD_GETADDRESS:
-				adapterGetAddress(conn);
+				this.adapterGetAddress(conn);
 				break;
 			case CMD_SETSEARCHONLYALARMINGDEVICES:
-				adapterSetSearchOnlyAlarmingDevices(conn);
+				this.adapterSetSearchOnlyAlarmingDevices(conn);
 				break;
 			case CMD_SETNORESETSEARCH:
-				adapterSetNoResetSearch(conn);
+				this.adapterSetNoResetSearch(conn);
 				break;
 			case CMD_SETSEARCHALLDEVICES:
-				adapterSetSearchAllDevices(conn);
+				this.adapterSetSearchAllDevices(conn);
 				break;
 			case CMD_TARGETALLFAMILIES:
-				adapterTargetAllFamilies(conn);
+				this.adapterTargetAllFamilies(conn);
 				break;
 			case CMD_TARGETFAMILY:
-				adapterTargetFamily(conn);
+				this.adapterTargetFamily(conn);
 				break;
 			case CMD_EXCLUDEFAMILY:
-				adapterExcludeFamily(conn);
+				this.adapterExcludeFamily(conn);
 				break;
 			/* feature methods */
 			case CMD_CANBREAK:
-				adapterCanBreak(conn);
+				this.adapterCanBreak(conn);
 				break;
 			case CMD_CANDELIVERPOWER:
-				adapterCanDeliverPower(conn);
+				this.adapterCanDeliverPower(conn);
 				break;
 			case CMD_CANDELIVERSMARTPOWER:
-				adapterCanDeliverSmartPower(conn);
+				this.adapterCanDeliverSmartPower(conn);
 				break;
 			case CMD_CANFLEX:
-				adapterCanFlex(conn);
+				this.adapterCanFlex(conn);
 				break;
 			case CMD_CANHYPERDRIVE:
-				adapterCanHyperdrive(conn);
+				this.adapterCanHyperdrive(conn);
 				break;
 			case CMD_CANOVERDRIVE:
-				adapterCanOverdrive(conn);
+				this.adapterCanOverdrive(conn);
 				break;
 			case CMD_CANPROGRAM:
-				adapterCanProgram(conn);
+				this.adapterCanProgram(conn);
 				break;
 			default:
 				// System.out.println("Unknown command: " + cmd);
@@ -609,7 +618,7 @@ private void close(Connection conn) {
 				conn.sock.close();
 			}
 		} catch (IOException ioe) {
-			/* drain */;
+			/* drain */
 		}
 
 		conn.sock = null;
@@ -617,7 +626,7 @@ private void close(Connection conn) {
 		conn.output = null;
 
 		// ensure that there is no exclusive use of the adapter
-		adapter.endExclusive();
+		this.adapter.endExclusive();
 	}
 
 	// --------
@@ -625,7 +634,7 @@ private void close(Connection conn) {
 	// --------
 
 	private void adapterFindFirstDevice(Connection conn) throws IOException, OneWireException {
-		boolean b = adapter.findFirstDevice();
+		var b = this.adapter.findFirstDevice();
 
 		if (DEBUG) {
 			System.out.println("   findFirstDevice returned " + b);
@@ -637,7 +646,7 @@ private void adapterFindFirstDevice(Connection conn) throws IOException, OneWire
 	}
 
 	private void adapterFindNextDevice(Connection conn) throws IOException, OneWireException {
-		boolean b = adapter.findNextDevice();
+		var b = this.adapter.findNextDevice();
 
 		if (DEBUG) {
 			System.out.println("   findNextDevice returned " + b);
@@ -650,12 +659,12 @@ private void adapterFindNextDevice(Connection conn) throws IOException, OneWireE
 
 	private void adapterGetAddress(Connection conn) throws IOException {
 		// read in the address
-		byte[] address = new byte[8];
+		var address = new byte[8];
 		// call getAddress
-		adapter.getAddress(address);
+		this.adapter.getAddress(address);
 
 		if (DEBUG) {
-			System.out.println("   adapter.getAddress(byte[]) called, speed=" + adapter.getSpeed());
+			System.out.println("   adapter.getAddress(byte[]) called, speed=" + this.adapter.getSpeed());
 		}
 
 		conn.output.writeByte(RET_SUCCESS);
@@ -665,10 +674,10 @@ private void adapterGetAddress(Connection conn) throws IOException {
 
 	private void adapterSetSearchOnlyAlarmingDevices(Connection conn) throws IOException {
 		if (DEBUG) {
-			System.out.println("   setSearchOnlyAlarmingDevices called, speed=" + adapter.getSpeed());
+			System.out.println("   setSearchOnlyAlarmingDevices called, speed=" + this.adapter.getSpeed());
 		}
 
-		adapter.setSearchOnlyAlarmingDevices();
+		this.adapter.setSearchOnlyAlarmingDevices();
 
 		conn.output.writeByte(RET_SUCCESS);
 		conn.output.flush();
@@ -676,10 +685,10 @@ private void adapterSetSearchOnlyAlarmingDevices(Connection conn) throws IOExcep
 
 	private void adapterSetNoResetSearch(Connection conn) throws IOException {
 		if (DEBUG) {
-			System.out.println("   setNoResetSearch called, speed=" + adapter.getSpeed());
+			System.out.println("   setNoResetSearch called, speed=" + this.adapter.getSpeed());
 		}
 
-		adapter.setNoResetSearch();
+		this.adapter.setNoResetSearch();
 
 		conn.output.writeByte(RET_SUCCESS);
 		conn.output.flush();
@@ -687,10 +696,10 @@ private void adapterSetNoResetSearch(Connection conn) throws IOException {
 
 	private void adapterSetSearchAllDevices(Connection conn) throws IOException {
 		if (DEBUG) {
-			System.out.println("   setSearchAllDevices called, speed=" + adapter.getSpeed());
+			System.out.println("   setSearchAllDevices called, speed=" + this.adapter.getSpeed());
 		}
 
-		adapter.setSearchAllDevices();
+		this.adapter.setSearchAllDevices();
 
 		conn.output.writeByte(RET_SUCCESS);
 		conn.output.flush();
@@ -698,10 +707,10 @@ private void adapterSetSearchAllDevices(Connection conn) throws IOException {
 
 	private void adapterTargetAllFamilies(Connection conn) throws IOException {
 		if (DEBUG) {
-			System.out.println("   targetAllFamilies called, speed=" + adapter.getSpeed());
+			System.out.println("   targetAllFamilies called, speed=" + this.adapter.getSpeed());
 		}
 
-		adapter.targetAllFamilies();
+		this.adapter.targetAllFamilies();
 
 		conn.output.writeByte(RET_SUCCESS);
 		conn.output.flush();
@@ -709,18 +718,18 @@ private void adapterTargetAllFamilies(Connection conn) throws IOException {
 
 	private void adapterTargetFamily(Connection conn) throws IOException {
 		// get the number of family codes to expect
-		int len = conn.input.readInt();
+		var len = conn.input.readInt();
 		// get the family codes
-		byte[] family = new byte[len];
+		var family = new byte[len];
 		conn.input.readFully(family, 0, len);
 
 		if (DEBUG) {
-			System.out.println("   targetFamily called, speed=" + adapter.getSpeed());
+			System.out.println("   targetFamily called, speed=" + this.adapter.getSpeed());
 			System.out.println("      families: " + Convert.toHexString(family));
 		}
 
 		// call targetFamily
-		adapter.targetFamily(family);
+		this.adapter.targetFamily(family);
 
 		conn.output.writeByte(RET_SUCCESS);
 		conn.output.flush();
@@ -728,18 +737,18 @@ private void adapterTargetFamily(Connection conn) throws IOException {
 
 	private void adapterExcludeFamily(Connection conn) throws IOException {
 		// get the number of family codes to expect
-		int len = conn.input.readInt();
+		var len = conn.input.readInt();
 		// get the family codes
-		byte[] family = new byte[len];
+		var family = new byte[len];
 		conn.input.readFully(family, 0, len);
 
 		if (DEBUG) {
-			System.out.println("   excludeFamily called, speed=" + adapter.getSpeed());
+			System.out.println("   excludeFamily called, speed=" + this.adapter.getSpeed());
 			System.out.println("      families: " + Convert.toHexString(family));
 		}
 
 		// call excludeFamily
-		adapter.excludeFamily(family);
+		this.adapter.excludeFamily(family);
 
 		conn.output.writeByte(RET_SUCCESS);
 		conn.output.flush();
@@ -751,13 +760,13 @@ private void adapterExcludeFamily(Connection conn) throws IOException {
 
 	private void adapterBeginExclusive(Connection conn) throws IOException, OneWireException {
 		if (DEBUG) {
-			System.out.println("   adapter.beginExclusive called, speed=" + adapter.getSpeed());
+			System.out.println("   adapter.beginExclusive called, speed=" + this.adapter.getSpeed());
 		}
 
 		// get blocking boolean
-		boolean blocking = conn.input.readBoolean();
+		var blocking = conn.input.readBoolean();
 		// call beginExclusive
-		boolean b = adapter.beginExclusive(blocking);
+		var b = this.adapter.beginExclusive(blocking);
 
 		conn.output.writeByte(RET_SUCCESS);
 		conn.output.writeBoolean(b);
@@ -770,11 +779,11 @@ private void adapterBeginExclusive(Connection conn) throws IOException, OneWireE
 
 	private void adapterEndExclusive(Connection conn) throws IOException, OneWireException {
 		if (DEBUG) {
-			System.out.println("   adapter.endExclusive called, speed=" + adapter.getSpeed());
+			System.out.println("   adapter.endExclusive called, speed=" + this.adapter.getSpeed());
 		}
 
 		// call endExclusive
-		adapter.endExclusive();
+		this.adapter.endExclusive();
 
 		conn.output.writeByte(RET_SUCCESS);
 		conn.output.flush();
@@ -785,10 +794,10 @@ private void adapterEndExclusive(Connection conn) throws IOException, OneWireExc
 	// --------
 
 	private void adapterReset(Connection conn) throws IOException, OneWireException {
-		int i = adapter.reset();
+		var i = this.adapter.reset();
 
 		if (DEBUG) {
-			System.out.println("   reset, speed=" + adapter.getSpeed() + ", returned " + i);
+			System.out.println("   reset, speed=" + this.adapter.getSpeed() + ", returned " + i);
 		}
 
 		conn.output.writeByte(RET_SUCCESS);
@@ -798,14 +807,14 @@ private void adapterReset(Connection conn) throws IOException, OneWireException
 
 	private void adapterPutBit(Connection conn) throws IOException, OneWireException {
 		// get the value of the bit
-		boolean bit = conn.input.readBoolean();
+		var bit = conn.input.readBoolean();
 
 		if (DEBUG) {
-			System.out.println("   putBit called, speed=" + adapter.getSpeed());
+			System.out.println("   putBit called, speed=" + this.adapter.getSpeed());
 			System.out.println("      bit=" + bit);
 		}
 
-		adapter.putBit(bit);
+		this.adapter.putBit(bit);
 
 		conn.output.writeByte(RET_SUCCESS);
 		conn.output.flush();
@@ -813,24 +822,24 @@ private void adapterPutBit(Connection conn) throws IOException, OneWireException
 
 	private void adapterPutByte(Connection conn) throws IOException, OneWireException {
 		// get the value of the byte
-		byte b = conn.input.readByte();
+		var b = conn.input.readByte();
 
 		if (DEBUG) {
-			System.out.println("   putByte called, speed=" + adapter.getSpeed());
+			System.out.println("   putByte called, speed=" + this.adapter.getSpeed());
 			System.out.println("      byte=" + Convert.toHexString(b));
 		}
 
-		adapter.putByte(b);
+		this.adapter.putByte(b);
 
 		conn.output.writeByte(RET_SUCCESS);
 		conn.output.flush();
 	}
 
 	private void adapterGetBit(Connection conn) throws IOException, OneWireException {
-		boolean bit = adapter.getBit();
+		var bit = this.adapter.getBit();
 
 		if (DEBUG) {
-			System.out.println("   getBit called, speed=" + adapter.getSpeed());
+			System.out.println("   getBit called, speed=" + this.adapter.getSpeed());
 			System.out.println("      bit=" + bit);
 		}
 
@@ -840,10 +849,10 @@ private void adapterGetBit(Connection conn) throws IOException, OneWireException
 	}
 
 	private void adapterGetByte(Connection conn) throws IOException, OneWireException {
-		int b = adapter.getByte();
+		var b = this.adapter.getByte();
 
 		if (DEBUG) {
-			System.out.println("   getByte called, speed=" + adapter.getSpeed());
+			System.out.println("   getByte called, speed=" + this.adapter.getSpeed());
 			System.out.println("      byte=" + Convert.toHexString((byte) b));
 		}
 
@@ -854,14 +863,14 @@ private void adapterGetByte(Connection conn) throws IOException, OneWireExceptio
 
 	private void adapterGetBlock(Connection conn) throws IOException, OneWireException {
 		// get the number requested
-		int len = conn.input.readInt();
+		var len = conn.input.readInt();
 		if (DEBUG) {
-			System.out.println("   getBlock called, speed=" + adapter.getSpeed());
+			System.out.println("   getBlock called, speed=" + this.adapter.getSpeed());
 			System.out.println("      len=" + len);
 		}
 
 		// get the bytes
-		byte[] b = adapter.getBlock(len);
+		var b = this.adapter.getBlock(len);
 
 		if (DEBUG) {
 			System.out.println("      returned: " + Convert.toHexString(b));
@@ -874,12 +883,12 @@ private void adapterGetBlock(Connection conn) throws IOException, OneWireExcepti
 
 	private void adapterDataBlock(Connection conn) throws IOException, OneWireException {
 		if (DEBUG) {
-			System.out.println("   DataBlock called, speed=" + adapter.getSpeed());
+			System.out.println("   DataBlock called, speed=" + this.adapter.getSpeed());
 		}
 		// get the number to block
-		int len = conn.input.readInt();
+		var len = conn.input.readInt();
 		// get the bytes to block
-		byte[] b = new byte[len];
+		var b = new byte[len];
 		conn.input.readFully(b, 0, len);
 
 		if (DEBUG) {
@@ -888,7 +897,7 @@ private void adapterDataBlock(Connection conn) throws IOException, OneWireExcept
 		}
 
 		// do the block
-		adapter.dataBlock(b, 0, len);
+		this.adapter.dataBlock(b, 0, len);
 
 		if (DEBUG) {
 			System.out.println("      Recv: " + Convert.toHexString(b));
@@ -905,15 +914,15 @@ private void adapterDataBlock(Connection conn) throws IOException, OneWireExcept
 
 	private void adapterSetPowerDuration(Connection conn) throws IOException, OneWireException {
 		// get the time factor value
-		int timeFactor = conn.input.readInt();
+		var timeFactor = conn.input.readInt();
 
 		if (DEBUG) {
-			System.out.println("   setPowerDuration called, speed=" + adapter.getSpeed());
+			System.out.println("   setPowerDuration called, speed=" + this.adapter.getSpeed());
 			System.out.println("      timeFactor=" + timeFactor);
 		}
 
 		// call setPowerDuration
-		adapter.setPowerDuration(timeFactor);
+		this.adapter.setPowerDuration(timeFactor);
 
 		conn.output.writeByte(RET_SUCCESS);
 		conn.output.flush();
@@ -921,15 +930,15 @@ private void adapterSetPowerDuration(Connection conn) throws IOException, OneWir
 
 	private void adapterStartPowerDelivery(Connection conn) throws IOException, OneWireException {
 		// get the change condition value
-		int changeCondition = conn.input.readInt();
+		var changeCondition = conn.input.readInt();
 
 		if (DEBUG) {
-			System.out.println("   startPowerDelivery called, speed=" + adapter.getSpeed());
+			System.out.println("   startPowerDelivery called, speed=" + this.adapter.getSpeed());
 			System.out.println("      changeCondition=" + changeCondition);
 		}
 
 		// call startPowerDelivery
-		boolean success = adapter.startPowerDelivery(changeCondition);
+		var success = this.adapter.startPowerDelivery(changeCondition);
 
 		conn.output.writeByte(RET_SUCCESS);
 		conn.output.writeBoolean(success);
@@ -938,15 +947,15 @@ private void adapterStartPowerDelivery(Connection conn) throws IOException, OneW
 
 	private void adapterSetProgramPulseDuration(Connection conn) throws IOException, OneWireException {
 		// get the time factor value
-		int timeFactor = conn.input.readInt();
+		var timeFactor = conn.input.readInt();
 
 		if (DEBUG) {
-			System.out.println("   setProgramPulseDuration called, speed=" + adapter.getSpeed());
+			System.out.println("   setProgramPulseDuration called, speed=" + this.adapter.getSpeed());
 			System.out.println("      timeFactor=" + timeFactor);
 		}
 
 		// call setProgramPulseDuration
-		adapter.setProgramPulseDuration(timeFactor);
+		this.adapter.setProgramPulseDuration(timeFactor);
 
 		conn.output.writeByte(RET_SUCCESS);
 		conn.output.flush();
@@ -954,15 +963,15 @@ private void adapterSetProgramPulseDuration(Connection conn) throws IOException,
 
 	private void adapterStartProgramPulse(Connection conn) throws IOException, OneWireException {
 		// get the change condition value
-		int changeCondition = conn.input.readInt();
+		var changeCondition = conn.input.readInt();
 
 		if (DEBUG) {
-			System.out.println("   startProgramPulse called, speed=" + adapter.getSpeed());
+			System.out.println("   startProgramPulse called, speed=" + this.adapter.getSpeed());
 			System.out.println("      changeCondition=" + changeCondition);
 		}
 
 		// call startProgramPulse();
-		boolean success = adapter.startProgramPulse(changeCondition);
+		var success = this.adapter.startProgramPulse(changeCondition);
 
 		conn.output.writeByte(RET_SUCCESS);
 		conn.output.writeBoolean(success);
@@ -971,11 +980,11 @@ private void adapterStartProgramPulse(Connection conn) throws IOException, OneWi
 
 	private void adapterStartBreak(Connection conn) throws IOException, OneWireException {
 		if (DEBUG) {
-			System.out.println("   startBreak called, speed=" + adapter.getSpeed());
+			System.out.println("   startBreak called, speed=" + this.adapter.getSpeed());
 		}
 
 		// call startBreak();
-		adapter.startBreak();
+		this.adapter.startBreak();
 
 		conn.output.writeByte(RET_SUCCESS);
 		conn.output.flush();
@@ -983,11 +992,11 @@ private void adapterStartBreak(Connection conn) throws IOException, OneWireExcep
 
 	private void adapterSetPowerNormal(Connection conn) throws IOException, OneWireException {
 		if (DEBUG) {
-			System.out.println("   setPowerNormal called, speed=" + adapter.getSpeed());
+			System.out.println("   setPowerNormal called, speed=" + this.adapter.getSpeed());
 		}
 
 		// call setPowerNormal
-		adapter.setPowerNormal();
+		this.adapter.setPowerNormal();
 
 		conn.output.writeByte(RET_SUCCESS);
 		conn.output.flush();
@@ -999,15 +1008,15 @@ private void adapterSetPowerNormal(Connection conn) throws IOException, OneWireE
 
 	private void adapterSetSpeed(Connection conn) throws IOException, OneWireException {
 		// get the value of the new speed
-		int speed = conn.input.readInt();
+		var speed = conn.input.readInt();
 
 		if (DEBUG) {
-			System.out.println("   setSpeed called, speed=" + adapter.getSpeed());
+			System.out.println("   setSpeed called, speed=" + this.adapter.getSpeed());
 			System.out.println("      speed=" + speed);
 		}
 
 		// do the setSpeed
-		adapter.setSpeed(speed);
+		this.adapter.setSpeed(speed);
 
 		conn.output.writeByte(RET_SUCCESS);
 		conn.output.flush();
@@ -1015,10 +1024,10 @@ private void adapterSetSpeed(Connection conn) throws IOException, OneWireExcepti
 
 	private void adapterGetSpeed(Connection conn) throws IOException, OneWireException {
 		// get the adapter speed
-		int speed = adapter.getSpeed();
+		var speed = this.adapter.getSpeed();
 
 		if (DEBUG) {
-			System.out.println("   getSpeed called, speed=" + adapter.getSpeed());
+			System.out.println("   getSpeed called, speed=" + this.adapter.getSpeed());
 			System.out.println("      speed=" + speed);
 		}
 
@@ -1032,7 +1041,7 @@ private void adapterGetSpeed(Connection conn) throws IOException, OneWireExcepti
 	// --------
 
 	private void adapterCanOverdrive(Connection conn) throws IOException, OneWireException {
-		boolean b = adapter.canOverdrive();
+		var b = this.adapter.canOverdrive();
 
 		if (DEBUG) {
 			System.out.println("   canOverdrive returned " + b);
@@ -1044,7 +1053,7 @@ private void adapterCanOverdrive(Connection conn) throws IOException, OneWireExc
 	}
 
 	private void adapterCanHyperdrive(Connection conn) throws IOException, OneWireException {
-		boolean b = adapter.canHyperdrive();
+		var b = this.adapter.canHyperdrive();
 
 		if (DEBUG) {
 			System.out.println("   canHyperDrive returned " + b);
@@ -1056,7 +1065,7 @@ private void adapterCanHyperdrive(Connection conn) throws IOException, OneWireEx
 	}
 
 	private void adapterCanFlex(Connection conn) throws IOException, OneWireException {
-		boolean b = adapter.canFlex();
+		var b = this.adapter.canFlex();
 
 		if (DEBUG) {
 			System.out.println("   canFlex returned " + b);
@@ -1068,7 +1077,7 @@ private void adapterCanFlex(Connection conn) throws IOException, OneWireExceptio
 	}
 
 	private void adapterCanProgram(Connection conn) throws IOException, OneWireException {
-		boolean b = adapter.canProgram();
+		var b = this.adapter.canProgram();
 
 		if (DEBUG) {
 			System.out.println("   canProgram returned " + b);
@@ -1080,7 +1089,7 @@ private void adapterCanProgram(Connection conn) throws IOException, OneWireExcep
 	}
 
 	private void adapterCanDeliverPower(Connection conn) throws IOException, OneWireException {
-		boolean b = adapter.canDeliverPower();
+		var b = this.adapter.canDeliverPower();
 
 		if (DEBUG) {
 			System.out.println("   canDeliverPower returned " + b);
@@ -1092,7 +1101,7 @@ private void adapterCanDeliverPower(Connection conn) throws IOException, OneWire
 	}
 
 	private void adapterCanDeliverSmartPower(Connection conn) throws IOException, OneWireException {
-		boolean b = adapter.canDeliverSmartPower();
+		var b = this.adapter.canDeliverSmartPower();
 
 		if (DEBUG) {
 			System.out.println("   canDeliverSmartPower returned " + b);
@@ -1104,7 +1113,7 @@ private void adapterCanDeliverSmartPower(Connection conn) throws IOException, On
 	}
 
 	private void adapterCanBreak(Connection conn) throws IOException, OneWireException {
-		boolean b = adapter.canBreak();
+		var b = this.adapter.canBreak();
 
 		if (DEBUG) {
 			System.out.println("   canBreak returned " + b);
@@ -1127,7 +1136,7 @@ private class SocketHandler implements Runnable {
 		/**
 		 * The connection that is being serviced.
 		 */
-		private Connection conn;
+		private final Connection conn;
 
 		/**
 		 * indicates whether or not the handler is currently running
@@ -1140,65 +1149,66 @@ private class SocketHandler implements Runnable {
 		 */
 		public SocketHandler(Socket sock) throws IOException {
 			// set socket timeout to 10 seconds
-			sock.setSoTimeout(timeoutInSeconds * 1000);
+			sock.setSoTimeout(NetAdapterHost.this.timeoutInSeconds * 1000);
 
 			// create the connection object
-			conn = new Connection();
-			conn.sock = sock;
-			conn.input = new DataInputStream(conn.sock.getInputStream());
+			this.conn = new Connection();
+			this.conn.sock = sock;
+			this.conn.input = new DataInputStream(this.conn.sock.getInputStream());
 			if (BUFFERED_OUTPUT) {
-				conn.output = new DataOutputStream(new BufferedOutputStream(conn.sock.getOutputStream()));
+				this.conn.output = new DataOutputStream(new BufferedOutputStream(this.conn.sock.getOutputStream()));
 			} else {
-				conn.output = new DataOutputStream(conn.sock.getOutputStream());
+				this.conn.output = new DataOutputStream(this.conn.sock.getOutputStream());
 			}
 
 			// first thing transmitted should be version info
-			if (!sendVersionUID(conn)) {
+			if (!NetAdapterHost.this.sendVersionUID(this.conn)) {
 				throw new IOException("send version failed");
 			}
 
 			// authenticate the client
-			byte[] chlg = new byte[8];
+			var chlg = new byte[8];
 			rand.nextBytes(chlg);
-			conn.output.write(chlg);
-			conn.output.flush();
+			this.conn.output.write(chlg);
+			this.conn.output.flush();
 
 			// compute the crc of the secret and the challenge
-			int crc = CRC16.compute(netAdapterSecret, 0);
+			var crc = CRC16.compute(NetAdapterHost.this.netAdapterSecret, 0);
 			crc = CRC16.compute(chlg, crc);
-			int answer = conn.input.readInt();
+			var answer = this.conn.input.readInt();
 			if (answer != crc) {
-				conn.output.writeByte(RET_FAILURE);
-				conn.output.writeUTF("Client Authentication Failed");
-				conn.output.flush();
+				this.conn.output.writeByte(RET_FAILURE);
+				this.conn.output.writeUTF("Client Authentication Failed");
+				this.conn.output.flush();
 				throw new IOException("authentication failed");
-			} else {
-				conn.output.writeByte(RET_SUCCESS);
-				conn.output.flush();
 			}
+			this.conn.output.writeByte(RET_SUCCESS);
+			this.conn.output.flush();
 		}
 
 		/**
 		 * Run method for socket Servicer.
 		 */
+		@Override
 		public void run() {
-			handlerRunning = true;
+			this.handlerRunning = true;
 			try {
-				while (!hostStopped && conn.sock != null) {
-					processRequests(conn);
+				while (!NetAdapterHost.this.hostStopped && this.conn.sock != null) {
+					NetAdapterHost.this.processRequests(this.conn);
 				}
 			} catch (Throwable t) {
-				if (DEBUG)
+				if (DEBUG) {
 					t.printStackTrace();
-				close(conn);
+				}
+				NetAdapterHost.this.close(this.conn);
 			}
-			handlerRunning = false;
+			this.handlerRunning = false;
 
-			if (!hostStopped && !singleThreaded) {
-				synchronized (hashHandlers) {
+			if (!NetAdapterHost.this.hostStopped && !NetAdapterHost.this.singleThreaded) {
+				synchronized (NetAdapterHost.this.hashHandlers) {
 					// thread finished running without being stopped.
 					// politely remove it from the hashtable.
-					hashHandlers.remove(Thread.currentThread());
+					NetAdapterHost.this.hashHandlers.remove(Thread.currentThread());
 				}
 			}
 		}
@@ -1207,14 +1217,15 @@ public void run() {
 		 * Waits for handler to finish, with a timeout.
 		 */
 		public void stopHandler() {
-			int i = 0;
-			int timeout = 3000;
-			while (handlerRunning && i++ < timeout)
+			var i = 0;
+			var timeout = 3000;
+			while (this.handlerRunning && i++ < timeout) {
 				try {
 					Thread.sleep(10);
 				} catch (Exception e) {
-					;
+
 				}
+			}
 		}
 	}
 
@@ -1227,15 +1238,15 @@ public void stopHandler() {
 	 * specified by DEFAULT_PORT.
 	 */
 	public static void main(String[] args) throws Exception {
-		DSPortAdapter adapter = com.dalsemi.onewire.OneWireAccessProvider.getDefaultAdapter();
+		var adapter = com.dalsemi.onewire.OneWireAccessProvider.getDefaultAdapter();
 
-		NetAdapterHost host = new NetAdapterHost(adapter, true);
+		var host = new NetAdapterHost(adapter, true);
 
 		System.out.println("Starting Multicast Listener");
 		host.createMulticastListener();
 
 		System.out.println("Starting NetAdapter Host");
-		(new Thread(host)).start();
+		new Thread(host).start();
 
 		// if(System.in!=null)
 		// {
diff --git a/io.openems.edge.bridge.onewire/src/com/dalsemi/onewire/adapter/NetAdapterSim.java b/io.openems.edge.bridge.onewire/src/com/dalsemi/onewire/adapter/NetAdapterSim.java
index b0b30fff3be..83219b3beba 100644
--- a/io.openems.edge.bridge.onewire/src/com/dalsemi/onewire/adapter/NetAdapterSim.java
+++ b/io.openems.edge.bridge.onewire/src/com/dalsemi/onewire/adapter/NetAdapterSim.java
@@ -39,7 +39,6 @@
 import java.net.ServerSocket;
 import java.net.Socket;
 import java.net.UnknownHostException;
-import java.util.Enumeration;
 import java.util.Hashtable;
 import java.util.Random;
 
@@ -236,9 +235,9 @@ public NetAdapterSim(String execCmd, String logFilename, int listenPort, boolean
 		this.processInput = new OutputStreamWriter(this.process.getOutputStream());
 
 		// wait until process is ready
-		int complete = 0;
+		var complete = 0;
 		while (complete < 2) {
-			String line = processOutput.readLine();
+			var line = this.processOutput.readLine();
 			if (complete == 0 && line.indexOf("read ok (data=17)") >= 0) {
 				complete++;
 				continue;
@@ -249,11 +248,12 @@ public NetAdapterSim(String execCmd, String logFilename, int listenPort, boolean
 			}
 		}
 
-		if (logFilename != null)
+		if (logFilename != null) {
 			this.logFile = new PrintWriter(new FileWriter(logFilename), true);
+		}
 
 		// Make sure we loaded the address of the device
-		simulationGetAddress();
+		this.simulationGetAddress();
 
 		// create the server socket
 		this.serverSocket = new ServerSocket(listenPort);
@@ -266,11 +266,12 @@ public NetAdapterSim(String execCmd, String logFilename, int listenPort, boolean
 		}
 
 		// get the shared secret
-		String secret = OneWireAccessProvider.getProperty("NetAdapter.secret");
-		if (secret != null)
-			netAdapterSecret = secret.getBytes();
-		else
-			netAdapterSecret = DEFAULT_SECRET.getBytes();
+		var secret = OneWireAccessProvider.getProperty("NetAdapter.secret");
+		if (secret != null) {
+			this.netAdapterSecret = secret.getBytes();
+		} else {
+			this.netAdapterSecret = DEFAULT_SECRET.getBytes();
+		}
 	}
 
 	/**
@@ -327,9 +328,9 @@ public NetAdapterSim(String execCmd, String logFilename, ServerSocket serverSock
 		this.processInput = new OutputStreamWriter(this.process.getOutputStream());
 
 		// wait until process is ready
-		int complete = 0;
+		var complete = 0;
 		while (complete < 2) {
-			String line = processOutput.readLine();
+			var line = this.processOutput.readLine();
 			if (complete == 0 && line.indexOf("read ok (data=17)") >= 0) {
 				complete++;
 				continue;
@@ -340,11 +341,12 @@ public NetAdapterSim(String execCmd, String logFilename, ServerSocket serverSock
 			}
 		}
 
-		if (logFilename != null)
+		if (logFilename != null) {
 			this.logFile = new PrintWriter(new FileWriter(logFilename), true);
+		}
 
 		// Make sure we loaded the address of the device
-		simulationGetAddress();
+		this.simulationGetAddress();
 
 		// save reference to the server socket
 		this.serverSocket = serverSock;
@@ -357,11 +359,12 @@ public NetAdapterSim(String execCmd, String logFilename, ServerSocket serverSock
 		}
 
 		// get the shared secret
-		String secret = OneWireAccessProvider.getProperty("NetAdapter.secret");
-		if (secret != null)
-			netAdapterSecret = secret.getBytes();
-		else
-			netAdapterSecret = DEFAULT_SECRET.getBytes();
+		var secret = OneWireAccessProvider.getProperty("NetAdapter.secret");
+		if (secret != null) {
+			this.netAdapterSecret = secret.getBytes();
+		} else {
+			this.netAdapterSecret = DEFAULT_SECRET.getBytes();
+		}
 	}
 
 	/**
@@ -371,7 +374,7 @@ public NetAdapterSim(String execCmd, String logFilename, ServerSocket serverSock
 	 *               client connections.
 	 */
 	public void setSecret(String secret) {
-		netAdapterSecret = secret.getBytes();
+		this.netAdapterSecret = secret.getBytes();
 	}
 
 	/**
@@ -379,7 +382,7 @@ public void setSecret(String secret) {
 	 * NetAdapterSim automatically. Uses defaults for Multicast group and port.
 	 */
 	public void createMulticastListener() throws IOException, UnknownHostException {
-		createMulticastListener(DEFAULT_MULTICAST_PORT);
+		this.createMulticastListener(DEFAULT_MULTICAST_PORT);
 	}
 
 	/**
@@ -389,10 +392,11 @@ public void createMulticastListener() throws IOException, UnknownHostException {
 	 * @param port The port the Multicast socket will receive packets on
 	 */
 	public void createMulticastListener(int port) throws IOException, UnknownHostException {
-		String group = OneWireAccessProvider.getProperty("NetAdapter.MulticastGroup");
-		if (group == null)
+		var group = OneWireAccessProvider.getProperty("NetAdapter.MulticastGroup");
+		if (group == null) {
 			group = DEFAULT_MULTICAST_GROUP;
-		createMulticastListener(port, group);
+		}
+		this.createMulticastListener(port, group);
 	}
 
 	/**
@@ -403,18 +407,18 @@ public void createMulticastListener(int port) throws IOException, UnknownHostExc
 	 * @param group The group the Multicast socket will join
 	 */
 	public void createMulticastListener(int port, String group) throws IOException, UnknownHostException {
-		if (multicastListener == null) {
+		if (this.multicastListener == null) {
 			// 4 bytes for integer versionUID
-			byte[] versionBytes = Convert.toByteArray(versionUID);
+			var versionBytes = Convert.toByteArray(versionUID);
 
 			// this byte array is 5 because length is used to determine different
 			// packet types by client
-			byte[] listenPortBytes = new byte[5];
-			Convert.toByteArray(serverSocket.getLocalPort(), listenPortBytes, 0, 4);
+			var listenPortBytes = new byte[5];
+			Convert.toByteArray(this.serverSocket.getLocalPort(), listenPortBytes, 0, 4);
 			listenPortBytes[4] = (byte) 0x0FF;
 
-			multicastListener = new MulticastListener(port, group, versionBytes, listenPortBytes);
-			(new Thread(multicastListener)).start();
+			this.multicastListener = new MulticastListener(port, group, versionBytes, listenPortBytes);
+			new Thread(this.multicastListener).start();
 		}
 	}
 
@@ -424,26 +428,28 @@ public void createMulticastListener(int port, String group) throws IOException,
 	 * services the socket or (optionally) launches a new thread for servicing the
 	 * socket.
 	 */
+	@Override
 	public void run() {
-		hostRunning = true;
-		while (!hostStopped) {
+		this.hostRunning = true;
+		while (!this.hostStopped) {
 			Socket sock = null;
 			try {
-				sock = serverSocket.accept();
+				sock = this.serverSocket.accept();
 				// reset time of last command, so we don't simulate a bunch of
 				// unnecessary time
-				timeOfLastCommand = System.currentTimeMillis();
-				handleConnection(sock);
+				this.timeOfLastCommand = System.currentTimeMillis();
+				this.handleConnection(sock);
 			} catch (IOException ioe1) {
 				try {
-					if (sock != null)
+					if (sock != null) {
 						sock.close();
+					}
 				} catch (IOException ioe2) {
-					;
+
 				}
 			}
 		}
-		hostRunning = false;
+		this.hostRunning = false;
 	}
 
 	/**
@@ -452,16 +458,16 @@ public void run() {
 	 * servicing this connection.
 	 */
 	public void handleConnection(Socket sock) throws IOException {
-		SocketHandler sh = new SocketHandler(sock);
-		if (singleThreaded) {
+		var sh = new SocketHandler(sock);
+		if (this.singleThreaded) {
 			// single-threaded
 			sh.run();
 		} else {
 			// multi-threaded
-			Thread t = new Thread(sh);
+			var t = new Thread(sh);
 			t.start();
-			synchronized (hashHandlers) {
-				hashHandlers.put(t, sh);
+			synchronized (this.hashHandlers) {
+				this.hashHandlers.put(t, sh);
 			}
 		}
 	}
@@ -474,28 +480,31 @@ public void stopHost() {
 		try {
 			this.serverSocket.close();
 		} catch (IOException ioe) {
-			;
+
 		}
 
 		// wait for run method to quit, with a timeout of 1 second
-		int i = 0;
-		while (hostRunning && i++ < 100)
+		var i = 0;
+		while (this.hostRunning && i++ < 100) {
 			try {
 				Thread.sleep(10);
 			} catch (Exception e) {
-				;
+
 			}
+		}
 
-		if (!singleThreaded) {
-			synchronized (hashHandlers) {
-				Enumeration<NetAdapterSim.SocketHandler> e = hashHandlers.elements();
-				while (e.hasMoreElements())
-					((SocketHandler) e.nextElement()).stopHandler();
+		if (!this.singleThreaded) {
+			synchronized (this.hashHandlers) {
+				var e = this.hashHandlers.elements();
+				while (e.hasMoreElements()) {
+					e.nextElement().stopHandler();
+				}
 			}
 		}
 
-		if (multicastListener != null)
-			multicastListener.stopListener();
+		if (this.multicastListener != null) {
+			this.multicastListener.stopListener();
+		}
 
 		// ensure that there is no exclusive use of the adapter
 		// adapter.endExclusive();
@@ -514,9 +523,9 @@ private boolean sendVersionUID(Connection conn) throws IOException {
 		conn.output.writeInt(versionUID);
 		conn.output.flush();
 
-		byte retVal = conn.input.readByte();
+		var retVal = conn.input.readByte();
 
-		return (retVal == RET_SUCCESS);
+		return retVal == RET_SUCCESS;
 	}
 
 	protected long timeOfLastCommand = 0;
@@ -531,9 +540,10 @@ private boolean sendVersionUID(Connection conn) throws IOException {
 	 */
 	private void processRequests(Connection conn) throws IOException {
 		// \\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\
-		if (logFile != null)
-			logFile.println("\n------------------------------------------");
-		// \\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\
+		if (this.logFile != null) {
+			this.logFile.println("\n------------------------------------------");
+			// \\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\
+		}
 
 		// get the next command
 		byte cmd = 0x00;
@@ -541,22 +551,24 @@ private void processRequests(Connection conn) throws IOException {
 		cmd = conn.input.readByte();
 
 		// \\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\
-		if (logFile != null)
-			logFile.println("CMD received: " + Integer.toHexString(cmd));
-		// \\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\
+		if (this.logFile != null) {
+			this.logFile.println("CMD received: " + Integer.toHexString(cmd));
+			// \\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\
+		}
 
 		if (cmd == CMD_PINGCONNECTION) {
 			// no-op, might update timer of some sort later
-			simulationPing(1000);
+			this.simulationPing(1000);
 			conn.output.writeByte(RET_SUCCESS);
 			conn.output.flush();
 		} else {
-			long timeDelta = System.currentTimeMillis() - timeOfLastCommand;
-			if (SIM_DEBUG && logFile != null)
-				logFile.println("general: timeDelta=" + timeDelta);
+			var timeDelta = System.currentTimeMillis() - this.timeOfLastCommand;
+			if (SIM_DEBUG && this.logFile != null) {
+				this.logFile.println("general: timeDelta=" + timeDelta);
+			}
 			if (timeDelta >= IGNORE_TIME_MIN && timeDelta <= IGNORE_TIME_MAX) {
 				// do something with timeDelta
-				simulationPing(timeDelta);
+				this.simulationPing(timeDelta);
 			}
 
 			try {
@@ -564,126 +576,128 @@ private void processRequests(Connection conn) throws IOException {
 				switch (cmd) {
 				/* Connection keep-alive and close commands */
 				case CMD_CLOSECONNECTION:
-					close(conn);
+					this.close(conn);
 					break;
 				/* Raw Data commands */
 				case CMD_RESET:
-					adapterReset(conn);
+					this.adapterReset(conn);
 					break;
 				case CMD_PUTBIT:
-					adapterPutBit(conn);
+					this.adapterPutBit(conn);
 					break;
 				case CMD_PUTBYTE:
-					adapterPutByte(conn);
+					this.adapterPutByte(conn);
 					break;
 				case CMD_GETBIT:
-					adapterGetBit(conn);
+					this.adapterGetBit(conn);
 					break;
 				case CMD_GETBYTE:
-					adapterGetByte(conn);
+					this.adapterGetByte(conn);
 					break;
 				case CMD_GETBLOCK:
-					adapterGetBlock(conn);
+					this.adapterGetBlock(conn);
 					break;
 				case CMD_DATABLOCK:
-					adapterDataBlock(conn);
+					this.adapterDataBlock(conn);
 					break;
 				/* Power methods */
 				case CMD_SETPOWERDURATION:
-					adapterSetPowerDuration(conn);
+					this.adapterSetPowerDuration(conn);
 					break;
 				case CMD_STARTPOWERDELIVERY:
-					adapterStartPowerDelivery(conn);
+					this.adapterStartPowerDelivery(conn);
 					break;
 				case CMD_SETPROGRAMPULSEDURATION:
-					adapterSetProgramPulseDuration(conn);
+					this.adapterSetProgramPulseDuration(conn);
 					break;
 				case CMD_STARTPROGRAMPULSE:
-					adapterStartProgramPulse(conn);
+					this.adapterStartProgramPulse(conn);
 					break;
 				case CMD_STARTBREAK:
-					adapterStartBreak(conn);
+					this.adapterStartBreak(conn);
 					break;
 				case CMD_SETPOWERNORMAL:
-					adapterSetPowerNormal(conn);
+					this.adapterSetPowerNormal(conn);
 					break;
 				/* Speed methods */
 				case CMD_SETSPEED:
-					adapterSetSpeed(conn);
+					this.adapterSetSpeed(conn);
 					break;
 				case CMD_GETSPEED:
-					adapterGetSpeed(conn);
+					this.adapterGetSpeed(conn);
 					break;
 				/* Network Semaphore methods */
 				case CMD_BEGINEXCLUSIVE:
-					adapterBeginExclusive(conn);
+					this.adapterBeginExclusive(conn);
 					break;
 				case CMD_ENDEXCLUSIVE:
-					adapterEndExclusive(conn);
+					this.adapterEndExclusive(conn);
 					break;
 				/* Searching methods */
 				case CMD_FINDFIRSTDEVICE:
-					adapterFindFirstDevice(conn);
+					this.adapterFindFirstDevice(conn);
 					break;
 				case CMD_FINDNEXTDEVICE:
-					adapterFindNextDevice(conn);
+					this.adapterFindNextDevice(conn);
 					break;
 				case CMD_GETADDRESS:
-					adapterGetAddress(conn);
+					this.adapterGetAddress(conn);
 					break;
 				case CMD_SETSEARCHONLYALARMINGDEVICES:
-					adapterSetSearchOnlyAlarmingDevices(conn);
+					this.adapterSetSearchOnlyAlarmingDevices(conn);
 					break;
 				case CMD_SETNORESETSEARCH:
-					adapterSetNoResetSearch(conn);
+					this.adapterSetNoResetSearch(conn);
 					break;
 				case CMD_SETSEARCHALLDEVICES:
-					adapterSetSearchAllDevices(conn);
+					this.adapterSetSearchAllDevices(conn);
 					break;
 				case CMD_TARGETALLFAMILIES:
-					adapterTargetAllFamilies(conn);
+					this.adapterTargetAllFamilies(conn);
 					break;
 				case CMD_TARGETFAMILY:
-					adapterTargetFamily(conn);
+					this.adapterTargetFamily(conn);
 					break;
 				case CMD_EXCLUDEFAMILY:
-					adapterExcludeFamily(conn);
+					this.adapterExcludeFamily(conn);
 					break;
 				/* feature methods */
 				case CMD_CANBREAK:
-					adapterCanBreak(conn);
+					this.adapterCanBreak(conn);
 					break;
 				case CMD_CANDELIVERPOWER:
-					adapterCanDeliverPower(conn);
+					this.adapterCanDeliverPower(conn);
 					break;
 				case CMD_CANDELIVERSMARTPOWER:
-					adapterCanDeliverSmartPower(conn);
+					this.adapterCanDeliverSmartPower(conn);
 					break;
 				case CMD_CANFLEX:
-					adapterCanFlex(conn);
+					this.adapterCanFlex(conn);
 					break;
 				case CMD_CANHYPERDRIVE:
-					adapterCanHyperdrive(conn);
+					this.adapterCanHyperdrive(conn);
 					break;
 				case CMD_CANOVERDRIVE:
-					adapterCanOverdrive(conn);
+					this.adapterCanOverdrive(conn);
 					break;
 				case CMD_CANPROGRAM:
-					adapterCanProgram(conn);
+					this.adapterCanProgram(conn);
 					break;
 				default:
-					if (SIM_DEBUG && logFile != null)
-						logFile.println("Unknown command received: " + cmd);
+					if (SIM_DEBUG && this.logFile != null) {
+						this.logFile.println("Unknown command received: " + cmd);
+					}
 					break;
 				}
 			} catch (OneWireException owe) {
-				if (SIM_DEBUG && logFile != null)
-					logFile.println("Exception: " + owe.toString());
+				if (SIM_DEBUG && this.logFile != null) {
+					this.logFile.println("Exception: " + owe.toString());
+				}
 				conn.output.writeByte(RET_FAILURE);
 				conn.output.writeUTF(owe.toString());
 				conn.output.flush();
 			}
-			timeOfLastCommand = System.currentTimeMillis();
+			this.timeOfLastCommand = System.currentTimeMillis();
 		}
 	}
 
@@ -698,7 +712,7 @@ private void close(Connection conn) {
 				conn.sock.close();
 			}
 		} catch (IOException ioe) {
-			/* drain */;
+			/* drain */
 		}
 
 		conn.sock = null;
@@ -714,10 +728,10 @@ private void close(Connection conn) {
 	// --------
 
 	private void adapterFindFirstDevice(Connection conn) throws IOException, OneWireException {
-		boolean b = true;// adapter.findFirstDevice();
+		var b = true;// adapter.findFirstDevice();
 
-		if (logFile != null) {
-			logFile.println("   findFirstDevice returned " + b);
+		if (this.logFile != null) {
+			this.logFile.println("   findFirstDevice returned " + b);
 		}
 
 		conn.output.writeByte(RET_SUCCESS);
@@ -726,10 +740,10 @@ private void adapterFindFirstDevice(Connection conn) throws IOException, OneWire
 	}
 
 	private void adapterFindNextDevice(Connection conn) throws IOException, OneWireException {
-		boolean b = false;// adapter.findNextDevice();
+		var b = false;// adapter.findNextDevice();
 
-		if (logFile != null) {
-			logFile.println("   findNextDevice returned " + b);
+		if (this.logFile != null) {
+			this.logFile.println("   findNextDevice returned " + b);
 		}
 
 		conn.output.writeByte(RET_SUCCESS);
@@ -738,18 +752,18 @@ private void adapterFindNextDevice(Connection conn) throws IOException, OneWireE
 	}
 
 	private void adapterGetAddress(Connection conn) throws IOException {
-		if (logFile != null) {
-			logFile.println("   adapter.getAddress(byte[]) called");
+		if (this.logFile != null) {
+			this.logFile.println("   adapter.getAddress(byte[]) called");
 		}
 
 		conn.output.writeByte(RET_SUCCESS);
-		conn.output.write(fakeAddress, 0, 8);
+		conn.output.write(this.fakeAddress, 0, 8);
 		conn.output.flush();
 	}
 
 	private void adapterSetSearchOnlyAlarmingDevices(Connection conn) throws IOException {
-		if (logFile != null) {
-			logFile.println("   setSearchOnlyAlarmingDevices called");
+		if (this.logFile != null) {
+			this.logFile.println("   setSearchOnlyAlarmingDevices called");
 		}
 
 		conn.output.writeByte(RET_SUCCESS);
@@ -757,8 +771,8 @@ private void adapterSetSearchOnlyAlarmingDevices(Connection conn) throws IOExcep
 	}
 
 	private void adapterSetNoResetSearch(Connection conn) throws IOException {
-		if (logFile != null) {
-			logFile.println("   setNoResetSearch called");
+		if (this.logFile != null) {
+			this.logFile.println("   setNoResetSearch called");
 		}
 
 		conn.output.writeByte(RET_SUCCESS);
@@ -766,8 +780,8 @@ private void adapterSetNoResetSearch(Connection conn) throws IOException {
 	}
 
 	private void adapterSetSearchAllDevices(Connection conn) throws IOException {
-		if (logFile != null) {
-			logFile.println("   setSearchAllDevices called");
+		if (this.logFile != null) {
+			this.logFile.println("   setSearchAllDevices called");
 		}
 
 		conn.output.writeByte(RET_SUCCESS);
@@ -775,8 +789,8 @@ private void adapterSetSearchAllDevices(Connection conn) throws IOException {
 	}
 
 	private void adapterTargetAllFamilies(Connection conn) throws IOException {
-		if (logFile != null) {
-			logFile.println("   targetAllFamilies called");
+		if (this.logFile != null) {
+			this.logFile.println("   targetAllFamilies called");
 		}
 
 		conn.output.writeByte(RET_SUCCESS);
@@ -786,14 +800,14 @@ private void adapterTargetAllFamilies(Connection conn) throws IOException {
 	// TODO
 	private void adapterTargetFamily(Connection conn) throws IOException {
 		// get the number of family codes to expect
-		int len = conn.input.readInt();
+		var len = conn.input.readInt();
 		// get the family codes
-		byte[] family = new byte[len];
+		var family = new byte[len];
 		conn.input.readFully(family, 0, len);
 
-		if (logFile != null) {
-			logFile.println("   targetFamily called");
-			logFile.println("      families: " + Convert.toHexString(family));
+		if (this.logFile != null) {
+			this.logFile.println("   targetFamily called");
+			this.logFile.println("      families: " + Convert.toHexString(family));
 		}
 
 		conn.output.writeByte(RET_SUCCESS);
@@ -803,14 +817,14 @@ private void adapterTargetFamily(Connection conn) throws IOException {
 	// TODO
 	private void adapterExcludeFamily(Connection conn) throws IOException {
 		// get the number of family codes to expect
-		int len = conn.input.readInt();
+		var len = conn.input.readInt();
 		// get the family codes
-		byte[] family = new byte[len];
+		var family = new byte[len];
 		conn.input.readFully(family, 0, len);
 
-		if (logFile != null) {
-			logFile.println("   excludeFamily called");
-			logFile.println("      families: " + Convert.toHexString(family));
+		if (this.logFile != null) {
+			this.logFile.println("   excludeFamily called");
+			this.logFile.println("      families: " + Convert.toHexString(family));
 		}
 
 		conn.output.writeByte(RET_SUCCESS);
@@ -823,29 +837,29 @@ private void adapterExcludeFamily(Connection conn) throws IOException {
 
 	// TODO
 	private void adapterBeginExclusive(Connection conn) throws IOException, OneWireException {
-		if (logFile != null) {
-			logFile.println("   adapter.beginExclusive called");
+		if (this.logFile != null) {
+			this.logFile.println("   adapter.beginExclusive called");
 		}
 
 		// get blocking boolean
 		// boolean blocking =
 		conn.input.readBoolean();
 		// call beginExclusive
-		boolean b = true;
+		var b = true;
 
 		conn.output.writeByte(RET_SUCCESS);
 		conn.output.writeBoolean(b);
 		conn.output.flush();
 
-		if (logFile != null) {
-			logFile.println("      adapter.beginExclusive returned " + b);
+		if (this.logFile != null) {
+			this.logFile.println("      adapter.beginExclusive returned " + b);
 		}
 	}
 
 	// TODO
 	private void adapterEndExclusive(Connection conn) throws IOException, OneWireException {
-		if (logFile != null) {
-			logFile.println("   adapter.endExclusive called");
+		if (this.logFile != null) {
+			this.logFile.println("   adapter.endExclusive called");
 		}
 
 		conn.output.writeByte(RET_SUCCESS);
@@ -857,13 +871,13 @@ private void adapterEndExclusive(Connection conn) throws IOException, OneWireExc
 	// --------
 
 	private void adapterReset(Connection conn) throws IOException, OneWireException {
-		int i = 1;// return 1 for presence pulse
+		var i = 1;// return 1 for presence pulse
 
-		if (logFile != null) {
-			logFile.println("   reset returned " + i);
+		if (this.logFile != null) {
+			this.logFile.println("   reset returned " + i);
 		}
 
-		simulationReset();
+		this.simulationReset();
 
 		conn.output.writeByte(RET_SUCCESS);
 		conn.output.writeInt(i);
@@ -873,39 +887,39 @@ private void adapterReset(Connection conn) throws IOException, OneWireException
 	// TODO
 	private void adapterPutBit(Connection conn) throws IOException, OneWireException {
 		// get the value of the bit
-		boolean bit = conn.input.readBoolean();
+		var bit = conn.input.readBoolean();
 
-		if (logFile != null) {
-			logFile.println("   putBit called");
-			logFile.println("      bit=" + bit);
+		if (this.logFile != null) {
+			this.logFile.println("   putBit called");
+			this.logFile.println("      bit=" + bit);
 		}
 
-		simulationPutBit(bit);
+		this.simulationPutBit(bit);
 		conn.output.writeByte(RET_SUCCESS);
 		conn.output.flush();
 	}
 
 	private void adapterPutByte(Connection conn) throws IOException, OneWireException {
 		// get the value of the byte
-		byte b = conn.input.readByte();
+		var b = conn.input.readByte();
 
-		if (logFile != null) {
-			logFile.println("   putByte called");
-			logFile.println("      byte=" + Convert.toHexString(b));
+		if (this.logFile != null) {
+			this.logFile.println("   putByte called");
+			this.logFile.println("      byte=" + Convert.toHexString(b));
 		}
 
-		simulationPutByte(b);
+		this.simulationPutByte(b);
 
 		conn.output.writeByte(RET_SUCCESS);
 		conn.output.flush();
 	}
 
 	private void adapterGetBit(Connection conn) throws IOException, OneWireException {
-		boolean bit = simulationGetBit();
+		var bit = this.simulationGetBit();
 
-		if (logFile != null) {
-			logFile.println("   getBit called");
-			logFile.println("      bit=" + bit);
+		if (this.logFile != null) {
+			this.logFile.println("   getBit called");
+			this.logFile.println("      bit=" + bit);
 		}
 
 		conn.output.writeByte(RET_SUCCESS);
@@ -914,11 +928,11 @@ private void adapterGetBit(Connection conn) throws IOException, OneWireException
 	}
 
 	private void adapterGetByte(Connection conn) throws IOException, OneWireException {
-		int b = simulationGetByte();
+		int b = this.simulationGetByte();
 
-		if (logFile != null) {
-			logFile.println("   getByte called");
-			logFile.println("      byte=" + Convert.toHexString((byte) b));
+		if (this.logFile != null) {
+			this.logFile.println("   getByte called");
+			this.logFile.println("      byte=" + Convert.toHexString((byte) b));
 		}
 
 		conn.output.writeByte(RET_SUCCESS);
@@ -928,20 +942,20 @@ private void adapterGetByte(Connection conn) throws IOException, OneWireExceptio
 
 	private void adapterGetBlock(Connection conn) throws IOException, OneWireException {
 		// get the number requested
-		int len = conn.input.readInt();
-		if (logFile != null) {
-			logFile.println("   getBlock called");
-			logFile.println("      len=" + len);
+		var len = conn.input.readInt();
+		if (this.logFile != null) {
+			this.logFile.println("   getBlock called");
+			this.logFile.println("      len=" + len);
 		}
 
 		// get the bytes
-		byte[] b = new byte[len];
-		for (int i = 0; i < len; i++) {
-			b[i] = simulationGetByte();
+		var b = new byte[len];
+		for (var i = 0; i < len; i++) {
+			b[i] = this.simulationGetByte();
 		}
 
-		if (logFile != null) {
-			logFile.println("      returned: " + Convert.toHexString(b));
+		if (this.logFile != null) {
+			this.logFile.println("      returned: " + Convert.toHexString(b));
 		}
 
 		conn.output.writeByte(RET_SUCCESS);
@@ -950,31 +964,31 @@ private void adapterGetBlock(Connection conn) throws IOException, OneWireExcepti
 	}
 
 	private void adapterDataBlock(Connection conn) throws IOException, OneWireException {
-		if (logFile != null) {
-			logFile.println("   DataBlock called");
+		if (this.logFile != null) {
+			this.logFile.println("   DataBlock called");
 		}
 		// get the number to block
-		int len = conn.input.readInt();
+		var len = conn.input.readInt();
 		// get the bytes to block
-		byte[] b = new byte[len];
+		var b = new byte[len];
 		conn.input.readFully(b, 0, len);
 
-		if (logFile != null) {
-			logFile.println("      " + len + " bytes");
-			logFile.println("      Send: " + Convert.toHexString(b));
+		if (this.logFile != null) {
+			this.logFile.println("      " + len + " bytes");
+			this.logFile.println("      Send: " + Convert.toHexString(b));
 		}
 
 		// do the block
-		for (int i = 0; i < len; i++) {
+		for (var i = 0; i < len; i++) {
 			if (b[i] == (byte) 0x0FF) {
-				b[i] = simulationGetByte();
+				b[i] = this.simulationGetByte();
 			} else {
-				simulationPutByte(b[i]);
+				this.simulationPutByte(b[i]);
 			}
 		}
 
-		if (logFile != null) {
-			logFile.println("      Recv: " + Convert.toHexString(b));
+		if (this.logFile != null) {
+			this.logFile.println("      Recv: " + Convert.toHexString(b));
 		}
 
 		conn.output.writeByte(RET_SUCCESS);
@@ -989,11 +1003,11 @@ private void adapterDataBlock(Connection conn) throws IOException, OneWireExcept
 	// TODO
 	private void adapterSetPowerDuration(Connection conn) throws IOException, OneWireException {
 		// get the time factor value
-		int timeFactor = conn.input.readInt();
+		var timeFactor = conn.input.readInt();
 
-		if (logFile != null) {
-			logFile.println("   setPowerDuration called");
-			logFile.println("      timeFactor=" + timeFactor);
+		if (this.logFile != null) {
+			this.logFile.println("   setPowerDuration called");
+			this.logFile.println("      timeFactor=" + timeFactor);
 		}
 
 		// call setPowerDuration
@@ -1006,15 +1020,15 @@ private void adapterSetPowerDuration(Connection conn) throws IOException, OneWir
 	// TODO
 	private void adapterStartPowerDelivery(Connection conn) throws IOException, OneWireException {
 		// get the change condition value
-		int changeCondition = conn.input.readInt();
+		var changeCondition = conn.input.readInt();
 
-		if (logFile != null) {
-			logFile.println("   startPowerDelivery called");
-			logFile.println("      changeCondition=" + changeCondition);
+		if (this.logFile != null) {
+			this.logFile.println("   startPowerDelivery called");
+			this.logFile.println("      changeCondition=" + changeCondition);
 		}
 
 		// call startPowerDelivery
-		boolean success = true;// adapter.startPowerDelivery(changeCondition);
+		var success = true;// adapter.startPowerDelivery(changeCondition);
 
 		conn.output.writeByte(RET_SUCCESS);
 		conn.output.writeBoolean(success);
@@ -1024,11 +1038,11 @@ private void adapterStartPowerDelivery(Connection conn) throws IOException, OneW
 	// TODO
 	private void adapterSetProgramPulseDuration(Connection conn) throws IOException, OneWireException {
 		// get the time factor value
-		int timeFactor = conn.input.readInt();
+		var timeFactor = conn.input.readInt();
 
-		if (logFile != null) {
-			logFile.println("   setProgramPulseDuration called");
-			logFile.println("      timeFactor=" + timeFactor);
+		if (this.logFile != null) {
+			this.logFile.println("   setProgramPulseDuration called");
+			this.logFile.println("      timeFactor=" + timeFactor);
 		}
 
 		// call setProgramPulseDuration
@@ -1041,15 +1055,15 @@ private void adapterSetProgramPulseDuration(Connection conn) throws IOException,
 	// TODO
 	private void adapterStartProgramPulse(Connection conn) throws IOException, OneWireException {
 		// get the change condition value
-		int changeCondition = conn.input.readInt();
+		var changeCondition = conn.input.readInt();
 
-		if (logFile != null) {
-			logFile.println("   startProgramPulse called");
-			logFile.println("      changeCondition=" + changeCondition);
+		if (this.logFile != null) {
+			this.logFile.println("   startProgramPulse called");
+			this.logFile.println("      changeCondition=" + changeCondition);
 		}
 
 		// call startProgramPulse();
-		boolean success = true;// adapter.startProgramPulse(changeCondition);
+		var success = true;// adapter.startProgramPulse(changeCondition);
 
 		conn.output.writeByte(RET_SUCCESS);
 		conn.output.writeBoolean(success);
@@ -1058,8 +1072,8 @@ private void adapterStartProgramPulse(Connection conn) throws IOException, OneWi
 
 	// TODO
 	private void adapterStartBreak(Connection conn) throws IOException, OneWireException {
-		if (logFile != null) {
-			logFile.println("   startBreak called");
+		if (this.logFile != null) {
+			this.logFile.println("   startBreak called");
 		}
 
 		// call startBreak();
@@ -1071,8 +1085,8 @@ private void adapterStartBreak(Connection conn) throws IOException, OneWireExcep
 
 	// TODO
 	private void adapterSetPowerNormal(Connection conn) throws IOException, OneWireException {
-		if (logFile != null) {
-			logFile.println("   setPowerNormal called");
+		if (this.logFile != null) {
+			this.logFile.println("   setPowerNormal called");
 		}
 
 		// call setPowerNormal
@@ -1089,11 +1103,11 @@ private void adapterSetPowerNormal(Connection conn) throws IOException, OneWireE
 	// TODO
 	private void adapterSetSpeed(Connection conn) throws IOException, OneWireException {
 		// get the value of the new speed
-		int speed = conn.input.readInt();
+		var speed = conn.input.readInt();
 
-		if (logFile != null) {
-			logFile.println("   setSpeed called");
-			logFile.println("      speed=" + speed);
+		if (this.logFile != null) {
+			this.logFile.println("   setSpeed called");
+			this.logFile.println("      speed=" + speed);
 		}
 
 		// do the setSpeed
@@ -1106,11 +1120,11 @@ private void adapterSetSpeed(Connection conn) throws IOException, OneWireExcepti
 	// TODO
 	private void adapterGetSpeed(Connection conn) throws IOException, OneWireException {
 		// get the adapter speed
-		int speed = 0;// adapter.getSpeed();
+		var speed = 0;// adapter.getSpeed();
 
-		if (logFile != null) {
-			logFile.println("   getSpeed called");
-			logFile.println("      speed=" + speed);
+		if (this.logFile != null) {
+			this.logFile.println("   getSpeed called");
+			this.logFile.println("      speed=" + speed);
 		}
 
 		conn.output.writeByte(RET_SUCCESS);
@@ -1124,10 +1138,10 @@ private void adapterGetSpeed(Connection conn) throws IOException, OneWireExcepti
 
 	// TODO
 	private void adapterCanOverdrive(Connection conn) throws IOException, OneWireException {
-		boolean b = false;// adapter.canOverdrive();
+		var b = false;// adapter.canOverdrive();
 
-		if (logFile != null) {
-			logFile.println("   canOverdrive returned " + b);
+		if (this.logFile != null) {
+			this.logFile.println("   canOverdrive returned " + b);
 		}
 
 		conn.output.writeByte(RET_SUCCESS);
@@ -1137,10 +1151,10 @@ private void adapterCanOverdrive(Connection conn) throws IOException, OneWireExc
 
 	// TODO
 	private void adapterCanHyperdrive(Connection conn) throws IOException, OneWireException {
-		boolean b = false;// adapter.canHyperdrive();
+		var b = false;// adapter.canHyperdrive();
 
-		if (logFile != null) {
-			logFile.println("   canHyperDrive returned " + b);
+		if (this.logFile != null) {
+			this.logFile.println("   canHyperDrive returned " + b);
 		}
 
 		conn.output.writeByte(RET_SUCCESS);
@@ -1150,10 +1164,10 @@ private void adapterCanHyperdrive(Connection conn) throws IOException, OneWireEx
 
 	// TODO
 	private void adapterCanFlex(Connection conn) throws IOException, OneWireException {
-		boolean b = false;// adapter.canFlex();
+		var b = false;// adapter.canFlex();
 
-		if (logFile != null) {
-			logFile.println("   canFlex returned " + b);
+		if (this.logFile != null) {
+			this.logFile.println("   canFlex returned " + b);
 		}
 
 		conn.output.writeByte(RET_SUCCESS);
@@ -1163,10 +1177,10 @@ private void adapterCanFlex(Connection conn) throws IOException, OneWireExceptio
 
 	// TODO
 	private void adapterCanProgram(Connection conn) throws IOException, OneWireException {
-		boolean b = true;// adapter.canProgram();
+		var b = true;// adapter.canProgram();
 
-		if (logFile != null) {
-			logFile.println("   canProgram returned " + b);
+		if (this.logFile != null) {
+			this.logFile.println("   canProgram returned " + b);
 		}
 
 		conn.output.writeByte(RET_SUCCESS);
@@ -1176,10 +1190,10 @@ private void adapterCanProgram(Connection conn) throws IOException, OneWireExcep
 
 	// TODO
 	private void adapterCanDeliverPower(Connection conn) throws IOException, OneWireException {
-		boolean b = true;// adapter.canDeliverPower();
+		var b = true;// adapter.canDeliverPower();
 
-		if (logFile != null) {
-			logFile.println("   canDeliverPower returned " + b);
+		if (this.logFile != null) {
+			this.logFile.println("   canDeliverPower returned " + b);
 		}
 
 		conn.output.writeByte(RET_SUCCESS);
@@ -1189,10 +1203,10 @@ private void adapterCanDeliverPower(Connection conn) throws IOException, OneWire
 
 	// TODO
 	private void adapterCanDeliverSmartPower(Connection conn) throws IOException, OneWireException {
-		boolean b = true;// adapter.canDeliverSmartPower();
+		var b = true;// adapter.canDeliverSmartPower();
 
-		if (logFile != null) {
-			logFile.println("   canDeliverSmartPower returned " + b);
+		if (this.logFile != null) {
+			this.logFile.println("   canDeliverSmartPower returned " + b);
 		}
 
 		conn.output.writeByte(RET_SUCCESS);
@@ -1202,10 +1216,10 @@ private void adapterCanDeliverSmartPower(Connection conn) throws IOException, On
 
 	// TODO
 	private void adapterCanBreak(Connection conn) throws IOException, OneWireException {
-		boolean b = true;// adapter.canBreak();
+		var b = true;// adapter.canBreak();
 
-		if (logFile != null) {
-			logFile.println("   canBreak returned " + b);
+		if (this.logFile != null) {
+			this.logFile.println("   canBreak returned " + b);
 		}
 
 		conn.output.writeByte(RET_SUCCESS);
@@ -1225,7 +1239,7 @@ private class SocketHandler implements Runnable {
 		/**
 		 * The connection that is being serviced.
 		 */
-		private Connection conn;
+		private final Connection conn;
 
 		/**
 		 * indicates whether or not the handler is currently running
@@ -1238,65 +1252,66 @@ private class SocketHandler implements Runnable {
 		 */
 		public SocketHandler(Socket sock) throws IOException {
 			// set socket timeout to 10 seconds
-			sock.setSoTimeout(timeoutInSeconds * 1000);
+			sock.setSoTimeout(NetAdapterSim.this.timeoutInSeconds * 1000);
 
 			// create the connection object
-			conn = new Connection();
-			conn.sock = sock;
-			conn.input = new DataInputStream(conn.sock.getInputStream());
+			this.conn = new Connection();
+			this.conn.sock = sock;
+			this.conn.input = new DataInputStream(this.conn.sock.getInputStream());
 			if (BUFFERED_OUTPUT) {
-				conn.output = new DataOutputStream(new BufferedOutputStream(conn.sock.getOutputStream()));
+				this.conn.output = new DataOutputStream(new BufferedOutputStream(this.conn.sock.getOutputStream()));
 			} else {
-				conn.output = new DataOutputStream(conn.sock.getOutputStream());
+				this.conn.output = new DataOutputStream(this.conn.sock.getOutputStream());
 			}
 
 			// first thing transmitted should be version info
-			if (!sendVersionUID(conn)) {
+			if (!NetAdapterSim.this.sendVersionUID(this.conn)) {
 				throw new IOException("send version failed");
 			}
 
 			// authenticate the client
-			byte[] chlg = new byte[8];
+			var chlg = new byte[8];
 			rand.nextBytes(chlg);
-			conn.output.write(chlg);
-			conn.output.flush();
+			this.conn.output.write(chlg);
+			this.conn.output.flush();
 
 			// compute the crc of the secret and the challenge
-			int crc = CRC16.compute(netAdapterSecret, 0);
+			var crc = CRC16.compute(NetAdapterSim.this.netAdapterSecret, 0);
 			crc = CRC16.compute(chlg, crc);
-			int answer = conn.input.readInt();
+			var answer = this.conn.input.readInt();
 			if (answer != crc) {
-				conn.output.writeByte(RET_FAILURE);
-				conn.output.writeUTF("Client Authentication Failed");
-				conn.output.flush();
+				this.conn.output.writeByte(RET_FAILURE);
+				this.conn.output.writeUTF("Client Authentication Failed");
+				this.conn.output.flush();
 				throw new IOException("authentication failed");
-			} else {
-				conn.output.writeByte(RET_SUCCESS);
-				conn.output.flush();
 			}
+			this.conn.output.writeByte(RET_SUCCESS);
+			this.conn.output.flush();
 		}
 
 		/**
 		 * Run method for socket Servicer.
 		 */
+		@Override
 		public void run() {
-			handlerRunning = true;
+			this.handlerRunning = true;
 			try {
-				while (!hostStopped && conn.sock != null) {
-					processRequests(conn);
+				while (!NetAdapterSim.this.hostStopped && this.conn.sock != null) {
+					NetAdapterSim.this.processRequests(this.conn);
 				}
 			} catch (Throwable t) {
-				if (logFile != null)
+				if (NetAdapterSim.this.logFile != null) {
 					t.printStackTrace();
-				close(conn);
+				}
+				NetAdapterSim.this.close(this.conn);
 			}
-			handlerRunning = false;
+			this.handlerRunning = false;
 
-			if (!hostStopped && !singleThreaded) {
-				synchronized (hashHandlers) {
+			if (!NetAdapterSim.this.hostStopped && !NetAdapterSim.this.singleThreaded) {
+				synchronized (NetAdapterSim.this.hashHandlers) {
 					// thread finished running without being stopped.
 					// politely remove it from the hashtable.
-					hashHandlers.remove(Thread.currentThread());
+					NetAdapterSim.this.hashHandlers.remove(Thread.currentThread());
 				}
 			}
 		}
@@ -1305,14 +1320,15 @@ public void run() {
 		 * Waits for handler to finish, with a timeout.
 		 */
 		public void stopHandler() {
-			int i = 0;
-			int timeout = 3000;
-			while (handlerRunning && i++ < timeout)
+			var i = 0;
+			var timeout = 3000;
+			while (this.handlerRunning && i++ < timeout) {
 				try {
 					Thread.sleep(10);
 				} catch (Exception e) {
-					;
+
 				}
+			}
 		}
 	}
 
@@ -1351,20 +1367,21 @@ public void stopHandler() {
 	private static final String PROMPT = "ncsim> ";
 
 	private void simulationReset() throws IOException {
-		if (SIM_DEBUG && logFile != null) {
-			logFile.println("reset: Writing=" + OW_RESET_CMD);
-			logFile.println("reset: Writing=" + RUN + OW_RESET_RUN_LENGTH);
+		if (SIM_DEBUG && this.logFile != null) {
+			this.logFile.println("reset: Writing=" + OW_RESET_CMD);
+			this.logFile.println("reset: Writing=" + RUN + OW_RESET_RUN_LENGTH);
 		}
-		processInput.write(OW_RESET_CMD + LINE_DELIM);
-		processInput.write(RUN + OW_RESET_RUN_LENGTH + LINE_DELIM);
-		processInput.flush();
+		this.processInput.write(OW_RESET_CMD + LINE_DELIM);
+		this.processInput.write(RUN + OW_RESET_RUN_LENGTH + LINE_DELIM);
+		this.processInput.flush();
 
 		// wait for it to complete
-		int complete = 0;
+		var complete = 0;
 		while (complete < 2) {
-			String line = processOutput.readLine();
-			if (SIM_DEBUG && logFile != null)
-				logFile.println("reset: complete=" + complete + ", read=" + line);
+			var line = this.processOutput.readLine();
+			if (SIM_DEBUG && this.logFile != null) {
+				this.logFile.println("reset: complete=" + complete + ", read=" + line);
+			}
 			if (complete == 0 && line.indexOf(OW_RESET_RESULT) >= 0) {
 				complete++;
 				continue;
@@ -1374,27 +1391,29 @@ private void simulationReset() throws IOException {
 				continue;
 			}
 		}
-		if (SIM_DEBUG && logFile != null)
-			logFile.println("reset: Complete");
+		if (SIM_DEBUG && this.logFile != null) {
+			this.logFile.println("reset: Complete");
+		}
 	}
 
 	private boolean simulationGetBit() throws java.io.IOException {
-		boolean bit = true;
+		var bit = true;
 
-		if (SIM_DEBUG && logFile != null) {
-			logFile.println("getBit: Writing=" + OW_READ_SLOT_CMD);
-			logFile.println("getBit: Writing=" + RUN + OW_READ_SLOT_RUN_LENGTH);
+		if (SIM_DEBUG && this.logFile != null) {
+			this.logFile.println("getBit: Writing=" + OW_READ_SLOT_CMD);
+			this.logFile.println("getBit: Writing=" + RUN + OW_READ_SLOT_RUN_LENGTH);
 		}
-		processInput.write(OW_READ_SLOT_CMD + LINE_DELIM);
-		processInput.write(RUN + OW_READ_SLOT_RUN_LENGTH + LINE_DELIM);
-		processInput.flush();
+		this.processInput.write(OW_READ_SLOT_CMD + LINE_DELIM);
+		this.processInput.write(RUN + OW_READ_SLOT_RUN_LENGTH + LINE_DELIM);
+		this.processInput.flush();
 
 		// wait for it to complete
-		int complete = 0;
+		var complete = 0;
 		while (complete < 3) {
-			String line = processOutput.readLine();
-			if (SIM_DEBUG && logFile != null)
-				logFile.println("getBit: complete=" + complete + ", read=" + line);
+			var line = this.processOutput.readLine();
+			if (SIM_DEBUG && this.logFile != null) {
+				this.logFile.println("getBit: complete=" + complete + ", read=" + line);
+			}
 			if (complete == 0 && line.indexOf("OW = 1'b0") >= 0) {
 				complete++;
 				continue;
@@ -1414,34 +1433,37 @@ private boolean simulationGetBit() throws java.io.IOException {
 				continue;
 			}
 		}
-		if (SIM_DEBUG && logFile != null)
-			logFile.println("getBit: Complete");
+		if (SIM_DEBUG && this.logFile != null) {
+			this.logFile.println("getBit: Complete");
+		}
 		return bit;
 	}
 
 	private byte simulationGetByte() throws java.io.IOException {
 		byte bits = 0;
 
-		if (SIM_DEBUG && logFile != null) {
-			logFile.println("getByte: Writing=" + OW_READ_BYTE_CMD);
-			logFile.println("getByte: Writing=" + RUN + OW_READ_BYTE_RUN_LENGTH);
+		if (SIM_DEBUG && this.logFile != null) {
+			this.logFile.println("getByte: Writing=" + OW_READ_BYTE_CMD);
+			this.logFile.println("getByte: Writing=" + RUN + OW_READ_BYTE_RUN_LENGTH);
 		}
-		processInput.write(OW_READ_BYTE_CMD + LINE_DELIM);
-		processInput.write(RUN + OW_READ_BYTE_RUN_LENGTH + LINE_DELIM);
-		processInput.flush();
+		this.processInput.write(OW_READ_BYTE_CMD + LINE_DELIM);
+		this.processInput.write(RUN + OW_READ_BYTE_RUN_LENGTH + LINE_DELIM);
+		this.processInput.flush();
 
 		// wait for it to complete
 		try {
-			int complete = 0;
+			var complete = 0;
 			while (complete < 2) {
-				String line = processOutput.readLine();
-				if (SIM_DEBUG && logFile != null)
-					logFile.println("getByte: complete=" + complete + ", read=" + line);
+				var line = this.processOutput.readLine();
+				if (SIM_DEBUG && this.logFile != null) {
+					this.logFile.println("getByte: complete=" + complete + ", read=" + line);
+				}
 				if (complete == 0 && line.indexOf(OW_READ_RESULT) >= 0) {
-					int i = line.indexOf(OW_READ_RESULT) + OW_READ_RESULT.length();
-					String bitstr = line.substring(i, i + 2);
-					if (SIM_DEBUG && logFile != null)
-						logFile.println("getByte: bitstr=" + bitstr);
+					var i = line.indexOf(OW_READ_RESULT) + OW_READ_RESULT.length();
+					var bitstr = line.substring(i, i + 2);
+					if (SIM_DEBUG && this.logFile != null) {
+						this.logFile.println("getByte: bitstr=" + bitstr);
+					}
 					bits = (byte) (Convert.toInt(bitstr) & 0x0FF);
 					complete++;
 					continue;
@@ -1451,106 +1473,115 @@ private byte simulationGetByte() throws java.io.IOException {
 					continue;
 				}
 			}
-			if (SIM_DEBUG && logFile != null)
-				logFile.println("getByte: complete");
+			if (SIM_DEBUG && this.logFile != null) {
+				this.logFile.println("getByte: complete");
+			}
 		} catch (Convert.ConvertException ce) {
-			if (SIM_DEBUG && logFile != null)
-				logFile.println("Error during hex string conversion: " + ce);
+			if (SIM_DEBUG && this.logFile != null) {
+				this.logFile.println("Error during hex string conversion: " + ce);
+			}
 		}
 		return bits;
 	}
 
 	private void simulationPutBit(boolean bit) throws java.io.IOException {
 		if (bit) {
-			if (SIM_DEBUG && logFile != null) {
-				logFile.println("putBit: Writing=" + OW_WRITE_ONE_CMD);
-				logFile.println("putBit: Writing=" + RUN + OW_WRITE_ONE_RUN_LENGTH);
+			if (SIM_DEBUG && this.logFile != null) {
+				this.logFile.println("putBit: Writing=" + OW_WRITE_ONE_CMD);
+				this.logFile.println("putBit: Writing=" + RUN + OW_WRITE_ONE_RUN_LENGTH);
 			}
-			processInput.write(OW_WRITE_ONE_CMD + LINE_DELIM);
-			processInput.write(RUN + OW_WRITE_ONE_RUN_LENGTH + LINE_DELIM);
+			this.processInput.write(OW_WRITE_ONE_CMD + LINE_DELIM);
+			this.processInput.write(RUN + OW_WRITE_ONE_RUN_LENGTH + LINE_DELIM);
 		} else {
-			if (SIM_DEBUG && logFile != null) {
-				logFile.println("putBit: Writing=" + OW_WRITE_ZERO_CMD);
-				logFile.println("putBit: Writing=" + RUN + OW_WRITE_ZERO_RUN_LENGTH);
+			if (SIM_DEBUG && this.logFile != null) {
+				this.logFile.println("putBit: Writing=" + OW_WRITE_ZERO_CMD);
+				this.logFile.println("putBit: Writing=" + RUN + OW_WRITE_ZERO_RUN_LENGTH);
 			}
-			processInput.write(OW_WRITE_ZERO_CMD + LINE_DELIM);
-			processInput.write(RUN + OW_WRITE_ZERO_RUN_LENGTH + LINE_DELIM);
+			this.processInput.write(OW_WRITE_ZERO_CMD + LINE_DELIM);
+			this.processInput.write(RUN + OW_WRITE_ZERO_RUN_LENGTH + LINE_DELIM);
 		}
-		processInput.flush();
+		this.processInput.flush();
 
 		// wait for it to complete
-		int complete = 0;
+		var complete = 0;
 		while (complete < 1) {
-			String line = processOutput.readLine();
-			if (SIM_DEBUG && logFile != null)
-				logFile.println("putBit: complete=" + complete + ", read=" + line);
+			var line = this.processOutput.readLine();
+			if (SIM_DEBUG && this.logFile != null) {
+				this.logFile.println("putBit: complete=" + complete + ", read=" + line);
+			}
 			if (complete == 0 && line.indexOf(GENERIC_CMD_END) >= 0) {
 				complete++;
 				continue;
 			}
 		}
-		if (SIM_DEBUG && logFile != null)
-			logFile.println("putBit: complete");
+		if (SIM_DEBUG && this.logFile != null) {
+			this.logFile.println("putBit: complete");
+		}
 	}
 
 	private void simulationPutByte(byte b) throws IOException {
-		if (SIM_DEBUG && logFile != null) {
-			logFile.println("putByte: Writing=" + OW_WRITE_BYTE_ARG + Convert.toHexString(b));
-			logFile.println("putByte: Writing=" + OW_WRITE_BYTE_CMD);
-			logFile.println("putByte: Writing=" + RUN + OW_WRITE_BYTE_RUN_LENGTH);
+		if (SIM_DEBUG && this.logFile != null) {
+			this.logFile.println("putByte: Writing=" + OW_WRITE_BYTE_ARG + Convert.toHexString(b));
+			this.logFile.println("putByte: Writing=" + OW_WRITE_BYTE_CMD);
+			this.logFile.println("putByte: Writing=" + RUN + OW_WRITE_BYTE_RUN_LENGTH);
 		}
-		processInput.write(OW_WRITE_BYTE_ARG + Convert.toHexString(b) + LINE_DELIM);
-		processInput.write(OW_WRITE_BYTE_CMD + LINE_DELIM);
-		processInput.write(RUN + OW_WRITE_BYTE_RUN_LENGTH + LINE_DELIM);
-		processInput.flush();
+		this.processInput.write(OW_WRITE_BYTE_ARG + Convert.toHexString(b) + LINE_DELIM);
+		this.processInput.write(OW_WRITE_BYTE_CMD + LINE_DELIM);
+		this.processInput.write(RUN + OW_WRITE_BYTE_RUN_LENGTH + LINE_DELIM);
+		this.processInput.flush();
 
 		// wait for it to complete
-		int complete = 0;
+		var complete = 0;
 		while (complete < 1) {
-			String line = processOutput.readLine();
-			if (SIM_DEBUG && logFile != null)
-				logFile.println("putByte: complete=" + complete + ", read=" + line);
+			var line = this.processOutput.readLine();
+			if (SIM_DEBUG && this.logFile != null) {
+				this.logFile.println("putByte: complete=" + complete + ", read=" + line);
+			}
 			if (complete == 0 && line.indexOf(GENERIC_CMD_END) >= 0) {
 				complete++;
 				continue;
 			}
 		}
-		if (SIM_DEBUG && logFile != null)
-			logFile.println("putByte: complete");
+		if (SIM_DEBUG && this.logFile != null) {
+			this.logFile.println("putByte: complete");
+		}
 	}
 
 	private void simulationPing(long timeDelta) throws IOException {
-		if (SIM_DEBUG && logFile != null) {
-			logFile.println("ping: timeDelta=" + timeDelta);
-			logFile.println("ping: Writing=" + RUN + (PING_MS_RUN_LENGTH * timeDelta));
+		if (SIM_DEBUG && this.logFile != null) {
+			this.logFile.println("ping: timeDelta=" + timeDelta);
+			this.logFile.println("ping: Writing=" + RUN + PING_MS_RUN_LENGTH * timeDelta);
 		}
-		processInput.write(RUN + (PING_MS_RUN_LENGTH * timeDelta) + LINE_DELIM);
-		processInput.flush();
+		this.processInput.write(RUN + PING_MS_RUN_LENGTH * timeDelta + LINE_DELIM);
+		this.processInput.flush();
 
 		// wait for it to complete
-		int complete = 0;
+		var complete = 0;
 		while (complete < 1) {
-			String line = processOutput.readLine();
-			if (SIM_DEBUG && logFile != null)
-				logFile.println("ping: complete=" + complete + ", read=" + line);
+			var line = this.processOutput.readLine();
+			if (SIM_DEBUG && this.logFile != null) {
+				this.logFile.println("ping: complete=" + complete + ", read=" + line);
+			}
 			if (complete == 0 && line.indexOf(GENERIC_CMD_END) >= 0) {
 				complete++;
 				continue;
 			}
 		}
-		if (SIM_DEBUG && logFile != null)
-			logFile.println("ping: complete");
+		if (SIM_DEBUG && this.logFile != null) {
+			this.logFile.println("ping: complete");
+		}
 	}
 
 	private void simulationGetAddress() throws IOException {
 		this.fakeAddress = new byte[8];
 		// reset the simulated part
-		simulationReset();
+		this.simulationReset();
 		// put the Read Rom command
-		simulationPutByte((byte) 0x33);
+		this.simulationPutByte((byte) 0x33);
 		// get the Rom ID
-		for (int i = 0; i < 8; i++)
-			this.fakeAddress[i] = simulationGetByte();
+		for (var i = 0; i < 8; i++) {
+			this.fakeAddress[i] = this.simulationGetByte();
+		}
 	}
 
 	// --------
@@ -1574,7 +1605,7 @@ public static void main(String[] args) throws Exception {
 			System.exit(1);
 		}
 
-		String execCmd = args[0];
+		var execCmd = args[0];
 		System.out.println("   Executing: " + execCmd);
 		String logFilename = null;
 		if (args.length > 1) {
@@ -1588,14 +1619,14 @@ public static void main(String[] args) throws Exception {
 			System.out.println("   Simulation Debugging is: " + (NetAdapterSim.SIM_DEBUG ? "enabled" : "disabled"));
 		}
 
-		NetAdapterSim host = new NetAdapterSim(execCmd, logFilename);
+		var host = new NetAdapterSim(execCmd, logFilename);
 		System.out.println("Device Address=" + Address.toString(host.fakeAddress));
 
 		System.out.println("Starting Multicast Listener...");
 		host.createMulticastListener();
 
 		System.out.println("Starting NetAdapter Host...");
-		(new Thread(host)).start();
+		new Thread(host).start();
 		System.out.println("NetAdapter Host Started");
 	}
 }
diff --git a/io.openems.edge.bridge.onewire/src/com/dalsemi/onewire/adapter/OneWireIOException.java b/io.openems.edge.bridge.onewire/src/com/dalsemi/onewire/adapter/OneWireIOException.java
index a136f0ce87b..2c40c565c25 100644
--- a/io.openems.edge.bridge.onewire/src/com/dalsemi/onewire/adapter/OneWireIOException.java
+++ b/io.openems.edge.bridge.onewire/src/com/dalsemi/onewire/adapter/OneWireIOException.java
@@ -46,7 +46,6 @@ public class OneWireIOException extends OneWireException {
 	 * Constructs a <code>OneWireIOException</code> with no detail message.
 	 */
 	public OneWireIOException() {
-		super();
 	}
 
 	/**
diff --git a/io.openems.edge.bridge.onewire/src/com/dalsemi/onewire/adapter/OneWireState.java b/io.openems.edge.bridge.onewire/src/com/dalsemi/onewire/adapter/OneWireState.java
index 11cf222e03a..be3e80f94dd 100644
--- a/io.openems.edge.bridge.onewire/src/com/dalsemi/onewire/adapter/OneWireState.java
+++ b/io.openems.edge.bridge.onewire/src/com/dalsemi/onewire/adapter/OneWireState.java
@@ -165,30 +165,30 @@ class OneWireState {
 	public OneWireState() {
 
 		// speed, level
-		oneWireSpeed = DSPortAdapter.SPEED_REGULAR;
-		oneWireLevel = DSPortAdapter.LEVEL_NORMAL;
+		this.oneWireSpeed = DSPortAdapter.SPEED_REGULAR;
+		this.oneWireLevel = DSPortAdapter.LEVEL_NORMAL;
 
 		// level primed
-		levelChangeOnNextBit = false;
-		levelChangeOnNextByte = false;
-		primedLevelValue = DSPortAdapter.LEVEL_NORMAL;
-		levelTimeFactor = DSPortAdapter.DELIVERY_INFINITE;
+		this.levelChangeOnNextBit = false;
+		this.levelChangeOnNextByte = false;
+		this.primedLevelValue = DSPortAdapter.LEVEL_NORMAL;
+		this.levelTimeFactor = DSPortAdapter.DELIVERY_INFINITE;
 
 		// adapter abilities
-		canProgram = false;
+		this.canProgram = false;
 
 		// search options
-		searchIncludeFamilies = new byte[0];
-		searchExcludeFamilies = new byte[0];
-		searchOnlyAlarmingButtons = false;
-		skipResetOnSearch = false;
+		this.searchIncludeFamilies = new byte[0];
+		this.searchExcludeFamilies = new byte[0];
+		this.searchOnlyAlarmingButtons = false;
+		this.skipResetOnSearch = false;
 
 		// new iButton object
-		ID = new byte[8];
+		this.ID = new byte[8];
 
 		// search state
-		searchLastDiscrepancy = 0;
-		searchFamilyLastDiscrepancy = 0;
-		searchLastDevice = false;
+		this.searchLastDiscrepancy = 0;
+		this.searchFamilyLastDiscrepancy = 0;
+		this.searchLastDevice = false;
 	}
 }
diff --git a/io.openems.edge.bridge.onewire/src/com/dalsemi/onewire/adapter/PDKAdapterUSB.java b/io.openems.edge.bridge.onewire/src/com/dalsemi/onewire/adapter/PDKAdapterUSB.java
index 5356c831401..633b2da694f 100644
--- a/io.openems.edge.bridge.onewire/src/com/dalsemi/onewire/adapter/PDKAdapterUSB.java
+++ b/io.openems.edge.bridge.onewire/src/com/dalsemi/onewire/adapter/PDKAdapterUSB.java
@@ -40,7 +40,7 @@ public class PDKAdapterUSB extends DSPortAdapter {
 	private int port_handle = -1;
 	private String port_name = "";
 
-	private Object syncObj = new Object();
+	private final Object syncObj = new Object();
 	private static Object staticSyncObj = new Object();
 	private static boolean libLoaded = false;
 	private boolean inExclusive = false;
@@ -52,18 +52,19 @@ public PDKAdapterUSB() {
 				libLoaded = true;
 			}
 		}
-		inExclusive = false;
+		this.inExclusive = false;
 	}
 
 	private native int OpenPort(String port);
 
+	@Override
 	public boolean selectPort(String portName) throws OneWireIOException, OneWireException {
 		try {
-			int portnumber = Integer.parseInt(portName.substring(3));
-			port_handle = OpenPort("DS2490-" + portnumber);
-			port_name = portName;
-			inExclusive = false;
-			return port_handle != -1;
+			var portnumber = Integer.parseInt(portName.substring(3));
+			this.port_handle = this.OpenPort("DS2490-" + portnumber);
+			this.port_name = portName;
+			this.inExclusive = false;
+			return this.port_handle != -1;
 		} catch (Exception e) {
 			throw new OneWireException("Bad Portnumber: " + portName);
 		}
@@ -71,98 +72,116 @@ public boolean selectPort(String portName) throws OneWireIOException, OneWireExc
 
 	private native void ClosePort(int port);
 
+	@Override
 	public void freePort() throws OneWireException {
-		if (port_handle != -1) {
-			ClosePort(port_handle);
-			port_handle = -1;
-			port_name = "";
-			inExclusive = false;
+		if (this.port_handle != -1) {
+			this.ClosePort(this.port_handle);
+			this.port_handle = -1;
+			this.port_name = "";
+			this.inExclusive = false;
 		}
 	}
 
+	@Override
 	public String getAdapterName() {
 		return "DS9490";
 	}
 
+	@Override
 	public String getPortTypeDescription() {
 		return "USB Adapter with libUSB and PDK API";
 	}
 
+	@Override
 	public String getClassVersion() {
 		return "USB-Beta";
 	}
 
+	@Override
 	public Enumeration<String> getPortNames() {
-		java.util.Vector<String> v = new java.util.Vector<String>();
-		for (int i = 1; i < 15; i++)
+		var v = new java.util.Vector<String>();
+		for (var i = 1; i < 15; i++) {
 			v.addElement("USB" + i);
+		}
 		return v.elements();
 	}
 
+	@Override
 	public String getPortName() throws OneWireException {
-		return port_name;
+		return this.port_name;
 	}
 
 	private native boolean AdapterDetected(int portHandle);
 
+	@Override
 	public boolean adapterDetected() throws OneWireIOException, OneWireException {
-		if (port_handle != -1) {
-			return AdapterDetected(port_handle);
-		} else
-			throw new OneWireException("Port not selected");
+		if (this.port_handle != -1) {
+			return this.AdapterDetected(this.port_handle);
+		}
+		throw new OneWireException("Port not selected");
 	}
 
 	private native void GetAddress(int portHandle, byte[] address);
 
+	@Override
 	public void getAddress(byte[] address) {
-		if (port_handle != -1)
-			GetAddress(port_handle, address);
+		if (this.port_handle != -1) {
+			this.GetAddress(this.port_handle, address);
+		}
 	}
 
 	private native int Search(int portHandle, boolean find_first, boolean do_reset, boolean alarm_only);
 
+	@Override
 	public boolean findFirstDevice() throws OneWireIOException, OneWireException {
-		if (port_handle != -1) {
-			int ret = Search(port_handle, true, !searchNoReset, searchAlarmOnly);
-			if (ret == -1)
-				throw new OneWireException("Adapter communication error during search");
-			return ret == 1 ? true : false;
-		} else
+		if (this.port_handle == -1) {
 			throw new OneWireException("Port not selected");
+		}
+		var ret = this.Search(this.port_handle, true, !this.searchNoReset, this.searchAlarmOnly);
+		if (ret == -1) {
+			throw new OneWireException("Adapter communication error during search");
+		}
+		return ret == 1 == true;
 	}
 
+	@Override
 	public boolean findNextDevice() throws OneWireIOException, OneWireException {
-		if (port_handle != -1) {
-			int ret = Search(port_handle, false, !searchNoReset, searchAlarmOnly);
-			if (ret == -1)
-				throw new OneWireException("Adapter communication error during search");
-			return ret == 1 ? true : false;
-		} else
+		if (this.port_handle == -1) {
 			throw new OneWireException("Port not selected");
+		}
+		var ret = this.Search(this.port_handle, false, !this.searchNoReset, this.searchAlarmOnly);
+		if (ret == -1) {
+			throw new OneWireException("Adapter communication error during search");
+		}
+		return ret == 1 == true;
 	}
 
 	private boolean searchAlarmOnly = false;
 	private boolean searchNoReset = false;
 
+	@Override
 	public void setSearchOnlyAlarmingDevices() {
-		searchAlarmOnly = true;
+		this.searchAlarmOnly = true;
 	}
 
+	@Override
 	public void setNoResetSearch() {
-		searchNoReset = true;
+		this.searchNoReset = true;
 	}
 
+	@Override
 	public void setSearchAllDevices() {
-		searchAlarmOnly = false;
-		searchNoReset = false;
+		this.searchAlarmOnly = false;
+		this.searchNoReset = false;
 	}
 
+	@Override
 	public boolean beginExclusive(boolean blocking) throws OneWireException {
-		boolean gotExclusive = false;
+		var gotExclusive = false;
 		while (!gotExclusive && blocking) {
-			synchronized (syncObj) {
-				if (!inExclusive) {
-					inExclusive = true;
+			synchronized (this.syncObj) {
+				if (!this.inExclusive) {
+					this.inExclusive = true;
 					gotExclusive = true;
 				}
 			}
@@ -170,125 +189,139 @@ public boolean beginExclusive(boolean blocking) throws OneWireException {
 		return false;
 	}
 
+	@Override
 	public void endExclusive() {
-		inExclusive = false;
+		this.inExclusive = false;
 	}
 
 	private native int TouchBit(int portHandle, int dataBit);
 
 	private native int TouchBitPower(int portHandle, int dataBit);
 
+	@Override
 	public void putBit(boolean dataBit) throws OneWireIOException, OneWireException {
-		if (port_handle != -1) {
-			int ret;
-			if (levelChangeOnNextBit && primedLevelValue == LEVEL_POWER_DELIVERY)
-				ret = TouchBitPower(port_handle, dataBit ? 1 : 0);
-			else
-				ret = TouchBit(port_handle, dataBit ? 1 : 0);
-			levelChangeOnNextBit = false;
-
-			if (ret == -1)
-				throw new OneWireIOException("1-Wire Adapter Communication Failed During Touchbit");
-			else if (ret != (dataBit ? 1 : 0))
-				throw new OneWireIOException("PutBit failed, echo did not match");
-		} else
+		if (this.port_handle == -1) {
 			throw new OneWireException("Port not selected");
+		}
+		int ret;
+		if (this.levelChangeOnNextBit && this.primedLevelValue == LEVEL_POWER_DELIVERY) {
+			ret = this.TouchBitPower(this.port_handle, dataBit ? 1 : 0);
+		} else {
+			ret = this.TouchBit(this.port_handle, dataBit ? 1 : 0);
+		}
+		this.levelChangeOnNextBit = false;
+
+		if (ret == -1) {
+			throw new OneWireIOException("1-Wire Adapter Communication Failed During Touchbit");
+		} else if (ret != (dataBit ? 1 : 0)) {
+			throw new OneWireIOException("PutBit failed, echo did not match");
+		}
 	}
 
+	@Override
 	public boolean getBit() throws OneWireIOException, OneWireException {
-		if (port_handle != -1) {
-			int ret;
-			if (levelChangeOnNextBit && primedLevelValue == LEVEL_POWER_DELIVERY)
-				ret = TouchBitPower(port_handle, 1);
-			else
-				ret = TouchBit(port_handle, 1);
-			levelChangeOnNextBit = false;
-
-			if (ret == 1)
-				return true;
-			else if (ret == 0)
-				return false;
-			else
-				throw new OneWireIOException("1-Wire Adapter Communication Failed During Touchbit");
-		} else
+		if (this.port_handle == -1) {
 			throw new OneWireException("Port not selected");
+		}
+		int ret;
+		if (this.levelChangeOnNextBit && this.primedLevelValue == LEVEL_POWER_DELIVERY) {
+			ret = this.TouchBitPower(this.port_handle, 1);
+		} else {
+			ret = this.TouchBit(this.port_handle, 1);
+		}
+		this.levelChangeOnNextBit = false;
+
+		if (ret == 1) {
+			return true;
+		} else if (ret == 0) {
+			return false;
+		} else {
+			throw new OneWireIOException("1-Wire Adapter Communication Failed During Touchbit");
+		}
 	}
 
 	private native int TouchByte(int portHandle, int dataByte);
 
 	private native int TouchBytePower(int portHandle, int dataByte);
 
+	@Override
 	public void putByte(int dataByte) throws OneWireIOException, OneWireException {
-		if (port_handle != -1) {
-			int ret;
-			if (levelChangeOnNextByte && primedLevelValue == LEVEL_POWER_DELIVERY)
-				ret = TouchBytePower(port_handle, dataByte);
-			else
-				ret = TouchByte(port_handle, dataByte);
-			levelChangeOnNextByte = false;
-
-// TODO non-functional
-//			if (ret == -1)
-//				throw new OneWireIOException("1-Wire Adapter Communication Failed During Touchbyte");
-//			else if (ret != dataByte)
-//				throw new OneWireIOException("PutByte failed, echo did not match");
-		} else
+		if (this.port_handle == -1) {
 			throw new OneWireException("Port not selected");
+		}
+		int ret;
+		if (this.levelChangeOnNextByte && this.primedLevelValue == LEVEL_POWER_DELIVERY) {
+			ret = this.TouchBytePower(this.port_handle, dataByte);
+		} else {
+			ret = this.TouchByte(this.port_handle, dataByte);
+		}
+		this.levelChangeOnNextByte = false;
 	}
 
+	@Override
 	public int getByte() throws OneWireIOException, OneWireException {
-		if (port_handle != -1) {
-			int ret;
-			if (levelChangeOnNextByte && primedLevelValue == LEVEL_POWER_DELIVERY)
-				ret = TouchBytePower(port_handle, 0x0FF);
-			else
-				ret = TouchByte(port_handle, 0x0FF);
-			levelChangeOnNextByte = false;
-
-			if (ret == -1)
-				throw new OneWireIOException("1-Wire Adapter Communication Failed During Touchbyte");
-			return ret;
-		} else
+		if (this.port_handle == -1) {
 			throw new OneWireException("Port not selected");
+		}
+		int ret;
+		if (this.levelChangeOnNextByte && this.primedLevelValue == LEVEL_POWER_DELIVERY) {
+			ret = this.TouchBytePower(this.port_handle, 0x0FF);
+		} else {
+			ret = this.TouchByte(this.port_handle, 0x0FF);
+		}
+		this.levelChangeOnNextByte = false;
+
+		if (ret == -1) {
+			throw new OneWireIOException("1-Wire Adapter Communication Failed During Touchbyte");
+		}
+		return ret;
 	}
 
+	@Override
 	public byte[] getBlock(int len) throws OneWireIOException, OneWireException {
-		byte[] buff = new byte[len];
-		getBlock(buff, 0, len);
+		var buff = new byte[len];
+		this.getBlock(buff, 0, len);
 		return buff;
 	}
 
+	@Override
 	public void getBlock(byte[] buff, int len) throws OneWireIOException, OneWireException {
-		getBlock(buff, 0, len);
+		this.getBlock(buff, 0, len);
 	}
 
+	@Override
 	public void getBlock(byte[] buff, int off, int len) throws OneWireIOException, OneWireException {
-		for (int i = 0; i < len; i++)
+		for (var i = 0; i < len; i++) {
 			buff[i + off] = (byte) 0xFF;
-		dataBlock(buff, off, len);
+		}
+		this.dataBlock(buff, off, len);
 	}
 
 	private native int DataBlock(int portHandle, byte[] buff, int off, int len);
 
+	@Override
 	public void dataBlock(byte[] buff, int off, int len) throws OneWireIOException, OneWireException {
-		if (port_handle != -1) {
-			int ret = DataBlock(port_handle, buff, off, len);
-			if (ret == -1)
-				throw new OneWireIOException("1-Wire Adapter Communication Failed During Reset");
-		} else
+		if (this.port_handle == -1) {
 			throw new OneWireException("Port not selected");
+		}
+		var ret = this.DataBlock(this.port_handle, buff, off, len);
+		if (ret == -1) {
+			throw new OneWireIOException("1-Wire Adapter Communication Failed During Reset");
+		}
 	}
 
 	private native int Reset(int portHandle);
 
+	@Override
 	public int reset() throws OneWireIOException, OneWireException {
-		if (port_handle != -1) {
-			int ret = Reset(port_handle);
-			if (ret == -1)
-				throw new OneWireIOException("1-Wire Adapter Communication Failed During Reset");
-			return ret;
-		} else
+		if (this.port_handle == -1) {
 			throw new OneWireException("Port not selected");
+		}
+		var ret = this.Reset(this.port_handle);
+		if (ret == -1) {
+			throw new OneWireIOException("1-Wire Adapter Communication Failed During Reset");
+		}
+		return ret;
 	}
 
 	// --------
@@ -309,6 +342,7 @@ public int reset() throws OneWireIOException, OneWireException {
 	 * @throws OneWireIOException on a 1-Wire communication error with the adapter
 	 * @throws OneWireException   on a setup error with the 1-Wire adapter
 	 */
+	@Override
 	public boolean canOverdrive() throws OneWireIOException, OneWireException {
 		return false;
 	}
@@ -322,6 +356,7 @@ public boolean canOverdrive() throws OneWireIOException, OneWireException {
 	 * @throws OneWireIOException on a 1-Wire communication error with the adapter
 	 * @throws OneWireException   on a setup error with the 1-Wire adapter
 	 */
+	@Override
 	public boolean canHyperdrive() throws OneWireIOException, OneWireException {
 		return false;
 	}
@@ -335,6 +370,7 @@ public boolean canHyperdrive() throws OneWireIOException, OneWireException {
 	 * @throws OneWireIOException on a 1-Wire communication error with the adapter
 	 * @throws OneWireException   on a setup error with the 1-Wire adapter
 	 */
+	@Override
 	public boolean canFlex() throws OneWireIOException, OneWireException {
 		return false;
 	}
@@ -348,6 +384,7 @@ public boolean canFlex() throws OneWireIOException, OneWireException {
 	 * @throws OneWireIOException on a 1-Wire communication error with the adapter
 	 * @throws OneWireException   on a setup error with the 1-Wire adapter
 	 */
+	@Override
 	public boolean canProgram() throws OneWireIOException, OneWireException {
 		return false;
 	}
@@ -361,6 +398,7 @@ public boolean canProgram() throws OneWireIOException, OneWireException {
 	 * @throws OneWireIOException on a 1-Wire communication error with the adapter
 	 * @throws OneWireException   on a setup error with the 1-Wire adapter
 	 */
+	@Override
 	public boolean canDeliverPower() throws OneWireIOException, OneWireException {
 		return true;
 	}
@@ -377,6 +415,7 @@ public boolean canDeliverPower() throws OneWireIOException, OneWireException {
 	 * @throws OneWireIOException on a 1-Wire communication error with the adapter
 	 * @throws OneWireException   on a setup error with the 1-Wire adapter
 	 */
+	@Override
 	public boolean canDeliverSmartPower() throws OneWireIOException, OneWireException {
 
 		// regardless of adapter, the class does not support it
@@ -392,6 +431,7 @@ public boolean canDeliverSmartPower() throws OneWireIOException, OneWireExceptio
 	 * @throws OneWireIOException on a 1-Wire communication error with the adapter
 	 * @throws OneWireException   on a setup error with the 1-Wire adapter
 	 */
+	@Override
 	public boolean canBreak() throws OneWireIOException, OneWireException {
 		return false;
 	}
@@ -425,12 +465,13 @@ public boolean canBreak() throws OneWireIOException, OneWireException {
 	 * @throws OneWireIOException on a 1-Wire communication error
 	 * @throws OneWireException   on a setup error with the 1-Wire adapter
 	 */
+	@Override
 	public void setPowerDuration(int timeFactor) throws OneWireIOException, OneWireException {
-		if (timeFactor != DELIVERY_INFINITE)
+		if (timeFactor != DELIVERY_INFINITE) {
 			throw new OneWireException(
 					"USerialAdapter-setPowerDuration, does not support this duration, infinite only");
-		else
-			levelTimeFactor = DELIVERY_INFINITE;
+		}
+		this.levelTimeFactor = DELIVERY_INFINITE;
 	}
 
 	int levelTimeFactor = DELIVERY_INFINITE;
@@ -465,35 +506,39 @@ public void setPowerDuration(int timeFactor) throws OneWireIOException, OneWireE
 	 * @throws OneWireIOException on a 1-Wire communication error
 	 * @throws OneWireException   on a setup error with the 1-Wire adapter
 	 */
+	@Override
 	public boolean startPowerDelivery(int changeCondition) throws OneWireIOException, OneWireException {
-		if (changeCondition == CONDITION_AFTER_BIT) {
-			levelChangeOnNextBit = true;
-			primedLevelValue = LEVEL_POWER_DELIVERY;
+		switch (changeCondition) {
+		case CONDITION_AFTER_BIT:
+			this.levelChangeOnNextBit = true;
+			this.primedLevelValue = LEVEL_POWER_DELIVERY;
 			return true;
-		} else if (changeCondition == CONDITION_AFTER_BYTE) {
-			levelChangeOnNextByte = true;
-			primedLevelValue = LEVEL_POWER_DELIVERY;
+		case CONDITION_AFTER_BYTE:
+			this.levelChangeOnNextByte = true;
+			this.primedLevelValue = LEVEL_POWER_DELIVERY;
 			return true;
-		} else if (changeCondition == CONDITION_NOW) {
-			int ret = PowerLevel(port_handle, LEVEL_POWER_DELIVERY);
-
-			if (ret == 1)
+		case CONDITION_NOW:
+			var ret = this.PowerLevel(this.port_handle, LEVEL_POWER_DELIVERY);
+			if (ret == 1) {
 				return true;
-			else if (ret == 0)
+			} else if (ret == 0) {
 				return false;
-			else
+			} else {
 				throw new OneWireIOException("1-Wire Adapter Communication Failed");
-		} else
+			}
+		default:
 			throw new OneWireException("Invalid power delivery condition");
+		}
 	}
 
 	public native int PowerLevel(int portHandle, int newLevel);
 
+	@Override
 	public void setPowerNormal() {
-		levelChangeOnNextByte = false;
-		levelChangeOnNextBit = false;
-		primedLevelValue = LEVEL_NORMAL;
-		PowerLevel(port_handle, LEVEL_NORMAL);
+		this.levelChangeOnNextByte = false;
+		this.levelChangeOnNextBit = false;
+		this.primedLevelValue = LEVEL_NORMAL;
+		this.PowerLevel(this.port_handle, LEVEL_NORMAL);
 	}
 
 }
diff --git a/io.openems.edge.bridge.onewire/src/com/dalsemi/onewire/adapter/RawSendPacket.java b/io.openems.edge.bridge.onewire/src/com/dalsemi/onewire/adapter/RawSendPacket.java
index 040eed45cbd..71eef790679 100644
--- a/io.openems.edge.bridge.onewire/src/com/dalsemi/onewire/adapter/RawSendPacket.java
+++ b/io.openems.edge.bridge.onewire/src/com/dalsemi/onewire/adapter/RawSendPacket.java
@@ -44,7 +44,7 @@ class RawSendPacket {
 	/**
 	 * StringBuffer of bytes to send
 	 */
-	public StringBuffer buffer;
+	public StringBuilder buffer;
 
 	/**
 	 * Expected length of return packet
@@ -59,7 +59,7 @@ class RawSendPacket {
 	 * Construct and initiailize the raw send packet
 	 */
 	public RawSendPacket() {
-		buffer = new StringBuffer();
-		returnLength = 0;
+		this.buffer = new StringBuilder();
+		this.returnLength = 0;
 	}
 }
diff --git a/io.openems.edge.bridge.onewire/src/com/dalsemi/onewire/adapter/SerialService.java b/io.openems.edge.bridge.onewire/src/com/dalsemi/onewire/adapter/SerialService.java
index c10254d15dc..f68f2eca7d5 100644
--- a/io.openems.edge.bridge.onewire/src/com/dalsemi/onewire/adapter/SerialService.java
+++ b/io.openems.edge.bridge.onewire/src/com/dalsemi/onewire/adapter/SerialService.java
@@ -51,7 +51,7 @@
  * @author DS
  *
  */
-@SuppressWarnings({ "unused", "unchecked" })
+@SuppressWarnings({ "unchecked" })
 public class SerialService implements SerialPortEventListener {
 	private static final boolean DEBUG = false;
 	/** The serial port name of this object (e.g. COM1, /dev/ttyS0) */
@@ -66,8 +66,6 @@ public class SerialService implements SerialPortEventListener {
 	private int currentThreadHash = 0;
 	/** temporary array, used for converting characters to bytes */
 	private byte[] tempArray = new byte[128];
-	/** used to end the Object.wait loop in readWithTimeout method */
-	private transient boolean dataAvailable = false;
 
 	/** Vector of thread hash codes that have done an open but no close */
 	private final Vector<Thread> users = new Vector<>(4);
@@ -92,13 +90,15 @@ public class SerialService implements SerialPortEventListener {
 	 */
 	public static void CleanUpByThread(Thread t) {
 		// \\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//
-		if (DEBUG)
+		if (DEBUG) {
 			System.out.println("SerialService.CleanUpByThread(Thread)");
+		}
 		// \\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//
 		try {
-			SerialService temp = (SerialService) knownServices.get(t);
-			if (temp == null)
+			var temp = knownServices.get(t);
+			if (temp == null) {
 				return;
+			}
 
 			synchronized (temp) {
 				if (t.hashCode() == temp.currentThreadHash) {
@@ -111,20 +111,13 @@ public static void CleanUpByThread(Thread t) {
 			knownServices.remove(t);
 		} catch (Exception e) {
 			// \\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//
-			if (DEBUG)
+			if (DEBUG) {
 				System.out.println("Exception cleaning: " + e.toString());
-			// \\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//
+				// \\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//
+			}
 		}
 	}
 
-	/**
-	 * do not use default constructor user getSerialService(String) instead.
-	 */
-	private SerialService() {
-		this.comPortName = null;
-		this.byteBang = false;
-	}
-
 	/**
 	 * this constructor only for use in the static method: getSerialService(String)
 	 */
@@ -132,33 +125,34 @@ protected SerialService(String strComPort) {
 		this.comPortName = strComPort;
 
 		// check to see if need to byte-bang the reads
-		String prop = com.dalsemi.onewire.OneWireAccessProvider.getProperty("onewire.serial.bytebangread");
+		var prop = com.dalsemi.onewire.OneWireAccessProvider.getProperty("onewire.serial.bytebangread");
 		if (prop != null) {
-			if (prop.indexOf("true") != -1)
-				byteBang = true;
-			else
-				byteBang = false;
+			if (prop.indexOf("true") != -1) {
+				this.byteBang = true;
+			} else {
+				this.byteBang = false;
+			}
 		} else {
-			byteBang = false;
+			this.byteBang = false;
 		}
 	}
 
 	public static SerialService getSerialService(String strComPort) {
 		synchronized (uniqueServices) {
 			// \\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//
-			if (DEBUG)
+			if (DEBUG) {
 				System.out.println("SerialService.getSerialService called: strComPort=" + strComPort);
-			// \\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//
+				// \\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//
+			}
 
-			String strLowerCaseComPort = strComPort.toLowerCase();
+			var strLowerCaseComPort = strComPort.toLowerCase();
 			Object o = uniqueServices.get(strLowerCaseComPort);
 			if (o != null) {
 				return (SerialService) o;
-			} else {
-				SerialService sps = new SerialService(strComPort);
-				uniqueServices.put(strLowerCaseComPort, sps);
-				return sps;
 			}
+			var sps = new SerialService(strComPort);
+			uniqueServices.put(strLowerCaseComPort, sps);
+			return sps;
 		}
 	}
 
@@ -167,8 +161,8 @@ public static SerialService getSerialService(String strComPort) {
 	 * object, so that all blocking methods are kicked awake whenever a serialEvent
 	 * occurs.
 	 */
+	@Override
 	public void serialEvent(SerialPortEvent spe) {
-		dataAvailable = true;
 		if (DEBUG) {
 			switch (spe.getEventType()) {
 			case SerialPortEvent.BI:
@@ -217,102 +211,114 @@ public void serialEvent(SerialPortEvent spe) {
 
 	public synchronized void openPort() throws IOException {
 		// \\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//
-		if (DEBUG)
+		if (DEBUG) {
 			System.out.println("SerialService.openPort() called");
+		}
 		// \\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//
-		openPort(null);
+		this.openPort(null);
 	}
 
 	public synchronized void openPort(SerialPortEventListener spel) throws IOException {
 		// \\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//
-		if (DEBUG)
+		if (DEBUG) {
 			System.out.println("SerialService.openPort: Thread.currentThread()=" + Thread.currentThread());
+		}
 		// \\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//
 		// record this thread as an owner
-		if (users.indexOf(Thread.currentThread()) == -1)
-			users.addElement(Thread.currentThread());
+		if (this.users.indexOf(Thread.currentThread()) == -1) {
+			this.users.addElement(Thread.currentThread());
+		}
 
-		if (isPortOpen())
+		if (this.isPortOpen()) {
 			return;
+		}
 
 		CommPortIdentifier port_id;
 		try {
-			port_id = CommPortIdentifier.getPortIdentifier(comPortName);
+			port_id = CommPortIdentifier.getPortIdentifier(this.comPortName);
 		} catch (NoSuchPortException nspe) {
 			// \\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//
-			if (DEBUG)
-				System.out.println("SerialService.openPort: No such port (" + comPortName + "). " + nspe);
+			if (DEBUG) {
+				System.out.println("SerialService.openPort: No such port (" + this.comPortName + "). " + nspe);
+			}
 			// \\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//
-			throw new IOException("No such port (" + comPortName + "). " + nspe);
+			throw new IOException("No such port (" + this.comPortName + "). " + nspe);
 		}
 
 		// check if the port is currently used
 		if (port_id.isCurrentlyOwned()) {
 			// \\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//
-			if (DEBUG)
-				System.out.println("SerialService.openPort: Port In Use (" + comPortName + ")");
+			if (DEBUG) {
+				System.out.println("SerialService.openPort: Port In Use (" + this.comPortName + ")");
+			}
 			// \\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//
-			throw new IOException("Port In Use (" + comPortName + ")");
+			throw new IOException("Port In Use (" + this.comPortName + ")");
 		}
 
 		// try to acquire the port
 		try {
 			// get the port object
-			serialPort = (SerialPort) port_id.open("Maxim Integrated Products", 2000);
+			this.serialPort = (SerialPort) port_id.open("Maxim Integrated Products", 2000);
 
 			// serialPort.setInputBufferSize(4096);
 			// serialPort.setOutputBufferSize(4096);
 
 			// \\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//
 			if (DEBUG) {
-				System.out.println("SerialService.openPort: getInputBufferSize = " + serialPort.getInputBufferSize());
-				System.out.println("SerialService.openPort: getOutputBufferSize = " + serialPort.getOutputBufferSize());
+				System.out.println(
+						"SerialService.openPort: getInputBufferSize = " + this.serialPort.getInputBufferSize());
+				System.out.println(
+						"SerialService.openPort: getOutputBufferSize = " + this.serialPort.getOutputBufferSize());
 			}
 			// \\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//
 
-			if (spel != null)
-				serialPort.addEventListener(spel);
-			else
-				serialPort.addEventListener(this);
-			serialPort.notifyOnOutputEmpty(true);
-			serialPort.notifyOnDataAvailable(true);
+			if (spel != null) {
+				this.serialPort.addEventListener(spel);
+			} else {
+				this.serialPort.addEventListener(this);
+			}
+			this.serialPort.notifyOnOutputEmpty(true);
+			this.serialPort.notifyOnDataAvailable(true);
 
 			// flow i/o
-			serialPort.setFlowControlMode(SerialPort.FLOWCONTROL_NONE);
+			this.serialPort.setFlowControlMode(SerialPort.FLOWCONTROL_NONE);
 
-			serialInputStream = serialPort.getInputStream();
-			serialOutputStream = serialPort.getOutputStream();
+			this.serialInputStream = this.serialPort.getInputStream();
+			this.serialOutputStream = this.serialPort.getOutputStream();
 			// bug workaround
-			serialOutputStream.write(0);
+			this.serialOutputStream.write(0);
 
 			// settings
-			serialPort.disableReceiveFraming();
-			serialPort.disableReceiveThreshold();
-			serialPort.enableReceiveTimeout(1);
+			this.serialPort.disableReceiveFraming();
+			this.serialPort.disableReceiveThreshold();
+			this.serialPort.enableReceiveTimeout(1);
 
 			// set baud rate
-			serialPort.setSerialPortParams(9600, SerialPort.DATABITS_8, SerialPort.STOPBITS_1, SerialPort.PARITY_NONE);
+			this.serialPort.setSerialPortParams(9600, SerialPort.DATABITS_8, SerialPort.STOPBITS_1,
+					SerialPort.PARITY_NONE);
 
-			serialPort.setDTR(true);
-			serialPort.setRTS(true);
+			this.serialPort.setDTR(true);
+			this.serialPort.setRTS(true);
 
 			// \\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//
-			if (DEBUG)
-				System.out.println("SerialService.openPort: Port Opened (" + comPortName + ")");
-			// \\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//
+			if (DEBUG) {
+				System.out.println("SerialService.openPort: Port Opened (" + this.comPortName + ")");
+				// \\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//
+			}
 		} catch (Exception e) {
 			// close the port if we have an object
-			if (serialPort != null)
-				serialPort.close();
+			if (this.serialPort != null) {
+				this.serialPort.close();
+			}
 
-			serialPort = null;
+			this.serialPort = null;
 
-			throw new IOException("Could not open port (" + comPortName + ") :" + e);
+			throw new IOException("Could not open port (" + this.comPortName + ") :" + e);
 		}
 	}
 
 	public synchronized void setNotifyOnDataAvailable(boolean notify) {
-		serialPort.notifyOnDataAvailable(notify);
+		this.serialPort.notifyOnDataAvailable(notify);
 	}
 
 	public static Enumeration<String> getSerialPortIdentifiers() {
@@ -320,9 +326,10 @@ public static Enumeration<String> getSerialPortIdentifiers() {
 			if (vPortIDs.size() == 0) {
 				Enumeration<CommPortIdentifier> e = CommPortIdentifier.getPortIdentifiers();
 				while (e.hasMoreElements()) {
-					CommPortIdentifier portID = (CommPortIdentifier) e.nextElement();
-					if (portID.getPortType() == CommPortIdentifier.PORT_SERIAL)
+					var portID = e.nextElement();
+					if (portID.getPortType() == CommPortIdentifier.PORT_SERIAL) {
 						vPortIDs.addElement(portID.getName());
+					}
 				}
 			}
 			return vPortIDs.elements();
@@ -330,27 +337,27 @@ public static Enumeration<String> getSerialPortIdentifiers() {
 	}
 
 	public synchronized String getPortName() {
-		return comPortName;
+		return this.comPortName;
 	}
 
 	public synchronized boolean isPortOpen() {
-		return serialPort != null;
+		return this.serialPort != null;
 	}
 
 	public synchronized boolean isDTR() {
-		return serialPort.isDTR();
+		return this.serialPort.isDTR();
 	}
 
 	public synchronized void setDTR(boolean newDTR) {
-		serialPort.setDTR(newDTR);
+		this.serialPort.setDTR(newDTR);
 	}
 
 	public synchronized boolean isRTS() {
-		return serialPort.isRTS();
+		return this.serialPort.isRTS();
 	}
 
 	public synchronized void setRTS(boolean newRTS) {
-		serialPort.setRTS(newRTS);
+		this.serialPort.setRTS(newRTS);
 	}
 
 	/**
@@ -359,26 +366,28 @@ public synchronized void setRTS(boolean newRTS) {
 	 * @param duration - break duration in ms
 	 */
 	public synchronized void sendBreak(int duration) {
-		serialPort.sendBreak(duration);
+		this.serialPort.sendBreak(duration);
 	}
 
 	public synchronized int getBaudRate() {
-		return serialPort.getBaudRate();
+		return this.serialPort.getBaudRate();
 	}
 
 	public synchronized void setBaudRate(int baudRate) throws IOException {
-		if (!isPortOpen())
+		if (!this.isPortOpen()) {
 			throw new IOException("Port Not Open");
+		}
 
 		try {
 			// set baud rate
-			serialPort.setSerialPortParams(baudRate, SerialPort.DATABITS_8, SerialPort.STOPBITS_1,
+			this.serialPort.setSerialPortParams(baudRate, SerialPort.DATABITS_8, SerialPort.STOPBITS_1,
 					SerialPort.PARITY_NONE);
 
 			// \\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//
-			if (DEBUG)
+			if (DEBUG) {
 				System.out.println("SerialService.setBaudRate: baudRate=" + baudRate);
-			// \\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//
+				// \\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//
+			}
 		} catch (UnsupportedCommOperationException uncoe) {
 			throw new IOException("Failed to set baud rate: " + uncoe);
 		}
@@ -392,24 +401,28 @@ public synchronized void setBaudRate(int baudRate) throws IOException {
 	 */
 	public synchronized void closePort() throws IOException {
 		// \\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//
-		if (DEBUG)
+		if (DEBUG) {
 			System.out.println("SerialService.closePort");
+		}
 		// \\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//
-		closePortByThreadID(Thread.currentThread());
+		this.closePortByThreadID(Thread.currentThread());
 	}
 
 	public synchronized void flush() throws IOException {
 		// \\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//
-		if (DEBUG)
+		if (DEBUG) {
 			System.out.println("SerialService.flush");
-		// \\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//
+			// \\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//
+		}
 
-		if (!isPortOpen())
+		if (!this.isPortOpen()) {
 			throw new IOException("Port Not Open");
+		}
 
-		serialOutputStream.flush();
-		while (serialInputStream.available() > 0)
-			serialInputStream.read();
+		this.serialOutputStream.flush();
+		while (this.serialInputStream.available() > 0) {
+			this.serialInputStream.read();
+		}
 	}
 
 	// ------------------------------------------------------------------------
@@ -432,20 +445,21 @@ public synchronized void flush() throws IOException {
 	 */
 	public boolean beginExclusive(boolean blocking) {
 		// \\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//
-		if (DEBUG)
+		if (DEBUG) {
 			System.out.println("SerialService.beginExclusive(bool)");
+		}
 		// \\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//
-		if (blocking) {
-			while (!beginExclusive()) {
-				try {
-					Thread.sleep(50);
-				} catch (Exception e) {
-				}
+		if (!blocking) {
+			return this.beginExclusive();
+		}
+		while (!this.beginExclusive()) {
+			try {
+				Thread.sleep(50);
+			} catch (Exception e) {
 			}
+		}
 
-			return true;
-		} else
-			return beginExclusive();
+		return true;
 	}
 
 	/**
@@ -455,12 +469,13 @@ public boolean beginExclusive(boolean blocking) {
 	 */
 	public synchronized void endExclusive() {
 		// \\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//
-		if (DEBUG)
+		if (DEBUG) {
 			System.out.println("SerialService.endExclusive");
+		}
 		// \\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//
 		// if own then release
-		if (currentThreadHash == Thread.currentThread().hashCode()) {
-			currentThreadHash = 0;
+		if (this.currentThreadHash == Thread.currentThread().hashCode()) {
+			this.currentThreadHash = 0;
 		}
 		knownServices.remove(Thread.currentThread());
 	}
@@ -470,10 +485,11 @@ public synchronized void endExclusive() {
 	 */
 	public synchronized boolean haveExclusive() {
 		// \\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//
-		if (DEBUG)
+		if (DEBUG) {
 			System.out.println("SerialService.haveExclusive");
+		}
 		// \\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//
-		return (currentThreadHash == Thread.currentThread().hashCode());
+		return this.currentThreadHash == Thread.currentThread().hashCode();
 	}
 
 	/**
@@ -491,16 +507,18 @@ public synchronized boolean haveExclusive() {
 	 */
 	private synchronized boolean beginExclusive() {
 		// \\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//
-		if (DEBUG)
+		if (DEBUG) {
 			System.out.println("SerialService.beginExclusive()");
+		}
 		// \\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//
-		if (currentThreadHash == 0) {
+		if (this.currentThreadHash == 0) {
 			// not owned so take
-			currentThreadHash = Thread.currentThread().hashCode();
+			this.currentThreadHash = Thread.currentThread().hashCode();
 			knownServices.put(Thread.currentThread(), this);
 
 			return true;
-		} else if (currentThreadHash == Thread.currentThread().hashCode()) {
+		}
+		if (this.currentThreadHash == Thread.currentThread().hashCode()) {
 			// already own
 			return true;
 		} else {
@@ -514,39 +532,43 @@ private synchronized boolean beginExclusive() {
 	 */
 	private synchronized void closePortByThreadID(Thread t) {
 		// \\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//
-		if (DEBUG)
+		if (DEBUG) {
 			System.out.println("SerialService.closePortByThreadID(Thread), Thread=" + t);
-		// \\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//
+			// \\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//
+		}
 
 		// added singleUser object for case where one thread creates the adapter
 		// (like the main thread), and another thread closes it (like the AWT event)
-		boolean singleUser = (users.size() == 1);
+		var singleUser = this.users.size() == 1;
 
 		// remove this thread as an owner
-		users.removeElement(t);
+		this.users.removeElement(t);
 
 		// if this is the last owner then close the port
-		if (singleUser || users.isEmpty()) {
+		if (singleUser || this.users.isEmpty()) {
 			// if don't own a port then just return
-			if (!isPortOpen())
+			if (!this.isPortOpen()) {
 				return;
+			}
 
 			// close the port
 			// \\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//
-			if (DEBUG)
+			if (DEBUG) {
 				System.out.println(
 						"SerialService.closePortByThreadID(Thread): calling serialPort.removeEventListener() and .close()");
+			}
 			// \\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//
-			serialPort.removeEventListener();
-			serialPort.close();
-			serialPort = null;
-			serialInputStream = null;
-			serialOutputStream = null;
+			this.serialPort.removeEventListener();
+			this.serialPort.close();
+			this.serialPort = null;
+			this.serialInputStream = null;
+			this.serialOutputStream = null;
 		} else
 		// \\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//
-		if (DEBUG)
+		if (DEBUG) {
 			System.out.println("SerialService.closePortByThreadID(Thread): can't close port, owned by another thread");
-		// \\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//
+			// \\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//
+		}
 	}
 
 	// ------------------------------------------------------------------------
@@ -554,77 +576,86 @@ private synchronized void closePortByThreadID(Thread t) {
 	// ------------------------------------------------------------------------
 
 	public synchronized int available() throws IOException {
-		if (!isPortOpen())
+		if (!this.isPortOpen()) {
 			throw new IOException("Port Not Open");
+		}
 
-		return serialInputStream.available();
+		return this.serialInputStream.available();
 	}
 
 	public synchronized int read() throws IOException {
-		if (!isPortOpen())
+		if (!this.isPortOpen()) {
 			throw new IOException("Port Not Open");
+		}
 
-		return serialInputStream.read();
+		return this.serialInputStream.read();
 	}
 
 	public synchronized int read(byte[] buffer) throws IOException {
-		if (!isPortOpen())
+		if (!this.isPortOpen()) {
 			throw new IOException("Port Not Open");
+		}
 
-		return read(buffer, 0, buffer.length);
+		return this.read(buffer, 0, buffer.length);
 	}
 
 	public synchronized int read(byte[] buffer, int offset, int length) throws IOException {
-		if (!isPortOpen())
+		if (!this.isPortOpen()) {
 			throw new IOException("Port Not Open");
+		}
 
-		return serialInputStream.read(buffer, offset, length);
+		return this.serialInputStream.read(buffer, offset, length);
 	}
 
 	public synchronized int readWithTimeout(byte[] buffer, int offset, int length) throws IOException {
 		// \\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//
-		if (DEBUG)
+		if (DEBUG) {
 			System.out.println("SerialService.readWithTimeout(): length=" + length);
-		// \\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//
+			// \\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//
+		}
 
-		if (!isPortOpen())
+		if (!this.isPortOpen()) {
 			throw new IOException("Port Not Open");
+		}
 
 		// set max_timeout to be very long
-		long max_timeout = System.currentTimeMillis() + length * 20 + 800;
-		int count = 0;
+		var max_timeout = System.currentTimeMillis() + length * 20 + 800;
+		var count = 0;
 
 		// check which mode of reading
-		if (byteBang) {
+		if (this.byteBang) {
 			// \\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//
-			if (DEBUG)
+			if (DEBUG) {
 				System.out.println("SerialService.readWithTimeout(): byte-banging read");
-			// \\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//
+				// \\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//
+			}
 
 			int new_byte;
 			do {
-				new_byte = serialInputStream.read();
+				new_byte = this.serialInputStream.read();
 
 				if (new_byte != -1) {
 					buffer[count + offset] = (byte) new_byte;
 					count++;
 				} else {
 					// check for timeout
-					if (System.currentTimeMillis() > max_timeout)
+					if (System.currentTimeMillis() > max_timeout) {
 						break;
+					}
 
 					// no bytes available yet so yield
 					Thread.yield();
 
 					// \\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//
-					if (DEBUG)
+					if (DEBUG) {
 						System.out.print("y");
-					// \\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//
+						// \\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//
+					}
 				}
 			} while (length > count);
 		} else {
 			do {
-				int get_num = serialInputStream.available();
+				var get_num = this.serialInputStream.available();
 				// \\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//
 				// if(DEBUG)
 				// System.out.println("SerialService.readWithTimeout(): get_num=" + get_num + ",
@@ -632,15 +663,17 @@ public synchronized int readWithTimeout(byte[] buffer, int offset, int length) t
 				// \\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//
 				if (get_num > 0) {
 					// check for block bigger then buffer
-					if ((get_num + count) > length)
+					if (get_num + count > length) {
 						get_num = length - count;
+					}
 
 					// read the block
-					count += serialInputStream.read(buffer, count + offset, get_num);
+					count += this.serialInputStream.read(buffer, count + offset, get_num);
 				} else {
 					// check for timeout
-					if (System.currentTimeMillis() > max_timeout)
+					if (System.currentTimeMillis() > max_timeout) {
 						length = 0;
+					}
 					Thread.yield();
 				}
 			} while (length > count);
@@ -659,17 +692,19 @@ public synchronized int readWithTimeout(byte[] buffer, int offset, int length) t
 	}
 
 	public synchronized char[] readWithTimeout(int length) throws IOException {
-		byte[] buffer = new byte[length];
+		var buffer = new byte[length];
 
-		int count = readWithTimeout(buffer, 0, length);
+		var count = this.readWithTimeout(buffer, 0, length);
 
-		if (length != count)
+		if (length != count) {
 			throw new IOException(
 					"readWithTimeout, timeout waiting for return bytes (wanted " + length + ", got " + count + ")");
+		}
 
-		char[] returnBuffer = new char[length];
-		for (int i = 0; i < length; i++)
+		var returnBuffer = new char[length];
+		for (var i = 0; i < length; i++) {
 			returnBuffer[i] = (char) (buffer[i] & 0x00FF);
+		}
 
 		return returnBuffer;
 	}
@@ -678,8 +713,9 @@ public synchronized char[] readWithTimeout(int length) throws IOException {
 	// Standard OutputStream methods
 	// ------------------------------------------------------------------------
 	public synchronized void write(int data) throws IOException {
-		if (!isPortOpen())
+		if (!this.isPortOpen()) {
 			throw new IOException("Port Not Open");
+		}
 
 		// \\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//
 		if (DEBUG) {
@@ -689,21 +725,22 @@ public synchronized void write(int data) throws IOException {
 		// \\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//
 
 		try {
-			serialOutputStream.write(data);
-			serialOutputStream.flush();
+			this.serialOutputStream.write(data);
+			this.serialOutputStream.flush();
 		} catch (IOException e) {
 
 			// drain IOExceptions that are 'Interrrupted' on Linux
 			// convert the rest to IOExceptions
-			if (!((System.getProperty("os.name").indexOf("Linux") != -1)
-					&& (e.toString().indexOf("Interrupted") != -1)))
+			if (!(System.getProperty("os.name").indexOf("Linux") != -1 && e.toString().indexOf("Interrupted") != -1)) {
 				throw new IOException("write(char): " + e);
+			}
 		}
 	}
 
 	public synchronized void write(byte[] data, int offset, int length) throws IOException {
-		if (!isPortOpen())
+		if (!this.isPortOpen()) {
 			throw new IOException("Port Not Open");
+		}
 
 		// \\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//
 		if (DEBUG) {
@@ -714,47 +751,50 @@ public synchronized void write(byte[] data, int offset, int length) throws IOExc
 		// \\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//
 
 		try {
-			serialOutputStream.write(data, offset, length);
-			serialOutputStream.flush();
+			this.serialOutputStream.write(data, offset, length);
+			this.serialOutputStream.flush();
 		} catch (IOException e) {
 
 			// drain IOExceptions that are 'Interrrupted' on Linux
 			// convert the rest to IOExceptions
-			if (!((System.getProperty("os.name").indexOf("Linux") != -1)
-					&& (e.toString().indexOf("Interrupted") != -1)))
+			if (!(System.getProperty("os.name").indexOf("Linux") != -1 && e.toString().indexOf("Interrupted") != -1)) {
 				throw new IOException("write(char): " + e);
+			}
 		}
 	}
 
 	public synchronized void write(byte[] data) throws IOException {
-		write(data, 0, data.length);
+		this.write(data, 0, data.length);
 	}
 
 	public synchronized void write(String data) throws IOException {
-		byte[] dataBytes = data.getBytes();
-		write(dataBytes, 0, dataBytes.length);
+		var dataBytes = data.getBytes();
+		this.write(dataBytes, 0, dataBytes.length);
 	}
 
 	public synchronized void write(char data) throws IOException {
-		write((int) data);
+		this.write((int) data);
 	}
 
 	public synchronized void write(char[] data) throws IOException {
-		write(data, 0, data.length);
+		this.write(data, 0, data.length);
 	}
 
 	public synchronized void write(char[] data, int offset, int length) throws IOException {
 		// \\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//
-		if (DEBUG)
+		if (DEBUG) {
 			System.out.println("SerialService.write: write " + length + " chars");
-		// \\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//
+			// \\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//
+		}
 
-		if (length > tempArray.length)
-			tempArray = new byte[length];
+		if (length > this.tempArray.length) {
+			this.tempArray = new byte[length];
+		}
 
-		for (int i = 0; i < length; i++)
-			tempArray[i] = (byte) data[i];
+		for (var i = 0; i < length; i++) {
+			this.tempArray[i] = (byte) data[i];
+		}
 
-		write(tempArray, 0, length);
+		this.write(this.tempArray, 0, length);
 	}
 }
\ No newline at end of file
diff --git a/io.openems.edge.bridge.onewire/src/com/dalsemi/onewire/adapter/TMEXAdapter.java b/io.openems.edge.bridge.onewire/src/com/dalsemi/onewire/adapter/TMEXAdapter.java
index e7ae91dbb3b..bf2f31b3002 100644
--- a/io.openems.edge.bridge.onewire/src/com/dalsemi/onewire/adapter/TMEXAdapter.java
+++ b/io.openems.edge.bridge.onewire/src/com/dalsemi/onewire/adapter/TMEXAdapter.java
@@ -196,20 +196,22 @@ public class TMEXAdapter extends DSPortAdapter {
 	 * @throws ClassNotFoundException
 	 */
 	public TMEXAdapter() throws ClassNotFoundException {
-		String nativeDLLName = "IBTMJAVA.dll";
+		var nativeDLLName = "IBTMJAVA.dll";
 		if (System.getProperty("os.arch").indexOf("64") != -1) {
 			nativeDLLName = "ibtmjava64.dll";
 		}
 		// check if native driver got loaded
-		if (!driverLoaded)
+		if (!driverLoaded) {
 			throw new ClassNotFoundException("native driver '" + nativeDLLName + "' not loaded");
+		}
 
 		// set default port type
-		portType = getDefaultTypeNumber();
+		this.portType = getDefaultTypeNumber();
 
 		// attempt to set the portType, will throw exception if does not exist
-		if (!setPortType_Native(portType))
+		if (!this.setPortType_Native(this.portType)) {
 			throw new ClassNotFoundException("TMEX adapter type does not exist");
+		}
 	}
 
 	/**
@@ -222,20 +224,22 @@ public TMEXAdapter() throws ClassNotFoundException {
 	public TMEXAdapter(int newPortType) throws ClassNotFoundException {
 
 		// set default port type
-		portType = newPortType;
+		this.portType = newPortType;
 
-		String nativeDLLName = "IBTMJAVA.dll";
+		var nativeDLLName = "IBTMJAVA.dll";
 		if (System.getProperty("os.arch").indexOf("64") != -1) {
 			nativeDLLName = "ibtmjava64.dll";
 		}
 
 		// check if native driver got loaded
-		if (!driverLoaded)
+		if (!driverLoaded) {
 			throw new ClassNotFoundException("native driver '" + nativeDLLName + "' not loaded");
+		}
 
 		// attempt to set the portType, will throw exception if does not exist
-		if (!setPortType_Native(portType))
+		if (!this.setPortType_Native(this.portType)) {
 			throw new ClassNotFoundException("TMEX adapter type does not exist");
+		}
 	}
 
 	/**
@@ -243,7 +247,7 @@ public TMEXAdapter(int newPortType) throws ClassNotFoundException {
 	 */
 	@Override
 	protected void finalize() {
-		cleanup_Native();
+		this.cleanup_Native();
 	}
 
 	// --------
@@ -257,6 +261,7 @@ protected void finalize() {
 	 *
 	 * @return <code>String</code> representation of the port adapter.
 	 */
+	@Override
 	public native String getAdapterName();
 
 	/**
@@ -265,6 +270,7 @@ protected void finalize() {
 	 *
 	 * @return <code>String</code> description of the port type required.
 	 */
+	@Override
 	public native String getPortTypeDescription();
 
 	/**
@@ -272,8 +278,9 @@ protected void finalize() {
 	 *
 	 * @return version string
 	 */
+	@Override
 	public String getClassVersion() {
-		return new String("0.02, native: " + getVersion_Native());
+		return ("0.02, native: " + this.getVersion_Native());
 	}
 
 	// --------
@@ -288,14 +295,16 @@ public String getClassVersion() {
 	 *
 	 * @return enumeration of type <code>String</code> that contains the port names
 	 */
+	@Override
 	public Enumeration<String> getPortNames() {
-		Vector<String> portVector = new Vector<>();
-		String header = getPortNameHeader_Native();
+		var portVector = new Vector<String>();
+		var header = this.getPortNameHeader_Native();
 
-		for (int i = 0; i < 16; i++)
-			portVector.addElement(new String(header + Integer.toString(i)));
+		for (var i = 0; i < 16; i++) {
+			portVector.addElement((header + Integer.toString(i)));
+		}
 
-		return (portVector.elements());
+		return portVector.elements();
 	}
 
 	/**
@@ -314,6 +323,7 @@ public Enumeration<String> getPortNames() {
 	 *                            with port.
 	 * @throws OneWireException   If port does not exist
 	 */
+	@Override
 	public native boolean selectPort(String portName) throws OneWireIOException, OneWireException;
 
 	/**
@@ -323,6 +333,7 @@ public Enumeration<String> getPortNames() {
 	 *
 	 * @throws OneWireException If port does not exist
 	 */
+	@Override
 	public native void freePort() throws OneWireException;
 
 	/**
@@ -332,6 +343,7 @@ public Enumeration<String> getPortNames() {
 	 *
 	 * @throws OneWireException if valid port not yet selected
 	 */
+	@Override
 	public native String getPortName() throws OneWireException;
 
 	// --------
@@ -347,6 +359,7 @@ public Enumeration<String> getPortNames() {
 	 * @throws OneWireIOException
 	 * @throws OneWireException
 	 */
+	@Override
 	public native boolean adapterDetected() throws OneWireIOException, OneWireException;
 
 	/**
@@ -363,6 +376,7 @@ public Enumeration<String> getPortNames() {
 	 * @throws OneWireException   on a communication or setup error with the 1-Wire
 	 *                            adapter
 	 */
+	@Override
 	public native String getAdapterVersion() throws OneWireIOException, OneWireException;
 
 	/**
@@ -381,6 +395,7 @@ public Enumeration<String> getPortNames() {
 	 *                            adapter
 	 * @see com.dalsemi.onewire.utils.Address
 	 */
+	@Override
 	public String getAdapterAddress() throws OneWireIOException, OneWireException {
 		return "<na>"; // ??? implement later
 	}
@@ -403,6 +418,7 @@ public String getAdapterAddress() throws OneWireIOException, OneWireException {
 	 * @throws OneWireIOException on a 1-Wire communication error with the adapter
 	 * @throws OneWireException   on a setup error with the 1-Wire adapter
 	 */
+	@Override
 	public native boolean canOverdrive() throws OneWireIOException, OneWireException;
 
 	/**
@@ -414,6 +430,7 @@ public String getAdapterAddress() throws OneWireIOException, OneWireException {
 	 * @throws OneWireIOException on a 1-Wire communication error with the adapter
 	 * @throws OneWireException   on a setup error with the 1-Wire adapter
 	 */
+	@Override
 	public native boolean canHyperdrive() throws OneWireIOException, OneWireException;
 
 	/**
@@ -425,6 +442,7 @@ public String getAdapterAddress() throws OneWireIOException, OneWireException {
 	 * @throws OneWireIOException on a 1-Wire communication error with the adapter
 	 * @throws OneWireException   on a setup error with the 1-Wire adapter
 	 */
+	@Override
 	public native boolean canFlex() throws OneWireIOException, OneWireException;
 
 	/**
@@ -436,6 +454,7 @@ public String getAdapterAddress() throws OneWireIOException, OneWireException {
 	 * @throws OneWireIOException on a 1-Wire communication error with the adapter
 	 * @throws OneWireException   on a setup error with the 1-Wire adapter
 	 */
+	@Override
 	public native boolean canProgram() throws OneWireIOException, OneWireException;
 
 	/**
@@ -447,6 +466,7 @@ public String getAdapterAddress() throws OneWireIOException, OneWireException {
 	 * @throws OneWireIOException on a 1-Wire communication error with the adapter
 	 * @throws OneWireException   on a setup error with the 1-Wire adapter
 	 */
+	@Override
 	public native boolean canDeliverPower() throws OneWireIOException, OneWireException;
 
 	/**
@@ -461,6 +481,7 @@ public String getAdapterAddress() throws OneWireIOException, OneWireException {
 	 * @throws OneWireIOException on a 1-Wire communication error with the adapter
 	 * @throws OneWireException   on a setup error with the 1-Wire adapter
 	 */
+	@Override
 	public native boolean canDeliverSmartPower() throws OneWireIOException, OneWireException;
 
 	/**
@@ -472,6 +493,7 @@ public String getAdapterAddress() throws OneWireIOException, OneWireException {
 	 * @throws OneWireIOException on a 1-Wire communication error with the adapter
 	 * @throws OneWireException   on a setup error with the 1-Wire adapter
 	 */
+	@Override
 	public native boolean canBreak() throws OneWireIOException, OneWireException;
 
 	// --------
@@ -488,12 +510,13 @@ public String getAdapterAddress() throws OneWireIOException, OneWireException {
 	 * @throws OneWireIOException on a 1-Wire communication error
 	 * @throws OneWireException   on a setup error with the 1-Wire adapter
 	 */
+	@Override
 	public boolean findFirstDevice() throws OneWireIOException, OneWireException {
 
 		// reset the internal rom buffer
-		resetSearch = true;
+		this.resetSearch = true;
 
-		return findNextDevice();
+		return this.findNextDevice();
 	}
 
 	/**
@@ -506,25 +529,24 @@ public boolean findFirstDevice() throws OneWireIOException, OneWireException {
 	 * @throws OneWireIOException on a 1-Wire communication error
 	 * @throws OneWireException   on a setup error with the 1-Wire adapter
 	 */
+	@Override
 	public boolean findNextDevice() throws OneWireIOException, OneWireException {
 		boolean retval;
 
 		while (true) {
-			retval = romSearch_Native(skipResetOnSearch, resetSearch, doAlarmSearch, RomDta);
+			retval = this.romSearch_Native(this.skipResetOnSearch, this.resetSearch, this.doAlarmSearch, this.RomDta);
 
-			if (retval) {
-				resetSearch = false;
-
-				// check if this is an OK family type
-				if (isValidFamily(RomDta))
-					return true;
-
-				// Else, loop to the top and do another search.
-			} else {
-				resetSearch = true;
+			if (!retval) {
+				this.resetSearch = true;
 
 				return false;
 			}
+			this.resetSearch = false;
+
+			// check if this is an OK family type
+			if (this.isValidFamily(this.RomDta)) {
+				return true;
+			}
 		}
 	}
 
@@ -538,8 +560,9 @@ public boolean findNextDevice() throws OneWireIOException, OneWireException {
 	 * @param address An array to be filled with the current iButton address.
 	 * @see com.dalsemi.onewire.utils.Address
 	 */
+	@Override
 	public void getAddress(byte[] address) {
-		System.arraycopy(RomDta, 0, address, 0, 8);
+		System.arraycopy(this.RomDta, 0, address, 0, 8);
 	}
 
 	/**
@@ -556,6 +579,7 @@ public void getAddress(byte[] address) {
 	 *
 	 * @see com.dalsemi.onewire.utils.Address
 	 */
+	@Override
 	public native boolean isPresent(byte[] address) throws OneWireIOException, OneWireException;
 
 	/**
@@ -573,6 +597,7 @@ public void getAddress(byte[] address) {
 	 *
 	 * @see com.dalsemi.onewire.utils.Address
 	 */
+	@Override
 	public native boolean isAlarming(byte[] address) throws OneWireIOException, OneWireException;
 
 	/**
@@ -595,6 +620,7 @@ public void getAddress(byte[] address) {
 	 * @see com.dalsemi.onewire.adapter.DSPortAdapter#isPresent(byte[] address)
 	 * @see com.dalsemi.onewire.utils.Address
 	 */
+	@Override
 	public native boolean select(byte[] address) throws OneWireIOException, OneWireException;
 
 	// --------
@@ -609,8 +635,9 @@ public void getAddress(byte[] address) {
 	 *
 	 * @see #setNoResetSearch
 	 */
+	@Override
 	public void setSearchOnlyAlarmingDevices() {
-		doAlarmSearch = true;
+		this.doAlarmSearch = true;
 	}
 
 	/**
@@ -618,8 +645,9 @@ public void setSearchOnlyAlarmingDevices() {
 	 * This feature is chiefly used with the DS2409 1-Wire coupler. The normal reset
 	 * before each search can be restored with the 'setSearchAllDevices()' method.
 	 */
+	@Override
 	public void setNoResetSearch() {
-		skipResetOnSearch = true;
+		this.skipResetOnSearch = true;
 	}
 
 	/**
@@ -630,9 +658,10 @@ public void setNoResetSearch() {
 	 *
 	 * @see #setNoResetSearch
 	 */
+	@Override
 	public void setSearchAllDevices() {
-		doAlarmSearch = false;
-		skipResetOnSearch = false;
+		this.doAlarmSearch = false;
+		this.skipResetOnSearch = false;
 	}
 
 	// --------
@@ -659,6 +688,7 @@ public void setSearchAllDevices() {
 	 *
 	 * @throws OneWireException on a setup error with the 1-Wire adapter
 	 */
+	@Override
 	public native boolean beginExclusive(boolean blocking) throws OneWireException;
 
 	/**
@@ -666,6 +696,7 @@ public void setSearchAllDevices() {
 	 * dynamically marks the end of a critical section and should be used when
 	 * exclusive control is no longer needed.
 	 */
+	@Override
 	public native void endExclusive();
 
 	// --------
@@ -680,9 +711,11 @@ public void setSearchAllDevices() {
 	 * @throws OneWireIOException on a 1-Wire communication error
 	 * @throws OneWireException   on a setup error with the 1-Wire adapter
 	 */
+	@Override
 	public void putBit(boolean bitValue) throws OneWireIOException, OneWireException {
-		if (dataBit_Native(bitValue) != bitValue)
+		if (this.dataBit_Native(bitValue) != bitValue) {
 			throw new OneWireIOException("Error during putBit()");
+		}
 	}
 
 	/**
@@ -693,8 +726,9 @@ public void putBit(boolean bitValue) throws OneWireIOException, OneWireException
 	 * @throws OneWireIOException on a 1-Wire communication error
 	 * @throws OneWireException   on a setup error with the 1-Wire adapter
 	 */
+	@Override
 	public boolean getBit() throws OneWireIOException, OneWireException {
-		return dataBit_Native(true);
+		return this.dataBit_Native(true);
 	}
 
 	/**
@@ -705,9 +739,11 @@ public boolean getBit() throws OneWireIOException, OneWireException {
 	 * @throws OneWireIOException on a 1-Wire communication error
 	 * @throws OneWireException   on a setup error with the 1-Wire adapter
 	 */
+	@Override
 	public void putByte(int byteValue) throws OneWireIOException, OneWireException {
-		if (dataByte_Native(byteValue & 0x00FF) != ((0x00FF) & byteValue))
+		if (this.dataByte_Native(byteValue & 0x00FF) != (0x00FF & byteValue)) {
 			throw new OneWireIOException("Error during putByte(), echo was incorrect ");
+		}
 	}
 
 	/**
@@ -718,8 +754,9 @@ public void putByte(int byteValue) throws OneWireIOException, OneWireException {
 	 * @throws OneWireIOException on a 1-Wire communication error
 	 * @throws OneWireException   on a setup error with the 1-Wire adapter
 	 */
+	@Override
 	public int getByte() throws OneWireIOException, OneWireException {
-		return dataByte_Native(0x00FF);
+		return this.dataByte_Native(0x00FF);
 	}
 
 	/**
@@ -732,10 +769,11 @@ public int getByte() throws OneWireIOException, OneWireException {
 	 * @throws OneWireIOException on a 1-Wire communication error
 	 * @throws OneWireException   on a setup error with the 1-Wire adapter
 	 */
+	@Override
 	public byte[] getBlock(int len) throws OneWireIOException, OneWireException {
-		byte[] barr = new byte[len];
+		var barr = new byte[len];
 
-		getBlock(barr, 0, len);
+		this.getBlock(barr, 0, len);
 
 		return barr;
 	}
@@ -750,8 +788,9 @@ public byte[] getBlock(int len) throws OneWireIOException, OneWireException {
 	 * @throws OneWireIOException on a 1-Wire communication error
 	 * @throws OneWireException   on a setup error with the 1-Wire adapter
 	 */
+	@Override
 	public void getBlock(byte[] arr, int len) throws OneWireIOException, OneWireException {
-		getBlock(arr, 0, len);
+		this.getBlock(arr, 0, len);
 	}
 
 	/**
@@ -765,6 +804,7 @@ public void getBlock(byte[] arr, int len) throws OneWireIOException, OneWireExce
 	 * @throws OneWireIOException on a 1-Wire communication error
 	 * @throws OneWireException   on a setup error with the 1-Wire adapter
 	 */
+	@Override
 	public native void getBlock(byte[] arr, int off, int len) throws OneWireIOException, OneWireException;
 
 	/**
@@ -780,6 +820,7 @@ public void getBlock(byte[] arr, int len) throws OneWireIOException, OneWireExce
 	 * @throws OneWireIOException on a 1-Wire communication error
 	 * @throws OneWireException   on a setup error with the 1-Wire adapter
 	 */
+	@Override
 	public native void dataBlock(byte dataBlock[], int off, int len) throws OneWireIOException, OneWireException;
 
 	/**
@@ -801,6 +842,7 @@ public void getBlock(byte[] arr, int len) throws OneWireIOException, OneWireExce
 	 * @throws OneWireIOException on a 1-Wire communication error
 	 * @throws OneWireException   on a setup error with the 1-Wire adapter
 	 */
+	@Override
 	public native int reset() throws OneWireIOException, OneWireException;
 
 	// --------
@@ -832,11 +874,13 @@ public void getBlock(byte[] arr, int len) throws OneWireIOException, OneWireExce
 	 * @throws OneWireIOException on a 1-Wire communication error
 	 * @throws OneWireException   on a setup error with the 1-Wire adapter
 	 */
+	@Override
 	public void setPowerDuration(int timeFactor) throws OneWireIOException, OneWireException {
 
 		// Right now we only support infinite pull up.
-		if (timeFactor != DELIVERY_INFINITE)
+		if (timeFactor != DELIVERY_INFINITE) {
 			throw new OneWireException("No support for other than infinite power duration");
+		}
 	}
 
 	/**
@@ -866,6 +910,7 @@ public void setPowerDuration(int timeFactor) throws OneWireIOException, OneWireE
 	 * @throws OneWireIOException on a 1-Wire communication error
 	 * @throws OneWireException   on a setup error with the 1-Wire adapter
 	 */
+	@Override
 	public native boolean startPowerDelivery(int changeCondition) throws OneWireIOException, OneWireException;
 
 	/**
@@ -889,9 +934,11 @@ public void setPowerDuration(int timeFactor) throws OneWireIOException, OneWireE
 	 * @throws OneWireIOException on a 1-Wire communication error
 	 * @throws OneWireException   on a setup error with the 1-Wire adapter
 	 */
+	@Override
 	public void setProgramPulseDuration(int timeFactor) throws OneWireIOException, OneWireException {
-		if (timeFactor != DELIVERY_EPROM)
+		if (timeFactor != DELIVERY_EPROM) {
 			throw new OneWireException("Only support EPROM length program pulse duration");
+		}
 	}
 
 	/**
@@ -922,6 +969,7 @@ public void setProgramPulseDuration(int timeFactor) throws OneWireIOException, O
 	 * @throws OneWireException   on a setup error with the 1-Wire adapter or the
 	 *                            adapter does not support this operation
 	 */
+	@Override
 	public native boolean startProgramPulse(int changeCondition) throws OneWireIOException, OneWireException;
 
 	/**
@@ -933,6 +981,7 @@ public void setProgramPulseDuration(int timeFactor) throws OneWireIOException, O
 	 * @throws OneWireException   on a setup error with the 1-Wire adapter or the
 	 *                            adapter does not support this operation
 	 */
+	@Override
 	public native void startBreak() throws OneWireIOException, OneWireException;
 
 	/**
@@ -946,6 +995,7 @@ public void setProgramPulseDuration(int timeFactor) throws OneWireIOException, O
 	 * @throws OneWireException   on a setup error with the 1-Wire adapter or the
 	 *                            adapter does not support this operation
 	 */
+	@Override
 	public native void setPowerNormal() throws OneWireIOException, OneWireException;
 
 	// --------
@@ -975,6 +1025,7 @@ public void setProgramPulseDuration(int timeFactor) throws OneWireIOException, O
 	 * @throws OneWireException   on a setup error with the 1-Wire adapter or the
 	 *                            adapter does not support this operation
 	 */
+	@Override
 	public native void setSpeed(int desiredSpeed) throws OneWireIOException, OneWireException;
 
 	/**
@@ -994,6 +1045,7 @@ public void setProgramPulseDuration(int timeFactor) throws OneWireIOException, O
 	 *         <li>>3 future speeds
 	 *         </ul>
 	 */
+	@Override
 	public native int getSpeed();
 
 	// --------
@@ -1012,10 +1064,10 @@ public void setProgramPulseDuration(int timeFactor) throws OneWireIOException, O
 	public boolean setTMEXPortType(int newPortType) {
 
 		// set default port type
-		portType = newPortType;
+		this.portType = newPortType;
 
 		// attempt to set the portType, return result
-		return setPortType_Native(portType);
+		return this.setPortType_Native(this.portType);
 	}
 
 	// --------
@@ -1127,9 +1179,9 @@ private native boolean romSearch_Native(boolean skipResetOnSearch, boolean reset
 	 */
 	static {
 		driverLoaded = false;
-		String nativeTMEXDLLName = "IBFS32.DLL";
-		String nativeDLLName = "ibtmjava.dll";
-		String loadLibraryString = "ibtmjava";
+		var nativeTMEXDLLName = "IBFS32.DLL";
+		var nativeDLLName = "ibtmjava.dll";
+		var loadLibraryString = "ibtmjava";
 		if (System.getProperty("os.arch").indexOf("64") != -1) {
 			nativeTMEXDLLName = "IBFS64.DLL";
 			nativeDLLName = "ibtmjava64.dll";
@@ -1141,10 +1193,10 @@ private native boolean romSearch_Native(boolean skipResetOnSearch, boolean reset
 
 			// check if TMEX native drivers installed
 			int index = 0, last_index = 0;
-			String search_path = System.getProperty("java.library.path");
+			var search_path = System.getProperty("java.library.path");
 			String path;
 			File file;
-			boolean tmex_loaded = false;
+			var tmex_loaded = false;
 
 			System.out.println(search_path);
 			// check for a path to search
@@ -1170,8 +1222,9 @@ private native boolean romSearch_Native(boolean skipResetOnSearch, boolean reset
 				} while (index > -1);
 			}
 			// jdk must not support "java.library.path" so assume it is loaded
-			else
+			else {
 				tmex_loaded = true;
+			}
 
 			if (tmex_loaded) {
 				try {
@@ -1184,8 +1237,9 @@ private native boolean romSearch_Native(boolean skipResetOnSearch, boolean reset
 						System.err.println("Native drivers not found, download 1-Wire Drivers from www.ibutton.com");
 					}
 				}
-			} else
+			} else {
 				System.err.println("Native drivers not found, download 1-Wire Drivers from www.ibutton.com");
+			}
 		}
 	}
 }
diff --git a/io.openems.edge.bridge.onewire/src/com/dalsemi/onewire/adapter/UAdapterState.java b/io.openems.edge.bridge.onewire/src/com/dalsemi/onewire/adapter/UAdapterState.java
index e3c2cb83f50..e2936c19f2d 100644
--- a/io.openems.edge.bridge.onewire/src/com/dalsemi/onewire/adapter/UAdapterState.java
+++ b/io.openems.edge.bridge.onewire/src/com/dalsemi/onewire/adapter/UAdapterState.java
@@ -197,31 +197,31 @@ class UAdapterState {
 	public UAdapterState(OneWireState newOneWireState) {
 
 		// get a pointer to the OneWire state object
-		oneWireState = newOneWireState;
+		this.oneWireState = newOneWireState;
 
 		// set the defaults
-		ubaud = BAUD_9600;
-		uSpeedMode = USPEED_FLEX;
-		revision = 0;
-		inCommandMode = true;
-		streamBits = true;
-		streamBytes = true;
-		streamSearches = true;
-		streamResets = false;
-		programVoltageAvailable = false;
-		longAlarmCheck = false;
-		lastAlarmCount = 0;
+		this.ubaud = BAUD_9600;
+		this.uSpeedMode = USPEED_FLEX;
+		this.revision = 0;
+		this.inCommandMode = true;
+		this.streamBits = true;
+		this.streamBytes = true;
+		this.streamSearches = true;
+		this.streamResets = false;
+		this.programVoltageAvailable = false;
+		this.longAlarmCheck = false;
+		this.lastAlarmCount = 0;
 
 		// create the three speed logical parameter settings
-		uParameters = new UParameterSettings[4];
-		uParameters[0] = new UParameterSettings();
-		uParameters[1] = new UParameterSettings();
-		uParameters[2] = new UParameterSettings();
-		uParameters[3] = new UParameterSettings();
+		this.uParameters = new UParameterSettings[4];
+		this.uParameters[0] = new UParameterSettings();
+		this.uParameters[1] = new UParameterSettings();
+		this.uParameters[2] = new UParameterSettings();
+		this.uParameters[3] = new UParameterSettings();
 
 		// adjust flex time
-		uParameters[DSPortAdapter.SPEED_FLEX].pullDownSlewRate = UParameterSettings.SLEWRATE_0p83Vus;
-		uParameters[DSPortAdapter.SPEED_FLEX].write1LowTime = UParameterSettings.WRITE1TIME_12us;
-		uParameters[DSPortAdapter.SPEED_FLEX].sampleOffsetTime = UParameterSettings.SAMPLEOFFSET_TIME_10us;
+		this.uParameters[DSPortAdapter.SPEED_FLEX].pullDownSlewRate = UParameterSettings.SLEWRATE_0p83Vus;
+		this.uParameters[DSPortAdapter.SPEED_FLEX].write1LowTime = UParameterSettings.WRITE1TIME_12us;
+		this.uParameters[DSPortAdapter.SPEED_FLEX].sampleOffsetTime = UParameterSettings.SAMPLEOFFSET_TIME_10us;
 	}
 }
diff --git a/io.openems.edge.bridge.onewire/src/com/dalsemi/onewire/adapter/UPacketBuilder.java b/io.openems.edge.bridge.onewire/src/com/dalsemi/onewire/adapter/UPacketBuilder.java
index f9823e7f840..4f370824afb 100644
--- a/io.openems.edge.bridge.onewire/src/com/dalsemi/onewire/adapter/UPacketBuilder.java
+++ b/io.openems.edge.bridge.onewire/src/com/dalsemi/onewire/adapter/UPacketBuilder.java
@@ -143,7 +143,7 @@ class UPacketBuilder {
 	/**
 	 * The current state of the U brick, passed into constructor.
 	 */
-	private UAdapterState uState;
+	private final UAdapterState uState;
 
 	/**
 	 * The current current count for the number of return bytes from the packet
@@ -179,27 +179,28 @@ class UPacketBuilder {
 	public UPacketBuilder(UAdapterState startUState) {
 
 		// get a reference to the U state
-		uState = startUState;
+		this.uState = startUState;
 
 		// create the buffer for the data
-		packet = new RawSendPacket();
+		this.packet = new RawSendPacket();
 
 		// create the vector
-		packetsVector = new Vector<>();
+		this.packetsVector = new Vector<>();
 
 		// restart the packet to initialize
-		restart();
+		this.restart();
 
 		// Default on SunOS to bit-banging
-		bitsOnly = (System.getProperty("os.name").indexOf("SunOS") != -1);
+		this.bitsOnly = System.getProperty("os.name").indexOf("SunOS") != -1;
 
 		// check for a bits only property
-		String bits = OneWireAccessProvider.getProperty("onewire.serial.forcebitsonly");
+		var bits = OneWireAccessProvider.getProperty("onewire.serial.forcebitsonly");
 		if (bits != null) {
-			if (bits.indexOf("true") != -1)
-				bitsOnly = true;
-			else if (bits.indexOf("false") != -1)
-				bitsOnly = false;
+			if (bits.indexOf("true") != -1) {
+				this.bitsOnly = true;
+			} else if (bits.indexOf("false") != -1) {
+				this.bitsOnly = false;
+			}
 		}
 	}
 
@@ -213,15 +214,15 @@ else if (bits.indexOf("false") != -1)
 	public void restart() {
 
 		// clear the vector list of packets
-		packetsVector.removeAllElements();
+		this.packetsVector.removeAllElements();
 
 		// truncate the packet to 0 length
-		packet.buffer.setLength(0);
+		this.packet.buffer.setLength(0);
 
-		packet.returnLength = 0;
+		this.packet.returnLength = 0;
 
 		// reset the return count
-		totalReturnLength = 0;
+		this.totalReturnLength = 0;
 	}
 
 	/**
@@ -231,10 +232,10 @@ public void restart() {
 	public void newPacket() {
 
 		// add the packet
-		packetsVector.addElement(packet);
+		this.packetsVector.addElement(this.packet);
 
 		// get a new packet
-		packet = new RawSendPacket();
+		this.packet = new RawSendPacket();
 	}
 
 	/**
@@ -245,10 +246,11 @@ public void newPacket() {
 	public Enumeration<RawSendPacket> getPackets() {
 
 		// put the last packet into the vector if it is non zero
-		if (packet.buffer.length() > 0)
-			newPacket();
+		if (this.packet.buffer.length() > 0) {
+			this.newPacket();
+		}
 
-		return packetsVector.elements();
+		return this.packetsVector.elements();
 	}
 
 	// --------
@@ -264,25 +266,27 @@ public Enumeration<RawSendPacket> getPackets() {
 	public int oneWireReset() {
 
 		// set to command mode
-		setToCommandMode();
+		this.setToCommandMode();
 
 		// append the reset command at the current speed
-		packet.buffer.append((char) (FUNCTION_RESET | uState.uSpeedMode));
+		this.packet.buffer.append((char) (FUNCTION_RESET | this.uState.uSpeedMode));
 
 		// count this as a return
-		totalReturnLength++;
-		packet.returnLength++;
+		this.totalReturnLength++;
+		this.packet.returnLength++;
 
 		// check if not streaming resets
-		if (!uState.streamResets)
-			newPacket();
+		if (!this.uState.streamResets) {
+			this.newPacket();
+		}
 
 		// check for 2480 wait on extra bytes packet
-		if (uState.longAlarmCheck && ((uState.uSpeedMode == UAdapterState.USPEED_REGULAR)
-				|| (uState.uSpeedMode == UAdapterState.USPEED_FLEX)))
-			newPacket();
+		if (this.uState.longAlarmCheck && (this.uState.uSpeedMode == UAdapterState.USPEED_REGULAR
+				|| this.uState.uSpeedMode == UAdapterState.USPEED_FLEX)) {
+			this.newPacket();
+		}
 
-		return totalReturnLength - 1;
+		return this.totalReturnLength - 1;
 	}
 
 	/**
@@ -298,55 +302,60 @@ public int dataBytes(char dataBytesValue[]) {
 		int i, j;
 
 		// set to data mode
-		if (!bitsOnly)
-			setToDataMode();
+		if (!this.bitsOnly) {
+			this.setToDataMode();
+		}
 
 		// provide debug output
-		if (doDebugMessages)
+		if (doDebugMessages) {
 			System.out.println("DEBUG: UPacketbuilder-dataBytes[] length " + dataBytesValue.length);
+		}
 
 		// record the current count location
-		int ret_value = totalReturnLength;
+		var ret_value = this.totalReturnLength;
 
 		// check each byte to see if some need duplication
 		for (i = 0; i < dataBytesValue.length; i++) {
 			// convert the rest to OneWireIOExceptions
-			if (bitsOnly) {
+			if (this.bitsOnly) {
 				// change byte to bits
 				byte_value = dataBytesValue[i];
 				for (j = 0; j < 8; j++) {
-					dataBit(((byte_value & 0x01) == 0x01), false);
+					this.dataBit((byte_value & 0x01) == 0x01, false);
 					byte_value >>>= 1;
 				}
 			} else {
 				// append the data
-				packet.buffer.append(dataBytesValue[i]);
+				this.packet.buffer.append(dataBytesValue[i]);
 
 				// provide debug output
-				if (doDebugMessages)
+				if (doDebugMessages) {
 					System.out.println("DEBUG: UPacketbuilder-dataBytes[] byte["
-							+ Integer.toHexString((int) dataBytesValue[i] & 0x00FF) + "]");
+							+ Integer.toHexString(dataBytesValue[i] & 0x00FF) + "]");
+				}
 
 				// check for duplicates needed for special characters
-				if (((char) (dataBytesValue[i] & 0x00FF) == UAdapterState.MODE_COMMAND)
-						|| (((char) (dataBytesValue[i] & 0x00FF) == UAdapterState.MODE_SPECIAL)
-								&& (uState.revision == UAdapterState.CHIP_VERSION1))) {
+				if ((char) (dataBytesValue[i] & 0x00FF) == UAdapterState.MODE_COMMAND
+						|| (char) (dataBytesValue[i] & 0x00FF) == UAdapterState.MODE_SPECIAL
+								&& this.uState.revision == UAdapterState.CHIP_VERSION1) {
 					// duplicate this data byte
-					packet.buffer.append(dataBytesValue[i]);
+					this.packet.buffer.append(dataBytesValue[i]);
 				}
 
 				// add to the return number of bytes
-				totalReturnLength++;
-				packet.returnLength++;
+				this.totalReturnLength++;
+				this.packet.returnLength++;
 
 				// provide debug output
-				if (doDebugMessages)
-					System.out.println("DEBUG: UPacketbuilder-dataBytes[] returnlength " + packet.returnLength
-							+ " bufferLength " + packet.buffer.length());
+				if (doDebugMessages) {
+					System.out.println("DEBUG: UPacketbuilder-dataBytes[] returnlength " + this.packet.returnLength
+							+ " bufferLength " + this.packet.buffer.length());
+				}
 
 				// check for packet too large or not streaming bytes
-				if ((packet.buffer.length() > MAX_BYTES_STREAMED) || !uState.streamBytes)
-					newPacket();
+				if (this.packet.buffer.length() > MAX_BYTES_STREAMED || !this.uState.streamBytes) {
+					this.newPacket();
+				}
 			}
 		}
 
@@ -364,12 +373,13 @@ public int dataBytes(char dataBytesValue[]) {
 	 *         operation
 	 */
 	public int dataBytes(byte[] dataBytesValue, int off, int len) {
-		char[] temp_ch = new char[len];
+		var temp_ch = new char[len];
 
-		for (int i = 0; i < len; i++)
+		for (var i = 0; i < len; i++) {
 			temp_ch[i] = (char) dataBytesValue[off + i];
+		}
 
-		return dataBytes(temp_ch);
+		return this.dataBytes(temp_ch);
 	}
 
 	/**
@@ -384,16 +394,16 @@ public int dataByte(char dataByteValue) {
 
 		// construct a temporary array of characters of length 1
 		// to use the dataBytes method
-		char[] temp_char_array = new char[1];
+		var temp_char_array = new char[1];
 
 		temp_char_array[0] = dataByteValue;
 
 		// provide debug output
-		if (doDebugMessages)
-			System.out.println(
-					"DEBUG: UPacketbuilder-dataBytes [" + Integer.toHexString((int) dataByteValue & 0x00FF) + "]");
+		if (doDebugMessages) {
+			System.out.println("DEBUG: UPacketbuilder-dataBytes [" + Integer.toHexString(dataByteValue & 0x00FF) + "]");
+		}
 
-		return dataBytes(temp_char_array);
+		return this.dataBytes(temp_char_array);
 	}
 
 	/**
@@ -409,13 +419,14 @@ public int primedDataByte(byte dataByteValue) {
 		int offset, start_offset = 0;
 
 		// create a primed data byte by using bits with last one primed
-		for (int i = 0; i < 8; i++) {
-			offset = dataBit(((dataByteValue & 0x01) == 0x01), (i == 7));
+		for (var i = 0; i < 8; i++) {
+			offset = this.dataBit((dataByteValue & 0x01) == 0x01, i == 7);
 			dataByteValue >>>= 1;
 
 			// record the starting offset
-			if (i == 0)
+			if (i == 0) {
 				start_offset = offset;
+			}
 		}
 
 		return start_offset;
@@ -433,21 +444,22 @@ public int primedDataByte(byte dataByteValue) {
 	public int dataBit(boolean dataBit, boolean strong5V) {
 
 		// set to command mode
-		setToCommandMode();
+		this.setToCommandMode();
 
 		// append the bit with polarity and strong5V options
-		packet.buffer.append((char) (FUNCTION_BIT | uState.uSpeedMode | ((dataBit) ? BIT_ONE : BIT_ZERO)
-				| ((strong5V) ? PRIME5V_TRUE : PRIME5V_FALSE)));
+		this.packet.buffer.append((char) (FUNCTION_BIT | this.uState.uSpeedMode | (dataBit ? BIT_ONE : BIT_ZERO)
+				| (strong5V ? PRIME5V_TRUE : PRIME5V_FALSE)));
 
 		// add to the return number of bytes
-		totalReturnLength++;
-		packet.returnLength++;
+		this.totalReturnLength++;
+		this.packet.returnLength++;
 
 		// check for packet too large or not streaming bits
-		if ((packet.buffer.length() > MAX_BYTES_STREAMED) || !uState.streamBits)
-			newPacket();
+		if (this.packet.buffer.length() > MAX_BYTES_STREAMED || !this.uState.streamBits) {
+			this.newPacket();
+		}
 
-		return (totalReturnLength - 1);
+		return this.totalReturnLength - 1;
 	}
 
 	/**
@@ -462,64 +474,66 @@ public int dataBit(boolean dataBit, boolean strong5V) {
 	public int search(OneWireState mState) {
 
 		// set to command mode
-		setToCommandMode();
+		this.setToCommandMode();
 
 		// search mode on
-		packet.buffer.append((char) (FUNCTION_SEARCHON | uState.uSpeedMode));
+		this.packet.buffer.append((char) (FUNCTION_SEARCHON | this.uState.uSpeedMode));
 
 		// set to data mode
-		setToDataMode();
+		this.setToDataMode();
 
 		// create the search sequence character array
-		char[] search_sequence = new char[16];
+		var search_sequence = new char[16];
 
 		// get a copy of the current ID
-		char[] id = new char[8];
+		var id = new char[8];
 
-		for (int i = 0; i < 8; i++)
+		for (var i = 0; i < 8; i++) {
 			id[i] = (char) (mState.ID[i] & 0xFF);
+		}
 
 		// clear the string
-		for (int i = 0; i < 16; i++)
+		for (var i = 0; i < 16; i++) {
 			search_sequence[i] = 0;
+		}
 
 		// provide debug output
-		if (doDebugMessages)
-			System.out.println("DEBUG: UPacketbuilder-search [" + Integer.toHexString((int) id.length) + "]");
+		if (doDebugMessages) {
+			System.out.println("DEBUG: UPacketbuilder-search [" + Integer.toHexString(id.length) + "]");
+		}
 
 		// only modify bits if not the first search
 		if (mState.searchLastDiscrepancy != 0xFF) {
 
 			// set the bits in the added buffer
-			for (int i = 0; i < 64; i++) {
+			for (var i = 0; i < 64; i++) {
 
 				// before last discrepancy (go direction based on ID)
-				if (i < (mState.searchLastDiscrepancy - 1))
-					bitWrite(search_sequence, (i * 2 + 1), bitRead(id, i));
-
-				// at last discrepancy (go 1's direction)
-				else if (i == (mState.searchLastDiscrepancy - 1))
-					bitWrite(search_sequence, (i * 2 + 1), true);
+				if (i < mState.searchLastDiscrepancy - 1) {
+					this.bitWrite(search_sequence, i * 2 + 1, this.bitRead(id, i));
+				} else if (i == mState.searchLastDiscrepancy - 1) {
+					this.bitWrite(search_sequence, i * 2 + 1, true);
+				}
 
 				// after last discrepancy so leave zeros
 			}
 		}
 
 		// remember this position
-		int return_position = totalReturnLength;
+		var return_position = this.totalReturnLength;
 
 		// add this sequence
-		packet.buffer.append(search_sequence);
+		this.packet.buffer.append(search_sequence);
 
 		// set to command mode
-		setToCommandMode();
+		this.setToCommandMode();
 
 		// search mode off
-		packet.buffer.append((char) (FUNCTION_SEARCHOFF | uState.uSpeedMode));
+		this.packet.buffer.append((char) (FUNCTION_SEARCHOFF | this.uState.uSpeedMode));
 
 		// add to the return number of bytes
-		totalReturnLength += 16;
-		packet.returnLength += 16;
+		this.totalReturnLength += 16;
+		this.packet.returnLength += 16;
 
 		return return_position;
 	}
@@ -530,10 +544,10 @@ else if (i == (mState.searchLastDiscrepancy - 1))
 	public void setSpeed() {
 
 		// set to command mode
-		setToCommandMode();
+		this.setToCommandMode();
 
 		// search mode off and change speed
-		packet.buffer.append((char) (FUNCTION_SEARCHOFF | uState.uSpeedMode));
+		this.packet.buffer.append((char) (FUNCTION_SEARCHOFF | this.uState.uSpeedMode));
 
 		// no return byte
 	}
@@ -546,13 +560,13 @@ public void setSpeed() {
 	 * Set the U state to command mode.
 	 */
 	public void setToCommandMode() {
-		if (!uState.inCommandMode) {
+		if (!this.uState.inCommandMode) {
 
 			// append the command to switch
-			packet.buffer.append(UAdapterState.MODE_COMMAND);
+			this.packet.buffer.append(UAdapterState.MODE_COMMAND);
 
 			// switch the state
-			uState.inCommandMode = true;
+			this.uState.inCommandMode = true;
 		}
 	}
 
@@ -560,13 +574,13 @@ public void setToCommandMode() {
 	 * Set the U state to data mode.
 	 */
 	public void setToDataMode() {
-		if (uState.inCommandMode) {
+		if (this.uState.inCommandMode) {
 
 			// append the command to switch
-			packet.buffer.append(UAdapterState.MODE_DATA);
+			this.packet.buffer.append(UAdapterState.MODE_DATA);
 
 			// switch the state
-			uState.inCommandMode = false;
+			this.uState.inCommandMode = false;
 		}
 	}
 
@@ -581,20 +595,21 @@ public void setToDataMode() {
 	public int getParameter(int parameter) {
 
 		// set to command mode
-		setToCommandMode();
+		this.setToCommandMode();
 
 		// append parameter get
-		packet.buffer.append((char) (CONFIG_MASK | parameter >> 3));
+		this.packet.buffer.append((char) (CONFIG_MASK | parameter >> 3));
 
 		// add to the return number of bytes
-		totalReturnLength++;
-		packet.returnLength++;
+		this.totalReturnLength++;
+		this.packet.returnLength++;
 
 		// check for packet too large
-		if (packet.buffer.length() > MAX_BYTES_STREAMED)
-			newPacket();
+		if (this.packet.buffer.length() > MAX_BYTES_STREAMED) {
+			this.newPacket();
+		}
 
-		return (totalReturnLength - 1);
+		return this.totalReturnLength - 1;
 	}
 
 	/**
@@ -609,20 +624,21 @@ public int getParameter(int parameter) {
 	public int setParameter(char parameter, char parameterValue) {
 
 		// set to command mode
-		setToCommandMode();
+		this.setToCommandMode();
 
 		// append the parameter set with value
-		packet.buffer.append((char) ((CONFIG_MASK | parameter) | parameterValue));
+		this.packet.buffer.append((char) (CONFIG_MASK | parameter | parameterValue));
 
 		// add to the return number of bytes
-		totalReturnLength++;
-		packet.returnLength++;
+		this.totalReturnLength++;
+		this.packet.returnLength++;
 
 		// check for packet too large
-		if (packet.buffer.length() > MAX_BYTES_STREAMED)
-			newPacket();
+		if (this.packet.buffer.length() > MAX_BYTES_STREAMED) {
+			this.newPacket();
+		}
 
-		return (totalReturnLength - 1);
+		return this.totalReturnLength - 1;
 	}
 
 	/**
@@ -638,24 +654,25 @@ public int setParameter(char parameter, char parameterValue) {
 	public int sendCommand(char command, boolean expectResponse) {
 
 		// set to command mode
-		setToCommandMode();
+		this.setToCommandMode();
 
 		// append the parameter set with value
-		packet.buffer.append(command);
+		this.packet.buffer.append(command);
 
 		// check for response
 		if (expectResponse) {
 
 			// add to the return number of bytes
-			totalReturnLength++;
-			packet.returnLength++;
+			this.totalReturnLength++;
+			this.packet.returnLength++;
 		}
 
 		// check for packet too large
-		if (packet.buffer.length() > MAX_BYTES_STREAMED)
-			newPacket();
+		if (this.packet.buffer.length() > MAX_BYTES_STREAMED) {
+			this.newPacket();
+		}
 
-		return (totalReturnLength - 1);
+		return this.totalReturnLength - 1;
 	}
 
 	// --------
@@ -677,26 +694,29 @@ public void interpretDataBytes(char[] dataByteResponse, int responseOffset, byte
 
 		for (i = 0; i < len; i++) {
 			// convert the rest to OneWireIOExceptions
-			if (bitsOnly) {
+			if (this.bitsOnly) {
 				temp_offset = responseOffset + 8 * i;
 
 				// provide debug output
-				if (doDebugMessages)
+				if (doDebugMessages) {
 					System.out.println("DEBUG: UPacketbuilder-interpretDataBytes[] responseOffset " + responseOffset
 							+ " offset " + offset + " lenbuf " + dataByteResponse.length);
+				}
 
 				// loop through and interpret each bit
 				result_byte = 0;
 				for (j = 0; j < 8; j++) {
 					result_byte = (char) (result_byte >>> 1);
 
-					if (interpretOneWireBit(dataByteResponse[temp_offset + j]))
+					if (this.interpretOneWireBit(dataByteResponse[temp_offset + j])) {
 						result_byte |= 0x80;
+					}
 				}
 
 				result[offset + i] = (byte) (result_byte & 0xFF);
-			} else
+			} else {
 				result[offset + i] = (byte) dataByteResponse[responseOffset + i];
+			}
 		}
 	}
 
@@ -710,46 +730,46 @@ public void interpretDataBytes(char[] dataByteResponse, int responseOffset, byte
 	public int interpretOneWireReset(char resetResponse) {
 
 		// make sure the response byte structure is correct
-		if ((resetResponse & 0xC0) == 0xC0) {
-
-			// retrieve the chip version and program voltage state
-			uState.revision = (char) (UAdapterState.CHIP_VERSION_MASK & resetResponse);
-			uState.programVoltageAvailable = ((UAdapterState.PROGRAM_VOLTAGE_MASK & resetResponse) != 0);
+		if ((resetResponse & 0xC0) != 0xC0) {
+			return DSPortAdapter.RESET_NOPRESENCE;
+		}
+		// retrieve the chip version and program voltage state
+		this.uState.revision = (char) (UAdapterState.CHIP_VERSION_MASK & resetResponse);
+		this.uState.programVoltageAvailable = (UAdapterState.PROGRAM_VOLTAGE_MASK & resetResponse) != 0;
 
-			// provide debug output
-			if (doDebugMessages)
-				System.out.println(
-						"DEBUG: UPacketbuilder-reset response " + Integer.toHexString((int) resetResponse & 0x00FF));
+		// provide debug output
+		if (doDebugMessages) {
+			System.out.println("DEBUG: UPacketbuilder-reset response " + Integer.toHexString(resetResponse & 0x00FF));
+		}
 
-			// convert the response byte to the OneWire reset result
-			switch (resetResponse & RESPONSE_RESET_MASK) {
+		// convert the response byte to the OneWire reset result
+		switch (resetResponse & RESPONSE_RESET_MASK) {
 
-			case RESPONSE_RESET_SHORT:
-				return DSPortAdapter.RESET_SHORT;
-			case RESPONSE_RESET_PRESENCE:
+		case RESPONSE_RESET_SHORT:
+			return DSPortAdapter.RESET_SHORT;
+		case RESPONSE_RESET_PRESENCE:
 
-				// if in long alarm check, record this as a non alarm reset
-				if (uState.longAlarmCheck) {
+			// if in long alarm check, record this as a non alarm reset
+			if (this.uState.longAlarmCheck) {
 
-					// check if can give up checking
-					if (uState.lastAlarmCount++ > UAdapterState.MAX_ALARM_COUNT)
-						uState.longAlarmCheck = false;
+				// check if can give up checking
+				if (this.uState.lastAlarmCount++ > UAdapterState.MAX_ALARM_COUNT) {
+					this.uState.longAlarmCheck = false;
 				}
+			}
 
-				return DSPortAdapter.RESET_PRESENCE;
-			case RESPONSE_RESET_ALARM:
+			return DSPortAdapter.RESET_PRESENCE;
+		case RESPONSE_RESET_ALARM:
 
-				// alarm presence so go into DS2480 long alarm check mode
-				uState.longAlarmCheck = true;
-				uState.lastAlarmCount = 0;
+			// alarm presence so go into DS2480 long alarm check mode
+			this.uState.longAlarmCheck = true;
+			this.uState.lastAlarmCount = 0;
 
-				return DSPortAdapter.RESET_ALARM;
-			case RESPONSE_RESET_NOPRESENCE:
-			default:
-				return DSPortAdapter.RESET_NOPRESENCE;
-			}
-		} else
+			return DSPortAdapter.RESET_ALARM;
+		case RESPONSE_RESET_NOPRESENCE:
+		default:
 			return DSPortAdapter.RESET_NOPRESENCE;
+		}
 	}
 
 	/**
@@ -762,10 +782,10 @@ public int interpretOneWireReset(char resetResponse) {
 	public boolean interpretOneWireBit(char bitResponse) {
 
 		// interpret the bit
-		if ((bitResponse & RESPONSE_BIT_MASK) == RESPONSE_BIT_ONE)
+		if ((bitResponse & RESPONSE_BIT_MASK) == RESPONSE_BIT_ONE) {
 			return true;
-		else
-			return false;
+		}
+		return false;
 	}
 
 	/**
@@ -781,58 +801,59 @@ public boolean interpretOneWireBit(char bitResponse) {
 	 *         search results
 	 */
 	public boolean interpretSearch(OneWireState mState, char[] searchResponse, int responseOffset) {
-		char[] temp_id = new char[8];
+		var temp_id = new char[8];
 
 		// change byte offset to bit offset
-		int bit_offset = responseOffset * 8;
+		var bit_offset = responseOffset * 8;
 
 		// set the temp Last Descrep to none
-		int temp_last_descrepancy = 0xFF;
-		int temp_last_family_descrepancy = 0;
+		var temp_last_descrepancy = 0xFF;
+		var temp_last_family_descrepancy = 0;
 
 		// interpret the search response sequence
-		for (int i = 0; i < 64; i++) {
+		for (var i = 0; i < 64; i++) {
 
 			// get the SerialNum bit
-			bitWrite(temp_id, i, bitRead(searchResponse, (i * 2) + 1 + bit_offset));
+			this.bitWrite(temp_id, i, this.bitRead(searchResponse, i * 2 + 1 + bit_offset));
 
 			// check LastDiscrepancy
-			if (bitRead(searchResponse, i * 2 + bit_offset) && !bitRead(searchResponse, i * 2 + 1 + bit_offset)) {
+			if (this.bitRead(searchResponse, i * 2 + bit_offset)
+					&& !this.bitRead(searchResponse, i * 2 + 1 + bit_offset)) {
 				temp_last_descrepancy = i + 1;
 
 				// check LastFamilyDiscrepancy
-				if (i < 8)
+				if (i < 8) {
 					temp_last_family_descrepancy = i + 1;
+				}
 			}
 		}
 
 		// check
-		byte[] id = new byte[8];
+		var id = new byte[8];
 
-		for (int i = 0; i < 8; i++)
+		for (var i = 0; i < 8; i++) {
 			id[i] = (byte) temp_id[i];
+		}
 
 		// check results
-		if ((!Address.isValid(id)) || (temp_last_descrepancy == 63) || (temp_id[0] == 0))
+		if (!Address.isValid(id) || temp_last_descrepancy == 63 || temp_id[0] == 0) {
 			return false;
+		}
+		// check for lastone
+		if (temp_last_descrepancy == mState.searchLastDiscrepancy || temp_last_descrepancy == 0xFF) {
+			mState.searchLastDevice = true;
+		}
 
-		// successful search
-		else {
-
-			// check for lastone
-			if ((temp_last_descrepancy == mState.searchLastDiscrepancy) || (temp_last_descrepancy == 0xFF))
-				mState.searchLastDevice = true;
-
-			// copy the ID number to the buffer
-			for (int i = 0; i < 8; i++)
-				mState.ID[i] = (byte) temp_id[i];
+		// copy the ID number to the buffer
+		for (var i = 0; i < 8; i++) {
+			mState.ID[i] = (byte) temp_id[i];
+		}
 
-			// set the count
-			mState.searchLastDiscrepancy = temp_last_descrepancy;
-			mState.searchFamilyLastDiscrepancy = temp_last_family_descrepancy;
+		// set the count
+		mState.searchLastDiscrepancy = temp_last_descrepancy;
+		mState.searchFamilyLastDiscrepancy = temp_last_family_descrepancy;
 
-			return true;
-		}
+		return true;
 	}
 
 	/**
@@ -847,11 +868,12 @@ public byte interpretPrimedByte(char[] primedDataResponse, int responseOffset) {
 		char result_byte = 0;
 
 		// loop through and interpret each bit
-		for (int i = 0; i < 8; i++) {
+		for (var i = 0; i < 8; i++) {
 			result_byte = (char) (result_byte >>> 1);
 
-			if (interpretOneWireBit(primedDataResponse[responseOffset + i]))
+			if (this.interpretOneWireBit(primedDataResponse[responseOffset + i])) {
 				result_byte |= 0x80;
+			}
 		}
 
 		return (byte) (result_byte & 0xFF);
@@ -865,26 +887,29 @@ public byte interpretPrimedByte(char[] primedDataResponse, int responseOffset) {
 	 * Request the maximum rate to do an operation
 	 */
 	public static int getDesiredBaud(int operation, int owSpeed, int maxBaud) {
-		int baud = 9600;
+		var baud = 9600;
 
 		switch (operation) {
 
 		case OPERATION_BYTE:
-			if (owSpeed == DSPortAdapter.SPEED_OVERDRIVE)
+			if (owSpeed == DSPortAdapter.SPEED_OVERDRIVE) {
 				baud = 115200;
-			else
+			} else {
 				baud = 9600;
+			}
 			break;
 		case OPERATION_SEARCH:
-			if (owSpeed == DSPortAdapter.SPEED_OVERDRIVE)
+			if (owSpeed == DSPortAdapter.SPEED_OVERDRIVE) {
 				baud = 57600;
-			else
+			} else {
 				baud = 9600;
+			}
 			break;
 		}
 
-		if (baud > maxBaud)
+		if (baud > maxBaud) {
 			baud = maxBaud;
+		}
 
 		return baud;
 	}
@@ -901,10 +926,10 @@ public static int getDesiredBaud(int operation, int owSpeed, int maxBaud) {
 	public boolean bitRead(char[] bitBuffer, int address) {
 		int byte_number, bit_number;
 
-		byte_number = (address / 8);
-		bit_number = address - (byte_number * 8);
+		byte_number = address / 8;
+		bit_number = address - byte_number * 8;
 
-		return (((char) ((bitBuffer[byte_number] >> bit_number) & 0x01)) == 0x01);
+		return (char) (bitBuffer[byte_number] >> bit_number & 0x01) == 0x01;
 	}
 
 	/**
@@ -918,12 +943,13 @@ public boolean bitRead(char[] bitBuffer, int address) {
 	public void bitWrite(char[] bitBuffer, int address, boolean newBitState) {
 		int byte_number, bit_number;
 
-		byte_number = (address / 8);
-		bit_number = address - (byte_number * 8);
+		byte_number = address / 8;
+		bit_number = address - byte_number * 8;
 
-		if (newBitState)
+		if (newBitState) {
 			bitBuffer[byte_number] |= (char) (0x01 << bit_number);
-		else
-			bitBuffer[byte_number] &= (char) (~(0x01 << bit_number));
+		} else {
+			bitBuffer[byte_number] &= (char) ~(0x01 << bit_number);
+		}
 	}
 }
diff --git a/io.openems.edge.bridge.onewire/src/com/dalsemi/onewire/adapter/UParameterSettings.java b/io.openems.edge.bridge.onewire/src/com/dalsemi/onewire/adapter/UParameterSettings.java
index 4ec078f296c..c0adea2ef32 100644
--- a/io.openems.edge.bridge.onewire/src/com/dalsemi/onewire/adapter/UParameterSettings.java
+++ b/io.openems.edge.bridge.onewire/src/com/dalsemi/onewire/adapter/UParameterSettings.java
@@ -295,10 +295,10 @@ class UParameterSettings {
 	 * <p>
 	 */
 	public UParameterSettings() {
-		pullDownSlewRate = SLEWRATE_1p37Vus;
-		pulse12VoltTime = TIME12V_infinite;
-		pulse5VoltTime = TIME5V_infinite;
-		write1LowTime = WRITE1TIME_10us;
-		sampleOffsetTime = SAMPLEOFFSET_TIME_8us;
+		this.pullDownSlewRate = SLEWRATE_1p37Vus;
+		this.pulse12VoltTime = TIME12V_infinite;
+		this.pulse5VoltTime = TIME5V_infinite;
+		this.write1LowTime = WRITE1TIME_10us;
+		this.sampleOffsetTime = SAMPLEOFFSET_TIME_8us;
 	}
 }
diff --git a/io.openems.edge.bridge.onewire/src/com/dalsemi/onewire/adapter/USerialAdapter.java b/io.openems.edge.bridge.onewire/src/com/dalsemi/onewire/adapter/USerialAdapter.java
index dc714f859c6..b9866278109 100644
--- a/io.openems.edge.bridge.onewire/src/com/dalsemi/onewire/adapter/USerialAdapter.java
+++ b/io.openems.edge.bridge.onewire/src/com/dalsemi/onewire/adapter/USerialAdapter.java
@@ -34,7 +34,6 @@
 
 import com.dalsemi.onewire.OneWireAccessProvider;
 import com.dalsemi.onewire.OneWireException;
-import com.dalsemi.onewire.container.OneWireContainer;
 import com.dalsemi.onewire.utils.Bit;
 import com.dalsemi.onewire.utils.CRC8;
 
@@ -210,9 +209,6 @@ public class USerialAdapter extends DSPortAdapter {
 	/** String name of the current opened port */
 	private boolean adapterPresent;
 
-	/** Flag to indicate more than expected byte received in a transaction */
-	private boolean extraBytesReceived;
-
 	/** U Adapter packet builder */
 	UPacketBuilder uBuild;
 
@@ -220,14 +216,14 @@ public class USerialAdapter extends DSPortAdapter {
 	private OneWireState owState;
 
 	/** U Adapter state */
-	private UAdapterState uState;
+	private final UAdapterState uState;
 
 	/** Input buffer to hold received data */
-	private StringBuffer inBuffer;
+	private final StringBuilder inBuffer;
 
 	/** Flag to indicate have a local begin/end Exclusive use of serial */
 	private boolean haveLocalUse;
-	private Object syncObject;
+	private final Object syncObject;
 
 	/** Enable/disable debug messages */
 	private static boolean doDebugMessages = false;
@@ -241,14 +237,14 @@ public class USerialAdapter extends DSPortAdapter {
 	 *
 	 */
 	public USerialAdapter() {
-		serial = null;
-		owState = new OneWireState();
-		uState = new UAdapterState(owState);
-		uBuild = new UPacketBuilder(uState);
-		inBuffer = new StringBuffer();
-		adapterPresent = false;
-		haveLocalUse = false;
-		syncObject = new Object();
+		this.serial = null;
+		this.owState = new OneWireState();
+		this.uState = new UAdapterState(this.owState);
+		this.uBuild = new UPacketBuilder(this.uState);
+		this.inBuffer = new StringBuilder();
+		this.adapterPresent = false;
+		this.haveLocalUse = false;
+		this.syncObject = new Object();
 	}
 
 	// --------
@@ -258,9 +254,9 @@ public USerialAdapter() {
 	@Override
 	protected void finalize() {
 		try {
-			freePort();
+			this.freePort();
 		} catch (Exception e) {
-			;
+
 		}
 	}
 
@@ -273,8 +269,9 @@ protected void finalize() {
 	 * @param thread that may have used a <code>USerialAdapter</code>
 	 */
 	public static void CleanUpByThread(Thread t) {
-		if (doDebugMessages)
+		if (doDebugMessages) {
 			System.out.println("CleanUpByThread called: Thread=" + t);
+		}
 		SerialService.CleanUpByThread(t);
 	}
 
@@ -285,6 +282,7 @@ public static void CleanUpByThread(Thread t) {
 	 *
 	 * @return <code>String</code> representation of the port adapter.
 	 */
+	@Override
 	public String getAdapterName() {
 		return "DS9097U";
 	}
@@ -295,6 +293,7 @@ public String getAdapterName() {
 	 *
 	 * @return <code>String</code> description of the port type required.
 	 */
+	@Override
 	public String getPortTypeDescription() {
 		return "serial communication port";
 	}
@@ -304,6 +303,7 @@ public String getPortTypeDescription() {
 	 *
 	 * @return version string
 	 */
+	@Override
 	public String getClassVersion() {
 		return classVersion;
 	}
@@ -320,6 +320,7 @@ public String getClassVersion() {
 	 *
 	 * @return enumeration of type <code>String</code> that contains the port names
 	 */
+	@Override
 	public Enumeration<String> getPortNames() {
 		return SerialService.getSerialPortIdentifiers();
 	}
@@ -340,23 +341,25 @@ public Enumeration<String> getPortNames() {
 	 *                            with port.
 	 * @throws OneWireException   If port does not exist
 	 */
+	@Override
 	public boolean selectPort(String newPortName) throws OneWireIOException, OneWireException {
 
 		// find the port reference
-		serial = SerialService.getSerialService(newPortName);
+		this.serial = SerialService.getSerialService(newPortName);
 		// ( SerialService ) serailServiceHash.get(newPortName);
 
 		// check if there is no such port
-		if (serial == null)
+		if (this.serial == null) {
 			throw new OneWireException("USerialAdapter: selectPort(), Not such serial port: " + newPortName);
+		}
 
 		try {
 
 			// acquire exclusive use of the port
-			beginLocalExclusive();
+			this.beginLocalExclusive();
 
 			// attempt to open the port
-			serial.openPort();
+			this.serial.openPort();
 
 			return true;
 		} catch (IOException ioe) {
@@ -364,7 +367,7 @@ public boolean selectPort(String newPortName) throws OneWireIOException, OneWire
 		} finally {
 
 			// release local exclusive use of port
-			endLocalExclusive();
+			this.endLocalExclusive();
 		}
 	}
 
@@ -375,11 +378,12 @@ public boolean selectPort(String newPortName) throws OneWireIOException, OneWire
 	 *
 	 * @throws OneWireException if valid port not yet selected
 	 */
+	@Override
 	public String getPortName() throws OneWireException {
-		if (serial != null)
-			return serial.getPortName();
-		else
-			throw new OneWireException("USerialAdapter-getPortName, port not selected");
+		if (this.serial != null) {
+			return this.serial.getPortName();
+		}
+		throw new OneWireException("USerialAdapter-getPortName, port not selected");
 	}
 
 	/**
@@ -389,21 +393,22 @@ public String getPortName() throws OneWireException {
 	 *
 	 * @throws OneWireException If port does not exist
 	 */
+	@Override
 	public void freePort() throws OneWireException {
 		try {
 			// acquire exclusive use of the port
-			beginLocalExclusive();
+			this.beginLocalExclusive();
 
-			adapterPresent = false;
+			this.adapterPresent = false;
 
 			// attempt to close the port
-			serial.closePort();
+			this.serial.closePort();
 		} catch (IOException ioe) {
 			throw new OneWireException("Error closing serial port");
 		} finally {
 
 			// release local exclusive use of port
-			endLocalExclusive();
+			this.endLocalExclusive();
 		}
 	}
 
@@ -420,22 +425,23 @@ public void freePort() throws OneWireException {
 	 * @throws OneWireIOException
 	 * @throws OneWireException
 	 */
+	@Override
 	public boolean adapterDetected() throws OneWireIOException, OneWireException {
 		boolean rt;
 
 		try {
 
 			// acquire exclusive use of the port
-			beginLocalExclusive();
-			uAdapterPresent();
+			this.beginLocalExclusive();
+			this.uAdapterPresent();
 
-			rt = uVerify();
+			rt = this.uVerify();
 		} catch (OneWireException e) {
 			rt = false;
 		} finally {
 
 			// release local exclusive use of port
-			endLocalExclusive();
+			this.endLocalExclusive();
 		}
 
 		return rt;
@@ -455,31 +461,30 @@ public boolean adapterDetected() throws OneWireIOException, OneWireException {
 	 * @throws OneWireException   on a communication or setup error with the 1-Wire
 	 *                            adapter
 	 */
+	@Override
 	public String getAdapterVersion() throws OneWireIOException, OneWireException {
-		String version_string = "DS2480 based adapter";
+		var version_string = "DS2480 based adapter";
 		boolean rt;
 
 		try {
 
 			// acquire exclusive use of the port
-			beginLocalExclusive();
+			this.beginLocalExclusive();
 
 			// only check if the port is acquired
-			if (uAdapterPresent()) {
-
-				// perform a reset to read the version
-				if (uState.revision == 0)
-					reset();
-
-				version_string = version_string.concat(", version " + (uState.revision >> 2));
-
-				return version_string;
-			} else
+			if (!this.uAdapterPresent()) {
 				throw new OneWireIOException("USerialAdapter-getAdapterVersion, adapter not present");
+			}
+			// perform a reset to read the version
+			if (this.uState.revision == 0) {
+				this.reset();
+			}
+
+			return version_string.concat(", version " + (this.uState.revision >> 2));
 		} finally {
 
 			// release local exclusive use of port
-			endLocalExclusive();
+			this.endLocalExclusive();
 		}
 	}
 
@@ -499,90 +504,94 @@ public String getAdapterVersion() throws OneWireIOException, OneWireException {
 	 *                            adapter
 	 * @see com.dalsemi.onewire.utils.Address
 	 */
+	@Override
 	public String getAdapterAddress() throws OneWireIOException, OneWireException {
 
 		// get a reference to the current oneWire State
-		OneWireState preserved_mstate = owState;
+		var preserved_mstate = this.owState;
 
-		owState = new OneWireState();
+		this.owState = new OneWireState();
 
 		try {
 
 			// acquire exclusive use of the port
-			beginLocalExclusive();
+			this.beginLocalExclusive();
 
 			// only check if the port is acquired
-			if (uAdapterPresent()) {
-
-				// set the search to find all of the available DS1982's
-				this.setSearchAllDevices();
-				this.targetAllFamilies();
-				this.targetFamily(ADAPTER_ID_FAMILY);
+			if (!this.uAdapterPresent()) {
+				throw new OneWireIOException("USerialAdapter-getAdapterAddress, adapter not present");
+			}
+			// set the search to find all of the available DS1982's
+			this.setSearchAllDevices();
+			this.targetAllFamilies();
+			this.targetFamily(ADAPTER_ID_FAMILY);
 
-				Enumeration<OneWireContainer> adapter_id_enum = this.getAllDeviceContainers();
-				byte[] address = new byte[8];
+			var adapter_id_enum = this.getAllDeviceContainers();
+			var address = new byte[8];
 
-				// loop through each of the DS1982's to find an adapter ID
-				for (; adapter_id_enum.hasMoreElements();) {
-					OneWireContainer ibutton = (OneWireContainer) adapter_id_enum.nextElement();
+			// loop through each of the DS1982's to find an adapter ID
+			for (; adapter_id_enum.hasMoreElements();) {
+				var ibutton = adapter_id_enum.nextElement();
 
-					System.arraycopy(ibutton.getAddress(), 0, address, 0, 8);
+				System.arraycopy(ibutton.getAddress(), 0, address, 0, 8);
 
-					// select this device
-					if (select(address)) {
+				// select this device
+				if (this.select(address)) {
 
-						// create a buffer to read the first page
-						byte[] read_buffer = new byte[37];
-						int cnt = 0;
-						int i;
+					// create a buffer to read the first page
+					var read_buffer = new byte[37];
+					var cnt = 0;
+					int i;
 
-						// extended read memory command
-						read_buffer[cnt++] = (byte) EXTENDED_READ_PAGE;
+					// extended read memory command
+					read_buffer[cnt++] = (byte) EXTENDED_READ_PAGE;
 
-						// address of first page
-						read_buffer[cnt++] = 0;
-						read_buffer[cnt++] = 0;
+					// address of first page
+					read_buffer[cnt++] = 0;
+					read_buffer[cnt++] = 0;
 
-						// CRC, data of page and CRC from device
-						for (i = 0; i < 34; i++)
-							read_buffer[cnt++] = (byte) 0xFF;
+					// CRC, data of page and CRC from device
+					for (i = 0; i < 34; i++) {
+						read_buffer[cnt++] = (byte) 0xFF;
+					}
 
-						// perform CRC8 of the first chunk of known data
-						int crc8 = CRC8.compute(read_buffer, 0, 3, 0);
+					// perform CRC8 of the first chunk of known data
+					var crc8 = CRC8.compute(read_buffer, 0, 3, 0);
 
-						// send/receive data to 1-Wire
-						dataBlock(read_buffer, 0, cnt);
+					// send/receive data to 1-Wire
+					this.dataBlock(read_buffer, 0, cnt);
 
-						// check the first CRC
-						if (CRC8.compute(read_buffer, 3, 1, crc8) == 0) {
+					// check the first CRC
+					if (CRC8.compute(read_buffer, 3, 1, crc8) == 0) {
 
-							// compute the next CRC8 with data from device
-							if (CRC8.compute(read_buffer, 4, 33, 0) == 0) {
+						// compute the next CRC8 with data from device
+						if (CRC8.compute(read_buffer, 4, 33, 0) == 0) {
 
-								// now loop to see if all data is 0xFF
-								for (i = 4; i < 36; i++)
-									if ((byte) read_buffer[i] != (byte) 0xFF)
-										continue;
+							// now loop to see if all data is 0xFF
+							for (i = 4; i < 36; i++) {
+								if (read_buffer[i] != (byte) 0xFF) {
+									continue;
+								}
+							}
 
-								// must be the one!
-								if (i == 36)
-									return ibutton.getAddressAsString();
+							// must be the one!
+							if (i == 36) {
+								return ibutton.getAddressAsString();
 							}
 						}
 					}
 				}
-			} else
-				throw new OneWireIOException("USerialAdapter-getAdapterAddress, adapter not present");
+			}
 		} catch (OneWireException e) {
 
 			// Drain.
 		} finally {
 
 			// restore the old state
-			owState = preserved_mstate;
+			this.owState = preserved_mstate;
 
 			// release local exclusive use of port
-			endLocalExclusive();
+			this.endLocalExclusive();
 		}
 
 		// don't know the ID
@@ -607,6 +616,7 @@ public String getAdapterAddress() throws OneWireIOException, OneWireException {
 	 * @throws OneWireIOException on a 1-Wire communication error with the adapter
 	 * @throws OneWireException   on a setup error with the 1-Wire adapter
 	 */
+	@Override
 	public boolean canOverdrive() throws OneWireIOException, OneWireException {
 		return true;
 	}
@@ -620,6 +630,7 @@ public boolean canOverdrive() throws OneWireIOException, OneWireException {
 	 * @throws OneWireIOException on a 1-Wire communication error with the adapter
 	 * @throws OneWireException   on a setup error with the 1-Wire adapter
 	 */
+	@Override
 	public boolean canHyperdrive() throws OneWireIOException, OneWireException {
 		return false;
 	}
@@ -633,6 +644,7 @@ public boolean canHyperdrive() throws OneWireIOException, OneWireException {
 	 * @throws OneWireIOException on a 1-Wire communication error with the adapter
 	 * @throws OneWireException   on a setup error with the 1-Wire adapter
 	 */
+	@Override
 	public boolean canFlex() throws OneWireIOException, OneWireException {
 		return true;
 	}
@@ -646,27 +658,28 @@ public boolean canFlex() throws OneWireIOException, OneWireException {
 	 * @throws OneWireIOException on a 1-Wire communication error with the adapter
 	 * @throws OneWireException   on a setup error with the 1-Wire adapter
 	 */
+	@Override
 	public boolean canProgram() throws OneWireIOException, OneWireException {
 		try {
 
 			// acquire exclusive use of the port
-			beginLocalExclusive();
+			this.beginLocalExclusive();
 
 			// only check if the port is acquired
-			if (uAdapterPresent()) {
-
-				// perform a reset to read the program available flag
-				if (uState.revision == 0)
-					reset();
-
-				// return the flag
-				return uState.programVoltageAvailable;
-			} else
+			if (!this.uAdapterPresent()) {
 				throw new OneWireIOException("USerialAdapter-canProgram, adapter not present");
+			}
+			// perform a reset to read the program available flag
+			if (this.uState.revision == 0) {
+				this.reset();
+			}
+
+			// return the flag
+			return this.uState.programVoltageAvailable;
 		} finally {
 
 			// release local exclusive use of port
-			endLocalExclusive();
+			this.endLocalExclusive();
 		}
 	}
 
@@ -679,6 +692,7 @@ public boolean canProgram() throws OneWireIOException, OneWireException {
 	 * @throws OneWireIOException on a 1-Wire communication error with the adapter
 	 * @throws OneWireException   on a setup error with the 1-Wire adapter
 	 */
+	@Override
 	public boolean canDeliverPower() throws OneWireIOException, OneWireException {
 		return true;
 	}
@@ -695,6 +709,7 @@ public boolean canDeliverPower() throws OneWireIOException, OneWireException {
 	 * @throws OneWireIOException on a 1-Wire communication error with the adapter
 	 * @throws OneWireException   on a setup error with the 1-Wire adapter
 	 */
+	@Override
 	public boolean canDeliverSmartPower() throws OneWireIOException, OneWireException {
 
 		// regardless of adapter, the class does not support it
@@ -710,6 +725,7 @@ public boolean canDeliverSmartPower() throws OneWireIOException, OneWireExceptio
 	 * @throws OneWireIOException on a 1-Wire communication error with the adapter
 	 * @throws OneWireException   on a setup error with the 1-Wire adapter
 	 */
+	@Override
 	public boolean canBreak() throws OneWireIOException, OneWireException {
 		return true;
 	}
@@ -728,15 +744,16 @@ public boolean canBreak() throws OneWireIOException, OneWireException {
 	 * @throws OneWireIOException on a 1-Wire communication error
 	 * @throws OneWireException   on a setup error with the 1-Wire adapter
 	 */
+	@Override
 	public boolean findFirstDevice() throws OneWireIOException, OneWireException {
 
 		// reset the current search
-		owState.searchLastDiscrepancy = 0;
-		owState.searchFamilyLastDiscrepancy = 0;
-		owState.searchLastDevice = false;
+		this.owState.searchLastDiscrepancy = 0;
+		this.owState.searchFamilyLastDiscrepancy = 0;
+		this.owState.searchLastDevice = false;
 
 		// search for the first device using next
-		return findNextDevice();
+		return this.findNextDevice();
 	}
 
 	/**
@@ -749,57 +766,59 @@ public boolean findFirstDevice() throws OneWireIOException, OneWireException {
 	 * @throws OneWireIOException on a 1-Wire communication error
 	 * @throws OneWireException   on a setup error with the 1-Wire adapter
 	 */
+	@Override
 	public boolean findNextDevice() throws OneWireIOException, OneWireException {
 		boolean search_result;
 
 		try {
 
 			// acquire exclusive use of the port
-			beginLocalExclusive();
+			this.beginLocalExclusive();
 
 			// check for previous last device
-			if (owState.searchLastDevice) {
-				owState.searchLastDiscrepancy = 0;
-				owState.searchFamilyLastDiscrepancy = 0;
-				owState.searchLastDevice = false;
+			if (this.owState.searchLastDevice) {
+				this.owState.searchLastDiscrepancy = 0;
+				this.owState.searchFamilyLastDiscrepancy = 0;
+				this.owState.searchLastDevice = false;
 
 				return false;
 			}
 
 			// check for 'first' and only 1 target
-			if ((owState.searchLastDiscrepancy == 0) && (owState.searchLastDevice == false)
-					&& (owState.searchIncludeFamilies.length == 1)) {
+			if (this.owState.searchLastDiscrepancy == 0 && this.owState.searchLastDevice == false
+					&& this.owState.searchIncludeFamilies.length == 1) {
 
 				// set the search to find the 1 target first
-				owState.searchLastDiscrepancy = 64;
+				this.owState.searchLastDiscrepancy = 64;
 
 				// create an id to set
-				byte[] new_id = new byte[8];
+				var new_id = new byte[8];
 
 				// set the family code
-				new_id[0] = owState.searchIncludeFamilies[0];
+				new_id[0] = this.owState.searchIncludeFamilies[0];
 
 				// clear the rest
-				for (int i = 1; i < 8; i++)
+				for (var i = 1; i < 8; i++) {
 					new_id[i] = 0;
+				}
 
 				// set this new ID
-				System.arraycopy(new_id, 0, owState.ID, 0, 8);
+				System.arraycopy(new_id, 0, this.owState.ID, 0, 8);
 			}
 
 			// loop until the correct type is found or no more devices
 			do {
 
 				// perform a search and keep the result
-				search_result = search(owState);
+				search_result = this.search(this.owState);
 
 				if (search_result) {
 
 					// check if not in exclude list
-					boolean is_excluded = false;
+					var is_excluded = false;
 
-					for (int i = 0; i < owState.searchExcludeFamilies.length; i++) {
-						if (owState.ID[0] == owState.searchExcludeFamilies[i]) {
+					for (byte element : this.owState.searchExcludeFamilies) {
+						if (this.owState.ID[0] == element) {
 							is_excluded = true;
 
 							break;
@@ -810,10 +829,10 @@ public boolean findNextDevice() throws OneWireIOException, OneWireException {
 					if (!is_excluded) {
 
 						// loop through the include list
-						boolean is_included = false;
+						var is_included = false;
 
-						for (int i = 0; i < owState.searchIncludeFamilies.length; i++) {
-							if (owState.ID[0] == owState.searchIncludeFamilies[i]) {
+						for (byte element : this.owState.searchIncludeFamilies) {
+							if (this.owState.ID[0] == element) {
 								is_included = true;
 
 								break;
@@ -821,23 +840,24 @@ public boolean findNextDevice() throws OneWireIOException, OneWireException {
 						}
 
 						// check if include list or there is no include list
-						if (is_included || (owState.searchIncludeFamilies.length == 0))
+						if (is_included || this.owState.searchIncludeFamilies.length == 0) {
 							return true;
+						}
 					}
 				}
 
 				// skip the current type if not last device
-				if (!owState.searchLastDevice && (owState.searchFamilyLastDiscrepancy != 0)) {
-					owState.searchLastDiscrepancy = owState.searchFamilyLastDiscrepancy;
-					owState.searchFamilyLastDiscrepancy = 0;
-					owState.searchLastDevice = false;
+				if (!this.owState.searchLastDevice && this.owState.searchFamilyLastDiscrepancy != 0) {
+					this.owState.searchLastDiscrepancy = this.owState.searchFamilyLastDiscrepancy;
+					this.owState.searchFamilyLastDiscrepancy = 0;
+					this.owState.searchLastDevice = false;
 				}
 
 				// end of search so reset and return
 				else {
-					owState.searchLastDiscrepancy = 0;
-					owState.searchFamilyLastDiscrepancy = 0;
-					owState.searchLastDevice = false;
+					this.owState.searchLastDiscrepancy = 0;
+					this.owState.searchFamilyLastDiscrepancy = 0;
+					this.owState.searchLastDevice = false;
 					search_result = false;
 				}
 			} while (search_result);
@@ -847,7 +867,7 @@ public boolean findNextDevice() throws OneWireIOException, OneWireException {
 		} finally {
 
 			// release local exclusive use of port
-			endLocalExclusive();
+			this.endLocalExclusive();
 		}
 	}
 
@@ -859,8 +879,9 @@ public boolean findNextDevice() throws OneWireIOException, OneWireException {
 	 * @param address An array to be filled with the current iButton address.
 	 * @see com.dalsemi.onewire.utils.Address
 	 */
+	@Override
 	public void getAddress(byte[] address) {
-		System.arraycopy(owState.ID, 0, address, 0, 8);
+		System.arraycopy(this.owState.ID, 0, address, 0, 8);
 	}
 
 	/**
@@ -871,7 +892,7 @@ public void getAddress(byte[] address) {
 	 * @param address An array to be copied into the current iButton address.
 	 */
 	public void setAddress(byte[] address) {
-		System.arraycopy(address, 0, owState.ID, 0, 8);
+		System.arraycopy(address, 0, this.owState.ID, 0, 8);
 	}
 
 	/**
@@ -888,55 +909,59 @@ public void setAddress(byte[] address) {
 	 *
 	 * @see com.dalsemi.onewire.utils.Address
 	 */
+	@Override
 	public boolean isPresent(byte[] address) throws OneWireIOException, OneWireException {
 		try {
 
 			// acquire exclusive use of the port
-			beginLocalExclusive();
+			this.beginLocalExclusive();
 
 			// make sure adapter is present
-			if (uAdapterPresent()) {
-
-				// check for pending power conditions
-				if (owState.oneWireLevel != LEVEL_NORMAL)
-					setPowerNormal();
-
-				// if in overdrive, then use the block method in super
-				if (owState.oneWireSpeed == SPEED_OVERDRIVE)
-					return blockIsPresent(address, false);
+			if (!this.uAdapterPresent()) {
+				throw new OneWireIOException("Error communicating with adapter");
+			}
+			// check for pending power conditions
+			if (this.owState.oneWireLevel != LEVEL_NORMAL) {
+				this.setPowerNormal();
+			}
 
-				// create a private OneWireState
-				OneWireState onewire_state = new OneWireState();
+			// if in overdrive, then use the block method in super
+			if (this.owState.oneWireSpeed == SPEED_OVERDRIVE) {
+				return this.blockIsPresent(address, false);
+			}
 
-				// set the ID to the ID of the iButton passes to this method
-				System.arraycopy(address, 0, onewire_state.ID, 0, 8);
+			// create a private OneWireState
+			var onewire_state = new OneWireState();
 
-				// set the state to find the specified device
-				onewire_state.searchLastDiscrepancy = 64;
-				onewire_state.searchFamilyLastDiscrepancy = 0;
-				onewire_state.searchLastDevice = false;
-				onewire_state.searchOnlyAlarmingButtons = false;
+			// set the ID to the ID of the iButton passes to this method
+			System.arraycopy(address, 0, onewire_state.ID, 0, 8);
 
-				// perform a search
-				if (search(onewire_state)) {
+			// set the state to find the specified device
+			onewire_state.searchLastDiscrepancy = 64;
+			onewire_state.searchFamilyLastDiscrepancy = 0;
+			onewire_state.searchLastDevice = false;
+			onewire_state.searchOnlyAlarmingButtons = false;
 
-					// compare the found device with the desired device
-					for (int i = 0; i < 8; i++)
-						if (address[i] != onewire_state.ID[i])
-							return false;
+			// perform a search
+			if (this.search(onewire_state)) {
 
-					// must be the correct device
-					return true;
+				// compare the found device with the desired device
+				for (var i = 0; i < 8; i++) {
+					if (address[i] != onewire_state.ID[i]) {
+						return false;
+					}
 				}
 
-				// failed to find device
-				return false;
-			} else
-				throw new OneWireIOException("Error communicating with adapter");
+				// must be the correct device
+				return true;
+			}
+
+			// failed to find device
+			return false;
 		} finally {
 
 			// release local exclusive use of port
-			endLocalExclusive();
+			this.endLocalExclusive();
 		}
 	}
 
@@ -955,55 +980,59 @@ public boolean isPresent(byte[] address) throws OneWireIOException, OneWireExcep
 	 *
 	 * @see com.dalsemi.onewire.utils.Address
 	 */
+	@Override
 	public boolean isAlarming(byte[] address) throws OneWireIOException, OneWireException {
 		try {
 
 			// acquire exclusive use of the port
-			beginLocalExclusive();
+			this.beginLocalExclusive();
 
 			// make sure adapter is present
-			if (uAdapterPresent()) {
-
-				// check for pending power conditions
-				if (owState.oneWireLevel != LEVEL_NORMAL)
-					setPowerNormal();
-
-				// if in overdrive, then use the block method in super
-				if (owState.oneWireSpeed == SPEED_OVERDRIVE)
-					return blockIsPresent(address, true);
+			if (!this.uAdapterPresent()) {
+				throw new OneWireIOException("Error communicating with adapter");
+			}
+			// check for pending power conditions
+			if (this.owState.oneWireLevel != LEVEL_NORMAL) {
+				this.setPowerNormal();
+			}
 
-				// create a private OneWireState
-				OneWireState onewire_state = new OneWireState();
+			// if in overdrive, then use the block method in super
+			if (this.owState.oneWireSpeed == SPEED_OVERDRIVE) {
+				return this.blockIsPresent(address, true);
+			}
 
-				// set the ID to the ID of the iButton passes to this method
-				System.arraycopy(address, 0, onewire_state.ID, 0, 8);
+			// create a private OneWireState
+			var onewire_state = new OneWireState();
 
-				// set the state to find the specified device (alarming)
-				onewire_state.searchLastDiscrepancy = 64;
-				onewire_state.searchFamilyLastDiscrepancy = 0;
-				onewire_state.searchLastDevice = false;
-				onewire_state.searchOnlyAlarmingButtons = true;
+			// set the ID to the ID of the iButton passes to this method
+			System.arraycopy(address, 0, onewire_state.ID, 0, 8);
 
-				// perform a search
-				if (search(onewire_state)) {
+			// set the state to find the specified device (alarming)
+			onewire_state.searchLastDiscrepancy = 64;
+			onewire_state.searchFamilyLastDiscrepancy = 0;
+			onewire_state.searchLastDevice = false;
+			onewire_state.searchOnlyAlarmingButtons = true;
 
-					// compare the found device with the desired device
-					for (int i = 0; i < 8; i++)
-						if (address[i] != onewire_state.ID[i])
-							return false;
+			// perform a search
+			if (this.search(onewire_state)) {
 
-					// must be the correct device
-					return true;
+				// compare the found device with the desired device
+				for (var i = 0; i < 8; i++) {
+					if (address[i] != onewire_state.ID[i]) {
+						return false;
+					}
 				}
 
-				// failed to find any alarming device
-				return false;
-			} else
-				throw new OneWireIOException("Error communicating with adapter");
+				// must be the correct device
+				return true;
+			}
+
+			// failed to find any alarming device
+			return false;
 		} finally {
 
 			// release local exclusive use of port
-			endLocalExclusive();
+			this.endLocalExclusive();
 		}
 	}
 
@@ -1019,8 +1048,9 @@ public boolean isAlarming(byte[] address) throws OneWireIOException, OneWireExce
 	 *
 	 * @see #setNoResetSearch
 	 */
+	@Override
 	public void setSearchOnlyAlarmingDevices() {
-		owState.searchOnlyAlarmingButtons = true;
+		this.owState.searchOnlyAlarmingButtons = true;
 	}
 
 	/**
@@ -1028,8 +1058,9 @@ public void setSearchOnlyAlarmingDevices() {
 	 * This feature is chiefly used with the DS2409 1-Wire coupler. The normal reset
 	 * before each search can be restored with the 'setSearchAllDevices()' method.
 	 */
+	@Override
 	public void setNoResetSearch() {
-		owState.skipResetOnSearch = true;
+		this.owState.skipResetOnSearch = true;
 	}
 
 	/**
@@ -1040,26 +1071,28 @@ public void setNoResetSearch() {
 	 *
 	 * @see #setNoResetSearch
 	 */
+	@Override
 	public void setSearchAllDevices() {
-		owState.searchOnlyAlarmingButtons = false;
-		owState.skipResetOnSearch = false;
+		this.owState.searchOnlyAlarmingButtons = false;
+		this.owState.skipResetOnSearch = false;
 	}
 
 	/**
 	 * Removes any selectivity during a search for iButtons or 1-Wire devices by
 	 * family type. The unique address for each iButton and 1-Wire device contains a
 	 * family descriptor that indicates the capabilities of the device.
-	 * 
+	 *
 	 * @see #targetFamily
 	 * @see #targetFamily(byte[])
 	 * @see #excludeFamily
 	 * @see #excludeFamily(byte[])
 	 */
+	@Override
 	public void targetAllFamilies() {
 
 		// clear the include and exclude family search lists
-		owState.searchIncludeFamilies = new byte[0];
-		owState.searchExcludeFamilies = new byte[0];
+		this.owState.searchIncludeFamilies = new byte[0];
+		this.owState.searchExcludeFamilies = new byte[0];
 	}
 
 	/**
@@ -1071,11 +1104,12 @@ public void targetAllFamilies() {
 	 * @see com.dalsemi.onewire.utils.Address
 	 * @see #targetAllFamilies
 	 */
+	@Override
 	public void targetFamily(int familyID) {
 
 		// replace include family array with 1 element array
-		owState.searchIncludeFamilies = new byte[1];
-		owState.searchIncludeFamilies[0] = (byte) familyID;
+		this.owState.searchIncludeFamilies = new byte[1];
+		this.owState.searchIncludeFamilies[0] = (byte) familyID;
 	}
 
 	/**
@@ -1087,12 +1121,13 @@ public void targetFamily(int familyID) {
 	 * @see com.dalsemi.onewire.utils.Address
 	 * @see #targetAllFamilies
 	 */
+	@Override
 	public void targetFamily(byte familyID[]) {
 
 		// replace include family array with new array
-		owState.searchIncludeFamilies = new byte[familyID.length];
+		this.owState.searchIncludeFamilies = new byte[familyID.length];
 
-		System.arraycopy(familyID, 0, owState.searchIncludeFamilies, 0, familyID.length);
+		System.arraycopy(familyID, 0, this.owState.searchIncludeFamilies, 0, familyID.length);
 	}
 
 	/**
@@ -1104,11 +1139,12 @@ public void targetFamily(byte familyID[]) {
 	 * @see com.dalsemi.onewire.utils.Address
 	 * @see #targetAllFamilies
 	 */
+	@Override
 	public void excludeFamily(int familyID) {
 
 		// replace exclude family array with 1 element array
-		owState.searchExcludeFamilies = new byte[1];
-		owState.searchExcludeFamilies[0] = (byte) familyID;
+		this.owState.searchExcludeFamilies = new byte[1];
+		this.owState.searchExcludeFamilies[0] = (byte) familyID;
 	}
 
 	/**
@@ -1120,12 +1156,13 @@ public void excludeFamily(int familyID) {
 	 * @see com.dalsemi.onewire.utils.Address
 	 * @see #targetAllFamilies
 	 */
+	@Override
 	public void excludeFamily(byte familyID[]) {
 
 		// replace exclude family array with new array
-		owState.searchExcludeFamilies = new byte[familyID.length];
+		this.owState.searchExcludeFamilies = new byte[familyID.length];
 
-		System.arraycopy(familyID, 0, owState.searchExcludeFamilies, 0, familyID.length);
+		System.arraycopy(familyID, 0, this.owState.searchExcludeFamilies, 0, familyID.length);
 	}
 
 	// --------
@@ -1148,8 +1185,9 @@ public void excludeFamily(byte familyID[]) {
 	 *
 	 * @throws OneWireException on a setup error with the 1-Wire adapter
 	 */
+	@Override
 	public boolean beginExclusive(boolean blocking) throws OneWireException {
-		return serial.beginExclusive(blocking);
+		return this.serial.beginExclusive(blocking);
 	}
 
 	/**
@@ -1157,8 +1195,9 @@ public boolean beginExclusive(boolean blocking) throws OneWireException {
 	 * dynamically marks the end of a critical section and should be used when
 	 * exclusive control is no longer needed.
 	 */
+	@Override
 	public void endExclusive() {
-		serial.endExclusive();
+		this.serial.endExclusive();
 	}
 
 	/**
@@ -1170,18 +1209,18 @@ public void endExclusive() {
 	private void beginLocalExclusive() throws OneWireException {
 
 		// check if there is no such port
-		if (serial == null)
+		if (this.serial == null) {
 			throw new OneWireException("USerialAdapter: port not selected ");
+		}
 
 		// check if already have exclusive use
-		if (serial.haveExclusive())
-			return;
-		else {
-			while (!haveLocalUse) {
-				synchronized (syncObject) {
-					haveLocalUse = serial.beginExclusive(false);
+		if (this.serial.haveExclusive()) {
+		} else {
+			while (!this.haveLocalUse) {
+				synchronized (this.syncObject) {
+					this.haveLocalUse = this.serial.beginExclusive(false);
 				}
-				if (!haveLocalUse) {
+				if (!this.haveLocalUse) {
 					try {
 						Thread.sleep(50);
 					} catch (Exception e) {
@@ -1196,11 +1235,11 @@ private void beginLocalExclusive() throws OneWireException {
 	 * if we did our own 'beginExclusive' block and frees it.
 	 */
 	private void endLocalExclusive() {
-		synchronized (syncObject) {
-			if (haveLocalUse) {
-				haveLocalUse = false;
+		synchronized (this.syncObject) {
+			if (this.haveLocalUse) {
+				this.haveLocalUse = false;
 
-				serial.endExclusive();
+				this.serial.endExclusive();
 			}
 		}
 	}
@@ -1217,51 +1256,53 @@ private void endLocalExclusive() {
 	 * @throws OneWireIOException on a 1-Wire communication error
 	 * @throws OneWireException   on a setup error with the 1-Wire adapter
 	 */
+	@Override
 	public void putBit(boolean bitValue) throws OneWireIOException, OneWireException {
 		try {
 
 			// acquire exclusive use of the port
-			beginLocalExclusive();
+			this.beginLocalExclusive();
 
 			// make sure adapter is present
-			if (uAdapterPresent()) {
-
-				// check for pending power conditions
-				if (owState.oneWireLevel != LEVEL_NORMAL)
-					setPowerNormal();
+			if (!this.uAdapterPresent()) {
+				throw new OneWireIOException("Error communicating with adapter");
+			}
+			// check for pending power conditions
+			if (this.owState.oneWireLevel != LEVEL_NORMAL) {
+				this.setPowerNormal();
+			}
 
-				// flush out the com buffer
-				serial.flush();
+			// flush out the com buffer
+			this.serial.flush();
 
-				// build a message to send bit to the U brick
-				uBuild.restart();
+			// build a message to send bit to the U brick
+			this.uBuild.restart();
 
-				int bit_offset = uBuild.dataBit(bitValue, owState.levelChangeOnNextBit);
+			var bit_offset = this.uBuild.dataBit(bitValue, this.owState.levelChangeOnNextBit);
 
-				// check if just started power delivery
-				if (owState.levelChangeOnNextBit) {
+			// check if just started power delivery
+			if (this.owState.levelChangeOnNextBit) {
 
-					// clear the primed condition
-					owState.levelChangeOnNextBit = false;
+				// clear the primed condition
+				this.owState.levelChangeOnNextBit = false;
 
-					// set new level state
-					owState.oneWireLevel = LEVEL_POWER_DELIVERY;
-				}
+				// set new level state
+				this.owState.oneWireLevel = LEVEL_POWER_DELIVERY;
+			}
 
-				// send and receive
-				char[] result_array = uTransaction(uBuild);
+			// send and receive
+			var result_array = this.uTransaction(this.uBuild);
 
-				// check for echo
-				if (bitValue != uBuild.interpretOneWireBit(result_array[bit_offset]))
-					throw new OneWireIOException("1-Wire communication error, echo was incorrect");
-			} else
-				throw new OneWireIOException("Error communicating with adapter");
+			// check for echo
+			if (bitValue != this.uBuild.interpretOneWireBit(result_array[bit_offset])) {
+				throw new OneWireIOException("1-Wire communication error, echo was incorrect");
+			}
 		} catch (IOException ioe) {
 			throw new OneWireIOException(ioe.toString());
 		} finally {
 
 			// release local exclusive use of port
-			endLocalExclusive();
+			this.endLocalExclusive();
 		}
 	}
 
@@ -1273,53 +1314,55 @@ public void putBit(boolean bitValue) throws OneWireIOException, OneWireException
 	 * @throws OneWireIOException on a 1-Wire communication error
 	 * @throws OneWireException   on a setup error with the 1-Wire adapter
 	 */
+	@Override
 	public boolean getBit() throws OneWireIOException, OneWireException {
 		try {
 
 			// acquire exclusive use of the port
-			beginLocalExclusive();
+			this.beginLocalExclusive();
 
 			// make sure adapter is present
-			if (uAdapterPresent()) {
-
-				// check for pending power conditions
-				if (owState.oneWireLevel != LEVEL_NORMAL)
-					setPowerNormal();
+			if (!this.uAdapterPresent()) {
+				throw new OneWireIOException("Error communicating with adapter");
+			}
+			// check for pending power conditions
+			if (this.owState.oneWireLevel != LEVEL_NORMAL) {
+				this.setPowerNormal();
+			}
 
-				// flush out the com buffer
-				serial.flush();
+			// flush out the com buffer
+			this.serial.flush();
 
-				// build a message to send bit to the U brick
-				uBuild.restart();
+			// build a message to send bit to the U brick
+			this.uBuild.restart();
 
-				int bit_offset = uBuild.dataBit(true, owState.levelChangeOnNextBit);
+			var bit_offset = this.uBuild.dataBit(true, this.owState.levelChangeOnNextBit);
 
-				// check if just started power delivery
-				if (owState.levelChangeOnNextBit) {
+			// check if just started power delivery
+			if (this.owState.levelChangeOnNextBit) {
 
-					// clear the primed condition
-					owState.levelChangeOnNextBit = false;
+				// clear the primed condition
+				this.owState.levelChangeOnNextBit = false;
 
-					// set new level state
-					owState.oneWireLevel = LEVEL_POWER_DELIVERY;
-				}
+				// set new level state
+				this.owState.oneWireLevel = LEVEL_POWER_DELIVERY;
+			}
 
-				// send and receive
-				char[] result_array = uTransaction(uBuild);
+			// send and receive
+			var result_array = this.uTransaction(this.uBuild);
 
-				// check the result
-				if (result_array.length == (bit_offset + 1))
-					return uBuild.interpretOneWireBit(result_array[bit_offset]);
-				else
-					return false;
-			} else
-				throw new OneWireIOException("Error communicating with adapter");
+			// check the result
+			if (result_array.length == bit_offset + 1) {
+				return this.uBuild.interpretOneWireBit(result_array[bit_offset]);
+			} else {
+				return false;
+			}
 		} catch (IOException ioe) {
 			throw new OneWireIOException(ioe.toString());
 		} finally {
 
 			// release local exclusive use of port
-			endLocalExclusive();
+			this.endLocalExclusive();
 		}
 	}
 
@@ -1331,16 +1374,18 @@ public boolean getBit() throws OneWireIOException, OneWireException {
 	 * @throws OneWireIOException on a 1-Wire communication error
 	 * @throws OneWireException   on a setup error with the 1-Wire adapter
 	 */
+	@Override
 	public void putByte(int byteValue) throws OneWireIOException, OneWireException {
-		byte[] temp_block = new byte[1];
+		var temp_block = new byte[1];
 
 		temp_block[0] = (byte) byteValue;
 
-		dataBlock(temp_block, 0, 1);
+		this.dataBlock(temp_block, 0, 1);
 
 		// check to make sure echo was what was sent
-		if (temp_block[0] != (byte) byteValue)
+		if (temp_block[0] != (byte) byteValue) {
 			throw new OneWireIOException("Error short on 1-Wire during putByte");
+		}
 	}
 
 	/**
@@ -1351,17 +1396,18 @@ public void putByte(int byteValue) throws OneWireIOException, OneWireException {
 	 * @throws OneWireIOException on a 1-Wire communication error
 	 * @throws OneWireException   on a setup error with the 1-Wire adapter
 	 */
+	@Override
 	public int getByte() throws OneWireIOException, OneWireException {
-		byte[] temp_block = new byte[1];
+		var temp_block = new byte[1];
 
 		temp_block[0] = (byte) 0xFF;
 
-		dataBlock(temp_block, 0, 1);
+		this.dataBlock(temp_block, 0, 1);
 
-		if (temp_block.length == 1)
-			return (temp_block[0] & 0xFF);
-		else
-			throw new OneWireIOException("Error communicating with adapter");
+		if (temp_block.length == 1) {
+			return temp_block[0] & 0xFF;
+		}
+		throw new OneWireIOException("Error communicating with adapter");
 	}
 
 	/**
@@ -1374,14 +1420,16 @@ public int getByte() throws OneWireIOException, OneWireException {
 	 * @throws OneWireIOException on a 1-Wire communication error
 	 * @throws OneWireException   on a setup error with the 1-Wire adapter
 	 */
+	@Override
 	public byte[] getBlock(int len) throws OneWireIOException, OneWireException {
-		byte[] temp_block = new byte[len];
+		var temp_block = new byte[len];
 
 		// set block to read 0xFF
-		for (int i = 0; i < len; i++)
+		for (var i = 0; i < len; i++) {
 			temp_block[i] = (byte) 0xFF;
+		}
 
-		getBlock(temp_block, len);
+		this.getBlock(temp_block, len);
 
 		return temp_block;
 	}
@@ -1396,8 +1444,9 @@ public byte[] getBlock(int len) throws OneWireIOException, OneWireException {
 	 * @throws OneWireIOException on a 1-Wire communication error
 	 * @throws OneWireException   on a setup error with the 1-Wire adapter
 	 */
+	@Override
 	public void getBlock(byte[] arr, int len) throws OneWireIOException, OneWireException {
-		getBlock(arr, 0, len);
+		this.getBlock(arr, 0, len);
 	}
 
 	/**
@@ -1411,13 +1460,15 @@ public void getBlock(byte[] arr, int len) throws OneWireIOException, OneWireExce
 	 * @throws OneWireIOException on a 1-Wire communication error
 	 * @throws OneWireException   on a setup error with the 1-Wire adapter
 	 */
+	@Override
 	public void getBlock(byte[] arr, int off, int len) throws OneWireIOException, OneWireException {
 
 		// set block to read 0xFF
-		for (int i = off; i < len; i++)
+		for (var i = off; i < len; i++) {
 			arr[i] = (byte) 0xFF;
+		}
 
-		dataBlock(arr, off, len);
+		this.dataBlock(arr, off, len);
 	}
 
 	/**
@@ -1433,6 +1484,7 @@ public void getBlock(byte[] arr, int off, int len) throws OneWireIOException, On
 	 * @throws OneWireIOException on a 1-Wire communication error
 	 * @throws OneWireException   on a setup error with the 1-Wire adapter
 	 */
+	@Override
 	public void dataBlock(byte dataBlock[], int off, int len) throws OneWireIOException, OneWireException {
 		int data_offset;
 		char[] ret_data;
@@ -1440,54 +1492,54 @@ public void dataBlock(byte dataBlock[], int off, int len) throws OneWireIOExcept
 		try {
 
 			// acquire exclusive use of the port
-			beginLocalExclusive();
+			this.beginLocalExclusive();
 
 			// make sure adapter is present
-			if (uAdapterPresent()) {
-
-				// check for pending power conditions
-				if (owState.oneWireLevel != LEVEL_NORMAL)
-					setPowerNormal();
+			if (!this.uAdapterPresent()) {
+				throw new OneWireIOException("Error communicating with adapter");
+			}
+			// check for pending power conditions
+			if (this.owState.oneWireLevel != LEVEL_NORMAL) {
+				this.setPowerNormal();
+			}
 
-				// set the correct baud rate to stream this operation
-				setStreamingSpeed(UPacketBuilder.OPERATION_BYTE);
+			// set the correct baud rate to stream this operation
+			this.setStreamingSpeed(UPacketBuilder.OPERATION_BYTE);
 
-				// flush out the com buffer
-				serial.flush();
+			// flush out the com buffer
+			this.serial.flush();
 
-				// build a message to write/read data bytes to the U brick
-				uBuild.restart();
+			// build a message to write/read data bytes to the U brick
+			this.uBuild.restart();
 
-				// check for primed byte
-				if ((len == 1) && owState.levelChangeOnNextByte) {
-					data_offset = uBuild.primedDataByte(dataBlock[off]);
-					owState.levelChangeOnNextByte = false;
+			// check for primed byte
+			if (len == 1 && this.owState.levelChangeOnNextByte) {
+				data_offset = this.uBuild.primedDataByte(dataBlock[off]);
+				this.owState.levelChangeOnNextByte = false;
 
-					// send and receive
-					ret_data = uTransaction(uBuild);
+				// send and receive
+				ret_data = this.uTransaction(this.uBuild);
 
-					// set new level state
-					owState.oneWireLevel = LEVEL_POWER_DELIVERY;
+				// set new level state
+				this.owState.oneWireLevel = LEVEL_POWER_DELIVERY;
 
-					// extract the result byte
-					dataBlock[off] = uBuild.interpretPrimedByte(ret_data, data_offset);
-				} else {
-					data_offset = uBuild.dataBytes(dataBlock, off, len);
+				// extract the result byte
+				dataBlock[off] = this.uBuild.interpretPrimedByte(ret_data, data_offset);
+			} else {
+				data_offset = this.uBuild.dataBytes(dataBlock, off, len);
 
-					// send and receive
-					ret_data = uTransaction(uBuild);
+				// send and receive
+				ret_data = this.uTransaction(this.uBuild);
 
-					// extract the result byte(s)
-					uBuild.interpretDataBytes(ret_data, data_offset, dataBlock, off, len);
-				}
-			} else
-				throw new OneWireIOException("Error communicating with adapter");
+				// extract the result byte(s)
+				this.uBuild.interpretDataBytes(ret_data, data_offset, dataBlock, off, len);
+			}
 		} catch (IOException ioe) {
 			throw new OneWireIOException(ioe.toString());
 		} finally {
 
 			// release local exclusive use of port
-			endLocalExclusive();
+			this.endLocalExclusive();
 		}
 	}
 
@@ -1510,43 +1562,45 @@ public void dataBlock(byte dataBlock[], int off, int len) throws OneWireIOExcept
 	 * @throws OneWireIOException on a 1-Wire communication error
 	 * @throws OneWireException   on a setup error with the 1-Wire adapter
 	 */
+	@Override
 	public int reset() throws OneWireIOException, OneWireException {
 		try {
 
 			// acquire exclusive use of the port
-			beginLocalExclusive();
+			this.beginLocalExclusive();
 
 			// make sure adapter is present
-			if (uAdapterPresent()) {
-
-				// check for pending power conditions
-				if (owState.oneWireLevel != LEVEL_NORMAL)
-					setPowerNormal();
+			if (!this.uAdapterPresent()) {
+				throw new OneWireIOException("Error communicating with adapter");
+			}
+			// check for pending power conditions
+			if (this.owState.oneWireLevel != LEVEL_NORMAL) {
+				this.setPowerNormal();
+			}
 
-				// flush out the com buffer
-				serial.flush();
+			// flush out the com buffer
+			this.serial.flush();
 
-				// build a message to read the baud rate from the U brick
-				uBuild.restart();
+			// build a message to read the baud rate from the U brick
+			this.uBuild.restart();
 
-				int reset_offset = uBuild.oneWireReset();
+			var reset_offset = this.uBuild.oneWireReset();
 
-				// send and receive
-				char[] result_array = uTransaction(uBuild);
+			// send and receive
+			var result_array = this.uTransaction(this.uBuild);
 
-				// check the result
-				if (result_array.length == (reset_offset + 1))
-					return uBuild.interpretOneWireReset(result_array[reset_offset]);
-				else
-					throw new OneWireIOException("USerialAdapter-reset: no return byte form 1-Wire reset");
-			} else
-				throw new OneWireIOException("Error communicating with adapter");
+			// check the result
+			if (result_array.length == reset_offset + 1) {
+				return this.uBuild.interpretOneWireReset(result_array[reset_offset]);
+			} else {
+				throw new OneWireIOException("USerialAdapter-reset: no return byte form 1-Wire reset");
+			}
 		} catch (IOException ioe) {
 			throw new OneWireIOException(ioe.toString());
 		} finally {
 
 			// release local exclusive use of port
-			endLocalExclusive();
+			this.endLocalExclusive();
 		}
 	}
 
@@ -1579,12 +1633,13 @@ public int reset() throws OneWireIOException, OneWireException {
 	 * @throws OneWireIOException on a 1-Wire communication error
 	 * @throws OneWireException   on a setup error with the 1-Wire adapter
 	 */
+	@Override
 	public void setPowerDuration(int timeFactor) throws OneWireIOException, OneWireException {
-		if (timeFactor != DELIVERY_INFINITE)
+		if (timeFactor != DELIVERY_INFINITE) {
 			throw new OneWireException(
 					"USerialAdapter-setPowerDuration, does not support this duration, infinite only");
-		else
-			owState.levelTimeFactor = DELIVERY_INFINITE;
+		}
+		this.owState.levelTimeFactor = DELIVERY_INFINITE;
 	}
 
 	/**
@@ -1614,53 +1669,58 @@ public void setPowerDuration(int timeFactor) throws OneWireIOException, OneWireE
 	 * @throws OneWireIOException on a 1-Wire communication error
 	 * @throws OneWireException   on a setup error with the 1-Wire adapter
 	 */
+	@Override
 	public boolean startPowerDelivery(int changeCondition) throws OneWireIOException, OneWireException {
 		try {
 
 			// acquire exclusive use of the port
-			beginLocalExclusive();
-
-			if (changeCondition == CONDITION_AFTER_BIT) {
-				owState.levelChangeOnNextBit = true;
-				owState.primedLevelValue = LEVEL_POWER_DELIVERY;
-			} else if (changeCondition == CONDITION_AFTER_BYTE) {
-				owState.levelChangeOnNextByte = true;
-				owState.primedLevelValue = LEVEL_POWER_DELIVERY;
-			} else if (changeCondition == CONDITION_NOW) {
-
+			this.beginLocalExclusive();
+
+			switch (changeCondition) {
+			case CONDITION_AFTER_BIT:
+				this.owState.levelChangeOnNextBit = true;
+				this.owState.primedLevelValue = LEVEL_POWER_DELIVERY;
+				break;
+			case CONDITION_AFTER_BYTE:
+				this.owState.levelChangeOnNextByte = true;
+				this.owState.primedLevelValue = LEVEL_POWER_DELIVERY;
+				break;
+			case CONDITION_NOW:
 				// make sure adapter is present
-				if (uAdapterPresent()) {
-
-					// check for pending power conditions
-					if (owState.oneWireLevel != LEVEL_NORMAL)
-						setPowerNormal();
+				if (!this.uAdapterPresent()) {
+					throw new OneWireIOException("Error communicating with adapter");
+				}
+				// check for pending power conditions
+				if (this.owState.oneWireLevel != LEVEL_NORMAL) {
+					this.setPowerNormal();
+				}
 
-					// flush out the com buffer
-					serial.flush();
+				// flush out the com buffer
+				this.serial.flush();
 
-					// build a message to read the baud rate from the U brick
-					uBuild.restart();
+				// build a message to read the baud rate from the U brick
+				this.uBuild.restart();
 
-					// set the SPUD time value
-					int set_SPUD_offset = uBuild.setParameter(UParameterSettings.PARAMETER_5VPULSE,
-							UParameterSettings.TIME5V_infinite);
+				// set the SPUD time value
+				var set_SPUD_offset = this.uBuild.setParameter(UParameterSettings.PARAMETER_5VPULSE,
+						UParameterSettings.TIME5V_infinite);
 
-					// add the command to begin the pulse
-					uBuild.sendCommand(UPacketBuilder.FUNCTION_5VPULSE_NOW, false);
+				// add the command to begin the pulse
+				this.uBuild.sendCommand(UPacketBuilder.FUNCTION_5VPULSE_NOW, false);
 
-					// send and receive
-					char[] result_array = uTransaction(uBuild);
+				// send and receive
+				var result_array = this.uTransaction(this.uBuild);
 
-					// check the result
-					if (result_array.length == (set_SPUD_offset + 1)) {
-						owState.oneWireLevel = LEVEL_POWER_DELIVERY;
+				// check the result
+				if (result_array.length == set_SPUD_offset + 1) {
+					this.owState.oneWireLevel = LEVEL_POWER_DELIVERY;
 
-						return true;
-					}
-				} else
-					throw new OneWireIOException("Error communicating with adapter");
-			} else
+					return true;
+				}
+				break;
+			default:
 				throw new OneWireException("Invalid power delivery condition");
+			}
 
 			return false;
 		} catch (IOException ioe) {
@@ -1668,7 +1728,7 @@ public boolean startPowerDelivery(int changeCondition) throws OneWireIOException
 		} finally {
 
 			// release local exclusive use of port
-			endLocalExclusive();
+			this.endLocalExclusive();
 		}
 	}
 
@@ -1693,9 +1753,11 @@ public boolean startPowerDelivery(int changeCondition) throws OneWireIOException
 	 * @throws OneWireIOException on a 1-Wire communication error
 	 * @throws OneWireException   on a setup error with the 1-Wire adapter
 	 */
+	@Override
 	public void setProgramPulseDuration(int timeFactor) throws OneWireIOException, OneWireException {
-		if (timeFactor != DELIVERY_EPROM)
+		if (timeFactor != DELIVERY_EPROM) {
 			throw new OneWireException("Only support EPROM length program pulse duration");
+		}
 	}
 
 	/**
@@ -1726,41 +1788,44 @@ public void setProgramPulseDuration(int timeFactor) throws OneWireIOException, O
 	 * @throws OneWireException   on a setup error with the 1-Wire adapter or the
 	 *                            adapter does not support this operation
 	 */
+	@Override
 	public boolean startProgramPulse(int changeCondition) throws OneWireIOException, OneWireException {
 
 		// check if adapter supports program
-		if (!uState.programVoltageAvailable)
+		if (!this.uState.programVoltageAvailable) {
 			throw new OneWireException("USerialAdapter: startProgramPulse, program voltage not available");
+		}
 
 		// check if correct change condition
-		if (changeCondition != CONDITION_NOW)
+		if (changeCondition != CONDITION_NOW) {
 			throw new OneWireException("USerialAdapter: startProgramPulse, CONDITION_NOW only currently supported");
+		}
 
 		try {
 
 			// acquire exclusive use of the port
-			beginLocalExclusive();
+			this.beginLocalExclusive();
 
 			// build a message to read the baud rate from the U brick
-			uBuild.restart();
+			this.uBuild.restart();
 
 			// int set_SPUD_offset =
-			uBuild.setParameter(UParameterSettings.PARAMETER_12VPULSE, UParameterSettings.TIME12V_512us);
+			this.uBuild.setParameter(UParameterSettings.PARAMETER_12VPULSE, UParameterSettings.TIME12V_512us);
 
 			// add the command to begin the pulse
 			// int pulse_offset =
-			uBuild.sendCommand(UPacketBuilder.FUNCTION_12VPULSE_NOW, true);
+			this.uBuild.sendCommand(UPacketBuilder.FUNCTION_12VPULSE_NOW, true);
 
 			// send the command
 			// char[] result_array =
-			uTransaction(uBuild);
+			this.uTransaction(this.uBuild);
 
 			// check the result ??
 			return true;
 		} finally {
 
 			// release local exclusive use of port
-			endLocalExclusive();
+			this.endLocalExclusive();
 		}
 	}
 
@@ -1773,25 +1838,26 @@ public boolean startProgramPulse(int changeCondition) throws OneWireIOException,
 	 * @throws OneWireException   on a setup error with the 1-Wire adapter or the
 	 *                            adapter does not support this operation
 	 */
+	@Override
 	public void startBreak() throws OneWireIOException, OneWireException {
 		try {
 
 			// acquire exclusive use of the port
-			beginLocalExclusive();
+			this.beginLocalExclusive();
 
 			// power down the 2480 (dropping the 1-Wire)
-			serial.setDTR(false);
-			serial.setRTS(false);
+			this.serial.setDTR(false);
+			this.serial.setRTS(false);
 
 			// wait for power to drop
-			sleep(200);
+			this.sleep(200);
 
 			// set the level state
-			owState.oneWireLevel = LEVEL_BREAK;
+			this.owState.oneWireLevel = LEVEL_BREAK;
 		} finally {
 
 			// release local exclusive use of port
-			endLocalExclusive();
+			this.endLocalExclusive();
 		}
 	}
 
@@ -1806,22 +1872,23 @@ public void startBreak() throws OneWireIOException, OneWireException {
 	 * @throws OneWireException   on a setup error with the 1-Wire adapter or the
 	 *                            adapter does not support this operation
 	 */
+	@Override
 	public void setPowerNormal() throws OneWireIOException, OneWireException {
 		try {
 
 			// acquire exclusive use of the port
-			beginLocalExclusive();
+			this.beginLocalExclusive();
 
-			if (owState.oneWireLevel == LEVEL_POWER_DELIVERY) {
+			if (this.owState.oneWireLevel == LEVEL_POWER_DELIVERY) {
 
 				// make sure adapter is present
-				if (uAdapterPresent()) {
+				if (this.uAdapterPresent()) {
 
 					// flush out the com buffer
-					serial.flush();
+					this.serial.flush();
 
 					// build a message to read the baud rate from the U brick
-					uBuild.restart();
+					this.uBuild.restart();
 
 					// \\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//
 					// shughes - 8-28-2003
@@ -1829,57 +1896,49 @@ public void setPowerNormal() throws OneWireIOException, OneWireException {
 					// is left in a bad state. Removed bad fix: extra getBit()
 					// SEE BELOW!
 					// stop pulse command
-					uBuild.sendCommand(UPacketBuilder.FUNCTION_STOP_PULSE, true);
+					this.uBuild.sendCommand(UPacketBuilder.FUNCTION_STOP_PULSE, true);
 
 					// start pulse with no prime
-					uBuild.sendCommand(UPacketBuilder.FUNCTION_5VPULSE_NOW, false);
+					this.uBuild.sendCommand(UPacketBuilder.FUNCTION_5VPULSE_NOW, false);
 					// \\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//
 
 					// add the command to stop the pulse
-					int pulse_response_offset = uBuild.sendCommand(UPacketBuilder.FUNCTION_STOP_PULSE, true);
+					var pulse_response_offset = this.uBuild.sendCommand(UPacketBuilder.FUNCTION_STOP_PULSE, true);
 
 					// send and receive
-					char[] result_array = uTransaction(uBuild);
+					var result_array = this.uTransaction(this.uBuild);
 
 					// check the result
-					if (result_array.length == (pulse_response_offset + 1)) {
-						owState.oneWireLevel = LEVEL_NORMAL;
-
-						// \\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//
-						// shughes - 8-28-2003
-						// This is a bad "fix", it was needed when we were causing
-						// a bad condition. Instead of fixing it here, we should
-						// fix it where we were causing it.. Which we did!
-						// SEE ABOVE!
-						// getBit();
-						// \\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//
-					} else
+					if (result_array.length != pulse_response_offset + 1) {
 						throw new OneWireIOException("Did not get a response back from stop power delivery");
+					}
+					this.owState.oneWireLevel = LEVEL_NORMAL;
 				}
-			} else if (owState.oneWireLevel == LEVEL_BREAK) {
+			} else if (this.owState.oneWireLevel == LEVEL_BREAK) {
 
 				// restore power
-				serial.setDTR(true);
-				serial.setRTS(true);
+				this.serial.setDTR(true);
+				this.serial.setRTS(true);
 
 				// wait for power to come up
-				sleep(300);
+				this.sleep(300);
 
 				// set the level state
-				owState.oneWireLevel = LEVEL_NORMAL;
+				this.owState.oneWireLevel = LEVEL_NORMAL;
 
 				// set the DS2480 to the correct mode and verify
-				adapterPresent = false;
+				this.adapterPresent = false;
 
-				if (!uAdapterPresent())
+				if (!this.uAdapterPresent()) {
 					throw new OneWireIOException("Did not get a response back from adapter after break");
+				}
 			}
 		} catch (IOException ioe) {
 			throw new OneWireIOException(ioe.toString());
 		} finally {
 
 			// release local exclusive use of port
-			endLocalExclusive();
+			this.endLocalExclusive();
 		}
 	}
 
@@ -1908,29 +1967,30 @@ public void setPowerNormal() throws OneWireIOException, OneWireException {
 	 * @throws OneWireException   on a setup error with the 1-Wire adapter or the
 	 *                            adapter does not support this operation
 	 */
+	@Override
 	public void setSpeed(int speed) throws OneWireIOException, OneWireException {
 		try {
 
 			// acquire exclusive use of the port
-			beginLocalExclusive();
+			this.beginLocalExclusive();
 
 			// check for valid speed
-			if ((speed == SPEED_REGULAR) || (speed == SPEED_OVERDRIVE) || (speed == SPEED_FLEX)) {
-
-				// change 1-Wire speed
-				owState.oneWireSpeed = (char) speed;
-
-				// set adapter to communicate at this new speed (regular == flex for now)
-				if (speed == SPEED_OVERDRIVE)
-					uState.uSpeedMode = UAdapterState.USPEED_OVERDRIVE;
-				else
-					uState.uSpeedMode = UAdapterState.USPEED_FLEX;
-			} else
+			if (speed != SPEED_REGULAR && speed != SPEED_OVERDRIVE && speed != SPEED_FLEX) {
 				throw new OneWireException("Requested speed is not supported by this adapter");
+			}
+			// change 1-Wire speed
+			this.owState.oneWireSpeed = (char) speed;
+
+			// set adapter to communicate at this new speed (regular == flex for now)
+			if (speed == SPEED_OVERDRIVE) {
+				this.uState.uSpeedMode = UAdapterState.USPEED_OVERDRIVE;
+			} else {
+				this.uState.uSpeedMode = UAdapterState.USPEED_FLEX;
+			}
 		} finally {
 
 			// release local exclusive use of port
-			endLocalExclusive();
+			this.endLocalExclusive();
 		}
 	}
 
@@ -1951,8 +2011,9 @@ public void setSpeed(int speed) throws OneWireIOException, OneWireException {
 	 *         <li>>3 future speeds
 	 *         </ul>
 	 */
+	@Override
 	public int getSpeed() {
-		return owState.oneWireSpeed;
+		return this.owState.oneWireSpeed;
 	}
 
 	// --------
@@ -1968,43 +2029,46 @@ public int getSpeed() {
 	 * @throws OneWireException   on a setup error with the 1-Wire adapter
 	 */
 	private boolean search(OneWireState mState) throws OneWireIOException, OneWireException {
-		int reset_offset = 0;
+		var reset_offset = 0;
 
 		// make sure adapter is present
-		if (uAdapterPresent()) {
-
-			// check for pending power conditions
-			if (owState.oneWireLevel != LEVEL_NORMAL)
-				setPowerNormal();
+		if (!this.uAdapterPresent()) {
+			throw new OneWireIOException("Error communicating with adapter");
+		}
+		// check for pending power conditions
+		if (this.owState.oneWireLevel != LEVEL_NORMAL) {
+			this.setPowerNormal();
+		}
 
-			// set the correct baud rate to stream this operation
-			setStreamingSpeed(UPacketBuilder.OPERATION_SEARCH);
+		// set the correct baud rate to stream this operation
+		this.setStreamingSpeed(UPacketBuilder.OPERATION_SEARCH);
 
-			// reset the packet
-			uBuild.restart();
+		// reset the packet
+		this.uBuild.restart();
 
-			// add a reset/ search command
-			if (!mState.skipResetOnSearch)
-				reset_offset = uBuild.oneWireReset();
+		// add a reset/ search command
+		if (!mState.skipResetOnSearch) {
+			reset_offset = this.uBuild.oneWireReset();
+		}
 
-			if (mState.searchOnlyAlarmingButtons)
-				uBuild.dataByte(ALARM_SEARCH_CMD);
-			else
-				uBuild.dataByte(NORMAL_SEARCH_CMD);
+		if (mState.searchOnlyAlarmingButtons) {
+			this.uBuild.dataByte(ALARM_SEARCH_CMD);
+		} else {
+			this.uBuild.dataByte(NORMAL_SEARCH_CMD);
+		}
 
-			// add search sequence based on mState
-			int search_offset = uBuild.search(mState);
+		// add search sequence based on mState
+		var search_offset = this.uBuild.search(mState);
 
-			// send/receive the search
-			char[] result_array = uTransaction(uBuild);
+		// send/receive the search
+		var result_array = this.uTransaction(this.uBuild);
 
-			// interpret search result and return
-			if (!mState.skipResetOnSearch)
-				uBuild.interpretOneWireReset(result_array[reset_offset]);
+		// interpret search result and return
+		if (!mState.skipResetOnSearch) {
+			this.uBuild.interpretOneWireReset(result_array[reset_offset]);
+		}
 
-			return uBuild.interpretSearch(mState, result_array, search_offset);
-		} else
-			throw new OneWireIOException("Error communicating with adapter");
+		return this.uBuild.interpretSearch(mState, result_array, search_offset);
 	}
 
 	/**
@@ -2018,34 +2082,37 @@ private boolean search(OneWireState mState) throws OneWireIOException, OneWireEx
 	 *         search
 	 */
 	private boolean blockIsPresent(byte[] address, boolean alarmOnly) throws OneWireIOException, OneWireException {
-		byte[] send_packet = new byte[24];
+		var send_packet = new byte[24];
 		int i;
 
 		// reset the 1-Wire
-		reset();
+		this.reset();
 
 		// send search command
-		if (alarmOnly)
-			putByte(ALARM_SEARCH_CMD);
-		else
-			putByte(NORMAL_SEARCH_CMD);
+		if (alarmOnly) {
+			this.putByte(ALARM_SEARCH_CMD);
+		} else {
+			this.putByte(NORMAL_SEARCH_CMD);
+		}
 
 		// set all bits at first
-		for (i = 0; i < 24; i++)
+		for (i = 0; i < 24; i++) {
 			send_packet[i] = (byte) 0xFF;
+		}
 
 		// now set or clear appropriate bits for search
-		for (i = 0; i < 64; i++)
+		for (i = 0; i < 64; i++) {
 			Bit.arrayWriteBit(Bit.arrayReadBit(i, 0, address), (i + 1) * 3 - 1, 0, send_packet);
+		}
 
 		// send to 1-Wire Net
-		dataBlock(send_packet, 0, 24);
+		this.dataBlock(send_packet, 0, 24);
 
 		// check the results of last 8 triplets (should be no conflicts)
 		int cnt = 56, goodbits = 0, tst, s;
 
 		for (i = 168; i < 192; i += 3) {
-			tst = (Bit.arrayReadBit(i, 0, send_packet) << 1) | Bit.arrayReadBit(i + 1, 0, send_packet);
+			tst = Bit.arrayReadBit(i, 0, send_packet) << 1 | Bit.arrayReadBit(i + 1, 0, send_packet);
 			s = Bit.arrayReadBit(cnt++, 0, address);
 
 			if (tst == 0x03) // no device on line
@@ -2055,12 +2122,13 @@ private boolean blockIsPresent(byte[] address, boolean alarmOnly) throws OneWire
 				break; // quit
 			}
 
-			if (((s == 0x01) && (tst == 0x02)) || ((s == 0x00) && (tst == 0x01))) // correct bit
+			if (s == 0x01 && tst == 0x02 || s == 0x00 && tst == 0x01) {
 				goodbits++; // count as a good bit
+			}
 		}
 
 		// check too see if there were enough good bits to be successful
-		return (goodbits >= 8);
+		return goodbits >= 8;
 	}
 
 	// --------
@@ -2073,14 +2141,16 @@ private boolean blockIsPresent(byte[] address, boolean alarmOnly) throws OneWire
 	private void setStreamingSpeed(int operation) throws OneWireIOException {
 
 		// get the desired baud rate for this operation
-		int baud = UPacketBuilder.getDesiredBaud(operation, owState.oneWireSpeed, maxBaud);
+		var baud = UPacketBuilder.getDesiredBaud(operation, this.owState.oneWireSpeed, maxBaud);
 
 		// check if already at the correct speed
-		if (baud == serial.getBaudRate())
+		if (baud == this.serial.getBaudRate()) {
 			return;
+		}
 
-		if (doDebugMessages)
-			System.out.println("Changing baud rate from " + serial.getBaudRate() + " to " + baud);
+		if (doDebugMessages) {
+			System.out.println("Changing baud rate from " + this.serial.getBaudRate() + " to " + baud);
+		}
 
 		// convert this baud to 'u' baud
 		char ubaud;
@@ -2103,84 +2173,90 @@ private void setStreamingSpeed(int operation) throws OneWireIOException {
 		}
 
 		// see if this is a new baud
-		if (ubaud == uState.ubaud)
+		if (ubaud == this.uState.ubaud) {
 			return;
+		}
 
 		// default, loose communication with adapter
-		adapterPresent = false;
+		this.adapterPresent = false;
 
 		// build a message to read the baud rate from the U brick
-		uBuild.restart();
+		this.uBuild.restart();
 
-		int baud_offset = uBuild.setParameter(UParameterSettings.PARAMETER_BAUDRATE, ubaud);
+		var baud_offset = this.uBuild.setParameter(UParameterSettings.PARAMETER_BAUDRATE, ubaud);
 
 		try {
 			// send command, no response at this baud rate
-			serial.flush();
+			this.serial.flush();
 
-			RawSendPacket pkt = (RawSendPacket) uBuild.getPackets().nextElement();
-			char[] temp_buf = new char[pkt.buffer.length()];
+			var pkt = this.uBuild.getPackets().nextElement();
+			var temp_buf = new char[pkt.buffer.length()];
 
 			pkt.buffer.getChars(0, pkt.buffer.length(), temp_buf, 0);
-			serial.write(temp_buf);
+			this.serial.write(temp_buf);
 
 			// delay to let things settle
-			sleep(5);
-			serial.flush();
+			this.sleep(5);
+			this.serial.flush();
 
 			// set the baud rate
-			sleep(5); // solaris hack!!!
-			serial.setBaudRate(baud);
+			this.sleep(5); // solaris hack!!!
+			this.serial.setBaudRate(baud);
 		} catch (IOException ioe) {
 			throw new OneWireIOException(ioe.toString());
 		}
 
-		uState.ubaud = ubaud;
+		this.uState.ubaud = ubaud;
 
 		// delay to let things settle
-		sleep(5);
+		this.sleep(5);
 
 		// verify adapter is at new baud rate
-		uBuild.restart();
+		this.uBuild.restart();
 
-		baud_offset = uBuild.getParameter(UParameterSettings.PARAMETER_BAUDRATE);
+		baud_offset = this.uBuild.getParameter(UParameterSettings.PARAMETER_BAUDRATE);
 
 		// set the DS2480 communication speed for subsequent blocks
-		uBuild.setSpeed();
+		this.uBuild.setSpeed();
 
 		try {
 
 			// send and receive
-			serial.flush();
+			this.serial.flush();
 
-			char[] result_array = uTransaction(uBuild);
+			var result_array = this.uTransaction(this.uBuild);
 
 			// check the result
 			if (result_array.length == 1) {
-				if (((result_array[baud_offset] & 0xF1) == 0) && ((result_array[baud_offset] & 0x0E) == uState.ubaud)) {
-					if (doDebugMessages)
+				if ((result_array[baud_offset] & 0xF1) == 0
+						&& (result_array[baud_offset] & 0x0E) == this.uState.ubaud) {
+					if (doDebugMessages) {
 						System.out.println("Success, baud changed and DS2480 is there");
+					}
 
 					// adapter still with us
-					adapterPresent = true;
+					this.adapterPresent = true;
 
 					// flush any garbage characters
-					sleep(150);
-					serial.flush();
+					this.sleep(150);
+					this.serial.flush();
 
 					return;
 				}
 			}
 		} catch (IOException ioe) {
-			if (doDebugMessages)
+			if (doDebugMessages) {
 				System.err.println("USerialAdapter-setStreamingSpeed: " + ioe);
+			}
 		} catch (OneWireIOException e) {
-			if (doDebugMessages)
+			if (doDebugMessages) {
 				System.err.println("USerialAdapter-setStreamingSpeed: " + e);
+			}
 		}
 
-		if (doDebugMessages)
+		if (doDebugMessages) {
 			System.out.println("Failed to change baud of DS2480");
+		}
 	}
 
 	/**
@@ -2191,35 +2267,37 @@ private void setStreamingSpeed(int operation) throws OneWireIOException {
 	 * @throws OneWireException - if port not selected
 	 */
 	private boolean uAdapterPresent() throws OneWireException {
-		boolean rt = true;
+		var rt = true;
 
 		// check if adapter has already be verified to be present
-		if (!adapterPresent) {
+		if (!this.adapterPresent) {
 
 			// do a master reset
-			uMasterReset();
+			this.uMasterReset();
 
 			// attempt to verify
-			if (!uVerify()) {
+			if (!this.uVerify()) {
 
 				// do a master reset and try again
-				uMasterReset();
+				this.uMasterReset();
 
-				if (!uVerify()) {
+				if (!this.uVerify()) {
 
 					// do a power reset and try again
-					uPowerReset();
+					this.uPowerReset();
 
-					if (!uVerify())
+					if (!this.uVerify()) {
 						rt = false;
+					}
 				}
 			}
 		}
 
-		adapterPresent = rt;
+		this.adapterPresent = rt;
 
-		if (doDebugMessages)
+		if (doDebugMessages) {
 			System.out.println("DEBUG: AdapterPresent result: " + rt);
+		}
 
 		return rt;
 	}
@@ -2229,33 +2307,35 @@ private boolean uAdapterPresent() throws OneWireException {
 	 * peforms a break. A single timing byte is then sent.
 	 */
 	private void uMasterReset() {
-		if (doDebugMessages)
+		if (doDebugMessages) {
 			System.out.println("DEBUG: uMasterReset");
+		}
 
 		// try to acquire the port
 		try {
 
 			// set the baud rate
-			serial.setBaudRate(9600);
+			this.serial.setBaudRate(9600);
 
-			uState.ubaud = UAdapterState.BAUD_9600;
+			this.uState.ubaud = UAdapterState.BAUD_9600;
 
 			// put back to standard speed
-			owState.oneWireSpeed = SPEED_REGULAR;
-			uState.uSpeedMode = UAdapterState.USPEED_FLEX;
-			uState.ubaud = UAdapterState.BAUD_9600;
+			this.owState.oneWireSpeed = SPEED_REGULAR;
+			this.uState.uSpeedMode = UAdapterState.USPEED_FLEX;
+			this.uState.ubaud = UAdapterState.BAUD_9600;
 
 			// send a break to reset DS2480
-			serial.sendBreak(10);
-			sleep(5);
+			this.serial.sendBreak(10);
+			this.sleep(5);
 
 			// send the timing byte
-			serial.flush();
-			serial.write(UPacketBuilder.FUNCTION_RESET);
-			serial.flush();
+			this.serial.flush();
+			this.serial.write(UPacketBuilder.FUNCTION_RESET);
+			this.serial.flush();
 		} catch (IOException e) {
-			if (doDebugMessages)
+			if (doDebugMessages) {
 				System.err.println("USerialAdapter-uMasterReset: " + e);
+			}
 		}
 	}
 
@@ -2264,37 +2344,39 @@ private void uMasterReset() {
 	 * down the DS2480. A single timing byte is then sent.
 	 */
 	private void uPowerReset() {
-		if (doDebugMessages)
+		if (doDebugMessages) {
 			System.out.println("DEBUG: uPowerReset");
+		}
 
 		// try to acquire the port
 		try {
 
 			// set the baud rate
-			serial.setBaudRate(9600);
+			this.serial.setBaudRate(9600);
 
-			uState.ubaud = UAdapterState.BAUD_9600;
+			this.uState.ubaud = UAdapterState.BAUD_9600;
 
 			// put back to standard speed
-			owState.oneWireSpeed = SPEED_REGULAR;
-			uState.uSpeedMode = UAdapterState.USPEED_FLEX;
-			uState.ubaud = UAdapterState.BAUD_9600;
+			this.owState.oneWireSpeed = SPEED_REGULAR;
+			this.uState.uSpeedMode = UAdapterState.USPEED_FLEX;
+			this.uState.ubaud = UAdapterState.BAUD_9600;
 
 			// power down DS2480
-			serial.setDTR(false);
-			serial.setRTS(false);
-			sleep(300);
-			serial.setDTR(true);
-			serial.setRTS(true);
-			sleep(1);
+			this.serial.setDTR(false);
+			this.serial.setRTS(false);
+			this.sleep(300);
+			this.serial.setDTR(true);
+			this.serial.setRTS(true);
+			this.sleep(1);
 
 			// send the timing byte
-			serial.flush();
-			serial.write(UPacketBuilder.FUNCTION_RESET);
-			serial.flush();
+			this.serial.flush();
+			this.serial.write(UPacketBuilder.FUNCTION_RESET);
+			this.serial.flush();
 		} catch (IOException e) {
-			if (doDebugMessages)
+			if (doDebugMessages) {
 				System.err.println("USerialAdapter-uPowerReset: " + e);
+			}
 		}
 	}
 
@@ -2309,37 +2391,40 @@ private void uPowerReset() {
 	 */
 	private boolean uVerify() {
 		try {
-			serial.flush();
+			this.serial.flush();
 
 			// build a message to read the baud rate from the U brick
-			uBuild.restart();
-
-			uBuild.setParameter(UParameterSettings.PARAMETER_SLEW,
-					uState.uParameters[owState.oneWireSpeed].pullDownSlewRate);
-			uBuild.setParameter(UParameterSettings.PARAMETER_WRITE1LOW,
-					uState.uParameters[owState.oneWireSpeed].write1LowTime);
-			uBuild.setParameter(UParameterSettings.PARAMETER_SAMPLEOFFSET,
-					uState.uParameters[owState.oneWireSpeed].sampleOffsetTime);
-			uBuild.setParameter(UParameterSettings.PARAMETER_5VPULSE, UParameterSettings.TIME5V_infinite);
-			int baud_offset = uBuild.getParameter(UParameterSettings.PARAMETER_BAUDRATE);
-			int bit_offset = uBuild.dataBit(true, false);
+			this.uBuild.restart();
+
+			this.uBuild.setParameter(UParameterSettings.PARAMETER_SLEW,
+					this.uState.uParameters[this.owState.oneWireSpeed].pullDownSlewRate);
+			this.uBuild.setParameter(UParameterSettings.PARAMETER_WRITE1LOW,
+					this.uState.uParameters[this.owState.oneWireSpeed].write1LowTime);
+			this.uBuild.setParameter(UParameterSettings.PARAMETER_SAMPLEOFFSET,
+					this.uState.uParameters[this.owState.oneWireSpeed].sampleOffsetTime);
+			this.uBuild.setParameter(UParameterSettings.PARAMETER_5VPULSE, UParameterSettings.TIME5V_infinite);
+			var baud_offset = this.uBuild.getParameter(UParameterSettings.PARAMETER_BAUDRATE);
+			var bit_offset = this.uBuild.dataBit(true, false);
 
 			// send and receive
-			char[] result_array = uTransaction(uBuild);
+			var result_array = this.uTransaction(this.uBuild);
 
 			// check the result
-			if (result_array.length == (bit_offset + 1)) {
-				if (((result_array[baud_offset] & 0xF1) == 0) && ((result_array[baud_offset] & 0x0E) == uState.ubaud)
-						&& ((result_array[bit_offset] & 0xF0) == 0x90)
-						&& ((result_array[bit_offset] & 0x0C) == uState.uSpeedMode))
+			if (result_array.length == bit_offset + 1) {
+				if ((result_array[baud_offset] & 0xF1) == 0 && (result_array[baud_offset] & 0x0E) == this.uState.ubaud
+						&& (result_array[bit_offset] & 0xF0) == 0x90
+						&& (result_array[bit_offset] & 0x0C) == this.uState.uSpeedMode) {
 					return true;
+				}
 			}
 		} catch (IOException ioe) {
-			if (doDebugMessages)
+			if (doDebugMessages) {
 				System.err.println("USerialAdapter-uVerify: " + ioe);
+			}
 		} catch (OneWireIOException e) {
-			if (doDebugMessages)
+			if (doDebugMessages) {
 				System.err.println("USerialAdapter-uVerify: " + e);
+			}
 		}
 
 		return false;
@@ -2359,54 +2444,54 @@ private char[] uTransaction(UPacketBuilder tempBuild) throws OneWireIOException
 
 		try {
 			// clear the buffers
-			serial.flush();
-			inBuffer.setLength(0);
+			this.serial.flush();
+			this.inBuffer.setLength(0);
 
 			// loop to send all of the packets
-			for (Enumeration<RawSendPacket> packet_enum = tempBuild.getPackets(); packet_enum.hasMoreElements();) {
+			for (var packet_enum = tempBuild.getPackets(); packet_enum.hasMoreElements();) {
 
 				// get the next packet
-				RawSendPacket pkt = (RawSendPacket) packet_enum.nextElement();
+				var pkt = packet_enum.nextElement();
 
 				// bogus packet to indicate need to wait for long DS2480 alarm reset
-				if ((pkt.buffer.length() == 0) && (pkt.returnLength == 0)) {
-					sleep(6);
-					serial.flush();
+				if (pkt.buffer.length() == 0 && pkt.returnLength == 0) {
+					this.sleep(6);
+					this.serial.flush();
 
 					continue;
 				}
 
 				// get the data
-				char[] temp_buf = new char[pkt.buffer.length()];
+				var temp_buf = new char[pkt.buffer.length()];
 
 				pkt.buffer.getChars(0, pkt.buffer.length(), temp_buf, 0);
 
 				// remember number of bytes in input
-				offset = inBuffer.length();
+				offset = this.inBuffer.length();
 
 				// send the packet
-				serial.write(temp_buf);
+				this.serial.write(temp_buf);
 
 				// wait on returnLength bytes in inBound
-				inBuffer.append(serial.readWithTimeout(pkt.returnLength));
+				this.inBuffer.append(this.serial.readWithTimeout(pkt.returnLength));
 			}
 
 			// read the return packet
-			char[] ret_buffer = new char[inBuffer.length()];
+			var ret_buffer = new char[this.inBuffer.length()];
 
-			inBuffer.getChars(0, inBuffer.length(), ret_buffer, 0);
+			this.inBuffer.getChars(0, this.inBuffer.length(), ret_buffer, 0);
 
 			// check for extra bytes in inBuffer
-			extraBytesReceived = (inBuffer.length() > tempBuild.totalReturnLength);
+			var extraBytesReceived = this.inBuffer.length() > tempBuild.totalReturnLength;
 
 			// clear the inbuffer
-			inBuffer.setLength(0);
+			this.inBuffer.setLength(0);
 
 			return ret_buffer;
 		} catch (IOException e) {
 
 			// need to check on adapter
-			adapterPresent = false;
+			this.adapterPresent = false;
 
 			// pass it on
 			throw new OneWireIOException(e.toString());
@@ -2419,8 +2504,9 @@ private char[] uTransaction(UPacketBuilder tempBuild) throws OneWireIOException
 	private void sleep(long msTime) {
 
 		// provided debug on standard out
-		if (doDebugMessages)
+		if (doDebugMessages) {
 			System.out.println("DEBUG: sleep(" + msTime + ")");
+		}
 
 		try {
 			Thread.sleep(msTime);
@@ -2442,19 +2528,19 @@ private void sleep(long msTime) {
 		 * // create a SerialServices instance for each port available and put in hash
 		 * Enumeration com_enum = CommPortIdentifier.getPortIdentifiers();
 		 * CommPortIdentifier port_id; SerialService serial_instance;
-		 * 
+		 *
 		 * // loop through all of the serial port elements while
 		 * (com_enum.hasMoreElements()) {
-		 * 
+		 *
 		 * // get the next com port port_id = ( CommPortIdentifier )
 		 * com_enum.nextElement();
-		 * 
+		 *
 		 * // only collect the names of the serial ports if (port_id.getPortType() ==
 		 * CommPortIdentifier.PORT_SERIAL) { serial_instance = new
 		 * SerialService(port_id.getName());
-		 * 
+		 *
 		 * serailServiceHash.put(port_id.getName(), serial_instance);
-		 * 
+		 *
 		 * if (doDebugMessages) System.out.println("DEBUG: Serial port: " +
 		 * port_id.getName()); } }
 		 */
@@ -2462,7 +2548,7 @@ private void sleep(long msTime) {
 		// check properties to see if max baud set manually
 		maxBaud = 115200;
 
-		String max_baud_str = OneWireAccessProvider.getProperty("onewire.serial.maxbaud");
+		var max_baud_str = OneWireAccessProvider.getProperty("onewire.serial.maxbaud");
 
 		if (max_baud_str != null) {
 			try {
@@ -2473,11 +2559,13 @@ private void sleep(long msTime) {
 		}
 
 		// provided debug on standard out
-		if (doDebugMessages)
+		if (doDebugMessages) {
 			System.out.println("DEBUG: getMaxBaud from properties: " + maxBaud);
+		}
 
 		// if not valid then use fastest
-		if ((maxBaud != 115200) && (maxBaud != 57600) && (maxBaud != 19200) && (maxBaud != 9600))
+		if (maxBaud != 115200 && maxBaud != 57600 && maxBaud != 19200 && maxBaud != 9600) {
 			maxBaud = 115200;
+		}
 	}
 }
diff --git a/io.openems.edge.bridge.onewire/src/com/dalsemi/onewire/application/file/MemoryCache.java b/io.openems.edge.bridge.onewire/src/com/dalsemi/onewire/application/file/MemoryCache.java
index d7e948fadde..8787fa6ae23 100644
--- a/io.openems.edge.bridge.onewire/src/com/dalsemi/onewire/application/file/MemoryCache.java
+++ b/io.openems.edge.bridge.onewire/src/com/dalsemi/onewire/application/file/MemoryCache.java
@@ -28,7 +28,6 @@
 
 package com.dalsemi.onewire.application.file;
 
-import java.util.Enumeration;
 // imports
 import java.util.Vector;
 
@@ -193,10 +192,10 @@ class MemoryCache {
 	 * @param device 1-Wire container
 	 */
 	public MemoryCache(OneWireContainer device) {
-		OneWireContainer[] devices = new OneWireContainer[1];
+		var devices = new OneWireContainer[1];
 		devices[0] = device;
 
-		init(devices);
+		this.init(devices);
 	}
 
 	/**
@@ -205,7 +204,7 @@ public MemoryCache(OneWireContainer device) {
 	 * @param device 1-Wire container
 	 */
 	public MemoryCache(OneWireContainer[] devices) {
-		init(devices);
+		this.init(devices);
 	}
 
 	/**
@@ -214,127 +213,135 @@ public MemoryCache(OneWireContainer[] devices) {
 	 * @param devices 1-Wire container(s)
 	 */
 	private void init(OneWireContainer[] devices) {
-		owd = devices;
-		int mem_size = 0;
+		this.owd = devices;
+		var mem_size = 0;
 
 		PagedMemoryBank pmb = null;
 
-		banks = new Vector<>(1);
-		owners = new Vector<>(1);
-		openedToWrite = new Vector<>(1);
-		startPages = new int[owd.length];
-		lastDevice = 0;
+		this.banks = new Vector<>(1);
+		this.owners = new Vector<>(1);
+		this.openedToWrite = new Vector<>(1);
+		this.startPages = new int[this.owd.length];
+		this.lastDevice = 0;
 
 		// check to see if adapter supports overdrive
 		try {
-			autoOverdrive = devices[0].getAdapter().canOverdrive();
+			this.autoOverdrive = devices[0].getAdapter().canOverdrive();
 		} catch (OneWireException e) {
-			autoOverdrive = false;
+			this.autoOverdrive = false;
 		}
 
 		// \\//\\//\\//\\//\\//\\//\\//
-		if (doDebugMessages)
+		if (doDebugMessages) {
 			System.out.println(
 					"___Constructor MemoryCache: " + devices[0].getAddressAsString() + " num " + devices.length);
+		}
 
 		// loop through all of the devices in the array
-		totalPages = 0;
-		for (int dev = 0; dev < owd.length; dev++) {
+		this.totalPages = 0;
+		for (var dev = 0; dev < this.owd.length; dev++) {
 			// check to make sure each device can do Overdrive
-			if (owd[dev].getMaxSpeed() != DSPortAdapter.SPEED_OVERDRIVE)
-				autoOverdrive = false;
+			if (this.owd[dev].getMaxSpeed() != DSPortAdapter.SPEED_OVERDRIVE) {
+				this.autoOverdrive = false;
+			}
 
 			// record the start page offset for each device
-			startPages[dev] = totalPages;
+			this.startPages[dev] = this.totalPages;
 
 			// enumerate through the memory banks and collect the
 			// general purpose banks in a vector
-			for (Enumeration<MemoryBank> bank_enum = owd[dev].getMemoryBanks(); bank_enum.hasMoreElements();) {
+			for (var bank_enum = this.owd[dev].getMemoryBanks(); bank_enum.hasMoreElements();) {
 				// get the next memory bank
-				MemoryBank mb = (MemoryBank) bank_enum.nextElement();
+				var mb = bank_enum.nextElement();
 
 				// look for pbm memory bank (used in file structure)
 				if (mb.isWriteOnce() && !mb.isGeneralPurposeMemory() && mb.isNonVolatile()
-						&& (mb instanceof OTPMemoryBank)) {
+						&& mb instanceof OTPMemoryBank) {
 					// if more then 1 device with a OTP then error
-					if (owd.length > 1) {
-						totalPages = 0;
+					if (this.owd.length > 1) {
+						this.totalPages = 0;
 						return;
 					}
 
 					// If only 128 bytes then have DS2502 or DS2406 which have bitmap included
 					// in the only status page. All other EPROM devices have a special memory
 					// bank that has 'Bitmap' in the title.
-					if ((mem_size == 128) || (mb.getBankDescription().indexOf("Bitmap") != -1)) {
-						pbmBank = (OTPMemoryBank) mb;
+					if (mem_size == 128 || mb.getBankDescription().indexOf("Bitmap") != -1) {
+						this.pbmBank = (OTPMemoryBank) mb;
 
-						if (mem_size == 128)
-							pbmBitOffset = 4;
+						if (mem_size == 128) {
+							this.pbmBitOffset = 4;
+						}
 
-						pbmByteOffset = 0;
-						canRedirect = true;
+						this.pbmByteOffset = 0;
+						this.canRedirect = true;
 
 						// \\//\\//\\//\\//\\//\\//\\//
-						if (doDebugMessages)
+						if (doDebugMessages) {
 							System.out.println("_Paged BitMap MemoryBank: " + mb.getBankDescription()
-									+ " with bit offset " + pbmBitOffset);
+									+ " with bit offset " + this.pbmBitOffset);
+						}
 					}
 				}
 
 				// check regular memory bank
-				if (!mb.isGeneralPurposeMemory() || !mb.isNonVolatile() || !(mb instanceof PagedMemoryBank))
+				if (!mb.isGeneralPurposeMemory() || !mb.isNonVolatile() || !(mb instanceof PagedMemoryBank)) {
 					continue;
+				}
 
 				// \\//\\//\\//\\//\\//\\//\\//
-				if (doDebugMessages)
+				if (doDebugMessages) {
 					System.out.println("_Using MemoryBank: " + mb.getBankDescription());
+				}
 
-				banks.addElement(mb);
+				this.banks.addElement(mb);
 				mem_size += mb.getSize();
-				totalPages += ((PagedMemoryBank) mb).getNumberPages();
+				this.totalPages += ((PagedMemoryBank) mb).getNumberPages();
 			}
 		}
 
 		// count total bankPages
-		bankPages = new int[banks.size()];
-		totalPages = 0;
+		this.bankPages = new int[this.banks.size()];
+		this.totalPages = 0;
 
-		for (int b = 0; b < banks.size(); b++) {
-			pmb = (PagedMemoryBank) banks.elementAt(b);
-			bankPages[b] = pmb.getNumberPages();
-			totalPages += bankPages[b];
+		for (var b = 0; b < this.banks.size(); b++) {
+			pmb = (PagedMemoryBank) this.banks.elementAt(b);
+			this.bankPages[b] = pmb.getNumberPages();
+			this.totalPages += this.bankPages[b];
 		}
 
 		// create the cache
-		len = new int[totalPages];
-		pageState = new int[totalPages];
-		writeLog = new int[totalPages];
-		redirect = new int[totalPages];
+		this.len = new int[this.totalPages];
+		this.pageState = new int[this.totalPages];
+		this.writeLog = new int[this.totalPages];
+		this.redirect = new int[this.totalPages];
 		if (pmb != null) {
-			maxPacketDataLength = pmb.getMaxPacketDataLength();
-			cache = new byte[totalPages][pmb.getPageLength()];
-			tempPage = new byte[pmb.getPageLength()];
+			this.maxPacketDataLength = pmb.getMaxPacketDataLength();
+			this.cache = new byte[this.totalPages][pmb.getPageLength()];
+			this.tempPage = new byte[pmb.getPageLength()];
 		}
 
 		// initialize some of the flag arrays
-		for (int p = 0; p < totalPages; p++) {
-			pageState[p] = NOT_READ;
-			len[p] = 0;
-			writeLog[p] = EMPTY;
+		for (var p = 0; p < this.totalPages; p++) {
+			this.pageState[p] = NOT_READ;
+			this.len[p] = 0;
+			this.writeLog[p] = EMPTY;
 		}
 
 		// if getting redirection information, create necessarey arrays
-		if (canRedirect) {
-			tempExtra = new byte[pmb.getExtraInfoLength()];
-			pbmCache = new byte[pbmBank.getSize()];
-			pbmCacheModified = new byte[pbmBank.getSize()];
-			pbmRead = false;
-		} else
-			pbmRead = true;
+		if (this.canRedirect) {
+			this.tempExtra = new byte[pmb.getExtraInfoLength()];
+			this.pbmCache = new byte[this.pbmBank.getSize()];
+			this.pbmCacheModified = new byte[this.pbmBank.getSize()];
+			this.pbmRead = false;
+		} else {
+			this.pbmRead = true;
+		}
 
 		// \\//\\//\\//\\//\\//\\//\\//
-		if (doDebugMessages)
-			System.out.println("_Total Pages: " + totalPages + ", get Redirection = " + canRedirect);
+		if (doDebugMessages) {
+			System.out.println("_Total Pages: " + this.totalPages + ", get Redirection = " + this.canRedirect);
+		}
 	}
 
 	/**
@@ -343,7 +350,7 @@ private void init(OneWireContainer[] devices) {
 	 * @return number of pages in the cache
 	 */
 	public int getNumberPages() {
-		return totalPages;
+		return this.totalPages;
 	}
 
 	/**
@@ -354,10 +361,10 @@ public int getNumberPages() {
 	 * @return number of pages in the bank
 	 */
 	public int getNumberPagesInBank(int bankNum) {
-		if (totalPages > 0)
-			return bankPages[bankNum];
-		else
-			return 0;
+		if (this.totalPages > 0) {
+			return this.bankPages[bankNum];
+		}
+		return 0;
 	}
 
 	/**
@@ -369,7 +376,7 @@ public int getNumberPagesInBank(int bankNum) {
 	 * @return page number of first page on device
 	 */
 	public int getPageOffsetForDevice(int deviceNum) {
-		return startPages[deviceNum];
+		return this.startPages[deviceNum];
 	}
 
 	/**
@@ -378,7 +385,7 @@ public int getPageOffsetForDevice(int deviceNum) {
 	 * @return max number of data bytes per page
 	 */
 	public int getMaxPacketDataLength() {
-		return maxPacketDataLength;
+		return this.maxPacketDataLength;
 	}
 
 	/**
@@ -388,7 +395,7 @@ public int getMaxPacketDataLength() {
 	 * @return true if this device is write-once
 	 */
 	public boolean isWriteOnce() {
-		return canRedirect;
+		return this.canRedirect;
 	}
 
 	/**
@@ -407,21 +414,24 @@ public boolean isWriteOnce() {
 	public int readPagePacket(int page, byte[] readBuf, int offset) throws OneWireIOException, OneWireException {
 
 		// \\//\\//\\//\\//\\//\\//\\//
-		if (doDebugMessages)
+		if (doDebugMessages) {
 			System.out.println("___readPagePacket (" + page + ") ");
+		}
 
 		// check if have a cache (any memory banks)
-		if (totalPages == 0)
+		if (this.totalPages == 0) {
 			throw new OneWireException("1-Wire Filesystem does not have memory");
+		}
 
 		// check if out of range
-		if (page >= totalPages)
+		if (page >= this.totalPages) {
 			throw new OneWireException("Page requested is not in memory space");
+		}
 
 		// check if doing autoOverdrive (greatly improves multi-device cache speed)
-		if (autoOverdrive) {
-			autoOverdrive = false;
-			DSPortAdapter adapter = owd[0].getAdapter();
+		if (this.autoOverdrive) {
+			this.autoOverdrive = false;
+			var adapter = this.owd[0].getAdapter();
 			adapter.setSpeed(DSPortAdapter.SPEED_REGULAR);
 			adapter.reset();
 			adapter.putByte((byte) 0x3C);
@@ -429,197 +439,210 @@ public int readPagePacket(int page, byte[] readBuf, int offset) throws OneWireIO
 		}
 
 		// check if need to read the page bitmap for the first time
-		if (!pbmRead)
-			readPageBitMap();
+		if (!this.pbmRead) {
+			this.readPageBitMap();
+		}
 
 		// page NOT cached (maybe redirected)
-		if ((pageState[page] == NOT_READ) || (pageState[page] == READ_NO_CRC) || (redirect[page] != 0)) {
-
+		if (this.pageState[page] != NOT_READ && this.pageState[page] != READ_NO_CRC && this.redirect[page] == 0) {
 			// \\//\\//\\//\\//\\//\\//\\//
-			if (doDebugMessages)
-				System.out.println("_Not in cache or redirected, length=" + len[page] + " redirect=" + redirect[page]);
+			if (doDebugMessages) {
+				System.out.print("_In cache (" + this.len[page] + "):");
+				this.debugDump(this.cache[page], 1, this.len[page]);
+			}
 
-			// page not cached, so read it
-			int local_page = getLocalPage(page);
-			PagedMemoryBank pmb = getMemoryBankForPage(page);
-			int local_device_page = page - startPages[getDeviceIndex(page)];
+			// get from cache
+			if (readBuf != null) {
+				System.arraycopy(this.cache[page], 1, readBuf, offset, this.len[page]);
+			}
 
-			// \\//\\//\\//\\//\\//\\//\\//
-			if (doDebugMessages)
-				System.out.println("_Look in MemoryBank " + pmb.getBankDescription());
-
-			if (canRedirect) {
-				// don't use multi-bank page reference (would not work with redirect)
-
-				// loop while page is redirected
-				int loopcnt = 0;
-				for (;;) {
-					// check for redirection
-					if (redirect[page] == 0) {
-						// check if already in cache
-						if ((pageState[page] == READ_CRC) || (pageState[page] == VERIFY) || (pageState[page] == WRITE))
-							break;
+			return this.len[page];
+		}
+		// \\//\\//\\//\\//\\//\\//\\//
+		if (doDebugMessages) {
+			System.out.println(
+					"_Not in cache or redirected, length=" + this.len[page] + " redirect=" + this.redirect[page]);
+		}
 
-						// read the page with device generated CRC
-						if (pmb.hasExtraInfo()) {
-							pmb.readPageCRC(page, (lastPageRead == (page - 1)), cache[page], 0, tempExtra);
+		// page not cached, so read it
+		var local_page = this.getLocalPage(page);
+		var pmb = this.getMemoryBankForPage(page);
+		var local_device_page = page - this.startPages[this.getDeviceIndex(page)];
 
-							// set the last page read
-							lastPageRead = page;
+		// \\//\\//\\//\\//\\//\\//\\//
+		if (doDebugMessages) {
+			System.out.println("_Look in MemoryBank " + pmb.getBankDescription());
+		}
 
-							// get the redirection byte
-							redirect[page] = ~tempExtra[0] & 0x00FF;
-						}
-						// OTP device that does not give redirect as extra info (DS1982/DS2502)
-						else {
-							pmb.readPageCRC(page, (lastPageRead == (page - 1)), cache[page], 0);
+		if (this.canRedirect) {
+			// don't use multi-bank page reference (would not work with redirect)
+
+			// loop while page is redirected
+			var loopcnt = 0;
+			for (;;) {
+				// check for redirection
+				if (this.redirect[page] == 0) {
+					// check if already in cache
+					if (this.pageState[page] == READ_CRC || this.pageState[page] == VERIFY
+							|| this.pageState[page] == WRITE) {
+						break;
+					}
 
-							// get the redirection
-							redirect[page] = (byte) (((OTPMemoryBank) pmb).getRedirectedPage(page));
+					// read the page with device generated CRC
+					if (pmb.hasExtraInfo()) {
+						pmb.readPageCRC(page, this.lastPageRead == page - 1, this.cache[page], 0, this.tempExtra);
 
-							// last page can't be used due to redirect read
-							lastPageRead = NONE;
-						}
+						// set the last page read
+						this.lastPageRead = page;
 
-						// set the page state
-						pageState[page] = READ_NO_CRC;
+						// get the redirection byte
+						this.redirect[page] = ~this.tempExtra[0] & 0x00FF;
+					}
+					// OTP device that does not give redirect as extra info (DS1982/DS2502)
+					else {
+						pmb.readPageCRC(page, this.lastPageRead == page - 1, this.cache[page], 0);
 
-						// \\//\\//\\//\\//\\//\\//\\//
-						if (doDebugMessages)
-							System.out.println("_Page: " + page + "->" + redirect[page] + " local " + local_page
-									+ " with packet length byte " + (cache[page][0] & 0x00FF));
+						// get the redirection
+						this.redirect[page] = (byte) ((OTPMemoryBank) pmb).getRedirectedPage(page);
 
-						// not redirected so look at packet
-						if (redirect[page] == 0) {
-							// check if length is realistic
-							if ((cache[page][0] & 0x00FF) > maxPacketDataLength)
-								throw new OneWireIOException("Invalid length in packet");
+						// last page can't be used due to redirect read
+						this.lastPageRead = NONE;
+					}
 
-							// verify the CRC is correct
-							if (CRC16.compute(cache[page], 0, cache[page][0] + 3, page) == 0x0000B001) {
-								// get the length
-								len[page] = cache[page][0];
+					// set the page state
+					this.pageState[page] = READ_NO_CRC;
 
-								// set the page state
-								pageState[page] = READ_CRC;
+					// \\//\\//\\//\\//\\//\\//\\//
+					if (doDebugMessages) {
+						System.out.println("_Page: " + page + "->" + this.redirect[page] + " local " + local_page
+								+ " with packet length byte " + (this.cache[page][0] & 0x00FF));
+					}
 
-								break;
-							} else
-								throw new OneWireIOException("Invalid CRC16 in packet read " + page);
+					// not redirected so look at packet
+					if (this.redirect[page] == 0) {
+						// check if length is realistic
+						if ((this.cache[page][0] & 0x00FF) > this.maxPacketDataLength) {
+							throw new OneWireIOException("Invalid length in packet");
 						}
-					} else
-						page = redirect[page];
 
-					// check for looping redirection
-					if (loopcnt++ > totalPages)
-						throw new OneWireIOException("Circular redirection of pages");
+						// verify the CRC is correct
+						if (CRC16.compute(this.cache[page], 0, this.cache[page][0] + 3, page) == 0x0000B001) {
+							// get the length
+							this.len[page] = this.cache[page][0];
+
+							// set the page state
+							this.pageState[page] = READ_CRC;
+
+							break;
+						} else {
+							throw new OneWireIOException("Invalid CRC16 in packet read " + page);
+						}
+					}
+				} else {
+					page = this.redirect[page];
 				}
 
-				// \\//\\//\\//\\//\\//\\//\\//
-				if (doDebugMessages) {
-					System.out.print("_Data found (" + len[page] + "):");
-					debugDump(cache[page], 1, len[page]);
+				// check for looping redirection
+				if (loopcnt++ > this.totalPages) {
+					throw new OneWireIOException("Circular redirection of pages");
 				}
+			}
 
-				// get copy of data for caller
-				if (readBuf != null)
-					System.arraycopy(cache[page], 1, readBuf, offset, len[page]);
+			// \\//\\//\\//\\//\\//\\//\\//
+			if (doDebugMessages) {
+				System.out.print("_Data found (" + this.len[page] + "):");
+				this.debugDump(this.cache[page], 1, this.len[page]);
+			}
 
-				return len[page];
+			// get copy of data for caller
+			if (readBuf != null) {
+				System.arraycopy(this.cache[page], 1, readBuf, offset, this.len[page]);
 			}
-			// not an EPROM
-			else {
-				// loop if get a crc error in packet data until get same data twice
-				for (;;) {
-					pmb.readPage(local_page, (lastPageRead == (page - 1)), tempPage, 0);
 
-					// \\//\\//\\//\\//\\//\\//\\//
-					if (doDebugMessages)
-						System.out.println("_Page: " + page + " translates to " + local_page + " or device page "
-								+ local_device_page);
+			return this.len[page];
+		}
+		// not an EPROM
+		else {
+			// loop if get a crc error in packet data until get same data twice
+			for (;;) {
+				pmb.readPage(local_page, this.lastPageRead == page - 1, this.tempPage, 0);
 
-					// set the last page read
-					lastPageRead = page;
+				// \\//\\//\\//\\//\\//\\//\\//
+				if (doDebugMessages) {
+					System.out.println(
+							"_Page: " + page + " translates to " + local_page + " or device page " + local_device_page);
+				}
 
-					// verify length is realistic
-					if ((tempPage[0] & 0x00FF) <= maxPacketDataLength) {
+				// set the last page read
+				this.lastPageRead = page;
 
-						// verify the CRC is correct
-						if (CRC16.compute(tempPage, 0, tempPage[0] + 3, local_device_page) == 0x0000B001) {
+				// verify length is realistic
+				if ((this.tempPage[0] & 0x00FF) <= this.maxPacketDataLength) {
 
-							// valid data so put into cache
-							System.arraycopy(tempPage, 0, cache[page], 0, tempPage.length);
+					// verify the CRC is correct
+					if (CRC16.compute(this.tempPage, 0, this.tempPage[0] + 3, local_device_page) == 0x0000B001) {
 
-							// get the length
-							len[page] = tempPage[0];
+						// valid data so put into cache
+						System.arraycopy(this.tempPage, 0, this.cache[page], 0, this.tempPage.length);
 
-							// set the page state
-							pageState[page] = READ_CRC;
+						// get the length
+						this.len[page] = this.tempPage[0];
 
-							break;
-						}
-					}
+						// set the page state
+						this.pageState[page] = READ_CRC;
 
-					// \\//\\//\\//\\//\\//\\//\\//
-					if (doDebugMessages) {
-						System.out.print("_Invalid CRC, raw: ");
-						debugDump(tempPage, 0, tempPage.length);
+						break;
 					}
+				}
 
-					// must have been invalid packet
-					// compare with data currently in the cache
-					boolean same_data = true;
-
-					for (int i = 0; i < tempPage.length; i++) {
-						if ((tempPage[i] & 0x00FF) != (cache[page][i] & 0x00FF)) {
+				// \\//\\//\\//\\//\\//\\//\\//
+				if (doDebugMessages) {
+					System.out.print("_Invalid CRC, raw: ");
+					this.debugDump(this.tempPage, 0, this.tempPage.length);
+				}
 
-							// \\//\\//\\//\\//\\//\\//\\//
-							if (doDebugMessages)
-								System.out.println("_Differenet at position=" + i);
+				// must have been invalid packet
+				// compare with data currently in the cache
+				var same_data = true;
 
-							same_data = false;
+				for (var i = 0; i < this.tempPage.length; i++) {
+					if ((this.tempPage[i] & 0x00FF) != (this.cache[page][i] & 0x00FF)) {
 
-							break;
+						// \\//\\//\\//\\//\\//\\//\\//
+						if (doDebugMessages) {
+							System.out.println("_Differenet at position=" + i);
 						}
-					}
 
-					// if the same then throw the exception, else loop again
-					if (same_data) {
-						// set the page state
-						pageState[page] = READ_NO_CRC;
+						same_data = false;
 
-						throw new OneWireIOException("Invalid CRC16 in packet read");
-					} else
-						System.arraycopy(tempPage, 0, cache[page], 0, tempPage.length);
+						break;
+					}
 				}
-			}
-
-			// \\//\\//\\//\\//\\//\\//\\//
-			if (doDebugMessages) {
-				System.out.print("_Data found (" + len[page] + "):");
-				debugDump(cache[page], 1, len[page]);
-			}
 
-			// get copy of data for caller
-			if (readBuf != null)
-				System.arraycopy(cache[page], 1, readBuf, offset, len[page]);
+				// if the same then throw the exception, else loop again
+				if (same_data) {
+					// set the page state
+					this.pageState[page] = READ_NO_CRC;
 
-			return len[page];
-		}
-		// page IS cached (READ_CRC, VERIFY, WRITE)
-		else {
-			// \\//\\//\\//\\//\\//\\//\\//
-			if (doDebugMessages) {
-				System.out.print("_In cache (" + len[page] + "):");
-				debugDump(cache[page], 1, len[page]);
+					throw new OneWireIOException("Invalid CRC16 in packet read");
+				} else {
+					System.arraycopy(this.tempPage, 0, this.cache[page], 0, this.tempPage.length);
+				}
 			}
+		}
 
-			// get from cache
-			if (readBuf != null)
-				System.arraycopy(cache[page], 1, readBuf, offset, len[page]);
+		// \\//\\//\\//\\//\\//\\//\\//
+		if (doDebugMessages) {
+			System.out.print("_Data found (" + this.len[page] + "):");
+			this.debugDump(this.cache[page], 1, this.len[page]);
+		}
 
-			return len[page];
+		// get copy of data for caller
+		if (readBuf != null) {
+			System.arraycopy(this.cache[page], 1, readBuf, offset, this.len[page]);
 		}
+
+		return this.len[page];
 	}
 
 	/**
@@ -637,95 +660,102 @@ public void writePagePacket(int page, byte[] writeBuf, int offset, int buflen)
 		// \\//\\//\\//\\//\\//\\//\\//
 		if (doDebugMessages) {
 			System.out.print("___writePagePacket on page " + page + " with data (" + buflen + "): ");
-			debugDump(writeBuf, offset, buflen);
+			this.debugDump(writeBuf, offset, buflen);
 		}
 
 		// check if have a cache (any memory banks)
-		if (totalPages == 0)
+		if (this.totalPages == 0) {
 			throw new OneWireException("1-Wire Filesystem does not have memory");
+		}
 
 		// check if need to read the page bitmap for the first time
-		if (!pbmRead)
-			readPageBitMap();
+		if (!this.pbmRead) {
+			this.readPageBitMap();
+		}
 
 		// OTP device
-		if (canRedirect) {
+		if (this.canRedirect) {
 			// get reference to memory bank
-			OTPMemoryBank otp = (OTPMemoryBank) getMemoryBankForPage(page);
+			var otp = (OTPMemoryBank) this.getMemoryBankForPage(page);
 
 			// check redirectoin if writing to a page that has not been read
-			if ((redirect[page] == 0) && (pageState[page] == NOT_READ))
-				redirect[page] = otp.getRedirectedPage(page);
+			if (this.redirect[page] == 0 && this.pageState[page] == NOT_READ) {
+				this.redirect[page] = otp.getRedirectedPage(page);
+			}
 
 			// check if page to write to is already redirected
-			if (redirect[page] != 0) {
+			if (this.redirect[page] != 0) {
 				// loop to find the end of the redirect chain
 				int last_page = page, cnt = 0;
-				lastPageRead = NONE;
+				this.lastPageRead = NONE;
 				do {
-					last_page = redirect[last_page];
+					last_page = this.redirect[last_page];
 
-					redirect[last_page] = otp.getRedirectedPage(last_page);
+					this.redirect[last_page] = otp.getRedirectedPage(last_page);
 
-					if (cnt++ > totalPages)
+					if (cnt++ > this.totalPages) {
 						throw new OneWireException("Error in Filesystem, circular redirection of pages");
-				} while (redirect[last_page] != 0);
+					}
+				} while (this.redirect[last_page] != 0);
 
 				// \\//\\//\\//\\//\\//\\//\\//
-				if (doDebugMessages)
+				if (doDebugMessages) {
 					System.out.print("___redirection chain ended on page " + last_page);
+				}
 
 				// Use the last_page since it was not redirected
-				System.arraycopy(writeBuf, offset, cache[last_page], 1, buflen);
-				len[last_page] = buflen;
-				cache[last_page][0] = (byte) buflen;
-				int crc = CRC16.compute(cache[last_page], 0, buflen + 1, last_page);
-				cache[last_page][buflen + 1] = (byte) (~crc & 0xFF);
-				cache[last_page][buflen + 2] = (byte) (((~crc & 0xFFFF) >>> 8) & 0xFF);
+				System.arraycopy(writeBuf, offset, this.cache[last_page], 1, buflen);
+				this.len[last_page] = buflen;
+				this.cache[last_page][0] = (byte) buflen;
+				var crc = CRC16.compute(this.cache[last_page], 0, buflen + 1, last_page);
+				this.cache[last_page][buflen + 1] = (byte) (~crc & 0xFF);
+				this.cache[last_page][buflen + 2] = (byte) ((~crc & 0xFFFF) >>> 8 & 0xFF);
 
 				// set pageState flag
-				pageState[last_page] = VERIFY;
+				this.pageState[last_page] = VERIFY;
 
 				// change page to last_page to be used in writeLog
 				page = last_page;
 			} else {
 				// Use the page since it is not redirected
-				System.arraycopy(writeBuf, offset, cache[page], 1, buflen);
-				len[page] = buflen;
-				cache[page][0] = (byte) buflen;
-				int crc = CRC16.compute(cache[page], 0, buflen + 1, page);
-				cache[page][buflen + 1] = (byte) (~crc & 0xFF);
-				cache[page][buflen + 2] = (byte) (((~crc & 0xFFFF) >>> 8) & 0xFF);
+				System.arraycopy(writeBuf, offset, this.cache[page], 1, buflen);
+				this.len[page] = buflen;
+				this.cache[page][0] = (byte) buflen;
+				var crc = CRC16.compute(this.cache[page], 0, buflen + 1, page);
+				this.cache[page][buflen + 1] = (byte) (~crc & 0xFF);
+				this.cache[page][buflen + 2] = (byte) ((~crc & 0xFFFF) >>> 8 & 0xFF);
 
 				// set pageState flag
-				pageState[page] = VERIFY;
+				this.pageState[page] = VERIFY;
 			}
 		}
 		// NON-OTP device
 		else {
 			// put in cache
-			System.arraycopy(writeBuf, offset, cache[page], 1, buflen);
+			System.arraycopy(writeBuf, offset, this.cache[page], 1, buflen);
 
-			len[page] = buflen;
-			cache[page][0] = (byte) buflen;
+			this.len[page] = buflen;
+			this.cache[page][0] = (byte) buflen;
 
 			// set pageState flag
-			pageState[page] = WRITE;
+			this.pageState[page] = WRITE;
 		}
 
 		// record write in log
 		// search the write log until find 'page' or EMPTY
-		for (log = 0; log < totalPages; log++) {
-			if ((writeLog[log] == page) || (writeLog[log] == EMPTY))
+		for (log = 0; log < this.totalPages; log++) {
+			if (this.writeLog[log] == page || this.writeLog[log] == EMPTY) {
 				break;
+			}
 		}
 
 		// shift write log down 1 to 'log'
-		for (; log > 0; log--)
-			writeLog[log] = writeLog[log - 1];
+		for (; log > 0; log--) {
+			this.writeLog[log] = this.writeLog[log - 1];
+		}
 
 		// add page at top
-		writeLog[0] = page;
+		this.writeLog[0] = page;
 	}
 
 	/**
@@ -738,12 +768,14 @@ public void sync() throws OneWireIOException, OneWireException {
 		int page, log;
 
 		// \\//\\//\\//\\//\\//\\//\\//
-		if (doDebugMessages)
+		if (doDebugMessages) {
 			System.out.println("___sync");
+		}
 
 		// check if have a cache (any memory banks)
-		if (totalPages == 0)
+		if (this.totalPages == 0) {
 			return;
+		}
 
 		// loop until all jobs complete
 		boolean jobs;
@@ -751,52 +783,55 @@ public void sync() throws OneWireIOException, OneWireException {
 			jobs = false;
 
 			// loop through write log and write the oldest pages first
-			for (log = totalPages - 1; log >= 0; log--) {
+			for (log = this.totalPages - 1; log >= 0; log--) {
 				// check if this is a valid log entry
-				if (writeLog[log] != EMPTY) {
+				if (this.writeLog[log] != EMPTY) {
 
 					// this was not empty so there is a job
 					jobs = true;
 
 					// get page number to write
-					page = writeLog[log];
+					page = this.writeLog[log];
 
 					// \\//\\//\\//\\//\\//\\//\\//
-					if (doDebugMessages)
-						System.out.println(
-								"_page " + page + " in log " + log + " is not empty, pageState: " + pageState[page]);
+					if (doDebugMessages) {
+						System.out.println("_page " + page + " in log " + log + " is not empty, pageState: "
+								+ this.pageState[page]);
+					}
 
 					// get the memory bank
-					PagedMemoryBank pmb = (PagedMemoryBank) getMemoryBankForPage(page);
+					var pmb = this.getMemoryBankForPage(page);
 
 					// get the local page number
-					int local_page = getLocalPage(page);
+					var local_page = this.getLocalPage(page);
 
 					// Verify operation (only in EPROM operations)
-					if (pageState[page] == VERIFY) {
+					if (this.pageState[page] == VERIFY) {
 						// \\//\\//\\//\\//\\//\\//\\//
-						if (doDebugMessages)
+						if (doDebugMessages) {
 							System.out.println("_verify page " + page);
+						}
 
 						// read the page with device generated CRC
-						pmb.readPageCRC(page, (lastPageRead == (page - 1)), tempPage, 0);
+						pmb.readPageCRC(page, this.lastPageRead == page - 1, this.tempPage, 0);
 
 						// set the last page read
-						lastPageRead = page;
+						this.lastPageRead = page;
 
 						// \\//\\//\\//\\//\\//\\//\\//
 						if (doDebugMessages) {
 							System.out.print("_Desired data: ");
-							debugDump(cache[page], 0, cache[page].length);
+							this.debugDump(this.cache[page], 0, this.cache[page].length);
 							System.out.print("_Current data: ");
-							debugDump(tempPage, 0, tempPage.length);
-							System.out.println("_len " + len[page]);
+							this.debugDump(this.tempPage, 0, this.tempPage.length);
+							System.out.println("_len " + this.len[page]);
 						}
 
 						// check to see if the desired data can be written here
-						boolean do_redirect = false;
-						for (int i = 1; i < (len[page] + 2); i++) {
-							if ((((tempPage[i] & 0x00FF) ^ (cache[page][i] & 0x00FF)) & (~tempPage[i] & 0x00FF)) > 0) {
+						var do_redirect = false;
+						for (var i = 1; i < this.len[page] + 2; i++) {
+							if (((this.tempPage[i] & 0x00FF ^ this.cache[page][i] & 0x00FF) & ~this.tempPage[i]
+									& 0x00FF) > 0) {
 								// error, data already on device, must redirect
 								do_redirect = true;
 								break;
@@ -806,141 +841,150 @@ public void sync() throws OneWireIOException, OneWireException {
 						// need to redirect
 						if (do_redirect) {
 							// \\//\\//\\//\\//\\//\\//\\//
-							if (doDebugMessages)
+							if (doDebugMessages) {
 								System.out.println("_page is occupied with conflicting data, must redirect");
+							}
 
 							// find a new page, set VERIFY job there
 							// get the next available page
-							int new_page = getFirstFreePage();
+							var new_page = this.getFirstFreePage();
 							while (new_page == page) {
 								System.out.println("_can't use this page " + page);
-								markPageUsed(new_page);
-								new_page = getNextFreePage();
+								this.markPageUsed(new_page);
+								new_page = this.getNextFreePage();
 							}
 
 							// verify got a free page
-							if (new_page < 0)
+							if (new_page < 0) {
 								throw new OneWireException("Redireciton required but out of space on 1-Wire device");
+							}
 
 							// mark page used
-							markPageUsed(new_page);
+							this.markPageUsed(new_page);
 
 							// put the data in the new page and setup the job
-							System.arraycopy(cache[page], 0, cache[new_page], 0, tempPage.length);
-							pageState[new_page] = VERIFY;
-							len[new_page] = len[page];
+							System.arraycopy(this.cache[page], 0, this.cache[new_page], 0, this.tempPage.length);
+							this.pageState[new_page] = VERIFY;
+							this.len[new_page] = this.len[page];
 
 							// add to write log
-							for (int i = 0; i < totalPages; i++) {
-								if (writeLog[i] == EMPTY) {
-									writeLog[i] = new_page;
+							for (var i = 0; i < this.totalPages; i++) {
+								if (this.writeLog[i] == EMPTY) {
+									this.writeLog[i] = new_page;
 									break;
 								}
 							}
 
 							// set old page for redirect
-							pageState[page] = REDIRECT;
-							cache[page][0] = (byte) (new_page & 0xFF);
+							this.pageState[page] = REDIRECT;
+							this.cache[page][0] = (byte) (new_page & 0xFF);
 						}
 						// verify passed
-						else
-							pageState[page] = WRITE;
+						else {
+							this.pageState[page] = WRITE;
+						}
 					}
 
 					// Redirect operation
-					if (pageState[page] == REDIRECT) {
+					if (this.pageState[page] == REDIRECT) {
 						// \\//\\//\\//\\//\\//\\//\\//
-						if (doDebugMessages)
-							System.out.println("_redirecting page " + page + " to " + (cache[page][0] & 0x00FF));
+						if (doDebugMessages) {
+							System.out.println("_redirecting page " + page + " to " + (this.cache[page][0] & 0x00FF));
+						}
 
 						// redirect the page (new page located in first byte of cache)
-						((OTPMemoryBank) pmb).redirectPage(page, cache[page][0] & 0x00FF);
+						((OTPMemoryBank) pmb).redirectPage(page, this.cache[page][0] & 0x00FF);
 
 						// clear the redirect job
-						pageState[page] = NOT_READ;
-						lastPageRead = NONE;
-						writeLog[log] = EMPTY;
+						this.pageState[page] = NOT_READ;
+						this.lastPageRead = NONE;
+						this.writeLog[log] = EMPTY;
 					}
 
 					// Write operation
-					if (pageState[page] == WRITE) {
+					if (this.pageState[page] == WRITE) {
 						// \\//\\//\\//\\//\\//\\//\\//
 						if (doDebugMessages) {
-							System.out.print("_write page " + page + " with data (" + len[page] + "): ");
-							debugDump(cache[page], 1, len[page]);
+							System.out.print("_write page " + page + " with data (" + this.len[page] + "): ");
+							this.debugDump(this.cache[page], 1, this.len[page]);
 						}
 
 						// check for new device, make sure it is at the correct speed
-						int new_index = getDeviceIndex(page);
-						if (new_index != lastDevice) {
+						var new_index = this.getDeviceIndex(page);
+						if (new_index != this.lastDevice) {
 							// \\//\\//\\//\\//\\//\\//\\//
-							if (doDebugMessages)
+							if (doDebugMessages) {
 								System.out.print("(" + new_index + ")");
+							}
 
-							lastDevice = new_index;
-							owd[lastDevice].doSpeed();
+							this.lastDevice = new_index;
+							this.owd[this.lastDevice].doSpeed();
 						}
 
 						// write the page
-						pmb.writePagePacket(local_page, cache[page], 1, len[page]);
+						pmb.writePagePacket(local_page, this.cache[page], 1, this.len[page]);
 
 						// clear pageState flag
-						pageState[page] = READ_CRC;
-						lastPageRead = NONE;
-						writeLog[log] = EMPTY;
+						this.pageState[page] = READ_CRC;
+						this.lastPageRead = NONE;
+						this.writeLog[log] = EMPTY;
 					}
 				}
 			}
 		} while (jobs);
 
 		// write the bitmap of used pages for OTP device
-		if (canRedirect) {
+		if (this.canRedirect) {
 			// make a buffer that contains only then new '0' bits in the bitmap
 			// required to not overprogram any bits
-			int numBytes = totalPages / 8;
-			if (numBytes == 0)
+			var numBytes = this.totalPages / 8;
+			if (numBytes == 0) {
 				numBytes = 1;
-			boolean changed = false;
-			byte[] temp_buf = new byte[numBytes];
+			}
+			var changed = false;
+			var temp_buf = new byte[numBytes];
 
-			for (int i = 0; i < numBytes; i++) {
-				temp_buf[i] = (byte) (~(pbmCache[i] ^ pbmCacheModified[i]) & 0x00FF);
-				if ((byte) temp_buf[i] != (byte) 0xFF)
+			for (var i = 0; i < numBytes; i++) {
+				temp_buf[i] = (byte) (~(this.pbmCache[i] ^ this.pbmCacheModified[i]) & 0x00FF);
+				if (temp_buf[i] != (byte) 0xFF) {
 					changed = true;
+				}
 			}
 
 			// \\//\\//\\//\\//\\//\\//\\//
 			if (doDebugMessages) {
 				System.out.print("_device bitmap: ");
-				debugDump(pbmCache, 0, pbmCache.length);
+				this.debugDump(this.pbmCache, 0, this.pbmCache.length);
 				System.out.print("_modified bitmap: ");
-				debugDump(pbmCacheModified, 0, pbmCacheModified.length);
+				this.debugDump(this.pbmCacheModified, 0, this.pbmCacheModified.length);
 				System.out.print("_page bitmap to write, changed: " + changed + "   ");
-				debugDump(temp_buf, 0, temp_buf.length);
+				this.debugDump(temp_buf, 0, temp_buf.length);
 			}
 
 			// write if changed
 			if (changed) {
 				// \\//\\//\\//\\//\\//\\//\\//
-				if (doDebugMessages)
+				if (doDebugMessages) {
 					System.out.println("_writing page bitmap");
+				}
 
 				// turn off read-back verification
-				pbmBank.setWriteVerification(false);
+				this.pbmBank.setWriteVerification(false);
 
 				// write buffer
-				pbmBank.write(0, temp_buf, 0, numBytes);
+				this.pbmBank.write(0, temp_buf, 0, numBytes);
 
 				// readback to make sure that it matches pbmCacheModified
-				pbmBank.read(0, false, temp_buf, 0, numBytes);
-				for (int i = 0; i < numBytes; i++) {
-					if ((temp_buf[i] & 0x00FF) != (pbmCacheModified[i] & 0x00FF))
+				this.pbmBank.read(0, false, temp_buf, 0, numBytes);
+				for (var i = 0; i < numBytes; i++) {
+					if ((temp_buf[i] & 0x00FF) != (this.pbmCacheModified[i] & 0x00FF)) {
 						throw new OneWireException("Readback verification of page bitmap was not correct");
+					}
 				}
 
 				// put new value of bitmap pbmCache
-				System.arraycopy(temp_buf, 0, pbmCache, 0, numBytes);
-				System.arraycopy(temp_buf, 0, pbmCacheModified, 0, numBytes);
+				System.arraycopy(temp_buf, 0, this.pbmCache, 0, numBytes);
+				System.arraycopy(temp_buf, 0, this.pbmCacheModified, 0, numBytes);
 			}
 		}
 	}
@@ -957,11 +1001,12 @@ public void sync() throws OneWireIOException, OneWireException {
 	public void addOwner(OWFileDescriptor tobj) {
 
 		// \\//\\//\\//\\//\\//\\//\\//
-		if (doDebugMessages)
+		if (doDebugMessages) {
 			System.out.println("___addOwner");
+		}
 
-		if (owners.indexOf(tobj) == -1) {
-			owners.addElement(tobj);
+		if (this.owners.indexOf(tobj) == -1) {
+			this.owners.addElement(tobj);
 		}
 	}
 
@@ -973,10 +1018,11 @@ public void addOwner(OWFileDescriptor tobj) {
 	public void removeOwner(Object tobj) {
 
 		// \\//\\//\\//\\//\\//\\//\\//
-		if (doDebugMessages)
+		if (doDebugMessages) {
 			System.out.println("___removeOwner");
+		}
 
-		owners.removeElement(tobj);
+		this.owners.removeElement(tobj);
 	}
 
 	/**
@@ -987,10 +1033,11 @@ public void removeOwner(Object tobj) {
 	public boolean noOwners() {
 
 		// \\//\\//\\//\\//\\//\\//\\//
-		if (doDebugMessages)
-			System.out.println("___noOwners = " + owners.isEmpty());
+		if (doDebugMessages) {
+			System.out.println("___noOwners = " + this.owners.isEmpty());
+		}
 
-		return owners.isEmpty();
+		return this.owners.isEmpty();
 	}
 
 	// --------
@@ -1004,10 +1051,11 @@ public boolean noOwners() {
 	 * @param filePath file to remove from write list
 	 */
 	public void removeWriteOpen(String filePath) {
-		int index = openedToWrite.indexOf(filePath);
+		var index = this.openedToWrite.indexOf(filePath);
 
-		if (index != -1)
-			openedToWrite.removeElementAt(index);
+		if (index != -1) {
+			this.openedToWrite.removeElementAt(index);
+		}
 	}
 
 	/**
@@ -1020,15 +1068,15 @@ public void removeWriteOpen(String filePath) {
 	 * @return true if file was not in the opened to write list
 	 */
 	public boolean isOpenedToWrite(String filePath, boolean addToList) {
-		int index = openedToWrite.indexOf(filePath);
+		var index = this.openedToWrite.indexOf(filePath);
 
-		if (index != -1)
+		if (index != -1) {
 			return true;
-		else {
-			if (addToList)
-				openedToWrite.addElement(filePath);
-			return false;
 		}
+		if (addToList) {
+			this.openedToWrite.addElement(filePath);
+		}
+		return false;
 	}
 
 	// --------
@@ -1041,7 +1089,7 @@ public boolean isOpenedToWrite(String filePath, boolean addToList) {
 	 * @return true if this memory cache should handle the page bitmap
 	 */
 	public boolean handlePageBitmap() {
-		return !(pbmBank == null);
+		return !(this.pbmBank == null);
 	}
 
 	/**
@@ -1051,11 +1099,12 @@ public boolean handlePageBitmap() {
 	 */
 	public void markPageUsed(int page) {
 		// \\//\\//\\//\\//\\//\\//\\//
-		if (doDebugMessages)
+		if (doDebugMessages) {
 			System.out.println("___markPageUsed " + page);
+		}
 
 		// mark page used in cached bitmap of used pages
-		Bit.arrayWriteBit(USED, pbmBitOffset + page, pbmByteOffset, pbmCacheModified);
+		Bit.arrayWriteBit(USED, this.pbmBitOffset + page, this.pbmByteOffset, this.pbmCacheModified);
 	}
 
 	/**
@@ -1069,27 +1118,28 @@ public void markPageUsed(int page) {
 	public boolean freePage(int page) {
 
 		// \\//\\//\\//\\//\\//\\//\\//
-		if (doDebugMessages)
+		if (doDebugMessages) {
 			System.out.print("___freePage " + page);
+		}
 
 		// only free pages that have been written to cache
 		// but not flushed to device
-		if (Bit.arrayReadBit(pbmBitOffset + page, pbmByteOffset, pbmCache) == NOT_USED) {
-			Bit.arrayWriteBit(NOT_USED, pbmBitOffset + page, pbmByteOffset, pbmCacheModified);
+		if (Bit.arrayReadBit(this.pbmBitOffset + page, this.pbmByteOffset, this.pbmCache) == NOT_USED) {
+			Bit.arrayWriteBit(NOT_USED, this.pbmBitOffset + page, this.pbmByteOffset, this.pbmCacheModified);
 
 			// \\//\\//\\//\\//\\//\\//\\//
-			if (doDebugMessages)
+			if (doDebugMessages) {
 				System.out.println("_ was cached so really free now ");
+			}
 
 			return true;
-		} else {
-
-			// \\//\\//\\//\\//\\//\\//\\//
-			if (doDebugMessages)
-				System.out.println("_ not cached so not free");
-
-			return false;
 		}
+		// \\//\\//\\//\\//\\//\\//\\//
+		if (doDebugMessages) {
+			System.out.println("_ not cached so not free");
+		}
+
+		return false;
 	}
 
 	/**
@@ -1100,12 +1150,13 @@ public boolean freePage(int page) {
 	public int getFirstFreePage() {
 
 		// \\//\\//\\//\\//\\//\\//\\//
-		if (doDebugMessages)
+		if (doDebugMessages) {
 			System.out.print("___getFirstFreePage ");
+		}
 
-		lastFreePage = 0;
+		this.lastFreePage = 0;
 
-		return getNextFreePage();
+		return this.getNextFreePage();
 	}
 
 	/**
@@ -1114,22 +1165,24 @@ public int getFirstFreePage() {
 	 * @return next page number that is free to write
 	 */
 	public int getNextFreePage() {
-		for (int pg = lastFreePage; pg < totalPages; pg++) {
-			if (Bit.arrayReadBit(pbmBitOffset + pg, pbmByteOffset, pbmCacheModified) == NOT_USED) {
+		for (var pg = this.lastFreePage; pg < this.totalPages; pg++) {
+			if (Bit.arrayReadBit(this.pbmBitOffset + pg, this.pbmByteOffset, this.pbmCacheModified) == NOT_USED) {
 
 				// \\//\\//\\//\\//\\//\\//\\//
-				if (doDebugMessages)
+				if (doDebugMessages) {
 					System.out.println("___getNextFreePage " + pg);
+				}
 
-				lastFreePage = pg + 1;
+				this.lastFreePage = pg + 1;
 
 				return pg;
 			}
 		}
 
 		// \\//\\//\\//\\//\\//\\//\\//
-		if (doDebugMessages)
+		if (doDebugMessages) {
 			System.out.println("___getNextFreePage, no free pages ");
+		}
 
 		return -1;
 	}
@@ -1143,32 +1196,34 @@ public int getNextFreePage() {
 	 */
 	public int getNumberFreePages() throws OneWireException {
 		// check if need to read the page bitmap for the first time
-		if (!pbmRead) {
+		if (!this.pbmRead) {
 			// read the pbm
-			pbmBank.read(0, false, pbmCache, 0, pbmCache.length);
+			this.pbmBank.read(0, false, this.pbmCache, 0, this.pbmCache.length);
 
 			// make a copy of it
-			System.arraycopy(pbmCache, 0, pbmCacheModified, 0, pbmCache.length);
+			System.arraycopy(this.pbmCache, 0, this.pbmCacheModified, 0, this.pbmCache.length);
 
 			// mark as read
-			pbmRead = true;
+			this.pbmRead = true;
 
 			// \\//\\//\\//\\//\\//\\//\\//
 			if (doDebugMessages) {
 				System.out.print("_Page bitmap read in getNumberFreePages: ");
-				debugDump(pbmCache, 0, pbmCache.length);
+				this.debugDump(this.pbmCache, 0, this.pbmCache.length);
 			}
 		}
 
-		int free_pages = 0;
-		for (int pg = 0; pg < totalPages; pg++) {
-			if (Bit.arrayReadBit(pbmBitOffset + pg, pbmByteOffset, pbmCacheModified) == NOT_USED)
+		var free_pages = 0;
+		for (var pg = 0; pg < this.totalPages; pg++) {
+			if (Bit.arrayReadBit(this.pbmBitOffset + pg, this.pbmByteOffset, this.pbmCacheModified) == NOT_USED) {
 				free_pages++;
+			}
 		}
 
 		// \\//\\//\\//\\//\\//\\//\\//
-		if (doDebugMessages)
+		if (doDebugMessages) {
 			System.out.println("___getNumberFreePages = " + free_pages);
+		}
 
 		return free_pages;
 	}
@@ -1179,7 +1234,7 @@ public int getNumberFreePages() throws OneWireException {
 	 * @return page number used in the directory for the remote page bitmap
 	 */
 	public int getBitMapPageNumber() {
-		return (pbmBank.getStartPhysicalAddress() / pbmBank.getPageLength());
+		return this.pbmBank.getStartPhysicalAddress() / this.pbmBank.getPageLength();
 	}
 
 	/**
@@ -1188,7 +1243,7 @@ public int getBitMapPageNumber() {
 	 * @return number of pages used in page bitmap
 	 */
 	public int getBitMapNumberOfPages() {
-		return ((totalPages / 8) / pbmBank.getPageLength());
+		return this.totalPages / 8 / this.pbmBank.getPageLength();
 	}
 
 	/**
@@ -1196,14 +1251,15 @@ public int getBitMapNumberOfPages() {
 	 * the Filesystem spans memory banks on the same or different devices.
 	 */
 	public PagedMemoryBank getMemoryBankForPage(int page) {
-		int cnt = 0;
+		var cnt = 0;
 
-		for (int bank_num = 0; bank_num < banks.size(); bank_num++) {
+		for (var bank_num = 0; bank_num < this.banks.size(); bank_num++) {
 			// check if 'page' is in this memory bank
-			if ((cnt + bankPages[bank_num]) > page)
-				return (PagedMemoryBank) banks.elementAt(bank_num);
+			if (cnt + this.bankPages[bank_num] > page) {
+				return (PagedMemoryBank) this.banks.elementAt(bank_num);
+			}
 
-			cnt += bankPages[bank_num];
+			cnt += this.bankPages[bank_num];
 		}
 
 		// page provided is not in this Filesystem
@@ -1216,10 +1272,11 @@ public PagedMemoryBank getMemoryBankForPage(int page) {
 	 * devices.
 	 */
 	private int getDeviceIndex(int page) {
-		for (int dev_num = (startPages.length - 1); dev_num >= 0; dev_num--) {
+		for (var dev_num = this.startPages.length - 1; dev_num >= 0; dev_num--) {
 			// check if 'page' is in this memory bank
-			if (startPages[dev_num] < page)
+			if (this.startPages[dev_num] < page) {
 				return dev_num;
+			}
 		}
 
 		// page provided is not in this Filesystem
@@ -1232,14 +1289,15 @@ private int getDeviceIndex(int page) {
 	 * different devices.
 	 */
 	public int getLocalPage(int page) {
-		int cnt = 0;
+		var cnt = 0;
 
-		for (int bank_num = 0; bank_num < banks.size(); bank_num++) {
+		for (var bank_num = 0; bank_num < this.banks.size(); bank_num++) {
 			// check if 'page' is in this memory bank
-			if ((cnt + bankPages[bank_num]) > page)
-				return (page - cnt);
+			if (cnt + this.bankPages[bank_num] > page) {
+				return page - cnt;
+			}
 
-			cnt += bankPages[bank_num];
+			cnt += this.bankPages[bank_num];
 		}
 
 		// page provided is not in this Filesystem
@@ -1253,7 +1311,7 @@ public int getLocalPage(int page) {
 	 */
 	public void clearLastPageRead() {
 		// last page can't be used due to redirect read
-		lastPageRead = NONE;
+		this.lastPageRead = NONE;
 	}
 
 	/**
@@ -1263,18 +1321,18 @@ public void clearLastPageRead() {
 	 */
 	private void readPageBitMap() throws OneWireException {
 		// read the pbm
-		pbmBank.read(0, false, pbmCache, 0, pbmCache.length);
+		this.pbmBank.read(0, false, this.pbmCache, 0, this.pbmCache.length);
 
 		// make a copy of it
-		System.arraycopy(pbmCache, 0, pbmCacheModified, 0, pbmCache.length);
+		System.arraycopy(this.pbmCache, 0, this.pbmCacheModified, 0, this.pbmCache.length);
 
 		// mark as read
-		pbmRead = true;
+		this.pbmRead = true;
 
 		// \\//\\//\\//\\//\\//\\//\\//
 		if (doDebugMessages) {
 			System.out.print("____Page bitmap read: ");
-			debugDump(pbmCache, 0, pbmCache.length);
+			this.debugDump(this.pbmCache, 0, this.pbmCache.length);
 		}
 	}
 
@@ -1290,8 +1348,8 @@ private void readPageBitMap() throws OneWireException {
 	 * @param len    length to dump
 	 */
 	private void debugDump(byte[] buf, int offset, int len) {
-		for (int i = offset; i < (offset + len); i++) {
-			System.out.print(Integer.toHexString((int) buf[i] & 0x00FF) + " ");
+		for (var i = offset; i < offset + len; i++) {
+			System.out.print(Integer.toHexString(buf[i] & 0x00FF) + " ");
 		}
 
 		System.out.println();
diff --git a/io.openems.edge.bridge.onewire/src/com/dalsemi/onewire/application/file/OWFile.java b/io.openems.edge.bridge.onewire/src/com/dalsemi/onewire/application/file/OWFile.java
index 82b8f7e7775..48730f97a97 100644
--- a/io.openems.edge.bridge.onewire/src/com/dalsemi/onewire/application/file/OWFile.java
+++ b/io.openems.edge.bridge.onewire/src/com/dalsemi/onewire/application/file/OWFile.java
@@ -184,7 +184,7 @@
  * <DL>
  * <DD>
  * <H4>Example 1</H4> Format the Filesystem of the 1-Wire device 'owd':
- * 
+ *
  * <PRE>
  *  <CODE>
  *   // create a 1-Wire file at root
@@ -220,7 +220,7 @@
  * <DD>
  * <H4>Example 2</H4> Make a multi-level directory structure on the 1-Wire
  * device 'owd':
- * 
+ *
  * <PRE>
  *  <CODE>
  *   OWFile owfile = new OWFile(owd, "/doc/text/temp");
@@ -290,7 +290,7 @@ public class OWFile {
 	 *                              <code>null</code>
 	 */
 	public OWFile(OneWireContainer owd, String pathname) {
-		fd = new OWFileDescriptor(owd, pathname);
+		this.fd = new OWFileDescriptor(owd, pathname);
 	}
 
 	/**
@@ -303,15 +303,15 @@ public OWFile(OneWireContainer owd, String pathname) {
 	 * @param pathname A pathname string
 	 * @throws NullPointerException If the <code>pathname</code> argument is
 	 *                              <code>null</code>
-	 * 
+	 *
 	 *                              Change the OWFileDescriptor to accept only an
 	 *                              array of containers Change the local ref to be
 	 *                              an array Create a single array in constructors
 	 *                              with single passed owc
-	 * 
+	 *
 	 */
 	public OWFile(OneWireContainer[] owd, String pathname) {
-		fd = new OWFileDescriptor(owd, pathname);
+		this.fd = new OWFileDescriptor(owd, pathname);
 	}
 
 	/*
@@ -350,10 +350,11 @@ public OWFile(OneWireContainer[] owd, String pathname) {
 	 * @throws NullPointerException If <code>child</code> is <code>null</code>
 	 */
 	public OWFile(OneWireContainer owd, String parent, String child) {
-		if (child == null)
+		if (child == null) {
 			throw new NullPointerException("child is null");
+		}
 
-		fd = new OWFileDescriptor(owd, parent + child);
+		this.fd = new OWFileDescriptor(owd, parent + child);
 	}
 
 	/**
@@ -382,17 +383,19 @@ public OWFile(OneWireContainer owd, String parent, String child) {
 	 * @throws NullPointerException If <code>child</code> is <code>null</code>
 	 */
 	public OWFile(OWFile parent, String child) {
-		if (child == null)
+		if (child == null) {
 			throw new NullPointerException("child is null");
+		}
 
 		String new_path;
 
-		if (parent.getAbsolutePath().endsWith("/"))
+		if (parent.getAbsolutePath().endsWith("/")) {
 			new_path = parent.getAbsolutePath() + child;
-		else
+		} else {
 			new_path = parent.getAbsolutePath() + separator + child;
+		}
 
-		fd = new OWFileDescriptor(parent.getOneWireContainers(), new_path);
+		this.fd = new OWFileDescriptor(parent.getOneWireContainers(), new_path);
 	}
 
 	// --------
@@ -408,7 +411,7 @@ public OWFile(OWFile parent, String child) {
 	 *         or the empty string if this pathname's name sequence is empty
 	 */
 	public String getName() {
-		return fd.getName();
+		return this.fd.getName();
 	}
 
 	/**
@@ -426,7 +429,7 @@ public String getName() {
 	 *         parent
 	 */
 	public String getParent() {
-		return fd.getParent();
+		return this.fd.getParent();
 	}
 
 	/**
@@ -444,7 +447,7 @@ public String getParent() {
 	 *         parent
 	 */
 	public OWFile getParentFile() {
-		return new OWFile(fd.getOneWireContainers(), fd.getParent());
+		return new OWFile(this.fd.getOneWireContainers(), this.fd.getParent());
 	}
 
 	/**
@@ -455,7 +458,7 @@ public OWFile getParentFile() {
 	 * @return The string form of this abstract pathname
 	 */
 	public String getPath() {
-		return fd.getPath();
+		return this.fd.getPath();
 	}
 
 	// --------
@@ -499,7 +502,7 @@ public boolean isAbsolute() {
 	 * @see java.io.File#isAbsolute()
 	 */
 	public String getAbsolutePath() {
-		return fd.getPath();
+		return this.fd.getPath();
 	}
 
 	/**
@@ -510,7 +513,7 @@ public String getAbsolutePath() {
 	 *         this abstract pathname
 	 */
 	public OWFile getAbsoluteFile() {
-		return new OWFile(fd.getOneWireContainers(), fd.getPath());
+		return new OWFile(this.fd.getOneWireContainers(), this.fd.getPath());
 	}
 
 	/**
@@ -542,7 +545,7 @@ public OWFile getAbsoluteFile() {
 	 * @since JDK1.1
 	 */
 	public String getCanonicalPath() throws IOException {
-		return fd.getPath();
+		return this.fd.getPath();
 	}
 
 	/**
@@ -557,7 +560,7 @@ public String getCanonicalPath() throws IOException {
 	 *                     filesystem queries
 	 */
 	public OWFile getCanonicalFile() throws IOException {
-		return new OWFile(fd.getOneWireContainers(), fd.getPath());
+		return new OWFile(this.fd.getOneWireContainers(), this.fd.getPath());
 	}
 
 	// --------
@@ -573,7 +576,7 @@ public OWFile getCanonicalFile() throws IOException {
 	 *         <code>false</code> otherwise
 	 */
 	public boolean canRead() {
-		return fd.canRead();
+		return this.fd.canRead();
 	}
 
 	/**
@@ -586,7 +589,7 @@ public boolean canRead() {
 	 *
 	 */
 	public boolean canWrite() {
-		return fd.canWrite();
+		return this.fd.canWrite();
 	}
 
 	/**
@@ -597,7 +600,7 @@ public boolean canWrite() {
 	 *
 	 */
 	public boolean exists() {
-		return fd.exists();
+		return this.fd.exists();
 	}
 
 	/**
@@ -608,7 +611,7 @@ public boolean exists() {
 	 *         otherwise
 	 */
 	public boolean isDirectory() {
-		return fd.isDirectory();
+		return this.fd.isDirectory();
 	}
 
 	/**
@@ -622,7 +625,7 @@ public boolean isDirectory() {
 	 *         otherwise
 	 */
 	public boolean isFile() {
-		return fd.isFile();
+		return this.fd.isFile();
 	}
 
 	/**
@@ -637,7 +640,7 @@ public boolean isFile() {
 	 *         platform
 	 */
 	public boolean isHidden() {
-		return fd.isHidden();
+		return this.fd.isHidden();
 	}
 
 	/**
@@ -662,7 +665,7 @@ public long lastModified() {
 	 *         or <code>0L</code> if the file does not exist
 	 */
 	public long length() {
-		return fd.length();
+		return this.fd.length();
 	}
 
 	// --------
@@ -683,7 +686,7 @@ public long length() {
 	 * @throws IOException If an I/O error occurred
 	 */
 	public boolean createNewFile() throws IOException {
-		return fd.createNewFile();
+		return this.fd.createNewFile();
 	}
 
 	/**
@@ -695,7 +698,7 @@ public boolean createNewFile() throws IOException {
 	 *         successfully deleted; <code>false</code> otherwise
 	 */
 	public boolean delete() {
-		return fd.delete();
+		return this.fd.delete();
 	}
 
 	/**
@@ -720,10 +723,10 @@ public boolean delete() {
 	 *         pathname does not denote a directory, or if an I/O error occurs.
 	 */
 	public String[] list() {
-		if (isFile() || !isDirectory())
+		if (this.isFile() || !this.isDirectory()) {
 			return null;
-		else
-			return fd.list();
+		}
+		return this.fd.list();
 	}
 
 	/**
@@ -754,27 +757,27 @@ public String[] list() {
 	 *         occurs.
 	 */
 	public OWFile[] listFiles() {
-		if (isFile() || !isDirectory())
+		if (this.isFile() || !this.isDirectory()) {
 			return null;
-		else {
-			String[] str_list;
-			OWFile[] file_list;
-			String new_path;
-
-			str_list = fd.list();
-			file_list = new OWFile[str_list.length];
+		}
+		String[] str_list;
+		OWFile[] file_list;
+		String new_path;
 
-			for (int i = 0; i < str_list.length; i++) {
-				if ((fd.getPath() == null) || fd.getPath().endsWith("/"))
-					new_path = "/" + str_list[i];
-				else
-					new_path = fd.getPath() + separator + str_list[i];
+		str_list = this.fd.list();
+		file_list = new OWFile[str_list.length];
 
-				file_list[i] = new OWFile(fd.getOneWireContainers(), new_path);
+		for (var i = 0; i < str_list.length; i++) {
+			if (this.fd.getPath() == null || this.fd.getPath().endsWith("/")) {
+				new_path = "/" + str_list[i];
+			} else {
+				new_path = this.fd.getPath() + separator + str_list[i];
 			}
 
-			return file_list;
+			file_list[i] = new OWFile(this.fd.getOneWireContainers(), new_path);
 		}
+
+		return file_list;
 	}
 
 	/**
@@ -785,7 +788,7 @@ public OWFile[] listFiles() {
 	 */
 	public boolean mkdir() {
 		try {
-			fd.create(false, true, false, -1, -1);
+			this.fd.create(false, true, false, -1, -1);
 
 			return true;
 		} catch (OWFileNotFoundException e) {
@@ -804,7 +807,7 @@ public boolean mkdir() {
 	 */
 	public boolean mkdirs() {
 		try {
-			fd.create(false, true, true, -1, -1);
+			this.fd.create(false, true, true, -1, -1);
 
 			return true;
 		} catch (OWFileNotFoundException e) {
@@ -824,7 +827,7 @@ public boolean mkdirs() {
 	 *                              <code>null</code>
 	 */
 	public boolean renameTo(OWFile dest) {
-		return fd.renameTo(dest);
+		return this.fd.renameTo(dest);
 	}
 
 	/**
@@ -862,9 +865,7 @@ public boolean setLastModified(long time) {
 	 *         <code>false</code> otherwise
 	 */
 	public boolean setReadOnly() {
-		boolean result = fd.setReadOnly();
-
-		return result;
+		return this.fd.setReadOnly();
 	}
 
 	// --------
@@ -909,7 +910,7 @@ public boolean setReadOnly() {
 	 *         roots.
 	 */
 	public static OWFile[] listRoots(OneWireContainer owc) {
-		OWFile[] roots = new OWFile[1];
+		var roots = new OWFile[1];
 
 		roots[0] = new OWFile(owc, "/");
 
@@ -934,9 +935,9 @@ public static OWFile[] listRoots(OneWireContainer owc) {
 	 *         is lexicographically - greater than the argument
 	 */
 	public int compareTo(OWFile pathname) {
-		OneWireContainer[] owd = fd.getOneWireContainers();
-		String this_path = owd[0].getAddressAsString() + getPath();
-		String compare_path = pathname.getOneWireContainer().getAddressAsString() + pathname.getPath();
+		var owd = this.fd.getOneWireContainers();
+		var this_path = owd[0].getAddressAsString() + this.getPath();
+		var compare_path = pathname.getOneWireContainer().getAddressAsString() + pathname.getPath();
 
 		return this_path.compareTo(compare_path);
 	}
@@ -961,7 +962,7 @@ public int compareTo(OWFile pathname) {
 	 * @see java.lang.Comparable
 	 */
 	public int compareTo(Object o) {
-		return compareTo((OWFile) o);
+		return this.compareTo((OWFile) o);
 	}
 
 	/**
@@ -977,14 +978,17 @@ public int compareTo(Object o) {
 	 * @return <code>true</code> if and only if the objects are the same;
 	 *         <code>false</code> otherwise
 	 */
+	@Override
 	public boolean equals(Object obj) {
-		if (obj == null)
+		if (obj == null) {
 			return false;
+		}
 
-		if (!(obj instanceof OWFile))
+		if (!(obj instanceof OWFile)) {
 			return false;
+		}
 
-		return (compareTo((OWFile) obj) == 0);
+		return this.compareTo((OWFile) obj) == 0;
 	}
 
 	/**
@@ -998,8 +1002,9 @@ public boolean equals(Object obj) {
 	 *
 	 * @return A hash code for this abstract pathname
 	 */
+	@Override
 	public int hashCode() {
-		return fd.getHashCode();
+		return this.fd.getHashCode();
 	}
 
 	/**
@@ -1008,8 +1013,9 @@ public int hashCode() {
 	 *
 	 * @return The string form of this abstract pathname
 	 */
+	@Override
 	public String toString() {
-		return fd.getPath();
+		return this.fd.getPath();
 	}
 
 	// --------
@@ -1026,7 +1032,7 @@ public String toString() {
 	 * @see com.dalsemi.onewire.application.file.OWFileDescriptor
 	 */
 	public OWFileDescriptor getFD() throws IOException {
-		return fd;
+		return this.fd;
 	}
 
 	/**
@@ -1037,7 +1043,7 @@ public OWFileDescriptor getFD() throws IOException {
 	 * @return the OneWireContainer for this Filesystem
 	 */
 	public OneWireContainer getOneWireContainer() {
-		OneWireContainer[] owd = fd.getOneWireContainers();
+		var owd = this.fd.getOneWireContainers();
 		return owd[0];
 	}
 
@@ -1049,7 +1055,7 @@ public OneWireContainer getOneWireContainer() {
 	 * @return the OneWireContainer(s) for this Filesystem
 	 */
 	public OneWireContainer[] getOneWireContainers() {
-		return fd.getOneWireContainers();
+		return this.fd.getOneWireContainers();
 	}
 
 	/**
@@ -1058,12 +1064,12 @@ public OneWireContainer[] getOneWireContainers() {
 	 * <P>
 	 * <b>WARNING</b> this will remove any files/directories.
 	 * <P>
-	 * 
+	 *
 	 * @exception IOException if an I/O error occurs.
 	 */
 	public void format() throws IOException {
 		try {
-			fd.format();
+			this.fd.format();
 		} catch (OneWireException e) {
 			throw new IOException(e.toString());
 		}
@@ -1079,7 +1085,7 @@ public void format() throws IOException {
 	 */
 	public int getFreeMemory() throws IOException {
 		try {
-			return fd.getFreeMemory();
+			return this.fd.getFreeMemory();
 		} catch (OneWireException e) {
 			throw new IOException(e.toString());
 		}
@@ -1092,9 +1098,9 @@ public int getFreeMemory() throws IOException {
 	 * @exception IOException if an I/O error occurs.
 	 */
 	public void close() throws IOException {
-		fd.close();
+		this.fd.close();
 
-		fd = null;
+		this.fd = null;
 	}
 
 	/**
@@ -1106,14 +1112,15 @@ public void close() throws IOException {
 	 * @exception IOException if an I/O error occurs.
 	 */
 	public int[] getPageList() throws IOException {
-		if (fd != null) {
-			if (!fd.exists())
-				return new int[0];
-		} else
+		if (this.fd == null) {
 			return new int[0];
+		}
+		if (!this.fd.exists()) {
+			return new int[0];
+		}
 
 		try {
-			return fd.getPageList();
+			return this.fd.getPageList();
 		} catch (OneWireException e) {
 			throw new IOException(e.toString());
 		}
@@ -1128,11 +1135,10 @@ public int[] getPageList() throws IOException {
 	 * @exception IOException if the file doesn't exist
 	 */
 	public int getStartPage() throws IOException {
-		if (fd != null && fd.exists()) {
-			return fd.getStartPage();
-		} else {
-			throw new FileNotFoundException();
+		if (this.fd != null && this.fd.exists()) {
+			return this.fd.getStartPage();
 		}
+		throw new FileNotFoundException();
 	}
 
 	/**
@@ -1142,13 +1148,14 @@ public int getStartPage() throws IOException {
 	 * @return PagedMemoryBank for the specified page
 	 */
 	public PagedMemoryBank getMemoryBankForPage(int page) {
-		if (fd != null) {
-			if (!fd.exists())
-				return null;
-		} else
+		if (this.fd == null) {
 			return null;
+		}
+		if (!this.fd.exists()) {
+			return null;
+		}
 
-		return fd.getMemoryBankForPage(page);
+		return this.fd.getMemoryBankForPage(page);
 	}
 
 	/**
@@ -1159,13 +1166,14 @@ public PagedMemoryBank getMemoryBankForPage(int page) {
 	 * @return local page for the specified Filesystem page (memory bank specific)
 	 */
 	public int getLocalPage(int page) {
-		if (fd != null) {
-			if (!fd.exists())
-				return 0;
-		} else
+		if (this.fd == null) {
 			return 0;
+		}
+		if (!this.fd.exists()) {
+			return 0;
+		}
 
-		return fd.getLocalPage(page);
+		return this.fd.getLocalPage(page);
 	}
 
 	/**
@@ -1178,7 +1186,8 @@ public int getLocalPage(int page) {
 	 */
 	@Override
 	protected void finalize() throws IOException {
-		if (fd != null)
-			fd.close();
+		if (this.fd != null) {
+			this.fd.close();
+		}
 	}
 }
diff --git a/io.openems.edge.bridge.onewire/src/com/dalsemi/onewire/application/file/OWFileDescriptor.java b/io.openems.edge.bridge.onewire/src/com/dalsemi/onewire/application/file/OWFileDescriptor.java
index 5875e582a50..08cea88a311 100644
--- a/io.openems.edge.bridge.onewire/src/com/dalsemi/onewire/application/file/OWFileDescriptor.java
+++ b/io.openems.edge.bridge.onewire/src/com/dalsemi/onewire/application/file/OWFileDescriptor.java
@@ -140,12 +140,6 @@ public class OWFileDescriptor {
 	/** Field feStartPage - Start Page specified in the File Entry */
 	private int feStartPage;
 
-	/** Field feParentPage - Parent page of current File Entry Page */
-	private int feParentPage;
-
-	/** Field feParentOffset - Offset into Parent page */
-	private int feParentOffset;
-
 	// --------
 	// file read/write info
 	// --------
@@ -231,7 +225,7 @@ public class OWFileDescriptor {
 	private byte[] tempPage;
 
 	/** Field initName - image of blank directory entry, used in parsing */
-	private byte[] initName = { 0x20, 0x20, 0x20, 0x20, EXT_UNKNOWN };
+	private final byte[] initName = { 0x20, 0x20, 0x20, 0x20, EXT_UNKNOWN };
 
 	/** Field smallBuf - small buffer */
 	private byte[] smallBuf;
@@ -252,8 +246,9 @@ public class OWFileDescriptor {
 	 */
 	public OWFileDescriptor() {
 		// \\//\\//\\//\\//\\//\\//\\//
-		if (doDebugMessages)
+		if (doDebugMessages) {
 			System.out.println("===Invalid Constructor OWFileDescriptor ");
+		}
 	}
 
 	/**
@@ -265,14 +260,15 @@ public OWFileDescriptor() {
 	 *                descriptor
 	 */
 	protected OWFileDescriptor(OneWireContainer owd, String newPath) {
-		OneWireContainer[] devices = new OneWireContainer[1];
+		var devices = new OneWireContainer[1];
 		devices[0] = owd;
 
 		// \\//\\//\\//\\//\\//\\//\\//
-		if (doDebugMessages)
+		if (doDebugMessages) {
 			System.out.println("===Constructor OWFileDescriptor with device: " + devices[0].getAddressAsString()
 					+ " and path: " + newPath);
-		setupFD(devices, newPath);
+		}
+		this.setupFD(devices, newPath);
 	}
 
 	/**
@@ -285,10 +281,11 @@ protected OWFileDescriptor(OneWireContainer owd, String newPath) {
 	 */
 	protected OWFileDescriptor(OneWireContainer[] owd, String newPath) {
 		// \\//\\//\\//\\//\\//\\//\\//
-		if (doDebugMessages)
+		if (doDebugMessages) {
 			System.out.println("===Constructor OWFileDescriptor with device: " + owd[0].getAddressAsString()
 					+ " and path: " + newPath);
-		setupFD(owd, newPath);
+		}
+		this.setupFD(owd, newPath);
 	}
 
 	/**
@@ -305,109 +302,115 @@ protected void setupFD(OneWireContainer[] owd, String newPath) {
 			// keep reference to container, adapter, and name
 			this.owd = owd;
 
-			if (newPath != null)
+			if (newPath != null) {
 				this.rawPath = newPath.toUpperCase();
-			else
+			} else {
 				this.rawPath = "";
+			}
 
 			// check the hash to see if already have a MemoryCache for this device
-			address = Long.valueOf(owd[0].getAddressAsLong());
-			cache = (MemoryCache) memoryCacheHash.get(address);
+			this.address = Long.valueOf(owd[0].getAddressAsLong());
+			this.cache = memoryCacheHash.get(this.address);
 
-			if (cache == null) {
+			if (this.cache == null) {
 				// create a new cache
-				cache = new MemoryCache(owd);
+				this.cache = new MemoryCache(owd);
 
 				// add to hash
-				memoryCacheHash.put(address, cache);
+				memoryCacheHash.put(this.address, this.cache);
 			}
 
 			// indicate this fd uses this cache, used later in cleanup
-			cache.addOwner(this);
+			this.cache.addOwner(this);
 
 			// get info on device through cache
-			totalPages = cache.getNumberPages();
-			rootTotalPages = cache.getNumberPagesInBank(0);
-			maxDataLen = cache.getMaxPacketDataLength();
-			openedToWrite = false;
+			this.totalPages = this.cache.getNumberPages();
+			this.rootTotalPages = this.cache.getNumberPagesInBank(0);
+			this.maxDataLen = this.cache.getMaxPacketDataLength();
+			this.openedToWrite = false;
 
 			// \\//\\//\\//\\//\\//\\//\\//
-			if (doDebugMessages)
-				System.out.println("=cache has totalPages = " + totalPages + " with max data " + maxDataLen);
+			if (doDebugMessages) {
+				System.out.println("=cache has totalPages = " + this.totalPages + " with max data " + this.maxDataLen);
+			}
 
 			// construct the page bufs
-			lastPageData = new byte[maxDataLen];
-			tempPage = new byte[lastPageData.length];
-			feData = new byte[lastPageData.length];
-			dmBuf = new byte[lastPageData.length];
-			smallBuf = new byte[10];
-			addrBuf = new byte[8];
+			this.lastPageData = new byte[this.maxDataLen];
+			this.tempPage = new byte[this.lastPageData.length];
+			this.feData = new byte[this.lastPageData.length];
+			this.dmBuf = new byte[this.lastPageData.length];
+			this.smallBuf = new byte[10];
+			this.addrBuf = new byte[8];
 
 			// guese at the number of bytes to represent a page number
 			// since have not read the root directory yet this may change
-			LEN_PAGE_PTR = (totalPages > 256) ? 2 : 1;
-			LEN_FILE_ENTRY = LEN_FILENAME + LEN_PAGE_PTR * 2;
-			LEN_CONTROL_DATA = 6 + LEN_PAGE_PTR;
+			this.LEN_PAGE_PTR = this.totalPages > 256 ? 2 : 1;
+			this.LEN_FILE_ENTRY = LEN_FILENAME + this.LEN_PAGE_PTR * 2;
+			this.LEN_CONTROL_DATA = 6 + this.LEN_PAGE_PTR;
 
 			// \\//\\//\\//\\//\\//\\//\\//
-			if (doDebugMessages)
-				System.out.println(
-						"=Number of page bytes = " + LEN_PAGE_PTR + " with directory entry size of " + LEN_FILE_ENTRY);
+			if (doDebugMessages) {
+				System.out.println("=Number of page bytes = " + this.LEN_PAGE_PTR + " with directory entry size of "
+						+ this.LEN_FILE_ENTRY);
+			}
 
 			// decide what type of bitmap we will have
-			if (cache.handlePageBitmap())
-				bitmapType = BM_CACHE;
-			else if (totalPages <= 32) {
-				bitmapType = BM_LOCAL;
-
-				// make PageBitMap max size of first page of directory
-				pbm = new byte[maxDataLen];
-				pbmByteOffset = 3;
-				pbmBitOffset = 0;
+			if (this.cache.handlePageBitmap()) {
+				this.bitmapType = BM_CACHE;
 			} else {
-				bitmapType = BM_FILE;
+				if (this.totalPages <= 32) {
+					this.bitmapType = BM_LOCAL;
+
+					// make PageBitMap max size of first page of directory
+					this.pbm = new byte[this.maxDataLen];
+					this.pbmByteOffset = 3;
+				} else {
+					this.bitmapType = BM_FILE;
 
-				// make PageBitMap correct size number of pages in fs
-				pbm = new byte[totalPages / 8 + LEN_PAGE_PTR];
-				pbmByteOffset = 0;
-				pbmBitOffset = 0;
+					// make PageBitMap correct size number of pages in fs
+					this.pbm = new byte[this.totalPages / 8 + this.LEN_PAGE_PTR];
+					this.pbmByteOffset = 0;
+				}
+				this.pbmBitOffset = 0;
 			}
-			pbmStartPage = -1;
+			this.pbmStartPage = -1;
 
 			// \\//\\//\\//\\//\\//\\//\\//
-			if (doDebugMessages)
-				System.out.println("=Page BitMap type is " + bitmapType + " with bit offset of " + pbmBitOffset);
+			if (doDebugMessages) {
+				System.out.println(
+						"=Page BitMap type is " + this.bitmapType + " with bit offset of " + this.pbmBitOffset);
+			}
 
 			// parse the path into a Vector
-			verbosePath = new Vector<byte[]>(3);
+			this.verbosePath = new Vector<>(3);
 
 			// done could not parse the skip compressing
-			if (!parsePath(rawPath, verbosePath))
+			if (!this.parsePath(this.rawPath, this.verbosePath)) {
 				return;
+			}
 
 			// create a compressed path (take out "." and "..")
-			path = new Vector<byte[]>(verbosePath.size());
+			this.path = new Vector<>(this.verbosePath.size());
 
 			byte[] element;
 
-			for (int element_num = 0; element_num < verbosePath.size(); element_num++) {
-				element = (byte[]) verbosePath.elementAt(element_num);
+			for (var element_num = 0; element_num < this.verbosePath.size(); element_num++) {
+				element = this.verbosePath.elementAt(element_num);
 
 				// ".."
-				if ((element[0] == '.') && (element[1] == '.')) {
+				if (element[0] == '.' && element[1] == '.') {
 
 					// remove last entry in path
-					if (path.size() > 0)
-						path.removeElementAt(path.size() - 1);
-					else {
-						path = null;
+					if (this.path.size() <= 0) {
+						this.path = null;
 						break;
 					}
+					this.path.removeElementAt(this.path.size() - 1);
 				}
 
 				// not "." (so ignore entries ".")
 				else if (element[0] != '.') {
-					path.addElement(element);
+					this.path.addElement(element);
 				}
 			}
 		}
@@ -425,8 +428,8 @@ else if (element[0] != '.') {
 	 *         otherwise.
 	 */
 	public boolean valid() {
-		synchronized (cache) {
-			return (cache != null);
+		synchronized (this.cache) {
+			return this.cache != null;
 		}
 	}
 
@@ -463,16 +466,17 @@ public boolean valid() {
 	public void sync() throws OWSyncFailedException {
 
 		// \\//\\//\\//\\//\\//\\//\\//
-		if (doDebugMessages)
+		if (doDebugMessages) {
 			System.out.println("===sync");
+		}
 
 		try {
-			synchronized (cache) {
+			synchronized (this.cache) {
 				// clear last page read flag
-				cache.clearLastPageRead();
+				this.cache.clearLastPageRead();
 
 				// flush the writes to the device
-				cache.sync();
+				this.cache.sync();
 			}
 		} catch (OneWireIOException e) {
 			throw new OWSyncFailedException(e.toString());
@@ -510,35 +514,39 @@ public void sync() throws OWSyncFailedException {
 	 */
 	protected void open() throws OWFileNotFoundException {
 		String last_error = null;
-		int cnt = 0;
+		var cnt = 0;
 
-		synchronized (cache) {
+		synchronized (this.cache) {
 			// \\//\\//\\//\\//\\//\\//\\//
-			if (doDebugMessages)
+			if (doDebugMessages) {
 				System.out.println("===open");
+			}
 
 			// clear last page read flag in the cache
-			cache.clearLastPageRead();
+			this.cache.clearLastPageRead();
 
 			// reset the file position
-			lastPage = -1;
+			this.lastPage = -1;
 
 			// check if had an invalid path
-			if (path == null)
+			if (this.path == null) {
 				throw new OWFileNotFoundException("Invalid path");
+			}
 
 			// check if have an empty path
-			if (path.size() == 0)
+			if (this.path.size() == 0) {
 				throw new OWFileNotFoundException("Invalid path, no elements");
+			}
 
 			// check to see if this file entry has been found
-			if (feStartPage <= 0) {
+			if (this.feStartPage <= 0) {
 
 				// loop up to 2 times if getting 1-Wire IO exceptions
 				do {
 					try {
-						if (verifyPath(path.size()))
+						if (this.verifyPath(this.path.size())) {
 							return;
+						}
 					} catch (OneWireException e) {
 						last_error = e.toString();
 					}
@@ -574,10 +582,11 @@ protected void open() throws OWFileNotFoundException {
 	 * @throws IOException if an I/O error occurs
 	 */
 	protected void close() throws IOException {
-		synchronized (cache) {
+		synchronized (this.cache) {
 			// \\//\\//\\//\\//\\//\\//\\//
-			if (doDebugMessages)
+			if (doDebugMessages) {
 				System.out.println("===close");
+			}
 
 			// \\//\\//\\//\\//\\//\\//\\//
 			if (doDebugMessages) {
@@ -587,13 +596,13 @@ protected void close() throws IOException {
 
 			// sync the cache to the device
 			try {
-				sync();
+				this.sync();
 			} catch (OWSyncFailedException e) {
 				throw new IOException(e.toString());
 			}
 
 			// free the resources for this fd
-			free();
+			this.free();
 		}
 	}
 
@@ -618,54 +627,59 @@ protected void create(boolean append, boolean isDirectory, boolean makeParents,
 		byte[] element;
 		boolean element_found;
 
-		synchronized (cache) {
+		synchronized (this.cache) {
 			// \\//\\//\\//\\//\\//\\//\\//
-			if (doDebugMessages)
+			if (doDebugMessages) {
 				System.out.println(
 						"===create, append=" + append + " isDirectory=" + isDirectory + " makeParents=" + makeParents);
+			}
 
 			// clear last page read flag in the cache
-			cache.clearLastPageRead();
+			this.cache.clearLastPageRead();
 
 			// reset the file position
-			lastPage = -1;
+			this.lastPage = -1;
 
 			// check if had an invalid path
-			if (path == null)
+			if (this.path == null) {
 				throw new OWFileNotFoundException("Invalid path");
+			}
 
 			// check if have an empty path
-			if (path.size() == 0)
+			if (this.path.size() == 0) {
 				throw new OWFileNotFoundException("Invalid path, no elements");
+			}
 
 			// make sure last element in path is a directory (or unknown) if making
 			// directory
 			if (isDirectory || makeParents) {
-				element = (byte[]) path.elementAt(path.size() - 1);
+				element = this.path.elementAt(this.path.size() - 1);
 
-				if (((element[4] & 0x7F) != EXT_UNKNOWN) && ((element[4] & 0x7F) != EXT_DIRECTORY))
+				if ((element[4] & 0x7F) != EXT_UNKNOWN && (element[4] & 0x7F) != EXT_DIRECTORY) {
 					throw new OWFileNotFoundException("Invalid path, directory has an extension");
+				}
 			}
 
 			// check if file is already opened to write
 			if (!isDirectory) {
-				if (cache.isOpenedToWrite(owd[0].getAddressAsString() + getPath(), true))
+				if (this.cache.isOpenedToWrite(this.owd[0].getAddressAsString() + this.getPath(), true)) {
 					throw new OWFileNotFoundException("File already opened to write");
+				}
 
-				openedToWrite = true;
+				this.openedToWrite = true;
 			}
 
 			// loop through the path elements, creating directories/file as needed
-			feStartPage = 0;
-			boolean file_exists = false;
+			this.feStartPage = 0;
+			var file_exists = false;
 			byte[] prev_element = { (byte) 0x52, (byte) 0x4F, (byte) 0x4F, (byte) 0x54 };
-			int prev_element_start = 0;
+			var prev_element_start = 0;
 
-			for (int element_num = 0; element_num < path.size(); element_num++) {
-				element = (byte[]) path.elementAt(element_num);
+			for (var element_num = 0; element_num < this.path.size(); element_num++) {
+				element = this.path.elementAt(element_num);
 
 				try {
-					element_found = findElement(feStartPage, element, 0);
+					element_found = this.findElement(this.feStartPage, element, 0);
 				} catch (OneWireException e) {
 					throw new OWFileNotFoundException(e.toString());
 				}
@@ -674,39 +688,38 @@ protected void create(boolean append, boolean isDirectory, boolean makeParents,
 					if (isDirectory) {
 
 						// convert unknown entry to directory
-						if ((byte) element[4] == (byte) EXT_UNKNOWN)
-							element[4] = (byte) EXT_DIRECTORY;
+						if (element[4] == EXT_UNKNOWN) {
+							element[4] = EXT_DIRECTORY;
+						}
 
-						if ((element_num != (path.size() - 1)) && !makeParents)
+						if (element_num != this.path.size() - 1 && !makeParents) {
 							throw new OWFileNotFoundException("Invalid path, parent not found");
-
-						createEntry(element, startPage, numberPages, prev_element, prev_element_start);
+						}
 					} else {
 
 						// convert unknown entry to file with 0 extension
-						if ((byte) element[4] == (byte) EXT_UNKNOWN)
+						if (element[4] == EXT_UNKNOWN) {
 							element[4] = 0;
+						}
 
-						if (element_num == (path.size() - 1)) {
-
-							// this is the file (end of path)
-							createEntry(element, startPage, numberPages, prev_element, prev_element_start);
-						} else {
+						if (element_num != this.path.size() - 1) {
 							// remove the entry in the cache before throwing exception
-							cache.removeWriteOpen(owd[0].getAddressAsString() + getPath());
+							this.cache.removeWriteOpen(this.owd[0].getAddressAsString() + this.getPath());
 							throw new OWFileNotFoundException("Path not found");
 						}
 					}
-				} else if (element_num == (path.size() - 1)) {
+					this.createEntry(element, startPage, numberPages, prev_element, prev_element_start);
+				} else if (element_num == this.path.size() - 1) {
 					// last element
 					if (isDirectory) {
-						if (startPage != -1)
+						if (startPage != -1) {
 							throw new OWFileNotFoundException("Destination File exists");
+						}
 					} else {
 						// check if last element is a directory and should be a file
-						if ((element[4] == (byte) EXT_DIRECTORY) && (!isDirectory)) {
+						if (element[4] == EXT_DIRECTORY && !isDirectory) {
 							// remove the entry in the cache before throwing exception
-							cache.removeWriteOpen(owd[0].getAddressAsString() + getPath());
+							this.cache.removeWriteOpen(this.owd[0].getAddressAsString() + this.getPath());
 							throw new OWFileNotFoundException("Filename provided is a directory!");
 						}
 						file_exists = true;
@@ -714,62 +727,69 @@ protected void create(boolean append, boolean isDirectory, boolean makeParents,
 				}
 
 				// get pointers to the next element
-				feStartPage = Convert.toInt(feData, feOffset + LEN_FILENAME, LEN_PAGE_PTR);
-				feNumPages = Convert.toInt(feData, feOffset + LEN_FILENAME + LEN_PAGE_PTR, LEN_PAGE_PTR);
+				this.feStartPage = Convert.toInt(this.feData, this.feOffset + LEN_FILENAME, this.LEN_PAGE_PTR);
+				this.feNumPages = Convert.toInt(this.feData, this.feOffset + LEN_FILENAME + this.LEN_PAGE_PTR,
+						this.LEN_PAGE_PTR);
 				prev_element = element;
-				prev_element_start = feStartPage;
+				prev_element_start = this.feStartPage;
 
 				// \\//\\//\\//\\//\\//\\//\\//
-				if (doDebugMessages)
-					System.out.println("=feStartPage " + feStartPage + " feNumPages " + feNumPages);
+				if (doDebugMessages) {
+					System.out.println("=feStartPage " + this.feStartPage + " feNumPages " + this.feNumPages);
+				}
 			}
 
 			// if is a file and it already exists, free all but the first data page
 			if (file_exists) {
 
 				// \\//\\//\\//\\//\\//\\//\\//
-				if (doDebugMessages)
+				if (doDebugMessages) {
 					System.out.println("=file exists");
+				}
 
 				// check for readonly
-				if (!canWrite())
+				if (!this.canWrite()) {
 					throw new OWFileNotFoundException("File is read only (access is denied)");
+				}
 
 				try {
 
 					// read the first file page
-					lastLen = cache.readPagePacket(feStartPage, lastPageData, 0);
+					this.lastLen = this.cache.readPagePacket(this.feStartPage, this.lastPageData, 0);
 
 					// write over this with an 'empty' page
-					Convert.toByteArray(0, smallBuf, 0, LEN_PAGE_PTR);
-					cache.writePagePacket(feStartPage, smallBuf, 0, LEN_PAGE_PTR);
+					Convert.toByteArray(0, this.smallBuf, 0, this.LEN_PAGE_PTR);
+					this.cache.writePagePacket(this.feStartPage, this.smallBuf, 0, this.LEN_PAGE_PTR);
 
 					// loop to read the rest of the pages and 'free' them
-					int next_page = Convert.toInt(lastPageData, lastLen - LEN_PAGE_PTR, LEN_PAGE_PTR);
+					var next_page = Convert.toInt(this.lastPageData, this.lastLen - this.LEN_PAGE_PTR,
+							this.LEN_PAGE_PTR);
 
 					while (next_page != 0) {
 
 						// free the page
-						readBitMap();
-						freePage(next_page);
-						writeBitMap();
+						this.readBitMap();
+						this.freePage(next_page);
+						this.writeBitMap();
 
 						// read the file page
-						lastLen = cache.readPagePacket(next_page, lastPageData, 0);
+						this.lastLen = this.cache.readPagePacket(next_page, this.lastPageData, 0);
 
 						// get the next page pointer
-						next_page = Convert.toInt(lastPageData, lastLen - LEN_PAGE_PTR, LEN_PAGE_PTR);
+						next_page = Convert.toInt(this.lastPageData, this.lastLen - this.LEN_PAGE_PTR,
+								this.LEN_PAGE_PTR);
 					}
 
 					// update the directory entry to free the pages
-					feNumPages = 1;
-					lastLen = cache.readPagePacket(fePage, lastPageData, 0);
+					this.feNumPages = 1;
+					this.lastLen = this.cache.readPagePacket(this.fePage, this.lastPageData, 0);
 
-					Convert.toByteArray(feNumPages, lastPageData, feOffset + LEN_FILENAME + LEN_PAGE_PTR, LEN_PAGE_PTR);
-					cache.writePagePacket(fePage, lastPageData, 0, lastLen);
+					Convert.toByteArray(this.feNumPages, this.lastPageData,
+							this.feOffset + LEN_FILENAME + this.LEN_PAGE_PTR, this.LEN_PAGE_PTR);
+					this.cache.writePagePacket(this.fePage, this.lastPageData, 0, this.lastLen);
 
 					// set the lastPage pointer to the current page
-					lastPage = feStartPage;
+					this.lastPage = this.feStartPage;
 				} catch (OneWireException e) {
 					throw new OWFileNotFoundException(e.toString());
 				}
@@ -789,218 +809,239 @@ protected void create(boolean append, boolean isDirectory, boolean makeParents,
 	protected void format() throws OneWireException, OneWireIOException {
 		int i, j, len, next_page, cnt, cdcnt = 0, device_map_pages, dm_bytes = 0;
 
-		synchronized (cache) {
+		synchronized (this.cache) {
 			// clear last page read flag in the cache
-			cache.clearLastPageRead();
+			this.cache.clearLastPageRead();
 
 			// check for device with no memory
-			if (totalPages == 0)
+			if (this.totalPages == 0) {
 				throw new OneWireException("1-Wire Filesystem does not have memory");
+			}
 
-			for (i = 0; i < feData.length; i++)
-				feData[i] = 0;
+			for (i = 0; i < this.feData.length; i++) {
+				this.feData[i] = 0;
+			}
 
 			// create the directory page
 			// Directory Marker 'DM'
-			feData[cdcnt] = (LEN_PAGE_PTR == 1) ? (byte) 0x0A : (byte) 0x0B;
-			feData[cdcnt++] |= (owd.length == 1) ? (byte) 0xA0 : 0xB0;
+			this.feData[cdcnt] = this.LEN_PAGE_PTR == 1 ? (byte) 0x0A : (byte) 0x0B;
+			this.feData[cdcnt++] |= this.owd.length == 1 ? (byte) 0xA0 : 0xB0;
 
 			// Map Address 'MA', skip for now
-			cdcnt += LEN_PAGE_PTR;
+			cdcnt += this.LEN_PAGE_PTR;
 
 			// decide what type of bitmap we will have
-			if (cache.handlePageBitmap()) {
-				bitmapType = BM_CACHE;
-				feData[cdcnt++] = 0;
+			if (this.cache.handlePageBitmap()) {
+				this.bitmapType = BM_CACHE;
+				this.feData[cdcnt++] = 0;
 
-				Convert.toByteArray(cache.getBitMapPageNumber(), feData, cdcnt, LEN_PAGE_PTR);
-				cdcnt += LEN_PAGE_PTR;
-				Convert.toByteArray(cache.getBitMapNumberOfPages(), feData, cdcnt, LEN_PAGE_PTR);
+				Convert.toByteArray(this.cache.getBitMapPageNumber(), this.feData, cdcnt, this.LEN_PAGE_PTR);
+				cdcnt += this.LEN_PAGE_PTR;
+				Convert.toByteArray(this.cache.getBitMapNumberOfPages(), this.feData, cdcnt, this.LEN_PAGE_PTR);
 			}
 			// regular bitmap
 			else {
 				// check for Device Map file
-				if (owd.length > 1) {
+				if (this.owd.length > 1) {
 					// calculate the number of pages need so leave space
-					dm_bytes = (owd.length - 1) * 8;
-					device_map_pages = dm_bytes / (maxDataLen - LEN_PAGE_PTR);
-					if ((dm_bytes % (maxDataLen - LEN_PAGE_PTR)) > 0)
+					dm_bytes = (this.owd.length - 1) * 8;
+					device_map_pages = dm_bytes / (this.maxDataLen - this.LEN_PAGE_PTR);
+					if (dm_bytes % (this.maxDataLen - this.LEN_PAGE_PTR) > 0) {
 						device_map_pages++;
-				} else
+					}
+				} else {
 					device_map_pages = 0;
+				}
 
 				// local
-				if (totalPages <= 32) {
-					bitmapType = BM_LOCAL;
+				if (this.totalPages <= 32) {
+					this.bitmapType = BM_LOCAL;
 
 					// make PageBitMap max size of first page of directory
-					pbm = new byte[maxDataLen];
-					pbmByteOffset = 3;
-					pbmBitOffset = 0;
+					this.pbm = new byte[this.maxDataLen];
+					this.pbmByteOffset = 3;
+					this.pbmBitOffset = 0;
 					// 'BC'
-					feData[cdcnt++] = (owd.length > 1) ? (byte) 0x82 : (byte) 0x80;
+					this.feData[cdcnt++] = this.owd.length > 1 ? (byte) 0x82 : (byte) 0x80;
 
 					// check if this will fit on the ROOT device
-					if (device_map_pages >= rootTotalPages)
+					if (device_map_pages >= this.rootTotalPages) {
 						throw new OneWireException(
 								"ROOT 1-Wire device does not have memory to support this many SATELLITE devices");
+					}
 
 					// set local page bitmap
-					for (i = 0; i <= device_map_pages; i++)
-						Bit.arrayWriteBit(PAGE_USED, i, cdcnt, feData);
+					for (i = 0; i <= device_map_pages; i++) {
+						Bit.arrayWriteBit(PAGE_USED, i, cdcnt, this.feData);
+					}
 
 					// put dummy directory on each SATELLITE device
-					if (owd.length > 1) {
+					if (this.owd.length > 1) {
 						// create the dummy directory
-						tempPage[0] = feData[0];
-						tempPage[LEN_PAGE_PTR] = 0;
-						tempPage[1] = (byte) 0x01;
-						tempPage[LEN_PAGE_PTR + 1] = (byte) 0x80;
-						for (j = 2; j <= 5; j++)
-							tempPage[LEN_PAGE_PTR + j] = (byte) 0xFF;
-						for (j = 6; j <= 7; j++)
-							tempPage[LEN_PAGE_PTR + j] = (byte) 0x00;
+						this.tempPage[0] = this.feData[0];
+						this.tempPage[this.LEN_PAGE_PTR] = 0;
+						this.tempPage[1] = (byte) 0x01;
+						this.tempPage[this.LEN_PAGE_PTR + 1] = (byte) 0x80;
+						for (j = 2; j <= 5; j++) {
+							this.tempPage[this.LEN_PAGE_PTR + j] = (byte) 0xFF;
+						}
+						for (j = 6; j <= 7; j++) {
+							this.tempPage[this.LEN_PAGE_PTR + j] = (byte) 0x00;
+						}
 
 						// create link back to the MASTER
-						System.arraycopy(owd[0].getAddress(), 0, smallBuf, 0, 8);
-						smallBuf[8] = 0;
-						smallBuf[9] = 0;
+						System.arraycopy(this.owd[0].getAddress(), 0, this.smallBuf, 0, 8);
+						this.smallBuf[8] = 0;
+						this.smallBuf[9] = 0;
 
 						// write dummy directory on each SATELLITE device and mark in bitmap
-						for (i = 1; i < owd.length; i++) {
+						for (i = 1; i < this.owd.length; i++) {
 							// dummy directory
-							cache.writePagePacket(cache.getPageOffsetForDevice(i), tempPage, 0, LEN_PAGE_PTR * 2 + 6);
-							Bit.arrayWriteBit(PAGE_USED, cache.getPageOffsetForDevice(i), cdcnt, feData);
+							this.cache.writePagePacket(this.cache.getPageOffsetForDevice(i), this.tempPage, 0,
+									this.LEN_PAGE_PTR * 2 + 6);
+							Bit.arrayWriteBit(PAGE_USED, this.cache.getPageOffsetForDevice(i), cdcnt, this.feData);
 
 							// MASTER device map link
-							cache.writePagePacket(cache.getPageOffsetForDevice(i) + 1, smallBuf, 0, LEN_PAGE_PTR + 8);
-							Bit.arrayWriteBit(PAGE_USED, cache.getPageOffsetForDevice(i) + 1, cdcnt, feData);
+							this.cache.writePagePacket(this.cache.getPageOffsetForDevice(i) + 1, this.smallBuf, 0,
+									this.LEN_PAGE_PTR + 8);
+							Bit.arrayWriteBit(PAGE_USED, this.cache.getPageOffsetForDevice(i) + 1, cdcnt, this.feData);
 						}
 					}
 				}
 				// file
 				else {
-					bitmapType = BM_FILE;
-					pbmByteOffset = 0;
-					pbmBitOffset = 0;
+					this.bitmapType = BM_FILE;
+					this.pbmByteOffset = 0;
+					this.pbmBitOffset = 0;
 
 					// calculate the number of bitmap pages needed
-					int pbm_bytes = (totalPages / 8);
-					int pgs = pbm_bytes / (maxDataLen - LEN_PAGE_PTR);
+					var pbm_bytes = this.totalPages / 8;
+					var pgs = pbm_bytes / (this.maxDataLen - this.LEN_PAGE_PTR);
 
-					if ((pbm_bytes % (maxDataLen - LEN_PAGE_PTR)) > 0)
+					if (pbm_bytes % (this.maxDataLen - this.LEN_PAGE_PTR) > 0) {
 						pgs++;
+					}
 
 					// check if this will fit on the ROOT device
-					if ((device_map_pages + pgs) >= rootTotalPages)
+					if (device_map_pages + pgs >= this.rootTotalPages) {
 						throw new OneWireException(
 								"ROOT 1-Wire device does not have memory to support this many SATELLITE devices");
+					}
 
 					// 'BC' set the page number of the bitmap file
-					feData[cdcnt++] = (owd.length > 1) ? (byte) 0x02 : (byte) 0x00;
+					this.feData[cdcnt++] = this.owd.length > 1 ? (byte) 0x02 : (byte) 0x00;
 
 					// page address and number of pages for bitmap file
-					if (LEN_PAGE_PTR == 1) {
-						feData[cdcnt++] = 0;
-						feData[cdcnt++] = 0;
+					if (this.LEN_PAGE_PTR == 1) {
+						this.feData[cdcnt++] = 0;
+						this.feData[cdcnt++] = 0;
 					}
-					Convert.toByteArray(device_map_pages + 1, feData, cdcnt, LEN_PAGE_PTR);
-					cdcnt += LEN_PAGE_PTR;
-					Convert.toByteArray(pgs, feData, cdcnt, LEN_PAGE_PTR);
+					Convert.toByteArray(device_map_pages + 1, this.feData, cdcnt, this.LEN_PAGE_PTR);
+					cdcnt += this.LEN_PAGE_PTR;
+					Convert.toByteArray(pgs, this.feData, cdcnt, this.LEN_PAGE_PTR);
 
 					// clear the bitmap
-					for (i = 0; i < pbm.length; i++)
-						pbm[i] = 0;
+					for (i = 0; i < this.pbm.length; i++) {
+						this.pbm[i] = 0;
+					}
 
 					// set the pages used by the directory and bitmap file and device map
-					for (i = 0; i <= (pgs + device_map_pages); i++)
-						Bit.arrayWriteBit(PAGE_USED, pbmBitOffset + i, pbmByteOffset, pbm);
+					for (i = 0; i <= pgs + device_map_pages; i++) {
+						Bit.arrayWriteBit(PAGE_USED, this.pbmBitOffset + i, this.pbmByteOffset, this.pbm);
+					}
 
 					// put dummy directory on each SATELLITE device
-					if (owd.length > 1) {
+					if (this.owd.length > 1) {
 						// create the dummy directory
-						tempPage[0] = feData[0];
-						tempPage[LEN_PAGE_PTR] = 0;
-						tempPage[1] = (byte) 0x01;
-						tempPage[LEN_PAGE_PTR + 1] = (byte) 0x80;
-						for (j = 2; j <= 5; j++)
-							tempPage[LEN_PAGE_PTR + j] = (byte) 0xFF;
-						for (j = 6; j <= 7; j++)
-							tempPage[LEN_PAGE_PTR + j] = (byte) 0x00;
+						this.tempPage[0] = this.feData[0];
+						this.tempPage[this.LEN_PAGE_PTR] = 0;
+						this.tempPage[1] = (byte) 0x01;
+						this.tempPage[this.LEN_PAGE_PTR + 1] = (byte) 0x80;
+						for (j = 2; j <= 5; j++) {
+							this.tempPage[this.LEN_PAGE_PTR + j] = (byte) 0xFF;
+						}
+						for (j = 6; j <= 7; j++) {
+							this.tempPage[this.LEN_PAGE_PTR + j] = (byte) 0x00;
+						}
 
 						// create link back to the MASTER
-						System.arraycopy(owd[0].getAddress(), 0, smallBuf, 0, 8);
-						smallBuf[8] = 0;
-						smallBuf[9] = 0;
+						System.arraycopy(this.owd[0].getAddress(), 0, this.smallBuf, 0, 8);
+						this.smallBuf[8] = 0;
+						this.smallBuf[9] = 0;
 
 						// write dummy directory on each SATELLITE device and mark in bitmap
-						for (i = 1; i < owd.length; i++) {
+						for (i = 1; i < this.owd.length; i++) {
 							// dummy directory
-							cache.writePagePacket(cache.getPageOffsetForDevice(i), tempPage, 0, LEN_PAGE_PTR * 2 + 6);
-							Bit.arrayWriteBit(PAGE_USED, pbmBitOffset + cache.getPageOffsetForDevice(i), pbmByteOffset,
-									pbm);
+							this.cache.writePagePacket(this.cache.getPageOffsetForDevice(i), this.tempPage, 0,
+									this.LEN_PAGE_PTR * 2 + 6);
+							Bit.arrayWriteBit(PAGE_USED, this.pbmBitOffset + this.cache.getPageOffsetForDevice(i),
+									this.pbmByteOffset, this.pbm);
 
 							// MASTER device map link
-							cache.writePagePacket(cache.getPageOffsetForDevice(i) + 1, smallBuf, 0, LEN_PAGE_PTR + 8);
-							Bit.arrayWriteBit(PAGE_USED, pbmBitOffset + cache.getPageOffsetForDevice(i) + 1,
-									pbmByteOffset, pbm);
+							this.cache.writePagePacket(this.cache.getPageOffsetForDevice(i) + 1, this.smallBuf, 0,
+									this.LEN_PAGE_PTR + 8);
+							Bit.arrayWriteBit(PAGE_USED, this.pbmBitOffset + this.cache.getPageOffsetForDevice(i) + 1,
+									this.pbmByteOffset, this.pbm);
 						}
 					}
 
 					// write the bitmap file
 					cnt = 0;
-					for (i = device_map_pages + 1; i <= (pgs + device_map_pages); i++) {
+					for (i = device_map_pages + 1; i <= pgs + device_map_pages; i++) {
 						// calculate length to write for this page
-						if ((pbm_bytes - cnt) > (maxDataLen - LEN_PAGE_PTR))
-							len = maxDataLen - LEN_PAGE_PTR;
-						else
+						if (pbm_bytes - cnt > this.maxDataLen - this.LEN_PAGE_PTR) {
+							len = this.maxDataLen - this.LEN_PAGE_PTR;
+						} else {
 							len = pbm_bytes - cnt;
+						}
 
 						// copy bitmap data to temp
-						System.arraycopy(pbm, pbmByteOffset + cnt, tempPage, 0, len);
+						System.arraycopy(this.pbm, this.pbmByteOffset + cnt, this.tempPage, 0, len);
 
 						// set the next page marker
-						next_page = (i == (pgs + device_map_pages)) ? 0 : (i + 1);
+						next_page = i == pgs + device_map_pages ? 0 : i + 1;
 
-						Convert.toByteArray(next_page, tempPage, len, LEN_PAGE_PTR);
+						Convert.toByteArray(next_page, this.tempPage, len, this.LEN_PAGE_PTR);
 
 						// write the page
-						cache.writePagePacket(i, tempPage, 0, len + LEN_PAGE_PTR);
+						this.cache.writePagePacket(i, this.tempPage, 0, len + this.LEN_PAGE_PTR);
 
 						cnt += len;
 					}
 				}
 
 				// write Device Map file
-				if (owd.length > 1) {
+				if (this.owd.length > 1) {
 					// set the start page 'MA'
-					Convert.toByteArray(1, feData, 1, LEN_PAGE_PTR);
+					Convert.toByteArray(1, this.feData, 1, this.LEN_PAGE_PTR);
 
 					// bitmap already taken care of, just put right after directory
 					// create the device map data to write
-					byte[] dmf = new byte[dm_bytes];
-					for (i = 1; i < owd.length; i++)
-						System.arraycopy(owd[i].getAddress(), 0, dmf, (i - 1) * 8, 8);
+					var dmf = new byte[dm_bytes];
+					for (i = 1; i < this.owd.length; i++) {
+						System.arraycopy(this.owd[i].getAddress(), 0, dmf, (i - 1) * 8, 8);
+					}
 
 					// write the pages
 					cnt = 0;
 					for (i = 1; i <= device_map_pages; i++) {
 						// calculate length to write for this page
-						if ((dm_bytes - cnt) > (maxDataLen - LEN_PAGE_PTR))
-							len = maxDataLen - LEN_PAGE_PTR;
-						else
+						if (dm_bytes - cnt > this.maxDataLen - this.LEN_PAGE_PTR) {
+							len = this.maxDataLen - this.LEN_PAGE_PTR;
+						} else {
 							len = dm_bytes - cnt;
+						}
 
 						// copy bitmap data to temp
-						System.arraycopy(dmf, cnt, tempPage, 0, len);
+						System.arraycopy(dmf, cnt, this.tempPage, 0, len);
 
 						// set the next page marker
-						next_page = (i == device_map_pages) ? 0 : (i + 1);
+						next_page = i == device_map_pages ? 0 : i + 1;
 
-						Convert.toByteArray(next_page, tempPage, len, LEN_PAGE_PTR);
+						Convert.toByteArray(next_page, this.tempPage, len, this.LEN_PAGE_PTR);
 
 						// write the page
-						cache.writePagePacket(i, tempPage, 0, len + LEN_PAGE_PTR);
+						this.cache.writePagePacket(i, this.tempPage, 0, len + this.LEN_PAGE_PTR);
 
 						cnt += len;
 					}
@@ -1008,14 +1049,15 @@ protected void format() throws OneWireException, OneWireIOException {
 			}
 
 			// write the directory page
-			cache.writePagePacket(0, feData, 0, LEN_CONTROL_DATA + LEN_PAGE_PTR);
+			this.cache.writePagePacket(0, this.feData, 0, this.LEN_CONTROL_DATA + this.LEN_PAGE_PTR);
 
 			// update bitmap if implemented in cache
-			if (cache.handlePageBitmap())
-				markPageUsed(0);
+			if (this.cache.handlePageBitmap()) {
+				this.markPageUsed(0);
+			}
 
-			fePage = 0;
-			feLen = LEN_CONTROL_DATA + LEN_PAGE_PTR;
+			this.fePage = 0;
+			this.feLen = this.LEN_CONTROL_DATA + this.LEN_PAGE_PTR;
 		}
 	}
 
@@ -1037,68 +1079,74 @@ protected void format() throws OneWireException, OneWireIOException {
 	protected int read(byte b[], int off, int len) throws IOException {
 		int read_count = 0, page_data_read, next_page = 0;
 
-		synchronized (cache) {
+		synchronized (this.cache) {
 			// \\//\\//\\//\\//\\//\\//\\//
-			if (doDebugMessages)
+			if (doDebugMessages) {
 				System.out.println("===read(byte[],int,int)  with len " + len);
+			}
 
 			// clear last page read flag in the cache
-			cache.clearLastPageRead();
+			this.cache.clearLastPageRead();
 
 			// check for no pages read
-			if (lastPage == -1) {
+			if (this.lastPage == -1) {
 				// \\//\\//\\//\\//\\//\\//\\//
-				if (doDebugMessages)
+				if (doDebugMessages) {
 					System.out.println("=first read");
+				}
 
-				lastPage = feStartPage;
-				lastOffset = 0;
-				filePosition = 0;
+				this.lastPage = this.feStartPage;
+				this.lastOffset = 0;
+				this.filePosition = 0;
 
 				// read the lastPage into the lastPageData buffer
-				fetchPage();
+				this.fetchPage();
 			}
 
 			// loop to read pages needed or end of file found
 			do {
 
 				// check if need to fetch another page
-				if ((lastOffset + LEN_PAGE_PTR) >= lastLen) {
+				if (this.lastOffset + this.LEN_PAGE_PTR >= this.lastLen) {
 
 					// any more pages?
-					next_page = Convert.toInt(lastPageData, lastLen - LEN_PAGE_PTR, LEN_PAGE_PTR);
+					next_page = Convert.toInt(this.lastPageData, this.lastLen - this.LEN_PAGE_PTR, this.LEN_PAGE_PTR);
 
-					if (next_page == 0)
+					if (next_page == 0) {
 						break;
+					}
 
 					// get the next page
-					lastPage = next_page;
+					this.lastPage = next_page;
 
-					fetchPage();
+					this.fetchPage();
 				}
 
 				// calculate the data available/needed to read from this page
-				if (len >= (lastLen - lastOffset - LEN_PAGE_PTR))
-					page_data_read = (lastLen - lastOffset - LEN_PAGE_PTR);
-				else
+				if (len >= this.lastLen - this.lastOffset - this.LEN_PAGE_PTR) {
+					page_data_read = this.lastLen - this.lastOffset - this.LEN_PAGE_PTR;
+				} else {
 					page_data_read = len;
+				}
 
 				// get the data from the page (if buffer not null)
-				if (b != null)
-					System.arraycopy(lastPageData, lastOffset, b, off, page_data_read);
+				if (b != null) {
+					System.arraycopy(this.lastPageData, this.lastOffset, b, off, page_data_read);
+				}
 
 				// adjust counters
 				read_count += page_data_read;
 				off += page_data_read;
 				len -= page_data_read;
-				lastOffset += page_data_read;
-				filePosition += page_data_read;
-				next_page = Convert.toInt(lastPageData, lastLen - LEN_PAGE_PTR, LEN_PAGE_PTR);
-			} while ((len != 0) && (next_page != 0));
+				this.lastOffset += page_data_read;
+				this.filePosition += page_data_read;
+				next_page = Convert.toInt(this.lastPageData, this.lastLen - this.LEN_PAGE_PTR, this.LEN_PAGE_PTR);
+			} while (len != 0 && next_page != 0);
 
 			// check for end of file
-			if ((read_count == 0) && (len != 0))
+			if (read_count == 0 && len != 0) {
 				return -1;
+			}
 
 			// return number of bytes read
 			return read_count;
@@ -1114,17 +1162,18 @@ protected int read(byte b[], int off, int len) throws IOException {
 	 * @exception IOException if an I/O error occurs.
 	 */
 	protected int read() throws IOException {
-		synchronized (cache) {
+		synchronized (this.cache) {
 			// \\//\\//\\//\\//\\//\\//\\//
-			if (doDebugMessages)
+			if (doDebugMessages) {
 				System.out.println("===read()");
+			}
 
-			int len = read(smallBuf, 0, 1);
+			var len = this.read(this.smallBuf, 0, 1);
 
-			if (len == 1)
-				return (int) (smallBuf[0] & 0x00FF);
-			else
-				return -1;
+			if (len == 1) {
+				return this.smallBuf[0] & 0x00FF;
+			}
+			return -1;
 		}
 	}
 
@@ -1139,12 +1188,13 @@ protected int read() throws IOException {
 	 * @exception IOException if an I/O error occurs.
 	 */
 	protected long skip(long n) throws IOException {
-		synchronized (cache) {
+		synchronized (this.cache) {
 			// \\//\\//\\//\\//\\//\\//\\//
-			if (doDebugMessages)
+			if (doDebugMessages) {
 				System.out.println("===skip " + n);
+			}
 
-			return read(null, 0, (int) n);
+			return this.read(null, 0, (int) n);
 		}
 	}
 
@@ -1157,12 +1207,12 @@ protected long skip(long n) throws IOException {
 	 * @exception IOException if an I/O error occurs.
 	 */
 	protected int available() throws IOException {
-		synchronized (cache) {
+		synchronized (this.cache) {
 			// check for no pages read
-			if (lastPage == -1)
+			if (this.lastPage == -1) {
 				return 0;
-			else
-				return (lastLen - lastOffset - 1);
+			}
+			return this.lastLen - this.lastOffset - 1;
 		}
 	}
 
@@ -1178,14 +1228,15 @@ protected int available() throws IOException {
 	 * @exception IOException if an I/O error occurs.
 	 */
 	protected void write(int b) throws IOException {
-		synchronized (cache) {
+		synchronized (this.cache) {
 			// \\//\\//\\//\\//\\//\\//\\//
-			if (doDebugMessages)
+			if (doDebugMessages) {
 				System.out.println("===write(int) " + b);
+			}
 
-			smallBuf[0] = (byte) b;
+			this.smallBuf[0] = (byte) b;
 
-			write(smallBuf, 0, 1);
+			this.write(this.smallBuf, 0, 1);
 		}
 	}
 
@@ -1199,61 +1250,65 @@ protected void write(int b) throws IOException {
 	 * @exception IOException if an I/O error occurs.
 	 */
 	protected void write(byte b[], int off, int len) throws IOException {
-		synchronized (cache) {
+		synchronized (this.cache) {
 			// \\//\\//\\//\\//\\//\\//\\//
 			if (doDebugMessages) {
 				System.out.print("===write(byte[],int,int) with data (" + len + ") :");
-				debugDump(b, off, len);
+				this.debugDump(b, off, len);
 			}
 
 			// check for something to do
-			if (len == 0)
+			if (len == 0) {
 				return;
+			}
 
 			// clear last page read flag in the cache
-			cache.clearLastPageRead();
+			this.cache.clearLastPageRead();
 
 			// check for no pages read
-			if (lastPage == -1) {
+			if (this.lastPage == -1) {
 				// \\//\\//\\//\\//\\//\\//\\//
-				if (doDebugMessages)
+				if (doDebugMessages) {
 					System.out.println("=first write");
+				}
 
-				lastPage = feStartPage;
-				lastOffset = 0;
-				filePosition = 0;
+				this.lastPage = this.feStartPage;
+				this.lastOffset = 0;
+				this.filePosition = 0;
 			}
 
 			try {
 				// read the last page
-				lastLen = cache.readPagePacket(lastPage, lastPageData, 0);
+				this.lastLen = this.cache.readPagePacket(this.lastPage, this.lastPageData, 0);
 
 				// \\//\\//\\//\\//\\//\\//\\//
-				if (doDebugMessages)
-					System.out.println("===write, readpagePacket " + lastPage + " got len " + lastLen);
+				if (doDebugMessages) {
+					System.out.println("===write, readpagePacket " + this.lastPage + " got len " + this.lastLen);
+				}
 
 				int write_len;
 
 				do {
 
 					// check if room to write
-					if (lastLen >= maxDataLen) {
+					if (this.lastLen >= this.maxDataLen) {
 
 						// \\//\\//\\//\\//\\//\\//\\//
-						if (doDebugMessages)
+						if (doDebugMessages) {
 							System.out.print("=Need new page");
+						}
 
 						// get another page to write
 						// get the pagebitmap
-						readBitMap();
+						this.readBitMap();
 
 						// get the next available page
-						int new_page = getFirstFreePage(false);
+						var new_page = this.getFirstFreePage(false);
 
 						// verify got a free page
 						if (new_page < 0) {
 							try {
-								sync();
+								this.sync();
 							} catch (OWSyncFailedException e) {
 								// DRAIN
 							}
@@ -1262,58 +1317,61 @@ protected void write(byte b[], int off, int len) throws IOException {
 						}
 
 						// mark page used
-						markPageUsed(new_page);
+						this.markPageUsed(new_page);
 
 						// put blank data page in new page
-						Convert.toByteArray(0, tempPage, 0, LEN_PAGE_PTR);
-						cache.writePagePacket(new_page, tempPage, 0, LEN_PAGE_PTR);
+						Convert.toByteArray(0, this.tempPage, 0, this.LEN_PAGE_PTR);
+						this.cache.writePagePacket(new_page, this.tempPage, 0, this.LEN_PAGE_PTR);
 
 						// change next page pointer in last page
-						Convert.toByteArray(new_page, lastPageData, lastLen - LEN_PAGE_PTR, LEN_PAGE_PTR);
+						Convert.toByteArray(new_page, this.lastPageData, this.lastLen - this.LEN_PAGE_PTR,
+								this.LEN_PAGE_PTR);
 
 						// put data page back in place with new next page pointer
-						cache.writePagePacket(lastPage, lastPageData, 0, lastLen);
+						this.cache.writePagePacket(this.lastPage, this.lastPageData, 0, this.lastLen);
 
 						// write the page bitmap
-						writeBitMap();
+						this.writeBitMap();
 
 						// update the directory entry to include this new page
-						lastLen = cache.readPagePacket(fePage, lastPageData, 0);
+						this.lastLen = this.cache.readPagePacket(this.fePage, this.lastPageData, 0);
 
-						Convert.toByteArray(++feNumPages, lastPageData, feOffset + LEN_FILENAME + LEN_PAGE_PTR,
-								LEN_PAGE_PTR);
-						cache.writePagePacket(fePage, lastPageData, 0, lastLen);
+						Convert.toByteArray(++this.feNumPages, this.lastPageData,
+								this.feOffset + LEN_FILENAME + this.LEN_PAGE_PTR, this.LEN_PAGE_PTR);
+						this.cache.writePagePacket(this.fePage, this.lastPageData, 0, this.lastLen);
 
 						// make 'lastPage' the new empty page
-						lastPageData[0] = 0;
-						lastPage = new_page;
-						lastLen = LEN_PAGE_PTR;
+						this.lastPageData[0] = 0;
+						this.lastPage = new_page;
+						this.lastLen = this.LEN_PAGE_PTR;
 					}
 
 					// calculate how much of the data can write to lastPage
-					if (len > (maxDataLen - lastLen))
-						write_len = maxDataLen - lastLen;
-					else
+					if (len > this.maxDataLen - this.lastLen) {
+						write_len = this.maxDataLen - this.lastLen;
+					} else {
 						write_len = len;
+					}
 
 					// \\//\\//\\//\\//\\//\\//\\//
-					if (doDebugMessages)
-						System.out.println("===write, len " + len + " maxDataLen " + maxDataLen + " lastLen " + lastLen
-								+ " write_len " + write_len + " off " + off);
+					if (doDebugMessages) {
+						System.out.println("===write, len " + len + " maxDataLen " + this.maxDataLen + " lastLen "
+								+ this.lastLen + " write_len " + write_len + " off " + off);
+					}
 
 					// copy the data
-					System.arraycopy(b, off, lastPageData, lastLen - LEN_PAGE_PTR, write_len);
+					System.arraycopy(b, off, this.lastPageData, this.lastLen - this.LEN_PAGE_PTR, write_len);
 
 					// update the counters
 					len -= write_len;
 					off += write_len;
-					lastLen += write_len;
+					this.lastLen += write_len;
 
 					// set the next page pointer to end of file marker '0'
-					Convert.toByteArray(0, lastPageData, lastLen - LEN_PAGE_PTR, LEN_PAGE_PTR);
+					Convert.toByteArray(0, this.lastPageData, this.lastLen - this.LEN_PAGE_PTR, this.LEN_PAGE_PTR);
 
 					// write the data
-					cache.writePagePacket(lastPage, lastPageData, 0, lastLen);
+					this.cache.writePagePacket(this.lastPage, this.lastPageData, 0, this.lastLen);
 				} while (len > 0);
 			} catch (OneWireException e) {
 				throw new IOException(e.toString());
@@ -1334,12 +1392,13 @@ protected void write(byte b[], int off, int len) throws IOException {
 	 *         or the empty string if this pathname's name sequence is empty
 	 */
 	protected String getName() {
-		synchronized (cache) {
+		synchronized (this.cache) {
 			// \\//\\//\\//\\//\\//\\//\\//
-			if (doDebugMessages)
+			if (doDebugMessages) {
 				System.out.println("===getName()");
+			}
 
-			return pathToString(path, path.size() - 1, path.size(), true);
+			return this.pathToString(this.path, this.path.size() - 1, this.path.size(), true);
 		}
 	}
 
@@ -1358,18 +1417,20 @@ protected String getName() {
 	 *         parent
 	 */
 	protected String getParent() {
-		synchronized (cache) {
+		synchronized (this.cache) {
 			// \\//\\//\\//\\//\\//\\//\\//
-			if (doDebugMessages)
-				System.out.println("===getParent(), path is null=" + (path == null));
+			if (doDebugMessages) {
+				System.out.println("===getParent(), path is null=" + (this.path == null));
+			}
 
-			if (path == null)
+			if (this.path == null) {
 				throw new NullPointerException("path is not valid");
+			}
 
-			if (path.size() >= 1)
-				return pathToString(path, 0, path.size() - 1, false);
-			else
-				return null;
+			if (this.path.size() >= 1) {
+				return this.pathToString(this.path, 0, this.path.size() - 1, false);
+			}
+			return null;
 		}
 	}
 
@@ -1381,15 +1442,17 @@ protected String getParent() {
 	 * @return The string form of this abstract pathname
 	 */
 	protected String getPath() {
-		synchronized (cache) {
+		synchronized (this.cache) {
 			// \\//\\//\\//\\//\\//\\//\\//
-			if (doDebugMessages)
-				System.out.println("===getPath(), path is null=" + (path == null));
+			if (doDebugMessages) {
+				System.out.println("===getPath(), path is null=" + (this.path == null));
+			}
 
-			if (path == null)
+			if (this.path == null) {
 				throw new NullPointerException("path is not valid");
+			}
 
-			return pathToString(verbosePath, 0, verbosePath.size(), false);
+			return this.pathToString(this.verbosePath, 0, this.verbosePath.size(), false);
 		}
 	}
 
@@ -1399,20 +1462,21 @@ protected String getPath() {
 	 * @return true if the file exists and false otherwise
 	 */
 	protected boolean exists() {
-		synchronized (cache) {
+		synchronized (this.cache) {
 			// \\//\\//\\//\\//\\//\\//\\//
-			if (doDebugMessages)
+			if (doDebugMessages) {
 				System.out.println("===exists()");
+			}
 
 			// clear last page read flag in the cache
-			cache.clearLastPageRead();
+			this.cache.clearLastPageRead();
 
 			// check if this is the root
-			if (path != null && path.size() == 0) {
+			if (this.path != null && this.path.size() == 0) {
 				// force a check of the Filesystem if never been read
-				if (pbmStartPage == -1) {
+				if (this.pbmStartPage == -1) {
 					try {
-						readBitMap();
+						this.readBitMap();
 					} catch (OneWireException e) {
 						return false;
 					}
@@ -1423,7 +1487,7 @@ protected boolean exists() {
 
 			// attempt to open the file/directory
 			try {
-				open();
+				this.open();
 
 				return true;
 			} catch (OWFileNotFoundException e) {
@@ -1438,12 +1502,13 @@ protected boolean exists() {
 	 * @return true if this file exists, false otherwise
 	 */
 	protected boolean canRead() {
-		synchronized (cache) {
+		synchronized (this.cache) {
 			// \\//\\//\\//\\//\\//\\//\\//
-			if (doDebugMessages)
+			if (doDebugMessages) {
 				System.out.println("===canRead()");
+			}
 
-			return exists();
+			return this.exists();
 		}
 	}
 
@@ -1453,18 +1518,20 @@ protected boolean canRead() {
 	 * @return true if this file exists and is not read only, false otherwise
 	 */
 	protected boolean canWrite() {
-		synchronized (cache) {
+		synchronized (this.cache) {
 			// \\//\\//\\//\\//\\//\\//\\//
-			if (doDebugMessages)
+			if (doDebugMessages) {
 				System.out.println("===canWrite()");
+			}
 
-			if (exists()) {
-				if (isFile())
-					return ((feData[feOffset + LEN_FILENAME - 1] & 0x80) == 0);
-				else
-					return true;
-			} else
+			if (!this.exists()) {
 				return false;
+			}
+			if (this.isFile()) {
+				return (this.feData[this.feOffset + LEN_FILENAME - 1] & 0x80) == 0;
+			} else {
+				return true;
+			}
 		}
 	}
 
@@ -1474,15 +1541,16 @@ protected boolean canWrite() {
 	 * @return true if this file exists and it is a directory, false otherwise
 	 */
 	protected boolean isDirectory() {
-		synchronized (cache) {
+		synchronized (this.cache) {
 			// \\//\\//\\//\\//\\//\\//\\//
-			if (doDebugMessages)
+			if (doDebugMessages) {
 				System.out.println("===isDirectory()");
+			}
 
-			if (exists())
-				return !isFile();
-			else
-				return false;
+			if (this.exists()) {
+				return !this.isFile();
+			}
+			return false;
 		}
 	}
 
@@ -1492,19 +1560,21 @@ protected boolean isDirectory() {
 	 * @return true if this file exists and is a file, false otherwise
 	 */
 	protected boolean isFile() {
-		synchronized (cache) {
+		synchronized (this.cache) {
 			// \\//\\//\\//\\//\\//\\//\\//
-			if (doDebugMessages)
+			if (doDebugMessages) {
 				System.out.println("===isFile()");
+			}
 
 			// check if this is the root
-			if (path.size() == 0)
+			if (this.path.size() == 0) {
 				return false;
+			}
 
-			if (exists())
-				return ((feData[feOffset + LEN_FILENAME - 1] & 0x7F) != 0x7F);
-			else
-				return false;
+			if (this.exists()) {
+				return (this.feData[this.feOffset + LEN_FILENAME - 1] & 0x7F) != 0x7F;
+			}
+			return false;
 		}
 	}
 
@@ -1514,19 +1584,20 @@ protected boolean isFile() {
 	 * @return true if this is a directory and is marked as hidden, false otherwise
 	 */
 	protected boolean isHidden() {
-		synchronized (cache) {
+		synchronized (this.cache) {
 			// \\//\\//\\//\\//\\//\\//\\//
-			if (doDebugMessages)
+			if (doDebugMessages) {
 				System.out.println("===isHidden()");
+			}
 
-			if (exists()) {
+			if (this.exists()) {
 
 				// look at hidden flag in parent (if it has one)
-				if (path.size() > 0) {
-					if (isDirectory()) {
-						byte[] fl = (byte[]) path.elementAt(path.size() - 1);
+				if (this.path.size() > 0) {
+					if (this.isDirectory()) {
+						var fl = this.path.elementAt(this.path.size() - 1);
 
-						return ((fl[LEN_FILENAME - 1] & 0x80) != 0);
+						return (fl[LEN_FILENAME - 1] & 0x80) != 0;
 					}
 				}
 			}
@@ -1543,15 +1614,16 @@ protected boolean isHidden() {
 	 * @return estimated length of file in bytes
 	 */
 	protected long length() {
-		synchronized (cache) {
+		synchronized (this.cache) {
 			// \\//\\//\\//\\//\\//\\//\\//
-			if (doDebugMessages)
+			if (doDebugMessages) {
 				System.out.println("===length()");
+			}
 
-			if (exists())
-				return (feNumPages * (maxDataLen - LEN_PAGE_PTR));
-			else
-				return 0;
+			if (this.exists()) {
+				return this.feNumPages * (this.maxDataLen - this.LEN_PAGE_PTR);
+			}
+			return 0;
 		}
 	}
 
@@ -1562,81 +1634,86 @@ protected long length() {
 	 * @return true if the file/directory was successfully deleted or false if not
 	 */
 	protected boolean delete() {
-		synchronized (cache) {
+		synchronized (this.cache) {
 			// clear last page read flag in the cache
-			cache.clearLastPageRead();
+			this.cache.clearLastPageRead();
 
-			if (isFile()) {
+			if (this.isFile()) {
 
 				// \\//\\//\\//\\//\\//\\//\\//
-				if (doDebugMessages)
+				if (doDebugMessages) {
 					System.out.println("===delete() is a file");
+				}
 
 				try {
 
 					// remove the directory entry
-					System.arraycopy(feData, feOffset + LEN_FILE_ENTRY, feData, feOffset,
-							feLen - feOffset - LEN_FILE_ENTRY);
+					System.arraycopy(this.feData, this.feOffset + this.LEN_FILE_ENTRY, this.feData, this.feOffset,
+							this.feLen - this.feOffset - this.LEN_FILE_ENTRY);
 
-					feLen -= LEN_FILE_ENTRY;
+					this.feLen -= this.LEN_FILE_ENTRY;
 
-					cache.writePagePacket(fePage, feData, 0, feLen);
+					this.cache.writePagePacket(this.fePage, this.feData, 0, this.feLen);
 
 					// loop to remove all of the file pages 'free' only if not EPROM
-					if (bitmapType != BM_CACHE) {
+					if (this.bitmapType != BM_CACHE) {
 
 						// loop to read the rest of the pages and 'free' them
-						int next_page = feStartPage;
+						var next_page = this.feStartPage;
 
 						while (next_page != 0) {
 
 							// free the page
-							readBitMap();
-							freePage(next_page);
-							writeBitMap();
+							this.readBitMap();
+							this.freePage(next_page);
+							this.writeBitMap();
 
 							// read the file page
-							lastLen = cache.readPagePacket(next_page, lastPageData, 0);
+							this.lastLen = this.cache.readPagePacket(next_page, this.lastPageData, 0);
 
 							// get the next page pointer
-							next_page = Convert.toInt(lastPageData, lastLen - LEN_PAGE_PTR, LEN_PAGE_PTR);
+							next_page = Convert.toInt(this.lastPageData, this.lastLen - this.LEN_PAGE_PTR,
+									this.LEN_PAGE_PTR);
 						}
 
 						// update
-						lastPage = -1;
-						feStartPage = -1;
+						this.lastPage = -1;
+						this.feStartPage = -1;
 					}
 
 					return true;
 				} catch (OneWireException e) {
 					return false;
 				}
-			} else if (isDirectory()) {
+			}
+			if (this.isDirectory()) {
 
 				// \\//\\//\\//\\//\\//\\//\\//
-				if (doDebugMessages)
+				if (doDebugMessages) {
 					System.out.println("===delete() is a directory");
+				}
 
 				try {
 
 					// read the first page of the directory to see if empty
-					int len = cache.readPagePacket(feStartPage, tempPage, 0);
+					var len = this.cache.readPagePacket(this.feStartPage, this.tempPage, 0);
 
-					if (len != LEN_CONTROL_DATA + LEN_PAGE_PTR)
+					if (len != this.LEN_CONTROL_DATA + this.LEN_PAGE_PTR) {
 						return false;
+					}
 
 					// remove the directory entry
-					System.arraycopy(feData, feOffset + LEN_CONTROL_DATA, feData, feOffset,
-							feLen - feOffset - LEN_CONTROL_DATA);
+					System.arraycopy(this.feData, this.feOffset + this.LEN_CONTROL_DATA, this.feData, this.feOffset,
+							this.feLen - this.feOffset - this.LEN_CONTROL_DATA);
 
-					feLen -= LEN_CONTROL_DATA;
+					this.feLen -= this.LEN_CONTROL_DATA;
 
-					cache.writePagePacket(fePage, feData, 0, feLen);
+					this.cache.writePagePacket(this.fePage, this.feData, 0, this.feLen);
 
 					// free the page
-					readBitMap();
-					freePage(feStartPage);
-					writeBitMap();
+					this.readBitMap();
+					this.freePage(this.feStartPage);
+					this.writeBitMap();
 
 					return true;
 				} catch (OneWireException e) {
@@ -1645,8 +1722,9 @@ protected boolean delete() {
 			} else {
 
 				// \\//\\//\\//\\//\\//\\//\\//
-				if (doDebugMessages)
+				if (doDebugMessages) {
 					System.out.println("===delete() is neither file or directory so fail");
+				}
 
 				return false;
 			}
@@ -1675,91 +1753,101 @@ protected boolean delete() {
 	 *         pathname does not denote a directory, or if an I/O error occurs.
 	 */
 	protected String[] list() {
-		synchronized (cache) {
+		synchronized (this.cache) {
 			// \\//\\//\\//\\//\\//\\//\\//
-			if (doDebugMessages)
+			if (doDebugMessages) {
 				System.out.println("===list() string");
+			}
 
 			// clear last page read flag in the cache
-			cache.clearLastPageRead();
+			this.cache.clearLastPageRead();
 
-			if (isDirectory()) {
-				Vector<String> entries = new Vector<>(1);
+			if (!this.isDirectory()) {
 
-				try {
+				// \\//\\//\\//\\//\\//\\//\\//
+				if (doDebugMessages) {
+					System.out.println("=not a directory so no list");
+				}
 
-					// \\//\\//\\//\\//\\//\\//\\//
-					if (doDebugMessages)
-						System.out.println("=feStartPage " + feStartPage);
+				return null;
+			}
+			var entries = new Vector<String>(1);
 
-					// loop though the entries and collect string reps
-					int next_page = feStartPage;
-					StringBuffer build_buffer = new StringBuffer();
-					int offset = LEN_CONTROL_DATA, len, i, page;
+			try {
 
-					do {
-						page = next_page;
+				// \\//\\//\\//\\//\\//\\//\\//
+				if (doDebugMessages) {
+					System.out.println("=feStartPage " + this.feStartPage);
+				}
 
-						// read the page
-						len = cache.readPagePacket(page, tempPage, 0);
+				// loop though the entries and collect string reps
+				var next_page = this.feStartPage;
+				var build_buffer = new StringBuilder();
+				int offset = this.LEN_CONTROL_DATA, len, i, page;
 
-						// loop through the entries
-						for (; offset < (len - LEN_PAGE_PTR); offset += LEN_FILE_ENTRY) {
-							build_buffer.setLength(0);
+				do {
+					page = next_page;
 
-							for (i = 0; i < 4; i++) {
-								if ((byte) tempPage[offset + i] != (byte) 0x20)
-									build_buffer.append((char) tempPage[offset + i]);
-								else
-									break;
-							}
+					// read the page
+					len = this.cache.readPagePacket(page, this.tempPage, 0);
 
-							if ((byte) (tempPage[offset + 4] & 0x7F) != (byte) EXT_DIRECTORY)
-								build_buffer.append("." + Integer.toString((int) (tempPage[offset + 4] & 0x7F)));
+					// loop through the entries
+					for (; offset < len - this.LEN_PAGE_PTR; offset += this.LEN_FILE_ENTRY) {
+						build_buffer.setLength(0);
 
-							// \\//\\//\\//\\//\\//\\//\\//
-							if (doDebugMessages)
-								System.out.println("=entry= " + build_buffer.toString());
+						for (i = 0; i < 4; i++) {
+							if (this.tempPage[offset + i] != (byte) 0x20) {
+								build_buffer.append((char) this.tempPage[offset + i]);
+							} else {
+								break;
+							}
+						}
 
-							// only add if not hidden directory
-							if ((byte) tempPage[offset + 4] != (byte) 0xFF)
-								// add to the vector of strings
-								entries.addElement(build_buffer.toString());
+						if ((byte) (this.tempPage[offset + 4] & 0x7F) != EXT_DIRECTORY) {
+							build_buffer.append("." + Integer.toString(this.tempPage[offset + 4] & 0x7F));
 						}
 
-						// get next page pointer to read
-						next_page = Convert.toInt(tempPage, len - LEN_PAGE_PTR, LEN_PAGE_PTR);
-						offset = 0;
+						// \\//\\//\\//\\//\\//\\//\\//
+						if (doDebugMessages) {
+							System.out.println("=entry= " + build_buffer.toString());
+						}
 
-						// check for looping Filesystem
-						if (entries.size() > totalPages)
-							return null;
+						// only add if not hidden directory
+						if (this.tempPage[offset + 4] != (byte) 0xFF) {
+							// add to the vector of strings
+							entries.addElement(build_buffer.toString());
+						}
+					}
 
-						// \\//\\//\\//\\//\\//\\//\\//
-						if (doDebugMessages)
-							System.out.println("=next page = " + next_page);
-					} while (next_page != 0);
-				} catch (OneWireException e) {
+					// get next page pointer to read
+					next_page = Convert.toInt(this.tempPage, len - this.LEN_PAGE_PTR, this.LEN_PAGE_PTR);
+					offset = 0;
 
-					// DRAIN
-					// \\//\\//\\//\\//\\//\\//\\//
-					if (doDebugMessages)
-						System.out.println("= " + e);
-				}
+					// check for looping Filesystem
+					if (entries.size() > this.totalPages) {
+						return null;
+					}
 
-				// return the entries as an array of strings
-				String[] strs = new String[entries.size()];
-				for (int i = 0; i < strs.length; i++)
-					strs[i] = (String) entries.elementAt(i);
-				return strs;
-			} else {
+					// \\//\\//\\//\\//\\//\\//\\//
+					if (doDebugMessages) {
+						System.out.println("=next page = " + next_page);
+					}
+				} while (next_page != 0);
+			} catch (OneWireException e) {
 
+				// DRAIN
 				// \\//\\//\\//\\//\\//\\//\\//
-				if (doDebugMessages)
-					System.out.println("=not a directory so no list");
+				if (doDebugMessages) {
+					System.out.println("= " + e);
+				}
+			}
 
-				return null;
+			// return the entries as an array of strings
+			var strs = new String[entries.size()];
+			for (var i = 0; i < strs.length; i++) {
+				strs[i] = entries.elementAt(i);
 			}
+			return strs;
 		}
 	}
 
@@ -1775,32 +1863,34 @@ protected String[] list() {
 	 *                              <code>null</code>
 	 */
 	protected boolean renameTo(OWFile dest) {
-		if (dest == null)
+		if (dest == null) {
 			throw new NullPointerException("Destination file is null");
+		}
 
-		synchronized (cache) {
+		synchronized (this.cache) {
 			// make sure exists (also getting the file entry info)
-			if (!exists())
+			if (!this.exists()) {
 				return false;
+			}
 
 			try {
 				// get the file descriptor of the destination
-				OWFileDescriptor dest_fd = dest.getFD();
+				var dest_fd = dest.getFD();
 
 				// create the new entry pointing to the old file
-				dest_fd.create(false, isDirectory(), false, feStartPage, feNumPages);
+				dest_fd.create(false, this.isDirectory(), false, this.feStartPage, this.feNumPages);
 
 				// delete the old entry
-				feLen = cache.readPagePacket(fePage, feData, 0);
-				System.arraycopy(feData, feOffset + LEN_FILE_ENTRY, feData, feOffset,
-						feLen - feOffset - LEN_FILE_ENTRY);
-				feLen -= LEN_FILE_ENTRY;
-				cache.writePagePacket(fePage, feData, 0, feLen);
+				this.feLen = this.cache.readPagePacket(this.fePage, this.feData, 0);
+				System.arraycopy(this.feData, this.feOffset + this.LEN_FILE_ENTRY, this.feData, this.feOffset,
+						this.feLen - this.feOffset - this.LEN_FILE_ENTRY);
+				this.feLen -= this.LEN_FILE_ENTRY;
+				this.cache.writePagePacket(this.fePage, this.feData, 0, this.feLen);
 
 				// open this file to make sure all file entry pointers get reset
-				feStartPage = -1;
+				this.feStartPage = -1;
 				try {
-					open();
+					this.open();
 				} catch (OWFileNotFoundException e) {
 					// DRAIN
 				}
@@ -1825,23 +1915,25 @@ protected boolean renameTo(OWFile dest) {
 	 *         <code>false</code> otherwise
 	 */
 	protected boolean setReadOnly() {
-		synchronized (cache) {
+		synchronized (this.cache) {
 			// \\//\\//\\//\\//\\//\\//\\//
-			if (doDebugMessages)
+			if (doDebugMessages) {
 				System.out.println("===setReadOnly()");
+			}
 
-			if (isFile()) {
+			if (this.isFile()) {
 
 				// \\//\\//\\//\\//\\//\\//\\//
-				if (doDebugMessages)
+				if (doDebugMessages) {
 					System.out.println("=is a file");
+				}
 
 				// mark the readonly bit in the file entry page
-				feData[feOffset + LEN_FILENAME - 1] |= 0x80;
+				this.feData[this.feOffset + LEN_FILENAME - 1] |= 0x80;
 
 				try {
 					// write new setting to cache
-					cache.writePagePacket(fePage, feData, 0, feLen);
+					this.cache.writePagePacket(this.fePage, this.feData, 0, this.feLen);
 				} catch (OneWireException e) {
 					return false;
 				}
@@ -1859,13 +1951,14 @@ protected boolean setReadOnly() {
 	 * @param readlimit limit to keep track of the current position
 	 */
 	protected void mark(int readlimit) {
-		synchronized (cache) {
+		synchronized (this.cache) {
 			// \\//\\//\\//\\//\\//\\//\\//
-			if (doDebugMessages)
-				System.out.println("===mark() with readlimit=" + readlimit + " current pos=" + filePosition);
+			if (doDebugMessages) {
+				System.out.println("===mark() with readlimit=" + readlimit + " current pos=" + this.filePosition);
+			}
 
-			markPosition = filePosition;
-			markLimit = readlimit;
+			this.markPosition = this.filePosition;
+			this.markLimit = readlimit;
 		}
 	}
 
@@ -1875,19 +1968,21 @@ protected void mark(int readlimit) {
 	 * @throws IOException when a read error occurs
 	 */
 	protected void reset() throws IOException {
-		synchronized (cache) {
+		synchronized (this.cache) {
 			// \\//\\//\\//\\//\\//\\//\\//
-			if (doDebugMessages)
-				System.out.println("===reset() current pos=" + filePosition);
+			if (doDebugMessages) {
+				System.out.println("===reset() current pos=" + this.filePosition);
+			}
 
-			if ((filePosition - markPosition) > markLimit)
+			if (this.filePosition - this.markPosition > this.markLimit) {
 				throw new IOException("File read beyond mark readlimit");
+			}
 
 			// reset the file
-			lastPage = -1;
+			this.lastPage = -1;
 
 			// skip to the mark position
-			skip(markPosition);
+			this.skip(this.markPosition);
 		}
 	}
 
@@ -1903,16 +1998,17 @@ protected void reset() throws IOException {
 	 * @throws OneWireException when an IO exception occurs
 	 */
 	protected void markPageUsed(int page) throws OneWireException {
-		synchronized (cache) {
+		synchronized (this.cache) {
 			// \\//\\//\\//\\//\\//\\//\\//
-			if (doDebugMessages)
+			if (doDebugMessages) {
 				System.out.println("===markPageUsed " + page);
+			}
 
-			if (bitmapType == BM_CACHE)
-				cache.markPageUsed(page);
-			else {
+			if (this.bitmapType == BM_CACHE) {
+				this.cache.markPageUsed(page);
+			} else {
 				// mark page used in cached bitmap of used pages
-				Bit.arrayWriteBit(PAGE_USED, pbmBitOffset + page, pbmByteOffset, pbm);
+				Bit.arrayWriteBit(PAGE_USED, this.pbmBitOffset + page, this.pbmByteOffset, this.pbm);
 			}
 		}
 	}
@@ -1928,19 +2024,19 @@ protected void markPageUsed(int page) throws OneWireException {
 	 * @throws OneWireException when an IO error occurs
 	 */
 	protected boolean freePage(int page) throws OneWireException {
-		synchronized (cache) {
+		synchronized (this.cache) {
 			// \\//\\//\\//\\//\\//\\//\\//
-			if (doDebugMessages)
+			if (doDebugMessages) {
 				System.out.print("===freePage " + page);
+			}
 
-			if (bitmapType == BM_CACHE)
-				return cache.freePage(page);
-			else {
-				// mark page used in cached bitmap of used pages
-				Bit.arrayWriteBit(PAGE_NOT_USED, pbmBitOffset + page, pbmByteOffset, pbm);
-
-				return true;
+			if (this.bitmapType == BM_CACHE) {
+				return this.cache.freePage(page);
 			}
+			// mark page used in cached bitmap of used pages
+			Bit.arrayWriteBit(PAGE_NOT_USED, this.pbmBitOffset + page, this.pbmByteOffset, this.pbm);
+
+			return true;
 		}
 	}
 
@@ -1955,18 +2051,18 @@ protected boolean freePage(int page) throws OneWireException {
 	 * @throws OneWireException when an IO exception occurs
 	 */
 	protected int getFirstFreePage(boolean counterPage) throws OneWireException {
-		synchronized (cache) {
+		synchronized (this.cache) {
 			// \\//\\//\\//\\//\\//\\//\\//
-			if (doDebugMessages)
+			if (doDebugMessages) {
 				System.out.print("===getFirstFreePage, counter " + counterPage);
+			}
 
-			if (bitmapType == BM_CACHE)
-				return cache.getFirstFreePage();
-			else {
-				lastFreePage = 0;
-
-				return getNextFreePage(counterPage);
+			if (this.bitmapType == BM_CACHE) {
+				return this.cache.getFirstFreePage();
 			}
+			this.lastFreePage = 0;
+
+			return this.getNextFreePage(counterPage);
 		}
 	}
 
@@ -1981,40 +2077,42 @@ protected int getFirstFreePage(boolean counterPage) throws OneWireException {
 	 * @throws OneWireException when an IO exception occurs
 	 */
 	protected int getNextFreePage(boolean counterPage) throws OneWireException {
-		synchronized (cache) {
+		synchronized (this.cache) {
 			// \\//\\//\\//\\//\\//\\//\\//
-			if (doDebugMessages)
+			if (doDebugMessages) {
 				System.out.println("===getNextFreePage ");
+			}
 
-			if (bitmapType == BM_CACHE)
-				return cache.getNextFreePage();
-			else {
-				for (int pg = lastFreePage; pg < totalPages; pg++) {
-					if (Bit.arrayReadBit(pbmBitOffset + pg, pbmByteOffset, pbm) == PAGE_NOT_USED) {
-						// check if need a counter page
-						if (counterPage) {
-							// counter page has extra info with COUNTER or MAC
-							PagedMemoryBank pmb = getMemoryBankForPage(pg);
-							if (pmb.hasExtraInfo() && (pg != 8)) {
-								String ex_info = pmb.getExtraInfoDescription();
-								if ((ex_info.indexOf("counter") > -1) || (ex_info.indexOf("MAC") > -1))
-									return pg;
+			if (this.bitmapType == BM_CACHE) {
+				return this.cache.getNextFreePage();
+			}
+			for (var pg = this.lastFreePage; pg < this.totalPages; pg++) {
+				if (Bit.arrayReadBit(this.pbmBitOffset + pg, this.pbmByteOffset, this.pbm) == PAGE_NOT_USED) {
+					// check if need a counter page
+					if (counterPage) {
+						// counter page has extra info with COUNTER or MAC
+						var pmb = this.getMemoryBankForPage(pg);
+						if (pmb.hasExtraInfo() && pg != 8) {
+							var ex_info = pmb.getExtraInfoDescription();
+							if (ex_info.indexOf("counter") > -1 || ex_info.indexOf("MAC") > -1) {
+								return pg;
 							}
-							continue;
 						}
+						continue;
+					}
 
-						// \\//\\//\\//\\//\\//\\//\\//
-						if (doDebugMessages)
-							System.out.println("=free page is " + pg);
+					// \\//\\//\\//\\//\\//\\//\\//
+					if (doDebugMessages) {
+						System.out.println("=free page is " + pg);
+					}
 
-						lastFreePage = pg + 1;
+					this.lastFreePage = pg + 1;
 
-						return pg;
-					}
+					return pg;
 				}
-
-				return -1;
 			}
+
+			return -1;
 		}
 	}
 
@@ -2027,32 +2125,34 @@ protected int getNextFreePage(boolean counterPage) throws OneWireException {
 	 * @throws OneWireException when an IO exception occurs
 	 */
 	protected int getFreeMemory() throws OneWireException {
-		synchronized (cache) {
+		synchronized (this.cache) {
 			// \\//\\//\\//\\//\\//\\//\\//
-			if (doDebugMessages)
+			if (doDebugMessages) {
 				System.out.println("===getFreeMemory()");
+			}
 
 			// clear last page read flag in the cache
-			cache.clearLastPageRead();
+			this.cache.clearLastPageRead();
 
-			if (bitmapType == BM_CACHE)
-				return (cache.getNumberFreePages() * (maxDataLen - LEN_PAGE_PTR));
-			else {
-				// read the bitmap
-				readBitMap();
+			if (this.bitmapType == BM_CACHE) {
+				return this.cache.getNumberFreePages() * (this.maxDataLen - this.LEN_PAGE_PTR);
+			}
+			// read the bitmap
+			this.readBitMap();
 
-				int free_pages = 0;
-				for (int pg = 0; pg < totalPages; pg++) {
-					if (Bit.arrayReadBit(pbmBitOffset + pg, pbmByteOffset, pbm) == PAGE_NOT_USED)
-						free_pages++;
+			var free_pages = 0;
+			for (var pg = 0; pg < this.totalPages; pg++) {
+				if (Bit.arrayReadBit(this.pbmBitOffset + pg, this.pbmByteOffset, this.pbm) == PAGE_NOT_USED) {
+					free_pages++;
 				}
+			}
 
-				// \\//\\//\\//\\//\\//\\//\\//
-				if (doDebugMessages)
-					System.out.println("=num free pages = " + free_pages);
-
-				return (free_pages * (maxDataLen - LEN_PAGE_PTR));
+			// \\//\\//\\//\\//\\//\\//\\//
+			if (doDebugMessages) {
+				System.out.println("=num free pages = " + free_pages);
 			}
+
+			return free_pages * (this.maxDataLen - this.LEN_PAGE_PTR);
 		}
 	}
 
@@ -2062,58 +2162,61 @@ protected int getFreeMemory() throws OneWireException {
 	 * @throws OneWireException when an IO error occurs
 	 */
 	protected void writeBitMap() throws OneWireException {
-		synchronized (cache) {
+		synchronized (this.cache) {
 			// \\//\\//\\//\\//\\//\\//\\//
-			if (doDebugMessages)
+			if (doDebugMessages) {
 				System.out.println("===writeBitMap() ");
+			}
 
 			// clear last page read flag in the cache
-			cache.clearLastPageRead();
+			this.cache.clearLastPageRead();
 
-			if (bitmapType == BM_LOCAL) {
+			if (this.bitmapType == BM_LOCAL) {
 				// \\//\\//\\//\\//\\//\\//\\//
-				if (doDebugMessages)
+				if (doDebugMessages) {
 					System.out.println("=local ");
+				}
 
-				int pg_len = cache.readPagePacket(0, tempPage, 0);
+				var pg_len = this.cache.readPagePacket(0, this.tempPage, 0);
 
 				// check to see if the bitmap has changed
-				for (int i = 3; i < 7; i++) {
-					if ((tempPage[i] & 0x00FF) != (pbm[i] & 0x00FF)) {
-						System.arraycopy(pbm, 3, tempPage, 3, 4);
-						cache.writePagePacket(0, tempPage, 0, pg_len);
+				for (var i = 3; i < 7; i++) {
+					if ((this.tempPage[i] & 0x00FF) != (this.pbm[i] & 0x00FF)) {
+						System.arraycopy(this.pbm, 3, this.tempPage, 3, 4);
+						this.cache.writePagePacket(0, this.tempPage, 0, pg_len);
 						break;
 					}
 				}
-			} else if (bitmapType == BM_FILE) {
+			} else if (this.bitmapType == BM_FILE) {
 				// \\//\\//\\//\\//\\//\\//\\//
-				if (doDebugMessages)
+				if (doDebugMessages) {
 					System.out.println("=file ");
+				}
 
 				// FILE type page bitmap (got start page from validateFileSystem)
-				int offset = 0, pg = pbmStartPage, len;
+				int offset = 0, pg = this.pbmStartPage, len;
 
 				// loop through all of the pages in the bitmap
-				for (int pg_cnt = 0; pg_cnt < pbmNumPages; pg_cnt++) {
+				for (var pg_cnt = 0; pg_cnt < this.pbmNumPages; pg_cnt++) {
 					// read the current bitmap just to get the next page pointer and length
-					len = cache.readPagePacket(pg, tempPage, 0);
+					len = this.cache.readPagePacket(pg, this.tempPage, 0);
 
 					// check to see if this bitmap segment has changed
-					for (int i = 0; i < (len - LEN_PAGE_PTR); i++) {
-						if ((tempPage[i] & 0x00FF) != (pbm[i + offset] & 0x00FF)) {
+					for (var i = 0; i < len - this.LEN_PAGE_PTR; i++) {
+						if ((this.tempPage[i] & 0x00FF) != (this.pbm[i + offset] & 0x00FF)) {
 							// copy new bitmap value to it
-							System.arraycopy(pbm, offset, tempPage, 0, len - LEN_PAGE_PTR);
+							System.arraycopy(this.pbm, offset, this.tempPage, 0, len - this.LEN_PAGE_PTR);
 
 							// write back to device
-							cache.writePagePacket(pg, tempPage, 0, len);
+							this.cache.writePagePacket(pg, this.tempPage, 0, len);
 
 							break;
 						}
 					}
 
 					// get next page number to read
-					pg = Convert.toInt(tempPage, len - LEN_PAGE_PTR, LEN_PAGE_PTR);
-					offset += (len - LEN_PAGE_PTR);
+					pg = Convert.toInt(this.tempPage, len - this.LEN_PAGE_PTR, this.LEN_PAGE_PTR);
+					offset += len - this.LEN_PAGE_PTR;
 				}
 			}
 		}
@@ -2127,42 +2230,45 @@ protected void writeBitMap() throws OneWireException {
 	protected void readBitMap() throws OneWireException {
 		int len;
 
-		synchronized (cache) {
+		synchronized (this.cache) {
 			// \\//\\//\\//\\//\\//\\//\\//
-			if (doDebugMessages)
+			if (doDebugMessages) {
 				System.out.println("===readBitMap() ");
+			}
 
 			// clear last page read flag in the cache
-			cache.clearLastPageRead();
+			this.cache.clearLastPageRead();
 
 			// check to see if the directory has been read to know where the page bitmap is
-			if (pbmStartPage == -1) {
-				fePage = 0;
-				feLen = cache.readPagePacket(fePage, feData, 0);
-				validateFileSystem();
+			if (this.pbmStartPage == -1) {
+				this.fePage = 0;
+				this.feLen = this.cache.readPagePacket(this.fePage, this.feData, 0);
+				this.validateFileSystem();
 			}
 
 			// depending on the type of the page bitmap, read it
-			if (bitmapType == BM_LOCAL) {
+			if (this.bitmapType == BM_LOCAL) {
 
 				// \\//\\//\\//\\//\\//\\//\\//
-				if (doDebugMessages)
+				if (doDebugMessages) {
 					System.out.println("=local ");
+				}
 
-				cache.readPagePacket(0, pbm, 0);
-			} else if (bitmapType == BM_FILE) {
+				this.cache.readPagePacket(0, this.pbm, 0);
+			} else if (this.bitmapType == BM_FILE) {
 
 				// \\//\\//\\//\\//\\//\\//\\//
-				if (doDebugMessages)
+				if (doDebugMessages) {
 					System.out.println("=file ");
+				}
 
 				// FILE type page bitmap (got start page from validateFileSystem)
-				int offset = 0, pg = pbmStartPage;
+				int offset = 0, pg = this.pbmStartPage;
 
-				for (int pg_cnt = 0; pg_cnt < pbmNumPages; pg_cnt++) {
-					len = cache.readPagePacket(pg, pbm, offset);
-					pg = Convert.toInt(pbm, offset + len - LEN_PAGE_PTR, LEN_PAGE_PTR);
-					offset += (len - LEN_PAGE_PTR);
+				for (var pg_cnt = 0; pg_cnt < this.pbmNumPages; pg_cnt++) {
+					len = this.cache.readPagePacket(pg, this.pbm, offset);
+					pg = Convert.toInt(this.pbm, offset + len - this.LEN_PAGE_PTR, this.LEN_PAGE_PTR);
+					offset += len - this.LEN_PAGE_PTR;
 
 					// \\//\\//\\//\\//\\//\\//\\//
 					if (doDebugMessages) {
@@ -2174,7 +2280,7 @@ protected void readBitMap() throws OneWireException {
 				// \\//\\//\\//\\//\\//\\//\\//
 				if (doDebugMessages) {
 					System.out.println("=pbm is ");
-					debugDump(pbm, 0, pbm.length);
+					this.debugDump(this.pbm, 0, this.pbm.length);
 				}
 			}
 		}
@@ -2187,19 +2293,19 @@ protected void readBitMap() throws OneWireException {
 	 * @exception OneWireException if an I/O error occurs.
 	 */
 	protected int[] getPageList() throws OneWireException {
-		int[] page_list = new int[feNumPages + 10];
+		var page_list = new int[this.feNumPages + 10];
 		int cnt = 0, len;
-		int next_page = feStartPage;
+		var next_page = this.feStartPage;
 
 		// clear last page read flag in the cache
-		cache.clearLastPageRead();
+		this.cache.clearLastPageRead();
 
 		// loop to read all of the pages
 		do {
 			// check list for size limit
 			if (cnt >= page_list.length) {
 				// grow this list by 10
-				int[] temp = new int[page_list.length + 10];
+				var temp = new int[page_list.length + 10];
 				System.arraycopy(page_list, 0, temp, 0, page_list.length);
 				page_list = temp;
 			}
@@ -2208,18 +2314,19 @@ protected int[] getPageList() throws OneWireException {
 			page_list[cnt++] = next_page;
 
 			// read the file page
-			len = cache.readPagePacket(next_page, tempPage, 0);
+			len = this.cache.readPagePacket(next_page, this.tempPage, 0);
 
 			// get the next page pointer
-			next_page = Convert.toInt(tempPage, len - LEN_PAGE_PTR, LEN_PAGE_PTR);
+			next_page = Convert.toInt(this.tempPage, len - this.LEN_PAGE_PTR, this.LEN_PAGE_PTR);
 
 			// check for looping pages
-			if (cnt > totalPages)
+			if (cnt > this.totalPages) {
 				throw new OneWireException("Error in Filesystem, looping pointers");
+			}
 		} while (next_page != 0);
 
 		// create the return array
-		int[] rt_array = new int[cnt];
+		var rt_array = new int[cnt];
 		System.arraycopy(page_list, 0, rt_array, 0, cnt);
 
 		return rt_array;
@@ -2234,7 +2341,7 @@ protected int[] getPageList() throws OneWireException {
 	 * @exception IOException if the file doesn't exist
 	 */
 	protected int getStartPage() throws IOException {
-		return feStartPage;
+		return this.feStartPage;
 	}
 
 	/**
@@ -2242,7 +2349,7 @@ protected int getStartPage() throws IOException {
 	 * the Filesystem spans memory banks on the same or different devices.
 	 */
 	protected PagedMemoryBank getMemoryBankForPage(int page) {
-		return cache.getMemoryBankForPage(page);
+		return this.cache.getMemoryBankForPage(page);
 	}
 
 	/**
@@ -2251,7 +2358,7 @@ protected PagedMemoryBank getMemoryBankForPage(int page) {
 	 * different devices.
 	 */
 	protected int getLocalPage(int page) {
-		return cache.getLocalPage(page);
+		return this.cache.getLocalPage(page);
 	}
 
 	// --------
@@ -2269,33 +2376,36 @@ protected int getLocalPage(int page) {
 	 * @return string representation of the specified path
 	 */
 	private String pathToString(Vector<byte[]> tempPath, int beginIndex, int endIndex, boolean single) {
-		if (beginIndex < 0)
+		if (beginIndex < 0) {
 			return null;
+		}
 
 		byte[] name;
-		StringBuffer build_buffer = new StringBuffer((single ? "" : OWFile.separator));
+		var build_buffer = new StringBuilder(single ? "" : OWFile.separator);
 
-		for (int element = beginIndex; element < endIndex; element++) {
-			name = (byte[]) tempPath.elementAt(element);
+		for (var element = beginIndex; element < endIndex; element++) {
+			name = tempPath.elementAt(element);
 
-			if (!single && (element != beginIndex))
+			if (!single && element != beginIndex) {
 				build_buffer.append(OWFile.separatorChar);
+			}
 
-			for (int i = 0; i < 4; i++) {
-				if ((byte) name[i] != (byte) 0x20)
-					build_buffer.append((char) name[i]);
-				else
+			for (var i = 0; i < 4; i++) {
+				if (name[i] == (byte) 0x20) {
 					break;
+				}
+				build_buffer.append((char) name[i]);
 			}
 
-			if (((byte) (name[4] & 0x7F) != (byte) EXT_DIRECTORY) && ((byte) name[4] != (byte) EXT_UNKNOWN))
-				build_buffer.append("." + Integer.toString((int) name[4] & 0x7F));
+			if ((byte) (name[4] & 0x7F) != EXT_DIRECTORY && name[4] != EXT_UNKNOWN) {
+				build_buffer.append("." + Integer.toString(name[4] & 0x7F));
+			}
 		}
 
-		if (build_buffer.length() == 0)
+		if (build_buffer.length() == 0) {
 			return null;
-		else
-			return build_buffer.toString();
+		}
+		return build_buffer.toString();
 	}
 
 	/**
@@ -2310,26 +2420,27 @@ private String pathToString(Vector<byte[]> tempPath, int beginIndex, int endInde
 	private boolean verifyPath(int depth) throws OneWireException {
 		byte[] element;
 
-		feStartPage = 0;
+		this.feStartPage = 0;
 
 		// \\//\\//\\//\\//\\//\\//\\//
-		if (doDebugMessages)
+		if (doDebugMessages) {
 			System.out.println("===verifyPath() depth=" + depth);
+		}
 
-		for (int element_num = 0; element_num < depth; element_num++) {
-			element = (byte[]) path.elementAt(element_num);
+		for (var element_num = 0; element_num < depth; element_num++) {
+			element = this.path.elementAt(element_num);
 
 			// remember where the parent entry is
-			feParentPage = feStartPage;
-			feParentOffset = feOffset;
-
+			var feParentPage = this.feStartPage;
 			// attempt to find the element starting at the last entry
-			if (!findElement(feStartPage, element, 0))
+			if (!this.findElement(this.feStartPage, element, 0)) {
 				return false;
+			}
 
 			// get the next entry start
-			feStartPage = Convert.toInt(feData, feOffset + LEN_FILENAME, LEN_PAGE_PTR);
-			feNumPages = Convert.toInt(feData, feOffset + LEN_FILENAME + LEN_PAGE_PTR, LEN_PAGE_PTR);
+			this.feStartPage = Convert.toInt(this.feData, this.feOffset + LEN_FILENAME, this.LEN_PAGE_PTR);
+			this.feNumPages = Convert.toInt(this.feData, this.feOffset + LEN_FILENAME + this.LEN_PAGE_PTR,
+					this.LEN_PAGE_PTR);
 		}
 
 		return true;
@@ -2349,58 +2460,63 @@ private boolean verifyPath(int depth) throws OneWireException {
 	 * @throws OneWireException when an IO error occurs
 	 */
 	private boolean findElement(int startPage, byte[] element, int offset) throws OneWireException {
-		int next_page = startPage;
+		var next_page = startPage;
 
 		// \\//\\//\\//\\//\\//\\//\\//
 		if (doDebugMessages) {
 			System.out.print("===findElement() start page=" + startPage + " element:");
-			debugDump(element, offset, 5);
+			this.debugDump(element, offset, 5);
 		}
 
 		// clear last page read flag in the cache
-		cache.clearLastPageRead();
+		this.cache.clearLastPageRead();
 
 		// read the 1-Wire device to find a file/directory reference
-		feOffset = LEN_CONTROL_DATA;
+		this.feOffset = this.LEN_CONTROL_DATA;
 
 		do {
-			fePage = next_page;
+			this.fePage = next_page;
 
 			// read the page
-			feLen = cache.readPagePacket(fePage, feData, 0);
+			this.feLen = this.cache.readPagePacket(this.fePage, this.feData, 0);
 
 			// if just read root directory, check filesystem
-			if (fePage == 0)
-				readBitMap();
+			if (this.fePage == 0) {
+				this.readBitMap();
+			}
 
 			// loop through the entries
-			for (; feOffset < (feLen - LEN_PAGE_PTR); feOffset += LEN_FILE_ENTRY) {
+			for (; this.feOffset < this.feLen - this.LEN_PAGE_PTR; this.feOffset += this.LEN_FILE_ENTRY) {
 				// compare with current element
-				if (elementEquals(element, offset, feData, feOffset)) {
+				if (this.elementEquals(element, offset, this.feData, this.feOffset)) {
 
 					// copy over any read-only or hidden flag in element name
-					if ((feData[feOffset + LEN_FILENAME - 1] & 0x80) != 0)
+					if ((this.feData[this.feOffset + LEN_FILENAME - 1] & 0x80) != 0) {
 						element[offset + LEN_FILENAME - 1] |= 0x80;
+					}
 
 					// \\//\\//\\//\\//\\//\\//\\//
-					if (doDebugMessages)
-						System.out.println("=found on page " + fePage + " at offset " + feOffset);
+					if (doDebugMessages) {
+						System.out.println("=found on page " + this.fePage + " at offset " + this.feOffset);
+					}
 
 					return true;
 				}
 			}
 
 			// get next page pointer to read
-			next_page = Convert.toInt(feData, feLen - LEN_PAGE_PTR, LEN_PAGE_PTR);
+			next_page = Convert.toInt(this.feData, this.feLen - this.LEN_PAGE_PTR, this.LEN_PAGE_PTR);
 
 			// reset loop start
-			if (next_page != 0)
-				feOffset = 0;
+			if (next_page != 0) {
+				this.feOffset = 0;
+			}
 		} while (next_page != 0);
 
 		// \\//\\//\\//\\//\\//\\//\\//
-		if (doDebugMessages)
+		if (doDebugMessages) {
 			System.out.println("=NOT found");
+		}
 
 		// end of directory and no entry found
 		return false;
@@ -2420,25 +2536,27 @@ private boolean elementEquals(byte[] file1, int offset1, byte[] file2, int offse
 		// \\//\\//\\//\\//\\//\\//\\//
 		if (doDebugMessages) {
 			System.out.print("===elementEquals()  ");
-			debugDump(file1, offset1, 5);
+			this.debugDump(file1, offset1, 5);
 			System.out.print("=to                 ");
-			debugDump(file2, offset2, 5);
+			this.debugDump(file2, offset2, 5);
 		}
 
-		for (int i = 0; i < 4; i++) {
-			if ((byte) file1[offset1 + i] != (byte) file2[offset2 + i])
+		for (var i = 0; i < 4; i++) {
+			if (file1[offset1 + i] != file2[offset2 + i]) {
 				return false;
+			}
 		}
 
 		// check if type is inknown (either a file with 000 extension or directory)
 		if (file1[offset1 + 4] == EXT_UNKNOWN) {
-			if ((file2[offset2 + 4] & 0x7F) == 0)
+			if ((file2[offset2 + 4] & 0x7F) == 0) {
 				file1[offset1 + 4] = 0;
-			else if ((file2[offset2 + 4] & 0x7F) == EXT_DIRECTORY)
+			} else if ((file2[offset2 + 4] & 0x7F) == EXT_DIRECTORY) {
 				file1[offset1 + 4] = EXT_DIRECTORY;
+			}
 		}
 
-		return ((byte) (file1[offset1 + 4] & 0x7F) == (byte) (file2[offset2 + 4] & 0x7F));
+		return (byte) (file1[offset1 + 4] & 0x7F) == (byte) (file2[offset2 + 4] & 0x7F);
 	}
 
 	/**
@@ -2451,11 +2569,12 @@ private void fetchPage() throws IOException {
 		try {
 
 			// \\//\\//\\//\\//\\//\\//\\//
-			if (doDebugMessages)
-				System.out.println("===fetchPage() " + lastPage);
+			if (doDebugMessages) {
+				System.out.println("===fetchPage() " + this.lastPage);
+			}
 
-			lastLen = cache.readPagePacket(lastPage, lastPageData, 0);
-			lastOffset = 0;
+			this.lastLen = this.cache.readPagePacket(this.lastPage, this.lastPageData, 0);
+			this.lastOffset = 0;
 		} catch (OneWireException e) {
 			throw new IOException(e.toString());
 		}
@@ -2482,27 +2601,28 @@ private void createEntry(byte[] newEntry, int startPage, int numberPages, byte[]
 		if (doDebugMessages) {
 			System.out.print("===createEntry() ");
 			System.out.print("=prevEntryStart " + prevEntryStart + " ");
-			debugDump(newEntry, 0, 5);
-			debugDump(feData, 0, feLen);
+			this.debugDump(newEntry, 0, 5);
+			this.debugDump(this.feData, 0, this.feLen);
 		}
 
 		// clear last page read flag in the cache
-		cache.clearLastPageRead();
+		this.cache.clearLastPageRead();
 
 		int new_page;
 
 		try {
 
 			// check if room in current page
-			if ((feLen + LEN_FILE_ENTRY) <= maxDataLen) {
+			if (this.feLen + this.LEN_FILE_ENTRY <= this.maxDataLen) {
 
 				// add to current page
 				// \\//\\//\\//\\//\\//\\//\\//
-				if (doDebugMessages)
-					System.out.println("=add to current dir page " + fePage);
+				if (doDebugMessages) {
+					System.out.println("=add to current dir page " + this.fePage);
+				}
 
 				// get the pagebitmap
-				readBitMap();
+				this.readBitMap();
 
 				// check if this is just a new entry pointing to an old file
 				if (startPage != -1) {
@@ -2512,99 +2632,88 @@ private void createEntry(byte[] newEntry, int startPage, int numberPages, byte[]
 					// get a new file to represent the new file/directory location
 
 					// get the next available page
-					new_page = getFirstFreePage((newEntry[4] == (byte) 102) || (newEntry[4] == (byte) 101));
+					new_page = this.getFirstFreePage(newEntry[4] == (byte) 102 || newEntry[4] == (byte) 101);
 
 					// verify got a free page
 					if (new_page < 0) {
 						try {
-							sync();
+							this.sync();
 						} catch (OWSyncFailedException e) {
 							// DRAIN
 						}
 
 						// if extension is 101 or 102, it could be there is not COUNTER pages
-						if ((newEntry[4] == (byte) 102) || (newEntry[4] == (byte) 101))
+						if (newEntry[4] == (byte) 102 || newEntry[4] == (byte) 101) {
 							throw new OWFileNotFoundException(
 									"Out of space on 1-Wire device, or no secure pages available");
-						else
-							throw new OWFileNotFoundException("Out of space on 1-Wire device");
+						}
+						throw new OWFileNotFoundException("Out of space on 1-Wire device");
 					}
 				}
 
 				// get next page pointer
-				int npp = Convert.toInt(feData, feLen - LEN_PAGE_PTR, LEN_PAGE_PTR);
+				var npp = Convert.toInt(this.feData, this.feLen - this.LEN_PAGE_PTR, this.LEN_PAGE_PTR);
 
 				// copy the file name into
-				System.arraycopy(newEntry, 0, feData, feLen - LEN_PAGE_PTR, LEN_FILENAME);
-				Convert.toByteArray(new_page, feData, feLen - LEN_PAGE_PTR + LEN_FILENAME, LEN_PAGE_PTR);
-				Convert.toByteArray(((numberPages == -1) ? 1 : numberPages), feData,
-						feLen - LEN_PAGE_PTR + LEN_FILENAME + LEN_PAGE_PTR, LEN_PAGE_PTR);
+				System.arraycopy(newEntry, 0, this.feData, this.feLen - this.LEN_PAGE_PTR, LEN_FILENAME);
+				Convert.toByteArray(new_page, this.feData, this.feLen - this.LEN_PAGE_PTR + LEN_FILENAME,
+						this.LEN_PAGE_PTR);
+				Convert.toByteArray(numberPages == -1 ? 1 : numberPages, this.feData,
+						this.feLen - this.LEN_PAGE_PTR + LEN_FILENAME + this.LEN_PAGE_PTR, this.LEN_PAGE_PTR);
 
-				feOffset = feLen - LEN_PAGE_PTR;
-				feLen = feLen + LEN_FILE_ENTRY;
+				this.feOffset = this.feLen - this.LEN_PAGE_PTR;
+				this.feLen = this.feLen + this.LEN_FILE_ENTRY;
 
 				// restore next page pointer
-				Convert.toByteArray(npp, feData, feLen - LEN_PAGE_PTR, LEN_PAGE_PTR);
+				Convert.toByteArray(npp, this.feData, this.feLen - this.LEN_PAGE_PTR, this.LEN_PAGE_PTR);
 
 				// check if this is not a rename operation
 				if (startPage == -1) {
 					// no rename, so write the new file/directory starting data
 
 					// mark page used
-					markPageUsed(new_page);
+					this.markPageUsed(new_page);
 
 					// put blank data page or directory entry in new page
 					if ((newEntry[4] & 0x7F) == EXT_DIRECTORY) {
 						// Directory Marker 'DM'
-						tempPage[0] = (LEN_PAGE_PTR == 1) ? (byte) 0x0A : (byte) 0x0B;
-						tempPage[0] |= (owd.length == 1) ? (byte) 0xA0 : 0xB0;
+						this.tempPage[0] = this.LEN_PAGE_PTR == 1 ? (byte) 0x0A : (byte) 0x0B;
+						this.tempPage[0] |= this.owd.length == 1 ? (byte) 0xA0 : 0xB0;
 
 						// dummy byte
-						tempPage[1] = 0;
+						this.tempPage[1] = 0;
 
-						System.arraycopy(prevEntry, 0, tempPage, 2, 4);
-						Convert.toByteArray(prevEntryStart, tempPage, 6, LEN_PAGE_PTR);
+						System.arraycopy(prevEntry, 0, this.tempPage, 2, 4);
+						Convert.toByteArray(prevEntryStart, this.tempPage, 6, this.LEN_PAGE_PTR);
 						// set next page pointer to end
-						Convert.toByteArray(0, tempPage, 6 + LEN_PAGE_PTR, LEN_PAGE_PTR);
-						cache.writePagePacket(new_page, tempPage, 0, 6 + LEN_PAGE_PTR * 2);
+						Convert.toByteArray(0, this.tempPage, 6 + this.LEN_PAGE_PTR, this.LEN_PAGE_PTR);
+						this.cache.writePagePacket(new_page, this.tempPage, 0, 6 + this.LEN_PAGE_PTR * 2);
 					} else {
-						Convert.toByteArray(0, smallBuf, 0, LEN_PAGE_PTR);
-						cache.writePagePacket(new_page, smallBuf, 0, LEN_PAGE_PTR);
+						Convert.toByteArray(0, this.smallBuf, 0, this.LEN_PAGE_PTR);
+						this.cache.writePagePacket(new_page, this.smallBuf, 0, this.LEN_PAGE_PTR);
 					}
 				}
 
 				// put new directory page in place
-				cache.writePagePacket(fePage, feData, 0, feLen);
-
-				// set the page bitmap
-				writeBitMap();
-
-				// if the new entry is not a directory
-				if ((newEntry[4] & 0x7F) != EXT_DIRECTORY) {
-
-					// setup the pointers for writing
-					filePosition = 0;
-					lastPage = new_page;
-					lastOffset = 0;
-					lastLen = 1;
-				}
+				this.cache.writePagePacket(this.fePage, this.feData, 0, this.feLen);
 			} else {
 				// need a new directory page
 
 				// \\//\\//\\//\\//\\//\\//\\//
-				if (doDebugMessages)
+				if (doDebugMessages) {
 					System.out.println("=need a new dir page ");
+				}
 
 				// get the pagebitmap
-				readBitMap();
+				this.readBitMap();
 
 				// get new page for directory
-				int new_dir_page = getFirstFreePage(false);
+				var new_dir_page = this.getFirstFreePage(false);
 
 				// verify got a free page
 				if (new_dir_page < 0) {
 					try {
-						sync();
+						this.sync();
 					} catch (OWSyncFailedException e) {
 						// DRAIN
 					}
@@ -2613,7 +2722,7 @@ private void createEntry(byte[] newEntry, int startPage, int numberPages, byte[]
 				}
 
 				// mark page used
-				markPageUsed(new_dir_page);
+				this.markPageUsed(new_dir_page);
 
 				// check if this is just a new entry pointing to an old file
 				if (startPage != -1) {
@@ -2623,40 +2732,40 @@ private void createEntry(byte[] newEntry, int startPage, int numberPages, byte[]
 					// get a new file to represent the new file/directory location
 
 					// get new page for the file
-					new_page = getNextFreePage((newEntry[4] == (byte) 102) || (newEntry[4] == (byte) 101));
+					new_page = this.getNextFreePage(newEntry[4] == (byte) 102 || newEntry[4] == (byte) 101);
 
 					// verify got a free page
 					if (new_page < 0) {
 						try {
-							sync();
+							this.sync();
 						} catch (OWSyncFailedException e) {
 							// DRAIN
 						}
 
 						// if extension is 101 or 102, it could be there is not COUNTER pages
-						if ((newEntry[4] == (byte) 102) || (newEntry[4] == (byte) 101))
+						if (newEntry[4] == (byte) 102 || newEntry[4] == (byte) 101) {
 							throw new OWFileNotFoundException(
 									"Out of space on 1-Wire device, or no secure pages available");
-						else
-							throw new OWFileNotFoundException("Out of space on 1-Wire device");
+						}
+						throw new OWFileNotFoundException("Out of space on 1-Wire device");
 					}
 
 					// mark page used
-					markPageUsed(new_page);
+					this.markPageUsed(new_page);
 				}
 
 				// create the new directory entry page
-				System.arraycopy(newEntry, 0, lastPageData, 0, LEN_FILENAME);
-				Convert.toByteArray(new_page, lastPageData, LEN_FILENAME, LEN_PAGE_PTR);
-				Convert.toByteArray(((numberPages == -1) ? 1 : numberPages), lastPageData, LEN_FILENAME + LEN_PAGE_PTR,
-						LEN_PAGE_PTR);
-				feOffset = 0;
+				System.arraycopy(newEntry, 0, this.lastPageData, 0, LEN_FILENAME);
+				Convert.toByteArray(new_page, this.lastPageData, LEN_FILENAME, this.LEN_PAGE_PTR);
+				Convert.toByteArray(numberPages == -1 ? 1 : numberPages, this.lastPageData,
+						LEN_FILENAME + this.LEN_PAGE_PTR, this.LEN_PAGE_PTR);
+				this.feOffset = 0;
 
 				// set next page pointer to end
-				Convert.toByteArray(0, lastPageData, LEN_FILE_ENTRY, LEN_PAGE_PTR);
+				Convert.toByteArray(0, this.lastPageData, this.LEN_FILE_ENTRY, this.LEN_PAGE_PTR);
 
 				// put new directory page in place
-				cache.writePagePacket(new_dir_page, lastPageData, 0, LEN_FILE_ENTRY + LEN_PAGE_PTR);
+				this.cache.writePagePacket(new_dir_page, this.lastPageData, 0, this.LEN_FILE_ENTRY + this.LEN_PAGE_PTR);
 
 				// check if this is not a rename operation
 				if (startPage == -1) {
@@ -2665,52 +2774,53 @@ private void createEntry(byte[] newEntry, int startPage, int numberPages, byte[]
 					// write the new file/directory page
 					if ((newEntry[4] & 0x7F) == EXT_DIRECTORY) {
 						// Directory Marker 'DM'
-						tempPage[0] = (LEN_PAGE_PTR == 1) ? (byte) 0x0A : (byte) 0x0B;
-						tempPage[0] |= (owd.length == 1) ? (byte) 0xA0 : 0xB0;
+						this.tempPage[0] = this.LEN_PAGE_PTR == 1 ? (byte) 0x0A : (byte) 0x0B;
+						this.tempPage[0] |= this.owd.length == 1 ? (byte) 0xA0 : 0xB0;
 
 						// dummy byte
-						tempPage[1] = 0;
+						this.tempPage[1] = 0;
 
-						System.arraycopy(prevEntry, 0, tempPage, 2, 4);
-						Convert.toByteArray(prevEntryStart, tempPage, 6, LEN_PAGE_PTR);
+						System.arraycopy(prevEntry, 0, this.tempPage, 2, 4);
+						Convert.toByteArray(prevEntryStart, this.tempPage, 6, this.LEN_PAGE_PTR);
 						// set next page pointer to end
-						Convert.toByteArray(0, tempPage, 6 + LEN_PAGE_PTR, LEN_PAGE_PTR);
-						cache.writePagePacket(new_page, tempPage, 0, 6 + LEN_PAGE_PTR * 2);
+						Convert.toByteArray(0, this.tempPage, 6 + this.LEN_PAGE_PTR, this.LEN_PAGE_PTR);
+						this.cache.writePagePacket(new_page, this.tempPage, 0, 6 + this.LEN_PAGE_PTR * 2);
 					} else {
-						Convert.toByteArray(0, smallBuf, 0, LEN_PAGE_PTR);
-						cache.writePagePacket(new_page, smallBuf, 0, LEN_PAGE_PTR);
+						Convert.toByteArray(0, this.smallBuf, 0, this.LEN_PAGE_PTR);
+						this.cache.writePagePacket(new_page, this.smallBuf, 0, this.LEN_PAGE_PTR);
 					}
 				}
 
 				// update the page pointer in the old directory page
-				Convert.toByteArray(new_dir_page, feData, feLen - LEN_PAGE_PTR, LEN_PAGE_PTR);
+				Convert.toByteArray(new_dir_page, this.feData, this.feLen - this.LEN_PAGE_PTR, this.LEN_PAGE_PTR);
 
 				// put new directory page in place
-				cache.writePagePacket(fePage, feData, 0, feLen);
+				this.cache.writePagePacket(this.fePage, this.feData, 0, this.feLen);
 
 				// set file entry info to the new directory page
-				fePage = new_dir_page;
-				feOffset = 0;
-				feLen = LEN_FILE_ENTRY + LEN_PAGE_PTR;
-				System.arraycopy(lastPageData, 0, feData, 0, feLen);
+				this.fePage = new_dir_page;
+				this.feOffset = 0;
+				this.feLen = this.LEN_FILE_ENTRY + this.LEN_PAGE_PTR;
+				System.arraycopy(this.lastPageData, 0, this.feData, 0, this.feLen);
 
 				// \\//\\//\\//\\//\\//\\//\\//
 				if (doDebugMessages) {
-					System.out.println("=NEW fePage=" + fePage + " feOffset " + feOffset + " feLen " + feLen);
-					debugDump(feData, 0, feLen);
+					System.out.println(
+							"=NEW fePage=" + this.fePage + " feOffset " + this.feOffset + " feLen " + this.feLen);
+					this.debugDump(this.feData, 0, this.feLen);
 				}
+			}
+			// set the page bitmap
+			this.writeBitMap();
 
-				// set the page bitmap
-				writeBitMap();
+			// if the new entry is not a directory
+			if ((newEntry[4] & 0x7F) != EXT_DIRECTORY) {
 
-				// if the new entry is a directory
-				if ((newEntry[4] & 0x7F) != EXT_DIRECTORY) {
-					// set file position info
-					filePosition = 0;
-					lastPage = new_page;
-					lastOffset = 0;
-					lastLen = 1;
-				}
+				// setup the pointers for writing
+				this.filePosition = 0;
+				this.lastPage = new_page;
+				this.lastOffset = 0;
+				this.lastLen = 1;
 			}
 		} catch (OneWireException e) {
 			throw new OWFileNotFoundException(e.toString());
@@ -2726,129 +2836,141 @@ private void createEntry(byte[] newEntry, int startPage, int numberPages, byte[]
 	private void validateFileSystem() throws OneWireException {
 
 		// \\//\\//\\//\\//\\//\\//\\//
-		if (doDebugMessages)
+		if (doDebugMessages) {
 			System.out.println("===validateFileSystem()");
+		}
 
 		// clear last page read flag in the cache
-		cache.clearLastPageRead();
+		this.cache.clearLastPageRead();
 
 		// check for SATELLITE
-		LEN_PAGE_PTR = ((feData[0] & 0x000F) == 0x0B) ? 2 : 1;
-		if (((feData[0] & 0x00F0) == 0xB0) && ((feData[1 + LEN_PAGE_PTR] & 0x0002) == 0)) {
+		this.LEN_PAGE_PTR = (this.feData[0] & 0x000F) == 0x0B ? 2 : 1;
+		if ((this.feData[0] & 0x00F0) == 0xB0 && (this.feData[1 + this.LEN_PAGE_PTR] & 0x0002) == 0) {
 			// read the DM page
-			int len = cache.readPagePacket(Convert.toInt(feData, 1, LEN_PAGE_PTR), dmBuf, 0);
-
-			if (len >= (8 + LEN_PAGE_PTR)) {
-				// copy address to temp buff (or piece of address number)
-				System.arraycopy(dmBuf, 0, addrBuf, 0, 8);
+			var len = this.cache.readPagePacket(Convert.toInt(this.feData, 1, this.LEN_PAGE_PTR), this.dmBuf, 0);
 
-				// get ref to adapter to create the new MASTER container
-				DSPortAdapter adapter = owd[0].getAdapter();
-				owd = new OneWireContainer[1];
-				owd[0] = adapter.getDeviceContainer(addrBuf);
-
-				// check for overdrive
-				if ((adapter.getSpeed() == DSPortAdapter.SPEED_OVERDRIVE)
-						&& (owd[0].getMaxSpeed() == DSPortAdapter.SPEED_OVERDRIVE))
-					owd[0].setSpeed(DSPortAdapter.SPEED_OVERDRIVE, false);
-
-				// free the current cache
-				cache.removeOwner(this);
-				if (cache.noOwners()) {
-					// remove the cache from the hash
-					memoryCacheHash.remove(address);
-					cache = null;
-				}
+			if (len < 8 + this.LEN_PAGE_PTR) {
+				throw new OneWireIOException(
+						"Invalid filesystem, this is a satellite device with invalid MASTER reference");
+			}
+			// copy address to temp buff (or piece of address number)
+			System.arraycopy(this.dmBuf, 0, this.addrBuf, 0, 8);
+
+			// get ref to adapter to create the new MASTER container
+			var adapter = this.owd[0].getAdapter();
+			this.owd = new OneWireContainer[1];
+			this.owd[0] = adapter.getDeviceContainer(this.addrBuf);
+
+			// check for overdrive
+			if (adapter.getSpeed() == DSPortAdapter.SPEED_OVERDRIVE
+					&& this.owd[0].getMaxSpeed() == DSPortAdapter.SPEED_OVERDRIVE) {
+				this.owd[0].setSpeed(DSPortAdapter.SPEED_OVERDRIVE, false);
+			}
 
-				// recreate the cache and setup
-				setupFD(owd, rawPath);
+			// free the current cache
+			this.cache.removeOwner(this);
+			if (this.cache.noOwners()) {
+				// remove the cache from the hash
+				memoryCacheHash.remove(this.address);
+				this.cache = null;
+			}
 
-				// get the new root dir
-				fePage = 0;
-				feLen = cache.readPagePacket(0, feData, 0);
+			// recreate the cache and setup
+			this.setupFD(this.owd, this.rawPath);
 
-				// make sure this is not a SATELLITE also (could be recursively bad!)
-				LEN_PAGE_PTR = ((feData[0] & 0x000F) == 0x0B) ? 2 : 1;
-				if (((feData[0] & 0x000F) == 0x0B) && ((feData[1 + LEN_PAGE_PTR] & 0x0002) == 0))
-					throw new OneWireIOException(
-							"Invalid filesystem, this is a satellite device, pointing to another satellite?");
+			// get the new root dir
+			this.fePage = 0;
+			this.feLen = this.cache.readPagePacket(0, this.feData, 0);
 
-				// call this recursively
-				validateFileSystem();
-				return;
-			} else
+			// make sure this is not a SATELLITE also (could be recursively bad!)
+			this.LEN_PAGE_PTR = (this.feData[0] & 0x000F) == 0x0B ? 2 : 1;
+			if ((this.feData[0] & 0x000F) == 0x0B && (this.feData[1 + this.LEN_PAGE_PTR] & 0x0002) == 0) {
 				throw new OneWireIOException(
-						"Invalid filesystem, this is a satellite device with invalid MASTER reference");
+						"Invalid filesystem, this is a satellite device, pointing to another satellite?");
+			}
+
+			// call this recursively
+			this.validateFileSystem();
+			return;
 		}
 
 		// check for MASTER
-		if (((feData[0] & 0x00F0) == 0xB0) && ((feData[1 + LEN_PAGE_PTR] & 0x0002) == 0x0002)) {
+		if ((this.feData[0] & 0x00F0) == 0xB0 && (this.feData[1 + this.LEN_PAGE_PTR] & 0x0002) == 0x0002) {
 			// read the DM file
-			int page = Convert.toInt(feData, 1, LEN_PAGE_PTR);
+			var page = Convert.toInt(this.feData, 1, this.LEN_PAGE_PTR);
 
 			// make sure is valid page
-			if ((page == 0) || (page >= totalPages))
+			if (page == 0 || page >= this.totalPages) {
 				throw new OneWireIOException("Invalid Filesystem, Device Map page number not valid.");
+			}
 
 			// check for incorrect or incomplete device list (member owd)
-			int num_devices = verifyDeviceMap(page, 0, false);
+			var num_devices = this.verifyDeviceMap(page, 0, false);
 			if (num_devices > 0) {
 				// create a new list
-				verifyDeviceMap(page, num_devices, (owd[0].getAdapter().getSpeed() == DSPortAdapter.SPEED_OVERDRIVE));
+				this.verifyDeviceMap(page, num_devices,
+						this.owd[0].getAdapter().getSpeed() == DSPortAdapter.SPEED_OVERDRIVE);
 
 				// free the current cache
-				cache.removeOwner(this);
-				if (cache.noOwners()) {
+				this.cache.removeOwner(this);
+				if (this.cache.noOwners()) {
 					// remove the cache from the hash
-					memoryCacheHash.remove(address);
-					cache = null;
+					memoryCacheHash.remove(this.address);
+					this.cache = null;
 				}
 
 				// recreate the cache and setup
-				setupFD(owd, rawPath);
+				this.setupFD(this.owd, this.rawPath);
 
 				// continue on with the root dir
-				fePage = 0;
-				feLen = cache.readPagePacket(0, feData, 0);
+				this.fePage = 0;
+				this.feLen = this.cache.readPagePacket(0, this.feData, 0);
 			}
 		}
 
 		// check and verify that this is a valid directory
-		if (((totalPages <= 256) && ((feData[0] & 0x000F) != 0x0A))
-				|| ((totalPages > 256) && ((feData[0] & 0x000F) != 0x0B)))
+		if (this.totalPages <= 256 && (this.feData[0] & 0x000F) != 0x0A
+				|| this.totalPages > 256 && (this.feData[0] & 0x000F) != 0x0B) {
 			throw new OneWireIOException("Invalid Filesystem marker found, number of pages incorrect");
+		}
 
-		if (((owd.length == 1) && ((feData[0] & 0x00F0) != 0x00A0))
-				|| ((owd.length > 1) && ((feData[0] & 0x00F0) != 0x00B0)))
+		if (this.owd.length == 1 && (this.feData[0] & 0x00F0) != 0x00A0
+				|| this.owd.length > 1 && (this.feData[0] & 0x00F0) != 0x00B0) {
 			throw new OneWireIOException("Invalid Filesystem marker found, multi-device marker incorrect");
+		}
 
 		// check where page bitmap is
-		if ((feData[1 + LEN_PAGE_PTR] & 0x0080) != 0) {
-			bitmapType = BM_LOCAL;
-			pbmByteOffset = 2 + LEN_PAGE_PTR;
-			pbmBitOffset = 0;
-			pbmStartPage = 0; // used as flag to see if filesystem has been validated
-		} else if (bitmapType != BM_CACHE) {
-			bitmapType = BM_FILE;
-			pbmStartPage = Convert.toInt(feData, LEN_CONTROL_DATA - LEN_PAGE_PTR * 2, LEN_PAGE_PTR);
-			pbmNumPages = Convert.toInt(feData, LEN_CONTROL_DATA - LEN_PAGE_PTR, LEN_PAGE_PTR);
-			pbmByteOffset = 0;
-			pbmBitOffset = 0;
+		if ((this.feData[1 + this.LEN_PAGE_PTR] & 0x0080) != 0) {
+			this.bitmapType = BM_LOCAL;
+			this.pbmByteOffset = 2 + this.LEN_PAGE_PTR;
+			this.pbmBitOffset = 0;
+			this.pbmStartPage = 0; // used as flag to see if filesystem has been validated
+		} else if (this.bitmapType != BM_CACHE) {
+			this.bitmapType = BM_FILE;
+			this.pbmStartPage = Convert.toInt(this.feData, this.LEN_CONTROL_DATA - this.LEN_PAGE_PTR * 2,
+					this.LEN_PAGE_PTR);
+			this.pbmNumPages = Convert.toInt(this.feData, this.LEN_CONTROL_DATA - this.LEN_PAGE_PTR, this.LEN_PAGE_PTR);
+			this.pbmByteOffset = 0;
+			this.pbmBitOffset = 0;
 
 			// make sure the number of pages in a FILE BM is correct
-			int pbm_bytes = (totalPages / 8);
-			int pgs = pbm_bytes / (maxDataLen - LEN_PAGE_PTR);
-			if ((pbm_bytes % (maxDataLen - LEN_PAGE_PTR)) > 0)
+			var pbm_bytes = this.totalPages / 8;
+			var pgs = pbm_bytes / (this.maxDataLen - this.LEN_PAGE_PTR);
+			if (pbm_bytes % (this.maxDataLen - this.LEN_PAGE_PTR) > 0) {
 				pgs++;
+			}
 
-			if (pbmNumPages != pgs)
+			if (this.pbmNumPages != pgs) {
 				throw new OneWireIOException("Invalid Filesystem, incorrect number of pages in remote bitmap file!");
-		} else
-			pbmStartPage = 0;
+			}
+		} else {
+			this.pbmStartPage = 0;
+		}
 
 		// \\//\\//\\//\\//\\//\\//\\//
-		if (doDebugMessages)
-			System.out.println("= is valid, pbmStartPage=" + pbmStartPage);
+		if (doDebugMessages) {
+			System.out.println("= is valid, pbmStartPage=" + this.pbmStartPage);
+		}
 	}
 
 	/**
@@ -2870,46 +2992,47 @@ private void validateFileSystem() throws OneWireException {
 	 */
 	protected int verifyDeviceMap(int startPage, int numberOfContainers, boolean setOverdrive) throws OneWireException {
 		int len, data_len;
-		int ow_cnt = 1;
-		int addr_offset = 0;
-		int pg_offset = 0;
+		var ow_cnt = 1;
+		var addr_offset = 0;
+		var pg_offset = 0;
 		int copy_len;
 		DSPortAdapter adapter = null;
 
 		// flag to indicate the device list 'owd' list is valid
-		boolean list_valid = true;
+		var list_valid = true;
 
 		// first page to read
-		int page = startPage;
+		var page = startPage;
 
 		// clear last page read flag in the cache
-		cache.clearLastPageRead();
+		this.cache.clearLastPageRead();
 
 		// check to see if need to create a new array for the new list of containers
 		if (numberOfContainers > 0) {
 			// get reference to the adapter for use in creating containers
-			adapter = owd[0].getAdapter();
+			adapter = this.owd[0].getAdapter();
 
-			OneWireContainer master_owc = owd[0];
-			owd = new OneWireContainer[numberOfContainers + 1];
-			owd[0] = master_owc;
+			var master_owc = this.owd[0];
+			this.owd = new OneWireContainer[numberOfContainers + 1];
+			this.owd[0] = master_owc;
 		}
 
 		// loop to read the Device Map file
 		do {
 			// read the first file page
-			len = cache.readPagePacket(page, dmBuf, 0);
-			data_len = len - LEN_PAGE_PTR;
+			len = this.cache.readPagePacket(page, this.dmBuf, 0);
+			data_len = len - this.LEN_PAGE_PTR;
 
 			// loop through the device addresses in the device map file
 			while (pg_offset < data_len) {
-				if ((data_len - pg_offset) >= (8 - addr_offset))
+				if (data_len - pg_offset >= 8 - addr_offset) {
 					copy_len = 8 - addr_offset;
-				else
+				} else {
 					copy_len = data_len - pg_offset;
+				}
 
 				// copy address to temp buff (or piece of address number)
-				System.arraycopy(dmBuf, pg_offset, addrBuf, addr_offset, copy_len);
+				System.arraycopy(this.dmBuf, pg_offset, this.addrBuf, addr_offset, copy_len);
 
 				// increment offsets
 				addr_offset += copy_len;
@@ -2919,17 +3042,17 @@ protected int verifyDeviceMap(int startPage, int numberOfContainers, boolean set
 				if (addr_offset >= 8) {
 					// check if creating OneWireContainers
 					if (numberOfContainers > 0) {
-						owd[ow_cnt] = adapter.getDeviceContainer(addrBuf);
+						this.owd[ow_cnt] = adapter.getDeviceContainer(this.addrBuf);
 
 						// set new container to correct speed
-						if (setOverdrive && (owd[ow_cnt].getMaxSpeed() == DSPortAdapter.SPEED_OVERDRIVE))
-							owd[ow_cnt].setSpeed(DSPortAdapter.SPEED_OVERDRIVE, false);
-					} else {
-						// not creating containers so just check if correct
-						if (owd.length <= ow_cnt)
-							list_valid = false;
-						else if (Address.toLong(addrBuf) != owd[ow_cnt].getAddressAsLong())
-							list_valid = false;
+						if (setOverdrive && this.owd[ow_cnt].getMaxSpeed() == DSPortAdapter.SPEED_OVERDRIVE) {
+							this.owd[ow_cnt].setSpeed(DSPortAdapter.SPEED_OVERDRIVE, false);
+						}
+					} else // not creating containers so just check if correct
+					if (this.owd.length <= ow_cnt) {
+						list_valid = false;
+					} else if (Address.toLong(this.addrBuf) != this.owd[ow_cnt].getAddressAsLong()) {
+						list_valid = false;
 					}
 
 					ow_cnt++;
@@ -2938,13 +3061,13 @@ else if (Address.toLong(addrBuf) != owd[ow_cnt].getAddressAsLong())
 			}
 
 			// get the next page
-			page = Convert.toInt(dmBuf, data_len, LEN_PAGE_PTR);
+			page = Convert.toInt(this.dmBuf, data_len, this.LEN_PAGE_PTR);
 
 			pg_offset = 0;
 		} while (page != 0);
 
 		// verify correct number of devices found
-		return (list_valid) ? 0 : ow_cnt - 1;
+		return list_valid ? 0 : ow_cnt - 1;
 	}
 
 	/**
@@ -2963,8 +3086,9 @@ private boolean parsePath(String rawPath, Vector<byte[]> parsedPath) {
 			name_len = 0;
 
 			// check if this is the last field
-			if ((index == -1) && (last_index < rawPath.length()))
+			if (index == -1 && last_index < rawPath.length()) {
 				index = rawPath.length();
+			}
 
 			// not done
 			if (index > 0) {
@@ -2980,7 +3104,7 @@ private boolean parsePath(String rawPath, Vector<byte[]> parsedPath) {
 				// create byte array for field
 				name = new byte[LEN_FILENAME];
 
-				System.arraycopy(initName, 0, name, 0, LEN_FILENAME);
+				System.arraycopy(this.initName, 0, name, 0, LEN_FILENAME);
 
 				// check if this is: ".", "..", or "name.number"
 				period_index = field.indexOf(".", 0);
@@ -2998,74 +3122,74 @@ private boolean parsePath(String rawPath, Vector<byte[]> parsedPath) {
 					name_len = field.length();
 
 					// check if last field
-					if (index != rawPath.length())
+					if (index != rawPath.length()) {
 						name[4] = EXT_DIRECTORY;
+					}
 
 					// \\//\\//\\//\\//\\//\\//\\//
 					if (doDebugMessages) {
 						System.out.print("=Parse, directory: ");
-						debugDump(name, 0, 5);
+						this.debugDump(name, 0, 5);
 					}
-				} else {
+				} else // assume that if first char is '.' then must be '.' or '..' directory refs
+				if (period_index == 0) {
 
-					// assume that if first char is '.' then must be '.' or '..' directory refs
-					if (period_index == 0) {
+					// check for valid length
+					if (field.length() > 2) {
 
-						// check for valid length
-						if (field.length() > 2) {
+						// \\//\\//\\//\\//\\//\\//\\//
+						if (doDebugMessages) {
+							System.out.println("=Parse ERROR, '.' field length > 2 ");
+						}
 
-							// \\//\\//\\//\\//\\//\\//\\//
-							if (doDebugMessages)
-								System.out.println("=Parse ERROR, '.' field length > 2 ");
+						return false;
+					}
 
-							return false;
-						}
+					System.arraycopy(field.getBytes(), 0, name, 0, field.length());
+					name[4] = EXT_DIRECTORY;
+					name_len = field.length();
 
-						System.arraycopy(field.getBytes(), 0, name, 0, field.length());
-						name[4] = EXT_DIRECTORY;
-						name_len = field.length();
+					// \\//\\//\\//\\//\\//\\//\\//
+					if (doDebugMessages) {
+						System.out.print("=Parse, directory: ");
+						this.debugDump(name, 0, 5);
+					}
+				} else {
 
-						// \\//\\//\\//\\//\\//\\//\\//
-						if (doDebugMessages) {
-							System.out.print("=Parse, directory: ");
-							debugDump(name, 0, 5);
-						}
-					} else {
+					// is name.number file
+					name_len = period_index;
 
-						// is name.number file
-						name_len = period_index;
+					// get name part
+					System.arraycopy(field.getBytes(), 0, name, 0, period_index);
 
-						// get name part
-						System.arraycopy(field.getBytes(), 0, name, 0, period_index);
+					// get the name part
+					try {
+						name[4] = (byte) Integer.parseInt(field.substring(period_index + 1));
+					} catch (NumberFormatException e) {
+						return false;
+					}
 
-						// get the name part
-						try {
-							name[4] = (byte) Integer.parseInt(field.substring(period_index + 1, field.length()));
-						} catch (NumberFormatException e) {
-							return false;
-						}
+					// \\//\\//\\//\\//\\//\\//\\//
+					if (doDebugMessages) {
+						System.out.print("=Parse, file: ");
+						this.debugDump(name, 0, 5);
+					}
+
+					// check if invalid field or extension
+					if (index != rawPath.length() || (name[4] & 0x00FF) > 102) {
 
 						// \\//\\//\\//\\//\\//\\//\\//
 						if (doDebugMessages) {
-							System.out.print("=Parse, file: ");
-							debugDump(name, 0, 5);
+							System.out.println("=Parse ERROR, extension > 102 or spaces detected");
 						}
 
-						// check if invalid field or extension
-						if ((index != rawPath.length()) || ((name[4] & 0x00FF) > 102)) {
-
-							// \\//\\//\\//\\//\\//\\//\\//
-							if (doDebugMessages)
-								System.out.println("=Parse ERROR, extension > 102 or spaces detected");
-
-							return false;
-						}
+						return false;
 					}
 				}
 
 				// make sure file name is exceptable
 				for (i = 0; i < name_len; i++) {
-					if (((name[i] & 0x00FF) < 0x21) || ((name[i] & 0x00FF) > 0x7E)) {
+					if ((name[i] & 0x00FF) < 0x21 || (name[i] & 0x00FF) > 0x7E) {
 						return false;
 					}
 				}
@@ -3098,17 +3222,16 @@ private boolean parsePath(String rawPath, Vector<byte[]> parsedPath) {
 	 *
 	 */
 	protected boolean createNewFile() throws IOException {
-		if (exists())
+		if (this.exists()) {
 			return false;
-		else {
-			try {
-				create(false, false, false, -1, -1);
-			} catch (OWFileNotFoundException e) {
-				throw new IOException(e.toString());
-			}
-
-			return true;
 		}
+		try {
+			this.create(false, false, false, -1, -1);
+		} catch (OWFileNotFoundException e) {
+			throw new IOException(e.toString());
+		}
+
+		return true;
 	}
 
 	/**
@@ -3123,16 +3246,18 @@ protected boolean createNewFile() throws IOException {
 	 * @return A hash code for this abstract pathname
 	 */
 	protected int getHashCode() {
-		synchronized (cache) {
+		synchronized (this.cache) {
 			int i, j, hash = 0;
-			String this_path = owd[0].getAddressAsString() + getPath();
-			byte[] path_bytes = this_path.getBytes();
+			var this_path = this.owd[0].getAddressAsString() + this.getPath();
+			var path_bytes = this_path.getBytes();
 
-			for (i = 0; i < (path_bytes.length / 4); i++)
+			for (i = 0; i < path_bytes.length / 4; i++) {
 				hash ^= Convert.toInt(path_bytes, i * 4, 4);
+			}
 
-			for (j = 0; j < (path_bytes.length % 4); j++)
-				hash ^= (int) (path_bytes[i * 4 + j] & 0x00FF);
+			for (j = 0; j < path_bytes.length % 4; j++) {
+				hash ^= path_bytes[i * 4 + j] & 0x00FF;
+			}
 
 			return hash;
 		}
@@ -3146,7 +3271,7 @@ protected int getHashCode() {
 	 *
 	 */
 	protected OneWireContainer[] getOneWireContainers() {
-		return owd;
+		return this.owd;
 	}
 
 	/**
@@ -3154,24 +3279,26 @@ protected OneWireContainer[] getOneWireContainers() {
 	 *
 	 */
 	protected void free() {
-		synchronized (cache) {
+		synchronized (this.cache) {
 			// if opened to write then remove the block
-			if (openedToWrite)
-				cache.removeWriteOpen(owd[0].getAddressAsString() + getPath());
+			if (this.openedToWrite) {
+				this.cache.removeWriteOpen(this.owd[0].getAddressAsString() + this.getPath());
+			}
 
 			// remove this owner from the list
-			cache.removeOwner(this);
+			this.cache.removeOwner(this);
 
 			// if not more owners then free the cache
-			if (cache.noOwners()) {
+			if (this.cache.noOwners()) {
 				// remove the cache from the hash
-				memoryCacheHash.remove(address);
+				memoryCacheHash.remove(this.address);
 
-				cache = null;
+				this.cache = null;
 
 				// \\//\\//\\//\\//\\//\\//\\//
-				if (doDebugMessages)
-					System.out.println("=released cache for " + Address.toString(address.longValue()));
+				if (doDebugMessages) {
+					System.out.println("=released cache for " + Address.toString(this.address.longValue()));
+				}
 			}
 		}
 	}
@@ -3184,8 +3311,8 @@ protected void free() {
 	 * @param len    length to dump
 	 */
 	private void debugDump(byte[] buf, int offset, int len) {
-		for (int i = offset; i < (offset + len); i++) {
-			System.out.print(Integer.toHexString((int) buf[i] & 0x00FF) + " ");
+		for (var i = offset; i < offset + len; i++) {
+			System.out.print(Integer.toHexString(buf[i] & 0x00FF) + " ");
 		}
 
 		System.out.println();
diff --git a/io.openems.edge.bridge.onewire/src/com/dalsemi/onewire/application/file/OWFileInputStream.java b/io.openems.edge.bridge.onewire/src/com/dalsemi/onewire/application/file/OWFileInputStream.java
index c6c9a83bb74..370edfbbecf 100644
--- a/io.openems.edge.bridge.onewire/src/com/dalsemi/onewire/application/file/OWFileInputStream.java
+++ b/io.openems.edge.bridge.onewire/src/com/dalsemi/onewire/application/file/OWFileInputStream.java
@@ -61,7 +61,7 @@
  *
  * <H3>Usage</H3>
  * <H4>Example</H4> Read from a 1-Wire file on device 'owd':
- * 
+ *
  * <PRE>
  *  <CODE>
  *   // get an input stream to the 1-Wire file
@@ -118,21 +118,21 @@ public class OWFileInputStream extends InputStream {
 	 *                                    other reason cannot be opened for reading.
 	 */
 	public OWFileInputStream(OneWireContainer owd, String name) throws OWFileNotFoundException {
-		fd = new OWFileDescriptor(owd, name);
+		this.fd = new OWFileDescriptor(owd, name);
 
 		// open the file
 		try {
-			fd.open();
+			this.fd.open();
 		} catch (OWFileNotFoundException e) {
-			fd.free();
-			fd = null;
+			this.fd.free();
+			this.fd = null;
 			throw new OWFileNotFoundException(e.toString());
 		}
 
 		// make sure this is not directory
-		if (!fd.isFile()) {
-			fd.free();
-			fd = null;
+		if (!this.fd.isFile()) {
+			this.fd.free();
+			this.fd = null;
 			throw new OWFileNotFoundException("Not a file");
 		}
 	}
@@ -157,21 +157,21 @@ public OWFileInputStream(OneWireContainer owd, String name) throws OWFileNotFoun
 	 *                                    other reason cannot be opened for reading.
 	 */
 	public OWFileInputStream(OneWireContainer[] owd, String name) throws OWFileNotFoundException {
-		fd = new OWFileDescriptor(owd, name);
+		this.fd = new OWFileDescriptor(owd, name);
 
 		// open the file
 		try {
-			fd.open();
+			this.fd.open();
 		} catch (OWFileNotFoundException e) {
-			fd.free();
-			fd = null;
+			this.fd.free();
+			this.fd = null;
 			throw new OWFileNotFoundException(e.toString());
 		}
 
 		// make sure this is not directory
-		if (!fd.isFile()) {
-			fd.free();
-			fd = null;
+		if (!this.fd.isFile()) {
+			this.fd.free();
+			this.fd = null;
 			throw new OWFileNotFoundException("Not a file");
 		}
 	}
@@ -195,26 +195,26 @@ public OWFileInputStream(OneWireContainer[] owd, String name) throws OWFileNotFo
 	public OWFileInputStream(OWFile file) throws OWFileNotFoundException {
 		// get the file descriptor
 		try {
-			fd = file.getFD();
+			this.fd = file.getFD();
 		} catch (IOException e) {
-			fd.free();
-			fd = null;
+			this.fd.free();
+			this.fd = null;
 			throw new OWFileNotFoundException(e.toString());
 		}
 
 		// open the file
 		try {
-			fd.open();
+			this.fd.open();
 		} catch (OWFileNotFoundException e) {
-			fd.free();
-			fd = null;
+			this.fd.free();
+			this.fd = null;
 			throw new OWFileNotFoundException(e.toString());
 		}
 
 		// make sure it is not a directory
-		if (!fd.isFile()) {
-			fd.free();
-			fd = null;
+		if (!this.fd.isFile()) {
+			this.fd.free();
+			this.fd = null;
 			throw new OWFileNotFoundException("Not a file");
 		}
 	}
@@ -230,10 +230,11 @@ public OWFileInputStream(OWFile file) throws OWFileNotFoundException {
 	 * @param fdObj the file descriptor to be opened for reading.
 	 */
 	public OWFileInputStream(OWFileDescriptor fdObj) {
-		if (fdObj == null)
+		if (fdObj == null) {
 			throw new NullPointerException("OWFile provided is null");
+		}
 
-		fd = fdObj;
+		this.fd = fdObj;
 	}
 
 	// --------
@@ -248,11 +249,12 @@ public OWFileInputStream(OWFileDescriptor fdObj) {
 	 *         reached.
 	 * @exception IOException if an I/O error occurs.
 	 */
+	@Override
 	public int read() throws IOException {
-		if (fd != null)
-			return fd.read();
-		else
-			throw new IOException("1-Wire FileDescriptor is null");
+		if (this.fd != null) {
+			return this.fd.read();
+		}
+		throw new IOException("1-Wire FileDescriptor is null");
 	}
 
 	/**
@@ -264,11 +266,12 @@ public int read() throws IOException {
 	 *         there is no more data because the end of the file has been reached.
 	 * @exception IOException if an I/O error occurs.
 	 */
+	@Override
 	public int read(byte b[]) throws IOException {
-		if (fd != null)
-			return fd.read(b, 0, b.length);
-		else
-			throw new IOException("1-Wire FileDescriptor is null");
+		if (this.fd != null) {
+			return this.fd.read(b, 0, b.length);
+		}
+		throw new IOException("1-Wire FileDescriptor is null");
 	}
 
 	/**
@@ -282,11 +285,12 @@ public int read(byte b[]) throws IOException {
 	 *         there is no more data because the end of the file has been reached.
 	 * @exception IOException if an I/O error occurs.
 	 */
+	@Override
 	public int read(byte b[], int off, int len) throws IOException {
-		if (fd != null)
-			return fd.read(b, off, len);
-		else
-			throw new IOException("1-Wire FileDescriptor is null");
+		if (this.fd != null) {
+			return this.fd.read(b, off, len);
+		}
+		throw new IOException("1-Wire FileDescriptor is null");
 	}
 
 	/**
@@ -299,11 +303,12 @@ public int read(byte b[], int off, int len) throws IOException {
 	 * @return the actual number of bytes skipped.
 	 * @exception IOException if an I/O error occurs.
 	 */
+	@Override
 	public long skip(long n) throws IOException {
-		if (fd != null)
-			return fd.skip(n);
-		else
-			throw new IOException("1-Wire FileDescriptor is null");
+		if (this.fd != null) {
+			return this.fd.skip(n);
+		}
+		throw new IOException("1-Wire FileDescriptor is null");
 	}
 
 	/**
@@ -314,11 +319,12 @@ public long skip(long n) throws IOException {
 	 *         without blocking.
 	 * @exception IOException if an I/O error occurs.
 	 */
+	@Override
 	public int available() throws IOException {
-		if (fd != null)
-			return fd.available();
-		else
-			throw new IOException("1-Wire FileDescriptor is null");
+		if (this.fd != null) {
+			return this.fd.available();
+		}
+		throw new IOException("1-Wire FileDescriptor is null");
 	}
 
 	/**
@@ -327,13 +333,14 @@ public int available() throws IOException {
 	 *
 	 * @exception IOException if an I/O error occurs.
 	 */
+	@Override
 	public void close() throws IOException {
-		if (fd != null)
-			fd.close();
-		else
+		if (this.fd == null) {
 			throw new IOException("1-Wire FileDescriptor is null");
+		}
+		this.fd.close();
 
-		fd = null;
+		this.fd = null;
 	}
 
 	/**
@@ -346,10 +353,10 @@ public void close() throws IOException {
 	 * @see com.dalsemi.onewire.application.file.OWFileDescriptor
 	 */
 	public final OWFileDescriptor getFD() throws IOException {
-		if (fd != null)
-			return fd;
-		else
-			throw new IOException("1-Wire FileDescriptor is null");
+		if (this.fd != null) {
+			return this.fd;
+		}
+		throw new IOException("1-Wire FileDescriptor is null");
 	}
 
 	/**
@@ -361,8 +368,8 @@ public final OWFileDescriptor getFD() throws IOException {
 	 */
 	@Override
 	public void finalize() throws IOException {
-		if (fd != null) {
-			fd.close();
+		if (this.fd != null) {
+			this.fd.close();
 		}
 	}
 
@@ -395,9 +402,11 @@ public void finalize() throws IOException {
 	 *                  position becomes invalid.
 	 * @see java.io.InputStream#reset()
 	 */
+	@Override
 	public void mark(int readlimit) {
-		if (fd != null)
-			fd.mark(readlimit);
+		if (this.fd != null) {
+			this.fd.mark(readlimit);
+		}
 	}
 
 	/**
@@ -448,9 +457,11 @@ public void mark(int readlimit) {
 	 * @see java.io.InputStream#mark(int)
 	 * @see java.io.IOException
 	 */
+	@Override
 	public void reset() throws IOException {
-		if (fd != null)
-			fd.reset();
+		if (this.fd != null) {
+			this.fd.reset();
+		}
 	}
 
 	/**
@@ -463,6 +474,7 @@ public void reset() throws IOException {
 	 * @see java.io.InputStream#mark(int)
 	 * @see java.io.InputStream#reset()
 	 */
+	@Override
 	public boolean markSupported() {
 		return true;
 	}
diff --git a/io.openems.edge.bridge.onewire/src/com/dalsemi/onewire/application/file/OWFileNotFoundException.java b/io.openems.edge.bridge.onewire/src/com/dalsemi/onewire/application/file/OWFileNotFoundException.java
index 3c156b4be34..0120b51a759 100644
--- a/io.openems.edge.bridge.onewire/src/com/dalsemi/onewire/application/file/OWFileNotFoundException.java
+++ b/io.openems.edge.bridge.onewire/src/com/dalsemi/onewire/application/file/OWFileNotFoundException.java
@@ -45,7 +45,6 @@ public class OWFileNotFoundException extends java.io.IOException {
 	 * error detail message.
 	 */
 	public OWFileNotFoundException() {
-		super();
 	}
 
 	/**
diff --git a/io.openems.edge.bridge.onewire/src/com/dalsemi/onewire/application/file/OWFileOutputStream.java b/io.openems.edge.bridge.onewire/src/com/dalsemi/onewire/application/file/OWFileOutputStream.java
index 243400c4179..676856937d0 100644
--- a/io.openems.edge.bridge.onewire/src/com/dalsemi/onewire/application/file/OWFileOutputStream.java
+++ b/io.openems.edge.bridge.onewire/src/com/dalsemi/onewire/application/file/OWFileOutputStream.java
@@ -80,7 +80,7 @@
  *
  * <H3>Usage</H3>
  * <H4>Example</H4> Write to a 1-Wire file on device 'owd':
- * 
+ *
  * <PRE>
  *  <CODE>
  *   // create a 1-Wire file at root
@@ -158,15 +158,15 @@ public class OWFileOutputStream extends OutputStream {
 	 *                                    write access to the file.
 	 */
 	public OWFileOutputStream(OneWireContainer owd, String name) throws OWFileNotFoundException {
-		OneWireContainer[] devices = new OneWireContainer[1];
+		var devices = new OneWireContainer[1];
 		devices[0] = owd;
-		fd = new OWFileDescriptor(devices, name);
+		this.fd = new OWFileDescriptor(devices, name);
 
 		try {
-			fd.create(false, false, false, -1, -1);
+			this.fd.create(false, false, false, -1, -1);
 		} catch (OWFileNotFoundException e) {
-			fd.free();
-			fd = null;
+			this.fd.free();
+			this.fd = null;
 			throw new OWFileNotFoundException(e.toString());
 		}
 	}
@@ -191,13 +191,13 @@ public OWFileOutputStream(OneWireContainer owd, String name) throws OWFileNotFou
 	 *                                    for any other reason
 	 */
 	public OWFileOutputStream(OneWireContainer[] owd, String name) throws OWFileNotFoundException {
-		fd = new OWFileDescriptor(owd, name);
+		this.fd = new OWFileDescriptor(owd, name);
 
 		try {
-			fd.create(false, false, false, -1, -1);
+			this.fd.create(false, false, false, -1, -1);
 		} catch (OWFileNotFoundException e) {
-			fd.free();
-			fd = null;
+			this.fd.free();
+			this.fd = null;
 			throw new OWFileNotFoundException(e.toString());
 		}
 	}
@@ -229,13 +229,13 @@ public OWFileOutputStream(OneWireContainer[] owd, String name) throws OWFileNotF
 	 *                                    write access to the file.
 	 */
 	public OWFileOutputStream(OneWireContainer owd, String name, boolean append) throws OWFileNotFoundException {
-		fd = new OWFileDescriptor(owd, name);
+		this.fd = new OWFileDescriptor(owd, name);
 
 		try {
-			fd.create(append, false, false, -1, -1);
+			this.fd.create(append, false, false, -1, -1);
 		} catch (OWFileNotFoundException e) {
-			fd.free();
-			fd = null;
+			this.fd.free();
+			this.fd = null;
 			throw new OWFileNotFoundException(e.toString());
 		}
 	}
@@ -267,13 +267,13 @@ public OWFileOutputStream(OneWireContainer owd, String name, boolean append) thr
 	 *                                    write access to the file.
 	 */
 	public OWFileOutputStream(OneWireContainer[] owd, String name, boolean append) throws OWFileNotFoundException {
-		fd = new OWFileDescriptor(owd, name);
+		this.fd = new OWFileDescriptor(owd, name);
 
 		try {
-			fd.create(append, false, false, -1, -1);
+			this.fd.create(append, false, false, -1, -1);
 		} catch (OWFileNotFoundException e) {
-			fd.free();
-			fd = null;
+			this.fd.free();
+			this.fd = null;
 			throw new OWFileNotFoundException(e.toString());
 		}
 	}
@@ -303,14 +303,14 @@ public OWFileOutputStream(OneWireContainer[] owd, String name, boolean append) t
 	 */
 	public OWFileOutputStream(OWFile file) throws OWFileNotFoundException {
 		try {
-			fd = file.getFD();
+			this.fd = file.getFD();
 		} catch (IOException e) {
-			fd.free();
-			fd = null;
+			this.fd.free();
+			this.fd = null;
 			throw new OWFileNotFoundException(e.toString());
 		}
 
-		fd.open();
+		this.fd.open();
 	}
 
 	/**
@@ -326,10 +326,11 @@ public OWFileOutputStream(OWFile file) throws OWFileNotFoundException {
 	 *                              access to the file descriptor.
 	 */
 	public OWFileOutputStream(OWFileDescriptor fdObj) {
-		if (fdObj == null)
+		if (fdObj == null) {
 			throw new NullPointerException("1-Wire FileDescriptor provided is null");
+		}
 
-		fd = fdObj;
+		this.fd = fdObj;
 	}
 
 	// --------
@@ -343,11 +344,12 @@ public OWFileOutputStream(OWFileDescriptor fdObj) {
 	 * @param b the byte to be written.
 	 * @exception IOException if an I/O error occurs.
 	 */
+	@Override
 	public void write(int b) throws IOException {
-		if (fd != null)
-			fd.write(b);
-		else
+		if (this.fd == null) {
 			throw new IOException("1-Wire FileDescriptor is null");
+		}
+		this.fd.write(b);
 	}
 
 	/**
@@ -357,11 +359,12 @@ public void write(int b) throws IOException {
 	 * @param b the data.
 	 * @exception IOException if an I/O error occurs.
 	 */
+	@Override
 	public void write(byte b[]) throws IOException {
-		if (fd != null)
-			fd.write(b, 0, b.length);
-		else
+		if (this.fd == null) {
 			throw new IOException("1-Wire FileDescriptor is null");
+		}
+		this.fd.write(b, 0, b.length);
 	}
 
 	/**
@@ -373,11 +376,12 @@ public void write(byte b[]) throws IOException {
 	 * @param len the number of bytes to write.
 	 * @exception IOException if an I/O error occurs.
 	 */
+	@Override
 	public void write(byte b[], int off, int len) throws IOException {
-		if (fd != null)
-			fd.write(b, off, len);
-		else
+		if (this.fd == null) {
 			throw new IOException("1-Wire FileDescriptor is null");
+		}
+		this.fd.write(b, off, len);
 	}
 
 	/**
@@ -387,13 +391,14 @@ public void write(byte b[], int off, int len) throws IOException {
 	 *
 	 * @exception IOException if an I/O error occurs.
 	 */
+	@Override
 	public void close() throws IOException {
-		if (fd != null)
-			fd.close();
-		else
+		if (this.fd == null) {
 			throw new IOException("1-Wire FileDescriptor is null");
+		}
+		this.fd.close();
 
-		fd = null;
+		this.fd = null;
 	}
 
 	/**
@@ -407,10 +412,10 @@ public void close() throws IOException {
 	 * @see com.dalsemi.onewire.application.file.OWFileDescriptor
 	 */
 	public OWFileDescriptor getFD() throws IOException {
-		if (fd != null)
-			return fd;
-		else
-			throw new IOException("1-Wire FileDescriptor is null");
+		if (this.fd != null) {
+			return this.fd;
+		}
+		throw new IOException("1-Wire FileDescriptor is null");
 	}
 
 	/**
@@ -423,7 +428,8 @@ public OWFileDescriptor getFD() throws IOException {
 	 */
 	@Override
 	public void finalize() throws IOException {
-		if (fd != null)
-			fd.close();
+		if (this.fd != null) {
+			this.fd.close();
+		}
 	}
 }
diff --git a/io.openems.edge.bridge.onewire/src/com/dalsemi/onewire/application/monitor/AbstractDeviceMonitor.java b/io.openems.edge.bridge.onewire/src/com/dalsemi/onewire/application/monitor/AbstractDeviceMonitor.java
index 792fb78f341..665c50b854d 100644
--- a/io.openems.edge.bridge.onewire/src/com/dalsemi/onewire/application/monitor/AbstractDeviceMonitor.java
+++ b/io.openems.edge.bridge.onewire/src/com/dalsemi/onewire/application/monitor/AbstractDeviceMonitor.java
@@ -132,11 +132,12 @@ public abstract class AbstractDeviceMonitor implements Runnable {
 	 */
 	public void cleanUpStaleContainerReferences() {
 		synchronized (deviceContainerHash) {
-			Enumeration<Long> e = deviceContainerHash.keys();
+			var e = deviceContainerHash.keys();
 			while (e.hasMoreElements()) {
 				Object o = e.nextElement();
-				if (!deviceAddressHash.containsKey(o))
+				if (!this.deviceAddressHash.containsKey(o)) {
 					deviceContainerHash.remove(o);
+				}
 			}
 		}
 	}
@@ -158,17 +159,18 @@ public void cleanUpStalePathReferences() {
 	 * and departure events will be fired.
 	 */
 	public void resetSearch() {
-		synchronized (sync_flag) {
+		synchronized (this.sync_flag) {
 			// fire departures for all devices
-			if (deviceAddressHash.size() > 0 && listeners.size() > 0) {
-				Vector<Long> v = new Vector<>(deviceAddressHash.size());
-				Enumeration<Long> e = deviceAddressHash.keys();
-				while (e.hasMoreElements())
+			if (this.deviceAddressHash.size() > 0 && this.listeners.size() > 0) {
+				var v = new Vector<Long>(this.deviceAddressHash.size());
+				var e = this.deviceAddressHash.keys();
+				while (e.hasMoreElements()) {
 					v.addElement(e.nextElement());
-				fireDepartureEvent(adapter, v);
+				}
+				this.fireDepartureEvent(this.adapter, v);
 			}
 
-			deviceAddressHash.clear();
+			this.deviceAddressHash.clear();
 		}
 	}
 
@@ -190,8 +192,9 @@ public int getMaxStateCount() {
 	 *                 before it is removed.
 	 */
 	public void setMaxStateCount(int stateCnt) {
-		if (stateCnt <= 0)
+		if (stateCnt <= 0) {
 			throw new IllegalArgumentException("State Count must be greater than 0");
+		}
 
 		this.max_state_count = stateCnt;
 	}
@@ -213,8 +216,9 @@ public int getMaxErrorCount() {
 	 *                 notified
 	 */
 	public void setMaxErrorCount(int errorCnt) {
-		if (errorCnt <= 0)
+		if (errorCnt <= 0) {
 			throw new IllegalArgumentException("Error Count must be greater than 0");
+		}
 
 		this.max_error_count = errorCnt;
 	}
@@ -256,20 +260,21 @@ public abstract void search(Vector<Long> arrivals, Vector<Long> departures)
 	 */
 	public boolean pauseMonitor(boolean blocking) {
 		// clear the start flag
-		synchronized (sync_flag) {
-			if (hasCompletelyStopped || (!startRunning && !isRunning))
+		synchronized (this.sync_flag) {
+			if (this.hasCompletelyStopped || !this.startRunning && !this.isRunning) {
 				return true;
+			}
 
-			startRunning = false;
+			this.startRunning = false;
 		}
 
 		// wait until it is paused or until timeout
-		int i = 0;
-		while (isRunning && (blocking || (i++) < 100)) {
-			msSleep(10);
+		var i = 0;
+		while (this.isRunning && (blocking || i++ < 100)) {
+			this.msSleep(10);
 		}
 
-		return !isRunning;
+		return !this.isRunning;
 	}
 
 	/**
@@ -280,22 +285,24 @@ public boolean pauseMonitor(boolean blocking) {
 	 */
 	public boolean resumeMonitor(boolean blocking) {
 		// set the start flag
-		synchronized (sync_flag) {
-			if (hasCompletelyStopped)
+		synchronized (this.sync_flag) {
+			if (this.hasCompletelyStopped) {
 				return false;
-			if (startRunning && isRunning)
+			}
+			if (this.startRunning && this.isRunning) {
 				return true;
+			}
 
-			startRunning = true;
+			this.startRunning = true;
 		}
 
 		// wait until it is running
-		int i = 0;
-		while (!isRunning && (blocking || (i++) < 100)) {
-			msSleep(10);
+		var i = 0;
+		while (!this.isRunning && (blocking || i++ < 100)) {
+			this.msSleep(10);
 		}
 
-		return isRunning;
+		return this.isRunning;
 	}
 
 	/**
@@ -304,7 +311,7 @@ public boolean resumeMonitor(boolean blocking) {
 	 * @return <CODE>true</CODE> if monitor is running
 	 */
 	public boolean isMonitorRunning() {
-		return isRunning;
+		return this.isRunning;
 	}
 
 	/**
@@ -312,15 +319,15 @@ public boolean isMonitorRunning() {
 	 */
 	public void killMonitor() {
 		// clear the running flags
-		synchronized (sync_flag) {
-			keepRunning = false;
-			startRunning = false;
+		synchronized (this.sync_flag) {
+			this.keepRunning = false;
+			this.startRunning = false;
 		}
 
 		// wait until the thread is no longer running, with a timeout
-		int i = 0;
-		while (!hasCompletelyStopped && i < 100) {
-			msSleep(20);
+		var i = 0;
+		while (!this.hasCompletelyStopped && i < 100) {
+			this.msSleep(20);
 		}
 	}
 
@@ -329,17 +336,18 @@ public void killMonitor() {
 	 * network. Listeners that have registered are notified when changes in the
 	 * network are detected.
 	 */
+	@Override
 	public void run() {
-		synchronized (sync_flag) {
-			hasCompletelyStopped = false;
+		synchronized (this.sync_flag) {
+			this.hasCompletelyStopped = false;
 		}
 
-		Vector<Long> arrivals = new Vector<>(), departures = new Vector<Long>();
-		while (keepRunning) {
-			if (startRunning) {
+		Vector<Long> arrivals = new Vector<>(), departures = new Vector<>();
+		while (this.keepRunning) {
+			if (this.startRunning) {
 				// set is now running
-				synchronized (sync_flag) {
-					isRunning = true;
+				synchronized (this.sync_flag) {
+					this.isRunning = true;
 				}
 
 				// erase previous arrivals and departures
@@ -347,35 +355,33 @@ public void run() {
 				departures.setSize(0);
 
 				// number of times an error occurred during 1-Wire search
-				int errorCount = 0;
-				boolean done = false;
+				var errorCount = 0;
+				var done = false;
 				while (!done) {
 					try {
 						// search for new devices, remove stale device entries
-						search(arrivals, departures);
+						this.search(arrivals, departures);
 						done = true;
 					} catch (Exception e) {
-						if (++errorCount == max_error_count) {
-							fireException(adapter, e);
+						if (++errorCount == this.max_error_count) {
+							this.fireException(this.adapter, e);
 							done = true;
 						}
 					}
 				}
-
-				// sleep to give other threads a chance at this network
-				msSleep(200);
 			} else {
 				// not running so clear flag
-				synchronized (sync_flag) {
-					isRunning = false;
+				synchronized (this.sync_flag) {
+					this.isRunning = false;
 				}
-				msSleep(200);
 			}
+			// sleep to give other threads a chance at this network
+			this.msSleep(200);
 		}
 		// not running so clear flag
-		synchronized (sync_flag) {
-			isRunning = false;
-			hasCompletelyStopped = true;
+		synchronized (this.sync_flag) {
+			this.isRunning = false;
+			this.hasCompletelyStopped = true;
 		}
 	}
 
@@ -393,7 +399,7 @@ protected void msSleep(long msTime) {
 		try {
 			Thread.sleep(msTime);
 		} catch (InterruptedException e) {
-			;
+
 		}
 	}
 
@@ -407,8 +413,9 @@ protected void msSleep(long msTime) {
 	 * @param dmel Listener of monitor events.
 	 */
 	public void addDeviceMonitorEventListener(DeviceMonitorEventListener dmel) {
-		if (dmel != null)
+		if (dmel != null) {
 			this.listeners.addElement(dmel);
+		}
 	}
 
 	/**
@@ -418,10 +425,10 @@ public void addDeviceMonitorEventListener(DeviceMonitorEventListener dmel) {
 	 *                arrivals.
 	 */
 	protected void fireArrivalEvent(DSPortAdapter adapter, Vector<Long> address) {
-		DeviceMonitorEvent dme = new DeviceMonitorEvent(DeviceMonitorEvent.ARRIVAL, this, adapter,
+		var dme = new DeviceMonitorEvent(DeviceMonitorEvent.ARRIVAL, this, adapter,
 				(Vector<Long>) address.clone());
-		for (int i = 0; i < listeners.size(); i++) {
-			DeviceMonitorEventListener listener = (DeviceMonitorEventListener) listeners.elementAt(i);
+		for (var i = 0; i < this.listeners.size(); i++) {
+			var listener = this.listeners.elementAt(i);
 			listener.deviceArrival(dme);
 		}
 	}
@@ -433,11 +440,11 @@ protected void fireArrivalEvent(DSPortAdapter adapter, Vector<Long> address) {
 	 *                devices.
 	 */
 	protected void fireDepartureEvent(DSPortAdapter adapter, Vector<Long> address) {
-		DeviceMonitorEvent dme = new DeviceMonitorEvent(DeviceMonitorEvent.DEPARTURE, this, adapter,
+		var dme = new DeviceMonitorEvent(DeviceMonitorEvent.DEPARTURE, this, adapter,
 				(Vector<Long>) address.clone());
 
-		for (int i = 0; i < listeners.size(); i++) {
-			DeviceMonitorEventListener listener = (DeviceMonitorEventListener) listeners.elementAt(i);
+		for (var i = 0; i < this.listeners.size(); i++) {
+			var listener = this.listeners.elementAt(i);
 			listener.deviceDeparture(dme);
 		}
 	}
@@ -448,9 +455,8 @@ protected void fireDepartureEvent(DSPortAdapter adapter, Vector<Long> address) {
 	 * @param ex The exception that occurred.
 	 */
 	private void fireException(DSPortAdapter adapter, Exception ex) {
-		for (int i = 0; i < listeners.size(); i++) {
-			((DeviceMonitorEventListener) listeners.elementAt(i))
-					.networkException(new DeviceMonitorException(this, adapter, ex));
+		for (var i = 0; i < this.listeners.size(); i++) {
+			this.listeners.elementAt(i).networkException(new DeviceMonitorException(this, adapter, ex));
 		}
 	}
 
@@ -461,7 +467,7 @@ private void fireException(DSPortAdapter adapter, Exception ex) {
 	 * @return The OWPath representing the network path to the device.
 	 */
 	public OWPath getDevicePath(byte[] address) {
-		return getDevicePath(Address.toLong(address));
+		return this.getDevicePath(Address.toLong(address));
 	}
 
 	/**
@@ -471,7 +477,7 @@ public OWPath getDevicePath(byte[] address) {
 	 * @return The OWPath representing the network path to the device.
 	 */
 	public OWPath getDevicePath(String address) {
-		return getDevicePath(Address.toLong(address));
+		return this.getDevicePath(Address.toLong(address));
 	}
 
 	/**
@@ -481,7 +487,7 @@ public OWPath getDevicePath(String address) {
 	 * @return The OWPath representing the network path to the device.
 	 */
 	public OWPath getDevicePath(long address) {
-		return getDevicePath(Long.valueOf(address));
+		return this.getDevicePath(Long.valueOf(address));
 	}
 
 	/**
@@ -499,7 +505,7 @@ public OWPath getDevicePath(long address) {
 	 * @return Enumeration of Long objects
 	 */
 	public Enumeration<Long> getAllAddresses() {
-		return deviceAddressHash.keys();
+		return this.deviceAddressHash.keys();
 	}
 
 	// --------
diff --git a/io.openems.edge.bridge.onewire/src/com/dalsemi/onewire/application/monitor/ChainMonitor.java b/io.openems.edge.bridge.onewire/src/com/dalsemi/onewire/application/monitor/ChainMonitor.java
index becbc9b2f88..0eb59ff48ff 100644
--- a/io.openems.edge.bridge.onewire/src/com/dalsemi/onewire/application/monitor/ChainMonitor.java
+++ b/io.openems.edge.bridge.onewire/src/com/dalsemi/onewire/application/monitor/ChainMonitor.java
@@ -26,7 +26,6 @@
  */
 package com.dalsemi.onewire.application.monitor;
 
-import java.util.Enumeration;
 import java.util.Vector;
 
 import com.dalsemi.onewire.OneWireException;
@@ -43,7 +42,7 @@
  * have two PIO pins (PIOA and PIOB). You can chain multiple devices together by
  * connecting PIOA of one part to PIOB of the next device. The first device in
  * the chain has its PIOB grounded.
- * 
+ *
  * This monitor performs a simple search. If a branch is activated/deactivated
  * between search cycles, this monitor will see the arrival/departure of new
  * devices without reference to the branch which they lie on.
@@ -61,7 +60,7 @@ public class ChainMonitor extends AbstractDeviceMonitor {
 	 * @param adapter the DSPortAdapter this monitor should search
 	 */
 	public ChainMonitor(DSPortAdapter adapter) {
-		setAdapter(adapter);
+		this.setAdapter(adapter);
 	}
 
 	/**
@@ -69,15 +68,17 @@ public ChainMonitor(DSPortAdapter adapter) {
 	 *
 	 * @param adapter the DSPortAdapter this monitor should search
 	 */
+	@Override
 	public void setAdapter(DSPortAdapter adapter) {
-		if (adapter == null)
+		if (adapter == null) {
 			throw new IllegalArgumentException("Adapter cannot be null");
+		}
 
-		synchronized (sync_flag) {
+		synchronized (this.sync_flag) {
 			this.adapter = adapter;
-			defaultPath = new OWPath(adapter);
+			this.defaultPath = new OWPath(adapter);
 
-			resetSearch();
+			this.resetSearch();
 		}
 	}
 
@@ -87,13 +88,14 @@ public void setAdapter(DSPortAdapter adapter) {
 	 * @param address a Long object representing the address of the device
 	 * @return The OWPath representing the network path to the device.
 	 */
+	@Override
 	public OWPath getDevicePath(Long address) {
-		return defaultPath;
+		return this.defaultPath;
 	}
 
 	/**
 	 * chainOn sends the chain mode "ON" command sequence to all chain devices.
-	 * 
+	 *
 	 * @return true if successful, false otherwise
 	 */
 	public boolean chainOn() throws OneWireException, OneWireIOException {
@@ -101,32 +103,32 @@ public boolean chainOn() throws OneWireException, OneWireIOException {
 		// send chain on command
 		//
 
-		boolean returnResult = false;
-		adapter.beginExclusive(true);
+		var returnResult = false;
+		this.adapter.beginExclusive(true);
 		// master issues a reset
-		adapter.reset();
+		this.adapter.reset();
 		// master issues a Skip Rom [0xCC]
-		adapter.putByte(0xCC);
+		this.adapter.putByte(0xCC);
 		// master issues Chain Mode command [0x99]
-		adapter.putByte(0x99);
+		this.adapter.putByte(0x99);
 		// master issues chain control byte ON [0x5A]
-		adapter.putByte(0x5A);
+		this.adapter.putByte(0x5A);
 		// master issues inverse of chain control byte ON
-		adapter.putByte(~0x5A);
+		this.adapter.putByte(~0x5A);
 		// master receives response: 0xAA success, or 0x00 error
-		if (adapter.getByte() != 0xAA) {
-			adapter.endExclusive();
+		if (this.adapter.getByte() != 0xAA) {
+			this.adapter.endExclusive();
 			return returnResult;
 		}
 		returnResult = true; // successful transmission of chain "ON" command
-		adapter.endExclusive();
+		this.adapter.endExclusive();
 		return returnResult;
 	}
 
 	/**
 	 * chainConditionalReadRom sends the chain mode "DONE" command sequence to
 	 * current chain device.
-	 * 
+	 *
 	 * @param chainDeviceAddress 8-byte array for chain 1-Wire net address
 	 * @return true if successful, false otherwise
 	 */
@@ -136,39 +138,39 @@ public boolean chainConditionalReadRom(byte[] chainDeviceAddress) throws OneWire
 		//
 
 		// initialize 1-Wire net address buffer to zero
-		for (int i = 0; i < 8; i++) {
+		for (var i = 0; i < 8; i++) {
 			chainDeviceAddress[i] = 0;
 		}
 
-		boolean returnResult = false;
+		var returnResult = false;
 		// acquire adapter
-		adapter.beginExclusive(true);
+		this.adapter.beginExclusive(true);
 		// master transmits a reset
-		adapter.reset();
+		this.adapter.reset();
 		// master issues a Conditional Read ROM [0x0F]
-		adapter.putByte(0x0F);
+		this.adapter.putByte(0x0F);
 		// master receives 8 bytes of 1-Wire network address
-		for (int i = 0; i < 8; i++) {
-			chainDeviceAddress[i] = (byte) adapter.getByte();
+		for (var i = 0; i < 8; i++) {
+			chainDeviceAddress[i] = (byte) this.adapter.getByte();
 		}
-		adapter.endExclusive();
-		if (chainDeviceAddress[0] == (byte) 0x81)
+		this.adapter.endExclusive();
+		if (chainDeviceAddress[0] == (byte) 0x81) {
 			throw new OneWireException(
 					"This adapter's DS2401 ID chip interferes with chain mode.  Try another adapter.");
+		}
 
 		// check for error (if serial number is not a bunch of 0xFFs)
-		if ((chainDeviceAddress[0] == (byte) 0xFF) && (chainDeviceAddress[7] == (byte) 0xFF)) {
+		if (chainDeviceAddress[0] == (byte) 0xFF && chainDeviceAddress[7] == (byte) 0xFF) {
 			// error, so return false
 			return returnResult;
 		}
-		returnResult = true;
-		return returnResult;
+		return true;
 	}
 
 	/**
 	 * chainDone sends the chain mode "DONE" command sequence to current chain
 	 * device.
-	 * 
+	 *
 	 * @return true if successful, false otherwise
 	 */
 	public boolean chainDone() throws OneWireException, OneWireIOException {
@@ -176,31 +178,31 @@ public boolean chainDone() throws OneWireException, OneWireIOException {
 		// send chain done command
 		//
 
-		boolean returnResult = false;
-		adapter.beginExclusive(true);
+		var returnResult = false;
+		this.adapter.beginExclusive(true);
 		// master issues reset
-		adapter.reset();
+		this.adapter.reset();
 		// master issues Resume command [0xA5]
-		adapter.putByte(0xA5);
+		this.adapter.putByte(0xA5);
 		// master issues Chain Mode command [0x99]
-		adapter.putByte(0x99);
+		this.adapter.putByte(0x99);
 		// master issues chain control byte DONE [0x96]
-		adapter.putByte(0x96);
+		this.adapter.putByte(0x96);
 		// master issues inverse of chain control byte DONE
-		adapter.putByte(~0x96);
+		this.adapter.putByte(~0x96);
 		// master receives response: 0xAA success, or 0x00 error
-		if (adapter.getByte() != 0xAA) {
-			adapter.endExclusive();
+		if (this.adapter.getByte() != 0xAA) {
+			this.adapter.endExclusive();
 			return returnResult;
 		}
 		returnResult = true; // successful transmission of chain "DONE" command
-		adapter.endExclusive();
+		this.adapter.endExclusive();
 		return returnResult;
 	}
 
 	/**
 	 * chainOff sends the chain mode "OFF" command sequence to all chain devices.
-	 * 
+	 *
 	 * @return true if successful, false otherwise
 	 */
 	public boolean chainOff() throws OneWireException, OneWireIOException {
@@ -208,25 +210,25 @@ public boolean chainOff() throws OneWireException, OneWireIOException {
 		// send chain off command
 		//
 
-		boolean returnResult = false;
-		adapter.beginExclusive(true);
+		var returnResult = false;
+		this.adapter.beginExclusive(true);
 		// master issues reset
-		adapter.reset();
+		this.adapter.reset();
 		// master issues a skip rom command [0xCC]
-		adapter.putByte(0xCC);
+		this.adapter.putByte(0xCC);
 		// master issues Chain Mode command [0x99]
-		adapter.putByte(0x99);
+		this.adapter.putByte(0x99);
 		// master issues chain control byte OFF [0x3C]
-		adapter.putByte(0x3C);
+		this.adapter.putByte(0x3C);
 		// master issues inverse of chain control byte OFF
-		adapter.putByte(~0x3C); // bitwise complement of 0x3C
+		this.adapter.putByte(~0x3C); // bitwise complement of 0x3C
 		// master receives response: 0xAA success, or 0x00 error
-		if (adapter.getByte() != 0xAA) {
-			adapter.endExclusive();
+		if (this.adapter.getByte() != 0xAA) {
+			this.adapter.endExclusive();
 			return returnResult;
 		}
 		returnResult = true; // successful transmission of chain "OFF" command
-		adapter.endExclusive();
+		this.adapter.endExclusive();
 		return returnResult;
 	}
 
@@ -236,72 +238,79 @@ public boolean chainOff() throws OneWireException, OneWireIOException {
 	 * @param arrivals   A vector of Long objects, represent new arrival addresses.
 	 * @param departures A vector of Long objects, represent departed addresses.
 	 */
+	@Override
 	public void search(Vector<Long> arrivals, Vector<Long> departures) throws OneWireException, OneWireIOException {
-		synchronized (sync_flag) {
+		synchronized (this.sync_flag) {
 			try {
-				byte[] chainDeviceAddress = new byte[8];
-				for (int i = 0; i < 8; i++) {
+				var chainDeviceAddress = new byte[8];
+				for (var i = 0; i < 8; i++) {
 					chainDeviceAddress[i] = 0;
 				}
 
 				// get exclusive use of 1-Wire network
-				adapter.beginExclusive(true);
+				this.adapter.beginExclusive(true);
 
 				// clear any previous search restrictions
-				adapter.setSearchAllDevices();
-				adapter.targetAllFamilies();
-				adapter.setSpeed(DSPortAdapter.SPEED_REGULAR);
-				adapter.endExclusive();
+				this.adapter.setSearchAllDevices();
+				this.adapter.targetAllFamilies();
+				this.adapter.setSpeed(DSPortAdapter.SPEED_REGULAR);
+				this.adapter.endExclusive();
 
 				// perform chain mode search
 				// send chain mode "ON" sequence
-				if (chainOn()) {
+				if (this.chainOn()) {
 					// loop on sending chain mode "Conditional Read ROM" until method returns false
-					while (chainConditionalReadRom(chainDeviceAddress)) {
-						Long longAddress = Long.valueOf(Address.toLong(chainDeviceAddress));
-						if (!deviceAddressHash.containsKey(longAddress) && arrivals != null)
+					while (this.chainConditionalReadRom(chainDeviceAddress)) {
+						var longAddress = Long.valueOf(Address.toLong(chainDeviceAddress));
+						if (!this.deviceAddressHash.containsKey(longAddress) && arrivals != null) {
 							arrivals.addElement(longAddress);
+						}
 
-						deviceAddressHash.put(longAddress, Integer.valueOf(max_state_count));
+						this.deviceAddressHash.put(longAddress, Integer.valueOf(this.max_state_count));
 						// send chain mode "DONE" sequence
-						if (!chainDone())
+						if (!this.chainDone()) {
 							throw new OneWireIOException(
 									"Transmission error occurred attempting to send chain control byte DONE.");
+						}
 					}
 					// send chain mode "OFF" sequence
-					if (!chainOff())
+					if (!this.chainOff()) {
 						throw new OneWireIOException(
 								"Transmission error occurred attempting to send chain control byte OFF.");
+					}
 				}
 			} finally {
-				adapter.endExclusive();
+				this.adapter.endExclusive();
 			}
 
 			// remove any devices that have not been seen
-			for (Enumeration<Long> device_enum = deviceAddressHash.keys(); device_enum.hasMoreElements();) {
-				Long longAddress = (Long) device_enum.nextElement();
+			for (var device_enum = this.deviceAddressHash.keys(); device_enum.hasMoreElements();) {
+				var longAddress = device_enum.nextElement();
 
 				// check for removal by looking at state counter
-				int cnt = ((Integer) deviceAddressHash.get(longAddress)).intValue();
+				var cnt = this.deviceAddressHash.get(longAddress).intValue();
 				if (cnt <= 0) {
-					deviceAddressHash.remove(longAddress);
-					if (departures != null)
+					this.deviceAddressHash.remove(longAddress);
+					if (departures != null) {
 						departures.addElement(longAddress);
+					}
 
 					synchronized (deviceContainerHash) {
 						deviceContainerHash.remove(longAddress);
 					}
 				} else {
 					// it stays
-					deviceAddressHash.put(longAddress, Integer.valueOf(cnt - 1));
+					this.deviceAddressHash.put(longAddress, Integer.valueOf(cnt - 1));
 				}
 			}
 
 			// fire notification events
-			if (arrivals != null && arrivals.size() > 0)
-				fireArrivalEvent(adapter, arrivals);
-			if (departures != null && departures.size() > 0)
-				fireDepartureEvent(adapter, departures);
+			if (arrivals != null && arrivals.size() > 0) {
+				this.fireArrivalEvent(this.adapter, arrivals);
+			}
+			if (departures != null && departures.size() > 0) {
+				this.fireDepartureEvent(this.adapter, departures);
+			}
 		}
 	}
 
@@ -316,16 +325,16 @@ public Vector<OneWireContainer> toContainerVector(Vector<Long> arrivals)
 			throws OneWireException, OneWireIOException {
 		OneWireContainer owd;
 		Long OneWireAddress;
-		Vector<OneWireContainer> containerVector = new Vector<>();
+		var containerVector = new Vector<OneWireContainer>();
 
 		// loop through all the 1-Wire devices found in arrivals list
-		adapter.beginExclusive(true);
-		for (int i = 0; i < arrivals.size(); i++) {
-			OneWireAddress = (Long) arrivals.elementAt(i);
-			owd = adapter.getDeviceContainer(OneWireAddress.longValue());
+		this.adapter.beginExclusive(true);
+		for (var i = 0; i < arrivals.size(); i++) {
+			OneWireAddress = arrivals.elementAt(i);
+			owd = this.adapter.getDeviceContainer(OneWireAddress.longValue());
 			containerVector.addElement(owd);
 		}
-		adapter.endExclusive();
+		this.adapter.endExclusive();
 		return containerVector;
 	}
 }
diff --git a/io.openems.edge.bridge.onewire/src/com/dalsemi/onewire/application/monitor/DeviceMonitor.java b/io.openems.edge.bridge.onewire/src/com/dalsemi/onewire/application/monitor/DeviceMonitor.java
index 9d22c03a683..b27545d24ef 100644
--- a/io.openems.edge.bridge.onewire/src/com/dalsemi/onewire/application/monitor/DeviceMonitor.java
+++ b/io.openems.edge.bridge.onewire/src/com/dalsemi/onewire/application/monitor/DeviceMonitor.java
@@ -26,7 +26,6 @@
  */
 package com.dalsemi.onewire.application.monitor;
 
-import java.util.Enumeration;
 import java.util.Vector;
 
 import com.dalsemi.onewire.OneWireException;
@@ -57,7 +56,7 @@ public class DeviceMonitor extends AbstractDeviceMonitor {
 	 * @param adapter the DSPortAdapter this monitor should search
 	 */
 	public DeviceMonitor(DSPortAdapter adapter) {
-		setAdapter(adapter);
+		this.setAdapter(adapter);
 	}
 
 	/**
@@ -65,15 +64,17 @@ public DeviceMonitor(DSPortAdapter adapter) {
 	 *
 	 * @param adapter the DSPortAdapter this monitor should search
 	 */
+	@Override
 	public void setAdapter(DSPortAdapter adapter) {
-		if (adapter == null)
+		if (adapter == null) {
 			throw new IllegalArgumentException("Adapter cannot be null");
+		}
 
-		synchronized (sync_flag) {
+		synchronized (this.sync_flag) {
 			this.adapter = adapter;
-			defaultPath = new OWPath(adapter);
+			this.defaultPath = new OWPath(adapter);
 
-			resetSearch();
+			this.resetSearch();
 		}
 	}
 
@@ -83,8 +84,9 @@ public void setAdapter(DSPortAdapter adapter) {
 	 * @param address a Long object representing the address of the device
 	 * @return The OWPath representing the network path to the device.
 	 */
+	@Override
 	public OWPath getDevicePath(Long address) {
-		return defaultPath;
+		return this.defaultPath;
 	}
 
 	/**
@@ -93,8 +95,8 @@ public OWPath getDevicePath(Long address) {
 	 * @param findAlarmingParts
 	 */
 	public void setDoAlarmSearch(boolean findAlarmingParts) {
-		synchronized (sync_flag) {
-			doAlarmSearch = findAlarmingParts;
+		synchronized (this.sync_flag) {
+			this.doAlarmSearch = findAlarmingParts;
 		}
 	}
 
@@ -102,7 +104,7 @@ public void setDoAlarmSearch(boolean findAlarmingParts) {
 	 * See if Gets this monitor to search for alarming parts.
 	 */
 	public boolean getDoAlarmSearch() {
-		return doAlarmSearch;
+		return this.doAlarmSearch;
 	}
 
 	/**
@@ -111,71 +113,77 @@ public boolean getDoAlarmSearch() {
 	 * @param arrivals   A vector of Long objects, represent new arrival addresses.
 	 * @param departures A vector of Long objects, represent departed addresses.
 	 */
+	@Override
 	public void search(Vector<Long> arrivals, Vector<Long> departures) throws OneWireException, OneWireIOException {
-		synchronized (sync_flag) {
+		synchronized (this.sync_flag) {
 			try {
 				// acquire the adapter
-				adapter.beginExclusive(true);
+				this.adapter.beginExclusive(true);
 
 				// setup the search
-				adapter.setSearchAllDevices();
-				adapter.targetAllFamilies();
-				adapter.setSpeed(DSPortAdapter.SPEED_REGULAR);
+				this.adapter.setSearchAllDevices();
+				this.adapter.targetAllFamilies();
+				this.adapter.setSpeed(DSPortAdapter.SPEED_REGULAR);
 
-				boolean search_result = adapter.findFirstDevice();
+				var search_result = this.adapter.findFirstDevice();
 
 				// loop while devices found
 				while (search_result) {
 					// get the 1-Wire address
-					Long longAddress = Long.valueOf(adapter.getAddressAsLong());
+					var longAddress = Long.valueOf(this.adapter.getAddressAsLong());
 					// if requested to do an alarm search, then check device for an alarm condition
 					// and save in list
-					if (doAlarmSearch) {
-						if (adapter.isAlarming(longAddress.longValue())) {
-							if (!deviceAddressHash.containsKey(longAddress) && arrivals != null)
+					if (this.doAlarmSearch) {
+						if (this.adapter.isAlarming(longAddress.longValue())) {
+							if (!this.deviceAddressHash.containsKey(longAddress) && arrivals != null) {
 								arrivals.addElement(longAddress);
+							}
 
-							deviceAddressHash.put(longAddress, Integer.valueOf(max_state_count));
+							this.deviceAddressHash.put(longAddress, Integer.valueOf(this.max_state_count));
 						}
 					} else {
-						if (!deviceAddressHash.containsKey(longAddress) && arrivals != null)
+						if (!this.deviceAddressHash.containsKey(longAddress) && arrivals != null) {
 							arrivals.addElement(longAddress);
+						}
 
-						deviceAddressHash.put(longAddress, Integer.valueOf(max_state_count));
+						this.deviceAddressHash.put(longAddress, Integer.valueOf(this.max_state_count));
 					}
 
 					// search for the next device
-					search_result = adapter.findNextDevice();
+					search_result = this.adapter.findNextDevice();
 				}
 			} finally {
-				adapter.endExclusive();
+				this.adapter.endExclusive();
 			}
 
 			// remove any devices that have not been seen
-			for (Enumeration<Long> device_enum = deviceAddressHash.keys(); device_enum.hasMoreElements();) {
-				Long longAddress = (Long) device_enum.nextElement();
+			for (var device_enum = this.deviceAddressHash.keys(); device_enum.hasMoreElements();) {
+				var longAddress = device_enum.nextElement();
 
 				// check for removal by looking at state counter
-				int cnt = ((Integer) deviceAddressHash.get(longAddress)).intValue();
+				var cnt = this.deviceAddressHash.get(longAddress).intValue();
 				if (cnt <= 0) {
-					deviceAddressHash.remove(longAddress);
-					if (departures != null)
+					this.deviceAddressHash.remove(longAddress);
+					if (departures != null) {
 						departures.addElement(longAddress);
+					}
 
 					synchronized (deviceContainerHash) {
 						deviceContainerHash.remove(longAddress);
 					}
 				} else {
 					// it stays
-					deviceAddressHash.put(longAddress, Integer.valueOf(cnt - 1));
+					this.deviceAddressHash.put(longAddress, Integer.valueOf(cnt - 1));
 				}
 			}
 
 			// fire notification events
-			if (arrivals != null && arrivals.size() > 0)
-				fireArrivalEvent(adapter, arrivals);
-			if (departures != null && departures.size() > 0)
-				fireDepartureEvent(adapter, departures);
+			if (arrivals != null && arrivals.size() > 0) {
+				this.fireArrivalEvent(this.adapter, arrivals);
+			}
+			if (departures != null && departures.size() > 0) {
+				this.fireDepartureEvent(this.adapter, departures);
+			}
 		}
 	}
 }
diff --git a/io.openems.edge.bridge.onewire/src/com/dalsemi/onewire/application/monitor/DeviceMonitorEvent.java b/io.openems.edge.bridge.onewire/src/com/dalsemi/onewire/application/monitor/DeviceMonitorEvent.java
index 9ef845c445a..056a39c96ed 100644
--- a/io.openems.edge.bridge.onewire/src/com/dalsemi/onewire/application/monitor/DeviceMonitorEvent.java
+++ b/io.openems.edge.bridge.onewire/src/com/dalsemi/onewire/application/monitor/DeviceMonitorEvent.java
@@ -66,8 +66,9 @@ public class DeviceMonitorEvent extends EventObject {
 	DeviceMonitorEvent(int eventType, AbstractDeviceMonitor source, DSPortAdapter adapter, Vector<Long> addresses) {
 		super(source);
 
-		if (eventType != ARRIVAL && eventType != DEPARTURE)
+		if (eventType != ARRIVAL && eventType != DEPARTURE) {
 			throw new IllegalArgumentException("Invalid event type: " + eventType);
+		}
 		this.eventType = eventType;
 		this.monitor = source;
 		this.adapter = adapter;
@@ -116,8 +117,8 @@ public int getDeviceCount() {
 	 * @return the OneWireContainer for the address at the specified index
 	 */
 	public OneWireContainer getContainerAt(int index) {
-		Long longAddress = (Long) this.vDeviceAddress.elementAt(index);
-		return AbstractDeviceMonitor.getDeviceContainer(adapter, longAddress);
+		var longAddress = this.vDeviceAddress.elementAt(index);
+		return AbstractDeviceMonitor.getDeviceContainer(this.adapter, longAddress);
 	}
 
 	/**
@@ -126,7 +127,7 @@ public OneWireContainer getContainerAt(int index) {
 	 * @return the Path object for the device at the specified index
 	 */
 	public OWPath getPathForContainerAt(int index) {
-		Long longAddress = (Long) this.vDeviceAddress.elementAt(index);
+		var longAddress = this.vDeviceAddress.elementAt(index);
 		return this.monitor.getDevicePath(longAddress);
 	}
 
@@ -136,7 +137,7 @@ public OWPath getPathForContainerAt(int index) {
 	 * @return the device address at the specified index
 	 */
 	public long getAddressAsLongAt(int index) {
-		return ((Long) this.vDeviceAddress.elementAt(index)).longValue();
+		return this.vDeviceAddress.elementAt(index).longValue();
 	}
 
 	/**
@@ -145,7 +146,7 @@ public long getAddressAsLongAt(int index) {
 	 * @return the device address at the specified index
 	 */
 	public byte[] getAddressAt(int index) {
-		return Address.toByteArray(getAddressAsLongAt(index));
+		return Address.toByteArray(this.getAddressAsLongAt(index));
 	}
 
 	/**
@@ -154,6 +155,6 @@ public byte[] getAddressAt(int index) {
 	 * @return the device address at the specified index
 	 */
 	public String getAddressAsStringAt(int index) {
-		return Address.toString(getAddressAsLongAt(index));
+		return Address.toString(this.getAddressAsLongAt(index));
 	}
 }
\ No newline at end of file
diff --git a/io.openems.edge.bridge.onewire/src/com/dalsemi/onewire/application/monitor/DeviceMonitorException.java b/io.openems.edge.bridge.onewire/src/com/dalsemi/onewire/application/monitor/DeviceMonitorException.java
index b5bd4c77ad2..3a96b10c84c 100644
--- a/io.openems.edge.bridge.onewire/src/com/dalsemi/onewire/application/monitor/DeviceMonitorException.java
+++ b/io.openems.edge.bridge.onewire/src/com/dalsemi/onewire/application/monitor/DeviceMonitorException.java
@@ -85,7 +85,7 @@ public DSPortAdapter getAdapter() {
 	 * @return the wrapped exception that was generated during a 1-Wire search.
 	 */
 	public Exception getException() {
-		return exception;
+		return this.exception;
 	}
 
 	/**
@@ -93,7 +93,7 @@ public Exception getException() {
 	 *
 	 */
 	public void throwException() throws Exception {
-		throw exception;
+		throw this.exception;
 	}
 
 	/**
@@ -101,7 +101,8 @@ public void throwException() throws Exception {
 	 *
 	 * @return a string representation of this object
 	 */
+	@Override
 	public String toString() {
-		return "Device Monitor Exception: " + exception.toString();
+		return "Device Monitor Exception: " + this.exception.toString();
 	}
 }
\ No newline at end of file
diff --git a/io.openems.edge.bridge.onewire/src/com/dalsemi/onewire/application/monitor/NetworkDeviceMonitor.java b/io.openems.edge.bridge.onewire/src/com/dalsemi/onewire/application/monitor/NetworkDeviceMonitor.java
index 59bb937c7b9..43a082922d8 100644
--- a/io.openems.edge.bridge.onewire/src/com/dalsemi/onewire/application/monitor/NetworkDeviceMonitor.java
+++ b/io.openems.edge.bridge.onewire/src/com/dalsemi/onewire/application/monitor/NetworkDeviceMonitor.java
@@ -27,14 +27,12 @@
 
 package com.dalsemi.onewire.application.monitor;
 
-import java.util.Enumeration;
 import java.util.Hashtable;
 import java.util.Vector;
 
 import com.dalsemi.onewire.OneWireException;
 import com.dalsemi.onewire.adapter.DSPortAdapter;
 import com.dalsemi.onewire.adapter.OneWireIOException;
-import com.dalsemi.onewire.container.OneWireContainer;
 import com.dalsemi.onewire.container.SwitchContainer;
 import com.dalsemi.onewire.utils.OWPath;
 
@@ -60,7 +58,7 @@ public class NetworkDeviceMonitor extends AbstractDeviceMonitor {
 	 * @param adapter the DSPortAdapter this monitor should search
 	 */
 	public NetworkDeviceMonitor(DSPortAdapter adapter) {
-		setAdapter(adapter);
+		this.setAdapter(adapter);
 	}
 
 	/**
@@ -68,20 +66,23 @@ public NetworkDeviceMonitor(DSPortAdapter adapter) {
 	 *
 	 * @param adapter the DSPortAdapter this monitor should search
 	 */
+	@Override
 	public void setAdapter(DSPortAdapter adapter) {
-		if (adapter == null)
+		if (adapter == null) {
 			throw new IllegalArgumentException("Adapter cannot be null");
+		}
 
-		synchronized (sync_flag) {
+		synchronized (this.sync_flag) {
 			this.adapter = adapter;
 
-			if (this.paths == null)
+			if (this.paths == null) {
 				this.paths = new Vector<>();
-			else
+			} else {
 				this.paths.setSize(0);
+			}
 			this.paths.addElement(new OWPath(adapter));
 
-			resetSearch();
+			this.resetSearch();
 		}
 	}
 
@@ -114,7 +115,7 @@ public boolean getBranchAutoSearching() {
 	 * @param path A branch to be searched during the next search routine
 	 */
 	public void addBranch(OWPath path) {
-		paths.addElement(path);
+		this.paths.addElement(path);
 	}
 
 	/**
@@ -123,9 +124,10 @@ public void addBranch(OWPath path) {
 	 * @param address a Long object representing the address of the device
 	 * @return The OWPath representing the network path to the device.
 	 */
+	@Override
 	public OWPath getDevicePath(Long address) {
-		synchronized (devicePathHash) {
-			return (OWPath) devicePathHash.get(address);
+		synchronized (this.devicePathHash) {
+			return this.devicePathHash.get(address);
 		}
 	}
 
@@ -137,13 +139,15 @@ public OWPath getDevicePath(Long address) {
 	 * a touch-contact environment which could run for some time and needs to
 	 * conserve memory.
 	 */
+	@Override
 	public void cleanUpStalePathReferences() {
-		synchronized (devicePathHash) {
-			Enumeration<Long> e = devicePathHash.keys();
+		synchronized (this.devicePathHash) {
+			var e = this.devicePathHash.keys();
 			while (e.hasMoreElements()) {
 				Object o = e.nextElement();
-				if (!deviceAddressHash.containsKey(o))
-					devicePathHash.remove(o);
+				if (!this.deviceAddressHash.containsKey(o)) {
+					this.devicePathHash.remove(o);
+				}
 			}
 		}
 	}
@@ -154,34 +158,35 @@ public void cleanUpStalePathReferences() {
 	 * @param arrivals   A vector of Long objects, represent new arrival addresses.
 	 * @param departures A vector of Long objects, represent departed addresses.
 	 */
+	@Override
 	public void search(Vector<Long> arrivals, Vector<Long> departures) throws OneWireException, OneWireIOException {
-		synchronized (sync_flag) {
+		synchronized (this.sync_flag) {
 			try {
 				// acquire the adapter
-				adapter.beginExclusive(true);
+				this.adapter.beginExclusive(true);
 
 				// setup the search
-				adapter.setSearchAllDevices();
-				adapter.targetAllFamilies();
-				adapter.setSpeed(DSPortAdapter.SPEED_REGULAR);
+				this.adapter.setSearchAllDevices();
+				this.adapter.targetAllFamilies();
+				this.adapter.setSpeed(DSPortAdapter.SPEED_REGULAR);
 
 				// close any opened branches
-				for (int j = 0; j < paths.size(); j++) {
+				for (var j = 0; j < this.paths.size(); j++) {
 					try {
-						((OWPath) paths.elementAt(j)).close();
+						this.paths.elementAt(j).close();
 					} catch (Exception e) {
-						;
+
 					}
 				}
 
 				// search through all of the paths
-				for (int i = 0; i < paths.size(); i++) {
+				for (var i = 0; i < this.paths.size(); i++) {
 					// set searches to not use reset
-					adapter.setNoResetSearch();
+					this.adapter.setNoResetSearch();
 
 					// find the first device on this branch
-					boolean search_result = false;
-					OWPath path = (OWPath) paths.elementAt(i);
+					var search_result = false;
+					var path = this.paths.elementAt(i);
 					try {
 						// try to open the current path
 						path.open();
@@ -190,79 +195,86 @@ public void search(Vector<Long> arrivals, Vector<Long> departures) throws OneWir
 						continue;
 					}
 
-					search_result = adapter.findFirstDevice();
+					search_result = this.adapter.findFirstDevice();
 
 					// loop while devices found
 					while (search_result) {
 						// get the 1-Wire address
-						Long longAddress = Long.valueOf(adapter.getAddressAsLong());
+						var longAddress = Long.valueOf(this.adapter.getAddressAsLong());
 						// check if the device already exists in our hashtable
-						if (!deviceAddressHash.containsKey(longAddress)) {
-							OneWireContainer owc = getDeviceContainer(adapter, longAddress);
+						if (!this.deviceAddressHash.containsKey(longAddress)) {
+							var owc = getDeviceContainer(this.adapter, longAddress);
 							// check to see if it's a switch and if we are supposed
 							// to automatically search down branches
-							if (this.branchAutoSearching && (owc instanceof SwitchContainer)) {
-								SwitchContainer sc = (SwitchContainer) owc;
-								byte[] state = sc.readDevice();
-								for (int j = 0; j < sc.getNumberChannels(state); j++) {
-									OWPath tmp = new OWPath(adapter, path);
+							if (this.branchAutoSearching && owc instanceof SwitchContainer) {
+								var sc = (SwitchContainer) owc;
+								var state = sc.readDevice();
+								for (var j = 0; j < sc.getNumberChannels(state); j++) {
+									var tmp = new OWPath(this.adapter, path);
 									tmp.add(owc, j);
-									if (!paths.contains(tmp))
-										paths.addElement(tmp);
+									if (!this.paths.contains(tmp)) {
+										this.paths.addElement(tmp);
+									}
 								}
 							}
 
-							synchronized (devicePathHash) {
-								devicePathHash.put(longAddress, path);
+							synchronized (this.devicePathHash) {
+								this.devicePathHash.put(longAddress, path);
 							}
-							if (arrivals != null)
+							if (arrivals != null) {
 								arrivals.addElement(longAddress);
+							}
 						}
 						// check if the existing device moved
-						else if (!path.equals((OWPath) devicePathHash.get(longAddress))) {
-							synchronized (devicePathHash) {
-								devicePathHash.put(longAddress, path);
+						else if (!path.equals(this.devicePathHash.get(longAddress))) {
+							synchronized (this.devicePathHash) {
+								this.devicePathHash.put(longAddress, path);
 							}
-							if (departures != null)
+							if (departures != null) {
 								departures.addElement(longAddress);
-							if (arrivals != null)
+							}
+							if (arrivals != null) {
 								arrivals.addElement(longAddress);
+							}
 						}
 
 						// update count
-						deviceAddressHash.put(longAddress, Integer.valueOf(max_state_count));
+						this.deviceAddressHash.put(longAddress, Integer.valueOf(this.max_state_count));
 
 						// find the next device on this branch
 						path.open();
-						search_result = adapter.findNextDevice();
+						search_result = this.adapter.findNextDevice();
 					}
 				}
 			} finally {
-				adapter.endExclusive();
+				this.adapter.endExclusive();
 			}
 
 			// remove any devices that have not been seen
-			for (Enumeration<Long> device_enum = deviceAddressHash.keys(); device_enum.hasMoreElements();) {
-				Long longAddress = (Long) device_enum.nextElement();
+			for (var device_enum = this.deviceAddressHash.keys(); device_enum.hasMoreElements();) {
+				var longAddress = device_enum.nextElement();
 
 				// check for removal by looking at state counter
-				int cnt = ((Integer) deviceAddressHash.get(longAddress)).intValue();
+				var cnt = this.deviceAddressHash.get(longAddress).intValue();
 				if (cnt <= 0) {
 					// device entry is stale, should be removed
-					deviceAddressHash.remove(longAddress);
-					if (departures != null)
+					this.deviceAddressHash.remove(longAddress);
+					if (departures != null) {
 						departures.addElement(longAddress);
+					}
 				} else {
 					// device entry isn't stale, it stays
-					deviceAddressHash.put(longAddress, Integer.valueOf(cnt - 1));
+					this.deviceAddressHash.put(longAddress, Integer.valueOf(cnt - 1));
 				}
 			}
 
 			// fire notification events
-			if (departures != null && departures.size() > 0)
-				fireDepartureEvent(adapter, departures);
-			if (arrivals != null && arrivals.size() > 0)
-				fireArrivalEvent(adapter, arrivals);
+			if (departures != null && departures.size() > 0) {
+				this.fireDepartureEvent(this.adapter, departures);
+			}
+			if (arrivals != null && arrivals.size() > 0) {
+				this.fireArrivalEvent(this.adapter, arrivals);
+			}
 		}
 	}
 
diff --git a/io.openems.edge.bridge.onewire/src/com/dalsemi/onewire/application/sha/SHADebit.java b/io.openems.edge.bridge.onewire/src/com/dalsemi/onewire/application/sha/SHADebit.java
index 9cc7f2e610a..a522ba91d8d 100644
--- a/io.openems.edge.bridge.onewire/src/com/dalsemi/onewire/application/sha/SHADebit.java
+++ b/io.openems.edge.bridge.onewire/src/com/dalsemi/onewire/application/sha/SHADebit.java
@@ -53,7 +53,7 @@
  *
  * <P>
  * A typical use case for this class might be as follows:
- * 
+ *
  * <pre>
  * OneWireContainer18 coprOWC18 = new OneWireContainer18(adapter, address);
  *
@@ -120,10 +120,9 @@
  * @version 1.00
  * @author SKH
  */
-@SuppressWarnings({ "unused" })
 public class SHADebit extends SHATransaction {
 	/** Used for fast FF copy */
-	private static final byte[] ffBlock = new byte[] { (byte) 0xFF, (byte) 0xFF, (byte) 0xFF, (byte) 0xFF, (byte) 0xFF,
+	private static final byte[] ffBlock = { (byte) 0xFF, (byte) 0xFF, (byte) 0xFF, (byte) 0xFF, (byte) 0xFF,
 			(byte) 0xFF, (byte) 0xFF, (byte) 0xFF };
 
 	// ************************************************************** //
@@ -163,7 +162,7 @@ public class SHADebit extends SHATransaction {
 
 	/** User apps should never call this */
 	protected SHADebit() {
-		;
+
 	}
 
 	/**
@@ -178,7 +177,7 @@ protected SHADebit() {
 	public SHADebit(SHAiButtonCopr copr) {
 		super(copr);
 
-		resetParameters();
+		this.resetParameters();
 	}
 
 	/**
@@ -237,22 +236,23 @@ public SHADebit(SHAiButtonCopr copr, int initialAmount, int debitAmount) {
 	 * @see SHAiButtonUser#writeAccountData(byte[],int)
 	 * @see #getLastError()
 	 */
+	@Override
 	public boolean setupTransactionData(SHAiButtonUser user) throws OneWireException, OneWireIOException {
 		// clear any error
-		lastError = NO_ERROR;
+		this.lastError = NO_ERROR;
 
 		// not in critical path, so malloc'ing is okay
-		byte[] accountData = new byte[32];
+		var accountData = new byte[32];
 
-		return writeTransactionData(user, 0, this.initialAmount, accountData);
+		return this.writeTransactionData(user, 0, this.initialAmount, accountData);
 	}
 
 	// prevent malloc'ing in the critical path
-	private byte[] verifyUser_fullBindCode = new byte[15];
-	private byte[] verifyUser_scratchpad = new byte[32];
-	private byte[] verifyUser_accountData = new byte[32];
-	private byte[] verifyUser_mac = new byte[20];
-	private byte[] verifyUser_chlg = new byte[3];
+	private final byte[] verifyUser_fullBindCode = new byte[15];
+	private final byte[] verifyUser_scratchpad = new byte[32];
+	private final byte[] verifyUser_accountData = new byte[32];
+	private final byte[] verifyUser_mac = new byte[20];
+	private final byte[] verifyUser_chlg = new byte[3];
 
 	/**
 	 * <P>
@@ -279,26 +279,27 @@ public boolean setupTransactionData(SHAiButtonUser user) throws OneWireException
 	 * @see SHAiButtonUser#readAccountData(byte[],int,byte[],int,byte[],int)
 	 * @see #getLastError()
 	 */
+	@Override
 	public synchronized boolean verifyUser(SHAiButtonUser user) throws OneWireException, OneWireIOException {
 		// clear any error
 		this.lastError = SHATransaction.NO_ERROR;
 
 		// local vars
-		byte[] fullBindCode = this.verifyUser_fullBindCode;
-		byte[] scratchpad = this.verifyUser_scratchpad;
-		byte[] accountData = this.verifyUser_accountData;
-		byte[] mac = this.verifyUser_mac;
-		byte[] chlg = this.verifyUser_chlg;
+		var fullBindCode = this.verifyUser_fullBindCode;
+		var scratchpad = this.verifyUser_scratchpad;
+		var accountData = this.verifyUser_accountData;
+		var mac = this.verifyUser_mac;
+		var chlg = this.verifyUser_chlg;
 
 		// Generate random challenge. This must be done on the
 		// coprocessor, otherwise flags aren't setup for VALIDATE_PAGE.
-		if (!copr.generateChallenge(0, chlg, 0)) {
-			lastError = COPR_COMPUTE_CHALLENGE_FAILED;
+		if (!this.copr.generateChallenge(0, chlg, 0)) {
+			this.lastError = COPR_COMPUTE_CHALLENGE_FAILED;
 			return false;
 		}
 
 		// have user answer the challenge
-		int wcc = user.readAccountData(chlg, 0, accountData, 0, mac, 0);
+		var wcc = user.readAccountData(chlg, 0, accountData, 0, mac, 0);
 
 		if (wcc < 0) {
 			if (user.hasWriteCycleCounter()) {
@@ -340,7 +341,8 @@ public synchronized boolean verifyUser(SHAiButtonUser user) throws OneWireExcept
 		}
 		// \\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//
 
-		if (!copr.verifyAuthentication(fullBindCode, accountData, scratchpad, mac, user.getAuthorizationCommand())) {
+		if (!this.copr.verifyAuthentication(fullBindCode, accountData, scratchpad, mac,
+				user.getAuthorizationCommand())) {
 			this.lastError = SHATransaction.COPROCESSOR_FAILURE;
 			return false;
 		}
@@ -348,11 +350,9 @@ public synchronized boolean verifyUser(SHAiButtonUser user) throws OneWireExcept
 		return true;
 	}
 
-	// prevent malloc'ing in the critical path
-	private byte[] verifyData_fullBindCode = new byte[32];
-	private byte[] verifyData_scratchpad = new byte[32];
-	private byte[] verifyData_accountData = new byte[32];
-	private byte[] verifyData_mac = new byte[20];
+	private final byte[] verifyData_scratchpad = new byte[32];
+	private final byte[] verifyData_accountData = new byte[32];
+	private final byte[] verifyData_mac = new byte[20];
 
 	/**
 	 * <P>
@@ -390,23 +390,24 @@ public synchronized boolean verifyUser(SHAiButtonUser user) throws OneWireExcept
 	 * @see SHAiButtonCopr#verifySignature(byte[],byte[],byte[])
 	 * @see #getLastError()
 	 */
+	@Override
 	public synchronized boolean verifyTransactionData(SHAiButtonUser user) throws OneWireException, OneWireIOException {
 		// clear any error
 		this.lastError = NO_ERROR;
 
 		// init local vars
-		byte[] scratchpad = this.verifyData_scratchpad;
-		byte[] accountData = this.verifyData_accountData;
-		byte[] verify_mac = this.verifyData_mac;
+		var scratchpad = this.verifyData_scratchpad;
+		var accountData = this.verifyData_accountData;
+		var verify_mac = this.verifyData_mac;
 
 		// if verifyUser was called, this is a read of cached data
-		int wcc = user.getWriteCycleCounter();
+		var wcc = user.getWriteCycleCounter();
 
 		// if verifyUser was called, this is a read of cached data
 		user.readAccountData(accountData, 0);
 
 		// get the user's balance from accountData
-		int balance = Convert.toInt(accountData, I_BALANCE, 3);
+		var balance = Convert.toInt(accountData, I_BALANCE, 3);
 		if (balance < 0) {
 			this.lastError = USER_BAD_ACCOUNT_DATA;
 			return false;
@@ -417,7 +418,7 @@ public synchronized boolean verifyTransactionData(SHAiButtonUser user) throws On
 		System.arraycopy(accountData, I_SIGNATURE, verify_mac, 0, 20);
 
 		// now lets reset the mac
-		copr.getInitialSignature(accountData, I_SIGNATURE);
+		this.copr.getInitialSignature(accountData, I_SIGNATURE);
 		// and reset the CRC
 		accountData[I_FILE_CRC16 + 0] = (byte) 0;
 		accountData[I_FILE_CRC16 + 1] = (byte) 0;
@@ -438,9 +439,9 @@ public synchronized boolean verifyTransactionData(SHAiButtonUser user) throws On
 		scratchpad[12] = (byte) user.getAccountPageNumber();
 		user.getAddress(scratchpad, 13, 7);
 
-		copr.getSigningChallenge(scratchpad, 20);
+		this.copr.getSigningChallenge(scratchpad, 20);
 
-		if (!copr.verifySignature(accountData, scratchpad, verify_mac)) {
+		if (!this.copr.verifySignature(accountData, scratchpad, verify_mac)) {
 			this.lastError = COPROCESSOR_FAILURE;
 			return false;
 		}
@@ -449,9 +450,9 @@ public synchronized boolean verifyTransactionData(SHAiButtonUser user) throws On
 	}
 
 	// prevent malloc'ing in critical path
-	private byte[] executeTransaction_accountData = new byte[32];
-	private byte[] executeTransaction_oldAcctData = new byte[32];
-	private byte[] executeTransaction_newAcctData = new byte[32];
+	private final byte[] executeTransaction_accountData = new byte[32];
+	private final byte[] executeTransaction_oldAcctData = new byte[32];
+	private final byte[] executeTransaction_newAcctData = new byte[32];
 
 	// private byte[] executeTransaction_scratchpad = new byte[32];
 	/**
@@ -495,6 +496,7 @@ public synchronized boolean verifyTransactionData(SHAiButtonUser user) throws On
 	 * @see SHAiButtonCopr#createDataSignature(byte[],byte[],byte[],int)
 	 * @see #getLastError()
 	 */
+	@Override
 	public synchronized boolean executeTransaction(SHAiButtonUser user, boolean verifySuccess)
 			throws OneWireException, OneWireIOException {
 		// clear any error
@@ -502,13 +504,13 @@ public synchronized boolean executeTransaction(SHAiButtonUser user, boolean veri
 
 		// init local vars
 		// holds the working copy of account data
-		byte[] accountData = this.executeTransaction_accountData;
+		var accountData = this.executeTransaction_accountData;
 		// holds the backup copy of account data before writing
-		byte[] oldAcctData = this.executeTransaction_oldAcctData;
+		var oldAcctData = this.executeTransaction_oldAcctData;
 		// holds the account data read back for checking
-		byte[] newAcctData = this.executeTransaction_newAcctData;
+		var newAcctData = this.executeTransaction_newAcctData;
 		// just make the transaction ID a random number, so it changes
-		int transID = rand.nextInt();
+		var transID = rand.nextInt();
 
 		// if verifyUser was called, this is a read of cached data
 		user.readAccountData(accountData, 0);
@@ -517,7 +519,7 @@ public synchronized boolean executeTransaction(SHAiButtonUser user, boolean veri
 		System.arraycopy(accountData, 0, oldAcctData, 0, 32);
 
 		// get the user's balance from accountData
-		int balance = Convert.toInt(accountData, I_BALANCE, 3);
+		var balance = Convert.toInt(accountData, I_BALANCE, 3);
 
 		// if there are insufficient funds
 		if (this.debitAmount > balance) {
@@ -526,30 +528,30 @@ public synchronized boolean executeTransaction(SHAiButtonUser user, boolean veri
 		}
 
 		// update the user's balance
-		this.userBalance = (balance - this.debitAmount);
+		this.userBalance = balance - this.debitAmount;
 
-		boolean success = writeTransactionData(user, transID, this.userBalance, accountData);
+		var success = this.writeTransactionData(user, transID, this.userBalance, accountData);
 
 		// if write didn't succeeded or if we need to perform
 		// a verification step anyways, let's double-check what
 		// the user has on the button.
 		if (verifySuccess || !success) {
-			boolean dataOK = false;
-			int cnt = MAX_RETRY_CNT;
+			var dataOK = false;
+			var cnt = MAX_RETRY_CNT;
 			do {
 				// calling verify user re-issues a challenge-response
 				// and reloads the cached account data in the user object.
-				if (verifyUser(user)) {
+				if (this.verifyUser(user)) {
 					// compare the user's account data against the working
 					// copy and the backup copy.
 					if (user.readAccountData(newAcctData, 0)) {
-						boolean isOld = true;
-						boolean isCur = true;
-						for (int i = 0; i < 32 && (isOld || isCur); i++) {
+						var isOld = true;
+						var isCur = true;
+						for (var i = 0; i < 32 && (isOld || isCur); i++) {
 							// match the backup
-							isOld = isOld && (newAcctData[i] == oldAcctData[i]);
+							isOld = isOld && newAcctData[i] == oldAcctData[i];
 							// match the working copy
-							isCur = isCur && (newAcctData[i] == accountData[i]);
+							isCur = isCur && newAcctData[i] == accountData[i];
 						}
 						if (isOld) {
 							// if it matches the backup copy, we didn't write anything
@@ -561,7 +563,7 @@ public synchronized boolean executeTransaction(SHAiButtonUser user, boolean veri
 						} else {
 							// iBUTTON DATA IS TOTALLY HOSED
 							// keep trying to get account data on the button
-							success = writeTransactionData(user, transID, this.userBalance, accountData);
+							success = this.writeTransactionData(user, transID, this.userBalance, accountData);
 						}
 					}
 				}
@@ -577,7 +579,7 @@ public synchronized boolean executeTransaction(SHAiButtonUser user, boolean veri
 		return success;
 	}
 
-	private byte[] writeTransactionData_scratchpad = new byte[32];
+	private final byte[] writeTransactionData_scratchpad = new byte[32];
 
 	/**
 	 * Does the writing of transaction data to the user button as well as actually
@@ -586,9 +588,9 @@ public synchronized boolean executeTransaction(SHAiButtonUser user, boolean veri
 	private final boolean writeTransactionData(SHAiButtonUser user, int transID, int balance, byte[] accountData)
 			throws OneWireException, OneWireIOException {
 		// init local vars
-		SHAiButtonCopr copr = this.copr;
-		int acctPageNum = user.getAccountPageNumber();
-		byte[] scratchpad = this.writeTransactionData_scratchpad;
+		var copr = this.copr;
+		var acctPageNum = user.getAccountPageNumber();
+		var scratchpad = this.writeTransactionData_scratchpad;
 
 		// length of the TMEX file - 28 data, 1 cont. ptr
 		accountData[I_FILE_LENGTH] = (byte) 29;
@@ -619,7 +621,7 @@ private final boolean writeTransactionData(SHAiButtonUser user, int transID, int
 
 		// we need to increment the writeCycleCounter since we will be writing to the
 		// part
-		int wcc = user.getWriteCycleCounter();
+		var wcc = user.getWriteCycleCounter();
 		if (wcc > 0) {
 			// copy the write cycle counter into scratchpad
 			Convert.toByteArray(wcc + 1, scratchpad, 8, 4);
@@ -643,7 +645,7 @@ private final boolean writeTransactionData(SHAiButtonUser user, int transID, int
 		copr.createDataSignature(accountData, scratchpad, accountData, I_SIGNATURE);
 
 		// after signature make sure to dump in the inverted CRC
-		int crc = ~CRC16.compute(accountData, 0, accountData[I_FILE_LENGTH] + 1, acctPageNum);
+		var crc = ~CRC16.compute(accountData, 0, accountData[I_FILE_LENGTH] + 1, acctPageNum);
 
 		// set the the crc16 bytes
 		accountData[I_FILE_CRC16 + 0] = (byte) crc;
@@ -662,12 +664,14 @@ private final boolean writeTransactionData(SHAiButtonUser user, int transID, int
 
 		// write it to the button
 		try {
-			if (user.writeAccountData(accountData, 0))
+			if (user.writeAccountData(accountData, 0)) {
 				return true;
+			}
 
 		} catch (OneWireException owe) {
-			if (DEBUG)
+			if (DEBUG) {
 				IOHelper.writeLine(owe);
+			}
 		}
 
 		this.lastError = SHATransaction.USER_WRITE_DATA_FAILED;
@@ -698,14 +702,15 @@ private final boolean writeTransactionData(SHAiButtonUser user, int transID, int
 	 *
 	 * @throws IllegalArgumentException if an invalid parameter type is requested.
 	 */
+	@Override
 	public synchronized int getParameter(int type) {
 		switch (type) {
 		case DEBIT_AMOUNT:
-			return debitAmount;
+			return this.debitAmount;
 		case INITIAL_AMOUNT:
-			return initialAmount;
+			return this.initialAmount;
 		case USER_BALANCE:
-			return userBalance;
+			return this.userBalance;
 		default:
 			throw new IllegalArgumentException("Invalid parameter type");
 		}
@@ -731,15 +736,17 @@ public synchronized int getParameter(int type) {
 	 *
 	 * @throws IllegalArgumentException if an invalid parameter type is requested.
 	 */
+	@Override
 	public synchronized boolean setParameter(int type, int param) {
-		if (param <= 0)
+		if (param <= 0) {
 			return false;
+		}
 		switch (type) {
 		case DEBIT_AMOUNT:
-			debitAmount = param;
+			this.debitAmount = param;
 			break;
 		case INITIAL_AMOUNT:
-			initialAmount = param;
+			this.initialAmount = param;
 			break;
 		default:
 			return false;
@@ -752,10 +759,11 @@ public synchronized boolean setParameter(int type, int param) {
 	 * Resets all transaction parameters to default values
 	 * </p>
 	 */
+	@Override
 	public synchronized void resetParameters() {
-		debitAmount = 50; // 50 cents
-		initialAmount = 10000; // 100 dollars
-		userBalance = 0; // 0 dollars
+		this.debitAmount = 50; // 50 cents
+		this.initialAmount = 10000; // 100 dollars
+		this.userBalance = 0; // 0 dollars
 	}
 
 }
diff --git a/io.openems.edge.bridge.onewire/src/com/dalsemi/onewire/application/sha/SHADebitUnsigned.java b/io.openems.edge.bridge.onewire/src/com/dalsemi/onewire/application/sha/SHADebitUnsigned.java
index 9b5a4c4535a..b482621f08e 100644
--- a/io.openems.edge.bridge.onewire/src/com/dalsemi/onewire/application/sha/SHADebitUnsigned.java
+++ b/io.openems.edge.bridge.onewire/src/com/dalsemi/onewire/application/sha/SHADebitUnsigned.java
@@ -99,7 +99,7 @@
  *
  * <P>
  * A typical use case for this class might be as follows:
- * 
+ *
  * <pre>
  * OneWireContainer18 coprOWC18 = new OneWireContainer18(adapter, address);
  *
@@ -171,10 +171,9 @@
  * @version 1.00
  * @author SKH
  */
-@SuppressWarnings({ "unused" })
 public class SHADebitUnsigned extends SHATransaction {
 	/** Used for fast FF copy */
-	private static final byte[] ffBlock = new byte[] { (byte) 0xFF, (byte) 0xFF, (byte) 0xFF, (byte) 0xFF, (byte) 0xFF,
+	private static final byte[] ffBlock = { (byte) 0xFF, (byte) 0xFF, (byte) 0xFF, (byte) 0xFF, (byte) 0xFF,
 			(byte) 0xFF, (byte) 0xFF, (byte) 0xFF };
 
 	// ---------
@@ -228,7 +227,7 @@ public class SHADebitUnsigned extends SHATransaction {
 	// ---------
 	/** User apps should never call this */
 	protected SHADebitUnsigned() {
-		;
+
 	}
 
 	/**
@@ -243,7 +242,7 @@ protected SHADebitUnsigned() {
 	public SHADebitUnsigned(SHAiButtonCopr copr) {
 		super(copr);
 
-		resetParameters();
+		this.resetParameters();
 	}
 
 	/**
@@ -300,22 +299,23 @@ public SHADebitUnsigned(SHAiButtonCopr copr, int initialAmount, int debitAmount)
 	 * @see SHAiButtonUser#writeAccountData(byte[],int)
 	 * @see #getLastError()
 	 */
+	@Override
 	public boolean setupTransactionData(SHAiButtonUser user) throws OneWireException, OneWireIOException {
 		// clear any error
-		lastError = NO_ERROR;
+		this.lastError = NO_ERROR;
 
 		// not in critical path, so malloc'ing is okay
-		byte[] accountData = new byte[32];
+		var accountData = new byte[32];
 
-		return writeTransactionData(user, 0, this.initialAmount, accountData);
+		return this.writeTransactionData(user, 0, this.initialAmount, accountData);
 	}
 
 	// prevent malloc'ing in the critical path
-	private byte[] verifyUser_fullBindCode = new byte[15];
-	private byte[] verifyUser_scratchpad = new byte[32];
-	private byte[] verifyUser_accountData = new byte[32];
-	private byte[] verifyUser_mac = new byte[20];
-	private byte[] verifyUser_chlg = new byte[3];
+	private final byte[] verifyUser_fullBindCode = new byte[15];
+	private final byte[] verifyUser_scratchpad = new byte[32];
+	private final byte[] verifyUser_accountData = new byte[32];
+	private final byte[] verifyUser_mac = new byte[20];
+	private final byte[] verifyUser_chlg = new byte[3];
 
 	/**
 	 * <P>
@@ -342,23 +342,24 @@ public boolean setupTransactionData(SHAiButtonUser user) throws OneWireException
 	 * @see SHAiButtonUser#readAccountData(byte[],int,byte[],int,byte[],int)
 	 * @see #getLastError()
 	 */
+	@Override
 	public synchronized boolean verifyUser(SHAiButtonUser user) throws OneWireException, OneWireIOException {
 		// clear any error
 		this.lastError = SHATransaction.NO_ERROR;
 
 		// local vars
-		byte[] fullBindCode = this.verifyUser_fullBindCode;
-		byte[] scratchpad = this.verifyUser_scratchpad;
-		byte[] accountData = this.verifyUser_accountData;
-		byte[] mac = this.verifyUser_mac;
-		byte[] chlg = this.verifyUser_chlg;
+		var fullBindCode = this.verifyUser_fullBindCode;
+		var scratchpad = this.verifyUser_scratchpad;
+		var accountData = this.verifyUser_accountData;
+		var mac = this.verifyUser_mac;
+		var chlg = this.verifyUser_chlg;
 
 		int wcc;
 
 		// Generate random challenge. This must be done on the
 		// coprocessor, otherwise flags aren't setup for VALIDATE_PAGE.
-		if (!copr.generateChallenge(0, chlg, 0)) {
-			lastError = COPR_COMPUTE_CHALLENGE_FAILED;
+		if (!this.copr.generateChallenge(0, chlg, 0)) {
+			this.lastError = COPR_COMPUTE_CHALLENGE_FAILED;
 			return false;
 		}
 
@@ -405,7 +406,8 @@ public synchronized boolean verifyUser(SHAiButtonUser user) throws OneWireExcept
 		}
 		// \\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//
 
-		if (!copr.verifyAuthentication(fullBindCode, accountData, scratchpad, mac, user.getAuthorizationCommand())) {
+		if (!this.copr.verifyAuthentication(fullBindCode, accountData, scratchpad, mac,
+				user.getAuthorizationCommand())) {
 			this.lastError = SHATransaction.COPROCESSOR_FAILURE;
 			return false;
 		}
@@ -414,7 +416,7 @@ public synchronized boolean verifyUser(SHAiButtonUser user) throws OneWireExcept
 	}
 
 	// prevent malloc'ing in the critical path
-	private byte[] verifyData_accountData = new byte[32];
+	private final byte[] verifyData_accountData = new byte[32];
 
 	/**
 	 * <P>
@@ -447,11 +449,12 @@ public synchronized boolean verifyUser(SHAiButtonUser user) throws OneWireExcept
 	 * @see SHAiButtonUser#readAccountData(byte[],int)
 	 * @see #getLastError()
 	 */
+	@Override
 	public synchronized boolean verifyTransactionData(SHAiButtonUser user) throws OneWireException, OneWireIOException {
 		// clear any error
 		this.lastError = NO_ERROR;
 
-		byte[] accountData = this.verifyData_accountData;
+		var accountData = this.verifyData_accountData;
 
 		// if verifyUser was called, this is a read of cached data
 		user.readAccountData(accountData, 0);
@@ -459,11 +462,12 @@ public synchronized boolean verifyTransactionData(SHAiButtonUser user) throws On
 		// verify the A-B data scheme is valid
 		boolean validPtr = false, validA = false, validB = false;
 
-		byte fileLength = accountData[I_FILE_LENGTH];
-		int crc16 = CRC16.compute(accountData, 0, fileLength + 3, user.getAccountPageNumber());
+		var fileLength = accountData[I_FILE_LENGTH];
+		var crc16 = CRC16.compute(accountData, 0, fileLength + 3, user.getAccountPageNumber());
 
-		if (fileLength == RECORD_A_LENGTH || fileLength == RECORD_B_LENGTH)
+		if (fileLength == RECORD_A_LENGTH || fileLength == RECORD_B_LENGTH) {
 			validPtr = true;
+		}
 
 		// was the crc of the file correct?
 		if (crc16 == 0xB001) {
@@ -495,19 +499,22 @@ public synchronized boolean verifyTransactionData(SHAiButtonUser user) throws On
 		// lets try Record A and check the crc
 		accountData[I_FILE_LENGTH] = RECORD_A_LENGTH;
 		crc16 = CRC16.compute(accountData, 0, RECORD_A_LENGTH + 3, user.getAccountPageNumber());
-		if (crc16 == 0xB001)
+		if (crc16 == 0xB001) {
 			validA = true;
+		}
 
 		// lets try Record B and check the crc
 		accountData[I_FILE_LENGTH] = RECORD_B_LENGTH;
 		crc16 = CRC16.compute(accountData, 0, RECORD_B_LENGTH + 3, user.getAccountPageNumber());
-		if (crc16 == 0xB001)
+		if (crc16 == 0xB001) {
 			validB = true;
+		}
 
 		if (validA && validB) {
 			// \\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\
-			if (DEBUG)
+			if (DEBUG) {
 				System.out.println("Both A and B are valid");
+			}
 			// \\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\
 			// Both A & B are valid! And we know that we can only
 			// get here if the pointer or the header was not valid.
@@ -517,39 +524,40 @@ public synchronized boolean verifyTransactionData(SHAiButtonUser user) throws On
 			accountData[I_FILE_LENGTH] = RECORD_A_LENGTH;
 		} else if (validA) {
 			// \\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\
-			if (DEBUG)
+			if (DEBUG) {
 				System.out.println("A is valid not B");
+			}
 			// \\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\
 			// B is invalid, A is valid. Means A is the last updated one,
 			// but B is the last known good value. The header was not updated
 			// to point to A before debit was aborted. Let's go with B
 			accountData[I_FILE_LENGTH] = RECORD_B_LENGTH;
-		} else if (validB) {
-			// \\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\
-			if (DEBUG)
-				System.out.println("B is valid not A - impossible");
+		} else {
+			if (validB) {
+				// \\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\
+				if (DEBUG) {
+					System.out.println("B is valid not A - impossible");
+				}
+			} else {
+				// \\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\
+				if (DEBUG) {
+					System.out.println("Neither record has valid CRC");
+				}
+			}
 			// \\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\
 			// A is invalid, B is valid. Should never ever happen. Something
 			// got completely hosed. What should happen here?
 			this.lastError = USER_BAD_ACCOUNT_DATA;
 			return false;
-		} else {
-			// \\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\
-			if (DEBUG)
-				System.out.println("Neither record has valid CRC");
-			// \\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\
-			// neither record contains a valid CRC. What should happen here?
-			// probably got weak bit in ptr record, no telling which way to go
-			this.lastError = USER_BAD_ACCOUNT_DATA;
-			return false;
 		}
 
 		// get the user's balance from accountData
-		int balance = -1;
-		if (accountData[I_FILE_LENGTH] == RECORD_A_LENGTH)
+		var balance = -1;
+		if (accountData[I_FILE_LENGTH] == RECORD_A_LENGTH) {
 			balance = Convert.toInt(accountData, I_BALANCE_A, 3);
-		else if (accountData[I_FILE_LENGTH] == RECORD_B_LENGTH)
+		} else if (accountData[I_FILE_LENGTH] == RECORD_B_LENGTH) {
 			balance = Convert.toInt(accountData, I_BALANCE_B, 3);
+		}
 
 		if (balance < 0) {
 			this.lastError = USER_BAD_ACCOUNT_DATA;
@@ -558,19 +566,20 @@ else if (accountData[I_FILE_LENGTH] == RECORD_B_LENGTH)
 
 		this.userBalance = balance;
 
-		int cnt = MAX_RETRY_CNT;
+		var cnt = MAX_RETRY_CNT;
 		do {
-			if (user.refreshDevice() && writeTransactionData(user, -1, balance, accountData))
+			if (user.refreshDevice() && this.writeTransactionData(user, -1, balance, accountData)) {
 				break;
+			}
 		} while (--cnt > 0);
 
 		return false;
 	}
 
 	// prevent malloc'ing in critical path
-	private byte[] executeTransaction_accountData = new byte[32];
-	private byte[] executeTransaction_oldAcctData = new byte[32];
-	private byte[] executeTransaction_newAcctData = new byte[32];
+	private final byte[] executeTransaction_accountData = new byte[32];
+	private final byte[] executeTransaction_oldAcctData = new byte[32];
+	private final byte[] executeTransaction_newAcctData = new byte[32];
 
 	/**
 	 * <P>
@@ -608,6 +617,7 @@ else if (accountData[I_FILE_LENGTH] == RECORD_B_LENGTH)
 	 * @see SHAiButtonUser#writeAccountData(byte[],int)
 	 * @see #getLastError()
 	 */
+	@Override
 	public synchronized boolean executeTransaction(SHAiButtonUser user, boolean verifySuccess)
 			throws OneWireException, OneWireIOException {
 		// clear any error
@@ -615,13 +625,13 @@ public synchronized boolean executeTransaction(SHAiButtonUser user, boolean veri
 
 		// init local vars
 		// holds the working copy of account data
-		byte[] accountData = this.executeTransaction_accountData;
+		var accountData = this.executeTransaction_accountData;
 		// holds the backup copy of account data before writing
-		byte[] oldAcctData = this.executeTransaction_oldAcctData;
+		var oldAcctData = this.executeTransaction_oldAcctData;
 		// holds the account data read back for checking
-		byte[] newAcctData = this.executeTransaction_newAcctData;
+		var newAcctData = this.executeTransaction_newAcctData;
 		// just make the transaction ID a random number, so it changes
-		int transID = rand.nextInt();
+		var transID = rand.nextInt();
 
 		// if verifyUser was called, this is a read of cached data
 		user.readAccountData(accountData, 0);
@@ -630,11 +640,12 @@ public synchronized boolean executeTransaction(SHAiButtonUser user, boolean veri
 		System.arraycopy(accountData, 0, oldAcctData, 0, 32);
 
 		// get the user's balance from accountData
-		int balance = -1;
-		if (accountData[I_FILE_LENGTH] == RECORD_A_LENGTH)
+		var balance = -1;
+		if (accountData[I_FILE_LENGTH] == RECORD_A_LENGTH) {
 			balance = Convert.toInt(accountData, I_BALANCE_A, 3);
-		else if (accountData[I_FILE_LENGTH] == RECORD_B_LENGTH)
+		} else if (accountData[I_FILE_LENGTH] == RECORD_B_LENGTH) {
 			balance = Convert.toInt(accountData, I_BALANCE_B, 3);
+		}
 
 		// if there are insufficient funds
 		if (this.debitAmount > balance) {
@@ -643,12 +654,12 @@ else if (accountData[I_FILE_LENGTH] == RECORD_B_LENGTH)
 		}
 
 		// update the user's balance
-		this.userBalance = (balance - this.debitAmount);
+		this.userBalance = balance - this.debitAmount;
 
 		// attempt to update the page
-		boolean success = false;
+		var success = false;
 		try {
-			success = writeTransactionData(user, transID, this.userBalance, accountData);
+			success = this.writeTransactionData(user, transID, this.userBalance, accountData);
 		} catch (Exception e) {
 			/* sink */ }
 
@@ -665,15 +676,15 @@ else if (accountData[I_FILE_LENGTH] == RECORD_B_LENGTH)
 				System.out.println(Convert.toHexString(oldAcctData, 0, 32, " "));
 			}
 			// \\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\
-			boolean dataOK = false;
-			int cnt = MAX_RETRY_CNT;
+			var dataOK = false;
+			var cnt = MAX_RETRY_CNT;
 			do {
 				try {
 					// let's refresh the page
 					user.refreshDevice();
 					// calling verify user re-issues a challenge-response
 					// and reloads the cached account data in the user object.
-					if (verifyUser(user)) {
+					if (this.verifyUser(user)) {
 						// compare the user's account data against the working
 						// copy and the backup copy.
 						if (user.readAccountData(newAcctData, 0)) {
@@ -683,13 +694,13 @@ else if (accountData[I_FILE_LENGTH] == RECORD_B_LENGTH)
 								System.out.println(Convert.toHexString(newAcctData, 0, 32, " "));
 							}
 							// \\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\
-							boolean isOld = true;
-							boolean isCur = true;
-							for (int i = 0; i < 32 && (isOld || isCur); i++) {
+							var isOld = true;
+							var isCur = true;
+							for (var i = 0; i < 32 && (isOld || isCur); i++) {
 								// match the backup
-								isOld = isOld && (newAcctData[i] == oldAcctData[i]);
+								isOld = isOld && newAcctData[i] == oldAcctData[i];
 								// match the working copy
-								isCur = isCur && (newAcctData[i] == accountData[i]);
+								isCur = isCur && newAcctData[i] == accountData[i];
 							}
 							if (isOld) {
 								// if it matches the backup copy, we didn't write anything
@@ -700,29 +711,34 @@ else if (accountData[I_FILE_LENGTH] == RECORD_B_LENGTH)
 								dataOK = true;
 								success = true;
 							} else {
-								int cnt2 = MAX_RETRY_CNT;
+								var cnt2 = MAX_RETRY_CNT;
 								do {
 									// iBUTTON DATA IS TOTALLY HOSED
 									// keep trying to get account data on the button
 									try {
-										success = writeTransactionData(user, transID, this.userBalance, accountData);
+										success = this.writeTransactionData(user, transID, this.userBalance,
+												accountData);
 									} catch (OneWireIOException owioe) {
-										if (cnt2 == 0)
+										if (cnt2 == 0) {
 											throw owioe;
+										}
 									} catch (OneWireException owe) {
-										if (cnt2 == 0)
+										if (cnt2 == 0) {
 											throw owe;
+										}
 									}
 								} while (cnt2-- > 0 && !success);
 							}
 						}
 					}
 				} catch (OneWireIOException owioe) {
-					if (cnt == 0)
+					if (cnt == 0) {
 						throw owioe;
+					}
 				} catch (OneWireException owe) {
-					if (cnt == 0)
+					if (cnt == 0) {
 						throw owe;
+					}
 				}
 			} while (!dataOK && cnt-- > 0);
 
@@ -736,8 +752,6 @@ else if (accountData[I_FILE_LENGTH] == RECORD_B_LENGTH)
 		return success;
 	}
 
-	private byte[] writeTransactionData_scratchpad = new byte[32];
-
 	/**
 	 * Does the writing of transaction data to the user button as well as actually
 	 * signing the data with the coprocessor.
@@ -748,7 +762,7 @@ else if (accountData[I_FILE_LENGTH] == RECORD_B_LENGTH)
 	private final boolean writeTransactionData(SHAiButtonUser user, int transID, int balance, byte[] accountData)
 			throws OneWireException, OneWireIOException {
 		// init local vars
-		int acctPageNum = user.getAccountPageNumber();
+		var acctPageNum = user.getAccountPageNumber();
 
 		// data type code - dynamic: 0x00, static: 0x01
 		accountData[I_DATA_TYPE_CODE] = 0x01;
@@ -765,9 +779,10 @@ private final boolean writeTransactionData(SHAiButtonUser user, int transID, int
 
 		if (accountData[I_FILE_LENGTH] == RECORD_A_LENGTH) {
 			// \\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\
-			if (DEBUG)
+			if (DEBUG) {
 				System.out.println("Was A, now using B");
-			// \\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\
+				// \\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\
+			}
 
 			// length of the TMEX file
 			accountData[I_FILE_LENGTH] = (byte) RECORD_B_LENGTH;
@@ -787,13 +802,14 @@ private final boolean writeTransactionData(SHAiButtonUser user, int transID, int
 			accountData[I_FILE_CRC16_B + 1] = 0x00;
 
 			// dump in the inverted CRC
-			int crc = ~CRC16.compute(accountData, 0, accountData[I_FILE_LENGTH] + 1, acctPageNum);
+			var crc = ~CRC16.compute(accountData, 0, accountData[I_FILE_LENGTH] + 1, acctPageNum);
 			accountData[I_FILE_CRC16_B + 0] = (byte) crc;
 			accountData[I_FILE_CRC16_B + 1] = (byte) (crc >> 8);
 		} else {
 			// \\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\
-			if (DEBUG)
+			if (DEBUG) {
 				System.out.println("Was B, now using A");
+			}
 			// \\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\
 			// length of the TMEX file
 			accountData[I_FILE_LENGTH] = (byte) RECORD_A_LENGTH;
@@ -813,7 +829,7 @@ private final boolean writeTransactionData(SHAiButtonUser user, int transID, int
 			accountData[I_FILE_CRC16_A + 1] = 0x00;
 
 			// dump in the inverted CRC
-			int crc = ~CRC16.compute(accountData, 0, accountData[I_FILE_LENGTH] + 1, acctPageNum);
+			var crc = ~CRC16.compute(accountData, 0, accountData[I_FILE_LENGTH] + 1, acctPageNum);
 			accountData[I_FILE_CRC16_A + 0] = (byte) crc;
 			accountData[I_FILE_CRC16_A + 1] = (byte) (crc >> 8);
 		}
@@ -831,11 +847,13 @@ private final boolean writeTransactionData(SHAiButtonUser user, int transID, int
 
 		// write it to the button
 		try {
-			if (user.writeAccountData(accountData, 0))
+			if (user.writeAccountData(accountData, 0)) {
 				return true;
+			}
 		} catch (OneWireException owe) {
-			if (DEBUG)
+			if (DEBUG) {
 				IOHelper.writeLine(owe);
+			}
 		}
 
 		this.lastError = SHATransaction.USER_WRITE_DATA_FAILED;
@@ -866,14 +884,15 @@ private final boolean writeTransactionData(SHAiButtonUser user, int transID, int
 	 *
 	 * @throws IllegalArgumentException if an invalid parameter type is requested.
 	 */
+	@Override
 	public synchronized int getParameter(int type) {
 		switch (type) {
 		case DEBIT_AMOUNT:
-			return debitAmount;
+			return this.debitAmount;
 		case INITIAL_AMOUNT:
-			return initialAmount;
+			return this.initialAmount;
 		case USER_BALANCE:
-			return userBalance;
+			return this.userBalance;
 		default:
 			return -1;
 		}
@@ -899,13 +918,14 @@ public synchronized int getParameter(int type) {
 	 *
 	 * @throws IllegalArgumentException if an invalid parameter type is requested.
 	 */
+	@Override
 	public synchronized boolean setParameter(int type, int param) {
 		switch (type) {
 		case DEBIT_AMOUNT:
-			debitAmount = param;
+			this.debitAmount = param;
 			break;
 		case INITIAL_AMOUNT:
-			initialAmount = param;
+			this.initialAmount = param;
 			break;
 		default:
 			return false;
@@ -918,9 +938,10 @@ public synchronized boolean setParameter(int type, int param) {
 	 * Resets all transaction parameters to default values
 	 * </p>
 	 */
+	@Override
 	public synchronized void resetParameters() {
-		debitAmount = 50; // 50 cents
-		initialAmount = 90000; // 100 dollars
-		userBalance = 0; // 0 dollars
+		this.debitAmount = 50; // 50 cents
+		this.initialAmount = 90000; // 100 dollars
+		this.userBalance = 0; // 0 dollars
 	}
 }
diff --git a/io.openems.edge.bridge.onewire/src/com/dalsemi/onewire/application/sha/SHASoftAuth.java b/io.openems.edge.bridge.onewire/src/com/dalsemi/onewire/application/sha/SHASoftAuth.java
index 58ff6e8e7bb..a08b9cd9c1e 100644
--- a/io.openems.edge.bridge.onewire/src/com/dalsemi/onewire/application/sha/SHASoftAuth.java
+++ b/io.openems.edge.bridge.onewire/src/com/dalsemi/onewire/application/sha/SHASoftAuth.java
@@ -51,57 +51,57 @@
  * <LI><B>32 bytes Total</B></LI>
  * </UL>
  * </P>
- * 
+ *
  * <P>
  * A typical use case for this class might be as follows:
- * 
+ *
  * <pre>
  * OneWireContainer18 coprOWC18 = new OneWireContainer18(adapter, address);
- * 
+ *
  * // COPR.0 is the filename for coprocessor service data
  * SHAiButtonCopr copr = new SHAiButtonCopr(coprOWC18, "COPR.0");
- * 
+ *
  * // Initial amount for new users is $100, and debit amount is 50 cents
  * byte[] ver_data = new byte[] { 0x00, 0x01, 0x02, 0x03, 0x04, 0x05, 0x06 };
  * SATransaction trans = new SHAsoftauth(copr, ver_data, 7);
- * 
+ *
  * OneWireContainer18 owc18 = new OneWireContainer18(adapter, userAddress);
- * 
+ *
  * // The following constructor erases all transaction data from the user and
  * // installs the system authentication secret on the user iButton.
  * SHAiButtonUser user = new SHAiButtonUser18(copr, owc18, true, authSecret);
- * 
+ *
  * // creates account data on iButton
  * if (trans.setupTransactionData(user))
  * 	System.out.println("Account data installed successfully");
  * else
  * 	System.out.println("Account data installation failed");
- * 
+ *
  * // ... ... ... ... ... ... ... ... ... ... ... ... ... ... ... ...
- * 
+ *
  * // "challenges" user iButton
  * if (trans.verifyUser(user)) {
  * 	System.out.println("User Verified Successfully");
- * 
+ *
  * 	// checks data signature
  * 	if (trans.verifyTransactionData(user)) {
  * 		System.out.println("Account Data Verified Successfully");
- * 
+ *
  * 		// writes verification data to user iButton
  * 		System.out.println("User's verification data: ");
  * 		softauth.getParameter(SHASoftAuth.VERIFICATION_DATA, ver_data, 0, 7);
  * 		IOHelper.writeBytes(ver_data);
  * 	}
  * }
- * 
+ *
  * // ... ... ... ... ... ... ... ... ... ... ... ... ... ... ... ...
- * 
+ *
  * if (trans.getLastError() != 0) {
  * 	System.err.println("Error code: " + trans.getLastError());
  * }
  * </pre>
  * </P>
- * 
+ *
  * <p>
  * This class makes use of several performance enhancements for TINI. For
  * instance, most methods are <code>synchronized</code> to access instance
@@ -113,7 +113,7 @@
  * <code>beginExclusive(boolean)</code> and <code>endExclusive()</code> should
  * be used.
  * </p>
- * 
+ *
  * @see SHATransaction
  * @see SHAiButtonCopr
  * @see SHAiButtonUser
@@ -121,10 +121,9 @@
  * @version 1.00
  * @author SKH
  */
-@SuppressWarnings({ "unused" })
 public class SHASoftAuth extends SHATransaction {
 	/** Used for fast FF copy */
-	private static final byte[] ffBlock = new byte[] { (byte) 0xFF, (byte) 0xFF, (byte) 0xFF, (byte) 0xFF, (byte) 0xFF,
+	private static final byte[] ffBlock = { (byte) 0xFF, (byte) 0xFF, (byte) 0xFF, (byte) 0xFF, (byte) 0xFF,
 			(byte) 0xFF, (byte) 0xFF, (byte) 0xFF };
 
 	// ************************************************************** //
@@ -146,14 +145,14 @@ public class SHASoftAuth extends SHATransaction {
 	// Member variables
 	// ************************************************************** //
 	/** Data to be stored on the iButton for Verification */
-	private byte[] ver_data = new byte[] { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 };
+	private final byte[] ver_data = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 };
 
 	/** Data that is to be written to the iButton for Verification */
-	private byte[] master_ver_data = new byte[] { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 };
+	private final byte[] master_ver_data = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 };
 
 	/** User apps should never call this */
 	protected SHASoftAuth() {
-		;
+
 	}
 
 	/**
@@ -161,14 +160,14 @@ protected SHASoftAuth() {
 	 * perform this transaction. After saving a reference to the SHA coprocessor,
 	 * this constructor resets all parameters for this type of transaction to their
 	 * default values.
-	 * 
+	 *
 	 * @param copr The coprocessor used for authentication and data signing in this
 	 *             transaction.
 	 */
 	public SHASoftAuth(SHAiButtonCopr copr) {
 		super(copr);
 
-		resetParameters();
+		this.resetParameters();
 	}
 
 	/**
@@ -176,7 +175,7 @@ public SHASoftAuth(SHAiButtonCopr copr) {
 	 * perform this transaction. After saving a reference to the SHA coprocessor,
 	 * this constructor resets all parameters for this type of transaction to their
 	 * default values.
-	 * 
+	 *
 	 * @param copr       The coprocessor used for authentication and data signing in
 	 *                   this transaction.
 	 * @param extra_data The 7 bytes of extra data to be used instead of the
@@ -201,13 +200,13 @@ public SHASoftAuth(SHAiButtonCopr copr, byte[] extra_data, int len) {
 	 * you try to install the authentication secret after creating the account data,
 	 * you will destroy all account data on the iButton.
 	 * </P>
-	 * 
+	 *
 	 * <P>
 	 * You can set the value of the initial account balance by calling
 	 * <code>transaction.setParameter(SHADebit.INITIAL_AMOUNT,10000)</code> where
 	 * the value of the units is in cents (i.e. 10000 = $100).
 	 * </P>
-	 * 
+	 *
 	 * <P>
 	 * <B>Flow of action: </B>
 	 * <ul>
@@ -218,33 +217,34 @@ public SHASoftAuth(SHAiButtonCopr copr, byte[] extra_data, int len) {
 	 * <li>Write account data page to iButton</li>
 	 * </ul>
 	 * </P>
-	 * 
+	 *
 	 * @param user SHAiButtonUser upon which the transaction occurs.
-	 * 
+	 *
 	 * @return <code>true</code>if and only if the signature is successfully created
 	 *         by the coprocessor AND the data is successfully written to the user
 	 *         iButton.
-	 * 
+	 *
 	 * @see SHAiButtonCopr#createDataSignature(byte[],byte[],byte[],int)
 	 * @see SHAiButtonUser#writeAccountData(byte[],int)
 	 * @see #getLastError()
 	 */
+	@Override
 	public boolean setupTransactionData(SHAiButtonUser user) throws OneWireException, OneWireIOException {
 		// clear any error
-		lastError = NO_ERROR;
+		this.lastError = NO_ERROR;
 
 		// not in critical path, so malloc'ing is okay
-		byte[] accountData = new byte[32];
+		var accountData = new byte[32];
 
-		return writeTransactionData(user, this.master_ver_data, accountData);
+		return this.writeTransactionData(user, this.master_ver_data, accountData);
 	}
 
 	// prevent malloc'ing in the critical path
-	private byte[] verifyUser_fullBindCode = new byte[15];
-	private byte[] verifyUser_scratchpad = new byte[32];
-	private byte[] verifyUser_accountData = new byte[32];
-	private byte[] verifyUser_mac = new byte[20];
-	private byte[] verifyUser_chlg = new byte[3];
+	private final byte[] verifyUser_fullBindCode = new byte[15];
+	private final byte[] verifyUser_scratchpad = new byte[32];
+	private final byte[] verifyUser_accountData = new byte[32];
+	private final byte[] verifyUser_mac = new byte[20];
+	private final byte[] verifyUser_chlg = new byte[3];
 
 	/**
 	 * <P>
@@ -253,7 +253,7 @@ public boolean setupTransactionData(SHAiButtonUser user) throws OneWireException
 	 * signature generated by the coprocessor after the user's unique secret has
 	 * been recreated on the coprocessor.
 	 * </P>
-	 * 
+	 *
 	 * <P>
 	 * <B>Flow of action: </B>
 	 * <ul>
@@ -263,34 +263,35 @@ public boolean setupTransactionData(SHAiButtonUser user) throws OneWireException
 	 * <li>Attempt to match user's signature with the coprocessor</li>
 	 * </ul>
 	 * </P>
-	 * 
+	 *
 	 * @param user SHAiButtonUser upon which the transaction occurs.
-	 * 
+	 *
 	 * @see SHAiButtonCopr#generateChallenge(int,byte[],int)
 	 * @see SHAiButtonCopr#verifyAuthentication(byte[],byte[],byte[],byte[],byte)
 	 * @see SHAiButtonUser#readAccountData(byte[],int,byte[],int,byte[],int)
 	 * @see #getLastError()
 	 */
+	@Override
 	public synchronized boolean verifyUser(SHAiButtonUser user) throws OneWireException, OneWireIOException {
 		// clear any error
 		this.lastError = SHATransaction.NO_ERROR;
 
 		// local vars
-		byte[] fullBindCode = this.verifyUser_fullBindCode;
-		byte[] scratchpad = this.verifyUser_scratchpad;
-		byte[] accountData = this.verifyUser_accountData;
-		byte[] mac = this.verifyUser_mac;
-		byte[] chlg = this.verifyUser_chlg;
+		var fullBindCode = this.verifyUser_fullBindCode;
+		var scratchpad = this.verifyUser_scratchpad;
+		var accountData = this.verifyUser_accountData;
+		var mac = this.verifyUser_mac;
+		var chlg = this.verifyUser_chlg;
 
 		// Generate random challenge. This must be done on the
 		// coprocessor, otherwise flags aren't setup for VALIDATE_PAGE.
-		if (!copr.generateChallenge(0, chlg, 0)) {
-			lastError = COPR_COMPUTE_CHALLENGE_FAILED;
+		if (!this.copr.generateChallenge(0, chlg, 0)) {
+			this.lastError = COPR_COMPUTE_CHALLENGE_FAILED;
 			return false;
 		}
 
 		// have user answer the challenge
-		int wcc = user.readAccountData(chlg, 0, accountData, 0, mac, 0);
+		var wcc = user.readAccountData(chlg, 0, accountData, 0, mac, 0);
 
 		if (wcc < 0) {
 			if (user.hasWriteCycleCounter()) {
@@ -332,7 +333,8 @@ public synchronized boolean verifyUser(SHAiButtonUser user) throws OneWireExcept
 		}
 		// \\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//
 
-		if (!copr.verifyAuthentication(fullBindCode, accountData, scratchpad, mac, user.getAuthorizationCommand())) {
+		if (!this.copr.verifyAuthentication(fullBindCode, accountData, scratchpad, mac,
+				user.getAuthorizationCommand())) {
 			this.lastError = SHATransaction.COPROCESSOR_FAILURE;
 			return false;
 		}
@@ -340,18 +342,16 @@ public synchronized boolean verifyUser(SHAiButtonUser user) throws OneWireExcept
 		return true;
 	}
 
-	// prevent malloc'ing in the critical path
-	private byte[] verifyData_fullBindCode = new byte[32];
-	private byte[] verifyData_scratchpad = new byte[32];
-	private byte[] verifyData_accountData = new byte[32];
-	private byte[] verifyData_mac = new byte[20];
+	private final byte[] verifyData_scratchpad = new byte[32];
+	private final byte[] verifyData_accountData = new byte[32];
+	private final byte[] verifyData_mac = new byte[20];
 
 	/**
 	 * <P>
 	 * Verifies user's account data. Account data is "verified" if the digital
 	 * signature matches the signature recreated by the coprocessor.
 	 * </P>
-	 * 
+	 *
 	 * <P>
 	 * <B>Flow of action: </B>
 	 * <ul>
@@ -363,33 +363,34 @@ public synchronized boolean verifyUser(SHAiButtonUser user) throws OneWireExcept
 	 * <li>Write the account data to the user</li>
 	 * </ul>
 	 * </P>
-	 * 
+	 *
 	 * <P>
 	 * If previous steps have been executed, all "Read" commands on the user are
 	 * reading from cached data.
 	 * </P>
-	 * 
+	 *
 	 * @param user SHAiButtonUser upon which the transaction occurs.
-	 * 
+	 *
 	 * @return <code>true</code> if and only if the account balance is greater than
 	 *         zero and digital signature matches the signature recreated by the
 	 *         coprocessor.
-	 * 
+	 *
 	 * @see SHAiButtonUser#readAccountData(byte[],int)
 	 * @see SHAiButtonCopr#verifySignature(byte[],byte[],byte[])
 	 * @see #getLastError()
 	 */
+	@Override
 	public synchronized boolean verifyTransactionData(SHAiButtonUser user) throws OneWireException, OneWireIOException {
 		// clear any error
 		this.lastError = NO_ERROR;
 
 		// init local vars
-		byte[] scratchpad = this.verifyData_scratchpad;
-		byte[] accountData = this.verifyData_accountData;
-		byte[] verify_mac = this.verifyData_mac;
+		var scratchpad = this.verifyData_scratchpad;
+		var accountData = this.verifyData_accountData;
+		var verify_mac = this.verifyData_mac;
 
 		// if verifyUser was called, this is a read of cached data
-		int wcc = user.getWriteCycleCounter();
+		var wcc = user.getWriteCycleCounter();
 
 		// if verifyUser was called, this is a read of cached data
 		user.readAccountData(accountData, 0);
@@ -401,7 +402,7 @@ public synchronized boolean verifyTransactionData(SHAiButtonUser user) throws On
 		System.arraycopy(accountData, I_SIGNATURE, verify_mac, 0, 20);
 
 		// now lets reset the mac
-		copr.getInitialSignature(accountData, I_SIGNATURE);
+		this.copr.getInitialSignature(accountData, I_SIGNATURE);
 		// and reset the CRC
 		accountData[I_FILE_CRC16 + 0] = (byte) 0;
 		accountData[I_FILE_CRC16 + 1] = (byte) 0;
@@ -422,9 +423,9 @@ public synchronized boolean verifyTransactionData(SHAiButtonUser user) throws On
 		scratchpad[12] = (byte) user.getAccountPageNumber();
 		user.getAddress(scratchpad, 13, 7);
 
-		copr.getSigningChallenge(scratchpad, 20);
+		this.copr.getSigningChallenge(scratchpad, 20);
 
-		if (!copr.verifySignature(accountData, scratchpad, verify_mac)) {
+		if (!this.copr.verifySignature(accountData, scratchpad, verify_mac)) {
 			this.lastError = COPROCESSOR_FAILURE;
 			return false;
 		}
@@ -433,9 +434,9 @@ public synchronized boolean verifyTransactionData(SHAiButtonUser user) throws On
 	}
 
 	// prevent malloc'ing in critical path
-	private byte[] executeTransaction_accountData = new byte[32];
-	private byte[] executeTransaction_oldAcctData = new byte[32];
-	private byte[] executeTransaction_newAcctData = new byte[32];
+	private final byte[] executeTransaction_accountData = new byte[32];
+	private final byte[] executeTransaction_oldAcctData = new byte[32];
+	private final byte[] executeTransaction_newAcctData = new byte[32];
 
 	// private byte[] executeTransaction_scratchpad = new byte[32];
 	/**
@@ -446,7 +447,7 @@ public synchronized boolean verifyTransactionData(SHAiButtonUser user) throws On
 	 * <code>transaction.setParameter(SHADebit.DEBIT_AMOUNT, 50)</code>, where the
 	 * value is in units of cents (i.e. for 1 dollar, use 100).
 	 * </P>
-	 * 
+	 *
 	 * <P>
 	 * <B>Flow of action: </B>
 	 * <ul>
@@ -458,26 +459,27 @@ public synchronized boolean verifyTransactionData(SHAiButtonUser user) throws On
 	 * <li>Write the account data to the user</li>
 	 * </ul>
 	 * </P>
-	 * 
+	 *
 	 * <P>
 	 * If previous steps have been executed, all "Read" commands on the user are
 	 * reading from cached data.
 	 * </P>
-	 * 
+	 *
 	 * @param user          SHAiButtonUser upon which the transaction occurs.
 	 * @param verifySuccess A boolean to let this method know if verification was
 	 *                      successful.
-	 * 
+	 *
 	 * @return <code>true</code> if and only if the user has enough in the account
 	 *         balance to perform the requested debit AND a new digital signature is
 	 *         successfully created AND the account data has been written to the
 	 *         button.
-	 * 
+	 *
 	 * @see SHAiButtonUser#readAccountData(byte[],int)
 	 * @see SHAiButtonUser#writeAccountData(byte[],int)
 	 * @see SHAiButtonCopr#createDataSignature(byte[],byte[],byte[],int)
 	 * @see #getLastError()
 	 */
+	@Override
 	public synchronized boolean executeTransaction(SHAiButtonUser user, boolean verifySuccess)
 			throws OneWireException, OneWireIOException {
 		// clear any error
@@ -485,11 +487,11 @@ public synchronized boolean executeTransaction(SHAiButtonUser user, boolean veri
 
 		// init local vars
 		// holds the working copy of account data
-		byte[] accountData = this.executeTransaction_accountData;
+		var accountData = this.executeTransaction_accountData;
 		// holds the backup copy of account data before writing
-		byte[] oldAcctData = this.executeTransaction_oldAcctData;
+		var oldAcctData = this.executeTransaction_oldAcctData;
 		// holds the account data read back for checking
-		byte[] newAcctData = this.executeTransaction_newAcctData;
+		var newAcctData = this.executeTransaction_newAcctData;
 
 		// if verifyUser was called, this is a read of cached data
 		user.readAccountData(accountData, 0);
@@ -500,28 +502,28 @@ public synchronized boolean executeTransaction(SHAiButtonUser user, boolean veri
 		// get the user's verification data
 		System.arraycopy(accountData, I_VERDATA, this.ver_data, 0, 7);
 
-		boolean success = writeTransactionData(user, this.master_ver_data, accountData);
+		var success = this.writeTransactionData(user, this.master_ver_data, accountData);
 
 		// if write didn't succeeded or if we need to perform
 		// a verification step anyways, let's double-check what
 		// the user has on the button.
 		if (verifySuccess || !success) {
-			boolean dataOK = false;
-			int cnt = MAX_RETRY_CNT;
+			var dataOK = false;
+			var cnt = MAX_RETRY_CNT;
 			do {
 				// calling verify user re-issues a challenge-response
 				// and reloads the cached account data in the user object.
-				if (verifyUser(user)) {
+				if (this.verifyUser(user)) {
 					// compare the user's account data against the working
 					// copy and the backup copy.
 					if (user.readAccountData(newAcctData, 0)) {
-						boolean isOld = true;
-						boolean isCur = true;
-						for (int i = 0; i < 32 && (isOld || isCur); i++) {
+						var isOld = true;
+						var isCur = true;
+						for (var i = 0; i < 32 && (isOld || isCur); i++) {
 							// match the backup
-							isOld = isOld && (newAcctData[i] == oldAcctData[i]);
+							isOld = isOld && newAcctData[i] == oldAcctData[i];
 							// match the working copy
-							isCur = isCur && (newAcctData[i] == accountData[i]);
+							isCur = isCur && newAcctData[i] == accountData[i];
 						}
 						if (isOld) {
 							// if it matches the backup copy, we didn't write anything
@@ -533,7 +535,7 @@ public synchronized boolean executeTransaction(SHAiButtonUser user, boolean veri
 						} else {
 							// iBUTTON DATA IS TOTALLY HOSED
 							// keep trying to get account data on the button
-							success = writeTransactionData(user, this.ver_data, accountData);
+							success = this.writeTransactionData(user, this.ver_data, accountData);
 						}
 					}
 				}
@@ -549,7 +551,7 @@ public synchronized boolean executeTransaction(SHAiButtonUser user, boolean veri
 		return success;
 	}
 
-	private byte[] writeTransactionData_scratchpad = new byte[32];
+	private final byte[] writeTransactionData_scratchpad = new byte[32];
 
 	/**
 	 * Does the writing of transaction data to the user button as well as actually
@@ -558,9 +560,9 @@ public synchronized boolean executeTransaction(SHAiButtonUser user, boolean veri
 	private final boolean writeTransactionData(SHAiButtonUser user, byte[] ver_data, byte[] accountData)
 			throws OneWireException, OneWireIOException {
 		// init local vars
-		SHAiButtonCopr copr = this.copr;
-		int acctPageNum = user.getAccountPageNumber();
-		byte[] scratchpad = this.writeTransactionData_scratchpad;
+		var copr = this.copr;
+		var acctPageNum = user.getAccountPageNumber();
+		var scratchpad = this.writeTransactionData_scratchpad;
 
 		// length of the TMEX file - 28 data, 1 cont. ptr
 		accountData[I_FILE_LENGTH] = (byte) 29;
@@ -582,7 +584,7 @@ private final boolean writeTransactionData(SHAiButtonUser user, byte[] ver_data,
 
 		// we need to increment the writeCycleCounter since we will be writing to the
 		// part
-		int wcc = user.getWriteCycleCounter();
+		var wcc = user.getWriteCycleCounter();
 		if (wcc > 0) {
 			// copy the write cycle counter into scratchpad
 			Convert.toByteArray(wcc + 1, scratchpad, 8, 4);
@@ -606,7 +608,7 @@ private final boolean writeTransactionData(SHAiButtonUser user, byte[] ver_data,
 		copr.createDataSignature(accountData, scratchpad, accountData, I_SIGNATURE);
 
 		// after signature make sure to dump in the inverted CRC
-		int crc = ~CRC16.compute(accountData, 0, accountData[I_FILE_LENGTH] + 1, acctPageNum);
+		var crc = ~CRC16.compute(accountData, 0, accountData[I_FILE_LENGTH] + 1, acctPageNum);
 
 		// set the the crc16 bytes
 		accountData[I_FILE_CRC16 + 0] = (byte) crc;
@@ -625,12 +627,14 @@ private final boolean writeTransactionData(SHAiButtonUser user, byte[] ver_data,
 
 		// write it to the button
 		try {
-			if (user.writeAccountData(accountData, 0))
+			if (user.writeAccountData(accountData, 0)) {
 				return true;
+			}
 
 		} catch (OneWireException owe) {
-			if (DEBUG)
+			if (DEBUG) {
 				IOHelper.writeLine(owe);
+			}
 		}
 
 		this.lastError = SHATransaction.USER_WRITE_DATA_FAILED;
@@ -641,7 +645,7 @@ private final boolean writeTransactionData(SHAiButtonUser user, byte[] ver_data,
 	 * <P>
 	 * Retrieves the value of a particular parameter for this debit transaction.
 	 * </P>
-	 * 
+	 *
 	 * <P>
 	 * <B>Valid Parameters</B>
 	 * <UL>
@@ -650,17 +654,18 @@ private final boolean writeTransactionData(SHAiButtonUser user, byte[] ver_data,
 	 * <LI><code>SHADebit.USER_BALANCE</code></LI>
 	 * </UL>
 	 * </P>
-	 * 
+	 *
 	 * <P>
 	 * Note that the value of <code>SHADebit.USER_BALANCE</code> will be set after
 	 * calling <code>verifyTransactionData(SHAiButtonUser)</code> and after calling
 	 * <code>executeTransaction(SHAiButtonUser)</code>.
 	 * </P>
-	 * 
+	 *
 	 * @return The value of the requested parameter.
-	 * 
+	 *
 	 * @throws IllegalArgumentException if an invalid parameter type is requested.
 	 */
+	@Override
 	public synchronized int getParameter(int type) {
 		return 0;
 	}
@@ -669,7 +674,7 @@ public synchronized int getParameter(int type) {
 	 * <P>
 	 * Retrieves the value of a particular parameter for this debit transaction.
 	 * </P>
-	 * 
+	 *
 	 * <P>
 	 * <B>Valid Parameters</B>
 	 * <UL>
@@ -678,15 +683,15 @@ public synchronized int getParameter(int type) {
 	 * <LI><code>SHADebit.USER_BALANCE</code></LI>
 	 * </UL>
 	 * </P>
-	 * 
+	 *
 	 * <P>
 	 * Note that the value of <code>SHADebit.USER_BALANCE</code> will be set after
 	 * calling <code>verifyTransactionData(SHAiButtonUser)</code> and after calling
 	 * <code>executeTransaction(SHAiButtonUser)</code>.
 	 * </P>
-	 * 
+	 *
 	 * @return The value of the requested parameter.
-	 * 
+	 *
 	 * @throws IllegalArgumentException if an invalid parameter type is requested.
 	 */
 	public synchronized int getParameter(int type, byte[] data, int offset, int len) {
@@ -702,7 +707,7 @@ public synchronized int getParameter(int type, byte[] data, int offset, int len)
 	 * <P>
 	 * Sets the value of a particular parameter for this debit transaction.
 	 * </P>
-	 * 
+	 *
 	 * <P>
 	 * <B>Valid Parameters</B>
 	 * <UL>
@@ -710,19 +715,19 @@ public synchronized int getParameter(int type, byte[] data, int offset, int len)
 	 * <LI><code>SHADebit.INITIAL_AMOUNT</code></LI>
 	 * </UL>
 	 * </P>
-	 * 
+	 *
 	 * @param type Specifies the parameter type (<code>SHADebit.DEBIT_AMOUNT</code>
 	 *             or <code>SHADebit.INITIAL_AMOUNT</code>)
 	 * @return </code>true</code> if a valid parameter type was specified and the
 	 *         value of the parameter is positive.
-	 * 
+	 *
 	 * @throws IllegalArgumentException if an invalid parameter type is requested.
 	 */
 	public synchronized boolean setParameter(int type, byte[] data, int offset, int len) {
-		if (type == VERIFICATION_DATA)
-			System.arraycopy(data, offset, this.master_ver_data, 0, len);
-		else
+		if (type != VERIFICATION_DATA) {
 			return false;
+		}
+		System.arraycopy(data, offset, this.master_ver_data, 0, len);
 
 		return true;
 	}
@@ -731,7 +736,7 @@ public synchronized boolean setParameter(int type, byte[] data, int offset, int
 	 * <P>
 	 * Sets the value of a particular parameter for this debit transaction.
 	 * </P>
-	 * 
+	 *
 	 * <P>
 	 * <B>Valid Parameters</B>
 	 * <UL>
@@ -739,14 +744,15 @@ public synchronized boolean setParameter(int type, byte[] data, int offset, int
 	 * <LI><code>SHADebit.INITIAL_AMOUNT</code></LI>
 	 * </UL>
 	 * </P>
-	 * 
+	 *
 	 * @param type Specifies the parameter type (<code>SHADebit.DEBIT_AMOUNT</code>
 	 *             or <code>SHADebit.INITIAL_AMOUNT</code>)
 	 * @return </code>true</code> if a valid parameter type was specified and the
 	 *         value of the parameter is positive.
-	 * 
+	 *
 	 * @throws IllegalArgumentException if an invalid parameter type is requested.
 	 */
+	@Override
 	public synchronized boolean setParameter(int type, int param) {
 		return false;
 	}
@@ -756,10 +762,11 @@ public synchronized boolean setParameter(int type, int param) {
 	 * Resets all transaction parameters to default values
 	 * </p>
 	 */
+	@Override
 	public synchronized void resetParameters() {
-		for (int i = 0; i < 7; i++) {
-			ver_data[i] = 0x00;
-			master_ver_data[i] = 0x00;
+		for (var i = 0; i < 7; i++) {
+			this.ver_data[i] = 0x00;
+			this.master_ver_data[i] = 0x00;
 		}
 
 	}
diff --git a/io.openems.edge.bridge.onewire/src/com/dalsemi/onewire/application/sha/SHATransaction.java b/io.openems.edge.bridge.onewire/src/com/dalsemi/onewire/application/sha/SHATransaction.java
index 3483967304d..b092b067368 100644
--- a/io.openems.edge.bridge.onewire/src/com/dalsemi/onewire/application/sha/SHATransaction.java
+++ b/io.openems.edge.bridge.onewire/src/com/dalsemi/onewire/application/sha/SHATransaction.java
@@ -103,7 +103,7 @@ public abstract class SHATransaction {
 	 * </p>
 	 */
 	protected SHATransaction() {
-		;
+
 	}
 
 	/**
diff --git a/io.openems.edge.bridge.onewire/src/com/dalsemi/onewire/application/sha/SHAiButtonCopr.java b/io.openems.edge.bridge.onewire/src/com/dalsemi/onewire/application/sha/SHAiButtonCopr.java
index 8fef14f08fc..29c7c87d1d7 100644
--- a/io.openems.edge.bridge.onewire/src/com/dalsemi/onewire/application/sha/SHAiButtonCopr.java
+++ b/io.openems.edge.bridge.onewire/src/com/dalsemi/onewire/application/sha/SHAiButtonCopr.java
@@ -212,7 +212,7 @@ public class SHAiButtonCopr {
 	 * @see #SHAiButtonCopr(OneWireContainer18,String)
 	 */
 	protected SHAiButtonCopr() {
-		;
+
 	}
 
 	/**
@@ -254,8 +254,8 @@ protected SHAiButtonCopr() {
 	 *                           installation on user buttons.
 	 * @param l_bindCode         the binding code used to finalize secret
 	 *                           installation on user buttons.
-	 * @param l_auxData          any auxiliary or miscellaneous data to be stored
-	 *                           on the coprocessor.
+	 * @param l_auxData          any auxiliary or miscellaneous data to be stored on
+	 *                           the coprocessor.
 	 * @param l_initialSignature the 20-byte initial MAC placed in user account data
 	 *                           before generating actual MAC.
 	 * @param l_signingChlg      the 3-byte challenge used for signing user account
@@ -284,46 +284,53 @@ public SHAiButtonCopr(OneWireContainer18 l_owc, String coprFilename, boolean l_f
 		this.lastError = SHAiButtonCopr.NO_ERROR;
 
 		// Do some bounds checking on our array data.
-		if (l_bindData.length != 32)
+		if (l_bindData.length != 32) {
 			throw new OneWireException("Invalid Binding Data");
-		if (l_bindCode.length != 7)
+		}
+		if (l_bindCode.length != 7) {
 			throw new OneWireException("Invalid Binding Code");
-		if (l_signingChlg.length != 3)
+		}
+		if (l_signingChlg.length != 3) {
 			throw new OneWireException("Invalid Signing Challenge");
-		if (l_serviceFilename.length < 4)
+		}
+		if (l_serviceFilename.length < 4) {
 			throw new OneWireException("Invalid Service Filename");
-		if (l_signPageNumber != 0 && l_signPageNumber != 8)
+		}
+		if (l_signPageNumber != 0 && l_signPageNumber != 8) {
 			throw new OneWireException("Invalid Signing Page Number (must be 0 or 8)");
+		}
 
 		// Check to see if this coprocessor's authentication secret
 		// is appropriately padded to be used with a DS1961S
-		this.DS1961Scompatible = ((l_authSecret.length % 47) == 0);
-		int secretDiv = l_authSecret.length / 47;
-		for (int j = 0; j < secretDiv && DS1961Scompatible; j++) {
-			int offset = 47 * j;
-			for (int i = 32; i < 36 && this.DS1961Scompatible; i++)
-				this.DS1961Scompatible = (l_authSecret[i + offset] == (byte) 0x0FF);
-			for (int i = 44; i < 47 && this.DS1961Scompatible; i++)
-				this.DS1961Scompatible = (l_authSecret[i + offset] == (byte) 0x0FF);
+		this.DS1961Scompatible = l_authSecret.length % 47 == 0;
+		var secretDiv = l_authSecret.length / 47;
+		for (var j = 0; j < secretDiv && this.DS1961Scompatible; j++) {
+			var offset = 47 * j;
+			for (var i = 32; i < 36 && this.DS1961Scompatible; i++) {
+				this.DS1961Scompatible = l_authSecret[i + offset] == (byte) 0x0FF;
+			}
+			for (var i = 44; i < 47 && this.DS1961Scompatible; i++) {
+				this.DS1961Scompatible = l_authSecret[i + offset] == (byte) 0x0FF;
+			}
 		}
 
 		// get the current month, date, and year
-		Calendar c = Calendar.getInstance();
-		int month = c.get(Calendar.MONTH) + 1;
-		int date = c.get(Calendar.DATE);
-		int year = c.get(Calendar.YEAR) - 1900;
-		byte yearMSB = (byte) ((year >> 8) & 0x0FF);
-		byte yearLSB = (byte) (year & 0x0FF);
+		var c = Calendar.getInstance();
+		var month = c.get(Calendar.MONTH) + 1;
+		var date = c.get(Calendar.DATE);
+		var year = c.get(Calendar.YEAR) - 1900;
+		var yearMSB = (byte) (year >> 8 & 0x0FF);
+		var yearLSB = (byte) (year & 0x0FF);
 
 		try {
 			if (l_formatDevice) {
 				// format if necessary
-				OWFile f = new OWFile(l_owc, coprFilename);
+				var f = new OWFile(l_owc, coprFilename);
 				f.format();
 				f.close();
 			}
 			// Create the service file
-			OWFileOutputStream fos = new OWFileOutputStream(l_owc, coprFilename);
+			var fos = new OWFileOutputStream(l_owc, coprFilename);
 			fos.write(l_serviceFilename, 0, 4);
 			fos.write(l_serviceFileExt);
 			fos.write(l_signPageNumber);
@@ -344,7 +351,7 @@ public SHAiButtonCopr(OneWireContainer18 l_owc, String coprFilename, boolean l_f
 			fos.write(l_initialSignature, 0, (byte) l_initialSignature.length);
 			fos.write(l_auxData, 0, (byte) l_auxData.length);
 			fos.write(l_encCode);
-			fos.write(DS1961Scompatible ? 0x55 : 0x00);
+			fos.write(this.DS1961Scompatible ? 0x55 : 0x00);
 			fos.flush();
 			fos.close();
 		} catch (Exception ioe) {
@@ -353,12 +360,14 @@ public SHAiButtonCopr(OneWireContainer18 l_owc, String coprFilename, boolean l_f
 		}
 
 		// Install the system signing secret, used to sign and validate all user data
-		if (!l_owc.installMasterSecret(l_signPageNumber, l_signingSecret, l_signPageNumber & 7))
+		if (!l_owc.installMasterSecret(l_signPageNumber, l_signingSecret, l_signPageNumber & 7)) {
 			throw new OneWireException("Could not install signing secret");
+		}
 
 		// Install the system authentication secret, used to authenticate users
-		if (!l_owc.installMasterSecret(l_authPageNumber, l_authSecret, l_authPageNumber & 7))
+		if (!l_owc.installMasterSecret(l_authPageNumber, l_authSecret, l_authPageNumber & 7)) {
 			throw new OneWireException("Could not install authentication secret");
+		}
 
 		// \\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\
 		if (DEBUG) {
@@ -420,7 +429,7 @@ public SHAiButtonCopr(OneWireContainer18 l_owc, String coprFilename, boolean l_f
 	 * @see #SHAiButtonCopr(OneWireContainer18,String,boolean,int,int,int,int,int,byte,byte[],byte[],byte[],byte[],byte[],byte[],byte[],byte[],byte[])
 	 */
 	public SHAiButtonCopr(OneWireContainer18 owc, String coprFilename) throws OneWireException, OneWireIOException {
-		setiButton(owc, coprFilename);
+		this.setiButton(owc, coprFilename);
 	}
 
 	// ***********************************************************************
@@ -467,26 +476,29 @@ private void setiButton(OneWireContainer18 owc, String coprFilename) throws OneW
 
 		OWFileInputStream fis = null;
 		try {
-			if (DEBUG)
+			if (DEBUG) {
 				IOHelper.writeLine("opening file: " + coprFilename + " on token: " + owc);
+			}
 			fis = new OWFileInputStream(owc, coprFilename);
 		} catch (OWFileNotFoundException e) {
-			if (DEBUG)
+			if (DEBUG) {
 				e.printStackTrace();
+			}
 			throw new OneWireIOException("Coprocessor service file Not found: " + e);
 		}
 		try {
 			// configures this object from the info in the given stream
-			fromStream(fis);
+			this.fromStream(fis);
 		} catch (IOException ioe) {
-			if (DEBUG)
+			if (DEBUG) {
 				ioe.printStackTrace();
+			}
 			throw new OneWireException("Bad Data in Coprocessor Service File: " + ioe);
 		} finally {
 			try {
 				fis.close();
 			} catch (IOException ioe) {
-				/* well, at least I tried! */;
+				/* well, at least I tried! */
 			}
 		}
 
@@ -496,19 +508,19 @@ private void setiButton(OneWireContainer18 owc, String coprFilename) throws OneW
 			IOHelper.writeLine("Loaded Coprocessor");
 			IOHelper.writeLine("address");
 			IOHelper.writeBytesHex(owc.getAddress());
-			IOHelper.writeLine("signPageNumber: " + signPageNumber);
-			IOHelper.writeLine("authPageNumber: " + authPageNumber);
-			IOHelper.writeLine("wspcPageNumber: " + wspcPageNumber);
+			IOHelper.writeLine("signPageNumber: " + this.signPageNumber);
+			IOHelper.writeLine("authPageNumber: " + this.authPageNumber);
+			IOHelper.writeLine("wspcPageNumber: " + this.wspcPageNumber);
 			IOHelper.writeLine("serviceFilename");
-			IOHelper.writeBytesHex(filename);
+			IOHelper.writeBytesHex(this.filename);
 			IOHelper.writeLine("bindData");
-			IOHelper.writeBytesHex(bindData);
+			IOHelper.writeBytesHex(this.bindData);
 			IOHelper.writeLine("bindCode");
-			IOHelper.writeBytesHex(bindCode);
+			IOHelper.writeBytesHex(this.bindCode);
 			IOHelper.writeLine("initialSignature");
-			IOHelper.writeBytesHex(initialSignature);
+			IOHelper.writeBytesHex(this.initialSignature);
 			IOHelper.writeLine("signingChallenge");
-			IOHelper.writeBytesHex(signingChallenge);
+			IOHelper.writeBytesHex(this.signingChallenge);
 			IOHelper.writeLine("------------------------------------");
 		}
 		// \\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\
@@ -555,8 +567,8 @@ private void setiButton(OneWireContainer18 owc, String coprFilename) throws OneW
 	 *         device.
 	 */
 	public byte[] getAddress() {
-		byte[] data = new byte[8];
-		System.arraycopy(address, 0, data, 0, 8);
+		var data = new byte[8];
+		System.arraycopy(this.address, 0, data, 0, 8);
 		return data;
 	}
 
@@ -570,7 +582,7 @@ public byte[] getAddress() {
 	 * @param offset the index at which copying starts
 	 */
 	public void getAddress(byte[] data, int offset) {
-		System.arraycopy(address, 0, data, offset, 8);
+		System.arraycopy(this.address, 0, data, offset, 8);
 	}
 
 	/**
@@ -584,7 +596,7 @@ public void getAddress(byte[] data, int offset) {
 	 * @param cnt    the number of bytes to copy
 	 */
 	public void getAddress(byte[] data, int offset, int cnt) {
-		System.arraycopy(address, 0, data, offset, cnt);
+		System.arraycopy(this.address, 0, data, offset, cnt);
 	}
 
 	/**
@@ -611,7 +623,7 @@ public int getAuthenticationPageNumber() {
 	 * @return the auxiliary data of this coprocessor's service
 	 */
 	public String getAuxilliaryData() {
-		return auxData;
+		return this.auxData;
 	}
 
 	/**
@@ -626,8 +638,8 @@ public String getAuxilliaryData() {
 	 * @see OneWireContainer18#bindSecretToiButton(int,byte[],byte[],int)
 	 */
 	public byte[] getBindCode() {
-		byte[] data = new byte[7];
-		System.arraycopy(bindCode, 0, data, 0, 7);
+		var data = new byte[7];
+		System.arraycopy(this.bindCode, 0, data, 0, 7);
 		return data;
 	}
 
@@ -644,7 +656,7 @@ public byte[] getBindCode() {
 	 * @see OneWireContainer18#bindSecretToiButton(int,byte[],byte[],int)
 	 */
 	public void getBindCode(byte[] data, int offset) {
-		System.arraycopy(bindCode, 0, data, offset, 7);
+		System.arraycopy(this.bindCode, 0, data, offset, 7);
 	}
 
 	/**
@@ -659,8 +671,8 @@ public void getBindCode(byte[] data, int offset) {
 	 * @see OneWireContainer18#bindSecretToiButton(int,byte[],byte[],int)
 	 */
 	public byte[] getBindData() {
-		byte[] data = new byte[32];
-		System.arraycopy(bindData, 0, data, 0, 32);
+		var data = new byte[32];
+		System.arraycopy(this.bindData, 0, data, 0, 32);
 		return data;
 	}
 
@@ -677,7 +689,7 @@ public byte[] getBindData() {
 	 * @see OneWireContainer18#bindSecretToiButton(int,byte[],byte[],int)
 	 */
 	public void getBindData(byte[] data, int offset) {
-		System.arraycopy(bindData, 0, data, offset, 32);
+		System.arraycopy(this.bindData, 0, data, offset, 32);
 	}
 
 	/**
@@ -690,7 +702,7 @@ public void getBindData(byte[] data, int offset) {
 	 * @return an integer representing type of encryption for user data.
 	 */
 	public int getEncryptionCode() {
-		return encCode;
+		return this.encCode;
 	}
 
 	/**
@@ -703,8 +715,8 @@ public int getEncryptionCode() {
 	 * @param offset     the starting index for copying the filename.
 	 */
 	public void getFilename(byte[] l_filename, int offset) {
-		int cnt = Math.min(l_filename.length - offset, 4);
-		System.arraycopy(filename, offset, l_filename, offset, cnt);
+		var cnt = Math.min(l_filename.length - offset, 4);
+		System.arraycopy(this.filename, offset, l_filename, offset, cnt);
 	}
 
 	/**
@@ -717,7 +729,7 @@ public void getFilename(byte[] l_filename, int offset) {
 	 * @return proper file extension for user's account data file.
 	 */
 	public byte getFilenameExt() {
-		return filename[4];
+		return this.filename[4];
 	}
 
 	/**
@@ -729,8 +741,8 @@ public byte getFilenameExt() {
 	 * @return 20-byte initial signature.
 	 */
 	public byte[] getInitialSignature() {
-		byte[] data = new byte[20];
-		System.arraycopy(initialSignature, 0, data, 0, 20);
+		var data = new byte[20];
+		System.arraycopy(this.initialSignature, 0, data, 0, 20);
 		return data;
 	}
 
@@ -744,7 +756,7 @@ public byte[] getInitialSignature() {
 	 * @param offset the index at which to start copying.
 	 */
 	public void getInitialSignature(byte[] data, int offset) {
-		System.arraycopy(initialSignature, 0, data, offset, 20);
+		System.arraycopy(this.initialSignature, 0, data, offset, 20);
 	}
 
 	/**
@@ -756,7 +768,7 @@ public void getInitialSignature(byte[] data, int offset) {
 	 * @return the error code, zero for none.
 	 */
 	public int getLastError() {
-		return lastError;
+		return this.lastError;
 	}
 
 	/**
@@ -768,7 +780,7 @@ public int getLastError() {
 	 * @return the name of the provider's service.
 	 */
 	public String getProviderName() {
-		return providerName;
+		return this.providerName;
 	}
 
 	/**
@@ -780,8 +792,8 @@ public String getProviderName() {
 	 * @return 3-byte challenge
 	 */
 	public byte[] getSigningChallenge() {
-		byte[] data = new byte[3];
-		System.arraycopy(signingChallenge, 0, data, 0, 3);
+		var data = new byte[3];
+		System.arraycopy(this.signingChallenge, 0, data, 0, 3);
 		return data;
 	}
 
@@ -795,7 +807,7 @@ public byte[] getSigningChallenge() {
 	 * @param offset the index at which to start copying.
 	 */
 	public void getSigningChallenge(byte[] data, int offset) {
-		System.arraycopy(signingChallenge, 0, data, offset, 3);
+		System.arraycopy(this.signingChallenge, 0, data, offset, 3);
 	}
 
 	/**
@@ -846,7 +858,7 @@ public int getWorkspacePageNumber() {
 	 * @see #reformatFor1961S(byte[])
 	 */
 	public boolean isDS1961Scompatible() {
-		return DS1961Scompatible;
+		return this.DS1961Scompatible;
 	}
 	// ***********************************************************************
 	// End Accessor Methods
@@ -889,7 +901,7 @@ public boolean isDS1961Scompatible() {
 	 *                       signing the page using the coprocessor's system signing
 	 *                       secret.
 	 * @param macStart       the offset into mac_buffer where copying should start.
-	 * 
+	 *
 	 * @return <code>true</code> if successful, <code>false</code> if an error
 	 *         occurred (use <code>getLastError()</code> for more information on the
 	 *         type of error)
@@ -911,8 +923,8 @@ public boolean createDataSignature(byte[] accountData, byte[] signScratchpad, by
 		this.lastError = SHAiButtonCopr.NO_ERROR;
 
 		// maintain local reference to container
-		OneWireContainer18 ibcL = this.ibc;
-		int addr = this.signPageNumber << 5;
+		var ibcL = this.ibc;
+		var addr = this.signPageNumber << 5;
 
 		// now we are ready to make a signature
 		if (!ibcL.writeDataPage(this.signPageNumber, accountData)) {
@@ -935,7 +947,7 @@ public boolean createDataSignature(byte[] accountData, byte[] signScratchpad, by
 			IOHelper.writeLine("-----------------------------------------------------------");
 			IOHelper.writeLine("COPR DEBUG - createDataSignature");
 			IOHelper.write("address: ");
-			IOHelper.writeBytesHex(address, 0, 8);
+			IOHelper.writeBytesHex(this.address, 0, 8);
 			IOHelper.writeLine("speed: " + this.ibc.getAdapter().getSpeed());
 			IOHelper.writeLine("-----------------------------------------------------------");
 		}
@@ -951,8 +963,8 @@ public boolean createDataSignature(byte[] accountData, byte[] signScratchpad, by
 
 			ibcL.useResume(false);
 			return true;
-		} else
-			this.lastError = SHAiButtonCopr.SHA_FUNCTION_FAILED;
+		}
+		this.lastError = SHAiButtonCopr.SHA_FUNCTION_FAILED;
 
 		ibcL.useResume(false);
 		return false;
@@ -981,7 +993,7 @@ public boolean createDataSignature(byte[] accountData, byte[] signScratchpad, by
 	 *                       secret.
 	 * @param macStart       the offset into mac_buffer where copying should start.
 	 * @param fullBindCode   used to recreate the user iButton's unique secret
-	 * 
+	 *
 	 * @return <code>true</code> if successful, <code>false</code> if an error
 	 *         occurred (use <code>getLastError()</code> for more information on the
 	 *         type of error)
@@ -1004,16 +1016,16 @@ public boolean createDataSignatureAuth(byte[] accountData, byte[] signScratchpad
 		this.lastError = SHAiButtonCopr.NO_ERROR;
 
 		// maintain local reference to container
-		OneWireContainer18 ibcL = this.ibc;
-		int page = this.signPageNumber;
-		int addr = page << 5;
+		var ibcL = this.ibc;
+		var page = this.signPageNumber;
+		var addr = page << 5;
 
 		// \\//\\//\\//\\//\\//\\//\\////\\////\\////\\////\\////\\////\\//
 		if (DEBUG) {
 			IOHelper.writeLine("-----------------------------------------------------------");
 			IOHelper.writeLine("COPR DEBUG - createDataSignatureAuth");
 			IOHelper.writeLine("address:");
-			IOHelper.writeBytesHex(address, 0, 8);
+			IOHelper.writeBytesHex(this.address, 0, 8);
 			IOHelper.writeLine("accountData");
 			IOHelper.writeBytesHex(accountData);
 			IOHelper.writeLine("signScratchpad");
@@ -1021,10 +1033,11 @@ public boolean createDataSignatureAuth(byte[] accountData, byte[] signScratchpad
 			IOHelper.writeLine("mac_buffer: ");
 			IOHelper.writeBytesHex(mac_buffer, macStart, 20);
 			IOHelper.writeLine("fullBindCode: ");
-			if (fullBindCode != null)
+			if (fullBindCode != null) {
 				IOHelper.writeBytesHex(fullBindCode);
-			else
+			} else {
 				IOHelper.writeLine("null");
+			}
 			IOHelper.writeLine("-----------------------------------------------------------");
 		}
 
@@ -1063,15 +1076,15 @@ public boolean createDataSignatureAuth(byte[] accountData, byte[] signScratchpad
 
 			ibcL.useResume(false);
 			return true;
-		} else
-			this.lastError = SHAiButtonCopr.SHA_FUNCTION_FAILED;
+		}
+		this.lastError = SHAiButtonCopr.SHA_FUNCTION_FAILED;
 
 		ibcL.useResume(false);
 		return false;
 	}
 
 	// prevent malloc'ing in the critical path
-	private byte[] generateChallenge_scratchpad = new byte[32];
+	private final byte[] generateChallenge_scratchpad = new byte[32];
 
 	/**
 	 * <p>
@@ -1121,11 +1134,11 @@ public synchronized boolean generateChallenge(int offset, byte[] ch, int start)
 		this.lastError = SHAiButtonCopr.NO_ERROR;
 
 		// maintain local reference to container
-		OneWireContainer18 ibcL = this.ibc;
-		byte[] scratchpad = this.generateChallenge_scratchpad;
-		int addr = authPageNumber << 5;
+		var ibcL = this.ibc;
+		var scratchpad = this.generateChallenge_scratchpad;
+		var addr = this.authPageNumber << 5;
 
-		if (ibcL.eraseScratchPad(authPageNumber)) {
+		if (ibcL.eraseScratchPad(this.authPageNumber)) {
 			// ibcL.useResume(true);
 
 			if (ibcL.SHAFunction(OneWireContainer18.COMPUTE_CHALLENGE, addr)) {
@@ -1133,7 +1146,7 @@ public synchronized boolean generateChallenge(int offset, byte[] ch, int start)
 				ibcL.readScratchPad(scratchpad, 0);
 
 				// copy the requested 3 return bytes
-				System.arraycopy(scratchpad, 8 + (offset % 17), ch, start, 3);
+				System.arraycopy(scratchpad, 8 + offset % 17, ch, start, 3);
 
 				// \\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\
 				if (DEBUG) {
@@ -1141,7 +1154,7 @@ public synchronized boolean generateChallenge(int offset, byte[] ch, int start)
 					IOHelper.writeLine("COPR DEBUG");
 					IOHelper.writeLine("address:");
 					IOHelper.writeLine("speed: " + this.ibc.getAdapter().getSpeed());
-					IOHelper.writeBytesHex(address, 0, 8);
+					IOHelper.writeBytesHex(this.address, 0, 8);
 					IOHelper.writeLine("Challenge:");
 					IOHelper.writeBytesHex(ch, start, 3);
 					ch[start] = (byte) 0x01;
@@ -1153,10 +1166,11 @@ public synchronized boolean generateChallenge(int offset, byte[] ch, int start)
 				// \\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\
 				ibcL.useResume(false);
 				return true;
-			} else
-				this.lastError = SHAiButtonCopr.SHA_FUNCTION_FAILED;
-		} else
+			}
+			this.lastError = SHAiButtonCopr.SHA_FUNCTION_FAILED;
+		} else {
 			this.lastError = SHAiButtonCopr.ERASE_SCRATCHPAD_FAILED;
+		}
 
 		ibcL.useResume(false);
 		return false;
@@ -1228,9 +1242,9 @@ public boolean verifyAuthentication(byte[] fullBindCode, byte[] pageData, byte[]
 		this.lastError = SHAiButtonCopr.NO_ERROR;
 
 		// maintain local reference to container
-		OneWireContainer18 ibcL = this.ibc;
-		int addr = this.wspcPageNumber << 5;
-		int wspc = this.wspcPageNumber;
+		var ibcL = this.ibc;
+		var addr = this.wspcPageNumber << 5;
+		var wspc = this.wspcPageNumber;
 
 		// recreate the user's secret on the coprocessor.
 		if (!ibcL.bindSecretToiButton(this.authPageNumber, this.bindData, fullBindCode, wspc)) {
@@ -1245,7 +1259,7 @@ public boolean verifyAuthentication(byte[] fullBindCode, byte[] pageData, byte[]
 			IOHelper.writeLine("-----------------------------------------------------------");
 			IOHelper.writeLine("COPR DEBUG - verifyAuthentication");
 			IOHelper.write("address: ");
-			IOHelper.writeBytesHex(address, 0, 8);
+			IOHelper.writeBytesHex(this.address, 0, 8);
 			IOHelper.writeLine("speed: " + this.ibc.getAdapter().getSpeed());
 			IOHelper.writeLine("pageData");
 			IOHelper.writeBytesHex(pageData);
@@ -1253,7 +1267,7 @@ public boolean verifyAuthentication(byte[] fullBindCode, byte[] pageData, byte[]
 			IOHelper.writeBytesHex(scratchpad);
 			IOHelper.writeLine("authCmd: " + authCmd);
 			IOHelper.writeLine("bindData: ");
-			IOHelper.writeBytesHex(bindData);
+			IOHelper.writeBytesHex(this.bindData);
 			IOHelper.writeLine("fullBindCode: ");
 			IOHelper.writeBytesHex(fullBindCode);
 			IOHelper.writeLine("-----------------------------------------------------------");
@@ -1279,10 +1293,11 @@ public boolean verifyAuthentication(byte[] fullBindCode, byte[] pageData, byte[]
 			if (ibcL.matchScratchPad(verify_mac)) {
 				ibcL.useResume(false);
 				return true;
-			} else
-				this.lastError = SHAiButtonCopr.MATCH_SCRATCHPAD_FAILED;
-		} else
+			}
+			this.lastError = SHAiButtonCopr.MATCH_SCRATCHPAD_FAILED;
+		} else {
 			this.lastError = SHAiButtonCopr.SHA_FUNCTION_FAILED;
+		}
 
 		ibcL.useResume(false);
 
@@ -1327,8 +1342,8 @@ public boolean verifySignature(byte[] pageData, byte[] scratchpad, byte[] verify
 		this.lastError = SHAiButtonCopr.NO_ERROR;
 
 		// maintain local reference to container
-		OneWireContainer18 ibcL = this.ibc;
-		int addr = this.signPageNumber << 5;
+		var ibcL = this.ibc;
+		var addr = this.signPageNumber << 5;
 
 		// now we are ready to make a signature
 		if (!ibcL.writeDataPage(this.signPageNumber, pageData)) {
@@ -1349,7 +1364,7 @@ public boolean verifySignature(byte[] pageData, byte[] scratchpad, byte[] verify
 			IOHelper.writeLine("-----------------------------------------------------------");
 			IOHelper.writeLine("COPR DEBUG - verifySignature");
 			IOHelper.write("address: ");
-			IOHelper.writeBytesHex(address, 0, 8);
+			IOHelper.writeBytesHex(this.address, 0, 8);
 			IOHelper.writeLine("speed: " + this.ibc.getAdapter().getSpeed());
 			IOHelper.writeLine("-----------------------------------------------------------");
 		}
@@ -1360,10 +1375,11 @@ public boolean verifySignature(byte[] pageData, byte[] scratchpad, byte[] verify
 			if (ibcL.matchScratchPad(verify_mac)) {
 				ibcL.useResume(false);
 				return true;
-			} else
-				this.lastError = SHAiButtonCopr.MATCH_SCRATCHPAD_FAILED;
-		} else
+			}
+			this.lastError = SHAiButtonCopr.MATCH_SCRATCHPAD_FAILED;
+		} else {
 			this.lastError = SHAiButtonCopr.SHA_FUNCTION_FAILED;
+		}
 
 		ibcL.useResume(false);
 		return false;
@@ -1378,6 +1394,7 @@ public boolean verifySignature(byte[] pageData, byte[] scratchpad, byte[] verify
 	 *
 	 * @return a string containing the 8-byte address of this 1-Wire device.
 	 */
+	@Override
 	public String toString() {
 		return "COPR: " + this.ibc.getAddressAsString() + ", provider: " + this.providerName + ", version: "
 				+ this.version;
@@ -1401,23 +1418,23 @@ protected void fromStream(InputStream is) throws IOException {
 		is.read(this.bindCode, 0, 7);
 		is.read(this.signingChallenge, 0, 3);
 
-		int namelen = is.read();
-		int siglen = is.read();
-		int auxlen = is.read();
+		var namelen = is.read();
+		var siglen = is.read();
+		var auxlen = is.read();
 
-		byte[] l_providerName = new byte[namelen];
+		var l_providerName = new byte[namelen];
 		is.read(l_providerName);
 		this.providerName = new String(l_providerName);
 
-		int cnt = Math.min(this.initialSignature.length, siglen);
+		var cnt = Math.min(this.initialSignature.length, siglen);
 		is.read(this.initialSignature, 0, cnt);
 
-		byte[] l_auxData = new byte[auxlen];
+		var l_auxData = new byte[auxlen];
 		is.read(l_auxData);
 		this.auxData = new String(l_auxData);
 
 		this.encCode = is.read();
-		this.DS1961Scompatible = (is.read() != 0);
+		this.DS1961Scompatible = is.read() != 0;
 	}
 
 	/**
@@ -1441,8 +1458,8 @@ protected void toStream(OutputStream os) throws IOException {
 		os.write(this.bindCode);
 		os.write(this.signingChallenge);
 
-		byte[] l_providerName = this.providerName.getBytes();
-		byte[] l_auxData = this.auxData.getBytes();
+		var l_providerName = this.providerName.getBytes();
+		var l_auxData = this.auxData.getBytes();
 		os.write((byte) l_providerName.length);
 		os.write((byte) this.initialSignature.length);
 		os.write((byte) l_auxData.length);
@@ -1480,11 +1497,11 @@ protected void toStream(OutputStream os) throws IOException {
 	 *         DS1961S interaction.
 	 */
 	public static byte[] reformatFor1961S(byte[] auth_secret) {
-		int numPartials = (auth_secret.length / 47) + 1;
-		byte[] new_secret = new byte[47 * numPartials];
+		var numPartials = auth_secret.length / 47 + 1;
+		var new_secret = new byte[47 * numPartials];
 
-		for (int i = 0; i < numPartials; i++) {
-			int cnt = Math.min(auth_secret.length - (i * 47), 47);
+		for (var i = 0; i < numPartials; i++) {
+			var cnt = Math.min(auth_secret.length - i * 47, 47);
 			System.arraycopy(auth_secret, i * 47, new_secret, i * 47, cnt);
 			new_secret[i * 47 + 32] = (byte) 0xFF;
 			new_secret[i * 47 + 33] = (byte) 0xFF;
diff --git a/io.openems.edge.bridge.onewire/src/com/dalsemi/onewire/application/sha/SHAiButtonCoprVM.java b/io.openems.edge.bridge.onewire/src/com/dalsemi/onewire/application/sha/SHAiButtonCoprVM.java
index ddc514c2505..fcd259a42f9 100644
--- a/io.openems.edge.bridge.onewire/src/com/dalsemi/onewire/application/sha/SHAiButtonCoprVM.java
+++ b/io.openems.edge.bridge.onewire/src/com/dalsemi/onewire/application/sha/SHAiButtonCoprVM.java
@@ -92,7 +92,7 @@ public class SHAiButtonCoprVM extends SHAiButtonCopr {
 	private static final byte[] digestBuff = new byte[64];
 
 	// used for compute first secret
-	private static final byte[] NullSecret = new byte[] { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 };
+	private static final byte[] NullSecret = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 };
 
 	// used for generate challenge and random RomID
 	private static java.util.Random rand = new java.util.Random();
@@ -134,8 +134,8 @@ public class SHAiButtonCoprVM extends SHAiButtonCopr {
 	 *                           installation on user buttons.
 	 * @param l_bindCode         the binding code used to finalize secret
 	 *                           installation on user buttons.
-	 * @param l_auxData          any auxiliary or miscellaneous data to be stored
-	 *                           on the coprocessor.
+	 * @param l_auxData          any auxiliary or miscellaneous data to be stored on
+	 *                           the coprocessor.
 	 * @param l_initialSignature the 20-byte initial MAC placed in user account data
 	 *                           before generating actual MAC.
 	 * @param l_signingChlg      the 3-byte challenge used for signing user account
@@ -184,23 +184,27 @@ public SHAiButtonCoprVM(byte[] RomID, int l_signPageNumber, int l_authPageNumber
 
 		// Check to see if this coprocessor's authentication secret
 		// is appropriately padded to be used with a DS1961S
-		this.DS1961Scompatible = ((l_authSecret.length % 47) == 0);
-		int secretDiv = l_authSecret.length / 47;
-		for (int j = 0; j < secretDiv && DS1961Scompatible; j++) {
-			int offset = 47 * j;
-			for (int i = 32; i < 36 && this.DS1961Scompatible; i++)
-				this.DS1961Scompatible = (l_authSecret[i + offset] == (byte) 0x0FF);
-			for (int i = 44; i < 47 && this.DS1961Scompatible; i++)
-				this.DS1961Scompatible = (l_authSecret[i + offset] == (byte) 0x0FF);
+		this.DS1961Scompatible = l_authSecret.length % 47 == 0;
+		var secretDiv = l_authSecret.length / 47;
+		for (var j = 0; j < secretDiv && this.DS1961Scompatible; j++) {
+			var offset = 47 * j;
+			for (var i = 32; i < 36 && this.DS1961Scompatible; i++) {
+				this.DS1961Scompatible = l_authSecret[i + offset] == (byte) 0x0FF;
+			}
+			for (var i = 44; i < 47 && this.DS1961Scompatible; i++) {
+				this.DS1961Scompatible = l_authSecret[i + offset] == (byte) 0x0FF;
+			}
 		}
 
 		// Install the system signing secret, used to sign and validate all user data
-		if (!installMasterSecret(signPageNumber, l_signingSecret, signPageNumber & 7))
+		if (!this.installMasterSecret(this.signPageNumber, l_signingSecret, this.signPageNumber & 7)) {
 			throw new OneWireIOException("failed to install system signing secret");
+		}
 
 		// Install the system authentication secret, used to authenticate users
-		if (!installMasterSecret(authPageNumber, l_authSecret, authPageNumber & 7))
+		if (!this.installMasterSecret(this.authPageNumber, l_authSecret, this.authPageNumber & 7)) {
 			throw new OneWireIOException("failed to install authentication secret");
+		}
 	}
 
 	/**
@@ -230,8 +234,9 @@ public SHAiButtonCoprVM(byte[] RomID, int l_signPageNumber, int l_authPageNumber
 	 *
 	 */
 	public SHAiButtonCoprVM(String filename) throws OneWireException, OneWireIOException {
-		if (!load(filename))
+		if (!this.load(filename)) {
 			throw new OneWireIOException("failed to load config info");
+		}
 	}
 
 	/**
@@ -262,12 +267,15 @@ public SHAiButtonCoprVM(String filename) throws OneWireException, OneWireIOExcep
 	 */
 	public SHAiButtonCoprVM(String filename, byte[] sign_secret, byte[] auth_secret)
 			throws OneWireException, OneWireIOException {
-		if (!load(filename))
+		if (!this.load(filename)) {
 			throw new OneWireIOException("failed to load config info");
-		if (!installMasterSecret(signPageNumber, sign_secret, signPageNumber & 7))
+		}
+		if (!this.installMasterSecret(this.signPageNumber, sign_secret, this.signPageNumber & 7)) {
 			throw new OneWireIOException("failed to install system signing secret");
-		if (!installMasterSecret(authPageNumber, auth_secret, authPageNumber & 7))
+		}
+		if (!this.installMasterSecret(this.authPageNumber, auth_secret, this.authPageNumber & 7)) {
 			throw new OneWireIOException("failed to install authentication secret");
+		}
 	}
 
 	/**
@@ -297,8 +305,9 @@ public SHAiButtonCoprVM(String filename, byte[] sign_secret, byte[] auth_secret)
 	 * @see #SHAiButtonCoprVM(byte[],int,int,int,int,int,byte,byte[],byte[],byte[],byte[],byte[],byte[],byte[],byte[],byte[])
 	 */
 	public SHAiButtonCoprVM(OneWireContainer owc, String filename) throws OneWireException, OneWireIOException {
-		if (!load(owc, filename))
+		if (!this.load(owc, filename)) {
 			throw new OneWireIOException("failed to load config info");
+		}
 	}
 
 	/**
@@ -331,12 +340,15 @@ public SHAiButtonCoprVM(OneWireContainer owc, String filename) throws OneWireExc
 	 */
 	public SHAiButtonCoprVM(OneWireContainer owc, String filename, byte[] sign_secret, byte[] auth_secret)
 			throws OneWireException, OneWireIOException {
-		if (!load(owc, filename))
+		if (!this.load(owc, filename)) {
 			throw new OneWireIOException("failed to load config info");
-		if (!installMasterSecret(signPageNumber, sign_secret, signPageNumber & 7))
+		}
+		if (!this.installMasterSecret(this.signPageNumber, sign_secret, this.signPageNumber & 7)) {
 			throw new OneWireIOException("failed to install system signing secret");
-		if (!installMasterSecret(authPageNumber, auth_secret, authPageNumber & 7))
+		}
+		if (!this.installMasterSecret(this.authPageNumber, auth_secret, this.authPageNumber & 7)) {
 			throw new OneWireIOException("failed to install authentication secret");
+		}
 	}
 
 	/**
@@ -369,12 +381,15 @@ public SHAiButtonCoprVM(OneWireContainer owc, String filename, byte[] sign_secre
 	 */
 	public SHAiButtonCoprVM(OneWireContainer18 owc, String filename, byte[] sign_secret, byte[] auth_secret)
 			throws OneWireException, OneWireIOException {
-		if (!load(owc, filename))
+		if (!this.load(owc, filename)) {
 			throw new OneWireIOException("failed to load config info");
-		if (!installMasterSecret(signPageNumber, sign_secret, signPageNumber & 7))
+		}
+		if (!this.installMasterSecret(this.signPageNumber, sign_secret, this.signPageNumber & 7)) {
 			throw new OneWireIOException("failed to install system signing secret");
-		if (!installMasterSecret(authPageNumber, auth_secret, authPageNumber & 7))
+		}
+		if (!this.installMasterSecret(this.authPageNumber, auth_secret, this.authPageNumber & 7)) {
 			throw new OneWireIOException("failed to install authentication secret");
+		}
 	}
 
 	// ***********************************************************************
@@ -408,18 +423,19 @@ public SHAiButtonCoprVM(OneWireContainer18 owc, String filename, byte[] sign_sec
 	public boolean save(String filename, boolean saveSecretData) throws OneWireException, OneWireIOException {
 		try {
 			// Create the configuration file
-			FileOutputStream fos = new FileOutputStream(filename);
+			var fos = new FileOutputStream(filename);
 
 			// write the data out to the config file
-			toStream(fos);
+			this.toStream(fos);
 
 			// non-standard additions
-			fos.write(address, 0, 8);
-			for (int i = 0; i < 8; i++) {
-				if (saveSecretData)
-					fos.write(secretPage[i]);
-				else
+			fos.write(this.address, 0, 8);
+			for (var i = 0; i < 8; i++) {
+				if (saveSecretData) {
+					fos.write(this.secretPage[i]);
+				} else {
 					fos.write(NullSecret);
+				}
 			}
 			fos.flush();
 			fos.close();
@@ -455,18 +471,19 @@ public boolean save(OneWireContainer owc, String filename, boolean saveSecretDat
 			throws OneWireException, OneWireIOException {
 		try {
 			// Create the configuration file
-			OWFileOutputStream fos = new OWFileOutputStream(owc, filename);
+			var fos = new OWFileOutputStream(owc, filename);
 
 			// write the data out
-			toStream(fos);
+			this.toStream(fos);
 
 			// non-standard additions
-			fos.write(address, 0, 8);
-			for (int i = 0; i < 8; i++) {
-				if (saveSecretData)
-					fos.write(secretPage[i]);
-				else
+			fos.write(this.address, 0, 8);
+			for (var i = 0; i < 8; i++) {
+				if (saveSecretData) {
+					fos.write(this.secretPage[i]);
+				} else {
 					fos.write(NullSecret);
+				}
 			}
 			fos.flush();
 			fos.close();
@@ -492,16 +509,16 @@ public boolean save(OneWireContainer owc, String filename, boolean saveSecretDat
 	public boolean load(String filename) {
 		try {
 			// open the file containing config info
-			FileInputStream fis = new FileInputStream(filename);
+			var fis = new FileInputStream(filename);
 
 			// load info from the file stream
-			fromStream(fis);
+			this.fromStream(fis);
 
 			// non-standard file components
 			if (fis.available() > 0) {
 				fis.read(this.address, 0, 8);
-				for (int i = 0; i < 8 && fis.available() > 0; i++) {
-					fis.read(secretPage[i]);
+				for (var i = 0; i < 8 && fis.available() > 0; i++) {
+					fis.read(this.secretPage[i]);
 				}
 			}
 			fis.close();
@@ -527,16 +544,16 @@ public boolean load(String filename) {
 	public boolean load(OneWireContainer owc, String filename) {
 		try {
 			// open the file containing config info
-			OWFileInputStream fis = new OWFileInputStream(owc, filename);
+			var fis = new OWFileInputStream(owc, filename);
 
 			// load info from the file stream
-			fromStream(fis);
+			this.fromStream(fis);
 
 			// non-standard file components
 			if (fis.available() > 0) {
 				fis.read(this.address, 0, 8);
-				for (int i = 0; i < 8 && fis.available() > 0; i++) {
-					fis.read(secretPage[i]);
+				for (var i = 0; i < 8 && fis.available() > 0; i++) {
+					fis.read(this.secretPage[i]);
 				}
 			}
 			fis.close();
@@ -560,10 +577,10 @@ public boolean load(OneWireContainer owc, String filename) {
 	public boolean load(OneWireContainer18 owc, String filename) {
 		try {
 			// open the file containing config info
-			OWFileInputStream fis = new OWFileInputStream(owc, filename);
+			var fis = new OWFileInputStream(owc, filename);
 
 			// load info from the file stream
-			fromStream(fis);
+			this.fromStream(fis);
 
 			// non-standard components
 			System.arraycopy(owc.getAddress(), 0, this.address, 0, 8);
@@ -616,7 +633,7 @@ public boolean load(OneWireContainer18 owc, String filename) {
 	 *                       signing the page using the coprocessor's system signing
 	 *                       secret.
 	 * @param macStart       the offset into mac_buffer where copying should start.
-	 * 
+	 *
 	 * @return <code>true</code> if successful, <code>false</code> if an error
 	 *         occurred (use <code>getLastError()</code> for more information on the
 	 *         type of error)
@@ -632,13 +649,14 @@ public boolean load(OneWireContainer18 owc, String filename) {
 	 * @see OneWireContainer18#SHAFunction(byte,int)
 	 * @see #getLastError()
 	 */
+	@Override
 	public boolean createDataSignature(byte[] accountData, byte[] signScratchpad, byte[] mac_buffer, int macStart)
 			throws OneWireException, OneWireIOException {
 		// clear any errors
 		this.lastError = SHAiButtonCopr.NO_ERROR;
 
-		if (SHAFunction(OneWireContainer18.SIGN_DATA_PAGE, secretPage[signPageNumber & 7], accountData, signScratchpad,
-				null, signPageNumber, -1)) {
+		if (this.SHAFunction(OneWireContainer18.SIGN_DATA_PAGE, this.secretPage[this.signPageNumber & 7], accountData,
+				signScratchpad, null, this.signPageNumber, -1)) {
 			System.arraycopy(signScratchpad, 8, mac_buffer, macStart, 20);
 			return true;
 		}
@@ -648,7 +666,7 @@ public boolean createDataSignature(byte[] accountData, byte[] signScratchpad, by
 	}
 
 	// prevent malloc'ing in the critical path
-	private byte[] generateChallenge_chlg = new byte[20];
+	private final byte[] generateChallenge_chlg = new byte[20];
 
 	/**
 	 * <p>
@@ -692,6 +710,7 @@ public boolean createDataSignature(byte[] accountData, byte[] signScratchpad, by
 	 * @see SHAiButtonUser#readAccountData(byte[],int,byte[],int,byte[],int)
 	 * @see #getLastError()
 	 */
+	@Override
 	public synchronized boolean generateChallenge(int offset, byte[] ch, int start)
 			throws OneWireIOException, OneWireException {
 		// clear any errors
@@ -764,17 +783,19 @@ public synchronized boolean generateChallenge(int offset, byte[] ch, int start)
 	 * @see OneWireContainer18#matchScratchPad(byte[])
 	 * @see #getLastError()
 	 */
+	@Override
 	public boolean verifyAuthentication(byte[] fullBindCode, byte[] pageData, byte[] scratchpad, byte[] verify_mac,
 			byte authCmd) throws OneWireIOException, OneWireException {
 		// clear any errors
 		this.lastError = SHAiButtonCopr.NO_ERROR;
-		int secretNum = this.wspcPageNumber & 7;
+		var secretNum = this.wspcPageNumber & 7;
 
 		// set Workspace Secret
-		bindSecretToiButton(authPageNumber, this.bindData, fullBindCode, secretNum);
+		this.bindSecretToiButton(this.authPageNumber, this.bindData, fullBindCode, secretNum);
 
-		if (SHAFunction(authCmd, secretPage[secretNum], pageData, scratchpad, null, wspcPageNumber, -1)) {
-			for (int i = 0; i < 20; i++) {
+		if (this.SHAFunction(authCmd, this.secretPage[secretNum], pageData, scratchpad, null, this.wspcPageNumber,
+				-1)) {
+			for (var i = 0; i < 20; i++) {
 				if (scratchpad[i + 8] != verify_mac[i]) {
 					this.lastError = SHAiButtonCopr.MATCH_SCRATCHPAD_FAILED;
 					return false;
@@ -811,7 +832,7 @@ public boolean verifyAuthentication(byte[] fullBindCode, byte[] pageData, byte[]
 	 *                       secret.
 	 * @param macStart       the offset into mac_buffer where copying should start.
 	 * @param fullBindCode   ignored by simulated coprocessor
-	 * 
+	 *
 	 * @return <code>true</code> if successful, <code>false</code> if an error
 	 *         occurred (use <code>getLastError()</code> for more information on the
 	 *         type of error)
@@ -828,13 +849,14 @@ public boolean verifyAuthentication(byte[] fullBindCode, byte[] pageData, byte[]
 	 * @see #createDataSignature(byte[],byte[],byte[],int)
 	 * @see #getLastError()
 	 */
+	@Override
 	public boolean createDataSignatureAuth(byte[] accountData, byte[] signScratchpad, byte[] mac_buffer, int macStart,
 			byte[] fullBindCode) throws OneWireException, OneWireIOException {
 		// clear any errors
 		this.lastError = SHAiButtonCopr.NO_ERROR;
 
-		if (SHAFunction(OneWireContainer18.SIGN_DATA_PAGE, secretPage[wspcPageNumber & 7], accountData, signScratchpad,
-				null, signPageNumber, -1)) {
+		if (this.SHAFunction(OneWireContainer18.SIGN_DATA_PAGE, this.secretPage[this.wspcPageNumber & 7], accountData,
+				signScratchpad, null, this.signPageNumber, -1)) {
 			System.arraycopy(signScratchpad, 8, mac_buffer, macStart, 20);
 			return true;
 		}
@@ -875,14 +897,15 @@ public boolean createDataSignatureAuth(byte[] accountData, byte[] signScratchpad
 	 * @see #verifyAuthentication(byte[],byte[],byte[],byte[],byte)
 	 * @see #getLastError()
 	 */
+	@Override
 	public boolean verifySignature(byte[] pageData, byte[] scratchpad, byte[] verify_mac)
 			throws OneWireIOException, OneWireException {
 		// clear any errors
 		this.lastError = SHAiButtonCopr.NO_ERROR;
 
-		if (SHAFunction(OneWireContainer18.VALIDATE_DATA_PAGE, this.secretPage[signPageNumber & 7], pageData,
-				scratchpad, this.address, signPageNumber, -1)) {
-			for (int i = 0; i < 20; i++) {
+		if (this.SHAFunction(OneWireContainer18.VALIDATE_DATA_PAGE, this.secretPage[this.signPageNumber & 7], pageData,
+				scratchpad, this.address, this.signPageNumber, -1)) {
+			for (var i = 0; i < 20; i++) {
 				if (scratchpad[i + 8] != verify_mac[i]) {
 					this.lastError = SHAiButtonCopr.MATCH_SCRATCHPAD_FAILED;
 					return false;
@@ -894,7 +917,7 @@ public boolean verifySignature(byte[] pageData, byte[] scratchpad, byte[] verify
 		return false;
 	}
 
-	private byte[] bindSecretToiButton_scratchpad = new byte[32];
+	private final byte[] bindSecretToiButton_scratchpad = new byte[32];
 
 	/**
 	 * <p>
@@ -937,7 +960,7 @@ public boolean verifySignature(byte[] pageData, byte[] scratchpad, byte[] verify
 	 */
 	public synchronized boolean bindSecretToiButton(int pageNum, byte[] bindData, byte[] bindCode, int secretNum) {
 		// local vars
-		byte[] scratchpad = this.bindSecretToiButton_scratchpad;
+		var scratchpad = this.bindSecretToiButton_scratchpad;
 
 		// write the bind_code to the scratchpad
 		if (bindCode.length == 7) {
@@ -946,16 +969,17 @@ public synchronized boolean bindSecretToiButton(int pageNum, byte[] bindData, by
 			System.arraycopy(this.address, 0, scratchpad, 13, 7);
 			System.arraycopy(bindCode, 4, scratchpad, 20, 3);
 		} else {
-			System.arraycopy(bindCode, 0, scratchpad, 8, (bindCode.length > 15 ? 15 : bindCode.length));
+			System.arraycopy(bindCode, 0, scratchpad, 8, bindCode.length > 15 ? 15 : bindCode.length);
 		}
 
 		// compute the MAC
-		if (!SHAFunction(OneWireContainer18.COMPUTE_NEXT_SECRET, secretPage[pageNum & 7], bindData, scratchpad, null,
-				pageNum, 0))
+		if (!this.SHAFunction(OneWireContainer18.COMPUTE_NEXT_SECRET, this.secretPage[pageNum & 7], bindData,
+				scratchpad, null, pageNum, 0)) {
 			return false;
+		}
 
 		// install the secret
-		System.arraycopy(scratchpad, 0, secretPage[secretNum & 7], 0, 8);
+		System.arraycopy(scratchpad, 0, this.secretPage[secretNum & 7], 0, 8);
 
 		return true;
 	}
@@ -995,44 +1019,47 @@ public boolean installMasterSecret(int pageNum, byte[] secret, int secretNum) {
 		// is to be computed, 32 bytes goes in the page and 15 goes in
 		// the scratchpad, so it's going to be easier in the computations
 		// if i know the input buffer length is divisible by 47
-		if (secret.length == 0)
+		if (secret.length == 0) {
 			return false;
+		}
 
 		byte[] input_secret = null;
-		int secret_mod_length = secret.length % 47;
+		var secret_mod_length = secret.length % 47;
 
-		if (secret_mod_length == 0) // if the length of the secret is divisible by 47
+		if (secret_mod_length == 0) {
 			input_secret = secret;
-		else {
+		} else {
 
 			/*
 			 * i figure in the case where secret is not divisible by 47 it will be quicker
 			 * to just create a new array once and copy the data in, rather than on every
 			 * partial secret calculation do bounds checking
 			 */
-			input_secret = new byte[secret.length + (47 - secret_mod_length)];
+			input_secret = new byte[secret.length + 47 - secret_mod_length];
 
 			System.arraycopy(secret, 0, input_secret, 0, secret.length);
 		}
 
 		// the current offset into the input_secret buffer
 		secretNum = secretNum & 7;
-		int offset = 0;
-		byte cmd = OneWireContainer18.COMPUTE_FIRST_SECRET;
-		byte[] scratchpad = new byte[32];
-		byte[] dataPage = new byte[32];
+		var offset = 0;
+		var cmd = OneWireContainer18.COMPUTE_FIRST_SECRET;
+		var scratchpad = new byte[32];
+		var dataPage = new byte[32];
 		while (offset < input_secret.length) {
-			for (int i = 0; i < 32; i++)
+			for (var i = 0; i < 32; i++) {
 				scratchpad[i] = (byte) 0x0FF;
+			}
 
 			System.arraycopy(input_secret, offset, dataPage, 0, 32);
 			System.arraycopy(input_secret, offset + 32, scratchpad, 8, 15);
-			if (!SHAFunction(cmd, secretPage[pageNum & 7], dataPage, scratchpad, null, signPageNumber, 0)) {
+			if (!this.SHAFunction(cmd, this.secretPage[pageNum & 7], dataPage, scratchpad, null, this.signPageNumber,
+					0)) {
 				return false;
 			}
 
 			// install the secret
-			System.arraycopy(scratchpad, 0, secretPage[secretNum], 0, 8);
+			System.arraycopy(scratchpad, 0, this.secretPage[secretNum], 0, 8);
 
 			offset += 47;
 			cmd = OneWireContainer18.COMPUTE_NEXT_SECRET;
@@ -1085,7 +1112,7 @@ public boolean installMasterSecret(int pageNum, byte[] secret, int secretNum) {
 	private synchronized boolean SHAFunction(byte function, byte[] shaSecret, byte[] shaPage, byte[] scratchpad,
 			byte[] romID, int pageNum, int writeCycleCounter) {
 		// offset for location in scratchpad to copy the MAC
-		int offset = 8;
+		var offset = 8;
 
 		// byte used for the M-X control bits
 		// Since never matching, I assume M bit is never set...
@@ -1105,7 +1132,7 @@ private synchronized boolean SHAFunction(byte function, byte[] shaSecret, byte[]
 		case OneWireContainer18.VALIDATE_DATA_PAGE:
 		case OneWireContainer18.SIGN_DATA_PAGE:
 			// M-X-P byte
-			scratchpad[12] = (byte) ((scratchpad[12] & 0x3F) | (shaMX & 0xC0));
+			scratchpad[12] = (byte) (scratchpad[12] & 0x3F | shaMX & 0xC0);
 			break;
 
 		// Authenticate host
@@ -1113,7 +1140,7 @@ private synchronized boolean SHAFunction(byte function, byte[] shaSecret, byte[]
 			// for authenticate host, X bit is set.
 			shaMX |= 0x40;
 			// M-X-P byte
-			scratchpad[12] = (byte) ((scratchpad[12] & 0x3F) | (shaMX & 0xC0));
+			scratchpad[12] = (byte) (scratchpad[12] & 0x3F | shaMX & 0xC0);
 			break;
 
 		// compute challenge and read authenticated page
@@ -1123,12 +1150,12 @@ private synchronized boolean SHAFunction(byte function, byte[] shaSecret, byte[]
 		case OneWireContainer18.READ_AUTHENTICATED_PAGE:
 			// place the write cycle counter into the scratchpad
 			scratchpad[8] = (byte) (writeCycleCounter & 0x0FF);
-			scratchpad[9] = (byte) ((writeCycleCounter >>> 8) & 0x0FF);
-			scratchpad[10] = (byte) ((writeCycleCounter >>> 16) & 0x0FF);
-			scratchpad[11] = (byte) ((writeCycleCounter >>> 24) & 0x0FF);
+			scratchpad[9] = (byte) (writeCycleCounter >>> 8 & 0x0FF);
+			scratchpad[10] = (byte) (writeCycleCounter >>> 16 & 0x0FF);
+			scratchpad[11] = (byte) (writeCycleCounter >>> 24 & 0x0FF);
 
 			// M-X-P byte
-			scratchpad[12] = (byte) ((pageNum & 0x0F) | (shaMX & 0xC0));
+			scratchpad[12] = (byte) (pageNum & 0x0F | shaMX & 0xC0);
 
 			// place the RomID into the scratchpad
 			System.arraycopy(romID, 0, scratchpad, 13, 7);
@@ -1148,8 +1175,9 @@ private synchronized boolean SHAFunction(byte function, byte[] shaSecret, byte[]
 
 		// init. digest buffer padding
 		digestBuff[55] = (byte) 0x80;
-		for (int i = 56; i < 62; i++)
+		for (var i = 56; i < 62; i++) {
 			digestBuff[i] = (byte) 0x00;
+		}
 		digestBuff[62] = (byte) 0x01;
 		digestBuff[63] = (byte) 0xB8;
 
@@ -1157,18 +1185,26 @@ private synchronized boolean SHAFunction(byte function, byte[] shaSecret, byte[]
 		if (DEBUG) {
 			IOHelper.writeLine("------------------------------------------------------------");
 
-			if (function == OneWireContainer18.VALIDATE_DATA_PAGE)
+			switch (function) {
+			case OneWireContainer18.VALIDATE_DATA_PAGE:
 				IOHelper.writeLine("Validating data page");
-			else if (function == OneWireContainer18.AUTH_HOST)
+				break;
+			case OneWireContainer18.AUTH_HOST:
 				IOHelper.writeLine("Authenticating Host");
-			else if (function == OneWireContainer18.SIGN_DATA_PAGE)
+				break;
+			case OneWireContainer18.SIGN_DATA_PAGE:
 				IOHelper.writeLine("Signing Data Page");
-			else if (function == OneWireContainer18.COMPUTE_NEXT_SECRET)
+				break;
+			case OneWireContainer18.COMPUTE_NEXT_SECRET:
 				IOHelper.writeLine("Computing Next Secret");
-			else if (function == OneWireContainer18.COMPUTE_FIRST_SECRET)
+				break;
+			case OneWireContainer18.COMPUTE_FIRST_SECRET:
 				IOHelper.writeLine("Computing FIRST Secret");
-			else
+				break;
+			default:
 				IOHelper.writeLine("SHA Function" + function);
+				break;
+			}
 
 			IOHelper.writeLine("pageNum: " + pageNum);
 			IOHelper.writeLine("DigestBuffer: ");
@@ -1208,6 +1244,7 @@ else if (function == OneWireContainer18.COMPUTE_FIRST_SECRET)
 	 *
 	 * @return a string containing the 8-byte address of this 1-Wire device.
 	 */
+	@Override
 	public String toString() {
 		return "COPRVM: " + Address.toString(this.address) + ", provider: " + this.providerName + ", version: "
 				+ this.version;
diff --git a/io.openems.edge.bridge.onewire/src/com/dalsemi/onewire/application/sha/SHAiButtonUser.java b/io.openems.edge.bridge.onewire/src/com/dalsemi/onewire/application/sha/SHAiButtonUser.java
index e38c07c086d..ee02a6b2663 100644
--- a/io.openems.edge.bridge.onewire/src/com/dalsemi/onewire/application/sha/SHAiButtonUser.java
+++ b/io.openems.edge.bridge.onewire/src/com/dalsemi/onewire/application/sha/SHAiButtonUser.java
@@ -93,7 +93,7 @@ public abstract class SHAiButtonUser {
 	/**
 	 * used to construct appropriate string for OWFile constructor
 	 */
-	protected final byte[] serviceFile = new byte[] { (byte) 'D', (byte) 'L', (byte) 'S', (byte) 'M' };
+	protected final byte[] serviceFile = { (byte) 'D', (byte) 'L', (byte) 'S', (byte) 'M' };
 	/**
 	 * stores string name of user's service file
 	 */
@@ -150,8 +150,8 @@ public String getAccountFilename() {
 	 *         device.
 	 */
 	public byte[] getAddress() {
-		byte[] data = new byte[8];
-		System.arraycopy(address, 0, data, 0, 8);
+		var data = new byte[8];
+		System.arraycopy(this.address, 0, data, 0, 8);
 		return data;
 	}
 
@@ -165,7 +165,7 @@ public byte[] getAddress() {
 	 * @param offset the index at which copying starts
 	 */
 	public void getAddress(byte[] data, int offset) {
-		System.arraycopy(address, 0, data, offset, 8);
+		System.arraycopy(this.address, 0, data, offset, 8);
 	}
 
 	/**
@@ -179,7 +179,7 @@ public void getAddress(byte[] data, int offset) {
 	 * @param cnt    the number of bytes to copy
 	 */
 	public void getAddress(byte[] data, int offset, int cnt) {
-		System.arraycopy(address, 0, data, offset, cnt);
+		System.arraycopy(this.address, 0, data, offset, cnt);
 	}
 
 	/**
@@ -213,14 +213,16 @@ public boolean getForceOverdrive() {
 	 *                     creating the service file.
 	 */
 	protected boolean createServiceFile(OneWireContainer owc, String filename, boolean formatDevice) {
-		boolean bRetVal = false;
-		OWFile owf = new OWFile(owc, strServiceFilename);
+		var bRetVal = false;
+		var owf = new OWFile(owc, this.strServiceFilename);
 		try {
-			if (formatDevice)
+			if (formatDevice) {
 				owf.format();
+			}
 
-			if (!owf.exists())
+			if (!owf.exists()) {
 				owf.createNewFile();
+			}
 
 			// save reference to page number for service file
 			this.accountPageNumber = owf.getPageList()[0];
@@ -260,14 +262,15 @@ protected boolean createServiceFile(OneWireContainer owc, String filename, boole
 	 */
 	protected synchronized boolean checkAccountPageInfo(OneWireContainer ibc) {
 		// this flag should only be set if there is valid data
-		if (accountPageNumber <= 0) {
+		if (this.accountPageNumber <= 0) {
 			try {
 				// create a file object representing service file
-				OWFile owf = new OWFile(ibc, strServiceFilename);
+				var owf = new OWFile(ibc, this.strServiceFilename);
 
 				// check to see if file exists
-				if (!owf.exists())
+				if (!owf.exists()) {
 					return false;
+				}
 
 				// get the page number for the file
 				// this.accountPageNumber = owf.getPageList()[0];
@@ -290,7 +293,7 @@ protected synchronized boolean checkAccountPageInfo(OneWireContainer ibc) {
 			}
 		}
 
-		return (this.accountPageNumber > 0);
+		return this.accountPageNumber > 0;
 	}
 
 	// *************************************************************** //
@@ -513,8 +516,9 @@ public boolean refreshDevice() throws OneWireException, OneWireIOException {
 	 *
 	 * @return a string containing the 8-byte address of this 1-Wire device.
 	 */
+	@Override
 	public String toString() {
-		StringBuffer sb = new StringBuffer(100);
+		var sb = new StringBuilder(100);
 		sb.append("USER: ");
 		sb.append(Address.toString(this.address));
 		sb.append(", service: ");
diff --git a/io.openems.edge.bridge.onewire/src/com/dalsemi/onewire/application/sha/SHAiButtonUser18.java b/io.openems.edge.bridge.onewire/src/com/dalsemi/onewire/application/sha/SHAiButtonUser18.java
index b0baf48253a..91619beead2 100644
--- a/io.openems.edge.bridge.onewire/src/com/dalsemi/onewire/application/sha/SHAiButtonUser18.java
+++ b/io.openems.edge.bridge.onewire/src/com/dalsemi/onewire/application/sha/SHAiButtonUser18.java
@@ -64,7 +64,7 @@ public class SHAiButtonUser18 extends SHAiButtonUser {
 	 * @see #SHAiButtonUser18(SHAiButtonCopr)
 	 */
 	protected SHAiButtonUser18() {
-		;
+
 	}
 
 	/**
@@ -107,8 +107,9 @@ public SHAiButtonUser18(SHAiButtonCopr copr, OneWireContainer18 owc, boolean for
 		// and address
 		this.address = owc.getAddress();
 
-		if (!createServiceFile(owc, strServiceFilename, formatDevice))
+		if (!this.createServiceFile(owc, this.strServiceFilename, formatDevice)) {
 			throw new OneWireException("Failed to create service file.");
+		}
 
 		// save a copy of the binding code
 		copr.getBindCode(this.fullBindCode, 0);
@@ -118,12 +119,15 @@ public SHAiButtonUser18(SHAiButtonCopr copr, OneWireContainer18 owc, boolean for
 		this.fullBindCode[4] = (byte) this.accountPageNumber;
 		System.arraycopy(this.address, 0, this.fullBindCode, 5, 7);
 
-		if (!owc.installMasterSecret(accountPageNumber, authSecret, accountPageNumber & 7))
+		if (!owc.installMasterSecret(this.accountPageNumber, authSecret, this.accountPageNumber & 7)) {
 			throw new OneWireException("Install Master Secret failed");
+		}
 
 		// not in critical path, so getBindBlah() is okay.
-		if (!owc.bindSecretToiButton(accountPageNumber, copr.getBindData(), this.fullBindCode, accountPageNumber & 7))
+		if (!owc.bindSecretToiButton(this.accountPageNumber, copr.getBindData(), this.fullBindCode,
+				this.accountPageNumber & 7)) {
 			throw new OneWireException("Bind Secret to iButton failed");
+		}
 
 		// \\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\
 		if (DEBUG) {
@@ -131,8 +135,8 @@ public SHAiButtonUser18(SHAiButtonCopr copr, OneWireContainer18 owc, boolean for
 			IOHelper.writeLine("Initialized User");
 			IOHelper.writeLine("address");
 			IOHelper.writeBytesHex(owc.getAddress());
-			IOHelper.writeLine("serviceFilename: " + strServiceFilename);
-			IOHelper.writeLine("accountPageNumber: " + accountPageNumber);
+			IOHelper.writeLine("serviceFilename: " + this.strServiceFilename);
+			IOHelper.writeLine("accountPageNumber: " + this.accountPageNumber);
 			IOHelper.writeLine("authSecret");
 			IOHelper.writeBytesHex(authSecret);
 			IOHelper.writeLine("bindData");
@@ -188,10 +192,11 @@ public SHAiButtonUser18(byte[] coprBindData, byte[] coprBindCode, byte[] fileNam
 
 		System.arraycopy(fileName, 0, this.serviceFile, 0, 4);
 		// create string representation of service filename
-		this.strServiceFilename = new String(fileName) + "." + (int) fileNameExt;
+		this.strServiceFilename = new String(fileName) + "." + fileNameExt;
 
-		if (!createServiceFile(owc, strServiceFilename, formatDevice))
+		if (!this.createServiceFile(owc, this.strServiceFilename, formatDevice)) {
 			throw new OneWireException("Failed to create service file.");
+		}
 
 		// save a copy of the binding code
 		System.arraycopy(coprBindCode, 0, this.fullBindCode, 0, 7);
@@ -201,12 +206,15 @@ public SHAiButtonUser18(byte[] coprBindData, byte[] coprBindCode, byte[] fileNam
 		this.fullBindCode[4] = (byte) this.accountPageNumber;
 		System.arraycopy(this.address, 0, this.fullBindCode, 5, 7);
 
-		if (!owc.installMasterSecret(accountPageNumber, authSecret, accountPageNumber & 7))
+		if (!owc.installMasterSecret(this.accountPageNumber, authSecret, this.accountPageNumber & 7)) {
 			throw new OneWireException("Install Master Secret failed");
+		}
 
 		// not in critical path, so getBindBlah() is okay.
-		if (!owc.bindSecretToiButton(accountPageNumber, coprBindData, this.fullBindCode, accountPageNumber & 7))
+		if (!owc.bindSecretToiButton(this.accountPageNumber, coprBindData, this.fullBindCode,
+				this.accountPageNumber & 7)) {
 			throw new OneWireException("Bind Secret to iButton failed");
+		}
 
 		// \\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\
 		if (DEBUG) {
@@ -214,8 +222,8 @@ public SHAiButtonUser18(byte[] coprBindData, byte[] coprBindCode, byte[] fileNam
 			IOHelper.writeLine("Initialized User");
 			IOHelper.writeLine("address");
 			IOHelper.writeBytesHex(owc.getAddress());
-			IOHelper.writeLine("serviceFilename: " + strServiceFilename);
-			IOHelper.writeLine("accountPageNumber: " + accountPageNumber);
+			IOHelper.writeLine("serviceFilename: " + this.strServiceFilename);
+			IOHelper.writeLine("accountPageNumber: " + this.accountPageNumber);
 			IOHelper.writeLine("authSecret");
 			IOHelper.writeBytesHex(authSecret);
 			IOHelper.writeLine("bindCode");
@@ -254,8 +262,9 @@ public SHAiButtonUser18(SHAiButtonCopr copr, OneWireContainer18 owc) throws OneW
 		this(copr);
 
 		// hold container reference and address
-		if (!setiButton18(owc))
+		if (!this.setiButton18(owc)) {
 			throw new OneWireException("Invalid SHA user");
+		}
 	}
 
 	/**
@@ -290,11 +299,12 @@ public SHAiButtonUser18(byte[] coprBindCode, byte[] fileName, int fileNameExt, O
 
 		// create string representation of service filename
 		System.arraycopy(fileName, 0, this.serviceFile, 0, 4);
-		this.strServiceFilename = new String(fileName) + "." + (int) fileNameExt;
+		this.strServiceFilename = new String(fileName) + "." + fileNameExt;
 
 		// hold container reference and address
-		if (!setiButton18(owc))
+		if (!this.setiButton18(owc)) {
 			throw new OneWireException("Invalid SHA user");
+		}
 	}
 
 	/**
@@ -367,8 +377,9 @@ public synchronized boolean setiButton18(OneWireContainer18 owc) throws OneWireE
 		this.accountPageNumber = -1;
 
 		// make sure account info is properly setup
-		if (!checkAccountPageInfo(owc))
+		if (!this.checkAccountPageInfo(owc)) {
 			return false;
+		}
 
 		// setup the fullBindCode with rest of info
 		this.fullBindCode[4] = (byte) this.accountPageNumber;
@@ -380,8 +391,8 @@ public synchronized boolean setiButton18(OneWireContainer18 owc) throws OneWireE
 			IOHelper.writeLine("Loaded User");
 			IOHelper.writeLine("address");
 			IOHelper.writeBytesHex(owc.getAddress());
-			IOHelper.writeLine("accountPageNumber: " + accountPageNumber);
-			IOHelper.writeLine("serviceFilename: " + strServiceFilename);
+			IOHelper.writeLine("accountPageNumber: " + this.accountPageNumber);
+			IOHelper.writeLine("serviceFilename: " + this.strServiceFilename);
 			IOHelper.writeLine("------------------------------------");
 		}
 		// \\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\
@@ -410,17 +421,20 @@ public synchronized boolean setiButton18(OneWireContainer18 owc) throws OneWireE
 	 * @throws OneWireException   on a communication or setup error with the 1-Wire
 	 *                            adapter
 	 */
+	@Override
 	public synchronized boolean setiButtonUser(DSPortAdapter adapter, byte[] address)
 			throws OneWireException, OneWireIOException {
-		if (this.ibc == null)
+		if (this.ibc == null) {
 			this.ibc = new OneWireContainer18();
+		}
 
 		this.ibc.setupContainer(adapter, address);
 
-		if (this.forceOverdrive)
+		if (this.forceOverdrive) {
 			this.ibc.setSpeed(DSPortAdapter.SPEED_OVERDRIVE, false);
+		}
 
-		return setiButton18(this.ibc);
+		return this.setiButton18(this.ibc);
 	}
 
 	/**
@@ -444,16 +458,19 @@ public synchronized boolean setiButtonUser(DSPortAdapter adapter, byte[] address
 	 * @throws OneWireException   on a communication or setup error with the 1-Wire
 	 *                            adapter
 	 */
+	@Override
 	public synchronized boolean setiButtonUser(byte[] address) throws OneWireException, OneWireIOException {
-		if (this.ibc == null)
+		if (this.ibc == null) {
 			return false;
+		}
 
 		this.ibc.setupContainer(this.ibc.getAdapter(), address);
 
-		if (this.forceOverdrive)
+		if (this.forceOverdrive) {
 			this.ibc.setSpeed(DSPortAdapter.SPEED_OVERDRIVE, false);
+		}
 
-		return setiButton18(this.ibc);
+		return this.setiButton18(this.ibc);
 	}
 
 	// ***********************************************************************
@@ -478,26 +495,27 @@ public synchronized boolean setiButtonUser(byte[] address) throws OneWireExcepti
 	 * @throws OneWireException   on a communication or setup error with the 1-Wire
 	 *                            adapter
 	 */
+	@Override
 	public synchronized int getWriteCycleCounter() throws OneWireException, OneWireIOException {
 		if (this.writeCycleCounter < 0) {
 			// need to get the writeCycleCounter.
-			int wcc = -1;
+			var wcc = -1;
 
 			// don't worry, this should not happen in the critical path.
 			// so malloc-ing doesn't really matter
-			byte[] wcc_buffer = new byte[32];
+			var wcc_buffer = new byte[32];
 
 			// read the page, 19, containing the write-cycle counters
 			this.ibc.readMemoryPage(19, wcc_buffer, 0);
 
 			// get the offset into page for wcc
-			int offset = (this.accountPageNumber & 7) << 2;
+			var offset = (this.accountPageNumber & 7) << 2;
 
 			// convert the four bytes, lsb first, into an int
-			wcc = (wcc_buffer[offset + 3] & 0x0ff);
-			wcc = (wcc << 8) | (wcc_buffer[offset + 2] & 0x0ff);
-			wcc = (wcc << 8) | (wcc_buffer[offset + 1] & 0x0ff);
-			wcc = (wcc << 8) | (wcc_buffer[offset] & 0x0ff);
+			wcc = wcc_buffer[offset + 3] & 0x0ff;
+			wcc = wcc << 8 | wcc_buffer[offset + 2] & 0x0ff;
+			wcc = wcc << 8 | wcc_buffer[offset + 1] & 0x0ff;
+			wcc = wcc << 8 | wcc_buffer[offset] & 0x0ff;
 
 			this.writeCycleCounter = wcc;
 		}
@@ -510,8 +528,9 @@ public synchronized int getWriteCycleCounter() throws OneWireException, OneWireI
 	 *
 	 * @return <code>true</code> if account page has write cycle counter.
 	 */
+	@Override
 	public synchronized boolean hasWriteCycleCounter() {
-		return (this.accountPageNumber > 7);
+		return this.accountPageNumber > 7;
 	}
 
 	/**
@@ -525,7 +544,7 @@ public synchronized boolean hasWriteCycleCounter() {
 	 *
 	 * <P>
 	 * For the DS1963S user iButton, the format of the full bind code is as follows:
-	 * 
+	 *
 	 * <PRE>
 	 *      (bindCode+0), (bindCode+1), (bindCode+2), (bindCode+3),
 	 *      (svcPageNum), (deviceAN+0), (deviceAN+1), (deviceAN+2),
@@ -540,6 +559,7 @@ public synchronized boolean hasWriteCycleCounter() {
 	 *                     available starting from the offset.
 	 * @param offset       the offset into fullBindCode where copying should begin.
 	 */
+	@Override
 	public void getFullBindCode(byte[] l_fullBindCode, int offset) {
 		System.arraycopy(this.fullBindCode, 0, l_fullBindCode, offset, 15);
 	}
@@ -554,6 +574,7 @@ public void getFullBindCode(byte[] l_fullBindCode, int offset) {
 	 * @return byte indicating appropriate command for authenticating user
 	 *
 	 */
+	@Override
 	public byte getAuthorizationCommand() {
 		return OneWireContainer18.VALIDATE_DATA_PAGE;
 	}
@@ -578,20 +599,23 @@ public byte getAuthorizationCommand() {
 	 * @throws OneWireException   on a communication or setup error with the 1-Wire
 	 *                            adapter
 	 */
+	@Override
 	public synchronized boolean writeAccountData(byte[] dataBuffer, int offset)
 			throws OneWireException, OneWireIOException {
 		// init local vars
-		OneWireContainer18 ibcL = this.ibc;
+		var ibcL = this.ibc;
 
 		// make sure account info is properly setup
-		if (!checkAccountPageInfo(ibcL))
+		if (!this.checkAccountPageInfo(ibcL)) {
 			return false;
+		}
 
-		int numBytes = Math.min(32, dataBuffer.length - offset);
+		var numBytes = Math.min(32, dataBuffer.length - offset);
 		System.arraycopy(dataBuffer, offset, this.accountData, 0, numBytes);
 		if (ibcL.writeDataPage(this.accountPageNumber, this.accountData)) {
-			if (this.writeCycleCounter >= 0)
+			if (this.writeCycleCounter >= 0) {
 				this.writeCycleCounter++;
+			}
 			return true;
 		}
 
@@ -623,13 +647,14 @@ public synchronized boolean writeAccountData(byte[] dataBuffer, int offset)
 	 * @throws OneWireException   on a communication or setup error with the 1-Wire
 	 *                            adapter
 	 */
+	@Override
 	public synchronized boolean readAccountData(byte[] dataBuffer, int offset)
 			throws OneWireException, OneWireIOException {
 		// init local vars
-		OneWireContainer18 ibcL = this.ibc;
+		var ibcL = this.ibc;
 
 		// make sure account info is properly setup
-		if (!checkAccountPageInfo(ibcL)) {
+		if (!this.checkAccountPageInfo(ibcL)) {
 			return false;
 		}
 
@@ -647,8 +672,8 @@ public synchronized boolean readAccountData(byte[] dataBuffer, int offset)
 	}
 
 	// prevent malloc'ing in critical path
-	private byte[] readAccountData_rawData = new byte[42];
-	private byte[] readAccountData_scratchpad = new byte[32];
+	private final byte[] readAccountData_rawData = new byte[42];
+	private final byte[] readAccountData_scratchpad = new byte[32];
 
 	/**
 	 * <P>
@@ -684,12 +709,13 @@ public synchronized boolean readAccountData(byte[] dataBuffer, int offset)
 	 * @throws OneWireException   on a communication or setup error with the 1-Wire
 	 *                            adapter
 	 */
+	@Override
 	public synchronized int readAccountData(byte[] chlg, int chlgStart, byte[] dataBuffer, int dataStart, byte[] mac,
 			int macStart) throws OneWireException, OneWireIOException {
 		// init local variables
-		OneWireContainer18 ibcL = this.ibc;
-		byte[] rawData = this.readAccountData_rawData;
-		byte[] scratchpad = this.readAccountData_scratchpad;
+		var ibcL = this.ibc;
+		var rawData = this.readAccountData_rawData;
+		var scratchpad = this.readAccountData_scratchpad;
 
 		// make sure account info is properly setup
 		if (this.accountPageNumber < 0) {
@@ -711,24 +737,24 @@ public synchronized int readAccountData(byte[] chlg, int chlgStart, byte[] dataB
 				// + 4 bytes page counter
 				// + 4 bytes secret counter
 				// + 2 bytes CRC
-				boolean readOK = ibcL.readAuthenticatedPage(this.accountPageNumber, rawData, 0);
+				var readOK = ibcL.readAuthenticatedPage(this.accountPageNumber, rawData, 0);
 
 				// read the scratchpad for mac
-				int len = ibcL.readScratchPad(scratchpad, 0);
+				var len = ibcL.readScratchPad(scratchpad, 0);
 
 				// disable RESUME
 				ibcL.useResume(false);
 
-				if ((!readOK) || (len < 0)) {
+				if (!readOK || len < 0) {
 					// read authenticate failed
 					return -1;
 				}
 
 				// get the value of the write cycle counter
-				int wcc = (rawData[35] & 0x0ff);
-				wcc = (wcc << 8) | (rawData[34] & 0x0ff);
-				wcc = (wcc << 8) | (rawData[33] & 0x0ff);
-				wcc = (wcc << 8) | (rawData[32] & 0x0ff);
+				var wcc = rawData[35] & 0x0ff;
+				wcc = wcc << 8 | rawData[34] & 0x0ff;
+				wcc = wcc << 8 | rawData[33] & 0x0ff;
+				wcc = wcc << 8 | rawData[32] & 0x0ff;
 
 				// put the accountData in our local cache
 				System.arraycopy(rawData, 0, this.accountData, 0, 32);
diff --git a/io.openems.edge.bridge.onewire/src/com/dalsemi/onewire/application/sha/SHAiButtonUser33.java b/io.openems.edge.bridge.onewire/src/com/dalsemi/onewire/application/sha/SHAiButtonUser33.java
index 3bb1f922fc5..6864e6147a3 100644
--- a/io.openems.edge.bridge.onewire/src/com/dalsemi/onewire/application/sha/SHAiButtonUser33.java
+++ b/io.openems.edge.bridge.onewire/src/com/dalsemi/onewire/application/sha/SHAiButtonUser33.java
@@ -51,11 +51,11 @@ public class SHAiButtonUser33 extends SHAiButtonUser {
 	/**
 	 * For fast 0xFF fills of byte arrays
 	 */
-	private static final byte[] ffBlock = new byte[] { (byte) 0x0FF, (byte) 0x0FF, (byte) 0x0FF, (byte) 0x0FF,
+	private static final byte[] ffBlock = { (byte) 0x0FF, (byte) 0x0FF, (byte) 0x0FF, (byte) 0x0FF, (byte) 0x0FF,
 			(byte) 0x0FF, (byte) 0x0FF, (byte) 0x0FF, (byte) 0x0FF, (byte) 0x0FF, (byte) 0x0FF, (byte) 0x0FF,
 			(byte) 0x0FF, (byte) 0x0FF, (byte) 0x0FF, (byte) 0x0FF, (byte) 0x0FF, (byte) 0x0FF, (byte) 0x0FF,
 			(byte) 0x0FF, (byte) 0x0FF, (byte) 0x0FF, (byte) 0x0FF, (byte) 0x0FF, (byte) 0x0FF, (byte) 0x0FF,
-			(byte) 0x0FF, (byte) 0x0FF, (byte) 0x0FF, (byte) 0x0FF, (byte) 0x0FF, (byte) 0x0FF, (byte) 0x0FF };
+			(byte) 0x0FF, (byte) 0x0FF, (byte) 0x0FF, (byte) 0x0FF, (byte) 0x0FF, (byte) 0x0FF };
 
 	/**
 	 * Reference to the OneWireContainer
@@ -87,7 +87,7 @@ public class SHAiButtonUser33 extends SHAiButtonUser {
 	 * @see #SHAiButtonUser33(SHAiButtonCopr,SHAiButtonCopr)
 	 */
 	protected SHAiButtonUser33() {
-		;
+
 	}
 
 	/**
@@ -138,25 +138,30 @@ public SHAiButtonUser33(SHAiButtonCopr copr, OneWireContainer33 owc, boolean for
 		this.address = owc.getAddress();
 
 		// clear out old secret first
-		byte[] NullSecret = new byte[8];
-		for (int i = 0; i < 8; i++)
+		var NullSecret = new byte[8];
+		for (var i = 0; i < 8; i++) {
 			NullSecret[i] = 0x00;
+		}
 
-		if (!this.ibc33.loadFirstSecret(NullSecret, 0))
+		if (!this.ibc33.loadFirstSecret(NullSecret, 0)) {
 			throw new OneWireException("Failed to null out device secret.");
+		}
 
-		if (!owc.installMasterSecret(0, authSecret))
+		if (!owc.installMasterSecret(0, authSecret)) {
 			throw new OneWireException("Install Master Secret failed");
+		}
 
-		if (!createServiceFile(owc, strServiceFilename, formatDevice))
+		if (!this.createServiceFile(owc, this.strServiceFilename, formatDevice)) {
 			throw new OneWireException("Failed to create service file.");
+		}
 
 		// setup the fullBindCode with rest of info
 		this.fullBindCode[4] = (byte) this.accountPageNumber;
 		System.arraycopy(this.address, 0, this.fullBindCode, 5, 7);
 
-		if (!owc.bindSecretToiButton(this.accountPageNumber, copr.getBindData()))
+		if (!owc.bindSecretToiButton(this.accountPageNumber, copr.getBindData())) {
 			throw new OneWireException("Bind Secret to iButton failed");
+		}
 
 		// \\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\
 		if (DEBUG) {
@@ -164,8 +169,8 @@ public SHAiButtonUser33(SHAiButtonCopr copr, OneWireContainer33 owc, boolean for
 			IOHelper.writeLine("Initialized DS1961S User");
 			IOHelper.writeLine("address");
 			IOHelper.writeBytesHex(owc.getAddress());
-			IOHelper.writeLine("serviceFilename: " + strServiceFilename);
-			IOHelper.writeLine("accountPageNumber: " + accountPageNumber);
+			IOHelper.writeLine("serviceFilename: " + this.strServiceFilename);
+			IOHelper.writeLine("accountPageNumber: " + this.accountPageNumber);
 			IOHelper.writeLine("authSecret");
 			IOHelper.writeBytesHex(authSecret);
 			IOHelper.writeLine("bindData");
@@ -215,7 +220,7 @@ public SHAiButtonUser33(SHAiButtonCopr copr, OneWireContainer33 owc, boolean for
 	public SHAiButtonUser33(byte[] coprBindCode, byte[] fileName, int fileNameExt, OneWireContainer33 owc,
 			boolean formatDevice, byte[] authSecret) throws OneWireException, OneWireIOException {
 		// create string representation of service filename
-		this.strServiceFilename = new String(fileName) + "." + (int) fileNameExt;
+		this.strServiceFilename = new String(fileName) + "." + fileNameExt;
 
 		// hold container reference
 		this.ibc33 = owc;
@@ -224,25 +229,30 @@ public SHAiButtonUser33(byte[] coprBindCode, byte[] fileName, int fileNameExt, O
 		this.address = owc.getAddress();
 
 		// clear out old secret first
-		byte[] NullSecret = new byte[8];
-		for (int i = 0; i < 8; i++)
+		var NullSecret = new byte[8];
+		for (var i = 0; i < 8; i++) {
 			NullSecret[i] = 0x00;
+		}
 
-		if (!this.ibc33.loadFirstSecret(NullSecret, 0))
+		if (!this.ibc33.loadFirstSecret(NullSecret, 0)) {
 			throw new OneWireException("Failed to null out device secret.");
+		}
 
-		if (!owc.installMasterSecret(0, authSecret))
+		if (!owc.installMasterSecret(0, authSecret)) {
 			throw new OneWireException("Install Master Secret failed");
+		}
 
-		if (!createServiceFile(owc, strServiceFilename, formatDevice))
+		if (!this.createServiceFile(owc, this.strServiceFilename, formatDevice)) {
 			throw new OneWireException("Failed to create service file.");
+		}
 
 		// setup the fullBindCode with rest of info
 		this.fullBindCode[4] = (byte) this.accountPageNumber;
 		System.arraycopy(this.address, 0, this.fullBindCode, 5, 7);
 
-		if (!owc.bindSecretToiButton(this.accountPageNumber, copr.getBindData()))
+		if (!owc.bindSecretToiButton(this.accountPageNumber, this.copr.getBindData())) {
 			throw new OneWireException("Bind Secret to iButton failed");
+		}
 
 		// \\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\
 		if (DEBUG) {
@@ -250,8 +260,8 @@ public SHAiButtonUser33(byte[] coprBindCode, byte[] fileName, int fileNameExt, O
 			IOHelper.writeLine("Initialized DS1961S User");
 			IOHelper.writeLine("address");
 			IOHelper.writeBytesHex(owc.getAddress());
-			IOHelper.writeLine("serviceFilename: " + strServiceFilename);
-			IOHelper.writeLine("accountPageNumber: " + accountPageNumber);
+			IOHelper.writeLine("serviceFilename: " + this.strServiceFilename);
+			IOHelper.writeLine("accountPageNumber: " + this.accountPageNumber);
 			IOHelper.writeLine("authSecret");
 			IOHelper.writeBytesHex(authSecret);
 			IOHelper.writeLine("bindCode");
@@ -299,8 +309,9 @@ public SHAiButtonUser33(SHAiButtonCopr copr, SHAiButtonCopr authCopr, OneWireCon
 		this(copr, authCopr);
 
 		// hold container reference and address
-		if (!setiButton33(owc))
+		if (!this.setiButton33(owc)) {
 			throw new OneWireException("Invalid SHA user");
+		}
 	}
 
 	/**
@@ -341,12 +352,13 @@ public SHAiButtonUser33(byte[] coprBindCode, byte[] fileName, int fileNameExt, O
 		System.arraycopy(ffBlock, 0, this.fullBindCode, 0, 15);
 
 		// create string representation of service filename
-		copr.getFilename(this.serviceFile, 0);
-		this.strServiceFilename = new String(fileName) + "." + (int) fileNameExt;
+		this.copr.getFilename(this.serviceFile, 0);
+		this.strServiceFilename = new String(fileName) + "." + fileNameExt;
 
 		// hold container reference and address
-		if (!setiButton33(owc))
+		if (!this.setiButton33(owc)) {
 			throw new OneWireException("Invalid SHA user");
+		}
 	}
 
 	/**
@@ -424,8 +436,9 @@ public synchronized boolean setiButton33(OneWireContainer33 owc) throws OneWireE
 		this.accountPageNumber = -1;
 
 		// make sure account info is properly setup
-		if (!checkAccountPageInfo(owc))
+		if (!this.checkAccountPageInfo(owc)) {
 			return false;
+		}
 
 		// setup the fullBindCode with rest of info
 		this.fullBindCode[4] = (byte) this.accountPageNumber;
@@ -437,8 +450,8 @@ public synchronized boolean setiButton33(OneWireContainer33 owc) throws OneWireE
 			IOHelper.writeLine("Loaded DS1961S User");
 			IOHelper.writeLine("address");
 			IOHelper.writeBytesHex(owc.getAddress());
-			IOHelper.writeLine("accountPageNumber: " + accountPageNumber);
-			IOHelper.writeLine("serviceFilename: " + strServiceFilename);
+			IOHelper.writeLine("accountPageNumber: " + this.accountPageNumber);
+			IOHelper.writeLine("serviceFilename: " + this.strServiceFilename);
 			IOHelper.writeLine("------------------------------------");
 		}
 		// \\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\
@@ -467,12 +480,14 @@ public synchronized boolean setiButton33(OneWireContainer33 owc) throws OneWireE
 	 * @throws OneWireException   on a communication or setup error with the 1-Wire
 	 *                            adapter
 	 */
+	@Override
 	public synchronized boolean setiButtonUser(DSPortAdapter adapter, byte[] address)
 			throws OneWireException, OneWireIOException {
-		if (this.ibc33 == null)
+		if (this.ibc33 == null) {
 			this.ibc33 = new OneWireContainer33();
+		}
 		this.ibc33.setupContainer(adapter, address);
-		return setiButton33(this.ibc33);
+		return this.setiButton33(this.ibc33);
 	}
 
 	/**
@@ -496,13 +511,15 @@ public synchronized boolean setiButtonUser(DSPortAdapter adapter, byte[] address
 	 * @throws OneWireException   on a communication or setup error with the 1-Wire
 	 *                            adapter
 	 */
+	@Override
 	public synchronized boolean setiButtonUser(byte[] address) throws OneWireException, OneWireIOException {
-		if (this.ibc33 == null)
+		if (this.ibc33 == null) {
 			return false;
+		}
 
 		this.ibc33.setupContainer(this.ibc33.getAdapter(), address);
 
-		return setiButton33(this.ibc33);
+		return this.setiButton33(this.ibc33);
 	}
 
 	/**
@@ -528,6 +545,7 @@ public synchronized boolean setiButtonUser(byte[] address) throws OneWireExcepti
 	 * @throws OneWireException   on a communication or setup error with the 1-Wire
 	 *                            adapter
 	 */
+	@Override
 	public synchronized int getWriteCycleCounter() throws OneWireException, OneWireIOException {
 		// DS1961S has no write cycle counters
 		return -1;
@@ -546,6 +564,7 @@ public synchronized int getWriteCycleCounter() throws OneWireException, OneWireI
 	 *
 	 * @return <code>true</code> if account page has write cycle counter.
 	 */
+	@Override
 	public synchronized boolean hasWriteCycleCounter() {
 		// DS1961S has no write cycle counters
 		return false;
@@ -562,7 +581,7 @@ public synchronized boolean hasWriteCycleCounter() {
 	 *
 	 * <P>
 	 * For the DS1963S user iButton, the format of the full bind code is as follows:
-	 * 
+	 *
 	 * <PRE>
 	 *      ( 0x0000FF ), ( 0x0000FF ), ( 0x0000FF ), ( 0x0000FF ),
 	 *      (svcPageNum), (deviceAN+0), (deviceAN+1), (deviceAN+2),
@@ -577,6 +596,7 @@ public synchronized boolean hasWriteCycleCounter() {
 	 *                     available starting from the offset.
 	 * @param offset       the offset into fullBindCode where copying should begin.
 	 */
+	@Override
 	public void getFullBindCode(byte[] l_fullBindCode, int offset) {
 		System.arraycopy(this.fullBindCode, 0, l_fullBindCode, offset, 15);
 		/*
@@ -596,13 +616,14 @@ public void getFullBindCode(byte[] l_fullBindCode, int offset) {
 	 * @return byte indicating appropriate command for authenticating user
 	 *
 	 */
+	@Override
 	public byte getAuthorizationCommand() {
 		return OneWireContainer18.AUTH_HOST;
 	}
 
-	private byte[] writeAccountData_copyAuth = new byte[32];
-	private byte[] writeAccountData_scratchpad = new byte[32];
-	private byte[] writeAccountData_pageData = new byte[32];
+	private final byte[] writeAccountData_copyAuth = new byte[32];
+	private final byte[] writeAccountData_scratchpad = new byte[32];
+	private final byte[] writeAccountData_pageData = new byte[32];
 
 	/**
 	 * <P>
@@ -631,19 +652,21 @@ public byte getAuthorizationCommand() {
 	 * @throws OneWireException   on a communication or setup error with the 1-Wire
 	 *                            adapter
 	 */
+	@Override
 	public synchronized boolean writeAccountData(byte[] dataBuffer, int offset)
 			throws OneWireException, OneWireIOException {
 		// local vars.
-		OneWireContainer33 ibcL = this.ibc33;
-		byte[] copyAuth = this.writeAccountData_copyAuth;
-		byte[] scratchpad = this.writeAccountData_scratchpad;
-		byte[] pageData = this.writeAccountData_pageData;
-		byte[] fullBindCode = this.fullBindCode;
-		SHAiButtonCopr coprL = this.copr;
+		var ibcL = this.ibc33;
+		var copyAuth = this.writeAccountData_copyAuth;
+		var scratchpad = this.writeAccountData_scratchpad;
+		var pageData = this.writeAccountData_pageData;
+		var fullBindCode = this.fullBindCode;
+		var coprL = this.copr;
 
 		// make sure account info is properly setup
-		if (!checkAccountPageInfo(ibcL))
+		if (!this.checkAccountPageInfo(ibcL)) {
 			return false;
+		}
 
 		// if the part is being initialized, the container class "knows"
 		// the secret already. no need for a coprocessor.
@@ -663,16 +686,16 @@ public synchronized boolean writeAccountData(byte[] dataBuffer, int offset)
 			System.arraycopy(this.accountData, 0, pageData, 0, 32);
 
 			// takes four write/copies to actually write the data page.
-			for (int i = 24; i >= 0; i -= 8) {
-				int index = offset + i;
+			for (var i = 24; i >= 0; i -= 8) {
+				var index = offset + i;
 				// only perform any action if the data needs to be updated
-				if ((dataBuffer[index] != accountData[i]) || (dataBuffer[index + 1] != accountData[i + 1])
-						|| (dataBuffer[index + 2] != accountData[i + 2])
-						|| (dataBuffer[index + 3] != accountData[i + 3])
-						|| (dataBuffer[index + 4] != accountData[i + 4])
-						|| (dataBuffer[index + 5] != accountData[i + 5])
-						|| (dataBuffer[index + 6] != accountData[i + 6])
-						|| (dataBuffer[index + 7] != accountData[i + 7])) {
+				if (dataBuffer[index] != this.accountData[i] || dataBuffer[index + 1] != this.accountData[i + 1]
+						|| dataBuffer[index + 2] != this.accountData[i + 2]
+						|| dataBuffer[index + 3] != this.accountData[i + 3]
+						|| dataBuffer[index + 4] != this.accountData[i + 4]
+						|| dataBuffer[index + 5] != this.accountData[i + 5]
+						|| dataBuffer[index + 6] != this.accountData[i + 6]
+						|| dataBuffer[index + 7] != this.accountData[i + 7]) {
 					// format the working page for generating the
 					// appropriate copy authorization mac
 					pageData[28] = dataBuffer[index];
@@ -710,14 +733,16 @@ public synchronized boolean writeAccountData(byte[] dataBuffer, int offset)
 					fullBindCode = null;
 
 					// write 8 bytes of data to the DS1961S scratchpad
-					if (!ibcL.writeScratchpad(this.accountPageNumber, i, dataBuffer, index, 8))
+					if (!ibcL.writeScratchpad(this.accountPageNumber, i, dataBuffer, index, 8)) {
 						// operation failed
 						return false;
+					}
 
 					// copy scratchpad to page
-					if (!ibcL.copyScratchpad(this.accountPageNumber, i, copyAuth, 0))
+					if (!ibcL.copyScratchpad(this.accountPageNumber, i, copyAuth, 0)) {
 						// operation failed
 						return false;
+					}
 
 					// update cache of account data
 					System.arraycopy(dataBuffer, index, this.accountData, i, 8);
@@ -742,13 +767,14 @@ public synchronized boolean writeAccountData(byte[] dataBuffer, int offset)
 	 * @param offset     the index into the buffer where copying should begin
 	 * @return whether or not the read was successful
 	 */
+	@Override
 	public synchronized boolean readAccountData(byte[] dataBuffer, int offset)
 			throws OneWireException, OneWireIOException {
 		// init local vars
-		OneWireContainer33 ibcL = this.ibc33;
+		var ibcL = this.ibc33;
 
 		// make sure account info is properly setup
-		if (!checkAccountPageInfo(ibcL)) {
+		if (!this.checkAccountPageInfo(ibcL)) {
 			return false;
 		}
 
@@ -791,10 +817,11 @@ public synchronized boolean readAccountData(byte[] dataBuffer, int offset)
 	 *
 	 * @return the value of the write cycle counter for the page
 	 */
+	@Override
 	public synchronized int readAccountData(byte[] chlg, int chlgStart, byte[] dataBuffer, int dataStart, byte[] mac,
 			int macStart) throws OneWireException, OneWireIOException {
 		// init local variables
-		OneWireContainer33 ibcL = this.ibc33;
+		var ibcL = this.ibc33;
 
 		// make sure account info is properly setup
 		if (this.accountPageNumber < 0) {
@@ -821,9 +848,8 @@ public synchronized int readAccountData(byte[] chlg, int chlgStart, byte[] dataB
 
 			// has no write cycle counter
 			return -1;
-		} else {
-			throw new OneWireException("SHAiButtonUser ReadAuthenticatedPage Failed");
 		}
+		throw new OneWireException("SHAiButtonUser ReadAuthenticatedPage Failed");
 	}
 
 	/**
@@ -832,8 +858,9 @@ public synchronized int readAccountData(byte[] chlg, int chlgStart, byte[] dataB
 	 *
 	 * @return true if the refresh was successful
 	 */
+	@Override
 	public boolean refreshDevice() throws OneWireException, OneWireIOException {
-		return ibc33.refreshPage(this.accountPageNumber);
+		return this.ibc33.refreshPage(this.accountPageNumber);
 	}
 
 }
diff --git a/io.openems.edge.bridge.onewire/src/com/dalsemi/onewire/application/tag/Contact.java b/io.openems.edge.bridge.onewire/src/com/dalsemi/onewire/application/tag/Contact.java
index 89b89762e87..6a087909b76 100644
--- a/io.openems.edge.bridge.onewire/src/com/dalsemi/onewire/application/tag/Contact.java
+++ b/io.openems.edge.bridge.onewire/src/com/dalsemi/onewire/application/tag/Contact.java
@@ -41,13 +41,12 @@ public class Contact extends TaggedDevice implements TaggedSensor {
 	 * Creates an object for the device.
 	 */
 	public Contact() {
-		super();
 	}
 
 	/**
 	 * Creates an object for the device with the supplied address and device type
 	 * connected to the supplied port adapter.
-	 * 
+	 *
 	 * @param adapter    The adapter serving the sensor.
 	 * @param netAddress The 1-Wire network address of the sensor.
 	 */
@@ -58,16 +57,17 @@ public Contact(DSPortAdapter adapter, String netAddress) {
 	/**
 	 * The readSensor method returns the "max" string if the Sensor is present or
 	 * the "min" string if the Sensor is not present.
-	 * 
+	 *
 	 * @return The "max" string if sensor is present or "min" string if not.
 	 */
+	@Override
 	public String readSensor() throws OneWireException {
-		String returnString = "";
+		var returnString = "";
 
-		if (DeviceContainer.isPresent()) {
-			returnString = max;
+		if (this.DeviceContainer.isPresent()) {
+			returnString = this.max;
 		} else {
-			returnString = min;
+			returnString = this.min;
 		}
 		return returnString;
 	}
diff --git a/io.openems.edge.bridge.onewire/src/com/dalsemi/onewire/application/tag/D2A.java b/io.openems.edge.bridge.onewire/src/com/dalsemi/onewire/application/tag/D2A.java
index 8ba5b16ff4f..7200adedf2d 100644
--- a/io.openems.edge.bridge.onewire/src/com/dalsemi/onewire/application/tag/D2A.java
+++ b/io.openems.edge.bridge.onewire/src/com/dalsemi/onewire/application/tag/D2A.java
@@ -43,20 +43,19 @@ public class D2A extends TaggedDevice implements TaggedActuator {
 	 * Creates an object for the device.
 	 */
 	public D2A() {
-		super();
-		ActuatorSelections = new Vector<>();
+		this.ActuatorSelections = new Vector<>();
 	}
 
 	/**
 	 * Creates an object for the device with the supplied address connected to the
 	 * supplied port adapter.
-	 * 
+	 *
 	 * @param adapter    The adapter serving the actuator.
 	 * @param netAddress The 1-Wire network address of the actuator.
 	 */
 	public D2A(DSPortAdapter adapter, String netAddress) {
 		super(adapter, netAddress);
-		ActuatorSelections = new Vector<>();
+		this.ActuatorSelections = new Vector<>();
 	}
 
 	/**
@@ -64,8 +63,9 @@ public D2A(DSPortAdapter adapter, String netAddress) {
 	 *
 	 * @return Vector of Strings representing selection states.
 	 */
+	@Override
 	public Vector<String> getSelections() {
-		return ActuatorSelections;
+		return this.ActuatorSelections;
 	}
 
 	/**
@@ -74,14 +74,15 @@ public Vector<String> getSelections() {
 	 * @param selection The selection string.
 	 * @throws OneWireException
 	 */
+	@Override
 	public void setSelection(String selection) throws OneWireException {
-		PotentiometerContainer pc = (PotentiometerContainer) getDeviceContainer();
-		int Index = 0;
-		Index = ActuatorSelections.indexOf(selection);
+		var pc = (PotentiometerContainer) this.getDeviceContainer();
+		var Index = 0;
+		Index = this.ActuatorSelections.indexOf(selection);
 		// must first read the device
-		byte[] state = pc.readDevice();
+		var state = pc.readDevice();
 		// set current wiper number from xml tag "channel"
-		pc.setCurrentWiperNumber(getChannel(), state);
+		pc.setCurrentWiperNumber(this.getChannel(), state);
 		// now, write to device to set the wiper number
 		pc.writeDevice(state);
 
@@ -106,21 +107,22 @@ public void setSelection(String selection) throws OneWireException {
 
 	/**
 	 * Initializes the actuator
-	 * 
+	 *
 	 * @throws OneWireException
 	 */
+	@Override
 	public void initActuator() throws OneWireException {
-		PotentiometerContainer pc = (PotentiometerContainer) getDeviceContainer();
+		var pc = (PotentiometerContainer) this.getDeviceContainer();
 		int numOfWiperSettings;
 		int resistance;
-		double offset = 0.6; // this seems about right...
+		var offset = 0.6; // this seems about right...
 		double wiperResistance;
 		String selectionString;
 		// initialize the ActuatorSelections Vector
 		// must first read the device
-		byte[] state = pc.readDevice();
+		var state = pc.readDevice();
 		// set current wiper number from xml tag "channel"
-		pc.setCurrentWiperNumber(getChannel(), state);
+		pc.setCurrentWiperNumber(this.getChannel(), state);
 		// now, write to device to set the wiper number
 		pc.writeDevice(state);
 		// now, extract some values to initialize the ActuatorSelections
@@ -129,21 +131,21 @@ public void initActuator() throws OneWireException {
 		// get the resistance value in k-Ohms
 		resistance = pc.potentiometerResistance(state);
 		// calculate wiper resistance
-		wiperResistance = (double) ((double) (resistance - offset) / (double) numOfWiperSettings);
+		wiperResistance = (resistance - offset) / numOfWiperSettings;
 		// add the values to the ActuatorSelections Vector
 		selectionString = resistance + " k-Ohms"; // make sure the first
-		ActuatorSelections.addElement(selectionString); // element is the entire resistance
-		for (int i = (numOfWiperSettings - 2); i > -1; i--) {
-			double newWiperResistance = (double) (wiperResistance * (double) i);
+		this.ActuatorSelections.addElement(selectionString); // element is the entire resistance
+		for (var i = numOfWiperSettings - 2; i > -1; i--) {
+			var newWiperResistance = wiperResistance * i;
 			// round the values before putting them in drop-down list
-			int roundedWiperResistance = (int) ((newWiperResistance + offset) * 10000);
-			selectionString = (double) ((double) roundedWiperResistance / 10000.0) + " k-Ohms";
-			ActuatorSelections.addElement(selectionString);
+			var roundedWiperResistance = (int) ((newWiperResistance + offset) * 10000);
+			selectionString = roundedWiperResistance / 10000.0 + " k-Ohms";
+			this.ActuatorSelections.addElement(selectionString);
 		}
 	}
 
 	/**
 	 * Keeps the selections of this actuator
 	 */
-	private Vector<String> ActuatorSelections;
+	private final Vector<String> ActuatorSelections;
 }
diff --git a/io.openems.edge.bridge.onewire/src/com/dalsemi/onewire/application/tag/Event.java b/io.openems.edge.bridge.onewire/src/com/dalsemi/onewire/application/tag/Event.java
index a9efe42401d..56706a21cc0 100644
--- a/io.openems.edge.bridge.onewire/src/com/dalsemi/onewire/application/tag/Event.java
+++ b/io.openems.edge.bridge.onewire/src/com/dalsemi/onewire/application/tag/Event.java
@@ -42,13 +42,12 @@ public class Event extends TaggedDevice implements TaggedSensor {
 	 * Creates an object for the device.
 	 */
 	public Event() {
-		super();
 	}
 
 	/**
 	 * Creates an object for the device with the supplied address and device type
 	 * connected to the supplied port adapter.
-	 * 
+	 *
 	 * @param adapter    The adapter serving the sensor.
 	 * @param netAddress The 1-Wire network address of the sensor.
 	 *
@@ -60,20 +59,21 @@ public Event(DSPortAdapter adapter, String netAddress) {
 	/**
 	 * The readSensor method returns the "max" string if the Sensor (a switch) has
 	 * had activity since last time it was checked for activity.
-	 * 
+	 *
 	 * @return String The "max" string associated with this Sensor.
 	 */
+	@Override
 	public String readSensor() throws OneWireException {
-		String returnString = "";
+		var returnString = "";
 		byte[] switchState;
 		SwitchContainer Container;
-		Container = (SwitchContainer) DeviceContainer;
+		Container = (SwitchContainer) this.DeviceContainer;
 
 		if (Container.hasActivitySensing()) // if there is any activity, read it.
 		{
 			switchState = Container.readDevice();
-			if (Container.getSensedActivity(getChannel(), switchState)) {
-				returnString = getMax();
+			if (Container.getSensedActivity(this.getChannel(), switchState)) {
+				returnString = this.getMax();
 				// for future accurate readings, clear activity.
 				Container.clearActivity();
 				switchState = Container.readDevice(); // throw away the reading
diff --git a/io.openems.edge.bridge.onewire/src/com/dalsemi/onewire/application/tag/Humidity.java b/io.openems.edge.bridge.onewire/src/com/dalsemi/onewire/application/tag/Humidity.java
index aa94b311bab..987ccbf10b0 100644
--- a/io.openems.edge.bridge.onewire/src/com/dalsemi/onewire/application/tag/Humidity.java
+++ b/io.openems.edge.bridge.onewire/src/com/dalsemi/onewire/application/tag/Humidity.java
@@ -42,13 +42,12 @@ public class Humidity extends TaggedDevice implements TaggedSensor {
 	 * Creates an object for the device.
 	 */
 	public Humidity() {
-		super();
 	}
 
 	/**
 	 * Creates an object for the device with the supplied address and device type
 	 * connected to the supplied port adapter.
-	 * 
+	 *
 	 * @param adapter    The adapter serving the sensor.
 	 * @param netAddress The 1-Wire network address of the sensor.
 	 */
@@ -61,21 +60,24 @@ public Humidity(DSPortAdapter adapter, String netAddress) {
 	 *
 	 * @return String humidity in %RH
 	 */
+	@Override
 	public String readSensor() throws OneWireException {
-		HumidityContainer hc = (HumidityContainer) DeviceContainer;
+		var hc = (HumidityContainer) this.DeviceContainer;
 
 		// read the device first to get the state
-		byte[] state = hc.readDevice();
+		var state = hc.readDevice();
 
 		// convert humidity
 		hc.doHumidityConvert(state);
 
 		// construct the return string
-		String return_string = (int) roundDouble(hc.getHumidity(state)) + "%";
-		if (hc.isRelative())
-			return_string += "RH";
+		var return_string = new StringBuilder().append((int) this.roundDouble(hc.getHumidity(state)))
+				.append("%");
+		if (hc.isRelative()) {
+			return_string.append("RH");
+		}
 
-		return return_string;
+		return return_string.toString();
 	}
 
 	/**
@@ -87,6 +89,6 @@ public String readSensor() throws OneWireException {
 	 * @return double rounded to the nearest digit in the "ones" position.
 	 */
 	private double roundDouble(double d) {
-		return (double) ((int) (d + ((d > 0) ? 0.5 : -0.5)));
+		return (int) (d + (d > 0 ? 0.5 : -0.5));
 	}
 }
diff --git a/io.openems.edge.bridge.onewire/src/com/dalsemi/onewire/application/tag/Level.java b/io.openems.edge.bridge.onewire/src/com/dalsemi/onewire/application/tag/Level.java
index 5a995b50718..21451c34ae2 100644
--- a/io.openems.edge.bridge.onewire/src/com/dalsemi/onewire/application/tag/Level.java
+++ b/io.openems.edge.bridge.onewire/src/com/dalsemi/onewire/application/tag/Level.java
@@ -42,13 +42,12 @@ public class Level extends TaggedDevice implements TaggedSensor {
 	 * Creates an object for the device.
 	 */
 	public Level() {
-		super();
 	}
 
 	/**
 	 * Creates an object for the device with the supplied address and device type
 	 * connected to the supplied port adapter.
-	 * 
+	 *
 	 * @param adapter    The adapter serving the sensor.
 	 * @param netAddress The 1-Wire network address of the sensor.
 	 *
@@ -66,20 +65,21 @@ public Level(DSPortAdapter adapter, String netAddress) {
 	 *         state, and the "min" string is associated with the non-conducting
 	 *         state of the 1-Wire switch.
 	 */
+	@Override
 	public String readSensor() throws OneWireException {
-		String returnString = "";
+		var returnString = "";
 		byte[] switchState;
-		int switchChannel = getChannel();
+		var switchChannel = this.getChannel();
 		SwitchContainer Container;
-		Container = (SwitchContainer) DeviceContainer;
+		Container = (SwitchContainer) this.DeviceContainer;
 
 		if (Container.hasLevelSensing()) // if it can sense levels, read it.
 		{
 			switchState = Container.readDevice();
 			if (Container.getLevel(switchChannel, switchState)) {
-				returnString = getMax();
+				returnString = this.getMax();
 			} else {
-				returnString = getMin();
+				returnString = this.getMin();
 			}
 		}
 		return returnString;
diff --git a/io.openems.edge.bridge.onewire/src/com/dalsemi/onewire/application/tag/SAXParser.java b/io.openems.edge.bridge.onewire/src/com/dalsemi/onewire/application/tag/SAXParser.java
index 1880f43cdd2..90dfb8579f7 100644
--- a/io.openems.edge.bridge.onewire/src/com/dalsemi/onewire/application/tag/SAXParser.java
+++ b/io.openems.edge.bridge.onewire/src/com/dalsemi/onewire/application/tag/SAXParser.java
@@ -90,7 +90,7 @@ public class SAXParser implements org.xml.sax.Parser {
 	 */
 	public SAXParser() {
 		// load the fully-qualified classname of the SAX Parser
-		String className = OneWireAccessProvider.getProperty("SAXParser.ClassName");
+		var className = OneWireAccessProvider.getProperty("SAXParser.ClassName");
 		if (className == null) {
 			// default to NanoXML
 			className = "nanoxml.sax.SAXParser";
@@ -98,7 +98,7 @@ public SAXParser() {
 
 		try {
 			Class<?> c = Class.forName(className);
-			parser = (org.xml.sax.Parser) c.newInstance();
+			this.parser = (org.xml.sax.Parser) c.newInstance();
 		} catch (Exception e) {
 			throw new RuntimeException("Can't load SAX Parser (" + className + "): " + e.getMessage());
 		}
@@ -110,8 +110,9 @@ public SAXParser() {
 	 * @param locale The locale to use.
 	 * @throws SAXException If the <var>locale</var> is not supported.
 	 */
+	@Override
 	public void setLocale(Locale locale) throws SAXException {
-		parser.setLocale(locale);
+		this.parser.setLocale(locale);
 	}
 
 	/**
@@ -122,8 +123,9 @@ public void setLocale(Locale locale) throws SAXException {
 	 *
 	 * @param resolver The entity resolver to use.
 	 */
+	@Override
 	public void setEntityResolver(EntityResolver resolver) {
-		parser.setEntityResolver(resolver);
+		this.parser.setEntityResolver(resolver);
 	}
 
 	/**
@@ -134,8 +136,9 @@ public void setEntityResolver(EntityResolver resolver) {
 	 *
 	 * @param handler The DTD handler to use.
 	 */
+	@Override
 	public void setDTDHandler(DTDHandler handler) {
-		parser.setDTDHandler(handler);
+		this.parser.setDTDHandler(handler);
 	}
 
 	/**
@@ -146,8 +149,9 @@ public void setDTDHandler(DTDHandler handler) {
 	 *
 	 * @param handler The document handler to use.
 	 */
+	@Override
 	public void setDocumentHandler(DocumentHandler handler) {
-		parser.setDocumentHandler(handler);
+		this.parser.setDocumentHandler(handler);
 	}
 
 	/**
@@ -159,8 +163,9 @@ public void setDocumentHandler(DocumentHandler handler) {
 	 *
 	 * @param handler The error handler to use.
 	 */
+	@Override
 	public void setErrorHandler(ErrorHandler handler) {
-		parser.setErrorHandler(handler);
+		this.parser.setErrorHandler(handler);
 	}
 
 	/**
@@ -170,8 +175,9 @@ public void setErrorHandler(ErrorHandler handler) {
 	 * @throws SAXException Any SAX exception, possibly wrapping another exception.
 	 * @throws IOException  If an I/O error occurred while reading the document.
 	 */
+	@Override
 	public void parse(InputSource inputSource) throws SAXException, IOException {
-		parser.parse(inputSource);
+		this.parser.parse(inputSource);
 	}
 
 	/**
@@ -181,7 +187,8 @@ public void parse(InputSource inputSource) throws SAXException, IOException {
 	 * @throws SAXException Any SAX exception, possibly wrapping another exception.
 	 * @throws IOException  If an I/O error occurred while reading the document.
 	 */
+	@Override
 	public void parse(String systemID) throws SAXException, IOException {
-		parser.parse(systemID);
+		this.parser.parse(systemID);
 	}
 }
diff --git a/io.openems.edge.bridge.onewire/src/com/dalsemi/onewire/application/tag/Switch.java b/io.openems.edge.bridge.onewire/src/com/dalsemi/onewire/application/tag/Switch.java
index e63a1ee8a2e..c6175ab5306 100644
--- a/io.openems.edge.bridge.onewire/src/com/dalsemi/onewire/application/tag/Switch.java
+++ b/io.openems.edge.bridge.onewire/src/com/dalsemi/onewire/application/tag/Switch.java
@@ -43,20 +43,19 @@ public class Switch extends TaggedDevice implements TaggedActuator {
 	 * Creates an object for the device.
 	 */
 	public Switch() {
-		super();
-		ActuatorSelections = new Vector<>();
+		this.ActuatorSelections = new Vector<>();
 	}
 
 	/**
 	 * Creates an object for the device with the supplied address connected to the
 	 * supplied port adapter.
-	 * 
+	 *
 	 * @param adapter    The adapter serving the actuator.
 	 * @param netAddress The 1-Wire network address of the actuator.
 	 */
 	public Switch(DSPortAdapter adapter, String netAddress) {
 		super(adapter, netAddress);
-		ActuatorSelections = new Vector<>();
+		this.ActuatorSelections = new Vector<>();
 	}
 
 	/**
@@ -64,8 +63,9 @@ public Switch(DSPortAdapter adapter, String netAddress) {
 	 *
 	 * @return Vector of Strings representing selection states.
 	 */
+	@Override
 	public Vector<String> getSelections() {
-		return ActuatorSelections;
+		return this.ActuatorSelections;
 	}
 
 	/**
@@ -74,20 +74,22 @@ public Vector<String> getSelections() {
 	 * @throws OneWireException
 	 *
 	 */
+	@Override
 	public void setSelection(String selection) throws OneWireException {
-		SwitchContainer switchcontainer = (SwitchContainer) getDeviceContainer();
-		int Index = 0;
-		int channelValue = getChannel();
-		Index = ActuatorSelections.indexOf(selection);
-		boolean switch_state = false;
+		var switchcontainer = (SwitchContainer) this.getDeviceContainer();
+		var Index = 0;
+		var channelValue = this.getChannel();
+		Index = this.ActuatorSelections.indexOf(selection);
+		var switch_state = false;
 
 		if (Index > -1) // means selection is in the vector
 		{
 			// initialize switch-state variable
-			if (Index > 0)
+			if (Index > 0) {
 				switch_state = true;
+			}
 			// write to the device (but, read it first to get state)
-			byte[] state = switchcontainer.readDevice();
+			var state = switchcontainer.readDevice();
 			// set the switch's state to the value specified
 			switchcontainer.setLatchState(channelValue, switch_state, false, state);
 			switchcontainer.writeDevice(state);
@@ -102,32 +104,34 @@ public void setSelection(String selection) throws OneWireException {
 
 	/**
 	 * Initializes the actuator
-	 * 
+	 *
 	 * @throws OneWireException
-	 * 
+	 *
 	 */
+	@Override
 	public void initActuator() throws OneWireException {
-		SwitchContainer switchcontainer = (SwitchContainer) getDeviceContainer();
+		var switchcontainer = (SwitchContainer) this.getDeviceContainer();
 		// initialize the ActuatorSelections Vector
-		ActuatorSelections.addElement(getMin()); // for switch, use min and max
-		ActuatorSelections.addElement(getMax());
+		this.ActuatorSelections.addElement(this.getMin()); // for switch, use min and max
+		this.ActuatorSelections.addElement(this.getMax());
 		// Now, initialize the switch to the desired condition.
 		// This condition is in the <init> tag and, of course, the
 		// <channel> tag is also needed to know which channel to
 		// to open or close.
 		int initValue;
 		int channelValue;
-		int switchStateIntValue = 0;
-		Integer init = Integer.parseInt(getInit());
+		var switchStateIntValue = 0;
+		Integer init = Integer.parseInt(this.getInit());
 		initValue = init.intValue();
-		channelValue = getChannel();
+		channelValue = this.getChannel();
 
-		byte[] state = switchcontainer.readDevice();
-		boolean switch_state = switchcontainer.getLatchState(channelValue, state);
-		if (switch_state)
+		var state = switchcontainer.readDevice();
+		var switch_state = switchcontainer.getLatchState(channelValue, state);
+		if (switch_state) {
 			switchStateIntValue = 1;
-		else
+		} else {
 			switchStateIntValue = 0;
+		}
 		if (initValue != switchStateIntValue) {
 			// set the switch's state to the value specified in XML file
 			switchcontainer.setLatchState(channelValue, !switch_state, false, state);
@@ -138,5 +142,5 @@ public void initActuator() throws OneWireException {
 	/**
 	 * Keeps the selections of this actuator
 	 */
-	private Vector<String> ActuatorSelections;
+	private final Vector<String> ActuatorSelections;
 }
diff --git a/io.openems.edge.bridge.onewire/src/com/dalsemi/onewire/application/tag/TAGHandler.java b/io.openems.edge.bridge.onewire/src/com/dalsemi/onewire/application/tag/TAGHandler.java
index c2edce7dec5..075d6f43da0 100644
--- a/io.openems.edge.bridge.onewire/src/com/dalsemi/onewire/application/tag/TAGHandler.java
+++ b/io.openems.edge.bridge.onewire/src/com/dalsemi/onewire/application/tag/TAGHandler.java
@@ -55,6 +55,7 @@ class TAGHandler implements ErrorHandler, DocumentHandler {
 	 * @param locator
 	 *
 	 */
+	@Override
 	public void setDocumentLocator(Locator locator) {
 	}
 
@@ -65,16 +66,17 @@ public void setDocumentLocator(Locator locator) {
 	 * @throws SAXException
 	 *
 	 */
+	@Override
 	public void startDocument() throws SAXException {
 
 		// Instantiate deviceList and clusterStack
-		deviceList = new Vector<TaggedDevice>();
-		clusterStack = new Stack<String>(); // keep track of clusters
-		branchStack = new Stack<TaggedDevice>(); // keep track of current branches
-		branchVector = new Vector<TaggedDevice>(); // keep track of every branch
-		branchVectors = new Vector<Vector<TaggedDevice>>(); // keep a vector of cloned branchStacks
+		this.deviceList = new Vector<>();
+		this.clusterStack = new Stack<>(); // keep track of clusters
+		this.branchStack = new Stack<>(); // keep track of current branches
+		this.branchVector = new Vector<>(); // keep track of every branch
+		this.branchVectors = new Vector<>(); // keep a vector of cloned branchStacks
 		// to use in making the OWPaths Vector
-		branchPaths = new Vector<OWPath>(); // keep track of OWPaths
+		this.branchPaths = new Vector<>(); // keep track of OWPaths
 	}
 
 	/**
@@ -84,6 +86,7 @@ public void startDocument() throws SAXException {
 	 * @throws SAXException
 	 *
 	 */
+	@Override
 	public void endDocument() throws SAXException {
 
 		// Iterate through deviceList and make all the
@@ -92,24 +95,24 @@ public void endDocument() throws SAXException {
 		OWPath branchPath;
 		Vector<TaggedDevice> singleBranchVector;
 
-		for (int i = 0; i < deviceList.size(); i++) {
-			device = (TaggedDevice) deviceList.elementAt(i);
+		for (var i = 0; i < this.deviceList.size(); i++) {
+			device = this.deviceList.elementAt(i);
 
-			device.setOWPath(adapter, device.getBranches());
+			device.setOWPath(this.adapter, device.getBranches());
 		}
 
 		// Now, iterate through branchVectors and make all the
 		// OWPaths for the Vector of OWPaths
 
-		for (int i = 0; i < branchVectors.size(); i++) {
-			singleBranchVector = (Vector<TaggedDevice>) branchVectors.elementAt(i);
-			branchPath = new OWPath(adapter);
-			for (int j = 0; j < singleBranchVector.size(); j++) {
-				device = (TaggedDevice) singleBranchVector.elementAt(i);
+		for (var i = 0; i < this.branchVectors.size(); i++) {
+			singleBranchVector = this.branchVectors.elementAt(i);
+			branchPath = new OWPath(this.adapter);
+			for (var j = 0; j < singleBranchVector.size(); j++) {
+				device = singleBranchVector.elementAt(i);
 
 				branchPath.add(device.getDeviceContainer(), device.getChannel());
 			}
-			branchPaths.addElement(branchPath);
+			this.branchPaths.addElement(branchPath);
 		}
 	}
 
@@ -123,19 +126,20 @@ public void endDocument() throws SAXException {
 	 * @throws SAXException
 	 *
 	 */
+	@Override
 	public void startElement(String name, AttributeList atts) throws SAXException {
-		currentElement = name; // save current element name
+		this.currentElement = name; // save current element name
 
-		String attributeAddr = "null";
-		String attributeType = "null";
+		var attributeAddr = "null";
+		var attributeType = "null";
 		String className;
-		int i = 0;
+		var i = 0;
 
 		// Parse cluster elements here, keeping track of them with a Stack.
 		if (name.toUpperCase().equals("CLUSTER")) {
 			for (i = 0; i < atts.getLength(); i++) {
 				if (atts.getName(i).toUpperCase().equals("NAME")) {
-					clusterStack.push(atts.getValue(i));
+					this.clusterStack.push(atts.getValue(i));
 				}
 			}
 		}
@@ -144,7 +148,7 @@ public void startElement(String name, AttributeList atts) throws SAXException {
 		if (name.toUpperCase().equals("SENSOR") || name.toUpperCase().equals("ACTUATOR")
 				|| name.toUpperCase().equals("BRANCH")) {
 			for (i = 0; i < atts.getLength(); i++) {
-				String attName = atts.getName(i);
+				var attName = atts.getName(i);
 
 				if (attName.toUpperCase().equals("ADDR")) {
 					attributeAddr = atts.getValue(i);
@@ -160,7 +164,7 @@ public void startElement(String name, AttributeList atts) throws SAXException {
 			// is of type "branch"
 			if (name.toUpperCase().equals("BRANCH")) {
 				attributeType = "branch";
-				currentDevice = new TaggedDevice(); // instantiates object
+				this.currentDevice = new TaggedDevice(); // instantiates object
 			} else {
 
 				// first, find tag type to instantiate by CLASS NAME!
@@ -168,15 +172,16 @@ public void startElement(String name, AttributeList atts) throws SAXException {
 				// path was included in the tag type.
 				if (attributeType.indexOf(".") > 0) {
 					className = attributeType;
-				} else
+				} else {
 					className = "com.dalsemi.onewire.application.tag." + attributeType;
+				}
 
 				// instantiate the appropriate object based on tag type (i.e., "Contact",
 				// "Switch", etc)
 				try {
 					Class<?> genericClass = Class.forName(className);
 
-					currentDevice = (TaggedDevice) genericClass.newInstance();
+					this.currentDevice = (TaggedDevice) genericClass.newInstance();
 				} catch (Exception e) {
 					throw new RuntimeException(
 							"Can't load 1-Wire Tag Type class (" + className + "): " + e.getMessage());
@@ -184,23 +189,24 @@ public void startElement(String name, AttributeList atts) throws SAXException {
 			}
 
 			// set the members (fields) of the TaggedDevice object
-			currentDevice.setDeviceContainer(adapter, attributeAddr);
-			currentDevice.setDeviceType(attributeType);
-			currentDevice.setClusterName(getClusterStackAsString(clusterStack, "/"));
-			currentDevice.setBranches((Vector<TaggedDevice>) branchStack.clone()); // copy branchStack to it's related
-																					// object in TaggedDevice
+			this.currentDevice.setDeviceContainer(this.adapter, attributeAddr);
+			this.currentDevice.setDeviceType(attributeType);
+			this.currentDevice.setClusterName(this.getClusterStackAsString(this.clusterStack, "/"));
+			this.currentDevice.setBranches((Vector<TaggedDevice>) this.branchStack.clone()); // copy branchStack to it's
+																								// related
+			// object in TaggedDevice
 
 			// ** do branch specific work here: **
 			if (name.equals("branch")) {
 
 				// push the not-quite-finished branch TaggedDevice on the branch stack.
-				branchStack.push(currentDevice);
+				this.branchStack.push(this.currentDevice);
 
 				// put currentDevice in the branch vector that holds all branch objects.
-				branchVector.addElement(currentDevice);
+				this.branchVector.addElement(this.currentDevice);
 
 				// put currentDevice in deviceList (if it is of type "branch", of course)
-				deviceList.addElement(currentDevice);
+				this.deviceList.addElement(this.currentDevice);
 			}
 		}
 	}
@@ -214,27 +220,28 @@ public void startElement(String name, AttributeList atts) throws SAXException {
 	 * @throws SAXException
 	 *
 	 */
+	@Override
 	public void endElement(String name) throws SAXException {
 		if (name.toUpperCase().equals("SENSOR") || name.toUpperCase().equals("ACTUATOR")) {
 
 			// System.out.println(name + " element finished");
-			deviceList.addElement(currentDevice);
+			this.deviceList.addElement(this.currentDevice);
 
-			currentDevice = null;
+			this.currentDevice = null;
 		}
 
 		if (name.toUpperCase().equals("BRANCH")) {
-			branchVectors.addElement((Vector<TaggedDevice>) branchStack.clone()); // adds a snapshot of
+			this.branchVectors.addElement((Vector<TaggedDevice>) this.branchStack.clone()); // adds a snapshot of
 			// the stack to
 			// make OWPaths later
 
-			branchStack.pop();
+			this.branchStack.pop();
 
-			currentDevice = null; // !!! not sure if this is needed.
+			this.currentDevice = null; // !!! not sure if this is needed.
 		}
 
 		if (name.toUpperCase().equals("CLUSTER")) {
-			clusterStack.pop();
+			this.clusterStack.pop();
 		}
 	}
 
@@ -249,63 +256,64 @@ public void endElement(String name) throws SAXException {
 	 * @throws SAXException
 	 *
 	 */
+	@Override
 	public void characters(char ch[], int start, int length) throws SAXException {
-		if (currentElement.toUpperCase().equals("LABEL")) {
-			if (currentDevice == null) {
+		if (this.currentElement.toUpperCase().equals("LABEL")) {
+			if (this.currentDevice == null) {
 
 				// This means we have a branch instead of a sensor or actuator
 				// so, set label accordingly
 				try {
-					currentDevice = (TaggedDevice) branchStack.peek();
+					this.currentDevice = this.branchStack.peek();
 
-					currentDevice.setLabel(new String(ch, start, length));
+					this.currentDevice.setLabel(new String(ch, start, length));
 
-					currentDevice = null;
+					this.currentDevice = null;
 				} catch (EmptyStackException ese) {
 
 					// don't do anything yet.
 				}
 			} else {
-				currentDevice.setLabel(new String(ch, start, length));
+				this.currentDevice.setLabel(new String(ch, start, length));
 			}
 
 			// System.out.println("This device's label is: " + currentDevice.label);
 		}
 
-		if (currentElement.toUpperCase().equals("CHANNEL")) {
-			if (currentDevice == null) {
+		if (this.currentElement.toUpperCase().equals("CHANNEL")) {
+			if (this.currentDevice == null) {
 
 				// This means we have a branch instead of a sensor or actuator
 				// so, set channel accordingly
 				try {
-					currentDevice = (TaggedDevice) branchStack.peek();
+					this.currentDevice = this.branchStack.peek();
 
-					currentDevice.setChannelFromString(new String(ch, start, length));
+					this.currentDevice.setChannelFromString(new String(ch, start, length));
 
-					currentDevice = null;
+					this.currentDevice = null;
 				} catch (EmptyStackException ese) {
 
 					// don't do anything yet.
 				}
 			} else {
-				currentDevice.setChannelFromString(new String(ch, start, length));
+				this.currentDevice.setChannelFromString(new String(ch, start, length));
 			}
 		}
 
-		if (currentElement.toUpperCase().equals("MAX")) {
-			currentDevice.max = new String(ch, start, length);
+		if (this.currentElement.toUpperCase().equals("MAX")) {
+			this.currentDevice.max = new String(ch, start, length);
 
 			// System.out.println("This device's max message is: " + currentDevice.max);
 		}
 
-		if (currentElement.toUpperCase().equals("MIN")) {
-			currentDevice.min = new String(ch, start, length);
+		if (this.currentElement.toUpperCase().equals("MIN")) {
+			this.currentDevice.min = new String(ch, start, length);
 
 			// System.out.println("This device's min message is: " + currentDevice.min);
 		}
 
-		if (currentElement.toUpperCase().equals("INIT")) {
-			currentDevice.setInit(new String(ch, start, length));
+		if (this.currentElement.toUpperCase().equals("INIT")) {
+			this.currentDevice.setInit(new String(ch, start, length));
 
 			// System.out.println("This device's init message is: " + currentDevice.init);
 		}
@@ -322,6 +330,7 @@ public void characters(char ch[], int start, int length) throws SAXException {
 	 * @throws SAXException
 	 *
 	 */
+	@Override
 	public void ignorableWhitespace(char ch[], int start, int length) throws SAXException {
 	}
 
@@ -335,6 +344,7 @@ public void ignorableWhitespace(char ch[], int start, int length) throws SAXExce
 	 * @throws SAXException
 	 *
 	 */
+	@Override
 	public void processingInstruction(String target, String data) throws SAXException {
 	}
 
@@ -346,7 +356,7 @@ public void processingInstruction(String target, String data) throws SAXExceptio
 	 *
 	 */
 	public Vector<TaggedDevice> getTaggedDeviceList() {
-		return deviceList;
+		return this.deviceList;
 	}
 
 	/**
@@ -371,6 +381,7 @@ public void setAdapter(DSPortAdapter adapter) throws com.dalsemi.onewire.OneWire
 	 * @throws SAXParseException
 	 *
 	 */
+	@Override
 	public void fatalError(SAXParseException exception) throws SAXParseException {
 		System.err.println(exception);
 
@@ -386,6 +397,7 @@ public void fatalError(SAXParseException exception) throws SAXParseException {
 	 * @throws SAXParseException
 	 *
 	 */
+	@Override
 	public void error(SAXParseException exception) throws SAXParseException {
 		System.err.println(exception);
 
@@ -399,6 +411,7 @@ public void error(SAXParseException exception) throws SAXParseException {
 	 * @param exception
 	 *
 	 */
+	@Override
 	public void warning(SAXParseException exception) {
 		System.err.println(exception);
 	}
@@ -414,7 +427,7 @@ public void warning(SAXParseException exception) {
 	 */
 	public Vector<TaggedDevice> getAllBranches() {
 
-		return branchVector;
+		return this.branchVector;
 
 	}
 
@@ -429,7 +442,7 @@ public Vector<TaggedDevice> getAllBranches() {
 	 */
 	public Vector<OWPath> getAllBranchPaths() {
 
-		return branchPaths;
+		return this.branchPaths;
 
 	}
 
@@ -444,13 +457,13 @@ public Vector<OWPath> getAllBranchPaths() {
 	 *
 	 */
 	private String getClusterStackAsString(Stack<String> clusters, String separator) {
-		String returnString = "";
+		var returnString = new StringBuilder();
 
-		for (int j = 0; j < clusters.size(); j++) {
-			returnString = returnString + separator + clusters.elementAt(j);
+		for (var j = 0; j < clusters.size(); j++) {
+			returnString.append(separator).append(clusters.elementAt(j));
 		}
 
-		return returnString;
+		return returnString.toString();
 	}
 
 	/** Field adapter */
diff --git a/io.openems.edge.bridge.onewire/src/com/dalsemi/onewire/application/tag/TAGParser.java b/io.openems.edge.bridge.onewire/src/com/dalsemi/onewire/application/tag/TAGParser.java
index ae44a3719d2..785d7e25b1f 100644
--- a/io.openems.edge.bridge.onewire/src/com/dalsemi/onewire/application/tag/TAGParser.java
+++ b/io.openems.edge.bridge.onewire/src/com/dalsemi/onewire/application/tag/TAGParser.java
@@ -49,17 +49,17 @@ public class TAGParser {
 	 * @param adapter What port adapter will serve the devices created.
 	 */
 	public TAGParser(DSPortAdapter adapter) {
-		parser = XML.createSAXParser();
-		handler = new TAGHandler();
+		this.parser = XML.createSAXParser();
+		this.handler = new TAGHandler();
 
 		try {
-			handler.setAdapter(adapter);
+			this.handler.setAdapter(adapter);
 		} catch (Exception e) {
 			System.out.println(e);
 		}
 
-		parser.setDocumentHandler(handler);
-		parser.setErrorHandler(handler);
+		this.parser.setDocumentHandler(this.handler);
+		this.parser.setErrorHandler(this.handler);
 	}
 
 	/**
@@ -72,13 +72,11 @@ public TAGParser(DSPortAdapter adapter) {
 	 * @throws IOException  If an I/O error occurs while reading <var>in</var>.
 	 */
 	public Vector<TaggedDevice> parse(InputStream in) throws SAXException, IOException {
-		InputSource insource = new InputSource(in);
+		var insource = new InputSource(in);
 
-		parser.parse(insource);
+		this.parser.parse(insource);
 
-		Vector<TaggedDevice> v = handler.getTaggedDeviceList();
-
-		return v;
+		return this.handler.getTaggedDeviceList();
 	}
 
 	/**
@@ -89,9 +87,7 @@ public Vector<TaggedDevice> parse(InputStream in) throws SAXException, IOExcepti
 	 */
 	public Vector<TaggedDevice> getBranches() {
 
-		Vector<TaggedDevice> v = handler.getAllBranches();
-
-		return v;
+		return this.handler.getAllBranches();
 	}
 
 	/**
@@ -102,14 +98,12 @@ public Vector<TaggedDevice> getBranches() {
 	 */
 	public Vector<OWPath> getOWPaths() {
 
-		Vector<OWPath> v = handler.getAllBranchPaths();
-
-		return v;
+		return this.handler.getAllBranchPaths();
 	}
 
 	/** Field parser */
-	private SAXParser parser;
+	private final SAXParser parser;
 
 	/** Field handler */
-	private TAGHandler handler;
+	private final TAGHandler handler;
 }
diff --git a/io.openems.edge.bridge.onewire/src/com/dalsemi/onewire/application/tag/TaggedDevice.java b/io.openems.edge.bridge.onewire/src/com/dalsemi/onewire/application/tag/TaggedDevice.java
index 4dcf5ed45a0..f295455d344 100644
--- a/io.openems.edge.bridge.onewire/src/com/dalsemi/onewire/application/tag/TaggedDevice.java
+++ b/io.openems.edge.bridge.onewire/src/com/dalsemi/onewire/application/tag/TaggedDevice.java
@@ -42,7 +42,7 @@ public class TaggedDevice {
 	/**
 	 * Creates an object for the device with the supplied address and device type
 	 * connected to the supplied port adapter.
-	 * 
+	 *
 	 * @param adapter    The adapter serving the sensor.
 	 * @param netAddress The 1-Wire network address of the sensor.
 	 */
@@ -150,8 +150,8 @@ public void setOWPath(DSPortAdapter adapter, Vector<TaggedDevice> Branches) {
 
 		TaggedDevice TDevice;
 
-		for (int i = 0; i < Branches.size(); i++) {
-			TDevice = (TaggedDevice) Branches.elementAt(i);
+		for (var i = 0; i < Branches.size(); i++) {
+			TDevice = Branches.elementAt(i);
 
 			this.branchPath.add(TDevice.getDeviceContainer(), TDevice.getChannel());
 		}
@@ -259,23 +259,27 @@ public OWPath getOWPath() {
 		return this.branchPath;
 	}
 
+	@Override
 	public boolean equals(Object o) {
-		if (o == this)
+		if (o == this) {
 			return true;
+		}
 
 		if (o instanceof TaggedDevice) {
-			TaggedDevice td = (TaggedDevice) o;
-			return (td.DeviceContainer.equals(this.DeviceContainer)) && (td.DeviceType.equals(this.DeviceType))
-					&& (td.min.equals(this.min)) && (td.max.equals(this.max)) && (td.init.equals(this.init))
-					&& (td.clusterName.equals(this.clusterName)) && (td.label.equals(this.label));
+			var td = (TaggedDevice) o;
+			return td.DeviceContainer.equals(this.DeviceContainer) && td.DeviceType.equals(this.DeviceType)
+					&& td.min.equals(this.min) && td.max.equals(this.max) && td.init.equals(this.init)
+					&& td.clusterName.equals(this.clusterName) && td.label.equals(this.label);
 		}
 		return false;
 	}
 
+	@Override
 	public int hashCode() {
-		return (getDeviceContainer().toString() + getLabel()).hashCode();
+		return (this.getDeviceContainer().toString() + this.getLabel()).hashCode();
 	}
 
+	@Override
 	public String toString() {
 		return this.getLabel();
 	}
diff --git a/io.openems.edge.bridge.onewire/src/com/dalsemi/onewire/application/tag/Thermal.java b/io.openems.edge.bridge.onewire/src/com/dalsemi/onewire/application/tag/Thermal.java
index 110f4fce04e..af45924f615 100644
--- a/io.openems.edge.bridge.onewire/src/com/dalsemi/onewire/application/tag/Thermal.java
+++ b/io.openems.edge.bridge.onewire/src/com/dalsemi/onewire/application/tag/Thermal.java
@@ -42,13 +42,12 @@ public class Thermal extends TaggedDevice implements TaggedSensor {
 	 * Creates an object for the device.
 	 */
 	public Thermal() {
-		super();
 	}
 
 	/**
 	 * Creates an object for the device with the supplied address and device type
 	 * connected to the supplied port adapter.
-	 * 
+	 *
 	 * @param adapter    The adapter serving the sensor.
 	 * @param netAddress The 1-Wire network address of the sensor.
 	 */
@@ -63,13 +62,13 @@ public Thermal(DSPortAdapter adapter, String netAddress) {
 	 *
 	 *               @return String temperature in degrees Celsius
 	 */
+	@Override
 	public String readSensor() throws OneWireException {
-		String returnString = "";
 		double theTemperature;
-		TemperatureContainer tc = (TemperatureContainer) DeviceContainer;
+		var tc = (TemperatureContainer) this.DeviceContainer;
 
 		// read the device first before getting the temperature
-		byte[] state = tc.readDevice();
+		var state = tc.readDevice();
 
 		// perform a temperature conversion
 		tc.doTemperatureConvert(state);
@@ -81,11 +80,8 @@ public String readSensor() throws OneWireException {
 		theTemperature = tc.getTemperature(state);
 		// theTemperature = (double)(Math.round(theTemperature * 100))/100; // avoid
 		// Math for TINI?
-		theTemperature = roundDouble(theTemperature * 100) / 100;
-		// make string out of results
-		returnString = theTemperature + " C";
-
-		return returnString;
+		theTemperature = this.roundDouble(theTemperature * 100) / 100;
+		return theTemperature + " C";
 	}
 
 	/**
@@ -97,6 +93,6 @@ public String readSensor() throws OneWireException {
 	 * @return double rounded to the nearest digit in the "ones" position.
 	 */
 	private double roundDouble(double d) {
-		return (double) ((int) (d + ((d > 0) ? 0.5 : -0.5)));
+		return (int) (d + (d > 0 ? 0.5 : -0.5));
 	}
 }
diff --git a/io.openems.edge.bridge.onewire/src/com/dalsemi/onewire/application/tag/XML.java b/io.openems.edge.bridge.onewire/src/com/dalsemi/onewire/application/tag/XML.java
index e4bb85ca940..c186b8b6beb 100644
--- a/io.openems.edge.bridge.onewire/src/com/dalsemi/onewire/application/tag/XML.java
+++ b/io.openems.edge.bridge.onewire/src/com/dalsemi/onewire/application/tag/XML.java
@@ -36,7 +36,7 @@
 // 2. Redistributions in binary form must reproduce the above copyright notice, this list
 //    of conditions and the following disclaimer in the documentation and/or other materials
 //    provided with the distribution.
-// 
+//
 // THIS SOFTWARE IS PROVIDED BY THE AUTHORS AND CONTRIBUTORS ``AS IS'' AND ANY EXPRESS OR
 // IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
 // MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL
@@ -46,7 +46,7 @@
 // HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
 // OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
 // SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-// 
+//
 // $Id: XML.java,v 1.1.1.1 2001/06/20 18:21:11 seankelly Exp $
 package com.dalsemi.onewire.application.tag;
 
@@ -81,16 +81,16 @@ public static SAXParser createSAXParser() {
 	public static String escape(String source) {
 
 		// Optimistically start with at least as many characters in the source.
-		StringBuffer rc = new StringBuffer(source.length());
+		var rc = new StringBuilder(source.length());
 
-		for (int i = 0; i < source.length(); ++i) {
-			char c = source.charAt(i);
+		for (var i = 0; i < source.length(); ++i) {
+			var c = source.charAt(i);
 
 			// Nonprintable characters print as their corresponding char reference.
 			// Thanks to Apache project for specs for these characters.
-			if ((c < ' ' && c != '\t' && c != '\n' && c != '\r') || c > 0x7E || c == 0xF7)
+			if (c < ' ' && c != '\t' && c != '\n' && c != '\r' || c > 0x7E || c == 0xF7) {
 				rc.append("&#").append(Integer.toString(c)).append(';');
-			else {
+			} else {
 
 				// Use an entity reference where appropriate
 				switch (c) {
diff --git a/io.openems.edge.bridge.onewire/src/com/dalsemi/onewire/container/ADContainer.java b/io.openems.edge.bridge.onewire/src/com/dalsemi/onewire/container/ADContainer.java
index b8bda12fb86..3b9a824f7b0 100644
--- a/io.openems.edge.bridge.onewire/src/com/dalsemi/onewire/container/ADContainer.java
+++ b/io.openems.edge.bridge.onewire/src/com/dalsemi/onewire/container/ADContainer.java
@@ -70,7 +70,7 @@
  *     double[] voltages = new double[adcontainer.getNumberADChannels()];
  *     for (int i=0; i &lt; adcontainer.getNumberADChannels(); i++)
  *     {
- *          adcontainer.doADConvert(i, state);         
+ *          adcontainer.doADConvert(i, state);
  *          voltages[i] = adc.getADVoltage(i, state);
  *     }
  *     if (adcontainer.hasADAlarms())
@@ -163,7 +163,7 @@ public interface ADContainer extends OneWireSensor {
 	 * same time.
 	 *
 	 * @return true if the device can do multi-channel voltage reads
-	 * 
+	 *
 	 * @see #doADConvert(boolean[],byte[])
 	 */
 	public boolean canADMultiChannelRead();
@@ -215,7 +215,7 @@ public interface ADContainer extends OneWireSensor {
 	 *                            error.
 	 * @throws OneWireException   on a communication or setup error with the 1-Wire
 	 *                            adapter. This is usually a non-recoverable error.
-	 * 
+	 *
 	 * @see com.dalsemi.onewire.container.OneWireSensor#readDevice()
 	 * @see #getADVoltage(byte[])
 	 * @see #canADMultiChannelRead()
@@ -370,7 +370,7 @@ public interface ADContainer extends OneWireSensor {
 	 *                <code>readDevice()</code>
 	 *
 	 * @return the input voltage range
-	 * 
+	 *
 	 * @see #getADRanges(int)
 	 * @see #setADRange(int,double,byte[])
 	 */
diff --git a/io.openems.edge.bridge.onewire/src/com/dalsemi/onewire/container/ClockContainer.java b/io.openems.edge.bridge.onewire/src/com/dalsemi/onewire/container/ClockContainer.java
index ef9bb5d5e85..363025ed16c 100644
--- a/io.openems.edge.bridge.onewire/src/com/dalsemi/onewire/container/ClockContainer.java
+++ b/io.openems.edge.bridge.onewire/src/com/dalsemi/onewire/container/ClockContainer.java
@@ -69,7 +69,7 @@
  *     byte[] state = clockcontainer.readDevice();
  *     long current_time = clockcontainer.getClock(state);
  *     System.out.println("Current time is :"+(new Date(current_time)));
- *     
+ *
  *     long system_time = System.currentTimeMillis();
  *     clockcontainer.setClock(system_time,state);
  *     clockcontainer.writeDevice(state);
diff --git a/io.openems.edge.bridge.onewire/src/com/dalsemi/onewire/container/CommandAPDU.java b/io.openems.edge.bridge.onewire/src/com/dalsemi/onewire/container/CommandAPDU.java
index 0a40644f795..a5f94706161 100644
--- a/io.openems.edge.bridge.onewire/src/com/dalsemi/onewire/container/CommandAPDU.java
+++ b/io.openems.edge.bridge.onewire/src/com/dalsemi/onewire/container/CommandAPDU.java
@@ -36,12 +36,12 @@
  * <BR>
  *
  * According to ISO 7816-4, a <code>CommandAPDU</code> has the following format:
- * 
+ *
  * <pre>
  *                  HEADER         |           BODY
  *         CLA    INS    P1    P2  |  [LC]    [DATA]    [LE]
  * </pre>
- * 
+ *
  * where
  * <ul>
  * <li><code>CLA</code> is the class byte
@@ -57,23 +57,23 @@
  *
  * <H3>Usage</H3>
  * <OL>
- * 
+ *
  * <pre>
  * byte[] buffer = { (byte) 0x90, (byte) 0x00, (byte) 0x00, (byte) 0x00, (byte) 0x01, (byte) 0x02, (byte) 0x03 };
  * CommandAPDU capdu = new CommandAPDU(buffer);
  * </pre>
- * 
+ *
  * <pre>
  * CommandAPDU capdu = new CommandAPDU((byte) 0x90, (byte) 0x00, (byte) 0x00, (byte) 0x00, (byte) 0x01, (byte) 0x02,
  * 		(byte) 0x03);
  * </pre>
  * </OL>
- * 
+ *
  * <H3>Additional information</H3>
  * <DL>
  * <DD><A HREF="http://www.opencard.org"> http://www.opencard.org</A>
  * </DL>
- * 
+ *
  * @see com.dalsemi.onewire.container.ResponseAPDU
  * @version 0.00, 28 Aug 2000
  * @author YL
@@ -126,10 +126,10 @@ public class CommandAPDU {
 	 * @param buffer the entire <code>CommandAPDU</code> as a byte array
 	 */
 	public CommandAPDU(byte[] buffer) {
-		apduLength = buffer.length;
-		apduBuffer = new byte[apduLength];
+		this.apduLength = buffer.length;
+		this.apduBuffer = new byte[this.apduLength];
 
-		System.arraycopy(buffer, 0, apduBuffer, 0, apduLength);
+		System.arraycopy(buffer, 0, this.apduBuffer, 0, this.apduLength);
 	} // CommandAPDU
 
 	/**
@@ -201,35 +201,36 @@ public CommandAPDU(byte cla, byte ins, byte p1, byte p2, byte[] data, int le) {
 		// all CommandAPDU has at least 5 bytes of header...
 		// that's CLA, INS, P1, P2, and LC
 
-		apduLength = 5;
+		this.apduLength = 5;
 
 		if (data != null) {
-			apduLength += data.length; // add data length
+			this.apduLength += data.length; // add data length
 		}
 
 		if (le >= 0) {
-			apduLength++; // add one byte for LE
+			this.apduLength++; // add one byte for LE
 		}
 
-		apduBuffer = new byte[apduLength];
+		this.apduBuffer = new byte[this.apduLength];
 
 		// fill CommandAPDU buffer body
-		apduBuffer[CLA] = cla;
-		apduBuffer[INS] = ins;
-		apduBuffer[P1] = p1;
-		apduBuffer[P2] = p2;
+		this.apduBuffer[CLA] = cla;
+		this.apduBuffer[INS] = ins;
+		this.apduBuffer[P1] = p1;
+		this.apduBuffer[P2] = p2;
 
 		if (data != null) {
-			apduBuffer[LC] = (byte) data.length;
+			this.apduBuffer[LC] = (byte) data.length;
 
-			System.arraycopy(data, 0, apduBuffer, LC + 1, data.length);
+			System.arraycopy(data, 0, this.apduBuffer, LC + 1, data.length);
 		} else {
 			// fill in the LC byte anyhoo
-			apduBuffer[LC] = (byte) 0;
+			this.apduBuffer[LC] = (byte) 0;
 		}
 
-		if (le >= 0)
-			apduBuffer[apduLength - 1] = (byte) le;
+		if (le >= 0) {
+			this.apduBuffer[this.apduLength - 1] = (byte) le;
+		}
 	} // CommandAPDU
 
 	/**
@@ -238,7 +239,7 @@ public CommandAPDU(byte cla, byte ins, byte p1, byte p2, byte[] data, int le) {
 	 * @return <code>CLA</code> byte of this <code>CommandAPDU</code>
 	 */
 	public byte getCLA() {
-		return apduBuffer[CLA];
+		return this.apduBuffer[CLA];
 	} // getCLA
 
 	/**
@@ -247,7 +248,7 @@ public byte getCLA() {
 	 * @return <code>INS</code> byte of this <code>CommandAPDU</code>
 	 */
 	public byte getINS() {
-		return apduBuffer[INS];
+		return this.apduBuffer[INS];
 	} // getINS
 
 	/**
@@ -256,7 +257,7 @@ public byte getINS() {
 	 * @return <code>P1</code> byte of this <code>CommandAPDU</code>
 	 */
 	public byte getP1() {
-		return apduBuffer[P1];
+		return this.apduBuffer[P1];
 	} // getP1
 
 	/**
@@ -265,7 +266,7 @@ public byte getP1() {
 	 * @return <code>P2</code> byte of this <code>CommandAPDU</code>
 	 */
 	public byte getP2() {
-		return apduBuffer[P2];
+		return this.apduBuffer[P2];
 	} // getP2
 
 	/**
@@ -276,10 +277,10 @@ public byte getP2() {
 	 *         body
 	 */
 	public int getLC() {
-		if (apduLength >= 6)
-			return apduBuffer[LC];
-		else
-			return 0;
+		if (this.apduLength >= 6) {
+			return this.apduBuffer[LC];
+		}
+		return 0;
 	} // getLC
 
 	/**
@@ -292,10 +293,10 @@ public int getLC() {
 	 * @see ResponseAPDU
 	 */
 	public int getLE() {
-		if ((apduLength == 5) || (apduLength == (6 + getLC())))
-			return apduBuffer[apduLength - 1];
-		else
-			return -1;
+		if (this.apduLength == 5 || this.apduLength == 6 + this.getLC()) {
+			return this.apduBuffer[this.apduLength - 1];
+		}
+		return -1;
 	} // getLE
 
 	/**
@@ -309,7 +310,7 @@ public int getLE() {
 	 *
 	 */
 	final public byte[] getBuffer() {
-		return apduBuffer;
+		return this.apduBuffer;
 	} // getBuffer
 
 	/**
@@ -327,10 +328,10 @@ final public byte[] getBuffer() {
 	 * @see #getLength
 	 */
 	final public byte getByte(int index) {
-		if (index >= apduLength)
+		if (index >= this.apduLength) {
 			return (byte) -1; // read beyond end of CommandAPDU
-		else
-			return (apduBuffer[index]);
+		}
+		return this.apduBuffer[index];
 	} // getByte
 
 	/**
@@ -344,9 +345,9 @@ final public byte getByte(int index) {
 	 * @see #getBuffer
 	 */
 	final public byte[] getBytes() {
-		byte[] apdu = new byte[apduLength];
+		var apdu = new byte[this.apduLength];
 
-		System.arraycopy(apduBuffer, 0, apdu, 0, apduLength);
+		System.arraycopy(this.apduBuffer, 0, apdu, 0, this.apduLength);
 
 		return apdu;
 	} // getBytes
@@ -357,7 +358,7 @@ final public byte[] getBytes() {
 	 * @return the length of the <code>CommandAPDU</code> currently stored
 	 */
 	final public int getLength() {
-		return apduLength;
+		return this.apduLength;
 	} // getLength
 
 	/**
@@ -374,8 +375,9 @@ final public int getLength() {
 	 *
 	 */
 	final public void setByte(int index, byte value) {
-		if (index < apduLength)
-			apduBuffer[index] = value;
+		if (index < this.apduLength) {
+			this.apduBuffer[index] = value;
+		}
 	} // setByte
 
 	/**
@@ -383,32 +385,35 @@ final public void setByte(int index, byte value) {
 	 *
 	 * @return a string describing this <code>CommandAPDU</code>
 	 */
+	@Override
 	public String toString() {
-		String apduString = "";
+		var apduString = new StringBuilder();
 
-		apduString += "CLA = " + Integer.toHexString(apduBuffer[CLA] & 0xFF);
-		apduString += " INS = " + Integer.toHexString(apduBuffer[INS] & 0xFF);
-		apduString += " P1 = " + Integer.toHexString(apduBuffer[P1] & 0xFF);
-		apduString += " P2 = " + Integer.toHexString(apduBuffer[P2] & 0xFF);
-		apduString += " LC = " + Integer.toHexString(getLC() & 0xFF);
+		apduString.append("CLA = ").append(Integer.toHexString(this.apduBuffer[CLA] & 0xFF));
+		apduString.append(" INS = ").append(Integer.toHexString(this.apduBuffer[INS] & 0xFF));
+		apduString.append(" P1 = ").append(Integer.toHexString(this.apduBuffer[P1] & 0xFF));
+		apduString.append(" P2 = ").append(Integer.toHexString(this.apduBuffer[P2] & 0xFF));
+		apduString.append(" LC = ").append(Integer.toHexString(this.getLC() & 0xFF));
 
-		if (getLE() == -1)
-			apduString += " LE = " + getLE();
-		else
-			apduString += " LE = " + Integer.toHexString(getLE() & 0xFF);
+		if (this.getLE() == -1) {
+			apduString.append(" LE = ").append(this.getLE());
+		} else {
+			apduString.append(" LE = ").append(Integer.toHexString(this.getLE() & 0xFF));
+		}
 
-		if (apduLength > 5) {
-			apduString += "\nDATA = ";
+		if (this.apduLength > 5) {
+			apduString.append("\nDATA = ");
 
-			for (int i = 5; i < getLC() + 5; i++) {
-				if ((apduBuffer[i] & 0xFF) < 0x10)
-					apduString += '0';
+			for (var i = 5; i < this.getLC() + 5; i++) {
+				if ((this.apduBuffer[i] & 0xFF) < 0x10) {
+					apduString.append('0');
+				}
 
-				apduString += Integer.toHexString((int) (apduBuffer[i] & 0xFF)) + " ";
+				apduString.append(Integer.toHexString(this.apduBuffer[i] & 0xFF)).append(" ");
 			}
 		}
 
 		// make hex String representation of byte array
-		return (apduString.toUpperCase());
+		return apduString.toString().toUpperCase();
 	} // toString
 }
diff --git a/io.openems.edge.bridge.onewire/src/com/dalsemi/onewire/container/HumidityContainer.java b/io.openems.edge.bridge.onewire/src/com/dalsemi/onewire/container/HumidityContainer.java
index 7db95ba9246..02c14b5f687 100644
--- a/io.openems.edge.bridge.onewire/src/com/dalsemi/onewire/container/HumidityContainer.java
+++ b/io.openems.edge.bridge.onewire/src/com/dalsemi/onewire/container/HumidityContainer.java
@@ -69,7 +69,7 @@
  *
  * <H4>Example</H4> Gets humidity reading from a HumidityContainer instance
  * '<code>hc</code>':
- * 
+ *
  * <PRE>
  *  <CODE>
  *   double lastHumidity;
@@ -78,7 +78,7 @@
  *   byte[] state = hc.readDevice();
  *
  *   // loop to read the humidity
- *   do 
+ *   do
  *   {
  *      // perform a humidity conversion
  *      hc.doHumidityConvert(state);
diff --git a/io.openems.edge.bridge.onewire/src/com/dalsemi/onewire/container/MemoryBank.java b/io.openems.edge.bridge.onewire/src/com/dalsemi/onewire/container/MemoryBank.java
index 42db04c135c..a8856a6193d 100644
--- a/io.openems.edge.bridge.onewire/src/com/dalsemi/onewire/container/MemoryBank.java
+++ b/io.openems.edge.bridge.onewire/src/com/dalsemi/onewire/container/MemoryBank.java
@@ -45,7 +45,7 @@
  * {@link com.dalsemi.onewire.container.OTPMemoryBank OTPMemoryBank} interfaces,
  * to provide additional functionality.
  * </P>
- * 
+ *
  * <P>
  * The MemoryBank methods can be organized into the following categories:
  * </P>
@@ -75,36 +75,36 @@
  * </UL>
  *
  * <H3>Usage</H3>
- * 
+ *
  * <DL>
  * <DD>
  * <H4>Example 1</H4> Display some features of MemoryBank instance 'mb':
- * 
+ *
  * <PRE>
  *  <CODE>
  *  if (mb.isWriteOnce())
  *     System.out.println("MemoryBank is write-once");
- * 
+ *
  *  if (mb.needsProgramPulse())
  *     System.out.println("MemoryBank requires program-pulse to write");
  * </CODE>
  * </PRE>
- * 
+ *
  * <DD>
  * <H4>Example 2</H4> Write the entire contents of a MemoryBank instance 'mb'
  * with zeros:
- * 
+ *
  * <PRE>
  * byte[] write_buf = new byte[mb.getSize()];
  * for (int i = 0; i &gt; write_buf.length; i++)
  * 	write_buf[i] = (byte) 0;
- * 
+ *
  * mb.write(0, write_buf, 0, write_buf.length);
  * </PRE>
  *
  * <DD>
  * <H4>Example 3</H4> Read the entire contents of a MemoryBank instance 'mb':
- * 
+ *
  * <PRE>
  *  <CODE>
  *  byte[] read_buf = new byte[mb.getSize()];
@@ -133,7 +133,7 @@
  * @see com.dalsemi.onewire.container.OneWireContainer20
  * @see com.dalsemi.onewire.container.OneWireContainer21
  * @see com.dalsemi.onewire.container.OneWireContainer23
- * 
+ *
  * @version 0.00, 28 Aug 2000
  * @author DS
  */
diff --git a/io.openems.edge.bridge.onewire/src/com/dalsemi/onewire/container/MemoryBankAD.java b/io.openems.edge.bridge.onewire/src/com/dalsemi/onewire/container/MemoryBankAD.java
index 9a558b12739..93e04f112ea 100644
--- a/io.openems.edge.bridge.onewire/src/com/dalsemi/onewire/container/MemoryBankAD.java
+++ b/io.openems.edge.bridge.onewire/src/com/dalsemi/onewire/container/MemoryBankAD.java
@@ -137,26 +137,27 @@ class MemoryBankAD implements PagedMemoryBank {
 	public MemoryBankAD(OneWireContainer ibutton) {
 
 		// keep reference to ibutton where memory bank is
-		ib = ibutton;
+		this.ib = ibutton;
 
 		// create the ffblock (used for faster 0xFF fills)
-		ffBlock = new byte[50];
+		this.ffBlock = new byte[50];
 
-		for (int i = 0; i < 50; i++)
-			ffBlock[i] = (byte) 0xFF;
+		for (var i = 0; i < 50; i++) {
+			this.ffBlock[i] = (byte) 0xFF;
+		}
 
 		// defaults for Page0 of DS2450
-		bankDescription = "A/D Conversion read-out";
-		generalPurposeMemory = false;
-		startPhysicalAddress = 0;
-		readWrite = false;
-		writeOnce = false;
-		readOnly = true;
-		nonVolatile = false;
-		writeVerification = true;
+		this.bankDescription = "A/D Conversion read-out";
+		this.generalPurposeMemory = false;
+		this.startPhysicalAddress = 0;
+		this.readWrite = false;
+		this.writeOnce = false;
+		this.readOnly = true;
+		this.nonVolatile = false;
+		this.writeVerification = true;
 
 		// indicate speed has not been set
-		doSetSpeed = true;
+		this.doSetSpeed = true;
 	}
 
 	// --------
@@ -168,8 +169,9 @@ public MemoryBankAD(OneWireContainer ibutton) {
 	 *
 	 * @return String containing the memory bank description
 	 */
+	@Override
 	public String getBankDescription() {
-		return bankDescription;
+		return this.bankDescription;
 	}
 
 	/**
@@ -179,8 +181,9 @@ public String getBankDescription() {
 	 *
 	 * @return 'true' if current memory bank is general purpose
 	 */
+	@Override
 	public boolean isGeneralPurposeMemory() {
-		return generalPurposeMemory;
+		return this.generalPurposeMemory;
 	}
 
 	/**
@@ -188,8 +191,9 @@ public boolean isGeneralPurposeMemory() {
 	 *
 	 * @return 'true' if current memory bank is read/write
 	 */
+	@Override
 	public boolean isReadWrite() {
-		return readWrite;
+		return this.readWrite;
 	}
 
 	/**
@@ -198,8 +202,9 @@ public boolean isReadWrite() {
 	 *
 	 * @return 'true' if current memory bank can only be written once
 	 */
+	@Override
 	public boolean isWriteOnce() {
-		return writeOnce;
+		return this.writeOnce;
 	}
 
 	/**
@@ -207,8 +212,9 @@ public boolean isWriteOnce() {
 	 *
 	 * @return 'true' if current memory bank can only be read
 	 */
+	@Override
 	public boolean isReadOnly() {
-		return readOnly;
+		return this.readOnly;
 	}
 
 	/**
@@ -217,8 +223,9 @@ public boolean isReadOnly() {
 	 *
 	 * @return 'true' if current memory bank non volatile.
 	 */
+	@Override
 	public boolean isNonVolatile() {
-		return nonVolatile;
+		return this.nonVolatile;
 	}
 
 	/**
@@ -228,6 +235,7 @@ public boolean isNonVolatile() {
 	 * @return 'true' if writing to the current memory bank pages requires a
 	 *         'ProgramPulse'.
 	 */
+	@Override
 	public boolean needsProgramPulse() {
 		return false;
 	}
@@ -239,6 +247,7 @@ public boolean needsProgramPulse() {
 	 * @return 'true' if writing to the current memory bank pages requires
 	 *         'PowerDelivery'.
 	 */
+	@Override
 	public boolean needsPowerDelivery() {
 		return false;
 	}
@@ -249,8 +258,9 @@ public boolean needsPowerDelivery() {
 	 *
 	 * @return physical starting address of this logical bank.
 	 */
+	@Override
 	public int getStartPhysicalAddress() {
-		return startPhysicalAddress;
+		return this.startPhysicalAddress;
 	}
 
 	/**
@@ -258,6 +268,7 @@ public int getStartPhysicalAddress() {
 	 *
 	 * @return memory bank size in bytes.
 	 */
+	@Override
 	public int getSize() {
 		return PAGE_LENGTH;
 	}
@@ -268,8 +279,9 @@ public int getSize() {
 	 * @param doReadVerf true (default) verify write in 'write' false, don't verify
 	 *                   write (used on Write-Once bit manipulation)
 	 */
+	@Override
 	public void setWriteVerification(boolean doReadVerf) {
-		writeVerification = doReadVerf;
+		this.writeVerification = doReadVerf;
 	}
 
 	/**
@@ -277,6 +289,7 @@ public void setWriteVerification(boolean doReadVerf) {
 	 *
 	 * @return number of pages in current memory bank
 	 */
+	@Override
 	public int getNumberPages() {
 		return 1;
 	}
@@ -286,6 +299,7 @@ public int getNumberPages() {
 	 *
 	 * @return page length in bytes in current memory bank
 	 */
+	@Override
 	public int getPageLength() {
 		return PAGE_LENGTH;
 	}
@@ -293,11 +307,12 @@ public int getPageLength() {
 	/**
 	 * Query to get Maximum data page length in bytes for a packet read or written
 	 * in the current memory bank. See the 'ReadPagePacket()' and
-	 * 'WritePagePacket()' methods. This method is only useful if the current
-	 * memory bank is general purpose memory.
+	 * 'WritePagePacket()' methods. This method is only useful if the current memory
+	 * bank is general purpose memory.
 	 *
 	 * @return max packet page length in bytes in current memory bank
 	 */
+	@Override
 	public int getMaxPacketDataLength() {
 		return PAGE_LENGTH - 3;
 	}
@@ -309,6 +324,7 @@ public int getMaxPacketDataLength() {
 	 *
 	 * @return 'true' if current memory bank can be read with self generated CRC.
 	 */
+	@Override
 	public boolean hasPageAutoCRC() {
 		return true;
 	}
@@ -330,6 +346,7 @@ public boolean hasPageAutoCRC() {
 	 * @see #readPagePacket(int,boolean,byte[],int,byte[]) readPagePacket(extra)
 	 * @since 1-Wire API 0.01
 	 */
+	@Override
 	public boolean hasExtraInfo() {
 		return false;
 	}
@@ -341,6 +358,7 @@ public boolean hasExtraInfo() {
 	 * @return number of bytes in Extra Information read when reading pages in the
 	 *         current memory bank.
 	 */
+	@Override
 	public int getExtraInfoLength() {
 		return 0;
 	}
@@ -352,6 +370,7 @@ public int getExtraInfoLength() {
 	 *
 	 * @return string describing extra information.
 	 */
+	@Override
 	public String getExtraInfoDescription() {
 		return null;
 	}
@@ -382,28 +401,32 @@ public String getExtraInfoDescription() {
 	 * @throws OneWireIOException
 	 * @throws OneWireException
 	 */
+	@Override
 	public void read(int startAddr, boolean readContinue, byte[] readBuf, int offset, int len)
 			throws OneWireIOException, OneWireException {
 
 		// check if read exceeds memory
-		if ((startAddr + len) > PAGE_LENGTH)
+		if (startAddr + len > PAGE_LENGTH) {
 			throw new OneWireException("Read exceeds memory bank end");
+		}
 
 		// no regular read memory so must use readPageCRC
-		int start_pg = startAddr / PAGE_LENGTH;
-		int end_pg = ((startAddr + len) / PAGE_LENGTH) - 1;
+		var start_pg = startAddr / PAGE_LENGTH;
+		var end_pg = (startAddr + len) / PAGE_LENGTH - 1;
 
-		if (((startAddr + len) % PAGE_LENGTH) > 0)
+		if ((startAddr + len) % PAGE_LENGTH > 0) {
 			end_pg++;
+		}
 
-		byte[] raw_buf = new byte[(end_pg - start_pg + 1) * PAGE_LENGTH];
+		var raw_buf = new byte[(end_pg - start_pg + 1) * PAGE_LENGTH];
 
 		// loop to read the pages
-		for (int pg = start_pg; pg <= end_pg; pg++)
-			readPageCRC(pg, !(pg == start_pg), raw_buf, (pg - start_pg) * PAGE_LENGTH);
+		for (var pg = start_pg; pg <= end_pg; pg++) {
+			this.readPageCRC(pg, !(pg == start_pg), raw_buf, (pg - start_pg) * PAGE_LENGTH);
+		}
 
 		// extract out the data
-		System.arraycopy(raw_buf, (startAddr % PAGE_LENGTH), readBuf, offset, len);
+		System.arraycopy(raw_buf, startAddr % PAGE_LENGTH, readBuf, offset, len);
 	}
 
 	/**
@@ -426,30 +449,32 @@ public void read(int startAddr, boolean readContinue, byte[] readBuf, int offset
 	 * @throws OneWireIOException
 	 * @throws OneWireException
 	 */
+	@Override
 	public void write(int startAddr, byte[] writeBuf, int offset, int len) throws OneWireIOException, OneWireException {
-		byte[] raw_buf = new byte[7];
+		var raw_buf = new byte[7];
 		int cnt = 0, start_addr, addr, end_addr, lastcrc;
 
 		// return if nothing to do
-		if (len == 0)
+		if (len == 0) {
 			return;
+		}
 
 		// attempt to put device at max desired speed
-		checkSpeed();
+		this.checkSpeed();
 
 		// select the device
-		if (!ib.adapter.select(ib.address)) {
-			forceVerify();
+		if (!this.ib.adapter.select(this.ib.address)) {
+			this.forceVerify();
 
 			throw new OneWireIOException("Device select failed");
 		}
 
 		// build packet
 		raw_buf[cnt++] = WRITE_MEMORY_COMMAND;
-		start_addr = startAddr + startPhysicalAddress;
+		start_addr = startAddr + this.startPhysicalAddress;
 		end_addr = start_addr + len;
 		raw_buf[cnt++] = (byte) (start_addr & 0xFF);
-		raw_buf[cnt++] = (byte) (((start_addr & 0xFFFF) >>> 8) & 0xFF);
+		raw_buf[cnt++] = (byte) ((start_addr & 0xFFFF) >>> 8 & 0xFF);
 
 		// loop for each byte to write
 		for (addr = start_addr; addr < end_addr; addr++) {
@@ -458,24 +483,24 @@ public void write(int startAddr, byte[] writeBuf, int offset, int len) throws On
 			raw_buf[cnt++] = writeBuf[offset + addr - start_addr];
 
 			// initialize crc16
-			lastcrc = CRC16.compute(raw_buf, 0, cnt, (addr == start_addr) ? 0 : addr);
+			lastcrc = CRC16.compute(raw_buf, 0, cnt, addr == start_addr ? 0 : addr);
 
 			// add the read crc and echo byte to block
-			System.arraycopy(ffBlock, 0, raw_buf, cnt, 3);
+			System.arraycopy(this.ffBlock, 0, raw_buf, cnt, 3);
 
 			// perform the block
-			ib.adapter.dataBlock(raw_buf, 0, cnt + 3);
+			this.ib.adapter.dataBlock(raw_buf, 0, cnt + 3);
 
 			// check the CRC
 			if (CRC16.compute(raw_buf, cnt, 2, lastcrc) != 0x0000B001) {
-				forceVerify();
+				this.forceVerify();
 
 				throw new OneWireIOException("Invalid CRC16 read from device");
 			}
 
 			// check echo
 			if (raw_buf[cnt + 2] != writeBuf[offset + addr - start_addr]) {
-				forceVerify();
+				this.forceVerify();
 
 				throw new OneWireIOException("Write byte echo was invalid");
 			}
@@ -510,11 +535,12 @@ public void write(int startAddr, byte[] writeBuf, int offset, int len) throws On
 	 * @throws OneWireIOException
 	 * @throws OneWireException
 	 */
+	@Override
 	public void readPage(int page, boolean readContinue, byte[] readBuf, int offset)
 			throws OneWireIOException, OneWireException {
 
 		// read page with read page CRC
-		readPageCRC(page, readContinue, readBuf, offset);
+		this.readPageCRC(page, readContinue, readBuf, offset);
 	}
 
 	/**
@@ -540,6 +566,7 @@ public void readPage(int page, boolean readContinue, byte[] readBuf, int offset)
 	 * @throws OneWireIOException
 	 * @throws OneWireException
 	 */
+	@Override
 	public void readPage(int page, boolean readContinue, byte[] readBuf, int offset, byte[] extraInfo)
 			throws OneWireIOException, OneWireException {
 
@@ -575,16 +602,18 @@ public void readPage(int page, boolean readContinue, byte[] readBuf, int offset,
 	 * @throws OneWireIOException
 	 * @throws OneWireException
 	 */
+	@Override
 	public int readPagePacket(int page, boolean readContinue, byte[] readBuf, int offset)
 			throws OneWireIOException, OneWireException {
-		byte[] raw_buf = new byte[PAGE_LENGTH];
+		var raw_buf = new byte[PAGE_LENGTH];
 
 		// read entire page with read page CRC
-		readPageCRC(page, readContinue, raw_buf, 0);
+		this.readPageCRC(page, readContinue, raw_buf, 0);
 
 		// check if length is realistic
-		if (raw_buf[0] > (PAGE_LENGTH - 3))
+		if (raw_buf[0] > PAGE_LENGTH - 3) {
 			throw new OneWireIOException("Invalid length in packet");
+		}
 
 		// verify the CRC is correct
 		if (CRC16.compute(raw_buf, 0, raw_buf[0] + 3, page) == 0x0000B001) {
@@ -594,11 +623,10 @@ public int readPagePacket(int page, boolean readContinue, byte[] readBuf, int of
 
 			// return the length
 			return raw_buf[0];
-		} else {
-			forceVerify();
-
-			throw new OneWireIOException("Invalid CRC16 in packet read");
 		}
+		this.forceVerify();
+
+		throw new OneWireIOException("Invalid CRC16 in packet read");
 	}
 
 	/**
@@ -623,6 +651,7 @@ public int readPagePacket(int page, boolean readContinue, byte[] readBuf, int of
 	 * @throws OneWireIOException
 	 * @throws OneWireException
 	 */
+	@Override
 	public int readPagePacket(int page, boolean readContinue, byte[] readBuf, int offset, byte[] extraInfo)
 			throws OneWireIOException, OneWireException {
 
@@ -642,27 +671,29 @@ public int readPagePacket(int page, boolean readContinue, byte[] readBuf, int of
 	 * @throws OneWireIOException
 	 * @throws OneWireException
 	 */
+	@Override
 	public void writePagePacket(int page, byte[] writeBuf, int offset, int len)
 			throws OneWireIOException, OneWireException {
 
 		// make sure length does not exceed max
-		if (len > PAGE_LENGTH - 3)
+		if (len > PAGE_LENGTH - 3) {
 			throw new OneWireIOException("Length of packet requested exceeds page size");
+		}
 
 		// construct the packet to write
-		byte[] raw_buf = new byte[len + 3];
+		var raw_buf = new byte[len + 3];
 
 		raw_buf[0] = (byte) len;
 
 		System.arraycopy(writeBuf, offset, raw_buf, 1, len);
 
-		int crc = CRC16.compute(raw_buf, 0, len + 1, page);
+		var crc = CRC16.compute(raw_buf, 0, len + 1, page);
 
 		raw_buf[len + 1] = (byte) (~crc & 0xFF);
-		raw_buf[len + 2] = (byte) (((~crc & 0xFFFF) >>> 8) & 0xFF);
+		raw_buf[len + 2] = (byte) ((~crc & 0xFFFF) >>> 8 & 0xFF);
 
 		// write the packet, return result
-		write(page * PAGE_LENGTH, raw_buf, 0, len + 3);
+		this.write(page * PAGE_LENGTH, raw_buf, 0, len + 3);
 	}
 
 	/**
@@ -681,21 +712,23 @@ public void writePagePacket(int page, byte[] writeBuf, int offset, int len)
 	 * @throws OneWireIOException
 	 * @throws OneWireException
 	 */
+	@Override
 	public void readPageCRC(int page, boolean readContinue, byte[] readBuf, int offset)
 			throws OneWireIOException, OneWireException {
-		byte[] raw_buf = new byte[5 + PAGE_LENGTH];
+		var raw_buf = new byte[5 + PAGE_LENGTH];
 		int len;
 
 		// attempt to put device at max desired speed
-		if (!readContinue)
-			checkSpeed();
+		if (!readContinue) {
+			this.checkSpeed();
+		}
 
 		// see if need to access the device
 		if (!readContinue) {
 
 			// select the device
-			if (!ib.adapter.select(ib.address)) {
-				forceVerify();
+			if (!this.ib.adapter.select(this.ib.address)) {
+				this.forceVerify();
 
 				throw new OneWireIOException("Device select failed");
 			}
@@ -703,26 +736,26 @@ public void readPageCRC(int page, boolean readContinue, byte[] readBuf, int offs
 			// build start reading memory block with: command, address
 			len = raw_buf.length;
 
-			System.arraycopy(ffBlock, 0, raw_buf, 0, len);
+			System.arraycopy(this.ffBlock, 0, raw_buf, 0, len);
 
 			raw_buf[0] = READ_MEMORY_COMMAND;
 
-			int addr = page * PAGE_LENGTH + startPhysicalAddress;
+			var addr = page * PAGE_LENGTH + this.startPhysicalAddress;
 
 			raw_buf[1] = (byte) (addr & 0xFF);
-			raw_buf[2] = (byte) (((addr & 0xFFFF) >>> 8) & 0xFF);
+			raw_buf[2] = (byte) ((addr & 0xFFFF) >>> 8 & 0xFF);
 		} else {
 			len = PAGE_LENGTH + 2;
 
-			System.arraycopy(ffBlock, 0, raw_buf, 0, len);
+			System.arraycopy(this.ffBlock, 0, raw_buf, 0, len);
 		}
 
 		// do the block
-		ib.adapter.dataBlock(raw_buf, 0, len);
+		this.ib.adapter.dataBlock(raw_buf, 0, len);
 
 		// check the CRC
 		if (CRC16.compute(raw_buf, 0, len, 0) != 0x0000B001) {
-			forceVerify();
+			this.forceVerify();
 
 			throw new OneWireIOException("Invalid CRC16 read from device");
 		}
@@ -750,6 +783,7 @@ public void readPageCRC(int page, boolean readContinue, byte[] readBuf, int offs
 	 * @throws OneWireIOException
 	 * @throws OneWireException
 	 */
+	@Override
 	public void readPageCRC(int page, boolean readContinue, byte[] readBuf, int offset, byte[] extraInfo)
 			throws OneWireIOException, OneWireException {
 
@@ -772,13 +806,13 @@ public void checkSpeed() throws OneWireIOException, OneWireException {
 		synchronized (this) {
 
 			// only check the speed
-			if (doSetSpeed) {
+			if (this.doSetSpeed) {
 
 				// attempt to set the correct speed and verify device present
-				ib.doSpeed();
+				this.ib.doSpeed();
 
 				// no exceptions so clear flag
-				doSetSpeed = false;
+				this.doSetSpeed = false;
 			}
 		}
 	}
@@ -789,7 +823,7 @@ public void checkSpeed() throws OneWireIOException, OneWireException {
 	 */
 	public void forceVerify() {
 		synchronized (this) {
-			doSetSpeed = true;
+			this.doSetSpeed = true;
 		}
 	}
 }
diff --git a/io.openems.edge.bridge.onewire/src/com/dalsemi/onewire/container/MemoryBankAppReg.java b/io.openems.edge.bridge.onewire/src/com/dalsemi/onewire/container/MemoryBankAppReg.java
index 5c670eb1312..7cac25b0102 100644
--- a/io.openems.edge.bridge.onewire/src/com/dalsemi/onewire/container/MemoryBankAppReg.java
+++ b/io.openems.edge.bridge.onewire/src/com/dalsemi/onewire/container/MemoryBankAppReg.java
@@ -142,16 +142,17 @@ class MemoryBankAppReg implements OTPMemoryBank {
 	public MemoryBankAppReg(OneWireContainer ibutton) {
 
 		// keep reference to ibutton where memory bank is
-		ib = ibutton;
+		this.ib = ibutton;
 
 		// defaults
-		writeVerification = true;
+		this.writeVerification = true;
 
 		// create the ffblock (used for faster 0xFF fills)
-		ffBlock = new byte[50];
+		this.ffBlock = new byte[50];
 
-		for (int i = 0; i < 50; i++)
-			ffBlock[i] = (byte) 0xFF;
+		for (var i = 0; i < 50; i++) {
+			this.ffBlock[i] = (byte) 0xFF;
+		}
 	}
 
 	// --------
@@ -163,6 +164,7 @@ public MemoryBankAppReg(OneWireContainer ibutton) {
 	 *
 	 * @return String containing the memory bank description
 	 */
+	@Override
 	public String getBankDescription() {
 		return bankDescription;
 	}
@@ -174,6 +176,7 @@ public String getBankDescription() {
 	 *
 	 * @return 'true' if current memory bank is general purpose
 	 */
+	@Override
 	public boolean isGeneralPurposeMemory() {
 		return true;
 	}
@@ -183,6 +186,7 @@ public boolean isGeneralPurposeMemory() {
 	 *
 	 * @return 'true' if current memory bank is read/write
 	 */
+	@Override
 	public boolean isReadWrite() {
 		return true;
 	}
@@ -193,6 +197,7 @@ public boolean isReadWrite() {
 	 *
 	 * @return 'true' if current memory bank can only be written once
 	 */
+	@Override
 	public boolean isWriteOnce() {
 		return false;
 	}
@@ -202,6 +207,7 @@ public boolean isWriteOnce() {
 	 *
 	 * @return 'true' if current memory bank can only be read
 	 */
+	@Override
 	public boolean isReadOnly() {
 		return false;
 	}
@@ -212,6 +218,7 @@ public boolean isReadOnly() {
 	 *
 	 * @return 'true' if current memory bank non volatile.
 	 */
+	@Override
 	public boolean isNonVolatile() {
 		return false;
 	}
@@ -223,6 +230,7 @@ public boolean isNonVolatile() {
 	 * @return 'true' if writing to the current memory bank pages requires a
 	 *         'ProgramPulse'.
 	 */
+	@Override
 	public boolean needsProgramPulse() {
 		return false;
 	}
@@ -234,6 +242,7 @@ public boolean needsProgramPulse() {
 	 * @return 'true' if writing to the current memory bank pages requires
 	 *         'PowerDelivery'.
 	 */
+	@Override
 	public boolean needsPowerDelivery() {
 		return true;
 	}
@@ -244,6 +253,7 @@ public boolean needsPowerDelivery() {
 	 *
 	 * @return physical starting address of this logical bank.
 	 */
+	@Override
 	public int getStartPhysicalAddress() {
 		return 0;
 	}
@@ -253,6 +263,7 @@ public int getStartPhysicalAddress() {
 	 *
 	 * @return memory bank size in bytes.
 	 */
+	@Override
 	public int getSize() {
 		return PAGE_SIZE;
 	}
@@ -266,6 +277,7 @@ public int getSize() {
 	 *
 	 * @return number of pages in current memory bank
 	 */
+	@Override
 	public int getNumberPages() {
 		return 1;
 	}
@@ -275,6 +287,7 @@ public int getNumberPages() {
 	 *
 	 * @return page length in bytes in current memory bank
 	 */
+	@Override
 	public int getPageLength() {
 		return PAGE_SIZE;
 	}
@@ -287,6 +300,7 @@ public int getPageLength() {
 	 *
 	 * @return max packet page length in bytes in current memory bank
 	 */
+	@Override
 	public int getMaxPacketDataLength() {
 		return PAGE_SIZE - 2;
 	}
@@ -298,6 +312,7 @@ public int getMaxPacketDataLength() {
 	 *
 	 * @return 'true' if current memory bank can be read with self generated CRC.
 	 */
+	@Override
 	public boolean hasPageAutoCRC() {
 		return false;
 	}
@@ -319,6 +334,7 @@ public boolean hasPageAutoCRC() {
 	 * @see #readPagePacket(int,boolean,byte[],int,byte[]) readPagePacket(extra)
 	 * @since 1-Wire API 0.01
 	 */
+	@Override
 	public boolean hasExtraInfo() {
 		return true;
 	}
@@ -330,6 +346,7 @@ public boolean hasExtraInfo() {
 	 * @return number of bytes in Extra Information read when reading pages in the
 	 *         current memory bank.
 	 */
+	@Override
 	public int getExtraInfoLength() {
 		return 1;
 	}
@@ -341,6 +358,7 @@ public int getExtraInfoLength() {
 	 *
 	 * @return string describing extra information.
 	 */
+	@Override
 	public String getExtraInfoDescription() {
 		return extraInfoDescription;
 	}
@@ -351,8 +369,9 @@ public String getExtraInfoDescription() {
 	 * @param doReadVerf true (default) verify write in 'write' false, don't verify
 	 *                   write (used on Write-Once bit manipulation)
 	 */
+	@Override
 	public void setWriteVerification(boolean doReadVerf) {
-		writeVerification = doReadVerf;
+		this.writeVerification = doReadVerf;
 	}
 
 	// --------
@@ -365,6 +384,7 @@ public void setWriteVerification(boolean doReadVerf) {
 	 *
 	 * @return 'true' if current memory bank pages can be redirected to a new page.
 	 */
+	@Override
 	public boolean canRedirectPage() {
 		return false;
 	}
@@ -375,6 +395,7 @@ public boolean canRedirectPage() {
 	 *
 	 * @return 'true' if current memory bank pages can be redirected to a new page.
 	 */
+	@Override
 	public boolean canLockPage() {
 		return true;
 	}
@@ -386,6 +407,7 @@ public boolean canLockPage() {
 	 * @return 'true' if current memory bank pages can be locked from being
 	 *         redirected to a new page.
 	 */
+	@Override
 	public boolean canLockRedirectPage() {
 		return false;
 	}
@@ -416,30 +438,33 @@ public boolean canLockRedirectPage() {
 	 * @throws OneWireIOException
 	 * @throws OneWireException
 	 */
+	@Override
 	public void read(int startAddr, boolean readContinue, byte[] readBuf, int offset, int len)
 			throws OneWireIOException, OneWireException {
 
 		// check if read exceeds memory
-		if ((startAddr + len) > PAGE_SIZE)
+		if (startAddr + len > PAGE_SIZE) {
 			throw new OneWireException("Read exceeds memory bank end");
+		}
 
 		// ignore readContinue, silly with a 8 byte memory bank
 		// attempt to put device at the correct speed
-		ib.doSpeed();
+		this.ib.doSpeed();
 
 		// select the device
-		if (!ib.adapter.select(ib.address))
+		if (!this.ib.adapter.select(this.ib.address)) {
 			throw new OneWireIOException("Device select failed");
+		}
 
 		// start the read
-		ib.adapter.putByte(READ_MEMORY_COMMAND);
-		ib.adapter.putByte(startAddr & 0xFF);
+		this.ib.adapter.putByte(READ_MEMORY_COMMAND);
+		this.ib.adapter.putByte(startAddr & 0xFF);
 
 		// file the read block with 0xFF
-		System.arraycopy(ffBlock, 0, readBuf, offset, len);
+		System.arraycopy(this.ffBlock, 0, readBuf, offset, len);
 
 		// do the read
-		ib.adapter.dataBlock(readBuf, offset, len);
+		this.ib.adapter.dataBlock(readBuf, offset, len);
 	}
 
 	/**
@@ -462,45 +487,51 @@ public void read(int startAddr, boolean readContinue, byte[] readBuf, int offset
 	 * @throws OneWireIOException
 	 * @throws OneWireException
 	 */
+	@Override
 	public void write(int startAddr, byte[] writeBuf, int offset, int len) throws OneWireIOException, OneWireException {
 		// return if nothing to do
-		if (len == 0)
+		if (len == 0) {
 			return;
+		}
 
 		// check if power delivery is available
-		if (!ib.adapter.canDeliverPower())
+		if (!this.ib.adapter.canDeliverPower()) {
 			throw new OneWireException("Power delivery required but not available");
+		}
 
 		// check if write exceeds memory
-		if ((startAddr + len) > PAGE_SIZE)
+		if (startAddr + len > PAGE_SIZE) {
 			throw new OneWireException("Write exceeds memory bank end");
+		}
 
 		// attempt to put device at the correct speed
-		ib.doSpeed();
+		this.ib.doSpeed();
 
 		// select the device
-		if (!ib.adapter.select(ib.address))
+		if (!this.ib.adapter.select(this.ib.address)) {
 			throw new OneWireIOException("Device select failed");
+		}
 
 		// start the write
-		ib.adapter.putByte(WRITE_MEMORY_COMMAND);
-		ib.adapter.putByte(startAddr & 0xFF);
+		this.ib.adapter.putByte(WRITE_MEMORY_COMMAND);
+		this.ib.adapter.putByte(startAddr & 0xFF);
 
 		// do the write
-		ib.adapter.dataBlock(writeBuf, offset, len);
+		this.ib.adapter.dataBlock(writeBuf, offset, len);
 
 		// check for write verification
-		if (writeVerification) {
+		if (this.writeVerification) {
 
 			// read back
-			byte[] read_buf = new byte[len];
+			var read_buf = new byte[len];
 
-			read(startAddr, true, read_buf, 0, len);
+			this.read(startAddr, true, read_buf, 0, len);
 
 			// compare
-			for (int i = 0; i < len; i++) {
-				if ((byte) read_buf[i] != (byte) writeBuf[i + offset])
+			for (var i = 0; i < len; i++) {
+				if (read_buf[i] != writeBuf[i + offset]) {
 					throw new OneWireIOException("Read back from write compare is incorrect, page may be locked");
+				}
 			}
 		}
 	}
@@ -530,15 +561,17 @@ public void write(int startAddr, byte[] writeBuf, int offset, int len) throws On
 	 * @throws OneWireIOException
 	 * @throws OneWireException
 	 */
+	@Override
 	public void readPage(int page, boolean readContinue, byte[] readBuf, int offset)
 			throws OneWireIOException, OneWireException {
 
 		// check if for valid page
-		if (page != 0)
+		if (page != 0) {
 			throw new OneWireException("Invalid page number for this memory bank");
+		}
 
 		// do the read
-		read(0, true, readBuf, offset, PAGE_SIZE);
+		this.read(0, true, readBuf, offset, PAGE_SIZE);
 	}
 
 	/**
@@ -564,14 +597,15 @@ public void readPage(int page, boolean readContinue, byte[] readBuf, int offset)
 	 * @throws OneWireIOException
 	 * @throws OneWireException
 	 */
+	@Override
 	public void readPage(int page, boolean readContinue, byte[] readBuf, int offset, byte[] extraInfo)
 			throws OneWireIOException, OneWireException {
 
 		// read the page data
-		read(page, true, readBuf, offset, PAGE_SIZE);
+		this.read(page, true, readBuf, offset, PAGE_SIZE);
 
 		// read the extra information (status)
-		readStatus(extraInfo);
+		this.readStatus(extraInfo);
 	}
 
 	/**
@@ -595,16 +629,18 @@ public void readPage(int page, boolean readContinue, byte[] readBuf, int offset,
 	 * @throws OneWireIOException
 	 * @throws OneWireException
 	 */
+	@Override
 	public int readPagePacket(int page, boolean readContinue, byte[] readBuf, int offset, byte[] extraInfo)
 			throws OneWireIOException, OneWireException {
-		byte[] raw_buf = new byte[PAGE_SIZE];
+		var raw_buf = new byte[PAGE_SIZE];
 
 		// read the entire page data
-		read(page, true, raw_buf, 0, PAGE_SIZE);
+		this.read(page, true, raw_buf, 0, PAGE_SIZE);
 
 		// check if length is realistic
-		if (raw_buf[0] > (PAGE_SIZE - 2))
+		if (raw_buf[0] > PAGE_SIZE - 2) {
 			throw new OneWireIOException("Invalid length in packet");
+		}
 
 		// verify the CRC is correct
 		if (CRC16.compute(raw_buf, 0, raw_buf[0] + 3, page) == 0x0000B001) {
@@ -613,12 +649,12 @@ public int readPagePacket(int page, boolean readContinue, byte[] readBuf, int of
 			System.arraycopy(raw_buf, 1, readBuf, offset, raw_buf[0]);
 
 			// read the extra info
-			readStatus(extraInfo);
+			this.readStatus(extraInfo);
 
 			// return the length
 			return raw_buf[0];
-		} else
-			throw new OneWireIOException("Invalid CRC16 in packet read");
+		}
+		throw new OneWireIOException("Invalid CRC16 in packet read");
 	}
 
 	/**
@@ -641,16 +677,18 @@ public int readPagePacket(int page, boolean readContinue, byte[] readBuf, int of
 	 * @throws OneWireIOException
 	 * @throws OneWireException
 	 */
+	@Override
 	public int readPagePacket(int page, boolean readContinue, byte[] readBuf, int offset)
 			throws OneWireIOException, OneWireException {
-		byte[] raw_buf = new byte[PAGE_SIZE];
+		var raw_buf = new byte[PAGE_SIZE];
 
 		// read the entire page data
-		read(page, true, raw_buf, 0, PAGE_SIZE);
+		this.read(page, true, raw_buf, 0, PAGE_SIZE);
 
 		// check if length is realistic
-		if (raw_buf[0] > (PAGE_SIZE - 2))
+		if (raw_buf[0] > PAGE_SIZE - 2) {
 			throw new OneWireIOException("Invalid length in packet");
+		}
 
 		// verify the CRC is correct
 		if (CRC16.compute(raw_buf, 0, raw_buf[0] + 3, page) == 0x0000B001) {
@@ -660,8 +698,8 @@ public int readPagePacket(int page, boolean readContinue, byte[] readBuf, int of
 
 			// return the length
 			return raw_buf[0];
-		} else
-			throw new OneWireIOException("Invalid CRC16 in packet read");
+		}
+		throw new OneWireIOException("Invalid CRC16 in packet read");
 	}
 
 	/**
@@ -676,27 +714,29 @@ public int readPagePacket(int page, boolean readContinue, byte[] readBuf, int of
 	 * @throws OneWireIOException
 	 * @throws OneWireException
 	 */
+	@Override
 	public void writePagePacket(int page, byte[] writeBuf, int offset, int len)
 			throws OneWireIOException, OneWireException {
 
 		// make sure length does not exceed max
-		if (len > (PAGE_SIZE - 2))
+		if (len > PAGE_SIZE - 2) {
 			throw new OneWireIOException("Length of packet requested exceeds page size");
+		}
 
 		// construct the packet to write
-		byte[] raw_buf = new byte[len + 3];
+		var raw_buf = new byte[len + 3];
 
 		raw_buf[0] = (byte) len;
 
 		System.arraycopy(writeBuf, offset, raw_buf, 1, len);
 
-		int crc = CRC16.compute(raw_buf, 0, len + 1, page);
+		var crc = CRC16.compute(raw_buf, 0, len + 1, page);
 
 		raw_buf[len + 1] = (byte) (~crc & 0xFF);
-		raw_buf[len + 2] = (byte) (((~crc & 0xFFFF) >>> 8) & 0xFF);
+		raw_buf[len + 2] = (byte) ((~crc & 0xFFFF) >>> 8 & 0xFF);
 
 		// write the packet, return result
-		write(page * PAGE_SIZE, raw_buf, 0, len + 3);
+		this.write(page * PAGE_SIZE, raw_buf, 0, len + 3);
 	}
 
 	/**
@@ -715,6 +755,7 @@ public void writePagePacket(int page, byte[] writeBuf, int offset, int len)
 	 * @throws OneWireIOException
 	 * @throws OneWireException
 	 */
+	@Override
 	public void readPageCRC(int page, boolean readContinue, byte[] readBuf, int offset)
 			throws OneWireIOException, OneWireException {
 
@@ -741,6 +782,7 @@ public void readPageCRC(int page, boolean readContinue, byte[] readBuf, int offs
 	 * @throws OneWireIOException
 	 * @throws OneWireException
 	 */
+	@Override
 	public void readPageCRC(int page, boolean readContinue, byte[] readBuf, int offset, byte[] extraInfo)
 			throws OneWireIOException, OneWireException {
 
@@ -761,22 +803,25 @@ public void readPageCRC(int page, boolean readContinue, byte[] readBuf, int offs
 	 * @throws OneWireIOException
 	 * @throws OneWireException
 	 */
+	@Override
 	public void lockPage(int page) throws OneWireIOException, OneWireException {
 
 		// attempt to put device at the correct speed
-		ib.doSpeed();
+		this.ib.doSpeed();
 
 		// select the device
-		if (!ib.adapter.select(ib.address))
+		if (!this.ib.adapter.select(this.ib.address)) {
 			throw new OneWireIOException("Device select failed");
+		}
 
 		// do the copy/lock sequence
-		ib.adapter.putByte(COPY_LOCK_COMMAND);
-		ib.adapter.putByte(VALIDATION_KEY);
+		this.ib.adapter.putByte(COPY_LOCK_COMMAND);
+		this.ib.adapter.putByte(VALIDATION_KEY);
 
 		// read back to verify
-		if (!isPageLocked(page))
+		if (!this.isPageLocked(page)) {
 			throw new OneWireIOException("Read back from write incorrect, could not lock page");
+		}
 	}
 
 	/**
@@ -789,17 +834,19 @@ public void lockPage(int page) throws OneWireIOException, OneWireException {
 	 * @throws OneWireIOException
 	 * @throws OneWireException
 	 */
+	@Override
 	public boolean isPageLocked(int page) throws OneWireIOException, OneWireException {
 
 		// check if for valid page
-		if (page != 0)
+		if (page != 0) {
 			throw new OneWireException("Invalid page number for this memory bank");
+		}
 
 		// attempt to put device at the correct speed
-		ib.doSpeed();
+		this.ib.doSpeed();
 
 		// read status and return result
-		return ((byte) readStatus() == (byte) LOCKED_FLAG);
+		return this.readStatus() == LOCKED_FLAG;
 	}
 
 	/**
@@ -812,6 +859,7 @@ public boolean isPageLocked(int page) throws OneWireIOException, OneWireExceptio
 	 * @throws OneWireIOException
 	 * @throws OneWireException
 	 */
+	@Override
 	public void redirectPage(int page, int newPage) throws OneWireIOException, OneWireException {
 
 		// only needs to be implemented if supported by hardware
@@ -839,6 +887,7 @@ public void redirectPage(int page, int newPage) throws OneWireIOException, OneWi
 	 * @see #redirectPage(int,int) redirectPage
 	 * @since 1-Wire API 0.01
 	 */
+	@Override
 	public int getRedirectedPage(int page) throws OneWireIOException, OneWireException {
 		return 0;
 	}
@@ -852,6 +901,7 @@ public int getRedirectedPage(int page) throws OneWireIOException, OneWireExcepti
 	 * @throws OneWireIOException
 	 * @throws OneWireException
 	 */
+	@Override
 	public void lockRedirectPage(int page) throws OneWireIOException, OneWireException {
 
 		// only needs to be implemented if supported by hardware
@@ -869,6 +919,7 @@ public void lockRedirectPage(int page) throws OneWireIOException, OneWireExcepti
 	 * @throws OneWireIOException
 	 * @throws OneWireException
 	 */
+	@Override
 	public boolean isRedirectPageLocked(int page) throws OneWireIOException, OneWireException {
 		return false;
 	}
@@ -886,7 +937,7 @@ public boolean isRedirectPageLocked(int page) throws OneWireIOException, OneWire
 	 * @throws OneWireException
 	 */
 	protected void readStatus(byte[] readBuf) throws OneWireIOException, OneWireException {
-		readBuf[0] = (byte) readStatus();
+		readBuf[0] = this.readStatus();
 	}
 
 	/**
@@ -900,15 +951,16 @@ protected void readStatus(byte[] readBuf) throws OneWireIOException, OneWireExce
 	protected byte readStatus() throws OneWireIOException, OneWireException {
 
 		// select the device
-		if (!ib.adapter.select(ib.address))
+		if (!this.ib.adapter.select(this.ib.address)) {
 			throw new OneWireIOException("Device select failed");
+		}
 
 		// do the read status sequence
-		ib.adapter.putByte(READ_STATUS_COMMAND);
+		this.ib.adapter.putByte(READ_STATUS_COMMAND);
 
 		// validation key
-		ib.adapter.putByte(0);
+		this.ib.adapter.putByte(0);
 
-		return (byte) ib.adapter.getByte();
+		return (byte) this.ib.adapter.getByte();
 	}
 }
diff --git a/io.openems.edge.bridge.onewire/src/com/dalsemi/onewire/container/MemoryBankEE.java b/io.openems.edge.bridge.onewire/src/com/dalsemi/onewire/container/MemoryBankEE.java
index fdae0004099..514a938d497 100644
--- a/io.openems.edge.bridge.onewire/src/com/dalsemi/onewire/container/MemoryBankEE.java
+++ b/io.openems.edge.bridge.onewire/src/com/dalsemi/onewire/container/MemoryBankEE.java
@@ -107,19 +107,20 @@ public MemoryBankEE(OneWireContainer ibutton) {
 		synchronized (this) {
 
 			// keep reference to ibutton where memory bank is
-			ib = ibutton;
+			this.ib = ibutton;
 
 			// create the ffblock (used for faster 0xFF fills)
-			ffBlock = new byte[50];
+			this.ffBlock = new byte[50];
 
-			for (int i = 0; i < 50; i++)
-				ffBlock[i] = (byte) 0xFF;
+			for (var i = 0; i < 50; i++) {
+				this.ffBlock[i] = (byte) 0xFF;
+			}
 
 			// defaults
-			writeVerification = true;
+			this.writeVerification = true;
 
 			// indicate speed has not been set
-			doSetSpeed = true;
+			this.doSetSpeed = true;
 		}
 	}
 
@@ -132,6 +133,7 @@ public MemoryBankEE(OneWireContainer ibutton) {
 	 *
 	 * @return String containing the memory bank description
 	 */
+	@Override
 	public String getBankDescription() {
 		return "Main Memory";
 	}
@@ -143,6 +145,7 @@ public String getBankDescription() {
 	 *
 	 * @return 'true' if current memory bank is general purpose
 	 */
+	@Override
 	public boolean isGeneralPurposeMemory() {
 		return true;
 	}
@@ -152,6 +155,7 @@ public boolean isGeneralPurposeMemory() {
 	 *
 	 * @return 'true' if current memory bank is read/write
 	 */
+	@Override
 	public boolean isReadWrite() {
 		return true;
 	}
@@ -162,6 +166,7 @@ public boolean isReadWrite() {
 	 *
 	 * @return 'true' if current memory bank can only be written once
 	 */
+	@Override
 	public boolean isWriteOnce() {
 		return false;
 	}
@@ -171,6 +176,7 @@ public boolean isWriteOnce() {
 	 *
 	 * @return 'true' if current memory bank can only be read
 	 */
+	@Override
 	public boolean isReadOnly() {
 		return false;
 	}
@@ -181,6 +187,7 @@ public boolean isReadOnly() {
 	 *
 	 * @return 'true' if current memory bank non volatile.
 	 */
+	@Override
 	public boolean isNonVolatile() {
 		return true;
 	}
@@ -192,6 +199,7 @@ public boolean isNonVolatile() {
 	 * @return 'true' if writing to the current memory bank pages requires a
 	 *         'ProgramPulse'.
 	 */
+	@Override
 	public boolean needsProgramPulse() {
 		return false;
 	}
@@ -203,6 +211,7 @@ public boolean needsProgramPulse() {
 	 * @return 'true' if writing to the current memory bank pages requires
 	 *         'PowerDelivery'.
 	 */
+	@Override
 	public boolean needsPowerDelivery() {
 		return true;
 	}
@@ -213,6 +222,7 @@ public boolean needsPowerDelivery() {
 	 *
 	 * @return physical starting address of this logical bank.
 	 */
+	@Override
 	public int getStartPhysicalAddress() {
 		return 0;
 	}
@@ -222,6 +232,7 @@ public int getStartPhysicalAddress() {
 	 *
 	 * @return memory bank size in bytes.
 	 */
+	@Override
 	public int getSize() {
 		return PAGE_LENGTH;
 	}
@@ -232,8 +243,9 @@ public int getSize() {
 	 * @param doReadVerf true (default) verify write in 'write' false, don't verify
 	 *                   write (used on Write-Once bit manipulation)
 	 */
+	@Override
 	public void setWriteVerification(boolean doReadVerf) {
-		writeVerification = doReadVerf;
+		this.writeVerification = doReadVerf;
 	}
 
 	/**
@@ -241,6 +253,7 @@ public void setWriteVerification(boolean doReadVerf) {
 	 *
 	 * @return number of pages in current memory bank
 	 */
+	@Override
 	public int getNumberPages() {
 		return 1;
 	}
@@ -250,6 +263,7 @@ public int getNumberPages() {
 	 *
 	 * @return page length in bytes in current memory bank
 	 */
+	@Override
 	public int getPageLength() {
 		return PAGE_LENGTH;
 	}
@@ -257,11 +271,12 @@ public int getPageLength() {
 	/**
 	 * Query to get Maximum data page length in bytes for a packet read or written
 	 * in the current memory bank. See the 'ReadPagePacket()' and
-	 * 'WritePagePacket()' methods. This method is only useful if the current
-	 * memory bank is general purpose memory.
+	 * 'WritePagePacket()' methods. This method is only useful if the current memory
+	 * bank is general purpose memory.
 	 *
 	 * @return max packet page length in bytes in current memory bank
 	 */
+	@Override
 	public int getMaxPacketDataLength() {
 		return PAGE_LENGTH - 3;
 	}
@@ -273,6 +288,7 @@ public int getMaxPacketDataLength() {
 	 *
 	 * @return 'true' if current memory bank can be read with self generated CRC.
 	 */
+	@Override
 	public boolean hasPageAutoCRC() {
 		return false;
 	}
@@ -294,6 +310,7 @@ public boolean hasPageAutoCRC() {
 	 * @see #readPagePacket(int,boolean,byte[],int,byte[]) readPagePacket(extra)
 	 * @since 1-Wire API 0.01
 	 */
+	@Override
 	public boolean hasExtraInfo() {
 		return false;
 	}
@@ -305,6 +322,7 @@ public boolean hasExtraInfo() {
 	 * @return number of bytes in Extra Information read when reading pages in the
 	 *         current memory bank.
 	 */
+	@Override
 	public int getExtraInfoLength() {
 		return 0;
 	}
@@ -316,6 +334,7 @@ public int getExtraInfoLength() {
 	 *
 	 * @return string describing extra information.
 	 */
+	@Override
 	public String getExtraInfoDescription() {
 		return null;
 	}
@@ -346,25 +365,28 @@ public String getExtraInfoDescription() {
 	 * @throws OneWireIOException
 	 * @throws OneWireException
 	 */
+	@Override
 	public void read(int startAddr, boolean readContinue, byte[] readBuf, int offset, int len)
 			throws OneWireIOException, OneWireException {
 		int i, cnt = 0;
-		byte[] raw_buf = new byte[2];
+		var raw_buf = new byte[2];
 
 		// attempt to put device at max desired speed
-		if (!readContinue)
-			checkSpeed();
+		if (!readContinue) {
+			this.checkSpeed();
+		}
 
 		// check if read exceeds memory
-		if ((startAddr + len) > PAGE_LENGTH)
+		if (startAddr + len > PAGE_LENGTH) {
 			throw new OneWireException("Read exceeds memory bank end");
+		}
 
 		// loop until get a non-0xFF value, or max 6 reads
 		do {
 
 			// select the device
-			if (!ib.adapter.select(ib.address)) {
-				forceVerify();
+			if (!this.ib.adapter.select(this.ib.address)) {
+				this.forceVerify();
 
 				throw new OneWireIOException("Device select failed");
 			}
@@ -374,27 +396,28 @@ public void read(int startAddr, boolean readContinue, byte[] readBuf, int offset
 			raw_buf[1] = (byte) (startAddr & 0xFF);
 
 			// do the first block for command, address
-			ib.adapter.dataBlock(raw_buf, 0, 2);
+			this.ib.adapter.dataBlock(raw_buf, 0, 2);
 
 			// pre-fill readBuf with 0xFF
-			System.arraycopy(ffBlock, 0, readBuf, offset, len);
+			System.arraycopy(this.ffBlock, 0, readBuf, offset, len);
 
 			// send the block
-			ib.adapter.dataBlock(readBuf, offset, len);
+			this.ib.adapter.dataBlock(readBuf, offset, len);
 
 			// see if result is non-0xFF
-			for (i = 0; i < len; i++)
-				if (readBuf[offset + i] != (byte) (0xFF))
+			for (i = 0; i < len; i++) {
+				if (readBuf[offset + i] != (byte) 0xFF) {
 					return;
+				}
+			}
 
 			try {
 				Thread.sleep(10);
 			} catch (InterruptedException e) {
 			}
-			;
 
-			if (!ib.isPresent()) {
-				forceVerify();
+			if (!this.ib.isPresent()) {
+				this.forceVerify();
 
 				throw new OneWireIOException("Device not present on 1-Wire");
 			}
@@ -423,55 +446,61 @@ public void read(int startAddr, boolean readContinue, byte[] readBuf, int offset
 	 * @throws OneWireIOException
 	 * @throws OneWireException
 	 */
+	@Override
 	public void write(int startAddr, byte[] writeBuf, int offset, int len) throws OneWireIOException, OneWireException {
 		int i;
 
 		// return if nothing to do
-		if (len == 0)
+		if (len == 0) {
 			return;
+		}
 
 		// check if power delivery is available
-		if (!ib.adapter.canDeliverPower())
+		if (!this.ib.adapter.canDeliverPower()) {
 			throw new OneWireException("Power delivery required but not available");
+		}
 
 		// attempt to put device at max desired speed
-		checkSpeed();
+		this.checkSpeed();
 
 		// check if write exceeds memory
-		if ((startAddr + len) > PAGE_LENGTH)
+		if (startAddr + len > PAGE_LENGTH) {
 			throw new OneWireException("Write exceeds memory bank end");
+		}
 
 		// write the page of data to scratchpad
-		writeScratchpad(startAddr, writeBuf, offset, len);
+		this.writeScratchpad(startAddr, writeBuf, offset, len);
 
 		// read to verify ok
-		byte[] raw_buf = new byte[PAGE_LENGTH];
+		var raw_buf = new byte[PAGE_LENGTH];
 
-		readScratchpad(raw_buf, startAddr, 0, PAGE_LENGTH);
+		this.readScratchpad(raw_buf, startAddr, 0, PAGE_LENGTH);
 
 		// check to see if the same
-		for (i = 0; i < len; i++)
+		for (i = 0; i < len; i++) {
 			if (raw_buf[i] != writeBuf[i + offset]) {
-				forceVerify();
+				this.forceVerify();
 
 				throw new OneWireIOException("Read back scratchpad verify had incorrect data");
 			}
+		}
 
 		// do the copy
-		copyScratchpad();
+		this.copyScratchpad();
 
 		// check on write verification
-		if (writeVerification) {
+		if (this.writeVerification) {
 
 			// read back to verify
-			read(startAddr, false, raw_buf, 0, len);
+			this.read(startAddr, false, raw_buf, 0, len);
 
-			for (i = 0; i < len; i++)
+			for (i = 0; i < len; i++) {
 				if (raw_buf[i] != writeBuf[i + offset]) {
-					forceVerify();
+					this.forceVerify();
 
 					throw new OneWireIOException("Read back verify had incorrect data");
 				}
+			}
 		}
 	}
 
@@ -500,14 +529,16 @@ public void write(int startAddr, byte[] writeBuf, int offset, int len) throws On
 	 * @throws OneWireIOException
 	 * @throws OneWireException
 	 */
+	@Override
 	public void readPage(int page, boolean readContinue, byte[] readBuf, int offset)
 			throws OneWireIOException, OneWireException {
 
 		// check if read exceeds memory
-		if (page != 0)
+		if (page != 0) {
 			throw new OneWireException("Page read exceeds memory bank end");
+		}
 
-		read(0, readContinue, readBuf, offset, PAGE_LENGTH);
+		this.read(0, readContinue, readBuf, offset, PAGE_LENGTH);
 	}
 
 	/**
@@ -533,6 +564,7 @@ public void readPage(int page, boolean readContinue, byte[] readBuf, int offset)
 	 * @throws OneWireIOException
 	 * @throws OneWireException
 	 */
+	@Override
 	public void readPage(int page, boolean readContinue, byte[] readBuf, int offset, byte[] extraInfo)
 			throws OneWireIOException, OneWireException {
 
@@ -568,19 +600,20 @@ public void readPage(int page, boolean readContinue, byte[] readBuf, int offset,
 	 * @throws OneWireIOException
 	 * @throws OneWireException
 	 */
+	@Override
 	public int readPagePacket(int page, boolean readContinue, byte[] readBuf, int offset)
 			throws OneWireIOException, OneWireException {
-		byte[] raw_buf = new byte[PAGE_LENGTH];
+		var raw_buf = new byte[PAGE_LENGTH];
 
 		// attempt to put device at speed
-		checkSpeed();
+		this.checkSpeed();
 
 		// read the scratchpad, discard extra information
-		readPage(page, readContinue, raw_buf, 0);
+		this.readPage(page, readContinue, raw_buf, 0);
 
 		// check if length is realistic
-		if (raw_buf[0] > (PAGE_LENGTH - 3)) {
-			forceVerify();
+		if (raw_buf[0] > PAGE_LENGTH - 3) {
+			this.forceVerify();
 
 			throw new OneWireIOException("Invalid length in packet");
 		}
@@ -593,11 +626,10 @@ public int readPagePacket(int page, boolean readContinue, byte[] readBuf, int of
 
 			// return the length
 			return raw_buf[0];
-		} else {
-			forceVerify();
-
-			throw new OneWireIOException("Invalid CRC16 in packet read");
 		}
+		this.forceVerify();
+
+		throw new OneWireIOException("Invalid CRC16 in packet read");
 	}
 
 	/**
@@ -622,6 +654,7 @@ public int readPagePacket(int page, boolean readContinue, byte[] readBuf, int of
 	 * @throws OneWireIOException
 	 * @throws OneWireException
 	 */
+	@Override
 	public int readPagePacket(int page, boolean readContinue, byte[] readBuf, int offset, byte[] extraInfo)
 			throws OneWireIOException, OneWireException {
 
@@ -641,27 +674,29 @@ public int readPagePacket(int page, boolean readContinue, byte[] readBuf, int of
 	 * @throws OneWireIOException
 	 * @throws OneWireException
 	 */
+	@Override
 	public void writePagePacket(int page, byte[] writeBuf, int offset, int len)
 			throws OneWireIOException, OneWireException {
 
 		// make sure length does not exceed max
-		if (len > (PAGE_LENGTH - 3))
+		if (len > PAGE_LENGTH - 3) {
 			throw new OneWireIOException("Length of packet requested exceeds page size");
+		}
 
 		// construct the packet to write
-		byte[] raw_buf = new byte[len + 3];
+		var raw_buf = new byte[len + 3];
 
 		raw_buf[0] = (byte) len;
 
 		System.arraycopy(writeBuf, offset, raw_buf, 1, len);
 
-		int crc = CRC16.compute(raw_buf, 0, len + 1, page);
+		var crc = CRC16.compute(raw_buf, 0, len + 1, page);
 
 		raw_buf[len + 1] = (byte) (~crc & 0xFF);
-		raw_buf[len + 2] = (byte) (((~crc & 0xFFFF) >>> 8) & 0xFF);
+		raw_buf[len + 2] = (byte) ((~crc & 0xFFFF) >>> 8 & 0xFF);
 
 		// write the packet, return result
-		write(page * PAGE_LENGTH, raw_buf, 0, len + 3);
+		this.write(page * PAGE_LENGTH, raw_buf, 0, len + 3);
 	}
 
 	/**
@@ -680,6 +715,7 @@ public void writePagePacket(int page, byte[] writeBuf, int offset, int len)
 	 * @throws OneWireIOException
 	 * @throws OneWireException
 	 */
+	@Override
 	public void readPageCRC(int page, boolean readContinue, byte[] readBuf, int offset)
 			throws OneWireIOException, OneWireException {
 
@@ -706,6 +742,7 @@ public void readPageCRC(int page, boolean readContinue, byte[] readBuf, int offs
 	 * @throws OneWireIOException
 	 * @throws OneWireException
 	 */
+	@Override
 	public void readPageCRC(int page, boolean readContinue, byte[] readBuf, int offset, byte[] extraInfo)
 			throws OneWireIOException, OneWireException {
 
@@ -734,26 +771,26 @@ public void readPageCRC(int page, boolean readContinue, byte[] readBuf, int offs
 	protected void readScratchpad(byte[] readBuf, int startAddr, int offset, int len)
 			throws OneWireIOException, OneWireException {
 		// select the device
-		if (!ib.adapter.select(ib.address)) {
-			forceVerify();
+		if (!this.ib.adapter.select(this.ib.address)) {
+			this.forceVerify();
 
 			throw new OneWireIOException("Device select failed");
 		}
 
 		// build first block
-		byte[] raw_buf = new byte[2];
+		var raw_buf = new byte[2];
 
 		raw_buf[0] = READ_SCRATCHPAD_COMMAND;
 		raw_buf[1] = (byte) startAddr;
 
 		// do the first block for address
-		ib.adapter.dataBlock(raw_buf, 0, 2);
+		this.ib.adapter.dataBlock(raw_buf, 0, 2);
 
 		// build the next block
-		System.arraycopy(ffBlock, 0, readBuf, offset, len);
+		System.arraycopy(this.ffBlock, 0, readBuf, offset, len);
 
 		// send second block to read data, return result
-		ib.adapter.dataBlock(readBuf, offset, len);
+		this.ib.adapter.dataBlock(readBuf, offset, len);
 	}
 
 	/**
@@ -771,14 +808,14 @@ protected void writeScratchpad(int startAddr, byte[] writeBuf, int offset, int l
 			throws OneWireIOException, OneWireException {
 
 		// select the device
-		if (!ib.adapter.select(ib.address)) {
-			forceVerify();
+		if (!this.ib.adapter.select(this.ib.address)) {
+			this.forceVerify();
 
 			throw new OneWireIOException("Device select failed");
 		}
 
 		// build block to send
-		byte[] raw_buf = new byte[len + 2];
+		var raw_buf = new byte[len + 2];
 
 		raw_buf[0] = WRITE_SCRATCHPAD_COMMAND;
 		raw_buf[1] = (byte) (startAddr & 0xFF);
@@ -786,7 +823,7 @@ protected void writeScratchpad(int startAddr, byte[] writeBuf, int offset, int l
 		System.arraycopy(writeBuf, offset, raw_buf, 2, len);
 
 		// send block, return result
-		ib.adapter.dataBlock(raw_buf, 0, len + 2);
+		this.ib.adapter.dataBlock(raw_buf, 0, len + 2);
 	}
 
 	/**
@@ -798,8 +835,8 @@ protected void writeScratchpad(int startAddr, byte[] writeBuf, int offset, int l
 	protected void copyScratchpad() throws OneWireIOException, OneWireException {
 
 		// select the device
-		if (!ib.adapter.select(ib.address)) {
-			forceVerify();
+		if (!this.ib.adapter.select(this.ib.address)) {
+			this.forceVerify();
 
 			throw new OneWireIOException("Device select failed");
 		}
@@ -807,23 +844,22 @@ protected void copyScratchpad() throws OneWireIOException, OneWireException {
 		try {
 
 			// copy scratch
-			ib.adapter.putByte(COPY_SCRATCHPAD_COMMAND);
+			this.ib.adapter.putByte(COPY_SCRATCHPAD_COMMAND);
 
 			// setup strong pullup
-			ib.adapter.setPowerDuration(DSPortAdapter.DELIVERY_INFINITE);
-			ib.adapter.startPowerDelivery(DSPortAdapter.CONDITION_AFTER_BYTE);
+			this.ib.adapter.setPowerDuration(DSPortAdapter.DELIVERY_INFINITE);
+			this.ib.adapter.startPowerDelivery(DSPortAdapter.CONDITION_AFTER_BYTE);
 
 			// send validation and start strong power delivery
-			ib.adapter.putByte((byte) 0xA5);
+			this.ib.adapter.putByte((byte) 0xA5);
 
 			// delay for 10ms
 			Thread.sleep(10);
 
 			// disable power
-			ib.adapter.setPowerNormal();
+			this.ib.adapter.setPowerNormal();
 		} catch (InterruptedException e) {
 		}
-		;
 	}
 
 	// --------
@@ -841,13 +877,13 @@ public void checkSpeed() throws OneWireIOException, OneWireException {
 		synchronized (this) {
 
 			// only check the speed
-			if (doSetSpeed) {
+			if (this.doSetSpeed) {
 
 				// attempt to set the correct speed and verify device present
-				ib.doSpeed();
+				this.ib.doSpeed();
 
 				// no exceptions so clear flag
-				doSetSpeed = false;
+				this.doSetSpeed = false;
 			}
 		}
 	}
@@ -858,7 +894,7 @@ public void checkSpeed() throws OneWireIOException, OneWireException {
 	 */
 	public void forceVerify() {
 		synchronized (this) {
-			doSetSpeed = true;
+			this.doSetSpeed = true;
 		}
 	}
 }
diff --git a/io.openems.edge.bridge.onewire/src/com/dalsemi/onewire/container/MemoryBankEEPROM.java b/io.openems.edge.bridge.onewire/src/com/dalsemi/onewire/container/MemoryBankEEPROM.java
index 0339f9de9a4..6d3554f27e9 100644
--- a/io.openems.edge.bridge.onewire/src/com/dalsemi/onewire/container/MemoryBankEEPROM.java
+++ b/io.openems.edge.bridge.onewire/src/com/dalsemi/onewire/container/MemoryBankEEPROM.java
@@ -218,41 +218,42 @@ class MemoryBankEEPROM implements OTPMemoryBank {
 	public MemoryBankEEPROM(OneWireContainer ibutton, ScratchPad scratch) {
 
 		// keep reference to ibutton where memory bank is
-		ib = ibutton;
+		this.ib = ibutton;
 
 		// keep reference to scratchPad bank
-		sp = scratch;
+		this.sp = scratch;
 
 		// get references to MemoryBanks used in OTP operations, assume locking
-		mbLock = null;
-		lockPage = true;
+		this.mbLock = null;
+		this.lockPage = true;
 
 		// initialize attributes of this memory bank - DEFAULT: Main memory DS2431
-		generalPurposeMemory = true;
-		bankDescription = "Main memory";
-		numberPages = 4;
-		size = 128;
-		pageLength = 32;
-		maxPacketDataLength = 29;
-		readWrite = true;
-		writeOnce = false;
-		readOnly = false;
-		nonVolatile = true;
-		pageAutoCRC = false;
-		lockPage = true;
-		programPulse = false;
-		powerDelivery = true;
-		extraInfo = false;
-		extraInfoLength = 0;
-		extraInfoDescription = null;
-		writeVerification = false;
-		startPhysicalAddress = 0;
-		doSetSpeed = true;
-		scratchPadSize = 8;
+		this.generalPurposeMemory = true;
+		this.bankDescription = "Main memory";
+		this.numberPages = 4;
+		this.size = 128;
+		this.pageLength = 32;
+		this.maxPacketDataLength = 29;
+		this.readWrite = true;
+		this.writeOnce = false;
+		this.readOnly = false;
+		this.nonVolatile = true;
+		this.pageAutoCRC = false;
+		this.lockPage = true;
+		this.programPulse = false;
+		this.powerDelivery = true;
+		this.extraInfo = false;
+		this.extraInfoLength = 0;
+		this.extraInfoDescription = null;
+		this.writeVerification = false;
+		this.startPhysicalAddress = 0;
+		this.doSetSpeed = true;
+		this.scratchPadSize = 8;
 
 		// create the ffblock (used for faster 0xFF fills)
-		for (int i = 0; i < 500; i++)
-			ffBlock[i] = (byte) 0xFF;
+		for (var i = 0; i < 500; i++) {
+			this.ffBlock[i] = (byte) 0xFF;
+		}
 	}
 
 	// --------
@@ -264,8 +265,9 @@ public MemoryBankEEPROM(OneWireContainer ibutton, ScratchPad scratch) {
 	 *
 	 * @return String containing the memory bank description
 	 */
+	@Override
 	public String getBankDescription() {
-		return bankDescription;
+		return this.bankDescription;
 	}
 
 	/**
@@ -275,8 +277,9 @@ public String getBankDescription() {
 	 *
 	 * @return 'true' if current memory bank is general purpose
 	 */
+	@Override
 	public boolean isGeneralPurposeMemory() {
-		return generalPurposeMemory;
+		return this.generalPurposeMemory;
 	}
 
 	/**
@@ -284,8 +287,9 @@ public boolean isGeneralPurposeMemory() {
 	 *
 	 * @return 'true' if current memory bank is read/write
 	 */
+	@Override
 	public boolean isReadWrite() {
-		return readWrite;
+		return this.readWrite;
 	}
 
 	/**
@@ -294,8 +298,9 @@ public boolean isReadWrite() {
 	 *
 	 * @return 'true' if current memory bank can only be written once
 	 */
+	@Override
 	public boolean isWriteOnce() {
-		return writeOnce;
+		return this.writeOnce;
 	}
 
 	/**
@@ -303,8 +308,9 @@ public boolean isWriteOnce() {
 	 *
 	 * @return 'true' if current memory bank can only be read
 	 */
+	@Override
 	public boolean isReadOnly() {
-		return readOnly;
+		return this.readOnly;
 	}
 
 	/**
@@ -313,8 +319,9 @@ public boolean isReadOnly() {
 	 *
 	 * @return 'true' if current memory bank non volatile.
 	 */
+	@Override
 	public boolean isNonVolatile() {
-		return nonVolatile;
+		return this.nonVolatile;
 	}
 
 	/**
@@ -324,8 +331,9 @@ public boolean isNonVolatile() {
 	 * @return 'true' if writing to the current memory bank pages requires a
 	 *         'ProgramPulse'.
 	 */
+	@Override
 	public boolean needsProgramPulse() {
-		return programPulse;
+		return this.programPulse;
 	}
 
 	/**
@@ -335,8 +343,9 @@ public boolean needsProgramPulse() {
 	 * @return 'true' if writing to the current memory bank pages requires
 	 *         'PowerDelivery'.
 	 */
+	@Override
 	public boolean needsPowerDelivery() {
-		return powerDelivery;
+		return this.powerDelivery;
 	}
 
 	/**
@@ -345,8 +354,9 @@ public boolean needsPowerDelivery() {
 	 *
 	 * @return physical starting address of this logical bank.
 	 */
+	@Override
 	public int getStartPhysicalAddress() {
-		return startPhysicalAddress;
+		return this.startPhysicalAddress;
 	}
 
 	/**
@@ -354,8 +364,9 @@ public int getStartPhysicalAddress() {
 	 *
 	 * @return memory bank size in bytes.
 	 */
+	@Override
 	public int getSize() {
-		return size;
+		return this.size;
 	}
 
 	// --------
@@ -367,8 +378,9 @@ public int getSize() {
 	 *
 	 * @return number of pages in current memory bank
 	 */
+	@Override
 	public int getNumberPages() {
-		return numberPages;
+		return this.numberPages;
 	}
 
 	/**
@@ -376,20 +388,22 @@ public int getNumberPages() {
 	 *
 	 * @return page length in bytes in current memory bank
 	 */
+	@Override
 	public int getPageLength() {
-		return pageLength;
+		return this.pageLength;
 	}
 
 	/**
 	 * Query to get Maximum data page length in bytes for a packet read or written
 	 * in the current memory bank. See the 'ReadPagePacket()' and
-	 * 'WritePagePacket()' methods. This method is only useful if the current
-	 * memory bank is general purpose memory.
+	 * 'WritePagePacket()' methods. This method is only useful if the current memory
+	 * bank is general purpose memory.
 	 *
 	 * @return max packet page length in bytes in current memory bank
 	 */
+	@Override
 	public int getMaxPacketDataLength() {
-		return maxPacketDataLength;
+		return this.maxPacketDataLength;
 	}
 
 	/**
@@ -399,8 +413,9 @@ public int getMaxPacketDataLength() {
 	 *
 	 * @return 'true' if current memory bank can be read with self generated CRC.
 	 */
+	@Override
 	public boolean hasPageAutoCRC() {
-		return pageAutoCRC;
+		return this.pageAutoCRC;
 	}
 
 	/**
@@ -420,8 +435,9 @@ public boolean hasPageAutoCRC() {
 	 * @see #readPagePacket(int,boolean,byte[],int,byte[]) readPagePacket(extra)
 	 * @since 1-Wire API 0.01
 	 */
+	@Override
 	public boolean hasExtraInfo() {
-		return extraInfo;
+		return this.extraInfo;
 	}
 
 	/**
@@ -431,8 +447,9 @@ public boolean hasExtraInfo() {
 	 * @return number of bytes in Extra Information read when reading pages in the
 	 *         current memory bank.
 	 */
+	@Override
 	public int getExtraInfoLength() {
-		return extraInfoLength;
+		return this.extraInfoLength;
 	}
 
 	/**
@@ -442,8 +459,9 @@ public int getExtraInfoLength() {
 	 *
 	 * @return string describing extra information.
 	 */
+	@Override
 	public String getExtraInfoDescription() {
-		return extraInfoDescription;
+		return this.extraInfoDescription;
 	}
 
 	/**
@@ -452,8 +470,9 @@ public String getExtraInfoDescription() {
 	 * @param doReadVerf true (default) verify write in 'write' false, don't verify
 	 *                   write (used on Write-Once bit manipulation)
 	 */
+	@Override
 	public void setWriteVerification(boolean doReadVerf) {
-		writeVerification = doReadVerf;
+		this.writeVerification = doReadVerf;
 	}
 
 	// --------
@@ -466,6 +485,7 @@ public void setWriteVerification(boolean doReadVerf) {
 	 *
 	 * @return 'true' if current memory bank pages can be redirected to a new page.
 	 */
+	@Override
 	public boolean canRedirectPage() {
 		return false;
 	}
@@ -476,8 +496,9 @@ public boolean canRedirectPage() {
 	 *
 	 * @return 'true' if current memory bank pages can be redirected to a new page.
 	 */
+	@Override
 	public boolean canLockPage() {
-		return lockPage;
+		return this.lockPage;
 	}
 
 	/**
@@ -487,6 +508,7 @@ public boolean canLockPage() {
 	 * @return 'true' if current memory bank pages can be locked from being
 	 *         redirected to a new page.
 	 */
+	@Override
 	public boolean canLockRedirectPage() {
 		return false;
 	}
@@ -517,40 +539,43 @@ public boolean canLockRedirectPage() {
 	 * @throws OneWireIOException
 	 * @throws OneWireException
 	 */
+	@Override
 	public void read(int startAddr, boolean readContinue, byte[] readBuf, int offset, int len)
 			throws OneWireIOException, OneWireException {
-		byte[] buff = new byte[150];
+		var buff = new byte[150];
 
-		System.arraycopy(ffBlock, 0, buff, 0, 150);
+		System.arraycopy(this.ffBlock, 0, buff, 0, 150);
 
 		// check if read exceeds memory
-		if ((startAddr + len) > (pageLength * numberPages))
+		if (startAddr + len > this.pageLength * this.numberPages) {
 			throw new OneWireException("Read exceeds memory bank end");
+		}
 
-		if (len < 0)
+		if (len < 0) {
 			throw new OneWireException("Invalid length");
+		}
 
 		// attempt to put device at max desired speed
 		if (!readContinue) {
-			sp.checkSpeed();
+			this.sp.checkSpeed();
 
 			// select the device
-			if (ib.adapter.select(ib.address)) {
-				buff[0] = READ_MEMORY_COMMAND;
+			if (!this.ib.adapter.select(this.ib.address)) {
+				throw new OneWireIOException("Device select failed");
+			}
+			buff[0] = READ_MEMORY_COMMAND;
 
-				// address 1
-				buff[1] = (byte) ((startAddr + startPhysicalAddress) & 0xFF);
-				// address 2
-				buff[2] = (byte) ((((startAddr + startPhysicalAddress) & 0xFFFF) >>> 8) & 0xFF);
+			// address 1
+			buff[1] = (byte) (startAddr + this.startPhysicalAddress & 0xFF);
+			// address 2
+			buff[2] = (byte) ((startAddr + this.startPhysicalAddress & 0xFFFF) >>> 8 & 0xFF);
 
-				ib.adapter.dataBlock(buff, 0, len + 3);
+			this.ib.adapter.dataBlock(buff, 0, len + 3);
 
-				// extract the data
-				System.arraycopy(buff, 3, readBuf, offset, len);
-			} else
-				throw new OneWireIOException("Device select failed");
+			// extract the data
+			System.arraycopy(buff, 3, readBuf, offset, len);
 		} else {
-			ib.adapter.dataBlock(buff, 0, len);
+			this.ib.adapter.dataBlock(buff, 0, len);
 
 			// extract the data
 			System.arraycopy(buff, 0, readBuf, offset, len);
@@ -577,90 +602,95 @@ public void read(int startAddr, boolean readContinue, byte[] readBuf, int offset
 	 * @throws OneWireIOException
 	 * @throws OneWireException
 	 */
+	@Override
 	public void write(int startAddr, byte[] writeBuf, int offset, int len) throws OneWireIOException, OneWireException {
 		int room_left;
 
 		// return if nothing to do
-		if (len == 0)
+		if (len == 0) {
 			return;
+		}
 
 		// attempt to put device at speed
-		sp.checkSpeed();
+		this.sp.checkSpeed();
 
 		// check if write exceeds memory
-		if ((startAddr + len) > size)
+		if (startAddr + len > this.size) {
 			throw new OneWireException("Write exceeds memory bank end");
+		}
 
 		// check if trying to write read only bank
-		if (isReadOnly())
+		if (this.isReadOnly()) {
 			throw new OneWireException("Trying to write read-only memory bank");
+		}
 
 		// loop while still have pages to write
 		int startx = 0, nextx = 0; // (start and next index into writeBuf)
-		byte[] raw_buf = new byte[scratchPadSize];
-		byte[] memory = new byte[size];
+		var raw_buf = new byte[this.scratchPadSize];
+		var memory = new byte[this.size];
 		// byte[] scratchpad = new byte[8];
 		// byte[] es_data = new byte[3];
-		int abs_addr = startAddr + startPhysicalAddress;
-		int pl = scratchPadSize;
+		var abs_addr = startAddr + this.startPhysicalAddress;
+		var pl = this.scratchPadSize;
 
 		// check to see if we need to read memory for the beginning of the block
-		if (scratchPadSize == 8) {
-			if ((startAddr & 0x07) != 0)
-				read((startAddr & 0x00F8), false, memory, (startAddr & 0x00F8), startAddr - (startAddr & 0x00F8) + 1);
-		} else {
-			if ((startAddr & 0x1F) != 0)
-				read((startAddr & 0xFE0), false, memory, (startAddr & 0xFE0), startAddr - (startAddr & 0xFE0) + 1);
+		if (this.scratchPadSize == 8) {
+			if ((startAddr & 0x07) != 0) {
+				this.read(startAddr & 0x00F8, false, memory, startAddr & 0x00F8, startAddr - (startAddr & 0x00F8) + 1);
+			}
+		} else if ((startAddr & 0x1F) != 0) {
+			this.read(startAddr & 0xFE0, false, memory, startAddr & 0xFE0, startAddr - (startAddr & 0xFE0) + 1);
 		}
 
 		// check to see if we need to read memory for the end of the block
-		if (scratchPadSize == 8) {
-			if (((startAddr + len - 1) & 0x07) != 0x07)
-				read((startAddr + len), false, memory, (startAddr + len),
-						((startAddr + len) | 0x07) - (startAddr + len) + 1);
-		} else {
-			if (((startAddr + len - 1) & 0x1F) != 0x1F)
-				read((startAddr + len), false, memory, (startAddr + len),
-						((startAddr + len) | 0x1F) - (startAddr + len) + 1);
+		if (this.scratchPadSize == 8) {
+			if ((startAddr + len - 1 & 0x07) != 0x07) {
+				this.read(startAddr + len, false, memory, startAddr + len,
+						(startAddr + len | 0x07) - (startAddr + len) + 1);
+			}
+		} else if ((startAddr + len - 1 & 0x1F) != 0x1F) {
+			this.read(startAddr + len, false, memory, startAddr + len,
+					(startAddr + len | 0x1F) - (startAddr + len) + 1);
 		}
 
 		do {
 			// calculate room left in current page
-			room_left = pl - ((abs_addr + startx) % pl);
+			room_left = pl - (abs_addr + startx) % pl;
 
 			// check if block left will cross end of page
-			if ((len - startx) > room_left)
+			if (len - startx > room_left) {
 				nextx = startx + room_left;
-			else
+			} else {
 				nextx = len;
+			}
 
-			System.arraycopy(memory, (((startx + startAddr) / scratchPadSize) * scratchPadSize), raw_buf, 0,
-					scratchPadSize);
+			System.arraycopy(memory, (startx + startAddr) / this.scratchPadSize * this.scratchPadSize, raw_buf, 0,
+					this.scratchPadSize);
 
-			if ((nextx - startx) == scratchPadSize) {
-				System.arraycopy(writeBuf, offset + startx, raw_buf, 0, scratchPadSize);
+			if (nextx - startx == this.scratchPadSize) {
+				System.arraycopy(writeBuf, offset + startx, raw_buf, 0, this.scratchPadSize);
+			} else if ((startAddr + nextx) % this.scratchPadSize == 0) {
+				System.arraycopy(writeBuf, offset + startx, raw_buf, (startAddr + startx) % this.scratchPadSize,
+						this.scratchPadSize - (startAddr + startx) % this.scratchPadSize);
 			} else {
-				if (((startAddr + nextx) % scratchPadSize) == 0) {
-					System.arraycopy(writeBuf, offset + startx, raw_buf, ((startAddr + startx) % scratchPadSize),
-							scratchPadSize - ((startAddr + startx) % scratchPadSize));
-				} else {
-					System.arraycopy(writeBuf, offset + startx, raw_buf, ((startAddr + startx) % scratchPadSize),
-							((startAddr + nextx) % scratchPadSize) - ((startAddr + startx) % scratchPadSize));
-				}
+				System.arraycopy(writeBuf, offset + startx, raw_buf, (startAddr + startx) % this.scratchPadSize,
+						(startAddr + nextx) % this.scratchPadSize - (startAddr + startx) % this.scratchPadSize);
 			}
 
 			// write the page of data to scratchpad (always do full scratchpad)
-			sp.writeScratchpad(abs_addr + startx + room_left - scratchPadSize, raw_buf, 0, scratchPadSize);
+			this.sp.writeScratchpad(abs_addr + startx + room_left - this.scratchPadSize, raw_buf, 0,
+					this.scratchPadSize);
 
 			// Copy data from scratchpad into memory
-			sp.copyScratchpad(abs_addr + startx + room_left - scratchPadSize, scratchPadSize);
+			this.sp.copyScratchpad(abs_addr + startx + room_left - this.scratchPadSize, this.scratchPadSize);
 
-			if (startAddr >= pageLength)
-				System.arraycopy(raw_buf, 0, memory, (((startx + startAddr) / scratchPadSize) * scratchPadSize) - 32,
-						scratchPadSize);
-			else
-				System.arraycopy(raw_buf, 0, memory, (((startx + startAddr) / scratchPadSize) * scratchPadSize),
-						scratchPadSize);
+			if (startAddr >= this.pageLength) {
+				System.arraycopy(raw_buf, 0, memory,
+						(startx + startAddr) / this.scratchPadSize * this.scratchPadSize - 32, this.scratchPadSize);
+			} else {
+				System.arraycopy(raw_buf, 0, memory, (startx + startAddr) / this.scratchPadSize * this.scratchPadSize,
+						this.scratchPadSize);
+			}
 
 			// point to next index
 			startx = nextx;
@@ -692,9 +722,10 @@ public void write(int startAddr, byte[] writeBuf, int offset, int len) throws On
 	 * @throws OneWireIOException
 	 * @throws OneWireException
 	 */
+	@Override
 	public void readPage(int page, boolean readContinue, byte[] readBuf, int offset)
 			throws OneWireIOException, OneWireException {
-		read(page * pageLength, readContinue, readBuf, offset, pageLength);
+		this.read(page * this.pageLength, readContinue, readBuf, offset, this.pageLength);
 	}
 
 	/**
@@ -720,6 +751,7 @@ public void readPage(int page, boolean readContinue, byte[] readBuf, int offset)
 	 * @throws OneWireIOException
 	 * @throws OneWireException
 	 */
+	@Override
 	public void readPage(int page, boolean readContinue, byte[] readBuf, int offset, byte[] extraInfo)
 			throws OneWireIOException, OneWireException {
 		throw new OneWireException("Read extra information not supported on this memory bank");
@@ -746,6 +778,7 @@ public void readPage(int page, boolean readContinue, byte[] readBuf, int offset,
 	 * @throws OneWireIOException
 	 * @throws OneWireException
 	 */
+	@Override
 	public int readPagePacket(int page, boolean readContinue, byte[] readBuf, int offset, byte[] extraInfo)
 			throws OneWireIOException, OneWireException {
 		throw new OneWireException("Read extra information not supported on this memory bank");
@@ -771,16 +804,17 @@ public int readPagePacket(int page, boolean readContinue, byte[] readBuf, int of
 	 * @throws OneWireIOException
 	 * @throws OneWireException
 	 */
+	@Override
 	public int readPagePacket(int page, boolean readContinue, byte[] readBuf, int offset)
 			throws OneWireIOException, OneWireException {
-		byte[] raw_buf = new byte[pageLength];
+		var raw_buf = new byte[this.pageLength];
 
 		// read entire page with read page CRC
-		read((page * pageLength), readContinue, raw_buf, 0, pageLength);
+		this.read(page * this.pageLength, readContinue, raw_buf, 0, this.pageLength);
 
 		// check if length is realistic
-		if ((raw_buf[0] & 0x00FF) > maxPacketDataLength) {
-			sp.forceVerify();
+		if ((raw_buf[0] & 0x00FF) > this.maxPacketDataLength) {
+			this.sp.forceVerify();
 
 			throw new OneWireIOException("Invalid length in packet");
 		}
@@ -793,11 +827,10 @@ public int readPagePacket(int page, boolean readContinue, byte[] readBuf, int of
 
 			// return the length
 			return raw_buf[0];
-		} else {
-			sp.forceVerify();
-
-			throw new OneWireIOException("Invalid CRC16 in packet read");
 		}
+		this.sp.forceVerify();
+
+		throw new OneWireIOException("Invalid CRC16 in packet read");
 	}
 
 	/**
@@ -812,31 +845,34 @@ public int readPagePacket(int page, boolean readContinue, byte[] readBuf, int of
 	 * @throws OneWireIOException
 	 * @throws OneWireException
 	 */
+	@Override
 	public void writePagePacket(int page, byte[] writeBuf, int offset, int len)
 			throws OneWireIOException, OneWireException {
 
 		// make sure length does not exceed max
-		if (len > maxPacketDataLength)
+		if (len > this.maxPacketDataLength) {
 			throw new OneWireIOException("Length of packet requested exceeds page size");
+		}
 
 		// see if this bank is general read/write
-		if (!generalPurposeMemory)
+		if (!this.generalPurposeMemory) {
 			throw new OneWireException("Current bank is not general purpose memory");
+		}
 
 		// construct the packet to write
-		byte[] raw_buf = new byte[len + 3];
+		var raw_buf = new byte[len + 3];
 
 		raw_buf[0] = (byte) len;
 
 		System.arraycopy(writeBuf, offset, raw_buf, 1, len);
 
-		int crc = CRC16.compute(raw_buf, 0, len + 1, page);
+		var crc = CRC16.compute(raw_buf, 0, len + 1, page);
 
 		raw_buf[len + 1] = (byte) (~crc & 0xFF);
-		raw_buf[len + 2] = (byte) (((~crc & 0xFFFF) >>> 8) & 0xFF);
+		raw_buf[len + 2] = (byte) ((~crc & 0xFFFF) >>> 8 & 0xFF);
 
 		// write the packet, return result
-		write(page * pageLength, raw_buf, 0, len + 3);
+		this.write(page * this.pageLength, raw_buf, 0, len + 3);
 	}
 
 	/**
@@ -855,6 +891,7 @@ public void writePagePacket(int page, byte[] writeBuf, int offset, int len)
 	 * @throws OneWireIOException
 	 * @throws OneWireException
 	 */
+	@Override
 	public void readPageCRC(int page, boolean readContinue, byte[] readBuf, int offset)
 			throws OneWireIOException, OneWireException {
 		throw new OneWireException("Read page with CRC not supported in this memory bank");
@@ -879,6 +916,7 @@ public void readPageCRC(int page, boolean readContinue, byte[] readBuf, int offs
 	 * @throws OneWireIOException
 	 * @throws OneWireException
 	 */
+	@Override
 	public void readPageCRC(int page, boolean readContinue, byte[] readBuf, int offset, byte[] extraInfo)
 			throws OneWireIOException, OneWireException {
 		throw new OneWireException("Read page with CRC not supported in this memory bank");
@@ -897,16 +935,17 @@ public void readPageCRC(int page, boolean readContinue, byte[] readBuf, int offs
 	 * @throws OneWireIOException
 	 * @throws OneWireException
 	 */
+	@Override
 	public void lockPage(int page) throws OneWireIOException, OneWireException {
-		byte[] wr_byte = new byte[1];
+		var wr_byte = new byte[1];
 
 		wr_byte[0] = LOCKED_FLAG;
 
-		mbLock.write(page, wr_byte, 0, 1);
+		this.mbLock.write(page, wr_byte, 0, 1);
 
 		// read back to verify
-		if (!isPageLocked(page)) {
-			sp.forceVerify();
+		if (!this.isPageLocked(page)) {
+			this.sp.forceVerify();
 
 			throw new OneWireIOException("Read back from write incorrect, could not lock page");
 		}
@@ -922,12 +961,13 @@ public void lockPage(int page) throws OneWireIOException, OneWireException {
 	 * @throws OneWireIOException
 	 * @throws OneWireException
 	 */
+	@Override
 	public boolean isPageLocked(int page) throws OneWireIOException, OneWireException {
-		byte[] rd_byte = new byte[1];
+		var rd_byte = new byte[1];
 
-		mbLock.read(page, false, rd_byte, 0, 1);
+		this.mbLock.read(page, false, rd_byte, 0, 1);
 
-		return (rd_byte[0] == LOCKED_FLAG);
+		return rd_byte[0] == LOCKED_FLAG;
 	}
 
 	/**
@@ -940,6 +980,7 @@ public boolean isPageLocked(int page) throws OneWireIOException, OneWireExceptio
 	 * @throws OneWireIOException
 	 * @throws OneWireException
 	 */
+	@Override
 	public void redirectPage(int page, int newPage) throws OneWireIOException, OneWireException {
 		throw new OneWireException("This memory bank does not support redirection.");
 	}
@@ -965,19 +1006,21 @@ public void redirectPage(int page, int newPage) throws OneWireIOException, OneWi
 	 * @see #redirectPage(int,int) redirectPage
 	 * @since 1-Wire API 0.01
 	 */
+	@Override
 	public int getRedirectedPage(int page) throws OneWireIOException, OneWireException {
 		throw new OneWireException("This memory bank does not support redirection.");
 	}
 
 	/**
-	 * Lock the redirection option for the specified page in the current memory bank.
-	 * Not supported by all devices. See the method 'canLockRedirectPage()'.
+	 * Lock the redirection option for the specified page in the current memory
+	 * bank. Not supported by all devices. See the method 'canLockRedirectPage()'.
 	 *
 	 * @param page number of page to redirect
 	 *
 	 * @throws OneWireIOException
 	 * @throws OneWireException
 	 */
+	@Override
 	public void lockRedirectPage(int page) throws OneWireIOException, OneWireException {
 		throw new OneWireException("This memory bank does not support redirection.");
 	}
@@ -993,6 +1036,7 @@ public void lockRedirectPage(int page) throws OneWireIOException, OneWireExcepti
 	 * @throws OneWireIOException
 	 * @throws OneWireException
 	 */
+	@Override
 	public boolean isRedirectPageLocked(int page) throws OneWireIOException, OneWireException {
 		throw new OneWireException("This memory bank does not support redirection.");
 	}
diff --git a/io.openems.edge.bridge.onewire/src/com/dalsemi/onewire/container/MemoryBankEEPROMblock.java b/io.openems.edge.bridge.onewire/src/com/dalsemi/onewire/container/MemoryBankEEPROMblock.java
index d8b3cff3cbb..287746d9afc 100644
--- a/io.openems.edge.bridge.onewire/src/com/dalsemi/onewire/container/MemoryBankEEPROMblock.java
+++ b/io.openems.edge.bridge.onewire/src/com/dalsemi/onewire/container/MemoryBankEEPROMblock.java
@@ -135,29 +135,32 @@ class MemoryBankEEPROMblock implements OTPMemoryBank {
 	public MemoryBankEEPROMblock(OneWireContainer30 ibutton) {
 
 		// keep reference to ibutton where memory bank is
-		ib = ibutton;
+		this.ib = ibutton;
 
 		// initialize attributes of this memory bank - DEFAULT: Main memory DS1985 w/o
 		// lock stuff
-		numberPages = 2;
-		size = 32;
-		pageLength = 16;
-		maxPacketDataLength = 13;
+		this.numberPages = 2;
+		this.size = 32;
+		this.pageLength = 16;
+		this.maxPacketDataLength = 13;
 
 		try {
-			lockPage0 = ib.getFlag(OneWireContainer30.EEPROM_REGISTER, OneWireContainer30.EEPROM_BLOCK_0_LOCK_FLAG);
-			lockPage1 = ib.getFlag(OneWireContainer30.EEPROM_REGISTER, OneWireContainer30.EEPROM_BLOCK_1_LOCK_FLAG);
+			this.lockPage0 = this.ib.getFlag(OneWireContainer30.EEPROM_REGISTER,
+					OneWireContainer30.EEPROM_BLOCK_0_LOCK_FLAG);
+			this.lockPage1 = this.ib.getFlag(OneWireContainer30.EEPROM_REGISTER,
+					OneWireContainer30.EEPROM_BLOCK_1_LOCK_FLAG);
 		} catch (Exception ioe) {
 			ioe.printStackTrace();
 		}
 
-		writeVerification = false;
-		startPhysicalAddress = 32;
-		doSetSpeed = true;
+		this.writeVerification = false;
+		this.startPhysicalAddress = 32;
+		this.doSetSpeed = true;
 
 		// create the ffblock (used for faster 0xFF fills)
-		for (int i = 0; i < 32; i++)
-			ffBlock[i] = (byte) 0xFF;
+		for (var i = 0; i < 32; i++) {
+			this.ffBlock[i] = (byte) 0xFF;
+		}
 	}
 
 	// --------
@@ -169,6 +172,7 @@ public MemoryBankEEPROMblock(OneWireContainer30 ibutton) {
 	 *
 	 * @return String containing the memory bank description
 	 */
+	@Override
 	public String getBankDescription() {
 		return "EEPROM memory for DS2760";
 	}
@@ -180,6 +184,7 @@ public String getBankDescription() {
 	 *
 	 * @return 'true' if current memory bank is general purpose
 	 */
+	@Override
 	public boolean isGeneralPurposeMemory() {
 		return true;
 	}
@@ -189,11 +194,12 @@ public boolean isGeneralPurposeMemory() {
 	 *
 	 * @return 'true' if current memory bank is read/write
 	 */
+	@Override
 	public boolean isReadWrite() {
-		if (lockPage0 && lockPage1)
+		if (this.lockPage0 && this.lockPage1) {
 			return false;
-		else
-			return true;
+		}
+		return true;
 	}
 
 	/**
@@ -202,6 +208,7 @@ public boolean isReadWrite() {
 	 *
 	 * @return 'true' if current memory bank can only be written once
 	 */
+	@Override
 	public boolean isWriteOnce() {
 		return false;
 	}
@@ -211,11 +218,12 @@ public boolean isWriteOnce() {
 	 *
 	 * @return 'true' if current memory bank can only be read
 	 */
+	@Override
 	public boolean isReadOnly() {
-		if (lockPage0 && lockPage1)
+		if (this.lockPage0 && this.lockPage1) {
 			return true;
-		else
-			return false;
+		}
+		return false;
 	}
 
 	/**
@@ -224,6 +232,7 @@ public boolean isReadOnly() {
 	 *
 	 * @return 'true' if current memory bank non volatile.
 	 */
+	@Override
 	public boolean isNonVolatile() {
 		return true;
 	}
@@ -235,6 +244,7 @@ public boolean isNonVolatile() {
 	 * @return 'true' if writing to the current memory bank pages requires a
 	 *         'ProgramPulse'.
 	 */
+	@Override
 	public boolean needsProgramPulse() {
 		return false;
 	}
@@ -246,6 +256,7 @@ public boolean needsProgramPulse() {
 	 * @return 'true' if writing to the current memory bank pages requires
 	 *         'PowerDelivery'.
 	 */
+	@Override
 	public boolean needsPowerDelivery() {
 		return false;
 	}
@@ -256,8 +267,9 @@ public boolean needsPowerDelivery() {
 	 *
 	 * @return physical starting address of this logical bank.
 	 */
+	@Override
 	public int getStartPhysicalAddress() {
-		return startPhysicalAddress;
+		return this.startPhysicalAddress;
 	}
 
 	/**
@@ -265,8 +277,9 @@ public int getStartPhysicalAddress() {
 	 *
 	 * @return memory bank size in bytes.
 	 */
+	@Override
 	public int getSize() {
-		return size;
+		return this.size;
 	}
 
 	// --------
@@ -278,8 +291,9 @@ public int getSize() {
 	 *
 	 * @return number of pages in current memory bank
 	 */
+	@Override
 	public int getNumberPages() {
-		return numberPages;
+		return this.numberPages;
 	}
 
 	/**
@@ -287,20 +301,22 @@ public int getNumberPages() {
 	 *
 	 * @return page length in bytes in current memory bank
 	 */
+	@Override
 	public int getPageLength() {
-		return pageLength;
+		return this.pageLength;
 	}
 
 	/**
 	 * Query to get Maximum data page length in bytes for a packet read or written
 	 * in the current memory bank. See the 'ReadPagePacket()' and
-	 * 'WritePagePacket()' methods. This method is only useful if the current
-	 * memory bank is general purpose memory.
+	 * 'WritePagePacket()' methods. This method is only useful if the current memory
+	 * bank is general purpose memory.
 	 *
 	 * @return max packet page length in bytes in current memory bank
 	 */
+	@Override
 	public int getMaxPacketDataLength() {
-		return maxPacketDataLength;
+		return this.maxPacketDataLength;
 	}
 
 	/**
@@ -310,6 +326,7 @@ public int getMaxPacketDataLength() {
 	 *
 	 * @return 'true' if current memory bank can be read with self generated CRC.
 	 */
+	@Override
 	public boolean hasPageAutoCRC() {
 		return false;
 	}
@@ -331,6 +348,7 @@ public boolean hasPageAutoCRC() {
 	 * @see #readPagePacket(int,boolean,byte[],int,byte[]) readPagePacket(extra)
 	 * @since 1-Wire API 0.01
 	 */
+	@Override
 	public boolean hasExtraInfo() {
 		return false;
 	}
@@ -342,6 +360,7 @@ public boolean hasExtraInfo() {
 	 * @return number of bytes in Extra Information read when reading pages in the
 	 *         current memory bank.
 	 */
+	@Override
 	public int getExtraInfoLength() {
 		return 0;
 	}
@@ -353,6 +372,7 @@ public int getExtraInfoLength() {
 	 *
 	 * @return string describing extra information.
 	 */
+	@Override
 	public String getExtraInfoDescription() {
 		return null;
 	}
@@ -363,8 +383,9 @@ public String getExtraInfoDescription() {
 	 * @param doReadVerf true (default) verify write in 'write' false, don't verify
 	 *                   write (used on Write-Once bit manipulation)
 	 */
+	@Override
 	public void setWriteVerification(boolean doReadVerf) {
-		writeVerification = doReadVerf;
+		this.writeVerification = doReadVerf;
 	}
 
 	// --------
@@ -377,6 +398,7 @@ public void setWriteVerification(boolean doReadVerf) {
 	 *
 	 * @return 'true' if current memory bank pages can be redirected to a new page.
 	 */
+	@Override
 	public boolean canRedirectPage() {
 		return false;
 	}
@@ -387,6 +409,7 @@ public boolean canRedirectPage() {
 	 *
 	 * @return 'true' if current memory bank pages can be redirected to a new page.
 	 */
+	@Override
 	public boolean canLockPage() {
 		return true;
 	}
@@ -398,6 +421,7 @@ public boolean canLockPage() {
 	 * @return 'true' if current memory bank pages can be locked from being
 	 *         redirected to a new page.
 	 */
+	@Override
 	public boolean canLockRedirectPage() {
 		return false;
 	}
@@ -428,80 +452,86 @@ public boolean canLockRedirectPage() {
 	 * @throws OneWireIOException
 	 * @throws OneWireException
 	 */
+	@Override
 	public void read(int startAddr, boolean readContinue, byte[] readBuf, int offset, int len)
 			throws OneWireIOException, OneWireException {
 		int i;
-		byte[] buffer = new byte[18];
+		var buffer = new byte[18];
 
-		if ((startAddr + len) > 32)
+		if (startAddr + len > 32) {
 			throw new OneWireException("Read exceeds memory bank end");
+		}
 
 		// calculate the address (32 and 48 are valid addresses)
 		byte memAddr;
-		if (startAddr < 16)
-			memAddr = (byte) startPhysicalAddress;
-		else
-			memAddr = (byte) (startPhysicalAddress + 16);
+		if (startAddr < 16) {
+			memAddr = (byte) this.startPhysicalAddress;
+		} else {
+			memAddr = (byte) (this.startPhysicalAddress + 16);
+		}
 
 		/* perform the recall/read and verification */
-		ib.doSpeed();
-		ib.adapter.reset();
-
-		if (ib.adapter.select(ib.address)) {
+		this.ib.doSpeed();
+		this.ib.adapter.reset();
 
-			/* first recall the memory to shadow ram */
-			buffer[0] = RECALL_DATA_COMMAND;
-			buffer[1] = memAddr;
+		if (!this.ib.adapter.select(this.ib.address)) {
+			throw new OneWireException("OneWireContainer30-Device not found.");
+		}
+		/* first recall the memory to shadow ram */
+		buffer[0] = RECALL_DATA_COMMAND;
+		buffer[1] = memAddr;
 
-			ib.adapter.dataBlock(buffer, 0, 2);
+		this.ib.adapter.dataBlock(buffer, 0, 2);
 
-			/* now read the shadow ram */
-			ib.adapter.reset();
-			ib.adapter.select(ib.address);
+		/* now read the shadow ram */
+		this.ib.adapter.reset();
+		this.ib.adapter.select(this.ib.address);
 
-			buffer[0] = READ_DATA_COMMAND;
+		buffer[0] = READ_DATA_COMMAND;
 
-			// buffer[1] should still hold memAddr
-			System.arraycopy(ffBlock, 0, buffer, 2, 16);
+		// buffer[1] should still hold memAddr
+		System.arraycopy(this.ffBlock, 0, buffer, 2, 16);
 
-			ib.adapter.dataBlock(buffer, 0, 18);
+		this.ib.adapter.dataBlock(buffer, 0, 18);
 
-			// user can re-read for verification
-			if ((startAddr < 16) && (startAddr + len < 16)) {
-				for (i = startAddr; i < (startAddr + len); i++)
-					readBuf[offset + i - startAddr] = buffer[i + 2];
-			} else if (startAddr >= 16) {
-				for (i = startAddr; i < (startAddr + len); i++)
-					readBuf[offset + i - startAddr] = buffer[i - startAddr + 2 + (startAddr - 16)];
-			} else {
-				for (i = startAddr; i < 16; i++)
-					readBuf[offset + i - startAddr] = buffer[i + 2];
+		// user can re-read for verification
+		if (startAddr < 16 && startAddr + len < 16) {
+			for (i = startAddr; i < startAddr + len; i++) {
+				readBuf[offset + i - startAddr] = buffer[i + 2];
+			}
+		} else if (startAddr >= 16) {
+			for (i = startAddr; i < startAddr + len; i++) {
+				readBuf[offset + i - startAddr] = buffer[i - startAddr + 2 + startAddr - 16];
+			}
+		} else {
+			for (i = startAddr; i < 16; i++) {
+				readBuf[offset + i - startAddr] = buffer[i + 2];
+			}
 
-				ib.adapter.reset();
-				ib.adapter.select(ib.address);
+			this.ib.adapter.reset();
+			this.ib.adapter.select(this.ib.address);
 
-				buffer[0] = RECALL_DATA_COMMAND;
-				buffer[1] = (byte) (memAddr + 16);
+			buffer[0] = RECALL_DATA_COMMAND;
+			buffer[1] = (byte) (memAddr + 16);
 
-				ib.adapter.dataBlock(buffer, 0, 2);
+			this.ib.adapter.dataBlock(buffer, 0, 2);
 
-				/* now read the shadow ram */
-				ib.adapter.reset();
-				ib.adapter.select(ib.address);
+			/* now read the shadow ram */
+			this.ib.adapter.reset();
+			this.ib.adapter.select(this.ib.address);
 
-				buffer[0] = READ_DATA_COMMAND;
+			buffer[0] = READ_DATA_COMMAND;
 
-				// buffer[1] should still hold memAddr
-				System.arraycopy(ffBlock, 0, buffer, 2, 16);
+			// buffer[1] should still hold memAddr
+			System.arraycopy(this.ffBlock, 0, buffer, 2, 16);
 
-				ib.adapter.dataBlock(buffer, 0, 18);
+			this.ib.adapter.dataBlock(buffer, 0, 18);
 
-				// user can re-read for verification
-				for (i = 16; i < (startAddr + len); i++)
-					readBuf[i + offset - startAddr] = buffer[i - 14];
+			// user can re-read for verification
+			for (i = 16; i < startAddr + len; i++) {
+				readBuf[i + offset - startAddr] = buffer[i - 14];
 			}
-		} else
-			throw new OneWireException("OneWireContainer30-Device not found.");
+		}
 	}
 
 	/**
@@ -524,115 +554,123 @@ public void read(int startAddr, boolean readContinue, byte[] readBuf, int offset
 	 * @throws OneWireIOException
 	 * @throws OneWireException
 	 */
+	@Override
 	public void write(int startAddr, byte[] writeBuf, int offset, int len) throws OneWireIOException, OneWireException {
-		byte[] buffer = new byte[18];
-		byte[] memory = new byte[32];
+		var buffer = new byte[18];
+		var memory = new byte[32];
 		int modify;
 		int i;
 
-		if (startAddr + len > 32)
+		if (startAddr + len > 32) {
 			throw new OneWireException("Write exceeds memory bank end");
+		}
 
 		// the first block is at address 32 and the second is at address 48
 		byte memAddr;
-		if (startAddr < 16)
-			memAddr = (byte) startPhysicalAddress;
-		else
-			memAddr = (byte) (startPhysicalAddress + 16);
+		if (startAddr < 16) {
+			memAddr = (byte) this.startPhysicalAddress;
+		} else {
+			memAddr = (byte) (this.startPhysicalAddress + 16);
+		}
 
 		// if the EEPROM block is locked throw a OneWireIOException
-		if ((lockPage0 && (memAddr == 32)) || (lockPage1 && (memAddr == 48)))
+		if (this.lockPage0 && memAddr == 32 || this.lockPage1 && memAddr == 48) {
 			throw new OneWireIOException("OneWireContainer30-Cant write data to locked EEPROM block.");
+		}
 
 		// read memory that is already there
-		read(0, false, memory, 0, 32);
+		this.read(0, false, memory, 0, 32);
 
 		System.arraycopy(writeBuf, offset, memory, startAddr, len);
 
 		/* perform the write/verification and copy */
-		ib.doSpeed();
-		ib.adapter.reset();
-
-		if (ib.adapter.select(ib.address)) {
-			/* first write to shadow rom */
-			buffer[0] = WRITE_DATA_COMMAND;
-			buffer[1] = memAddr;
-
-			if (memAddr == 32) {
-				System.arraycopy(memory, 0, buffer, 2, 16);
-				modify = 0;
-			} else {
-				System.arraycopy(memory, 16, buffer, 2, 16);
-				modify = 16;
-			}
-
-			ib.adapter.dataBlock(buffer, 0, 18);
+		this.ib.doSpeed();
+		this.ib.adapter.reset();
 
-			/* read the shadow ram back for verification */
-			ib.adapter.reset();
-			ib.adapter.select(ib.address);
+		if (!this.ib.adapter.select(this.ib.address)) {
+			throw new OneWireException("OneWireContainer30-Device not found.");
+		}
+		/* first write to shadow rom */
+		buffer[0] = WRITE_DATA_COMMAND;
+		buffer[1] = memAddr;
 
-			buffer[0] = READ_DATA_COMMAND;
+		if (memAddr == 32) {
+			System.arraycopy(memory, 0, buffer, 2, 16);
+			modify = 0;
+		} else {
+			System.arraycopy(memory, 16, buffer, 2, 16);
+			modify = 16;
+		}
 
-			// buffer[1] should still hold memAddr
-			System.arraycopy(ffBlock, 0, buffer, 2, 16);
+		this.ib.adapter.dataBlock(buffer, 0, 18);
 
-			ib.adapter.dataBlock(buffer, 0, 18);
+		/* read the shadow ram back for verification */
+		this.ib.adapter.reset();
+		this.ib.adapter.select(this.ib.address);
 
-			// verify data
-			for (i = 0; i < 16; i++)
-				if (buffer[i + 2] != memory[i + modify])
-					throw new OneWireIOException("Error writing EEPROM memory bank");
+		buffer[0] = READ_DATA_COMMAND;
 
-			/* now perform the copy to EEPROM */
-			ib.adapter.reset();
-			ib.adapter.select(ib.address);
+		// buffer[1] should still hold memAddr
+		System.arraycopy(this.ffBlock, 0, buffer, 2, 16);
 
-			buffer[0] = COPY_DATA_COMMAND;
+		this.ib.adapter.dataBlock(buffer, 0, 18);
 
-			// buffer[1] should still hold memAddr
-			ib.adapter.dataBlock(buffer, 0, 2);
+		// verify data
+		for (i = 0; i < 16; i++) {
+			if (buffer[i + 2] != memory[i + modify]) {
+				throw new OneWireIOException("Error writing EEPROM memory bank");
+			}
+		}
 
-			if ((startAddr < 16) && ((startAddr + len) >= 16)) {
-				memAddr = 48;
-				ib.adapter.reset();
+		/* now perform the copy to EEPROM */
+		this.ib.adapter.reset();
+		this.ib.adapter.select(this.ib.address);
 
-				if (ib.adapter.select(ib.address)) {
-					/* first write to shadow rom */
-					buffer[0] = WRITE_DATA_COMMAND;
-					buffer[1] = memAddr;
+		buffer[0] = COPY_DATA_COMMAND;
 
-					System.arraycopy(memory, 16, buffer, 2, 16);
+		// buffer[1] should still hold memAddr
+		this.ib.adapter.dataBlock(buffer, 0, 2);
 
-					ib.adapter.dataBlock(buffer, 0, 18);
+		if (startAddr < 16 && startAddr + len >= 16) {
+			memAddr = 48;
+			this.ib.adapter.reset();
 
-					/* read the shadow ram back for verification */
-					ib.adapter.reset();
-					ib.adapter.select(ib.address);
+			if (this.ib.adapter.select(this.ib.address)) {
+				/* first write to shadow rom */
+				buffer[0] = WRITE_DATA_COMMAND;
+				buffer[1] = memAddr;
 
-					buffer[0] = READ_DATA_COMMAND;
+				System.arraycopy(memory, 16, buffer, 2, 16);
 
-					// buffer[1] should still hold memAddr
-					System.arraycopy(ffBlock, 0, buffer, 2, 16);
+				this.ib.adapter.dataBlock(buffer, 0, 18);
 
-					ib.adapter.dataBlock(buffer, 0, 18);
+				/* read the shadow ram back for verification */
+				this.ib.adapter.reset();
+				this.ib.adapter.select(this.ib.address);
 
-					// verify data
-					for (i = 0; i < 16; i++)
-						if (buffer[i + 2] != memory[i + 16])
-							throw new OneWireIOException("Error writing EEPROM memory bank");
+				buffer[0] = READ_DATA_COMMAND;
 
-					/* now perform the copy to EEPROM */
-					ib.adapter.reset();
-					ib.adapter.select(ib.address);
+				// buffer[1] should still hold memAddr
+				System.arraycopy(this.ffBlock, 0, buffer, 2, 16);
 
-					buffer[0] = COPY_DATA_COMMAND;
+				this.ib.adapter.dataBlock(buffer, 0, 18);
 
-					ib.adapter.dataBlock(buffer, 0, 2);
+				// verify data
+				for (i = 0; i < 16; i++) {
+					if (buffer[i + 2] != memory[i + 16]) {
+						throw new OneWireIOException("Error writing EEPROM memory bank");
+					}
 				}
+
+				/* now perform the copy to EEPROM */
+				this.ib.adapter.reset();
+				this.ib.adapter.select(this.ib.address);
+
+				buffer[0] = COPY_DATA_COMMAND;
+
+				this.ib.adapter.dataBlock(buffer, 0, 2);
 			}
-		} else
-			throw new OneWireException("OneWireContainer30-Device not found.");
+		}
 	}
 
 	// --------
@@ -660,9 +698,10 @@ public void write(int startAddr, byte[] writeBuf, int offset, int len) throws On
 	 * @throws OneWireIOException
 	 * @throws OneWireException
 	 */
+	@Override
 	public void readPage(int page, boolean readContinue, byte[] readBuf, int offset)
 			throws OneWireIOException, OneWireException {
-		read(page * pageLength, readContinue, readBuf, offset, pageLength);
+		this.read(page * this.pageLength, readContinue, readBuf, offset, this.pageLength);
 	}
 
 	/**
@@ -688,6 +727,7 @@ public void readPage(int page, boolean readContinue, byte[] readBuf, int offset)
 	 * @throws OneWireIOException
 	 * @throws OneWireException
 	 */
+	@Override
 	public void readPage(int page, boolean readContinue, byte[] readBuf, int offset, byte[] extraInfo)
 			throws OneWireIOException, OneWireException {
 		throw new OneWireException("Read extra information not supported on this memory bank");
@@ -714,6 +754,7 @@ public void readPage(int page, boolean readContinue, byte[] readBuf, int offset,
 	 * @throws OneWireIOException
 	 * @throws OneWireException
 	 */
+	@Override
 	public int readPagePacket(int page, boolean readContinue, byte[] readBuf, int offset, byte[] extraInfo)
 			throws OneWireIOException, OneWireException {
 		throw new OneWireException("Read extra information not supported on this memory bank");
@@ -739,16 +780,17 @@ public int readPagePacket(int page, boolean readContinue, byte[] readBuf, int of
 	 * @throws OneWireIOException
 	 * @throws OneWireException
 	 */
+	@Override
 	public int readPagePacket(int page, boolean readContinue, byte[] readBuf, int offset)
 			throws OneWireIOException, OneWireException {
-		byte[] raw_buf = new byte[pageLength];
+		var raw_buf = new byte[this.pageLength];
 
 		// read entire page with read page CRC
-		read((page * pageLength), readContinue, raw_buf, 0, pageLength);
+		this.read(page * this.pageLength, readContinue, raw_buf, 0, this.pageLength);
 
 		// check if length is realistic
-		if ((raw_buf[0] & 0x00FF) > maxPacketDataLength) {
-			forceVerify();
+		if ((raw_buf[0] & 0x00FF) > this.maxPacketDataLength) {
+			this.forceVerify();
 
 			throw new OneWireIOException("Invalid length in packet");
 		}
@@ -761,11 +803,10 @@ public int readPagePacket(int page, boolean readContinue, byte[] readBuf, int of
 
 			// return the length
 			return raw_buf[0];
-		} else {
-			forceVerify();
-
-			throw new OneWireIOException("Invalid CRC16 in packet read");
 		}
+		this.forceVerify();
+
+		throw new OneWireIOException("Invalid CRC16 in packet read");
 	}
 
 	/**
@@ -780,27 +821,29 @@ public int readPagePacket(int page, boolean readContinue, byte[] readBuf, int of
 	 * @throws OneWireIOException
 	 * @throws OneWireException
 	 */
+	@Override
 	public void writePagePacket(int page, byte[] writeBuf, int offset, int len)
 			throws OneWireIOException, OneWireException {
 
 		// make sure length does not exceed max
-		if (len > maxPacketDataLength)
+		if (len > this.maxPacketDataLength) {
 			throw new OneWireIOException("Length of packet requested exceeds page size");
+		}
 
 		// construct the packet to write
-		byte[] raw_buf = new byte[len + 3];
+		var raw_buf = new byte[len + 3];
 
 		raw_buf[0] = (byte) len;
 
 		System.arraycopy(writeBuf, offset, raw_buf, 1, len);
 
-		int crc = CRC16.compute(raw_buf, 0, len + 1, page);
+		var crc = CRC16.compute(raw_buf, 0, len + 1, page);
 
 		raw_buf[len + 1] = (byte) (~crc & 0xFF);
-		raw_buf[len + 2] = (byte) (((~crc & 0xFFFF) >>> 8) & 0xFF);
+		raw_buf[len + 2] = (byte) ((~crc & 0xFFFF) >>> 8 & 0xFF);
 
 		// write the packet, return result
-		write(page * pageLength, raw_buf, 0, len + 3);
+		this.write(page * this.pageLength, raw_buf, 0, len + 3);
 	}
 
 	/**
@@ -819,6 +862,7 @@ public void writePagePacket(int page, byte[] writeBuf, int offset, int len)
 	 * @throws OneWireIOException
 	 * @throws OneWireException
 	 */
+	@Override
 	public void readPageCRC(int page, boolean readContinue, byte[] readBuf, int offset)
 			throws OneWireIOException, OneWireException {
 		throw new OneWireException("Read page with CRC not supported in this memory bank");
@@ -843,6 +887,7 @@ public void readPageCRC(int page, boolean readContinue, byte[] readBuf, int offs
 	 * @throws OneWireIOException
 	 * @throws OneWireException
 	 */
+	@Override
 	public void readPageCRC(int page, boolean readContinue, byte[] readBuf, int offset, byte[] extraInfo)
 			throws OneWireIOException, OneWireException {
 		throw new OneWireException("Read page with CRC not supported in this memory bank");
@@ -861,29 +906,30 @@ public void readPageCRC(int page, boolean readContinue, byte[] readBuf, int offs
 	 * @throws OneWireIOException
 	 * @throws OneWireException
 	 */
+	@Override
 	public void lockPage(int page) throws OneWireIOException, OneWireException {
-		if (page > 1)
+		if (page > 1) {
 			throw new OneWireException("Page does not exist to lock");
+		}
 
-		ib.setFlag(OneWireContainer30.EEPROM_REGISTER, OneWireContainer30.EEPROM_LOCK_ENABLE_FLAG, true);
+		this.ib.setFlag(OneWireContainer30.EEPROM_REGISTER, OneWireContainer30.EEPROM_LOCK_ENABLE_FLAG, true);
 
 		if (page == 0) {
-			ib.setFlag(OneWireContainer30.EEPROM_REGISTER, OneWireContainer30.EEPROM_BLOCK_0_LOCK_FLAG, true);
+			this.ib.setFlag(OneWireContainer30.EEPROM_REGISTER, OneWireContainer30.EEPROM_BLOCK_0_LOCK_FLAG, true);
 		} else if (page == 1) {
-			ib.setFlag(OneWireContainer30.EEPROM_REGISTER, OneWireContainer30.EEPROM_BLOCK_1_LOCK_FLAG, true);
+			this.ib.setFlag(OneWireContainer30.EEPROM_REGISTER, OneWireContainer30.EEPROM_BLOCK_1_LOCK_FLAG, true);
 		}
 
 		// read back to verify
-		if (!isPageLocked(page)) {
-			forceVerify();
+		if (!this.isPageLocked(page)) {
+			this.forceVerify();
 
 			throw new OneWireIOException("Read back from write incorrect, could not lock page");
-		} else {
-			if (page == 0) {
-				lockPage0 = true;
-			} else if (page == 1) {
-				lockPage1 = true;
-			}
+		}
+		if (page == 0) {
+			this.lockPage0 = true;
+		} else if (page == 1) {
+			this.lockPage1 = true;
 		}
 	}
 
@@ -897,16 +943,18 @@ public void lockPage(int page) throws OneWireIOException, OneWireException {
 	 * @throws OneWireIOException
 	 * @throws OneWireException
 	 */
+	@Override
 	public boolean isPageLocked(int page) throws OneWireIOException, OneWireException {
-		boolean flag = false;
+		var flag = false;
 
-		if (page > 1)
+		if (page > 1) {
 			throw new OneWireException("Page does not exist to be locked");
+		}
 
 		if (page == 0) {
-			flag = ib.getFlag(OneWireContainer30.EEPROM_REGISTER, OneWireContainer30.EEPROM_BLOCK_0_LOCK_FLAG);
+			flag = this.ib.getFlag(OneWireContainer30.EEPROM_REGISTER, OneWireContainer30.EEPROM_BLOCK_0_LOCK_FLAG);
 		} else if (page == 1) {
-			flag = ib.getFlag(OneWireContainer30.EEPROM_REGISTER, OneWireContainer30.EEPROM_BLOCK_1_LOCK_FLAG);
+			flag = this.ib.getFlag(OneWireContainer30.EEPROM_REGISTER, OneWireContainer30.EEPROM_BLOCK_1_LOCK_FLAG);
 		}
 
 		return flag;
@@ -923,6 +971,7 @@ public boolean isPageLocked(int page) throws OneWireIOException, OneWireExceptio
 	 * @throws OneWireIOException
 	 * @throws OneWireException
 	 */
+	@Override
 	public void redirectPage(int page, int newPage) throws OneWireIOException, OneWireException {
 		throw new OneWireException("This memory bank does not support redirection.");
 	}
@@ -948,19 +997,21 @@ public void redirectPage(int page, int newPage) throws OneWireIOException, OneWi
 	 * @see #redirectPage(int,int) redirectPage
 	 * @since 1-Wire API 0.01
 	 */
+	@Override
 	public int getRedirectedPage(int page) throws OneWireIOException, OneWireException {
 		throw new OneWireException("This memory bank does not support redirection.");
 	}
 
 	/**
-	 * Lock the redirection option for the specified page in the current memory bank.
-	 * Not supported by all devices. See the method 'canLockRedirectPage()'.
+	 * Lock the redirection option for the specified page in the current memory
+	 * bank. Not supported by all devices. See the method 'canLockRedirectPage()'.
 	 *
 	 * @param page number of page to redirect
 	 *
 	 * @throws OneWireIOException
 	 * @throws OneWireException
 	 */
+	@Override
 	public void lockRedirectPage(int page) throws OneWireIOException, OneWireException {
 		throw new OneWireException("This memory bank does not support redirection.");
 	}
@@ -976,6 +1027,7 @@ public void lockRedirectPage(int page) throws OneWireIOException, OneWireExcepti
 	 * @throws OneWireIOException
 	 * @throws OneWireException
 	 */
+	@Override
 	public boolean isRedirectPageLocked(int page) throws OneWireIOException, OneWireException {
 		throw new OneWireException("This memory bank does not support redirection.");
 	}
@@ -995,13 +1047,13 @@ public void checkSpeed() throws OneWireIOException, OneWireException {
 		synchronized (this) {
 
 			// only check the speed
-			if (doSetSpeed) {
+			if (this.doSetSpeed) {
 
 				// attempt to set the correct speed and verify device present
-				ib.doSpeed();
+				this.ib.doSpeed();
 
 				// no exceptions so clear flag
-				doSetSpeed = false;
+				this.doSetSpeed = false;
 			}
 		}
 	}
@@ -1012,7 +1064,7 @@ public void checkSpeed() throws OneWireIOException, OneWireException {
 	 */
 	public void forceVerify() {
 		synchronized (this) {
-			doSetSpeed = true;
+			this.doSetSpeed = true;
 		}
 	}
 
diff --git a/io.openems.edge.bridge.onewire/src/com/dalsemi/onewire/container/MemoryBankEEPROMstatus.java b/io.openems.edge.bridge.onewire/src/com/dalsemi/onewire/container/MemoryBankEEPROMstatus.java
index 9d1ea3f4481..0b55c58b783 100644
--- a/io.openems.edge.bridge.onewire/src/com/dalsemi/onewire/container/MemoryBankEEPROMstatus.java
+++ b/io.openems.edge.bridge.onewire/src/com/dalsemi/onewire/container/MemoryBankEEPROMstatus.java
@@ -190,29 +190,30 @@ class MemoryBankEEPROMstatus implements MemoryBank {
 	public MemoryBankEEPROMstatus(OneWireContainer ibutton) {
 
 		// keep reference to ibutton where memory bank is
-		ib = ibutton;
+		this.ib = ibutton;
 
 		// initialize attributes of this memory bank - DEFAULT: Main memory DS1985 w/o
 		// lock stuff
-		generalPurposeMemory = false;
-		bankDescription = "Main Memory";
-		numberPages = 1;
-		readWrite = false;
-		writeOnce = false;
-		readOnly = false;
-		nonVolatile = true;
-		pageAutoCRC = true;
-		programPulse = false;
-		powerDelivery = false;
-		writeVerification = false;
-		startPhysicalAddress = 0;
-		doSetSpeed = true;
+		this.generalPurposeMemory = false;
+		this.bankDescription = "Main Memory";
+		this.numberPages = 1;
+		this.readWrite = false;
+		this.writeOnce = false;
+		this.readOnly = false;
+		this.nonVolatile = true;
+		this.pageAutoCRC = true;
+		this.programPulse = false;
+		this.powerDelivery = false;
+		this.writeVerification = false;
+		this.startPhysicalAddress = 0;
+		this.doSetSpeed = true;
 
 		// create the ffblock (used for faster 0xFF fills)
-		ffBlock = new byte[20];
+		this.ffBlock = new byte[20];
 
-		for (int i = 0; i < 20; i++)
-			ffBlock[i] = (byte) 0xFF;
+		for (var i = 0; i < 20; i++) {
+			this.ffBlock[i] = (byte) 0xFF;
+		}
 	}
 
 	// --------
@@ -224,8 +225,9 @@ public MemoryBankEEPROMstatus(OneWireContainer ibutton) {
 	 *
 	 * @return String containing the memory bank description
 	 */
+	@Override
 	public String getBankDescription() {
-		return bankDescription;
+		return this.bankDescription;
 	}
 
 	/**
@@ -235,8 +237,9 @@ public String getBankDescription() {
 	 *
 	 * @return 'true' if current memory bank is general purpose
 	 */
+	@Override
 	public boolean isGeneralPurposeMemory() {
-		return generalPurposeMemory;
+		return this.generalPurposeMemory;
 	}
 
 	/**
@@ -244,8 +247,9 @@ public boolean isGeneralPurposeMemory() {
 	 *
 	 * @return 'true' if current memory bank is read/write
 	 */
+	@Override
 	public boolean isReadWrite() {
-		return readWrite;
+		return this.readWrite;
 	}
 
 	/**
@@ -254,8 +258,9 @@ public boolean isReadWrite() {
 	 *
 	 * @return 'true' if current memory bank can only be written once
 	 */
+	@Override
 	public boolean isWriteOnce() {
-		return writeOnce;
+		return this.writeOnce;
 	}
 
 	/**
@@ -263,8 +268,9 @@ public boolean isWriteOnce() {
 	 *
 	 * @return 'true' if current memory bank can only be read
 	 */
+	@Override
 	public boolean isReadOnly() {
-		return readOnly;
+		return this.readOnly;
 	}
 
 	/**
@@ -273,8 +279,9 @@ public boolean isReadOnly() {
 	 *
 	 * @return 'true' if current memory bank non volatile.
 	 */
+	@Override
 	public boolean isNonVolatile() {
-		return nonVolatile;
+		return this.nonVolatile;
 	}
 
 	/**
@@ -284,8 +291,9 @@ public boolean isNonVolatile() {
 	 * @return 'true' if writing to the current memory bank pages requires a
 	 *         'ProgramPulse'.
 	 */
+	@Override
 	public boolean needsProgramPulse() {
-		return programPulse;
+		return this.programPulse;
 	}
 
 	/**
@@ -295,8 +303,9 @@ public boolean needsProgramPulse() {
 	 * @return 'true' if writing to the current memory bank pages requires
 	 *         'PowerDelivery'.
 	 */
+	@Override
 	public boolean needsPowerDelivery() {
-		return powerDelivery;
+		return this.powerDelivery;
 	}
 
 	/**
@@ -305,8 +314,9 @@ public boolean needsPowerDelivery() {
 	 *
 	 * @return physical starting address of this logical bank.
 	 */
+	@Override
 	public int getStartPhysicalAddress() {
-		return startPhysicalAddress;
+		return this.startPhysicalAddress;
 	}
 
 	/**
@@ -314,8 +324,9 @@ public int getStartPhysicalAddress() {
 	 *
 	 * @return memory bank size in bytes.
 	 */
+	@Override
 	public int getSize() {
-		return size;
+		return this.size;
 	}
 
 	// --------
@@ -328,7 +339,7 @@ public int getSize() {
 	 * @return number of pages in current memory bank
 	 */
 	public int getNumberPages() {
-		return numberPages;
+		return this.numberPages;
 	}
 
 	/**
@@ -337,19 +348,19 @@ public int getNumberPages() {
 	 * @return page length in bytes in current memory bank
 	 */
 	public int getPageLength() {
-		return pageLength;
+		return this.pageLength;
 	}
 
 	/**
 	 * Query to get Maximum data page length in bytes for a packet read or written
 	 * in the current memory bank. See the 'ReadPagePacket()' and
-	 * 'WritePagePacket()' methods. This method is only useful if the current
-	 * memory bank is general purpose memory.
+	 * 'WritePagePacket()' methods. This method is only useful if the current memory
+	 * bank is general purpose memory.
 	 *
 	 * @return max packet page length in bytes in current memory bank
 	 */
 	public int getMaxPacketDataLength() {
-		return maxPacketDataLength;
+		return this.maxPacketDataLength;
 	}
 
 	/**
@@ -360,7 +371,7 @@ public int getMaxPacketDataLength() {
 	 * @return 'true' if current memory bank can be read with self generated CRC.
 	 */
 	public boolean hasPageAutoCRC() {
-		return pageAutoCRC;
+		return this.pageAutoCRC;
 	}
 
 	/**
@@ -412,8 +423,9 @@ public String getExtraInfoDescription() {
 	 * @param doReadVerf true (default) verify write in 'write' false, don't verify
 	 *                   write (used on Write-Once bit manipulation)
 	 */
+	@Override
 	public void setWriteVerification(boolean doReadVerf) {
-		writeVerification = doReadVerf;
+		this.writeVerification = doReadVerf;
 	}
 
 	// --------
@@ -442,39 +454,41 @@ public void setWriteVerification(boolean doReadVerf) {
 	 * @throws OneWireIOException
 	 * @throws OneWireException
 	 */
+	@Override
 	public void read(int startAddr, boolean readContinue, byte[] readBuf, int offset, int len)
 			throws OneWireIOException, OneWireException {
-		byte[] buff = new byte[20];
-		int addr = startPhysicalAddress + startAddr;
+		var buff = new byte[20];
+		var addr = this.startPhysicalAddress + startAddr;
 
-		System.arraycopy(ffBlock, 0, buff, 0, 20);
+		System.arraycopy(this.ffBlock, 0, buff, 0, 20);
 
 		// check if read exceeds memory
-		if ((startAddr + len) > size)
+		if (startAddr + len > this.size) {
 			throw new OneWireException("Read exceeds memory bank end");
+		}
 
 		// attempt to put device at max desired speed
 		// attempt to put device at max desired speed
 		if (!readContinue) {
-			checkSpeed();
+			this.checkSpeed();
 
 			// select the device
-			if (ib.adapter.select(ib.address)) {
-				buff[0] = READ_MEMORY_COMMAND;
+			if (!this.ib.adapter.select(this.ib.address)) {
+				throw new OneWireIOException("Device select failed");
+			}
+			buff[0] = READ_MEMORY_COMMAND;
 
-				// address 1
-				buff[1] = (byte) (addr & 0xFF);
-				// address 2
-				buff[2] = (byte) (((addr & 0xFFFF) >>> 8) & 0xFF);
+			// address 1
+			buff[1] = (byte) (addr & 0xFF);
+			// address 2
+			buff[2] = (byte) ((addr & 0xFFFF) >>> 8 & 0xFF);
 
-				ib.adapter.dataBlock(buff, 0, len + 3);
+			this.ib.adapter.dataBlock(buff, 0, len + 3);
 
-				// extract the data
-				System.arraycopy(buff, 3, readBuf, offset, len);
-			} else
-				throw new OneWireIOException("Device select failed");
+			// extract the data
+			System.arraycopy(buff, 3, readBuf, offset, len);
 		} else {
-			ib.adapter.dataBlock(buff, 0, len);
+			this.ib.adapter.dataBlock(buff, 0, len);
 
 			// extract the data
 			System.arraycopy(buff, 0, readBuf, offset, len);
@@ -501,71 +515,75 @@ public void read(int startAddr, boolean readContinue, byte[] readBuf, int offset
 	 * @throws OneWireIOException
 	 * @throws OneWireException
 	 */
+	@Override
 	public void write(int startAddr, byte[] writeBuf, int offset, int len) throws OneWireIOException, OneWireException {
 		int i;
-		byte[] es_data = new byte[3];
-		byte[] scratchpad = new byte[8];
+		var es_data = new byte[3];
+		var scratchpad = new byte[8];
 
 		// return if nothing to do
-		if (len == 0)
+		if (len == 0) {
 			return;
+		}
 
 		// attempt to put device at speed
-		checkSpeed();
+		this.checkSpeed();
 
 		// check if write exceeds memory
-		if ((startAddr + len) > size)
+		if (startAddr + len > this.size) {
 			throw new OneWireException("Write exceeds memory bank end");
+		}
 
 		// check if trying to write read only bank
-		if (isReadOnly() && (((startPhysicalAddress + startAddr) != 137) && (len != 1)))
+		if (this.isReadOnly() && this.startPhysicalAddress + startAddr != 137 && len != 1) {
 			throw new OneWireException("Trying to write read-only memory bank");
+		}
 
-		if (((startPhysicalAddress + startAddr) == 137) && (len == 1)) {
-			ib.adapter.select(ib.address);
+		if (this.startPhysicalAddress + startAddr == 137 && len == 1) {
+			this.ib.adapter.select(this.ib.address);
 
-			byte[] buffer = new byte[5];
+			var buffer = new byte[5];
 
 			buffer[0] = CHANNEL_ACCESS_WRITE;
 			buffer[1] = writeBuf[offset];
 			buffer[2] = (byte) ~writeBuf[offset];
-			System.arraycopy(ffBlock, 0, buffer, 3, 2);
+			System.arraycopy(this.ffBlock, 0, buffer, 3, 2);
 
-			ib.adapter.dataBlock(buffer, 0, 5);
+			this.ib.adapter.dataBlock(buffer, 0, 5);
 
 			if (buffer[3] != (byte) 0x00AA) {
 				throw new OneWireIOException(
 						"Failure to change DS2408 latch state: buffer=" + Convert.toHexString(buffer));
 			}
-		} else if (((startPhysicalAddress + startAddr) > 138) && ((startPhysicalAddress + startAddr + len) < 143)) {
-			ib.adapter.select(ib.address);
+		} else if (this.startPhysicalAddress + startAddr > 138 && this.startPhysicalAddress + startAddr + len < 143) {
+			this.ib.adapter.select(this.ib.address);
 
-			byte[] buffer = new byte[6];
+			var buffer = new byte[6];
 
 			buffer[0] = (byte) 0xCC;
-			buffer[1] = (byte) ((startAddr + startPhysicalAddress) & 0xFF);
-			buffer[2] = (byte) ((((startAddr + startPhysicalAddress) & 0xFFFF) >>> 8) & 0xFF);
+			buffer[1] = (byte) (startAddr + this.startPhysicalAddress & 0xFF);
+			buffer[2] = (byte) ((startAddr + this.startPhysicalAddress & 0xFFFF) >>> 8 & 0xFF);
 
 			System.arraycopy(writeBuf, offset, buffer, 3, len);
 
-			ib.adapter.dataBlock(buffer, 0, len + 3);
-		} else if (((startPhysicalAddress + startAddr) > 127) && ((startPhysicalAddress + startAddr + len) < 130)) {
-			byte[] buffer = new byte[8];
-			int addr = 128;
-			byte[] buff = new byte[11];
+			this.ib.adapter.dataBlock(buffer, 0, len + 3);
+		} else if (this.startPhysicalAddress + startAddr > 127 && this.startPhysicalAddress + startAddr + len < 130) {
+			var buffer = new byte[8];
+			var addr = 128;
+			var buff = new byte[11];
 
-			System.arraycopy(ffBlock, 0, buff, 0, 11);
+			System.arraycopy(this.ffBlock, 0, buff, 0, 11);
 
-			ib.adapter.select(ib.address);
+			this.ib.adapter.select(this.ib.address);
 
 			buff[0] = READ_MEMORY_COMMAND;
 
 			// address 1
 			buff[1] = (byte) (addr & 0xFF);
 			// address 2
-			buff[2] = (byte) (((addr & 0xFFFF) >>> 8) & 0xFF);
+			buff[2] = (byte) ((addr & 0xFFFF) >>> 8 & 0xFF);
 
-			ib.adapter.dataBlock(buff, 0, 11);
+			this.ib.adapter.dataBlock(buff, 0, 11);
 
 			// extract the data
 			System.arraycopy(buff, 3, buffer, 0, 8);
@@ -573,26 +591,28 @@ public void write(int startAddr, byte[] writeBuf, int offset, int len) throws On
 			System.arraycopy(writeBuf, offset, buffer, 0, len);
 
 			// write the page of data to scratchpad
-			if (!writeScratchpad(startPhysicalAddress + startAddr, buffer, 0, 8))
+			if (!this.writeScratchpad(this.startPhysicalAddress + startAddr, buffer, 0, 8)) {
 				throw new OneWireIOException("Invalid CRC16 in write");
+			}
 
-			if (!readScratchpad(scratchpad, 0, 8, es_data))
+			if (!this.readScratchpad(scratchpad, 0, 8, es_data)) {
 				throw new OneWireIOException("Read scratchpad was not successful.");
+			}
 
 			if ((es_data[2] & 0x20) == 0x20) {
 				throw new OneWireIOException("The write scratchpad command was not completed.");
-			} else {
-				for (i = 0; i < 8; i++)
-					if (scratchpad[i] != buffer[i]) {
-						throw new OneWireIOException(
-								"The read back of the data in the scratch pad did " + "not match.");
-					}
+			}
+			for (i = 0; i < 8; i++) {
+				if (scratchpad[i] != buffer[i]) {
+					throw new OneWireIOException("The read back of the data in the scratch pad did " + "not match.");
+				}
 			}
 
 			// Copy data from scratchpad into memory
-			copyScratchpad(es_data);
-		} else
+			this.copyScratchpad(es_data);
+		} else {
 			throw new OneWireIOException("Trying to write read-only memory.");
+		}
 	}
 
 	// --------
@@ -610,13 +630,13 @@ public void checkSpeed() throws OneWireIOException, OneWireException {
 		synchronized (this) {
 
 			// only check the speed
-			if (doSetSpeed) {
+			if (this.doSetSpeed) {
 
 				// attempt to set the correct speed and verify device present
-				ib.doSpeed();
+				this.ib.doSpeed();
 
 				// no exceptions so clear flag
-				doSetSpeed = false;
+				this.doSetSpeed = false;
 			}
 		}
 	}
@@ -627,7 +647,7 @@ public void checkSpeed() throws OneWireIOException, OneWireException {
 	 */
 	public void forceVerify() {
 		synchronized (this) {
-			doSetSpeed = true;
+			this.doSetSpeed = true;
 		}
 	}
 
@@ -647,40 +667,37 @@ public void forceVerify() {
 	 */
 	public boolean writeScratchpad(int addr, byte[] out_buf, int offset, int len)
 			throws OneWireIOException, OneWireException {
-		byte[] send_block = new byte[14];
+		var send_block = new byte[14];
 
 		// protect send buffer
 		// since the scratchpad is only eight bytes, there is no reason to write
 		// more than eight bytes.. and we can optimize our send buffer's size.
-		if (len > 8)
+		if (len > 8) {
 			len = 8;
+		}
 
 		// access the device
-		if (ib.adapter.select(ib.getAddress())) {
-			int cnt = 0;
-			// set data block up
-			// start by sending the write scratchpad command
-			send_block[cnt++] = WRITE_SCRATCHPAD_COMMAND;
-			// followed by the target address
-			send_block[cnt++] = (byte) (addr & 0x00FF);
-			send_block[cnt++] = (byte) (((addr & 0x00FFFF) >>> 8) & 0x00FF);
-
-			// followed by the data to write to the scratchpad
-			System.arraycopy(out_buf, offset, send_block, 3, len);
-			cnt += len;
-
-			// followed by two bytes for reading CRC16 value
-			send_block[cnt++] = (byte) 0x00FF;
-			send_block[cnt++] = (byte) 0x00FF;
-
-			// send the data
-			ib.adapter.dataBlock(send_block, 0, cnt);
-
-			// verify the CRC is correct
-//         if (CRC16.compute(send_block, 0, cnt) != 0x0000B001)
-//            throw new OneWireIOException("Invalid CRC16 in Writing Scratch Pad");
-		} else
+		if (!this.ib.adapter.select(this.ib.getAddress())) {
 			throw new OneWireIOException("Device select failed.");
+		}
+		var cnt = 0;
+		// set data block up
+		// start by sending the write scratchpad command
+		send_block[cnt++] = WRITE_SCRATCHPAD_COMMAND;
+		// followed by the target address
+		send_block[cnt++] = (byte) (addr & 0x00FF);
+		send_block[cnt++] = (byte) ((addr & 0x00FFFF) >>> 8 & 0x00FF);
+
+		// followed by the data to write to the scratchpad
+		System.arraycopy(out_buf, offset, send_block, 3, len);
+		cnt += len;
+
+		// followed by two bytes for reading CRC16 value
+		send_block[cnt++] = (byte) 0x00FF;
+		send_block[cnt++] = (byte) 0x00FF;
+
+		// send the data
+		this.ib.adapter.dataBlock(send_block, 0, cnt);
 
 		return true;
 	}
@@ -695,46 +712,46 @@ public boolean writeScratchpad(int addr, byte[] out_buf, int offset, int len)
 	 * @throws OneWireException
 	 */
 	public synchronized void copyScratchpad(byte[] es_data) throws OneWireIOException, OneWireException {
-		byte[] send_block = new byte[4];
+		var send_block = new byte[4];
 
 		// access the device
-		if (ib.adapter.select(ib.getAddress())) {
-			// ending address with data status
-			send_block[3] = es_data[2];// ES;
+		if (!this.ib.adapter.select(this.ib.getAddress())) {
+			throw new OneWireIOException("Device select failed.");
+		}
+		// ending address with data status
+		send_block[3] = es_data[2];// ES;
 
-			// address 2
-			send_block[2] = es_data[1];// TA2
+		// address 2
+		send_block[2] = es_data[1];// TA2
 
-			// address 1
-			send_block[1] = es_data[0];// TA1;
+		// address 1
+		send_block[1] = es_data[0];// TA1;
 
-			// Copy command
-			send_block[0] = COPY_SCRATCHPAD_COMMAND;
+		// Copy command
+		send_block[0] = COPY_SCRATCHPAD_COMMAND;
 
-			// send copy scratchpad command
-			ib.adapter.dataBlock(send_block, 0, 3);
+		// send copy scratchpad command
+		this.ib.adapter.dataBlock(send_block, 0, 3);
 
-			// provide strong pull-up for copy
-			ib.adapter.setPowerDuration(DSPortAdapter.DELIVERY_INFINITE);
-			ib.adapter.startPowerDelivery(DSPortAdapter.CONDITION_AFTER_BYTE);
-			ib.adapter.putByte(send_block[3]);
+		// provide strong pull-up for copy
+		this.ib.adapter.setPowerDuration(DSPortAdapter.DELIVERY_INFINITE);
+		this.ib.adapter.startPowerDelivery(DSPortAdapter.CONDITION_AFTER_BYTE);
+		this.ib.adapter.putByte(send_block[3]);
 
-			// pause before checking result
-			try {
-				Thread.sleep(12);
-			} catch (InterruptedException e) {
-			}
+		// pause before checking result
+		try {
+			Thread.sleep(12);
+		} catch (InterruptedException e) {
+		}
 
-			ib.adapter.setPowerNormal();
+		this.ib.adapter.setPowerNormal();
 
-			// get result
-			byte test = (byte) ib.adapter.getByte();
+		// get result
+		var test = (byte) this.ib.adapter.getByte();
 
-			if (test == (byte) 0x00FF) {
-				throw new OneWireIOException("The scratchpad did not get copied to memory.");
-			}
-		} else
-			throw new OneWireIOException("Device select failed.");
+		if (test == (byte) 0x00FF) {
+			throw new OneWireIOException("The scratchpad did not get copied to memory.");
+		}
 	}
 
 	/**
@@ -753,31 +770,32 @@ public synchronized void copyScratchpad(byte[] es_data) throws OneWireIOExceptio
 	public boolean readScratchpad(byte[] readBuf, int offset, int len, byte[] es_data)
 			throws OneWireIOException, OneWireException {
 		// select the device
-		if (!ib.adapter.select(ib.address)) {
-			forceVerify();
+		if (!this.ib.adapter.select(this.ib.address)) {
+			this.forceVerify();
 			throw new OneWireIOException("Device select failed");
 		}
 
 		// build first block
-		byte[] raw_buf = new byte[14];
+		var raw_buf = new byte[14];
 		raw_buf[0] = READ_SCRATCHPAD_COMMAND;
-		System.arraycopy(ffBlock, 0, raw_buf, 1, 13);
+		System.arraycopy(this.ffBlock, 0, raw_buf, 1, 13);
 
 		// do data block for TA1, TA2, and E/S
 		// followed by 8 bytes of data and 2 bytes of crc
-		ib.adapter.dataBlock(raw_buf, 0, 14);
+		this.ib.adapter.dataBlock(raw_buf, 0, 14);
 
 		// verify CRC16 is correct
-		if (CRC16.compute(raw_buf, 0, 14) == 0x0000B001) {
-			// optionally extract the extra info
-			if (es_data != null)
-				System.arraycopy(raw_buf, 1, es_data, 0, 3);
-
-			System.arraycopy(raw_buf, 4, readBuf, offset, len);
-			// success
-			return true;
-		} else
+		if (CRC16.compute(raw_buf, 0, 14) != 0x0000B001) {
 			throw new OneWireException("Error due to CRC.");
+		}
+		// optionally extract the extra info
+		if (es_data != null) {
+			System.arraycopy(raw_buf, 1, es_data, 0, 3);
+		}
+
+		System.arraycopy(raw_buf, 4, readBuf, offset, len);
+		// success
+		return true;
 	}
 
 }
diff --git a/io.openems.edge.bridge.onewire/src/com/dalsemi/onewire/container/MemoryBankEPROM.java b/io.openems.edge.bridge.onewire/src/com/dalsemi/onewire/container/MemoryBankEPROM.java
index 29e8885d5b7..07da2132dde 100644
--- a/io.openems.edge.bridge.onewire/src/com/dalsemi/onewire/container/MemoryBankEPROM.java
+++ b/io.openems.edge.bridge.onewire/src/com/dalsemi/onewire/container/MemoryBankEPROM.java
@@ -281,52 +281,53 @@ class MemoryBankEPROM implements OTPMemoryBank {
 	public MemoryBankEPROM(OneWireContainer ibutton) {
 
 		// keep reference to ibutton where memory bank is
-		ib = ibutton;
+		this.ib = ibutton;
 
 		// get references to MemoryBanks used in OTP operations, assume no
 		// locking/redirection
-		mbLock = null;
-		mbRedirect = null;
-		mbLockRedirect = null;
-		lockOffset = 0;
-		redirectOffset = 0;
-		lockRedirectOffset = 0;
+		this.mbLock = null;
+		this.mbRedirect = null;
+		this.mbLockRedirect = null;
+		this.lockOffset = 0;
+		this.redirectOffset = 0;
+		this.lockRedirectOffset = 0;
 
 		// initialize attributes of this memory bank - DEFAULT: Main memory DS1985 w/o
 		// lock stuff
-		generalPurposeMemory = true;
-		bankDescription = "Main Memory";
-		numberPages = 64;
-		size = 2048;
-		pageLength = 32;
-		maxPacketDataLength = 29;
-		readWrite = false;
-		writeOnce = true;
-		readOnly = false;
-		nonVolatile = true;
-		pageAutoCRC = true;
-		redirectPage = false;
-		lockPage = false;
-		lockRedirectPage = false;
-		programPulse = true;
-		powerDelivery = false;
-		extraInfo = true;
-		extraInfoLength = 1;
-		extraInfoDescription = "Inverted redirection page";
-		writeVerification = true;
-		startPhysicalAddress = 0;
-		READ_PAGE_WITH_CRC = MAIN_READ_PAGE_COMMAND;
-		WRITE_MEMORY_COMMAND = MAIN_WRITE_COMMAND;
-		numCRCBytes = 2;
-		crcAfterAddress = true;
-		normalReadCRC = false;
-		doSetSpeed = true;
+		this.generalPurposeMemory = true;
+		this.bankDescription = "Main Memory";
+		this.numberPages = 64;
+		this.size = 2048;
+		this.pageLength = 32;
+		this.maxPacketDataLength = 29;
+		this.readWrite = false;
+		this.writeOnce = true;
+		this.readOnly = false;
+		this.nonVolatile = true;
+		this.pageAutoCRC = true;
+		this.redirectPage = false;
+		this.lockPage = false;
+		this.lockRedirectPage = false;
+		this.programPulse = true;
+		this.powerDelivery = false;
+		this.extraInfo = true;
+		this.extraInfoLength = 1;
+		this.extraInfoDescription = "Inverted redirection page";
+		this.writeVerification = true;
+		this.startPhysicalAddress = 0;
+		this.READ_PAGE_WITH_CRC = MAIN_READ_PAGE_COMMAND;
+		this.WRITE_MEMORY_COMMAND = MAIN_WRITE_COMMAND;
+		this.numCRCBytes = 2;
+		this.crcAfterAddress = true;
+		this.normalReadCRC = false;
+		this.doSetSpeed = true;
 
 		// create the ffblock (used for faster 0xFF fills)
-		ffBlock = new byte[50];
+		this.ffBlock = new byte[50];
 
-		for (int i = 0; i < 50; i++)
-			ffBlock[i] = (byte) 0xFF;
+		for (var i = 0; i < 50; i++) {
+			this.ffBlock[i] = (byte) 0xFF;
+		}
 	}
 
 	// --------
@@ -338,8 +339,9 @@ public MemoryBankEPROM(OneWireContainer ibutton) {
 	 *
 	 * @return String containing the memory bank description
 	 */
+	@Override
 	public String getBankDescription() {
-		return bankDescription;
+		return this.bankDescription;
 	}
 
 	/**
@@ -349,8 +351,9 @@ public String getBankDescription() {
 	 *
 	 * @return 'true' if current memory bank is general purpose
 	 */
+	@Override
 	public boolean isGeneralPurposeMemory() {
-		return generalPurposeMemory;
+		return this.generalPurposeMemory;
 	}
 
 	/**
@@ -358,8 +361,9 @@ public boolean isGeneralPurposeMemory() {
 	 *
 	 * @return 'true' if current memory bank is read/write
 	 */
+	@Override
 	public boolean isReadWrite() {
-		return readWrite;
+		return this.readWrite;
 	}
 
 	/**
@@ -368,8 +372,9 @@ public boolean isReadWrite() {
 	 *
 	 * @return 'true' if current memory bank can only be written once
 	 */
+	@Override
 	public boolean isWriteOnce() {
-		return writeOnce;
+		return this.writeOnce;
 	}
 
 	/**
@@ -377,8 +382,9 @@ public boolean isWriteOnce() {
 	 *
 	 * @return 'true' if current memory bank can only be read
 	 */
+	@Override
 	public boolean isReadOnly() {
-		return readOnly;
+		return this.readOnly;
 	}
 
 	/**
@@ -387,8 +393,9 @@ public boolean isReadOnly() {
 	 *
 	 * @return 'true' if current memory bank non volatile.
 	 */
+	@Override
 	public boolean isNonVolatile() {
-		return nonVolatile;
+		return this.nonVolatile;
 	}
 
 	/**
@@ -398,8 +405,9 @@ public boolean isNonVolatile() {
 	 * @return 'true' if writing to the current memory bank pages requires a
 	 *         'ProgramPulse'.
 	 */
+	@Override
 	public boolean needsProgramPulse() {
-		return programPulse;
+		return this.programPulse;
 	}
 
 	/**
@@ -409,8 +417,9 @@ public boolean needsProgramPulse() {
 	 * @return 'true' if writing to the current memory bank pages requires
 	 *         'PowerDelivery'.
 	 */
+	@Override
 	public boolean needsPowerDelivery() {
-		return powerDelivery;
+		return this.powerDelivery;
 	}
 
 	/**
@@ -419,8 +428,9 @@ public boolean needsPowerDelivery() {
 	 *
 	 * @return physical starting address of this logical bank.
 	 */
+	@Override
 	public int getStartPhysicalAddress() {
-		return startPhysicalAddress;
+		return this.startPhysicalAddress;
 	}
 
 	/**
@@ -428,8 +438,9 @@ public int getStartPhysicalAddress() {
 	 *
 	 * @return memory bank size in bytes.
 	 */
+	@Override
 	public int getSize() {
-		return size;
+		return this.size;
 	}
 
 	// --------
@@ -441,8 +452,9 @@ public int getSize() {
 	 *
 	 * @return number of pages in current memory bank
 	 */
+	@Override
 	public int getNumberPages() {
-		return numberPages;
+		return this.numberPages;
 	}
 
 	/**
@@ -450,20 +462,22 @@ public int getNumberPages() {
 	 *
 	 * @return page length in bytes in current memory bank
 	 */
+	@Override
 	public int getPageLength() {
-		return pageLength;
+		return this.pageLength;
 	}
 
 	/**
 	 * Query to get Maximum data page length in bytes for a packet read or written
 	 * in the current memory bank. See the 'ReadPagePacket()' and
-	 * 'WritePagePacket()' methods. This method is only useful if the current
-	 * memory bank is general purpose memory.
+	 * 'WritePagePacket()' methods. This method is only useful if the current memory
+	 * bank is general purpose memory.
 	 *
 	 * @return max packet page length in bytes in current memory bank
 	 */
+	@Override
 	public int getMaxPacketDataLength() {
-		return maxPacketDataLength;
+		return this.maxPacketDataLength;
 	}
 
 	/**
@@ -473,8 +487,9 @@ public int getMaxPacketDataLength() {
 	 *
 	 * @return 'true' if current memory bank can be read with self generated CRC.
 	 */
+	@Override
 	public boolean hasPageAutoCRC() {
-		return pageAutoCRC;
+		return this.pageAutoCRC;
 	}
 
 	/**
@@ -494,8 +509,9 @@ public boolean hasPageAutoCRC() {
 	 * @see #readPagePacket(int,boolean,byte[],int,byte[]) readPagePacket(extra)
 	 * @since 1-Wire API 0.01
 	 */
+	@Override
 	public boolean hasExtraInfo() {
-		return extraInfo;
+		return this.extraInfo;
 	}
 
 	/**
@@ -505,8 +521,9 @@ public boolean hasExtraInfo() {
 	 * @return number of bytes in Extra Information read when reading pages in the
 	 *         current memory bank.
 	 */
+	@Override
 	public int getExtraInfoLength() {
-		return extraInfoLength;
+		return this.extraInfoLength;
 	}
 
 	/**
@@ -516,8 +533,9 @@ public int getExtraInfoLength() {
 	 *
 	 * @return string describing extra information.
 	 */
+	@Override
 	public String getExtraInfoDescription() {
-		return extraInfoDescription;
+		return this.extraInfoDescription;
 	}
 
 	/**
@@ -526,8 +544,9 @@ public String getExtraInfoDescription() {
 	 * @param doReadVerf true (default) verify write in 'write' false, don't verify
 	 *                   write (used on Write-Once bit manipulation)
 	 */
+	@Override
 	public void setWriteVerification(boolean doReadVerf) {
-		writeVerification = doReadVerf;
+		this.writeVerification = doReadVerf;
 	}
 
 	// --------
@@ -540,8 +559,9 @@ public void setWriteVerification(boolean doReadVerf) {
 	 *
 	 * @return 'true' if current memory bank pages can be redirected to a new page.
 	 */
+	@Override
 	public boolean canRedirectPage() {
-		return redirectPage;
+		return this.redirectPage;
 	}
 
 	/**
@@ -550,8 +570,9 @@ public boolean canRedirectPage() {
 	 *
 	 * @return 'true' if current memory bank pages can be redirected to a new page.
 	 */
+	@Override
 	public boolean canLockPage() {
-		return lockPage;
+		return this.lockPage;
 	}
 
 	/**
@@ -561,8 +582,9 @@ public boolean canLockPage() {
 	 * @return 'true' if current memory bank pages can be locked from being
 	 *         redirected to a new page.
 	 */
+	@Override
 	public boolean canLockRedirectPage() {
-		return lockRedirectPage;
+		return this.lockRedirectPage;
 	}
 
 	// --------
@@ -591,36 +613,41 @@ public boolean canLockRedirectPage() {
 	 * @throws OneWireIOException
 	 * @throws OneWireException
 	 */
+	@Override
 	public void read(int startAddr, boolean readContinue, byte[] readBuf, int offset, int len)
 			throws OneWireIOException, OneWireException {
 		int i;
 
 		// check if read exceeds memory
-		if ((startAddr + len) > (pageLength * numberPages))
+		if (startAddr + len > this.pageLength * this.numberPages) {
 			throw new OneWireException("Read exceeds memory bank end");
+		}
 
 		// attempt to put device at max desired speed
-		if (!readContinue)
-			checkSpeed();
+		if (!readContinue) {
+			this.checkSpeed();
+		}
 
 		// check if status memory
-		if (READ_PAGE_WITH_CRC == STATUS_READ_PAGE_COMMAND) {
+		if (this.READ_PAGE_WITH_CRC == STATUS_READ_PAGE_COMMAND) {
 
 			// no regular read memory so must use readPageCRC
-			int start_pg = startAddr / pageLength;
-			int end_pg = ((startAddr + len) / pageLength) - 1;
+			var start_pg = startAddr / this.pageLength;
+			var end_pg = (startAddr + len) / this.pageLength - 1;
 
-			if (((startAddr + len) % pageLength) > 0)
+			if ((startAddr + len) % this.pageLength > 0) {
 				end_pg++;
+			}
 
-			byte[] raw_buf = new byte[(end_pg - start_pg + 1) * pageLength];
+			var raw_buf = new byte[(end_pg - start_pg + 1) * this.pageLength];
 
 			// loop to read the pages
-			for (int pg = start_pg; pg <= end_pg; pg++)
-				readPageCRC(pg, !(pg == start_pg), raw_buf, (pg - start_pg) * pageLength, null, 0);
+			for (var pg = start_pg; pg <= end_pg; pg++) {
+				this.readPageCRC(pg, !(pg == start_pg), raw_buf, (pg - start_pg) * this.pageLength, null, 0);
+			}
 
 			// extract out the data
-			System.arraycopy(raw_buf, (startAddr % pageLength), readBuf, offset, len);
+			System.arraycopy(raw_buf, startAddr % this.pageLength, readBuf, offset, len);
 		}
 
 		// regular memory so use standard read memory command
@@ -630,37 +657,38 @@ public void read(int startAddr, boolean readContinue, byte[] readBuf, int offset
 			if (!readContinue) {
 
 				// select the device
-				if (!ib.adapter.select(ib.address)) {
-					forceVerify();
+				if (!this.ib.adapter.select(this.ib.address)) {
+					this.forceVerify();
 
 					throw new OneWireIOException("Device select failed");
 				}
 
 				// build start reading memory block
-				byte[] raw_buf = new byte[4];
+				var raw_buf = new byte[4];
 
 				raw_buf[0] = READ_MEMORY_COMMAND;
-				raw_buf[1] = (byte) ((startAddr + startPhysicalAddress) & 0xFF);
-				raw_buf[2] = (byte) ((((startAddr + startPhysicalAddress) & 0xFFFF) >>> 8) & 0xFF);
+				raw_buf[1] = (byte) (startAddr + this.startPhysicalAddress & 0xFF);
+				raw_buf[2] = (byte) ((startAddr + this.startPhysicalAddress & 0xFFFF) >>> 8 & 0xFF);
 				raw_buf[3] = (byte) 0xFF;
 
 				// check if get a 1 byte crc in a normal read.
-				int num_bytes = (normalReadCRC) ? 4 : 3;
+				var num_bytes = this.normalReadCRC ? 4 : 3;
 
 				// do the first block for command, address
-				ib.adapter.dataBlock(raw_buf, 0, num_bytes);
+				this.ib.adapter.dataBlock(raw_buf, 0, num_bytes);
 			}
 
 			// pre-fill readBuf with 0xFF
-			int pgs = len / pageLength;
-			int extra = len % pageLength;
+			var pgs = len / this.pageLength;
+			var extra = len % this.pageLength;
 
-			for (i = 0; i < pgs; i++)
-				System.arraycopy(ffBlock, 0, readBuf, offset + i * pageLength, pageLength);
-			System.arraycopy(ffBlock, 0, readBuf, offset + pgs * pageLength, extra);
+			for (i = 0; i < pgs; i++) {
+				System.arraycopy(this.ffBlock, 0, readBuf, offset + i * this.pageLength, this.pageLength);
+			}
+			System.arraycopy(this.ffBlock, 0, readBuf, offset + pgs * this.pageLength, extra);
 
 			// send second block to read data, return result
-			ib.adapter.dataBlock(readBuf, offset, len);
+			this.ib.adapter.dataBlock(readBuf, offset, len);
 		}
 	}
 
@@ -684,46 +712,50 @@ public void read(int startAddr, boolean readContinue, byte[] readBuf, int offset
 	 * @throws OneWireIOException
 	 * @throws OneWireException
 	 */
+	@Override
 	public void write(int startAddr, byte[] writeBuf, int offset, int len) throws OneWireIOException, OneWireException {
 		int i;
 		byte result;
 
 		// return if nothing to do
-		if (len == 0)
+		if (len == 0) {
 			return;
+		}
 
 		// check if power delivery is available
-		if (!ib.adapter.canProgram())
+		if (!this.ib.adapter.canProgram()) {
 			throw new OneWireException("Program voltage required but not available");
+		}
 
 		// check if trying to write read only bank
-		if (isReadOnly())
+		if (this.isReadOnly()) {
 			throw new OneWireException("Trying to write read-only memory bank");
+		}
 
 		// check if write exceeds memory
-		if ((startAddr + len) > (pageLength * numberPages))
+		if (startAddr + len > this.pageLength * this.numberPages) {
 			throw new OneWireException("Write exceeds memory bank end");
+		}
 
 		// set the program pulse duration
-		ib.adapter.setProgramPulseDuration(DSPortAdapter.DELIVERY_EPROM);
+		this.ib.adapter.setProgramPulseDuration(DSPortAdapter.DELIVERY_EPROM);
 
 		// attempt to put device at max desired speed
-		checkSpeed();
+		this.checkSpeed();
 
 		// loop while still have bytes to write
-		boolean write_continue = false;
+		var write_continue = false;
 
 		for (i = 0; i < len; i++) {
-			result = programByte(startAddr + i + startPhysicalAddress, writeBuf[offset + i], write_continue);
+			result = this.programByte(startAddr + i + this.startPhysicalAddress, writeBuf[offset + i], write_continue);
 
-			if (writeVerification) {
-				if ((byte) result == (byte) writeBuf[offset + i])
-					write_continue = true;
-				else {
-					forceVerify();
+			if (this.writeVerification) {
+				if (result != writeBuf[offset + i]) {
+					this.forceVerify();
 
 					throw new OneWireIOException("Read back byte on EPROM programming did not match");
 				}
+				write_continue = true;
 			}
 		}
 	}
@@ -753,12 +785,14 @@ public void write(int startAddr, byte[] writeBuf, int offset, int len) throws On
 	 * @throws OneWireIOException
 	 * @throws OneWireException
 	 */
+	@Override
 	public void readPage(int page, boolean readContinue, byte[] readBuf, int offset)
 			throws OneWireIOException, OneWireException {
-		if (pageAutoCRC)
-			readPageCRC(page, readContinue, readBuf, offset, null, extraInfoLength);
-		else
-			read(page * pageLength, readContinue, readBuf, offset, pageLength);
+		if (this.pageAutoCRC) {
+			this.readPageCRC(page, readContinue, readBuf, offset, null, this.extraInfoLength);
+		} else {
+			this.read(page * this.pageLength, readContinue, readBuf, offset, this.pageLength);
+		}
 	}
 
 	/**
@@ -784,14 +818,16 @@ public void readPage(int page, boolean readContinue, byte[] readBuf, int offset)
 	 * @throws OneWireIOException
 	 * @throws OneWireException
 	 */
+	@Override
 	public void readPage(int page, boolean readContinue, byte[] readBuf, int offset, byte[] extraInfo)
 			throws OneWireIOException, OneWireException {
 
 		// check if current bank is not scratchpad bank, or not page 0
-		if (!this.extraInfo)
+		if (!this.extraInfo) {
 			throw new OneWireException("Read extra information not supported on this memory bank");
+		}
 
-		readPageCRC(page, readContinue, readBuf, offset, extraInfo, extraInfoLength);
+		this.readPageCRC(page, readContinue, readBuf, offset, extraInfo, this.extraInfoLength);
 	}
 
 	/**
@@ -815,20 +851,22 @@ public void readPage(int page, boolean readContinue, byte[] readBuf, int offset,
 	 * @throws OneWireIOException
 	 * @throws OneWireException
 	 */
+	@Override
 	public int readPagePacket(int page, boolean readContinue, byte[] readBuf, int offset, byte[] extraInfo)
 			throws OneWireIOException, OneWireException {
-		byte[] raw_buf = new byte[pageLength];
+		var raw_buf = new byte[this.pageLength];
 
 		// check if current bank is not scratchpad bank, or not page 0
-		if (!this.extraInfo)
+		if (!this.extraInfo) {
 			throw new OneWireException("Read extra information not supported on this memory bank");
+		}
 
 		// read entire page with read page CRC
-		readPageCRC(page, readContinue, raw_buf, 0, extraInfo, extraInfoLength);
+		this.readPageCRC(page, readContinue, raw_buf, 0, extraInfo, this.extraInfoLength);
 
 		// check if length is realistic
-		if ((raw_buf[0] & 0x00FF) > maxPacketDataLength) {
-			forceVerify();
+		if ((raw_buf[0] & 0x00FF) > this.maxPacketDataLength) {
+			this.forceVerify();
 
 			throw new OneWireIOException("Invalid length in packet");
 		}
@@ -841,11 +879,10 @@ public int readPagePacket(int page, boolean readContinue, byte[] readBuf, int of
 
 			// return the length
 			return raw_buf[0];
-		} else {
-			forceVerify();
-
-			throw new OneWireIOException("Invalid CRC16 in packet read");
 		}
+		this.forceVerify();
+
+		throw new OneWireIOException("Invalid CRC16 in packet read");
 	}
 
 	/**
@@ -868,16 +905,17 @@ public int readPagePacket(int page, boolean readContinue, byte[] readBuf, int of
 	 * @throws OneWireIOException
 	 * @throws OneWireException
 	 */
+	@Override
 	public int readPagePacket(int page, boolean readContinue, byte[] readBuf, int offset)
 			throws OneWireIOException, OneWireException {
-		byte[] raw_buf = new byte[pageLength];
+		var raw_buf = new byte[this.pageLength];
 
 		// read entire page with read page CRC
-		readPageCRC(page, readContinue, raw_buf, 0, null, extraInfoLength);
+		this.readPageCRC(page, readContinue, raw_buf, 0, null, this.extraInfoLength);
 
 		// check if length is realistic
-		if ((raw_buf[0] & 0x00FF) > maxPacketDataLength) {
-			forceVerify();
+		if ((raw_buf[0] & 0x00FF) > this.maxPacketDataLength) {
+			this.forceVerify();
 
 			throw new OneWireIOException("Invalid length in packet");
 		}
@@ -890,11 +928,10 @@ public int readPagePacket(int page, boolean readContinue, byte[] readBuf, int of
 
 			// return the length
 			return raw_buf[0];
-		} else {
-			forceVerify();
-
-			throw new OneWireIOException("Invalid CRC16 in packet read");
 		}
+		this.forceVerify();
+
+		throw new OneWireIOException("Invalid CRC16 in packet read");
 	}
 
 	/**
@@ -909,31 +946,34 @@ public int readPagePacket(int page, boolean readContinue, byte[] readBuf, int of
 	 * @throws OneWireIOException
 	 * @throws OneWireException
 	 */
+	@Override
 	public void writePagePacket(int page, byte[] writeBuf, int offset, int len)
 			throws OneWireIOException, OneWireException {
 
 		// make sure length does not exceed max
-		if (len > maxPacketDataLength)
+		if (len > this.maxPacketDataLength) {
 			throw new OneWireIOException("Length of packet requested exceeds page size");
+		}
 
 		// see if this bank is general read/write
-		if (!generalPurposeMemory)
+		if (!this.generalPurposeMemory) {
 			throw new OneWireException("Current bank is not general purpose memory");
+		}
 
 		// construct the packet to write
-		byte[] raw_buf = new byte[len + 3];
+		var raw_buf = new byte[len + 3];
 
 		raw_buf[0] = (byte) len;
 
 		System.arraycopy(writeBuf, offset, raw_buf, 1, len);
 
-		int crc = CRC16.compute(raw_buf, 0, len + 1, page);
+		var crc = CRC16.compute(raw_buf, 0, len + 1, page);
 
 		raw_buf[len + 1] = (byte) (~crc & 0xFF);
-		raw_buf[len + 2] = (byte) (((~crc & 0xFFFF) >>> 8) & 0xFF);
+		raw_buf[len + 2] = (byte) ((~crc & 0xFFFF) >>> 8 & 0xFF);
 
 		// write the packet, return result
-		write(page * pageLength, raw_buf, 0, len + 3);
+		this.write(page * this.pageLength, raw_buf, 0, len + 3);
 	}
 
 	/**
@@ -952,9 +992,10 @@ public void writePagePacket(int page, byte[] writeBuf, int offset, int len)
 	 * @throws OneWireIOException
 	 * @throws OneWireException
 	 */
+	@Override
 	public void readPageCRC(int page, boolean readContinue, byte[] readBuf, int offset)
 			throws OneWireIOException, OneWireException {
-		readPageCRC(page, readContinue, readBuf, offset, null, extraInfoLength);
+		this.readPageCRC(page, readContinue, readBuf, offset, null, this.extraInfoLength);
 	}
 
 	/**
@@ -976,9 +1017,10 @@ public void readPageCRC(int page, boolean readContinue, byte[] readBuf, int offs
 	 * @throws OneWireIOException
 	 * @throws OneWireException
 	 */
+	@Override
 	public void readPageCRC(int page, boolean readContinue, byte[] readBuf, int offset, byte[] extraInfo)
 			throws OneWireIOException, OneWireException {
-		readPageCRC(page, readContinue, readBuf, offset, extraInfo, extraInfoLength);
+		this.readPageCRC(page, readContinue, readBuf, offset, extraInfo, this.extraInfoLength);
 	}
 
 	// --------
@@ -994,24 +1036,25 @@ public void readPageCRC(int page, boolean readContinue, byte[] readBuf, int offs
 	 * @throws OneWireIOException
 	 * @throws OneWireException
 	 */
+	@Override
 	public void lockPage(int page) throws OneWireIOException, OneWireException {
 
 		// create byte to write to mlLock to lock page
-		int nbyt = (page >>> 3);
-		int nbit = page - (nbyt << 3);
-		byte[] wr_byte = new byte[1];
+		var nbyt = page >>> 3;
+		var nbit = page - (nbyt << 3);
+		var wr_byte = new byte[1];
 
 		wr_byte[0] = (byte) ~(0x01 << nbit);
 
 		// bit field so turn off write verification
-		mbLock.setWriteVerification(false);
+		this.mbLock.setWriteVerification(false);
 
 		// write the lock bit
-		mbLock.write(nbyt + lockOffset, wr_byte, 0, 1);
+		this.mbLock.write(nbyt + this.lockOffset, wr_byte, 0, 1);
 
 		// read back to verify
-		if (!isPageLocked(page)) {
-			forceVerify();
+		if (!this.isPageLocked(page)) {
+			this.forceVerify();
 
 			throw new OneWireIOException("Read back from write incorrect, could not lock page");
 		}
@@ -1027,23 +1070,24 @@ public void lockPage(int page) throws OneWireIOException, OneWireException {
 	 * @throws OneWireIOException
 	 * @throws OneWireException
 	 */
+	@Override
 	public boolean isPageLocked(int page) throws OneWireIOException, OneWireException {
 
 		// read page that locked bit is on
-		int pg_len = mbLock.getPageLength();
-		int read_pg = (page + lockOffset) / (pg_len * 8);
+		var pg_len = this.mbLock.getPageLength();
+		var read_pg = (page + this.lockOffset) / (pg_len * 8);
 
 		// read page with bit
-		byte[] read_buf = new byte[pg_len];
+		var read_buf = new byte[pg_len];
 
-		mbLock.readPageCRC(read_pg, false, read_buf, 0);
+		this.mbLock.readPageCRC(read_pg, false, read_buf, 0);
 
 		// return boolean on locked bit
-		int index = (page + lockOffset) - (read_pg * 8 * pg_len);
-		int nbyt = (index >>> 3);
-		int nbit = index - (nbyt << 3);
+		var index = page + this.lockOffset - read_pg * 8 * pg_len;
+		var nbyt = index >>> 3;
+		var nbit = index - (nbyt << 3);
 
-		return !(((read_buf[nbyt] >>> nbit) & 0x01) == 0x01);
+		return !((read_buf[nbyt] >>> nbit & 0x01) == 0x01);
 	}
 
 	/**
@@ -1056,18 +1100,19 @@ public boolean isPageLocked(int page) throws OneWireIOException, OneWireExceptio
 	 * @throws OneWireIOException
 	 * @throws OneWireException
 	 */
+	@Override
 	public void redirectPage(int page, int newPage) throws OneWireIOException, OneWireException {
 
 		// create byte to redirect page
-		byte[] wr_byte = new byte[1];
+		var wr_byte = new byte[1];
 
 		wr_byte[0] = (byte) ~newPage;
 
 		// writing byte so turn on write verification
-		mbRedirect.setWriteVerification(true);
+		this.mbRedirect.setWriteVerification(true);
 
 		// write the redirection byte
-		mbRedirect.write(page + redirectOffset, wr_byte, 0, 1);
+		this.mbRedirect.write(page + this.redirectOffset, wr_byte, 0, 1);
 	}
 
 	/**
@@ -1091,48 +1136,50 @@ public void redirectPage(int page, int newPage) throws OneWireIOException, OneWi
 	 * @see #redirectPage(int,int) redirectPage
 	 * @since 1-Wire API 0.01
 	 */
+	@Override
 	public int getRedirectedPage(int page) throws OneWireIOException, OneWireException {
 
 		// read page that redirect byte is on
-		int pg_len = mbRedirect.getPageLength();
-		int read_pg = (page + redirectOffset) / pg_len;
+		var pg_len = this.mbRedirect.getPageLength();
+		var read_pg = (page + this.redirectOffset) / pg_len;
 
 		// read page with byte
-		byte[] read_buf = new byte[pg_len];
+		var read_buf = new byte[pg_len];
 
-		mbRedirect.readPageCRC(read_pg, false, read_buf, 0);
+		this.mbRedirect.readPageCRC(read_pg, false, read_buf, 0);
 
 		// return page
-		return ~read_buf[(page + redirectOffset) % pg_len] & 0x000000FF;
+		return ~read_buf[(page + this.redirectOffset) % pg_len] & 0x000000FF;
 	}
 
 	/**
-	 * Lock the redirection option for the specified page in the current memory bank.
-	 * Not supported by all devices. See the method 'canLockRedirectPage()'.
+	 * Lock the redirection option for the specified page in the current memory
+	 * bank. Not supported by all devices. See the method 'canLockRedirectPage()'.
 	 *
 	 * @param page number of page to redirect
 	 *
 	 * @throws OneWireIOException
 	 * @throws OneWireException
 	 */
+	@Override
 	public void lockRedirectPage(int page) throws OneWireIOException, OneWireException {
 
 		// create byte to write to mlLock to lock page
-		int nbyt = (page >>> 3);
-		int nbit = page - (nbyt << 3);
-		byte[] wr_byte = new byte[1];
+		var nbyt = page >>> 3;
+		var nbit = page - (nbyt << 3);
+		var wr_byte = new byte[1];
 
 		wr_byte[0] = (byte) ~(0x01 << nbit);
 
 		// bit field so turn off write verification
-		mbLockRedirect.setWriteVerification(false);
+		this.mbLockRedirect.setWriteVerification(false);
 
 		// write the lock bit
-		mbLockRedirect.write(nbyt + lockRedirectOffset, wr_byte, 0, 1);
+		this.mbLockRedirect.write(nbyt + this.lockRedirectOffset, wr_byte, 0, 1);
 
 		// read back to verify
-		if (!isRedirectPageLocked(page)) {
-			forceVerify();
+		if (!this.isRedirectPageLocked(page)) {
+			this.forceVerify();
 
 			throw new OneWireIOException("Read back from write incorrect, could not lock redirect byte");
 		}
@@ -1149,23 +1196,24 @@ public void lockRedirectPage(int page) throws OneWireIOException, OneWireExcepti
 	 * @throws OneWireIOException
 	 * @throws OneWireException
 	 */
+	@Override
 	public boolean isRedirectPageLocked(int page) throws OneWireIOException, OneWireException {
 
 		// read page that lock redirect bit is on
-		int pg_len = mbLockRedirect.getPageLength();
-		int read_pg = (page + lockRedirectOffset) / (pg_len * 8);
+		var pg_len = this.mbLockRedirect.getPageLength();
+		var read_pg = (page + this.lockRedirectOffset) / (pg_len * 8);
 
 		// read page with bit
-		byte[] read_buf = new byte[pg_len];
+		var read_buf = new byte[pg_len];
 
-		mbLockRedirect.readPageCRC(read_pg, false, read_buf, 0);
+		this.mbLockRedirect.readPageCRC(read_pg, false, read_buf, 0);
 
 		// return boolean on lock redirect bit
-		int index = (page + lockRedirectOffset) - (read_pg * 8 * pg_len);
-		int nbyt = (index >>> 3);
-		int nbit = index - (nbyt << 3);
+		var index = page + this.lockRedirectOffset - read_pg * 8 * pg_len;
+		var nbyt = index >>> 3;
+		var nbit = index - (nbyt << 3);
 
-		return !(((read_buf[nbyt] >>> nbit) & 0x01) == 0x01);
+		return !((read_buf[nbyt] >>> nbit & 0x01) == 0x01);
 	}
 
 	// --------
@@ -1194,111 +1242,113 @@ public boolean isRedirectPageLocked(int page) throws OneWireIOException, OneWire
 	protected void readPageCRC(int page, boolean readContinue, byte[] readBuf, int offset, byte[] extraInfo,
 			int extraLength) throws OneWireIOException, OneWireException {
 		int len = 0, lastcrc = 0;
-		byte[] raw_buf = new byte[pageLength + numCRCBytes];
+		var raw_buf = new byte[this.pageLength + this.numCRCBytes];
 
 		// only needs to be implemented if supported by hardware
-		if (!pageAutoCRC)
+		if (!this.pageAutoCRC) {
 			throw new OneWireException("Read page with CRC not supported in this memory bank");
+		}
 
 		// attempt to put device at max desired speed
-		if (!readContinue)
-			checkSpeed();
+		if (!readContinue) {
+			this.checkSpeed();
+		}
 
 		// check if read exceeds memory
-		if (page > numberPages)
+		if (page > this.numberPages) {
 			throw new OneWireException("Read exceeds memory bank end");
+		}
 
 		// see if need to access the device
 		if (!readContinue) {
 
 			// select the device
-			if (!ib.adapter.select(ib.address)) {
-				forceVerify();
+			if (!this.ib.adapter.select(this.ib.address)) {
+				this.forceVerify();
 
 				throw new OneWireIOException("Device select failed");
 			}
 
 			// build start reading memory block with: command, address, (extraInfo?), (crc?)
-			len = 3 + extraInfoLength;
+			len = 3 + this.extraInfoLength;
 
-			if (crcAfterAddress)
-				len += numCRCBytes;
+			if (this.crcAfterAddress) {
+				len += this.numCRCBytes;
+			}
 
-			System.arraycopy(ffBlock, 0, raw_buf, 0, len);
+			System.arraycopy(this.ffBlock, 0, raw_buf, 0, len);
 
-			raw_buf[0] = READ_PAGE_WITH_CRC;
+			raw_buf[0] = this.READ_PAGE_WITH_CRC;
 
-			int addr = page * pageLength + startPhysicalAddress;
+			var addr = page * this.pageLength + this.startPhysicalAddress;
 
 			raw_buf[1] = (byte) (addr & 0xFF);
-			raw_buf[2] = (byte) (((addr & 0xFFFF) >>> 8) & 0xFF);
+			raw_buf[2] = (byte) ((addr & 0xFFFF) >>> 8 & 0xFF);
 
 			// do the first block
-			ib.adapter.dataBlock(raw_buf, 0, len);
-		} else if (extraInfoLength > 0) {
+			this.ib.adapter.dataBlock(raw_buf, 0, len);
+		} else if (this.extraInfoLength > 0) {
 
 			// build first block with: extraInfo, crc
-			len = extraInfoLength + numCRCBytes;
+			len = this.extraInfoLength + this.numCRCBytes;
 
-			System.arraycopy(ffBlock, 0, raw_buf, 0, len);
+			System.arraycopy(this.ffBlock, 0, raw_buf, 0, len);
 
 			// do the first block
-			ib.adapter.dataBlock(raw_buf, 0, len);
+			this.ib.adapter.dataBlock(raw_buf, 0, len);
 		}
 
 		// check CRC
-		if (numCRCBytes == 2)
+		if (this.numCRCBytes == 2) {
 			lastcrc = CRC16.compute(raw_buf, 0, len, 0);
-		else
+		} else {
 			lastcrc = CRC8.compute(raw_buf, 0, len, 0);
+		}
 
-		if ((extraInfoLength > 0) || (crcAfterAddress)) {
+		if (this.extraInfoLength > 0 || this.crcAfterAddress) {
 
 			// check CRC
-			if (numCRCBytes == 2) {
+			if (this.numCRCBytes == 2) {
 				if (lastcrc != 0x0000B001) {
-					forceVerify();
+					this.forceVerify();
 
 					throw new OneWireIOException("Invalid CRC16 read from device");
 				}
-			} else {
-				if (lastcrc != 0) {
-					forceVerify();
+			} else if (lastcrc != 0) {
+				this.forceVerify();
 
-					throw new OneWireIOException("Invalid CRC8 read from device");
-				}
+				throw new OneWireIOException("Invalid CRC8 read from device");
 			}
 
 			lastcrc = 0;
 
 			// extract the extra information
-			if ((extraInfoLength > 0) && (extraInfo != null))
-				System.arraycopy(raw_buf, len - extraInfoLength - numCRCBytes, extraInfo, 0, extraLength);
+			if (this.extraInfoLength > 0 && extraInfo != null) {
+				System.arraycopy(raw_buf, len - this.extraInfoLength - this.numCRCBytes, extraInfo, 0, extraLength);
+			}
 		}
 
 		// pre-fill with 0xFF
-		System.arraycopy(ffBlock, 0, raw_buf, 0, raw_buf.length);
+		System.arraycopy(this.ffBlock, 0, raw_buf, 0, raw_buf.length);
 
 		// send block to read data + crc
-		ib.adapter.dataBlock(raw_buf, 0, raw_buf.length);
+		this.ib.adapter.dataBlock(raw_buf, 0, raw_buf.length);
 
 		// check the CRC
-		if (numCRCBytes == 2) {
+		if (this.numCRCBytes == 2) {
 			if (CRC16.compute(raw_buf, 0, raw_buf.length, lastcrc) != 0x0000B001) {
-				forceVerify();
+				this.forceVerify();
 
 				throw new OneWireIOException("Invalid CRC16 read from device");
 			}
-		} else {
-			if (CRC8.compute(raw_buf, 0, raw_buf.length, lastcrc) != 0) {
-				forceVerify();
+		} else if (CRC8.compute(raw_buf, 0, raw_buf.length, lastcrc) != 0) {
+			this.forceVerify();
 
-				throw new OneWireIOException("Invalid CRC8 read from device");
-			}
+			throw new OneWireIOException("Invalid CRC8 read from device");
 		}
 
 		// extract the page data
-		System.arraycopy(raw_buf, 0, readBuf, offset, pageLength);
+		System.arraycopy(raw_buf, 0, readBuf, offset, this.pageLength);
 	}
 
 	/**
@@ -1323,24 +1373,24 @@ protected byte programByte(int addr, byte data, boolean writeContinue) throws On
 		if (!writeContinue) {
 
 			// select the device
-			if (!ib.adapter.select(ib.address)) {
-				forceVerify();
+			if (!this.ib.adapter.select(this.ib.address)) {
+				this.forceVerify();
 
 				throw new OneWireIOException("device not present");
 			}
 
 			// pre-fill with 0xFF
-			byte[] raw_buf = new byte[6];
+			var raw_buf = new byte[6];
 
-			System.arraycopy(ffBlock, 0, raw_buf, 0, raw_buf.length);
+			System.arraycopy(this.ffBlock, 0, raw_buf, 0, raw_buf.length);
 
 			// construct packet
-			raw_buf[0] = (byte) WRITE_MEMORY_COMMAND;
+			raw_buf[0] = this.WRITE_MEMORY_COMMAND;
 			raw_buf[1] = (byte) (addr & 0xFF);
-			raw_buf[2] = (byte) (((addr & 0xFFFF) >>> 8) & 0xFF);
-			raw_buf[3] = (byte) data;
+			raw_buf[2] = (byte) ((addr & 0xFFFF) >>> 8 & 0xFF);
+			raw_buf[3] = data;
 
-			if (numCRCBytes == 2) {
+			if (this.numCRCBytes == 2) {
 				lastcrc = CRC16.compute(raw_buf, 0, 4, 0);
 				len = 6;
 			} else {
@@ -1349,42 +1399,40 @@ protected byte programByte(int addr, byte data, boolean writeContinue) throws On
 			}
 
 			// send block to read data + crc
-			ib.adapter.dataBlock(raw_buf, 0, len);
+			this.ib.adapter.dataBlock(raw_buf, 0, len);
 
 			// check CRC
-			if (numCRCBytes == 2) {
+			if (this.numCRCBytes == 2) {
 				if (CRC16.compute(raw_buf, 4, 2, lastcrc) != 0x0000B001) {
-					forceVerify();
+					this.forceVerify();
 
 					throw new OneWireIOException("Invalid CRC16 read from device");
 				}
-			} else {
-				if (CRC8.compute(raw_buf, 4, 1, lastcrc) != 0) {
-					forceVerify();
+			} else if (CRC8.compute(raw_buf, 4, 1, lastcrc) != 0) {
+				this.forceVerify();
 
-					throw new OneWireIOException("Invalid CRC8 read from device");
-				}
+				throw new OneWireIOException("Invalid CRC8 read from device");
 			}
 		} else {
 
 			// send the data
-			ib.adapter.putByte(data);
+			this.ib.adapter.putByte(data);
 
 			// check CRC from device
-			if (numCRCBytes == 2) {
+			if (this.numCRCBytes == 2) {
 				lastcrc = CRC16.compute(data, addr);
-				lastcrc = CRC16.compute(ib.adapter.getByte(), lastcrc);
+				lastcrc = CRC16.compute(this.ib.adapter.getByte(), lastcrc);
 
-				if (CRC16.compute(ib.adapter.getByte(), lastcrc) != 0x0000B001) {
-					forceVerify();
+				if (CRC16.compute(this.ib.adapter.getByte(), lastcrc) != 0x0000B001) {
+					this.forceVerify();
 
 					throw new OneWireIOException("Invalid CRC16 read from device");
 				}
 			} else {
 				lastcrc = CRC8.compute(data, addr);
 
-				if (CRC8.compute(ib.adapter.getByte(), lastcrc) != 0) {
-					forceVerify();
+				if (CRC8.compute(this.ib.adapter.getByte(), lastcrc) != 0) {
+					this.forceVerify();
 
 					throw new OneWireIOException("Invalid CRC8 read from device");
 				}
@@ -1392,10 +1440,10 @@ protected byte programByte(int addr, byte data, boolean writeContinue) throws On
 		}
 
 		// send the pulse
-		ib.adapter.startProgramPulse(DSPortAdapter.CONDITION_NOW);
+		this.ib.adapter.startProgramPulse(DSPortAdapter.CONDITION_NOW);
 
 		// return the result
-		return (byte) ib.adapter.getByte();
+		return (byte) this.ib.adapter.getByte();
 	}
 
 	// --------
@@ -1413,13 +1461,13 @@ public void checkSpeed() throws OneWireIOException, OneWireException {
 		synchronized (this) {
 
 			// only check the speed
-			if (doSetSpeed) {
+			if (this.doSetSpeed) {
 
 				// attempt to set the correct speed and verify device present
-				ib.doSpeed();
+				this.ib.doSpeed();
 
 				// no exceptions so clear flag
-				doSetSpeed = false;
+				this.doSetSpeed = false;
 			}
 		}
 	}
@@ -1430,7 +1478,7 @@ public void checkSpeed() throws OneWireIOException, OneWireException {
 	 */
 	public void forceVerify() {
 		synchronized (this) {
-			doSetSpeed = true;
+			this.doSetSpeed = true;
 		}
 	}
 }
diff --git a/io.openems.edge.bridge.onewire/src/com/dalsemi/onewire/container/MemoryBankNV.java b/io.openems.edge.bridge.onewire/src/com/dalsemi/onewire/container/MemoryBankNV.java
index c3ce9a2bcf5..06f7b5a5471 100644
--- a/io.openems.edge.bridge.onewire/src/com/dalsemi/onewire/container/MemoryBankNV.java
+++ b/io.openems.edge.bridge.onewire/src/com/dalsemi/onewire/container/MemoryBankNV.java
@@ -185,36 +185,37 @@ class MemoryBankNV implements PagedMemoryBank {
 	public MemoryBankNV(OneWireContainer ibutton, ScratchPad scratch) {
 
 		// keep reference to ibutton where memory bank is
-		ib = ibutton;
+		this.ib = ibutton;
 
 		// keep reference to scratchPad bank
-		sp = scratch;
+		this.sp = scratch;
 
 		// initialize attributes of this memory bank - DEFAULT: DS1993 main memory
-		bankDescription = "Main Memory";
-		generalPurposeMemory = true;
-		startPhysicalAddress = 0;
-		size = 512;
-		readWrite = true;
-		writeOnce = false;
-		readOnly = false;
-		nonVolatile = true;
-		programPulse = false;
-		powerDelivery = false;
-		writeVerification = true;
-		numberPages = 16;
-		pageLength = 32;
-		maxPacketDataLength = 29;
-		pageAutoCRC = false;
-		extraInfo = false;
-		extraInfoLength = 0;
-		extraInfoDescription = null;
+		this.bankDescription = "Main Memory";
+		this.generalPurposeMemory = true;
+		this.startPhysicalAddress = 0;
+		this.size = 512;
+		this.readWrite = true;
+		this.writeOnce = false;
+		this.readOnly = false;
+		this.nonVolatile = true;
+		this.programPulse = false;
+		this.powerDelivery = false;
+		this.writeVerification = true;
+		this.numberPages = 16;
+		this.pageLength = 32;
+		this.maxPacketDataLength = 29;
+		this.pageAutoCRC = false;
+		this.extraInfo = false;
+		this.extraInfoLength = 0;
+		this.extraInfoDescription = null;
 
 		// create the ffblock (used for faster 0xFF fills)
-		ffBlock = new byte[96];
+		this.ffBlock = new byte[96];
 
-		for (int i = 0; i < 96; i++)
-			ffBlock[i] = (byte) 0xFF;
+		for (var i = 0; i < 96; i++) {
+			this.ffBlock[i] = (byte) 0xFF;
+		}
 	}
 
 	// --------
@@ -226,8 +227,9 @@ public MemoryBankNV(OneWireContainer ibutton, ScratchPad scratch) {
 	 *
 	 * @return String containing the memory bank description
 	 */
+	@Override
 	public String getBankDescription() {
-		return bankDescription;
+		return this.bankDescription;
 	}
 
 	/**
@@ -237,8 +239,9 @@ public String getBankDescription() {
 	 *
 	 * @return 'true' if current memory bank is general purpose
 	 */
+	@Override
 	public boolean isGeneralPurposeMemory() {
-		return generalPurposeMemory;
+		return this.generalPurposeMemory;
 	}
 
 	/**
@@ -246,8 +249,9 @@ public boolean isGeneralPurposeMemory() {
 	 *
 	 * @return 'true' if current memory bank is read/write
 	 */
+	@Override
 	public boolean isReadWrite() {
-		return readWrite;
+		return this.readWrite;
 	}
 
 	/**
@@ -256,8 +260,9 @@ public boolean isReadWrite() {
 	 *
 	 * @return 'true' if current memory bank can only be written once
 	 */
+	@Override
 	public boolean isWriteOnce() {
-		return writeOnce;
+		return this.writeOnce;
 	}
 
 	/**
@@ -265,8 +270,9 @@ public boolean isWriteOnce() {
 	 *
 	 * @return 'true' if current memory bank can only be read
 	 */
+	@Override
 	public boolean isReadOnly() {
-		return readOnly;
+		return this.readOnly;
 	}
 
 	/**
@@ -275,8 +281,9 @@ public boolean isReadOnly() {
 	 *
 	 * @return 'true' if current memory bank non volatile.
 	 */
+	@Override
 	public boolean isNonVolatile() {
-		return nonVolatile;
+		return this.nonVolatile;
 	}
 
 	/**
@@ -286,8 +293,9 @@ public boolean isNonVolatile() {
 	 * @return 'true' if writing to the current memory bank pages requires a
 	 *         'ProgramPulse'.
 	 */
+	@Override
 	public boolean needsProgramPulse() {
-		return programPulse;
+		return this.programPulse;
 	}
 
 	/**
@@ -297,8 +305,9 @@ public boolean needsProgramPulse() {
 	 * @return 'true' if writing to the current memory bank pages requires
 	 *         'PowerDelivery'.
 	 */
+	@Override
 	public boolean needsPowerDelivery() {
-		return powerDelivery;
+		return this.powerDelivery;
 	}
 
 	/**
@@ -307,8 +316,9 @@ public boolean needsPowerDelivery() {
 	 *
 	 * @return physical starting address of this logical bank.
 	 */
+	@Override
 	public int getStartPhysicalAddress() {
-		return startPhysicalAddress;
+		return this.startPhysicalAddress;
 	}
 
 	/**
@@ -316,8 +326,9 @@ public int getStartPhysicalAddress() {
 	 *
 	 * @return memory bank size in bytes.
 	 */
+	@Override
 	public int getSize() {
-		return size;
+		return this.size;
 	}
 
 	/**
@@ -326,8 +337,9 @@ public int getSize() {
 	 * @param doReadVerf true (default) verify write in 'write' false, don't verify
 	 *                   write (used on Write-Once bit manipulation)
 	 */
+	@Override
 	public void setWriteVerification(boolean doReadVerf) {
-		writeVerification = doReadVerf;
+		this.writeVerification = doReadVerf;
 	}
 
 	/**
@@ -335,8 +347,9 @@ public void setWriteVerification(boolean doReadVerf) {
 	 *
 	 * @return number of pages in current memory bank
 	 */
+	@Override
 	public int getNumberPages() {
-		return numberPages;
+		return this.numberPages;
 	}
 
 	/**
@@ -344,20 +357,22 @@ public int getNumberPages() {
 	 *
 	 * @return page length in bytes in current memory bank
 	 */
+	@Override
 	public int getPageLength() {
-		return pageLength;
+		return this.pageLength;
 	}
 
 	/**
 	 * Query to get Maximum data page length in bytes for a packet read or written
 	 * in the current memory bank. See the 'ReadPagePacket()' and
-	 * 'WritePagePacket()' methods. This method is only useful if the current
-	 * memory bank is general purpose memory.
+	 * 'WritePagePacket()' methods. This method is only useful if the current memory
+	 * bank is general purpose memory.
 	 *
 	 * @return max packet page length in bytes in current memory bank
 	 */
+	@Override
 	public int getMaxPacketDataLength() {
-		return maxPacketDataLength;
+		return this.maxPacketDataLength;
 	}
 
 	/**
@@ -367,8 +382,9 @@ public int getMaxPacketDataLength() {
 	 *
 	 * @return 'true' if current memory bank can be read with self generated CRC.
 	 */
+	@Override
 	public boolean hasPageAutoCRC() {
-		return pageAutoCRC;
+		return this.pageAutoCRC;
 	}
 
 	/**
@@ -388,8 +404,9 @@ public boolean hasPageAutoCRC() {
 	 * @see #readPagePacket(int,boolean,byte[],int,byte[]) readPagePacket(extra)
 	 * @since 1-Wire API 0.01
 	 */
+	@Override
 	public boolean hasExtraInfo() {
-		return extraInfo;
+		return this.extraInfo;
 	}
 
 	/**
@@ -399,8 +416,9 @@ public boolean hasExtraInfo() {
 	 * @return number of bytes in Extra Information read when reading pages in the
 	 *         current memory bank.
 	 */
+	@Override
 	public int getExtraInfoLength() {
-		return extraInfoLength;
+		return this.extraInfoLength;
 	}
 
 	/**
@@ -410,8 +428,9 @@ public int getExtraInfoLength() {
 	 *
 	 * @return string describing extra information.
 	 */
+	@Override
 	public String getExtraInfoDescription() {
-		return extraInfoDescription;
+		return this.extraInfoDescription;
 	}
 
 	// --------
@@ -440,50 +459,54 @@ public String getExtraInfoDescription() {
 	 * @throws OneWireIOException
 	 * @throws OneWireException
 	 */
+	@Override
 	public void read(int startAddr, boolean readContinue, byte[] readBuf, int offset, int len)
 			throws OneWireIOException, OneWireException {
 		int i;
 
 		// attempt to put device at max desired speed
-		if (!readContinue)
-			sp.checkSpeed();
+		if (!readContinue) {
+			this.sp.checkSpeed();
+		}
 
 		// check if read exceeds memory
-		if ((startAddr + len) > (pageLength * numberPages))
+		if (startAddr + len > this.pageLength * this.numberPages) {
 			throw new OneWireException("Read exceeds memory bank end");
+		}
 
 		// see if need to access the device
 		if (!readContinue) {
 
 			// select the device
-			if (!ib.adapter.select(ib.address)) {
-				sp.forceVerify();
+			if (!this.ib.adapter.select(this.ib.address)) {
+				this.sp.forceVerify();
 
 				throw new OneWireIOException("Device select failed");
 			}
 
 			// build start reading memory block
-			int addr = startAddr + startPhysicalAddress;
-			byte[] raw_buf = new byte[3];
+			var addr = startAddr + this.startPhysicalAddress;
+			var raw_buf = new byte[3];
 
 			raw_buf[0] = READ_MEMORY_COMMAND;
 			raw_buf[1] = (byte) (addr & 0xFF);
-			raw_buf[2] = (byte) (((addr & 0xFFFF) >>> 8) & 0xFF);
+			raw_buf[2] = (byte) ((addr & 0xFFFF) >>> 8 & 0xFF);
 
 			// do the first block for command, address
-			ib.adapter.dataBlock(raw_buf, 0, 3);
+			this.ib.adapter.dataBlock(raw_buf, 0, 3);
 		}
 
 		// pre-fill readBuf with 0xFF
-		int pgs = len / pageLength;
-		int extra = len % pageLength;
+		var pgs = len / this.pageLength;
+		var extra = len % this.pageLength;
 
-		for (i = 0; i < pgs; i++)
-			System.arraycopy(ffBlock, 0, readBuf, offset + i * pageLength, pageLength);
-		System.arraycopy(ffBlock, 0, readBuf, offset + pgs * pageLength, extra);
+		for (i = 0; i < pgs; i++) {
+			System.arraycopy(this.ffBlock, 0, readBuf, offset + i * this.pageLength, this.pageLength);
+		}
+		System.arraycopy(this.ffBlock, 0, readBuf, offset + pgs * this.pageLength, extra);
 
 		// send second block to read data, return result
-		ib.adapter.dataBlock(readBuf, offset, len);
+		this.ib.adapter.dataBlock(readBuf, offset, len);
 	}
 
 	/**
@@ -506,65 +529,71 @@ public void read(int startAddr, boolean readContinue, byte[] readBuf, int offset
 	 * @throws OneWireIOException
 	 * @throws OneWireException
 	 */
+	@Override
 	public void write(int startAddr, byte[] writeBuf, int offset, int len) throws OneWireIOException, OneWireException {
 		int i, room_left;
 
 		// return if nothing to do
-		if (len == 0)
+		if (len == 0) {
 			return;
+		}
 
 		// attempt to put device at speed
-		sp.checkSpeed();
+		this.sp.checkSpeed();
 
 		// check if write exceeds memory
-		if ((startAddr + len) > size)
+		if (startAddr + len > this.size) {
 			throw new OneWireException("Write exceeds memory bank end");
+		}
 
 		// check if trying to write read only bank
-		if (isReadOnly())
+		if (this.isReadOnly()) {
 			throw new OneWireException("Trying to write read-only memory bank");
+		}
 
 		// loop while still have pages to write
 		int startx = 0, nextx = 0; // (start and next index into writeBuf)
-		byte[] raw_buf = new byte[pageLength];
-		byte[] extra_buf = new byte[sp.getExtraInfoLength()];
-		int abs_addr = startPhysicalAddress + startAddr;
-		int pl = pageLength;
+		var raw_buf = new byte[this.pageLength];
+		var extra_buf = new byte[this.sp.getExtraInfoLength()];
+		var abs_addr = this.startPhysicalAddress + startAddr;
+		var pl = this.pageLength;
 
 		do {
 
 			// calculate room left in current page
-			room_left = pl - ((abs_addr + startx) % pl);
+			room_left = pl - (abs_addr + startx) % pl;
 
 			// check if block left will cross end of page
-			if ((len - startx) > room_left)
+			if (len - startx > room_left) {
 				nextx = startx + room_left;
-			else
+			} else {
 				nextx = len;
+			}
 
 			// write the page of data to scratchpad
-			sp.writeScratchpad(abs_addr + startx, writeBuf, offset + startx, nextx - startx);
+			this.sp.writeScratchpad(abs_addr + startx, writeBuf, offset + startx, nextx - startx);
 
 			// read to verify ok
-			sp.readScratchpad(raw_buf, 0, pl, extra_buf);
+			this.sp.readScratchpad(raw_buf, 0, pl, extra_buf);
 
 			// check to see if the same
-			for (i = 0; i < (nextx - startx); i++)
+			for (i = 0; i < nextx - startx; i++) {
 				if (raw_buf[i] != writeBuf[i + offset + startx]) {
-					sp.forceVerify();
+					this.sp.forceVerify();
 
 					throw new OneWireIOException("Read back of scratchpad had incorrect data");
 				}
+			}
 
 			// check to make sure that the address is correct
-			if ((((extra_buf[0] & 0x00FF) | ((extra_buf[1] << 8) & 0x00FF00)) & 0x00FFFF) != (abs_addr + startx)) {
-				sp.forceVerify();
+			if (((extra_buf[0] & 0x00FF | extra_buf[1] << 8 & 0x00FF00) & 0x00FFFF) != abs_addr + startx) {
+				this.sp.forceVerify();
 
 				throw new OneWireIOException("Address read back from scrachpad was incorrect");
 			}
 
 			// do the copy
-			sp.copyScratchpad(abs_addr + startx, nextx - startx);
+			this.sp.copyScratchpad(abs_addr + startx, nextx - startx);
 
 			// point to next index
 			startx = nextx;
@@ -596,9 +625,10 @@ public void write(int startAddr, byte[] writeBuf, int offset, int len) throws On
 	 * @throws OneWireIOException
 	 * @throws OneWireException
 	 */
+	@Override
 	public void readPage(int page, boolean readContinue, byte[] readBuf, int offset)
 			throws OneWireIOException, OneWireException {
-		read(page * pageLength, readContinue, readBuf, offset, pageLength);
+		this.read(page * this.pageLength, readContinue, readBuf, offset, this.pageLength);
 	}
 
 	/**
@@ -624,6 +654,7 @@ public void readPage(int page, boolean readContinue, byte[] readBuf, int offset)
 	 * @throws OneWireIOException
 	 * @throws OneWireException
 	 */
+	@Override
 	public void readPage(int page, boolean readContinue, byte[] readBuf, int offset, byte[] extraInfo)
 			throws OneWireIOException, OneWireException {
 
@@ -659,19 +690,21 @@ public void readPage(int page, boolean readContinue, byte[] readBuf, int offset,
 	 * @throws OneWireIOException
 	 * @throws OneWireException
 	 */
+	@Override
 	public int readPagePacket(int page, boolean readContinue, byte[] readBuf, int offset)
 			throws OneWireIOException, OneWireException {
-		byte[] raw_buf = new byte[pageLength];
+		var raw_buf = new byte[this.pageLength];
 
 		// read the page
-		readPage(page, readContinue, raw_buf, 0);
+		this.readPage(page, readContinue, raw_buf, 0);
 
 		// check if length is realistic
-		if ((raw_buf[0] & 0x00FF) > maxPacketDataLength)
+		if ((raw_buf[0] & 0x00FF) > this.maxPacketDataLength) {
 			throw new OneWireIOException("Invalid length in packet");
+		}
 
 		// verify the CRC is correct
-		int abs_page = (startPhysicalAddress / pageLength) + page;
+		var abs_page = this.startPhysicalAddress / this.pageLength + page;
 		if (CRC16.compute(raw_buf, 0, raw_buf[0] + 3, abs_page) == 0x0000B001) {
 
 			// extract the data out of the packet
@@ -679,8 +712,8 @@ public int readPagePacket(int page, boolean readContinue, byte[] readBuf, int of
 
 			// return the length
 			return raw_buf[0];
-		} else
-			throw new OneWireIOException("Invalid CRC16 in packet read");
+		}
+		throw new OneWireIOException("Invalid CRC16 in packet read");
 	}
 
 	/**
@@ -705,6 +738,7 @@ public int readPagePacket(int page, boolean readContinue, byte[] readBuf, int of
 	 * @throws OneWireIOException
 	 * @throws OneWireException
 	 */
+	@Override
 	public int readPagePacket(int page, boolean readContinue, byte[] readBuf, int offset, byte[] extraInfo)
 			throws OneWireIOException, OneWireException {
 
@@ -724,32 +758,35 @@ public int readPagePacket(int page, boolean readContinue, byte[] readBuf, int of
 	 * @throws OneWireIOException
 	 * @throws OneWireException
 	 */
+	@Override
 	public void writePagePacket(int page, byte[] writeBuf, int offset, int len)
 			throws OneWireIOException, OneWireException {
 
 		// make sure length does not exceed max
-		if (len > maxPacketDataLength)
+		if (len > this.maxPacketDataLength) {
 			throw new OneWireIOException("Length of packet requested exceeds page size");
+		}
 
 		// see if this bank is general read/write
-		if (!generalPurposeMemory)
+		if (!this.generalPurposeMemory) {
 			throw new OneWireException("Current bank is not general purpose memory");
+		}
 
 		// construct the packet to write
-		byte[] raw_buf = new byte[len + 3];
+		var raw_buf = new byte[len + 3];
 
 		raw_buf[0] = (byte) len;
 
 		System.arraycopy(writeBuf, offset, raw_buf, 1, len);
 
-		int abs_page = (startPhysicalAddress / pageLength) + page;
-		int crc = CRC16.compute(raw_buf, 0, len + 1, abs_page);
+		var abs_page = this.startPhysicalAddress / this.pageLength + page;
+		var crc = CRC16.compute(raw_buf, 0, len + 1, abs_page);
 
 		raw_buf[len + 1] = (byte) (~crc & 0xFF);
-		raw_buf[len + 2] = (byte) (((~crc & 0xFFFF) >>> 8) & 0xFF);
+		raw_buf[len + 2] = (byte) ((~crc & 0xFFFF) >>> 8 & 0xFF);
 
 		// write the packet, return result
-		write(page * pageLength, raw_buf, 0, len + 3);
+		this.write(page * this.pageLength, raw_buf, 0, len + 3);
 	}
 
 	/**
@@ -768,6 +805,7 @@ public void writePagePacket(int page, byte[] writeBuf, int offset, int len)
 	 * @throws OneWireIOException
 	 * @throws OneWireException
 	 */
+	@Override
 	public void readPageCRC(int page, boolean readContinue, byte[] readBuf, int offset)
 			throws OneWireIOException, OneWireException {
 
@@ -794,6 +832,7 @@ public void readPageCRC(int page, boolean readContinue, byte[] readBuf, int offs
 	 * @throws OneWireIOException
 	 * @throws OneWireException
 	 */
+	@Override
 	public void readPageCRC(int page, boolean readContinue, byte[] readBuf, int offset, byte[] extraInfo)
 			throws OneWireIOException, OneWireException {
 
diff --git a/io.openems.edge.bridge.onewire/src/com/dalsemi/onewire/container/MemoryBankNVCRC.java b/io.openems.edge.bridge.onewire/src/com/dalsemi/onewire/container/MemoryBankNVCRC.java
index 275c47660a2..5f113b86a07 100644
--- a/io.openems.edge.bridge.onewire/src/com/dalsemi/onewire/container/MemoryBankNVCRC.java
+++ b/io.openems.edge.bridge.onewire/src/com/dalsemi/onewire/container/MemoryBankNVCRC.java
@@ -77,9 +77,9 @@ public MemoryBankNVCRC(OneWireContainer ibutton, ScratchPad scratch) {
 		super(ibutton, scratch);
 
 		// initialize attributes of this memory bank
-		pageAutoCRC = true;
-		readContinuePossible = true;
-		numVerifyBytes = 0;
+		this.pageAutoCRC = true;
+		this.readContinuePossible = true;
+		this.numVerifyBytes = 0;
 	}
 
 	// --------
@@ -107,11 +107,12 @@ public MemoryBankNVCRC(OneWireContainer ibutton, ScratchPad scratch) {
 	 * @throws OneWireIOException
 	 * @throws OneWireException
 	 */
+	@Override
 	public void readPage(int page, boolean readContinue, byte[] readBuf, int offset)
 			throws OneWireIOException, OneWireException {
 
 		// all other pages
-		readPageCRC(page, readContinue, readBuf, offset, null, extraInfoLength);
+		this.readPageCRC(page, readContinue, readBuf, offset, null, this.extraInfoLength);
 	}
 
 	/**
@@ -137,14 +138,16 @@ public void readPage(int page, boolean readContinue, byte[] readBuf, int offset)
 	 * @throws OneWireIOException
 	 * @throws OneWireException
 	 */
+	@Override
 	public void readPage(int page, boolean readContinue, byte[] readBuf, int offset, byte[] extraInfo)
 			throws OneWireIOException, OneWireException {
 
 		// check if current bank is not scratchpad bank, or not page 0
-		if (!this.extraInfo)
+		if (!this.extraInfo) {
 			throw new OneWireException("Read extra information not supported on this memory bank");
+		}
 
-		readPageCRC(page, readContinue, readBuf, offset, extraInfo, extraInfoLength);
+		this.readPageCRC(page, readContinue, readBuf, offset, extraInfo, this.extraInfoLength);
 	}
 
 	/**
@@ -168,22 +171,23 @@ public void readPage(int page, boolean readContinue, byte[] readBuf, int offset,
 	 * @throws OneWireIOException
 	 * @throws OneWireException
 	 */
+	@Override
 	public int readPagePacket(int page, boolean readContinue, byte[] readBuf, int offset, byte[] extraInfo)
 			throws OneWireIOException, OneWireException {
-		byte[] raw_buf = new byte[pageLength];
+		var raw_buf = new byte[this.pageLength];
 
 		// read entire page with read page CRC
-		readPageCRC(page, readContinue, raw_buf, 0, extraInfo, extraInfoLength);
+		this.readPageCRC(page, readContinue, raw_buf, 0, extraInfo, this.extraInfoLength);
 
 		// check if length is realistic
-		if (raw_buf[0] > maxPacketDataLength) {
-			sp.forceVerify();
+		if (raw_buf[0] > this.maxPacketDataLength) {
+			this.sp.forceVerify();
 
 			throw new OneWireIOException("Invalid length in packet");
 		}
 
 		// verify the CRC is correct
-		int abs_page = (startPhysicalAddress / pageLength) + page;
+		var abs_page = this.startPhysicalAddress / this.pageLength + page;
 		if (CRC16.compute(raw_buf, 0, raw_buf[0] + 3, abs_page) == 0x0000B001) {
 
 			// extract the data out of the packet
@@ -191,11 +195,10 @@ public int readPagePacket(int page, boolean readContinue, byte[] readBuf, int of
 
 			// return the length
 			return raw_buf[0];
-		} else {
-			sp.forceVerify();
-
-			throw new OneWireIOException("Invalid CRC16 in packet read");
 		}
+		this.sp.forceVerify();
+
+		throw new OneWireIOException("Invalid CRC16 in packet read");
 	}
 
 	/**
@@ -214,9 +217,10 @@ public int readPagePacket(int page, boolean readContinue, byte[] readBuf, int of
 	 * @throws OneWireIOException
 	 * @throws OneWireException
 	 */
+	@Override
 	public void readPageCRC(int page, boolean readContinue, byte[] readBuf, int offset)
 			throws OneWireIOException, OneWireException {
-		readPageCRC(page, readContinue, readBuf, offset, null, extraInfoLength);
+		this.readPageCRC(page, readContinue, readBuf, offset, null, this.extraInfoLength);
 	}
 
 	/**
@@ -238,9 +242,10 @@ public void readPageCRC(int page, boolean readContinue, byte[] readBuf, int offs
 	 * @throws OneWireIOException
 	 * @throws OneWireException
 	 */
+	@Override
 	public void readPageCRC(int page, boolean readContinue, byte[] readBuf, int offset, byte[] extraInfo)
 			throws OneWireIOException, OneWireException {
-		readPageCRC(page, readContinue, readBuf, offset, extraInfo, extraInfoLength);
+		this.readPageCRC(page, readContinue, readBuf, offset, extraInfo, this.extraInfoLength);
 	}
 
 	/**
@@ -264,27 +269,30 @@ public void readPageCRC(int page, boolean readContinue, byte[] readBuf, int offs
 	 */
 	protected void readPageCRC(int page, boolean readContinue, byte[] readBuf, int offset, byte[] extraInfo,
 			int extraLength) throws OneWireIOException, OneWireException {
-		int last_crc = 0;
+		var last_crc = 0;
 		byte[] raw_buf;
 
 		// only needs to be implemented if supported by hardware
-		if (!pageAutoCRC)
+		if (!this.pageAutoCRC) {
 			throw new OneWireException("Read page with CRC not supported in this memory bank");
+		}
 
 		// attempt to put device at max desired speed
-		if (!readContinue)
-			sp.checkSpeed();
+		if (!readContinue) {
+			this.sp.checkSpeed();
+		}
 
 		// check if read exceeds memory
-		if (page > numberPages)
+		if (page > this.numberPages) {
 			throw new OneWireException("Read exceeds memory bank end");
+		}
 
 		// see if need to access the device
-		if (!readContinue || !readContinuePossible) {
+		if (!readContinue || !this.readContinuePossible) {
 
 			// select the device
-			if (!ib.adapter.select(ib.address)) {
-				sp.forceVerify();
+			if (!this.ib.adapter.select(this.ib.address)) {
+				this.sp.forceVerify();
 
 				throw new OneWireIOException("Device select failed");
 			}
@@ -293,38 +301,39 @@ protected void readPageCRC(int page, boolean readContinue, byte[] readBuf, int o
 			raw_buf = new byte[3];
 			raw_buf[0] = READ_PAGE_WITH_CRC;
 
-			int addr = page * pageLength + startPhysicalAddress;
+			var addr = page * this.pageLength + this.startPhysicalAddress;
 
 			raw_buf[1] = (byte) (addr & 0xFF);
-			raw_buf[2] = (byte) (((addr & 0xFFFF) >>> 8) & 0xFF);
+			raw_buf[2] = (byte) ((addr & 0xFFFF) >>> 8 & 0xFF);
 
 			// perform CRC16 on first part
 			last_crc = CRC16.compute(raw_buf, 0, raw_buf.length, last_crc);
 
 			// do the first block for command, TA1, TA2
-			ib.adapter.dataBlock(raw_buf, 0, 3);
+			this.ib.adapter.dataBlock(raw_buf, 0, 3);
 		}
 
 		// pre-fill with 0xFF
-		raw_buf = new byte[pageLength + extraLength + 2 + numVerifyBytes];
+		raw_buf = new byte[this.pageLength + extraLength + 2 + this.numVerifyBytes];
 
-		System.arraycopy(ffBlock, 0, raw_buf, 0, raw_buf.length);
+		System.arraycopy(this.ffBlock, 0, raw_buf, 0, raw_buf.length);
 
 		// send block to read data + extra info? + crc
-		ib.adapter.dataBlock(raw_buf, 0, raw_buf.length);
+		this.ib.adapter.dataBlock(raw_buf, 0, raw_buf.length);
 
 		// check the CRC
-		if (CRC16.compute(raw_buf, 0, raw_buf.length - numVerifyBytes, last_crc) != 0x0000B001) {
-			sp.forceVerify();
+		if (CRC16.compute(raw_buf, 0, raw_buf.length - this.numVerifyBytes, last_crc) != 0x0000B001) {
+			this.sp.forceVerify();
 
 			throw new OneWireIOException("Invalid CRC16 read from device");
 		}
 
 		// extract the page data
-		System.arraycopy(raw_buf, 0, readBuf, offset, pageLength);
+		System.arraycopy(raw_buf, 0, readBuf, offset, this.pageLength);
 
 		// optional extract the extra info
-		if (extraInfo != null)
-			System.arraycopy(raw_buf, pageLength, extraInfo, 0, extraLength);
+		if (extraInfo != null) {
+			System.arraycopy(raw_buf, this.pageLength, extraInfo, 0, extraLength);
+		}
 	}
 }
diff --git a/io.openems.edge.bridge.onewire/src/com/dalsemi/onewire/container/MemoryBankNVCRCPW.java b/io.openems.edge.bridge.onewire/src/com/dalsemi/onewire/container/MemoryBankNVCRCPW.java
index a0f7bb2e64f..42965c09759 100644
--- a/io.openems.edge.bridge.onewire/src/com/dalsemi/onewire/container/MemoryBankNVCRCPW.java
+++ b/io.openems.edge.bridge.onewire/src/com/dalsemi/onewire/container/MemoryBankNVCRCPW.java
@@ -70,14 +70,14 @@ public class MemoryBankNVCRCPW extends MemoryBankNVCRC {
 	public MemoryBankNVCRCPW(PasswordContainer ibutton, MemoryBankScratchCRCPW scratch) {
 		super((OneWireContainer) ibutton, scratch);
 
-		ibPass = ibutton;
+		this.ibPass = ibutton;
 
 		// initialize attributes of this memory bank
-		pageAutoCRC = true;
-		readContinuePossible = true;
-		numVerifyBytes = 0;
+		this.pageAutoCRC = true;
+		this.readContinuePossible = true;
+		this.numVerifyBytes = 0;
 
-		scratchpadPW = scratch;
+		this.scratchpadPW = scratch;
 	}
 
 	/**
@@ -99,9 +99,10 @@ public MemoryBankNVCRCPW(PasswordContainer ibutton, MemoryBankScratchCRCPW scrat
 	 * @throws OneWireIOException
 	 * @throws OneWireException
 	 */
+	@Override
 	public void readPageCRC(int page, boolean readContinue, byte[] readBuf, int offset, byte[] extraInfo)
 			throws OneWireIOException, OneWireException {
-		readPageCRC(page, readContinue, readBuf, offset, extraInfo, extraInfoLength);
+		this.readPageCRC(page, readContinue, readBuf, offset, extraInfo, this.extraInfoLength);
 	}
 
 	/**
@@ -123,30 +124,34 @@ public void readPageCRC(int page, boolean readContinue, byte[] readBuf, int offs
 	 * @throws OneWireIOException
 	 * @throws OneWireException
 	 */
+	@Override
 	protected void readPageCRC(int page, boolean readContinue, byte[] readBuf, int offset, byte[] extraInfo,
 			int extraLength) throws OneWireIOException, OneWireException {
-		int last_crc = 0;
+		var last_crc = 0;
 		byte[] raw_buf;
 		byte temp;
 
 		// only needs to be implemented if supported by hardware
-		if (!pageAutoCRC)
+		if (!this.pageAutoCRC) {
 			throw new OneWireException("Read page with CRC not supported in this memory bank");
+		}
 
 		// attempt to put device at max desired speed
-		if (!readContinue)
-			sp.checkSpeed();
+		if (!readContinue) {
+			this.sp.checkSpeed();
+		}
 
 		// check if read exceeds memory
-		if (page > numberPages)
+		if (page > this.numberPages) {
 			throw new OneWireException("Read exceeds memory bank end");
+		}
 
 		// see if need to access the device
-		if (!readContinue || !readContinuePossible) {
+		if (!readContinue || !this.readContinuePossible) {
 
 			// select the device
-			if (!ib.adapter.select(ib.address)) {
-				sp.forceVerify();
+			if (!this.ib.adapter.select(this.ib.address)) {
+				this.sp.forceVerify();
 
 				throw new OneWireIOException("Device select failed");
 			}
@@ -155,73 +160,74 @@ protected void readPageCRC(int page, boolean readContinue, byte[] readBuf, int o
 			raw_buf = new byte[11];
 			raw_buf[0] = READ_MEMORY_CRC_PW_COMMAND;
 
-			int addr = page * pageLength + startPhysicalAddress;
+			var addr = page * this.pageLength + this.startPhysicalAddress;
 
 			raw_buf[1] = (byte) (addr & 0xFF);
-			raw_buf[2] = (byte) (((addr & 0xFFFF) >>> 8) & 0xFF);
+			raw_buf[2] = (byte) ((addr & 0xFFFF) >>> 8 & 0xFF);
 
-			if (ibPass.isContainerReadWritePasswordSet())
-				ibPass.getContainerReadWritePassword(raw_buf, 3);
-			else
-				ibPass.getContainerReadOnlyPassword(raw_buf, 3);
+			if (this.ibPass.isContainerReadWritePasswordSet()) {
+				this.ibPass.getContainerReadWritePassword(raw_buf, 3);
+			} else {
+				this.ibPass.getContainerReadOnlyPassword(raw_buf, 3);
+			}
 
 			// perform CRC16 on first part (without the password)
 			last_crc = CRC16.compute(raw_buf, 0, 3, last_crc);
 
 			// do the first block for command, TA1, TA2, and password
 
-			if (enablePower) {
-				ib.adapter.dataBlock(raw_buf, 0, 10);
+			if (this.enablePower) {
+				this.ib.adapter.dataBlock(raw_buf, 0, 10);
 
-				ib.adapter.startPowerDelivery(DSPortAdapter.CONDITION_AFTER_BYTE);
+				this.ib.adapter.startPowerDelivery(DSPortAdapter.CONDITION_AFTER_BYTE);
 
-				ib.adapter.putByte(raw_buf[10]);
+				this.ib.adapter.putByte(raw_buf[10]);
 
-			} else
-				ib.adapter.dataBlock(raw_buf, 0, 11);
-		} else {
-			if (enablePower) {
-				ib.adapter.startPowerDelivery(DSPortAdapter.CONDITION_AFTER_BYTE);
-				temp = (byte) ib.adapter.getByte();
+			} else {
+				this.ib.adapter.dataBlock(raw_buf, 0, 11);
 			}
+		} else if (this.enablePower) {
+			this.ib.adapter.startPowerDelivery(DSPortAdapter.CONDITION_AFTER_BYTE);
+			temp = (byte) this.ib.adapter.getByte();
 		}
 
-		if (enablePower) {
+		if (this.enablePower) {
 			msWait(3);
 
-			ib.adapter.setPowerNormal();
+			this.ib.adapter.setPowerNormal();
 		}
 
 		// pre-fill with 0xFF
-		raw_buf = new byte[pageLength + extraLength + 2 + numVerifyBytes];
+		raw_buf = new byte[this.pageLength + extraLength + 2 + this.numVerifyBytes];
 
-		System.arraycopy(ffBlock, 0, raw_buf, 0, raw_buf.length);
+		System.arraycopy(this.ffBlock, 0, raw_buf, 0, raw_buf.length);
 
 		// send block to read data + extra info? + crc
-		if (enablePower) {
-			ib.adapter.dataBlock(raw_buf, 0, (raw_buf.length - 1));
-			last_crc = CRC16.compute(raw_buf, 0, raw_buf.length - numVerifyBytes - 2, last_crc);
+		if (this.enablePower) {
+			this.ib.adapter.dataBlock(raw_buf, 0, raw_buf.length - 1);
+			last_crc = CRC16.compute(raw_buf, 0, raw_buf.length - this.numVerifyBytes - 2, last_crc);
 
-			if ((last_crc & 0x0FF) != ((~raw_buf[raw_buf.length - 2]) & 0x0FF)) {
-				sp.forceVerify();
+			if ((last_crc & 0x0FF) != (~raw_buf[raw_buf.length - 2] & 0x0FF)) {
+				this.sp.forceVerify();
 				throw new OneWireIOException("Invalid CRC16 read from device.  Password may be incorrect.");
 			}
 		} else {
-			ib.adapter.dataBlock(raw_buf, 0, raw_buf.length);
+			this.ib.adapter.dataBlock(raw_buf, 0, raw_buf.length);
 
 			// check the CRC
-			if (CRC16.compute(raw_buf, 0, raw_buf.length - numVerifyBytes, last_crc) != 0x0000B001) {
-				sp.forceVerify();
+			if (CRC16.compute(raw_buf, 0, raw_buf.length - this.numVerifyBytes, last_crc) != 0x0000B001) {
+				this.sp.forceVerify();
 				throw new OneWireIOException("Invalid CRC16 read from device.  Password may be incorrect.");
 			}
 		}
 
 		// extract the page data
-		System.arraycopy(raw_buf, 0, readBuf, offset, pageLength);
+		System.arraycopy(raw_buf, 0, readBuf, offset, this.pageLength);
 
 		// optional extract the extra info
-		if (extraInfo != null)
-			System.arraycopy(raw_buf, pageLength, extraInfo, 0, extraLength);
+		if (extraInfo != null) {
+			System.arraycopy(raw_buf, this.pageLength, extraInfo, 0, extraLength);
+		}
 	}
 
 	/**
@@ -246,66 +252,69 @@ protected void readPageCRC(int page, boolean readContinue, byte[] readBuf, int o
 	 * @throws OneWireIOException
 	 * @throws OneWireException
 	 */
+	@Override
 	public void read(int startAddr, boolean readContinue, byte[] readBuf, int offset, int len)
 			throws OneWireIOException, OneWireException {
 		int i;
-		byte[] raw_buf = new byte[64];
+		var raw_buf = new byte[64];
 
 		// attempt to put device at max desired speed
 		if (!readContinue) {
-			sp.checkSpeed();
+			this.sp.checkSpeed();
 		}
 
 		// check if read exceeds memory
-		if ((startAddr + len) > size)
+		if (startAddr + len > this.size) {
 			throw new OneWireException("Read exceeds memory bank end");
+		}
 
 		// see if need to access the device
 		if (!readContinue) {
 
 			// select the device
-			if (!ib.adapter.select(ib.address)) {
-				sp.forceVerify();
+			if (!this.ib.adapter.select(this.ib.address)) {
+				this.sp.forceVerify();
 
 				throw new OneWireIOException("Device select failed");
 			}
 
 			// build start reading memory block
-			int addr = startAddr + startPhysicalAddress;
+			var addr = startAddr + this.startPhysicalAddress;
 
 			raw_buf[0] = READ_MEMORY_CRC_PW_COMMAND;
 
 			raw_buf[1] = (byte) (addr & 0xFF);
-			raw_buf[2] = (byte) (((addr & 0xFFFF) >>> 8) & 0xFF);
+			raw_buf[2] = (byte) ((addr & 0xFFFF) >>> 8 & 0xFF);
 
-			if (ibPass.isContainerReadWritePasswordSet())
-				ibPass.getContainerReadWritePassword(raw_buf, 3);
-			else
-				ibPass.getContainerReadOnlyPassword(raw_buf, 3);
+			if (this.ibPass.isContainerReadWritePasswordSet()) {
+				this.ibPass.getContainerReadWritePassword(raw_buf, 3);
+			} else {
+				this.ibPass.getContainerReadOnlyPassword(raw_buf, 3);
+			}
 
 			// do the first block for command, address. password
-			if (enablePower) {
-				ib.adapter.dataBlock(raw_buf, 0, 10);
-				ib.adapter.startPowerDelivery(DSPortAdapter.CONDITION_AFTER_BYTE);
-				ib.adapter.putByte(raw_buf[10]);
+			if (this.enablePower) {
+				this.ib.adapter.dataBlock(raw_buf, 0, 10);
+				this.ib.adapter.startPowerDelivery(DSPortAdapter.CONDITION_AFTER_BYTE);
+				this.ib.adapter.putByte(raw_buf[10]);
 
 				msWait(10);
 
-				ib.adapter.setPowerNormal();
+				this.ib.adapter.setPowerNormal();
 			} else {
-				ib.adapter.dataBlock(raw_buf, 0, 11);
+				this.ib.adapter.dataBlock(raw_buf, 0, 11);
 			}
 		}
 
 		// pre-fill readBuf with 0xFF
-		int startOffset = startAddr % pageLength;
+		var startOffset = startAddr % this.pageLength;
 
 		// First, count how many bytes are leftover from the
 		// whole page reads.
-		int bytesLeftover = (len % pageLength);
+		var bytesLeftover = len % this.pageLength;
 
 		// Second, account for the whole number of pages
-		int pgs = (len / pageLength);
+		var pgs = len / this.pageLength;
 
 		// Third, if read starts in middle, go ahead and count
 		// that whole page as 1 more page.
@@ -314,27 +323,28 @@ public void read(int startAddr, boolean readContinue, byte[] readBuf, int offset
 			// subtract the bytes from this extra page from our
 			// leftover bytes, since we just accounted for each
 			// byte to the end of this first page.
-			bytesLeftover -= (pageLength - startOffset);
+			bytesLeftover -= this.pageLength - startOffset;
 		}
 
 		// Finally, account for 1 more page read if there are
 		// any more left over bytes
-		if (bytesLeftover > 0)
+		if (bytesLeftover > 0) {
 			pgs += 1;
+		}
 
-		int startPage = startAddr / pageLength;
+		var startPage = startAddr / this.pageLength;
 
 		for (i = 0; i < pgs; i++) {
-			readPageCRC(startPage + i, false, raw_buf, 0, null, 0);
+			this.readPageCRC(startPage + i, false, raw_buf, 0, null, 0);
 
 			if (i == 0) {
-				System.arraycopy(raw_buf, startOffset, readBuf, offset, (pageLength - startOffset));
-			} else if ((i == (pgs - 1)) && (bytesLeftover != 0)) {
-				System.arraycopy(raw_buf, 0, readBuf, (offset + (pageLength - startOffset) + ((i - 1) * pageLength)),
-						bytesLeftover);
+				System.arraycopy(raw_buf, startOffset, readBuf, offset, this.pageLength - startOffset);
+			} else if (i == pgs - 1 && bytesLeftover != 0) {
+				System.arraycopy(raw_buf, 0, readBuf,
+						offset + this.pageLength - startOffset + (i - 1) * this.pageLength, bytesLeftover);
 			} else {
-				System.arraycopy(raw_buf, 0, readBuf, (offset + (pageLength - startOffset) + ((i - 1) * pageLength)),
-						pageLength);
+				System.arraycopy(raw_buf, 0, readBuf,
+						offset + this.pageLength - startOffset + (i - 1) * this.pageLength, this.pageLength);
 			}
 		}
 
@@ -360,23 +370,26 @@ public void read(int startAddr, boolean readContinue, byte[] readBuf, int offset
 	 * @throws OneWireIOException
 	 * @throws OneWireException
 	 */
+	@Override
 	public void write(int startAddr, byte[] writeBuf, int offset, int len) throws OneWireIOException, OneWireException {
 		// find the last (non-inclusive) address for this write
-		int endingOffset = (startAddr + len);
-		if (((endingOffset & 0x1F) > 0) && (!enablePower)) {
+		var endingOffset = startAddr + len;
+		if ((endingOffset & 0x1F) > 0 && !this.enablePower) {
 			// find the number of bytes left until the end of the page
-			int numBytes = pageLength - (endingOffset & 0x1F);
+			var numBytes = this.pageLength - (endingOffset & 0x1F);
 			if ( // endingOffset == 0x250 ???? why??
-			(ibPass.hasReadWritePassword() && (0xFFE0 & endingOffset) == (0xFFE0 & ibPass.getReadWritePasswordAddress())
-					&& endingOffset < (ibPass.getReadWritePasswordAddress() + ibPass.getReadWritePasswordLength()))
-					|| (ibPass.hasReadOnlyPassword()
-							&& (0xFFE0 & endingOffset) == (0xFFE0 & ibPass.getReadOnlyPasswordAddress())
-							&& endingOffset < (ibPass.getReadOnlyPasswordAddress()
-									+ ibPass.getReadOnlyPasswordLength()))
-					|| (ibPass.hasWriteOnlyPassword()
-							&& (0xFFE0 & endingOffset) == (0xFFE0 & ibPass.getWriteOnlyPasswordAddress())
-							&& endingOffset < (ibPass.getWriteOnlyPasswordAddress()
-									+ ibPass.getWriteOnlyPasswordLength()))) {
+			this.ibPass.hasReadWritePassword()
+					&& (0xFFE0 & endingOffset) == (0xFFE0 & this.ibPass.getReadWritePasswordAddress())
+					&& endingOffset < this.ibPass.getReadWritePasswordAddress()
+							+ this.ibPass.getReadWritePasswordLength()
+					|| this.ibPass.hasReadOnlyPassword()
+							&& (0xFFE0 & endingOffset) == (0xFFE0 & this.ibPass.getReadOnlyPasswordAddress())
+							&& endingOffset < this.ibPass.getReadOnlyPasswordAddress()
+									+ this.ibPass.getReadOnlyPasswordLength()
+					|| this.ibPass.hasWriteOnlyPassword()
+							&& (0xFFE0 & endingOffset) == (0xFFE0 & this.ibPass.getWriteOnlyPasswordAddress())
+							&& endingOffset < this.ibPass.getWriteOnlyPasswordAddress()
+									+ this.ibPass.getWriteOnlyPasswordLength()) {
 
 				// password block would be written to with potentially bad data
 				throw new OneWireException("Executing write would overwrite password control registers with "
@@ -385,9 +398,9 @@ public void write(int startAddr, byte[] writeBuf, int offset, int len) throws On
 						+ "specified exactly in the write buffer.");
 			}
 
-			byte[] tempBuf = new byte[len + numBytes];
+			var tempBuf = new byte[len + numBytes];
 			System.arraycopy(writeBuf, offset, tempBuf, 0, len);
-			read(endingOffset, false, tempBuf, len, numBytes);
+			this.read(endingOffset, false, tempBuf, len, numBytes);
 
 			super.write(startAddr, tempBuf, 0, tempBuf.length);
 		} else {
@@ -404,7 +417,7 @@ private static final void msWait(final long ms) {
 		try {
 			Thread.sleep(ms);
 		} catch (InterruptedException ie) {
-			;
+
 		}
 	}
 }
\ No newline at end of file
diff --git a/io.openems.edge.bridge.onewire/src/com/dalsemi/onewire/container/MemoryBankSBM.java b/io.openems.edge.bridge.onewire/src/com/dalsemi/onewire/container/MemoryBankSBM.java
index 58e3ec11b1f..c89f8628745 100644
--- a/io.openems.edge.bridge.onewire/src/com/dalsemi/onewire/container/MemoryBankSBM.java
+++ b/io.openems.edge.bridge.onewire/src/com/dalsemi/onewire/container/MemoryBankSBM.java
@@ -150,27 +150,28 @@ class MemoryBankSBM implements MemoryBank {
 	 */
 	public MemoryBankSBM(OneWireContainer ibutton) {
 		// keep reference to ibutton where memory bank is
-		ib = ibutton;
+		this.ib = ibutton;
 
 		// initialize attributes of this memory bank - DEFAULT: DS2438 Status byte
-		bankDescription = "Status/Configuration";
-		generalPurposeMemory = false;
-		startPhysicalAddress = 0;
-		size = 1;
-		readWrite = true;
-		readOnly = false;
-		nonVolatile = true;
-		powerDelivery = true;
-		writeVerification = true;
+		this.bankDescription = "Status/Configuration";
+		this.generalPurposeMemory = false;
+		this.startPhysicalAddress = 0;
+		this.size = 1;
+		this.readWrite = true;
+		this.readOnly = false;
+		this.nonVolatile = true;
+		this.powerDelivery = true;
+		this.writeVerification = true;
 
 		// create the ffblock (used for faster 0xFF fills)
-		ffBlock = new byte[20];
+		this.ffBlock = new byte[20];
 
-		for (int i = 0; i < 20; i++)
-			ffBlock[i] = (byte) 0xFF;
+		for (var i = 0; i < 20; i++) {
+			this.ffBlock[i] = (byte) 0xFF;
+		}
 
 		// indicate speed has not been set
-		doSetSpeed = true;
+		this.doSetSpeed = true;
 	}
 
 	// --------
@@ -182,8 +183,9 @@ public MemoryBankSBM(OneWireContainer ibutton) {
 	 *
 	 * @return String containing the memory bank description
 	 */
+	@Override
 	public String getBankDescription() {
-		return bankDescription;
+		return this.bankDescription;
 	}
 
 	/**
@@ -193,8 +195,9 @@ public String getBankDescription() {
 	 *
 	 * @return 'true' if current memory bank is general purpose
 	 */
+	@Override
 	public boolean isGeneralPurposeMemory() {
-		return generalPurposeMemory;
+		return this.generalPurposeMemory;
 	}
 
 	/**
@@ -202,8 +205,9 @@ public boolean isGeneralPurposeMemory() {
 	 *
 	 * @return 'true' if current memory bank is read/write
 	 */
+	@Override
 	public boolean isReadWrite() {
-		return readWrite;
+		return this.readWrite;
 	}
 
 	/**
@@ -212,6 +216,7 @@ public boolean isReadWrite() {
 	 *
 	 * @return 'true' if current memory bank can only be written once
 	 */
+	@Override
 	public boolean isWriteOnce() {
 		return false;
 	}
@@ -221,8 +226,9 @@ public boolean isWriteOnce() {
 	 *
 	 * @return 'true' if current memory bank can only be read
 	 */
+	@Override
 	public boolean isReadOnly() {
-		return readOnly;
+		return this.readOnly;
 	}
 
 	/**
@@ -231,8 +237,9 @@ public boolean isReadOnly() {
 	 *
 	 * @return 'true' if current memory bank non volatile.
 	 */
+	@Override
 	public boolean isNonVolatile() {
-		return nonVolatile;
+		return this.nonVolatile;
 	}
 
 	/**
@@ -242,6 +249,7 @@ public boolean isNonVolatile() {
 	 * @return 'true' if writing to the current memory bank pages requires a
 	 *         'ProgramPulse'.
 	 */
+	@Override
 	public boolean needsProgramPulse() {
 		return false;
 	}
@@ -253,8 +261,9 @@ public boolean needsProgramPulse() {
 	 * @return 'true' if writing to the current memory bank pages requires
 	 *         'PowerDelivery'.
 	 */
+	@Override
 	public boolean needsPowerDelivery() {
-		return powerDelivery;
+		return this.powerDelivery;
 	}
 
 	/**
@@ -263,8 +272,9 @@ public boolean needsPowerDelivery() {
 	 *
 	 * @return physical starting address of this logical bank.
 	 */
+	@Override
 	public int getStartPhysicalAddress() {
-		return startPhysicalAddress;
+		return this.startPhysicalAddress;
 	}
 
 	/**
@@ -272,8 +282,9 @@ public int getStartPhysicalAddress() {
 	 *
 	 * @return memory bank size in bytes.
 	 */
+	@Override
 	public int getSize() {
-		return size;
+		return this.size;
 	}
 
 	/**
@@ -282,8 +293,9 @@ public int getSize() {
 	 * @param doReadVerf true (default) verify write in 'write' false, don't verify
 	 *                   write (used on Write-Once bit manipulation)
 	 */
+	@Override
 	public void setWriteVerification(boolean doReadVerf) {
-		writeVerification = doReadVerf;
+		this.writeVerification = doReadVerf;
 	}
 
 	// --------
@@ -312,34 +324,38 @@ public void setWriteVerification(boolean doReadVerf) {
 	 * @throws OneWireIOException
 	 * @throws OneWireException
 	 */
+	@Override
 	public void read(int startAddr, boolean readContinue, byte[] readBuf, int offset, int len)
 			throws OneWireIOException, OneWireException {
 		byte[] temp_buf;
 
 		// check for valid address
-		if ((startAddr < 0) || ((startAddr + len) > size))
+		if (startAddr < 0 || startAddr + len > this.size) {
 			throw new OneWireException("Read exceeds memory bank");
+		}
 
 		// check for zero length read (saves time)
-		if (len == 0)
+		if (len == 0) {
 			return;
+		}
 
 		// attempt to put device at max desired speed
-		checkSpeed();
+		this.checkSpeed();
 
 		// translate the address into a page and offset
-		int page = (startAddr + startPhysicalAddress) / 8;
-		int page_offset = (startAddr + startPhysicalAddress) % 8;
-		int data_len = 8 - page_offset;
-		if (data_len > len)
+		var page = (startAddr + this.startPhysicalAddress) / 8;
+		var page_offset = (startAddr + this.startPhysicalAddress) % 8;
+		var data_len = 8 - page_offset;
+		if (data_len > len) {
 			data_len = len;
-		int page_cnt = 0;
-		int data_read = 0;
+		}
+		var page_cnt = 0;
+		var data_read = 0;
 
 		// loop while reading pages
 		while (data_read < len) {
 			// read a page
-			temp_buf = readRawPage(page + page_cnt);
+			temp_buf = this.readRawPage(page + page_cnt);
 
 			// copy contents to the readBuf
 			System.arraycopy(temp_buf, page_offset, readBuf, offset + data_read, data_len);
@@ -348,9 +364,10 @@ public void read(int startAddr, boolean readContinue, byte[] readBuf, int offset
 			page_cnt++;
 			data_read += data_len;
 			page_offset = 0;
-			data_len = (len - data_read);
-			if (data_len > 8)
+			data_len = len - data_read;
+			if (data_len > 8) {
 				data_len = 8;
+			}
 		}
 	}
 
@@ -374,36 +391,40 @@ public void read(int startAddr, boolean readContinue, byte[] readBuf, int offset
 	 * @throws OneWireIOException
 	 * @throws OneWireException
 	 */
+	@Override
 	public void write(int startAddr, byte[] writeBuf, int offset, int len) throws OneWireIOException, OneWireException {
 		byte[] temp_buf;
 
 		// return if nothing to do
-		if (len == 0)
+		if (len == 0) {
 			return;
+		}
 
 		// check if power delivery is available
-		if (!ib.adapter.canDeliverPower())
+		if (!this.ib.adapter.canDeliverPower()) {
 			throw new OneWireException("Power delivery required but not available");
+		}
 
 		// attempt to put device at max desired speed
-		checkSpeed();
+		this.checkSpeed();
 
 		// translate the address into a page and offset
-		int page = (startAddr + startPhysicalAddress) / 8;
-		int page_offset = (startAddr + startPhysicalAddress) % 8;
-		int data_len = 8 - page_offset;
-		if (data_len > len)
+		var page = (startAddr + this.startPhysicalAddress) / 8;
+		var page_offset = (startAddr + this.startPhysicalAddress) % 8;
+		var data_len = 8 - page_offset;
+		if (data_len > len) {
 			data_len = len;
-		int page_cnt = 0;
-		int data_written = 0;
-		byte[] page_buf = new byte[8];
+		}
+		var page_cnt = 0;
+		var data_written = 0;
+		var page_buf = new byte[8];
 
 		// loop while writing pages
 		while (data_written < len) {
 			// check if only writing part of page
 			// pre-fill write page buff with current page contents
-			if ((page_offset != 0) || (data_len != 8)) {
-				temp_buf = readRawPage(page + page_cnt);
+			if (page_offset != 0 || data_len != 8) {
+				temp_buf = this.readRawPage(page + page_cnt);
 				System.arraycopy(temp_buf, 0, page_buf, 0, 8);
 			}
 
@@ -411,15 +432,16 @@ public void write(int startAddr, byte[] writeBuf, int offset, int len) throws On
 			System.arraycopy(writeBuf, offset + data_written, page_buf, page_offset, data_len);
 
 			// write the page
-			writeRawPage(page + page_cnt, page_buf, 0);
+			this.writeRawPage(page + page_cnt, page_buf, 0);
 
 			// increment counters
 			page_cnt++;
 			data_written += data_len;
 			page_offset = 0;
-			data_len = (len - data_written);
-			if (data_len > 8)
+			data_len = len - data_written;
+			if (data_len > 8) {
 				data_len = 8;
+			}
 		}
 	}
 
@@ -439,38 +461,40 @@ public void write(int startAddr, byte[] writeBuf, int offset, int len) throws On
 	 * @throws IllegalArgumentException Bad parameters passed
 	 */
 	protected byte[] readRawPage(int page) throws OneWireIOException, OneWireException {
-		byte[] buffer = new byte[11];
-		byte[] result = new byte[8];
+		var buffer = new byte[11];
+		var result = new byte[8];
 		int crc8; // this device uses a crc 8
 
-		if (ib.adapter.select(ib.address)) {
-			/* recall memory to the scratchpad */
-			buffer[0] = RECALL_MEMORY_COMMAND;
-			buffer[1] = (byte) page;
+		if (!this.ib.adapter.select(this.ib.address)) {
+			throw new OneWireIOException("Device not found during read page.");
+		}
+		/* recall memory to the scratchpad */
+		buffer[0] = RECALL_MEMORY_COMMAND;
+		buffer[1] = (byte) page;
 
-			ib.adapter.dataBlock(buffer, 0, 2);
+		this.ib.adapter.dataBlock(buffer, 0, 2);
 
-			/* perform the read scratchpad */
-			ib.adapter.select(ib.address);
+		/* perform the read scratchpad */
+		this.ib.adapter.select(this.ib.address);
 
-			buffer[0] = READ_SCRATCHPAD_COMMAND;
-			buffer[1] = (byte) page;
+		buffer[0] = READ_SCRATCHPAD_COMMAND;
+		buffer[1] = (byte) page;
 
-			for (int i = 2; i < 11; i++)
-				buffer[i] = (byte) 0x0ff;
+		for (var i = 2; i < 11; i++) {
+			buffer[i] = (byte) 0x0ff;
+		}
 
-			ib.adapter.dataBlock(buffer, 0, 11);
+		this.ib.adapter.dataBlock(buffer, 0, 11);
 
-			/* do the crc check */
-			crc8 = CRC8.compute(buffer, 2, 9);
+		/* do the crc check */
+		crc8 = CRC8.compute(buffer, 2, 9);
 
-			if (crc8 != 0x0)
-				throw new OneWireIOException("Bad CRC during page read " + crc8);
+		if (crc8 != 0x0) {
+			throw new OneWireIOException("Bad CRC during page read " + crc8);
+		}
 
-			// copy the data into the result
-			System.arraycopy(buffer, 2, result, 0, 8);
-		} else
-			throw new OneWireIOException("Device not found during read page.");
+		// copy the data into the result
+		System.arraycopy(buffer, 2, result, 0, 8);
 
 		return result;
 	}
@@ -491,38 +515,39 @@ protected byte[] readRawPage(int page) throws OneWireIOException, OneWireExcepti
 	 * @throws IllegalArgumentException Bad parameters passed
 	 */
 	protected void writeRawPage(int page, byte[] source, int offset) throws OneWireIOException, OneWireException {
-		byte[] buffer = new byte[12];
+		var buffer = new byte[12];
 		int crc8;
 
-		if (ib.adapter.select(ib.address)) {
+		if (this.ib.adapter.select(this.ib.address)) {
 			// write the page to the scratchpad first
 			buffer[0] = WRITE_SCRATCHPAD_COMMAND;
 			buffer[1] = (byte) page;
 
 			System.arraycopy(source, offset, buffer, 2, 8);
-			ib.adapter.dataBlock(buffer, 0, 10);
+			this.ib.adapter.dataBlock(buffer, 0, 10);
 
 			// read back the scrathpad
-			if (ib.adapter.select(ib.address)) {
+			if (this.ib.adapter.select(this.ib.address)) {
 				// write the page to the scratchpad first
 				buffer[0] = READ_SCRATCHPAD_COMMAND;
 				buffer[1] = (byte) page;
 
-				System.arraycopy(ffBlock, 0, buffer, 2, 9);
-				ib.adapter.dataBlock(buffer, 0, 11);
+				System.arraycopy(this.ffBlock, 0, buffer, 2, 9);
+				this.ib.adapter.dataBlock(buffer, 0, 11);
 
 				/* do the crc check */
 				crc8 = CRC8.compute(buffer, 2, 9);
 
-				if (crc8 != 0x0)
+				if (crc8 != 0x0) {
 					throw new OneWireIOException("Bad CRC during scratchpad read " + crc8);
+				}
 
 				// now copy that part of the scratchpad to memory
-				if (ib.adapter.select(ib.address)) {
+				if (this.ib.adapter.select(this.ib.address)) {
 					buffer[0] = COPY_SCRATCHPAD_COMMAND;
 					buffer[1] = (byte) page;
 
-					ib.adapter.dataBlock(buffer, 0, 2);
+					this.ib.adapter.dataBlock(buffer, 0, 2);
 
 					// give it some time to write
 					try {
@@ -531,8 +556,9 @@ protected void writeRawPage(int page, byte[] source, int offset) throws OneWireI
 					}
 
 					// check the result
-					if ((byte) ib.adapter.getByte() != (byte) 0xFF)
+					if ((byte) this.ib.adapter.getByte() != (byte) 0xFF) {
 						throw new OneWireIOException("Copy scratchpad verification not found.");
+					}
 
 					return;
 				}
@@ -557,13 +583,13 @@ public void checkSpeed() throws OneWireIOException, OneWireException {
 		synchronized (this) {
 
 			// only check the speed
-			if (doSetSpeed) {
+			if (this.doSetSpeed) {
 
 				// attempt to set the correct speed and verify device present
-				ib.doSpeed();
+				this.ib.doSpeed();
 
 				// no exceptions so clear flag
-				doSetSpeed = false;
+				this.doSetSpeed = false;
 			}
 		}
 	}
@@ -574,7 +600,7 @@ public void checkSpeed() throws OneWireIOException, OneWireException {
 	 */
 	public void forceVerify() {
 		synchronized (this) {
-			doSetSpeed = true;
+			this.doSetSpeed = true;
 		}
 	}
 }
diff --git a/io.openems.edge.bridge.onewire/src/com/dalsemi/onewire/container/MemoryBankSHAEE.java b/io.openems.edge.bridge.onewire/src/com/dalsemi/onewire/container/MemoryBankSHAEE.java
index 327c05af97a..08e3cc0c609 100644
--- a/io.openems.edge.bridge.onewire/src/com/dalsemi/onewire/container/MemoryBankSHAEE.java
+++ b/io.openems.edge.bridge.onewire/src/com/dalsemi/onewire/container/MemoryBankSHAEE.java
@@ -179,15 +179,15 @@ public class MemoryBankSHAEE implements PagedMemoryBank {
 	 */
 	public MemoryBankSHAEE(OneWireContainer33 ibutton, MemoryBankScratchSHAEE scratch) {
 		// keep reference to ibutton where memory bank is
-		ib = ibutton;
+		this.ib = ibutton;
 
-		scratchpad = scratch;
+		this.scratchpad = scratch;
 
 		// keep reference to adapter that button is on
-		adapter = ib.getAdapter();
+		this.adapter = this.ib.getAdapter();
 
 		// indicate speed has not been set
-		doSetSpeed = true;
+		this.doSetSpeed = true;
 	}
 
 	// --------
@@ -199,8 +199,9 @@ public MemoryBankSHAEE(OneWireContainer33 ibutton, MemoryBankScratchSHAEE scratc
 	 *
 	 * @return String containing the memory bank description
 	 */
+	@Override
 	public String getBankDescription() {
-		return bankDescription;
+		return this.bankDescription;
 	}
 
 	/**
@@ -210,8 +211,9 @@ public String getBankDescription() {
 	 *
 	 * @return 'true' if current memory bank is general purpose
 	 */
+	@Override
 	public boolean isGeneralPurposeMemory() {
-		return generalPurposeMemory;
+		return this.generalPurposeMemory;
 	}
 
 	/**
@@ -219,8 +221,9 @@ public boolean isGeneralPurposeMemory() {
 	 *
 	 * @return 'true' if current memory bank is read/write
 	 */
+	@Override
 	public boolean isReadWrite() {
-		return readWrite;
+		return this.readWrite;
 	}
 
 	/**
@@ -229,8 +232,9 @@ public boolean isReadWrite() {
 	 *
 	 * @return 'true' if current memory bank can only be written once
 	 */
+	@Override
 	public boolean isWriteOnce() {
-		return writeOnce;
+		return this.writeOnce;
 	}
 
 	/**
@@ -238,8 +242,9 @@ public boolean isWriteOnce() {
 	 *
 	 * @return 'true' if current memory bank can only be read
 	 */
+	@Override
 	public boolean isReadOnly() {
-		return readOnly;
+		return this.readOnly;
 	}
 
 	/**
@@ -248,6 +253,7 @@ public boolean isReadOnly() {
 	 *
 	 * @return 'true' if current memory bank non volatile.
 	 */
+	@Override
 	public boolean isNonVolatile() {
 		return true;
 	}
@@ -259,6 +265,7 @@ public boolean isNonVolatile() {
 	 * @return 'true' if writing to the current memory bank pages requires a
 	 *         'ProgramPulse'.
 	 */
+	@Override
 	public boolean needsProgramPulse() {
 		return false;
 	}
@@ -270,6 +277,7 @@ public boolean needsProgramPulse() {
 	 * @return 'true' if writing to the current memory bank pages requires
 	 *         'PowerDelivery'.
 	 */
+	@Override
 	public boolean needsPowerDelivery() {
 		return true;
 	}
@@ -280,8 +288,9 @@ public boolean needsPowerDelivery() {
 	 *
 	 * @return physical starting address of this logical bank.
 	 */
+	@Override
 	public int getStartPhysicalAddress() {
-		return startPhysicalAddress;
+		return this.startPhysicalAddress;
 	}
 
 	/**
@@ -289,8 +298,9 @@ public int getStartPhysicalAddress() {
 	 *
 	 * @return memory bank size in bytes.
 	 */
+	@Override
 	public int getSize() {
-		return size;
+		return this.size;
 	}
 
 	/**
@@ -299,8 +309,9 @@ public int getSize() {
 	 * @param doReadVerf true (default) verify write in 'write' false, don't verify
 	 *                   write (used on Write-Once bit manipulation)
 	 */
+	@Override
 	public void setWriteVerification(boolean doReadVerf) {
-		writeVerification = doReadVerf;
+		this.writeVerification = doReadVerf;
 	}
 
 	/**
@@ -308,8 +319,9 @@ public void setWriteVerification(boolean doReadVerf) {
 	 *
 	 * @return number of pages in current memory bank
 	 */
+	@Override
 	public int getNumberPages() {
-		return numberPages;
+		return this.numberPages;
 	}
 
 	/**
@@ -317,8 +329,9 @@ public int getNumberPages() {
 	 *
 	 * @return page length in bytes in current memory bank
 	 */
+	@Override
 	public int getPageLength() {
-		return pageLength;
+		return this.pageLength;
 	}
 
 	/**
@@ -328,8 +341,9 @@ public int getPageLength() {
 	 *
 	 * @return 'true' if current memory bank can be read with self generated CRC.
 	 */
+	@Override
 	public boolean hasPageAutoCRC() {
-		return pageCRC;
+		return this.pageCRC;
 	}
 
 	/**
@@ -349,8 +363,9 @@ public boolean hasPageAutoCRC() {
 	 * @see #readPagePacket(int,boolean,byte[],int,byte[]) readPagePacket(extra)
 	 * @since 1-Wire API 0.01
 	 */
+	@Override
 	public boolean hasExtraInfo() {
-		return extraInfo;
+		return this.extraInfo;
 	}
 
 	/**
@@ -360,8 +375,9 @@ public boolean hasExtraInfo() {
 	 * @return number of bytes in Extra Information read when reading pages in the
 	 *         current memory bank.
 	 */
+	@Override
 	public int getExtraInfoLength() {
-		return extraInfoLength;
+		return this.extraInfoLength;
 	}
 
 	/**
@@ -371,6 +387,7 @@ public int getExtraInfoLength() {
 	 *
 	 * @return string describing extra information.
 	 */
+	@Override
 	public String getExtraInfoDescription() {
 		return "The MAC for the SHA Engine";
 	}
@@ -378,13 +395,14 @@ public String getExtraInfoDescription() {
 	/**
 	 * Query to get Maximum data page length in bytes for a packet read or written
 	 * in the current memory bank. See the 'ReadPagePacket()' and
-	 * 'WritePagePacket()' methods. This method is only useful if the current
-	 * memory bank is general purpose memory.
+	 * 'WritePagePacket()' methods. This method is only useful if the current memory
+	 * bank is general purpose memory.
 	 *
 	 * @return max packet page length in bytes in current memory bank
 	 */
+	@Override
 	public int getMaxPacketDataLength() {
-		return maxPacketDataLength;
+		return this.maxPacketDataLength;
 	}
 
 	// --------
@@ -414,6 +432,7 @@ public int getMaxPacketDataLength() {
 	 * @throws OneWireIOException
 	 * @throws OneWireException
 	 */
+	@Override
 	public void read(int startAddr, boolean readContinue, byte[] readBuf, int offset, int len)
 			throws OneWireIOException, OneWireException {
 		// \\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//
@@ -424,7 +443,7 @@ public void read(int startAddr, boolean readContinue, byte[] readBuf, int offset
 			Debug.debug("  readContinue=" + readContinue);
 			Debug.debug("  offset=" + offset);
 			Debug.debug("  len=" + len);
-			Debug.debug("  this.startPhysicalAddress=0x" + Convert.toHexString((byte) startPhysicalAddress));
+			Debug.debug("  this.startPhysicalAddress=0x" + Convert.toHexString((byte) this.startPhysicalAddress));
 			Debug.debug("  this.pageLength=" + this.pageLength);
 			Debug.debug("  this.numberPages=" + this.numberPages);
 			Debug.stackTrace();
@@ -432,45 +451,50 @@ public void read(int startAddr, boolean readContinue, byte[] readBuf, int offset
 		// \\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//
 
 		// attempt to put device at max desired speed
-		if (!readContinue && ib.adapterSet())
-			checkSpeed();
+		if (!readContinue && this.ib.adapterSet()) {
+			this.checkSpeed();
+		}
 
 		// check if read exceeds memory
-		if ((startAddr + len) > (pageLength * numberPages))
+		if (startAddr + len > this.pageLength * this.numberPages) {
 			throw new OneWireException("Read exceeds memory bank end.");
+		}
 
 		// see if need to access the device
 		if (!readContinue) {
 			// select the device
-			if (!adapter.select(ib.getAddress()))
+			if (!this.adapter.select(this.ib.getAddress())) {
 				throw new OneWireIOException("Device select failed.");
+			}
 
 			// build start reading memory block
-			int addr = startAddr + startPhysicalAddress;
-			byte[] raw_buf = new byte[3];
+			var addr = startAddr + this.startPhysicalAddress;
+			var raw_buf = new byte[3];
 
 			raw_buf[0] = READ_MEMORY;
 			raw_buf[1] = (byte) (addr & 0xFF);
-			raw_buf[2] = (byte) (((addr & 0xFFFF) >>> 8) & 0xFF);
+			raw_buf[2] = (byte) ((addr & 0xFFFF) >>> 8 & 0xFF);
 
 			// do the first block for command, address
-			adapter.dataBlock(raw_buf, 0, 3);
+			this.adapter.dataBlock(raw_buf, 0, 3);
 			// \\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//
-			if (DEBUG)
+			if (DEBUG) {
 				Debug.debug("  raw_buf", raw_buf, 0, 3);
-			// \\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//
+				// \\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//
+			}
 		}
 
 		// pre-fill readBuf with 0xFF
-		int pgs = len / pageLength;
-		int extra = len % pageLength;
+		var pgs = len / this.pageLength;
+		var extra = len % this.pageLength;
 
-		for (int i = 0; i < pgs; i++)
-			System.arraycopy(ffBlock, 0, readBuf, offset + i * pageLength, pageLength);
-		System.arraycopy(ffBlock, 0, readBuf, offset + pgs * pageLength, extra);
+		for (var i = 0; i < pgs; i++) {
+			System.arraycopy(ffBlock, 0, readBuf, offset + i * this.pageLength, this.pageLength);
+		}
+		System.arraycopy(ffBlock, 0, readBuf, offset + pgs * this.pageLength, extra);
 
 		// send second block to read data, return result
-		adapter.dataBlock(readBuf, offset, len);
+		this.adapter.dataBlock(readBuf, offset, len);
 
 		// \\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//
 		if (DEBUG) {
@@ -501,6 +525,7 @@ public void read(int startAddr, boolean readContinue, byte[] readBuf, int offset
 	 * @throws OneWireIOException
 	 * @throws OneWireException
 	 */
+	@Override
 	public void write(int startAddr, byte[] writeBuf, int offset, int len) throws OneWireIOException, OneWireException {
 		// \\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\
 		if (DEBUG) {
@@ -508,93 +533,103 @@ public void write(int startAddr, byte[] writeBuf, int offset, int len) throws On
 			Debug.debug("MemoryBankSHAEE.write(int,byte[],int,int) called");
 			Debug.debug("  startAddr=0x" + Convert.toHexString((byte) startAddr));
 			Debug.debug("  writeBuf", writeBuf, offset, len);
-			Debug.debug("  startPhysicalAddress=0x" + Convert.toHexString((byte) startPhysicalAddress));
+			Debug.debug("  startPhysicalAddress=0x" + Convert.toHexString((byte) this.startPhysicalAddress));
 		}
 		// \\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\
 		int room_left;
 
-		if (!checked)
-			checked = ib.checkStatus();
+		if (!this.checked) {
+			this.checked = this.ib.checkStatus();
+		}
 
 		// return if nothing to do
-		if (len == 0)
+		if (len == 0) {
 			return;
+		}
 
 		// attempt to put device at speed
-		checkSpeed();
+		this.checkSpeed();
 
 		// check to see if secret is set
-		if (!ib.isContainerSecretSet())
+		if (!this.ib.isContainerSecretSet()) {
 			throw new OneWireException("Secret is not set.");
+		}
 
 		// check if write exceeds memory
-		if ((startAddr + len) > size)
+		if (startAddr + len > this.size) {
 			throw new OneWireException("Write exceeds memory bank end");
+		}
 
 		// check if trying to write read only bank
-		if (isReadOnly())
+		if (this.isReadOnly()) {
 			throw new OneWireException("Trying to write read-only memory bank");
+		}
 
 		// loop while still have pages to write
 		int startx = 0, nextx = 0; // (start and next index into writeBuf)
-		byte[] raw_buf = new byte[8];
-		byte[] memory = new byte[(size - (startAddr & 0xE0))]; // till end of memory
-		int abs_addr = startPhysicalAddress + startAddr;
-		int pl = 8;
+		var raw_buf = new byte[8];
+		var memory = new byte[this.size - (startAddr & 0xE0)]; // till end of memory
+		var abs_addr = this.startPhysicalAddress + startAddr;
+		var pl = 8;
 
-		read(startAddr & 0xE0, false, memory, 0, memory.length);
+		this.read(startAddr & 0xE0, false, memory, 0, memory.length);
 
 		if (abs_addr >= 128) {
-			ib.getContainerSecret(memory, 0);
+			this.ib.getContainerSecret(memory, 0);
 		}
 
 		do {
 			// calculate room left in current page
-			room_left = pl - ((abs_addr + startx) % pl);
+			room_left = pl - (abs_addr + startx) % pl;
 
 			// check if block left will cross end of page
-			if ((len - startx) > room_left)
+			if (len - startx > room_left) {
 				nextx = startx + room_left;
-			else
+			} else {
 				nextx = len;
+			}
 
 			// bug fix, if updating pages two and three in the same write op
 			// this used to fail, was (startAddr>=pageLength)
-			if ((startx + startAddr) >= pageLength)
-				System.arraycopy(memory, (((startx + startAddr) / 8) * 8) - 32, raw_buf, 0, 8);
-			else
-				System.arraycopy(memory, (((startx + startAddr) / 8) * 8), raw_buf, 0, 8);
+			if (startx + startAddr >= this.pageLength) {
+				System.arraycopy(memory, (startx + startAddr) / 8 * 8 - 32, raw_buf, 0, 8);
+			} else {
+				System.arraycopy(memory, (startx + startAddr) / 8 * 8, raw_buf, 0, 8);
+			}
 
-			if ((nextx - startx) == 8)
+			if (nextx - startx == 8) {
 				System.arraycopy(writeBuf, offset + startx, raw_buf, 0, 8);
-			else if (((startAddr + nextx) % 8) == 0)
-				System.arraycopy(writeBuf, offset + startx, raw_buf, ((startAddr + startx) % 8),
-						8 - ((startAddr + startx) % 8));
-			else
-				System.arraycopy(writeBuf, offset + startx, raw_buf, ((startAddr + startx) % 8),
-						((startAddr + nextx) % 8) - ((startAddr + startx) % 8));
+			} else if ((startAddr + nextx) % 8 == 0) {
+				System.arraycopy(writeBuf, offset + startx, raw_buf, (startAddr + startx) % 8,
+						8 - (startAddr + startx) % 8);
+			} else {
+				System.arraycopy(writeBuf, offset + startx, raw_buf, (startAddr + startx) % 8,
+						(startAddr + nextx) % 8 - (startAddr + startx) % 8);
+			}
 
 			// write the page of data to scratchpad
-			scratchpad.writeScratchpad(abs_addr + startx + room_left - 8, raw_buf, 0, 8);
+			this.scratchpad.writeScratchpad(abs_addr + startx + room_left - 8, raw_buf, 0, 8);
 
 			// Copy data from scratchpad into memory
-			scratchpad.copyScratchpad(abs_addr + startx + room_left - 8, raw_buf, 0, memory, 0);
+			this.scratchpad.copyScratchpad(abs_addr + startx + room_left - 8, raw_buf, 0, memory, 0);
 
 			// bug fix, if updating pages two and three in the same write op
 			// this used to fail, was (startAddr>=pageLength)
-			if ((startx + startAddr) >= pageLength)
-				System.arraycopy(raw_buf, 0, memory, (((startx + startAddr) / 8) * 8) - 32, 8);
-			else
-				System.arraycopy(raw_buf, 0, memory, (((startx + startAddr) / 8) * 8), 8);
+			if (startx + startAddr >= this.pageLength) {
+				System.arraycopy(raw_buf, 0, memory, (startx + startAddr) / 8 * 8 - 32, 8);
+			} else {
+				System.arraycopy(raw_buf, 0, memory, (startx + startAddr) / 8 * 8, 8);
+			}
 
 			// point to next index
 			startx = nextx;
 		} while (nextx < len);
 
 		// \\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\
-		if (DEBUG)
+		if (DEBUG) {
 			Debug.debug("-----------------------------------------------------------");
-		// \\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\
+			// \\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\
+		}
 	}
 
 	// --------
@@ -622,9 +657,10 @@ else if (((startAddr + nextx) % 8) == 0)
 	 * @throws OneWireIOException
 	 * @throws OneWireException
 	 */
+	@Override
 	public void readPage(int page, boolean readContinue, byte[] readBuf, int offset)
 			throws OneWireIOException, OneWireException {
-		read(page * pageLength, readContinue, readBuf, offset, pageLength);
+		this.read(page * this.pageLength, readContinue, readBuf, offset, this.pageLength);
 	}
 
 	/**
@@ -650,22 +686,27 @@ public void readPage(int page, boolean readContinue, byte[] readBuf, int offset)
 	 * @throws OneWireIOException
 	 * @throws OneWireException
 	 */
+	@Override
 	public void readPage(int page, boolean readContinue, byte[] readBuf, int offset, byte[] extraInfo)
 			throws OneWireIOException, OneWireException {
-		byte[] pg = new byte[32];
+		var pg = new byte[32];
 
-		if (!checked)
-			checked = ib.checkStatus();
+		if (!this.checked) {
+			this.checked = this.ib.checkStatus();
+		}
 
-		if (!hasPageAutoCRC())
+		if (!this.hasPageAutoCRC()) {
 			throw new OneWireException("This memory bank doesn't have crc capabilities.");
+		}
 
 		// attempt to put device at max desired speed
-		if (!readContinue)
-			checkSpeed();
+		if (!readContinue) {
+			this.checkSpeed();
+		}
 
-		if (!readAuthenticatedPage(page, pg, 0, extraInfo, 0))
+		if (!this.readAuthenticatedPage(page, pg, 0, extraInfo, 0)) {
 			throw new OneWireException("Read didn't work.");
+		}
 
 		System.arraycopy(pg, 0, readBuf, offset, 32);
 	}
@@ -698,16 +739,18 @@ public void readPage(int page, boolean readContinue, byte[] readBuf, int offset,
 	 * @throws OneWireIOException
 	 * @throws OneWireException
 	 */
+	@Override
 	public int readPagePacket(int page, boolean readContinue, byte[] readBuf, int offset)
 			throws OneWireIOException, OneWireException {
-		byte[] raw_buf = new byte[pageLength];
+		var raw_buf = new byte[this.pageLength];
 
 		// read the page
-		readPage(page, readContinue, raw_buf, 0);
+		this.readPage(page, readContinue, raw_buf, 0);
 
 		// check if length is realistic
-		if ((raw_buf[0] & 0x00FF) > maxPacketDataLength)
+		if ((raw_buf[0] & 0x00FF) > this.maxPacketDataLength) {
 			throw new OneWireIOException("Invalid length in packet.");
+		}
 
 		// verify the CRC is correct
 		if (CRC16.compute(raw_buf, 0, raw_buf[0] + 3, page) == 0x0000B001) {
@@ -717,8 +760,8 @@ public int readPagePacket(int page, boolean readContinue, byte[] readBuf, int of
 
 			// return the length
 			return raw_buf[0];
-		} else
-			throw new OneWireIOException("Invalid CRC16 in packet read.");
+		}
+		throw new OneWireIOException("Invalid CRC16 in packet read.");
 	}
 
 	/**
@@ -743,22 +786,26 @@ public int readPagePacket(int page, boolean readContinue, byte[] readBuf, int of
 	 * @throws OneWireIOException
 	 * @throws OneWireException
 	 */
+	@Override
 	public int readPagePacket(int page, boolean readContinue, byte[] readBuf, int offset, byte[] extraInfo)
 			throws OneWireIOException, OneWireException {
-		byte[] raw_buf = new byte[pageLength];
+		var raw_buf = new byte[this.pageLength];
 
-		if (!checked)
-			checked = ib.checkStatus();
+		if (!this.checked) {
+			this.checked = this.ib.checkStatus();
+		}
 
-		if (!hasPageAutoCRC())
+		if (!this.hasPageAutoCRC()) {
 			throw new OneWireException("This memory bank page doesn't have CRC capabilities.");
+		}
 
 		// read the page
-		readAuthenticatedPage(page, raw_buf, 0, extraInfo, 0);
+		this.readAuthenticatedPage(page, raw_buf, 0, extraInfo, 0);
 
 		// check if length is realistic
-		if ((raw_buf[0] & 0x00FF) > maxPacketDataLength)
+		if ((raw_buf[0] & 0x00FF) > this.maxPacketDataLength) {
 			throw new OneWireIOException("Invalid length in packet.");
+		}
 
 		// verify the CRC is correct
 		if (CRC16.compute(raw_buf, 0, raw_buf[0] + 3, page) == 0x0000B001) {
@@ -768,8 +815,8 @@ public int readPagePacket(int page, boolean readContinue, byte[] readBuf, int of
 
 			// return the length
 			return raw_buf[0];
-		} else
-			throw new OneWireIOException("Invalid CRC16 in packet read.");
+		}
+		throw new OneWireIOException("Invalid CRC16 in packet read.");
 	}
 
 	/**
@@ -784,31 +831,34 @@ public int readPagePacket(int page, boolean readContinue, byte[] readBuf, int of
 	 * @throws OneWireIOException
 	 * @throws OneWireException
 	 */
+	@Override
 	public void writePagePacket(int page, byte[] writeBuf, int offset, int len)
 			throws OneWireIOException, OneWireException {
 
 		// make sure length does not exceed max
-		if (len > maxPacketDataLength)
+		if (len > this.maxPacketDataLength) {
 			throw new OneWireIOException("Length of packet requested exceeds page size.");
+		}
 
 		// see if this bank is general read/write
-		if (!generalPurposeMemory)
+		if (!this.generalPurposeMemory) {
 			throw new OneWireException("Current bank is not general purpose memory.");
+		}
 
 		// construct the packet to write
-		byte[] raw_buf = new byte[len + 3];
+		var raw_buf = new byte[len + 3];
 
 		raw_buf[0] = (byte) len;
 
 		System.arraycopy(writeBuf, offset, raw_buf, 1, len);
 
-		int crc = CRC16.compute(raw_buf, 0, len + 1, page);
+		var crc = CRC16.compute(raw_buf, 0, len + 1, page);
 
 		raw_buf[len + 1] = (byte) (~crc & 0xFF);
-		raw_buf[len + 2] = (byte) (((~crc & 0xFFFF) >>> 8) & 0xFF);
+		raw_buf[len + 2] = (byte) ((~crc & 0xFFFF) >>> 8 & 0xFF);
 
 		// write the packet, return result
-		write(page * pageLength, raw_buf, 0, len + 3);
+		this.write(page * this.pageLength, raw_buf, 0, len + 3);
 	}
 
 	/**
@@ -827,21 +877,25 @@ public void writePagePacket(int page, byte[] writeBuf, int offset, int len)
 	 * @throws OneWireIOException
 	 * @throws OneWireException
 	 */
+	@Override
 	public void readPageCRC(int page, boolean readContinue, byte[] readBuf, int offset)
 			throws OneWireIOException, OneWireException {
-		byte[] extra = new byte[20];
-		byte[] pg = new byte[32];
+		var extra = new byte[20];
+		var pg = new byte[32];
 
-		if (!checked)
-			checked = ib.checkStatus();
+		if (!this.checked) {
+			this.checked = this.ib.checkStatus();
+		}
 
-		if (!hasPageAutoCRC())
+		if (!this.hasPageAutoCRC()) {
 			throw new OneWireException("This memory bank doesn't have CRC capabilities.");
+		}
 
-		if (!readAuthenticatedPage(page, pg, 0, extra, 0))
+		if (!this.readAuthenticatedPage(page, pg, 0, extra, 0)) {
 			throw new OneWireException("Read didn't work.");
+		}
 
-		System.arraycopy(pg, 0, readBuf, offset, pageLength);
+		System.arraycopy(pg, 0, readBuf, offset, this.pageLength);
 	}
 
 	/**
@@ -863,20 +917,24 @@ public void readPageCRC(int page, boolean readContinue, byte[] readBuf, int offs
 	 * @throws OneWireIOException
 	 * @throws OneWireException
 	 */
+	@Override
 	public void readPageCRC(int page, boolean readContinue, byte[] readBuf, int offset, byte[] extraInfo)
 			throws OneWireIOException, OneWireException {
-		byte[] pg = new byte[32];
+		var pg = new byte[32];
 
-		if (!checked)
-			checked = ib.checkStatus();
+		if (!this.checked) {
+			this.checked = this.ib.checkStatus();
+		}
 
-		if (!hasPageAutoCRC())
+		if (!this.hasPageAutoCRC()) {
 			throw new OneWireException("This memory bank doesn't have CRC capabilities.");
+		}
 
-		if (!readAuthenticatedPage(page, pg, 0, extraInfo, 0))
+		if (!this.readAuthenticatedPage(page, pg, 0, extraInfo, 0)) {
 			throw new OneWireException("Read didn't work.");
+		}
 
-		System.arraycopy(pg, 0, readBuf, offset, pageLength);
+		System.arraycopy(pg, 0, readBuf, offset, this.pageLength);
 	}
 
 	// ------------------------
@@ -887,15 +945,15 @@ public void readPageCRC(int page, boolean readContinue, byte[] readBuf, int offs
 	 * Write protect the memory bank.
 	 */
 	public void writeprotect() {
-		readOnly = true;
-		readWrite = false;
+		this.readOnly = true;
+		this.readWrite = false;
 	}
 
 	/**
 	 * Sets the EPROM mode for this page.
 	 */
 	public void setEPROM() {
-		writeOnce = true;
+		this.writeOnce = true;
 	}
 
 	// ------------------------
@@ -912,13 +970,13 @@ public void setEPROM() {
 	public void checkSpeed() throws OneWireIOException, OneWireException {
 		synchronized (this) {
 			// only check the speed
-			if (doSetSpeed) {
+			if (this.doSetSpeed) {
 
 				// attempt to set the correct speed and verify device present
-				ib.doSpeed();
+				this.ib.doSpeed();
 
 				// no exceptions so clear flag
-				doSetSpeed = false;
+				this.doSetSpeed = false;
 			}
 		}
 	}
@@ -935,30 +993,31 @@ public void checkSpeed() throws OneWireIOException, OneWireException {
 	 */
 	public boolean readAuthenticatedPage(int page, byte[] data, int dataStart, byte[] extra_info, int extraStart)
 			throws OneWireException, OneWireIOException {
-		byte[] send_block = new byte[40];
-		byte[] challenge = new byte[8];
+		var send_block = new byte[40];
+		var challenge = new byte[8];
 
-		int addr = (page * pageLength) + startPhysicalAddress;
+		var addr = page * this.pageLength + this.startPhysicalAddress;
 
-		ib.getChallenge(challenge, 4);
-		scratchpad.writeScratchpad(addr, challenge, 0, 8);
+		this.ib.getChallenge(challenge, 4);
+		this.scratchpad.writeScratchpad(addr, challenge, 0, 8);
 
 		// access the device
-		if (!adapter.select(ib.getAddress()))
+		if (!this.adapter.select(this.ib.getAddress())) {
 			throw new OneWireIOException("Device select failed.");
+		}
 
 		// Read Authenticated Command
 		send_block[0] = READ_AUTH_PAGE;
 		// address 1
 		send_block[1] = (byte) (addr & 0xFF);
 		// address 2
-		send_block[2] = (byte) (((addr & 0xFFFF) >>> 8) & 0xFF);
+		send_block[2] = (byte) ((addr & 0xFFFF) >>> 8 & 0xFF);
 
 		// data + FF byte
 		System.arraycopy(ffBlock, 0, send_block, 3, 35);
 
 		// now send the block
-		adapter.dataBlock(send_block, 0, 38);
+		this.adapter.dataBlock(send_block, 0, 38);
 
 		// \\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\
 		if (DEBUG) {
@@ -981,10 +1040,10 @@ public boolean readAuthenticatedPage(int page, byte[] data, int dataStart, byte[
 		try {
 			Thread.sleep(2);
 		} catch (InterruptedException ie) {
-			;
+
 		}
 
-		adapter.dataBlock(send_block, 0, 22);
+		this.adapter.dataBlock(send_block, 0, 22);
 
 		// \\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\
 		if (DEBUG) {
@@ -1016,7 +1075,7 @@ public boolean readAuthenticatedPage(int page, byte[] data, int dataStart, byte[
 	 */
 	public void forceVerify() {
 		synchronized (this) {
-			doSetSpeed = true;
+			this.doSetSpeed = true;
 		}
 	}
 
diff --git a/io.openems.edge.bridge.onewire/src/com/dalsemi/onewire/container/MemoryBankScratch.java b/io.openems.edge.bridge.onewire/src/com/dalsemi/onewire/container/MemoryBankScratch.java
index c115b5278c5..a65265ef777 100644
--- a/io.openems.edge.bridge.onewire/src/com/dalsemi/onewire/container/MemoryBankScratch.java
+++ b/io.openems.edge.bridge.onewire/src/com/dalsemi/onewire/container/MemoryBankScratch.java
@@ -193,39 +193,40 @@ class MemoryBankScratch implements PagedMemoryBank, ScratchPad {
 	public MemoryBankScratch(OneWireContainer ibutton) {
 
 		// keep reference to ibutton where memory bank is
-		ib = ibutton;
+		this.ib = ibutton;
 
 		// initialize attributes of this memory bank - DEFAULT: DS199X scratchapd
-		bankDescription = "Scratchpad";
-		generalPurposeMemory = false;
-		startPhysicalAddress = 0;
-		size = 32;
-		readWrite = true;
-		writeOnce = false;
-		readOnly = false;
-		nonVolatile = false;
-		programPulse = false;
-		powerDelivery = false;
-		writeVerification = true;
-		numberPages = 1;
-		pageLength = 32;
-		maxPacketDataLength = 29;
-		pageAutoCRC = false;
-		extraInfo = true;
-		extraInfoLength = 3;
-		extraInfoDescription = "Target address, offset";
+		this.bankDescription = "Scratchpad";
+		this.generalPurposeMemory = false;
+		this.startPhysicalAddress = 0;
+		this.size = 32;
+		this.readWrite = true;
+		this.writeOnce = false;
+		this.readOnly = false;
+		this.nonVolatile = false;
+		this.programPulse = false;
+		this.powerDelivery = false;
+		this.writeVerification = true;
+		this.numberPages = 1;
+		this.pageLength = 32;
+		this.maxPacketDataLength = 29;
+		this.pageAutoCRC = false;
+		this.extraInfo = true;
+		this.extraInfoLength = 3;
+		this.extraInfoDescription = "Target address, offset";
 
 		// create the ffblock (used for faster 0xFF fills)
-		ffBlock = new byte[96];
+		this.ffBlock = new byte[96];
 
-		for (int i = 0; i < 96; i++)
-			ffBlock[i] = (byte) 0xFF;
+		for (var i = 0; i < 96; i++) {
+			this.ffBlock[i] = (byte) 0xFF;
+		}
 
 		// default copy scratchpad command
-		COPY_SCRATCHPAD_COMMAND = (byte) 0x55;
+		this.COPY_SCRATCHPAD_COMMAND = (byte) 0x55;
 
 		// indicate speed has not been set
-		doSetSpeed = true;
+		this.doSetSpeed = true;
 	}
 
 	// --------
@@ -237,8 +238,9 @@ public MemoryBankScratch(OneWireContainer ibutton) {
 	 *
 	 * @return String containing the memory bank description
 	 */
+	@Override
 	public String getBankDescription() {
-		return bankDescription;
+		return this.bankDescription;
 	}
 
 	/**
@@ -248,8 +250,9 @@ public String getBankDescription() {
 	 *
 	 * @return 'true' if current memory bank is general purpose
 	 */
+	@Override
 	public boolean isGeneralPurposeMemory() {
-		return generalPurposeMemory;
+		return this.generalPurposeMemory;
 	}
 
 	/**
@@ -257,8 +260,9 @@ public boolean isGeneralPurposeMemory() {
 	 *
 	 * @return 'true' if current memory bank is read/write
 	 */
+	@Override
 	public boolean isReadWrite() {
-		return readWrite;
+		return this.readWrite;
 	}
 
 	/**
@@ -267,8 +271,9 @@ public boolean isReadWrite() {
 	 *
 	 * @return 'true' if current memory bank can only be written once
 	 */
+	@Override
 	public boolean isWriteOnce() {
-		return writeOnce;
+		return this.writeOnce;
 	}
 
 	/**
@@ -276,8 +281,9 @@ public boolean isWriteOnce() {
 	 *
 	 * @return 'true' if current memory bank can only be read
 	 */
+	@Override
 	public boolean isReadOnly() {
-		return readOnly;
+		return this.readOnly;
 	}
 
 	/**
@@ -286,8 +292,9 @@ public boolean isReadOnly() {
 	 *
 	 * @return 'true' if current memory bank non volatile.
 	 */
+	@Override
 	public boolean isNonVolatile() {
-		return nonVolatile;
+		return this.nonVolatile;
 	}
 
 	/**
@@ -297,8 +304,9 @@ public boolean isNonVolatile() {
 	 * @return 'true' if writing to the current memory bank pages requires a
 	 *         'ProgramPulse'.
 	 */
+	@Override
 	public boolean needsProgramPulse() {
-		return programPulse;
+		return this.programPulse;
 	}
 
 	/**
@@ -308,8 +316,9 @@ public boolean needsProgramPulse() {
 	 * @return 'true' if writing to the current memory bank pages requires
 	 *         'PowerDelivery'.
 	 */
+	@Override
 	public boolean needsPowerDelivery() {
-		return powerDelivery;
+		return this.powerDelivery;
 	}
 
 	/**
@@ -318,8 +327,9 @@ public boolean needsPowerDelivery() {
 	 *
 	 * @return physical starting address of this logical bank.
 	 */
+	@Override
 	public int getStartPhysicalAddress() {
-		return startPhysicalAddress;
+		return this.startPhysicalAddress;
 	}
 
 	/**
@@ -327,8 +337,9 @@ public int getStartPhysicalAddress() {
 	 *
 	 * @return memory bank size in bytes.
 	 */
+	@Override
 	public int getSize() {
-		return size;
+		return this.size;
 	}
 
 	/**
@@ -336,8 +347,9 @@ public int getSize() {
 	 *
 	 * @return number of pages in current memory bank
 	 */
+	@Override
 	public int getNumberPages() {
-		return numberPages;
+		return this.numberPages;
 	}
 
 	/**
@@ -345,20 +357,22 @@ public int getNumberPages() {
 	 *
 	 * @return page length in bytes in current memory bank
 	 */
+	@Override
 	public int getPageLength() {
-		return pageLength;
+		return this.pageLength;
 	}
 
 	/**
 	 * Query to get Maximum data page length in bytes for a packet read or written
 	 * in the current memory bank. See the 'ReadPagePacket()' and
-	 * 'WritePagePacket()' methods. This method is only useful if the current
-	 * memory bank is general purpose memory.
+	 * 'WritePagePacket()' methods. This method is only useful if the current memory
+	 * bank is general purpose memory.
 	 *
 	 * @return max packet page length in bytes in current memory bank
 	 */
+	@Override
 	public int getMaxPacketDataLength() {
-		return maxPacketDataLength;
+		return this.maxPacketDataLength;
 	}
 
 	/**
@@ -368,8 +382,9 @@ public int getMaxPacketDataLength() {
 	 *
 	 * @return 'true' if current memory bank can be read with self generated CRC.
 	 */
+	@Override
 	public boolean hasPageAutoCRC() {
-		return pageAutoCRC;
+		return this.pageAutoCRC;
 	}
 
 	/**
@@ -389,8 +404,9 @@ public boolean hasPageAutoCRC() {
 	 * @see #readPagePacket(int,boolean,byte[],int,byte[]) readPagePacket(extra)
 	 * @since 1-Wire API 0.01
 	 */
+	@Override
 	public boolean hasExtraInfo() {
-		return extraInfo;
+		return this.extraInfo;
 	}
 
 	/**
@@ -400,8 +416,9 @@ public boolean hasExtraInfo() {
 	 * @return number of bytes in Extra Information read when reading pages in the
 	 *         current memory bank.
 	 */
+	@Override
 	public int getExtraInfoLength() {
-		return extraInfoLength;
+		return this.extraInfoLength;
 	}
 
 	/**
@@ -411,8 +428,9 @@ public int getExtraInfoLength() {
 	 *
 	 * @return string describing extra information.
 	 */
+	@Override
 	public String getExtraInfoDescription() {
-		return extraInfoDescription;
+		return this.extraInfoDescription;
 	}
 
 	/**
@@ -421,8 +439,9 @@ public String getExtraInfoDescription() {
 	 * @param doReadVerf true (default) verify write in 'write' false, don't verify
 	 *                   write (used on Write-Once bit manipulation)
 	 */
+	@Override
 	public void setWriteVerification(boolean doReadVerf) {
-		writeVerification = doReadVerf;
+		this.writeVerification = doReadVerf;
 	}
 
 	// --------
@@ -451,18 +470,20 @@ public void setWriteVerification(boolean doReadVerf) {
 	 * @throws OneWireIOException
 	 * @throws OneWireException
 	 */
+	@Override
 	public void read(int startAddr, boolean readContinue, byte[] readBuf, int offset, int len)
 			throws OneWireIOException, OneWireException {
 
 		// check if read exceeds memory
-		if ((startAddr + len) > size)
+		if (startAddr + len > this.size) {
 			throw new OneWireException("Read exceeds memory bank end");
+		}
 
 		// attempt to put device at speed
-		checkSpeed();
+		this.checkSpeed();
 
 		// read the scratchpad, discard extra information
-		readScratchpad(readBuf, offset, len, null);
+		this.readScratchpad(readBuf, offset, len, null);
 	}
 
 	/**
@@ -485,40 +506,44 @@ public void read(int startAddr, boolean readContinue, byte[] readBuf, int offset
 	 * @throws OneWireIOException
 	 * @throws OneWireException
 	 */
+	@Override
 	public void write(int startAddr, byte[] writeBuf, int offset, int len) throws OneWireIOException, OneWireException {
 
 		// return if nothing to do
-		if (len == 0)
+		if (len == 0) {
 			return;
+		}
 
 		// attempt to put device at speed
-		checkSpeed();
+		this.checkSpeed();
 
 		// check if write exceeds memory
-		if ((startAddr + len) > size)
+		if (startAddr + len > this.size) {
 			throw new OneWireException("Write exceeds memory bank end");
+		}
 
 		// write the page of data to scratchpad
-		writeScratchpad(startPhysicalAddress + startAddr, writeBuf, offset, len);
+		this.writeScratchpad(this.startPhysicalAddress + startAddr, writeBuf, offset, len);
 
 		// read to verify ok
-		byte[] raw_buf = new byte[pageLength];
-		byte[] extra_buf = new byte[extraInfoLength];
+		var raw_buf = new byte[this.pageLength];
+		var extra_buf = new byte[this.extraInfoLength];
 
-		readScratchpad(raw_buf, 0, pageLength, extra_buf);
+		this.readScratchpad(raw_buf, 0, this.pageLength, extra_buf);
 
 		// check to see if the same
-		for (int i = 0; i < len; i++)
+		for (var i = 0; i < len; i++) {
 			if (raw_buf[i] != writeBuf[i + offset]) {
-				forceVerify();
+				this.forceVerify();
 
 				throw new OneWireIOException("Read back verify had incorrect data");
 			}
+		}
 
 		// check to make sure that the address is correct
-		if ((((extra_buf[0] & 0x00FF) | ((extra_buf[1] << 8) & 0x00FF00)) & 0x00FFFF) != (startPhysicalAddress
-				+ startAddr)) {
-			forceVerify();
+		if (((extra_buf[0] & 0x00FF | extra_buf[1] << 8 & 0x00FF00) & 0x00FFFF) != this.startPhysicalAddress
+				+ startAddr) {
+			this.forceVerify();
 
 			throw new OneWireIOException("Read back address had incorrect data");
 		}
@@ -549,18 +574,20 @@ public void write(int startAddr, byte[] writeBuf, int offset, int len) throws On
 	 * @throws OneWireIOException
 	 * @throws OneWireException
 	 */
+	@Override
 	public void readPage(int page, boolean readContinue, byte[] readBuf, int offset)
 			throws OneWireIOException, OneWireException {
 
 		// check if read exceeds memory
-		if (page != 0)
+		if (page != 0) {
 			throw new OneWireException("Page read exceeds memory bank end");
+		}
 
 		// attempt to put device at speed
-		checkSpeed();
+		this.checkSpeed();
 
 		// read the scratchpad, discard extra information
-		readScratchpad(readBuf, offset, pageLength, null);
+		this.readScratchpad(readBuf, offset, this.pageLength, null);
 	}
 
 	/**
@@ -586,18 +613,20 @@ public void readPage(int page, boolean readContinue, byte[] readBuf, int offset)
 	 * @throws OneWireIOException
 	 * @throws OneWireException
 	 */
+	@Override
 	public void readPage(int page, boolean readContinue, byte[] readBuf, int offset, byte[] extraInfo)
 			throws OneWireIOException, OneWireException {
 
 		// check if read exceeds memory
-		if (page != 0)
+		if (page != 0) {
 			throw new OneWireException("Page read exceeds memory bank end");
+		}
 
 		// attempt to put device at speed
-		checkSpeed();
+		this.checkSpeed();
 
 		// read the scratchpad, discard extra information
-		readScratchpad(readBuf, offset, pageLength, extraInfo);
+		this.readScratchpad(readBuf, offset, this.pageLength, extraInfo);
 	}
 
 	/**
@@ -628,19 +657,20 @@ public void readPage(int page, boolean readContinue, byte[] readBuf, int offset,
 	 * @throws OneWireIOException
 	 * @throws OneWireException
 	 */
+	@Override
 	public int readPagePacket(int page, boolean readContinue, byte[] readBuf, int offset)
 			throws OneWireIOException, OneWireException {
-		byte[] raw_buf = new byte[pageLength];
+		var raw_buf = new byte[this.pageLength];
 
 		// attempt to put device at speed
-		checkSpeed();
+		this.checkSpeed();
 
 		// read the scratchpad, discard extra information
-		readScratchpad(raw_buf, 0, pageLength, null);
+		this.readScratchpad(raw_buf, 0, this.pageLength, null);
 
 		// check if length is realistic
-		if (raw_buf[0] > maxPacketDataLength) {
-			forceVerify();
+		if (raw_buf[0] > this.maxPacketDataLength) {
+			this.forceVerify();
 
 			throw new OneWireIOException("Invalid length in packet");
 		}
@@ -653,11 +683,10 @@ public int readPagePacket(int page, boolean readContinue, byte[] readBuf, int of
 
 			// return the length
 			return raw_buf[0];
-		} else {
-			forceVerify();
-
-			throw new OneWireIOException("Invalid CRC16 in packet read");
 		}
+		this.forceVerify();
+
+		throw new OneWireIOException("Invalid CRC16 in packet read");
 	}
 
 	/**
@@ -682,19 +711,20 @@ public int readPagePacket(int page, boolean readContinue, byte[] readBuf, int of
 	 * @throws OneWireIOException
 	 * @throws OneWireException
 	 */
+	@Override
 	public int readPagePacket(int page, boolean readContinue, byte[] readBuf, int offset, byte[] extraInfo)
 			throws OneWireIOException, OneWireException {
-		byte[] raw_buf = new byte[pageLength];
+		var raw_buf = new byte[this.pageLength];
 
 		// attempt to put device at speed
-		checkSpeed();
+		this.checkSpeed();
 
 		// read the scratchpad, discard extra information
-		readScratchpad(raw_buf, 0, pageLength, extraInfo);
+		this.readScratchpad(raw_buf, 0, this.pageLength, extraInfo);
 
 		// check if length is realistic
-		if (raw_buf[0] > maxPacketDataLength) {
-			forceVerify();
+		if (raw_buf[0] > this.maxPacketDataLength) {
+			this.forceVerify();
 
 			throw new OneWireIOException("Invalid length in packet");
 		}
@@ -707,11 +737,10 @@ public int readPagePacket(int page, boolean readContinue, byte[] readBuf, int of
 
 			// return the length
 			return raw_buf[0];
-		} else {
-			forceVerify();
-
-			throw new OneWireIOException("Invalid CRC16 in packet read");
 		}
+		this.forceVerify();
+
+		throw new OneWireIOException("Invalid CRC16 in packet read");
 	}
 
 	/**
@@ -726,31 +755,34 @@ public int readPagePacket(int page, boolean readContinue, byte[] readBuf, int of
 	 * @throws OneWireIOException
 	 * @throws OneWireException
 	 */
+	@Override
 	public void writePagePacket(int page, byte[] writeBuf, int offset, int len)
 			throws OneWireIOException, OneWireException {
 
 		// make sure length does not exceed max
-		if (len > maxPacketDataLength)
+		if (len > this.maxPacketDataLength) {
 			throw new OneWireException("Length of packet requested exceeds page size");
+		}
 
 		// see if this bank is general read/write
-		if (!generalPurposeMemory)
+		if (!this.generalPurposeMemory) {
 			throw new OneWireException("Current bank is not general purpose memory");
+		}
 
 		// construct the packet to write
-		byte[] raw_buf = new byte[len + 3];
+		var raw_buf = new byte[len + 3];
 
 		raw_buf[0] = (byte) len;
 
 		System.arraycopy(writeBuf, offset, raw_buf, 1, len);
 
-		int crc = CRC16.compute(raw_buf, 0, len + 1, page);
+		var crc = CRC16.compute(raw_buf, 0, len + 1, page);
 
 		raw_buf[len + 1] = (byte) (~crc & 0xFF);
-		raw_buf[len + 2] = (byte) (((~crc & 0xFFFF) >>> 8) & 0xFF);
+		raw_buf[len + 2] = (byte) ((~crc & 0xFFFF) >>> 8 & 0xFF);
 
 		// write the packet, return result
-		write(page * pageLength, raw_buf, 0, len + 3);
+		this.write(page * this.pageLength, raw_buf, 0, len + 3);
 	}
 
 	/**
@@ -769,6 +801,7 @@ public void writePagePacket(int page, byte[] writeBuf, int offset, int len)
 	 * @throws OneWireIOException
 	 * @throws OneWireException
 	 */
+	@Override
 	public void readPageCRC(int page, boolean readContinue, byte[] readBuf, int offset)
 			throws OneWireIOException, OneWireException {
 
@@ -795,6 +828,7 @@ public void readPageCRC(int page, boolean readContinue, byte[] readBuf, int offs
 	 * @throws OneWireIOException
 	 * @throws OneWireException
 	 */
+	@Override
 	public void readPageCRC(int page, boolean readContinue, byte[] readBuf, int offset, byte[] extraInfo)
 			throws OneWireIOException, OneWireException {
 
@@ -822,34 +856,36 @@ public void readPageCRC(int page, boolean readContinue, byte[] readBuf, int offs
 	 * @throws OneWireIOException
 	 * @throws OneWireException
 	 */
+	@Override
 	public void readScratchpad(byte[] readBuf, int offset, int len, byte[] extraInfo)
 			throws OneWireIOException, OneWireException {
 		// select the device
-		if (!ib.adapter.select(ib.address)) {
-			forceVerify();
+		if (!this.ib.adapter.select(this.ib.address)) {
+			this.forceVerify();
 
 			throw new OneWireIOException("Device select failed");
 		}
 
 		// build first block
-		byte[] raw_buf = new byte[1 + extraInfoLength];
+		var raw_buf = new byte[1 + this.extraInfoLength];
 
 		raw_buf[0] = READ_SCRATCHPAD_COMMAND;
 
-		System.arraycopy(ffBlock, 0, raw_buf, 1, extraInfoLength);
+		System.arraycopy(this.ffBlock, 0, raw_buf, 1, this.extraInfoLength);
 
 		// do the first block for TA1, TA2, and E/S
-		ib.adapter.dataBlock(raw_buf, 0, 1 + extraInfoLength);
+		this.ib.adapter.dataBlock(raw_buf, 0, 1 + this.extraInfoLength);
 
 		// optionally extract the extra info
-		if (extraInfo != null)
-			System.arraycopy(raw_buf, 1, extraInfo, 0, extraInfoLength);
+		if (extraInfo != null) {
+			System.arraycopy(raw_buf, 1, extraInfo, 0, this.extraInfoLength);
+		}
 
 		// build the next block
-		System.arraycopy(ffBlock, 0, readBuf, offset, len);
+		System.arraycopy(this.ffBlock, 0, readBuf, offset, len);
 
 		// send second block to read data, return result
-		ib.adapter.dataBlock(readBuf, offset, len);
+		this.ib.adapter.dataBlock(readBuf, offset, len);
 	}
 
 	/**
@@ -863,27 +899,28 @@ public void readScratchpad(byte[] readBuf, int offset, int len, byte[] extraInfo
 	 * @throws OneWireIOException
 	 * @throws OneWireException
 	 */
+	@Override
 	public void writeScratchpad(int startAddr, byte[] writeBuf, int offset, int len)
 			throws OneWireIOException, OneWireException {
 
 		// select the device
-		if (!ib.adapter.select(ib.address)) {
-			forceVerify();
+		if (!this.ib.adapter.select(this.ib.address)) {
+			this.forceVerify();
 
 			throw new OneWireIOException("Device select failed");
 		}
 
 		// build block to send
-		byte[] raw_buf = new byte[3 + len];
+		var raw_buf = new byte[3 + len];
 
 		raw_buf[0] = WRITE_SCRATCHPAD_COMMAND;
 		raw_buf[1] = (byte) (startAddr & 0xFF);
-		raw_buf[2] = (byte) (((startAddr & 0xFFFF) >>> 8) & 0xFF);
+		raw_buf[2] = (byte) ((startAddr & 0xFFFF) >>> 8 & 0xFF);
 
 		System.arraycopy(writeBuf, offset, raw_buf, 3, len);
 
 		// send block, return result
-		ib.adapter.dataBlock(raw_buf, 0, len + 3);
+		this.ib.adapter.dataBlock(raw_buf, 0, len + 3);
 	}
 
 	/**
@@ -895,29 +932,30 @@ public void writeScratchpad(int startAddr, byte[] writeBuf, int offset, int len)
 	 * @throws OneWireIOException
 	 * @throws OneWireException
 	 */
+	@Override
 	public void copyScratchpad(int startAddr, int len) throws OneWireIOException, OneWireException {
 
 		// select the device
-		if (!ib.adapter.select(ib.address)) {
-			forceVerify();
+		if (!this.ib.adapter.select(this.ib.address)) {
+			this.forceVerify();
 
 			throw new OneWireIOException("Device select failed");
 		}
 
 		// build block to send
-		byte[] raw_buf = new byte[5];
+		var raw_buf = new byte[5];
 
-		raw_buf[0] = COPY_SCRATCHPAD_COMMAND;
+		raw_buf[0] = this.COPY_SCRATCHPAD_COMMAND;
 		raw_buf[1] = (byte) (startAddr & 0xFF);
-		raw_buf[2] = (byte) (((startAddr & 0xFFFF) >>> 8) & 0xFF);
-		raw_buf[3] = (byte) ((startAddr + len - 1) & 0x1F);
+		raw_buf[2] = (byte) ((startAddr & 0xFFFF) >>> 8 & 0xFF);
+		raw_buf[3] = (byte) (startAddr + len - 1 & 0x1F);
 		raw_buf[4] = (byte) 0xFF;
 
 		// send block (check copy indication complete)
-		ib.adapter.dataBlock(raw_buf, 0, 5);
+		this.ib.adapter.dataBlock(raw_buf, 0, 5);
 
 		if ((raw_buf[4] & 0x0F0) != 0) {
-			forceVerify();
+			this.forceVerify();
 
 			throw new OneWireIOException("Copy scratchpad complete not found");
 		}
@@ -936,34 +974,35 @@ public void copyScratchpad(int startAddr, int len, boolean WriteProtect)
 			throws OneWireIOException, OneWireException {
 		int i, j;
 
-		if (WriteProtect)
+		if (WriteProtect) {
 			i = 2;
-		else
+		} else {
 			i = 0;
+		}
 
 		for (j = 0; j < i; j++) {
 			// select the device
-			if (!ib.adapter.select(ib.address)) {
-				forceVerify();
+			if (!this.ib.adapter.select(this.ib.address)) {
+				this.forceVerify();
 
 				throw new OneWireIOException("Device select failed");
 			}
 
 			// build block to send
-			byte[] raw_buf = new byte[5];
+			var raw_buf = new byte[5];
 
-			raw_buf[0] = COPY_SCRATCHPAD_COMMAND;
+			raw_buf[0] = this.COPY_SCRATCHPAD_COMMAND;
 			raw_buf[1] = (byte) (startAddr & 0xFF);
-			raw_buf[2] = (byte) (((startAddr & 0xFFFF) >>> 8) & 0xFF);
-			raw_buf[3] = (byte) ((startAddr + len - 1) & 0x1F);
+			raw_buf[2] = (byte) ((startAddr & 0xFFFF) >>> 8 & 0xFF);
+			raw_buf[3] = (byte) (startAddr + len - 1 & 0x1F);
 			raw_buf[3] = (byte) (raw_buf[3] | 0x80);
 			raw_buf[4] = (byte) 0xFF;
 
 			// send block (check copy indication complete)
-			ib.adapter.dataBlock(raw_buf, 0, 5);
+			this.ib.adapter.dataBlock(raw_buf, 0, 5);
 
 			if ((raw_buf[4] & 0x0F0) != 0) {
-				forceVerify();
+				this.forceVerify();
 
 				throw new OneWireIOException("Copy scratchpad complete not found");
 			}
@@ -981,6 +1020,7 @@ public void copyScratchpad(int startAddr, int len, boolean WriteProtect)
 	 * @throws OneWireIOException
 	 * @throws OneWireException
 	 */
+	@Override
 	public void checkSpeed() throws OneWireIOException, OneWireException {
 		synchronized (this) {
 			// only check the speed
@@ -988,12 +1028,12 @@ public void checkSpeed() throws OneWireIOException, OneWireException {
 			// currently at the ibutton's max speed. If it isn't, we should
 			// call the doSpeed() method, since the adapter might have
 			// changed speeds.
-			if (doSetSpeed || (ib.adapter.getSpeed() != ib.getMaxSpeed())) {
+			if (this.doSetSpeed || this.ib.adapter.getSpeed() != this.ib.getMaxSpeed()) {
 				// attempt to set the correct speed and verify device present
-				ib.doSpeed();
+				this.ib.doSpeed();
 
 				// no exceptions so clear flag
-				doSetSpeed = false;
+				this.doSetSpeed = false;
 			}
 		}
 	}
@@ -1002,9 +1042,10 @@ public void checkSpeed() throws OneWireIOException, OneWireException {
 	 * Set the flag to indicate the next 'checkSpeed()' will force a speed set and
 	 * verify 'doSpeed()'.
 	 */
+	@Override
 	public void forceVerify() {
 		synchronized (this) {
-			doSetSpeed = true;
+			this.doSetSpeed = true;
 		}
 	}
 }
diff --git a/io.openems.edge.bridge.onewire/src/com/dalsemi/onewire/container/MemoryBankScratchCRC.java b/io.openems.edge.bridge.onewire/src/com/dalsemi/onewire/container/MemoryBankScratchCRC.java
index 0427e6e5406..2e084ac229e 100644
--- a/io.openems.edge.bridge.onewire/src/com/dalsemi/onewire/container/MemoryBankScratchCRC.java
+++ b/io.openems.edge.bridge.onewire/src/com/dalsemi/onewire/container/MemoryBankScratchCRC.java
@@ -54,11 +54,11 @@ public MemoryBankScratchCRC(OneWireContainer ibutton) {
 		super(ibutton);
 
 		// initialize attributes of this memory bank - DEFAULT: DS1963L scratchapd
-		bankDescription = "Scratchpad with CRC";
-		pageAutoCRC = true;
+		this.bankDescription = "Scratchpad with CRC";
+		this.pageAutoCRC = true;
 
 		// default copy scratchpad command
-		COPY_SCRATCHPAD_COMMAND = (byte) 0x55;
+		this.COPY_SCRATCHPAD_COMMAND = (byte) 0x55;
 	}
 
 	// --------
@@ -81,11 +81,12 @@ public MemoryBankScratchCRC(OneWireContainer ibutton) {
 	 * @throws OneWireIOException
 	 * @throws OneWireException
 	 */
+	@Override
 	public void readPageCRC(int page, boolean readContinue, byte[] readBuf, int offset)
 			throws OneWireIOException, OneWireException {
-		byte[] extraInfo = new byte[extraInfoLength];
+		var extraInfo = new byte[this.extraInfoLength];
 
-		readPageCRC(page, readContinue, readBuf, offset, extraInfo);
+		this.readPageCRC(page, readContinue, readBuf, offset, extraInfo);
 	}
 
 	/**
@@ -107,23 +108,27 @@ public void readPageCRC(int page, boolean readContinue, byte[] readBuf, int offs
 	 * @throws OneWireIOException
 	 * @throws OneWireException
 	 */
+	@Override
 	public void readPageCRC(int page, boolean readContinue, byte[] readBuf, int offset, byte[] extraInfo)
 			throws OneWireIOException, OneWireException {
 
 		// only needs to be implemented if supported by hardware
-		if (!pageAutoCRC)
+		if (!this.pageAutoCRC) {
 			throw new OneWireException("Read page with CRC not supported in this memory bank");
+		}
 
 		// attempt to put device at max desired speed
-		if (!readContinue)
-			checkSpeed();
+		if (!readContinue) {
+			this.checkSpeed();
+		}
 
 		// check if read exceeds memory
-		if (page > numberPages)
+		if (page > this.numberPages) {
 			throw new OneWireException("Read exceeds memory bank end");
+		}
 
 		// read the scratchpad
-		readScratchpad(readBuf, offset, pageLength, extraInfo);
+		this.readScratchpad(readBuf, offset, this.pageLength, extraInfo);
 	}
 
 	// --------
@@ -146,44 +151,46 @@ public void readPageCRC(int page, boolean readContinue, byte[] readBuf, int offs
 	 * @throws OneWireIOException
 	 * @throws OneWireException
 	 */
+	@Override
 	public void readScratchpad(byte[] readBuf, int offset, int len, byte[] extraInfo)
 			throws OneWireIOException, OneWireException {
 		// select the device
-		if (!ib.adapter.select(ib.address)) {
-			forceVerify();
+		if (!this.ib.adapter.select(this.ib.address)) {
+			this.forceVerify();
 
 			throw new OneWireIOException("Device select failed");
 		}
 
 		// build block
-		byte[] raw_buf = new byte[extraInfoLength + pageLength + 3];
+		var raw_buf = new byte[this.extraInfoLength + this.pageLength + 3];
 
 		raw_buf[0] = READ_SCRATCHPAD_COMMAND;
 
-		System.arraycopy(ffBlock, 0, raw_buf, 1, raw_buf.length - 1);
+		System.arraycopy(this.ffBlock, 0, raw_buf, 1, raw_buf.length - 1);
 
 		// send block, command + (extra) + page data + CRC
-		ib.adapter.dataBlock(raw_buf, 0, raw_buf.length);
+		this.ib.adapter.dataBlock(raw_buf, 0, raw_buf.length);
 
 		// get the starting offset to see when the crc will show up
 		int addr = raw_buf[1];
 
-		addr = (addr | ((raw_buf[2] << 8) & 0xFF00)) & 0xFFFF;
+		addr = (addr | raw_buf[2] << 8 & 0xFF00) & 0xFFFF;
 
-		int num_crc = 35 - (addr & 0x001F) + extraInfoLength;
+		var num_crc = 35 - (addr & 0x001F) + this.extraInfoLength;
 
 		// check crc of entire block
 		if (CRC16.compute(raw_buf, 0, num_crc, 0) != 0x0000B001) {
-			forceVerify();
+			this.forceVerify();
 
 			throw new OneWireIOException("Invalid CRC16 read from device");
 		}
 
 		// optionally extract the extra info
-		if (extraInfo != null)
-			System.arraycopy(raw_buf, 1, extraInfo, 0, extraInfoLength);
+		if (extraInfo != null) {
+			System.arraycopy(raw_buf, 1, extraInfo, 0, this.extraInfoLength);
+		}
 
 		// extract the page data
-		System.arraycopy(raw_buf, extraInfoLength + 1, readBuf, 0, pageLength);
+		System.arraycopy(raw_buf, this.extraInfoLength + 1, readBuf, 0, this.pageLength);
 	}
 }
diff --git a/io.openems.edge.bridge.onewire/src/com/dalsemi/onewire/container/MemoryBankScratchCRCPW.java b/io.openems.edge.bridge.onewire/src/com/dalsemi/onewire/container/MemoryBankScratchCRCPW.java
index 8d9ffe891bf..d393474bb27 100644
--- a/io.openems.edge.bridge.onewire/src/com/dalsemi/onewire/container/MemoryBankScratchCRCPW.java
+++ b/io.openems.edge.bridge.onewire/src/com/dalsemi/onewire/container/MemoryBankScratchCRCPW.java
@@ -63,14 +63,14 @@ public class MemoryBankScratchCRCPW extends MemoryBankScratchEx {
 	public MemoryBankScratchCRCPW(PasswordContainer ibutton) {
 		super((OneWireContainer) ibutton);
 
-		ibPass = ibutton;
+		this.ibPass = ibutton;
 
 		// initialize attributes of this memory bank - DEFAULT: DS1963L scratchapd
-		bankDescription = "Scratchpad with CRC and Password";
-		pageAutoCRC = true;
+		this.bankDescription = "Scratchpad with CRC and Password";
+		this.pageAutoCRC = true;
 
 		// default copy scratchpad command (from DS1922)
-		COPY_SCRATCHPAD_COMMAND = (byte) 0x99;
+		this.COPY_SCRATCHPAD_COMMAND = (byte) 0x99;
 	}
 
 	// --------
@@ -93,11 +93,12 @@ public MemoryBankScratchCRCPW(PasswordContainer ibutton) {
 	 * @throws OneWireIOException
 	 * @throws OneWireException
 	 */
+	@Override
 	public void readPageCRC(int page, boolean readContinue, byte[] readBuf, int offset)
 			throws OneWireIOException, OneWireException {
-		byte[] extraInfo = new byte[extraInfoLength];
+		var extraInfo = new byte[this.extraInfoLength];
 
-		readPageCRC(page, readContinue, readBuf, offset, extraInfo);
+		this.readPageCRC(page, readContinue, readBuf, offset, extraInfo);
 	}
 
 	/**
@@ -119,23 +120,27 @@ public void readPageCRC(int page, boolean readContinue, byte[] readBuf, int offs
 	 * @throws OneWireIOException
 	 * @throws OneWireException
 	 */
+	@Override
 	public void readPageCRC(int page, boolean readContinue, byte[] readBuf, int offset, byte[] extraInfo)
 			throws OneWireIOException, OneWireException {
 
 		// only needs to be implemented if supported by hardware
-		if (!pageAutoCRC)
+		if (!this.pageAutoCRC) {
 			throw new OneWireException("Read page with CRC not supported in this memory bank");
+		}
 
 		// attempt to put device at max desired speed
-		if (!readContinue)
-			checkSpeed();
+		if (!readContinue) {
+			this.checkSpeed();
+		}
 
 		// check if read exceeds memory
-		if (page > numberPages)
+		if (page > this.numberPages) {
 			throw new OneWireException("Read exceeds memory bank end");
+		}
 
 		// read the scratchpad
-		readScratchpad(readBuf, offset, pageLength, extraInfo);
+		this.readScratchpad(readBuf, offset, this.pageLength, extraInfo);
 	}
 
 	// --------
@@ -158,63 +163,67 @@ public void readPageCRC(int page, boolean readContinue, byte[] readBuf, int offs
 	 * @throws OneWireIOException
 	 * @throws OneWireException
 	 */
+	@Override
 	public void readScratchpad(byte[] readBuf, int offset, int len, byte[] extraInfo)
 			throws OneWireIOException, OneWireException {
-		int blockLength = 0;
-		int num_crc = 0;
+		var blockLength = 0;
+		var num_crc = 0;
 
 		// select the device
-		if (!ib.adapter.select(ib.address)) {
-			forceVerify();
+		if (!this.ib.adapter.select(this.ib.address)) {
+			this.forceVerify();
 
 			throw new OneWireIOException("Device select failed");
 		}
 
 		// build block
-		if (enablePower) {
-			if (len == pageLength)
-				blockLength = extraInfoLength + pageLength + 3;
-			else
-				blockLength = len + extraInfoLength + 1;
-		} else
-			blockLength = extraInfoLength + pageLength + 3;
+		if (this.enablePower) {
+			if (len == this.pageLength) {
+				blockLength = this.extraInfoLength + this.pageLength + 3;
+			} else {
+				blockLength = len + this.extraInfoLength + 1;
+			}
+		} else {
+			blockLength = this.extraInfoLength + this.pageLength + 3;
+		}
 
-		byte[] raw_buf = new byte[blockLength];
+		var raw_buf = new byte[blockLength];
 
 		raw_buf[0] = READ_SCRATCHPAD_COMMAND;
 
-		System.arraycopy(ffBlock, 0, raw_buf, 1, raw_buf.length - 1);
+		System.arraycopy(this.ffBlock, 0, raw_buf, 1, raw_buf.length - 1);
 
 		// send block, command + (extra) + page data + CRC
-		ib.adapter.dataBlock(raw_buf, 0, raw_buf.length);
+		this.ib.adapter.dataBlock(raw_buf, 0, raw_buf.length);
 
 		// get the starting offset to see when the crc will show up
 		int addr = raw_buf[1];
 
-		addr = (addr | ((raw_buf[2] << 8) & 0xFF00)) & 0xFFFF;
+		addr = (addr | raw_buf[2] << 8 & 0xFF00) & 0xFFFF;
 
-		if (enablePower && (len == 64))
-			num_crc = pageLength + 3 - (addr & 0x003F) + extraInfoLength;
-		else if (!enablePower)
-			num_crc = pageLength + 3 - (addr & 0x001F) + extraInfoLength;
+		if (this.enablePower && len == 64) {
+			num_crc = this.pageLength + 3 - (addr & 0x003F) + this.extraInfoLength;
+		} else if (!this.enablePower) {
+			num_crc = this.pageLength + 3 - (addr & 0x001F) + this.extraInfoLength;
+		}
 
 		// check crc of entire block
-		if (len == pageLength) {
+		if (len == this.pageLength) {
 			if (CRC16.compute(raw_buf, 0, num_crc, 0) != 0x0000B001) {
-				forceVerify();
+				this.forceVerify();
 				throw new OneWireIOException("Invalid CRC16 read from device");
 			}
 		}
 
 		// optionally extract the extra info
-		if (extraInfo != null)
-			System.arraycopy(raw_buf, 1, extraInfo, 0, extraInfoLength);
+		if (extraInfo != null) {
+			System.arraycopy(raw_buf, 1, extraInfo, 0, this.extraInfoLength);
+		}
 
 		// extract the page data
-		if (!enablePower)
-			System.arraycopy(raw_buf, extraInfoLength + 1, readBuf, offset, len);
-		else
-			System.arraycopy(raw_buf, extraInfoLength + 1, readBuf, offset, len);
+		if (!this.enablePower) {
+		}
+		System.arraycopy(raw_buf, this.extraInfoLength + 1, readBuf, offset, len);
 	}
 
 	/**
@@ -226,62 +235,66 @@ else if (!enablePower)
 	 * @throws OneWireIOException
 	 * @throws OneWireException
 	 */
+	@Override
 	public void copyScratchpad(int startAddr, int len) throws OneWireIOException, OneWireException {
-		if (!enablePower) {
-			if (((startAddr + len) & 0x1F) != 0)
+		if (!this.enablePower) {
+			if ((startAddr + len & 0x1F) != 0) {
 				throw new OneWireException("CopyScratchpad failed: Ending Offset must go to end of page");
+			}
 		}
 
 		// select the device
-		if (!ib.adapter.select(ib.address)) {
-			forceVerify();
+		if (!this.ib.adapter.select(this.ib.address)) {
+			this.forceVerify();
 			throw new OneWireIOException("Device select failed");
 		}
 
 		// build block to send (1 cmd, 3 data, 8 password, 4 verification)
-		int raw_buf_length = 16;
-		byte[] raw_buf = new byte[raw_buf_length];
+		var raw_buf_length = 16;
+		var raw_buf = new byte[raw_buf_length];
 
-		raw_buf[0] = COPY_SCRATCHPAD_COMMAND;
+		raw_buf[0] = this.COPY_SCRATCHPAD_COMMAND;
 		raw_buf[1] = (byte) (startAddr & 0xFF);
-		raw_buf[2] = (byte) (((startAddr & 0xFFFF) >>> 8) & 0xFF);
-		if (enablePower)
-			raw_buf[3] = (byte) ((startAddr + len - 1) & 0x3F);
-		else
-			raw_buf[3] = (byte) ((startAddr + len - 1) & 0x1F);
-
-		if (ibPass.isContainerReadWritePasswordSet()) {
-			ibPass.getContainerReadWritePassword(raw_buf, 4);
+		raw_buf[2] = (byte) ((startAddr & 0xFFFF) >>> 8 & 0xFF);
+		if (this.enablePower) {
+			raw_buf[3] = (byte) (startAddr + len - 1 & 0x3F);
+		} else {
+			raw_buf[3] = (byte) (startAddr + len - 1 & 0x1F);
+		}
+
+		if (this.ibPass.isContainerReadWritePasswordSet()) {
+			this.ibPass.getContainerReadWritePassword(raw_buf, 4);
 		}
 
-		System.arraycopy(ffBlock, 0, raw_buf, raw_buf_length - 4, 4);
+		System.arraycopy(this.ffBlock, 0, raw_buf, raw_buf_length - 4, 4);
 
 		// send block (check copy indication complete)
-		if (enablePower) {
-			ib.adapter.dataBlock(raw_buf, 0, (raw_buf_length - 5));
+		if (this.enablePower) {
+			this.ib.adapter.dataBlock(raw_buf, 0, raw_buf_length - 5);
 
-			ib.adapter.startPowerDelivery(DSPortAdapter.CONDITION_AFTER_BYTE);
+			this.ib.adapter.startPowerDelivery(DSPortAdapter.CONDITION_AFTER_BYTE);
 
-			ib.adapter.putByte(raw_buf[11]);
+			this.ib.adapter.putByte(raw_buf[11]);
 
 			msWait(23);
 
-			ib.adapter.setPowerNormal();
+			this.ib.adapter.setPowerNormal();
 
-			raw_buf[12] = (byte) ib.adapter.getByte();
+			raw_buf[12] = (byte) this.ib.adapter.getByte();
 
-			if (((raw_buf[12] & (byte) 0xF0) != (byte) 0xA0) && ((raw_buf[12] & (byte) 0xF0) != (byte) 0x50))
+			if ((raw_buf[12] & (byte) 0xF0) != (byte) 0xA0 && (raw_buf[12] & (byte) 0xF0) != (byte) 0x50) {
 				throw new OneWireIOException("Copy scratchpad complete not found");
+			}
 		} else {
-			ib.adapter.dataBlock(raw_buf, 0, raw_buf_length);
+			this.ib.adapter.dataBlock(raw_buf, 0, raw_buf_length);
 
-			byte verifyByte = (byte) (raw_buf[raw_buf_length - 1] & 0x0F);
+			var verifyByte = (byte) (raw_buf[raw_buf_length - 1] & 0x0F);
 			if (verifyByte != 0x0A && verifyByte != 0x05) {
 				// forceVerify();
-				if (verifyByte == 0x0F)
+				if (verifyByte == 0x0F) {
 					throw new OneWireIOException("Copy scratchpad failed - invalid password");
-				else
-					throw new OneWireIOException("Copy scratchpad complete not found");
+				}
+				throw new OneWireIOException("Copy scratchpad complete not found");
 			}
 		}
 	}
@@ -297,10 +310,12 @@ public void copyScratchpad(int startAddr, int len) throws OneWireIOException, On
 	 * @throws OneWireIOException
 	 * @throws OneWireException
 	 */
+	@Override
 	public void writeScratchpad(int startAddr, byte[] writeBuf, int offset, int len)
 			throws OneWireIOException, OneWireException {
-		if ((((startAddr + len) & 0x1F) != 0) && (!enablePower))
+		if ((startAddr + len & 0x1F) != 0 && !this.enablePower) {
 			throw new OneWireException("WriteScratchpad failed: Ending Offset must go to end of page");
+		}
 
 		super.writeScratchpad(startAddr, writeBuf, offset, len);
 	}
@@ -312,7 +327,7 @@ private static final void msWait(final long ms) {
 		try {
 			Thread.sleep(ms);
 		} catch (InterruptedException ie) {
-			;
+
 		}
 	}
 }
diff --git a/io.openems.edge.bridge.onewire/src/com/dalsemi/onewire/container/MemoryBankScratchEE.java b/io.openems.edge.bridge.onewire/src/com/dalsemi/onewire/container/MemoryBankScratchEE.java
index 90e4eb296a7..a397742366b 100644
--- a/io.openems.edge.bridge.onewire/src/com/dalsemi/onewire/container/MemoryBankScratchEE.java
+++ b/io.openems.edge.bridge.onewire/src/com/dalsemi/onewire/container/MemoryBankScratchEE.java
@@ -69,10 +69,10 @@ public MemoryBankScratchEE(OneWireContainer ibutton) {
 		super(ibutton);
 
 		// default copy scratchpad delay
-		COPY_DELAY_LEN = (byte) 5;
+		this.COPY_DELAY_LEN = (byte) 5;
 
 		// default ES mask for copy scratchpad
-		ES_MASK = 0;
+		this.ES_MASK = 0;
 	}
 
 	// --------
@@ -90,40 +90,41 @@ public MemoryBankScratchEE(OneWireContainer ibutton) {
 	 * @throws OneWireIOException
 	 * @throws OneWireException
 	 */
+	@Override
 	public void writeScratchpad(int startAddr, byte[] writeBuf, int offset, int len)
 			throws OneWireIOException, OneWireException {
-		boolean calcCRC = false;
+		var calcCRC = false;
 
 		// select the device
-		if (!ib.adapter.select(ib.address)) {
-			forceVerify();
+		if (!this.ib.adapter.select(this.ib.address)) {
+			this.forceVerify();
 
 			throw new OneWireIOException("Device select failed");
 		}
 
 		// build block to send
-		byte[] raw_buf = new byte[37];
+		var raw_buf = new byte[37];
 
 		raw_buf[0] = WRITE_SCRATCHPAD_COMMAND;
 		raw_buf[1] = (byte) (startAddr & 0xFF);
-		raw_buf[2] = (byte) (((startAddr & 0xFFFF) >>> 8) & 0xFF);
+		raw_buf[2] = (byte) ((startAddr & 0xFFFF) >>> 8 & 0xFF);
 
 		System.arraycopy(writeBuf, offset, raw_buf, 3, len);
 
 		// check if full page (can utilize CRC)
-		if (((startAddr + len) % pageLength) == 0) {
-			System.arraycopy(ffBlock, 0, raw_buf, len + 3, 2);
+		if ((startAddr + len) % this.pageLength == 0) {
+			System.arraycopy(this.ffBlock, 0, raw_buf, len + 3, 2);
 
 			calcCRC = true;
 		}
 
 		// send block, return result
-		ib.adapter.dataBlock(raw_buf, 0, len + 3 + ((calcCRC) ? 2 : 0));
+		this.ib.adapter.dataBlock(raw_buf, 0, len + 3 + (calcCRC ? 2 : 0));
 
 		// check crc
 		if (calcCRC) {
 			if (CRC16.compute(raw_buf, 0, len + 5, 0) != 0x0000B001) {
-				forceVerify();
+				this.forceVerify();
 
 				throw new OneWireIOException("Invalid CRC16 read from device");
 			}
@@ -139,57 +140,57 @@ public void writeScratchpad(int startAddr, byte[] writeBuf, int offset, int len)
 	 * @throws OneWireIOException
 	 * @throws OneWireException
 	 */
+	@Override
 	public void copyScratchpad(int startAddr, int len) throws OneWireIOException, OneWireException {
 
 		// select the device
-		if (!ib.adapter.select(ib.address)) {
-			forceVerify();
+		if (!this.ib.adapter.select(this.ib.address)) {
+			this.forceVerify();
 
 			throw new OneWireIOException("Device select failed");
 		}
 
 		// build block to send
-		byte[] raw_buf = new byte[3];
+		var raw_buf = new byte[3];
 
-		raw_buf[0] = COPY_SCRATCHPAD_COMMAND;
+		raw_buf[0] = this.COPY_SCRATCHPAD_COMMAND;
 		raw_buf[1] = (byte) (startAddr & 0xFF);
-		raw_buf[2] = (byte) (((startAddr & 0xFFFF) >>> 8) & 0xFF);
+		raw_buf[2] = (byte) ((startAddr & 0xFFFF) >>> 8 & 0xFF);
 
 		// send block (command, address)
-		ib.adapter.dataBlock(raw_buf, 0, 3);
+		this.ib.adapter.dataBlock(raw_buf, 0, 3);
 
 		try {
 
 			// setup strong pullup
-			ib.adapter.setPowerDuration(DSPortAdapter.DELIVERY_INFINITE);
-			ib.adapter.startPowerDelivery(DSPortAdapter.CONDITION_AFTER_BYTE);
+			this.ib.adapter.setPowerDuration(DSPortAdapter.DELIVERY_INFINITE);
+			this.ib.adapter.startPowerDelivery(DSPortAdapter.CONDITION_AFTER_BYTE);
 
 			// send the offset and start power delivery
-			ib.adapter.putByte((byte) (((startAddr + len - 1) & (pageLength - 1))) | ES_MASK);
+			this.ib.adapter.putByte((byte) (startAddr + len - 1 & this.pageLength - 1) | this.ES_MASK);
 
 			// delay for ms
-			Thread.sleep(COPY_DELAY_LEN);
+			Thread.sleep(this.COPY_DELAY_LEN);
 
 			// disable power
-			ib.adapter.setPowerNormal();
+			this.ib.adapter.setPowerNormal();
 
 			// check if complete
 			byte rslt = 0;
-			if (numVerificationBytes == 1)
-				rslt = (byte) ib.adapter.getByte();
-			else {
-				raw_buf = new byte[numVerificationBytes];
-				ib.adapter.getBlock(raw_buf, 0, numVerificationBytes);
-				rslt = raw_buf[numVerificationBytes - 1];
+			if (this.numVerificationBytes == 1) {
+				rslt = (byte) this.ib.adapter.getByte();
+			} else {
+				raw_buf = new byte[this.numVerificationBytes];
+				this.ib.adapter.getBlock(raw_buf, 0, this.numVerificationBytes);
+				rslt = raw_buf[this.numVerificationBytes - 1];
 			}
 
-			if (((byte) (rslt & 0x0F0) != (byte) 0xA0) && ((byte) (rslt & 0x0F0) != (byte) 0x50)) {
-				forceVerify();
+			if ((byte) (rslt & 0x0F0) != (byte) 0xA0 && (byte) (rslt & 0x0F0) != (byte) 0x50) {
+				this.forceVerify();
 
 				throw new OneWireIOException("Copy scratchpad complete not found");
 			}
 		} catch (InterruptedException e) {
 		}
-		;
 	}
 }
diff --git a/io.openems.edge.bridge.onewire/src/com/dalsemi/onewire/container/MemoryBankScratchEx.java b/io.openems.edge.bridge.onewire/src/com/dalsemi/onewire/container/MemoryBankScratchEx.java
index 626cea5a159..dbedd734818 100644
--- a/io.openems.edge.bridge.onewire/src/com/dalsemi/onewire/container/MemoryBankScratchEx.java
+++ b/io.openems.edge.bridge.onewire/src/com/dalsemi/onewire/container/MemoryBankScratchEx.java
@@ -54,10 +54,10 @@ public MemoryBankScratchEx(OneWireContainer ibutton) {
 		super(ibutton);
 
 		// initialize attributes of this memory bank
-		bankDescription = "Scratchpad Ex";
+		this.bankDescription = "Scratchpad Ex";
 
 		// change copy scratchpad command
-		COPY_SCRATCHPAD_COMMAND = (byte) 0x5A;
+		this.COPY_SCRATCHPAD_COMMAND = (byte) 0x5A;
 	}
 
 	// --------
@@ -75,45 +75,47 @@ public MemoryBankScratchEx(OneWireContainer ibutton) {
 	 * @throws OneWireIOException
 	 * @throws OneWireException
 	 */
+	@Override
 	public void writeScratchpad(int startAddr, byte[] writeBuf, int offset, int len)
 			throws OneWireIOException, OneWireException {
-		boolean calcCRC = false;
+		var calcCRC = false;
 
-		if (len > pageLength)
+		if (len > this.pageLength) {
 			throw new OneWireException("Write exceeds memory bank end");
+		}
 
 		// select the device
-		if (!ib.adapter.select(ib.address)) {
-			forceVerify();
+		if (!this.ib.adapter.select(this.ib.address)) {
+			this.forceVerify();
 
 			throw new OneWireIOException("Device select failed");
 		}
 
 		// build block to send
-		byte[] raw_buf = new byte[pageLength + 5]; // [37];
+		var raw_buf = new byte[this.pageLength + 5]; // [37];
 
 		raw_buf[0] = WRITE_SCRATCHPAD_COMMAND;
 		raw_buf[1] = (byte) (startAddr & 0xFF);
-		raw_buf[2] = (byte) (((startAddr & 0xFFFF) >>> 8) & 0xFF);
+		raw_buf[2] = (byte) ((startAddr & 0xFFFF) >>> 8 & 0xFF);
 
 		System.arraycopy(writeBuf, offset, raw_buf, 3, len);
 
 		// check if full page (can utilize CRC)
-		if (((startAddr + len) % pageLength) == 0) {
-			System.arraycopy(ffBlock, 0, raw_buf, len + 3, 2);
+		if ((startAddr + len) % this.pageLength == 0) {
+			System.arraycopy(this.ffBlock, 0, raw_buf, len + 3, 2);
 
 			calcCRC = true;
 		}
 
 		// send block, return result
-		ib.adapter.dataBlock(raw_buf, 0, len + 3 + ((calcCRC) ? 2 : 0));
+		this.ib.adapter.dataBlock(raw_buf, 0, len + 3 + (calcCRC ? 2 : 0));
 		// System.out.println("WriteScratchpad: " +
 		// com.dalsemi.onewire.utils.Convert.toHexString(raw_buf));
 
 		// check crc
 		if (calcCRC) {
 			if (CRC16.compute(raw_buf, 0, len + 5, 0) != 0x0000B001) {
-				forceVerify();
+				this.forceVerify();
 
 				throw new OneWireIOException("Invalid CRC16 read from device");
 			}
@@ -129,31 +131,32 @@ public void writeScratchpad(int startAddr, byte[] writeBuf, int offset, int len)
 	 * @throws OneWireIOException
 	 * @throws OneWireException
 	 */
+	@Override
 	public void copyScratchpad(int startAddr, int len) throws OneWireIOException, OneWireException {
 
 		// select the device
-		if (!ib.adapter.select(ib.address)) {
-			forceVerify();
+		if (!this.ib.adapter.select(this.ib.address)) {
+			this.forceVerify();
 
 			throw new OneWireIOException("Device select failed");
 		}
 
 		// build block to send
-		byte[] raw_buf = new byte[6];
+		var raw_buf = new byte[6];
 
-		raw_buf[0] = COPY_SCRATCHPAD_COMMAND;
+		raw_buf[0] = this.COPY_SCRATCHPAD_COMMAND;
 		raw_buf[1] = (byte) (startAddr & 0xFF);
-		raw_buf[2] = (byte) (((startAddr & 0xFFFF) >>> 8) & 0xFF);
-		raw_buf[3] = (byte) ((startAddr + len - 1) & 0x1F);
+		raw_buf[2] = (byte) ((startAddr & 0xFFFF) >>> 8 & 0xFF);
+		raw_buf[3] = (byte) (startAddr + len - 1 & 0x1F);
 
-		System.arraycopy(ffBlock, 0, raw_buf, 4, 2);
+		System.arraycopy(this.ffBlock, 0, raw_buf, 4, 2);
 
 		// send block (check copy indication complete)
-		ib.adapter.dataBlock(raw_buf, 0, raw_buf.length);
+		this.ib.adapter.dataBlock(raw_buf, 0, raw_buf.length);
 
-		if (((byte) (raw_buf[raw_buf.length - 1] & 0x0F0) != (byte) 0xA0)
-				&& ((byte) (raw_buf[raw_buf.length - 1] & 0x0F0) != (byte) 0x50)) {
-			forceVerify();
+		if ((byte) (raw_buf[raw_buf.length - 1] & 0x0F0) != (byte) 0xA0
+				&& (byte) (raw_buf[raw_buf.length - 1] & 0x0F0) != (byte) 0x50) {
+			this.forceVerify();
 
 			throw new OneWireIOException("Copy scratchpad complete not found");
 		}
diff --git a/io.openems.edge.bridge.onewire/src/com/dalsemi/onewire/container/MemoryBankScratchSHA.java b/io.openems.edge.bridge.onewire/src/com/dalsemi/onewire/container/MemoryBankScratchSHA.java
index 7601ee0911e..4ca6ac33351 100644
--- a/io.openems.edge.bridge.onewire/src/com/dalsemi/onewire/container/MemoryBankScratchSHA.java
+++ b/io.openems.edge.bridge.onewire/src/com/dalsemi/onewire/container/MemoryBankScratchSHA.java
@@ -63,7 +63,7 @@ public MemoryBankScratchSHA(OneWireContainer ibutton) {
 		super(ibutton);
 
 		// initialize attributes of this memory bank - DEFAULT: DS1963S scratchapd
-		bankDescription = "Scratchpad with CRC and auto-hide";
+		this.bankDescription = "Scratchpad with CRC and auto-hide";
 	}
 
 	// --------
@@ -81,14 +81,15 @@ public MemoryBankScratchSHA(OneWireContainer ibutton) {
 	 * @throws OneWireIOException
 	 * @throws OneWireException
 	 */
+	@Override
 	public void writeScratchpad(int startAddr, byte[] writeBuf, int offset, int len)
 			throws OneWireIOException, OneWireException {
-		boolean calcCRC = false;
-		byte[] raw_buf = new byte[37];
+		var calcCRC = false;
+		var raw_buf = new byte[37];
 
 		// select the device
-		if (!ib.adapter.select(ib.address)) {
-			forceVerify();
+		if (!this.ib.adapter.select(this.ib.address)) {
+			this.forceVerify();
 
 			throw new OneWireIOException("Device select failed");
 		}
@@ -96,18 +97,18 @@ public void writeScratchpad(int startAddr, byte[] writeBuf, int offset, int len)
 		// erase the scratchpad
 		raw_buf[0] = ERASE_SCRATCHPAD_COMMAND;
 
-		System.arraycopy(ffBlock, 0, raw_buf, 1, 8);
-		ib.adapter.dataBlock(raw_buf, 0, 9);
+		System.arraycopy(this.ffBlock, 0, raw_buf, 1, 8);
+		this.ib.adapter.dataBlock(raw_buf, 0, 9);
 
-		if (((byte) (raw_buf[8] & 0x0F0) != (byte) 0xA0) && ((byte) (raw_buf[8] & 0x0F0) != (byte) 0x50)) {
-			forceVerify();
+		if ((byte) (raw_buf[8] & 0x0F0) != (byte) 0xA0 && (byte) (raw_buf[8] & 0x0F0) != (byte) 0x50) {
+			this.forceVerify();
 
 			throw new OneWireIOException("Erase scratchpad complete not found");
 		}
 
 		// select the device
-		if (!ib.adapter.select(ib.address)) {
-			forceVerify();
+		if (!this.ib.adapter.select(this.ib.address)) {
+			this.forceVerify();
 
 			throw new OneWireIOException("Device select failed");
 		}
@@ -115,24 +116,24 @@ public void writeScratchpad(int startAddr, byte[] writeBuf, int offset, int len)
 		// build block to send
 		raw_buf[0] = WRITE_SCRATCHPAD_COMMAND;
 		raw_buf[1] = (byte) (startAddr & 0xFF);
-		raw_buf[2] = (byte) (((startAddr & 0xFFFF) >>> 8) & 0xFF);
+		raw_buf[2] = (byte) ((startAddr & 0xFFFF) >>> 8 & 0xFF);
 
 		System.arraycopy(writeBuf, offset, raw_buf, 3, len);
 
 		// check if full page (can utilize CRC)
-		if (((startAddr + len) % pageLength) == 0) {
-			System.arraycopy(ffBlock, 0, raw_buf, len + 3, 2);
+		if ((startAddr + len) % this.pageLength == 0) {
+			System.arraycopy(this.ffBlock, 0, raw_buf, len + 3, 2);
 
 			calcCRC = true;
 		}
 
 		// send block, return result
-		ib.adapter.dataBlock(raw_buf, 0, len + 3 + ((calcCRC) ? 2 : 0));
+		this.ib.adapter.dataBlock(raw_buf, 0, len + 3 + (calcCRC ? 2 : 0));
 
 		// check crc
 		if (calcCRC) {
 			if (CRC16.compute(raw_buf, 0, len + 5, 0) != 0x0000B001) {
-				forceVerify();
+				this.forceVerify();
 
 				throw new OneWireIOException("Invalid CRC16 read from device");
 			}
diff --git a/io.openems.edge.bridge.onewire/src/com/dalsemi/onewire/container/MemoryBankScratchSHAEE.java b/io.openems.edge.bridge.onewire/src/com/dalsemi/onewire/container/MemoryBankScratchSHAEE.java
index 30b470dc762..86fb43809c6 100644
--- a/io.openems.edge.bridge.onewire/src/com/dalsemi/onewire/container/MemoryBankScratchSHAEE.java
+++ b/io.openems.edge.bridge.onewire/src/com/dalsemi/onewire/container/MemoryBankScratchSHAEE.java
@@ -43,7 +43,6 @@
  * @version 1.00, 11 Aug 2002
  * @author SH
  */
-@SuppressWarnings({ "unused" })
 public class MemoryBankScratchSHAEE extends MemoryBankScratchEx {
 	/** turn on extra debugging output */
 	private static final boolean DEBUG = false;
@@ -114,23 +113,23 @@ public class MemoryBankScratchSHAEE extends MemoryBankScratchEx {
 	 * memory bank resides on.
 	 */
 	public MemoryBankScratchSHAEE(OneWireContainer33 ibutton) {
-		super((OneWireContainer) ibutton);
+		super(ibutton);
 
-		owc33 = ibutton;
+		this.owc33 = ibutton;
 
 		// initialize attributes of this memory bank - DEFAULT: DS1963L scratchapd
-		bankDescription = "Scratchpad with CRC and 'Copy Scratchpad w/ SHA MAC'";
-		pageAutoCRC = true;
-		startPhysicalAddress = 0;
-		size = 8;
-		numberPages = 1;
-		pageLength = 8;
-		maxPacketDataLength = 8 - 3;
-		extraInfo = true;
-		extraInfoLength = 3;
+		this.bankDescription = "Scratchpad with CRC and 'Copy Scratchpad w/ SHA MAC'";
+		this.pageAutoCRC = true;
+		this.startPhysicalAddress = 0;
+		this.size = 8;
+		this.numberPages = 1;
+		this.pageLength = 8;
+		this.maxPacketDataLength = 8 - 3;
+		this.extraInfo = true;
+		this.extraInfoLength = 3;
 
 		// COPY_SCRATCHPAD_WITH_MAC
-		COPY_SCRATCHPAD_COMMAND = (byte) 0x55;
+		this.COPY_SCRATCHPAD_COMMAND = (byte) 0x55;
 	}
 
 	// --------
@@ -153,13 +152,14 @@ public MemoryBankScratchSHAEE(OneWireContainer33 ibutton) {
 	 * @throws OneWireIOException
 	 * @throws OneWireException
 	 */
+	@Override
 	public void readPageCRC(int page, boolean readContinue, byte[] readBuf, int offset)
 			throws OneWireIOException, OneWireException {
 		// \\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//
 		if (DEBUG) {
 			Debug.debug("-----------------------------------------------------------");
 			Debug.debug("MemoryBankScratchSHAEE.readPageCRC(int, boolean, byte[], int) called");
-			Debug.debug("  romID=" + owc33.getAddressAsString());
+			Debug.debug("  romID=" + this.owc33.getAddressAsString());
 			Debug.debug("  page=" + page);
 			Debug.debug("  readContinue=" + readContinue);
 			Debug.debug("  offset=" + offset);
@@ -167,12 +167,13 @@ public void readPageCRC(int page, boolean readContinue, byte[] readBuf, int offs
 		// \\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//
 		// byte[] extraInfo = new byte [extraInfoLength];
 
-		readPageCRC(page, readContinue, readBuf, offset, null);
+		this.readPageCRC(page, readContinue, readBuf, offset, null);
 
 		// \\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//
-		if (DEBUG)
+		if (DEBUG) {
 			Debug.debug("-----------------------------------------------------------");
-		// \\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//
+			// \\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//
+		}
 	}
 
 	/**
@@ -194,13 +195,14 @@ public void readPageCRC(int page, boolean readContinue, byte[] readBuf, int offs
 	 * @throws OneWireIOException
 	 * @throws OneWireException
 	 */
+	@Override
 	public void readPageCRC(int page, boolean readContinue, byte[] readBuf, int offset, byte[] extraInfo)
 			throws OneWireIOException, OneWireException {
 		// \\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//
 		if (DEBUG) {
 			Debug.debug("-----------------------------------------------------------");
 			Debug.debug("MemoryBankScratchSHAEE.readPageCRC(int, boolean, byte[], int, byte[]) called");
-			Debug.debug("  romID=" + owc33.getAddressAsString());
+			Debug.debug("  romID=" + this.owc33.getAddressAsString());
 			Debug.debug("  page=" + page);
 			Debug.debug("  readContinue=" + readContinue);
 			Debug.debug("  offset=" + offset);
@@ -208,24 +210,28 @@ public void readPageCRC(int page, boolean readContinue, byte[] readBuf, int offs
 		// \\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//
 
 		// only needs to be implemented if supported by hardware
-		if (!pageAutoCRC)
+		if (!this.pageAutoCRC) {
 			throw new OneWireException("Read page with CRC not supported in this memory bank");
+		}
 
 		// attempt to put device at max desired speed
-		if (!readContinue)
-			checkSpeed();
+		if (!readContinue) {
+			this.checkSpeed();
+		}
 
 		// check if read exceeds memory
-		if (page > numberPages)
+		if (page > this.numberPages) {
 			throw new OneWireException("Read exceeds memory bank end");
+		}
 
 		// read the scratchpad
-		readScratchpad(readBuf, offset, pageLength, extraInfo);
+		this.readScratchpad(readBuf, offset, this.pageLength, extraInfo);
 
 		// \\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//
-		if (DEBUG)
+		if (DEBUG) {
 			Debug.debug("-----------------------------------------------------------");
-		// \\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//
+			// \\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//
+		}
 	}
 
 	// --------
@@ -248,78 +254,84 @@ public void readPageCRC(int page, boolean readContinue, byte[] readBuf, int offs
 	 * @throws OneWireIOException
 	 * @throws OneWireException
 	 */
+	@Override
 	public void readScratchpad(byte[] readBuf, int offset, int len, byte[] extraInfo)
 			throws OneWireIOException, OneWireException {
 		// \\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//
 		if (DEBUG) {
 			Debug.debug("-----------------------------------------------------------");
 			Debug.debug("MemoryBankScratchSHAEE.readScratchpad(byte[], int, int, byte[]) called");
-			Debug.debug("  romID=" + owc33.getAddressAsString());
+			Debug.debug("  romID=" + this.owc33.getAddressAsString());
 			Debug.debug("  offset=" + offset);
 			Debug.debug("  len=" + len);
 		}
 		// \\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//
-		synchronized (read_scratchpad_buffer) {
-			int num_crc = 0;
+		synchronized (this.read_scratchpad_buffer) {
+			var num_crc = 0;
 
-			checkSpeed();
+			this.checkSpeed();
 
 			// select the device
-			if (!ib.adapter.select(ib.address)) {
-				forceVerify();
+			if (!this.ib.adapter.select(this.ib.address)) {
+				this.forceVerify();
 
 				throw new OneWireIOException("Device select failed");
 			}
 
 			// build block
-			read_scratchpad_buffer[0] = READ_SCRATCHPAD_COMMAND;
+			this.read_scratchpad_buffer[0] = READ_SCRATCHPAD_COMMAND;
 
-			System.arraycopy(ffBlock, 0, read_scratchpad_buffer, 1, read_scratchpad_buffer.length - 1);
+			System.arraycopy(ffBlock, 0, this.read_scratchpad_buffer, 1, this.read_scratchpad_buffer.length - 1);
 
 			// send block, command + (extra) + page data + CRC
-			ib.adapter.dataBlock(read_scratchpad_buffer, 0, read_scratchpad_buffer.length);
+			this.ib.adapter.dataBlock(this.read_scratchpad_buffer, 0, this.read_scratchpad_buffer.length);
 
 			// \\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//
-			if (DEBUG)
-				Debug.debug("read_scratchpad_buffer", read_scratchpad_buffer);
-			// \\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//
+			if (DEBUG) {
+				Debug.debug("read_scratchpad_buffer", this.read_scratchpad_buffer);
+				// \\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//
+			}
 
 			// get the starting offset to see when the crc will show up
-			int addr = read_scratchpad_buffer[1];
+			int addr = this.read_scratchpad_buffer[1];
 
-			addr = (addr | ((read_scratchpad_buffer[2] << 8) & 0xFF00)) & 0xFFFF;
+			addr = (addr | this.read_scratchpad_buffer[2] << 8 & 0xFF00) & 0xFFFF;
 
-			num_crc = pageLength + 3 + extraInfoLength;
+			num_crc = this.pageLength + 3 + this.extraInfoLength;
 
 			// \\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//
-			if (DEBUG)
+			if (DEBUG) {
 				Debug.debug("num_crc=" + num_crc);
-			// \\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//
+				// \\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//
+			}
 
 			// check crc of entire block
-			if (len == pageLength) {
-				if (CRC16.compute(read_scratchpad_buffer, 0, num_crc, 0) != 0x0000B001) {
+			if (len == this.pageLength) {
+				if (CRC16.compute(this.read_scratchpad_buffer, 0, num_crc, 0) != 0x0000B001) {
 					// \\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//
-					if (DEBUG)
+					if (DEBUG) {
 						Debug.debug("CRC16 Failed");
+					}
 					// \\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//
-					forceVerify();
+					this.forceVerify();
 
 					throw new OneWireIOException("Invalid CRC16 read from device");
 				}
 			}
 
 			// optionally extract the extra info
-			if (extraInfo != null)
-				System.arraycopy(read_scratchpad_buffer, 1, extraInfo, 0, extraInfoLength);
+			if (extraInfo != null) {
+				System.arraycopy(this.read_scratchpad_buffer, 1, extraInfo, 0, this.extraInfoLength);
+			}
 
 			// extract the page data
-			System.arraycopy(read_scratchpad_buffer, extraInfoLength + 1, readBuf, offset, len);
+			System.arraycopy(this.read_scratchpad_buffer, this.extraInfoLength + 1, readBuf, offset, len);
 		}
 		// \\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//
-		if (DEBUG)
+		if (DEBUG) {
 			Debug.debug("-----------------------------------------------------------");
-		// \\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//
+			// \\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//
+		}
 	}
 
 	/**
@@ -331,24 +343,26 @@ public void readScratchpad(byte[] readBuf, int offset, int len, byte[] extraInfo
 	 * @throws OneWireIOException
 	 * @throws OneWireException
 	 */
+	@Override
 	public void copyScratchpad(int addr, int len) throws OneWireIOException, OneWireException {
 		// \\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//
 		if (DEBUG) {
 			Debug.debug("-----------------------------------------------------------");
 			Debug.debug("MemoryBankScratchSHAEE.copyScratchpad(int, int) called");
-			Debug.debug("  romID=" + owc33.getAddressAsString());
+			Debug.debug("  romID=" + this.owc33.getAddressAsString());
 			Debug.debug("  addr=0x" + Convert.toHexString((byte) addr));
 			Debug.debug("  len=" + len);
 		}
 		// \\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//
-		synchronized (scratchpad_buffer) {
-			readScratchpad(scratchpad_buffer, 0, 8, null);
-			copyScratchpad(addr, scratchpad_buffer, 0);
+		synchronized (this.scratchpad_buffer) {
+			this.readScratchpad(this.scratchpad_buffer, 0, 8, null);
+			this.copyScratchpad(addr, this.scratchpad_buffer, 0);
 		}
 		// \\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//
-		if (DEBUG)
+		if (DEBUG) {
 			Debug.debug("-----------------------------------------------------------");
-		// \\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//
+			// \\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//
+		}
 	}
 
 	/**
@@ -367,23 +381,24 @@ public void copyScratchpad(int addr, byte[] scratchpad, int offset) throws OneWi
 		if (DEBUG) {
 			Debug.debug("-----------------------------------------------------------");
 			Debug.debug("MemoryBankScratchSHAEE.copyScratchpad(int, byte[], int) called");
-			Debug.debug("  romID=" + owc33.getAddressAsString());
+			Debug.debug("  romID=" + this.owc33.getAddressAsString());
 			Debug.debug("  addr=0x" + Convert.toHexString((byte) addr));
 			Debug.debug("  scratchpad", scratchpad, offset, 8);
 		}
 		// \\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//
-		synchronized (page_data_buffer) {
-			readMemory(addr & 0xE0, false, page_data_buffer, 0, 32);
+		synchronized (this.page_data_buffer) {
+			this.readMemory(addr & 0xE0, false, this.page_data_buffer, 0, 32);
 
 			// readMemory clears the TA address set by write scratchpad, let's re-write it
-			writeScratchpad(addr, scratchpad, offset, 8);
+			this.writeScratchpad(addr, scratchpad, offset, 8);
 
-			copyScratchpad(addr, scratchpad, offset, page_data_buffer, 0);
+			this.copyScratchpad(addr, scratchpad, offset, this.page_data_buffer, 0);
 		}
 		// \\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//
-		if (DEBUG)
+		if (DEBUG) {
 			Debug.debug("-----------------------------------------------------------");
-		// \\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//
+			// \\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//
+		}
 	}
 
 	/**
@@ -405,48 +420,49 @@ public void copyScratchpad(int addr, byte[] scratchpad, int scratchpadOffset, by
 		if (DEBUG) {
 			Debug.debug("-----------------------------------------------------------");
 			Debug.debug("MemoryBankScratchSHAEE.copyScratchpad(int, byte[], int, byte[], int) called");
-			Debug.debug("  romID=" + owc33.getAddressAsString());
+			Debug.debug("  romID=" + this.owc33.getAddressAsString());
 			Debug.debug("  addr=0x" + Convert.toHexString((byte) addr));
 			Debug.debug("  scratchpad", scratchpad, scratchpadOffset, 8);
 			Debug.debug("  pageData", pageData, pageDataOffset, 32);
 		}
 		// \\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//
-		synchronized (MT_buffer) {
+		synchronized (this.MT_buffer) {
 			// copy the secret into message block
-			owc33.getContainerSecret(MT_buffer, 0);
-			System.arraycopy(MT_buffer, 4, MT_buffer, 48, 4);
+			this.owc33.getContainerSecret(this.MT_buffer, 0);
+			System.arraycopy(this.MT_buffer, 4, this.MT_buffer, 48, 4);
 
 			// copy the current page contents into the buffer
-			System.arraycopy(pageData, pageDataOffset, MT_buffer, 4, 28);
+			System.arraycopy(pageData, pageDataOffset, this.MT_buffer, 4, 28);
 
-			System.arraycopy(scratchpad, scratchpadOffset, MT_buffer, 32, 8);
+			System.arraycopy(scratchpad, scratchpadOffset, this.MT_buffer, 32, 8);
 
-			MT_buffer[40] = (byte) ((addr & 0x0E0) >>> 5);
-			System.arraycopy(owc33.getAddress(), 0, MT_buffer, 41, 7);
-			System.arraycopy(ffBlock, 0, MT_buffer, 52, 3);
+			this.MT_buffer[40] = (byte) ((addr & 0x0E0) >>> 5);
+			System.arraycopy(this.owc33.getAddress(), 0, this.MT_buffer, 41, 7);
+			System.arraycopy(ffBlock, 0, this.MT_buffer, 52, 3);
 
 			// put in the padding
-			MT_buffer[55] = (byte) 0x80;
-			System.arraycopy(zeroBlock, 0, MT_buffer, 56, 6);
-			MT_buffer[62] = (byte) 0x01;
-			MT_buffer[63] = (byte) 0xB8;
+			this.MT_buffer[55] = (byte) 0x80;
+			System.arraycopy(zeroBlock, 0, this.MT_buffer, 56, 6);
+			this.MT_buffer[62] = (byte) 0x01;
+			this.MT_buffer[63] = (byte) 0xB8;
 
 			// \\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//
 			if (DEBUG) {
-				Debug.debug("MT_buffer", MT_buffer);
+				Debug.debug("MT_buffer", this.MT_buffer);
 			}
 			// \\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//
 
-			synchronized (MAC_buffer) {
+			synchronized (this.MAC_buffer) {
 				// do the SHA calculation to get MAC
-				SHA.ComputeSHA(MT_buffer, MAC_buffer, 0);
-				copyScratchpadWithMAC(addr, MAC_buffer, 0);
+				SHA.ComputeSHA(this.MT_buffer, this.MAC_buffer, 0);
+				this.copyScratchpadWithMAC(addr, this.MAC_buffer, 0);
 			}
 		}
 		// \\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//
-		if (DEBUG)
+		if (DEBUG) {
 			Debug.debug("-----------------------------------------------------------");
-		// \\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//
+			// \\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//
+		}
 	}
 
 	/**
@@ -466,81 +482,85 @@ public void copyScratchpadWithMAC(int addr, byte[] authMAC, int authOffset)
 		if (DEBUG) {
 			Debug.debug("-----------------------------------------------------------");
 			Debug.debug("MemoryBankScratchSHAEE.copyScratchpadWithMAC(int, byte[], int) called");
-			Debug.debug("  romID=" + owc33.getAddressAsString());
+			Debug.debug("  romID=" + this.owc33.getAddressAsString());
 			Debug.debug("  addr=0x" + Convert.toHexString((byte) addr));
 			Debug.debug("  authMAC", authMAC, authOffset, 20);
 		}
 		// \\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//
-		synchronized (copy_scratchpad_buffer) {
-			byte[] send_block = copy_scratchpad_buffer;
+		synchronized (this.copy_scratchpad_buffer) {
+			var send_block = this.copy_scratchpad_buffer;
 
-			checkSpeed();
+			this.checkSpeed();
 
 			// access the device
-			if (ib.adapter.select(ib.getAddress())) {
-				// ending address with data status
-				send_block[3] = 0x5F;// ES - always 0x5F
+			if (!this.ib.adapter.select(this.ib.getAddress())) {
+				throw new OneWireIOException("Device select failed.");
+			}
+			// ending address with data status
+			send_block[3] = 0x5F;// ES - always 0x5F
 
-				// address 2
-				send_block[2] = (byte) ((addr >> 8) & 0x0FF);// TA2
+			// address 2
+			send_block[2] = (byte) (addr >> 8 & 0x0FF);// TA2
 
-				// address 1
-				send_block[1] = (byte) ((addr) & 0x0FF);// TA1;
+			// address 1
+			send_block[1] = (byte) (addr & 0x0FF);// TA1;
 
-				// Copy command
-				send_block[0] = COPY_SCRATCHPAD_COMMAND;
+			// Copy command
+			send_block[0] = this.COPY_SCRATCHPAD_COMMAND;
 
-				// send copy scratchpad command
-				ib.adapter.dataBlock(send_block, 0, 4);
+			// send copy scratchpad command
+			this.ib.adapter.dataBlock(send_block, 0, 4);
 
+			// \\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//
+			if (DEBUG) {
+				Debug.debug("  send_block", send_block, 0, 4);
 				// \\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//
-				if (DEBUG)
-					Debug.debug("  send_block", send_block, 0, 4);
-				// \\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//
+			}
 
-				// pause before sending appropriate MAC
-				try {
-					Thread.sleep(2);
-				} catch (InterruptedException e) {
-				}
+			// pause before sending appropriate MAC
+			try {
+				Thread.sleep(2);
+			} catch (InterruptedException e) {
+			}
 
-				// sending MAC
-				ib.adapter.dataBlock(authMAC, authOffset, 19);
+			// sending MAC
+			this.ib.adapter.dataBlock(authMAC, authOffset, 19);
 
-				// provide strong pull-up for copy
-				ib.adapter.setPowerDuration(DSPortAdapter.DELIVERY_INFINITE);
-				ib.adapter.startPowerDelivery(DSPortAdapter.CONDITION_AFTER_BYTE);
-				ib.adapter.putByte(authMAC[authOffset + 19]);
+			// provide strong pull-up for copy
+			this.ib.adapter.setPowerDuration(DSPortAdapter.DELIVERY_INFINITE);
+			this.ib.adapter.startPowerDelivery(DSPortAdapter.CONDITION_AFTER_BYTE);
+			this.ib.adapter.putByte(authMAC[authOffset + 19]);
 
-				// pause before checking result
-				try {
-					Thread.sleep(12);
-				} catch (InterruptedException e) {
-				}
+			// pause before checking result
+			try {
+				Thread.sleep(12);
+			} catch (InterruptedException e) {
+			}
 
-				ib.adapter.setPowerNormal();
+			this.ib.adapter.setPowerNormal();
 
-				// get result
-				byte test = (byte) ib.adapter.getByte();
+			// get result
+			var test = (byte) this.ib.adapter.getByte();
 
+			// \\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//
+			if (DEBUG) {
+				Debug.debug("  result=0x" + Convert.toHexString(test));
 				// \\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//
-				if (DEBUG)
-					Debug.debug("  result=0x" + Convert.toHexString((byte) test));
-				// \\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//
+			}
 
-				if ((test != (byte) 0xAA) && (test != (byte) 0x55)) {
-					if (test == (byte) 0xFF)
-						throw new OneWireException("That area of memory is write-protected.");
-					else if (test == (byte) 0x00)
-						throw new OneWireIOException("Error due to not matching MAC.");
+			if (test != (byte) 0xAA && test != (byte) 0x55) {
+				if (test == (byte) 0xFF) {
+					throw new OneWireException("That area of memory is write-protected.");
+				} else if (test == (byte) 0x00) {
+					throw new OneWireIOException("Error due to not matching MAC.");
 				}
-			} else
-				throw new OneWireIOException("Device select failed.");
+			}
 		}
 		// \\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//
-		if (DEBUG)
+		if (DEBUG) {
 			Debug.debug("-----------------------------------------------------------");
-		// \\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//
+			// \\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//
+		}
 	}
 
 	/**
@@ -554,20 +574,21 @@ else if (test == (byte) 0x00)
 	 * @throws OneWireIOException
 	 * @throws OneWireException
 	 */
+	@Override
 	public void writeScratchpad(int addr, byte[] writeBuf, int offset, int len)
 			throws OneWireIOException, OneWireException {
 		// \\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//
 		if (DEBUG) {
 			Debug.debug("-----------------------------------------------------------");
 			Debug.debug("MemoryBankScratchSHAEE.writeScratchpad(int, byte[], int, int) called");
-			Debug.debug("  romID=" + owc33.getAddressAsString());
+			Debug.debug("  romID=" + this.owc33.getAddressAsString());
 			Debug.debug("  addr=0x" + Convert.toHexString((byte) addr));
 			Debug.debug("  writeBuf", writeBuf, offset, len);
 			Debug.stackTrace();
 		}
 		// \\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//
 
-		checkSpeed();
+		this.checkSpeed();
 
 		super.writeScratchpad(addr, writeBuf, offset, len);
 
@@ -599,23 +620,25 @@ public void writeScratchpad(int addr, byte[] writeBuf, int offset, int len)
 	 * @throws OneWireIOException
 	 * @throws OneWireException
 	 */
+	@Override
 	public void write(int addr, byte[] writeBuf, int offset, int len) throws OneWireIOException, OneWireException {
 		// \\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//
 		if (DEBUG) {
 			Debug.debug("-----------------------------------------------------------");
 			Debug.debug("MemoryBankScratchSHAEE.write(int, byte[], int, int) called");
-			Debug.debug("  romID=" + owc33.getAddressAsString());
+			Debug.debug("  romID=" + this.owc33.getAddressAsString());
 			Debug.debug("  addr=0x" + Convert.toHexString((byte) addr));
 			Debug.debug("  writeBuf", writeBuf, offset, len);
 		}
 		// \\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//
 
-		writeScratchpad(addr, writeBuf, offset, len);
+		this.writeScratchpad(addr, writeBuf, offset, len);
 
 		// \\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//
-		if (DEBUG)
+		if (DEBUG) {
 			Debug.debug("-----------------------------------------------------------");
-		// \\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//
+			// \\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//
+		}
 	}
 
 	/**
@@ -636,19 +659,20 @@ public void loadFirstSecret(int addr, byte[] data, int offset) throws OneWireIOE
 		if (DEBUG) {
 			Debug.debug("-----------------------------------------------------------");
 			Debug.debug("MemoryBankScratchSHAEE.loadFirstSecret(int, byte[], int) called");
-			Debug.debug("  romID=" + owc33.getAddressAsString());
+			Debug.debug("  romID=" + this.owc33.getAddressAsString());
 			Debug.debug("  addr=0x" + Convert.toHexString(addr));
 			Debug.debug("  data", data, offset, 8);
 		}
 		// \\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//
 
-		writeScratchpad(addr, data, offset, 8);
-		loadFirstSecret(addr);
+		this.writeScratchpad(addr, data, offset, 8);
+		this.loadFirstSecret(addr);
 
 		// \\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//
-		if (DEBUG)
+		if (DEBUG) {
 			Debug.debug("-----------------------------------------------------------");
-		// \\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//
+			// \\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//
+		}
 	}
 
 	/**
@@ -667,70 +691,75 @@ public void loadFirstSecret(int addr) throws OneWireIOException, OneWireExceptio
 		if (DEBUG) {
 			Debug.debug("-----------------------------------------------------------");
 			Debug.debug("MemoryBankScratchSHAEE.loadFirstSecret(int) called");
-			Debug.debug("  romID=" + owc33.getAddressAsString());
+			Debug.debug("  romID=" + this.owc33.getAddressAsString());
 			Debug.debug("  addr=0x" + Convert.toHexString((byte) addr));
 		}
 		// \\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//
 
-		byte[] send_block = new byte[4];
+		var send_block = new byte[4];
 
-		checkSpeed();
+		this.checkSpeed();
 
 		// access the device
-		if (ib.adapter.select(ib.getAddress())) {
-			send_block[0] = LOAD_FIRST_SECRET;
-			send_block[1] = (byte) (addr & 0x00FF);
-			send_block[2] = (byte) ((addr >>> 8) & 0x00FF);
-			send_block[3] = (byte) 0x5F;// Should be 0x5F,not ( byte ) ((addr + 7) & 0x01F);
+		if (!this.ib.adapter.select(this.ib.getAddress())) {
+			throw new OneWireIOException("Device select failed.");
+		}
+		send_block[0] = LOAD_FIRST_SECRET;
+		send_block[1] = (byte) (addr & 0x00FF);
+		send_block[2] = (byte) (addr >>> 8 & 0x00FF);
+		send_block[3] = (byte) 0x5F;// Should be 0x5F,not ( byte ) ((addr + 7) & 0x01F);
 
-			// \\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\
-			if (DEBUG)
-				Debug.debug("send_block", send_block, 0, 4);
+		// \\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\
+		if (DEBUG) {
+			Debug.debug("send_block", send_block, 0, 4);
 			// \\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\
+		}
 
-			// now send the block
-			ib.adapter.dataBlock(send_block, 0, 3);
+		// now send the block
+		this.ib.adapter.dataBlock(send_block, 0, 3);
 
-			// provide strong pull-up for load
-			ib.adapter.setPowerDuration(DSPortAdapter.DELIVERY_INFINITE);
-			ib.adapter.startPowerDelivery(DSPortAdapter.CONDITION_AFTER_BYTE);
-			ib.adapter.putByte(send_block[3]);
+		// provide strong pull-up for load
+		this.ib.adapter.setPowerDuration(DSPortAdapter.DELIVERY_INFINITE);
+		this.ib.adapter.startPowerDelivery(DSPortAdapter.CONDITION_AFTER_BYTE);
+		this.ib.adapter.putByte(send_block[3]);
 
-			try {
-				Thread.sleep(20);
-			} catch (InterruptedException e) {
-			}
+		try {
+			Thread.sleep(20);
+		} catch (InterruptedException e) {
+		}
 
-			ib.adapter.setPowerNormal();
+		this.ib.adapter.setPowerNormal();
 
-			byte test = (byte) ib.adapter.getByte();
+		var test = (byte) this.ib.adapter.getByte();
 
-			// \\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\
-			if (DEBUG)
-				Debug.debug("result=" + Convert.toHexString(test));
+		// \\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\
+		if (DEBUG) {
+			Debug.debug("result=" + Convert.toHexString(test));
 			// \\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\
+		}
 
-			if ((test != (byte) 0xAA) && (test != (byte) 0x55))
-				throw new OneWireException("Error due to invalid load.");
+		if (test != (byte) 0xAA && test != (byte) 0x55) {
+			throw new OneWireException("Error due to invalid load.");
+		}
 
-			// if data is loaded to secrets memory, lets read it so we can
-			// set the container secret
-			if (addr == 0x080) {
-				// \\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\
-				if (DEBUG)
-					Debug.debug("reading scratchpad and setting container secret");
+		// if data is loaded to secrets memory, lets read it so we can
+		// set the container secret
+		if (addr == 0x080) {
+			// \\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\
+			if (DEBUG) {
+				Debug.debug("reading scratchpad and setting container secret");
 				// \\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\
-
-				byte[] secret = new byte[8];
-				readScratchpad(secret, 0, 8, null);
-				owc33.setContainerSecret(secret, 0);
 			}
-		} else
-			throw new OneWireIOException("Device select failed.");
+
+			var secret = new byte[8];
+			this.readScratchpad(secret, 0, 8, null);
+			this.owc33.setContainerSecret(secret, 0);
+		}
 		// \\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//
-		if (DEBUG)
+		if (DEBUG) {
 			Debug.debug("-----------------------------------------------------------");
-		// \\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//
+			// \\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//
+		}
 	}
 
 	/**
@@ -745,39 +774,41 @@ public void computeNextSecret(int addr) throws OneWireIOException, OneWireExcept
 		if (DEBUG) {
 			Debug.debug("-----------------------------------------------------------");
 			Debug.debug("MemoryBankScratchSHAEE.computeNextSecret(int) called");
-			Debug.debug("  romID=" + owc33.getAddressAsString());
+			Debug.debug("  romID=" + this.owc33.getAddressAsString());
 			Debug.debug("  addr=0x" + Convert.toHexString((byte) addr));
 		}
 		// \\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//
 
-		byte[] send_block = new byte[3];
-		byte[] scratch = new byte[8];
+		var send_block = new byte[3];
+		var scratch = new byte[8];
 		byte[] next_secret = null;
 
 		// check to see if secret is set
-		if (owc33.isContainerSecretSet()) {
+		if (this.owc33.isContainerSecretSet()) {
 			// \\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//
-			if (DEBUG)
+			if (DEBUG) {
 				Debug.debug("Calculating next secret for container");
-			// \\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//
+				// \\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//
+			}
 
-			byte[] memory = new byte[32];
-			byte[] secret = new byte[8];
-			byte[] MT = new byte[64];
+			var memory = new byte[32];
+			var secret = new byte[8];
+			var MT = new byte[64];
 
-			readMemory(addr & 0xE0, false, memory, 0, 32);
+			this.readMemory(addr & 0xE0, false, memory, 0, 32);
 
-			owc33.getContainerSecret(secret, 0);
+			this.owc33.getContainerSecret(secret, 0);
 
 			// \\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//
-			if (DEBUG)
+			if (DEBUG) {
 				Debug.debug("currentSecret", secret, 0, 8);
-			// \\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//
+				// \\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//
+			}
 
 			System.arraycopy(secret, 0, MT, 0, 4);
 			System.arraycopy(memory, 0, MT, 4, 32);
 			System.arraycopy(ffBlock, 0, MT, 36, 4);
-			readScratchpad(MT, 40, 8, null);
+			this.readScratchpad(MT, 40, 8, null);
 			MT[40] = (byte) (MT[40] & (byte) 0x3F);
 			System.arraycopy(secret, 4, MT, 48, 4);
 			System.arraycopy(ffBlock, 0, MT, 52, 3);
@@ -789,11 +820,12 @@ public void computeNextSecret(int addr) throws OneWireIOException, OneWireExcept
 			MT[63] = (byte) 0xB8;
 
 			// \\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//
-			if (DEBUG)
+			if (DEBUG) {
 				Debug.debug("MT", MT, 0, 64);
-			// \\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//
+				// \\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//
+			}
 
-			int[] AtoE = new int[5];
+			var AtoE = new int[5];
 			SHA.ComputeSHA(MT, AtoE);
 
 			// copy E into secret
@@ -809,62 +841,66 @@ public void computeNextSecret(int addr) throws OneWireIOException, OneWireExcept
 			next_secret = secret;
 
 			// \\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//
-			if (DEBUG)
+			if (DEBUG) {
 				Debug.debug("nextSecret", secret, 0, 8);
-			// \\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//
+				// \\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//
+			}
 		}
 
-		checkSpeed();
+		this.checkSpeed();
 
 		// access the device
-		if (ib.adapter.select(ib.getAddress())) {
-			// Next Secret command
-			send_block[0] = COMPUTE_NEXT_SECRET;
-			// address 1
-			send_block[1] = (byte) (addr & 0xFF);
-			// address 2
-			send_block[2] = (byte) (((addr & 0xFFFF) >>> 8) & 0xFF);
+		if (!this.ib.adapter.select(this.ib.getAddress())) {
+			throw new OneWireIOException("Device select failed.");
+		}
+		// Next Secret command
+		send_block[0] = COMPUTE_NEXT_SECRET;
+		// address 1
+		send_block[1] = (byte) (addr & 0xFF);
+		// address 2
+		send_block[2] = (byte) ((addr & 0xFFFF) >>> 8 & 0xFF);
 
-			// now send the block
-			ib.adapter.dataBlock(send_block, 0, 2);
+		// now send the block
+		this.ib.adapter.dataBlock(send_block, 0, 2);
 
-			// provide strong pull-up for compute next secret
-			ib.adapter.setPowerDuration(DSPortAdapter.DELIVERY_INFINITE);
-			ib.adapter.startPowerDelivery(DSPortAdapter.CONDITION_AFTER_BYTE);
-			ib.adapter.putByte(send_block[2]);
+		// provide strong pull-up for compute next secret
+		this.ib.adapter.setPowerDuration(DSPortAdapter.DELIVERY_INFINITE);
+		this.ib.adapter.startPowerDelivery(DSPortAdapter.CONDITION_AFTER_BYTE);
+		this.ib.adapter.putByte(send_block[2]);
 
+		// \\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//
+		if (DEBUG) {
+			Debug.debug("sendblock ", send_block, 0, 3);
 			// \\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//
-			if (DEBUG)
-				Debug.debug("sendblock ", send_block, 0, 3);
-			// \\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//
+		}
 
-			try {
-				Thread.sleep(14);
-			} catch (InterruptedException e) {
-			}
+		try {
+			Thread.sleep(14);
+		} catch (InterruptedException e) {
+		}
 
-			ib.adapter.setPowerNormal();
+		this.ib.adapter.setPowerNormal();
 
-			readScratchpad(scratch, 0, 8, null);
-			for (int i = 0; i < 8; i++) {
-				if (scratch[i] != (byte) 0xAA) {
-					throw new OneWireIOException("Next secret not calculated.");
-				}
+		this.readScratchpad(scratch, 0, 8, null);
+		for (var i = 0; i < 8; i++) {
+			if (scratch[i] != (byte) 0xAA) {
+				throw new OneWireIOException("Next secret not calculated.");
 			}
-			if (next_secret != null) {
-				// \\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//
-				if (DEBUG)
-					Debug.debug("setting container secret", next_secret, 0, 8);
-				// \\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//
-				owc33.setContainerSecret(next_secret, 0);
+		}
+		if (next_secret != null) {
+			// \\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//
+			if (DEBUG) {
+				Debug.debug("setting container secret", next_secret, 0, 8);
 			}
-		} else
-			throw new OneWireIOException("Device select failed.");
+			// \\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//
+			this.owc33.setContainerSecret(next_secret, 0);
+		}
 
 		// \\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//
-		if (DEBUG)
+		if (DEBUG) {
 			Debug.debug("-----------------------------------------------------------");
-		// \\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//
+			// \\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//
+		}
 	}
 
 	/**
@@ -885,37 +921,39 @@ public void computeNextSecret(int addr, byte[] partialsecret, int offset)
 		if (DEBUG) {
 			Debug.debug("-----------------------------------------------------------");
 			Debug.debug("MemoryBankScratchSHAEE.computeNextSecret(int, byte[], int) called");
-			Debug.debug("  romID=" + owc33.getAddressAsString());
+			Debug.debug("  romID=" + this.owc33.getAddressAsString());
 			Debug.debug("  addr=0x" + Convert.toHexString((byte) addr));
 			Debug.debug("  partialsecret", partialsecret, offset, 8);
 		}
 		// \\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//
 
-		byte[] send_block = new byte[3];
-		byte[] scratch = new byte[8];
+		var send_block = new byte[3];
+		var scratch = new byte[8];
 		byte[] next_secret = null;
 
-		writeScratchpad(addr, partialsecret, 0, 8);
+		this.writeScratchpad(addr, partialsecret, 0, 8);
 
 		// check to see if secret is set
-		if (owc33.isContainerSecretSet()) {
+		if (this.owc33.isContainerSecretSet()) {
 			// \\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//
-			if (DEBUG)
+			if (DEBUG) {
 				Debug.debug("Calculating next secret for container");
-			// \\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//
+				// \\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//
+			}
 
-			byte[] memory = new byte[32];
-			byte[] secret = new byte[8];
-			byte[] MT = new byte[64];
+			var memory = new byte[32];
+			var secret = new byte[8];
+			var MT = new byte[64];
 
-			readMemory(addr & 0xE0, false, memory, 0, 32);
+			this.readMemory(addr & 0xE0, false, memory, 0, 32);
 
-			owc33.getContainerSecret(secret, 0);
+			this.owc33.getContainerSecret(secret, 0);
 
 			// \\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//
-			if (DEBUG)
+			if (DEBUG) {
 				Debug.debug("currentSecret", secret, 0, 8);
-			// \\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//
+				// \\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//
+			}
 
 			System.arraycopy(secret, 0, MT, 0, 4);
 			System.arraycopy(memory, 0, MT, 4, 32);
@@ -932,11 +970,12 @@ public void computeNextSecret(int addr, byte[] partialsecret, int offset)
 			MT[63] = (byte) 0xB8;
 
 			// \\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//
-			if (DEBUG)
+			if (DEBUG) {
 				Debug.debug("MT", MT, 0, 64);
-			// \\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//
+				// \\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//
+			}
 
-			int[] AtoE = new int[5];
+			var AtoE = new int[5];
 			SHA.ComputeSHA(MT, AtoE);
 
 			// copy E into secret
@@ -952,61 +991,65 @@ public void computeNextSecret(int addr, byte[] partialsecret, int offset)
 			next_secret = secret;
 
 			// \\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//
-			if (DEBUG)
+			if (DEBUG) {
 				Debug.debug("nextSecret=", secret, 0, 8);
-			// \\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//
+				// \\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//
+			}
 		}
 
 		// access the device
-		if (ib.adapter.select(ib.getAddress())) {
-			// Next Secret command
-			send_block[0] = COMPUTE_NEXT_SECRET;
-			// address 1
-			send_block[1] = (byte) (addr & 0xFF);
-			// address 2
-			send_block[2] = (byte) (((addr & 0xFFFF) >>> 8) & 0xFF);
+		if (!this.ib.adapter.select(this.ib.getAddress())) {
+			throw new OneWireIOException("Device select failed.");
+		}
+		// Next Secret command
+		send_block[0] = COMPUTE_NEXT_SECRET;
+		// address 1
+		send_block[1] = (byte) (addr & 0xFF);
+		// address 2
+		send_block[2] = (byte) ((addr & 0xFFFF) >>> 8 & 0xFF);
 
-			// now send the block
-			ib.adapter.dataBlock(send_block, 0, 2);
+		// now send the block
+		this.ib.adapter.dataBlock(send_block, 0, 2);
 
-			// provide strong pull-up for compute next secret
-			ib.adapter.setPowerDuration(DSPortAdapter.DELIVERY_INFINITE);
-			ib.adapter.startPowerDelivery(DSPortAdapter.CONDITION_AFTER_BYTE);
-			ib.adapter.putByte(send_block[2]);
+		// provide strong pull-up for compute next secret
+		this.ib.adapter.setPowerDuration(DSPortAdapter.DELIVERY_INFINITE);
+		this.ib.adapter.startPowerDelivery(DSPortAdapter.CONDITION_AFTER_BYTE);
+		this.ib.adapter.putByte(send_block[2]);
 
+		// \\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//
+		if (DEBUG) {
+			Debug.debug("sendblock ", send_block, 0, 3);
 			// \\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//
-			if (DEBUG)
-				Debug.debug("sendblock ", send_block, 0, 3);
-			// \\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//
+		}
 
-			try {
-				Thread.sleep(14);
-			} catch (InterruptedException e) {
-			}
+		try {
+			Thread.sleep(14);
+		} catch (InterruptedException e) {
+		}
 
-			ib.adapter.setPowerNormal();
+		this.ib.adapter.setPowerNormal();
 
-			readScratchpad(scratch, 0, 8, null);
-			for (int i = 0; i < 8; i++) {
-				if (scratch[i] != (byte) 0xAA) {
-					throw new OneWireIOException("Next secret not calculated.");
-				}
+		this.readScratchpad(scratch, 0, 8, null);
+		for (var i = 0; i < 8; i++) {
+			if (scratch[i] != (byte) 0xAA) {
+				throw new OneWireIOException("Next secret not calculated.");
 			}
+		}
 
-			if (next_secret != null) {
-				// \\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//
-				if (DEBUG)
-					Debug.debug("setting container secret", next_secret, 0, 8);
-				// \\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//
-				owc33.setContainerSecret(next_secret, 0);
+		if (next_secret != null) {
+			// \\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//
+			if (DEBUG) {
+				Debug.debug("setting container secret", next_secret, 0, 8);
 			}
-		} else
-			throw new OneWireIOException("Device select failed.");
+			// \\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//
+			this.owc33.setContainerSecret(next_secret, 0);
+		}
 
 		// \\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//
-		if (DEBUG)
+		if (DEBUG) {
 			Debug.debug("-----------------------------------------------------------");
-		// \\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//
+			// \\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//
+		}
 	}
 
 	/**
@@ -1026,53 +1069,57 @@ public void refreshScratchpad(int addr) throws OneWireIOException, OneWireExcept
 		if (DEBUG) {
 			Debug.debug("-----------------------------------------------------------");
 			Debug.debug("MemoryBankScratchSHAEE.refreshScratchpad(int) called");
-			Debug.debug("  romID=" + owc33.getAddressAsString());
+			Debug.debug("  romID=" + this.owc33.getAddressAsString());
 			Debug.debug("  addr=0x" + Convert.toHexString((byte) addr));
 			Debug.stackTrace();
 		}
 		// \\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//
 
-		checkSpeed();
+		this.checkSpeed();
 
 		// access the device
-		if (ib.adapter.select(ib.getAddress())) {
-			byte[] send_block = new byte[13];
+		if (!this.ib.adapter.select(this.ib.getAddress())) {
+			// \\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//
+			if (DEBUG) {
+				Debug.debug("   Refresh Scratchpad failed because there is no device");
+			}
+			// \\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//
+			throw new OneWireIOException("Device select failed.");
+		}
+		var send_block = new byte[13];
 
-			send_block[0] = REFRESH_SCRATCHPAD;
-			send_block[1] = (byte) (addr & 0x00FF);
-			send_block[2] = (byte) ((addr >>> 8) & 0x00FF);
-			for (int i = 3; i < 11; i++)
-				send_block[i] = (byte) 0x00;
-			send_block[11] = (byte) 0xFF;
-			send_block[12] = (byte) 0xFF;
+		send_block[0] = REFRESH_SCRATCHPAD;
+		send_block[1] = (byte) (addr & 0x00FF);
+		send_block[2] = (byte) (addr >>> 8 & 0x00FF);
+		for (var i = 3; i < 11; i++) {
+			send_block[i] = (byte) 0x00;
+		}
+		send_block[11] = (byte) 0xFF;
+		send_block[12] = (byte) 0xFF;
 
-			// now send the block
-			ib.adapter.dataBlock(send_block, 0, 13);
+		// now send the block
+		this.ib.adapter.dataBlock(send_block, 0, 13);
 
-			// \\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\
-			if (DEBUG)
-				Debug.debug("send_block", send_block, 0, 13);
+		// \\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\
+		if (DEBUG) {
+			Debug.debug("send_block", send_block, 0, 13);
 			// \\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\
+		}
 
-			if (CRC16.compute(send_block, 0, 13, 0) != 0x0B001) {
-				// \\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//
-				if (DEBUG)
-					Debug.debug("   Refresh Scratchpad failed because of bad CRC16");
-				// \\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//
-				throw new OneWireException("Bad CRC16 on Refresh Scratchpad");
-			}
-		} else {
+		if (CRC16.compute(send_block, 0, 13, 0) != 0x0B001) {
 			// \\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//
-			if (DEBUG)
-				Debug.debug("   Refresh Scratchpad failed because there is no device");
+			if (DEBUG) {
+				Debug.debug("   Refresh Scratchpad failed because of bad CRC16");
+			}
 			// \\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//
-			throw new OneWireIOException("Device select failed.");
+			throw new OneWireException("Bad CRC16 on Refresh Scratchpad");
 		}
 
 		// \\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//
-		if (DEBUG)
+		if (DEBUG) {
 			Debug.debug("-----------------------------------------------------------");
-		// \\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//
+			// \\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//
+		}
 	}
 
 	/**
@@ -1103,7 +1150,7 @@ private void readMemory(int startAddr, boolean readContinue, byte[] readBuf, int
 		if (DEBUG) {
 			Debug.debug("-----------------------------------------------------------");
 			Debug.debug("MemoryBankScratchSHAEE.readMemory(int, boolean, byte[], int, int) called");
-			Debug.debug("  romID=" + owc33.getAddressAsString());
+			Debug.debug("  romID=" + this.owc33.getAddressAsString());
 			Debug.debug("  startAddr=0x" + Convert.toHexString((byte) startAddr));
 			Debug.debug("  readContinue=" + readContinue);
 			Debug.debug("  offset=" + offset);
@@ -1112,22 +1159,24 @@ private void readMemory(int startAddr, boolean readContinue, byte[] readBuf, int
 		// \\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//
 
 		// attempt to put device at max desired speed
-		if (!readContinue)
-			checkSpeed();
+		if (!readContinue) {
+			this.checkSpeed();
+		}
 
 		// see if need to access the device
 		if (!readContinue) {
 			// select the device
-			if (!ib.adapter.select(ib.getAddress()))
+			if (!this.ib.adapter.select(this.ib.getAddress())) {
 				throw new OneWireIOException("Device select failed.");
+			}
 
 			// build start reading memory block
 			readBuf[offset] = (byte) 0xF0; // READ MEMORY, no CRC, no MAC
 			readBuf[offset + 1] = (byte) (startAddr & 0xFF);
-			readBuf[offset + 2] = (byte) (((startAddr & 0xFFFF) >>> 8) & 0xFF);
+			readBuf[offset + 2] = (byte) ((startAddr & 0xFFFF) >>> 8 & 0xFF);
 
 			// do the first block for command, address
-			ib.adapter.dataBlock(readBuf, offset, 3);
+			this.ib.adapter.dataBlock(readBuf, offset, 3);
 			// \\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//
 			if (DEBUG) {
 				Debug.debug("  readBuf", readBuf, offset, 3);
@@ -1136,17 +1185,19 @@ private void readMemory(int startAddr, boolean readContinue, byte[] readBuf, int
 		}
 
 		// pre-fill readBuf with 0xFF
-		int pgs = len / 32;
-		int extra = len % 32;
+		var pgs = len / 32;
+		var extra = len % 32;
 
-		for (int i = 0; i < pgs; i++)
+		for (var i = 0; i < pgs; i++) {
 			System.arraycopy(ffBlock, 0, readBuf, offset + i * 32, 32);
-		if (extra > 0)
+		}
+		if (extra > 0) {
 			System.arraycopy(ffBlock, 0, readBuf, offset + pgs * 32, extra);
+		}
 
 		// \\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//
 		// send second block to read data, return result
-		ib.adapter.dataBlock(readBuf, offset, len);
+		this.ib.adapter.dataBlock(readBuf, offset, len);
 
 		// \\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//
 		if (DEBUG) {
@@ -1155,15 +1206,4 @@ private void readMemory(int startAddr, boolean readContinue, byte[] readBuf, int
 		}
 		// \\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//
 	}
-
-	/**
-	 * helper method to pause for specified milliseconds
-	 */
-	private static final void msWait(final long ms) {
-		try {
-			Thread.sleep(ms);
-		} catch (InterruptedException ie) {
-			;
-		}
-	}
 }
diff --git a/io.openems.edge.bridge.onewire/src/com/dalsemi/onewire/container/MemoryBankScratchTemp.java b/io.openems.edge.bridge.onewire/src/com/dalsemi/onewire/container/MemoryBankScratchTemp.java
index 84dc767cb76..139d1cef6f2 100644
--- a/io.openems.edge.bridge.onewire/src/com/dalsemi/onewire/container/MemoryBankScratchTemp.java
+++ b/io.openems.edge.bridge.onewire/src/com/dalsemi/onewire/container/MemoryBankScratchTemp.java
@@ -40,7 +40,6 @@
  * @version 0.00, 15 October 2006
  * @author
  */
-@SuppressWarnings({ "unused" })
 class MemoryBankScratchTemp implements MemoryBank {
 	// --------
 	// --------Static Final Variables
@@ -67,14 +66,6 @@ class MemoryBankScratchTemp implements MemoryBank {
 	 */
 	private static final byte COPY_SCRATCHPAD_COMMAND = (byte) 0x48;
 
-	/**
-	 * Write scratchpad command
-	 */
-	private static final byte WRITE_SCRATCHPAD_COMMAND = (byte) 0x4E;
-	// --------
-	// -------- Protected Variables for MemoryBank implementation
-	// --------
-
 	/**
 	 * Starting physical address in memory bank. Needed for different types of
 	 * memory in the same logical memory bank. This can be used to separate them
@@ -157,28 +148,29 @@ class MemoryBankScratchTemp implements MemoryBank {
 	 */
 	public MemoryBankScratchTemp(OneWireContainer ibutton) {
 		// keep reference to ibutton where memory bank is
-		ib = ibutton;
+		this.ib = ibutton;
 
 		// initialize attributes of this memory bank
 
-		bankDescription = "Temperature";
-		generalPurposeMemory = false;
-		startPhysicalAddress = 0;
-		size = 2;
-		readWrite = false;
-		readOnly = true;
-		nonVolatile = false;
-		powerDelivery = true;
-		writeVerification = false; // not needed here but required for MemoryBank implementation
+		this.bankDescription = "Temperature";
+		this.generalPurposeMemory = false;
+		this.startPhysicalAddress = 0;
+		this.size = 2;
+		this.readWrite = false;
+		this.readOnly = true;
+		this.nonVolatile = false;
+		this.powerDelivery = true;
+		this.writeVerification = false; // not needed here but required for MemoryBank implementation
 
 		// create the ffblock (used for faster 0xFF fills)
-		ffBlock = new byte[15];
+		this.ffBlock = new byte[15];
 
-		for (int i = 0; i < 15; i++)
-			ffBlock[i] = (byte) 0xFF;
+		for (var i = 0; i < 15; i++) {
+			this.ffBlock[i] = (byte) 0xFF;
+		}
 
 		// indicate speed has not been set
-		doSetSpeed = true;
+		this.doSetSpeed = true;
 	}
 
 	// --------
@@ -190,8 +182,9 @@ public MemoryBankScratchTemp(OneWireContainer ibutton) {
 	 *
 	 * @return String containing the memory bank description
 	 */
+	@Override
 	public String getBankDescription() {
-		return bankDescription;
+		return this.bankDescription;
 	}
 
 	/**
@@ -201,8 +194,9 @@ public String getBankDescription() {
 	 *
 	 * @return 'true' if current memory bank is general purpose
 	 */
+	@Override
 	public boolean isGeneralPurposeMemory() {
-		return generalPurposeMemory;
+		return this.generalPurposeMemory;
 	}
 
 	/**
@@ -210,8 +204,9 @@ public boolean isGeneralPurposeMemory() {
 	 *
 	 * @return memory bank size in bytes.
 	 */
+	@Override
 	public int getSize() {
-		return size;
+		return this.size;
 	}
 
 	/**
@@ -219,8 +214,9 @@ public int getSize() {
 	 *
 	 * @return 'true' if current memory bank is read/write
 	 */
+	@Override
 	public boolean isReadWrite() {
-		return readWrite;
+		return this.readWrite;
 	}
 
 	/**
@@ -229,6 +225,7 @@ public boolean isReadWrite() {
 	 *
 	 * @return 'true' if current memory bank can only be written once
 	 */
+	@Override
 	public boolean isWriteOnce() {
 		return false;
 	}
@@ -238,8 +235,9 @@ public boolean isWriteOnce() {
 	 *
 	 * @return 'true' if current memory bank can only be read
 	 */
+	@Override
 	public boolean isReadOnly() {
-		return readOnly;
+		return this.readOnly;
 	}
 
 	/**
@@ -248,8 +246,9 @@ public boolean isReadOnly() {
 	 *
 	 * @return 'true' if current memory bank non volatile.
 	 */
+	@Override
 	public boolean isNonVolatile() {
-		return nonVolatile;
+		return this.nonVolatile;
 	}
 
 	/**
@@ -259,6 +258,7 @@ public boolean isNonVolatile() {
 	 * @return 'true' if writing to the current memory bank pages requires a
 	 *         'ProgramPulse'.
 	 */
+	@Override
 	public boolean needsProgramPulse() {
 		return false;
 	}
@@ -270,8 +270,9 @@ public boolean needsProgramPulse() {
 	 * @return 'true' if writing to the current memory bank pages requires
 	 *         'PowerDelivery'.
 	 */
+	@Override
 	public boolean needsPowerDelivery() {
-		return powerDelivery;
+		return this.powerDelivery;
 	}
 
 	/**
@@ -280,8 +281,9 @@ public boolean needsPowerDelivery() {
 	 *
 	 * @return physical starting address of this logical bank.
 	 */
+	@Override
 	public int getStartPhysicalAddress() {
-		return startPhysicalAddress;
+		return this.startPhysicalAddress;
 	}
 
 	/**
@@ -290,8 +292,9 @@ public int getStartPhysicalAddress() {
 	 * @param doReadVerf true (default) verify write in 'write' false, don't verify
 	 *                   write (used on Write-Once bit manipulation)
 	 */
+	@Override
 	public void setWriteVerification(boolean doReadVerf) {
-		writeVerification = doReadVerf;
+		this.writeVerification = doReadVerf;
 	}
 
 	// --------
@@ -317,29 +320,33 @@ public void setWriteVerification(boolean doReadVerf) {
 	 * @throws OneWireIOException
 	 * @throws OneWireException
 	 */
+	@Override
 	public void read(int startAddr, boolean readContinue, byte[] readBuf, int offset, int len)
 			throws OneWireIOException, OneWireException {
 		byte[] temp_buf;
 
 		// check for valid address
-		if ((startAddr < 0) || ((startAddr + len) > size))
+		if (startAddr < 0 || startAddr + len > this.size) {
 			throw new OneWireException("Read exceeds memory bank");
+		}
 
 		// check for zero length read (saves time)
-		if (len == 0)
+		if (len == 0) {
 			return;
+		}
 
 		// attempt to put device at max desired speed
-		checkSpeed();
+		this.checkSpeed();
 
 		// translate the address into a page_offset and offset
-		int page_offset = startAddr + startPhysicalAddress;
-		int data_len = 8 - page_offset;
-		if (data_len > len)
+		var page_offset = startAddr + this.startPhysicalAddress;
+		var data_len = 8 - page_offset;
+		if (data_len > len) {
 			data_len = len;
+		}
 
 		// read scratchpad
-		temp_buf = readScratchpad();
+		temp_buf = this.readScratchpad();
 
 		// copy contents to the readBuf
 		System.arraycopy(temp_buf, page_offset, readBuf, offset, data_len);
@@ -365,6 +372,7 @@ public void read(int startAddr, boolean readContinue, byte[] readBuf, int offset
 	 * @throws OneWireIOException
 	 * @throws OneWireException
 	 */
+	@Override
 	public void write(int startAddr, byte[] writeBuf, int offset, int len) throws OneWireIOException, OneWireException {
 		byte[] temp_buf;
 
@@ -374,26 +382,28 @@ public void write(int startAddr, byte[] writeBuf, int offset, int len) throws On
 		// len = how many bytes to write
 
 		// return if nothing to do
-		if (len == 0)
+		if (len == 0) {
 			return;
+		}
 
 		// check if power delivery is available
-		if (!ib.adapter.canDeliverPower())
+		if (!this.ib.adapter.canDeliverPower()) {
 			throw new OneWireException("Power delivery required but not available");
+		}
 
 		// attempt to put device at max desired speed
-		checkSpeed();
+		this.checkSpeed();
 
 		// since writing is a bit odd in that the startPhysicalAddress
 		// is off by 2 due to being able to read 9 bytes but only writing 3,
 		// let's correct...
 
 		// translate the address into a page offset
-		int page_offset = startAddr + startPhysicalAddress;
-		byte[] page_buf = new byte[3];
+		var page_offset = startAddr + this.startPhysicalAddress;
+		var page_buf = new byte[3];
 
 		// pre-fill buff with current page contents
-		temp_buf = readRecallScratchpad();
+		temp_buf = this.readRecallScratchpad();
 
 		// we have temp_buf, so now write the data we want changed to it.
 		System.arraycopy(writeBuf, offset, temp_buf, page_offset, len);
@@ -403,7 +413,7 @@ public void write(int startAddr, byte[] writeBuf, int offset, int len) throws On
 		System.arraycopy(temp_buf, 2, page_buf, 0, 3);
 
 		// write the page
-		writeScratchpad(page_buf);
+		this.writeScratchpad(page_buf);
 	}
 
 	// --------
@@ -421,11 +431,11 @@ public void write(int startAddr, byte[] writeBuf, int offset, int len) throws On
 	 * @throws OneWireException   Could not find part
 	 */
 	protected byte[] readScratchpad() throws OneWireIOException, OneWireException {
-		byte[] send_block = new byte[10];
-		byte[] result_block = new byte[8];
+		var send_block = new byte[10];
+		var result_block = new byte[8];
 		int crc8; // this device uses a crc 8
 
-		if (ib.adapter.select(ib.address)) {
+		if (this.ib.adapter.select(this.ib.address)) {
 			/* recall memory to the scratchpad */
 			// ib.adapter.putByte(RECALL_MEMORY_COMMAND);
 
@@ -433,14 +443,15 @@ protected byte[] readScratchpad() throws OneWireIOException, OneWireException {
 			// ib.adapter.select(ib.address);
 
 			/* read scratchpad command */
-			send_block[0] = (byte) READ_SCRATCHPAD_COMMAND;
+			send_block[0] = READ_SCRATCHPAD_COMMAND;
 
 			/* now add the read bytes for data bytes and crc8 */
-			for (int i = 1; i < 10; i++)
+			for (var i = 1; i < 10; i++) {
 				send_block[i] = (byte) 0xFF;
+			}
 
 			/* send the block */
-			ib.adapter.dataBlock(send_block, 0, send_block.length);
+			this.ib.adapter.dataBlock(send_block, 0, send_block.length);
 
 			/*
 			 * Now, send_block contains the 8-byte Scratchpad plus READ_SCRATCHPAD_COMMAND
@@ -450,13 +461,14 @@ protected byte[] readScratchpad() throws OneWireIOException, OneWireException {
 
 			// see if CRC8 is correct
 			crc8 = CRC8.compute(send_block, 1, 9);
-			if (crc8 != 0)
+			if (crc8 != 0) {
 				throw new OneWireIOException("Bad CRC during page read " + crc8);
+			}
 
 			// copy the data into the result
 			System.arraycopy(send_block, 1, result_block, 0, 8);
 
-			return (result_block);
+			return result_block;
 		}
 
 		// device must not have been present
@@ -476,12 +488,12 @@ protected byte[] readScratchpad() throws OneWireIOException, OneWireException {
 	 */
 	protected byte[] readRecallScratchpad() throws OneWireIOException, OneWireException {
 		byte[] recallData;
-		if (ib.adapter.select(ib.address)) {
+		if (this.ib.adapter.select(this.ib.address)) {
 			// recall memory to the scratchpad
-			ib.adapter.putByte(RECALL_MEMORY_COMMAND);
+			this.ib.adapter.putByte(RECALL_MEMORY_COMMAND);
 			// read scratchpad
-			recallData = readScratchpad();
-			return (recallData);
+			recallData = this.readScratchpad();
+			return recallData;
 		}
 
 		// device must not have been present
@@ -510,12 +522,12 @@ protected byte[] readRecallScratchpad() throws OneWireIOException, OneWireExcept
 	public void writeScratchpad(byte[] data) throws OneWireIOException, OneWireException {
 		/*
 		 * OneWireContainer42 ib42;
-		 * 
+		 *
 		 * ib42 = (OneWireContainer42) ib; ib42.writeScratchpad(data);
 		 */
 
 		// setup buffer to write to scratchpad
-		byte[] writeBuffer = new byte[4];
+		var writeBuffer = new byte[4];
 		// byte[] writeBuffer = new byte [6];
 		byte[] readBuffer;
 		// boolean vddSupplied = false;
@@ -531,18 +543,17 @@ public void writeScratchpad(byte[] data) throws OneWireIOException, OneWireExcep
 		writeBuffer[3] = data[2];
 
 		// send command block to device
-		if (ib.adapter.select(ib.getAddressAsString())) {
-			ib.adapter.dataBlock(writeBuffer, 0, writeBuffer.length);
-		} else {
+		if (!this.ib.adapter.select(this.ib.getAddressAsString())) {
 
 			// device must not have been present
 			throw new OneWireIOException("Device not found on 1-Wire Network");
 		}
+		this.ib.adapter.dataBlock(writeBuffer, 0, writeBuffer.length);
 
 		// double check by reading scratchpad without recallEsquared
-		readBuffer = readScratchpad();
+		readBuffer = this.readScratchpad();
 
-		if ((readBuffer[2] != data[0]) || (readBuffer[3] != data[1]) || (readBuffer[4] != data[2])) {
+		if (readBuffer[2] != data[0] || readBuffer[3] != data[1] || readBuffer[4] != data[2]) {
 
 			// writing to scratchpad failed
 			throw new OneWireIOException("Error writing to scratchpad " + data[0] + " " + readBuffer[2] + " " + data[1]
@@ -550,50 +561,25 @@ public void writeScratchpad(byte[] data) throws OneWireIOException, OneWireExcep
 		}
 
 		// second, let's copy the scratchpad.
-		if (ib.adapter.select(ib.getAddressAsString())) {
-
-			// apply the power delivery
-			ib.adapter.setPowerDuration(DSPortAdapter.DELIVERY_INFINITE);
-			ib.adapter.startPowerDelivery(DSPortAdapter.CONDITION_AFTER_BYTE);
+		if (!this.ib.adapter.select(this.ib.getAddressAsString())) {
+			// device must not have been present
+			throw new OneWireIOException("Device not found on 1-Wire Network");
+		}
+		// apply the power delivery
+		this.ib.adapter.setPowerDuration(DSPortAdapter.DELIVERY_INFINITE);
+		this.ib.adapter.startPowerDelivery(DSPortAdapter.CONDITION_AFTER_BYTE);
 
-			// send the copy scratchpad command
-			ib.adapter.putByte(COPY_SCRATCHPAD_COMMAND);
+		// send the copy scratchpad command
+		this.ib.adapter.putByte(COPY_SCRATCHPAD_COMMAND);
 
-			// sleep for 10 milliseconds to allow copy to take place.
-			try {
-				Thread.sleep(10);
-			} catch (InterruptedException e) {
-			}
-			;
-
-			// Turn power back to normal.
-			ib.adapter.setPowerNormal();
+		// sleep for 10 milliseconds to allow copy to take place.
+		try {
+			Thread.sleep(10);
+		} catch (InterruptedException e) {
 		}
 
-		/*
-		 * 
-		 * // now copy scratchpad // second, let's copy the scratchpad. if
-		 * (ib.adapter.select(ib.getAddressAsString())) { // apply the power delivery
-		 * vddSupplied = isExternalPowerSupplied(); if (!vddSupplied) {
-		 * ib.adapter.setPowerDuration(DSPortAdapter.DELIVERY_INFINITE);
-		 * ib.adapter.startPowerDelivery(DSPortAdapter.CONDITION_AFTER_BYTE); }
-		 * 
-		 * // send the convert temperature command
-		 * ib.adapter.putByte(COPY_SCRATCHPAD_COMMAND);
-		 * 
-		 * // sleep for 10 milliseconds to allow copy to take place. try {
-		 * Thread.sleep(10); } catch (InterruptedException e){} ;
-		 * 
-		 * // Turn power back to normal. if (!vddSupplied) {
-		 * ib.adapter.setPowerNormal(); }
-		 * 
-		 * }
-		 */
-		else {
-			// device must not have been present
-			throw new OneWireIOException("Device not found on 1-Wire Network");
-		}
-		return;
+		// Turn power back to normal.
+		this.ib.adapter.setPowerNormal();
 
 	}
 
@@ -613,23 +599,23 @@ public void writeScratchpad(byte[] data) throws OneWireIOException, OneWireExcep
 	 *                            adapter
 	 */
 	public boolean isExternalPowerSupplied() throws OneWireIOException, OneWireException {
-		int intresult = 0;
-		boolean result = false;
+		var intresult = 0;
+		var result = false;
 
 		// select the device
-		if (ib.adapter.select(ib.getAddress())) {
-			// send the "Read Power Supply" memory command
-			ib.adapter.putByte(READ_POWER_SUPPLY_COMMAND);
-
-			// read results
-			intresult = ib.adapter.getByte();
-		} else {
+		if (!this.ib.adapter.select(this.ib.getAddress())) {
 
 			// device must not have been present
 			throw new OneWireIOException("Device not found on 1-Wire Network");
 		}
-		if (intresult != 0x00)
+		// send the "Read Power Supply" memory command
+		this.ib.adapter.putByte(READ_POWER_SUPPLY_COMMAND);
+
+		// read results
+		intresult = this.ib.adapter.getByte();
+		if (intresult != 0x00) {
 			result = true; // reads 0xFF for true and 0x00 for false
+		}
 
 		return result;
 	}
@@ -649,13 +635,13 @@ public void checkSpeed() throws OneWireIOException, OneWireException {
 		synchronized (this) {
 
 			// only check the speed
-			if (doSetSpeed) {
+			if (this.doSetSpeed) {
 
 				// attempt to set the correct speed and verify device present
-				ib.doSpeed();
+				this.ib.doSpeed();
 
 				// no exceptions so clear flag
-				doSetSpeed = false;
+				this.doSetSpeed = false;
 			}
 		}
 	}
@@ -666,7 +652,7 @@ public void checkSpeed() throws OneWireIOException, OneWireException {
 	 */
 	public void forceVerify() {
 		synchronized (this) {
-			doSetSpeed = true;
+			this.doSetSpeed = true;
 		}
 	}
 
diff --git a/io.openems.edge.bridge.onewire/src/com/dalsemi/onewire/container/MissionContainer.java b/io.openems.edge.bridge.onewire/src/com/dalsemi/onewire/container/MissionContainer.java
index 09b77a7696c..478d8b4cadc 100644
--- a/io.openems.edge.bridge.onewire/src/com/dalsemi/onewire/container/MissionContainer.java
+++ b/io.openems.edge.bridge.onewire/src/com/dalsemi/onewire/container/MissionContainer.java
@@ -125,21 +125,21 @@ void startNewMission(int sampleRate, int missionStartDelay, boolean rolloverEnab
 
 	/**
 	 * Returns <code>true</code> if a mission is currently running.
-	 * 
+	 *
 	 * @return <code>true</code> if a mission is currently running.
 	 */
 	boolean isMissionRunning() throws OneWireException, OneWireIOException;
 
 	/**
 	 * Returns <code>true</code> if a rollover is enabled.
-	 * 
+	 *
 	 * @return <code>true</code> if a rollover is enabled.
 	 */
 	boolean isMissionRolloverEnabled() throws OneWireException, OneWireIOException;
 
 	/**
 	 * Returns <code>true</code> if a mission has rolled over.
-	 * 
+	 *
 	 * @return <code>true</code> if a mission has rolled over.
 	 */
 	boolean hasMissionRolloverOccurred() throws OneWireException, OneWireIOException;
diff --git a/io.openems.edge.bridge.onewire/src/com/dalsemi/onewire/container/OTPMemoryBank.java b/io.openems.edge.bridge.onewire/src/com/dalsemi/onewire/container/OTPMemoryBank.java
index 2e625ec3f25..3289a63b9ef 100644
--- a/io.openems.edge.bridge.onewire/src/com/dalsemi/onewire/container/OTPMemoryBank.java
+++ b/io.openems.edge.bridge.onewire/src/com/dalsemi/onewire/container/OTPMemoryBank.java
@@ -66,12 +66,12 @@
  * </UL>
  *
  * <H3>Usage</H3>
- * 
+ *
  * <DL>
  * <DD>
  * <H4>Example 1</H4> Read the OTP status of page 0 in the OTPMemoryBank
  * instance 'otp':
- * 
+ *
  * <PRE>
  *  <CODE>
  *  if (otp.canRedirectPage())
@@ -80,7 +80,7 @@
  *     if (new_page != 0)
  *        System.out.println("Page 0 is redirected to " + new_page);
  *  }
- * 
+ *
  *  if (otp.canLockPage())
  *  {
  *     if (otp.isPageLocked(0))
@@ -97,12 +97,12 @@
  *
  * <DD>
  * <H4>Example 1</H4> Lock all of the pages in the OTPMemoryBank instance 'otp':
- * 
+ *
  * <PRE>
  *  <CODE>
  *  if (otp.canLockPage())
  *  {
- *     // loop to lock each page  
+ *     // loop to lock each page
  *     for (int pg = 0; pg < otp.getNumberPages(); pg++)
  *     {
  *        otp.lockPage(pg);
@@ -160,7 +160,7 @@ public interface OTPMemoryBank extends PagedMemoryBank {
 	 *
 	 * @return <CODE> true </CODE> if this memory bank has pages that can be locked
 	 *         from being redirected to a new page
-	 * 
+	 *
 	 * @see #lockRedirectPage(int) lockRedirectPage
 	 * @see #isRedirectPageLocked(int) isRedirectPageLocked
 	 */
diff --git a/io.openems.edge.bridge.onewire/src/com/dalsemi/onewire/container/OneWireContainer.java b/io.openems.edge.bridge.onewire/src/com/dalsemi/onewire/container/OneWireContainer.java
index 8d1a1d3bfc8..f2c3573bc22 100644
--- a/io.openems.edge.bridge.onewire/src/com/dalsemi/onewire/container/OneWireContainer.java
+++ b/io.openems.edge.bridge.onewire/src/com/dalsemi/onewire/container/OneWireContainer.java
@@ -65,7 +65,7 @@
  * {@link com.dalsemi.onewire.container.PagedMemoryBank PagedMemoryBank}, and
  * {@link com.dalsemi.onewire.container.PagedMemoryBank OTPMemoryBank} for
  * specific examples.
- * 
+ *
  * <PRE>
  *  <CODE>
  *  MemoryBank      mb;
@@ -111,14 +111,14 @@ public class OneWireContainer {
 	/**
 	 * 1-Wire Network Address of this iButton or 1-Wire device. Family code is byte
 	 * at offset 0.
-	 * 
+	 *
 	 * @see com.dalsemi.onewire.utils.Address
 	 */
 	protected byte[] address;
 
 	/**
 	 * Temporary copy of 1-Wire Network Address of this iButton or 1-Wire device.
-	 * 
+	 *
 	 * @see com.dalsemi.onewire.utils.Address
 	 */
 	private byte[] addressCopy;
@@ -233,19 +233,19 @@ public OneWireContainer(DSPortAdapter sourceAdapter, String newAddress) {
 	public void setupContainer(DSPortAdapter sourceAdapter, byte[] newAddress) {
 
 		// get a reference to the source adapter (will need this to communicate)
-		adapter = sourceAdapter;
+		this.adapter = sourceAdapter;
 
 		// set the Address
 		synchronized (this) {
-			address = new byte[8];
-			addressCopy = new byte[8];
+			this.address = new byte[8];
+			this.addressCopy = new byte[8];
 
-			System.arraycopy(newAddress, 0, address, 0, 8);
+			System.arraycopy(newAddress, 0, this.address, 0, 8);
 		}
 
 		// set desired speed to be SPEED_REGULAR by default with no fallback
-		speed = DSPortAdapter.SPEED_REGULAR;
-		speedFallBackOK = false;
+		this.speed = DSPortAdapter.SPEED_REGULAR;
+		this.speedFallBackOK = false;
 	}
 
 	/**
@@ -259,17 +259,17 @@ public void setupContainer(DSPortAdapter sourceAdapter, byte[] newAddress) {
 	public void setupContainer(DSPortAdapter sourceAdapter, long newAddress) {
 
 		// get a reference to the source adapter (will need this to communicate)
-		adapter = sourceAdapter;
+		this.adapter = sourceAdapter;
 
 		// set the Address
 		synchronized (this) {
-			address = Address.toByteArray(newAddress);
-			addressCopy = new byte[8];
+			this.address = Address.toByteArray(newAddress);
+			this.addressCopy = new byte[8];
 		}
 
 		// set desired speed to be SPEED_REGULAR by default with no fallback
-		speed = DSPortAdapter.SPEED_REGULAR;
-		speedFallBackOK = false;
+		this.speed = DSPortAdapter.SPEED_REGULAR;
+		this.speedFallBackOK = false;
 	}
 
 	/**
@@ -283,17 +283,17 @@ public void setupContainer(DSPortAdapter sourceAdapter, long newAddress) {
 	public void setupContainer(DSPortAdapter sourceAdapter, String newAddress) {
 
 		// get a reference to the source adapter (will need this to communicate)
-		adapter = sourceAdapter;
+		this.adapter = sourceAdapter;
 
 		// set the Address
 		synchronized (this) {
-			address = Address.toByteArray(newAddress);
-			addressCopy = new byte[8];
+			this.address = Address.toByteArray(newAddress);
+			this.addressCopy = new byte[8];
 		}
 
 		// set desired speed to be SPEED_REGULAR by default with no fallback
-		speed = DSPortAdapter.SPEED_REGULAR;
-		speedFallBackOK = false;
+		this.speed = DSPortAdapter.SPEED_REGULAR;
+		this.speedFallBackOK = false;
 	}
 
 	/**
@@ -302,7 +302,7 @@ public void setupContainer(DSPortAdapter sourceAdapter, String newAddress) {
 	 * @return port adapter instance
 	 */
 	public DSPortAdapter getAdapter() {
-		return adapter;
+		return this.adapter;
 	}
 
 	// --------
@@ -317,8 +317,9 @@ public DSPortAdapter getAdapter() {
 	 */
 	public String getName() {
 		synchronized (this) {
-			return "Device type: " + (((address[0] & 0x0FF) < 16) ? ("0" + Integer.toHexString(address[0] & 0x0FF))
-					: Integer.toHexString(address[0] & 0x0FF));
+			return "Device type: "
+					+ ((this.address[0] & 0x0FF) < 16 ? "0" + Integer.toHexString(this.address[0] & 0x0FF)
+							: Integer.toHexString(this.address[0] & 0x0FF));
 		}
 	}
 
@@ -365,8 +366,8 @@ public String getDescription() {
 	 *
 	 */
 	public void setSpeed(int newSpeed, boolean fallBack) {
-		speed = newSpeed;
-		speedFallBackOK = fallBack;
+		this.speed = newSpeed;
+		this.speedFallBackOK = fallBack;
 	}
 
 	/**
@@ -388,7 +389,7 @@ public int getMaxSpeed() {
 	 * @see com.dalsemi.onewire.utils.Address
 	 */
 	public byte[] getAddress() {
-		return address;
+		return this.address;
 	}
 
 	/**
@@ -398,7 +399,7 @@ public byte[] getAddress() {
 	 * @see com.dalsemi.onewire.utils.Address
 	 */
 	public String getAddressAsString() {
-		return Address.toString(address);
+		return Address.toString(this.address);
 	}
 
 	/**
@@ -408,7 +409,7 @@ public String getAddressAsString() {
 	 * @see com.dalsemi.onewire.utils.Address
 	 */
 	public long getAddressAsLong() {
-		return Address.toLong(address);
+		return Address.toLong(this.address);
 	}
 
 	/**
@@ -438,7 +439,7 @@ public Enumeration<MemoryBank> getMemoryBanks() {
 	 */
 	public boolean isPresent() throws OneWireIOException, OneWireException {
 		synchronized (this) {
-			return adapter.isPresent(address);
+			return this.adapter.isPresent(this.address);
 		}
 	}
 
@@ -454,7 +455,7 @@ public boolean isPresent() throws OneWireIOException, OneWireException {
 	 */
 	public boolean isAlarming() throws OneWireIOException, OneWireException {
 		synchronized (this) {
-			return adapter.isAlarming(address);
+			return this.adapter.isAlarming(this.address);
 		}
 	}
 
@@ -470,36 +471,37 @@ public boolean isAlarming() throws OneWireIOException, OneWireException {
 	 * @see #setSpeed(int,boolean)
 	 */
 	public void doSpeed() throws OneWireIOException, OneWireException {
-		boolean is_present = false;
+		var is_present = false;
 
 		try {
 			// check if already at speed and device present
-			if ((speed == adapter.getSpeed()) && adapter.isPresent(address))
+			if (this.speed == this.adapter.getSpeed() && this.adapter.isPresent(this.address)) {
 				return;
+			}
 		} catch (OneWireIOException e) {
 			// VOID
 		}
 
 		// speed Overdrive
-		if (speed == DSPortAdapter.SPEED_OVERDRIVE) {
+		if (this.speed == DSPortAdapter.SPEED_OVERDRIVE) {
 			try {
 				// get this device and adapter to overdrive
-				adapter.setSpeed(DSPortAdapter.SPEED_REGULAR);
-				adapter.reset();
-				adapter.putByte((byte) 0x69);
-				adapter.setSpeed(DSPortAdapter.SPEED_OVERDRIVE);
+				this.adapter.setSpeed(DSPortAdapter.SPEED_REGULAR);
+				this.adapter.reset();
+				this.adapter.putByte((byte) 0x69);
+				this.adapter.setSpeed(DSPortAdapter.SPEED_OVERDRIVE);
 			} catch (OneWireIOException e) {
 				// VOID
 			}
 
 			// get copy of address
 			synchronized (this) {
-				System.arraycopy(address, 0, addressCopy, 0, 8);
-				adapter.dataBlock(addressCopy, 0, 8);
+				System.arraycopy(this.address, 0, this.addressCopy, 0, 8);
+				this.adapter.dataBlock(this.addressCopy, 0, 8);
 			}
 
 			try {
-				is_present = adapter.isPresent(address);
+				is_present = this.adapter.isPresent(this.address);
 			} catch (OneWireIOException e) {
 				// VOID
 			}
@@ -508,18 +510,19 @@ public void doSpeed() throws OneWireIOException, OneWireException {
 			if (!is_present) {
 
 				// check if allow fallback
-				if (speedFallBackOK)
-					adapter.setSpeed(DSPortAdapter.SPEED_REGULAR);
-				else
+				if (!this.speedFallBackOK) {
 					throw new OneWireIOException("Failed to get device to selected speed (overdrive)");
+				}
+				this.adapter.setSpeed(DSPortAdapter.SPEED_REGULAR);
 			}
 		}
 		// speed regular or flex
-		else if ((speed == DSPortAdapter.SPEED_REGULAR) || (speed == DSPortAdapter.SPEED_FLEX))
-			adapter.setSpeed(speed);
-		// speed hyperdrive, don't know how to do this
-		else
+		else if (this.speed == DSPortAdapter.SPEED_REGULAR || this.speed == DSPortAdapter.SPEED_FLEX) {
+			this.adapter.setSpeed(this.speed);
+			// speed hyperdrive, don't know how to do this
+		} else {
 			throw new OneWireException("Speed selected (hyperdrive) is not supported by this method");
+		}
 	}
 
 	// --------
@@ -534,30 +537,34 @@ else if ((speed == DSPortAdapter.SPEED_REGULAR) || (speed == DSPortAdapter.SPEED
 	 * @return a hash code value for this object.
 	 * @see java.util.Hashtable
 	 */
+	@Override
 	public int hashCode() {
-		if (this.address == null)
+		if (this.address == null) {
 			return 0;
-		else
-			return (Long.valueOf(Address.toLong(this.address))).hashCode();
+		}
+		return Long.valueOf(Address.toLong(this.address)).hashCode();
 	}
 
 	/**
 	 * Indicates whether some other object is "equal to" this one.
-	 * 
+	 *
 	 * @param obj the reference object with which to compare.
 	 * @return <code>true</code> if this object is the same as the obj argument;
 	 *         <code>false</code> otherwise.
 	 */
+	@Override
 	public boolean equals(Object obj) {
-		if (obj == this)
+		if (obj == this) {
 			return true;
+		}
 
 		if (obj instanceof OneWireContainer) {
-			OneWireContainer owc = (OneWireContainer) obj;
+			var owc = (OneWireContainer) obj;
 			// don't claim that all subclasses of a specific container are
 			// equivalent to the parent container
-			if (owc.getClass() == this.getClass())
+			if (owc.getClass() == this.getClass()) {
 				return owc.getAddressAsLong() == this.getAddressAsLong();
+			}
 		}
 
 		return false;
@@ -568,6 +575,7 @@ public boolean equals(Object obj) {
 	 *
 	 * @return a string representation of the object.
 	 */
+	@Override
 	public String toString() {
 		return Address.toString(this.address) + " " + this.getName();
 	}
diff --git a/io.openems.edge.bridge.onewire/src/com/dalsemi/onewire/container/OneWireContainer01.java b/io.openems.edge.bridge.onewire/src/com/dalsemi/onewire/container/OneWireContainer01.java
index eb03a6ff262..c0fc85cbf2f 100644
--- a/io.openems.edge.bridge.onewire/src/com/dalsemi/onewire/container/OneWireContainer01.java
+++ b/io.openems.edge.bridge.onewire/src/com/dalsemi/onewire/container/OneWireContainer01.java
@@ -83,7 +83,6 @@ public class OneWireContainer01 extends OneWireContainer {
 	 * @see #setupContainer(DSPortAdapter,String)
 	 */
 	public OneWireContainer01() {
-		super();
 	}
 
 	/**
@@ -140,14 +139,17 @@ public OneWireContainer01(DSPortAdapter sourceAdapter, String newAddress) {
 		super(sourceAdapter, newAddress);
 	}
 
+	@Override
 	public String getName() {
 		return "DS1990A";
 	}
 
+	@Override
 	public String getAlternateNames() {
 		return "DS2401,DS2411";
 	}
 
+	@Override
 	public String getDescription() {
 		return "64-bit unique serial number";
 	}
diff --git a/io.openems.edge.bridge.onewire/src/com/dalsemi/onewire/container/OneWireContainer02.java b/io.openems.edge.bridge.onewire/src/com/dalsemi/onewire/container/OneWireContainer02.java
index 3b16fd9ec6e..cd5ec1083ba 100644
--- a/io.openems.edge.bridge.onewire/src/com/dalsemi/onewire/container/OneWireContainer02.java
+++ b/io.openems.edge.bridge.onewire/src/com/dalsemi/onewire/container/OneWireContainer02.java
@@ -126,7 +126,7 @@ public class OneWireContainer02 extends OneWireContainer {
 	/**
 	 * General purpose buffer
 	 */
-	private byte[] buffer = new byte[82];
+	private final byte[] buffer = new byte[82];
 
 	// --------
 	// -------- Constructor
@@ -153,7 +153,6 @@ public class OneWireContainer02 extends OneWireContainer {
 	 * @see #setupContainer(DSPortAdapter,String)
 	 */
 	public OneWireContainer02() {
-		super();
 	}
 
 	/**
@@ -216,18 +215,21 @@ public OneWireContainer02(DSPortAdapter sourceAdapter, String newAddress) {
 
 	/**
 	*/
+	@Override
 	public String getName() {
 		return "DS1991";
 	}
 
 	/**
 	*/
+	@Override
 	public String getAlternateNames() {
 		return "DS1425";
 	}
 
 	/**
 	*/
+	@Override
 	public String getDescription() {
 		return "2048 bits of nonvolatile read/write memory " + "organized as three secure keys of 384 bits each "
 				+ "and a 512 bit scratch pad. Each key has its own " + "64 bit password and 64 bit ID field.  Secure "
@@ -255,29 +257,30 @@ public void writeScratchpad(int addr, byte[] data)
 			throws OneWireIOException, OneWireException, IllegalArgumentException {
 
 		// confirm that data will fit
-		if (addr > 0x3F)
+		if (addr > 0x3F) {
 			throw new IllegalArgumentException("Address out of range: 0x00 to 0x3F");
+		}
 
-		int dataRoom = 0x3F - addr + 1;
+		var dataRoom = 0x3F - addr + 1;
 
-		if (dataRoom < data.length)
+		if (dataRoom < data.length) {
 			throw new IllegalArgumentException("Data is too long for scratchpad.");
+		}
 
-		buffer[0] = WRITE_SCRATCHPAD_COMMAND;
-		buffer[1] = (byte) (addr | 0xC0);
-		buffer[2] = (byte) (~buffer[1]);
+		this.buffer[0] = WRITE_SCRATCHPAD_COMMAND;
+		this.buffer[1] = (byte) (addr | 0xC0);
+		this.buffer[2] = (byte) ~this.buffer[1];
 
-		System.arraycopy(data, 0, buffer, 3, data.length);
+		System.arraycopy(data, 0, this.buffer, 3, data.length);
 
 		// send command block
-		if (adapter.select(address)) {
-			adapter.dataBlock(buffer, 0, 3 + data.length);
-		} else {
+		if (!this.adapter.select(this.address)) {
 
 			// device must not have been present
 			throw new OneWireIOException(
 					"MultiKey iButton " + this.getAddressAsString() + " not found on 1-Wire Network");
 		}
+		this.adapter.dataBlock(this.buffer, 0, 3 + data.length);
 	}
 
 	/**
@@ -291,28 +294,26 @@ public void writeScratchpad(int addr, byte[] data)
 	 *                            adapter
 	 */
 	public byte[] readScratchpad() throws OneWireIOException, OneWireException {
-		buffer[0] = READ_SCRATCHPAD_COMMAND;
-		buffer[1] = (byte) 0xC0; // Starting address of scratchpad
-		buffer[2] = 0x3F;
+		this.buffer[0] = READ_SCRATCHPAD_COMMAND;
+		this.buffer[1] = (byte) 0xC0; // Starting address of scratchpad
+		this.buffer[2] = 0x3F;
 
-		for (int i = 3; i < 67; i++)
-			buffer[i] = (byte) 0xFF;
+		for (var i = 3; i < 67; i++) {
+			this.buffer[i] = (byte) 0xFF;
+		}
 
 		// send command block
-		if (adapter.select(address)) {
-			adapter.dataBlock(buffer, 0, 67);
+		if (this.adapter.select(this.address)) {
+			this.adapter.dataBlock(this.buffer, 0, 67);
 
-			byte[] retData = new byte[64];
+			var retData = new byte[64];
 
-			System.arraycopy(buffer, 3, retData, 0, 64);
+			System.arraycopy(this.buffer, 3, retData, 0, 64);
 
 			return retData;
-		} else {
-
-			// device must not have been present
-			throw new OneWireIOException(
-					"MultiKey iButton " + this.getAddressAsString() + " not found on 1-Wire Network");
 		}
+		// device must not have been present
+		throw new OneWireIOException("MultiKey iButton " + this.getAddressAsString() + " not found on 1-Wire Network");
 	}
 
 	/**
@@ -336,34 +337,36 @@ public void copyScratchpad(int key, byte[] passwd, int blockNum)
 			throws OneWireIOException, OneWireException, IllegalArgumentException {
 
 		// confirm that input is OK
-		if ((key < 0) || (key > 2))
+		if (key < 0 || key > 2) {
 			throw new IllegalArgumentException("Key out of range: 0 to 2.");
+		}
 
-		if (passwd.length != 8)
+		if (passwd.length != 8) {
 			throw new IllegalArgumentException("Password must contain exactly 8 characters");
+		}
 
-		if ((blockNum < 0) || (blockNum > 8))
+		if (blockNum < 0 || blockNum > 8) {
 			throw new IllegalArgumentException("Block id out of range: 0 to 8.");
+		}
 
-		buffer[0] = COPY_SCRATCHPAD_COMMAND;
-		buffer[1] = (byte) (key << 6);
-		buffer[2] = (byte) (~buffer[1]);
+		this.buffer[0] = COPY_SCRATCHPAD_COMMAND;
+		this.buffer[1] = (byte) (key << 6);
+		this.buffer[2] = (byte) ~this.buffer[1];
 
 		// set up block selector code
-		System.arraycopy(blockCodes[blockNum], 0, buffer, 3, 8);
+		System.arraycopy(blockCodes[blockNum], 0, this.buffer, 3, 8);
 
 		// set up password
-		System.arraycopy(passwd, 0, buffer, 11, 8);
+		System.arraycopy(passwd, 0, this.buffer, 11, 8);
 
 		// send command block
-		if (adapter.select(address)) {
-			adapter.dataBlock(buffer, 0, 19);
-		} else {
+		if (!this.adapter.select(this.address)) {
 
 			// device must not have been present
 			throw new OneWireIOException(
 					"MultiKey iButton " + this.getAddressAsString() + " not found on 1-Wire Network");
 		}
+		this.adapter.dataBlock(this.buffer, 0, 19);
 	}
 
 	/**
@@ -393,9 +396,9 @@ public byte[] readSubkey(int key, byte[] passwd)
 			throws OneWireIOException, OneWireException, IllegalArgumentException {
 
 		// create block to send back
-		byte[] retData = new byte[64];
+		var retData = new byte[64];
 
-		readSubkey(retData, key, passwd);
+		this.readSubkey(retData, key, passwd);
 
 		return retData;
 	}
@@ -424,39 +427,42 @@ public void readSubkey(byte[] data, int key, byte[] passwd)
 			throws OneWireIOException, OneWireException, IllegalArgumentException {
 
 		// confirm key and passwd within legal parameters
-		if (key > 0x03)
+		if (key > 0x03) {
 			throw new IllegalArgumentException("Key out of range: 0 to 2.");
+		}
 
-		if (passwd.length != 8)
+		if (passwd.length != 8) {
 			throw new IllegalArgumentException("Password must contain exactly 8 characters.");
+		}
 
-		if (data.length != 64)
+		if (data.length != 64) {
 			throw new IllegalArgumentException("Data must be size 64.");
+		}
 
-		buffer[0] = READ_SUBKEY_COMMAND;
-		buffer[1] = (byte) ((key << 6) | 0x10);
-		buffer[2] = (byte) (~buffer[1]);
+		this.buffer[0] = READ_SUBKEY_COMMAND;
+		this.buffer[1] = (byte) (key << 6 | 0x10);
+		this.buffer[2] = (byte) ~this.buffer[1];
 
 		// prepare buffer to receive
-		for (int i = 3; i < 67; i++)
-			buffer[i] = (byte) 0xFF;
+		for (var i = 3; i < 67; i++) {
+			this.buffer[i] = (byte) 0xFF;
+		}
 
 		// insert password data
-		System.arraycopy(passwd, 0, buffer, 11, 8);
+		System.arraycopy(passwd, 0, this.buffer, 11, 8);
 
 		// send command block
-		if (adapter.select(address)) {
-			adapter.dataBlock(buffer, 0, 67);
-			adapter.reset();
-
-			// create block to send back
-			System.arraycopy(buffer, 3, data, 0, 64);
-		} else {
+		if (!this.adapter.select(this.address)) {
 
 			// device must not have been present
 			throw new OneWireIOException(
 					"MultiKey iButton " + this.getAddressAsString() + " not found on 1-Wire Network");
 		}
+		this.adapter.dataBlock(this.buffer, 0, 67);
+		this.adapter.reset();
+
+		// create block to send back
+		System.arraycopy(this.buffer, 3, data, 0, 64);
 	}
 
 	/**
@@ -482,45 +488,49 @@ public void writePassword(int key, byte[] oldName, byte[] newName, byte[] newPas
 			throws OneWireIOException, OneWireException, IllegalArgumentException {
 
 		// confirm key names and passwd within legal parameters
-		if (key > 0x03)
+		if (key > 0x03) {
 			throw new IllegalArgumentException("Key value out of range: 0 to 2.");
+		}
 
-		if (newPasswd.length != 8)
+		if (newPasswd.length != 8) {
 			throw new IllegalArgumentException("Password must contain exactly 8 characters.");
+		}
 
-		if (oldName.length != 8)
+		if (oldName.length != 8) {
 			throw new IllegalArgumentException("Old name must contain exactly 8 characters.");
+		}
 
-		if (newName.length != 8)
+		if (newName.length != 8) {
 			throw new IllegalArgumentException("New name must contain exactly 8 characters.");
+		}
 
-		buffer[0] = WRITE_PASSWORD_COMMAND;
-		buffer[1] = (byte) (key << 6);
-		buffer[2] = (byte) (~buffer[1]);
+		this.buffer[0] = WRITE_PASSWORD_COMMAND;
+		this.buffer[1] = (byte) (key << 6);
+		this.buffer[2] = (byte) ~this.buffer[1];
 
 		// prepare buffer to receive 8 bytes of the identifier
-		for (int i = 3; i < 11; i++)
-			buffer[i] = (byte) 0xFF;
+		for (var i = 3; i < 11; i++) {
+			this.buffer[i] = (byte) 0xFF;
+		}
 
 		// prepare same subkey identifier for confirmation
-		System.arraycopy(oldName, 0, buffer, 11, 8);
+		System.arraycopy(oldName, 0, this.buffer, 11, 8);
 
 		// prepare new subkey identifier
-		System.arraycopy(newName, 0, buffer, 19, 8);
+		System.arraycopy(newName, 0, this.buffer, 19, 8);
 
 		// prepare new password for writing
-		System.arraycopy(newPasswd, 0, buffer, 27, 8);
+		System.arraycopy(newPasswd, 0, this.buffer, 27, 8);
 
 		// send command block
-		if (adapter.select(address)) {
-			adapter.dataBlock(buffer, 0, 35);
-			adapter.reset();
-		} else {
+		if (!this.adapter.select(this.address)) {
 
 			// device must not have been present
 			throw new OneWireIOException(
 					"MultiKey iButton " + this.getAddressAsString() + " not found on 1-Wire Network");
 		}
+		this.adapter.dataBlock(this.buffer, 0, 35);
+		this.adapter.reset();
 	}
 
 	/**
@@ -544,42 +554,46 @@ public void writeSubkey(int key, int addr, byte[] passwd, byte[] data)
 			throws OneWireIOException, OneWireException, IllegalArgumentException {
 
 		// confirm key names and passwd within legal parameters
-		if (key > 0x03)
+		if (key > 0x03) {
 			throw new IllegalArgumentException("Key out of range: 0 to 2.");
+		}
 
-		if ((addr < 0x00) || (addr > 0x3F))
+		if (addr < 0x00 || addr > 0x3F) {
 			throw new IllegalArgumentException("Address must be between 0x00 and 0x3F");
+		}
 
-		if (passwd.length != 8)
+		if (passwd.length != 8) {
 			throw new IllegalArgumentException("Password must contain exactly 8 characters.");
+		}
 
-		if (data.length > (0x3F - addr + 1))
+		if (data.length > 0x3F - addr + 1) {
 			throw new IllegalArgumentException("Data length out of bounds.");
+		}
 
-		buffer[0] = WRITE_SUBKEY_COMMAND;
-		buffer[1] = (byte) ((key << 6) | addr);
-		buffer[2] = (byte) (~buffer[1]);
+		this.buffer[0] = WRITE_SUBKEY_COMMAND;
+		this.buffer[1] = (byte) (key << 6 | addr);
+		this.buffer[2] = (byte) ~this.buffer[1];
 
 		// prepare buffer to receive 8 bytes of the identifier
-		for (int i = 3; i < 11; i++)
-			buffer[i] = (byte) 0xFF;
+		for (var i = 3; i < 11; i++) {
+			this.buffer[i] = (byte) 0xFF;
+		}
 
 		// prepare same subkey identifier for confirmation
-		System.arraycopy(passwd, 0, buffer, 11, 8);
+		System.arraycopy(passwd, 0, this.buffer, 11, 8);
 
 		// prepare data to write
-		System.arraycopy(data, 0, buffer, 19, data.length);
+		System.arraycopy(data, 0, this.buffer, 19, data.length);
 
 		// send command block
-		if (adapter.select(address)) {
-			adapter.dataBlock(buffer, 0, 19 + data.length);
-			adapter.reset();
-		} else {
+		if (!this.adapter.select(this.address)) {
 
 			// device must not have been present
 			throw new OneWireIOException(
 					"MultiKey iButton " + this.getAddressAsString() + " not found on 1-Wire Network");
 		}
+		this.adapter.dataBlock(this.buffer, 0, 19 + data.length);
+		this.adapter.reset();
 	}
 
 	/**
diff --git a/io.openems.edge.bridge.onewire/src/com/dalsemi/onewire/container/OneWireContainer04.java b/io.openems.edge.bridge.onewire/src/com/dalsemi/onewire/container/OneWireContainer04.java
index 7bb9ea30935..dcc8f3c7ffa 100644
--- a/io.openems.edge.bridge.onewire/src/com/dalsemi/onewire/container/OneWireContainer04.java
+++ b/io.openems.edge.bridge.onewire/src/com/dalsemi/onewire/container/OneWireContainer04.java
@@ -317,10 +317,8 @@ public class OneWireContainer04 extends OneWireContainer implements ClockContain
 	 *      super.setupContainer()
 	 */
 	public OneWireContainer04() {
-		super();
-
 		// initialize the clock memory bank
-		initClock();
+		this.initClock();
 	}
 
 	/**
@@ -342,7 +340,7 @@ public OneWireContainer04(DSPortAdapter sourceAdapter, byte[] newAddress) {
 		super(sourceAdapter, newAddress);
 
 		// initialize the clock memory bank
-		initClock();
+		this.initClock();
 	}
 
 	/**
@@ -365,7 +363,7 @@ public OneWireContainer04(DSPortAdapter sourceAdapter, long newAddress) {
 		super(sourceAdapter, newAddress);
 
 		// initialize the clock memory bank
-		initClock();
+		this.initClock();
 	}
 
 	/**
@@ -388,7 +386,7 @@ public OneWireContainer04(DSPortAdapter sourceAdapter, String newAddress) {
 		super(sourceAdapter, newAddress);
 
 		// initialize the clock memory bank
-		initClock();
+		this.initClock();
 	}
 
 	// --------
@@ -401,6 +399,7 @@ public OneWireContainer04(DSPortAdapter sourceAdapter, String newAddress) {
 	 *
 	 * @return iButton or 1-Wire device name
 	 */
+	@Override
 	public String getName() {
 		return "DS1994";
 	}
@@ -412,6 +411,7 @@ public String getName() {
 	 *
 	 * @return 1-Wire device alternate names
 	 */
+	@Override
 	public String getAlternateNames() {
 		return "DS2404, Time-in-a-can, DS1427";
 	}
@@ -422,6 +422,7 @@ public String getAlternateNames() {
 	 *
 	 * @return device description
 	 */
+	@Override
 	public String getDescription() {
 		return "4096 bit read/write nonvolatile memory partitioned " + "into sixteen pages of 256 bits each and a real "
 				+ "time clock/calendar in binary format.";
@@ -433,20 +434,21 @@ public String getDescription() {
 	 * MemoryBank}, {@link com.dalsemi.onewire.container.PagedMemoryBank
 	 * PagedMemoryBank}, and {@link com.dalsemi.onewire.container.OTPMemoryBank
 	 * OTPMemoryBank}.
-	 * 
+	 *
 	 * @return <CODE>Enumeration</CODE> of memory banks
 	 */
+	@Override
 	public Enumeration<MemoryBank> getMemoryBanks() {
-		Vector<MemoryBank> bank_vector = new Vector<>(3);
+		var bank_vector = new Vector<MemoryBank>(3);
 
 		// scratchpad
-		bank_vector.addElement(scratch);
+		bank_vector.addElement(this.scratch);
 
 		// NVRAM
-		bank_vector.addElement(new MemoryBankNV(this, scratch));
+		bank_vector.addElement(new MemoryBankNV(this, this.scratch));
 
 		// clock
-		bank_vector.addElement(clock);
+		bank_vector.addElement(this.clock);
 
 		return bank_vector.elements();
 	}
@@ -466,6 +468,7 @@ public Enumeration<MemoryBank> getMemoryBanks() {
 	 * @see #setClockAlarm(long,byte[])
 	 * @see #setClockAlarmEnable(boolean,byte[])
 	 */
+	@Override
 	public boolean hasClockAlarm() {
 		return true;
 	}
@@ -478,6 +481,7 @@ public boolean hasClockAlarm() {
 	 * @see #isClockRunning(byte[])
 	 * @see #setClockRunEnable(boolean,byte[])
 	 */
+	@Override
 	public boolean canDisableClock() {
 		return true;
 	}
@@ -487,6 +491,7 @@ public boolean canDisableClock() {
 	 *
 	 * @return the clock resolution in milliseconds
 	 */
+	@Override
 	public long getClockResolution() {
 		return 4;
 	}
@@ -511,8 +516,9 @@ public long getClockResolution() {
 	 * @throws OneWireException   on a communication or setup error with the 1-Wire
 	 *                            adapter
 	 */
+	@Override
 	public byte[] readDevice() throws OneWireIOException, OneWireException {
-		byte[][] read_buf = new byte[2][36];
+		var read_buf = new byte[2][36];
 		boolean alarming;
 		int buf_num = 0, attempt = 0, i;
 
@@ -523,35 +529,38 @@ public byte[] readDevice() throws OneWireIOException, OneWireException {
 		}
 
 		// check if device alarming
-		alarming = isAlarming();
+		alarming = this.isAlarming();
 
 		// loop up to 5 times to read clock register page
 		do {
 
 			// only read status byte once if device was alarming (will be cleared)
-			if (alarming && (attempt != 0))
-				clock.read(1, false, read_buf[buf_num], 1, 31);
-			else
-				clock.read(0, false, read_buf[buf_num], 0, 32);
+			if (alarming && attempt != 0) {
+				this.clock.read(1, false, read_buf[buf_num], 1, 31);
+			} else {
+				this.clock.read(0, false, read_buf[buf_num], 0, 32);
+			}
 
 			// compare if this is not the first read
 			if (attempt++ != 0) {
 
 				// loop to see if same
 				for (i = 1; i < 32; i++) {
-					if ((i != 2) && (i != 7)) {
-						if (read_buf[0][i] != read_buf[1][i])
+					if (i != 2 && i != 7) {
+						if (read_buf[0][i] != read_buf[1][i]) {
 							break;
+						}
 					}
 				}
 
 				// check on compare, if ok then return most recent read_buf
-				if (i == 32)
+				if (i == 32) {
 					return read_buf[buf_num];
+				}
 			}
 
 			// alternate buffer
-			buf_num = (buf_num == 0) ? 1 : 0;
+			buf_num = buf_num == 0 ? 1 : 0;
 		} while (attempt < 5);
 
 		// failed to get a match
@@ -573,34 +582,34 @@ public byte[] readDevice() throws OneWireIOException, OneWireException {
 	 * @throws OneWireException   on a communication or setup error with the 1-Wire
 	 *                            adapter
 	 */
+	@Override
 	public void writeDevice(byte[] state) throws OneWireIOException, OneWireException {
 		int start_offset = 0, len = 0, i;
-		boolean got_block = false;
+		var got_block = false;
 
 		// loop to collect changed bytes and write them in blocks
 		for (i = 0; i < 32; i++) {
 
 			// check to see if this byte needs writing (skip control register for now)
-			if ((Bit.arrayReadBit(i, BITMAP_OFFSET, state) == 1) && (i != 1)) {
+			if (Bit.arrayReadBit(i, BITMAP_OFFSET, state) == 1 && i != 1) {
 
 				// check if already in a block
-				if (got_block)
+				if (got_block) {
 					len++;
-
-				// new block
-				else {
+				} else {
 					got_block = true;
 					start_offset = i;
 					len = 1;
 				}
 
 				// check for last byte exception, write current block
-				if (i == 31)
-					clock.write(start_offset, state, start_offset, len);
+				if (i == 31) {
+					this.clock.write(start_offset, state, start_offset, len);
+				}
 			} else if (got_block) {
 
 				// done with this block so write it
-				clock.write(start_offset, state, start_offset, len);
+				this.clock.write(start_offset, state, start_offset, len);
 
 				got_block = false;
 			}
@@ -610,19 +619,20 @@ public void writeDevice(byte[] state) throws OneWireIOException, OneWireExceptio
 		if (Bit.arrayReadBit(CONTROL_OFFSET, BITMAP_OFFSET, state) == 1) {
 
 			// write Normally
-			clock.write(CONTROL_OFFSET, state, CONTROL_OFFSET, 1);
+			this.clock.write(CONTROL_OFFSET, state, CONTROL_OFFSET, 1);
 
 			// check if any write-protect bits set
 			if ((state[CONTROL_OFFSET] & 0x07) != 0) {
 
 				// need to do a copy scratchpad 2 more times to become write-protected
-				scratch.copyScratchpad(clock.getStartPhysicalAddress() + CONTROL_OFFSET, 1, true);
+				this.scratch.copyScratchpad(this.clock.getStartPhysicalAddress() + CONTROL_OFFSET, 1, true);
 			}
 		}
 
 		// clear out the bitmap
-		for (i = BITMAP_OFFSET; i < state.length; i++)
+		for (i = BITMAP_OFFSET; i < state.length; i++) {
 			state[i] = 0;
+		}
 	}
 
 	// --------
@@ -640,6 +650,7 @@ public void writeDevice(byte[] state) throws OneWireIOException, OneWireExceptio
 	 * @see com.dalsemi.onewire.container.OneWireSensor#readDevice()
 	 * @see #setClock(long,byte[])
 	 */
+	@Override
 	public long getClock(byte[] state) {
 		return Convert.toLong(state, RTC_OFFSET, 5) * 1000 / 256;
 	}
@@ -661,6 +672,7 @@ public long getClock(byte[] state) {
 	 * @see #setClockAlarm(long,byte[])
 	 * @see #setClockAlarmEnable(boolean,byte[])
 	 */
+	@Override
 	public long getClockAlarm(byte[] state) throws OneWireException {
 		return Convert.toLong(state, RTC_ALARM_OFFSET, 5) * 1000 / 256;
 	}
@@ -681,8 +693,9 @@ public long getClockAlarm(byte[] state) throws OneWireException {
 	 * @see #setClockAlarm(long,byte[])
 	 * @see #setClockAlarmEnable(boolean,byte[])
 	 */
+	@Override
 	public boolean isClockAlarming(byte[] state) {
-		return (Bit.arrayReadBit(0, STATUS_OFFSET, state) == 1);
+		return Bit.arrayReadBit(0, STATUS_OFFSET, state) == 1;
 	}
 
 	/**
@@ -700,8 +713,9 @@ public boolean isClockAlarming(byte[] state) {
 	 * @see #setClockAlarm(long,byte[])
 	 * @see #setClockAlarmEnable(boolean,byte[])
 	 */
+	@Override
 	public boolean isClockAlarmEnabled(byte[] state) {
-		return (Bit.arrayReadBit(3, STATUS_OFFSET, state) == 0);
+		return Bit.arrayReadBit(3, STATUS_OFFSET, state) == 0;
 	}
 
 	/**
@@ -717,8 +731,9 @@ public boolean isClockAlarmEnabled(byte[] state) {
 	 * @see #canDisableClock()
 	 * @see #setClockRunEnable(boolean,byte[])
 	 */
+	@Override
 	public boolean isClockRunning(byte[] state) {
-		return (Bit.arrayReadBit(4, CONTROL_OFFSET, state) == 1);
+		return Bit.arrayReadBit(4, CONTROL_OFFSET, state) == 1;
 	}
 
 	// --------
@@ -801,7 +816,7 @@ public long getCycleCounterAlarm(byte[] state) {
 	 * @see #setIntervalTimerAlarmEnable(boolean,byte[]) setIntervalTimerAlarmEnable
 	 */
 	public boolean isIntervalTimerAlarming(byte[] state) {
-		return (Bit.arrayReadBit(1, STATUS_OFFSET, state) == 1);
+		return Bit.arrayReadBit(1, STATUS_OFFSET, state) == 1;
 	}
 
 	/**
@@ -817,7 +832,7 @@ public boolean isIntervalTimerAlarming(byte[] state) {
 	 * @see #setCycleCounterAlarmEnable(boolean,byte[]) setCycleCounterAlarmEnable
 	 */
 	public boolean isCycleCounterAlarming(byte[] state) {
-		return (Bit.arrayReadBit(2, STATUS_OFFSET, state) == 1);
+		return Bit.arrayReadBit(2, STATUS_OFFSET, state) == 1;
 	}
 
 	/**
@@ -833,7 +848,7 @@ public boolean isCycleCounterAlarming(byte[] state) {
 	 * @see #setIntervalTimerAlarmEnable(boolean,byte[]) setIntervalTimerAlarmEnable
 	 */
 	public boolean isIntervalTimerAlarmEnabled(byte[] state) {
-		return (Bit.arrayReadBit(4, STATUS_OFFSET, state) == 0);
+		return Bit.arrayReadBit(4, STATUS_OFFSET, state) == 0;
 	}
 
 	/**
@@ -849,7 +864,7 @@ public boolean isIntervalTimerAlarmEnabled(byte[] state) {
 	 * @see #setCycleCounterAlarmEnable(boolean,byte[]) setCycleCounterAlarmEnable
 	 */
 	public boolean isCycleCounterAlarmEnabled(byte[] state) {
-		return (Bit.arrayReadBit(5, STATUS_OFFSET, state) == 0);
+		return Bit.arrayReadBit(5, STATUS_OFFSET, state) == 0;
 	}
 
 	/**
@@ -864,7 +879,7 @@ public boolean isCycleCounterAlarmEnabled(byte[] state) {
 	 * @see #writeProtectClock(byte[]) writeProtectClock
 	 */
 	public boolean isClockWriteProtected(byte[] state) {
-		return (Bit.arrayReadBit(0, CONTROL_OFFSET, state) == 1);
+		return Bit.arrayReadBit(0, CONTROL_OFFSET, state) == 1;
 	}
 
 	/**
@@ -881,7 +896,7 @@ public boolean isClockWriteProtected(byte[] state) {
 	 * @see #writeProtectIntervalTimer(byte[]) writeProtectIntervalTimer
 	 */
 	public boolean isIntervalTimerWriteProtected(byte[] state) {
-		return (Bit.arrayReadBit(1, CONTROL_OFFSET, state) == 1);
+		return Bit.arrayReadBit(1, CONTROL_OFFSET, state) == 1;
 	}
 
 	/**
@@ -896,7 +911,7 @@ public boolean isIntervalTimerWriteProtected(byte[] state) {
 	 * @see #writeProtectCycleCounter(byte[]) writeProtectCycleCounter
 	 */
 	public boolean isCycleCounterWriteProtected(byte[] state) {
-		return (Bit.arrayReadBit(2, CONTROL_OFFSET, state) == 1);
+		return Bit.arrayReadBit(2, CONTROL_OFFSET, state) == 1;
 	}
 
 	/**
@@ -912,7 +927,7 @@ public boolean isCycleCounterWriteProtected(byte[] state) {
 	 * @see #setReadAfterExpire(boolean, byte[]) setReadAfterExpire
 	 */
 	public boolean canReadAfterExpire(byte[] state) {
-		return (Bit.arrayReadBit(3, CONTROL_OFFSET, state) == 1);
+		return Bit.arrayReadBit(3, CONTROL_OFFSET, state) == 1;
 	}
 
 	/**
@@ -930,7 +945,7 @@ public boolean canReadAfterExpire(byte[] state) {
 	 * @see #setIntervalTimerAutomatic(boolean, byte[]) setIntervalTimerAutomatic
 	 */
 	public boolean isIntervalTimerAutomatic(byte[] state) {
-		return (Bit.arrayReadBit(5, CONTROL_OFFSET, state) == 1);
+		return Bit.arrayReadBit(5, CONTROL_OFFSET, state) == 1;
 	}
 
 	/**
@@ -948,7 +963,7 @@ public boolean isIntervalTimerAutomatic(byte[] state) {
 	 * @see #setIntervalTimerRunState(boolean, byte[]) setIntervalTimerRunState
 	 */
 	public boolean isIntervalTimerStopped(byte[] state) {
-		return (Bit.arrayReadBit(6, CONTROL_OFFSET, state) == 1);
+		return Bit.arrayReadBit(6, CONTROL_OFFSET, state) == 1;
 	}
 
 	/**
@@ -965,7 +980,7 @@ public boolean isIntervalTimerStopped(byte[] state) {
 	 * @see #setAutomaticDelayLong(boolean,byte[]) setAutomaticDelayLong
 	 */
 	public boolean isAutomaticDelayLong(byte[] state) {
-		return (Bit.arrayReadBit(7, CONTROL_OFFSET, state) == 1);
+		return Bit.arrayReadBit(7, CONTROL_OFFSET, state) == 1;
 	}
 
 	// --------
@@ -985,12 +1000,14 @@ public boolean isAutomaticDelayLong(byte[] state) {
 	 * @see com.dalsemi.onewire.container.OneWireSensor#writeDevice(byte[])
 	 * @see #getClock(byte[])
 	 */
+	@Override
 	public void setClock(long time, byte[] state) {
 		Convert.toByteArray(time * 256 / 1000, state, RTC_OFFSET, 5);
 
 		// set bitmap field to indicate these clock registers were changed
-		for (int i = 0; i < 5; i++)
+		for (var i = 0; i < 5; i++) {
 			Bit.arrayWriteBit(1, RTC_OFFSET + i, BITMAP_OFFSET, state);
+		}
 	}
 
 	/**
@@ -1014,12 +1031,14 @@ public void setClock(long time, byte[] state) {
 	 * @see #isClockAlarming(byte[])
 	 * @see #setClockAlarmEnable(boolean,byte[])
 	 */
+	@Override
 	public void setClockAlarm(long time, byte[] state) throws OneWireException {
 		Convert.toByteArray(time * 256 / 1000, state, RTC_ALARM_OFFSET, 5);
 
 		// set bitmap field to indicate these clock registers were changed
-		for (int i = 0; i < 5; i++)
+		for (var i = 0; i < 5; i++) {
 			Bit.arrayWriteBit(1, RTC_ALARM_OFFSET + i, BITMAP_OFFSET, state);
+		}
 	}
 
 	/**
@@ -1040,6 +1059,7 @@ public void setClockAlarm(long time, byte[] state) throws OneWireException {
 	 * @see #canDisableClock()
 	 * @see #isClockRunning(byte[])
 	 */
+	@Override
 	public void setClockRunEnable(boolean runEnable, byte[] state) throws OneWireException {
 		Bit.arrayWriteBit(runEnable ? 1 : 0, 4, CONTROL_OFFSET, state);
 
@@ -1068,6 +1088,7 @@ public void setClockRunEnable(boolean runEnable, byte[] state) throws OneWireExc
 	 * @see #setClockAlarm(long,byte[])
 	 * @see #isClockAlarming(byte[])
 	 */
+	@Override
 	public void setClockAlarmEnable(boolean alarmEnable, byte[] state) throws OneWireException {
 		Bit.arrayWriteBit(alarmEnable ? 0 : 1, 3, STATUS_OFFSET, state);
 
@@ -1095,8 +1116,9 @@ public void setIntervalTimer(long time, byte[] state) {
 		Convert.toByteArray(time * 256 / 1000, state, INTERVAL_OFFSET, 5);
 
 		// set bitmap field to indicate these clock registers were changed
-		for (int i = 0; i < 5; i++)
+		for (var i = 0; i < 5; i++) {
 			Bit.arrayWriteBit(1, INTERVAL_OFFSET + i, BITMAP_OFFSET, state);
+		}
 	}
 
 	/**
@@ -1115,8 +1137,9 @@ public void setCycleCounter(long cycles, byte[] state) {
 		Convert.toByteArray(cycles, state, COUNTER_OFFSET, 4);
 
 		// set bitmap field to indicate these clock registers were changed
-		for (int i = 0; i < 4; i++)
+		for (var i = 0; i < 4; i++) {
 			Bit.arrayWriteBit(1, COUNTER_OFFSET + i, BITMAP_OFFSET, state);
+		}
 	}
 
 	/**
@@ -1135,8 +1158,9 @@ public void setIntervalTimerAlarm(long time, byte[] state) {
 		Convert.toByteArray(time * 256 / 1000, state, INTERVAL_ALARM_OFFSET, 5);
 
 		// set bitmap field to indicate these clock registers were changed
-		for (int i = 0; i < 5; i++)
+		for (var i = 0; i < 5; i++) {
 			Bit.arrayWriteBit(1, INTERVAL_ALARM_OFFSET + i, BITMAP_OFFSET, state);
+		}
 	}
 
 	/**
@@ -1157,8 +1181,9 @@ public void setCycleCounterAlarm(long cycles, byte[] state) {
 		Convert.toByteArray(cycles, state, COUNTER_ALARM_OFFSET, 4);
 
 		// set bitmap field to indicate these clock registers were changed
-		for (int i = 0; i < 4; i++)
+		for (var i = 0; i < 4; i++) {
 			Bit.arrayWriteBit(1, COUNTER_ALARM_OFFSET + i, BITMAP_OFFSET, state);
+		}
 	}
 
 	/**
@@ -1377,15 +1402,15 @@ public void setCycleCounterAlarmEnable(boolean alarmEnable, byte[] state) {
 	private void initClock() {
 
 		// scratchpad
-		scratch = new MemoryBankScratch(this);
+		this.scratch = new MemoryBankScratch(this);
 
 		// clock
-		clock = new MemoryBankNV(this, scratch);
-		clock.numberPages = 1;
-		clock.startPhysicalAddress = 512;
-		clock.size = 32;
-		clock.generalPurposeMemory = false;
-		clock.maxPacketDataLength = 0;
-		clock.bankDescription = "Clock/alarm registers";
+		this.clock = new MemoryBankNV(this, this.scratch);
+		this.clock.numberPages = 1;
+		this.clock.startPhysicalAddress = 512;
+		this.clock.size = 32;
+		this.clock.generalPurposeMemory = false;
+		this.clock.maxPacketDataLength = 0;
+		this.clock.bankDescription = "Clock/alarm registers";
 	}
 }
diff --git a/io.openems.edge.bridge.onewire/src/com/dalsemi/onewire/container/OneWireContainer05.java b/io.openems.edge.bridge.onewire/src/com/dalsemi/onewire/container/OneWireContainer05.java
index 8ceb87bce0b..e2caa6f95d0 100644
--- a/io.openems.edge.bridge.onewire/src/com/dalsemi/onewire/container/OneWireContainer05.java
+++ b/io.openems.edge.bridge.onewire/src/com/dalsemi/onewire/container/OneWireContainer05.java
@@ -137,7 +137,6 @@ public class OneWireContainer05 extends OneWireContainer implements SwitchContai
 	 *      OneWireContainer05(DSPortAdapter,String)
 	 */
 	public OneWireContainer05() {
-		super();
 	}
 
 	/**
@@ -201,6 +200,7 @@ public OneWireContainer05(DSPortAdapter sourceAdapter, String newAddress) {
 	 *
 	 * @return iButton or 1-Wire device name
 	 */
+	@Override
 	public String getName() {
 		return "DS2405";
 	}
@@ -212,6 +212,7 @@ public String getName() {
 	 *
 	 * @return the alternate names for this iButton or 1-Wire device
 	 */
+	@Override
 	public String getAlternateNames() {
 		return "Addressable Switch";
 	}
@@ -222,6 +223,7 @@ public String getAlternateNames() {
 	 *
 	 * @return device description
 	 */
+	@Override
 	public String getDescription() {
 		return "Addressable Switch with controlled open drain PIO "
 				+ "pin. PIO pin sink capability is greater than 4mA " + "at 0.4V.";
@@ -244,6 +246,7 @@ public String getDescription() {
 	 *
 	 * @see com.dalsemi.onewire.container.OneWireSensor#readDevice()
 	 */
+	@Override
 	public int getNumberChannels(byte[] state) {
 		// we ignore the state, DS2405 can only have one channel
 		return 1;
@@ -260,6 +263,7 @@ public int getNumberChannels(byte[] state) {
 	 *
 	 * @see #getLatchState(int,byte[])
 	 */
+	@Override
 	public boolean isHighSideSwitch() {
 		return false;
 	}
@@ -274,6 +278,7 @@ public boolean isHighSideSwitch() {
 	 * @see #getSensedActivity(int,byte[])
 	 * @see #clearActivity()
 	 */
+	@Override
 	public boolean hasActivitySensing() {
 		return false;
 	}
@@ -287,6 +292,7 @@ public boolean hasActivitySensing() {
 	 *
 	 * @see #getLevel(int,byte[])
 	 */
+	@Override
 	public boolean hasLevelSensing() {
 		return true;
 	}
@@ -303,6 +309,7 @@ public boolean hasLevelSensing() {
 	 *
 	 * @see #setLatchState(int,boolean,boolean,byte[])
 	 */
+	@Override
 	public boolean hasSmartOn() {
 		return false;
 	}
@@ -318,6 +325,7 @@ public boolean hasSmartOn() {
 	 *
 	 * @see #setLatchState(int,boolean,boolean,byte[])
 	 */
+	@Override
 	public boolean onlySingleChannelOn() {
 		return true;
 	}
@@ -343,8 +351,9 @@ public boolean onlySingleChannelOn() {
 	 * @see com.dalsemi.onewire.container.OneWireSensor#readDevice()
 	 * @see #hasLevelSensing()
 	 */
+	@Override
 	public boolean getLevel(int channel, byte[] state) {
-		return ((state[0] & 0x02) == 0x02);
+		return (state[0] & 0x02) == 0x02;
 	}
 
 	/**
@@ -364,8 +373,9 @@ public boolean getLevel(int channel, byte[] state) {
 	 * @see #isHighSideSwitch()
 	 * @see #setLatchState(int,boolean,boolean,byte[])
 	 */
+	@Override
 	public boolean getLatchState(int channel, byte[] state) {
-		return ((state[0] & 0x01) == 0x01);
+		return (state[0] & 0x01) == 0x01;
 	}
 
 	/**
@@ -388,6 +398,7 @@ public boolean getLatchState(int channel, byte[] state) {
 	 * @see #hasActivitySensing()
 	 * @see #clearActivity()
 	 */
+	@Override
 	public boolean getSensedActivity(int channel, byte[] state) throws OneWireException {
 
 		// i don't do this
@@ -404,6 +415,7 @@ public boolean getSensedActivity(int channel, byte[] state) throws OneWireExcept
 	 * @see com.dalsemi.onewire.container.OneWireSensor#readDevice()
 	 * @see #getSensedActivity(int,byte[])
 	 */
+	@Override
 	public void clearActivity() throws OneWireException {
 
 		// i don't do this
@@ -438,11 +450,13 @@ public void clearActivity() throws OneWireException {
 	 * @see #getLatchState(int,byte[])
 	 * @see com.dalsemi.onewire.container.OneWireSensor#writeDevice(byte[])
 	 */
+	@Override
 	public void setLatchState(int channel, boolean latchState, boolean doSmart, byte[] state) {
-		if (latchState)
+		if (latchState) {
 			state[0] = (byte) (state[0] | 0x01);
-		else
+		} else {
 			state[0] = (byte) (state[0] & 0xfe);
+		}
 	}
 
 	/**
@@ -461,33 +475,35 @@ public void setLatchState(int channel, boolean latchState, boolean doSmart, byte
 	 * @throws OneWireException   on a communication or setup error with the 1-Wire
 	 *                            adapter
 	 */
+	@Override
 	public byte[] readDevice() throws OneWireIOException, OneWireException {
 
 		// first let's make sure we can talk to the part
 		// speed is not critical with the 2405 so i'll just call doSpeed()
-		doSpeed();
+		this.doSpeed();
 
 		// this ain't a hard part--it's only gonna take 1 byte
-		byte[] state = new byte[1];
+		var state = new byte[1];
 
 		// here's the 'bitmap'
 		// bit 0 : switch state (0 for conducting, 1 for non-conducting)
 		// bit 1 : sensed level (0 for low, 1 for high)
 		state[0] = (byte) 0;
 
-		if (isPresent()) {
-			if (isAlarming())
-				state[0] = 1;
-		} else
+		if (!this.isPresent()) {
 			throw new OneWireIOException("Device not present");
+		}
+		if (this.isAlarming()) {
+			state[0] = 1;
+		}
 
-		if (isPresent()) {
-
-			// Byte after 'search' indicates level
-			if (adapter.getByte() != 0)
-				state[0] = (byte) (state[0] | 0x02);
-		} else
+		if (!this.isPresent()) {
 			throw new OneWireIOException("Device not present");
+		}
+		// Byte after 'search' indicates level
+		if (this.adapter.getByte() != 0) {
+			state[0] = (byte) (state[0] | 0x02);
+		}
 
 		return state;
 	}
@@ -507,24 +523,25 @@ public byte[] readDevice() throws OneWireIOException, OneWireException {
 	 * @throws OneWireException   on a communication or setup error with the 1-Wire
 	 *                            adapter
 	 */
+	@Override
 	public void writeDevice(byte[] state) throws OneWireIOException, OneWireException {
-		doSpeed();
+		this.doSpeed();
 
-		boolean value = ((state[0] & 0x01) == 0x01);
-		boolean compare = isAlarming();
+		var value = (state[0] & 0x01) == 0x01;
+		var compare = this.isAlarming();
 
 		// check to see if already in the correct state
-		if (compare == value)
+		if (compare == value) {
 			return;
-
-		// incorrect state so toggle
-		else if (adapter.select(address)) {
+		}
+		if (this.adapter.select(this.address)) {
 
 			// verify
-			compare = isAlarming();
+			compare = this.isAlarming();
 
-			if (compare == value)
+			if (compare == value) {
 				return;
+			}
 		}
 
 		throw new OneWireIOException("Failure to change DS2405 latch state");
diff --git a/io.openems.edge.bridge.onewire/src/com/dalsemi/onewire/container/OneWireContainer06.java b/io.openems.edge.bridge.onewire/src/com/dalsemi/onewire/container/OneWireContainer06.java
index 72b69a9c10f..f6cba17a3d0 100644
--- a/io.openems.edge.bridge.onewire/src/com/dalsemi/onewire/container/OneWireContainer06.java
+++ b/io.openems.edge.bridge.onewire/src/com/dalsemi/onewire/container/OneWireContainer06.java
@@ -43,7 +43,7 @@
  * <P>
  * This iButton is primarily used as a read/write portable memory device.
  * </P>
- * 
+ *
  * <H3>Features</H3>
  * <UL>
  * <LI>4096 bits (512 bytes) of read/write nonvolatile memory
@@ -53,14 +53,14 @@
  * <LI>Operating temperature range from -40 to +70
  * <LI>Over 10 years of data retention
  * </UL>
- * 
+ *
  * <H3>Memory</H3>
- * 
+ *
  * <P>
  * The memory can be accessed through the objects that are returned from the
  * {@link #getMemoryBanks() getMemoryBanks} method.
  * </P>
- * 
+ *
  * The following is a list of the MemoryBank instances that are returned:
  *
  * <UL>
@@ -85,9 +85,9 @@
  * payload
  * </UL>
  * </UL>
- * 
+ *
  * <H3>Usage</H3>
- * 
+ *
  * <DL>
  * <DD>See the usage example in
  * {@link com.dalsemi.onewire.container.OneWireContainer OneWireContainer} to
@@ -102,10 +102,10 @@
  * <DD><A HREF="http://pdfserv.maxim-ic.com/arpdf/DS1992-DS1994.pdf">
  * http://pdfserv.maxim-ic.com/arpdf/DS1992-DS1994.pdf</A>
  * </DL>
- * 
+ *
  * @see com.dalsemi.onewire.container.MemoryBank
  * @see com.dalsemi.onewire.container.PagedMemoryBank
- * 
+ *
  * @version 0.00, 28 Aug 2000
  * @author DS
  */
@@ -127,7 +127,6 @@ public class OneWireContainer06 extends OneWireContainer {
 	 *      super.setupContainer()
 	 */
 	public OneWireContainer06() {
-		super();
 	}
 
 	/**
@@ -199,6 +198,7 @@ public OneWireContainer06(DSPortAdapter sourceAdapter, String newAddress) {
 	 *
 	 * @return iButton or 1-Wire device name
 	 */
+	@Override
 	public String getName() {
 		return "DS1993";
 	}
@@ -209,6 +209,7 @@ public String getName() {
 	 *
 	 * @return device description
 	 */
+	@Override
 	public String getDescription() {
 		return "4096 bit read/write nonvolatile memory partitioned " + "into sixteen pages of 256 bits each. ";
 	}
@@ -219,14 +220,15 @@ public String getDescription() {
 	 * MemoryBank}, {@link com.dalsemi.onewire.container.PagedMemoryBank
 	 * PagedMemoryBank}, and {@link com.dalsemi.onewire.container.OTPMemoryBank
 	 * OTPMemoryBank}.
-	 * 
+	 *
 	 * @return <CODE>Enumeration</CODE> of memory banks
 	 */
+	@Override
 	public Enumeration<MemoryBank> getMemoryBanks() {
-		Vector<MemoryBank> bank_vector = new Vector<>(2);
+		var bank_vector = new Vector<MemoryBank>(2);
 
 		// scratchpad
-		MemoryBankScratch scratch = new MemoryBankScratch(this);
+		var scratch = new MemoryBankScratch(this);
 
 		bank_vector.addElement(scratch);
 
diff --git a/io.openems.edge.bridge.onewire/src/com/dalsemi/onewire/container/OneWireContainer08.java b/io.openems.edge.bridge.onewire/src/com/dalsemi/onewire/container/OneWireContainer08.java
index 6c6558a4e56..8bfd54403ac 100644
--- a/io.openems.edge.bridge.onewire/src/com/dalsemi/onewire/container/OneWireContainer08.java
+++ b/io.openems.edge.bridge.onewire/src/com/dalsemi/onewire/container/OneWireContainer08.java
@@ -43,7 +43,7 @@
  * <P>
  * This iButton is primarily used as a read/write portable memory device.
  * </P>
- * 
+ *
  * <H3>Features</H3>
  * <UL>
  * <LI>1024 bits (128 bytes) of read/write nonvolatile memory
@@ -53,14 +53,14 @@
  * <LI>Operating temperature range from -40 to +70
  * <LI>Over 10 years of data retention
  * </UL>
- * 
+ *
  * <H3>Memory</H3>
- * 
+ *
  * <P>
  * The memory can be accessed through the objects that are returned from the
  * {@link #getMemoryBanks() getMemoryBanks} method.
  * </P>
- * 
+ *
  * The following is a list of the MemoryBank instances that are returned:
  *
  * <UL>
@@ -85,9 +85,9 @@
  * payload
  * </UL>
  * </UL>
- * 
+ *
  * <H3>Usage</H3>
- * 
+ *
  * <DL>
  * <DD>See the usage example in
  * {@link com.dalsemi.onewire.container.OneWireContainer OneWireContainer} to
@@ -102,7 +102,7 @@
  * <DD><A HREF="http://pdfserv.maxim-ic.com/arpdf/DS1992-DS1994.pdf">
  * http://pdfserv.maxim-ic.com/arpdf/DS1992-DS1994.pdf</A>
  * </DL>
- * 
+ *
  * @see com.dalsemi.onewire.container.MemoryBank
  * @see com.dalsemi.onewire.container.PagedMemoryBank
  *
@@ -127,7 +127,6 @@ public class OneWireContainer08 extends OneWireContainer {
 	 *      super.setupContainer()
 	 */
 	public OneWireContainer08() {
-		super();
 	}
 
 	/**
@@ -199,6 +198,7 @@ public OneWireContainer08(DSPortAdapter sourceAdapter, String newAddress) {
 	 *
 	 * @return iButton or 1-Wire device name
 	 */
+	@Override
 	public String getName() {
 		return "DS1992";
 	}
@@ -209,6 +209,7 @@ public String getName() {
 	 *
 	 * @return device description
 	 */
+	@Override
 	public String getDescription() {
 		return "1024 bit read/write nonvolatile memory partitioned " + "into four pages of 256 bits each.";
 	}
@@ -219,19 +220,20 @@ public String getDescription() {
 	 * MemoryBank}, {@link com.dalsemi.onewire.container.PagedMemoryBank
 	 * PagedMemoryBank}, and {@link com.dalsemi.onewire.container.OTPMemoryBank
 	 * OTPMemoryBank}.
-	 * 
+	 *
 	 * @return <CODE>Enumeration</CODE> of memory banks
 	 */
+	@Override
 	public Enumeration<MemoryBank> getMemoryBanks() {
-		Vector<MemoryBank> bank_vector = new Vector<>(2);
+		var bank_vector = new Vector<MemoryBank>(2);
 
 		// scratchpad
-		MemoryBankScratch scratch = new MemoryBankScratch(this);
+		var scratch = new MemoryBankScratch(this);
 
 		bank_vector.addElement(scratch);
 
 		// NVRAM
-		MemoryBankNV nv = new MemoryBankNV(this, scratch);
+		var nv = new MemoryBankNV(this, scratch);
 
 		nv.numberPages = 4;
 		nv.size = 128;
diff --git a/io.openems.edge.bridge.onewire/src/com/dalsemi/onewire/container/OneWireContainer09.java b/io.openems.edge.bridge.onewire/src/com/dalsemi/onewire/container/OneWireContainer09.java
index 26e87610a14..4abb8bf858e 100644
--- a/io.openems.edge.bridge.onewire/src/com/dalsemi/onewire/container/OneWireContainer09.java
+++ b/io.openems.edge.bridge.onewire/src/com/dalsemi/onewire/container/OneWireContainer09.java
@@ -46,7 +46,7 @@
  * portable memory device. The 1-Wire Chip version is used for small
  * non-volatile storage.
  * </P>
- * 
+ *
  * <H3>Features</H3>
  * <UL>
  * <LI>1024 bits (128 bytes) Electrically Programmable Read-Only Memory (EPROM)
@@ -63,19 +63,19 @@
  * 12.0V from -40@htmlonly &#176C @endhtmlonly to +50@htmlonly
  * &#176C @endhtmlonly
  * </UL>
- * 
+ *
  * <H3>Alternate Names</H3>
  * <UL>
  * <LI>D2502
  * </UL>
  *
  * <H3>Memory</H3>
- * 
+ *
  * <P>
  * The memory can be accessed through the objects that are returned from the
  * {@link #getMemoryBanks() getMemoryBanks} method.
  * </P>
- * 
+ *
  * The following is a list of the MemoryBank instances that are returned:
  *
  * <UL>
@@ -105,9 +105,9 @@
  * <LI><I> Page Features </I> page-device-CRC
  * </UL>
  * </UL>
- * 
+ *
  * <H3>Usage</H3>
- * 
+ *
  * <DL>
  * <DD>See the usage example in
  * {@link com.dalsemi.onewire.container.OneWireContainer OneWireContainer} to
@@ -125,13 +125,13 @@
  * <DD><A HREF="http://pdfserv.maxim-ic.com/arpdf/DS1982.pdf">
  * http://pdfserv.maxim-ic.com/arpdf/DS1982.pdf</A>
  * </DL>
- * 
+ *
  * @see com.dalsemi.onewire.container.MemoryBank
  * @see com.dalsemi.onewire.container.PagedMemoryBank
  * @see com.dalsemi.onewire.container.OTPMemoryBank
  * @see com.dalsemi.onewire.container.OneWireContainer0B
  * @see com.dalsemi.onewire.container.OneWireContainer0F
- * 
+ *
  * @version 0.00, 28 Aug 2000
  * @author DS
  */
@@ -153,7 +153,6 @@ public class OneWireContainer09 extends OneWireContainer {
 	 *      super.setupContainer()
 	 */
 	public OneWireContainer09() {
-		super();
 	}
 
 	/**
@@ -225,6 +224,7 @@ public OneWireContainer09(DSPortAdapter sourceAdapter, String newAddress) {
 	 *
 	 * @return iButton or 1-Wire device name
 	 */
+	@Override
 	public String getName() {
 		return "DS1982";
 	}
@@ -236,6 +236,7 @@ public String getName() {
 	 *
 	 * @return 1-Wire device alternate names
 	 */
+	@Override
 	public String getAlternateNames() {
 		return "DS2502";
 	}
@@ -246,6 +247,7 @@ public String getAlternateNames() {
 	 *
 	 * @return device description
 	 */
+	@Override
 	public String getDescription() {
 		return "1024 bit Electrically Programmable Read Only Memory " + "(EPROM) partitioned into four 256 bit pages."
 				+ "Each memory page can be permanently write-protected "
@@ -259,14 +261,15 @@ public String getDescription() {
 	 * MemoryBank}, {@link com.dalsemi.onewire.container.PagedMemoryBank
 	 * PagedMemoryBank}, and {@link com.dalsemi.onewire.container.OTPMemoryBank
 	 * OTPMemoryBank}.
-	 * 
+	 *
 	 * @return <CODE>Enumeration</CODE> of memory banks
 	 */
+	@Override
 	public Enumeration<MemoryBank> getMemoryBanks() {
-		Vector<MemoryBank> bank_vector = new Vector<>(2);
+		var bank_vector = new Vector<MemoryBank>(2);
 
 		// EPROM main bank
-		MemoryBankEPROM mn = new MemoryBankEPROM(this);
+		var mn = new MemoryBankEPROM(this);
 
 		mn.numberPages = 4;
 		mn.size = 128;
@@ -281,7 +284,7 @@ public Enumeration<MemoryBank> getMemoryBanks() {
 		bank_vector.addElement(mn);
 
 		// EPROM status write protect pages bank
-		MemoryBankEPROM st = new MemoryBankEPROM(this);
+		var st = new MemoryBankEPROM(this);
 
 		st.bankDescription = "Write protect pages and Page redirection";
 		st.numberPages = 1;
diff --git a/io.openems.edge.bridge.onewire/src/com/dalsemi/onewire/container/OneWireContainer0A.java b/io.openems.edge.bridge.onewire/src/com/dalsemi/onewire/container/OneWireContainer0A.java
index dc82dc50686..1d3e0a89c3c 100644
--- a/io.openems.edge.bridge.onewire/src/com/dalsemi/onewire/container/OneWireContainer0A.java
+++ b/io.openems.edge.bridge.onewire/src/com/dalsemi/onewire/container/OneWireContainer0A.java
@@ -43,7 +43,7 @@
  * <P>
  * This iButton is primarily used as a read/write portable memory device.
  * </P>
- * 
+ *
  * <H3>Features</H3>
  * <UL>
  * <LI>16384 bits (2048 bytes) of read/write nonvolatile memory
@@ -55,14 +55,14 @@
  * +70@htmlonly &#176C @endhtmlonly
  * <LI>Over 10 years of data retention
  * </UL>
- * 
+ *
  * <H3>Memory</H3>
- * 
+ *
  * <P>
  * The memory can be accessed through the objects that are returned from the
  * {@link #getMemoryBanks() getMemoryBanks} method.
  * </P>
- * 
+ *
  * The following is a list of the MemoryBank instances that are returned:
  *
  * <UL>
@@ -87,9 +87,9 @@
  * payload
  * </UL>
  * </UL>
- * 
+ *
  * <H3>Usage</H3>
- * 
+ *
  * <DL>
  * <DD>See the usage example in
  * {@link com.dalsemi.onewire.container.OneWireContainer OneWireContainer} to
@@ -104,7 +104,7 @@
  * <DD><A HREF="http://pdfserv.maxim-ic.com/arpdf/DS1995.pdf">
  * http://pdfserv.maxim-ic.com/arpdf/DS1995.pdf</A>
  * </DL>
- * 
+ *
  * @see com.dalsemi.onewire.container.MemoryBank
  * @see com.dalsemi.onewire.container.PagedMemoryBank
  *
@@ -129,7 +129,6 @@ public class OneWireContainer0A extends OneWireContainer {
 	 *      super.setupContainer()
 	 */
 	public OneWireContainer0A() {
-		super();
 	}
 
 	/**
@@ -201,6 +200,7 @@ public OneWireContainer0A(DSPortAdapter sourceAdapter, String newAddress) {
 	 *
 	 * @return iButton or 1-Wire device name
 	 */
+	@Override
 	public String getName() {
 		return "DS1995";
 	}
@@ -211,6 +211,7 @@ public String getName() {
 	 *
 	 * @return device description
 	 */
+	@Override
 	public String getDescription() {
 		return "16384 bit read/write nonvolatile memory partitioned " + "into sixty-four pages of 256 bits each.";
 	}
@@ -229,6 +230,7 @@ public String getDescription() {
 	 * @see com.dalsemi.onewire.adapter.DSPortAdapter#SPEED_FLEX
 	 *      DSPortAdapter.SPEED_FLEX
 	 */
+	@Override
 	public int getMaxSpeed() {
 		return DSPortAdapter.SPEED_OVERDRIVE;
 	}
@@ -239,19 +241,20 @@ public int getMaxSpeed() {
 	 * MemoryBank}, {@link com.dalsemi.onewire.container.PagedMemoryBank
 	 * PagedMemoryBank}, and {@link com.dalsemi.onewire.container.OTPMemoryBank
 	 * OTPMemoryBank}.
-	 * 
+	 *
 	 * @return <CODE>Enumeration</CODE> of memory banks
 	 */
+	@Override
 	public Enumeration<MemoryBank> getMemoryBanks() {
-		Vector<MemoryBank> bank_vector = new Vector<>(2);
+		var bank_vector = new Vector<MemoryBank>(2);
 
 		// scratchpad
-		MemoryBankScratch scratch = new MemoryBankScratch(this);
+		var scratch = new MemoryBankScratch(this);
 
 		bank_vector.addElement(scratch);
 
 		// NVRAM
-		MemoryBankNV nv = new MemoryBankNV(this, scratch);
+		var nv = new MemoryBankNV(this, scratch);
 
 		nv.numberPages = 64;
 		nv.size = 2048;
diff --git a/io.openems.edge.bridge.onewire/src/com/dalsemi/onewire/container/OneWireContainer0B.java b/io.openems.edge.bridge.onewire/src/com/dalsemi/onewire/container/OneWireContainer0B.java
index 9863669c28f..3069138e8dc 100644
--- a/io.openems.edge.bridge.onewire/src/com/dalsemi/onewire/container/OneWireContainer0B.java
+++ b/io.openems.edge.bridge.onewire/src/com/dalsemi/onewire/container/OneWireContainer0B.java
@@ -46,7 +46,7 @@
  * portable memory device. The 1-Wire Chip version is used for small
  * non-volatile storage.
  * </P>
- * 
+ *
  * <H3>Features</H3>
  * <UL>
  * <LI>16384 bits (2048 bytes) Electrically Programmable Read-Only Memory
@@ -63,19 +63,19 @@
  * 12.0V from -40@htmlonly &#176C @endhtmlonly to +50@htmlonly
  * &#176C @endhtmlonly
  * </UL>
- * 
+ *
  * <H3>Alternate Names</H3>
  * <UL>
  * <LI>D2505
  * </UL>
  *
  * <H3>Memory</H3>
- * 
+ *
  * <P>
  * The memory can be accessed through the objects that are returned from the
  * {@link #getMemoryBanks() getMemoryBanks} method.
  * </P>
- * 
+ *
  * The following is a list of the MemoryBank instances that are returned:
  *
  * <UL>
@@ -144,9 +144,9 @@
  * <LI><I> Page Features </I> page-device-CRC
  * </UL>
  * </UL>
- * 
+ *
  * <H3>Usage</H3>
- * 
+ *
  * <DL>
  * <DD>See the usage example in
  * {@link com.dalsemi.onewire.container.OneWireContainer OneWireContainer} to
@@ -164,13 +164,13 @@
  * <DD><A HREF="http://pdfserv.maxim-ic.com/arpdf/DS1985.pdf">
  * http://pdfserv.maxim-ic.com/arpdf/DS1985.pdf</A>
  * </DL>
- * 
+ *
  * @see com.dalsemi.onewire.container.MemoryBank
  * @see com.dalsemi.onewire.container.PagedMemoryBank
  * @see com.dalsemi.onewire.container.OTPMemoryBank
  * @see com.dalsemi.onewire.container.OneWireContainer09
  * @see com.dalsemi.onewire.container.OneWireContainer0F
- * 
+ *
  * @version 0.00, 28 Aug 2000
  * @author DS
  */
@@ -192,7 +192,6 @@ public class OneWireContainer0B extends OneWireContainer {
 	 *      super.setupContainer()
 	 */
 	public OneWireContainer0B() {
-		super();
 	}
 
 	/**
@@ -264,6 +263,7 @@ public OneWireContainer0B(DSPortAdapter sourceAdapter, String newAddress) {
 	 *
 	 * @return iButton or 1-Wire device name
 	 */
+	@Override
 	public String getName() {
 		return "DS1985";
 	}
@@ -275,6 +275,7 @@ public String getName() {
 	 *
 	 * @return 1-Wire device alternate names
 	 */
+	@Override
 	public String getAlternateNames() {
 		return "DS2505";
 	}
@@ -285,6 +286,7 @@ public String getAlternateNames() {
 	 *
 	 * @return device description
 	 */
+	@Override
 	public String getDescription() {
 		return "16384 bit Electrically Programmable Read Only Memory "
 				+ "(EPROM) partitioned into sixty-four 256 bit pages."
@@ -299,19 +301,20 @@ public String getDescription() {
 	 * MemoryBank}, {@link com.dalsemi.onewire.container.PagedMemoryBank
 	 * PagedMemoryBank}, and {@link com.dalsemi.onewire.container.OTPMemoryBank
 	 * OTPMemoryBank}.
-	 * 
+	 *
 	 * @return <CODE>Enumeration</CODE> of memory banks
 	 */
+	@Override
 	public Enumeration<MemoryBank> getMemoryBanks() {
-		Vector<MemoryBank> bank_vector = new Vector<>(5);
+		var bank_vector = new Vector<MemoryBank>(5);
 
 		// EPROM main bank
-		MemoryBankEPROM mn = new MemoryBankEPROM(this);
+		var mn = new MemoryBankEPROM(this);
 
 		bank_vector.addElement(mn);
 
 		// EPROM status write protect pages bank
-		MemoryBankEPROM wp = new MemoryBankEPROM(this);
+		var wp = new MemoryBankEPROM(this);
 
 		wp.bankDescription = "Write protect pages";
 		wp.numberPages = 1;
@@ -328,7 +331,7 @@ public Enumeration<MemoryBank> getMemoryBanks() {
 		bank_vector.addElement(wp);
 
 		// EPROM status write protect redirection bank
-		MemoryBankEPROM wpr = new MemoryBankEPROM(this);
+		var wpr = new MemoryBankEPROM(this);
 
 		wpr.bankDescription = "Write protect redirection";
 		wpr.numberPages = 1;
@@ -346,7 +349,7 @@ public Enumeration<MemoryBank> getMemoryBanks() {
 		bank_vector.addElement(wpr);
 
 		// EPROM status bitmap
-		MemoryBankEPROM bm = new MemoryBankEPROM(this);
+		var bm = new MemoryBankEPROM(this);
 
 		bm.bankDescription = "Bitmap of used pages for file structure";
 		bm.numberPages = 1;
@@ -364,7 +367,7 @@ public Enumeration<MemoryBank> getMemoryBanks() {
 		bank_vector.addElement(bm);
 
 		// EPROM status redirection
-		MemoryBankEPROM rd = new MemoryBankEPROM(this);
+		var rd = new MemoryBankEPROM(this);
 
 		rd.bankDescription = "Page redirection bytes";
 		rd.generalPurposeMemory = false;
diff --git a/io.openems.edge.bridge.onewire/src/com/dalsemi/onewire/container/OneWireContainer0C.java b/io.openems.edge.bridge.onewire/src/com/dalsemi/onewire/container/OneWireContainer0C.java
index 3a8ad7d86f3..e36b9e386b9 100644
--- a/io.openems.edge.bridge.onewire/src/com/dalsemi/onewire/container/OneWireContainer0C.java
+++ b/io.openems.edge.bridge.onewire/src/com/dalsemi/onewire/container/OneWireContainer0C.java
@@ -43,7 +43,7 @@
  * <P>
  * This iButton is primarily used as a read/write portable memory device.
  * </P>
- * 
+ *
  * <H3>Features</H3>
  * <UL>
  * <LI>65536 bits (8192 bytes) of read/write nonvolatile memory
@@ -55,14 +55,14 @@
  * +70@htmlonly &#176C @endhtmlonly
  * <LI>Over 10 years of data retention
  * </UL>
- * 
+ *
  * <H3>Memory</H3>
- * 
+ *
  * <P>
  * The memory can be accessed through the objects that are returned from the
  * {@link #getMemoryBanks() getMemoryBanks} method.
  * </P>
- * 
+ *
  * The following is a list of the MemoryBank instances that are returned:
  *
  * <UL>
@@ -87,9 +87,9 @@
  * payload
  * </UL>
  * </UL>
- * 
+ *
  * <H3>Usage</H3>
- * 
+ *
  * <DL>
  * <DD>See the usage example in
  * {@link com.dalsemi.onewire.container.OneWireContainer OneWireContainer} to
@@ -104,7 +104,7 @@
  * <DD><A HREF="http://pdfserv.maxim-ic.com/arpdf/DS1996.pdf">
  * http://pdfserv.maxim-ic.com/arpdf/DS1996.pdf</A>
  * </DL>
- * 
+ *
  * @see com.dalsemi.onewire.container.MemoryBank
  * @see com.dalsemi.onewire.container.PagedMemoryBank
  *
@@ -129,7 +129,6 @@ public class OneWireContainer0C extends OneWireContainer {
 	 *      super.setupContainer()
 	 */
 	public OneWireContainer0C() {
-		super();
 	}
 
 	/**
@@ -201,6 +200,7 @@ public OneWireContainer0C(DSPortAdapter sourceAdapter, String newAddress) {
 	 *
 	 * @return iButton or 1-Wire device name
 	 */
+	@Override
 	public String getName() {
 		return "DS1996";
 	}
@@ -211,6 +211,7 @@ public String getName() {
 	 *
 	 * @return device description
 	 */
+	@Override
 	public String getDescription() {
 		return "65536 bit read/write nonvolatile memory partitioned "
 				+ "into two-hundred fifty-six pages of 256 bits each.";
@@ -230,6 +231,7 @@ public String getDescription() {
 	 * @see com.dalsemi.onewire.adapter.DSPortAdapter#SPEED_FLEX
 	 *      DSPortAdapter.SPEED_FLEX
 	 */
+	@Override
 	public int getMaxSpeed() {
 		return DSPortAdapter.SPEED_OVERDRIVE;
 	}
@@ -240,24 +242,25 @@ public int getMaxSpeed() {
 	 * MemoryBank}, {@link com.dalsemi.onewire.container.PagedMemoryBank
 	 * PagedMemoryBank}, and {@link com.dalsemi.onewire.container.OTPMemoryBank
 	 * OTPMemoryBank}.
-	 * 
+	 *
 	 * @return <CODE>Enumeration</CODE> of memory banks
 	 */
+	@Override
 	public Enumeration<MemoryBank> getMemoryBanks() {
-		Vector<MemoryBank> bank_vector = new Vector<>(2);
+		var bank_vector = new Vector<MemoryBank>(2);
 
 		// scratchpad
-		MemoryBankScratch scratch = new MemoryBankScratch(this);
+		var scratch = new MemoryBankScratch(this);
 
-		bank_vector.addElement((MemoryBank) scratch);
+		bank_vector.addElement(scratch);
 
 		// NVRAM
-		MemoryBankNV nv = new MemoryBankNV(this, scratch);
+		var nv = new MemoryBankNV(this, scratch);
 
 		nv.numberPages = 256;
 		nv.size = 8192;
 
-		bank_vector.addElement((MemoryBank) nv);
+		bank_vector.addElement(nv);
 
 		return bank_vector.elements();
 	}
diff --git a/io.openems.edge.bridge.onewire/src/com/dalsemi/onewire/container/OneWireContainer0F.java b/io.openems.edge.bridge.onewire/src/com/dalsemi/onewire/container/OneWireContainer0F.java
index a11b5963104..e446e9a169b 100644
--- a/io.openems.edge.bridge.onewire/src/com/dalsemi/onewire/container/OneWireContainer0F.java
+++ b/io.openems.edge.bridge.onewire/src/com/dalsemi/onewire/container/OneWireContainer0F.java
@@ -46,7 +46,7 @@
  * portable memory device. The 1-Wire Chip version is used for non-volatile
  * storage.
  * </P>
- * 
+ *
  * <H3>Features</H3>
  * <UL>
  * <LI>65536 bits (8192 bytes) Electrically Programmable Read-Only Memory
@@ -64,19 +64,19 @@
  * 12.0V from -40@htmlonly &#176C @endhtmlonly to +50@htmlonly
  * &#176C @endhtmlonly
  * </UL>
- * 
+ *
  * <H3>Alternate Names</H3>
  * <UL>
  * <LI>D2506
  * </UL>
  *
  * <H3>Memory</H3>
- * 
+ *
  * <P>
  * The memory can be accessed through the objects that are returned from the
  * {@link #getMemoryBanks() getMemoryBanks} method.
  * </P>
- * 
+ *
  * The following is a list of the MemoryBank instances that are returned:
  *
  * <UL>
@@ -146,9 +146,9 @@
  * <LI><I> Page Features </I> page-device-CRC
  * </UL>
  * </UL>
- * 
+ *
  * <H3>Usage</H3>
- * 
+ *
  * <DL>
  * <DD>See the usage example in
  * {@link com.dalsemi.onewire.container.OneWireContainer OneWireContainer} to
@@ -166,13 +166,13 @@
  * <DD><A HREF="http://pdfserv.maxim-ic.com/arpdf/DS1986.pdf">
  * http://pdfserv.maxim-ic.com/arpdf/DS1986.pdf</A>
  * </DL>
- * 
+ *
  * @see com.dalsemi.onewire.container.MemoryBank
  * @see com.dalsemi.onewire.container.PagedMemoryBank
  * @see com.dalsemi.onewire.container.OTPMemoryBank
  * @see com.dalsemi.onewire.container.OneWireContainer09
  * @see com.dalsemi.onewire.container.OneWireContainer0B
- * 
+ *
  * @version 0.00, 28 Aug 2000
  * @author DS
  */
@@ -194,7 +194,6 @@ public class OneWireContainer0F extends OneWireContainer {
 	 *      super.setupContainer()
 	 */
 	public OneWireContainer0F() {
-		super();
 	}
 
 	/**
@@ -266,6 +265,7 @@ public OneWireContainer0F(DSPortAdapter sourceAdapter, String newAddress) {
 	 *
 	 * @return iButton or 1-Wire device name
 	 */
+	@Override
 	public String getName() {
 		return "DS1986";
 	}
@@ -277,6 +277,7 @@ public String getName() {
 	 *
 	 * @return 1-Wire device alternate names
 	 */
+	@Override
 	public String getAlternateNames() {
 		return "DS2506";
 	}
@@ -287,6 +288,7 @@ public String getAlternateNames() {
 	 *
 	 * @return device description
 	 */
+	@Override
 	public String getDescription() {
 		return "65536 bit Electrically Programmable Read Only Memory "
 				+ "(EPROM) partitioned into two-hundered fifty-six 256 bit "
@@ -309,6 +311,7 @@ public String getDescription() {
 	 * @see com.dalsemi.onewire.adapter.DSPortAdapter#SPEED_FLEX
 	 *      DSPortAdapter.SPEED_FLEX
 	 */
+	@Override
 	public int getMaxSpeed() {
 		return DSPortAdapter.SPEED_OVERDRIVE;
 	}
@@ -319,14 +322,15 @@ public int getMaxSpeed() {
 	 * MemoryBank}, {@link com.dalsemi.onewire.container.PagedMemoryBank
 	 * PagedMemoryBank}, and {@link com.dalsemi.onewire.container.OTPMemoryBank
 	 * OTPMemoryBank}.
-	 * 
+	 *
 	 * @return <CODE>Enumeration</CODE> of memory banks
 	 */
+	@Override
 	public Enumeration<MemoryBank> getMemoryBanks() {
-		Vector<MemoryBank> bank_vector = new Vector<>(5);
+		var bank_vector = new Vector<MemoryBank>(5);
 
 		// EPROM main bank
-		MemoryBankEPROM mn = new MemoryBankEPROM(this);
+		var mn = new MemoryBankEPROM(this);
 
 		mn.numberPages = 256;
 		mn.size = 8192;
@@ -334,7 +338,7 @@ public Enumeration<MemoryBank> getMemoryBanks() {
 		bank_vector.addElement(mn);
 
 		// EPROM status write protect pages bank
-		MemoryBankEPROM wp = new MemoryBankEPROM(this);
+		var wp = new MemoryBankEPROM(this);
 
 		wp.bankDescription = "Write protect pages";
 		wp.numberPages = 4;
@@ -351,7 +355,7 @@ public Enumeration<MemoryBank> getMemoryBanks() {
 		bank_vector.addElement(wp);
 
 		// EPROM status write protect redirection bank
-		MemoryBankEPROM wpr = new MemoryBankEPROM(this);
+		var wpr = new MemoryBankEPROM(this);
 
 		wpr.bankDescription = "Write protect redirection";
 		wpr.numberPages = 4;
@@ -369,7 +373,7 @@ public Enumeration<MemoryBank> getMemoryBanks() {
 		bank_vector.addElement(wpr);
 
 		// EPROM status bitmap
-		MemoryBankEPROM bm = new MemoryBankEPROM(this);
+		var bm = new MemoryBankEPROM(this);
 
 		bm.bankDescription = "Bitmap of used pages for file structure";
 		bm.numberPages = 4;
@@ -387,7 +391,7 @@ public Enumeration<MemoryBank> getMemoryBanks() {
 		bank_vector.addElement(bm);
 
 		// EPROM status redirection
-		MemoryBankEPROM rd = new MemoryBankEPROM(this);
+		var rd = new MemoryBankEPROM(this);
 
 		rd.bankDescription = "Page redirection bytes";
 		rd.generalPurposeMemory = false;
diff --git a/io.openems.edge.bridge.onewire/src/com/dalsemi/onewire/container/OneWireContainer10.java b/io.openems.edge.bridge.onewire/src/com/dalsemi/onewire/container/OneWireContainer10.java
index 241c8e869e4..aaf154cb710 100644
--- a/io.openems.edge.bridge.onewire/src/com/dalsemi/onewire/container/OneWireContainer10.java
+++ b/io.openems.edge.bridge.onewire/src/com/dalsemi/onewire/container/OneWireContainer10.java
@@ -33,7 +33,6 @@
 import com.dalsemi.onewire.adapter.DSPortAdapter;
 import com.dalsemi.onewire.adapter.OneWireIOException;
 import com.dalsemi.onewire.utils.CRC8;
-import com.dalsemi.onewire.utils.Convert;
 
 /**
  * <P>
@@ -79,7 +78,6 @@
  * @version 1.00, 1 Sep 2000
  * @author DS,JK Converted to use TemperatureContainer interface 9-1-2000 KLA
  */
-@SuppressWarnings({ "unused" })
 public class OneWireContainer10 extends OneWireContainer implements TemperatureContainer {
 	private boolean normalResolution = true;
 
@@ -112,9 +110,6 @@ public class OneWireContainer10 extends OneWireContainer implements TemperatureC
 	/** DS1920 copy data from scratchpad to EEPROM command */
 	private static final byte COPY_SCRATCHPAD_COMMAND = (byte) 0x48;
 
-	/** DS1920 recall EEPROM command */
-	private static final byte RECALL_EEPROM_COMMAND = (byte) 0xB8;
-
 	/**
 	 * Creates an empty <code>OneWireContainer10</code>. Must call
 	 * <code>setupContainer()</code> before using this new container.
@@ -129,7 +124,6 @@ public class OneWireContainer10 extends OneWireContainer implements TemperatureC
 	 * @see #OneWireContainer10(DSPortAdapter,String)
 	 */
 	public OneWireContainer10() {
-		super();
 	}
 
 	/**
@@ -206,6 +200,7 @@ public OneWireContainer10(DSPortAdapter sourceAdapter, String newAddress) {
 	 *
 	 * @return this <code>OneWireContainer10</code> name
 	 */
+	@Override
 	public String getName() {
 		return "DS1920";
 	}
@@ -217,6 +212,7 @@ public String getName() {
 	 *
 	 * @return this <code>OneWireContainer10</code> alternate names
 	 */
+	@Override
 	public String getAlternateNames() {
 		return "DS18S20";
 	}
@@ -227,6 +223,7 @@ public String getAlternateNames() {
 	 *
 	 * @return <code>OneWireContainer10</code> functional description
 	 */
+	@Override
 	public String getDescription() {
 		return "Digital thermometer measures temperatures from " + "-55C to 100C in typically 0.2 seconds.  +/- 0.5C "
 				+ "Accuracy between 0C and 70C. 0.5C standard "
@@ -250,6 +247,7 @@ public String getDescription() {
 	 * @see #getTemperatureAlarm
 	 * @see #setTemperatureAlarm
 	 */
+	@Override
 	public boolean hasTemperatureAlarms() {
 		return true;
 	}
@@ -264,6 +262,7 @@ public boolean hasTemperatureAlarms() {
 	 * @see #getTemperatureResolutions
 	 * @see #setTemperatureResolution
 	 */
+	@Override
 	public boolean hasSelectableTemperatureResolution() {
 		return true;
 	}
@@ -279,8 +278,9 @@ public boolean hasSelectableTemperatureResolution() {
 	 * @see #getTemperatureResolution
 	 * @see #setTemperatureResolution
 	 */
+	@Override
 	public double[] getTemperatureResolutions() {
-		double[] resolutions = new double[2];
+		var resolutions = new double[2];
 
 		resolutions[0] = RESOLUTION_NORMAL;
 		resolutions[1] = RESOLUTION_MAXIMUM;
@@ -299,6 +299,7 @@ public double[] getTemperatureResolutions() {
 	 * @see #setTemperatureAlarm
 	 *
 	 */
+	@Override
 	public double getTemperatureAlarmResolution() {
 		return 1.0;
 	}
@@ -311,6 +312,7 @@ public double getTemperatureAlarmResolution() {
 	 *
 	 * @see #getMinTemperature
 	 */
+	@Override
 	public double getMaxTemperature() {
 		return 100.0;
 	}
@@ -323,6 +325,7 @@ public double getMaxTemperature() {
 	 *
 	 * @see #getMaxTemperature
 	 */
+	@Override
 	public double getMinTemperature() {
 		return -55.0;
 	}
@@ -347,43 +350,43 @@ public double getMinTemperature() {
 	 *
 	 * @see #getTemperature
 	 */
+	@Override
 	public void doTemperatureConvert(byte[] state) throws OneWireIOException, OneWireException {
-		doSpeed();
+		this.doSpeed();
 
 		// select the device
-		if (adapter.select(address)) {
-
-			// Setup Power Delivery
-			adapter.setPowerDuration(DSPortAdapter.DELIVERY_INFINITE);
-			adapter.startPowerDelivery(DSPortAdapter.CONDITION_AFTER_BYTE);
+		if (!this.adapter.select(this.address)) {
+			// device must not have been present
+			throw new OneWireIOException("OneWireContainer10-device not present");
+		}
+		// Setup Power Delivery
+		this.adapter.setPowerDuration(DSPortAdapter.DELIVERY_INFINITE);
+		this.adapter.startPowerDelivery(DSPortAdapter.CONDITION_AFTER_BYTE);
 
-			// send the convert temperature command
-			adapter.putByte(CONVERT_TEMPERATURE_COMMAND);
+		// send the convert temperature command
+		this.adapter.putByte(CONVERT_TEMPERATURE_COMMAND);
 
-			// delay for 750 ms
-			try {
-				Thread.sleep(750);
-			} catch (InterruptedException e) {
-			}
-
-			// Turn power back to normal.
-			adapter.setPowerNormal();
+		// delay for 750 ms
+		try {
+			Thread.sleep(750);
+		} catch (InterruptedException e) {
+		}
 
-			// check to see if the temperature conversion is over
-			if (adapter.getByte() != 0x0FF)
-				throw new OneWireIOException("OneWireContainer10-temperature conversion not complete");
+		// Turn power back to normal.
+		this.adapter.setPowerNormal();
 
-			// read the result
-			byte mode = state[4]; // preserve the resolution in the state
+		// check to see if the temperature conversion is over
+		if (this.adapter.getByte() != 0x0FF) {
+			throw new OneWireIOException("OneWireContainer10-temperature conversion not complete");
+		}
 
-			adapter.select(address);
-			readScratch(state);
+		// read the result
+		var mode = state[4]; // preserve the resolution in the state
 
-			state[4] = mode;
-		} else
+		this.adapter.select(this.address);
+		this.readScratch(state);
 
-			// device must not have been present
-			throw new OneWireIOException("OneWireContainer10-device not present");
+		state[4] = mode;
 	}
 
 	// --------
@@ -409,34 +412,31 @@ public void doTemperatureConvert(byte[] state) throws OneWireIOException, OneWir
 	 *
 	 * @see #doTemperatureConvert
 	 */
+	@Override
 	public double getTemperature(byte[] state) throws OneWireIOException {
 
 		// on some parts, namely the 18S20, you can get invalid readings.
 		// basically, the detection is that all the upper 8 bits should
 		// be the same by sign extension. the error condition (DS18S20
 		// returns 185.0+) violated that condition
-		if (((state[1] & 0x0ff) != 0x00) && ((state[1] & 0x0ff) != 0x0FF))
+		if ((state[1] & 0x0ff) != 0x00 && (state[1] & 0x0ff) != 0x0FF) {
 			throw new OneWireIOException("Invalid temperature data!");
+		}
 
-		short temp = (short) ((state[0] & 0x0ff) | (state[1] << 8));
+		var temp = (short) (state[0] & 0x0ff | state[1] << 8);
 
 		if (state[4] == 1) {
 			temp = (short) (temp >> 1); // lop off the last bit
 
 			// also takes care of the / 2.0
-			double tmp = (double) temp;
-			double cr = (state[6] & 0x0ff);
-			double cpc = (state[7] & 0x0ff);
-
-			// just let the thing throw a divide by zero exception
-			tmp = tmp - (double) 0.25 + (cpc - cr) / cpc;
-
-			return tmp;
-		} else {
+			double tmp = temp;
+			double cr = state[6] & 0x0ff;
+			double cpc = state[7] & 0x0ff;
 
-			// do normal resolution
-			return temp / 2.0;
+			return tmp - 0.25 + (cpc - cr) / cpc;
 		}
+		// do normal resolution
+		return temp / 2.0;
 	}
 
 	/**
@@ -453,8 +453,9 @@ public double getTemperature(byte[] state) throws OneWireIOException {
 	 * @see #hasTemperatureAlarms
 	 * @see #setTemperatureAlarm
 	 */
+	@Override
 	public double getTemperatureAlarm(int alarmType, byte[] state) {
-		return (double) state[alarmType == ALARM_LOW ? 3 : 2];
+		return state[alarmType == ALARM_LOW ? 3 : 2];
 	}
 
 	/**
@@ -470,9 +471,11 @@ public double getTemperatureAlarm(int alarmType, byte[] state) {
 	 * @see #getTemperatureResolutions
 	 * @see #setTemperatureResolution
 	 */
+	@Override
 	public double getTemperatureResolution(byte[] state) {
-		if (state[4] == 0)
+		if (state[4] == 0) {
 			return RESOLUTION_NORMAL;
+		}
 
 		return RESOLUTION_MAXIMUM;
 	}
@@ -494,14 +497,17 @@ public double getTemperatureResolution(byte[] state) {
 	 * @see #hasTemperatureAlarms
 	 * @see #getTemperatureAlarm
 	 */
+	@Override
 	public void setTemperatureAlarm(int alarmType, double alarmValue, byte[] state) {
-		if ((alarmType != ALARM_LOW) && (alarmType != ALARM_HIGH))
+		if (alarmType != ALARM_LOW && alarmType != ALARM_HIGH) {
 			throw new IllegalArgumentException("Invalid alarm type.");
+		}
 
-		if (alarmValue > 100.0 || alarmValue < -55.0)
+		if (alarmValue > 100.0 || alarmValue < -55.0) {
 			throw new IllegalArgumentException("Value for alarm not in accepted range.  Must be -55 C <-> +100 C.");
+		}
 
-		state[(alarmType == ALARM_LOW) ? 3 : 2] = (byte) alarmValue;
+		state[alarmType == ALARM_LOW ? 3 : 2] = (byte) alarmValue;
 	}
 
 	/**
@@ -520,14 +526,16 @@ public void setTemperatureAlarm(int alarmType, double alarmValue, byte[] state)
 	 * @see #getTemperatureResolution
 	 * @see #getTemperatureResolutions
 	 */
+	@Override
 	public void setTemperatureResolution(double resolution, byte[] state) {
 		synchronized (this) {
-			if (resolution == RESOLUTION_NORMAL)
-				normalResolution = true;
-			else
-				normalResolution = false;
+			if (resolution == RESOLUTION_NORMAL) {
+				this.normalResolution = true;
+			} else {
+				this.normalResolution = false;
+			}
 
-			state[4] = (byte) (normalResolution ? 0 : 1);
+			state[4] = (byte) (this.normalResolution ? 0 : 1);
 		}
 	}
 
@@ -540,7 +548,7 @@ public void setTemperatureResolution(double resolution, byte[] state) {
 	 *
 	 * @return <code>OneWireContainer10</code> state information. Device state looks
 	 *         like this:
-	 * 
+	 *
 	 *         <pre>
 	 *   0 : temperature LSB
 	 *   1 : temperature MSB
@@ -564,38 +572,40 @@ public void setTemperatureResolution(double resolution, byte[] state) {
 	 *
 	 * @see #writeDevice
 	 */
+	@Override
 	public byte[] readDevice() throws OneWireIOException, OneWireException {
 
-		byte[] data = new byte[8];
+		var data = new byte[8];
 
-		doSpeed();
+		this.doSpeed();
 
 		// select the device
-		if (adapter.select(address)) {
-
-			// construct a block to read the scratchpad
-			byte[] buffer = new byte[10];
+		if (!this.adapter.select(this.address)) {
+			throw new OneWireIOException("OneWireContainer10-Device not found on 1-Wire Network");
+		}
+		// construct a block to read the scratchpad
+		var buffer = new byte[10];
 
-			// read scratchpad command
-			buffer[0] = (byte) READ_SCRATCHPAD_COMMAND;
+		// read scratchpad command
+		buffer[0] = READ_SCRATCHPAD_COMMAND;
 
-			// now add the read bytes for data bytes and crc8
-			for (int i = 1; i < 10; i++)
-				buffer[i] = (byte) 0x0FF;
+		// now add the read bytes for data bytes and crc8
+		for (var i = 1; i < 10; i++) {
+			buffer[i] = (byte) 0x0FF;
+		}
 
-			// send the block
-			adapter.dataBlock(buffer, 0, buffer.length);
+		// send the block
+		this.adapter.dataBlock(buffer, 0, buffer.length);
 
-			// see if crc is correct
-			if (CRC8.compute(buffer, 1, 9) == 0)
-				System.arraycopy(buffer, 1, data, 0, 8);
-			else
-				throw new OneWireIOException("OneWireContainer10-Error reading CRC8 from device.");
-		} else
-			throw new OneWireIOException("OneWireContainer10-Device not found on 1-Wire Network");
+		// see if crc is correct
+		if (CRC8.compute(buffer, 1, 9) == 0) {
+			System.arraycopy(buffer, 1, data, 0, 8);
+		} else {
+			throw new OneWireIOException("OneWireContainer10-Error reading CRC8 from device.");
+		}
 
 		// we are just reading normalResolution here, no need to synchronize
-		data[4] = (byte) (normalResolution ? 0 : 1);
+		data[4] = (byte) (this.normalResolution ? 0 : 1);
 
 		return data;
 	}
@@ -619,19 +629,20 @@ public byte[] readDevice() throws OneWireIOException, OneWireException {
 	 *
 	 * @see #readDevice
 	 */
+	@Override
 	public void writeDevice(byte[] state) throws OneWireIOException, OneWireException {
-		doSpeed();
+		this.doSpeed();
 
-		byte[] temp = new byte[2];
+		var temp = new byte[2];
 
 		temp[0] = state[2];
 		temp[1] = state[3];
 
 		// Write it to the Scratchpad.
-		writeScratchpad(temp);
+		this.writeScratchpad(temp);
 
 		// Place in memory.
-		copyScratchpad();
+		this.copyScratchpad();
 	}
 
 	// --------
@@ -655,28 +666,29 @@ public void writeDevice(byte[] state) throws OneWireIOException, OneWireExceptio
 	private void readScratch(byte[] data) throws OneWireIOException, OneWireException {
 
 		// select the device
-		if (adapter.select(address)) {
-
-			// construct a block to read the scratchpad
-			byte[] buffer = new byte[10];
+		if (!this.adapter.select(this.address)) {
+			throw new OneWireIOException("OneWireContainer10-Device not found on 1-Wire Network");
+		}
+		// construct a block to read the scratchpad
+		var buffer = new byte[10];
 
-			// read scratchpad command
-			buffer[0] = (byte) READ_SCRATCHPAD_COMMAND;
+		// read scratchpad command
+		buffer[0] = READ_SCRATCHPAD_COMMAND;
 
-			// now add the read bytes for data bytes and crc8
-			for (int i = 1; i < 10; i++)
-				buffer[i] = (byte) 0x0FF;
+		// now add the read bytes for data bytes and crc8
+		for (var i = 1; i < 10; i++) {
+			buffer[i] = (byte) 0x0FF;
+		}
 
-			// send the block
-			adapter.dataBlock(buffer, 0, buffer.length);
+		// send the block
+		this.adapter.dataBlock(buffer, 0, buffer.length);
 
-			// see if crc is correct
-			if (CRC8.compute(buffer, 1, 9) == 0)
-				System.arraycopy(buffer, 1, data, 0, 8);
-			else
-				throw new OneWireIOException("OneWireContainer10-Error reading CRC8 from device.");
-		} else
-			throw new OneWireIOException("OneWireContainer10-Device not found on 1-Wire Network");
+		// see if crc is correct
+		if (CRC8.compute(buffer, 1, 9) == 0) {
+			System.arraycopy(buffer, 1, data, 0, 8);
+		} else {
+			throw new OneWireIOException("OneWireContainer10-Error reading CRC8 from device.");
+		}
 	}
 
 	/**
@@ -702,12 +714,13 @@ private void readScratch(byte[] data) throws OneWireIOException, OneWireExceptio
 	private void writeScratchpad(byte[] data) throws OneWireIOException, OneWireException, IllegalArgumentException {
 
 		// Variables.
-		byte[] write_block = new byte[3];
-		byte[] buffer = new byte[8];
+		var write_block = new byte[3];
+		var buffer = new byte[8];
 
 		// First do some error checking.
-		if (data.length != 2)
+		if (data.length != 2) {
 			throw new IllegalArgumentException("Bad data.  Data must consist of only TWO bytes.");
+		}
 
 		// Prepare the write_block to be sent.
 		write_block[0] = WRITE_SCRATCHPAD_COMMAND;
@@ -715,21 +728,20 @@ private void writeScratchpad(byte[] data) throws OneWireIOException, OneWireExce
 		write_block[2] = data[1];
 
 		// Send the block of data to the DS1920.
-		if (adapter.select(address))
-			adapter.dataBlock(write_block, 0, 3);
-		else
+		if (!this.adapter.select(this.address)) {
 			throw new OneWireIOException("OneWireContainer10 - Device not found");
+		}
+		this.adapter.dataBlock(write_block, 0, 3);
 
 		// Check data to ensure correctly received.
 		buffer = new byte[8];
 
-		readScratch(buffer);
+		this.readScratch(buffer);
 
 		// verify data
-		if ((buffer[2] != data[0]) || (buffer[3] != data[1]))
+		if (buffer[2] != data[0] || buffer[3] != data[1]) {
 			throw new OneWireIOException("OneWireContainer10 - data read back incorrect");
-
-		return;
+		}
 	}
 
 	/**
@@ -747,24 +759,23 @@ private void writeScratchpad(byte[] data) throws OneWireIOException, OneWireExce
 	private void copyScratchpad() throws OneWireIOException, OneWireException {
 
 		// select the device
-		if (adapter.select(address)) {
-
-			// send the copy command
-			adapter.putByte(COPY_SCRATCHPAD_COMMAND);
+		if (!this.adapter.select(this.address)) {
+			throw new OneWireIOException("OneWireContainer10 - device not found");
+		}
+		// send the copy command
+		this.adapter.putByte(COPY_SCRATCHPAD_COMMAND);
 
-			// Setup Power Delivery
-			adapter.setPowerDuration(DSPortAdapter.DELIVERY_INFINITE);
-			adapter.startPowerDelivery(DSPortAdapter.CONDITION_NOW);
+		// Setup Power Delivery
+		this.adapter.setPowerDuration(DSPortAdapter.DELIVERY_INFINITE);
+		this.adapter.startPowerDelivery(DSPortAdapter.CONDITION_NOW);
 
-			// delay for 10 ms
-			try {
-				Thread.sleep(10);
-			} catch (InterruptedException e) {
-			}
+		// delay for 10 ms
+		try {
+			Thread.sleep(10);
+		} catch (InterruptedException e) {
+		}
 
-			// Turn power back to normal.
-			adapter.setPowerNormal();
-		} else
-			throw new OneWireIOException("OneWireContainer10 - device not found");
+		// Turn power back to normal.
+		this.adapter.setPowerNormal();
 	}
 }
diff --git a/io.openems.edge.bridge.onewire/src/com/dalsemi/onewire/container/OneWireContainer12.java b/io.openems.edge.bridge.onewire/src/com/dalsemi/onewire/container/OneWireContainer12.java
index b58a279f928..ca6639fbac2 100644
--- a/io.openems.edge.bridge.onewire/src/com/dalsemi/onewire/container/OneWireContainer12.java
+++ b/io.openems.edge.bridge.onewire/src/com/dalsemi/onewire/container/OneWireContainer12.java
@@ -320,7 +320,7 @@ public class OneWireContainer12 extends OneWireContainer implements SwitchContai
 	/* DS2406 channel access command */
 	private static final byte CHANNEL_ACCESS_COMMAND = (byte) 0xF5;
 	/* internal buffer */
-	private byte[] buffer = new byte[7];
+	private final byte[] buffer = new byte[7];
 	private boolean clearactivity = false;
 	private boolean doSpeedEnable = true;
 
@@ -347,7 +347,6 @@ public class OneWireContainer12 extends OneWireContainer implements SwitchContai
 	 *      OneWireContainer12(DSPortAdapter,String)
 	 */
 	public OneWireContainer12() {
-		super();
 	}
 
 	/**
@@ -414,6 +413,7 @@ public OneWireContainer12(DSPortAdapter sourceAdapter, String newAddress) {
 	 *
 	 * @return iButton or 1-Wire device name
 	 */
+	@Override
 	public String getName() {
 		return "DS2406";
 	}
@@ -425,6 +425,7 @@ public String getName() {
 	 *
 	 * @return the alternate names for this iButton or 1-Wire device
 	 */
+	@Override
 	public String getAlternateNames() {
 		return "Dual Addressable Switch, DS2407";
 	}
@@ -435,6 +436,7 @@ public String getAlternateNames() {
 	 *
 	 * @return device description
 	 */
+	@Override
 	public String getDescription() {
 		return "1-Wire Dual Addressable Switch.  PIO pin channel " + "A sink capability of typical 50mA at 0.4V with "
 				+ "soft turn-on; optional channel B typical 10 mA at "
@@ -449,14 +451,15 @@ public String getDescription() {
 	 * MemoryBank}, {@link com.dalsemi.onewire.container.PagedMemoryBank
 	 * PagedMemoryBank}, and {@link com.dalsemi.onewire.container.OTPMemoryBank
 	 * OTPMemoryBank}.
-	 * 
+	 *
 	 * @return <CODE>Enumeration</CODE> of memory banks
 	 */
+	@Override
 	public Enumeration<MemoryBank> getMemoryBanks() {
-		Vector<MemoryBank> bank_vector = new Vector<>(2);
+		var bank_vector = new Vector<MemoryBank>(2);
 
 		// EPROM main bank
-		MemoryBankEPROM mn = new MemoryBankEPROM(this);
+		var mn = new MemoryBankEPROM(this);
 
 		mn.numberPages = 4;
 		mn.size = 128;
@@ -464,7 +467,7 @@ public Enumeration<MemoryBank> getMemoryBanks() {
 		bank_vector.addElement(mn);
 
 		// EPROM status write protect pages bank
-		MemoryBankEPROM st = new MemoryBankEPROM(this);
+		var st = new MemoryBankEPROM(this);
 
 		st.bankDescription = "Write protect pages, Page redirection, Switch control";
 		st.numberPages = 1;
@@ -508,7 +511,7 @@ public Enumeration<MemoryBank> getMemoryBanks() {
 	 * @see com.dalsemi.onewire.container.OneWireSensor#readDevice()
 	 */
 	public boolean isPowerSupplied(byte[] state) {
-		return ((state[0] & 0x80) == 0x80);
+		return (state[0] & 0x80) == 0x80;
 	}
 
 	/**
@@ -524,8 +527,9 @@ public boolean isPowerSupplied(byte[] state) {
 	 *
 	 * @see com.dalsemi.onewire.container.OneWireSensor#readDevice()
 	 */
+	@Override
 	public int getNumberChannels(byte[] state) {
-		return ((state[0] & 0x40) == 0x40) ? 2 : 1;
+		return (state[0] & 0x40) == 0x40 ? 2 : 1;
 	}
 
 	/**
@@ -539,6 +543,7 @@ public int getNumberChannels(byte[] state) {
 	 *
 	 * @see #getLatchState(int,byte[])
 	 */
+	@Override
 	public boolean isHighSideSwitch() {
 		return false;
 	}
@@ -553,6 +558,7 @@ public boolean isHighSideSwitch() {
 	 * @see #getSensedActivity(int,byte[])
 	 * @see #clearActivity()
 	 */
+	@Override
 	public boolean hasActivitySensing() {
 		return true;
 	}
@@ -566,6 +572,7 @@ public boolean hasActivitySensing() {
 	 *
 	 * @see #getLevel(int,byte[])
 	 */
+	@Override
 	public boolean hasLevelSensing() {
 		return true;
 	}
@@ -582,6 +589,7 @@ public boolean hasLevelSensing() {
 	 *
 	 * @see #setLatchState(int,boolean,boolean,byte[])
 	 */
+	@Override
 	public boolean hasSmartOn() {
 		return false;
 	}
@@ -597,6 +605,7 @@ public boolean hasSmartOn() {
 	 *
 	 * @see #setLatchState(int,boolean,boolean,byte[])
 	 */
+	@Override
 	public boolean onlySingleChannelOn() {
 		return false;
 	}
@@ -622,11 +631,12 @@ public boolean onlySingleChannelOn() {
 	 * @see com.dalsemi.onewire.container.OneWireSensor#readDevice()
 	 * @see #hasLevelSensing()
 	 */
+	@Override
 	public boolean getLevel(int channel, byte[] state) {
-		if (channel == 0)
-			return ((state[0] & 0x04) == 0x04);
-		else
-			return ((state[0] & 0x08) == 0x08);
+		if (channel == 0) {
+			return (state[0] & 0x04) == 0x04;
+		}
+		return (state[0] & 0x08) == 0x08;
 	}
 
 	/**
@@ -646,12 +656,12 @@ public boolean getLevel(int channel, byte[] state) {
 	 * @see #isHighSideSwitch()
 	 * @see #setLatchState(int,boolean,boolean,byte[])
 	 */
+	@Override
 	public boolean getLatchState(int channel, byte[] state) {
 		if (channel == 0) {
-			return ((state[1] & 0x20) != 0x20);
-		} else {
-			return ((state[1] & 0x40) != 0x40);
+			return (state[1] & 0x20) != 0x20;
 		}
+		return (state[1] & 0x40) != 0x40;
 	}
 
 	/**
@@ -672,11 +682,12 @@ public boolean getLatchState(int channel, byte[] state) {
 	 * @see #hasActivitySensing()
 	 * @see #clearActivity()
 	 */
+	@Override
 	public boolean getSensedActivity(int channel, byte[] state) {
-		if (channel == 0)
-			return ((state[0] & 0x10) == 0x10);
-		else
-			return ((state[0] & 0x20) == 0x20);
+		if (channel == 0) {
+			return (state[0] & 0x10) == 0x10;
+		}
+		return (state[0] & 0x20) == 0x20;
 	}
 
 	/**
@@ -697,9 +708,10 @@ public boolean getSensedActivity(int channel, byte[] state) {
 	 * @see com.dalsemi.onewire.container.OneWireSensor#readDevice()
 	 * @see #getSensedActivity(int,byte[])
 	 */
+	@Override
 	public void clearActivity() {
 		synchronized (this) {
-			clearactivity = true;
+			this.clearactivity = true;
 		}
 	}
 
@@ -731,15 +743,18 @@ public void clearActivity() {
 	 * @see #getLatchState(int,byte[])
 	 * @see com.dalsemi.onewire.container.OneWireSensor#writeDevice(byte[])
 	 */
+	@Override
 	public void setLatchState(int channel, boolean latchState, boolean doSmart, byte[] state) {
 		if (channel == 0) {
 			state[1] &= (byte) 0xdf;
-			if (!latchState)
+			if (!latchState) {
 				state[1] = (byte) (state[1] | 0x20);
+			}
 		} else {
 			state[1] &= (byte) 0xbf;
-			if (!latchState)
+			if (!latchState) {
 				state[1] = (byte) (state[1] | 0x40);
+			}
 		}
 	}
 
@@ -759,8 +774,9 @@ public void setLatchState(int channel, boolean latchState, boolean doSmart, byte
 	 * @throws OneWireException   on a communication or setup error with the 1-Wire
 	 *                            adapter
 	 */
+	@Override
 	public byte[] readDevice() throws OneWireIOException, OneWireException {
-		byte[] state = new byte[2];
+		var state = new byte[2];
 
 		// the first byte is the raw status
 		// the second byte is for writing
@@ -768,47 +784,50 @@ public byte[] readDevice() throws OneWireIOException, OneWireException {
 		// the status we are interested in reading does not
 		// look the same as the status we are interested in writing
 		synchronized (this) {
-			if (doSpeedEnable)
-				doSpeed();
+			if (this.doSpeedEnable) {
+				this.doSpeed();
+			}
 
 			// select the device
-			if (adapter.select(address)) {
+			if (this.adapter.select(this.address)) {
 
 				// channel access command
-				buffer[0] = CHANNEL_ACCESS_COMMAND;
+				this.buffer[0] = CHANNEL_ACCESS_COMMAND;
 
 				// send the control bytes
-				if (clearactivity) {
-					buffer[1] = (byte) 0xD5;
-					clearactivity = false;
+				if (this.clearactivity) {
+					this.buffer[1] = (byte) 0xD5;
+					this.clearactivity = false;
 				} else {
-					buffer[1] = (byte) 0x55;
+					this.buffer[1] = (byte) 0x55;
 				}
 
-				buffer[2] = (byte) 0xFF;
+				this.buffer[2] = (byte) 0xFF;
 
 				// read the info, dummy and CRC16
-				for (int i = 3; i < 7; i++)
-					buffer[i] = (byte) 0xFF;
+				for (var i = 3; i < 7; i++) {
+					this.buffer[i] = (byte) 0xFF;
+				}
 
 				// send the block
-				adapter.dataBlock(buffer, 0, 7);
+				this.adapter.dataBlock(this.buffer, 0, 7);
 
 				// calculate the CRC16 on the result and check if correct
-				if (CRC16.compute(buffer, 0, 7, 0) == 0xB001) {
-					state[0] = buffer[3];
+				if (CRC16.compute(this.buffer, 0, 7, 0) == 0xB001) {
+					state[0] = this.buffer[3];
 
 					// let's read the status byte 7 and get the data there
-					buffer[0] = (byte) 0x0aa; // READ_STATUS
-					buffer[1] = 7; // address to read
-					buffer[2] = 0;
-					for (int i = 3; i < 6; i++) // plus room for the CRC
-						buffer[i] = (byte) 0x0ff;
-					adapter.reset();
-					adapter.select(address);
-					adapter.dataBlock(buffer, 0, 6);
-					if (CRC16.compute(buffer, 0, 6, 0) == 0xB001) {
-						state[1] = buffer[3];
+					this.buffer[0] = (byte) 0x0aa; // READ_STATUS
+					this.buffer[1] = 7; // address to read
+					this.buffer[2] = 0;
+					for (var i = 3; i < 6; i++) {
+						this.buffer[i] = (byte) 0x0ff;
+					}
+					this.adapter.reset();
+					this.adapter.select(this.address);
+					this.adapter.dataBlock(this.buffer, 0, 6);
+					if (CRC16.compute(this.buffer, 0, 6, 0) == 0xB001) {
+						state[1] = this.buffer[3];
 						return state;
 					}
 				}
@@ -834,35 +853,38 @@ public byte[] readDevice() throws OneWireIOException, OneWireException {
 	 * @throws OneWireException   on a communication or setup error with the 1-Wire
 	 *                            adapter
 	 */
+	@Override
 	public void writeDevice(byte[] state) throws OneWireIOException, OneWireException {
-		if (doSpeedEnable)
-			doSpeed();
+		if (this.doSpeedEnable) {
+			this.doSpeed();
+		}
 
-		if (adapter.select(address)) {
+		if (this.adapter.select(this.address)) {
 			synchronized (this) {
 
 				// create a block to set the switch state
 				// read memory and counter command
 				// write status command
-				buffer[0] = WRITE_STATUS_COMMAND;
+				this.buffer[0] = WRITE_STATUS_COMMAND;
 
 				// address of switch state in status
-				buffer[1] = 0x07;
-				buffer[2] = 0x00;
+				this.buffer[1] = 0x07;
+				this.buffer[2] = 0x00;
 
 				// write state
-				buffer[3] = (byte) state[1];
+				this.buffer[3] = state[1];
 
 				// read CRC16
-				buffer[4] = (byte) 0xFF;
-				buffer[5] = (byte) 0xFF;
+				this.buffer[4] = (byte) 0xFF;
+				this.buffer[5] = (byte) 0xFF;
 
 				// send the block
-				adapter.dataBlock(buffer, 0, 6);
+				this.adapter.dataBlock(this.buffer, 0, 6);
 
 				// calculate the CRC16 on the result and check if correct
-				if (CRC16.compute(buffer, 0, 6, 0) == 0xB001)
+				if (CRC16.compute(this.buffer, 0, 6, 0) == 0xB001) {
 					return;
+				}
 			}
 		}
 
@@ -886,7 +908,7 @@ public void writeDevice(byte[] state) throws OneWireIOException, OneWireExceptio
 	 * @see OneWireContainer#doSpeed()
 	 */
 	public synchronized void setSpeedCheck(boolean doSpeedCheck) {
-		doSpeedEnable = doSpeedCheck;
+		this.doSpeedEnable = doSpeedCheck;
 	}
 
 	/**
@@ -1021,7 +1043,7 @@ public void setSearchConditions(byte channel, byte source, byte polarity, byte[]
 	 * @param CRCMode       The 2406/7 supports 4 CRC generation modes for error
 	 *                      detection when performing channel access. This argument
 	 *                      should have one of the following values:
-	 * 
+	 *
 	 *                      <pre>
 	 * <code>
 	 *     CRC_DISABLE        Never generate a CRC
@@ -1030,7 +1052,7 @@ public void setSearchConditions(byte channel, byte source, byte polarity, byte[]
 	 *     CRC_EVERY_32_BYTES Generate a CRC after every 32 bytes.
 	 * </code>
 	 *                      </pre>
-	 * 
+	 *
 	 *                      Invalid values will be masked to valid values. The CRC
 	 *                      is 16 bits, and does not get passed back with the
 	 *                      output. This method returns <code>null</code> on a CRC
@@ -1038,7 +1060,7 @@ public void setSearchConditions(byte channel, byte source, byte polarity, byte[]
 	 *
 	 * @param channelMode   The 2406/7 supports 3 modes of channel communication.
 	 *                      This argument should take one of the following values:
-	 * 
+	 *
 	 *                      <pre>
 	 * <code>
 	 *     CHANNEL_A_ONLY  Only communicate with PIO A
@@ -1046,7 +1068,7 @@ public void setSearchConditions(byte channel, byte source, byte polarity, byte[]
 	 *     CHANNEL_BOTH    Communicate with both PIO's
 	 * </code>
 	 *                      </pre>
-	 * 
+	 *
 	 *                      If <code>CHANNEL_BOTH</code> is selected, data is
 	 *                      written and read from the input buffer to the two
 	 *                      channels. See the datasheet for a description of
@@ -1090,24 +1112,28 @@ public byte[] channelAccess(byte[] inbuffer, boolean toggleRW, boolean readIniti
 		CRCMode = CRCMode & 0x03; // MASK THIS TO ACCEPTABLE VALUE
 		channelMode = channelMode & 0x0c; // MASK THIS TO ACCEPTABLE VALUE
 
-		if (channelMode == 0)
+		if (channelMode == 0) {
 			channelMode = 0x04; // CHANNELMODE CANNOT BE 0
+		}
 
-		if (interleave && (channelMode != CHANNEL_BOTH)) // CANNOT INTERLEAVE WITH ONLY 1 CHANNEL
+		if (interleave && channelMode != CHANNEL_BOTH) {
 			interleave = false;
+		}
 
-		if (doSpeedEnable)
-			doSpeed();
+		if (this.doSpeedEnable) {
+			this.doSpeed();
+		}
 
-		if (adapter.select(address)) {
+		if (this.adapter.select(this.address)) {
 			int crc16;
 			int i;
 
 			// now figure out how many bytes my output buffer needs to be
-			int inlength = inbuffer.length;
+			var inlength = inbuffer.length;
 
-			if (toggleRW)
-				inlength = (inlength << 1); // = inlength * 2
+			if (toggleRW) {
+				inlength = inlength << 1; // = inlength * 2
+			}
 
 			switch (CRCMode) {
 			default:
@@ -1115,14 +1141,14 @@ public byte[] channelAccess(byte[] inbuffer, boolean toggleRW, boolean readIniti
 				inlength = inlength * 3; // length + 2*length
 				break;
 			case CRC_EVERY_8_BYTES: // we need to allow for 2 CRC bytes for every 8 bytes of length
-				inlength = inlength + ((inlength >> 3) << 1); // (length DIV 8) * 2
+				inlength = inlength + (inlength >> 3 << 1); // (length DIV 8) * 2
 				break;
 			case CRC_EVERY_32_BYTES: // we need to allow for 2 CRC bytes for every 32 bytes of length
-				inlength = inlength + ((inlength >> 5) << 1); // (length DIV 32) * 2
+				inlength = inlength + (inlength >> 5 << 1); // (length DIV 32) * 2
 				break;
 			}
 
-			byte[] outputbuffer = new byte[inlength + 3 + 1]; // 3 control bytes + 1 information byte
+			var outputbuffer = new byte[inlength + 3 + 1]; // 3 control bytes + 1 information byte
 
 			outputbuffer[0] = CHANNEL_ACCESS_COMMAND;
 			crc16 = CRC16.compute(CHANNEL_ACCESS_COMMAND & 0x0FF);
@@ -1133,8 +1159,9 @@ public byte[] channelAccess(byte[] inbuffer, boolean toggleRW, boolean readIniti
 			outputbuffer[2] = (byte) 0xFF;
 			crc16 = CRC16.compute(outputbuffer, 1, 2, crc16);
 
-			for (i = 3; i < outputbuffer.length; i++)
+			for (i = 3; i < outputbuffer.length; i++) {
 				outputbuffer[i] = (byte) 0xff;
+			}
 
 			// now for the hard part: putting the right outputbuffer into the array
 			// first lets see if we can skip this stage, ie on just a read
@@ -1152,19 +1179,19 @@ public byte[] channelAccess(byte[] inbuffer, boolean toggleRW, boolean readIniti
 			 * every 32 bytes c read on 0 Read a byte, write a byte, no CRC d read on 1 Read
 			 * a byte, CRC, write a byte, CRC e read on 8 Read a byte, write a byte X 4 then
 			 * a CRC f read on 32 Read a byte, write a byte X 16 then a CRC
-			 * 
+			 *
 			 * Options 0-3 require that we space the input buffer for the CRCs. Options 8-b
 			 * require no extra work, since we have already loaded the buffer with FF's for
 			 * reads. Options 4 and c require that we interleave the write bytes and the
 			 * read FF's Options 5 and d require that we interleace write byte, CRC space,
 			 * read byte, CRC space Other options are really messy
-			 * 
+			 *
 			 * ...Brain
 			 */
-			int j = 4; // outputbuffer 0-2 is command bytes, outputbuffer[3] is return info
-			int option = outputbuffer[1] & 0x63; // get the bits out we want for toggle, initial, and CRC
+			var j = 4; // outputbuffer 0-2 is command bytes, outputbuffer[3] is return info
+			var option = outputbuffer[1] & 0x63; // get the bits out we want for toggle, initial, and CRC
 
-			option = ((option >> 3) | option) & 0x0f; // now lets make it a number 0-15
+			option = (option >> 3 | option) & 0x0f; // now lets make it a number 0-15
 
 			/*
 			 * switch (option) { case 0 : case 1 : case 2 : case 3 : for
@@ -1185,53 +1212,56 @@ public byte[] channelAccess(byte[] inbuffer, boolean toggleRW, boolean readIniti
 			 * places for reading the CRC's and reading the data from the channels. the
 			 * previous code is left because it makes a little more sense in that form. at
 			 * least i think so.
-			 * 
+			 *
 			 * ...Pinky
 			 */
-			if ((option < 8) || (option > 0x0b)) // if this is not a read-only (which we need do nothing for)
+			if (option < 8 || option > 0x0b) // if this is not a read-only (which we need do nothing for)
 			{
 				for (i = 0; i < inbuffer.length; i++) {
-					if (option > 0x0b) // then we are reading first
-						j = j + fixJ((i * 2) + 1, option); // leave a space for a read, and the CRC if need be
+					if (option > 0x0b) {
+						j = j + this.fixJ(i * 2 + 1, option); // leave a space for a read, and the CRC if need be
+					}
 
 					outputbuffer[j] = inbuffer[i]; // write this data
 
-					if (option < 0x04) // if this is only a write
-						j = j + fixJ(i + 1, option); // leave a space for CRC if needed, else just increment
-					else // else we are toggling
+					if (option < 0x04) {
+						j = j + this.fixJ(i + 1, option); // leave a space for CRC if needed, else just increment
+					} else // else we are toggling
 					{
-						if (option < 0x08) // this is a write-first toggle
-							j = j + fixJ((i * 2) + 1, option); // so leave a space for a read
+						if (option < 0x08) {
+							j = j + this.fixJ(i * 2 + 1, option); // so leave a space for a read
+						}
 
-						j = j + fixJ((i * 2) + 2, option); // now leave a space for the CRC
+						j = j + this.fixJ(i * 2 + 2, option); // now leave a space for the CRC
 					}
 				}
 			}
 
 			// now our output buffer should be set correctly
 			// send the block Pinky!
-			adapter.dataBlock(outputbuffer, 0, outputbuffer.length);
+			this.adapter.dataBlock(outputbuffer, 0, outputbuffer.length);
 
 			// calculate the CRC16 within the resulting buffer for integrity
 			// start at offset 3 for the information byte
 			crc16 = CRC16.compute(outputbuffer[3], crc16);
 			j = 0; // j will be how many bytes we are into the buffer - CRC bytes read
 
-			int k = 0; // index into the return buffer
-			boolean fresh = false; // whether or not we need to reinitialize the CRC calculation
-			byte[] returnbuffer = new byte[inbuffer.length];
+			var k = 0; // index into the return buffer
+			var fresh = false; // whether or not we need to reinitialize the CRC calculation
+			var returnbuffer = new byte[inbuffer.length];
 
 			for (i = 4; i < outputbuffer.length; i++) {
 				if (CRCMode != CRC_DISABLE) {
 					if (fresh) {
 						crc16 = CRC16.compute(outputbuffer[i]);
 						fresh = false;
-					} else
+					} else {
 						crc16 = CRC16.compute(outputbuffer[i], crc16);
+					}
 				}
 
-				if ((!toggleRW && readInitially) || (toggleRW && readInitially && ((j & 0x01) == 0x00))
-						|| (toggleRW && !readInitially && ((j & 0x01) == 0x01))) {
+				if (!toggleRW && readInitially || toggleRW && readInitially && (j & 0x01) == 0x00
+						|| toggleRW && !readInitially && (j & 0x01) == 0x01) {
 					returnbuffer[k] = outputbuffer[i];
 
 					k++;
@@ -1239,13 +1269,14 @@ public byte[] channelAccess(byte[] inbuffer, boolean toggleRW, boolean readIniti
 
 				j++;
 
-				if ((fixJ(j, option) > 1) && (CRCMode != CRC_DISABLE)) // means that we should look for a CRC
+				if (this.fixJ(j, option) > 1 && CRCMode != CRC_DISABLE) // means that we should look for a CRC
 				{
 					crc16 = CRC16.compute(outputbuffer, i + 1, 2, crc16);
 					i += 2;
 
-					if (crc16 != 0xb001)
+					if (crc16 != 0xb001) {
 						throw new OneWireIOException("Invalid CRC");
+					}
 
 					fresh = true;
 				}
@@ -1268,7 +1299,7 @@ public byte[] channelAccess(byte[] inbuffer, boolean toggleRW, boolean readIniti
 	 * output buffer. should be called after every setting of a value.
 	 *
 	 * @param current_index current index into the channel access array
-	 * 
+	 *
 	 * @param option_mask contains data on CRC generation
 	 *
 	 * @return amount to increment the index variable
@@ -1284,21 +1315,22 @@ private int fixJ(int current_index, int option_mask) {
 		case 0x01:
 			return 3; // 2-byte CRC after every byte
 		default: // must be 0x02 (after 8 bytes) or 0x03 (after 32 bytes)
-			if ((current_index & (8 + (24 * (option_mask & 0x01)) - 1)) == 0)
+			if ((current_index & 8 + 24 * (option_mask & 0x01) - 1) == 0) {
 				return 3;
+			}
 
 			/*
 			 * OK let me explain that last piece of code: The only return values are going
 			 * to be 1 and 3, 1 for a normal increment and 3 if we want to leave space to
 			 * receive a CRC.
-			 * 
+			 *
 			 * So the mask gets the bits out that are concerned with the CRC. When its 0 it
 			 * means that the CRC is disabled, so the next location into our destination
 			 * array we need to copy into is just the next available location.
-			 * 
+			 *
 			 * When it is 1, it means we will receive a CRC after each transmission, so we
 			 * should leave a 2 byte space for it (thus increment by 3).
-			 * 
+			 *
 			 * When it is 2, it means that after every 8 bytes we want to receive a CRC byte
 			 * pair. When it is a 3, it means that every 32 bytes we want the CRC pair. So
 			 * what we want to check is if the current_index is divisible by 8 or 32 (we do
diff --git a/io.openems.edge.bridge.onewire/src/com/dalsemi/onewire/container/OneWireContainer13.java b/io.openems.edge.bridge.onewire/src/com/dalsemi/onewire/container/OneWireContainer13.java
index 45540462691..bea51d4cf13 100644
--- a/io.openems.edge.bridge.onewire/src/com/dalsemi/onewire/container/OneWireContainer13.java
+++ b/io.openems.edge.bridge.onewire/src/com/dalsemi/onewire/container/OneWireContainer13.java
@@ -46,7 +46,7 @@
  * portable memory device. The 1-Wire Chip version is used for small
  * non-volatile storage.
  * </P>
- * 
+ *
  * <H3>Features</H3>
  * <UL>
  * <LI>4096 bits (512 bytes) Electrically Programmable Read-Only Memory (EPROM)
@@ -63,19 +63,19 @@
  * 12.0V from -40@htmlonly &#176C @endhtmlonly to +50@htmlonly
  * &#176C @endhtmlonly
  * </UL>
- * 
+ *
  * <H3>Alternate Names</H3>
  * <UL>
  * <LI>D2503
  * </UL>
  *
  * <H3>Memory</H3>
- * 
+ *
  * <P>
  * The memory can be accessed through the objects that are returned from the
  * {@link #getMemoryBanks() getMemoryBanks} method.
  * </P>
- * 
+ *
  * The following is a list of the MemoryBank instances that are returned:
  *
  * <UL>
@@ -144,9 +144,9 @@
  * <LI><I> Page Features </I> page-device-CRC
  * </UL>
  * </UL>
- * 
+ *
  * <H3>Usage</H3>
- * 
+ *
  * <DL>
  * <DD>See the usage example in
  * {@link com.dalsemi.onewire.container.OneWireContainer OneWireContainer} to
@@ -161,14 +161,14 @@
  * <DL>
  * <DD>(not available)
  * </DL>
- * 
+ *
  * @see com.dalsemi.onewire.container.MemoryBank
  * @see com.dalsemi.onewire.container.PagedMemoryBank
  * @see com.dalsemi.onewire.container.OTPMemoryBank
  * @see com.dalsemi.onewire.container.OneWireContainer09
  * @see com.dalsemi.onewire.container.OneWireContainer0B
  * @see com.dalsemi.onewire.container.OneWireContainer0F
- * 
+ *
  * @version 0.00, 28 Aug 2000
  * @author DS
  */
@@ -190,7 +190,6 @@ public class OneWireContainer13 extends OneWireContainer {
 	 *      super.setupContainer()
 	 */
 	public OneWireContainer13() {
-		super();
 	}
 
 	/**
@@ -262,6 +261,7 @@ public OneWireContainer13(DSPortAdapter sourceAdapter, String newAddress) {
 	 *
 	 * @return iButton or 1-Wire device name
 	 */
+	@Override
 	public String getName() {
 		return "DS1983";
 	}
@@ -273,6 +273,7 @@ public String getName() {
 	 *
 	 * @return 1-Wire device alternate names
 	 */
+	@Override
 	public String getAlternateNames() {
 		return "DS2503";
 	}
@@ -283,6 +284,7 @@ public String getAlternateNames() {
 	 *
 	 * @return device description
 	 */
+	@Override
 	public String getDescription() {
 		return "4096 bit Electrically Programmable Read Only Memory "
 				+ "(EPROM) partitioned into sixteen 256 bit pages."
@@ -297,14 +299,15 @@ public String getDescription() {
 	 * MemoryBank}, {@link com.dalsemi.onewire.container.PagedMemoryBank
 	 * PagedMemoryBank}, and {@link com.dalsemi.onewire.container.OTPMemoryBank
 	 * OTPMemoryBank}.
-	 * 
+	 *
 	 * @return <CODE>Enumeration</CODE> of memory banks
 	 */
+	@Override
 	public Enumeration<MemoryBank> getMemoryBanks() {
-		Vector<MemoryBank> bank_vector = new Vector<>(5);
+		var bank_vector = new Vector<MemoryBank>(5);
 
 		// EPROM main bank
-		MemoryBankEPROM mn = new MemoryBankEPROM(this);
+		var mn = new MemoryBankEPROM(this);
 
 		mn.numberPages = 16;
 		mn.size = 512;
@@ -312,7 +315,7 @@ public Enumeration<MemoryBank> getMemoryBanks() {
 		bank_vector.addElement(mn);
 
 		// EPROM status write protect pages bank
-		MemoryBankEPROM wp = new MemoryBankEPROM(this);
+		var wp = new MemoryBankEPROM(this);
 
 		wp.bankDescription = "Write protect pages";
 		wp.numberPages = 1;
@@ -329,7 +332,7 @@ public Enumeration<MemoryBank> getMemoryBanks() {
 		bank_vector.addElement(wp);
 
 		// EPROM status write protect redirection bank
-		MemoryBankEPROM wpr = new MemoryBankEPROM(this);
+		var wpr = new MemoryBankEPROM(this);
 
 		wpr.bankDescription = "Write protect redirection";
 		wpr.numberPages = 1;
@@ -347,7 +350,7 @@ public Enumeration<MemoryBank> getMemoryBanks() {
 		bank_vector.addElement(wpr);
 
 		// EPROM status bitmap
-		MemoryBankEPROM bm = new MemoryBankEPROM(this);
+		var bm = new MemoryBankEPROM(this);
 
 		bm.bankDescription = "Bitmap of used pages for file structure";
 		bm.numberPages = 1;
@@ -365,7 +368,7 @@ public Enumeration<MemoryBank> getMemoryBanks() {
 		bank_vector.addElement(bm);
 
 		// EPROM status redirection
-		MemoryBankEPROM rd = new MemoryBankEPROM(this);
+		var rd = new MemoryBankEPROM(this);
 
 		rd.bankDescription = "Page redirection bytes";
 		rd.generalPurposeMemory = false;
diff --git a/io.openems.edge.bridge.onewire/src/com/dalsemi/onewire/container/OneWireContainer14.java b/io.openems.edge.bridge.onewire/src/com/dalsemi/onewire/container/OneWireContainer14.java
index 4f8067344f1..41be239c741 100644
--- a/io.openems.edge.bridge.onewire/src/com/dalsemi/onewire/container/OneWireContainer14.java
+++ b/io.openems.edge.bridge.onewire/src/com/dalsemi/onewire/container/OneWireContainer14.java
@@ -46,7 +46,7 @@
  * portable memory device. The 1-Wire Chip version is used for small
  * non-volatile storage.
  * </P>
- * 
+ *
  * <H3>Features</H3>
  * <UL>
  * <LI>256 bits (32 bytes) Electrically Erasable Programmable Read Only Memory
@@ -59,19 +59,19 @@
  * -40@htmlonly &#176C @endhtmlonly to +85@htmlonly &#176C @endhtmlonly
  * environments
  * </UL>
- * 
+ *
  * <H3>Alternate Names</H3>
  * <UL>
  * <LI>DS2430A
  * </UL>
  *
  * <H3>Memory</H3>
- * 
+ *
  * <P>
  * The memory can be accessed through the objects that are returned from the
  * {@link #getMemoryBanks() getMemoryBanks} method.
  * </P>
- * 
+ *
  * The following is a list of the MemoryBank instances that are returned:
  *
  * <UL>
@@ -99,9 +99,9 @@
  * <LI><I> Extra information for each page</I> Page Locked flag, length 1
  * </UL>
  * </UL>
- * 
+ *
  * <H3>Usage</H3>
- * 
+ *
  * <DL>
  * <DD>See the usage example in
  * {@link com.dalsemi.onewire.container.OneWireContainer OneWireContainer} to
@@ -119,11 +119,11 @@
  * <DD><A HREF="http://pdfserv.maxim-ic.com/arpdf/DS2430A.pdf">
  * http://pdfserv.maxim-ic.com/arpdf/DS2430A.pdf</A>
  * </DL>
- * 
+ *
  * @see com.dalsemi.onewire.container.MemoryBank
  * @see com.dalsemi.onewire.container.PagedMemoryBank
  * @see com.dalsemi.onewire.container.OneWireContainer14
- * 
+ *
  * @version 0.00, 28 Aug 2000
  * @author DS
  */
@@ -145,7 +145,6 @@ public class OneWireContainer14 extends OneWireContainer {
 	 *      super.setupContainer()
 	 */
 	public OneWireContainer14() {
-		super();
 	}
 
 	/**
@@ -217,6 +216,7 @@ public OneWireContainer14(DSPortAdapter sourceAdapter, String newAddress) {
 	 *
 	 * @return iButton or 1-Wire device name
 	 */
+	@Override
 	public String getName() {
 		return "DS1971";
 	}
@@ -228,6 +228,7 @@ public String getName() {
 	 *
 	 * @return 1-Wire device alternate names
 	 */
+	@Override
 	public String getAlternateNames() {
 		return "DS2430A";
 	}
@@ -238,6 +239,7 @@ public String getAlternateNames() {
 	 *
 	 * @return device description
 	 */
+	@Override
 	public String getDescription() {
 		return "Electrically Erasable Programmable Read Only Memory "
 				+ "(EEPROM) organized as one page of 256 bits and 64 bit "
@@ -250,11 +252,12 @@ public String getDescription() {
 	 * MemoryBank}, {@link com.dalsemi.onewire.container.PagedMemoryBank
 	 * PagedMemoryBank}, and {@link com.dalsemi.onewire.container.OTPMemoryBank
 	 * OTPMemoryBank}.
-	 * 
+	 *
 	 * @return <CODE>Enumeration</CODE> of memory banks
 	 */
+	@Override
 	public Enumeration<MemoryBank> getMemoryBanks() {
-		Vector<MemoryBank> bank_vector = new Vector<>(1);
+		var bank_vector = new Vector<MemoryBank>(1);
 
 		// EEPROM
 		bank_vector.addElement(new MemoryBankEE(this));
diff --git a/io.openems.edge.bridge.onewire/src/com/dalsemi/onewire/container/OneWireContainer18.java b/io.openems.edge.bridge.onewire/src/com/dalsemi/onewire/container/OneWireContainer18.java
index 4232277107b..96d989ec27c 100644
--- a/io.openems.edge.bridge.onewire/src/com/dalsemi/onewire/container/OneWireContainer18.java
+++ b/io.openems.edge.bridge.onewire/src/com/dalsemi/onewire/container/OneWireContainer18.java
@@ -28,6 +28,7 @@
 
 package com.dalsemi.onewire.container;
 
+import java.util.Arrays;
 import java.util.Enumeration;
 import java.util.Vector;
 
@@ -63,7 +64,7 @@
  * SHAiButton} does these. The <code>SHAiButton</code> class exists on top of
  * this class, making higher level calls to implement transactions.
  * </p>
- * 
+ *
  * <p>
  * This container makes use of several optimizations to help it run fast on
  * TINI. These optimizations do little for the PC, but they do not slow down the
@@ -225,7 +226,7 @@ public class OneWireContainer18 extends OneWireContainer {
 	 * number of times we wait for the 10101010... to appear on commands such as
 	 * read_auth_page, copy_scratch...
 	 */
-	private int block_wait_count = 20;
+	private final int block_wait_count = 20;
 
 	/*
 	 * are we currently using resume? some internal code makes use of the resume
@@ -240,13 +241,12 @@ public class OneWireContainer18 extends OneWireContainer {
 	 */
 	private boolean doSpeedEnable = true;
 
-	private byte[] byte_buffer = new byte[60]; // use this everywhere to communicate
+	private final byte[] byte_buffer = new byte[60]; // use this everywhere to communicate
 	private byte[] private_address = null;
 
 	static byte[] FF = new byte[60]; // use this to fill an array with 0x0ff's
 	static {
-		for (int i = 0; i < FF.length; i++)
-			FF[i] = (byte) 0x0ff;
+		Arrays.fill(FF, (byte) 0x0ff);
 	}
 	// there's really no good reason for these to be public like they were in 0.00
 	// OneWire release
@@ -322,7 +322,7 @@ public class OneWireContainer18 extends OneWireContainer {
 	 * DS1963S. See the datasheet for more information.
 	 *
 	 * @see #SHAFunction(byte,int)
-	 * 
+	 *
 	 * @see #SHAFunction(byte)
 	 */
 	public static final byte COMPUTE_SHA = (byte) 0x33;
@@ -335,9 +335,9 @@ public class OneWireContainer18 extends OneWireContainer {
 	 * partial secret.
 	 *
 	 * @see #SHAFunction(byte,int)
-	 * 
+	 *
 	 * @see #SHAFunction(byte)
-	 * 
+	 *
 	 * @see #installMasterSecret(int,byte[],int)
 	 */
 	public static final byte COMPUTE_FIRST_SECRET = (byte) 0x0F;
@@ -348,9 +348,9 @@ public class OneWireContainer18 extends OneWireContainer {
 	 * secret except the first.
 	 *
 	 * @see #SHAFunction(byte,int)
-	 * 
+	 *
 	 * @see #SHAFunction(byte)
-	 * 
+	 *
 	 * @see #installMasterSecret(int,byte[],int)
 	 */
 	public static final byte COMPUTE_NEXT_SECRET = (byte) 0xF0;
@@ -361,7 +361,7 @@ public class OneWireContainer18 extends OneWireContainer {
 	 * authentication and to verify user data.
 	 *
 	 * @see #SHAFunction(byte,int)
-	 * 
+	 *
 	 * @see #SHAFunction(byte)
 	 */
 	public static final byte VALIDATE_DATA_PAGE = (byte) 0x3C;
@@ -371,7 +371,7 @@ public class OneWireContainer18 extends OneWireContainer {
 	 * DS1963S. See the datasheet for more information.
 	 *
 	 * @see #SHAFunction(byte,int)
-	 * 
+	 *
 	 * @see #SHAFunction(byte)
 	 */
 	public static final byte SIGN_DATA_PAGE = (byte) 0xC3;
@@ -381,9 +381,9 @@ public class OneWireContainer18 extends OneWireContainer {
 	 * pseudo random number generator. See the datasheet for more information.
 	 *
 	 * @see #SHAFunction(byte,int)
-	 * 
+	 *
 	 * @see #SHAFunction(byte)
-	 * 
+	 *
 	 * @see #SHAiButton#generateChallenge(int,int,byte[])
 	 */
 	public static final byte COMPUTE_CHALLENGE = (byte) 0xCC;
@@ -393,7 +393,7 @@ public class OneWireContainer18 extends OneWireContainer {
 	 * datasheet for more information.
 	 *
 	 * @see #SHAFunction(byte,int)
-	 * 
+	 *
 	 * @see #SHAFunction(byte)
 	 */
 	public static final byte AUTH_HOST = (byte) 0xAA;
@@ -432,11 +432,12 @@ public class OneWireContainer18 extends OneWireContainer {
 	public OneWireContainer18() {
 		super(null, 0);
 
-		if (private_address == null)
-			private_address = new byte[8];
+		if (this.private_address == null) {
+			this.private_address = new byte[8];
+		}
 
 		// initialize the memory banks
-		initMem();
+		this.initMem();
 	}
 
 	/**
@@ -455,11 +456,12 @@ public OneWireContainer18() {
 	public OneWireContainer18(DSPortAdapter sourceAdapter, byte[] newAddress) {
 		super(sourceAdapter, newAddress);
 
-		if (private_address == null)
-			private_address = new byte[8];
+		if (this.private_address == null) {
+			this.private_address = new byte[8];
+		}
 
 		// initialize the memory banks
-		initMem();
+		this.initMem();
 	}
 
 	/**
@@ -478,11 +480,12 @@ public OneWireContainer18(DSPortAdapter sourceAdapter, byte[] newAddress) {
 	public OneWireContainer18(DSPortAdapter sourceAdapter, long newAddress) {
 		super(sourceAdapter, newAddress);
 
-		if (private_address == null)
-			private_address = new byte[8];
+		if (this.private_address == null) {
+			this.private_address = new byte[8];
+		}
 
 		// initialize the memory banks
-		initMem();
+		this.initMem();
 	}
 
 	/**
@@ -501,11 +504,12 @@ public OneWireContainer18(DSPortAdapter sourceAdapter, long newAddress) {
 	public OneWireContainer18(DSPortAdapter sourceAdapter, String newAddress) {
 		super(sourceAdapter, newAddress);
 
-		if (private_address == null)
-			private_address = new byte[8];
+		if (this.private_address == null) {
+			this.private_address = new byte[8];
+		}
 
 		// initialize the memory banks
-		initMem();
+		this.initMem();
 	}
 
 	// --------
@@ -528,23 +532,25 @@ public OneWireContainer18(DSPortAdapter sourceAdapter, String newAddress) {
 	 *
 	 * @see com.dalsemi.onewire.utils.Address
 	 */
+	@Override
 	public void setupContainer(DSPortAdapter sourceAdapter, byte[] newAddress) {
 		// get a reference to the source adapter (will need this to communicate)
 		this.adapter = sourceAdapter;
 
 		// set the Address
 		synchronized (this) {
-			if (private_address == null)
-				private_address = new byte[8];
+			if (this.private_address == null) {
+				this.private_address = new byte[8];
+			}
 
-			System.arraycopy(newAddress, 0, private_address, 0, 8);
+			System.arraycopy(newAddress, 0, this.private_address, 0, 8);
 
-			this.address = private_address;
+			this.address = this.private_address;
 		}
 
 		// set desired speed to be SPEED_REGULAR by default with no fallback
-		speed = DSPortAdapter.SPEED_REGULAR;
-		speedFallBackOK = false;
+		this.speed = DSPortAdapter.SPEED_REGULAR;
+		this.speedFallBackOK = false;
 	}
 
 	/**
@@ -553,6 +559,7 @@ public void setupContainer(DSPortAdapter sourceAdapter, byte[] newAddress) {
 	 *
 	 * @return iButton or 1-Wire device name
 	 */
+	@Override
 	public String getName() {
 		return "DS1963S";
 	}
@@ -564,6 +571,7 @@ public String getName() {
 	 *
 	 * @return the alternate names for this iButton or 1-Wire device
 	 */
+	@Override
 	public String getAlternateNames() {
 		return "SHA-1 iButton";
 	}
@@ -574,6 +582,7 @@ public String getAlternateNames() {
 	 *
 	 * @return device description
 	 */
+	@Override
 	public String getDescription() {
 		return "4096 bits of read/write nonvolatile memory. Memory "
 				+ "is partitioned into sixteen pages of 256 bits each. "
@@ -586,6 +595,7 @@ public String getDescription() {
 	 * @return maximum speed
 	 * @see DSPortAdapter#setSpeed
 	 */
+	@Override
 	public int getMaxSpeed() {
 		return DSPortAdapter.SPEED_OVERDRIVE;
 	}
@@ -596,23 +606,24 @@ public int getMaxSpeed() {
 	 * MemoryBank}, {@link com.dalsemi.onewire.container.PagedMemoryBank
 	 * PagedMemoryBank}, and {@link com.dalsemi.onewire.container.OTPMemoryBank
 	 * OTPMemoryBank}.
-	 * 
+	 *
 	 * @return <CODE>Enumeration</CODE> of memory banks
 	 */
+	@Override
 	public Enumeration<MemoryBank> getMemoryBanks() {
-		Vector<MemoryBank> bank = new Vector<>(4);
+		var bank = new Vector<MemoryBank>(4);
 
 		// scratchpad
-		bank.addElement(scratch);
+		bank.addElement(this.scratch);
 
 		// NVRAM (no write cycle)
-		bank.addElement(memory);
+		bank.addElement(this.memory);
 
 		// NVRAM (with write cycle counters)
-		bank.addElement(memoryPlus);
+		bank.addElement(this.memoryPlus);
 
 		// Page Write cycle counters
-		MemoryBankNV cnt = new MemoryBankNV(this, (MemoryBankScratch) scratch);
+		var cnt = new MemoryBankNV(this, this.scratch);
 
 		cnt.numberPages = 3;
 		cnt.size = 96;
@@ -634,27 +645,27 @@ public Enumeration<MemoryBank> getMemoryBanks() {
 	private void initMem() {
 
 		// scratchpad
-		scratch = new MemoryBankScratchSHA(this);
+		this.scratch = new MemoryBankScratchSHA(this);
 
 		// NVRAM (no write cycle)
-		memory = new MemoryBankNVCRC(this, (MemoryBankScratch) scratch);
-		memory.numberPages = 8;
-		memory.size = 256;
-		memory.extraInfoLength = 8;
-		memory.readContinuePossible = false;
-		memory.numVerifyBytes = 8;
+		this.memory = new MemoryBankNVCRC(this, this.scratch);
+		this.memory.numberPages = 8;
+		this.memory.size = 256;
+		this.memory.extraInfoLength = 8;
+		this.memory.readContinuePossible = false;
+		this.memory.numVerifyBytes = 8;
 
 		// NVRAM (with write cycle counters)
-		memoryPlus = new MemoryBankNVCRC(this, (MemoryBankScratch) scratch);
-		memoryPlus.numberPages = 8;
-		memoryPlus.size = 256;
-		memoryPlus.bankDescription = "Memory with write cycle counter";
-		memoryPlus.startPhysicalAddress = 256;
-		memoryPlus.extraInfo = true;
-		memoryPlus.extraInfoDescription = "Write cycle counter";
-		memoryPlus.extraInfoLength = 8;
-		memoryPlus.readContinuePossible = false;
-		memoryPlus.numVerifyBytes = 8;
+		this.memoryPlus = new MemoryBankNVCRC(this, this.scratch);
+		this.memoryPlus.numberPages = 8;
+		this.memoryPlus.size = 256;
+		this.memoryPlus.bankDescription = "Memory with write cycle counter";
+		this.memoryPlus.startPhysicalAddress = 256;
+		this.memoryPlus.extraInfo = true;
+		this.memoryPlus.extraInfoDescription = "Write cycle counter";
+		this.memoryPlus.extraInfoLength = 8;
+		this.memoryPlus.readContinuePossible = false;
+		this.memoryPlus.numVerifyBytes = 8;
 	}
 
 	////////////////////////////////////////////////////////////////////
@@ -677,7 +688,7 @@ private void initMem() {
 	 * @see OneWireContainer#doSpeed()
 	 */
 	public synchronized void setSpeedCheck(boolean doSpeedCheck) {
-		doSpeedEnable = doSpeedCheck;
+		this.doSpeedEnable = doSpeedCheck;
 	}
 
 	/**
@@ -698,7 +709,7 @@ public synchronized void setSpeedCheck(boolean doSpeedCheck) {
 	 * @see #RESUME
 	 */
 	public synchronized void useResume(boolean set) {
-		resume = set;
+		this.resume = set;
 	}
 
 	/**
@@ -734,19 +745,20 @@ public synchronized void useResume(boolean set) {
 	 * @see #copyScratchPad()
 	 */
 	public synchronized boolean eraseScratchPad(int page) throws OneWireIOException, OneWireException {
-		if (doSpeedEnable && (!resume))
-			doSpeed();
+		if (this.doSpeedEnable && !this.resume) {
+			this.doSpeed();
+		}
 
 		// select the device
-		if (!resume)
-			adapter.select(address);
-		else {
-			adapter.reset();
-			adapter.putByte(RESUME);
+		if (!this.resume) {
+			this.adapter.select(this.address);
+		} else {
+			this.adapter.reset();
+			this.adapter.putByte(RESUME);
 		}
 
 		// build block to send
-		byte[] buffer = byte_buffer;
+		var buffer = this.byte_buffer;
 
 		buffer[0] = ERASE_SCRATCHPAD;
 		buffer[1] = (byte) (page << 5);
@@ -757,14 +769,14 @@ public synchronized boolean eraseScratchPad(int page) throws OneWireIOException,
 			IOHelper.writeLine("------------------------------------");
 			IOHelper.writeLine("Erase Scratchpad");
 			IOHelper.writeLine("address");
-			IOHelper.writeBytesHex(address);
+			IOHelper.writeBytesHex(this.address);
 			IOHelper.write("target address: 0x");
-			IOHelper.writeHex((byte) buffer[2]);
-			IOHelper.writeLineHex((byte) buffer[1]);
-			IOHelper.writeLine("adapter.getSpeed()=" + adapter.getSpeed());
-			IOHelper.writeLine("adapter.getPortTypeDescription()=" + adapter.getPortTypeDescription());
+			IOHelper.writeHex(buffer[2]);
+			IOHelper.writeLineHex(buffer[1]);
+			IOHelper.writeLine("adapter.getSpeed()=" + this.adapter.getSpeed());
+			IOHelper.writeLine("adapter.getPortTypeDescription()=" + this.adapter.getPortTypeDescription());
 			IOHelper.writeLine("this.speed=" + this.speed);
-			IOHelper.writeLine("device isPresent: " + adapter.isPresent(this.address));
+			IOHelper.writeLine("device isPresent: " + this.adapter.isPresent(this.address));
 		}
 		// \\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\
 
@@ -776,7 +788,7 @@ public synchronized boolean eraseScratchPad(int page) throws OneWireIOException,
 		}
 
 		// send block (check copy indication complete)
-		adapter.dataBlock(buffer, 0, 6);
+		this.adapter.dataBlock(buffer, 0, 6);
 
 		if (DEBUG) {
 			IOHelper.writeLine("buffer:");
@@ -784,10 +796,10 @@ public synchronized boolean eraseScratchPad(int page) throws OneWireIOException,
 			IOHelper.writeLine("------------------------------------");
 		}
 
-		if (buffer[5] == (byte) 0x0ff)
-			return waitForSuccessfulFinish();
-		else
-			return true;
+		if (buffer[5] == (byte) 0x0ff) {
+			return this.waitForSuccessfulFinish();
+		}
+		return true;
 	}
 
 	/**
@@ -803,7 +815,7 @@ public synchronized boolean eraseScratchPad(int page) throws OneWireIOException,
 	 * program can check to see if the DS1963S has started alternating its output
 	 * much quicker than calling this method will. For instance, to copy the
 	 * scratchpad, the source code might look like this:
-	 * 
+	 *
 	 * <pre>
 	 * buffer[0] = COPY_SCRATCHPAD;
 	 * buffer[1] = TA1;
@@ -813,9 +825,9 @@ public synchronized boolean eraseScratchPad(int page) throws OneWireIOException,
 	 * adapter.dataBlock(buffer, 0, 4);
 	 * return waitForSuccessfulFinish();
 	 * </pre>
-	 * 
+	 *
 	 * To optimize the code, read more bytes than required:
-	 * 
+	 *
 	 * <pre>
 	 * buffer[0] = COPY_SCRATCHPAD;
 	 * buffer[1] = TA1;
@@ -865,13 +877,14 @@ public synchronized boolean waitForSuccessfulFinish() throws OneWireIOException,
 
 		// this method should be called after another method, so let's not worry
 		// about making sure the speed is right, it should be already
-		int count = 0;
+		var count = 0;
 
-		while (adapter.getByte() == 0xff) {
+		while (this.adapter.getByte() == 0xff) {
 			count++;
 
-			if (count == block_wait_count)
+			if (count == this.block_wait_count) {
 				return false;
+			}
 		}
 
 		return true;
@@ -914,7 +927,7 @@ public void readMemoryPage(int pageNum, byte[] data, int start) throws OneWireIO
 
 		// don't need to be synchronized, since readMemoryPage(int, byte, int, byte[],
 		// int) is
-		readMemoryPage(pageNum, READ_MEMORY, 32, data, start);
+		this.readMemoryPage(pageNum, READ_MEMORY, 32, data, start);
 	}
 
 	/*
@@ -922,25 +935,26 @@ public void readMemoryPage(int pageNum, byte[] data, int start) throws OneWireIO
 	 */
 	private synchronized void readMemoryPage(int pageNum, byte COMMAND, int bytes_to_read, byte[] data, int start)
 			throws OneWireIOException, OneWireException {
-		if (doSpeedEnable && (!resume))
-			doSpeed();
-
-		if (!resume)
-			adapter.select(address);
-		else {
-			adapter.reset();
-			adapter.putByte(RESUME);
+		if (this.doSpeedEnable && !this.resume) {
+			this.doSpeed();
+		}
+
+		if (!this.resume) {
+			this.adapter.select(this.address);
+		} else {
+			this.adapter.reset();
+			this.adapter.putByte(RESUME);
 		}
 
-		byte[] buffer = byte_buffer;
-		int addr = pageNum << 5; // pageNumber * 32
+		var buffer = this.byte_buffer;
+		var addr = pageNum << 5; // pageNumber * 32
 
 		buffer[0] = COMMAND;
 		buffer[1] = (byte) addr;
 		buffer[2] = (byte) (addr >> 8);
 
 		System.arraycopy(FF, 0, buffer, 3, bytes_to_read);
-		adapter.dataBlock(buffer, 0, 3 + bytes_to_read);
+		this.adapter.dataBlock(buffer, 0, 3 + bytes_to_read);
 
 		// copy data for return
 		System.arraycopy(buffer, 3, data, start, bytes_to_read);
@@ -993,9 +1007,9 @@ public boolean readAuthenticatedPage(int pageNum, byte[] data, int start)
 		// int) is
 		// read 42 bytes = 32 page bytes + 4 bytes secret counter + 4 bytes page counter
 		// + 2 bytes CRC
-		readMemoryPage(pageNum, READ_AUTHENTICATED_PAGE, 42, data, start);
+		this.readMemoryPage(pageNum, READ_AUTHENTICATED_PAGE, 42, data, start);
 
-		int crc = CRC16.compute(READ_AUTHENTICATED_PAGE);
+		var crc = CRC16.compute(READ_AUTHENTICATED_PAGE);
 
 		crc = CRC16.compute((byte) (pageNum << 5), crc); // (pagenumber*32 = address) lower 8 bits
 		crc = CRC16.compute((byte) (pageNum >>> 3), crc); // pagenumber*32 is pagenumber<<5, but
@@ -1007,7 +1021,7 @@ public boolean readAuthenticatedPage(int pageNum, byte[] data, int start)
 			return false;
 		}
 
-		return (waitForSuccessfulFinish());
+		return this.waitForSuccessfulFinish();
 	}
 
 	/**
@@ -1048,25 +1062,26 @@ public boolean readAuthenticatedPage(int pageNum, byte[] data, int start)
 	 */
 	public synchronized boolean writeScratchPad(int targetPage, int targetPageOffset, byte[] inputbuffer, int start,
 			int length) throws OneWireIOException, OneWireException {
-		if (doSpeedEnable && (!resume))
-			doSpeed();
-
-		if (!resume)
-			adapter.select(address);
-		else {
-			adapter.reset();
-			adapter.putByte(RESUME);
+		if (this.doSpeedEnable && !this.resume) {
+			this.doSpeed();
+		}
+
+		if (!this.resume) {
+			this.adapter.select(this.address);
+		} else {
+			this.adapter.reset();
+			this.adapter.putByte(RESUME);
 		}
 
-		byte[] buffer = byte_buffer;
-		int addr = (targetPage << 5) + targetPageOffset;
+		var buffer = this.byte_buffer;
+		var addr = (targetPage << 5) + targetPageOffset;
 
 		// \\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\
 		if (DEBUG) {
 			IOHelper.writeLine("------------------------------------");
 			IOHelper.writeLine("Writing Scratchpad of iButton");
 			IOHelper.writeLine("address");
-			IOHelper.writeBytesHex(address);
+			IOHelper.writeBytesHex(this.address);
 			IOHelper.writeLine("targetPage: " + targetPage);
 			IOHelper.writeLine("targetPageOffset: " + targetPageOffset);
 			IOHelper.write("target address: 0x");
@@ -1084,10 +1099,11 @@ public synchronized boolean writeScratchPad(int targetPage, int targetPageOffset
 		buffer[1] = (byte) addr;
 		buffer[2] = (byte) (addr >> 8);
 
-		int maxbytes = 32 - (addr & 31);
+		var maxbytes = 32 - (addr & 31);
 
-		if (length > maxbytes)
+		if (length > maxbytes) {
 			length = maxbytes; // if we are going to go over the 32byte boundary
+		}
 
 		// let's cut it
 		System.arraycopy(inputbuffer, start, buffer, 3, length);
@@ -1102,16 +1118,18 @@ public synchronized boolean writeScratchPad(int targetPage, int targetPageOffset
 		// finish reading at the scratchpad boundary (and we checked earlier to
 		// make sure don't go over THEREFORE we have gone under). if we are at
 		// the boundary we need two extra bytes to read the crc
-		adapter.dataBlock(buffer, 0, ((((addr + length) & 31) == 0) ? length + 5 : length + 3));
+		this.adapter.dataBlock(buffer, 0, (addr + length & 31) == 0 ? length + 5 : length + 3);
 
 		// if we dont check the CRC we are done
-		if (((addr + length) & 31) != 0)
+		if ((addr + length & 31) != 0) {
 			return true;
+		}
 
 		// else we need to do a CRC calculation
 		if (CRC16.compute(buffer, 0, length + 5, 0) != 0xB001) {
-			if (DEBUG)
+			if (DEBUG) {
 				System.out.println("CRC Failed in Write Scratchpad");
+			}
 			return false;
 		}
 
@@ -1147,17 +1165,18 @@ public synchronized boolean writeScratchPad(int targetPage, int targetPageOffset
 	 * @see #VALIDATE_DATA_PAGE
 	 */
 	public synchronized boolean matchScratchPad(byte[] mac) throws OneWireIOException, OneWireException {
-		if (doSpeedEnable && (!resume))
-			doSpeed();
-
-		if (!resume)
-			adapter.select(address);
-		else {
-			adapter.reset();
-			adapter.putByte(RESUME);
+		if (this.doSpeedEnable && !this.resume) {
+			this.doSpeed();
 		}
 
-		byte[] buffer = byte_buffer;
+		if (!this.resume) {
+			this.adapter.select(this.address);
+		} else {
+			this.adapter.reset();
+			this.adapter.putByte(RESUME);
+		}
+
+		var buffer = this.byte_buffer;
 
 		buffer[0] = MATCH_SCRATCHPAD;
 
@@ -1167,7 +1186,7 @@ public synchronized boolean matchScratchPad(byte[] mac) throws OneWireIOExceptio
 		buffer[22] = (byte) 0x0ff; // CRC2
 		buffer[23] = (byte) 0x0ff; // status
 
-		adapter.dataBlock(buffer, 0, 24);
+		this.adapter.dataBlock(buffer, 0, 24);
 
 		if (CRC16.compute(buffer, 0, 23, 0) != 0xB001) {
 			return false;
@@ -1178,7 +1197,7 @@ public synchronized boolean matchScratchPad(byte[] mac) throws OneWireIOExceptio
 			IOHelper.writeLine("------------------------------------");
 			IOHelper.writeLine("Matching the scratchpad");
 			IOHelper.writeLine("Address");
-			IOHelper.writeBytesHex(address);
+			IOHelper.writeBytesHex(this.address);
 			IOHelper.writeLine("mac");
 			IOHelper.writeBytesHex(mac);
 			IOHelper.writeLine("matchScratchpad buffer");
@@ -1187,8 +1206,9 @@ public synchronized boolean matchScratchPad(byte[] mac) throws OneWireIOExceptio
 		}
 		// \\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\
 
-		if (buffer[23] != (byte) 0x0ff)
+		if (buffer[23] != (byte) 0x0ff) {
 			return true;
+		}
 
 		return false;
 	}
@@ -1221,40 +1241,41 @@ public synchronized boolean matchScratchPad(byte[] mac) throws OneWireIOExceptio
 	 * @see #writeScratchPad(int,int,byte[],int,int)
 	 */
 	public synchronized int readScratchPad(byte[] data, int start) throws OneWireIOException, OneWireException {
-		if (doSpeedEnable && (!resume))
-			doSpeed();
-
-		if (!resume)
-			adapter.select(address);
-		else {
-			adapter.reset();
-			adapter.putByte(RESUME);
+		if (this.doSpeedEnable && !this.resume) {
+			this.doSpeed();
+		}
+
+		if (!this.resume) {
+			this.adapter.select(this.address);
+		} else {
+			this.adapter.reset();
+			this.adapter.putByte(RESUME);
 		}
 
-		byte[] buffer = byte_buffer;
+		var buffer = this.byte_buffer;
 
 		buffer[0] = READ_SCRATCHPAD;
 
 		System.arraycopy(FF, 0, buffer, 1, 37);
-		adapter.dataBlock(buffer, 0, 38);
+		this.adapter.dataBlock(buffer, 0, 38);
 
-		TA1 = buffer[1];
-		TA2 = buffer[2];
-		ES = buffer[3];
+		this.TA1 = buffer[1];
+		this.TA2 = buffer[2];
+		this.ES = buffer[3];
 
-		int length = 32 - (TA1 & 31);
+		var length = 32 - (this.TA1 & 31);
 
 		// \\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\
 		if (DEBUG) {
 			IOHelper.writeLine("------------------------------------");
 			IOHelper.writeLine("Read Scratchpad");
 			IOHelper.writeLine("address");
-			IOHelper.writeBytesHex(address);
+			IOHelper.writeBytesHex(this.address);
 			IOHelper.write("target address: 0x");
-			IOHelper.writeHex((byte) TA2);
-			IOHelper.writeLineHex((byte) TA1);
+			IOHelper.writeHex(this.TA2);
+			IOHelper.writeLineHex(this.TA1);
 			IOHelper.write("ES: 0x");
-			IOHelper.writeLineHex((byte) ES);
+			IOHelper.writeLineHex(this.ES);
 			IOHelper.writeLine("data");
 			IOHelper.writeBytesHex(buffer, 4, length);
 			IOHelper.writeLine("------------------------------------");
@@ -1265,8 +1286,9 @@ public synchronized int readScratchPad(byte[] data, int start) throws OneWireIOE
 			return -1;
 		}
 
-		if (data != null)
+		if (data != null) {
 			System.arraycopy(buffer, 4, data, start, length);
+		}
 
 		return length;
 	}
@@ -1294,32 +1316,33 @@ public synchronized int readScratchPad(byte[] data, int start) throws OneWireIOE
 	 * @see #writeScratchPad(int,int,byte[],int,int)
 	 */
 	public synchronized boolean copyScratchPad() throws OneWireIOException, OneWireException {
-		if (doSpeedEnable && (!resume))
-			doSpeed();
-
-		if (!resume)
-			adapter.select(address);
-		else {
-			adapter.reset();
-			adapter.putByte(RESUME);
+		if (this.doSpeedEnable && !this.resume) {
+			this.doSpeed();
+		}
+
+		if (!this.resume) {
+			this.adapter.select(this.address);
+		} else {
+			this.adapter.reset();
+			this.adapter.putByte(RESUME);
 		}
 
-		byte[] buffer = byte_buffer;
+		var buffer = this.byte_buffer;
 
 		buffer[0] = COPY_SCRATCHPAD;
-		buffer[1] = TA1;
-		buffer[2] = TA2;
-		buffer[3] = ES;
+		buffer[1] = this.TA1;
+		buffer[2] = this.TA2;
+		buffer[3] = this.ES;
 
 		System.arraycopy(FF, 0, buffer, 4, 5);
 
 		// adapter.dataBlock(buffer,0,4);
-		adapter.dataBlock(buffer, 0, 9);
+		this.adapter.dataBlock(buffer, 0, 9);
 
-		if (buffer[8] == (byte) 0x0ff)
-			return waitForSuccessfulFinish();
-		else
-			return true;
+		if (buffer[8] == (byte) 0x0ff) {
+			return this.waitForSuccessfulFinish();
+		}
+		return true;
 	}
 
 	/**
@@ -1367,23 +1390,24 @@ public synchronized boolean installMasterSecret(int page, byte[] secret, int sec
 		// is to be computed, 32 bytes goes in the page and 15 goes in
 		// the scratchpad, so it's going to be easier in the computations
 		// if i know the input buffer length is divisible by 47
-		if (secret.length == 0)
+		if (secret.length == 0) {
 			return false;
+		}
 
 		byte[] input_secret = null;
-		byte[] buffer = byte_buffer;
-		int secret_mod_length = secret.length % 47;
+		var buffer = this.byte_buffer;
+		var secret_mod_length = secret.length % 47;
 
-		if (secret_mod_length == 0) // if the length of the secret is divisible by 47
+		if (secret_mod_length == 0) {
 			input_secret = secret;
-		else {
+		} else {
 
 			/*
 			 * i figure in the case where secret is not divisible by 47 it will be quicker
 			 * to just create a new array once and copy the data in, rather than on every
 			 * partial secret calculation do bounds checking
 			 */
-			input_secret = new byte[secret.length + (47 - secret_mod_length)];
+			input_secret = new byte[secret.length + 47 - secret_mod_length];
 
 			System.arraycopy(secret, 0, input_secret, 0, secret.length);
 		}
@@ -1393,7 +1417,7 @@ public synchronized boolean installMasterSecret(int page, byte[] secret, int sec
 			IOHelper.writeLine("------------------------------------");
 			IOHelper.writeLine("Installing Secret on iButton");
 			IOHelper.writeLine("address");
-			IOHelper.writeBytesHex(address);
+			IOHelper.writeBytesHex(this.address);
 			IOHelper.writeLine("page: " + page);
 			IOHelper.writeLine("secret");
 			IOHelper.writeBytesHex(secret);
@@ -1408,43 +1432,50 @@ public synchronized boolean installMasterSecret(int page, byte[] secret, int sec
 		secret_number = secret_number & 7;
 
 		// the secret page is 16 for secrets 0-3, page 17 for secrets 4-7
-		int secret_page = (secret_number > 3) ? 17 : 16;
+		var secret_page = secret_number > 3 ? 17 : 16;
 
 		// each page has 4 secrets, so look at 2 LS bits
-		int secret_offset = (secret_number & 3) << 3;
-		int offset = 0; // the current offset into the input_secret buffer
-		byte[] sp_buffer = new byte[32];
+		var secret_offset = (secret_number & 3) << 3;
+		var offset = 0; // the current offset into the input_secret buffer
+		var sp_buffer = new byte[32];
 
 		while (offset < input_secret.length) {
-			if (!eraseScratchPad(page))
+			if (!this.eraseScratchPad(page)) {
 				return false;
+			}
 
-			if (!writeScratchPad(page, 0, input_secret, offset, 32))
+			if (!this.writeScratchPad(page, 0, input_secret, offset, 32)) {
 				return false; // first write the whole page
+			}
 
-			if (readScratchPad(buffer, 0) < 0)
+			if (this.readScratchPad(buffer, 0) < 0) {
 				return false; // get the address registers
+			}
 
-			if (!copyScratchPad())
+			if (!this.copyScratchPad()) {
 				return false; // copy the page into memory
+			}
 
 			System.arraycopy(input_secret, offset + 32, sp_buffer, 8, 15);
 
-			if (!writeScratchPad(page, 0, sp_buffer, 0, 32))
+			if (!this.writeScratchPad(page, 0, sp_buffer, 0, 32)) {
 				return false; // now write the scratchpad data
+			}
 
-			if (!SHAFunction((offset == 0) ? COMPUTE_FIRST_SECRET : COMPUTE_NEXT_SECRET))
+			if (!this.SHAFunction(offset == 0 ? COMPUTE_FIRST_SECRET : COMPUTE_NEXT_SECRET)) {
 				return false; // means a failure
+			}
 
 			// here we have to write the scratchpad with 32 bytes of dummy data
-			if (!write_read_copy_quick(secret_page, secret_offset))
+			if (!this.write_read_copy_quick(secret_page, secret_offset)) {
 				return false;
+			}
 
 			offset += 47;
 		}
 
 		// now lets clean up - erase the scratchpad and data page
-		writeDataPage(page, FF);
+		this.writeDataPage(page, FF);
 
 		/*
 		 * //This fails for some parts, due to "well-known" problem with //erase
@@ -1456,9 +1487,9 @@ public synchronized boolean installMasterSecret(int page, byte[] secret, int sec
 	}
 
 	// local cache to make TINI fast
-	private byte[] bind_code_temp = new byte[32];
-	private byte[] bind_code_alt_temp = new byte[32];
-	private byte[] bind_data_temp = new byte[32];
+	private final byte[] bind_code_temp = new byte[32];
+	private final byte[] bind_code_alt_temp = new byte[32];
+	private final byte[] bind_data_temp = new byte[32];
 
 	/**
 	 * <p>
@@ -1510,36 +1541,37 @@ public synchronized boolean installMasterSecret(int page, byte[] secret, int sec
 	public synchronized boolean bindSecretToiButton(int page, byte[] bind_data, byte[] bind_code, int secret_number)
 			throws OneWireIOException, OneWireException {
 		if (bind_data.length != 32) {
-			System.arraycopy(bind_data, 0, bind_data_temp, 0, (bind_data.length > 32 ? 32 : bind_data.length));
+			System.arraycopy(bind_data, 0, this.bind_data_temp, 0, bind_data.length > 32 ? 32 : bind_data.length);
 
-			bind_data = bind_data_temp;
+			bind_data = this.bind_data_temp;
 		}
 
 		if (bind_code.length != 15) {
 			if (bind_code.length == 7) {
-				System.arraycopy(bind_code, 0, bind_code_alt_temp, 0, 4);
+				System.arraycopy(bind_code, 0, this.bind_code_alt_temp, 0, 4);
 
-				bind_code_alt_temp[4] = (byte) page;
+				this.bind_code_alt_temp[4] = (byte) page;
 
-				System.arraycopy(address, 0, bind_code_alt_temp, 5, 7);
-				System.arraycopy(bind_code, 4, bind_code_alt_temp, 12, 3);
+				System.arraycopy(this.address, 0, this.bind_code_alt_temp, 5, 7);
+				System.arraycopy(bind_code, 4, this.bind_code_alt_temp, 12, 3);
 			} else {
-				System.arraycopy(bind_code, 0, bind_code_alt_temp, 0, (bind_code.length > 15 ? 15 : bind_code.length));
+				System.arraycopy(bind_code, 0, this.bind_code_alt_temp, 0,
+						bind_code.length > 15 ? 15 : bind_code.length);
 			}
 
-			bind_code = bind_code_alt_temp;
+			bind_code = this.bind_code_alt_temp;
 		}
 
-		System.arraycopy(bind_code, 0, bind_code_temp, 8, 15);
+		System.arraycopy(bind_code, 0, this.bind_code_temp, 8, 15);
 
-		bind_code = bind_code_temp;
+		bind_code = this.bind_code_temp;
 
 		// \\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\
 		if (DEBUG) {
 			IOHelper.writeLine("------------------------------------");
 			IOHelper.writeLine("Binding Secret to iButton");
 			IOHelper.writeLine("address");
-			IOHelper.writeBytesHex(address);
+			IOHelper.writeBytesHex(this.address);
 			IOHelper.writeLine("page: " + page);
 			IOHelper.writeLine("secret_number: " + (secret_number & 7));
 			IOHelper.writeLine("bind_data");
@@ -1550,37 +1582,38 @@ public synchronized boolean bindSecretToiButton(int page, byte[] bind_data, byte
 		}
 		// \\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\
 
-		if (!writeDataPage(page, bind_data))
+		if (!this.writeDataPage(page, bind_data)) {
 			return false;
+		}
 
-		resume = true;
+		this.resume = true;
 
-		if (!writeScratchPad(page, 0, bind_code, 0, 32)) {
-			resume = false;
+		if (!this.writeScratchPad(page, 0, bind_code, 0, 32)) {
+			this.resume = false;
 
 			return false;
 		}
 
-		if (!SHAFunction(COMPUTE_NEXT_SECRET)) {
-			resume = false;
+		if (!this.SHAFunction(COMPUTE_NEXT_SECRET)) {
+			this.resume = false;
 
 			return false; // means a failure
 		}
 
 		// go ahead and set resume = false, but write_read_copy_quick doesn't
 		// check resume, it automatically assumes it can resume
-		resume = false;
+		this.resume = false;
 
 		// make sure the secret number is between 0 and 7
 		secret_number = secret_number & 7;
 
 		// the secret page is 16 for secrets 0-3, page 17 for secrets 4-7
-		int secret_page = (secret_number > 3) ? 17 : 16;
+		var secret_page = secret_number > 3 ? 17 : 16;
 
 		// each page has 4 secrets, so look at 2 LS bits
-		int secret_offset = (secret_number & 3) << 3;
+		var secret_offset = (secret_number & 3) << 3;
 
-		return (write_read_copy_quick(secret_page, secret_offset));
+		return this.write_read_copy_quick(secret_page, secret_offset);
 	}
 
 	// used when copying secrets from the scratchpad to a secret page
@@ -1590,23 +1623,23 @@ private synchronized boolean write_read_copy_quick(int secret_page, int secret_o
 		// don't worry about doSpeed here, this should never be called before something
 		// else
 		// that would call doSpeed
-		int addr = (secret_page << 5) + secret_offset;
-		byte[] buffer = byte_buffer;
+		var addr = (secret_page << 5) + secret_offset;
+		var buffer = this.byte_buffer;
 
 		// assume we can resume
-		buffer[0] = (byte) RESUME;
-		buffer[1] = (byte) WRITE_SCRATCHPAD;
+		buffer[0] = RESUME;
+		buffer[1] = WRITE_SCRATCHPAD;
 		buffer[2] = (byte) addr; // (secret_page << 5);
 		buffer[3] = (byte) (addr >> 8); // secret_offset;
 
-		int length = 32 - secret_offset;
+		var length = 32 - secret_offset;
 
 		// \\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\
 		if (DEBUG) {
 			IOHelper.writeLine("------------------------------------");
 			IOHelper.writeLine("write_read_copy_quick");
 			IOHelper.writeLine("address");
-			IOHelper.writeBytesHex(address);
+			IOHelper.writeBytesHex(this.address);
 			IOHelper.writeLine("write scratchpad");
 			IOHelper.write("target address: 0x");
 			IOHelper.writeHex((byte) (addr >> 8));
@@ -1615,29 +1648,29 @@ private synchronized boolean write_read_copy_quick(int secret_page, int secret_o
 		// \\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\
 
 		// write the scratchpad
-		adapter.reset();
+		this.adapter.reset();
 		System.arraycopy(FF, 0, buffer, 4, length + 2);
-		adapter.dataBlock(buffer, 0, length + 6);
+		this.adapter.dataBlock(buffer, 0, length + 6);
 
 		if (CRC16.compute(buffer, 1, length + 5, 0) != 0xB001) {
 			return false;
 		}
 
 		// here we want to read the scratchpad WITHOUT reading the rest of the data
-		buffer[1] = (byte) READ_SCRATCHPAD;
+		buffer[1] = READ_SCRATCHPAD;
 
 		System.arraycopy(FF, 0, buffer, 2, 8);
-		adapter.reset();
-		adapter.dataBlock(buffer, 0, 5);
+		this.adapter.reset();
+		this.adapter.dataBlock(buffer, 0, 5);
 
 		// \\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\
 		if (DEBUG) {
 			IOHelper.writeLine("read scratchpad");
 			IOHelper.write("target address: 0x");
-			IOHelper.writeHex((byte) buffer[3]);
-			IOHelper.writeLineHex((byte) buffer[2]);
+			IOHelper.writeHex(buffer[3]);
+			IOHelper.writeLineHex(buffer[2]);
 			IOHelper.write("ES: 0x");
-			IOHelper.writeLineHex((byte) buffer[4]);
+			IOHelper.writeLineHex(buffer[4]);
 			IOHelper.writeLine("------------------------------------");
 		}
 		// \\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\
@@ -1645,15 +1678,15 @@ private synchronized boolean write_read_copy_quick(int secret_page, int secret_o
 		// here we just shoot the buffer back out to call copyScratchpad
 		buffer[1] = COPY_SCRATCHPAD;
 
-		adapter.reset();
+		this.adapter.reset();
 
 		// adapter.dataBlock(buffer,0,5);
-		adapter.dataBlock(buffer, 0, 8);
+		this.adapter.dataBlock(buffer, 0, 8);
 
-		if (buffer[7] == (byte) 0x0ff)
-			return waitForSuccessfulFinish();
-		else
-			return true;
+		if (buffer[7] == (byte) 0x0ff) {
+			return this.waitForSuccessfulFinish();
+		}
+		return true;
 	}
 
 	/**
@@ -1696,7 +1729,7 @@ public synchronized boolean writeDataPage(int page_number, byte[] page_data)
 			IOHelper.writeLine("------------------------------------");
 			IOHelper.writeLine("Writing Data Page to iButton");
 			IOHelper.writeLine("address");
-			IOHelper.writeBytesHex(address);
+			IOHelper.writeBytesHex(this.address);
 			IOHelper.writeLine("page_number: " + page_number);
 			IOHelper.writeLine("page_data");
 			IOHelper.writeBytesHex(page_data);
@@ -1704,18 +1737,19 @@ public synchronized boolean writeDataPage(int page_number, byte[] page_data)
 		}
 		// \\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\
 
-		if (doSpeedEnable && (!resume))
-			doSpeed();
+		if (this.doSpeedEnable && !this.resume) {
+			this.doSpeed();
+		}
 
 		// first we need to erase the scratchpad
-		if (!resume)
-			adapter.select(address);
-		else {
-			adapter.reset();
-			adapter.putByte(RESUME);
+		if (!this.resume) {
+			this.adapter.select(this.address);
+		} else {
+			this.adapter.reset();
+			this.adapter.putByte(RESUME);
 		}
 
-		byte[] buffer = byte_buffer;
+		var buffer = this.byte_buffer;
 
 		buffer[1] = ERASE_SCRATCHPAD;
 		buffer[2] = (byte) 0;
@@ -1723,16 +1757,18 @@ public synchronized boolean writeDataPage(int page_number, byte[] page_data)
 
 		// send block (check copy indication complete)
 		System.arraycopy(FF, 0, buffer, 4, 3);
-		adapter.dataBlock(buffer, 1, 6);
+		this.adapter.dataBlock(buffer, 1, 6);
 
-		if (buffer[6] == (byte) 0x0ff)
-			if (!waitForSuccessfulFinish())
+		if (buffer[6] == (byte) 0x0ff) {
+			if (!this.waitForSuccessfulFinish()) {
 				return false;
+			}
+		}
 
 		// then we need to write the scratchpad
-		int addr = page_number << 5;
+		var addr = page_number << 5;
 
-		buffer[0] = (byte) RESUME;
+		buffer[0] = RESUME;
 		buffer[1] = WRITE_SCRATCHPAD;
 		buffer[2] = (byte) addr;
 		buffer[3] = (byte) (addr >> 8);
@@ -1742,53 +1778,54 @@ public synchronized boolean writeDataPage(int page_number, byte[] page_data)
 		buffer[36] = (byte) 0xff;
 		buffer[37] = (byte) 0xff; // leave space for the CRC
 
-		adapter.reset();
+		this.adapter.reset();
 
 		// adapter.putByte(RESUME);
-		adapter.dataBlock(buffer, 0, 38);
+		this.adapter.dataBlock(buffer, 0, 38);
 
 		if (CRC16.compute(buffer, 1, 37, 0) != 0xB001) {
 			return false;
 		}
 
 		// then we need to do a 'read' to get out TA1,TA2,E/S
-		adapter.reset();
+		this.adapter.reset();
 
 		// buffer[0] = RESUME;
 		buffer[1] = READ_SCRATCHPAD;
 
 		System.arraycopy(FF, 0, buffer, 2, 37);
-		adapter.dataBlock(buffer, 0, 39);
+		this.adapter.dataBlock(buffer, 0, 39);
 
 		// match the scratchpad contents before copying
-		for (int i = 0; i < 32; i++) {
+		for (var i = 0; i < 32; i++) {
 			if (page_data[i] != buffer[5 + i]) {
 				return false;
 			}
 		}
 
 		// Don't skip this!
-		TA1 = buffer[2];
-		TA2 = buffer[3];
-		ES = buffer[4];
-		int length = 32 - (TA1 & 31);
+		this.TA1 = buffer[2];
+		this.TA2 = buffer[3];
+		this.ES = buffer[4];
+		var length = 32 - (this.TA1 & 31);
 
 		if (CRC16.compute(buffer, 1, 6 + length, 0) != 0xB001) {
 			return false;
 		}
 
 		// now we can copy the scratchpad
-		adapter.reset();
+		this.adapter.reset();
 
 		// buffer[0] still has the resume command in it
 		buffer[1] = COPY_SCRATCHPAD;
 
 		// TA1,TA2,ES area already in buffer
 		System.arraycopy(FF, 0, buffer, 5, 3);
-		adapter.dataBlock(buffer, 0, 8);
+		this.adapter.dataBlock(buffer, 0, 8);
 
-		if (buffer[7] == (byte) 0x0ff)
-			return waitForSuccessfulFinish();
+		if (buffer[7] == (byte) 0x0ff) {
+			return this.waitForSuccessfulFinish();
+		}
 
 		return true;
 	}
@@ -1833,7 +1870,7 @@ public synchronized boolean writeDataPage(int page_number, byte[] page_data)
 	 * @see #readScratchPad(byte[],int)
 	 */
 	public boolean SHAFunction(byte function) throws OneWireIOException, OneWireException {
-		return SHAFunction(function, (TA1 & 0x0ff) | (TA2 << 8));
+		return this.SHAFunction(function, this.TA1 & 0x0ff | this.TA2 << 8);
 	}
 
 	/**
@@ -1882,11 +1919,11 @@ public synchronized boolean SHAFunction(byte function, int T) throws OneWireIOEx
 			IOHelper.writeLine("------------------------------------");
 			IOHelper.writeLine("SHA Function");
 			IOHelper.writeLine("address");
-			IOHelper.writeBytesHex(address);
-			IOHelper.writeLine("adapter.getSpeed()=" + adapter.getSpeed());
-			IOHelper.writeLine("adapter.getPortTypeDescription()=" + adapter.getPortTypeDescription());
+			IOHelper.writeBytesHex(this.address);
+			IOHelper.writeLine("adapter.getSpeed()=" + this.adapter.getSpeed());
+			IOHelper.writeLine("adapter.getPortTypeDescription()=" + this.adapter.getPortTypeDescription());
 			IOHelper.writeLine("this.speed=" + this.speed);
-			IOHelper.writeLine("device isPresent: " + adapter.isPresent(this.address));
+			IOHelper.writeLine("device isPresent: " + this.adapter.isPresent(this.address));
 			IOHelper.write("function: 0x");
 			IOHelper.writeLineHex(function);
 			IOHelper.write("target address: 0x");
@@ -1895,17 +1932,18 @@ public synchronized boolean SHAFunction(byte function, int T) throws OneWireIOEx
 		}
 		// \\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\
 
-		if (doSpeedEnable && (!resume))
-			doSpeed();
+		if (this.doSpeedEnable && !this.resume) {
+			this.doSpeed();
+		}
 
-		if (!resume)
-			adapter.select(address);
-		else {
-			adapter.reset();
-			adapter.putByte(RESUME);
+		if (!this.resume) {
+			this.adapter.select(this.address);
+		} else {
+			this.adapter.reset();
+			this.adapter.putByte(RESUME);
 		}
 
-		byte[] buffer = byte_buffer;
+		var buffer = this.byte_buffer;
 
 		buffer[0] = COMPUTE_SHA;
 		buffer[1] = (byte) T;
@@ -1919,7 +1957,7 @@ public synchronized boolean SHAFunction(byte function, int T) throws OneWireIOEx
 			IOHelper.writeBytesHex(buffer, 0, 9);
 		}
 
-		adapter.dataBlock(buffer, 0, 9);
+		this.adapter.dataBlock(buffer, 0, 9);
 
 		if (DEBUG) {
 			IOHelper.writeLine("buffer:");
@@ -1931,8 +1969,9 @@ public synchronized boolean SHAFunction(byte function, int T) throws OneWireIOEx
 			return false;
 		}
 
-		if (buffer[8] == (byte) 0x0ff)
-			return waitForSuccessfulFinish();
+		if (buffer[8] == (byte) 0x0ff) {
+			return this.waitForSuccessfulFinish();
+		}
 
 		return true;
 	}
diff --git a/io.openems.edge.bridge.onewire/src/com/dalsemi/onewire/container/OneWireContainer1A.java b/io.openems.edge.bridge.onewire/src/com/dalsemi/onewire/container/OneWireContainer1A.java
index 0ab175c3ca7..07f3e37e15c 100644
--- a/io.openems.edge.bridge.onewire/src/com/dalsemi/onewire/container/OneWireContainer1A.java
+++ b/io.openems.edge.bridge.onewire/src/com/dalsemi/onewire/container/OneWireContainer1A.java
@@ -45,7 +45,7 @@
  * This iButton is primarily used as a read/write portable memory device that
  * provides tamper detection when utilizing the write counters.
  * </P>
- * 
+ *
  * <H3>Features</H3>
  * <UL>
  * <LI>4096 bits (512 bytes) of read/write nonvolatile memory
@@ -59,14 +59,14 @@
  * <LI>Operating temperature range from -40 to +70
  * <LI>Over 10 years of data retention
  * </UL>
- * 
+ *
  * <H3>Memory</H3>
- * 
+ *
  * <P>
  * The memory can be accessed through the objects that are returned from the
  * {@link #getMemoryBanks() getMemoryBanks} method.
  * </P>
- * 
+ *
  * The following is a list of the MemoryBank instances that are returned:
  *
  * <UL>
@@ -104,9 +104,9 @@
  * <LI><I> Extra information for each page</I> Write cycle counter, length 8
  * </UL>
  * </UL>
- * 
+ *
  * <H3>Usage</H3>
- * 
+ *
  * <DL>
  * <DD>See the usage example in
  * {@link com.dalsemi.onewire.container.OneWireContainer OneWireContainer} to
@@ -121,11 +121,11 @@
  * <DD><A HREF="http://pdfserv.maxim-ic.com/arpdf/DS1963L.pdf">
  * http://pdfserv.maxim-ic.com/arpdf/DS1963L.pdf</A>
  * </DL>
- * 
+ *
  * @see com.dalsemi.onewire.container.MemoryBank
  * @see com.dalsemi.onewire.container.PagedMemoryBank
  * @see com.dalsemi.onewire.container.OneWireContainer18
- * 
+ *
  * @version 0.00, 28 Aug 2000
  * @author DS
  */
@@ -147,7 +147,6 @@ public class OneWireContainer1A extends OneWireContainer {
 	 *      super.setupContainer()
 	 */
 	public OneWireContainer1A() {
-		super();
 	}
 
 	/**
@@ -219,6 +218,7 @@ public OneWireContainer1A(DSPortAdapter sourceAdapter, String newAddress) {
 	 *
 	 * @return iButton or 1-Wire device name
 	 */
+	@Override
 	public String getName() {
 		return "DS1963L";
 	}
@@ -230,6 +230,7 @@ public String getName() {
 	 *
 	 * @return 1-Wire device alternate names
 	 */
+	@Override
 	public String getAlternateNames() {
 		return "Monetary iButton";
 	}
@@ -240,6 +241,7 @@ public String getAlternateNames() {
 	 *
 	 * @return device description
 	 */
+	@Override
 	public String getDescription() {
 		return "4096 bit read/write nonvolatile memory with " + "four 32-bit read-only non rolling-over page write "
 				+ "cycle counters and tamper-detect bits for small " + "money storage";
@@ -259,6 +261,7 @@ public String getDescription() {
 	 * @see com.dalsemi.onewire.adapter.DSPortAdapter#SPEED_FLEX
 	 *      DSPortAdapter.SPEED_FLEX
 	 */
+	@Override
 	public int getMaxSpeed() {
 		return DSPortAdapter.SPEED_OVERDRIVE;
 	}
@@ -269,11 +272,12 @@ public int getMaxSpeed() {
 	 * MemoryBank}, {@link com.dalsemi.onewire.container.PagedMemoryBank
 	 * PagedMemoryBank}, and {@link com.dalsemi.onewire.container.OTPMemoryBank
 	 * OTPMemoryBank}.
-	 * 
+	 *
 	 * @return <CODE>Enumeration</CODE> of memory banks
 	 */
+	@Override
 	public Enumeration<MemoryBank> getMemoryBanks() {
-		Vector<MemoryBank> bank_vector = new Vector<>(3);
+		var bank_vector = new Vector<MemoryBank>(3);
 
 		// scratchpad
 		MemoryBankScratch scratch = new MemoryBankScratchEx(this);
diff --git a/io.openems.edge.bridge.onewire/src/com/dalsemi/onewire/container/OneWireContainer1C.java b/io.openems.edge.bridge.onewire/src/com/dalsemi/onewire/container/OneWireContainer1C.java
index a8a624a8b6b..ccff9c2a53e 100644
--- a/io.openems.edge.bridge.onewire/src/com/dalsemi/onewire/container/OneWireContainer1C.java
+++ b/io.openems.edge.bridge.onewire/src/com/dalsemi/onewire/container/OneWireContainer1C.java
@@ -27,6 +27,7 @@
 
 package com.dalsemi.onewire.container;
 
+import java.util.Arrays;
 import java.util.Enumeration;
 import java.util.Vector;
 
@@ -73,7 +74,7 @@ public class OneWireContainer1C extends OneWireContainer implements SwitchContai
 	/**
 	 * Used for 0xFF array
 	 */
-	private byte[] FF = new byte[8];
+	private final byte[] FF = new byte[8];
 
 	// --------
 	// -------- Memory Banks
@@ -140,12 +141,9 @@ public class OneWireContainer1C extends OneWireContainer implements SwitchContai
 	 *      OneWireContainer1C(DSPortAdapter,String)
 	 */
 	public OneWireContainer1C() {
-		super();
+		this.initmem();
 
-		initmem();
-
-		for (int i = 0; i < FF.length; i++)
-			FF[i] = (byte) 0x0FF;
+		Arrays.fill(this.FF, (byte) 0x0FF);
 	}
 
 	/**
@@ -164,10 +162,9 @@ public OneWireContainer1C() {
 	public OneWireContainer1C(DSPortAdapter sourceAdapter, byte[] newAddress) {
 		super(sourceAdapter, newAddress);
 
-		initmem();
+		this.initmem();
 
-		for (int i = 0; i < FF.length; i++)
-			FF[i] = (byte) 0x0FF;
+		Arrays.fill(this.FF, (byte) 0x0FF);
 	}
 
 	/**
@@ -186,10 +183,9 @@ public OneWireContainer1C(DSPortAdapter sourceAdapter, byte[] newAddress) {
 	public OneWireContainer1C(DSPortAdapter sourceAdapter, long newAddress) {
 		super(sourceAdapter, newAddress);
 
-		initmem();
+		this.initmem();
 
-		for (int i = 0; i < FF.length; i++)
-			FF[i] = (byte) 0x0FF;
+		Arrays.fill(this.FF, (byte) 0x0FF);
 	}
 
 	/**
@@ -208,10 +204,9 @@ public OneWireContainer1C(DSPortAdapter sourceAdapter, long newAddress) {
 	public OneWireContainer1C(DSPortAdapter sourceAdapter, String newAddress) {
 		super(sourceAdapter, newAddress);
 
-		initmem();
+		this.initmem();
 
-		for (int i = 0; i < FF.length; i++)
-			FF[i] = (byte) 0x0FF;
+		Arrays.fill(this.FF, (byte) 0x0FF);
 	}
 
 	// --------
@@ -224,6 +219,7 @@ public OneWireContainer1C(DSPortAdapter sourceAdapter, String newAddress) {
 	 *
 	 * @return iButton or 1-Wire device name
 	 */
+	@Override
 	public String getName() {
 		return "DS28E04";
 	}
@@ -234,17 +230,18 @@ public String getName() {
 	 * MemoryBank}, {@link com.dalsemi.onewire.container.PagedMemoryBank
 	 * PagedMemoryBank}, and {@link com.dalsemi.onewire.container.OTPMemoryBank
 	 * OTPMemoryBank}.
-	 * 
+	 *
 	 * @return <CODE>Enumeration</CODE> of memory banks
 	 */
+	@Override
 	public Enumeration<MemoryBank> getMemoryBanks() {
-		Vector<MemoryBank> bank_vector = new Vector<>(5);
+		var bank_vector = new Vector<MemoryBank>(5);
 
-		bank_vector.addElement(scratch);
-		bank_vector.addElement(mainMemory);
-		bank_vector.addElement(protectionMemory);
-		bank_vector.addElement(pioMemory);
-		bank_vector.addElement(searchMemory);
+		bank_vector.addElement(this.scratch);
+		bank_vector.addElement(this.mainMemory);
+		bank_vector.addElement(this.protectionMemory);
+		bank_vector.addElement(this.pioMemory);
+		bank_vector.addElement(this.searchMemory);
 
 		return bank_vector.elements();
 	}
@@ -256,6 +253,7 @@ public Enumeration<MemoryBank> getMemoryBanks() {
 	 *
 	 * @return the alternate names for this iButton or 1-Wire device
 	 */
+	@Override
 	public String getAlternateNames() {
 		return "DS28E04";
 	}
@@ -266,6 +264,7 @@ public String getAlternateNames() {
 	 *
 	 * @return device description
 	 */
+	@Override
 	public String getDescription() {
 		return "Addressable 1-Wire 4K-bit EEPROM, with 2 channels"
 				+ " of general-purpose PIO pins with pulse generation capability.";
@@ -288,6 +287,7 @@ public String getDescription() {
 	 *
 	 * @see com.dalsemi.onewire.container.OneWireSensor#readDevice()
 	 */
+	@Override
 	public int getNumberChannels(byte[] state) {
 		return 2;
 	}
@@ -303,6 +303,7 @@ public int getNumberChannels(byte[] state) {
 	 *
 	 * @see #getLatchState(int,byte[])
 	 */
+	@Override
 	public boolean isHighSideSwitch() {
 		return false;
 	}
@@ -317,6 +318,7 @@ public boolean isHighSideSwitch() {
 	 * @see #getSensedActivity(int,byte[])
 	 * @see #clearActivity()
 	 */
+	@Override
 	public boolean hasActivitySensing() {
 		return true;
 	}
@@ -330,6 +332,7 @@ public boolean hasActivitySensing() {
 	 *
 	 * @see #getLevel(int,byte[])
 	 */
+	@Override
 	public boolean hasLevelSensing() {
 		return true;
 	}
@@ -346,6 +349,7 @@ public boolean hasLevelSensing() {
 	 *
 	 * @see #setLatchState(int,boolean,boolean,byte[])
 	 */
+	@Override
 	public boolean hasSmartOn() {
 		return false;
 	}
@@ -361,6 +365,7 @@ public boolean hasSmartOn() {
 	 *
 	 * @see #setLatchState(int,boolean,boolean,byte[])
 	 */
+	@Override
 	public boolean onlySingleChannelOn() {
 		return false;
 	}
@@ -386,9 +391,10 @@ public boolean onlySingleChannelOn() {
 	 * @see com.dalsemi.onewire.container.OneWireSensor#readDevice()
 	 * @see #hasLevelSensing()
 	 */
+	@Override
 	public boolean getLevel(int channel, byte[] state) {
-		byte level = (byte) (0x01 << channel);
-		return ((state[0] & level) == level);
+		var level = (byte) (0x01 << channel);
+		return (state[0] & level) == level;
 	}
 
 	/**
@@ -408,9 +414,10 @@ public boolean getLevel(int channel, byte[] state) {
 	 * @see #isHighSideSwitch()
 	 * @see #setLatchState(int,boolean,boolean,byte[])
 	 */
+	@Override
 	public boolean getLatchState(int channel, byte[] state) {
-		byte latch = (byte) (0x01 << channel);
-		return ((state[1] & latch) == latch);
+		var latch = (byte) (0x01 << channel);
+		return (state[1] & latch) == latch;
 	}
 
 	/**
@@ -433,9 +440,10 @@ public boolean getLatchState(int channel, byte[] state) {
 	 * @see #hasActivitySensing()
 	 * @see #clearActivity()
 	 */
+	@Override
 	public boolean getSensedActivity(int channel, byte[] state) throws OneWireException {
-		byte activity = (byte) (0x01 << channel);
-		return ((state[2] & activity) == activity);
+		var activity = (byte) (0x01 << channel);
+		return (state[2] & activity) == activity;
 	}
 
 	/**
@@ -448,18 +456,20 @@ public boolean getSensedActivity(int channel, byte[] state) throws OneWireExcept
 	 * @see com.dalsemi.onewire.container.OneWireSensor#readDevice()
 	 * @see #getSensedActivity(int,byte[])
 	 */
+	@Override
 	public void clearActivity() throws OneWireException {
-		adapter.assertSelect(address);
+		this.adapter.assertSelect(this.address);
 
-		byte[] buffer = new byte[9];
+		var buffer = new byte[9];
 
 		buffer[0] = RESET_ACTIVITY_LATCHES;
-		System.arraycopy(FF, 0, buffer, 1, 8);
+		System.arraycopy(this.FF, 0, buffer, 1, 8);
 
-		adapter.dataBlock(buffer, 0, 9);
+		this.adapter.dataBlock(buffer, 0, 9);
 
-		if ((buffer[1] != (byte) 0xAA) && (buffer[1] != (byte) 0x55))
+		if (buffer[1] != (byte) 0xAA && buffer[1] != (byte) 0x55) {
 			throw new OneWireException("Sense Activity was not cleared.");
+		}
 	}
 
 	// --------
@@ -490,13 +500,15 @@ public void clearActivity() throws OneWireException {
 	 * @see #getLatchState(int,byte[])
 	 * @see com.dalsemi.onewire.container.OneWireSensor#writeDevice(byte[])
 	 */
+	@Override
 	public void setLatchState(int channel, boolean latchState, boolean doSmart, byte[] state) {
-		byte latch = (byte) (0x01 << channel);
+		var latch = (byte) (0x01 << channel);
 
-		if (latchState)
+		if (latchState) {
 			state[1] = (byte) (state[1] | latch);
-		else
+		} else {
 			state[1] = (byte) (state[1] & ~latch);
+		}
 	}
 
 	/**
@@ -514,7 +526,7 @@ public void setLatchState(int channel, boolean latchState, boolean doSmart, byte
 	 * @see com.dalsemi.onewire.container.OneWireSensor#writeDevice(byte[])
 	 */
 	public void setLatchState(byte set, byte[] state) {
-		state[1] = (byte) set;
+		state[1] = set;
 	}
 
 	/**
@@ -533,11 +545,12 @@ public void setLatchState(byte set, byte[] state) {
 	 * @throws OneWireException   on a communication or setup error with the 1-Wire
 	 *                            adapter
 	 */
+	@Override
 	public byte[] readDevice() throws OneWireIOException, OneWireException {
-		byte[] state = new byte[3];
+		var state = new byte[3];
 
-		System.arraycopy(FF, 0, state, 0, 3);
-		pioMemory.read(0, false, state, 0, 3);
+		System.arraycopy(this.FF, 0, state, 0, 3);
+		this.pioMemory.read(0, false, state, 0, 3);
 
 		return state;
 	}
@@ -559,9 +572,9 @@ public byte[] readDevice() throws OneWireIOException, OneWireException {
 	 *                            adapter
 	 */
 	public byte[] readRegister() throws OneWireIOException, OneWireException {
-		byte[] register = new byte[3];
+		var register = new byte[3];
 
-		searchMemory.read(0, false, register, 0, 3);
+		this.searchMemory.read(0, false, register, 0, 3);
 
 		return register;
 	}
@@ -581,11 +594,12 @@ public byte[] readRegister() throws OneWireIOException, OneWireException {
 	 * @throws OneWireException   on a communication or setup error with the 1-Wire
 	 *                            adapter
 	 */
+	@Override
 	public void writeDevice(byte[] state) throws OneWireIOException, OneWireException {
 		// channel Access Write
-		adapter.assertSelect(address);
+		this.adapter.assertSelect(this.address);
 
-		byte[] buffer = new byte[5];
+		var buffer = new byte[5];
 
 		buffer[0] = PIO_ACCESS_WRITE;
 		buffer[1] = state[1];
@@ -593,7 +607,7 @@ public void writeDevice(byte[] state) throws OneWireIOException, OneWireExceptio
 		buffer[3] = (byte) 0xFF;
 		buffer[4] = (byte) 0xFF;
 
-		adapter.dataBlock(buffer, 0, 5);
+		this.adapter.dataBlock(buffer, 0, 5);
 
 		if (buffer[3] != (byte) 0x00AA) {
 			throw new OneWireIOException("Failure to change latch state.");
@@ -619,9 +633,9 @@ public void writeDevice(byte[] state) throws OneWireIOException, OneWireExceptio
 	 */
 	public void writeRegister(byte[] register) throws OneWireIOException, OneWireException {
 		// channel Access Write
-		adapter.assertSelect(address);
+		this.adapter.assertSelect(this.address);
 
-		byte[] buffer = new byte[6];
+		var buffer = new byte[6];
 
 		buffer[0] = WRITE_REGISTER;
 		buffer[1] = 0x23;
@@ -630,7 +644,7 @@ public void writeRegister(byte[] register) throws OneWireIOException, OneWireExc
 		buffer[4] = register[1];
 		buffer[5] = register[2];
 
-		adapter.dataBlock(buffer, 0, 6);
+		this.adapter.dataBlock(buffer, 0, 6);
 	}
 
 	/**
@@ -649,22 +663,25 @@ public void writeRegister(byte[] register) throws OneWireIOException, OneWireExc
 	 *                            adapter
 	 */
 	public boolean isVccPowered(byte[] register) throws OneWireIOException, OneWireException {
-		if ((register[2] & (byte) 0x80) == (byte) 0x80)
+		if ((register[2] & (byte) 0x80) == (byte) 0x80) {
 			return true;
+		}
 
 		return false;
 	}
 
 	public boolean getDefaultPolarity(byte[] register) {
-		if ((register[2] & (byte) 0x40) == (byte) 0x40)
+		if ((register[2] & (byte) 0x40) == (byte) 0x40) {
 			return true;
+		}
 
 		return false;
 	}
 
 	public boolean getPowerOnResetLatch(byte[] register) {
-		if ((register[2] & (byte) 0x08) == (byte) 0x08)
+		if ((register[2] & (byte) 0x08) == (byte) 0x08) {
 			return true;
+		}
 
 		return false;
 	}
@@ -677,7 +694,7 @@ public boolean getPowerOnResetLatch(byte[] register) {
 	 */
 	public void clearPowerOnReset(byte[] register) {
 		if ((register[2] & (byte) 0x08) == (byte) 0x08) {
-			register[2] = (byte) ((byte) register[2] & (byte) 0xF7);
+			register[2] = (byte) (register[2] & (byte) 0xF7);
 		}
 	}
 
@@ -689,7 +706,7 @@ public void clearPowerOnReset(byte[] register) {
 	 */
 	public void orConditionalSearch(byte[] register) {
 		if ((register[2] & (byte) 0x02) == (byte) 0x02) {
-			register[2] = (byte) ((byte) register[2] & (byte) 0xFD);
+			register[2] = (byte) (register[2] & (byte) 0xFD);
 		}
 	}
 
@@ -701,7 +718,7 @@ public void orConditionalSearch(byte[] register) {
 	 */
 	public void andConditionalSearch(byte[] register) {
 		if ((register[2] & (byte) 0x02) != (byte) 0x02) {
-			register[2] = (byte) ((byte) register[2] | (byte) 0x02);
+			register[2] = (byte) (register[2] | (byte) 0x02);
 		}
 	}
 
@@ -714,7 +731,7 @@ public void andConditionalSearch(byte[] register) {
 	 */
 	public void setConditionalSearchLogicLevel(byte[] register) {
 		if ((register[2] & (byte) 0x01) == (byte) 0x01) {
-			register[2] = (byte) ((byte) register[2] & (byte) 0xFE);
+			register[2] = (byte) (register[2] & (byte) 0xFE);
 		}
 	}
 
@@ -727,7 +744,7 @@ public void setConditionalSearchLogicLevel(byte[] register) {
 	 */
 	public void setConditionalSearchActivity(byte[] register) {
 		if ((register[2] & (byte) 0x01) != (byte) 0x01) {
-			register[2] = (byte) ((byte) register[2] | (byte) 0x01);
+			register[2] = (byte) (register[2] | (byte) 0x01);
 		}
 	}
 
@@ -741,12 +758,13 @@ public void setConditionalSearchActivity(byte[] register) {
 	 *                 from <code>readRegister()</code>
 	 */
 	public void setChannelMask(int channel, boolean set, byte[] register) {
-		byte mask = (byte) (0x01 << channel);
+		var mask = (byte) (0x01 << channel);
 
-		if (set)
-			register[0] = (byte) ((byte) register[0] | (byte) mask);
-		else
-			register[0] = (byte) ((byte) register[0] & (byte) ~mask);
+		if (set) {
+			register[0] = (byte) (register[0] | mask);
+		} else {
+			register[0] = (byte) (register[0] & (byte) ~mask);
+		}
 	}
 
 	/**
@@ -760,12 +778,13 @@ public void setChannelMask(int channel, boolean set, byte[] register) {
 	 *                 from <code>readRegister()</code>
 	 */
 	public void setChannelPolarity(int channel, boolean set, byte[] register) {
-		byte polarity = (byte) (0x01 << channel);
+		var polarity = (byte) (0x01 << channel);
 
-		if (set)
-			register[1] = (byte) ((byte) register[1] | (byte) polarity);
-		else
-			register[1] = (byte) ((byte) register[1] & (byte) ~polarity);
+		if (set) {
+			register[1] = (byte) (register[1] | polarity);
+		} else {
+			register[1] = (byte) (register[1] & (byte) ~polarity);
+		}
 	}
 
 	/**
@@ -780,9 +799,9 @@ public void setChannelPolarity(int channel, boolean set, byte[] register) {
 	 *         other wise.
 	 */
 	public boolean getChannelMask(int channel, byte[] register) {
-		byte mask = (byte) (0x01 << channel);
+		var mask = (byte) (0x01 << channel);
 
-		return ((register[0] & mask) == mask);
+		return (register[0] & mask) == mask;
 	}
 
 	/**
@@ -796,56 +815,56 @@ public boolean getChannelMask(int channel, byte[] register) {
 	 *         other wise.
 	 */
 	public boolean getChannelPolarity(int channel, byte[] register) {
-		byte polarity = (byte) (0x01 << channel);
+		var polarity = (byte) (0x01 << channel);
 
-		return ((register[1] & polarity) == polarity);
+		return (register[1] & polarity) == polarity;
 	}
 
 	/**
 	 * Initialize the memory banks and data associated with each.
 	 */
 	private void initmem() {
-		scratch = new MemoryBankScratchEE(this);
-		scratch.bankDescription = "Scratchpad";
-		((MemoryBankScratchEE) scratch).COPY_DELAY_LEN = 18; // TODO: Should be 10
-		((MemoryBankScratchEE) scratch).numVerificationBytes = 2;
-
-		mainMemory = new MemoryBankNV(this, scratch);
-		mainMemory.bankDescription = "User Data Memory";
-		mainMemory.startPhysicalAddress = 0x000;
-		mainMemory.size = 0x200;
-		mainMemory.readOnly = false;
-		mainMemory.generalPurposeMemory = true;
-		mainMemory.readWrite = true;
-		mainMemory.powerDelivery = true;
-
-		protectionMemory = new MemoryBankNV(this, scratch);
-		protectionMemory.bankDescription = "Protection Control and Factory Bytes";
-		protectionMemory.startPhysicalAddress = 0x200;
-		protectionMemory.size = 0x020;
-		protectionMemory.readOnly = false;
-		protectionMemory.generalPurposeMemory = false;
-		protectionMemory.readWrite = true;
-		protectionMemory.powerDelivery = true;
-
-		pioMemory = new MemoryBankNV(this, scratch);
-		pioMemory.bankDescription = "PIO Readouts";
-		pioMemory.startPhysicalAddress = 0x220;
-		pioMemory.size = 0x003;
-		pioMemory.readOnly = true;
-		pioMemory.generalPurposeMemory = false;
-		pioMemory.nonVolatile = false;
-		pioMemory.readWrite = false;
-		pioMemory.powerDelivery = false;
-
-		searchMemory = new MemoryBankNV(this, scratch);
-		searchMemory.bankDescription = "Conditional Search and Status Register";
-		searchMemory.startPhysicalAddress = 0x223;
-		searchMemory.size = 0x003;
-		searchMemory.readOnly = true;
-		searchMemory.generalPurposeMemory = false;
-		searchMemory.nonVolatile = false;
-		searchMemory.readWrite = false;
-		searchMemory.powerDelivery = false;
+		this.scratch = new MemoryBankScratchEE(this);
+		this.scratch.bankDescription = "Scratchpad";
+		((MemoryBankScratchEE) this.scratch).COPY_DELAY_LEN = 18; // TODO: Should be 10
+		((MemoryBankScratchEE) this.scratch).numVerificationBytes = 2;
+
+		this.mainMemory = new MemoryBankNV(this, this.scratch);
+		this.mainMemory.bankDescription = "User Data Memory";
+		this.mainMemory.startPhysicalAddress = 0x000;
+		this.mainMemory.size = 0x200;
+		this.mainMemory.readOnly = false;
+		this.mainMemory.generalPurposeMemory = true;
+		this.mainMemory.readWrite = true;
+		this.mainMemory.powerDelivery = true;
+
+		this.protectionMemory = new MemoryBankNV(this, this.scratch);
+		this.protectionMemory.bankDescription = "Protection Control and Factory Bytes";
+		this.protectionMemory.startPhysicalAddress = 0x200;
+		this.protectionMemory.size = 0x020;
+		this.protectionMemory.readOnly = false;
+		this.protectionMemory.generalPurposeMemory = false;
+		this.protectionMemory.readWrite = true;
+		this.protectionMemory.powerDelivery = true;
+
+		this.pioMemory = new MemoryBankNV(this, this.scratch);
+		this.pioMemory.bankDescription = "PIO Readouts";
+		this.pioMemory.startPhysicalAddress = 0x220;
+		this.pioMemory.size = 0x003;
+		this.pioMemory.readOnly = true;
+		this.pioMemory.generalPurposeMemory = false;
+		this.pioMemory.nonVolatile = false;
+		this.pioMemory.readWrite = false;
+		this.pioMemory.powerDelivery = false;
+
+		this.searchMemory = new MemoryBankNV(this, this.scratch);
+		this.searchMemory.bankDescription = "Conditional Search and Status Register";
+		this.searchMemory.startPhysicalAddress = 0x223;
+		this.searchMemory.size = 0x003;
+		this.searchMemory.readOnly = true;
+		this.searchMemory.generalPurposeMemory = false;
+		this.searchMemory.nonVolatile = false;
+		this.searchMemory.readWrite = false;
+		this.searchMemory.powerDelivery = false;
 	}
 }
diff --git a/io.openems.edge.bridge.onewire/src/com/dalsemi/onewire/container/OneWireContainer1D.java b/io.openems.edge.bridge.onewire/src/com/dalsemi/onewire/container/OneWireContainer1D.java
index 64d0e33ac3d..c8b8fcbefc3 100644
--- a/io.openems.edge.bridge.onewire/src/com/dalsemi/onewire/container/OneWireContainer1D.java
+++ b/io.openems.edge.bridge.onewire/src/com/dalsemi/onewire/container/OneWireContainer1D.java
@@ -56,7 +56,7 @@
  * the the counters may also be read with the <CODE> PagedMemoryBank </CODE>
  * interface as 'extra' information on a page read.
  * </P>
- * 
+ *
  * <H3>Features</H3>
  * <UL>
  * <LI>4096 bits (512 bytes) of read/write nonvolatile memory
@@ -72,14 +72,14 @@
  * <LI>Operating temperature range from -40 to +70
  * <LI>Over 10 years of data retention
  * </UL>
- * 
+ *
  * <H3>Memory</H3>
- * 
+ *
  * <P>
  * The memory can be accessed through the objects that are returned from the
  * {@link #getMemoryBanks() getMemoryBanks} method.
  * </P>
- * 
+ *
  * The following is a list of the MemoryBank instances that are returned:
  *
  * <UL>
@@ -130,21 +130,21 @@
  * length 8
  * </UL>
  * </UL>
- * 
+ *
  * <H3>Usage</H3>
- * 
+ *
  * <DL>
  * <DD>
  * <H4>Example</H4> Read the two external counters of this containers instance
  * 'owd':
- * 
+ *
  * <PRE>
  *  <CODE>
  *  System.out.print("Counter on page 14: " + owd.readCounter(14));
  *  System.out.print("Counter on page 15: " + owd.readCounter(15));
  * </CODE>
  * </PRE>
- * 
+ *
  * <DD>See the usage example in
  * {@link com.dalsemi.onewire.container.OneWireContainer OneWireContainer} to
  * enumerate the MemoryBanks.
@@ -158,10 +158,10 @@
  * <DD><A HREF="http://pdfserv.maxim-ic.com/arpdf/DS2422-DS2423.pdf">
  * http://pdfserv.maxim-ic.com/arpdf/DS2422-DS2423.pdf</A>
  * </DL>
- * 
+ *
  * @see com.dalsemi.onewire.container.MemoryBank
  * @see com.dalsemi.onewire.container.PagedMemoryBank
- * 
+ *
  * @version 0.00, 28 Aug 2000
  * @author DS
  */
@@ -183,7 +183,7 @@ public class OneWireContainer1D extends OneWireContainer {
 	/**
 	 * Internal buffer
 	 */
-	private byte[] buffer = new byte[14];
+	private final byte[] buffer = new byte[14];
 
 	// --------
 	// -------- Constructors
@@ -201,7 +201,6 @@ public class OneWireContainer1D extends OneWireContainer {
 	 *      super.setupContainer()
 	 */
 	public OneWireContainer1D() {
-		super();
 	}
 
 	/**
@@ -273,6 +272,7 @@ public OneWireContainer1D(DSPortAdapter sourceAdapter, String newAddress) {
 	 *
 	 * @return iButton or 1-Wire device name
 	 */
+	@Override
 	public String getName() {
 		return "DS2423";
 	}
@@ -283,6 +283,7 @@ public String getName() {
 	 *
 	 * @return device description
 	 */
+	@Override
 	public String getDescription() {
 		return "1-Wire counter with 4096 bits of read/write, nonvolatile "
 				+ "memory.  Memory is partitioned into sixteen pages of 256 bits each.  "
@@ -306,6 +307,7 @@ public String getDescription() {
 	 * @see com.dalsemi.onewire.adapter.DSPortAdapter#SPEED_FLEX
 	 *      DSPortAdapter.SPEED_FLEX
 	 */
+	@Override
 	public int getMaxSpeed() {
 		return DSPortAdapter.SPEED_OVERDRIVE;
 	}
@@ -316,19 +318,20 @@ public int getMaxSpeed() {
 	 * MemoryBank}, {@link com.dalsemi.onewire.container.PagedMemoryBank
 	 * PagedMemoryBank}, and {@link com.dalsemi.onewire.container.OTPMemoryBank
 	 * OTPMemoryBank}.
-	 * 
+	 *
 	 * @return <CODE>Enumeration</CODE> of memory banks
 	 */
+	@Override
 	public Enumeration<MemoryBank> getMemoryBanks() {
-		Vector<MemoryBank> bank_vector = new Vector<>(4);
+		var bank_vector = new Vector<MemoryBank>(4);
 
 		// scratchpad
-		MemoryBankScratchEx scratch = new MemoryBankScratchEx(this);
+		var scratch = new MemoryBankScratchEx(this);
 
 		bank_vector.addElement(scratch);
 
 		// NVRAM
-		MemoryBankNVCRC nv = new MemoryBankNVCRC(this, scratch);
+		var nv = new MemoryBankNVCRC(this, scratch);
 
 		nv.numberPages = 12;
 		nv.size = 384;
@@ -389,42 +392,44 @@ public Enumeration<MemoryBank> getMemoryBanks() {
 	public long readCounter(int counterPage) throws OneWireIOException, OneWireException {
 
 		// check if counter page provided is valid
-		if ((counterPage < 12) || (counterPage > 15))
+		if (counterPage < 12 || counterPage > 15) {
 			throw new OneWireException("OneWireContainer1D-invalid counter page");
+		}
 
 		// select the device
-		if (adapter.select(address)) {
+		if (this.adapter.select(this.address)) {
 			int crc16;
 
 			// read memory command
-			buffer[0] = READ_MEMORY_COMMAND;
+			this.buffer[0] = READ_MEMORY_COMMAND;
 			crc16 = CRC16.compute(READ_MEMORY_COMMAND);
 
 			// address of last data byte before counter
-			int address = (counterPage << 5) + 31;
+			var address = (counterPage << 5) + 31;
 
 			// append the address
-			buffer[1] = (byte) address;
-			crc16 = CRC16.compute(buffer[1], crc16);
-			buffer[2] = (byte) (address >>> 8);
-			crc16 = CRC16.compute(buffer[2], crc16);
+			this.buffer[1] = (byte) address;
+			crc16 = CRC16.compute(this.buffer[1], crc16);
+			this.buffer[2] = (byte) (address >>> 8);
+			crc16 = CRC16.compute(this.buffer[2], crc16);
 
 			// now add the read bytes for data byte,counter,zero bits, crc16
-			for (int i = 3; i < 14; i++)
-				buffer[i] = (byte) 0xFF;
+			for (var i = 3; i < 14; i++) {
+				this.buffer[i] = (byte) 0xFF;
+			}
 
 			// send the block
-			adapter.dataBlock(buffer, 0, 14);
+			this.adapter.dataBlock(this.buffer, 0, 14);
 
 			// calculate the CRC16 on the result and check if correct
-			if (CRC16.compute(buffer, 3, 11, crc16) == 0xB001) {
+			if (CRC16.compute(this.buffer, 3, 11, crc16) == 0xB001) {
 
 				// extract the counter out of this verified packet
-				long return_count = 0;
+				var return_count = 0L;
 
-				for (int i = 4; i >= 1; i--) {
+				for (var i = 4; i >= 1; i--) {
 					return_count <<= 8;
-					return_count |= (buffer[i + 3] & 0xFF);
+					return_count |= this.buffer[i + 3] & 0xFF;
 				}
 
 				// return the result count
diff --git a/io.openems.edge.bridge.onewire/src/com/dalsemi/onewire/container/OneWireContainer1F.java b/io.openems.edge.bridge.onewire/src/com/dalsemi/onewire/container/OneWireContainer1F.java
index 4f7b2e582bb..47214de610d 100644
--- a/io.openems.edge.bridge.onewire/src/com/dalsemi/onewire/container/OneWireContainer1F.java
+++ b/io.openems.edge.bridge.onewire/src/com/dalsemi/onewire/container/OneWireContainer1F.java
@@ -163,9 +163,7 @@ public class OneWireContainer1F extends OneWireContainer implements SwitchContai
 	 *      super.setupContainer()
 	 */
 	public OneWireContainer1F() {
-		super();
-
-		clearActivityOnWrite = false;
+		this.clearActivityOnWrite = false;
 	}
 
 	/**
@@ -186,7 +184,7 @@ public OneWireContainer1F() {
 	public OneWireContainer1F(DSPortAdapter sourceAdapter, byte[] newAddress) {
 		super(sourceAdapter, newAddress);
 
-		clearActivityOnWrite = false;
+		this.clearActivityOnWrite = false;
 	}
 
 	/**
@@ -208,7 +206,7 @@ public OneWireContainer1F(DSPortAdapter sourceAdapter, byte[] newAddress) {
 	public OneWireContainer1F(DSPortAdapter sourceAdapter, long newAddress) {
 		super(sourceAdapter, newAddress);
 
-		clearActivityOnWrite = false;
+		this.clearActivityOnWrite = false;
 	}
 
 	/**
@@ -230,7 +228,7 @@ public OneWireContainer1F(DSPortAdapter sourceAdapter, long newAddress) {
 	public OneWireContainer1F(DSPortAdapter sourceAdapter, String newAddress) {
 		super(sourceAdapter, newAddress);
 
-		clearActivityOnWrite = false;
+		this.clearActivityOnWrite = false;
 	}
 
 	// --------
@@ -243,6 +241,7 @@ public OneWireContainer1F(DSPortAdapter sourceAdapter, String newAddress) {
 	 *
 	 * @return iButton or 1-Wire device name
 	 */
+	@Override
 	public String getName() {
 		return "DS2409";
 	}
@@ -254,6 +253,7 @@ public String getName() {
 	 *
 	 * @return 1-Wire device alternate names
 	 */
+	@Override
 	public String getAlternateNames() {
 		return "Coupler";
 	}
@@ -264,6 +264,7 @@ public String getAlternateNames() {
 	 *
 	 * @return device description
 	 */
+	@Override
 	public String getDescription() {
 		return "1-Wire Network Coupler with dual addressable " + "switches and a general purpose open drain control "
 				+ "output.  Provides a common ground for all connected"
@@ -286,7 +287,7 @@ public String getDescription() {
 	 * @see OneWireContainer#doSpeed()
 	 */
 	public synchronized void setSpeedCheck(boolean doSpeedCheck) {
-		doSpeedEnable = doSpeedCheck;
+		this.doSpeedEnable = doSpeedCheck;
 	}
 
 	// --------
@@ -309,14 +310,16 @@ public synchronized void setSpeedCheck(boolean doSpeedCheck) {
 	 * @throws OneWireException   on a communication or setup error with the 1-Wire
 	 *                            adapter
 	 */
+	@Override
 	public byte[] readDevice() throws OneWireIOException, OneWireException {
-		byte[] ret_buf = new byte[4];
+		var ret_buf = new byte[4];
 
-		if (doSpeedEnable)
-			doSpeed();
+		if (this.doSpeedEnable) {
+			this.doSpeed();
+		}
 
 		// read the status byte
-		byte[] tmp_buf = deviceOperation(READ_WRITE_STATUS_COMMAND, (byte) 0x00FF, 2);
+		var tmp_buf = this.deviceOperation(READ_WRITE_STATUS_COMMAND, (byte) 0x00FF, 2);
 
 		// extract the status byte
 		ret_buf[0] = tmp_buf[2];
@@ -339,19 +342,22 @@ public byte[] readDevice() throws OneWireIOException, OneWireException {
 	 * @throws OneWireException   on a communication or setup error with the 1-Wire
 	 *                            adapter
 	 */
+	@Override
 	public void writeDevice(byte[] state) throws OneWireIOException, OneWireException {
-		int extra = 0;
+		var extra = 0;
 		byte command, first_byte;
 		byte[] tmp_buf = null;
 
-		if (doSpeedEnable)
-			doSpeed();
+		if (this.doSpeedEnable) {
+			this.doSpeed();
+		}
 
 		// check for both switches set to on
-		if ((Bit.arrayReadBit(MAIN_OFFSET, BITMAP_OFFSET, state) == 1)
-				&& (Bit.arrayReadBit(AUX_OFFSET, BITMAP_OFFSET, state) == 1)) {
-			if ((state[MAIN_OFFSET] != SWITCH_OFF) && (state[AUX_OFFSET] != SWITCH_OFF))
+		if (Bit.arrayReadBit(MAIN_OFFSET, BITMAP_OFFSET, state) == 1
+				&& Bit.arrayReadBit(AUX_OFFSET, BITMAP_OFFSET, state) == 1) {
+			if (state[MAIN_OFFSET] != SWITCH_OFF && state[AUX_OFFSET] != SWITCH_OFF) {
 				throw new OneWireException("Attempting to set both channels on, only single channel on at a time");
+			}
 		}
 
 		// check if need to set control
@@ -361,22 +367,24 @@ public void writeDevice(byte[] state) throws OneWireIOException, OneWireExceptio
 			first_byte = 0;
 
 			// mode bit
-			if (Bit.arrayReadBit(7, STATUS_OFFSET, state) == 1)
+			if (Bit.arrayReadBit(7, STATUS_OFFSET, state) == 1) {
 				first_byte |= (byte) 0x20;
+			}
 
 			// Control output
-			if (Bit.arrayReadBit(6, STATUS_OFFSET, state) == 1)
+			if (Bit.arrayReadBit(6, STATUS_OFFSET, state) == 1) {
 				first_byte |= (byte) 0xC0;
+			}
 
-			tmp_buf = deviceOperation(READ_WRITE_STATUS_COMMAND, first_byte, 2);
-			state[0] = (byte) tmp_buf[2];
+			tmp_buf = this.deviceOperation(READ_WRITE_STATUS_COMMAND, first_byte, 2);
+			state[0] = tmp_buf[2];
 		}
 
 		// check for AUX state change
 		command = 0;
 
 		if (Bit.arrayReadBit(AUX_OFFSET, BITMAP_OFFSET, state) == 1) {
-			if ((state[AUX_OFFSET] == SWITCH_ON) || (state[AUX_OFFSET] == SWITCH_SMART)) {
+			if (state[AUX_OFFSET] == SWITCH_ON || state[AUX_OFFSET] == SWITCH_SMART) {
 				command = SMART_ON_AUX_COMMAND;
 				extra = 2;
 			} else {
@@ -400,18 +408,19 @@ public void writeDevice(byte[] state) throws OneWireIOException, OneWireExceptio
 		}
 
 		// check if there are events to clear and not about to do clear anyway
-		if ((clearActivityOnWrite) && (command != ALL_LINES_OFF_COMMAND)) {
-			if ((Bit.arrayReadBit(4, STATUS_OFFSET, state) == 1) || (Bit.arrayReadBit(5, STATUS_OFFSET, state) == 1)) {
+		if (this.clearActivityOnWrite && command != ALL_LINES_OFF_COMMAND) {
+			if (Bit.arrayReadBit(4, STATUS_OFFSET, state) == 1 || Bit.arrayReadBit(5, STATUS_OFFSET, state) == 1) {
 
 				// clear the events
-				deviceOperation(ALL_LINES_OFF_COMMAND, (byte) 0xFF, 0);
+				this.deviceOperation(ALL_LINES_OFF_COMMAND, (byte) 0xFF, 0);
 
 				// set the channels back to the correct state
 				if (command == 0) {
-					if (Bit.arrayReadBit(0, STATUS_OFFSET, state) == 0)
+					if (Bit.arrayReadBit(0, STATUS_OFFSET, state) == 0) {
 						command = SMART_ON_MAIN_COMMAND;
-					else if (Bit.arrayReadBit(2, STATUS_OFFSET, state) == 0)
+					} else if (Bit.arrayReadBit(2, STATUS_OFFSET, state) == 0) {
 						command = SMART_ON_AUX_COMMAND;
+					}
 
 					extra = 2;
 				}
@@ -419,18 +428,20 @@ else if (Bit.arrayReadBit(2, STATUS_OFFSET, state) == 0)
 		}
 
 		// check if there is a command to send
-		if (command != 0)
-			tmp_buf = deviceOperation(command, (byte) 0xFF, extra);
+		if (command != 0) {
+			tmp_buf = this.deviceOperation(command, (byte) 0xFF, extra);
+		}
 
 		// if doing a SMART_ON, then look at result data for presence
-		if ((command == SMART_ON_MAIN_COMMAND) || (command == SMART_ON_AUX_COMMAND)) {
+		if (command == SMART_ON_MAIN_COMMAND || command == SMART_ON_AUX_COMMAND) {
 			// devices on branch indicated if 3rd byte is 0
-			devicesOnBranch = (tmp_buf[2] == 0);
-		} else
-			devicesOnBranch = false;
+			this.devicesOnBranch = tmp_buf[2] == 0;
+		} else {
+			this.devicesOnBranch = false;
+		}
 
 		// clear clear activity on write
-		clearActivityOnWrite = false;
+		this.clearActivityOnWrite = false;
 
 		// clear the bitmap
 		state[BITMAP_OFFSET] = 0;
@@ -461,14 +472,16 @@ else if (Bit.arrayReadBit(2, STATUS_OFFSET, state) == 0)
 	public void dischargeLines(int time) throws OneWireIOException, OneWireException {
 
 		// Error checking
-		if (time < 100)
+		if (time < 100) {
 			time = 100;
+		}
 
-		if (doSpeedEnable)
-			doSpeed();
+		if (this.doSpeedEnable) {
+			this.doSpeed();
+		}
 
 		// discharge the lines
-		deviceOperation(DISCHARGE_COMMAND, (byte) 0xFF, 0);
+		this.deviceOperation(DISCHARGE_COMMAND, (byte) 0xFF, 0);
 
 		// wait for desired time and return.
 		try {
@@ -479,7 +492,7 @@ public void dischargeLines(int time) throws OneWireIOException, OneWireException
 		}
 
 		// clear the discharge
-		deviceOperation(READ_WRITE_STATUS_COMMAND, (byte) 0x00FF, 2);
+		this.deviceOperation(READ_WRITE_STATUS_COMMAND, (byte) 0x00FF, 2);
 	}
 
 	// --------
@@ -497,6 +510,7 @@ public void dischargeLines(int time) throws OneWireIOException, OneWireException
 	 *
 	 * @see #getLatchState(int,byte[])
 	 */
+	@Override
 	public boolean isHighSideSwitch() {
 		return true;
 	}
@@ -511,6 +525,7 @@ public boolean isHighSideSwitch() {
 	 * @see #getSensedActivity(int,byte[])
 	 * @see #clearActivity()
 	 */
+	@Override
 	public boolean hasActivitySensing() {
 		return true;
 	}
@@ -524,6 +539,7 @@ public boolean hasActivitySensing() {
 	 *
 	 * @see #getLevel(int,byte[])
 	 */
+	@Override
 	public boolean hasLevelSensing() {
 		return true;
 	}
@@ -540,6 +556,7 @@ public boolean hasLevelSensing() {
 	 *
 	 * @see #setLatchState(int,boolean,boolean,byte[])
 	 */
+	@Override
 	public boolean hasSmartOn() {
 		return true;
 	}
@@ -555,6 +572,7 @@ public boolean hasSmartOn() {
 	 *
 	 * @see #setLatchState(int,boolean,boolean,byte[])
 	 */
+	@Override
 	public boolean onlySingleChannelOn() {
 		return true;
 	}
@@ -576,6 +594,7 @@ public boolean onlySingleChannelOn() {
 	 *
 	 * @return the number of channels for this device
 	 */
+	@Override
 	public int getNumberChannels(byte[] state) {
 		return 2;
 	}
@@ -597,8 +616,9 @@ public int getNumberChannels(byte[] state) {
 	 * @see com.dalsemi.onewire.container.OneWireSensor#readDevice()
 	 * @see #hasLevelSensing()
 	 */
+	@Override
 	public boolean getLevel(int channel, byte[] state) throws OneWireException {
-		return (Bit.arrayReadBit(1 + channel * 2, STATUS_OFFSET, state) == 1);
+		return Bit.arrayReadBit(1 + channel * 2, STATUS_OFFSET, state) == 1;
 	}
 
 	/**
@@ -618,8 +638,9 @@ public boolean getLevel(int channel, byte[] state) throws OneWireException {
 	 * @see #isHighSideSwitch()
 	 * @see #setLatchState(int,boolean,boolean,byte[])
 	 */
+	@Override
 	public boolean getLatchState(int channel, byte[] state) {
-		return (Bit.arrayReadBit(channel * 2, STATUS_OFFSET, state) == 0);
+		return Bit.arrayReadBit(channel * 2, STATUS_OFFSET, state) == 0;
 	}
 
 	/**
@@ -642,8 +663,9 @@ public boolean getLatchState(int channel, byte[] state) {
 	 * @see #hasActivitySensing()
 	 * @see #clearActivity()
 	 */
+	@Override
 	public boolean getSensedActivity(int channel, byte[] state) throws OneWireException {
-		return (Bit.arrayReadBit(4 + channel, STATUS_OFFSET, state) == 1);
+		return Bit.arrayReadBit(4 + channel, STATUS_OFFSET, state) == 1;
 	}
 
 	// --------
@@ -659,7 +681,7 @@ public boolean getSensedActivity(int channel, byte[] state) throws OneWireExcept
 	 * @return <code>true</code> if control mode is automatic
 	 */
 	public boolean isModeAuto(byte[] state) {
-		return (Bit.arrayReadBit(7, STATUS_OFFSET, state) == 0);
+		return Bit.arrayReadBit(7, STATUS_OFFSET, state) == 0;
 	}
 
 	/**
@@ -699,7 +721,7 @@ public int getControlData(byte[] state) {
 	 * @return <code>true</code> if device detected on branch
 	 */
 	public boolean getLastSmartOnDeviceDetect() {
-		return devicesOnBranch;
+		return this.devicesOnBranch;
 	}
 
 	// --------
@@ -730,13 +752,15 @@ public boolean getLastSmartOnDeviceDetect() {
 	 * @see #getLatchState(int,byte[])
 	 * @see com.dalsemi.onewire.container.OneWireSensor#writeDevice(byte[])
 	 */
+	@Override
 	public void setLatchState(int channel, boolean latchState, boolean doSmart, byte[] state) {
 
 		// set the state flag
-		if (latchState)
-			state[channel + 1] = (byte) ((doSmart) ? SWITCH_SMART : SWITCH_ON);
-		else
+		if (latchState) {
+			state[channel + 1] = (byte) (doSmart ? SWITCH_SMART : SWITCH_ON);
+		} else {
 			state[channel + 1] = (byte) SWITCH_OFF;
+		}
 
 		// indicate in bitmap the the state has changed
 		Bit.arrayWriteBit(1, channel + 1, BITMAP_OFFSET, state);
@@ -752,8 +776,9 @@ public void setLatchState(int channel, boolean latchState, boolean doSmart, byte
 	 * @see com.dalsemi.onewire.container.OneWireSensor#readDevice()
 	 * @see #getSensedActivity(int,byte[])
 	 */
+	@Override
 	public void clearActivity() throws OneWireException {
-		clearActivityOnWrite = true;
+		this.clearActivityOnWrite = true;
 	}
 
 	// --------
@@ -771,17 +796,17 @@ public void clearActivity() throws OneWireException {
 	 */
 	public void setModeAuto(boolean makeAuto, byte[] state) {
 		// set the bit
-		Bit.arrayWriteBit((makeAuto ? 0 : 1), 7, STATUS_OFFSET, state);
+		Bit.arrayWriteBit(makeAuto ? 0 : 1, 7, STATUS_OFFSET, state);
 
 		// indicate in bitmap the the state has changed
 		Bit.arrayWriteBit(1, STATUS_OFFSET, BITMAP_OFFSET, state);
 	}
 
 	/**
-	 * Sets the control pin channel association. This only makes sense if the control
-	 * pin is in automatic mode. The method <code>writeDevice(byte[])</code> must be
-	 * called to finalize changes to the device. Note that multiple 'set' methods
-	 * can be called before one call to <code>writeDevice(byte[])</code>.
+	 * Sets the control pin channel association. This only makes sense if the
+	 * control pin is in automatic mode. The method <code>writeDevice(byte[])</code>
+	 * must be called to finalize changes to the device. Note that multiple 'set'
+	 * methods can be called before one call to <code>writeDevice(byte[])</code>.
 	 *
 	 * @param channel channel to associate with control pin
 	 * @param state   current state of the device returned from
@@ -793,8 +818,9 @@ public void setModeAuto(boolean makeAuto, byte[] state) {
 	public void setControlChannelAssociation(int channel, byte[] state) throws OneWireException {
 
 		// check for invalid mode
-		if (!isModeAuto(state))
+		if (!this.isModeAuto(state)) {
 			throw new OneWireException("Trying to set channel association in manual mode");
+		}
 
 		// set the bit
 		Bit.arrayWriteBit(channel, 6, STATUS_OFFSET, state);
@@ -817,11 +843,12 @@ public void setControlChannelAssociation(int channel, byte[] state) throws OneWi
 	 */
 	public void setControlData(boolean data, byte[] state) throws OneWireException {
 		// check for invalid mode
-		if (isModeAuto(state))
+		if (this.isModeAuto(state)) {
 			throw new OneWireException("Trying to set control data when control is in automatic mode");
+		}
 
 		// set the bit
-		Bit.arrayWriteBit((data ? 1 : 0), 6, STATUS_OFFSET, state);
+		Bit.arrayWriteBit(data ? 1 : 0, 6, STATUS_OFFSET, state);
 
 		// indicate in bitmap the the state has changed
 		Bit.arrayWriteBit(1, STATUS_OFFSET, BITMAP_OFFSET, state);
@@ -850,41 +877,41 @@ public void setControlData(boolean data, byte[] state) throws OneWireException {
 	 */
 	private byte[] deviceOperation(byte command, byte sendByte, int extra) throws OneWireIOException, OneWireException {
 		OneWireIOException exc = null;
-		for (int attemptCounter = 2; attemptCounter > 0; attemptCounter--) {
+		for (var attemptCounter = 2; attemptCounter > 0; attemptCounter--) {
 			// Variables.
-			byte[] raw_buf = new byte[extra + 2];
+			var raw_buf = new byte[extra + 2];
 
 			// build block.
-			raw_buf[0] = (byte) command;
-			raw_buf[1] = (byte) sendByte;
+			raw_buf[0] = command;
+			raw_buf[1] = sendByte;
 
-			for (int i = 2; i < raw_buf.length; i++)
+			for (var i = 2; i < raw_buf.length; i++) {
 				raw_buf[i] = (byte) 0xFF;
+			}
 
 			// Select the device.
-			if (adapter.select(address)) {
-
-				// send the block
-				adapter.dataBlock(raw_buf, 0, raw_buf.length);
-
-				// verify
-				if (command == READ_WRITE_STATUS_COMMAND) {
-					if ((byte) raw_buf[raw_buf.length - 1] != (byte) raw_buf[raw_buf.length - 2]) {
-						if (exc == null)
-							exc = new OneWireIOException("OneWireContainer1F verify on command incorrect");
-						continue;
-					}
-				} else {
-					if ((byte) raw_buf[raw_buf.length - 1] != (byte) command) {
-						if (exc == null)
-							exc = new OneWireIOException("OneWireContainer1F verify on command incorrect");
-						continue;
+			if (!this.adapter.select(this.address)) {
+				throw new OneWireIOException("OneWireContainer1F failure - Device not found.");
+			}
+			// send the block
+			this.adapter.dataBlock(raw_buf, 0, raw_buf.length);
+
+			// verify
+			if (command == READ_WRITE_STATUS_COMMAND) {
+				if (raw_buf[raw_buf.length - 1] != raw_buf[raw_buf.length - 2]) {
+					if (exc == null) {
+						exc = new OneWireIOException("OneWireContainer1F verify on command incorrect");
 					}
+					continue;
 				}
+			} else if (raw_buf[raw_buf.length - 1] != command) {
+				if (exc == null) {
+					exc = new OneWireIOException("OneWireContainer1F verify on command incorrect");
+				}
+				continue;
+			}
 
-				return raw_buf;
-			} else
-				throw new OneWireIOException("OneWireContainer1F failure - Device not found.");
+			return raw_buf;
 		}
 		// get here after a few attempts
 		throw exc;
diff --git a/io.openems.edge.bridge.onewire/src/com/dalsemi/onewire/container/OneWireContainer20.java b/io.openems.edge.bridge.onewire/src/com/dalsemi/onewire/container/OneWireContainer20.java
index b0e00b1dab3..f387a97e8c1 100644
--- a/io.openems.edge.bridge.onewire/src/com/dalsemi/onewire/container/OneWireContainer20.java
+++ b/io.openems.edge.bridge.onewire/src/com/dalsemi/onewire/container/OneWireContainer20.java
@@ -64,7 +64,7 @@
  * <P>
  * Example device setup
  * </P>
- * 
+ *
  * <PRE>
  * <CODE>
  *      byte[] state = owd.readDevice();
@@ -79,7 +79,7 @@
  * <P>
  * Example device read
  * </P>
- * 
+ *
  * <PRE>
  * <CODE>
  *      owd.doADConvert(OneWireContainer20.CHANNELA, state);
@@ -171,10 +171,8 @@ public class OneWireContainer20 extends OneWireContainer implements ADContainer
 	 * Default constructor
 	 */
 	public OneWireContainer20() {
-		super();
-
 		// initialize the memory banks
-		initMem();
+		this.initMem();
 	}
 
 	/**
@@ -188,7 +186,7 @@ public OneWireContainer20(DSPortAdapter sourceAdapter, byte[] newAddress) {
 		super(sourceAdapter, newAddress);
 
 		// initialize the memory banks
-		initMem();
+		this.initMem();
 	}
 
 	/**
@@ -202,7 +200,7 @@ public OneWireContainer20(DSPortAdapter sourceAdapter, long newAddress) {
 		super(sourceAdapter, newAddress);
 
 		// initialize the memory banks
-		initMem();
+		this.initMem();
 	}
 
 	/**
@@ -216,7 +214,7 @@ public OneWireContainer20(DSPortAdapter sourceAdapter, String newAddress) {
 		super(sourceAdapter, newAddress);
 
 		// initialize the memory banks
-		initMem();
+		this.initMem();
 	}
 
 	// --------
@@ -228,6 +226,7 @@ public OneWireContainer20(DSPortAdapter sourceAdapter, String newAddress) {
 	 *
 	 * @return representation of this 1-Wire device's name
 	 */
+	@Override
 	public String getName() {
 		return "DS2450";
 	}
@@ -237,6 +236,7 @@ public String getName() {
 	 *
 	 * @return representation of this 1-Wire device's other names
 	 */
+	@Override
 	public String getAlternateNames() {
 		return "1-Wire Quad A/D Converter";
 	}
@@ -246,6 +246,7 @@ public String getAlternateNames() {
 	 *
 	 * @return description of this 1-Wire device's functionality
 	 */
+	@Override
 	public String getDescription() {
 		return "Four high-impedance inputs for measurement of analog "
 				+ "voltages.  User programmable input range.  Very low "
@@ -260,6 +261,7 @@ public String getDescription() {
 	 *
 	 * @return maximum speed of this One-Wire device
 	 */
+	@Override
 	public int getMaxSpeed() {
 		return DSPortAdapter.SPEED_OVERDRIVE;
 	}
@@ -273,15 +275,17 @@ public int getMaxSpeed() {
 	 * @see com.dalsemi.onewire.container.PagedMemoryBank
 	 * @see com.dalsemi.onewire.container.OTPMemoryBank
 	 */
+	@Override
 	public Enumeration<MemoryBank> getMemoryBanks() {
-		Vector<MemoryBank> bank_vector = new Vector<>(4);
+		var bank_vector = new Vector<MemoryBank>(4);
 
 		// readout
-		bank_vector.addElement(readout);
+		bank_vector.addElement(this.readout);
 
 		// control/alarms/calibration
-		for (int i = 0; i < 3; i++)
-			bank_vector.addElement(regs.elementAt(i));
+		for (var i = 0; i < 3; i++) {
+			bank_vector.addElement(this.regs.elementAt(i));
+		}
 
 		return bank_vector.elements();
 	}
@@ -297,6 +301,7 @@ public Enumeration<MemoryBank> getMemoryBanks() {
 	 *
 	 * @return the number of channels
 	 */
+	@Override
 	public int getNumberADChannels() {
 		return NUM_CHANNELS;
 	}
@@ -306,6 +311,7 @@ public int getNumberADChannels() {
 	 *
 	 * @return <CODE>true</CODE> if it has high/low trips
 	 */
+	@Override
 	public boolean hasADAlarms() {
 		return true;
 	}
@@ -319,8 +325,9 @@ public boolean hasADAlarms() {
 	 * @return available ranges starting from the largest range to the smallest
 	 *         range
 	 */
+	@Override
 	public double[] getADRanges(int channel) {
-		double[] ranges = new double[2];
+		var ranges = new double[2];
 
 		ranges[0] = 5.12;
 		ranges[1] = 2.56;
@@ -338,11 +345,13 @@ public double[] getADRanges(int channel) {
 	 *
 	 * @return available resolutions
 	 */
+	@Override
 	public double[] getADResolutions(int channel, double range) {
-		double[] res = new double[16];
+		var res = new double[16];
 
-		for (int i = 0; i < 16; i++)
-			res[i] = range / (double) (1 << (i + 1));
+		for (var i = 0; i < 16; i++) {
+			res[i] = range / (1 << i + 1);
+		}
 
 		return res;
 	}
@@ -353,6 +362,7 @@ public double[] getADResolutions(int channel, double range) {
 	 *
 	 * @return <CODE>true</CODE> if can do multi-channel voltage reads
 	 */
+	@Override
 	public boolean canADMultiChannelRead() {
 		return true;
 	}
@@ -375,15 +385,16 @@ public boolean canADMultiChannelRead() {
 	 * @throws OneWireIOException Data was not read correctly
 	 * @throws OneWireException   Could not find part
 	 */
+	@Override
 	public byte[] readDevice() throws OneWireIOException, OneWireException {
-		byte[] read_buf = new byte[27];
+		var read_buf = new byte[27];
 		MemoryBankAD mb;
 
 		// read the banks, control/alarm/calibration
-		for (int i = 0; i < 3; i++) {
-			mb = (MemoryBankAD) regs.elementAt(i);
+		for (var i = 0; i < 3; i++) {
+			mb = (MemoryBankAD) this.regs.elementAt(i);
 
-			mb.readPageCRC(0, (i != 0), read_buf, i * 8);
+			mb.readPageCRC(0, i != 0, read_buf, i * 8);
 		}
 
 		// zero out the bitmap
@@ -406,6 +417,7 @@ public byte[] readDevice() throws OneWireIOException, OneWireException {
 	 * @throws OneWireIOException Data was not written correctly
 	 * @throws OneWireException   Could not find part
 	 */
+	@Override
 	public void writeDevice(byte[] state) throws OneWireIOException, OneWireException {
 		int start_offset, len, i, bank, index;
 		boolean got_block;
@@ -435,7 +447,7 @@ public void writeDevice(byte[] state) throws OneWireIOException, OneWireExceptio
 			start_offset = 0;
 			len = 0;
 			got_block = false;
-			mb = (MemoryBankAD) regs.elementAt(bank);
+			mb = (MemoryBankAD) this.regs.elementAt(bank);
 
 			// loop through each byte in the memory bank
 			for (i = 0; i < 8; i++) {
@@ -444,19 +456,18 @@ public void writeDevice(byte[] state) throws OneWireIOException, OneWireExceptio
 				if (Bit.arrayReadBit(bank * 8 + i, BITMAP_OFFSET, state) == 1) {
 
 					// check if already in a block
-					if (got_block)
+					if (got_block) {
 						len++;
-
-					// new block
-					else {
+					} else {
 						got_block = true;
 						start_offset = i;
 						len = 1;
 					}
 
 					// check for last byte exception, write current block
-					if (i == 7)
+					if (i == 7) {
 						mb.write(start_offset, state, bank * 8 + start_offset, len);
+					}
 				} else if (got_block) {
 
 					// done with this block so write it
@@ -487,16 +498,17 @@ public void writeDevice(byte[] state) throws OneWireIOException, OneWireExceptio
 	 * @throws OneWireIOException Data was not read correctly
 	 * @throws OneWireException   Could not find part
 	 */
+	@Override
 	public double[] getADVoltage(byte[] state) throws OneWireIOException, OneWireException {
-		byte[] read_buf = new byte[8];
-		double[] ret_dbl = new double[4];
+		var read_buf = new byte[8];
+		var ret_dbl = new double[4];
 
 		// get readout page
-		readout.readPageCRC(0, false, read_buf, 0);
+		this.readout.readPageCRC(0, false, read_buf, 0);
 
 		// convert to array of doubles
-		for (int ch = 0; ch < 4; ch++) {
-			ret_dbl[ch] = interpretVoltage(Convert.toLong(read_buf, ch * 2, 2), getADRange(ch, state));
+		for (var ch = 0; ch < 4; ch++) {
+			ret_dbl[ch] = interpretVoltage(Convert.toLong(read_buf, ch * 2, 2), this.getADRange(ch, state));
 		}
 
 		return ret_dbl;
@@ -520,18 +532,20 @@ public double[] getADVoltage(byte[] state) throws OneWireIOException, OneWireExc
 	 * @throws OneWireException         Could not find part
 	 * @throws IllegalArgumentException Invalid channel number passed
 	 */
+	@Override
 	public double getADVoltage(int channel, byte[] state) throws OneWireIOException, OneWireException {
 
 		// check for valid channel value
-		if ((channel < 0) || (channel > 3))
+		if (channel < 0 || channel > 3) {
 			throw new IllegalArgumentException("Invalid channel number");
+		}
 
 		// get readout page
-		byte[] read_buf = new byte[8];
+		var read_buf = new byte[8];
 
-		readout.readPageCRC(0, false, read_buf, 0);
+		this.readout.readPageCRC(0, false, read_buf, 0);
 
-		return interpretVoltage(Convert.toLong(read_buf, channel * 2, 2), getADRange(channel, state));
+		return interpretVoltage(Convert.toLong(read_buf, channel * 2, 2), this.getADRange(channel, state));
 	}
 
 	/**
@@ -546,10 +560,11 @@ public double getADVoltage(int channel, byte[] state) throws OneWireIOException,
 	 * @throws OneWireIOException Data was not written correctly
 	 * @throws OneWireException   Could not find part
 	 */
+	@Override
 	public void doADConvert(int channel, byte[] state) throws OneWireIOException, OneWireException {
 
 		// call with set presets to 0
-		doADConvert(channel, PRESET_TO_ZEROS, state);
+		this.doADConvert(channel, PRESET_TO_ZEROS, state);
 	}
 
 	/**
@@ -565,15 +580,17 @@ public void doADConvert(int channel, byte[] state) throws OneWireIOException, On
 	 * @throws OneWireIOException Data was not written correctly
 	 * @throws OneWireException   Could not find part
 	 */
+	@Override
 	public void doADConvert(boolean[] doConvert, byte[] state) throws OneWireIOException, OneWireException {
 
 		// call with set presets to 0
-		int[] presets = new int[4];
+		var presets = new int[4];
 
-		for (int i = 0; i < 4; i++)
+		for (var i = 0; i < 4; i++) {
 			presets[i] = PRESET_TO_ZEROS;
+		}
 
-		doADConvert(doConvert, presets, state);
+		this.doADConvert(doConvert, presets, state);
 	}
 
 	/**
@@ -593,11 +610,12 @@ public void doADConvert(int channel, int preset, byte[] state)
 			throws OneWireIOException, OneWireException, IllegalArgumentException {
 
 		// check for valid channel value
-		if ((channel < 0) || (channel > 3))
+		if (channel < 0 || channel > 3) {
 			throw new IllegalArgumentException("Invalid channel number");
+		}
 
 		// perform the conversion (do fixed max conversion time)
-		doADConvert((byte) (0x01 << channel), (byte) (preset << channel), 1440, state);
+		this.doADConvert((byte) (0x01 << channel), (byte) (preset << channel), 1440, state);
 	}
 
 	/**
@@ -617,31 +635,33 @@ public void doADConvert(boolean[] doConvert, int[] preset, byte[] state)
 			throws OneWireIOException, OneWireException {
 		byte input_select_mask = 0;
 		byte read_out_control = 0;
-		int time = 160; // Time required in micro Seconds to convert.
+		var time = 160; // Time required in micro Seconds to convert.
 
 		// calculate the input mask, readout control, and conversion time
-		for (int ch = 3; ch >= 0; ch--) {
+		for (var ch = 3; ch >= 0; ch--) {
 
 			// input select
 			input_select_mask <<= 1;
 
-			if (doConvert[ch])
+			if (doConvert[ch]) {
 				input_select_mask |= 0x01;
+			}
 
 			// readout control
 			read_out_control <<= 2;
 
-			if (preset[ch] == PRESET_TO_ZEROS)
+			if (preset[ch] == PRESET_TO_ZEROS) {
 				read_out_control |= 0x01;
-			else if (preset[ch] == PRESET_TO_ONES)
+			} else if (preset[ch] == PRESET_TO_ONES) {
 				read_out_control |= 0x02;
+			}
 
 			// conversion time
-			time += (80 * getADResolution(ch, state));
+			time += 80 * this.getADResolution(ch, state);
 		}
 
 		// do the conversion
-		doADConvert(input_select_mask, read_out_control, time, state);
+		this.doADConvert(input_select_mask, read_out_control, time, state);
 	}
 
 	// --------
@@ -663,16 +683,18 @@ else if (preset[ch] == PRESET_TO_ONES)
 	 *
 	 * @throws IllegalArgumentException Invalid channel number passed
 	 */
+	@Override
 	public double getADAlarm(int channel, int alarmType, byte[] state) {
 
 		// check for valid channel value
-		if ((channel < 0) || (channel > 3))
+		if (channel < 0 || channel > 3) {
 			throw new IllegalArgumentException("Invalid channel number");
+		}
 
 		// extract alarm value and convert to voltage
-		long temp_long = (long) (state[ALARM_OFFSET + channel * 2 + alarmType] & 0x00FF) << 8;
+		var temp_long = (long) (state[ALARM_OFFSET + channel * 2 + alarmType] & 0x00FF) << 8;
 
-		return interpretVoltage(temp_long, getADRange(channel, state));
+		return interpretVoltage(temp_long, this.getADRange(channel, state));
 	}
 
 	/**
@@ -691,13 +713,15 @@ public double getADAlarm(int channel, int alarmType, byte[] state) {
 	 *
 	 * @throws IllegalArgumentException Invalid channel number passed
 	 */
+	@Override
 	public boolean getADAlarmEnable(int channel, int alarmType, byte[] state) {
 
 		// check for valid channel value
-		if ((channel < 0) || (channel > 3))
+		if (channel < 0 || channel > 3) {
 			throw new IllegalArgumentException("Invalid channel number");
+		}
 
-		return (Bit.arrayReadBit(2 + alarmType, channel * 2 + 1, state) == 1);
+		return Bit.arrayReadBit(2 + alarmType, channel * 2 + 1, state) == 1;
 	}
 
 	/**
@@ -716,13 +740,15 @@ public boolean getADAlarmEnable(int channel, int alarmType, byte[] state) {
 	 *
 	 * @throws IllegalArgumentException Invalid channel number passed
 	 */
+	@Override
 	public boolean hasADAlarmed(int channel, int alarmType, byte[] state) {
 
 		// check for valid channel value
-		if ((channel < 0) || (channel > 3))
+		if (channel < 0 || channel > 3) {
 			throw new IllegalArgumentException("Invalid channel number");
+		}
 
-		return (Bit.arrayReadBit(4 + alarmType, channel * 2 + 1, state) == 1);
+		return Bit.arrayReadBit(4 + alarmType, channel * 2 + 1, state) == 1;
 	}
 
 	/**
@@ -739,19 +765,22 @@ public boolean hasADAlarmed(int channel, int alarmType, byte[] state) {
 	 *
 	 * @throws IllegalArgumentException Invalid channel number passed
 	 */
+	@Override
 	public double getADResolution(int channel, byte[] state) {
 
 		// check for valid channel value
-		if ((channel < 0) || (channel > 3))
+		if (channel < 0 || channel > 3) {
 			throw new IllegalArgumentException("Invalid channel number");
+		}
 
-		int res = state[channel * 2] & 0x0F;
+		var res = state[channel * 2] & 0x0F;
 
 		// return resolution, if 0 then 16 bits
-		if (res == 0)
+		if (res == 0) {
 			res = 16;
+		}
 
-		return getADRange(channel, state) / (double) (1 << res);
+		return this.getADRange(channel, state) / (1 << res);
 	}
 
 	/**
@@ -768,13 +797,15 @@ public double getADResolution(int channel, byte[] state) {
 	 *
 	 * @throws IllegalArgumentException Invalid channel number passed
 	 */
+	@Override
 	public double getADRange(int channel, byte[] state) {
 
 		// check for valid channel value
-		if ((channel < 0) || (channel > 3))
+		if (channel < 0 || channel > 3) {
 			throw new IllegalArgumentException("Invalid channel number");
+		}
 
-		return (Bit.arrayReadBit(0, channel * 2 + 1, state) == 1) ? 5.12 : 2.56;
+		return Bit.arrayReadBit(0, channel * 2 + 1, state) == 1 ? 5.12 : 2.56;
 	}
 
 	/**
@@ -794,10 +825,11 @@ public double getADRange(int channel, byte[] state) {
 	public boolean isOutputEnabled(int channel, byte[] state) throws IllegalArgumentException {
 
 		// check for valid channel value
-		if ((channel < 0) || (channel > 3))
+		if (channel < 0 || channel > 3) {
 			throw new IllegalArgumentException("Invalid channel number");
+		}
 
-		return (Bit.arrayReadBit(7, channel * 2, state) == 1);
+		return Bit.arrayReadBit(7, channel * 2, state) == 1;
 	}
 
 	/**
@@ -818,10 +850,11 @@ public boolean isOutputEnabled(int channel, byte[] state) throws IllegalArgument
 	public boolean getOutputState(int channel, byte[] state) throws IllegalArgumentException {
 
 		// check for valid channel value
-		if ((channel < 0) || (channel > 3))
+		if (channel < 0 || channel > 3) {
 			throw new IllegalArgumentException("Invalid channel number");
+		}
 
-		return (Bit.arrayReadBit(6, channel * 2, state) == 1);
+		return Bit.arrayReadBit(6, channel * 2, state) == 1;
 	}
 
 	/**
@@ -836,7 +869,7 @@ public boolean getOutputState(int channel, byte[] state) throws IllegalArgumentE
 	 *         <CODE>true</CODE> if not conducting
 	 */
 	public boolean getDevicePOR(byte[] state) {
-		return (Bit.arrayReadBit(7, 1, state) == 1);
+		return Bit.arrayReadBit(7, 1, state) == 1;
 	}
 
 	/**
@@ -850,7 +883,7 @@ public boolean getDevicePOR(byte[] state) {
 	 * @return <CODE>true</CODE> if set to external power operation
 	 */
 	public boolean isPowerExternal(byte[] state) {
-		return (state[EXPOWER_OFFSET] != 0);
+		return state[EXPOWER_OFFSET] != 0;
 	}
 
 	// --------
@@ -874,15 +907,17 @@ public boolean isPowerExternal(byte[] state) {
 	 *
 	 * @throws IllegalArgumentException Invalid channel number passed
 	 */
+	@Override
 	public void setADAlarm(int channel, int alarmType, double alarm, byte[] state) {
 
 		// check for valid channel value
-		if ((channel < 0) || (channel > 3))
+		if (channel < 0 || channel > 3) {
 			throw new IllegalArgumentException("Invalid channel number");
+		}
 
-		int offset = ALARM_OFFSET + channel * 2 + alarmType;
+		var offset = ALARM_OFFSET + channel * 2 + alarmType;
 
-		state[offset] = (byte) ((voltageToInt(alarm, getADRange(channel, state)) >>> 8) & 0x00FF);
+		state[offset] = (byte) (voltageToInt(alarm, this.getADRange(channel, state)) >>> 8 & 0x00FF);
 
 		// set bitmap field to indicate this register has changed
 		Bit.arrayWriteBit(1, offset, BITMAP_OFFSET, state);
@@ -905,14 +940,16 @@ public void setADAlarm(int channel, int alarmType, double alarm, byte[] state) {
 	 *
 	 * @throws IllegalArgumentException Invalid channel number passed
 	 */
+	@Override
 	public void setADAlarmEnable(int channel, int alarmType, boolean alarmEnable, byte[] state) {
 
 		// check for valid channel value
-		if ((channel < 0) || (channel > 3))
+		if (channel < 0 || channel > 3) {
 			throw new IllegalArgumentException("Invalid channel number");
+		}
 
 		// change alarm enable
-		Bit.arrayWriteBit(((alarmEnable) ? 1 : 0), 2 + alarmType, channel * 2 + 1, state);
+		Bit.arrayWriteBit(alarmEnable ? 1 : 0, 2 + alarmType, channel * 2 + 1, state);
 
 		// set bitmap field to indicate this register has changed
 		Bit.arrayWriteBit(1, channel * 2 + 1, BITMAP_OFFSET, state);
@@ -933,15 +970,17 @@ public void setADAlarmEnable(int channel, int alarmType, boolean alarmEnable, by
 	 *
 	 * @throws IllegalArgumentException Invalid channel number passed
 	 */
+	@Override
 	public void setADResolution(int channel, double resolution, byte[] state) {
 
 		// check for valid channel value
-		if ((channel < 0) || (channel > 3))
+		if (channel < 0 || channel > 3) {
 			throw new IllegalArgumentException("Invalid channel number");
+		}
 
 		// convert voltage resolution into bit resolution
-		int div = (int) (getADRange(channel, state) / resolution);
-		int res_bits = 0;
+		var div = (int) (this.getADRange(channel, state) / resolution);
+		var res_bits = 0;
 
 		do {
 			div >>>= 1;
@@ -951,18 +990,20 @@ public void setADResolution(int channel, double resolution, byte[] state) {
 
 		res_bits -= 1;
 
-		if (res_bits == 16)
+		if (res_bits == 16) {
 			res_bits = 0;
+		}
 
 		// check for valid bit resolution
-		if ((res_bits < 0) || (res_bits > 15))
+		if (res_bits < 0 || res_bits > 15) {
 			throw new IllegalArgumentException("Invalid resolution");
+		}
 
 		// clear out the resolution
 		state[channel * 2] &= (byte) 0xF0;
 
 		// set the resolution
-		state[channel * 2] |= (byte) ((res_bits == 16) ? 0 : res_bits);
+		state[channel * 2] |= (byte) (res_bits == 16 ? 0 : res_bits);
 
 		// set bitmap field to indicate this register has changed
 		Bit.arrayWriteBit(1, channel * 2, BITMAP_OFFSET, state);
@@ -983,21 +1024,24 @@ public void setADResolution(int channel, double resolution, byte[] state) {
 	 *
 	 * @throws IllegalArgumentException Invalid channel number passed
 	 */
+	@Override
 	public void setADRange(int channel, double range, byte[] state) {
 
 		// check for valid channel value
-		if ((channel < 0) || (channel > 3))
+		if (channel < 0 || channel > 3) {
 			throw new IllegalArgumentException("Invalid channel number");
+		}
 
 		// convert range into bit value
 		int range_bit;
 
-		if ((range > 5.00) & (range < 5.30))
+		if (range > 5.00 && range < 5.30) {
 			range_bit = 1;
-		else if ((range > 2.40) & (range < 2.70))
+		} else if (range > 2.40 && range < 2.70) {
 			range_bit = 0;
-		else
+		} else {
 			throw new IllegalArgumentException("Invalid range");
+		}
 
 		// change range bit
 		Bit.arrayWriteBit(range_bit, 0, channel * 2 + 1, state);
@@ -1026,15 +1070,17 @@ else if ((range > 2.40) & (range < 2.70))
 	public void setOutput(int channel, boolean outputEnable, boolean outputState, byte[] state) {
 
 		// check for valid channel value
-		if ((channel < 0) || (channel > 3))
+		if (channel < 0 || channel > 3) {
 			throw new IllegalArgumentException("Invalid channel number");
+		}
 
 		// output enable bit
-		Bit.arrayWriteBit(((outputEnable) ? 1 : 0), 7, channel * 2, state);
+		Bit.arrayWriteBit(outputEnable ? 1 : 0, 7, channel * 2, state);
 
 		// optionally set state
-		if (outputEnable)
-			Bit.arrayWriteBit(((outputState) ? 1 : 0), 6, channel * 2, state);
+		if (outputEnable) {
+			Bit.arrayWriteBit(outputState ? 1 : 0, 6, channel * 2, state);
+		}
 
 		// set bitmap field to indicate this register has changed
 		Bit.arrayWriteBit(1, channel * 2, BITMAP_OFFSET, state);
@@ -1074,7 +1120,7 @@ public void setPower(boolean external, byte[] state) {
 	 * @return calculated voltage based on the range
 	 */
 	public static double interpretVoltage(long rawVoltage, double range) {
-		return (((double) rawVoltage / 65535.0) * range);
+		return rawVoltage / 65535.0 * range;
 	}
 
 	/**
@@ -1087,7 +1133,7 @@ public static double interpretVoltage(long rawVoltage, double range) {
 	 * @return the DS2450 voltage
 	 */
 	public static int voltageToInt(double voltage, double range) {
-		return (int) ((voltage * 65535.0) / range);
+		return (int) (voltage * 65535.0 / range);
 	}
 
 	// --------
@@ -1100,12 +1146,12 @@ public static int voltageToInt(double voltage, double range) {
 	private void initMem() {
 
 		// readout
-		readout = new MemoryBankAD(this);
+		this.readout = new MemoryBankAD(this);
 
 		// control
-		regs = new Vector<>(3);
+		this.regs = new Vector<>(3);
 
-		MemoryBankAD temp_mb = new MemoryBankAD(this);
+		var temp_mb = new MemoryBankAD(this);
 
 		temp_mb.bankDescription = "A/D Control and Status";
 		temp_mb.generalPurposeMemory = false;
@@ -1113,7 +1159,7 @@ private void initMem() {
 		temp_mb.readWrite = true;
 		temp_mb.readOnly = false;
 
-		regs.addElement(temp_mb);
+		this.regs.addElement(temp_mb);
 
 		// Alarms
 		temp_mb = new MemoryBankAD(this);
@@ -1123,7 +1169,7 @@ private void initMem() {
 		temp_mb.readWrite = true;
 		temp_mb.readOnly = false;
 
-		regs.addElement(temp_mb);
+		this.regs.addElement(temp_mb);
 
 		// calibration
 		temp_mb = new MemoryBankAD(this);
@@ -1133,7 +1179,7 @@ private void initMem() {
 		temp_mb.readWrite = true;
 		temp_mb.readOnly = false;
 
-		regs.addElement(temp_mb);
+		this.regs.addElement(temp_mb);
 	}
 
 	/**
@@ -1159,65 +1205,65 @@ private void doADConvert(byte inputSelectMask, byte readOutControl, int timeUs,
 		}
 
 		// Create the command block to be sent.
-		byte[] raw_buf = new byte[5];
+		var raw_buf = new byte[5];
 
 		raw_buf[0] = CONVERT_COMMAND;
 		raw_buf[1] = inputSelectMask;
-		raw_buf[2] = (byte) readOutControl;
+		raw_buf[2] = readOutControl;
 		raw_buf[3] = (byte) 0xFF;
 		raw_buf[4] = (byte) 0xFF;
 
 		// calculate the CRC16 up to and including readOutControl
-		int crc16 = CRC16.compute(raw_buf, 0, 3, 0);
+		var crc16 = CRC16.compute(raw_buf, 0, 3, 0);
 
 		// Send command block.
-		if (adapter.select(address)) {
-			if (isPowerExternal(state)) {
-
-				// good power so send the entire block (with both CRC)
-				adapter.dataBlock(raw_buf, 0, 5);
+		if (!this.adapter.select(this.address)) {
+			throw new OneWireException("OneWireContainer20 - Device not found.");
+		}
+		if (this.isPowerExternal(state)) {
 
-				// Wait for complete of conversion
-				try {
-					Thread.sleep((timeUs / 1000) + 10);
-				} catch (InterruptedException e) {
-				}
-				;
+			// good power so send the entire block (with both CRC)
+			this.adapter.dataBlock(raw_buf, 0, 5);
 
-				// calculate the rest of the CRC16
-				crc16 = CRC16.compute(raw_buf, 3, 2, crc16);
-			} else {
+			// Wait for complete of conversion
+			try {
+				Thread.sleep(timeUs / 1000 + 10);
+			} catch (InterruptedException e) {
+			}
 
-				// parasite power so send the all but last byte
-				adapter.dataBlock(raw_buf, 0, 4);
+			// calculate the rest of the CRC16
+			crc16 = CRC16.compute(raw_buf, 3, 2, crc16);
+		} else {
 
-				// setup power delivery
-				adapter.setPowerDuration(DSPortAdapter.DELIVERY_INFINITE);
-				adapter.startPowerDelivery(DSPortAdapter.CONDITION_AFTER_BYTE);
+			// parasite power so send the all but last byte
+			this.adapter.dataBlock(raw_buf, 0, 4);
 
-				// get the final CRC byte and start strong power delivery
-				raw_buf[4] = (byte) adapter.getByte();
-				crc16 = CRC16.compute(raw_buf, 3, 2, crc16);
+			// setup power delivery
+			this.adapter.setPowerDuration(DSPortAdapter.DELIVERY_INFINITE);
+			this.adapter.startPowerDelivery(DSPortAdapter.CONDITION_AFTER_BYTE);
 
-				// Wait for power delivery to complete the conversion
-				try {
-					Thread.sleep((timeUs / 1000) + 1);
-				} catch (InterruptedException e) {
-				}
-				;
+			// get the final CRC byte and start strong power delivery
+			raw_buf[4] = (byte) this.adapter.getByte();
+			crc16 = CRC16.compute(raw_buf, 3, 2, crc16);
 
-				// Turn power off.
-				adapter.setPowerNormal();
+			// Wait for power delivery to complete the conversion
+			try {
+				Thread.sleep(timeUs / 1000 + 1);
+			} catch (InterruptedException e) {
 			}
-		} else
-			throw new OneWireException("OneWireContainer20 - Device not found.");
+
+			// Turn power off.
+			this.adapter.setPowerNormal();
+		}
 
 		// check the CRC result
-		if (crc16 != 0x0000B001)
+		if (crc16 != 0x0000B001) {
 			throw new OneWireIOException("OneWireContainer20 - Failure during conversion - Bad CRC");
+		}
 
 		// check if still busy
-		if (adapter.getByte() == 0x00)
+		if (this.adapter.getByte() == 0x00) {
 			throw new OneWireIOException("Conversion failed to complete.");
+		}
 	}
 }
diff --git a/io.openems.edge.bridge.onewire/src/com/dalsemi/onewire/container/OneWireContainer21.java b/io.openems.edge.bridge.onewire/src/com/dalsemi/onewire/container/OneWireContainer21.java
index e3a1fde670d..fd8d261d714 100644
--- a/io.openems.edge.bridge.onewire/src/com/dalsemi/onewire/container/OneWireContainer21.java
+++ b/io.openems.edge.bridge.onewire/src/com/dalsemi/onewire/container/OneWireContainer21.java
@@ -152,7 +152,7 @@
  * This code also ensures that the Thermocron's clock is set to run, and that
  * the clock alarm is enabled.
  * </p>
- * 
+ *
  * <pre>
  * <code>
  *       // "ID" is a byte array of size 8 with an address of a part we
@@ -299,9 +299,7 @@
  * @author COlmstea, KLA
  *
  */
-@SuppressWarnings({ "unused" })
 public class OneWireContainer21 extends OneWireContainer implements TemperatureContainer, ClockContainer {
-	private static final byte FAMILY_CODE = (byte) 0x21;
 	private boolean doSpeedEnable = true;
 
 	/*
@@ -330,7 +328,7 @@ public class OneWireContainer21 extends OneWireContainer implements TemperatureC
 	private MemoryBankNVCRC log;
 
 	// Buffer to hold the temperature log in
-	private byte[] read_log_buffer = new byte[64 * 32]; // 64 pages X 32 bytes per page
+	private final byte[] read_log_buffer = new byte[64 * 32]; // 64 pages X 32 bytes per page
 
 	// should we update the Real time clock?
 	private boolean updatertc = false;
@@ -622,10 +620,8 @@ public class OneWireContainer21 extends OneWireContainer implements TemperatureC
 	 *      OneWireContainer21(DSPortAdapter,String)
 	 */
 	public OneWireContainer21() {
-		super();
-
 		// initialize the memory banks
-		initMem();
+		this.initMem();
 	}
 
 	/**
@@ -645,7 +641,7 @@ public OneWireContainer21(DSPortAdapter sourceAdapter, byte[] newAddress) {
 		super(sourceAdapter, newAddress);
 
 		// initialize the memory banks
-		initMem();
+		this.initMem();
 	}
 
 	/**
@@ -665,7 +661,7 @@ public OneWireContainer21(DSPortAdapter sourceAdapter, long newAddress) {
 		super(sourceAdapter, newAddress);
 
 		// initialize the memory banks
-		initMem();
+		this.initMem();
 	}
 
 	/**
@@ -685,7 +681,7 @@ public OneWireContainer21(DSPortAdapter sourceAdapter, String newAddress) {
 		super(sourceAdapter, newAddress);
 
 		// initialize the memory banks
-		initMem();
+		this.initMem();
 	}
 
 	/**
@@ -696,9 +692,10 @@ public OneWireContainer21(DSPortAdapter sourceAdapter, String newAddress) {
 	 * @param newAddress    address of this 1-Wire device
 	 * @see com.dalsemi.onewire.utils.Address
 	 */
+	@Override
 	public void setupContainer(DSPortAdapter sourceAdapter, byte[] newAddress) {
 		super.setupContainer(sourceAdapter, newAddress);
-		setThermochronVariables();
+		this.setThermochronVariables();
 	}
 
 	/**
@@ -709,9 +706,10 @@ public void setupContainer(DSPortAdapter sourceAdapter, byte[] newAddress) {
 	 * @param newAddress    address of this 1-Wire device
 	 * @see com.dalsemi.onewire.utils.Address
 	 */
+	@Override
 	public void setupContainer(DSPortAdapter sourceAdapter, long newAddress) {
 		super.setupContainer(sourceAdapter, newAddress);
-		setThermochronVariables();
+		this.setThermochronVariables();
 	}
 
 	/**
@@ -722,9 +720,10 @@ public void setupContainer(DSPortAdapter sourceAdapter, long newAddress) {
 	 * @param newAddress    address of this 1-Wire device
 	 * @see com.dalsemi.onewire.utils.Address
 	 */
+	@Override
 	public void setupContainer(DSPortAdapter sourceAdapter, java.lang.String newAddress) {
 		super.setupContainer(sourceAdapter, newAddress);
-		setThermochronVariables();
+		this.setThermochronVariables();
 	}
 
 	/**
@@ -733,29 +732,30 @@ public void setupContainer(DSPortAdapter sourceAdapter, java.lang.String newAddr
 	 * MemoryBank}, {@link com.dalsemi.onewire.container.PagedMemoryBank
 	 * PagedMemoryBank}, and {@link com.dalsemi.onewire.container.OTPMemoryBank
 	 * OTPMemoryBank}.
-	 * 
+	 *
 	 * @return <CODE>Enumeration</CODE> of memory banks
 	 */
+	@Override
 	public Enumeration<MemoryBank> getMemoryBanks() {
-		Vector<MemoryBank> bank_vector = new Vector<>(6);
+		var bank_vector = new Vector<MemoryBank>(6);
 
 		// scratchpad
-		bank_vector.addElement(scratch);
+		bank_vector.addElement(this.scratch);
 
 		// NVRAM
-		bank_vector.addElement(new MemoryBankNVCRC(this, scratch));
+		bank_vector.addElement(new MemoryBankNVCRC(this, this.scratch));
 
 		// Register page
-		bank_vector.addElement(register);
+		bank_vector.addElement(this.register);
 
 		// Alarm time stamps and duration
-		bank_vector.addElement(alarm);
+		bank_vector.addElement(this.alarm);
 
 		// Histogram
-		bank_vector.addElement(histogram);
+		bank_vector.addElement(this.histogram);
 
 		// Log
-		bank_vector.addElement(log);
+		bank_vector.addElement(this.log);
 
 		return bank_vector.elements();
 	}
@@ -770,45 +770,45 @@ public Enumeration<MemoryBank> getMemoryBanks() {
 	private void initMem() {
 
 		// scratchpad
-		scratch = new MemoryBankScratchCRC(this);
+		this.scratch = new MemoryBankScratchCRC(this);
 
 		// Register
-		register = new MemoryBankNVCRC(this, scratch);
-		register.numberPages = 1;
-		register.size = 32;
-		register.bankDescription = "Register control";
-		register.startPhysicalAddress = 0x200;
-		register.generalPurposeMemory = false;
+		this.register = new MemoryBankNVCRC(this, this.scratch);
+		this.register.numberPages = 1;
+		this.register.size = 32;
+		this.register.bankDescription = "Register control";
+		this.register.startPhysicalAddress = 0x200;
+		this.register.generalPurposeMemory = false;
 
 		// Alarm registers
-		alarm = new MemoryBankNVCRC(this, scratch);
-		alarm.numberPages = 3;
-		alarm.size = 96;
-		alarm.bankDescription = "Alarm time stamps";
-		alarm.startPhysicalAddress = 544;
-		alarm.generalPurposeMemory = false;
-		alarm.readOnly = true;
-		alarm.readWrite = false;
+		this.alarm = new MemoryBankNVCRC(this, this.scratch);
+		this.alarm.numberPages = 3;
+		this.alarm.size = 96;
+		this.alarm.bankDescription = "Alarm time stamps";
+		this.alarm.startPhysicalAddress = 544;
+		this.alarm.generalPurposeMemory = false;
+		this.alarm.readOnly = true;
+		this.alarm.readWrite = false;
 
 		// Histogram
-		histogram = new MemoryBankNVCRC(this, scratch);
-		histogram.numberPages = 4;
-		histogram.size = 128;
-		histogram.bankDescription = "Temperature Histogram";
-		histogram.startPhysicalAddress = 2048;
-		histogram.generalPurposeMemory = false;
-		histogram.readOnly = true;
-		histogram.readWrite = false;
+		this.histogram = new MemoryBankNVCRC(this, this.scratch);
+		this.histogram.numberPages = 4;
+		this.histogram.size = 128;
+		this.histogram.bankDescription = "Temperature Histogram";
+		this.histogram.startPhysicalAddress = 2048;
+		this.histogram.generalPurposeMemory = false;
+		this.histogram.readOnly = true;
+		this.histogram.readWrite = false;
 
 		// Log
-		log = new MemoryBankNVCRC(this, scratch);
-		log.numberPages = 64;
-		log.size = 2048;
-		log.bankDescription = "Temperature log";
-		log.startPhysicalAddress = 4096;
-		log.generalPurposeMemory = false;
-		log.readOnly = true;
-		log.readWrite = false;
+		this.log = new MemoryBankNVCRC(this, this.scratch);
+		this.log.numberPages = 64;
+		this.log.size = 2048;
+		this.log.bankDescription = "Temperature log";
+		this.log.startPhysicalAddress = 4096;
+		this.log.generalPurposeMemory = false;
+		this.log.readOnly = true;
+		this.log.readWrite = false;
 	}
 
 	/**
@@ -828,70 +828,70 @@ private void initMem() {
 	private void setThermochronVariables() {
 		// Get Temperature Range code, which is the first 12 (MSB) bits of the
 		// unique serial number (after the CRC).
-		byte[] address = getAddress(); // retrieve 1-Wire net address to look at range code.
-		int rangeCode = (((address[6] & 0x0FF) << 4) | ((address[5] & 0x0FF) >> 4));
+		var address = this.getAddress(); // retrieve 1-Wire net address to look at range code.
+		var rangeCode = (address[6] & 0x0FF) << 4 | (address[5] & 0x0FF) >> 4;
 
 		switch (rangeCode) {
 		case 0x34C:
-			partNumber = "DS1921L-F51";
-			temperatureRangeLow = -40;
-			temperatureRangeHigh = 85;
-			temperatureResolution = 0.5;
-			temperatureOperatingRangeLow = -10;
-			temperatureOperatingRangeHigh = 85;
-			isDS1921HZ = false;
+			this.partNumber = "DS1921L-F51";
+			this.temperatureRangeLow = -40;
+			this.temperatureRangeHigh = 85;
+			this.temperatureResolution = 0.5;
+			this.temperatureOperatingRangeLow = -10;
+			this.temperatureOperatingRangeHigh = 85;
+			this.isDS1921HZ = false;
 			break;
 		case 0x254:
-			partNumber = "DS1921L-F52";
-			temperatureRangeLow = -40;
-			temperatureRangeHigh = 85;
-			temperatureResolution = 0.5;
-			temperatureOperatingRangeLow = -20;
-			temperatureOperatingRangeHigh = 85;
-			isDS1921HZ = false;
+			this.partNumber = "DS1921L-F52";
+			this.temperatureRangeLow = -40;
+			this.temperatureRangeHigh = 85;
+			this.temperatureResolution = 0.5;
+			this.temperatureOperatingRangeLow = -20;
+			this.temperatureOperatingRangeHigh = 85;
+			this.isDS1921HZ = false;
 			break;
 		case 0x15C:
-			partNumber = "DS1921L-F53";
-			temperatureRangeLow = -40;
-			temperatureRangeHigh = 85;
-			temperatureResolution = 0.5;
-			temperatureOperatingRangeLow = -30;
-			temperatureOperatingRangeHigh = 85;
-			isDS1921HZ = false;
+			this.partNumber = "DS1921L-F53";
+			this.temperatureRangeLow = -40;
+			this.temperatureRangeHigh = 85;
+			this.temperatureResolution = 0.5;
+			this.temperatureOperatingRangeLow = -30;
+			this.temperatureOperatingRangeHigh = 85;
+			this.isDS1921HZ = false;
 			break;
 		case 0x4F2:
-			partNumber = "DS1921H-F5";
-			temperatureRangeLow = 15;
-			temperatureRangeHigh = 46;
-			temperatureResolution = 0.125;
-			temperatureOperatingRangeLow = -40;
-			temperatureOperatingRangeHigh = 85;
-			isDS1921HZ = true;
+			this.partNumber = "DS1921H-F5";
+			this.temperatureRangeLow = 15;
+			this.temperatureRangeHigh = 46;
+			this.temperatureResolution = 0.125;
+			this.temperatureOperatingRangeLow = -40;
+			this.temperatureOperatingRangeHigh = 85;
+			this.isDS1921HZ = true;
 			break;
 		case 0x3B2:
-			partNumber = "DS1921Z-F5";
-			temperatureRangeLow = -5;
-			temperatureRangeHigh = 26;
-			temperatureResolution = 0.125;
-			temperatureOperatingRangeLow = -40;
-			temperatureOperatingRangeHigh = 85;
-			isDS1921HZ = true;
+			this.partNumber = "DS1921Z-F5";
+			this.temperatureRangeLow = -5;
+			this.temperatureRangeHigh = 26;
+			this.temperatureResolution = 0.125;
+			this.temperatureOperatingRangeLow = -40;
+			this.temperatureOperatingRangeHigh = 85;
+			this.isDS1921HZ = true;
 			break;
 		default:
-			long lower36bits = (((long) address[5] & 0x0F) << 32) | (((long) address[4] & 0x0FF) << 24)
-					| (((long) address[3] & 0x0FF) << 16) | (((long) address[2] & 0x0FF) << 8)
-					| ((long) address[1] & 0x0FF);
-			if (lower36bits >= 0x100000)
-				partNumber = "DS1921G-F5";
-			else
-				partNumber = "DS1921L-PROTO";
-
-			temperatureRangeLow = -40;
-			temperatureRangeHigh = 85;
-			temperatureResolution = 0.5;
-			temperatureOperatingRangeLow = -40;
-			temperatureOperatingRangeHigh = 85;
-			isDS1921HZ = false;
+			var lower36bits = ((long) address[5] & 0x0F) << 32 | ((long) address[4] & 0x0FF) << 24
+					| ((long) address[3] & 0x0FF) << 16 | ((long) address[2] & 0x0FF) << 8 | (long) address[1] & 0x0FF;
+			if (lower36bits >= 0x100000) {
+				this.partNumber = "DS1921G-F5";
+			} else {
+				this.partNumber = "DS1921L-PROTO";
+			}
+
+			this.temperatureRangeLow = -40;
+			this.temperatureRangeHigh = 85;
+			this.temperatureResolution = 0.5;
+			this.temperatureOperatingRangeLow = -40;
+			this.temperatureOperatingRangeHigh = 85;
+			this.isDS1921HZ = false;
 			break;
 
 		}
@@ -904,17 +904,17 @@ private void setThermochronVariables() {
 		 * in correct place rangeCode = rangeCode + (netAddress[5] & 0xFF); // add the
 		 * least significant byte to make integer. rangeCode = rangeCode >> 4; // this
 		 * is a 12-bit number, so get rid of extra 4 bits.
-		 * 
+		 *
 		 * // Detect what kind of part we have, a DS1921L-F5X or a DS1921H/Z int
 		 * detectionInt = rangeCode & 0x03; // get the last 2 bits to see what they are
 		 * if (detectionInt > 0) isDS1921HZ = true; // if the last 2 bits > 0 then the
 		 * part is a DS1921H or Z
-		 * 
+		 *
 		 * // Get temperature ranges as a result of the rangeCode and the type of
 		 * device. if (isDS1921HZ) { // get the most significant 8 bits of the 12-bit
 		 * rangeCode temperatureRangeLow = rangeCode >> 4; temperatureRangeLow =
 		 * temperatureRangeLow - 64; // 1 degree increment with 0x000 = -64 degrees.
-		 * 
+		 *
 		 * // Resolution Code -- the last 2 bits of the 12-bit rangeCode number // // 0
 		 * = 0.5 degrees Celsius // 1 = 0.25 // 2 = 0.125 // 3 = 0.0625 switch(rangeCode
 		 * & 0x03) // gets the last 2 bits of the 12-bit rangeCode. { case 0:
@@ -922,11 +922,11 @@ private void setThermochronVariables() {
 		 * break; case 2: temperatureResolution = 0.125; break; case 3:
 		 * temperatureResolution = 0.0625; break; default: temperatureResolution = 0.5;
 		 * }
-		 * 
+		 *
 		 * // Range Modifier Code (range width) // // 0 = full range, 256 * resolution
 		 * // 1 = reduced range, 2/3 of full range // 2 = reduced range, 1/2 of full
 		 * range // 3 = reduced range, 1/3 of full range
-		 * 
+		 *
 		 * switch((rangeCode >> 2) & 0x03) { case 0: temperatureRangeWidth = (256 *
 		 * temperatureResolution) - 1; break; case 1: temperatureRangeWidth = (256 *
 		 * temperatureResolution * 2 / 3) - 1; break; case 2: temperatureRangeWidth =
@@ -954,23 +954,23 @@ private void setThermochronVariables() {
 	 */
 	private int[] getDate(int timeReg, byte[] state) {
 		byte upper, lower;
-		int[] result = new int[3];
+		var result = new int[3];
 
 		timeReg = timeReg & 31;
 
 		/* extract the day of the month */
 		lower = state[timeReg++];
-		upper = (byte) ((lower >>> 4) & 0x0f);
+		upper = (byte) (lower >>> 4 & 0x0f);
 		lower = (byte) (lower & 0x0f);
 		result[2] = 10 * upper + lower;
 
 		/* extract the month */
 		lower = state[timeReg++];
-		upper = (byte) ((lower >>> 4) & 0x0f);
+		upper = (byte) (lower >>> 4 & 0x0f);
 		lower = (byte) (lower & 0x0f);
 
 		// the upper bit contains the century, so subdivide upper
-		byte century = (byte) ((upper >>> 3) & 0x01);
+		var century = (byte) (upper >>> 3 & 0x01);
 
 		upper = (byte) (upper & 0x01);
 		result[1] = lower + upper * 10;
@@ -978,7 +978,7 @@ private int[] getDate(int timeReg, byte[] state) {
 		/* grab the year */
 		result[0] = 1900 + century * 100;
 		lower = state[timeReg++];
-		upper = (byte) ((lower >>> 4) & 0x0f);
+		upper = (byte) (lower >>> 4 & 0x0f);
 		lower = (byte) (lower & 0x0f);
 		result[0] += upper * 10 + lower;
 
@@ -991,7 +991,7 @@ private int[] getDate(int timeReg, byte[] state) {
 	 */
 	private int[] getTime(int timeReg, byte[] state) {
 		byte upper, lower;
-		int[] result = new int[3];
+		var result = new int[3];
 
 		timeReg = timeReg & 31;
 
@@ -1000,37 +1000,38 @@ private int[] getTime(int timeReg, byte[] state) {
 
 		/* First grab the seconds. Upper half holds the 10's of seconds */
 		lower = state[timeReg++];
-		upper = (byte) ((lower >>> 4) & 0x07);
+		upper = (byte) (lower >>> 4 & 0x07);
 		lower = (byte) (lower & 0x0f);
-		result[0] = (int) lower + (int) upper * 10;
+		result[0] = lower + upper * 10;
 
 		/* now grab minutes. The upper half holds the 10s of minutes */
 		lower = state[timeReg++];
-		upper = (byte) ((lower >>> 4) & 0x07);
+		upper = (byte) (lower >>> 4 & 0x07);
 		lower = (byte) (lower & 0x0f);
-		result[1] = (int) lower + (int) upper * 10;
+		result[1] = lower + upper * 10;
 
 		/*
 		 * now grab the hours. The lower half is single hours again, but the upper half
 		 * of the byte is determined by the 2nd bit - specifying 12/24 hour time.
 		 */
 		lower = state[timeReg++];
-		upper = (byte) ((lower >>> 4) & 0x07);
+		upper = (byte) (lower >>> 4 & 0x07);
 		lower = (byte) (lower & 0x0f);
 
 		int hours;
 
 		// if the 2nd bit is 1, convert 12 hour time to 24 hour time.
-		if ((upper >>> 2) != 0) {
+		if (upper >>> 2 != 0) {
 
 			// extract the AM/PM byte (PM is indicated by a 1)
-			byte PM = (byte) (((upper << 6) >>> 7) & 0x01);
+			var PM = (byte) (upper << 6 >>> 7 & 0x01);
 
 			// isolate the 10s place
 			upper = (byte) (upper & 0x01);
 			hours = upper * 10 + PM * 12;
-		} else
+		} else {
 			hours = upper * 10; // already in 24 hour format
+		}
 
 		hours += lower;
 		result[2] = hours;
@@ -1046,7 +1047,7 @@ private void setTime(int timeReg, int hours, int minutes, int seconds, boolean A
 
 		/* format in bytes and write seconds */
 		upper = (byte) (seconds / 10);
-		upper = (byte) ((upper << 4) & 0xf0);
+		upper = (byte) (upper << 4 & 0xf0);
 		lower = (byte) (seconds % 10);
 		lower = (byte) (lower & 0x0f);
 		state[timeReg & 31] = (byte) (upper | lower);
@@ -1055,7 +1056,7 @@ private void setTime(int timeReg, int hours, int minutes, int seconds, boolean A
 
 		/* format in bytes and write minutes */
 		upper = (byte) (minutes / 10);
-		upper = (byte) ((upper << 4) & 0xf0);
+		upper = (byte) (upper << 4 & 0xf0);
 		lower = (byte) (minutes % 10);
 		lower = (byte) (lower & 0x0f);
 		state[timeReg & 31] = (byte) (upper | lower);
@@ -1066,26 +1067,30 @@ private void setTime(int timeReg, int hours, int minutes, int seconds, boolean A
 		if (AMPM) {
 			upper = (byte) 0x04;
 
-			if (hours > 11)
+			if (hours > 11) {
 				upper = (byte) (upper | 0x02);
+			}
 
 			// this next function simply checks for a decade hour
-			if (((hours % 12) == 0) || ((hours % 12) > 9))
+			if (hours % 12 == 0 || hours % 12 > 9) {
 				upper = (byte) (upper | 0x01);
+			}
 
-			if (hours > 12)
+			if (hours > 12) {
 				hours = hours - 12;
+			}
 
-			if (hours == 0)
+			if (hours == 0) {
 				lower = (byte) 0x02;
-			else
-				lower = (byte) ((hours % 10) & 0x0f);
+			} else {
+				lower = (byte) (hours % 10 & 0x0f);
+			}
 		} else {
 			upper = (byte) (hours / 10);
 			lower = (byte) (hours % 10);
 		}
 
-		upper = (byte) ((upper << 4) & 0xf0);
+		upper = (byte) (upper << 4 & 0xf0);
 		lower = (byte) (lower & 0x0f);
 		state[timeReg & 31] = (byte) (upper | lower);
 
@@ -1104,7 +1109,7 @@ private void setDate(int year, int month, int day, byte[] state) {
 
 		/* write the day byte (the upper holds 10s of days, lower holds single days) */
 		upper = (byte) (day / 10);
-		upper = (byte) ((upper << 4) & 0xf0);
+		upper = (byte) (upper << 4 & 0xf0);
 		lower = (byte) (day % 10);
 		lower = (byte) (lower & 0x0f);
 		state[0x04] = (byte) (upper | lower);
@@ -1114,7 +1119,7 @@ private void setDate(int year, int month, int day, byte[] state) {
 		 * (1 for 2000, 0 for 1900)
 		 */
 		upper = (byte) (month / 10);
-		upper = (byte) ((upper << 4) & 0xf0);
+		upper = (byte) (upper << 4 & 0xf0);
 		lower = (byte) (month % 10);
 		lower = (byte) (lower & 0x0f);
 
@@ -1123,14 +1128,15 @@ private void setDate(int year, int month, int day, byte[] state) {
 
 			// go ahead and fix up the year too while i'm at it
 			year = year - 2000;
-		} else
+		} else {
 			year = year - 1900;
+		}
 
 		state[0x05] = (byte) (upper | lower);
 
 		// now write the year
 		upper = (byte) (year / 10);
-		upper = (byte) ((upper << 4) & 0xf0);
+		upper = (byte) (upper << 4 & 0xf0);
 		lower = (byte) (year % 10);
 		lower = (byte) (lower & 0x0f);
 		state[0x06] = (byte) (upper | lower);
@@ -1148,6 +1154,7 @@ private void setDate(int year, int month, int day, byte[] state) {
 	 * @return maximum speed
 	 * @see DSPortAdapter#setSpeed
 	 */
+	@Override
 	public int getMaxSpeed() {
 		return DSPortAdapter.SPEED_OVERDRIVE;
 	}
@@ -1158,8 +1165,9 @@ public int getMaxSpeed() {
 	 *
 	 * @return iButton or 1-Wire device name
 	 */
+	@Override
 	public String getName() {
-		return partNumber;
+		return this.partNumber;
 	}
 
 	/**
@@ -1169,6 +1177,7 @@ public String getName() {
 	 *
 	 * @return the alternate names for this iButton or 1-Wire device
 	 */
+	@Override
 	public String getAlternateNames() {
 		return "Thermochron";
 	}
@@ -1179,31 +1188,30 @@ public String getAlternateNames() {
 	 *
 	 * @return device description
 	 */
+	@Override
 	public String getDescription() {
 		// put the DS1921's characteristics together in a string format.
-		String characteristics = "";
-		if (partNumber != "DS1921") {
+		var characteristics = "";
+		if (this.partNumber != "DS1921") {
 			// get the physical range as a string
-			String strPhysicalRange = Convert.toString(getPhysicalRangeLowTemperature(), 1) + " to "
-					+ Convert.toString(getPhysicalRangeHighTemperature(), 1) + " degrees Celsius.";
+			var strPhysicalRange = Convert.toString(this.getPhysicalRangeLowTemperature(), 1) + " to "
+					+ Convert.toString(this.getPhysicalRangeHighTemperature(), 1) + " degrees Celsius.";
 			// get the operating range as a string
-			String strOperatingRange = Convert.toString(getOperatingRangeLowTemperature(), 1) + " to "
-					+ Convert.toString(getOperatingRangeHighTemperature(), 1) + " degrees Celsius.";
+			var strOperatingRange = Convert.toString(this.getOperatingRangeLowTemperature(), 1) + " to "
+					+ Convert.toString(this.getOperatingRangeHighTemperature(), 1) + " degrees Celsius.";
 			characteristics = " The operating range for this device is:  " + strOperatingRange
 					+ " The physical range for this device is:  " + strPhysicalRange + " The resolution is "
-					+ Convert.toString(getTemperatureResolution(), 3)
-					+ " degrees Celsius, and the histogram bin width is " + Convert.toString(getHistogramBinWidth(), 3)
-					+ " degrees Celsius.";
+					+ Convert.toString(this.getTemperatureResolution(), 3)
+					+ " degrees Celsius, and the histogram bin width is "
+					+ Convert.toString(this.getHistogramBinWidth(), 3) + " degrees Celsius.";
 		}
-		String returnString = "Rugged, self-sufficient 1-Wire device that, once setup for "
+		return "Rugged, self-sufficient 1-Wire device that, once setup for "
 				+ "a mission, will measure the temperature and record the result in "
 				+ "a protected memory section. It stores up to 2048 temperature "
 				+ "measurements and will take measurements at a user-specified "
 				+ "rate. The thermochron also records the number of times the temperature "
 				+ "falls on a given degree range (temperature bin), and stores the " + "data in histogram format."
 				+ characteristics;
-
-		return returnString;
 	}
 
 	/**
@@ -1222,7 +1230,7 @@ public String getDescription() {
 	 * @see OneWireContainer#doSpeed()
 	 */
 	public synchronized void setSpeedCheck(boolean doSpeedCheck) {
-		doSpeedEnable = doSpeedCheck;
+		this.doSpeedEnable = doSpeedCheck;
 	}
 
 	/**
@@ -1241,7 +1249,7 @@ public synchronized void setSpeedCheck(boolean doSpeedCheck) {
 	 * @return the physical range low temperature in degrees Celsius
 	 */
 	public double getPhysicalRangeLowTemperature() {
-		return temperatureRangeLow;
+		return this.temperatureRangeLow;
 	}
 
 	/**
@@ -1260,7 +1268,7 @@ public double getPhysicalRangeLowTemperature() {
 	 * @return the physical range low temperature in degrees Celsius
 	 */
 	public double getPhysicalRangeHighTemperature() {
-		return temperatureRangeHigh;
+		return this.temperatureRangeHigh;
 	}
 
 	/**
@@ -1279,7 +1287,7 @@ public double getPhysicalRangeHighTemperature() {
 	 * @return the operating range low temperature in degrees Celsius
 	 */
 	public double getOperatingRangeLowTemperature() {
-		return temperatureOperatingRangeLow;
+		return this.temperatureOperatingRangeLow;
 	}
 
 	/**
@@ -1298,7 +1306,7 @@ public double getOperatingRangeLowTemperature() {
 	 * @return the operating range high temperature in degrees Celsius
 	 */
 	public double getOperatingRangeHighTemperature() {
-		return temperatureOperatingRangeHigh;
+		return this.temperatureOperatingRangeHigh;
 	}
 
 	/**
@@ -1308,7 +1316,7 @@ public double getOperatingRangeHighTemperature() {
 	 * @return the temperature resolution of this thermochron.
 	 */
 	public double getTemperatureResolution() {
-		return temperatureResolution;
+		return this.temperatureResolution;
 	}
 
 	/**
@@ -1318,9 +1326,10 @@ public double getTemperatureResolution() {
 	 * @return the lowest histogram bin temperature.
 	 */
 	public double getHistogramLowTemperature() {
-		double lowTemp = getPhysicalRangeLowTemperature(); // low temp of thermochrons other than H or Z
-		if (isDS1921HZ)
-			lowTemp = lowTemp - (getTemperatureResolution() * 4);
+		var lowTemp = this.getPhysicalRangeLowTemperature(); // low temp of thermochrons other than H or Z
+		if (this.isDS1921HZ) {
+			lowTemp = lowTemp - this.getTemperatureResolution() * 4;
+		}
 		return lowTemp;
 	}
 
@@ -1330,7 +1339,7 @@ public double getHistogramLowTemperature() {
 	 * @return the width of a histogram bin for this thermochron.
 	 */
 	public double getHistogramBinWidth() {
-		return (getTemperatureResolution() * 4); // 4 temperature readings per bin
+		return this.getTemperatureResolution() * 4; // 4 temperature readings per bin
 	}
 
 	/**
@@ -1352,12 +1361,12 @@ public double decodeTemperature(byte tempByte) {
 		// and Tlow is the low temperature of temperature range.
 		// and Tres is the resolution of the DS1921.
 
-		double decodedTemperature = 0.0;
-		if (isDS1921HZ) {
-			decodedTemperature = ((tempByte & 0x00ff) * temperatureResolution);
-			decodedTemperature = decodedTemperature + (temperatureRangeLow - (4 * temperatureResolution));
+		var decodedTemperature = 0.0;
+		if (this.isDS1921HZ) {
+			decodedTemperature = (tempByte & 0x00ff) * this.temperatureResolution;
+			decodedTemperature = decodedTemperature + (this.temperatureRangeLow - 4 * this.temperatureResolution);
 		} else {
-			decodedTemperature = ((tempByte & 0x00ff) / 2.0) - 40.0;
+			decodedTemperature = (tempByte & 0x00ff) / 2.0 - 40.0;
 		}
 		return decodedTemperature;
 	}
@@ -1381,11 +1390,11 @@ public byte encodeTemperature(double temperature) {
 		// and Tres is the resolution of the DS1921
 
 		byte encodedTemperature = 0x00;
-		if (isDS1921HZ) {
-			double result = ((temperature - temperatureRangeLow) / temperatureResolution) + 4;
+		if (this.isDS1921HZ) {
+			var result = (temperature - this.temperatureRangeLow) / this.temperatureResolution + 4;
 			encodedTemperature = (byte) ((int) result & 0x000000ff);
 		} else {
-			encodedTemperature = (byte) (((int) (2 * temperature) + 80) & 0x000000ff);
+			encodedTemperature = (byte) ((int) (2 * temperature) + 80 & 0x000000ff);
 		}
 		return encodedTemperature;
 	}
@@ -1413,59 +1422,63 @@ public byte encodeTemperature(double temperature) {
 	public void writeByte(int memAddr, byte source) throws OneWireIOException, OneWireException {
 
 		// User should only need to write to the 32 byte register page
-		byte[] buffer = new byte[5];
+		var buffer = new byte[5];
 
 		// break the address into its bytes
-		byte msbAddress = (byte) ((memAddr >>> 8) & 0x0ff);
-		byte lsbAddress = (byte) (memAddr & 0x0ff);
+		var msbAddress = (byte) (memAddr >>> 8 & 0x0ff);
+		var lsbAddress = (byte) (memAddr & 0x0ff);
 
 		/* check for valid parameters */
-		if ((msbAddress > 0x1F) || (msbAddress < 0))
+		if (msbAddress > 0x1F || msbAddress < 0) {
 			throw new IllegalArgumentException("OneWireContainer21-Address for write out of range.");
+		}
 
 		/* perform the write and verification */
-		if (doSpeedEnable)
-			doSpeed();
-
-		if (adapter.select(address)) {
+		if (this.doSpeedEnable) {
+			this.doSpeed();
+		}
 
-			/* write to the scratchpad first */
-			buffer[0] = WRITE_SCRATCHPAD_COMMAND;
-			buffer[1] = lsbAddress;
-			buffer[2] = msbAddress;
-			buffer[3] = source;
+		if (!this.adapter.select(this.address)) {
+			throw new OneWireException("OneWireContainer21-Device not present.");
+		}
+		/* write to the scratchpad first */
+		buffer[0] = WRITE_SCRATCHPAD_COMMAND;
+		buffer[1] = lsbAddress;
+		buffer[2] = msbAddress;
+		buffer[3] = source;
 
-			adapter.dataBlock(buffer, 0, 4);
+		this.adapter.dataBlock(buffer, 0, 4);
 
-			/* read it back for the verification bytes required to copy it to mem */
-			adapter.select(address);
+		/* read it back for the verification bytes required to copy it to mem */
+		this.adapter.select(this.address);
 
-			buffer[0] = READ_SCRATCHPAD_COMMAND;
+		buffer[0] = READ_SCRATCHPAD_COMMAND;
 
-			for (int i = 1; i < 5; i++)
-				buffer[i] = (byte) 0x0ff;
+		for (var i = 1; i < 5; i++) {
+			buffer[i] = (byte) 0x0ff;
+		}
 
-			adapter.dataBlock(buffer, 0, 5);
+		this.adapter.dataBlock(buffer, 0, 5);
 
-			// check to see if the data was written correctly
-			if (buffer[4] != source)
-				throw new OneWireIOException("OneWireContainer21-Error writing data byte.");
+		// check to see if the data was written correctly
+		if (buffer[4] != source) {
+			throw new OneWireIOException("OneWireContainer21-Error writing data byte.");
+		}
 
-			/* now perform the copy from the scratchpad to memory */
-			adapter.select(address);
+		/* now perform the copy from the scratchpad to memory */
+		this.adapter.select(this.address);
 
-			buffer[0] = COPY_SCRATCHPAD_COMMAND;
+		buffer[0] = COPY_SCRATCHPAD_COMMAND;
 
-			// keep buffer[1]-buffer[3] because they contain the verification bytes
-			buffer[4] = (byte) 0xff;
+		// keep buffer[1]-buffer[3] because they contain the verification bytes
+		buffer[4] = (byte) 0xff;
 
-			adapter.dataBlock(buffer, 0, 5);
+		this.adapter.dataBlock(buffer, 0, 5);
 
-			/* now check to see that the part sent a 01010101 indicating a success */
-			if ((buffer[4] != (byte) 0xAA) && (buffer[4] != (byte) 0x55))
-				throw new OneWireIOException("OneWireContainer21-Error writing data byte.");
-		} else
-			throw new OneWireException("OneWireContainer21-Device not present.");
+		/* now check to see that the part sent a 01010101 indicating a success */
+		if (buffer[4] != (byte) 0xAA && buffer[4] != (byte) 0x55) {
+			throw new OneWireIOException("OneWireContainer21-Error writing data byte.");
+		}
 	}
 
 	/**
@@ -1491,31 +1504,33 @@ public void writeByte(int memAddr, byte source) throws OneWireIOException, OneWi
 	 * @see #getMemoryBanks()
 	 */
 	public byte readByte(int memAddr) throws OneWireIOException, OneWireException {
-		byte[] buffer = new byte[4];
+		var buffer = new byte[4];
 
 		// break the address up into bytes
-		byte msbAddress = (byte) ((memAddr >> 8) & 0x000000ff);
-		byte lsbAddress = (byte) (memAddr & 0x000000ff);
+		var msbAddress = (byte) (memAddr >> 8 & 0x000000ff);
+		var lsbAddress = (byte) (memAddr & 0x000000ff);
 
 		/* check the validity of the address */
-		if ((msbAddress > 0x1F) || (msbAddress < 0))
+		if (msbAddress > 0x1F || msbAddress < 0) {
 			throw new IllegalArgumentException("OneWireContainer21-Address for read out of range.");
+		}
 
 		/* read a user specified amount of memory and verify its validity */
-		if (doSpeedEnable)
-			doSpeed();
+		if (this.doSpeedEnable) {
+			this.doSpeed();
+		}
 
-		if (adapter.select(address)) {
+		if (this.adapter.select(this.address)) {
 			buffer[0] = READ_MEMORY_CRC_COMMAND;
 			buffer[1] = lsbAddress;
 			buffer[2] = msbAddress;
 			buffer[3] = (byte) 0x0ff;
 
-			adapter.dataBlock(buffer, 0, 4);
+			this.adapter.dataBlock(buffer, 0, 4);
 
 			return buffer[3];
-		} else
-			throw new OneWireException("OneWireContainer21-Device not present.");
+		}
+		throw new OneWireException("OneWireContainer21-Device not present.");
 	}
 
 	/**
@@ -1592,7 +1607,7 @@ public byte readByte(int memAddr) throws OneWireIOException, OneWireException {
 	 *
 	 */
 	public boolean getFlag(int register, byte bitMask) throws OneWireIOException, OneWireException {
-		return ((readByte(register) & bitMask) != 0);
+		return (this.readByte(register) & bitMask) != 0;
 	}
 
 	/**
@@ -1622,7 +1637,7 @@ public boolean getFlag(int register, byte bitMask) throws OneWireIOException, On
 	 * @see #setFlag(int,byte,boolean,byte[])
 	 */
 	public boolean getFlag(int register, byte bitMask, byte[] state) {
-		return ((state[register & 31] & bitMask) != 0);
+		return (state[register & 31] & bitMask) != 0;
 	}
 
 	/**
@@ -1665,19 +1680,21 @@ public boolean getFlag(int register, byte bitMask, byte[] state) {
 	public void setFlag(int register, byte bitMask, boolean flagValue) throws OneWireIOException, OneWireException {
 
 		// check for Mission in Progress flag
-		if (getFlag(STATUS_REGISTER, MISSION_IN_PROGRESS_FLAG))
+		if (this.getFlag(STATUS_REGISTER, MISSION_IN_PROGRESS_FLAG)) {
 			throw new OneWireIOException("OneWireContainer21-Cannot write to register while mission is in progress.");
+		}
 
 		// read the current flag settings
-		byte flags = readByte(register);
+		var flags = this.readByte(register);
 
-		if (flagValue)
+		if (flagValue) {
 			flags = (byte) (flags | bitMask);
-		else
-			flags = (byte) (flags & ~(bitMask));
+		} else {
+			flags = (byte) (flags & ~bitMask);
+		}
 
 		// write the regs back
-		writeByte(register, flags);
+		this.writeByte(register, flags);
 	}
 
 	/**
@@ -1714,12 +1731,13 @@ public void setFlag(int register, byte bitMask, boolean flagValue) throws OneWir
 	public void setFlag(int register, byte bitMask, boolean flagValue, byte[] state) {
 		register = register & 31;
 
-		byte flags = state[register];
+		var flags = state[register];
 
-		if (flagValue)
+		if (flagValue) {
 			flags = (byte) (flags | bitMask);
-		else
-			flags = (byte) (flags & ~(bitMask));
+		} else {
+			flags = (byte) (flags & ~bitMask);
+		}
 
 		// write the regs back
 		state[register] = flags;
@@ -1760,22 +1778,24 @@ public void setFlag(int register, byte bitMask, boolean flagValue, byte[] state)
 	 */
 	public void enableMission(int sampleRate) throws OneWireIOException, OneWireException {
 		/* check for valid parameters */
-		if ((sampleRate > 255) || (sampleRate < 0))
+		if (sampleRate > 255 || sampleRate < 0) {
 			throw new IllegalArgumentException("OneWireContainer21-Sample rate must be 255 minutes or less");
+		}
 
-		if (getFlag(STATUS_REGISTER, MISSION_IN_PROGRESS_FLAG))
+		if (this.getFlag(STATUS_REGISTER, MISSION_IN_PROGRESS_FLAG)) {
 			throw new OneWireIOException("OneWireContainer30-Unable to start mission (Mission already in Progress)");
+		}
 
 		// read the current register status
-		byte controlReg = readByte(CONTROL_REGISTER);
+		var controlReg = this.readByte(CONTROL_REGISTER);
 
 		// Set the enable mission byte to 0
 		controlReg = (byte) (controlReg & 0xEF);
 
-		writeByte(CONTROL_REGISTER, controlReg);
+		this.writeByte(CONTROL_REGISTER, controlReg);
 
 		// set the sample rate and let her rip
-		writeByte(0x20D, (byte) (sampleRate & 0x000000ff));
+		this.writeByte(0x20D, (byte) (sampleRate & 0x000000ff));
 	}
 
 	/**
@@ -1796,12 +1816,12 @@ public void enableMission(int sampleRate) throws OneWireIOException, OneWireExce
 	public void disableMission() throws OneWireIOException, OneWireException {
 
 		// first read the current register
-		byte statusReg = readByte(STATUS_REGISTER);
+		var statusReg = this.readByte(STATUS_REGISTER);
 
 		// Set the MIP bit to 0, regardless of whether a mission is commencing
 		statusReg = (byte) (statusReg & 0xDF); // set the MIP bit to 0;
 
-		writeByte(STATUS_REGISTER, statusReg);
+		this.writeByte(STATUS_REGISTER, statusReg);
 	}
 
 	/**
@@ -1827,7 +1847,7 @@ public void disableMission() throws OneWireIOException, OneWireException {
 	 * @see #enableMission(int)
 	 */
 	public void setMissionStartDelay(int missionStartDelay, byte[] state) {
-		state[0x12] = (byte) (missionStartDelay);
+		state[0x12] = (byte) missionStartDelay;
 		state[0x13] = (byte) (missionStartDelay >> 8);
 	}
 
@@ -1867,38 +1887,39 @@ public void clearMemory() throws OneWireIOException, OneWireException {
 		// added 8/29/2001 by SH - delay necessary so that clock is
 		// running before mission is enabled.
 		// check to see if the Oscillator is enabled.
-		byte[] state = readDevice();
-		if (isClockRunning(state)) {
+		var state = this.readDevice();
+		if (this.isClockRunning(state)) {
 			// if the oscillator is not enabled, start it
-			setClockRunEnable(true, state);
-			writeDevice(state);
+			this.setClockRunEnable(true, state);
+			this.writeDevice(state);
 			// and give it the required time
 			try {
 				Thread.sleep(751);
 			} catch (InterruptedException ie) {
-				;
+
 			}
 		}
 
 		// first set the MCLRE bit to 1 in the control register
-		setFlag(CONTROL_REGISTER, MEMORY_CLEAR_ENABLE_FLAG, true);
+		this.setFlag(CONTROL_REGISTER, MEMORY_CLEAR_ENABLE_FLAG, true);
 
 		// now send the memory clear command and wait 5 milliseconds
-		if (doSpeedEnable)
-			doSpeed();
-
-		adapter.reset();
+		if (this.doSpeedEnable) {
+			this.doSpeed();
+		}
 
-		if (adapter.select(address)) {
-			adapter.putByte(CLEAR_MEMORY_COMMAND);
+		this.adapter.reset();
 
-			try {
-				Thread.sleep(5);
-			} catch (Exception e) {
-				// drain it
-			}
-		} else
+		if (!this.adapter.select(this.address)) {
 			throw new OneWireException("OneWireContainer21-Device not found.");
+		}
+		this.adapter.putByte(CLEAR_MEMORY_COMMAND);
+
+		try {
+			Thread.sleep(5);
+		} catch (Exception e) {
+			// drain it
+		}
 	}
 
 	/**
@@ -1908,7 +1929,7 @@ public void clearMemory() throws OneWireIOException, OneWireException {
 	 * returned <code>java.util.Calendar</code> object are valid. Only four values
 	 * in the <code>Calendar</code> should be used. The field names for these values
 	 * are:
-	 * 
+	 *
 	 * <pre>
 	 * <code>
 	 *      Calendar.DAY_OF_MONTH
@@ -1935,8 +1956,8 @@ public void clearMemory() throws OneWireIOException, OneWireException {
 	public Calendar getAlarmTime(byte[] state) {
 
 		// first get the time
-		int[] time = getTime(0x207, state);
-		Calendar result = Calendar.getInstance();
+		var time = this.getTime(0x207, state);
+		var result = Calendar.getInstance();
 		result.set(Calendar.YEAR, 0);
 		result.set(Calendar.MONTH, 0);
 		result.set(Calendar.DATE, 0);
@@ -1949,7 +1970,7 @@ public Calendar getAlarmTime(byte[] state) {
 		// time [0]);
 
 		// now put the day of the week in there
-		byte dayOfWeek = (byte) (state[0x0A] & 0x07);
+		var dayOfWeek = (byte) (state[0x0A] & 0x07);
 
 		result.set(Calendar.DAY_OF_MONTH, dayOfWeek);
 
@@ -1965,7 +1986,7 @@ public Calendar getAlarmTime(byte[] state) {
 	 *
 	 * <p>
 	 * Valid values for <code>alarmFrequency</code> are:
-	 * 
+	 *
 	 * <pre>
 	 * <code>
 	 *    ONCE_PER_SECOND
@@ -2000,11 +2021,11 @@ public Calendar getAlarmTime(byte[] state) {
 	 * @see #ONCE_PER_WEEK
 	 */
 	public void setClockAlarm(int hours, int minutes, int seconds, int day, int alarmFrequency, byte[] state) {
-		setTime(0x207, hours, minutes, seconds, false, state);
+		this.setTime(0x207, hours, minutes, seconds, false, state);
 
 		state[0x0a] = (byte) day;
 
-		int number_0_msb = 0; // how many of the MS, MM, MH, MD bytes have
+		var number_0_msb = 0; // how many of the MS, MM, MH, MD bytes have
 
 		// 0 as their ms bit???
 		switch (alarmFrequency) {
@@ -2026,13 +2047,14 @@ public void setClockAlarm(int hours, int minutes, int seconds, int day, int alar
 			break;
 		}
 
-		for (int i = 0x07; i < 0x0b; i++) {
+		for (var i = 0x07; i < 0x0b; i++) {
 			if (number_0_msb > 0) {
 				number_0_msb--;
 
 				state[i] = (byte) (state[i] & 0x7f); // make the leading bit 0
-			} else
+			} else {
 				state[i] = (byte) (state[i] | 0x80); // make the laeding bit 1
+			}
 		}
 	}
 
@@ -2050,7 +2072,7 @@ public void setClockAlarm(int hours, int minutes, int seconds, int day, int alar
 	 * @see #readDevice()
 	 */
 	public int getSampleRate(byte[] state) {
-		return (int) (0x0FF & state[0x0D]);
+		return 0x0FF & state[0x0D];
 	}
 
 	/**
@@ -2067,11 +2089,11 @@ public int getSampleRate(byte[] state) {
 	 * @see #getDeviceSamplesCounter(byte[])
 	 */
 	public int getMissionSamplesCounter(byte[] state) {
-		byte low = state[0x1A];
-		byte medium = state[0x1B];
-		byte high = state[0x1C];
+		var low = state[0x1A];
+		var medium = state[0x1B];
+		var high = state[0x1C];
 
-		return (((high << 16) & 0x00ff0000) | ((medium << 8) & 0x0000ff00) | (low & 0x000000ff));
+		return high << 16 & 0x00ff0000 | medium << 8 & 0x0000ff00 | low & 0x000000ff;
 	}
 
 	/**
@@ -2095,11 +2117,11 @@ public int getMissionSamplesCounter(byte[] state) {
 	 * @see #getMissionSamplesCounter(byte[])
 	 */
 	public int getDeviceSamplesCounter(byte[] state) {
-		byte low = state[0x1D];
-		byte medium = state[0x1E];
-		byte high = state[0x1F];
+		var low = state[0x1D];
+		var medium = state[0x1E];
+		var high = state[0x1F];
 
-		return (((high << 16) & 0x00ff0000) | ((medium << 8) & 0x0000ff00) | (low & 0x000000ff));
+		return high << 16 & 0x00ff0000 | medium << 8 & 0x0000ff00 | low & 0x000000ff;
 	}
 
 	/**
@@ -2122,33 +2144,35 @@ public Calendar getMissionTimeStamp(byte[] state) {
 		 * read the seconds. since i can ignore that in this case, i can go ahead and
 		 * 'fake' read the seconds
 		 */
-		int[] time_result = getTime(0x214, state);
-		int[] date_result = getDate(0x217, state);
-		int year = date_result[0] % 100;
+		var time_result = this.getTime(0x214, state);
+		var date_result = this.getDate(0x217, state);
+		var year = date_result[0] % 100;
 
 		// determine the century based on the number of samples taken
-		int numberOfCounts = getMissionSamplesCounter(state);
-		int timeBetweenCounts = getSampleRate(state);
-		int yearsSinceMissionStart = (int) ((numberOfCounts * timeBetweenCounts) / (525600));
+		var numberOfCounts = this.getMissionSamplesCounter(state);
+		var timeBetweenCounts = this.getSampleRate(state);
+		var yearsSinceMissionStart = numberOfCounts * timeBetweenCounts / 525600;
 
 		// get a rough estimate of how long ago this was
 		// result = getDateTime(state);
-		int[] offset_result = getDate(0x204, state);
-		int result_year = offset_result[0];
+		var offset_result = this.getDate(0x204, state);
+		var result_year = offset_result[0];
 
 		// add the century based on this calculation
 		// if ((result.get(Calendar.YEAR) - yearsSinceMissionStart) > 1999)
-		if ((result_year - yearsSinceMissionStart) > 1999)
+		if (result_year - yearsSinceMissionStart > 1999) {
 			year += 2000;
-		else
+		} else {
 			year += 1900;
+		}
 
 		// protect against deviations that may cause gross errors
 		// if (year > result.get(Calendar.YEAR))
-		if (year > result_year)
+		if (year > result_year) {
 			year -= 100;
+		}
 
-		Calendar result = Calendar.getInstance();
+		var result = Calendar.getInstance();
 		result.set(Calendar.YEAR, year);
 		result.set(Calendar.MONTH, date_result[1] - 1);
 		result.set(Calendar.DATE, date_result[2]);
@@ -2172,7 +2196,7 @@ public Calendar getMissionTimeStamp(byte[] state) {
 	 * millisecond value of <code>getMissionTimeStamp()</code> to determine the time
 	 * that the 'first' log entry actually occurred.
 	 * </p>
-	 * 
+	 *
 	 * <pre>
 	 * <code>
 	 *      //ds1921 is a OneWireContainer21
@@ -2204,10 +2228,11 @@ public Calendar getMissionTimeStamp(byte[] state) {
 	 * @see #getTemperatureLog(byte[])
 	 */
 	public long getFirstLogOffset(byte[] state) {
-		long counter = getMissionSamplesCounter(state);
+		long counter = this.getMissionSamplesCounter(state);
 
-		if ((counter < 2049) || (!getFlag(CONTROL_REGISTER, ROLLOVER_ENABLE_FLAG, state)))
+		if (counter < 2049 || !this.getFlag(CONTROL_REGISTER, ROLLOVER_ENABLE_FLAG, state)) {
 			return 0;
+		}
 
 		// else we need to figure out when the first sample occurred
 		// since there are counter entries, the first entry is (counter - 2048)
@@ -2217,11 +2242,9 @@ public long getFirstLogOffset(byte[] state) {
 
 		// rate is the rate in minutes, must multiply by 60 to be seconds,
 		// then by 1000 to be milliseconds
-		int rate = this.getSampleRate(state);
+		var rate = this.getSampleRate(state);
 
-		counter = counter * rate * 1000 * 60;
-
-		return counter;
+		return counter * rate * 1000 * 60;
 	}
 
 	/**
@@ -2261,36 +2284,37 @@ public synchronized byte[] getTemperatureLog(byte[] state) throws OneWireIOExcep
 		byte[] result;
 
 		/* get the number of samples and the rate at which they were taken */
-		int numberOfReadings = getMissionSamplesCounter(state);
+		var numberOfReadings = this.getMissionSamplesCounter(state);
 
 		// used for rollover
-		int offsetDepth = 0;
+		var offsetDepth = 0;
 
 		/* this next line checks the rollover bit and whether a rollover occurred */
-		if ((getFlag(CONTROL_REGISTER, ROLLOVER_ENABLE_FLAG, state)) && (numberOfReadings > 2048)) {
+		if (this.getFlag(CONTROL_REGISTER, ROLLOVER_ENABLE_FLAG, state) && numberOfReadings > 2048) {
 
 			// offsetDepth holds the number of new readings before we hit older ones
 			offsetDepth = numberOfReadings % 2048;
 		}
 
 		// the max number of readings STORED is 2048
-		if (numberOfReadings > 2048)
+		if (numberOfReadings > 2048) {
 			numberOfReadings = 2048;
+		}
 
 		result = new byte[numberOfReadings];
 
-		int offset = 0;
+		var offset = 0;
 
 		while (offset < numberOfReadings) {
-			log.readPageCRC(offset >> 5, false, read_log_buffer, offset);
+			this.log.readPageCRC(offset >> 5, false, this.read_log_buffer, offset);
 
 			offset += 32;
 		}
 
 		// put the bytes into the output array, but careful for the case
 		// where we rolled over that we start in the right place!
-		System.arraycopy(read_log_buffer, offsetDepth, result, 0, numberOfReadings - offsetDepth);
-		System.arraycopy(read_log_buffer, 0, result, numberOfReadings - offsetDepth, offsetDepth);
+		System.arraycopy(this.read_log_buffer, offsetDepth, result, 0, numberOfReadings - offsetDepth);
+		System.arraycopy(this.read_log_buffer, 0, result, numberOfReadings - offsetDepth, offsetDepth);
 
 		return result;
 	}
@@ -2324,17 +2348,18 @@ public synchronized byte[] getTemperatureLog(byte[] state) throws OneWireIOExcep
 	 */
 	public int[] getTemperatureHistogram() throws OneWireIOException, OneWireException {
 		int[] result;
-		if (isDS1921HZ)
+		if (this.isDS1921HZ) {
 			result = new int[64]; // One more bin for the H or Z
-		else
+		} else {
 			result = new int[63];
-		byte[] buffer = new byte[128];
+		}
+		var buffer = new byte[128];
 
 		/* read the data first */
-		int offset = 0;
+		var offset = 0;
 
 		while (offset < 128) {
-			histogram.readPageCRC(offset >> 5, false, buffer, offset);
+			this.histogram.readPageCRC(offset >> 5, false, buffer, offset);
 
 			offset += 32;
 		}
@@ -2344,7 +2369,7 @@ public int[] getTemperatureHistogram() throws OneWireIOException, OneWireExcepti
 		while (i < result.length) {
 
 			// get the 2 byte counter values
-			result[i] = (buffer[j] & 0x00ff) | ((buffer[j + 1] << 8) & 0xff00);
+			result[i] = buffer[j] & 0x00ff | buffer[j + 1] << 8 & 0xff00;
 
 			i++;
 
@@ -2375,7 +2400,7 @@ public int[] getTemperatureHistogram() throws OneWireIOException, OneWireExcepti
 	 * @see #getAlarmHistory(byte)
 	 */
 	public boolean getAlarmStatus(byte alarmBit, byte[] state) {
-		return ((state[STATUS_REGISTER & 31] & alarmBit) != 0);
+		return (state[STATUS_REGISTER & 31] & alarmBit) != 0;
 	}
 
 	/**
@@ -2419,7 +2444,7 @@ public boolean getAlarmStatus(byte alarmBit, byte[] state) {
 	 *
 	 * <p>
 	 * Acceptable values for the <code>alarmBit</code> parameter are:
-	 * 
+	 *
 	 * <pre>
 	 * <code>
 	 *     TEMPERATURE_LOW_ALARM
@@ -2443,31 +2468,33 @@ public boolean getAlarmStatus(byte alarmBit, byte[] state) {
 	 * @see #getAlarmStatus(byte,byte[])
 	 */
 	public byte[] getAlarmHistory(byte alarmBit) throws OneWireIOException, OneWireException {
-		int counter = 0;
-		byte[] temp_data = new byte[96];
-		int offset = 0;
+		var counter = 0;
+		var temp_data = new byte[96];
+		var offset = 0;
 
 		while (offset < 96) {
-			alarm.readPageCRC(offset >> 5, false, temp_data, offset);
+			this.alarm.readPageCRC(offset >> 5, false, temp_data, offset);
 
 			offset += 32;
 		}
 
-		if (alarmBit == TEMPERATURE_LOW_ALARM)
+		if (alarmBit == TEMPERATURE_LOW_ALARM) {
 			offset = 0;
-		else
+		} else {
 			offset = 48;
+		}
 
 		/*
 		 * check how many entries there are (each entry consists of 4 bytes) the fourth
 		 * byte of each entry is the counter - check if its > 0
 		 */
 		/* but there can only be a maximum of 12 entries! */
-		while (counter < 12 && (counter * 4 + 3 + offset < temp_data.length)
-				&& (temp_data[counter * 4 + 3 + offset] != 0))
+		while (counter < 12 && counter * 4 + 3 + offset < temp_data.length
+				&& temp_data[counter * 4 + 3 + offset] != 0) {
 			counter++;
+		}
 
-		byte[] data = new byte[counter << 2];
+		var data = new byte[counter << 2];
 
 		System.arraycopy(temp_data, offset, data, 0, counter << 2);
 
@@ -2490,11 +2517,12 @@ public byte[] getAlarmHistory(byte alarmBit) throws OneWireIOException, OneWireE
 	 * @throws OneWireException   on a communication or setup error with the 1-Wire
 	 *                            adapter
 	 */
+	@Override
 	public byte[] readDevice() throws OneWireIOException, OneWireException {
-		byte[] buffer = new byte[32];
+		var buffer = new byte[32];
 
 		// going to return the register page, 32 bytes
-		register.readPageCRC(0, false, buffer, 0);
+		this.register.readPageCRC(0, false, buffer, 0);
 
 		return buffer;
 	}
@@ -2514,16 +2542,18 @@ public byte[] readDevice() throws OneWireIOException, OneWireException {
 	 * @throws OneWireException   on a communication or setup error with the 1-Wire
 	 *                            adapter
 	 */
+	@Override
 	public void writeDevice(byte[] state) throws OneWireIOException, OneWireException {
-		if (getFlag(STATUS_REGISTER, MISSION_IN_PROGRESS_FLAG))
+		if (this.getFlag(STATUS_REGISTER, MISSION_IN_PROGRESS_FLAG)) {
 			throw new OneWireIOException("OneWireContainer21-Cannot write to registers while mission is in progress.");
+		}
 
-		int start = updatertc ? 0 : 7;
+		var start = this.updatertc ? 0 : 7;
 
-		register.write(start, state, start, 20 - start); // last 12 bytes are read only
+		this.register.write(start, state, start, 20 - start); // last 12 bytes are read only
 
 		synchronized (this) {
-			updatertc = false;
+			this.updatertc = false;
 		}
 	}
 
@@ -2542,6 +2572,7 @@ public void writeDevice(byte[] state) throws OneWireIOException, OneWireExceptio
 	 * @see #getTemperatureAlarm
 	 * @see #setTemperatureAlarm
 	 */
+	@Override
 	public boolean hasTemperatureAlarms() {
 		return true;
 	}
@@ -2556,6 +2587,7 @@ public boolean hasTemperatureAlarms() {
 	 * @see #getTemperatureResolutions
 	 * @see #setTemperatureResolution
 	 */
+	@Override
 	public boolean hasSelectableTemperatureResolution() {
 		return false;
 	}
@@ -2571,10 +2603,11 @@ public boolean hasSelectableTemperatureResolution() {
 	 * @see #getTemperatureResolution
 	 * @see #setTemperatureResolution
 	 */
+	@Override
 	public double[] getTemperatureResolutions() {
-		double[] d = new double[1];
+		var d = new double[1];
 
-		d[0] = temperatureResolution;
+		d[0] = this.temperatureResolution;
 
 		return d;
 	}
@@ -2589,6 +2622,7 @@ public double[] getTemperatureResolutions() {
 	 * @see #setTemperatureAlarm
 	 *
 	 */
+	@Override
 	public double getTemperatureAlarmResolution() {
 		return 1.5;
 	}
@@ -2600,8 +2634,9 @@ public double getTemperatureAlarmResolution() {
 	 *
 	 * @see #getMinTemperature()
 	 */
+	@Override
 	public double getMaxTemperature() {
-		return getOperatingRangeHighTemperature();
+		return this.getOperatingRangeHighTemperature();
 	}
 
 	/**
@@ -2611,8 +2646,9 @@ public double getMaxTemperature() {
 	 *
 	 * @see #getMaxTemperature()
 	 */
+	@Override
 	public double getMinTemperature() {
-		return getOperatingRangeLowTemperature();
+		return this.getOperatingRangeLowTemperature();
 	}
 
 	// --------
@@ -2635,32 +2671,34 @@ public double getMinTemperature() {
 	 * @throws OneWireException   on a communication or setup error with the 1-Wire
 	 *                            adapter
 	 */
+	@Override
 	public void doTemperatureConvert(byte[] state) throws OneWireIOException, OneWireException {
 
 		/* check for mission in progress */
-		if (getFlag(STATUS_REGISTER, MISSION_IN_PROGRESS_FLAG))
+		if (this.getFlag(STATUS_REGISTER, MISSION_IN_PROGRESS_FLAG)) {
 			throw new OneWireIOException("OneWireContainer21-Cant force " + "temperature read during a mission.");
+		}
 
 		/* get the temperature */
-		if (doSpeedEnable)
-			doSpeed(); // we aren't worried about how long this takes...we're sleeping for 750 ms!
-
-		adapter.reset();
+		if (this.doSpeedEnable) {
+			this.doSpeed(); // we aren't worried about how long this takes...we're sleeping for 750 ms!
+		}
 
-		if (adapter.select(address)) {
+		this.adapter.reset();
 
-			// perform the temperature conversion
-			adapter.putByte(CONVERT_TEMPERATURE_COMMAND);
+		if (!this.adapter.select(this.address)) {
+			throw new OneWireException("OneWireContainer21-Device not found!");
+		}
+		// perform the temperature conversion
+		this.adapter.putByte(CONVERT_TEMPERATURE_COMMAND);
 
-			try {
-				Thread.sleep(750);
-			} catch (InterruptedException e) {
-			}
+		try {
+			Thread.sleep(750);
+		} catch (InterruptedException e) {
+		}
 
-			// grab the temperature
-			state[0x11] = readByte(0x211);
-		} else
-			throw new OneWireException("OneWireContainer21-Device not found!");
+		// grab the temperature
+		state[0x11] = this.readByte(0x211);
 	}
 
 	// --------
@@ -2676,8 +2714,9 @@ public void doTemperatureConvert(byte[] state) throws OneWireIOException, OneWir
 	 * @return temperature in Celsius from the last
 	 *         <code>doTemperatureConvert()</code>
 	 */
+	@Override
 	public double getTemperature(byte[] state) {
-		return decodeTemperature(state[0x11]);
+		return this.decodeTemperature(state[0x11]);
 	}
 
 	/**
@@ -2693,11 +2732,12 @@ public double getTemperature(byte[] state) {
 	 * @see #hasTemperatureAlarms
 	 * @see #setTemperatureAlarm
 	 */
+	@Override
 	public double getTemperatureAlarm(int alarmType, byte[] state) {
-		if ((alarmType == TEMPERATURE_HIGH_ALARM) || (alarmType == ALARM_HIGH))
-			return decodeTemperature(state[0x0c]);
-		else
-			return decodeTemperature(state[0x0b]);
+		if (alarmType == TEMPERATURE_HIGH_ALARM || alarmType == ALARM_HIGH) {
+			return this.decodeTemperature(state[0x0c]);
+		}
+		return this.decodeTemperature(state[0x0b]);
 	}
 
 	/**
@@ -2712,8 +2752,9 @@ public double getTemperatureAlarm(int alarmType, byte[] state) {
 	 * @see #getTemperatureResolutions
 	 * @see #setTemperatureResolution
 	 */
+	@Override
 	public double getTemperatureResolution(byte[] state) {
-		return temperatureResolution;
+		return this.temperatureResolution;
 	}
 
 	// --------
@@ -2733,29 +2774,34 @@ public double getTemperatureResolution(byte[] state) {
 	 * @see #hasTemperatureAlarms
 	 * @see #getTemperatureAlarm
 	 */
+	@Override
 	public void setTemperatureAlarm(int alarmType, double alarmValue, byte[] state) {
-		double histogramLow = getHistogramLowTemperature();
-		double histogramHigh = getPhysicalRangeHighTemperature()
-				+ (getHistogramBinWidth() - getTemperatureResolution());
-		byte alarm = encodeTemperature(alarmValue);
+		var histogramLow = this.getHistogramLowTemperature();
+		var histogramHigh = this.getPhysicalRangeHighTemperature()
+				+ (this.getHistogramBinWidth() - this.getTemperatureResolution());
+		var alarm = this.encodeTemperature(alarmValue);
 
 		// take special care of top and bottom of temperature ranges for the different
 		// types of thermochrons.
-		if (isDS1921HZ) {
-			if (alarmValue < histogramLow)
+		if (this.isDS1921HZ) {
+			if (alarmValue < histogramLow) {
 				alarm = 0;
+			}
 
-			if (alarmValue > histogramHigh)
+			if (alarmValue > histogramHigh) {
 				alarm = (byte) 0xFF; // maximum value stand for the histogram high temperature
+			}
 		} else {
-			if (alarmValue < -40.0)
+			if (alarmValue < -40.0) {
 				alarm = 0;
+			}
 
-			if (alarmValue > 85.0)
+			if (alarmValue > 85.0) {
 				alarm = (byte) 0xfa; // maximum value stands for 85.0 C
+			}
 		}
 
-		if ((alarmType == TEMPERATURE_HIGH_ALARM) || (alarmType == ALARM_HIGH)) {
+		if (alarmType == TEMPERATURE_HIGH_ALARM || alarmType == ALARM_HIGH) {
 			state[0x0c] = alarm;
 		} else {
 			state[0x0b] = alarm;
@@ -2777,6 +2823,7 @@ public void setTemperatureAlarm(int alarmType, double alarmValue, byte[] state)
 	 * @see #getTemperatureResolution
 	 * @see #getTemperatureResolutions
 	 */
+	@Override
 	public void setTemperatureResolution(double resolution, byte[] state) throws OneWireException {
 		throw new OneWireException("Selectable Temperature Resolution Not Supported");
 	}
@@ -2798,6 +2845,7 @@ public void setTemperatureResolution(double resolution, byte[] state) throws One
 	 * @see #setClockAlarm(long,byte[])
 	 * @see #setClockAlarmEnable(boolean,byte[])
 	 */
+	@Override
 	public boolean hasClockAlarm() {
 		return true;
 	}
@@ -2810,6 +2858,7 @@ public boolean hasClockAlarm() {
 	 * @see #isClockRunning(byte[])
 	 * @see #setClockRunEnable(boolean,byte[])
 	 */
+	@Override
 	public boolean canDisableClock() {
 		return true;
 	}
@@ -2819,6 +2868,7 @@ public boolean canDisableClock() {
 	 *
 	 * @return the clock resolution in milliseconds
 	 */
+	@Override
 	public long getClockResolution() {
 		return 1000;
 	}
@@ -2838,17 +2888,18 @@ public long getClockResolution() {
 	 * @see com.dalsemi.onewire.container.OneWireSensor#readDevice()
 	 * @see #setClock(long,byte[])
 	 */
+	@Override
 	public long getClock(byte[] state) {
 
 		/* grab the time (at location 200, date at 204) */
-		int[] time = getTime(0x200, state);
-		int[] date = getDate(0x204, state);
+		var time = this.getTime(0x200, state);
+		var date = this.getDate(0x204, state);
 
 		// date[1] - 1 because Java months are 0 offset
 		// date[0] - 1900 because Java years are from 1900
 		// Date d = new Date(date[0]-1900, date[1]-1, date[2], time[2], time[1],
 		// time[0]);
-		Calendar result = Calendar.getInstance();
+		var result = Calendar.getInstance();
 		result.set(Calendar.YEAR, date[0]);
 		result.set(Calendar.MONTH, date[1] - 1);
 		result.set(Calendar.DATE, date[2]);
@@ -2880,11 +2931,12 @@ public long getClock(byte[] state) {
 	 * @see #setClockAlarm(long,byte[])
 	 * @see #setClockAlarmEnable(boolean,byte[])
 	 */
+	@Override
 	public long getClockAlarm(byte[] state) {
 
 		// first get the normal real time clock
-		int[] time = getTime(0x200, state);
-		int[] date = getDate(0x204, state);
+		var time = this.getTime(0x200, state);
+		var date = this.getDate(0x204, state);
 
 		// date[0] = year
 		// date[1] = month
@@ -2893,7 +2945,7 @@ public long getClockAlarm(byte[] state) {
 		// time[1] = minute
 		// time[0] = second
 		// date[1] - 1 because Java does funky months from offset 0
-		Calendar c = Calendar.getInstance();
+		var c = Calendar.getInstance();
 		c.set(Calendar.YEAR, date[0]);
 		c.set(Calendar.MONTH, date[1] - 1);
 		c.set(Calendar.DATE, date[2]);
@@ -2906,41 +2958,44 @@ public long getClockAlarm(byte[] state) {
 		// time [2], time [1], time [0]);
 
 		// get the seconds into the day we are at
-		int time_into_day = time[0] + 60 * time[1] + 60 * 60 * time[2];
+		var time_into_day = time[0] + 60 * time[1] + 60 * 60 * time[2];
 
 		// now lets get the alarm specs
-		int[] a_time = getTime(0x207, state);
+		var a_time = this.getTime(0x207, state);
 
 		// get the seconds into the day the alarm is at
-		int a_time_into_day = a_time[0] + 60 * a_time[1] + 60 * 60 * a_time[2];
+		var a_time_into_day = a_time[0] + 60 * a_time[1] + 60 * 60 * a_time[2];
 
 		// now put the day of the week in there
-		byte dayOfWeek = (byte) (state[0x0A] & 0x07);
+		var dayOfWeek = (byte) (state[0x0A] & 0x07);
 
-		if (dayOfWeek == 0)
+		if (dayOfWeek == 0) {
 			dayOfWeek++;
+		}
 
-		byte MS = (byte) ((state[0x07] >>> 7) & 0x01);
-		byte MM = (byte) ((state[0x08] >>> 7) & 0x01);
-		byte MH = (byte) ((state[0x09] >>> 7) & 0x01);
-		byte MD = (byte) ((state[0x0A] >>> 7) & 0x01);
+		var MS = (byte) (state[0x07] >>> 7 & 0x01);
+		var MM = (byte) (state[0x08] >>> 7 & 0x01);
+		var MH = (byte) (state[0x09] >>> 7 & 0x01);
+		var MD = (byte) (state[0x0A] >>> 7 & 0x01);
 
-		long temp_time = 0;
-		int MILLIS_PER_DAY = 1000 * 60 * 60 * 24;
+		var temp_time = 0L;
+		var MILLIS_PER_DAY = 1000 * 60 * 60 * 24;
 
 		switch (MS + MM + MH + MD) {
 		case 4: // ONCE_PER_SECOND
 			c.add(Calendar.SECOND, 1);
 			break;
 		case 3: // ONCE_PER_MINUTE
-			if (!(a_time_into_day < time_into_day)) // alarm has occurred
+			if (!(a_time_into_day < time_into_day)) {
 				c.add(Calendar.MINUTE, 1);
+			}
 
 			c.set(Calendar.SECOND, a_time[0]);
 			break;
 		case 2: // ONCE_PER_HOUR
-			if (!(a_time_into_day < time_into_day)) // alarm has occurred
+			if (!(a_time_into_day < time_into_day)) {
 				c.add(Calendar.HOUR_OF_DAY, 1); // will occur again next hour
+			}
 
 			c.set(Calendar.SECOND, a_time[0]);
 			c.set(Calendar.MINUTE, a_time[1]);
@@ -2950,8 +3005,9 @@ public long getClockAlarm(byte[] state) {
 			c.set(Calendar.MINUTE, a_time[1]);
 			c.set(Calendar.HOUR_OF_DAY, a_time[2]);
 
-			if ((a_time_into_day < time_into_day)) // alarm has occurred
+			if (a_time_into_day < time_into_day) {
 				c.add(Calendar.DATE, 1); // will occur again tomorrow
+			}
 			break;
 		default:
 		case 0: // ONCE_PER_WEEK
@@ -2964,12 +3020,12 @@ public long getClockAlarm(byte[] state) {
 			/*
 			 * oh no!!! TINI doesn't like calls to Calendar.roll() and Calendar.add()! we
 			 * could be stuck here forever!
-			 * 
+			 *
 			 * if (dayOfWeek == c.get(c.DAY_OF_WEEK)) {
-			 * 
+			 *
 			 * //has alarm already occurred today? if ((a_time_into_day < time_into_day))
 			 * //alarm has occurred c.add(c.DATE, 7); //will occur again next week } else {
-			 * 
+			 *
 			 * //roll the day of the week until it matches while (dayOfWeek !=
 			 * c.get(c.DAY_OF_WEEK)) c.roll(c.DATE, true); }
 			 */
@@ -2978,14 +3034,15 @@ public long getClockAlarm(byte[] state) {
 			if (dayOfWeek == c.get(Calendar.DAY_OF_WEEK)) {
 
 				// has alarm already occurred today?
-				if ((a_time_into_day < time_into_day)) // alarm has occurred
-					temp_time += (7 * MILLIS_PER_DAY); // will occur again next week
+				if (a_time_into_day < time_into_day) {
+					temp_time += 7 * MILLIS_PER_DAY; // will occur again next week
+				}
 			} else {
 
 				// roll the day of the week until it matches
-				int cdayofweek = c.get(Calendar.DAY_OF_WEEK);
+				var cdayofweek = c.get(Calendar.DAY_OF_WEEK);
 
-				while ((dayOfWeek % 7) != (cdayofweek++ % 7)) {
+				while (dayOfWeek % 7 != cdayofweek++ % 7) {
 					temp_time += MILLIS_PER_DAY;
 				}
 				// c.roll(c.DATE, true);
@@ -3013,8 +3070,9 @@ public long getClockAlarm(byte[] state) {
 	 * @see #setClockAlarm(long,byte[])
 	 * @see #setClockAlarmEnable(boolean,byte[])
 	 */
+	@Override
 	public boolean isClockAlarming(byte[] state) {
-		return ((state[STATUS_REGISTER & 31] & TIMER_ALARM) != 0);
+		return (state[STATUS_REGISTER & 31] & TIMER_ALARM) != 0;
 	}
 
 	/**
@@ -3032,8 +3090,9 @@ public boolean isClockAlarming(byte[] state) {
 	 * @see #setClockAlarm(long,byte[])
 	 * @see #setClockAlarmEnable(boolean,byte[])
 	 */
+	@Override
 	public boolean isClockAlarmEnabled(byte[] state) {
-		return ((state[CONTROL_REGISTER & 31] & TIMER_ALARM_SEARCH_FLAG) != 0);
+		return (state[CONTROL_REGISTER & 31] & TIMER_ALARM_SEARCH_FLAG) != 0;
 	}
 
 	/**
@@ -3049,10 +3108,11 @@ public boolean isClockAlarmEnabled(byte[] state) {
 	 * @see #canDisableClock()
 	 * @see #setClockRunEnable(boolean,byte[])
 	 */
+	@Override
 	public boolean isClockRunning(byte[] state) {
 
 		// checks for equal to 0 since active low means clock is running
-		return ((state[CONTROL_REGISTER & 31] & OSCILLATOR_ENABLE_FLAG) == 0);
+		return (state[CONTROL_REGISTER & 31] & OSCILLATOR_ENABLE_FLAG) == 0;
 	}
 
 	// --------
@@ -3072,19 +3132,20 @@ public boolean isClockRunning(byte[] state) {
 	 * @see com.dalsemi.onewire.container.OneWireSensor#writeDevice(byte[])
 	 * @see #getClock(byte[])
 	 */
+	@Override
 	public void setClock(long time, byte[] state) {
-		Date x = new Date(time);
-		Calendar d = Calendar.getInstance();
+		var x = new Date(time);
+		var d = Calendar.getInstance();
 
 		// removed by SH - not J2ME-compliant
 		// Calendar d = new GregorianCalendar();
 
 		d.setTime(x);
-		setTime(0x200, d.get(Calendar.HOUR_OF_DAY), d.get(Calendar.MINUTE), d.get(Calendar.SECOND), false, state);
-		setDate(d.get(Calendar.YEAR), d.get(Calendar.MONTH) + 1, d.get(Calendar.DATE), state);
+		this.setTime(0x200, d.get(Calendar.HOUR_OF_DAY), d.get(Calendar.MINUTE), d.get(Calendar.SECOND), false, state);
+		this.setDate(d.get(Calendar.YEAR), d.get(Calendar.MONTH) + 1, d.get(Calendar.DATE), state);
 
 		synchronized (this) {
-			updatertc = true;
+			this.updatertc = true;
 		}
 	}
 
@@ -3109,6 +3170,7 @@ public void setClock(long time, byte[] state) {
 	 * @see #isClockAlarming(byte[])
 	 * @see #setClockAlarmEnable(boolean,byte[])
 	 */
+	@Override
 	public void setClockAlarm(long time, byte[] state) throws OneWireException {
 
 		// can't do this because we need more info on the alarm
@@ -3131,10 +3193,11 @@ public void setClockAlarm(long time, byte[] state) throws OneWireException {
 	 * @see #canDisableClock()
 	 * @see #isClockRunning(byte[])
 	 */
+	@Override
 	public void setClockRunEnable(boolean runEnable, byte[] state) {
 
 		// the oscillator enable is active low
-		setFlag(CONTROL_REGISTER, OSCILLATOR_ENABLE_FLAG, !runEnable, state);
+		this.setFlag(CONTROL_REGISTER, OSCILLATOR_ENABLE_FLAG, !runEnable, state);
 	}
 
 	/**
@@ -3155,7 +3218,8 @@ public void setClockRunEnable(boolean runEnable, byte[] state) {
 	 * @see #setClockAlarm(long,byte[])
 	 * @see #isClockAlarming(byte[])
 	 */
+	@Override
 	public void setClockAlarmEnable(boolean alarmEnable, byte[] state) {
-		setFlag(CONTROL_REGISTER, TIMER_ALARM_SEARCH_FLAG, alarmEnable, state);
+		this.setFlag(CONTROL_REGISTER, TIMER_ALARM_SEARCH_FLAG, alarmEnable, state);
 	}
 }
diff --git a/io.openems.edge.bridge.onewire/src/com/dalsemi/onewire/container/OneWireContainer22.java b/io.openems.edge.bridge.onewire/src/com/dalsemi/onewire/container/OneWireContainer22.java
index f31884f8429..d4b89cc2312 100644
--- a/io.openems.edge.bridge.onewire/src/com/dalsemi/onewire/container/OneWireContainer22.java
+++ b/io.openems.edge.bridge.onewire/src/com/dalsemi/onewire/container/OneWireContainer22.java
@@ -96,7 +96,6 @@ public class OneWireContainer22 extends OneWireContainer28 implements Temperatur
 	 * @see #OneWireContainer22(DSPortAdapter,String)
 	 */
 	public OneWireContainer22() {
-		super();
 	}
 
 	/**
@@ -173,6 +172,7 @@ public OneWireContainer22(DSPortAdapter sourceAdapter, String newAddress) {
 	 *
 	 * @return this <code>OneWireContainer22</code> name
 	 */
+	@Override
 	public String getName() {
 		return "DS1822";
 	}
@@ -184,6 +184,7 @@ public String getName() {
 	 *
 	 * @return this <code>OneWireContainer22</code> alternate names
 	 */
+	@Override
 	public String getAlternateNames() {
 		return "";
 	}
@@ -194,6 +195,7 @@ public String getAlternateNames() {
 	 *
 	 * @return <code>OneWireContainer22</code> functional description
 	 */
+	@Override
 	public String getDescription() {
 		return "Digital thermometer measures temperatures from " + "-55C to 125C in 0.75 seconds (max).  +/- 2C "
 				+ "accuracy between -10C and 85C. Thermometer "
diff --git a/io.openems.edge.bridge.onewire/src/com/dalsemi/onewire/container/OneWireContainer23.java b/io.openems.edge.bridge.onewire/src/com/dalsemi/onewire/container/OneWireContainer23.java
index bcd09221062..dedc4cd3fd0 100644
--- a/io.openems.edge.bridge.onewire/src/com/dalsemi/onewire/container/OneWireContainer23.java
+++ b/io.openems.edge.bridge.onewire/src/com/dalsemi/onewire/container/OneWireContainer23.java
@@ -46,7 +46,7 @@
  * portable memory device. The 1-Wire Chip version is used for small
  * non-volatile storage.
  * </P>
- * 
+ *
  * <H3>Features</H3>
  * <UL>
  * <LI>4096 bits (512 bytes) Electrically Erasable Programmable Read Only Memory
@@ -59,19 +59,19 @@
  * -40@htmlonly &#176C @endhtmlonly to +85@htmlonly &#176C @endhtmlonly
  * environments
  * </UL>
- * 
+ *
  * <H3>Alternate Names</H3>
  * <UL>
  * <LI>DS2433
  * </UL>
  *
  * <H3>Memory</H3>
- * 
+ *
  * <P>
  * The memory can be accessed through the objects that are returned from the
  * {@link #getMemoryBanks() getMemoryBanks} method.
  * </P>
- * 
+ *
  * The following is a list of the MemoryBank instances that are returned:
  *
  * <UL>
@@ -96,9 +96,9 @@
  * payload
  * </UL>
  * </UL>
- * 
+ *
  * <H3>Usage</H3>
- * 
+ *
  * <DL>
  * <DD>See the usage example in
  * {@link com.dalsemi.onewire.container.OneWireContainer OneWireContainer} to
@@ -115,11 +115,11 @@
  * <DD><A HREF="http://pdfserv.maxim-ic.com/arpdf/DS2433.pdf">
  * http://pdfserv.maxim-ic.com/arpdf/DS2433.pdf</A>
  * </DL>
- * 
+ *
  * @see com.dalsemi.onewire.container.MemoryBank
  * @see com.dalsemi.onewire.container.PagedMemoryBank
  * @see com.dalsemi.onewire.container.OneWireContainer14
- * 
+ *
  * @version 0.00, 28 Aug 2000
  * @author DS
  */
@@ -141,7 +141,6 @@ public class OneWireContainer23 extends OneWireContainer {
 	 *      super.setupContainer()
 	 */
 	public OneWireContainer23() {
-		super();
 	}
 
 	/**
@@ -213,6 +212,7 @@ public OneWireContainer23(DSPortAdapter sourceAdapter, String newAddress) {
 	 *
 	 * @return iButton or 1-Wire device name
 	 */
+	@Override
 	public String getName() {
 		return "DS1973";
 	}
@@ -224,6 +224,7 @@ public String getName() {
 	 *
 	 * @return 1-Wire device alternate names
 	 */
+	@Override
 	public String getAlternateNames() {
 		return "DS2433";
 	}
@@ -234,6 +235,7 @@ public String getAlternateNames() {
 	 *
 	 * @return device description
 	 */
+	@Override
 	public String getDescription() {
 		return "4096 bit Electrically Erasable Programmable Read Only Memory "
 				+ "(EEPROM) organized as sixteen pages of 256 bits.";
@@ -253,6 +255,7 @@ public String getDescription() {
 	 * @see com.dalsemi.onewire.adapter.DSPortAdapter#SPEED_FLEX
 	 *      DSPortAdapter.SPEED_FLEX
 	 */
+	@Override
 	public int getMaxSpeed() {
 		return DSPortAdapter.SPEED_OVERDRIVE;
 	}
@@ -263,18 +266,19 @@ public int getMaxSpeed() {
 	 * MemoryBank}, {@link com.dalsemi.onewire.container.PagedMemoryBank
 	 * PagedMemoryBank}, and {@link com.dalsemi.onewire.container.OTPMemoryBank
 	 * OTPMemoryBank}.
-	 * 
+	 *
 	 * @return <CODE>Enumeration</CODE> of memory banks
 	 */
+	@Override
 	public Enumeration<MemoryBank> getMemoryBanks() {
-		Vector<MemoryBank> bank_vector = new Vector<>(2);
+		var bank_vector = new Vector<MemoryBank>(2);
 
 		// scratchpad
-		MemoryBankScratchEE mbScratch = new MemoryBankScratchEE(this);
+		var mbScratch = new MemoryBankScratchEE(this);
 		bank_vector.addElement(mbScratch);
 
 		// EEPROM
-		MemoryBankNV mbNV = new MemoryBankNV(this, mbScratch);
+		var mbNV = new MemoryBankNV(this, mbScratch);
 		mbNV.powerDelivery = true;
 
 		bank_vector.addElement(mbNV);
diff --git a/io.openems.edge.bridge.onewire/src/com/dalsemi/onewire/container/OneWireContainer24.java b/io.openems.edge.bridge.onewire/src/com/dalsemi/onewire/container/OneWireContainer24.java
index 091aaf0af47..ce0fc5e602d 100644
--- a/io.openems.edge.bridge.onewire/src/com/dalsemi/onewire/container/OneWireContainer24.java
+++ b/io.openems.edge.bridge.onewire/src/com/dalsemi/onewire/container/OneWireContainer24.java
@@ -154,7 +154,6 @@ public class OneWireContainer24 extends OneWireContainer implements ClockContain
 	 *      super.setupContainer()
 	 */
 	public OneWireContainer24() {
-		super();
 	}
 
 	/**
@@ -226,6 +225,7 @@ public OneWireContainer24(DSPortAdapter sourceAdapter, String newAddress) {
 	 *
 	 * @return iButton or 1-Wire device name
 	 */
+	@Override
 	public String getName() {
 		return "DS2415";
 	}
@@ -237,6 +237,7 @@ public String getName() {
 	 *
 	 * @return 1-Wire device alternate names
 	 */
+	@Override
 	public String getAlternateNames() {
 		return "DS1904";
 	}
@@ -247,6 +248,7 @@ public String getAlternateNames() {
 	 *
 	 * @return device description
 	 */
+	@Override
 	public String getDescription() {
 		return "Real time clock implemented as a binary counter " + "that can be used to add functions such as "
 				+ "calendar, time and date stamp and logbook to any "
@@ -268,6 +270,7 @@ public String getDescription() {
 	 * @see #setClockAlarm(long,byte[])
 	 * @see #setClockAlarmEnable(boolean,byte[])
 	 */
+	@Override
 	public boolean hasClockAlarm() {
 		return false;
 	}
@@ -280,6 +283,7 @@ public boolean hasClockAlarm() {
 	 * @see #isClockRunning(byte[])
 	 * @see #setClockRunEnable(boolean,byte[])
 	 */
+	@Override
 	public boolean canDisableClock() {
 		return true;
 	}
@@ -289,6 +293,7 @@ public boolean canDisableClock() {
 	 *
 	 * @return the clock resolution in milliseconds
 	 */
+	@Override
 	public long getClockResolution() {
 		return 1000;
 	}
@@ -311,18 +316,19 @@ public long getClockResolution() {
 	 * @throws OneWireException   on a communication or setup error with the 1-Wire
 	 *                            adapter
 	 */
+	@Override
 	public byte[] readDevice() throws OneWireIOException, OneWireException {
-		byte[] state = new byte[5];
-		if (adapter.select(address)) {
+		var state = new byte[5];
+		if (this.adapter.select(this.address)) {
 			// send out the read clock command
 			// first write the command to the 1-wire bus
-			adapter.putByte(READ_CLOCK_COMMAND);
+			this.adapter.putByte(READ_CLOCK_COMMAND);
 			// now grab the five bytes
-			adapter.getBlock(state, 0, 5);
+			this.adapter.getBlock(state, 0, 5);
 			return state;
-		} else
-			// failed to get a match
-			throw new OneWireIOException("Device not found on 1-Wire Network");
+		}
+		// failed to get a match
+		throw new OneWireIOException("Device not found on 1-Wire Network");
 	}
 
 	/**
@@ -340,23 +346,27 @@ public byte[] readDevice() throws OneWireIOException, OneWireException {
 	 * @throws OneWireException   on a communication or setup error with the 1-Wire
 	 *                            adapter
 	 */
+	@Override
 	public void writeDevice(byte[] state) throws OneWireIOException, OneWireException {
-		if (adapter.select(address)) {
-			byte[] writeblock = new byte[6];
-			writeblock[0] = WRITE_CLOCK_COMMAND;
-			System.arraycopy(state, 0, writeblock, 1, 5);
-			// send the write clock command with the five bytes appended
-			adapter.dataBlock(writeblock, 0, 6);
+		if (!this.adapter.select(this.address)) {
+			throw new OneWireIOException("Device not found on one-wire network");
+		}
+		var writeblock = new byte[6];
+		writeblock[0] = WRITE_CLOCK_COMMAND;
+		System.arraycopy(state, 0, writeblock, 1, 5);
+		// send the write clock command with the five bytes appended
+		this.adapter.dataBlock(writeblock, 0, 6);
 
-			// double check by reading the clock bytes back
-			byte[] readblock = readDevice();
-			if ((readblock[0] & 0x0C) != (state[0] & 0x0C))
+		// double check by reading the clock bytes back
+		var readblock = this.readDevice();
+		if ((readblock[0] & 0x0C) != (state[0] & 0x0C)) {
+			throw new OneWireIOException("Failed to write to the clock register page");
+		}
+		for (var i = 1; i < 5; i++) {
+			if (readblock[i] != state[i]) {
 				throw new OneWireIOException("Failed to write to the clock register page");
-			for (int i = 1; i < 5; i++)
-				if (readblock[i] != state[i])
-					throw new OneWireIOException("Failed to write to the clock register page");
-		} else
-			throw new OneWireIOException("Device not found on one-wire network");
+			}
+		}
 	}
 
 	// --------
@@ -375,6 +385,7 @@ public void writeDevice(byte[] state) throws OneWireIOException, OneWireExceptio
 	 * @see com.dalsemi.onewire.container.OneWireSensor#readDevice()
 	 * @see #setClock(long,byte[])
 	 */
+	@Override
 	public long getClock(byte[] state) {
 		return Convert.toLong(state, RTC_OFFSET, 4) * 1000;
 	}
@@ -396,6 +407,7 @@ public long getClock(byte[] state) {
 	 * @see #setClockAlarm(long,byte[])
 	 * @see #setClockAlarmEnable(boolean,byte[])
 	 */
+	@Override
 	public long getClockAlarm(byte[] state) throws OneWireException {
 		throw new OneWireException("This device does not support clock alarms.");
 	}
@@ -416,6 +428,7 @@ public long getClockAlarm(byte[] state) throws OneWireException {
 	 * @see #setClockAlarm(long,byte[])
 	 * @see #setClockAlarmEnable(boolean,byte[])
 	 */
+	@Override
 	public boolean isClockAlarming(byte[] state) {
 		return false;
 	}
@@ -435,6 +448,7 @@ public boolean isClockAlarming(byte[] state) {
 	 * @see #setClockAlarm(long,byte[])
 	 * @see #setClockAlarmEnable(boolean,byte[])
 	 */
+	@Override
 	public boolean isClockAlarmEnabled(byte[] state) {
 		return false;
 	}
@@ -452,8 +466,9 @@ public boolean isClockAlarmEnabled(byte[] state) {
 	 * @see #canDisableClock()
 	 * @see #setClockRunEnable(boolean,byte[])
 	 */
+	@Override
 	public boolean isClockRunning(byte[] state) {
-		return (Bit.arrayReadBit(3, CONTROL_OFFSET, state) == 1);
+		return Bit.arrayReadBit(3, CONTROL_OFFSET, state) == 1;
 	}
 
 	// --------
@@ -473,8 +488,9 @@ public boolean isClockRunning(byte[] state) {
 	 * @see com.dalsemi.onewire.container.OneWireSensor#writeDevice(byte[])
 	 * @see #getClock(byte[])
 	 */
+	@Override
 	public void setClock(long time, byte[] state) {
-		Convert.toByteArray((time / 1000L), state, RTC_OFFSET, 4);
+		Convert.toByteArray(time / 1000L, state, RTC_OFFSET, 4);
 	}
 
 	/**
@@ -498,6 +514,7 @@ public void setClock(long time, byte[] state) {
 	 * @see #isClockAlarming(byte[])
 	 * @see #setClockAlarmEnable(boolean,byte[])
 	 */
+	@Override
 	public void setClockAlarm(long time, byte[] state) throws OneWireException {
 		throw new OneWireException("This device does not support clock alarms.");
 	}
@@ -523,6 +540,7 @@ public void setClockAlarm(long time, byte[] state) throws OneWireException {
 	 * @see #setClockAlarm(long,byte[])
 	 * @see #isClockAlarming(byte[])
 	 */
+	@Override
 	public void setClockAlarmEnable(boolean alarmEnable, byte[] state) throws OneWireException {
 		throw new OneWireException("This device does not support clock alarms.");
 	}
@@ -544,6 +562,7 @@ public void setClockAlarmEnable(boolean alarmEnable, byte[] state) throws OneWir
 	 * @see #canDisableClock()
 	 * @see #isClockRunning(byte[])
 	 */
+	@Override
 	public void setClockRunEnable(boolean runEnable, byte[] state) {
 		/* When writing oscillator enable, both bits should have identical data. */
 		Bit.arrayWriteBit(runEnable ? 1 : 0, 3, CONTROL_OFFSET, state);
diff --git a/io.openems.edge.bridge.onewire/src/com/dalsemi/onewire/container/OneWireContainer26.java b/io.openems.edge.bridge.onewire/src/com/dalsemi/onewire/container/OneWireContainer26.java
index cf4264d4c2d..5f62fc9095f 100644
--- a/io.openems.edge.bridge.onewire/src/com/dalsemi/onewire/container/OneWireContainer26.java
+++ b/io.openems.edge.bridge.onewire/src/com/dalsemi/onewire/container/OneWireContainer26.java
@@ -62,7 +62,7 @@
  * value is also the maximum voltage that part can report.
  * </P>
  *
- * 
+ *
  * <H3>DataSheet</H3>
  * <DL>
  * <DD>http://pdfserv.maxim-ic.com/arpdf/DS2438.pdf (not active yet,
@@ -170,7 +170,6 @@ public class OneWireContainer26 extends OneWireContainer
 	 * Default constructor
 	 */
 	public OneWireContainer26() {
-		super();
 	}
 
 	/**
@@ -215,17 +214,18 @@ public OneWireContainer26(DSPortAdapter sourceAdapter, String newAddress) {
 	 * MemoryBank}, {@link com.dalsemi.onewire.container.PagedMemoryBank
 	 * PagedMemoryBank}, and {@link com.dalsemi.onewire.container.OTPMemoryBank
 	 * OTPMemoryBank}.
-	 * 
+	 *
 	 * @return <CODE>Enumeration</CODE> of memory banks
 	 */
+	@Override
 	public Enumeration<MemoryBank> getMemoryBanks() {
-		Vector<MemoryBank> bank_vector = new Vector<>(8);
+		var bank_vector = new Vector<MemoryBank>(8);
 
 		// Status
 		bank_vector.addElement(new MemoryBankSBM(this));
 
 		// Temp/Volt/Current
-		MemoryBankSBM temp = new MemoryBankSBM(this);
+		var temp = new MemoryBankSBM(this);
 		temp.bankDescription = "Temperature/Voltage/Current";
 		temp.generalPurposeMemory = false;
 		temp.startPhysicalAddress = 1;
@@ -318,6 +318,7 @@ public Enumeration<MemoryBank> getMemoryBanks() {
 	 * @return representation of this 1-Wire device's name
 	 *
 	 */
+	@Override
 	public String getName() {
 		return "DS2438";
 	}
@@ -328,6 +329,7 @@ public String getName() {
 	 *
 	 * @return representation of the alternate name(s)
 	 */
+	@Override
 	public String getAlternateNames() {
 		return "Smart Battery Monitor";
 	}
@@ -337,6 +339,7 @@ public String getAlternateNames() {
 	 *
 	 * @return representation of the functional description
 	 */
+	@Override
 	public String getDescription() {
 		return "1-Wire device that integrates the total current charging or "
 				+ "discharging through a battery and stores it in a register. "
@@ -353,7 +356,7 @@ public String getDescription() {
 	 * @param resistance Value of the sense resistor in Ohms.
 	 */
 	public synchronized void setSenseResistor(double resistance) {
-		Rsens = resistance;
+		this.Rsens = resistance;
 	}
 
 	/**
@@ -363,7 +366,7 @@ public synchronized void setSenseResistor(double resistance) {
 	 * @return currently stored value of the sense resistor in Ohms
 	 */
 	public double getSenseResistor() {
-		return Rsens;
+		return this.Rsens;
 	}
 
 	/**
@@ -382,7 +385,7 @@ public double getSenseResistor() {
 	 * @see OneWireContainer#doSpeed()
 	 */
 	public synchronized void setSpeedCheck(boolean doSpeedCheck) {
-		doSpeedEnable = doSpeedCheck;
+		this.doSpeedEnable = doSpeedCheck;
 	}
 
 	/**
@@ -397,48 +400,51 @@ public synchronized void setSpeedCheck(boolean doSpeedCheck) {
 	 * @throws IllegalArgumentException Bad parameters passed
 	 */
 	public byte[] readPage(int page) throws OneWireIOException, OneWireException, IllegalArgumentException {
-		byte[] buffer = new byte[11];
-		byte[] result = new byte[8];
+		var buffer = new byte[11];
+		var result = new byte[8];
 		int crc8; // this device uses a crc 8
 
 		/* check validity of parameter */
-		if ((page < 0) || (page > 7))
+		if (page < 0 || page > 7) {
 			throw new IllegalArgumentException("OneWireContainer26-Page " + page + " is an invalid page.");
+		}
 
 		/* perform the read/verification */
-		if (doSpeedEnable)
-			doSpeed();
-
-		if (adapter.select(address)) {
+		if (this.doSpeedEnable) {
+			this.doSpeed();
+		}
 
-			/* recall memory to the scratchpad */
-			buffer[0] = RECALL_MEMORY_COMMAND;
-			buffer[1] = (byte) page;
+		if (!this.adapter.select(this.address)) {
+			throw new OneWireException("OneWireContainer26-device not found.");
+		}
+		/* recall memory to the scratchpad */
+		buffer[0] = RECALL_MEMORY_COMMAND;
+		buffer[1] = (byte) page;
 
-			adapter.dataBlock(buffer, 0, 2);
+		this.adapter.dataBlock(buffer, 0, 2);
 
-			/* perform the read scratchpad */
-			adapter.reset();
-			adapter.select(address);
+		/* perform the read scratchpad */
+		this.adapter.reset();
+		this.adapter.select(this.address);
 
-			buffer[0] = READ_SCRATCHPAD_COMMAND;
-			buffer[1] = (byte) page;
+		buffer[0] = READ_SCRATCHPAD_COMMAND;
+		buffer[1] = (byte) page;
 
-			for (int i = 2; i < 11; i++)
-				buffer[i] = (byte) 0x0ff;
+		for (var i = 2; i < 11; i++) {
+			buffer[i] = (byte) 0x0ff;
+		}
 
-			adapter.dataBlock(buffer, 0, 11);
+		this.adapter.dataBlock(buffer, 0, 11);
 
-			/* do the crc check */
-			crc8 = CRC8.compute(buffer, 2, 9);
+		/* do the crc check */
+		crc8 = CRC8.compute(buffer, 2, 9);
 
-			if (crc8 != 0x0)
-				throw new OneWireIOException("OneWireContainer26-Bad CRC during read." + crc8);
+		if (crc8 != 0x0) {
+			throw new OneWireIOException("OneWireContainer26-Bad CRC during read." + crc8);
+		}
 
-			// copy the data into the result
-			System.arraycopy(buffer, 2, result, 0, 8);
-		} else
-			throw new OneWireException("OneWireContainer26-device not found.");
+		// copy the data into the result
+		System.arraycopy(buffer, 2, result, 0, 8);
 
 		return result;
 	}
@@ -457,37 +463,39 @@ public byte[] readPage(int page) throws OneWireIOException, OneWireException, Il
 	 * @throws IllegalArgumentException Bad parameters passed
 	 */
 	public void writePage(int page, byte[] source, int offset) throws OneWireIOException, OneWireException {
-		byte[] buffer = new byte[10];
+		var buffer = new byte[10];
 
 		/* check parameter validity */
-		if ((page < 0) || (page > 7))
+		if (page < 0 || page > 7) {
 			throw new IllegalArgumentException("OneWireContainer26-Page " + page + " is an invalid page.");
+		}
 
-		if (source.length < 8)
+		if (source.length < 8) {
 			throw new IllegalArgumentException("OneWireContainer26-Invalid data page passed to writePage.");
+		}
 
-		if (doSpeedEnable)
-			doSpeed();
-
-		if (adapter.select(address)) {
+		if (this.doSpeedEnable) {
+			this.doSpeed();
+		}
 
-			// write the page to the scratchpad first
-			buffer[0] = WRITE_SCRATCHPAD_COMMAND;
-			buffer[1] = (byte) page;
+		if (!this.adapter.select(this.address)) {
+			throw new OneWireException("OneWireContainer26-Device not found.");
+		}
+		// write the page to the scratchpad first
+		buffer[0] = WRITE_SCRATCHPAD_COMMAND;
+		buffer[1] = (byte) page;
 
-			System.arraycopy(source, offset, buffer, 2, 8);
-			adapter.dataBlock(buffer, 0, 10);
+		System.arraycopy(source, offset, buffer, 2, 8);
+		this.adapter.dataBlock(buffer, 0, 10);
 
-			// now copy that part of the scratchpad to memory
-			adapter.reset();
-			adapter.select(address);
+		// now copy that part of the scratchpad to memory
+		this.adapter.reset();
+		this.adapter.select(this.address);
 
-			buffer[0] = COPY_SCRATCHPAD_COMMAND;
-			buffer[1] = (byte) page;
+		buffer[0] = COPY_SCRATCHPAD_COMMAND;
+		buffer[1] = (byte) page;
 
-			adapter.dataBlock(buffer, 0, 2);
-		} else
-			throw new OneWireException("OneWireContainer26-Device not found.");
+		this.adapter.dataBlock(buffer, 0, 2);
 	}
 
 	/**
@@ -505,10 +513,11 @@ public void writePage(int page, byte[] source, int offset) throws OneWireIOExcep
 	 * @throws IllegalArgumentException Bad parameters passed
 	 */
 	public boolean getFlag(byte flagToGet) throws OneWireIOException, OneWireException, IllegalArgumentException {
-		byte[] data = readPage(0);
+		var data = this.readPage(0);
 
-		if ((data[0] & flagToGet) != 0)
+		if ((data[0] & flagToGet) != 0) {
 			return true;
+		}
 
 		return false;
 	}
@@ -527,14 +536,15 @@ public boolean getFlag(byte flagToGet) throws OneWireIOException, OneWireExcepti
 	 */
 	public void setFlag(byte flagToSet, boolean flagValue)
 			throws OneWireIOException, OneWireException, IllegalArgumentException {
-		byte[] data = readPage(0);
+		var data = this.readPage(0);
 
-		if (flagValue)
+		if (flagValue) {
 			data[0] = (byte) (data[0] | flagToSet);
-		else
-			data[0] = (byte) (data[0] & ~(flagToSet));
+		} else {
+			data[0] = (byte) (data[0] & ~flagToSet);
+		}
 
-		writePage(0, data, 0);
+		this.writePage(0, data, 0);
 	}
 
 	/**
@@ -546,9 +556,9 @@ public void setFlag(byte flagToSet, boolean flagValue)
 	 * @return current value in Amperes
 	 */
 	public double getCurrent(byte[] state) {
-		short rawCurrent = (short) ((state[6] << 8) | (state[5] & 0x0ff));
+		var rawCurrent = (short) (state[6] << 8 | state[5] & 0x0ff);
 
-		return rawCurrent / (4096.0 * Rsens);
+		return rawCurrent / (4096.0 * this.Rsens);
 	}
 
 	/**
@@ -561,9 +571,9 @@ public double getCurrent(byte[] state) {
 	 * @throws IllegalArgumentException Bad parameters passed
 	 */
 	public double getRemainingCapacity() throws OneWireIOException, OneWireException, IllegalArgumentException {
-		int ica = getICA();
+		var ica = this.getICA();
 
-		return (1000 * ica / (2048 * Rsens));
+		return 1000 * ica / (2048 * this.Rsens);
 	}
 
 	/**
@@ -581,8 +591,9 @@ public double getRemainingCapacity() throws OneWireIOException, OneWireException
 	public boolean isCharging(byte[] state) throws OneWireIOException, OneWireException, IllegalArgumentException {
 
 		// positive current (if the thing is hooked up right) is charging
-		if (getCurrent(state) > 0)
+		if (this.getCurrent(state) > 0) {
 			return true;
+		}
 
 		return false;
 	}
@@ -602,37 +613,37 @@ public void calibrateCurrentADC() throws OneWireIOException, OneWireException, I
 		byte currentLSB, currentMSB;
 
 		// grab the current IAD settings so that we dont change anything
-		boolean IADvalue = getFlag(IAD_FLAG);
+		var IADvalue = this.getFlag(IAD_FLAG);
 
 		// the IAD bit must be set to "0" to write to the Offset Register
-		setFlag(IAD_FLAG, false);
+		this.setFlag(IAD_FLAG, false);
 
 		// write all zeroes to the offset register
-		data = readPage(1);
+		data = this.readPage(1);
 		data[5] = data[6] = 0;
 
-		writePage(1, data, 0);
+		this.writePage(1, data, 0);
 
 		// enable current measurements once again
-		setFlag(IAD_FLAG, true);
+		this.setFlag(IAD_FLAG, true);
 
 		// read the Current Register value
-		data = readPage(0);
+		data = this.readPage(0);
 		currentLSB = data[5];
 		currentMSB = data[6];
 
 		// disable current measurements so that we can write to the offset reg
-		setFlag(IAD_FLAG, false);
+		this.setFlag(IAD_FLAG, false);
 
 		// change the sign of the current register value and store it as the offset
-		data = readPage(1);
-		data[5] = (byte) (~(currentLSB) + 1);
-		data[6] = (byte) (~(currentMSB));
+		data = this.readPage(1);
+		data[5] = (byte) (~currentLSB + 1);
+		data[6] = (byte) ~currentMSB;
 
-		writePage(1, data, 0);
+		this.writePage(1, data, 0);
 
 		// eset the IAD settings back to normal
-		setFlag(IAD_FLAG, IADvalue);
+		this.setFlag(IAD_FLAG, IADvalue);
 	}
 
 	/**
@@ -671,19 +682,19 @@ public void setThreshold(byte thresholdValue) throws OneWireIOException, OneWire
 		}
 
 		// first save their original IAD settings so we dont change anything
-		boolean IADvalue = getFlag(IAD_FLAG);
+		var IADvalue = this.getFlag(IAD_FLAG);
 
 		// current measurements must be off to write to the threshold register
-		setFlag(IAD_FLAG, false);
+		this.setFlag(IAD_FLAG, false);
 
 		// write the threshold register
-		data = readPage(0);
+		data = this.readPage(0);
 		data[7] = thresholdReg;
 
-		writePage(0, data, 0);
+		this.writePage(0, data, 0);
 
 		// set the IAD back to the way the user had it
-		setFlag(IAD_FLAG, IADvalue);
+		this.setFlag(IAD_FLAG, IADvalue);
 	}
 
 	/**
@@ -696,9 +707,9 @@ public void setThreshold(byte thresholdValue) throws OneWireIOException, OneWire
 	 * @throws IllegalArgumentException Bad parameters passed
 	 */
 	public int getICA() throws OneWireIOException, OneWireException, IllegalArgumentException {
-		byte[] data = readPage(1);
+		var data = this.readPage(1);
 
-		return (int) (data[4] & 0x000000ff);
+		return data[4] & 0x000000ff;
 	}
 
 	/**
@@ -713,9 +724,9 @@ public int getICA() throws OneWireIOException, OneWireException, IllegalArgument
 	 * @throws IllegalArgumentException Bad parameters passed
 	 */
 	public int getCCA() throws OneWireIOException, OneWireException, IllegalArgumentException {
-		byte[] data = readPage(7);
+		var data = this.readPage(7);
 
-		return ((data[5] << 8) & 0x0000ff00) | (data[4] & 0x000000ff);
+		return data[5] << 8 & 0x0000ff00 | data[4] & 0x000000ff;
 	}
 
 	/**
@@ -730,9 +741,9 @@ public int getCCA() throws OneWireIOException, OneWireException, IllegalArgument
 	 * @throws IllegalArgumentException Bad parameters passed
 	 */
 	public int getDCA() throws OneWireIOException, OneWireException, IllegalArgumentException {
-		byte[] data = readPage(7);
+		var data = this.readPage(7);
 
-		return ((data[7] << 8) & 0x0000ff00) | (data[6] & 0x000000ff);
+		return data[7] << 8 & 0x0000ff00 | data[6] & 0x000000ff;
 	}
 
 	/**
@@ -745,11 +756,11 @@ public int getDCA() throws OneWireIOException, OneWireException, IllegalArgument
 	 * @throws IllegalArgumentException Bad parameters passed
 	 */
 	public void setICA(int icaValue) throws OneWireIOException, OneWireException, IllegalArgumentException {
-		byte[] data = readPage(1);
+		var data = this.readPage(1);
 
 		data[4] = (byte) (icaValue & 0x000000ff);
 
-		writePage(1, data, 0);
+		this.writePage(1, data, 0);
 	}
 
 	/**
@@ -762,12 +773,12 @@ public void setICA(int icaValue) throws OneWireIOException, OneWireException, Il
 	 * @throws IllegalArgumentException Bad parameters passed
 	 */
 	public void setCCA(int ccaValue) throws OneWireIOException, OneWireException, IllegalArgumentException {
-		byte[] data = readPage(7);
+		var data = this.readPage(7);
 
 		data[4] = (byte) (ccaValue & 0x00ff);
 		data[5] = (byte) ((ccaValue & 0xff00) >>> 8);
 
-		writePage(7, data, 0);
+		this.writePage(7, data, 0);
 	}
 
 	/**
@@ -780,12 +791,12 @@ public void setCCA(int ccaValue) throws OneWireIOException, OneWireException, Il
 	 * @throws IllegalArgumentException Bad parameters passed
 	 */
 	public void setDCA(int dcaValue) throws OneWireIOException, OneWireException, IllegalArgumentException {
-		byte[] data = readPage(7);
+		var data = this.readPage(7);
 
 		data[6] = (byte) (dcaValue & 0x00ff);
 		data[7] = (byte) ((dcaValue & 0xff00) >>> 8);
 
-		writePage(7, data, 0);
+		this.writePage(7, data, 0);
 	}
 
 	/**
@@ -797,7 +808,7 @@ public void setDCA(int dcaValue) throws OneWireIOException, OneWireException, Il
 	 * @return time in milliseconds that have occurred since 1970
 	 */
 	public long getDisconnectTime(byte[] state) {
-		return getTime(state, 16) * 1000;
+		return this.getTime(state, 16) * 1000;
 	}
 
 	/**
@@ -809,13 +820,13 @@ public long getDisconnectTime(byte[] state) {
 	 * @return time in milliseconds that have occurred since 1970
 	 */
 	public long getEndOfChargeTime(byte[] state) {
-		return getTime(state, 20) * 1000;
+		return this.getTime(state, 20) * 1000;
 	}
 
 	// actually could be called byteArrayToLong, only used in time functions
 	private long getTime(byte[] state, int start) {
-		long time = (state[start] & 0x0ff) | ((state[start + 1] & 0x0ff) << 8) | ((state[start + 2] & 0x0ff) << 16)
-				| ((state[start + 3] & 0x0ff) << 24);
+		long time = state[start] & 0x0ff | (state[start + 1] & 0x0ff) << 8 | (state[start + 2] & 0x0ff) << 16
+				| (state[start + 3] & 0x0ff) << 24;
 
 		return time & 0x0ffffffff;
 	}
@@ -833,6 +844,7 @@ private long getTime(byte[] state, int start) {
 	 *
 	 * @return number of channels
 	 */
+	@Override
 	public int getNumberADChannels() {
 		return 3; // has VDD, VAD channel (battery, gen purpose)
 					// and it has a Vsense channel for current sensing
@@ -843,6 +855,7 @@ public int getNumberADChannels() {
 	 *
 	 * @return true if has high/low trips
 	 */
+	@Override
 	public boolean hasADAlarms() {
 		return false;
 	}
@@ -854,13 +867,15 @@ public boolean hasADAlarms() {
 	 *
 	 * @return available ranges
 	 */
+	@Override
 	public double[] getADRanges(int channel) {
-		double[] result = new double[1];
+		var result = new double[1];
 
-		if (channel == CHANNEL_VSENSE)
+		if (channel == CHANNEL_VSENSE) {
 			result[0] = .250;
-		else
+		} else {
 			result[0] = 10.23;
+		}
 
 		/*
 		 * for VAD, not entirely true--this should be 2 * VDD. If you hook up VDD to the
@@ -869,7 +884,7 @@ public double[] getADRanges(int channel) {
 		 * ---------------------------------- | ***************** | One-Wire-------
 		 * DIODE-------*VDD ONEWIRE*--- | * * | * GROUND *--- C * * | | * 2438 * | gnd *
 		 * * | | ***************** | |----------------------|
-		 * 
+		 *
 		 */
 		return result;
 	}
@@ -883,13 +898,15 @@ public double[] getADRanges(int channel) {
 	 *
 	 * @return available resolutions
 	 */
+	@Override
 	public double[] getADResolutions(int channel, double range) {
-		double[] result = new double[1];
+		var result = new double[1];
 
-		if (channel == CHANNEL_VSENSE)
+		if (channel == CHANNEL_VSENSE) {
 			result[0] = 0.2441;
-		else
+		} else {
 			result[0] = 0.01; // 10 mV
+		}
 
 		return result;
 	}
@@ -900,6 +917,7 @@ public double[] getADResolutions(int channel, double range) {
 	 *
 	 * @return true if device can do multi-channel voltage reads
 	 */
+	@Override
 	public boolean canADMultiChannelRead() {
 		return false;
 	}
@@ -920,11 +938,12 @@ public boolean canADMultiChannelRead() {
 	 * @throws OneWireIOException Error writing data
 	 * @throws OneWireException   Could not find part
 	 */
+	@Override
 	public void doADConvert(int channel, byte[] state) throws OneWireIOException, OneWireException {
 		if (channel == CHANNEL_VSENSE) {
 			if ((state[0] & IAD_FLAG) == 0) {
 				// enable the current sense channel
-				setFlag(IAD_FLAG, true);
+				this.setFlag(IAD_FLAG, true);
 				state[0] |= IAD_FLAG;
 				try {
 					// updates once every 27.6 milliseconds
@@ -933,34 +952,35 @@ public void doADConvert(int channel, byte[] state) throws OneWireIOException, On
 				}
 			}
 
-			byte[] data = readPage(0);
+			var data = this.readPage(0);
 			// update the state
 			System.arraycopy(data, 5, state, 5, 2);
 		} else {
-			setFlag(AD_FLAG, channel == CHANNEL_VDD);
+			this.setFlag(AD_FLAG, channel == CHANNEL_VDD);
 
 			// first perform the conversion
-			if (doSpeedEnable)
-				doSpeed();
+			if (this.doSpeedEnable) {
+				this.doSpeed();
+			}
 
-			if (adapter.select(address)) {
-				adapter.putByte(CONVERT_VOLTAGE_COMMAND);
+			if (!this.adapter.select(this.address)) {
+				throw new OneWireException("OneWireContainer26-Device not found.");
+			}
+			this.adapter.putByte(CONVERT_VOLTAGE_COMMAND);
 
-				try {
-					Thread.sleep(4);
-				} catch (InterruptedException e) {
-				}
+			try {
+				Thread.sleep(4);
+			} catch (InterruptedException e) {
+			}
 
-				byte[] data = readPage(0);
+			var data = this.readPage(0);
 
-				// let's update state with this info
-				System.arraycopy(data, 0, state, 0, 8);
+			// let's update state with this info
+			System.arraycopy(data, 0, state, 0, 8);
 
-				// save off the voltage in our state's holdindg area
-				state[24 + channel * 2] = data[4];
-				state[24 + channel * 2 + 1] = data[3];
-			} else
-				throw new OneWireException("OneWireContainer26-Device not found.");
+			// save off the voltage in our state's holdindg area
+			state[24 + channel * 2] = data[4];
+			state[24 + channel * 2 + 1] = data[3];
 		}
 	}
 
@@ -978,6 +998,7 @@ public void doADConvert(int channel, byte[] state) throws OneWireIOException, On
 	 * @throws OneWireIOException Error writing data
 	 * @throws OneWireException   Could not find part
 	 */
+	@Override
 	public void doADConvert(boolean[] doConvert, byte[] state) throws OneWireIOException, OneWireException {
 		throw new OneWireException("This device cannot do multi-channel reads");
 	}
@@ -997,6 +1018,7 @@ public void doADConvert(boolean[] doConvert, byte[] state) throws OneWireIOExcep
 	 * @throws OneWireIOException Error reading data
 	 * @throws OneWireException   Could not find part
 	 */
+	@Override
 	public double[] getADVoltage(byte[] state) throws OneWireIOException, OneWireException {
 		throw new OneWireException("This device cannot do multi-channel reads");
 	}
@@ -1018,13 +1040,15 @@ public double[] getADVoltage(byte[] state) throws OneWireIOException, OneWireExc
 	 * @throws OneWireIOException Error reading data
 	 * @throws OneWireException   Could not find part
 	 */
+	@Override
 	public double getADVoltage(int channel, byte[] state) throws OneWireIOException, OneWireException {
-		double result = 0;
+		var result = 0D;
 
-		if (channel == CHANNEL_VSENSE)
-			result = ((state[6] << 8) | (state[5] & 0x0ff)) / 4096d;
-		else
-			result = (((state[24 + channel * 2] << 8) & 0x00300) | (state[24 + channel * 2 + 1] & 0x0ff)) / 100.0d;
+		if (channel == CHANNEL_VSENSE) {
+			result = (state[6] << 8 | state[5] & 0x0ff) / 4096d;
+		} else {
+			result = (state[24 + channel * 2] << 8 & 0x00300 | state[24 + channel * 2 + 1] & 0x0ff) / 100.0d;
+		}
 
 		return result;
 	}
@@ -1049,6 +1073,7 @@ public double getADVoltage(int channel, byte[] state) throws OneWireIOException,
 	 *
 	 * @throws OneWireException Device does not support A/D alarms
 	 */
+	@Override
 	public double getADAlarm(int channel, int alarmType, byte[] state) throws OneWireException {
 		throw new OneWireException("This device does not have A/D alarms");
 	}
@@ -1069,6 +1094,7 @@ public double getADAlarm(int channel, int alarmType, byte[] state) throws OneWir
 	 *
 	 * @throws OneWireException Device does not support A/D alarms
 	 */
+	@Override
 	public boolean getADAlarmEnable(int channel, int alarmType, byte[] state) throws OneWireException {
 		throw new OneWireException("This device does not have A/D alarms");
 	}
@@ -1089,6 +1115,7 @@ public boolean getADAlarmEnable(int channel, int alarmType, byte[] state) throws
 	 *
 	 * @throws OneWireException Device does not support A/D alarms
 	 */
+	@Override
 	public boolean hasADAlarmed(int channel, int alarmType, byte[] state) throws OneWireException {
 		throw new OneWireException("This device does not have A/D alarms");
 	}
@@ -1105,6 +1132,7 @@ public boolean hasADAlarmed(int channel, int alarmType, byte[] state) throws One
 	 *
 	 * @return resolution of channel in volts
 	 */
+	@Override
 	public double getADResolution(int channel, byte[] state) {
 
 		// this is easy, its always 0.01 V = 10 mV
@@ -1123,11 +1151,12 @@ public double getADResolution(int channel, byte[] state) {
 	 *
 	 * @return input voltage range
 	 */
+	@Override
 	public double getADRange(int channel, byte[] state) {
-		if (channel == CHANNEL_VSENSE)
+		if (channel == CHANNEL_VSENSE) {
 			return .250;
-		else
-			return 10.23;
+		}
+		return 10.23;
 	}
 
 	// --------
@@ -1151,6 +1180,7 @@ public double getADRange(int channel, byte[] state) {
 	 *
 	 * @throws OneWireException Device does not support A/D alarms
 	 */
+	@Override
 	public void setADAlarm(int channel, int alarmType, double alarm, byte[] state) throws OneWireException {
 		throw new OneWireException("This device does not have A/D alarms");
 	}
@@ -1172,6 +1202,7 @@ public void setADAlarm(int channel, int alarmType, double alarm, byte[] state) t
 	 *
 	 * @throws OneWireException Device does not support A/D alarms
 	 */
+	@Override
 	public void setADAlarmEnable(int channel, int alarmType, boolean alarmEnable, byte[] state)
 			throws OneWireException {
 		throw new OneWireException("This device does not have AD alarms");
@@ -1190,6 +1221,7 @@ public void setADAlarmEnable(int channel, int alarmType, boolean alarmEnable, by
 	 * @param state      current state of the device returned from
 	 *                   <CODE>readDevice()</CODE>
 	 */
+	@Override
 	public void setADResolution(int channel, double resolution, byte[] state) {
 
 		// but you can't select the resolution for this part!!!!
@@ -1210,6 +1242,7 @@ public void setADResolution(int channel, double resolution, byte[] state) {
 	 * @param state   current state of the device returned from
 	 *                <CODE>readDevice()</CODE>
 	 */
+	@Override
 	public void setADRange(int channel, double range, byte[] state) {
 
 		// you can't change the ranges here without changing VDD!!!
@@ -1227,15 +1260,16 @@ public void setADRange(int channel, double range, byte[] state) {
 	 * @throws OneWireIOException Error reading data
 	 * @throws OneWireException   Could not find part
 	 */
+	@Override
 	public byte[] readDevice() throws OneWireIOException, OneWireException {
 
 		// should return the first three pages
 		// and then 6 extra bytes, 2 for channel 1 voltage and
 		// 2 for channel 2 voltage
-		byte[] state = new byte[28];
+		var state = new byte[28];
 
-		for (int i = 0; i < 3; i++) {
-			byte[] pg = readPage(i);
+		for (var i = 0; i < 3; i++) {
+			var pg = this.readPage(i);
 
 			System.arraycopy(pg, 0, state, i * 8, 8);
 		}
@@ -1263,9 +1297,10 @@ public byte[] readDevice() throws OneWireIOException, OneWireException {
 	 * @throws OneWireIOException Error writing data
 	 * @throws OneWireException   Could not find part
 	 */
+	@Override
 	public void writeDevice(byte[] state) throws OneWireIOException, OneWireException {
-		writePage(0, state, 0);
-		writePage(1, state, 8);
+		this.writePage(0, state, 0);
+		this.writePage(1, state, 8);
 	}
 
 	// --------
@@ -1277,6 +1312,7 @@ public void writeDevice(byte[] state) throws OneWireIOException, OneWireExceptio
 	 *
 	 * @return true if has high/low trip alarms
 	 */
+	@Override
 	public boolean hasTemperatureAlarms() {
 		return false;
 	}
@@ -1286,6 +1322,7 @@ public boolean hasTemperatureAlarms() {
 	 *
 	 * @return true if device has selectable resolution
 	 */
+	@Override
 	public boolean hasSelectableTemperatureResolution() {
 		return false;
 	}
@@ -1295,8 +1332,9 @@ public boolean hasSelectableTemperatureResolution() {
 	 *
 	 * @return available resolutions in degrees C
 	 */
+	@Override
 	public double[] getTemperatureResolutions() {
-		double[] result = new double[1];
+		var result = new double[1];
 
 		result[0] = 0.03125;
 
@@ -1310,6 +1348,7 @@ public double[] getTemperatureResolutions() {
 	 *
 	 * @throws OneWireException Device does not have temperature alarms
 	 */
+	@Override
 	public double getTemperatureAlarmResolution() throws OneWireException {
 		throw new OneWireException("This device does not have temperature alarms");
 	}
@@ -1319,6 +1358,7 @@ public double getTemperatureAlarmResolution() throws OneWireException {
 	 *
 	 * @return maximum temperature in degrees C
 	 */
+	@Override
 	public double getMaxTemperature() {
 		return 125.0;
 	}
@@ -1328,6 +1368,7 @@ public double getMaxTemperature() {
 	 *
 	 * @return minimum temperature in degrees C
 	 */
+	@Override
 	public double getMinTemperature() {
 		return -55.0;
 	}
@@ -1345,27 +1386,28 @@ public double getMinTemperature() {
 	 * @throws OneWireIOException Error writing data
 	 * @throws OneWireException   Could not find part
 	 */
+	@Override
 	public void doTemperatureConvert(byte[] state) throws OneWireIOException, OneWireException {
 		byte[] data; // hold page
 
-		if (doSpeedEnable)
-			doSpeed();
-
-		if (adapter.select(address)) {
+		if (this.doSpeedEnable) {
+			this.doSpeed();
+		}
 
-			// perform the temperature conversion
-			adapter.putByte(CONVERT_TEMP_COMMAND);
+		if (!this.adapter.select(this.address)) {
+			throw new OneWireException("OneWireContainer26-Device not found.");
+		}
+		// perform the temperature conversion
+		this.adapter.putByte(CONVERT_TEMP_COMMAND);
 
-			try {
-				Thread.sleep(10);
-			} catch (InterruptedException Ie) {
-			}
+		try {
+			Thread.sleep(10);
+		} catch (InterruptedException Ie) {
+		}
 
-			data = readPage(0);
-			state[2] = data[2];
-			state[1] = data[1];
-		} else
-			throw new OneWireException("OneWireContainer26-Device not found.");
+		data = this.readPage(0);
+		state[2] = data[2];
+		state[1] = data[1];
 	}
 
 	// --------
@@ -1380,10 +1422,9 @@ public void doTemperatureConvert(byte[] state) throws OneWireIOException, OneWir
 	 *
 	 * @return temperature in degrees C from the last <CODE>doTemperature()</CODE>
 	 */
+	@Override
 	public double getTemperature(byte[] state) {
-		double temp = ((short) ((state[2] << 8) | (state[1] & 0x0ff)) >> 3) * 0.03125;
-
-		return temp;
+		return ((short) (state[2] << 8 | state[1] & 0x0ff) >> 3) * 0.03125;
 	}
 
 	/**
@@ -1398,6 +1439,7 @@ public double getTemperature(byte[] state) {
 	 *
 	 * @throws OneWireException Device does not have temperature alarms
 	 */
+	@Override
 	public double getTemperatureAlarm(int alarmType, byte[] state) throws OneWireException {
 		throw new OneWireException("This device does not have temperature alarms");
 	}
@@ -1410,6 +1452,7 @@ public double getTemperatureAlarm(int alarmType, byte[] state) throws OneWireExc
 	 *
 	 * @return temperature resolution in degrees C
 	 */
+	@Override
 	public double getTemperatureResolution(byte[] state) {
 		return 0.03125;
 	}
@@ -1430,6 +1473,7 @@ public double getTemperatureResolution(byte[] state) {
 	 *
 	 * @throws OneWireException Device does not have temperature alarms
 	 */
+	@Override
 	public void setTemperatureAlarm(int alarmType, double alarmValue, byte[] state)
 			throws OneWireException, OneWireIOException {
 		throw new OneWireException("This device does not have temperature alarms");
@@ -1446,6 +1490,7 @@ public void setTemperatureAlarm(int alarmType, double alarmValue, byte[] state)
 	 * @throws OneWireIOException Error writing data
 	 * @throws OneWireException   Could not find part
 	 */
+	@Override
 	public void setTemperatureResolution(double resolution, byte[] state) throws OneWireException, OneWireIOException {
 
 		// airball, only one resolution!!!
@@ -1460,6 +1505,7 @@ public void setTemperatureResolution(double resolution, byte[] state) throws One
 	 *
 	 * @return true if real-time-clock has an alarm
 	 */
+	@Override
 	public boolean hasClockAlarm() {
 		return false;
 	}
@@ -1470,6 +1516,7 @@ public boolean hasClockAlarm() {
 	 *
 	 * @return true if the clock can be enabled and disabled
 	 */
+	@Override
 	public boolean canDisableClock() {
 		return false;
 	}
@@ -1479,6 +1526,7 @@ public boolean canDisableClock() {
 	 *
 	 * @return clock resolution in milliseconds.
 	 */
+	@Override
 	public long getClockResolution() {
 		return 1000;
 	}
@@ -1495,8 +1543,9 @@ public long getClockResolution() {
 	 *
 	 * @return time in milliseconds that have occurred since 1970
 	 */
+	@Override
 	public long getClock(byte[] state) {
-		return getTime(state, 8) * 1000;
+		return this.getTime(state, 8) * 1000;
 	}
 
 	/**
@@ -1509,6 +1558,7 @@ public long getClock(byte[] state) {
 	 *
 	 * @throws OneWireException Device does not have clock alarm
 	 */
+	@Override
 	public long getClockAlarm(byte[] state) throws OneWireException {
 		throw new OneWireException("This device does not have a clock alarm!");
 	}
@@ -1521,6 +1571,7 @@ public long getClockAlarm(byte[] state) throws OneWireException {
 	 *
 	 * @return true if clock is alarming
 	 */
+	@Override
 	public boolean isClockAlarming(byte[] state) {
 		return false;
 	}
@@ -1533,6 +1584,7 @@ public boolean isClockAlarming(byte[] state) {
 	 *
 	 * @return true if clock alarm is enabled
 	 */
+	@Override
 	public boolean isClockAlarmEnabled(byte[] state) {
 		return false;
 	}
@@ -1546,6 +1598,7 @@ public boolean isClockAlarmEnabled(byte[] state) {
 	 *
 	 * @return true if clock is running
 	 */
+	@Override
 	public boolean isClockRunning(byte[] state) {
 		return true;
 	}
@@ -1562,6 +1615,7 @@ public boolean isClockRunning(byte[] state) {
 	 * @param time  new clock setting in milliseconds
 	 * @param state device state
 	 */
+	@Override
 	public void setClock(long time, byte[] state) {
 		time = time / 1000; // convert to seconds
 		state[8] = (byte) time;
@@ -1580,6 +1634,7 @@ public void setClock(long time, byte[] state) {
 	 *
 	 * @throws OneWireException Device does not support clock alarm
 	 */
+	@Override
 	public void setClockAlarm(long time, byte[] state) throws OneWireException {
 		throw new OneWireException("This device does not have a clock alarm!");
 	}
@@ -1594,9 +1649,11 @@ public void setClockAlarm(long time, byte[] state) throws OneWireException {
 	 *
 	 * @throws OneWireException Device does not support disabled clock
 	 */
+	@Override
 	public void setClockRunEnable(boolean runEnable, byte[] state) throws OneWireException {
-		if (!runEnable)
+		if (!runEnable) {
 			throw new OneWireException("This device's clock cannot be disabled!");
+		}
 	}
 
 	/**
@@ -1609,6 +1666,7 @@ public void setClockRunEnable(boolean runEnable, byte[] state) throws OneWireExc
 	 *
 	 * @throws OneWireException Device does not support clock alarm
 	 */
+	@Override
 	public void setClockAlarmEnable(boolean alarmEnable, byte[] state) throws OneWireException {
 		throw new OneWireException("This device does not have a clock alarm!");
 	}
@@ -1627,6 +1685,7 @@ public void setClockAlarmEnable(boolean alarmEnable, byte[] state) throws OneWir
 	 * @see #getHumidityResolutions
 	 * @see #setHumidityResolution
 	 */
+	@Override
 	public boolean isRelative() {
 		return true;
 	}
@@ -1640,6 +1699,7 @@ public boolean isRelative() {
 	 * @see #getHumidityAlarm
 	 * @see #setHumidityAlarm
 	 */
+	@Override
 	public boolean hasHumidityAlarms() {
 		return false;
 	}
@@ -1654,6 +1714,7 @@ public boolean hasHumidityAlarms() {
 	 * @see #getHumidityResolutions
 	 * @see #setHumidityResolution
 	 */
+	@Override
 	public boolean hasSelectableHumidityResolution() {
 		return false;
 	}
@@ -1670,8 +1731,9 @@ public boolean hasSelectableHumidityResolution() {
 	 * @see #getHumidityResolution
 	 * @see #setHumidityResolution
 	 */
+	@Override
 	public double[] getHumidityResolutions() {
-		double[] result = new double[1];
+		var result = new double[1];
 
 		result[0] = 0.1;
 
@@ -1690,6 +1752,7 @@ public double[] getHumidityResolutions() {
 	 * @see #setHumidityAlarm
 	 *
 	 */
+	@Override
 	public double getHumidityAlarmResolution() throws OneWireException {
 		throw new OneWireException("This device does not have a humidity alarm!");
 	}
@@ -1711,15 +1774,16 @@ public double getHumidityAlarmResolution() throws OneWireException {
 	 * @throws OneWireException   on a communication or setup error with the 1-Wire
 	 *                            adapter
 	 */
+	@Override
 	public void doHumidityConvert(byte[] state) throws OneWireIOException, OneWireException {
 		// do temp convert
-		doTemperatureConvert(state);
+		this.doTemperatureConvert(state);
 
 		// do VDD for supply voltage
-		doADConvert(CHANNEL_VDD, state);
+		this.doADConvert(CHANNEL_VDD, state);
 
 		// do VAD for sensor voltage
-		doADConvert(CHANNEL_VAD, state);
+		this.doADConvert(CHANNEL_VAD, state);
 	}
 
 	// --------
@@ -1736,31 +1800,34 @@ public void doHumidityConvert(byte[] state) throws OneWireIOException, OneWireEx
 	 * @see #getHumidityResolution
 	 * @see #setHumidityResolution
 	 */
+	@Override
 	public double getHumidity(byte[] state) {
 		double temp = 0, vdd = 0, vad = 0, rh = 0;
 
 		try {
 			// read the temperature
-			temp = getTemperature(state);
+			temp = this.getTemperature(state);
 
 			// read the supply voltage
-			vdd = getADVoltage(CHANNEL_VDD, state);
+			vdd = this.getADVoltage(CHANNEL_VDD, state);
 
 			// read the sample voltage
-			vad = getADVoltage(CHANNEL_VAD, state);
+			vad = this.getADVoltage(CHANNEL_VAD, state);
 		} catch (OneWireException e) {
 			// know from this implementation that this will never happen
 			return 0.0;
 		}
 
 		// do calculation and check for out of range values
-		if (vdd != 0)
-			rh = (((vad / vdd) - 0.16) / 0.0062) / (1.0546 - 0.00216 * temp);
+		if (vdd != 0) {
+			rh = (vad / vdd - 0.16) / 0.0062 / (1.0546 - 0.00216 * temp);
+		}
 
-		if (rh < 0.0)
+		if (rh < 0.0) {
 			rh = 0.0;
-		else if (rh > 100.0)
+		} else if (rh > 100.0) {
 			rh = 100.0;
+		}
 
 		return rh;
 	}
@@ -1777,6 +1844,7 @@ else if (rh > 100.0)
 	 * @see #getHumidityResolutions
 	 * @see #setHumidityResolution
 	 */
+	@Override
 	public double getHumidityResolution(byte[] state) {
 		return 0.1;
 	}
@@ -1796,6 +1864,7 @@ public double getHumidityResolution(byte[] state) {
 	 * @see #hasHumidityAlarms
 	 * @see #setHumidityAlarm
 	 */
+	@Override
 	public double getHumidityAlarm(int alarmType, byte[] state) throws OneWireException {
 		throw new OneWireException("This device does not have a humidity alarm!");
 	}
@@ -1819,6 +1888,7 @@ public double getHumidityAlarm(int alarmType, byte[] state) throws OneWireExcept
 	 * @see #hasHumidityAlarms
 	 * @see #getHumidityAlarm
 	 */
+	@Override
 	public void setHumidityAlarm(int alarmType, double alarmValue, byte[] state) throws OneWireException {
 		throw new OneWireException("This device does not have a humidity alarm!");
 	}
@@ -1838,6 +1908,7 @@ public void setHumidityAlarm(int alarmType, double alarmValue, byte[] state) thr
 	 * @see #getHumidityResolution
 	 * @see #getHumidityResolutions
 	 */
+	@Override
 	public void setHumidityResolution(double resolution, byte[] state) throws OneWireException {
 		throw new OneWireException("This device does not have selectable humidity resolution!");
 	}
diff --git a/io.openems.edge.bridge.onewire/src/com/dalsemi/onewire/container/OneWireContainer27.java b/io.openems.edge.bridge.onewire/src/com/dalsemi/onewire/container/OneWireContainer27.java
index 1a07e3b8f0f..0d6606b11c0 100644
--- a/io.openems.edge.bridge.onewire/src/com/dalsemi/onewire/container/OneWireContainer27.java
+++ b/io.openems.edge.bridge.onewire/src/com/dalsemi/onewire/container/OneWireContainer27.java
@@ -38,7 +38,7 @@
  * container encapsulates the functionality of the iButton family type <B>27</B>
  * (hex)
  * </P>
- * 
+ *
  * <H3>Features</H3>
  * <UL>
  * <LI>Real-Time Clock with fully compatible 1-Wire MicroLAN interface
@@ -51,7 +51,7 @@
  * +85@htmlonly &#176C @endhtmlonly
  * <LI>Low power, 200 nA typical with oscillator running
  * </UL>
- * 
+ *
  * <H3>Clock</H3>
  *
  * <P>
@@ -99,7 +99,7 @@
  * </UL>
  *
  * <H3>Usage</H3>
- * 
+ *
  * <DL>
  * <DD>See the usage example in
  * {@link com.dalsemi.onewire.container.ClockContainer ClockContainer} for clock
@@ -111,9 +111,9 @@
  * <DD><A HREF="http://pdfserv.maxim-ic.com/arpdf/DS2417.pdf">
  * http://pdfserv.maxim-ic.com/arpdf/DS2417.pdf</A>
  * </DL>
- * 
+ *
  * @see com.dalsemi.onewire.container.ClockContainer
- * 
+ *
  * @version 1.10, 26 September 2001
  * @author BA
  */
@@ -164,7 +164,6 @@ public class OneWireContainer27 extends OneWireContainer24 implements ClockConta
 	 *      super.setupContainer()
 	 */
 	public OneWireContainer27() {
-		super();
 	}
 
 	/**
@@ -236,6 +235,7 @@ public OneWireContainer27(DSPortAdapter sourceAdapter, String newAddress) {
 	 *
 	 * @return iButton or 1-Wire device name
 	 */
+	@Override
 	public String getName() {
 		return "DS2417";
 	}
@@ -247,6 +247,7 @@ public String getName() {
 	 *
 	 * @return 1-Wire device alternate names
 	 */
+	@Override
 	public String getAlternateNames() {
 		return "1-Wire Time Chip with hardware interrupt";
 	}
@@ -257,6 +258,7 @@ public String getAlternateNames() {
 	 *
 	 * @return device description
 	 */
+	@Override
 	public String getDescription() {
 		return "Real time clock with interrupt implemented as a binary counter "
 				+ "that can be used to add functions such as " + "calendar, time and date stamp and logbook to any "
@@ -282,8 +284,8 @@ public String getDescription() {
 	 * @see #getClock(byte[])
 	 */
 	public long getInterruptInterval(byte[] state) {
-		long ret = 0;
-		switch (((state[CONTROL_OFFSET] & 0x70) >>> 4)) {
+		var ret = 0L;
+		switch ((state[CONTROL_OFFSET] & 0x70) >>> 4) {
 		default:
 			break;
 		case 0x00:
@@ -318,7 +320,7 @@ public long getInterruptInterval(byte[] state) {
 	 *
 	 * Checks to see if interrupt mode is turned on. If so, pulses will be generated
 	 * at an interval selected by setInterruptInterval.
-	 * 
+	 *
 	 * @param state current state of the device returned from
 	 *              <code>readDevice()</code>
 	 *
@@ -329,7 +331,7 @@ public long getInterruptInterval(byte[] state) {
 	 * @see #setClockRunEnable(boolean,byte[])
 	 */
 	public boolean isInterruptEnabled(byte[] state) {
-		return (Bit.arrayReadBit(7, CONTROL_OFFSET, state) == 1);
+		return Bit.arrayReadBit(7, CONTROL_OFFSET, state) == 1;
 	}
 
 	// --------
@@ -368,7 +370,7 @@ public void setInterruptInterval(byte intervalValue, byte[] state) {
 	/**
 	 * Enables or disables hardware interrupting. If enabled, the device sends an
 	 * interrupt at intervals defined by using the setInterruptInterval function.
-	 * 
+	 *
 	 * @param runEnable true to enable interval interrupts.
 	 * @param state     current state of the device returned from
 	 *                  <code>readDevice()</code>
diff --git a/io.openems.edge.bridge.onewire/src/com/dalsemi/onewire/container/OneWireContainer28.java b/io.openems.edge.bridge.onewire/src/com/dalsemi/onewire/container/OneWireContainer28.java
index 343d4077a96..56825230d7c 100644
--- a/io.openems.edge.bridge.onewire/src/com/dalsemi/onewire/container/OneWireContainer28.java
+++ b/io.openems.edge.bridge.onewire/src/com/dalsemi/onewire/container/OneWireContainer28.java
@@ -132,7 +132,6 @@ public class OneWireContainer28 extends OneWireContainer implements TemperatureC
 	 * @see #OneWireContainer28(DSPortAdapter,String)
 	 */
 	public OneWireContainer28() {
-		super();
 	}
 
 	/**
@@ -209,6 +208,7 @@ public OneWireContainer28(DSPortAdapter sourceAdapter, String newAddress) {
 	 *
 	 * @return this <code>OneWireContainer28</code> name
 	 */
+	@Override
 	public String getName() {
 		return "DS18B20";
 	}
@@ -220,6 +220,7 @@ public String getName() {
 	 *
 	 * @return this <code>OneWireContainer28</code> alternate names
 	 */
+	@Override
 	public String getAlternateNames() {
 		return "DS1820B, DS18B20X";
 	}
@@ -230,6 +231,7 @@ public String getAlternateNames() {
 	 *
 	 * @return <code>OneWireContainer28</code> functional description
 	 */
+	@Override
 	public String getDescription() {
 		return "Digital thermometer measures temperatures from " + "-55C to 125C in 0.75 seconds (max).  +/- 0.5C "
 				+ "accuracy between -10C and 85C. Thermometer "
@@ -249,6 +251,7 @@ public String getDescription() {
 	 * @see #getTemperatureAlarm
 	 * @see #setTemperatureAlarm
 	 */
+	@Override
 	public boolean hasTemperatureAlarms() {
 		return true;
 	}
@@ -263,6 +266,7 @@ public boolean hasTemperatureAlarms() {
 	 * @see #getTemperatureResolutions
 	 * @see #setTemperatureResolution
 	 */
+	@Override
 	public boolean hasSelectableTemperatureResolution() {
 		return true;
 	}
@@ -278,13 +282,14 @@ public boolean hasSelectableTemperatureResolution() {
 	 * @see #getTemperatureResolution
 	 * @see #setTemperatureResolution
 	 */
+	@Override
 	public double[] getTemperatureResolutions() {
-		double[] resolutions = new double[4];
+		var resolutions = new double[4];
 
-		resolutions[0] = (double) 0.5; // 9-bit
-		resolutions[1] = (double) 0.25; // 10-bit
-		resolutions[2] = (double) 0.125; // 11-bit
-		resolutions[3] = (double) 0.0625; // 12-bit
+		resolutions[0] = 0.5; // 9-bit
+		resolutions[1] = 0.25; // 10-bit
+		resolutions[2] = 0.125; // 11-bit
+		resolutions[3] = 0.0625; // 12-bit
 
 		return resolutions;
 	}
@@ -300,6 +305,7 @@ public double[] getTemperatureResolutions() {
 	 * @see #setTemperatureAlarm
 	 *
 	 */
+	@Override
 	public double getTemperatureAlarmResolution() {
 		return 1.0;
 	}
@@ -312,6 +318,7 @@ public double getTemperatureAlarmResolution() {
 	 *
 	 * @see #getMinTemperature
 	 */
+	@Override
 	public double getMaxTemperature() {
 		return 125.0;
 	}
@@ -324,6 +331,7 @@ public double getMaxTemperature() {
 	 *
 	 * @see #getMaxTemperature
 	 */
+	@Override
 	public double getMinTemperature() {
 		return -55.0;
 	}
@@ -348,59 +356,59 @@ public double getMinTemperature() {
 	 *
 	 * @see #getTemperature
 	 */
+	@Override
 	public void doTemperatureConvert(byte[] state) throws OneWireIOException, OneWireException {
-		int msDelay = 750; // in milliseconds
+		var msDelay = 750; // in milliseconds
 
 		// select the device
-		if (adapter.select(address)) {
-
-			// Setup Power Delivery
-			adapter.setPowerDuration(DSPortAdapter.DELIVERY_INFINITE);
-			adapter.startPowerDelivery(DSPortAdapter.CONDITION_AFTER_BYTE);
-			// send the convert temperature command
-			adapter.putByte(CONVERT_TEMPERATURE_COMMAND);
-
-			// calculate duration of delay according to resolution desired
-			switch (state[4]) {
-
-			case RESOLUTION_9_BIT:
-				msDelay = 94;
-				break;
-			case RESOLUTION_10_BIT:
-				msDelay = 188;
-				break;
-			case RESOLUTION_11_BIT:
-				msDelay = 375;
-				break;
-			case RESOLUTION_12_BIT:
-				msDelay = 750;
-				break;
-			default:
-				msDelay = 750;
-			} // switch
-
-			// delay for specified amount of time
-			try {
-				Thread.sleep(msDelay);
-			} catch (InterruptedException e) {
-			}
+		if (!this.adapter.select(this.address)) {
+
+			// device must not have been present
+			throw new OneWireIOException("OneWireContainer28-device not present");
+		}
+		// Setup Power Delivery
+		this.adapter.setPowerDuration(DSPortAdapter.DELIVERY_INFINITE);
+		this.adapter.startPowerDelivery(DSPortAdapter.CONDITION_AFTER_BYTE);
+		// send the convert temperature command
+		this.adapter.putByte(CONVERT_TEMPERATURE_COMMAND);
+
+		// calculate duration of delay according to resolution desired
+		switch (state[4]) {
 
-			// Turn power back to normal.
-			adapter.setPowerNormal();
+		case RESOLUTION_9_BIT:
+			msDelay = 94;
+			break;
+		case RESOLUTION_10_BIT:
+			msDelay = 188;
+			break;
+		case RESOLUTION_11_BIT:
+			msDelay = 375;
+			break;
+		case RESOLUTION_12_BIT:
+			msDelay = 750;
+			break;
+		default:
+			msDelay = 750;
+		} // switch
 
-			// check to see if the temperature conversion is over
-			if (adapter.getByte() != 0xFF)
-				throw new OneWireIOException("OneWireContainer28-temperature conversion not complete");
+		// delay for specified amount of time
+		try {
+			Thread.sleep(msDelay);
+		} catch (InterruptedException e) {
+		}
 
-			// BH added call to recallE2 to get new converted temperature into "state"
-			// variable
-			adapter.select(address);
-			state = recallE2();
-		} else {
+		// Turn power back to normal.
+		this.adapter.setPowerNormal();
 
-			// device must not have been present
-			throw new OneWireIOException("OneWireContainer28-device not present");
+		// check to see if the temperature conversion is over
+		if (this.adapter.getByte() != 0xFF) {
+			throw new OneWireIOException("OneWireContainer28-temperature conversion not complete");
 		}
+
+		// BH added call to recallE2 to get new converted temperature into "state"
+		// variable
+		this.adapter.select(this.address);
+		state = this.recallE2();
 	}
 
 	// --------
@@ -426,6 +434,7 @@ public void doTemperatureConvert(byte[] state) throws OneWireIOException, OneWir
 	 *
 	 * @see #doTemperatureConvert
 	 */
+	@Override
 	public double getTemperature(byte[] state) throws OneWireIOException {
 
 		// Take these three steps:
@@ -443,13 +452,13 @@ public double getTemperature(byte[] state) throws OneWireIOException {
 		// 0xFF5E = -10.125C
 		// 0xFE6F = -25.0625C
 		// 0xFC90 = -55.0C
-		double theTemperature = (double) 0.0;
+		var theTemperature = 0.0;
 		int inttemperature = state[1]; // inttemperature is automatically sign extended here.
 
-		inttemperature = (inttemperature << 8) | (state[0] & 0xFF); // this converts 2 bytes into integer
-		theTemperature = (double) ((double) inttemperature / (double) 16); // converts integer to a double
+		inttemperature = inttemperature << 8 | state[0] & 0xFF; // this converts 2 bytes into integer
+		theTemperature = (double) inttemperature / (double) 16; // converts integer to a double
 
-		return (theTemperature);
+		return theTemperature;
 	}
 
 	/**
@@ -466,8 +475,9 @@ public double getTemperature(byte[] state) throws OneWireIOException {
 	 * @see #hasTemperatureAlarms
 	 * @see #setTemperatureAlarm
 	 */
+	@Override
 	public double getTemperatureAlarm(int alarmType, byte[] state) {
-		return (double) state[alarmType == ALARM_LOW ? 3 : 2];
+		return state[alarmType == ALARM_LOW ? 3 : 2];
 	}
 
 	/**
@@ -487,26 +497,27 @@ public double getTemperatureAlarm(int alarmType, byte[] state) {
 	 * @see #getTemperatureResolutions
 	 * @see #setTemperatureResolution
 	 */
+	@Override
 	public double getTemperatureResolution(byte[] state) {
-		double tempres = (double) 0.0;
+		var tempres = 0.0;
 
 		// calculate temperature resolution according to configuration byte
 		switch (state[4]) {
 
 		case RESOLUTION_9_BIT:
-			tempres = (double) 0.5;
+			tempres = 0.5;
 			break;
 		case RESOLUTION_10_BIT:
-			tempres = (double) 0.25;
+			tempres = 0.25;
 			break;
 		case RESOLUTION_11_BIT:
-			tempres = (double) 0.125;
+			tempres = 0.125;
 			break;
 		case RESOLUTION_12_BIT:
-			tempres = (double) 0.0625;
+			tempres = 0.0625;
 			break;
 		default:
-			tempres = (double) 0.0;
+			tempres = 0.0;
 		} // switch
 
 		return tempres;
@@ -529,15 +540,18 @@ public double getTemperatureResolution(byte[] state) {
 	 * @see #hasTemperatureAlarms
 	 * @see #getTemperatureAlarm
 	 */
+	@Override
 	public void setTemperatureAlarm(int alarmType, double alarmValue, byte[] state)
 			throws OneWireException, OneWireIOException {
-		if ((alarmType != ALARM_LOW) && (alarmType != ALARM_HIGH))
+		if (alarmType != ALARM_LOW && alarmType != ALARM_HIGH) {
 			throw new IllegalArgumentException("Invalid alarm type.");
+		}
 
-		if (alarmValue > 125.0 || alarmValue < -55.0)
+		if (alarmValue > 125.0 || alarmValue < -55.0) {
 			throw new IllegalArgumentException("Value for alarm not in accepted range.  Must be -55 C <-> +125 C.");
+		}
 
-		state[(alarmType == ALARM_LOW) ? 3 : 2] = (byte) alarmValue;
+		state[alarmType == ALARM_LOW ? 3 : 2] = (byte) alarmValue;
 	}
 
 	/**
@@ -560,23 +574,28 @@ public void setTemperatureAlarm(int alarmType, double alarmValue, byte[] state)
 	 * @see #getTemperatureResolution
 	 * @see #getTemperatureResolutions
 	 */
+	@Override
 	public void setTemperatureResolution(double resolution, byte[] state) throws OneWireException {
-		byte configbyte = RESOLUTION_12_BIT;
+		var configbyte = RESOLUTION_12_BIT;
 
 		synchronized (this) {
 
 			// calculate configbyte from given resolution
-			if (resolution == 0.5)
+			if (resolution == 0.5) {
 				configbyte = RESOLUTION_9_BIT;
+			}
 
-			if (resolution == 0.25)
+			if (resolution == 0.25) {
 				configbyte = RESOLUTION_10_BIT;
+			}
 
-			if (resolution == 0.125)
+			if (resolution == 0.125) {
 				configbyte = RESOLUTION_11_BIT;
+			}
 
-			if (resolution == 0.0625)
+			if (resolution == 0.0625) {
 				configbyte = RESOLUTION_12_BIT;
+			}
 
 			state[4] = configbyte;
 		}
@@ -591,7 +610,7 @@ public void setTemperatureResolution(double resolution, byte[] state) throws One
 	 *
 	 * @return <code>OneWireContainer28</code> state information. Device state looks
 	 *         like this:
-	 * 
+	 *
 	 *         <pre>
 	 *   0 : temperature LSB
 	 *   1 : temperature MSB
@@ -615,13 +634,9 @@ public void setTemperatureResolution(double resolution, byte[] state) throws One
 	 *
 	 * @see #writeDevice
 	 */
+	@Override
 	public byte[] readDevice() throws OneWireIOException, OneWireException {
-
-		byte[] data;
-
-		data = recallE2();
-
-		return data;
+		return this.recallE2();
 	}
 
 	/**
@@ -643,18 +658,19 @@ public byte[] readDevice() throws OneWireIOException, OneWireException {
 	 *
 	 * @see #readDevice
 	 */
+	@Override
 	public void writeDevice(byte[] state) throws OneWireIOException, OneWireException {
-		byte[] temp = new byte[3];
+		var temp = new byte[3];
 
 		temp[0] = state[2];
 		temp[1] = state[3];
 		temp[2] = state[4];
 
 		// Write it to the Scratchpad.
-		writeScratchpad(temp);
+		this.writeScratchpad(temp);
 
 		// Place in memory.
-		copyScratchpad();
+		this.copyScratchpad();
 	}
 
 	// --------
@@ -680,20 +696,21 @@ public byte[] readScratchpad() throws OneWireIOException, OneWireException {
 		byte[] result_block;
 
 		// select the device
-		if (adapter.select(address)) {
+		if (this.adapter.select(this.address)) {
 
 			// create a block to send that reads the scratchpad
-			byte[] send_block = new byte[10];
+			var send_block = new byte[10];
 
 			// read scratchpad command
-			send_block[0] = (byte) READ_SCRATCHPAD_COMMAND;
+			send_block[0] = READ_SCRATCHPAD_COMMAND;
 
 			// now add the read bytes for data bytes and crc8
-			for (int i = 1; i < 10; i++)
+			for (var i = 1; i < 10; i++) {
 				send_block[i] = (byte) 0xFF;
+			}
 
 			// send the block
-			adapter.dataBlock(send_block, 0, send_block.length);
+			this.adapter.dataBlock(send_block, 0, send_block.length);
 
 			// now, send_block contains the 9-byte Scratchpad plus READ_SCRATCHPAD_COMMAND
 			// byte
@@ -701,15 +718,15 @@ public byte[] readScratchpad() throws OneWireIOException, OneWireException {
 			// byte)
 			result_block = new byte[9];
 
-			for (int i = 0; i < 9; i++) {
+			for (var i = 0; i < 9; i++) {
 				result_block[i] = send_block[i + 1];
 			}
 
 			// see if CRC8 is correct
-			if (CRC8.compute(send_block, 1, 9) == 0)
-				return (result_block);
-			else
-				throw new OneWireIOException("OneWireContainer28-Error reading CRC8 from device.");
+			if (CRC8.compute(send_block, 1, 9) == 0) {
+				return result_block;
+			}
+			throw new OneWireIOException("OneWireContainer28-Error reading CRC8 from device.");
 		}
 
 		// device must not have been present
@@ -740,7 +757,7 @@ public byte[] readScratchpad() throws OneWireIOException, OneWireException {
 	public void writeScratchpad(byte[] data) throws OneWireIOException, OneWireException {
 
 		// setup buffer to write to scratchpad
-		byte[] writeBuffer = new byte[4];
+		var writeBuffer = new byte[4];
 
 		writeBuffer[0] = WRITE_SCRATCHPAD_COMMAND;
 		writeBuffer[1] = data[0];
@@ -748,26 +765,23 @@ public void writeScratchpad(byte[] data) throws OneWireIOException, OneWireExcep
 		writeBuffer[3] = data[2];
 
 		// send command block to device
-		if (adapter.select(address)) {
-			adapter.dataBlock(writeBuffer, 0, writeBuffer.length);
-		} else {
+		if (!this.adapter.select(this.address)) {
 
 			// device must not have been present
 			throw new OneWireIOException("OneWireContainer28-Device not found on 1-Wire Network");
 		}
+		this.adapter.dataBlock(writeBuffer, 0, writeBuffer.length);
 
 		// double check by reading scratchpad
 		byte[] readBuffer;
 
-		readBuffer = readScratchpad();
+		readBuffer = this.readScratchpad();
 
-		if ((readBuffer[2] != data[0]) || (readBuffer[3] != data[1]) || (readBuffer[4] != data[2])) {
+		if (readBuffer[2] != data[0] || readBuffer[3] != data[1] || readBuffer[4] != data[2]) {
 
 			// writing to scratchpad failed
 			throw new OneWireIOException("OneWireContainer28-Error writing to scratchpad");
 		}
-
-		return;
 	}
 
 	// -------------------------------------------------------------------------
@@ -789,40 +803,37 @@ public void copyScratchpad() throws OneWireIOException, OneWireException {
 		// first, let's read the scratchpad to compare later.
 		byte[] readfirstbuffer;
 
-		readfirstbuffer = readScratchpad();
+		readfirstbuffer = this.readScratchpad();
 
 		// second, let's copy the scratchpad.
-		if (adapter.select(address)) {
-
-			// apply the power delivery
-			adapter.setPowerDuration(DSPortAdapter.DELIVERY_INFINITE);
-			adapter.startPowerDelivery(DSPortAdapter.CONDITION_AFTER_BYTE);
-
-			// send the convert temperature command
-			adapter.putByte(COPY_SCRATCHPAD_COMMAND);
-
-			// sleep for 10 milliseconds to allow copy to take place.
-			try {
-				Thread.sleep(10);
-			} catch (InterruptedException e) {
-			}
-			;
-
-			// Turn power back to normal.
-			adapter.setPowerNormal();
-		} else {
+		if (!this.adapter.select(this.address)) {
 
 			// device must not have been present
 			throw new OneWireIOException("OneWireContainer28-Device not found on 1-Wire Network");
 		}
+		// apply the power delivery
+		this.adapter.setPowerDuration(DSPortAdapter.DELIVERY_INFINITE);
+		this.adapter.startPowerDelivery(DSPortAdapter.CONDITION_AFTER_BYTE);
+
+		// send the convert temperature command
+		this.adapter.putByte(COPY_SCRATCHPAD_COMMAND);
+
+		// sleep for 10 milliseconds to allow copy to take place.
+		try {
+			Thread.sleep(10);
+		} catch (InterruptedException e) {
+		}
+
+		// Turn power back to normal.
+		this.adapter.setPowerNormal();
 
 		// third, let's read the scratchpad again with the recallE2 command and compare.
 		byte[] readlastbuffer;
 
-		readlastbuffer = recallE2();
+		readlastbuffer = this.recallE2();
 
-		if ((readfirstbuffer[2] != readlastbuffer[2]) || (readfirstbuffer[3] != readlastbuffer[3])
-				|| (readfirstbuffer[4] != readlastbuffer[4])) {
+		if (readfirstbuffer[2] != readlastbuffer[2] || readfirstbuffer[3] != readlastbuffer[3]
+				|| readfirstbuffer[4] != readlastbuffer[4]) {
 
 			// copying to scratchpad failed
 			throw new OneWireIOException("OneWireContainer28-Error copying scratchpad to E2 memory.");
@@ -851,15 +862,15 @@ public byte[] recallE2() throws OneWireIOException, OneWireException {
 		byte[] ScratchBuff;
 
 		// select the device
-		if (adapter.select(address)) {
+		if (this.adapter.select(this.address)) {
 
 			// send the Recall E-squared memory command
-			adapter.putByte(RECALL_E2MEMORY_COMMAND);
+			this.adapter.putByte(RECALL_E2MEMORY_COMMAND);
 
 			// read scratchpad
-			ScratchBuff = readScratchpad();
+			ScratchBuff = this.readScratchpad();
 
-			return (ScratchBuff);
+			return ScratchBuff;
 		}
 
 		// device must not have been present
@@ -884,25 +895,24 @@ public byte[] recallE2() throws OneWireIOException, OneWireException {
 	 *                            adapter
 	 */
 	public boolean isExternalPowerSupplied() throws OneWireIOException, OneWireException {
-		int intresult = 0;
-		boolean result = false;
+		var intresult = 0;
+		var result = false;
 
 		// select the device
-		if (adapter.select(address)) {
-
-			// send the "Read Power Supply" memory command
-			adapter.putByte(READ_POWER_SUPPLY_COMMAND);
-
-			// read results
-			intresult = adapter.getByte();
-		} else {
+		if (!this.adapter.select(this.address)) {
 
 			// device must not have been present
 			throw new OneWireIOException("OneWireContainer28-Device not found on 1-Wire Network");
 		}
+		// send the "Read Power Supply" memory command
+		this.adapter.putByte(READ_POWER_SUPPLY_COMMAND);
 
-		if (intresult != 0x00)
+		// read results
+		intresult = this.adapter.getByte();
+
+		if (intresult != 0x00) {
 			result = true; // reads 0xFF for true and 0x00 for false
+		}
 
 		return result;
 	}
diff --git a/io.openems.edge.bridge.onewire/src/com/dalsemi/onewire/container/OneWireContainer29.java b/io.openems.edge.bridge.onewire/src/com/dalsemi/onewire/container/OneWireContainer29.java
index 83689685142..b2c96de8c5a 100644
--- a/io.openems.edge.bridge.onewire/src/com/dalsemi/onewire/container/OneWireContainer29.java
+++ b/io.openems.edge.bridge.onewire/src/com/dalsemi/onewire/container/OneWireContainer29.java
@@ -27,6 +27,7 @@
 
 package com.dalsemi.onewire.container;
 
+import java.util.Arrays;
 import java.util.Enumeration;
 import java.util.Vector;
 
@@ -86,7 +87,7 @@ public class OneWireContainer29 extends OneWireContainer implements SwitchContai
 	/**
 	 * Used for 0xFF array
 	 */
-	private byte[] FF = new byte[8];
+	private final byte[] FF = new byte[8];
 
 	// --------
 	// -------- Constructors
@@ -108,12 +109,9 @@ public class OneWireContainer29 extends OneWireContainer implements SwitchContai
 	 *      OneWireContainer29(DSPortAdapter,String)
 	 */
 	public OneWireContainer29() {
-		super();
+		this.initmem();
 
-		initmem();
-
-		for (int i = 0; i < FF.length; i++)
-			FF[i] = (byte) 0x0FF;
+		Arrays.fill(this.FF, (byte) 0x0FF);
 	}
 
 	/**
@@ -132,10 +130,9 @@ public OneWireContainer29() {
 	public OneWireContainer29(DSPortAdapter sourceAdapter, byte[] newAddress) {
 		super(sourceAdapter, newAddress);
 
-		initmem();
+		this.initmem();
 
-		for (int i = 0; i < FF.length; i++)
-			FF[i] = (byte) 0x0FF;
+		Arrays.fill(this.FF, (byte) 0x0FF);
 	}
 
 	/**
@@ -154,10 +151,9 @@ public OneWireContainer29(DSPortAdapter sourceAdapter, byte[] newAddress) {
 	public OneWireContainer29(DSPortAdapter sourceAdapter, long newAddress) {
 		super(sourceAdapter, newAddress);
 
-		initmem();
+		this.initmem();
 
-		for (int i = 0; i < FF.length; i++)
-			FF[i] = (byte) 0x0FF;
+		Arrays.fill(this.FF, (byte) 0x0FF);
 	}
 
 	/**
@@ -176,10 +172,9 @@ public OneWireContainer29(DSPortAdapter sourceAdapter, long newAddress) {
 	public OneWireContainer29(DSPortAdapter sourceAdapter, String newAddress) {
 		super(sourceAdapter, newAddress);
 
-		initmem();
+		this.initmem();
 
-		for (int i = 0; i < FF.length; i++)
-			FF[i] = (byte) 0x0FF;
+		Arrays.fill(this.FF, (byte) 0x0FF);
 	}
 
 	// --------
@@ -192,6 +187,7 @@ public OneWireContainer29(DSPortAdapter sourceAdapter, String newAddress) {
 	 *
 	 * @return iButton or 1-Wire device name
 	 */
+	@Override
 	public String getName() {
 		return "DS2408";
 	}
@@ -202,14 +198,15 @@ public String getName() {
 	 * MemoryBank}, {@link com.dalsemi.onewire.container.PagedMemoryBank
 	 * PagedMemoryBank}, and {@link com.dalsemi.onewire.container.OTPMemoryBank
 	 * OTPMemoryBank}.
-	 * 
+	 *
 	 * @return <CODE>Enumeration</CODE> of memory banks
 	 */
+	@Override
 	public Enumeration<MemoryBank> getMemoryBanks() {
-		Vector<MemoryBank> bank_vector = new Vector<>(5);
+		var bank_vector = new Vector<MemoryBank>(5);
 
-		bank_vector.addElement(map);
-		bank_vector.addElement(search);
+		bank_vector.addElement(this.map);
+		bank_vector.addElement(this.search);
 
 		return bank_vector.elements();
 	}
@@ -221,6 +218,7 @@ public Enumeration<MemoryBank> getMemoryBanks() {
 	 *
 	 * @return the alternate names for this iButton or 1-Wire device
 	 */
+	@Override
 	public String getAlternateNames() {
 		return "8-Channel Addressable Switch";
 	}
@@ -231,6 +229,7 @@ public String getAlternateNames() {
 	 *
 	 * @return device description
 	 */
+	@Override
 	public String getDescription() {
 		return "1-Wire 8-Channel Addressable Switch";
 	}
@@ -241,6 +240,7 @@ public String getDescription() {
 	 * @return maximum speed
 	 * @see DSPortAdapter#setSpeed
 	 */
+	@Override
 	public int getMaxSpeed() {
 		return DSPortAdapter.SPEED_OVERDRIVE;
 	}
@@ -262,6 +262,7 @@ public int getMaxSpeed() {
 	 *
 	 * @see com.dalsemi.onewire.container.OneWireSensor#readDevice()
 	 */
+	@Override
 	public int getNumberChannels(byte[] state) {
 		// check the 88h byte bits 6 and 7
 		// 00 - 4 channels
@@ -282,6 +283,7 @@ public int getNumberChannels(byte[] state) {
 	 *
 	 * @see #getLatchState(int,byte[])
 	 */
+	@Override
 	public boolean isHighSideSwitch() {
 		return false;
 	}
@@ -296,6 +298,7 @@ public boolean isHighSideSwitch() {
 	 * @see #getSensedActivity(int,byte[])
 	 * @see #clearActivity()
 	 */
+	@Override
 	public boolean hasActivitySensing() {
 		return true;
 	}
@@ -309,6 +312,7 @@ public boolean hasActivitySensing() {
 	 *
 	 * @see #getLevel(int,byte[])
 	 */
+	@Override
 	public boolean hasLevelSensing() {
 		return true;
 	}
@@ -325,6 +329,7 @@ public boolean hasLevelSensing() {
 	 *
 	 * @see #setLatchState(int,boolean,boolean,byte[])
 	 */
+	@Override
 	public boolean hasSmartOn() {
 		return false;
 	}
@@ -340,6 +345,7 @@ public boolean hasSmartOn() {
 	 *
 	 * @see #setLatchState(int,boolean,boolean,byte[])
 	 */
+	@Override
 	public boolean onlySingleChannelOn() {
 		return false;
 	}
@@ -365,9 +371,10 @@ public boolean onlySingleChannelOn() {
 	 * @see com.dalsemi.onewire.container.OneWireSensor#readDevice()
 	 * @see #hasLevelSensing()
 	 */
+	@Override
 	public boolean getLevel(int channel, byte[] state) {
-		byte level = (byte) (0x01 << channel);
-		return ((state[0] & level) == level);
+		var level = (byte) (0x01 << channel);
+		return (state[0] & level) == level;
 	}
 
 	/**
@@ -387,9 +394,10 @@ public boolean getLevel(int channel, byte[] state) {
 	 * @see #isHighSideSwitch()
 	 * @see #setLatchState(int,boolean,boolean,byte[])
 	 */
+	@Override
 	public boolean getLatchState(int channel, byte[] state) {
-		byte latch = (byte) (0x01 << channel);
-		return ((state[1] & latch) == latch);
+		var latch = (byte) (0x01 << channel);
+		return (state[1] & latch) == latch;
 	}
 
 	/**
@@ -412,9 +420,10 @@ public boolean getLatchState(int channel, byte[] state) {
 	 * @see #hasActivitySensing()
 	 * @see #clearActivity()
 	 */
+	@Override
 	public boolean getSensedActivity(int channel, byte[] state) throws OneWireException {
-		byte activity = (byte) (0x01 << channel);
-		return ((state[2] & activity) == activity);
+		var activity = (byte) (0x01 << channel);
+		return (state[2] & activity) == activity;
 	}
 
 	/**
@@ -427,17 +436,19 @@ public boolean getSensedActivity(int channel, byte[] state) throws OneWireExcept
 	 * @see com.dalsemi.onewire.container.OneWireSensor#readDevice()
 	 * @see #getSensedActivity(int,byte[])
 	 */
+	@Override
 	public void clearActivity() throws OneWireException {
-		adapter.select(address);
-		byte[] buffer = new byte[9];
+		this.adapter.select(this.address);
+		var buffer = new byte[9];
 
 		buffer[0] = RESET_ACTIVITY_LATCHES;
-		System.arraycopy(FF, 0, buffer, 1, 8);
+		System.arraycopy(this.FF, 0, buffer, 1, 8);
 
-		adapter.dataBlock(buffer, 0, 9);
+		this.adapter.dataBlock(buffer, 0, 9);
 
-		if ((buffer[1] != (byte) 0xAA) && (buffer[1] != (byte) 0x55))
+		if (buffer[1] != (byte) 0xAA && buffer[1] != (byte) 0x55) {
 			throw new OneWireException("Sense Activity was not cleared.");
+		}
 	}
 
 	// --------
@@ -468,13 +479,15 @@ public void clearActivity() throws OneWireException {
 	 * @see #getLatchState(int,byte[])
 	 * @see com.dalsemi.onewire.container.OneWireSensor#writeDevice(byte[])
 	 */
+	@Override
 	public void setLatchState(int channel, boolean latchState, boolean doSmart, byte[] state) {
-		byte latch = (byte) (0x01 << channel);
+		var latch = (byte) (0x01 << channel);
 
-		if (latchState)
+		if (latchState) {
 			state[1] = (byte) (state[1] | latch);
-		else
+		} else {
 			state[1] = (byte) (state[1] & ~latch);
+		}
 	}
 
 	/**
@@ -492,7 +505,7 @@ public void setLatchState(int channel, boolean latchState, boolean doSmart, byte
 	 * @see com.dalsemi.onewire.container.OneWireSensor#writeDevice(byte[])
 	 */
 	public void setLatchState(byte set, byte[] state) {
-		state[1] = (byte) set;
+		state[1] = set;
 	}
 
 	/**
@@ -511,11 +524,12 @@ public void setLatchState(byte set, byte[] state) {
 	 * @throws OneWireException   on a communication or setup error with the 1-Wire
 	 *                            adapter
 	 */
+	@Override
 	public byte[] readDevice() throws OneWireIOException, OneWireException {
-		byte[] state = new byte[3];
+		var state = new byte[3];
 
-		System.arraycopy(FF, 0, state, 0, 3);
-		map.read(0, false, state, 0, 3);
+		System.arraycopy(this.FF, 0, state, 0, 3);
+		this.map.read(0, false, state, 0, 3);
 
 		return state;
 	}
@@ -537,9 +551,9 @@ public byte[] readDevice() throws OneWireIOException, OneWireException {
 	 *                            adapter
 	 */
 	public byte[] readRegister() throws OneWireIOException, OneWireException {
-		byte[] register = new byte[3];
+		var register = new byte[3];
 
-		search.read(0, false, register, 0, 3);
+		this.search.read(0, false, register, 0, 3);
 
 		return register;
 	}
@@ -559,8 +573,9 @@ public byte[] readRegister() throws OneWireIOException, OneWireException {
 	 * @throws OneWireException   on a communication or setup error with the 1-Wire
 	 *                            adapter
 	 */
+	@Override
 	public void writeDevice(byte[] state) throws OneWireIOException, OneWireException {
-		map.write(1, state, 1, 1);
+		this.map.write(1, state, 1, 1);
 	}
 
 	/**
@@ -578,7 +593,7 @@ public void writeDevice(byte[] state) throws OneWireIOException, OneWireExceptio
 	 *                            adapter
 	 */
 	public void writeRegister(byte[] register) throws OneWireIOException, OneWireException {
-		search.write(0, register, 0, 3);
+		this.search.write(0, register, 0, 3);
 	}
 
 	/**
@@ -595,9 +610,9 @@ public void writeRegister(byte[] register) throws OneWireIOException, OneWireExc
 	 *                            adapter
 	 */
 	public void setResetMode(byte[] register, boolean set) throws OneWireIOException, OneWireException {
-		if (set && ((register[2] & 0x04) == 0x04)) {
+		if (set && (register[2] & 0x04) == 0x04) {
 			register[2] = (byte) (register[2] & (byte) 0xFB);
-		} else if ((!set) && ((register[2] & (byte) 0x04) == (byte) 0x00)) {
+		} else if (!set && (register[2] & (byte) 0x04) == (byte) 0x00) {
 			register[2] = (byte) (register[2] | (byte) 0x04);
 		}
 	}
@@ -618,8 +633,9 @@ public void setResetMode(byte[] register, boolean set) throws OneWireIOException
 	 *                            adapter
 	 */
 	public boolean getVCC(byte[] register) throws OneWireIOException, OneWireException {
-		if ((register[2] & (byte) 0x80) == (byte) 0x80)
+		if ((register[2] & (byte) 0x80) == (byte) 0x80) {
 			return true;
+		}
 
 		return false;
 	}
@@ -632,7 +648,7 @@ public boolean getVCC(byte[] register) throws OneWireIOException, OneWireExcepti
 	 */
 	public void clearPowerOnReset(byte[] register) {
 		if ((register[2] & (byte) 0x08) == (byte) 0x08) {
-			register[2] = (byte) ((byte) register[2] & (byte) 0xF7);
+			register[2] = (byte) (register[2] & (byte) 0xF7);
 		}
 	}
 
@@ -644,7 +660,7 @@ public void clearPowerOnReset(byte[] register) {
 	 */
 	public void orConditionalSearch(byte[] register) {
 		if ((register[2] & (byte) 0x02) == (byte) 0x02) {
-			register[2] = (byte) ((byte) register[2] & (byte) 0xFD);
+			register[2] = (byte) (register[2] & (byte) 0xFD);
 		}
 	}
 
@@ -656,7 +672,7 @@ public void orConditionalSearch(byte[] register) {
 	 */
 	public void andConditionalSearch(byte[] register) {
 		if ((register[2] & (byte) 0x02) != (byte) 0x02) {
-			register[2] = (byte) ((byte) register[2] | (byte) 0x02);
+			register[2] = (byte) (register[2] | (byte) 0x02);
 		}
 	}
 
@@ -668,7 +684,7 @@ public void andConditionalSearch(byte[] register) {
 	 */
 	public void pioConditionalSearch(byte[] register) {
 		if ((register[2] & (byte) 0x01) == (byte) 0x01) {
-			register[2] = (byte) ((byte) register[2] & (byte) 0xFE);
+			register[2] = (byte) (register[2] & (byte) 0xFE);
 		}
 	}
 
@@ -681,7 +697,7 @@ public void pioConditionalSearch(byte[] register) {
 	 */
 	public void activityConditionalSearch(byte[] register) {
 		if ((register[2] & (byte) 0x01) != (byte) 0x01) {
-			register[2] = (byte) ((byte) register[2] | (byte) 0x01);
+			register[2] = (byte) (register[2] | (byte) 0x01);
 		}
 	}
 
@@ -695,12 +711,13 @@ public void activityConditionalSearch(byte[] register) {
 	 *                 from <code>readRegister()</code>
 	 */
 	public void setChannelMask(int channel, boolean set, byte[] register) {
-		byte mask = (byte) (0x01 << channel);
+		var mask = (byte) (0x01 << channel);
 
-		if (set)
-			register[0] = (byte) ((byte) register[0] | (byte) mask);
-		else
-			register[0] = (byte) ((byte) register[0] & (byte) ~mask);
+		if (set) {
+			register[0] = (byte) (register[0] | mask);
+		} else {
+			register[0] = (byte) (register[0] & (byte) ~mask);
+		}
 	}
 
 	/**
@@ -714,12 +731,13 @@ public void setChannelMask(int channel, boolean set, byte[] register) {
 	 *                 from <code>readRegister()</code>
 	 */
 	public void setChannelPolarity(int channel, boolean set, byte[] register) {
-		byte polarity = (byte) (0x01 << channel);
+		var polarity = (byte) (0x01 << channel);
 
-		if (set)
-			register[1] = (byte) ((byte) register[1] | (byte) polarity);
-		else
-			register[1] = (byte) ((byte) register[1] & (byte) ~polarity);
+		if (set) {
+			register[1] = (byte) (register[1] | polarity);
+		} else {
+			register[1] = (byte) (register[1] & (byte) ~polarity);
+		}
 	}
 
 	/**
@@ -734,9 +752,9 @@ public void setChannelPolarity(int channel, boolean set, byte[] register) {
 	 *         other wise.
 	 */
 	public boolean getChannelMask(int channel, byte[] register) {
-		byte mask = (byte) (0x01 << channel);
+		var mask = (byte) (0x01 << channel);
 
-		return ((register[0] & mask) == mask);
+		return (register[0] & mask) == mask;
 	}
 
 	/**
@@ -750,9 +768,9 @@ public boolean getChannelMask(int channel, byte[] register) {
 	 *         other wise.
 	 */
 	public boolean getChannelPolarity(int channel, byte[] register) {
-		byte polarity = (byte) (0x01 << channel);
+		var polarity = (byte) (0x01 << channel);
 
-		return ((register[1] & polarity) == polarity);
+		return (register[1] & polarity) == polarity;
 	}
 
 	/**
@@ -760,18 +778,18 @@ public boolean getChannelPolarity(int channel, byte[] register) {
 	 */
 	private void initmem() {
 		// Memory map registers
-		map = new MemoryBankEEPROMstatus(this);
-		map.bankDescription = "Memory mapped register of pin logic state, port output "
+		this.map = new MemoryBankEEPROMstatus(this);
+		this.map.bankDescription = "Memory mapped register of pin logic state, port output "
 				+ "latch logic state and activity latch logic state.";
-		map.startPhysicalAddress = 136;
-		map.size = 3;
-		map.readOnly = true;
+		this.map.startPhysicalAddress = 136;
+		this.map.size = 3;
+		this.map.readOnly = true;
 
 		// Conditional Search
-		search = new MemoryBankEEPROMstatus(this);
-		search.bankDescription = "Conditional search bit mask, polarity bit mask and " + "control register.";
-		search.startPhysicalAddress = 139;
-		search.size = 3;
-		search.readWrite = true;
+		this.search = new MemoryBankEEPROMstatus(this);
+		this.search.bankDescription = "Conditional search bit mask, polarity bit mask and " + "control register.";
+		this.search.startPhysicalAddress = 139;
+		this.search.size = 3;
+		this.search.readWrite = true;
 	}
 }
diff --git a/io.openems.edge.bridge.onewire/src/com/dalsemi/onewire/container/OneWireContainer2C.java b/io.openems.edge.bridge.onewire/src/com/dalsemi/onewire/container/OneWireContainer2C.java
index f8e565e3915..f3dd00c5d49 100644
--- a/io.openems.edge.bridge.onewire/src/com/dalsemi/onewire/container/OneWireContainer2C.java
+++ b/io.openems.edge.bridge.onewire/src/com/dalsemi/onewire/container/OneWireContainer2C.java
@@ -66,7 +66,7 @@ public class OneWireContainer2C extends OneWireContainer implements Potentiomete
 	// --------
 	// -------- Variables
 	// --------
-	private byte[] buffer = new byte[4];
+	private final byte[] buffer = new byte[4];
 
 	// --------
 	// -------- Finals
@@ -128,7 +128,6 @@ public class OneWireContainer2C extends OneWireContainer implements Potentiomete
 	 * Default constructor
 	 */
 	public OneWireContainer2C() {
-		super();
 	}
 
 	/**
@@ -177,6 +176,7 @@ public OneWireContainer2C(DSPortAdapter sourceAdapter, String newAddress) {
 	 *
 	 * @return representation of this 1-Wire devices name
 	 */
+	@Override
 	public String getName() {
 		return "DS2890";
 	}
@@ -188,6 +188,7 @@ public String getName() {
 	 *
 	 * @return representation of the alternate names
 	 */
+	@Override
 	public String getAlternateNames() {
 		return "Digital Potentiometer";
 	}
@@ -197,6 +198,7 @@ public String getAlternateNames() {
 	 *
 	 * @return representation of the function description
 	 */
+	@Override
 	public String getDescription() {
 		return "1-Wire linear taper digitally controlled potentiometer "
 				+ "with 256 wiper positions.  0-11 Volt working range.";
@@ -207,6 +209,7 @@ public String getDescription() {
 	 *
 	 * @return maximum speed this device can communicate at
 	 */
+	@Override
 	public int getMaxSpeed() {
 		return DSPortAdapter.SPEED_OVERDRIVE;
 	}
@@ -225,8 +228,9 @@ public int getMaxSpeed() {
 	 *         <CODE>false</CODE> if this device has logarithmic potentiometer
 	 *         element(s)
 	 */
+	@Override
 	public boolean isLinear(byte[] state) {
-		return ((state[0] & 0x01) == 0x01);
+		return (state[0] & 0x01) == 0x01;
 	}
 
 	/**
@@ -238,8 +242,9 @@ public boolean isLinear(byte[] state) {
 	 * @return <CODE>true</CODE> if the wiper settings are volatile;
 	 *         <CODE>false</CODE> if the wiper settings are non-volatile
 	 */
+	@Override
 	public boolean wiperSettingsAreVolatile(byte[] state) {
-		return ((state[0] & 0x02) == 0x02);
+		return (state[0] & 0x02) == 0x02;
 	}
 
 	/**
@@ -250,8 +255,9 @@ public boolean wiperSettingsAreVolatile(byte[] state) {
 	 *              <CODE>readDevice()</CODE>)
 	 * @return the number of potentiometers on this device
 	 */
+	@Override
 	public int numberOfPotentiometers(byte[] state) {
-		return (((state[0] >> 2) & 0x03) + 1);
+		return (state[0] >> 2 & 0x03) + 1;
 	}
 
 	/**
@@ -262,6 +268,7 @@ public int numberOfPotentiometers(byte[] state) {
 	 *              <CODE>readDevice()</CODE>)
 	 * @return number of wiper positions available
 	 */
+	@Override
 	public int numberOfWiperSettings(byte[] state) {
 		switch (state[0] & 0x30) {
 
@@ -283,6 +290,7 @@ public int numberOfWiperSettings(byte[] state) {
 	 *              <CODE>readDevice()</CODE>)
 	 * @return the resistance value in k-Ohms
 	 */
+	@Override
 	public int potentiometerResistance(byte[] state) {
 		switch (state[0] & 0xc0) {
 
@@ -306,12 +314,14 @@ public int potentiometerResistance(byte[] state) {
 	 *              <CODE>readDevice()</CODE>)
 	 * @return the current wiper number
 	 */
+	@Override
 	public int getCurrentWiperNumber(byte[] state) {
-		int wiper = state[1] & 0x03;
-		int wiper_inverse = (state[1] >> 2) & 0x03;
+		var wiper = state[1] & 0x03;
+		var wiper_inverse = state[1] >> 2 & 0x03;
 
-		if ((wiper + wiper_inverse) == 3)
+		if (wiper + wiper_inverse == 3) {
 			return wiper;
+		}
 
 		return -1;
 	}
@@ -326,14 +336,16 @@ public int getCurrentWiperNumber(byte[] state) {
 	 * @param state        state buffer of this 1-Wire Potentiometer device
 	 *                     (returned by <CODE>readDevice()</CODE>)
 	 */
+	@Override
 	public void setCurrentWiperNumber(int wiper_number, byte[] state) {
-		if (wiper_number != (wiper_number & 0x03))
+		if (wiper_number != (wiper_number & 0x03)) {
 			return; // invalid, just skip it
+		}
 
-		int wiper_inverse = ~wiper_number;
+		var wiper_inverse = ~wiper_number;
 
-		wiper_number = wiper_number | ((wiper_inverse & 0x03) << 2);
-		state[1] = (byte) ((state[1] & 0xf0) | (wiper_number & 0x0f));
+		wiper_number = wiper_number | (wiper_inverse & 0x03) << 2;
+		state[1] = (byte) (state[1] & 0xf0 | wiper_number & 0x0f);
 	}
 
 	/**
@@ -343,8 +355,9 @@ public void setCurrentWiperNumber(int wiper_number, byte[] state) {
 	 *              <CODE>readDevice()</CODE>)
 	 * @return <CODE>true</CODE> if it is enabled; <CODE>false</CODE> if not
 	 */
+	@Override
 	public boolean isChargePumpOn(byte[] state) {
-		return ((state[1] & 0x40) == 0x40);
+		return (state[1] & 0x40) == 0x40;
 	}
 
 	/**
@@ -359,11 +372,13 @@ public boolean isChargePumpOn(byte[] state) {
 	 * @return <CODE>true</CODE> if the operation was successful; <CODE>false</CODE>
 	 *         if there was an error
 	 */
+	@Override
 	public void setChargePump(boolean charge_pump_on, byte[] state) {
 		state[1] = (byte) (state[1] & 0xbf); // mask out the charge pump bit
 
-		if (charge_pump_on)
+		if (charge_pump_on) {
 			state[1] = (byte) (state[1] | 0x40);
+		}
 	}
 
 	/**
@@ -375,8 +390,9 @@ public void setChargePump(boolean charge_pump_on, byte[] state) {
 	 * @throws OneWireIOException Data was not written correctly
 	 * @throws OneWireException   Could not find device
 	 */
+	@Override
 	public int getWiperPosition() throws OneWireIOException, OneWireException {
-		return (readRegisters(READ_POSITION) & 0x0ff);
+		return this.readRegisters(READ_POSITION) & 0x0ff;
 	}
 
 	/**
@@ -389,8 +405,9 @@ public int getWiperPosition() throws OneWireIOException, OneWireException {
 	 * @throws OneWireIOException Data was not written correctly
 	 * @throws OneWireException   Could not find device
 	 */
+	@Override
 	public boolean setWiperPosition(int position) throws OneWireIOException, OneWireException {
-		return writeTransaction(WRITE_POSITION, (byte) position);
+		return this.writeTransaction(WRITE_POSITION, (byte) position);
 	}
 
 	/**
@@ -404,8 +421,9 @@ public boolean setWiperPosition(int position) throws OneWireIOException, OneWire
 	 * @throws OneWireIOException Data was not written correctly
 	 * @throws OneWireException   Could not find device
 	 */
+	@Override
 	public int increment(boolean reselect) throws OneWireIOException, OneWireException {
-		return unitChange(INCREMENT, reselect);
+		return this.unitChange(INCREMENT, reselect);
 	}
 
 	/**
@@ -419,8 +437,9 @@ public int increment(boolean reselect) throws OneWireIOException, OneWireExcepti
 	 * @throws OneWireIOException Data was not written correctly
 	 * @throws OneWireException   Could not find device
 	 */
+	@Override
 	public int decrement(boolean reselect) throws OneWireIOException, OneWireException {
-		return unitChange(DECREMENT, reselect);
+		return this.unitChange(DECREMENT, reselect);
 	}
 
 	/**
@@ -430,8 +449,9 @@ public int decrement(boolean reselect) throws OneWireIOException, OneWireExcepti
 	 * @throws OneWireIOException Data was not written correctly
 	 * @throws OneWireException   Could not find device
 	 */
+	@Override
 	public int increment() throws OneWireIOException, OneWireException {
-		return unitChange(INCREMENT, true);
+		return this.unitChange(INCREMENT, true);
 	}
 
 	/**
@@ -441,8 +461,9 @@ public int increment() throws OneWireIOException, OneWireException {
 	 * @throws OneWireIOException Data was not written correctly
 	 * @throws OneWireException   Could not find device
 	 */
+	@Override
 	public int decrement() throws OneWireIOException, OneWireException {
-		return unitChange(DECREMENT, true);
+		return this.unitChange(DECREMENT, true);
 	}
 
 	/**
@@ -456,6 +477,7 @@ public int decrement() throws OneWireIOException, OneWireException {
 	 * @throws OneWireIOException Data was not read correctly
 	 * @throws OneWireException   Could not find device
 	 */
+	@Override
 	public byte[] readDevice() throws OneWireIOException, OneWireException {
 
 		// format for the byte array is this:
@@ -477,19 +499,20 @@ public byte[] readDevice() throws OneWireIOException, OneWireException {
 		// bit 2 : Inverted Wiper Number lsb
 		// bit 1 : Wiper Number msb
 		// (lsb) bit 0 : Wiper Number lsb
-		byte[] state = new byte[2];
+		var state = new byte[2];
 
-		doSpeed();
+		this.doSpeed();
 
-		if (!adapter.select(address))
+		if (!this.adapter.select(this.address)) {
 			throw new OneWireIOException("Could not select the part!");
+		}
 
-		byte[] buf = new byte[3];
+		var buf = new byte[3];
 
 		buf[0] = READ_CONTROL;
 		buf[1] = buf[2] = (byte) 0x0ff;
 
-		adapter.dataBlock(buf, 0, 3);
+		this.adapter.dataBlock(buf, 0, 3);
 
 		state[0] = buf[1]; // feature
 		state[1] = buf[2]; // control
@@ -507,11 +530,13 @@ public byte[] readDevice() throws OneWireIOException, OneWireException {
 	 * @throws OneWireIOException Data was not written correctly
 	 * @throws OneWireException   Could not find device
 	 */
+	@Override
 	public void writeDevice(byte[] state) throws OneWireIOException, OneWireException {
 
 		// here we want to write the control register, just state[1]
-		if (!writeTransaction(WRITE_CONTROL, state[1]))
+		if (!this.writeTransaction(WRITE_CONTROL, state[1])) {
 			throw new OneWireIOException("Device may not have been present!");
+		}
 	}
 
 	//////////////////////////////////////////////////////////////////////
@@ -521,56 +546,58 @@ public void writeDevice(byte[] state) throws OneWireIOException, OneWireExceptio
 	/*
 	 * This function handles reading of the registers for: 1. Finding the state of
 	 * the charge pump 2. Finding the current location of the wiper
-	 * 
+	 *
 	 * Both of these operations send one command byte and receive two information
 	 * bytes. The relevant information for both is stored in that second received
 	 * byte.
 	 */
 	private synchronized int readRegisters(byte COMMAND) throws OneWireIOException, OneWireException {
-		doSpeed();
+		this.doSpeed();
 
-		if (!adapter.select(address))
+		if (!this.adapter.select(this.address)) {
 			throw new OneWireIOException("Could not select the part!");
+		}
 
-		buffer[0] = COMMAND;
-		buffer[1] = buffer[2] = (byte) 0x0ff;
+		this.buffer[0] = COMMAND;
+		this.buffer[1] = this.buffer[2] = (byte) 0x0ff;
 
-		adapter.dataBlock(buffer, 0, 3);
+		this.adapter.dataBlock(this.buffer, 0, 3);
 
-		return (0x0ff & buffer[2]);
+		return 0x0ff & this.buffer[2];
 	}
 
 	/*
 	 * Handles the writing transactions, which are: 1. Setting the control register
 	 * (ie the charge pump state) 2. Setting the wiper position
-	 * 
+	 *
 	 * Both of these operations have the same transaction process. The command byte
 	 * and a value parameter are passed in (either the new control register or the
 	 * new position) and the part echo's the value parameter. If the echo is correct
 	 * (no transmission errors), the master sends a 96 (which means finish
 	 * transaction). If the transaction succeeds, the part returns 0's, otherwise it
 	 * returns 1's.
-	 * 
+	 *
 	 */
 	private synchronized boolean writeTransaction(byte COMMAND, byte value)
 			throws OneWireIOException, OneWireException {
-		doSpeed();
+		this.doSpeed();
 
-		if (adapter.select(address)) {
-			buffer[0] = COMMAND;
-			buffer[1] = value;
-			buffer[2] = (byte) 0x0ff;
+		if (this.adapter.select(this.address)) {
+			this.buffer[0] = COMMAND;
+			this.buffer[1] = value;
+			this.buffer[2] = (byte) 0x0ff;
 
-			adapter.dataBlock(buffer, 0, 3);
+			this.adapter.dataBlock(this.buffer, 0, 3);
 
-			if (buffer[2] == value) {
-				buffer[0] = (byte) 0x096;
-				buffer[1] = (byte) 0x0ff;
+			if (this.buffer[2] == value) {
+				this.buffer[0] = (byte) 0x096;
+				this.buffer[1] = (byte) 0x0ff;
 
-				adapter.dataBlock(buffer, 0, 2);
+				this.adapter.dataBlock(this.buffer, 0, 2);
 
-				if (buffer[1] == 0)
+				if (this.buffer[1] == 0) {
 					return true;
+				}
 			}
 		}
 
@@ -585,15 +612,15 @@ private synchronized boolean writeTransaction(byte COMMAND, byte value)
 	 */
 	private synchronized int unitChange(byte COMMAND, boolean reselect) throws OneWireIOException, OneWireException {
 		if (reselect) {
-			doSpeed(); // don't need to do this if we don't need to select
-			adapter.select(address);
+			this.doSpeed(); // don't need to do this if we don't need to select
+			this.adapter.select(this.address);
 		}
 
-		buffer[0] = COMMAND;
-		buffer[1] = (byte) 0x0ff;
+		this.buffer[0] = COMMAND;
+		this.buffer[1] = (byte) 0x0ff;
 
-		adapter.dataBlock(buffer, 0, 2);
+		this.adapter.dataBlock(this.buffer, 0, 2);
 
-		return (0x0ff & buffer[1]);
+		return 0x0ff & this.buffer[1];
 	}
 }
diff --git a/io.openems.edge.bridge.onewire/src/com/dalsemi/onewire/container/OneWireContainer2D.java b/io.openems.edge.bridge.onewire/src/com/dalsemi/onewire/container/OneWireContainer2D.java
index 8a4a3bc79a0..8e50afe4fe0 100644
--- a/io.openems.edge.bridge.onewire/src/com/dalsemi/onewire/container/OneWireContainer2D.java
+++ b/io.openems.edge.bridge.onewire/src/com/dalsemi/onewire/container/OneWireContainer2D.java
@@ -96,7 +96,6 @@ public class OneWireContainer2D extends OneWireContainer {
 	 * using.
 	 */
 	public OneWireContainer2D() {
-		super();
 	}
 
 	/**
@@ -111,7 +110,7 @@ public OneWireContainer2D(DSPortAdapter sourceAdapter, byte[] newAddress) {
 		super(sourceAdapter, newAddress);
 
 		// initialize the memory banks
-		initMem();
+		this.initMem();
 	}
 
 	/**
@@ -126,7 +125,7 @@ public OneWireContainer2D(DSPortAdapter sourceAdapter, long newAddress) {
 		super(sourceAdapter, newAddress);
 
 		// initialize the memory banks
-		initMem();
+		this.initMem();
 	}
 
 	/**
@@ -141,7 +140,7 @@ public OneWireContainer2D(DSPortAdapter sourceAdapter, String newAddress) {
 		super(sourceAdapter, newAddress);
 
 		// initialize the memory banks
-		initMem();
+		this.initMem();
 	}
 
 	// --------
@@ -156,11 +155,12 @@ public OneWireContainer2D(DSPortAdapter sourceAdapter, String newAddress) {
 	 *                      iButton.
 	 * @param newAddress    address of this 1-Wire device
 	 */
+	@Override
 	public void setupContainer(DSPortAdapter sourceAdapter, byte[] newAddress) {
 		super.setupContainer(sourceAdapter, newAddress);
 
 		// initialize the memory banks
-		initMem();
+		this.initMem();
 	}
 
 	/**
@@ -171,11 +171,12 @@ public void setupContainer(DSPortAdapter sourceAdapter, byte[] newAddress) {
 	 *                      iButton.
 	 * @param newAddress    address of this 1-Wire device
 	 */
+	@Override
 	public void setupContainer(DSPortAdapter sourceAdapter, long newAddress) {
 		super.setupContainer(sourceAdapter, newAddress);
 
 		// initialize the memory banks
-		initMem();
+		this.initMem();
 	}
 
 	/**
@@ -186,11 +187,12 @@ public void setupContainer(DSPortAdapter sourceAdapter, long newAddress) {
 	 *                      iButton.
 	 * @param newAddress    address of this 1-Wire device
 	 */
+	@Override
 	public void setupContainer(DSPortAdapter sourceAdapter, String newAddress) {
 		super.setupContainer(sourceAdapter, newAddress);
 
 		// initialize the memory banks
-		initMem();
+		this.initMem();
 	}
 
 	/**
@@ -199,6 +201,7 @@ public void setupContainer(DSPortAdapter sourceAdapter, String newAddress) {
 	 *
 	 * @return string representation of the iButton name.
 	 */
+	@Override
 	public String getName() {
 		return "DS1972";
 	}
@@ -210,6 +213,7 @@ public String getName() {
 	 *
 	 * @return the alternate names for this iButton or 1-Wire device
 	 */
+	@Override
 	public String getAlternateNames() {
 		return "DS2431";
 	}
@@ -219,6 +223,7 @@ public String getAlternateNames() {
 	 *
 	 * @return string representation of the function description.
 	 */
+	@Override
 	public String getDescription() {
 		return "1K-Bit protected 1-Wire EEPROM.";
 	}
@@ -228,6 +233,7 @@ public String getDescription() {
 	 *
 	 * @return max. communication speed.
 	 */
+	@Override
 	public int getMaxSpeed() {
 		return DSPortAdapter.SPEED_OVERDRIVE;
 	}
@@ -238,17 +244,18 @@ public int getMaxSpeed() {
 	 * MemoryBank}, {@link com.dalsemi.onewire.container.PagedMemoryBank
 	 * PagedMemoryBank}, and {@link com.dalsemi.onewire.container.OTPMemoryBank
 	 * OTPMemoryBank}.
-	 * 
+	 *
 	 * @return <CODE>Enumeration</CODE> of memory banks
 	 */
+	@Override
 	public Enumeration<MemoryBank> getMemoryBanks() {
-		Vector<MemoryBank> bank_vector = new Vector<>(2);
+		var bank_vector = new Vector<MemoryBank>(2);
 
 		// main memory
-		bank_vector.addElement((MemoryBank) main_mem);
+		bank_vector.addElement(this.main_mem);
 
 		// register memory
-		bank_vector.addElement((MemoryBank) register);
+		bank_vector.addElement(this.register);
 
 		return bank_vector.elements();
 	}
@@ -258,7 +265,7 @@ public Enumeration<MemoryBank> getMemoryBanks() {
 	 */
 	private void initMem() {
 		// scratch pad
-		MemoryBankScratchEE sp = new MemoryBankScratchEE(this);
+		var sp = new MemoryBankScratchEE(this);
 		sp.size = 8;
 		sp.pageLength = 8;
 		sp.maxPacketDataLength = 5;
@@ -267,35 +274,35 @@ private void initMem() {
 		sp.ES_MASK = (byte) 0;
 
 		// main memory
-		main_mem = new MemoryBankEEPROM(this, sp);
+		this.main_mem = new MemoryBankEEPROM(this, sp);
 
 		// register memory
-		register = new MemoryBankEEPROM(this, sp);
+		this.register = new MemoryBankEEPROM(this, sp);
 
 		// initialize attributes of this memory bank
-		register.generalPurposeMemory = false;
-		register.bankDescription = "Write-protect/EPROM-Mode control register";
-		register.numberPages = 1;
-		register.size = 8;
-		register.pageLength = 8;
-		register.maxPacketDataLength = 0;
-		register.readWrite = true;
-		register.writeOnce = false;
-		register.readOnly = false;
-		register.nonVolatile = true;
-		register.pageAutoCRC = false;
-		register.lockPage = false;
-		register.programPulse = false;
-		register.powerDelivery = true;
-		register.extraInfo = false;
-		register.extraInfoLength = 0;
-		register.extraInfoDescription = null;
-		register.writeVerification = false;
-		register.startPhysicalAddress = 128;
-		register.doSetSpeed = true;
+		this.register.generalPurposeMemory = false;
+		this.register.bankDescription = "Write-protect/EPROM-Mode control register";
+		this.register.numberPages = 1;
+		this.register.size = 8;
+		this.register.pageLength = 8;
+		this.register.maxPacketDataLength = 0;
+		this.register.readWrite = true;
+		this.register.writeOnce = false;
+		this.register.readOnly = false;
+		this.register.nonVolatile = true;
+		this.register.pageAutoCRC = false;
+		this.register.lockPage = false;
+		this.register.programPulse = false;
+		this.register.powerDelivery = true;
+		this.register.extraInfo = false;
+		this.register.extraInfoLength = 0;
+		this.register.extraInfoDescription = null;
+		this.register.writeVerification = false;
+		this.register.startPhysicalAddress = 128;
+		this.register.doSetSpeed = true;
 
 		// set the lock mb
-		main_mem.mbLock = register;
+		this.main_mem.mbLock = this.register;
 	}
 
 	// --------
@@ -309,11 +316,11 @@ private void initMem() {
 	 * @return 'true' if current memory bank can only be written once
 	 */
 	public boolean isPageWriteOnce(int page) throws OneWireIOException, OneWireException {
-		byte[] rd_byte = new byte[1];
+		var rd_byte = new byte[1];
 
-		register.read(page, false, rd_byte, 0, 1);
+		this.register.read(page, false, rd_byte, 0, 1);
 
-		return (rd_byte[0] == WRITEONCE_FLAG);
+		return rd_byte[0] == WRITEONCE_FLAG;
 	}
 
 	/**
@@ -326,14 +333,15 @@ public boolean isPageWriteOnce(int page) throws OneWireIOException, OneWireExcep
 	 * @throws OneWireException
 	 */
 	public void setPageWriteOnce(int page) throws OneWireIOException, OneWireException {
-		byte[] wr_byte = new byte[1];
+		var wr_byte = new byte[1];
 
 		wr_byte[0] = WRITEONCE_FLAG;
 
-		register.write(page, wr_byte, 0, 1);
+		this.register.write(page, wr_byte, 0, 1);
 
 		// read back to verify
-		if (!isPageWriteOnce(page))
+		if (!this.isPageWriteOnce(page)) {
 			throw new OneWireIOException("Failed to set page to write-once mode.");
+		}
 	}
 }
diff --git a/io.openems.edge.bridge.onewire/src/com/dalsemi/onewire/container/OneWireContainer30.java b/io.openems.edge.bridge.onewire/src/com/dalsemi/onewire/container/OneWireContainer30.java
index 26250a8d305..4a5c69fc600 100644
--- a/io.openems.edge.bridge.onewire/src/com/dalsemi/onewire/container/OneWireContainer30.java
+++ b/io.openems.edge.bridge.onewire/src/com/dalsemi/onewire/container/OneWireContainer30.java
@@ -156,8 +156,9 @@ public class OneWireContainer30 extends OneWireContainer implements ADContainer,
 	public static final byte DC_PIN_STATE_FLAG = 4;
 
 	/**
-	 * PROTECTION REGISTER FLAG: Resetting this flag will disable charging regardless
-	 * of cell or pack conditions. Accessed with <CODE>getFlag()/setFlag()</CODE>.
+	 * PROTECTION REGISTER FLAG: Resetting this flag will disable charging
+	 * regardless of cell or pack conditions. Accessed with
+	 * <CODE>getFlag()/setFlag()</CODE>.
 	 */
 	public static final byte CHARGE_ENABLE_FLAG = 2;
 
@@ -234,9 +235,7 @@ public class OneWireContainer30 extends OneWireContainer implements ADContainer,
 	 * Default constructor
 	 */
 	public OneWireContainer30() {
-		super();
-
-		internalResistor = true;
+		this.internalResistor = true;
 	}
 
 	/**
@@ -250,7 +249,7 @@ public OneWireContainer30() {
 	public OneWireContainer30(DSPortAdapter sourceAdapter, byte[] newAddress) {
 		super(sourceAdapter, newAddress);
 
-		internalResistor = true;
+		this.internalResistor = true;
 	}
 
 	/**
@@ -264,7 +263,7 @@ public OneWireContainer30(DSPortAdapter sourceAdapter, byte[] newAddress) {
 	public OneWireContainer30(DSPortAdapter sourceAdapter, long newAddress) {
 		super(sourceAdapter, newAddress);
 
-		internalResistor = true;
+		this.internalResistor = true;
 	}
 
 	/**
@@ -278,7 +277,7 @@ public OneWireContainer30(DSPortAdapter sourceAdapter, long newAddress) {
 	public OneWireContainer30(DSPortAdapter sourceAdapter, String newAddress) {
 		super(sourceAdapter, newAddress);
 
-		internalResistor = true;
+		this.internalResistor = true;
 	}
 
 	/**
@@ -288,6 +287,7 @@ public OneWireContainer30(DSPortAdapter sourceAdapter, String newAddress) {
 	 * @return representation of the 1-Wire device name
 	 *
 	 */
+	@Override
 	public String getName() {
 		return "DS2760";
 	}
@@ -298,6 +298,7 @@ public String getName() {
 	 *
 	 * @return representation of the alternate names for this device
 	 */
+	@Override
 	public String getAlternateNames() {
 		return "1-Cell Li-Ion Battery Monitor";
 	}
@@ -307,6 +308,7 @@ public String getAlternateNames() {
 	 *
 	 * @return representation of the function description
 	 */
+	@Override
 	public String getDescription() {
 		return "The DS2760 is a data acquisition, information storage, and safety"
 				+ " protection device tailored for cost-sensitive battery pack applications."
@@ -321,14 +323,15 @@ public String getDescription() {
 	 * MemoryBank}, {@link com.dalsemi.onewire.container.PagedMemoryBank
 	 * PagedMemoryBank}, and {@link com.dalsemi.onewire.container.OTPMemoryBank
 	 * OTPMemoryBank}.
-	 * 
+	 *
 	 * @return <CODE>Enumeration</CODE> of memory banks
 	 */
+	@Override
 	public Enumeration<MemoryBank> getMemoryBanks() {
-		Vector<MemoryBank> bank_vector = new Vector<>(1);
+		var bank_vector = new Vector<MemoryBank>(1);
 
 		// EEPROM main bank
-		MemoryBankEEPROMblock mn = new MemoryBankEEPROMblock(this);
+		var mn = new MemoryBankEEPROMblock(this);
 
 		bank_vector.addElement(mn);
 
@@ -341,7 +344,7 @@ public Enumeration<MemoryBank> getMemoryBanks() {
 	 * to the device.
 	 */
 	public synchronized void setResistorInternal() {
-		internalResistor = true;
+		this.internalResistor = true;
 	}
 
 	/**
@@ -352,7 +355,7 @@ public synchronized void setResistorInternal() {
 	 * @param Rsens resistance in ohms
 	 */
 	public synchronized void setResistorExternal(double Rsens) {
-		internalResistor = false;
+		this.internalResistor = false;
 		this.Rsens = Rsens;
 	}
 
@@ -372,23 +375,23 @@ public synchronized void setResistorExternal(double Rsens) {
 	 * @throws OneWireException   Could not find part
 	 */
 	public byte readByte(int memAddr) throws OneWireIOException, OneWireException {
-		byte[] buffer = new byte[3];
+		var buffer = new byte[3];
 
-		doSpeed();
-		adapter.reset();
+		this.doSpeed();
+		this.adapter.reset();
 
-		if (adapter.select(address)) {
+		if (this.adapter.select(this.address)) {
 
 			/* setup the read */
 			buffer[0] = READ_DATA_COMMAND;
 			buffer[1] = (byte) memAddr;
 			buffer[2] = (byte) 0xFF;
 
-			adapter.dataBlock(buffer, 0, 3);
+			this.adapter.dataBlock(buffer, 0, 3);
 
 			return buffer[2];
-		} else
-			throw new OneWireException("OneWireContainer30-Device not found.");
+		}
+		throw new OneWireException("OneWireContainer30-Device not found.");
 	}
 
 	/**
@@ -408,18 +411,19 @@ public byte readByte(int memAddr) throws OneWireIOException, OneWireException {
 	 * @throws OneWireException   Could not find part
 	 */
 	public void readBytes(int memAddr, byte[] buffer, int start, int len) throws OneWireIOException, OneWireException {
-		doSpeed();
-		adapter.reset();
-
-		if (adapter.select(address)) {
-			for (int i = start; i < start + len; i++)
-				buffer[i] = (byte) 0x0ff;
+		this.doSpeed();
+		this.adapter.reset();
 
-			adapter.putByte(READ_DATA_COMMAND);
-			adapter.putByte(memAddr & 0x0ff);
-			adapter.dataBlock(buffer, start, len);
-		} else
+		if (!this.adapter.select(this.address)) {
 			throw new OneWireException("OneWireContainer30-Device not found.");
+		}
+		for (var i = start; i < start + len; i++) {
+			buffer[i] = (byte) 0x0ff;
+		}
+
+		this.adapter.putByte(READ_DATA_COMMAND);
+		this.adapter.putByte(memAddr & 0x0ff);
+		this.adapter.dataBlock(buffer, start, len);
 	}
 
 	/**
@@ -438,25 +442,20 @@ public void readBytes(int memAddr, byte[] buffer, int start, int len) throws One
 	 * @throws OneWireException   Could not find part
 	 */
 	public void writeByte(int memAddr, byte data) throws OneWireIOException, OneWireException {
-		byte[] buffer = new byte[3];
+		var buffer = new byte[3];
 
-		doSpeed();
-		adapter.reset();
+		this.doSpeed();
+		this.adapter.reset();
 
-		if (adapter.select(address)) {
-
-			/* first perform the write */
-			buffer[0] = WRITE_DATA_COMMAND;
-			buffer[1] = (byte) memAddr;
-			buffer[2] = data;
-
-			adapter.dataBlock(buffer, 0, 3);
-
-			// don't read it back for verification...some addresses
-			// have some R-only bits and some RW bits. let the user
-			// verify if they want to
-		} else
+		if (!this.adapter.select(this.address)) {
 			throw new OneWireException("OneWireContainer30-Device not found.");
+		}
+		/* first perform the write */
+		buffer[0] = WRITE_DATA_COMMAND;
+		buffer[1] = (byte) memAddr;
+		buffer[2] = data;
+
+		this.adapter.dataBlock(buffer, 0, 3);
 	}
 
 	/**
@@ -472,48 +471,49 @@ public void writeByte(int memAddr, byte data) throws OneWireIOException, OneWire
 	 * @throws OneWireException   Could not find part
 	 */
 	public byte[] readEEPROMBlock(int blockNumber) throws OneWireIOException, OneWireException {
-		byte[] buffer = new byte[18];
-		byte[] result = new byte[16];
+		var buffer = new byte[18];
+		var result = new byte[16];
 
 		// calculate the address (32 and 48 are valid addresses)
-		byte memAddr = (byte) (32 + (blockNumber * 16));
+		var memAddr = (byte) (32 + blockNumber * 16);
 
 		/* check for valid parameters */
-		if ((blockNumber != 0) & (blockNumber != 1))
+		if (blockNumber != 0 && blockNumber != 1) {
 			throw new IllegalArgumentException(
 					"OneWireContainer30-Block number " + blockNumber + " is not a valid EEPROM block.");
+		}
 
 		/* perform the recall/read and verification */
-		doSpeed();
-		adapter.reset();
+		this.doSpeed();
+		this.adapter.reset();
 
-		if (adapter.select(address)) {
-
-			/* first recall the memory to shadow ram */
-			buffer[0] = RECALL_DATA_COMMAND;
-			buffer[1] = memAddr;
+		if (!this.adapter.select(this.address)) {
+			throw new OneWireException("OneWireContainer30-Device not found.");
+		}
+		/* first recall the memory to shadow ram */
+		buffer[0] = RECALL_DATA_COMMAND;
+		buffer[1] = memAddr;
 
-			adapter.dataBlock(buffer, 0, 2);
+		this.adapter.dataBlock(buffer, 0, 2);
 
-			/* now read the shadow ram */
-			adapter.reset();
-			adapter.select(address);
+		/* now read the shadow ram */
+		this.adapter.reset();
+		this.adapter.select(this.address);
 
-			buffer[0] = READ_DATA_COMMAND;
+		buffer[0] = READ_DATA_COMMAND;
 
-			// buffer[1] should still hold memAddr
-			for (int i = 0; i < 16; i++)
-				buffer[i + 2] = (byte) 0xff;
+		// buffer[1] should still hold memAddr
+		for (var i = 0; i < 16; i++) {
+			buffer[i + 2] = (byte) 0xff;
+		}
 
-			adapter.dataBlock(buffer, 0, 18);
+		this.adapter.dataBlock(buffer, 0, 18);
 
-			// keep this result
-			System.arraycopy(buffer, 2, result, 0, 16);
+		// keep this result
+		System.arraycopy(buffer, 2, result, 0, 16);
 
-			// user can re-read for verification
-			return result;
-		} else
-			throw new OneWireException("OneWireContainer30-Device not found.");
+		// user can re-read for verification
+		return result;
 	}
 
 	/**
@@ -529,66 +529,72 @@ public byte[] readEEPROMBlock(int blockNumber) throws OneWireIOException, OneWir
 	 * @throws OneWireException   Could not find part
 	 */
 	public void writeEEPROMBlock(int blockNumber, byte[] data) throws OneWireIOException, OneWireException {
-		byte[] buffer = new byte[18];
+		var buffer = new byte[18];
 
 		// the first block is at address 32 and the second is at address 48
-		byte memAddr = (byte) (32 + (blockNumber * 16));
+		var memAddr = (byte) (32 + blockNumber * 16);
 
 		/* check for valid parameters */
-		if (data.length < 16)
+		if (data.length < 16) {
 			throw new IllegalArgumentException("OneWireContainer30-Data block must consist of 16 bytes.");
+		}
 
-		if ((blockNumber != 0) && (blockNumber != 1))
+		if (blockNumber != 0 && blockNumber != 1) {
 			throw new IllegalArgumentException(
 					"OneWireContainer30-Block number " + blockNumber + " is not a valid EEPROM block.");
+		}
 
 		// if the EEPROM block is locked throw a OneWireIOException
-		if (((blockNumber == 0) && (getFlag(EEPROM_REGISTER, EEPROM_BLOCK_0_LOCK_FLAG)))
-				|| ((blockNumber == 1) && (getFlag(EEPROM_REGISTER, EEPROM_BLOCK_1_LOCK_FLAG))))
+		if (blockNumber == 0 && this.getFlag(EEPROM_REGISTER, EEPROM_BLOCK_0_LOCK_FLAG)
+				|| blockNumber == 1 && this.getFlag(EEPROM_REGISTER, EEPROM_BLOCK_1_LOCK_FLAG)) {
 			throw new OneWireIOException("OneWireContainer30-Cant write data to locked EEPROM block.");
+		}
 
 		/* perform the write/verification and copy */
-		doSpeed();
-		adapter.reset();
-
-		if (adapter.select(address)) {
+		this.doSpeed();
+		this.adapter.reset();
 
-			/* first write to shadow rom */
-			buffer[0] = WRITE_DATA_COMMAND;
-			buffer[1] = memAddr;
+		if (!this.adapter.select(this.address)) {
+			throw new OneWireException("OneWireContainer30-Device not found.");
+		}
+		/* first write to shadow rom */
+		buffer[0] = WRITE_DATA_COMMAND;
+		buffer[1] = memAddr;
 
-			for (int i = 0; i < 16; i++)
-				buffer[i + 2] = data[i];
+		for (var i = 0; i < 16; i++) {
+			buffer[i + 2] = data[i];
+		}
 
-			adapter.dataBlock(buffer, 0, 18);
+		this.adapter.dataBlock(buffer, 0, 18);
 
-			/* read the shadow ram back for verification */
-			adapter.reset();
-			adapter.select(address);
+		/* read the shadow ram back for verification */
+		this.adapter.reset();
+		this.adapter.select(this.address);
 
-			buffer[0] = READ_DATA_COMMAND;
+		buffer[0] = READ_DATA_COMMAND;
 
-			// buffer[1] should still hold memAddr
-			for (int i = 0; i < 16; i++)
-				buffer[i + 2] = (byte) 0xff;
+		// buffer[1] should still hold memAddr
+		for (var i = 0; i < 16; i++) {
+			buffer[i + 2] = (byte) 0xff;
+		}
 
-			adapter.dataBlock(buffer, 0, 18);
+		this.adapter.dataBlock(buffer, 0, 18);
 
-			// verify data
-			for (int i = 0; i < 16; i++)
-				if (buffer[i + 2] != data[i])
-					throw new OneWireIOException("OneWireContainer30-Error writing EEPROM block" + blockNumber + ".");
+		// verify data
+		for (var i = 0; i < 16; i++) {
+			if (buffer[i + 2] != data[i]) {
+				throw new OneWireIOException("OneWireContainer30-Error writing EEPROM block" + blockNumber + ".");
+			}
+		}
 
-			/* now perform the copy to EEPROM */
-			adapter.reset();
-			adapter.select(address);
+		/* now perform the copy to EEPROM */
+		this.adapter.reset();
+		this.adapter.select(this.address);
 
-			buffer[0] = COPY_DATA_COMMAND;
+		buffer[0] = COPY_DATA_COMMAND;
 
-			// buffer[1] should still hold memAddr
-			adapter.dataBlock(buffer, 0, 2);
-		} else
-			throw new OneWireException("OneWireContainer30-Device not found.");
+		// buffer[1] should still hold memAddr
+		this.adapter.dataBlock(buffer, 0, 2);
 	}
 
 	/**
@@ -603,22 +609,23 @@ public void writeEEPROMBlock(int blockNumber, byte[] data) throws OneWireIOExcep
 	public void lockBlock(int blockNumber) throws OneWireIOException, OneWireException {
 
 		// compute the byte location
-		byte memAddr = (byte) (32 + (blockNumber * 16));
+		var memAddr = (byte) (32 + blockNumber * 16);
 
 		/* check if the block is valid */
-		if ((blockNumber != 0) & (blockNumber != 1))
+		if (blockNumber != 0 && blockNumber != 1) {
 			throw new IllegalArgumentException(
 					"OneWireContainer30-Block " + blockNumber + " is not a valid EEPROM block.");
+		}
 
 		/* perform the lock */
-		doSpeed();
-		adapter.reset();
+		this.doSpeed();
+		this.adapter.reset();
 
-		if (adapter.select(address)) {
-			adapter.putByte(LOCK_COMMAND);
-			adapter.putByte(memAddr);
-		} else
+		if (!this.adapter.select(this.address)) {
 			throw new OneWireException("OneWireContainer30-Device not found.");
+		}
+		this.adapter.putByte(LOCK_COMMAND);
+		this.adapter.putByte(memAddr);
 	}
 
 	/**
@@ -644,10 +651,11 @@ public void lockBlock(int blockNumber) throws OneWireIOException, OneWireExcepti
 	public boolean getFlag(int memAddr, byte flagToGet) throws OneWireIOException, OneWireException {
 
 		// read the byte and perform a simple mask to determine if that byte is on
-		byte data = readByte(memAddr);
+		var data = this.readByte(memAddr);
 
-		if ((data & flagToGet) != 0)
+		if ((data & flagToGet) != 0) {
 			return true;
+		}
 
 		return false;
 	}
@@ -672,17 +680,19 @@ public void setFlag(int memAddr, byte flagToSet, boolean flagValue) throws OneWi
 
 		// the desired default value for the status register flags has to be
 		// set in a separate register for some reason, so I treat it specially.
-		if (memAddr == STATUS_REGISTER)
+		if (memAddr == STATUS_REGISTER) {
 			memAddr = 49;
+		}
 
-		byte data = readByte(memAddr);
+		var data = this.readByte(memAddr);
 
-		if (flagValue)
+		if (flagValue) {
 			data = (byte) (data | flagToSet);
-		else
-			data = (byte) (data & ~(flagToSet));
+		} else {
+			data = (byte) (data & ~flagToSet);
+		}
 
-		writeByte(memAddr, data);
+		this.writeByte(memAddr, data);
 	}
 
 	/**
@@ -698,7 +708,7 @@ public void setFlag(int memAddr, byte flagToSet, boolean flagValue) throws OneWi
 	public double getCurrent(byte[] state) throws OneWireIOException, OneWireException {
 
 		// grab the data
-		int data = ((state[14] << 8) | (state[15] & 0x00ff));
+		var data = state[14] << 8 | state[15] & 0x00ff;
 
 		data = data >> 3;
 
@@ -706,12 +716,11 @@ public double getCurrent(byte[] state) throws OneWireIOException, OneWireExcepti
 
 		// when the internal resistor is used, the device calculates it for you
 		// the resolution is .625 mA
-		if (internalResistor)
-			result = (data * .625) / 1000;
-
-		// otherwise convert to Amperes
-		else
-			result = data * .000015625 / Rsens;
+		if (this.internalResistor) {
+			result = data * .625 / 1000;
+		} else {
+			result = data * .000015625 / this.Rsens;
+		}
 
 		return result;
 	}
@@ -735,14 +744,15 @@ public void setRemainingCapacity(double remainingCapacity) throws OneWireIOExcep
 		int data;
 
 		// if the internal resistor is used, it can be stored as is (in mAH)
-		if (internalResistor)
+		if (this.internalResistor) {
 			data = (int) (remainingCapacity * 4);
-		else
-			data = (int) (remainingCapacity * Rsens / .00626);
+		} else {
+			data = (int) (remainingCapacity * this.Rsens / .00626);
+		}
 
 		// break into bytes and store
-		writeByte(16, (byte) (data >> 8));
-		writeByte(17, (byte) (data & 0xff));
+		this.writeByte(16, (byte) (data >> 8));
+		this.writeByte(17, (byte) (data & 0xff));
 	}
 
 	/**
@@ -756,18 +766,17 @@ public void setRemainingCapacity(double remainingCapacity) throws OneWireIOExcep
 	 * @throws OneWireException   Could not find part
 	 */
 	public double getRemainingCapacity(byte[] state) throws OneWireIOException, OneWireException {
-		double result = 0;
+		var result = 0D;
 
 		// grab the data
-		int data = ((state[16] & 0xff) << 8) | (state[17] & 0xff);
+		var data = (state[16] & 0xff) << 8 | state[17] & 0xff;
 
 		// if the internal resistor is being used the part calculates it for us
-		if (internalResistor)
+		if (this.internalResistor) {
 			result = data / 4.0;
-
-		// this equation can be found on the data sheet
-		else
-			result = data * .00626 / Rsens;
+		} else {
+			result = data * .00626 / this.Rsens;
+		}
 
 		return result;
 	}
@@ -787,7 +796,7 @@ public void setLatchState(boolean on) throws OneWireIOException, OneWireExceptio
 
 		// since bit 0 is read-only and bits 2-7 are don't cares,
 		// we don't need to read location 8 first, we can just write
-		writeByte(8, (byte) (on ? 0x40 : 0x00));
+		this.writeByte(8, (byte) (on ? 0x40 : 0x00));
 	}
 
 	/**
@@ -799,7 +808,7 @@ public void setLatchState(boolean on) throws OneWireIOException, OneWireExceptio
 	 * @throws OneWireException   Could not find part
 	 */
 	public boolean getLatchState() throws OneWireIOException, OneWireException {
-		return ((readByte(8) & 0x40) == 0x40);
+		return (this.readByte(8) & 0x40) == 0x40;
 	}
 
 	/**
@@ -811,9 +820,9 @@ public boolean getLatchState() throws OneWireIOException, OneWireException {
 	 * @throws OneWireException   Could not find part
 	 */
 	public void clearConditions() throws OneWireIOException, OneWireException {
-		byte protect_reg = readByte(0);
+		var protect_reg = this.readByte(0);
 
-		writeByte(0, (byte) (protect_reg & 0x0f));
+		this.writeByte(0, (byte) (protect_reg & 0x0f));
 	}
 
 	/////////////////////////////////////////////////////////////////////
@@ -832,6 +841,7 @@ public void clearConditions() throws OneWireIOException, OneWireException {
 	 *
 	 * @return number of channels
 	 */
+	@Override
 	public int getNumberADChannels() {
 		return 2;
 	}
@@ -841,6 +851,7 @@ public int getNumberADChannels() {
 	 *
 	 * @return <CODE>true</CODE> if has high/low trips
 	 */
+	@Override
 	public boolean hasADAlarms() {
 		return false;
 	}
@@ -853,8 +864,9 @@ public boolean hasADAlarms() {
 	 *
 	 * @return available ranges
 	 */
+	@Override
 	public double[] getADRanges(int channel) {
-		double[] result = new double[1];
+		var result = new double[1];
 
 		result[0] = 5.0;
 
@@ -871,10 +883,11 @@ public double[] getADRanges(int channel) {
 	 *
 	 * @return available resolutions
 	 */
+	@Override
 	public double[] getADResolutions(int channel, double range) {
-		double[] result = new double[1];
+		var result = new double[1];
 
-		result[0] = getADResolution(channel, null);
+		result[0] = this.getADResolution(channel, null);
 
 		return result;
 	}
@@ -885,6 +898,7 @@ public double[] getADResolutions(int channel, double range) {
 	 *
 	 * @return <CODE>true</CODE> if can do multi-channel voltage reads
 	 */
+	@Override
 	public boolean canADMultiChannelRead() {
 		return false;
 	}
@@ -905,6 +919,7 @@ public boolean canADMultiChannelRead() {
 	 * @throws OneWireIOException Error writing data
 	 * @throws OneWireException   Could not find device
 	 */
+	@Override
 	public void doADConvert(int channel, byte[] state) throws OneWireIOException, OneWireException {
 
 		// this actually should be an airball as well...
@@ -929,6 +944,7 @@ public void doADConvert(int channel, byte[] state) throws OneWireIOException, On
 	 * @throws OneWireIOException Error writing data
 	 * @throws OneWireException   Device does not support multi-channel reading
 	 */
+	@Override
 	public void doADConvert(boolean[] doConvert, byte[] state) throws OneWireIOException, OneWireException {
 		throw new OneWireException("This device does not support multi-channel reading");
 	}
@@ -947,6 +963,7 @@ public void doADConvert(boolean[] doConvert, byte[] state) throws OneWireIOExcep
 	 * @throws OneWireIOException Error writing data
 	 * @throws OneWireException   Device does not support multi-channel reading
 	 */
+	@Override
 	public double[] getADVoltage(byte[] state) throws OneWireIOException, OneWireException {
 		throw new OneWireException("This device does not support multi-channel reading");
 	}
@@ -968,15 +985,16 @@ public double[] getADVoltage(byte[] state) throws OneWireIOException, OneWireExc
 	 * @throws OneWireIOException Error reading data
 	 * @throws OneWireException   Could not find device
 	 */
+	@Override
 	public double getADVoltage(int channel, byte[] state) throws OneWireIOException, OneWireException {
-		if (channel < 0 || channel > 1)
+		if (channel < 0 || channel > 1) {
 			throw new OneWireException("Invalid channel");
+		}
 
 		int data;
-		double result = 0.0;
 
 		// the measurement is put in two bytes, (MSB) and (LSB).
-		data = (state[12 + channel * 2] << 8) | (state[13 + channel * 2] & 0x00ff);
+		data = state[12 + channel * 2] << 8 | state[13 + channel * 2] & 0x00ff;
 
 		if (channel == 0) {
 			// the voltage measurement channel
@@ -990,10 +1008,7 @@ public double getADVoltage(int channel, byte[] state) throws OneWireIOException,
 			data = data >> 3;
 		}
 
-		// that raw measurement is in 'resolution' units -> convert to volts
-		result = data * getADResolution(channel, state);
-
-		return result;
+		return data * this.getADResolution(channel, state);
 	}
 
 	// --------
@@ -1016,6 +1031,7 @@ public double getADVoltage(int channel, byte[] state) throws OneWireIOException,
 	 *
 	 * @throws OneWireException Device does not support A/D alarms
 	 */
+	@Override
 	public double getADAlarm(int channel, int alarmType, byte[] state) throws OneWireException {
 		throw new OneWireException("This device does not have AD alarms");
 	}
@@ -1036,6 +1052,7 @@ public double getADAlarm(int channel, int alarmType, byte[] state) throws OneWir
 	 *
 	 * @throws OneWireException Device does not support A/D alarms
 	 */
+	@Override
 	public boolean getADAlarmEnable(int channel, int alarmType, byte[] state) throws OneWireException {
 		throw new OneWireException("This device does not have AD alarms");
 	}
@@ -1056,6 +1073,7 @@ public boolean getADAlarmEnable(int channel, int alarmType, byte[] state) throws
 	 *
 	 * @throws OneWireException Device does not support A/D alarms
 	 */
+	@Override
 	public boolean hasADAlarmed(int channel, int alarmType, byte[] state) throws OneWireException {
 		throw new OneWireException("This device does not have AD alarms");
 	}
@@ -1072,18 +1090,18 @@ public boolean hasADAlarmed(int channel, int alarmType, byte[] state) throws One
 	 *
 	 * @return A/D resolution of channel in volts
 	 */
+	@Override
 	public double getADResolution(int channel, byte[] state) {
 		if (channel == 0) {
 			return 0.00488; // its always the same!
+		}
+		if (this.internalResistor) {
+			// 0.625 mV units
+			return 0.000625d;
 		} else {
-			// if internal resistor is used
-			if (internalResistor)
-				// 0.625 mV units
-				return 0.000625d;
-			else
-				// external resistor is used
-				// 15.625 uV units
-				return .000015625d;
+			// external resistor is used
+			// 15.625 uV units
+			return .000015625d;
 		}
 	}
 
@@ -1099,6 +1117,7 @@ public double getADResolution(int channel, byte[] state) {
 	 *
 	 * @return A/D input voltage range
 	 */
+	@Override
 	public double getADRange(int channel, byte[] state) {
 		return 5.0; // so is this one!
 	}
@@ -1124,6 +1143,7 @@ public double getADRange(int channel, byte[] state) {
 	 *
 	 * @throws OneWireException Device does not support A/D alarms
 	 */
+	@Override
 	public void setADAlarm(int channel, int alarmType, double alarm, byte[] state) throws OneWireException {
 		throw new OneWireException("This device does not have AD alarms");
 	}
@@ -1145,6 +1165,7 @@ public void setADAlarm(int channel, int alarmType, double alarm, byte[] state) t
 	 *
 	 * @throws OneWireException Device does not support A/D alarms
 	 */
+	@Override
 	public void setADAlarmEnable(int channel, int alarmType, boolean alarmEnable, byte[] state)
 			throws OneWireException {
 		throw new OneWireException("This device does not have AD alarms");
@@ -1163,6 +1184,7 @@ public void setADAlarmEnable(int channel, int alarmType, boolean alarmEnable, by
 	 * @param state      current state of the device returned from
 	 *                   <CODE>readDevice()</CODE>
 	 */
+	@Override
 	public void setADResolution(int channel, double resolution, byte[] state) {
 
 		// airball! no resolutions to set!
@@ -1182,6 +1204,7 @@ public void setADResolution(int channel, double resolution, byte[] state) {
 	 * @param state   current state of the device returned from
 	 *                <CODE>readDevice()</CODE>
 	 */
+	@Override
 	public void setADRange(int channel, double range, byte[] state) {
 
 		// yet another airball--YAAB...only one range on this part
@@ -1196,6 +1219,7 @@ public void setADRange(int channel, double range, byte[] state) {
 	 *
 	 * @return <CODE>true</CODE> if has high/low temperature trip alarms
 	 */
+	@Override
 	public boolean hasTemperatureAlarms() {
 		return false;
 	}
@@ -1205,6 +1229,7 @@ public boolean hasTemperatureAlarms() {
 	 *
 	 * @return <CODE>true</CODE> if has selectable temperature resolution
 	 */
+	@Override
 	public boolean hasSelectableTemperatureResolution() {
 		return false;
 	}
@@ -1214,8 +1239,9 @@ public boolean hasSelectableTemperatureResolution() {
 	 *
 	 * @return available temperature resolutions in degrees C
 	 */
+	@Override
 	public double[] getTemperatureResolutions() {
-		double[] result = new double[1];
+		var result = new double[1];
 
 		result[0] = 0.125;
 
@@ -1229,6 +1255,7 @@ public double[] getTemperatureResolutions() {
 	 *
 	 * @throws OneWireException Device does not support temperature alarms
 	 */
+	@Override
 	public double getTemperatureAlarmResolution() throws OneWireException {
 		throw new OneWireException("This device does not have temperature alarms");
 	}
@@ -1238,6 +1265,7 @@ public double getTemperatureAlarmResolution() throws OneWireException {
 	 *
 	 * @return maximum temperature in degrees C
 	 */
+	@Override
 	public double getMaxTemperature() {
 		return 85.0;
 	}
@@ -1247,6 +1275,7 @@ public double getMaxTemperature() {
 	 *
 	 * @return minimum temperature in degrees C
 	 */
+	@Override
 	public double getMinTemperature() {
 		return -40.0;
 	}
@@ -1263,6 +1292,7 @@ public double getMinTemperature() {
 	 * @throws OneWireIOException Error writing data
 	 * @throws OneWireException   Could not find device
 	 */
+	@Override
 	public void doTemperatureConvert(byte[] state) throws OneWireIOException, OneWireException {
 
 		// for the same reason we don't have to do an AD conversion,
@@ -1283,19 +1313,16 @@ public void doTemperatureConvert(byte[] state) throws OneWireIOException, OneWir
 	 * @return temperature in degrees C from the last
 	 *         <CODE>doTemperatureConvert()</CODE>
 	 */
+	@Override
 	public double getTemperature(byte[] state) {
-		double temperature;
 		int data;
 
 		// the MSB is at 24, the LSB at 25 and the format is so that when
 		// attached, the whole thing must be shifted right 5 (Signed)
-		data = (state[24] << 8) | (state[25] & 0x00ff);
+		data = state[24] << 8 | state[25] & 0x00ff;
 		data = data >> 5;
 
-		// that raw measurement is in .125 degree units
-		temperature = data / 8.0;
-
-		return temperature;
+		return data / 8.0;
 	}
 
 	/**
@@ -1310,6 +1337,7 @@ public double getTemperature(byte[] state) {
 	 *
 	 * @throws OneWireException Device does not support temperature alarms
 	 */
+	@Override
 	public double getTemperatureAlarm(int alarmType, byte[] state) throws OneWireException {
 		throw new OneWireException("This device does not have temperature alarms");
 	}
@@ -1322,6 +1350,7 @@ public double getTemperatureAlarm(int alarmType, byte[] state) throws OneWireExc
 	 *
 	 * @return temperature resolution in degrees C
 	 */
+	@Override
 	public double getTemperatureResolution(byte[] state) {
 		return 0.125;
 	}
@@ -1343,6 +1372,7 @@ public double getTemperatureResolution(byte[] state) {
 	 * @throws OneWireIOException Error writing data
 	 * @throws OneWireException   Device does not support temperature alarms
 	 */
+	@Override
 	public void setTemperatureAlarm(int alarmType, double alarmValue, byte[] state)
 			throws OneWireException, OneWireIOException {
 		throw new OneWireException("This device does not have temperature alarms");
@@ -1359,6 +1389,7 @@ public void setTemperatureAlarm(int alarmType, double alarmValue, byte[] state)
 	 * @throws OneWireIOException Error writing data
 	 * @throws OneWireException   Could not find device
 	 */
+	@Override
 	public void setTemperatureResolution(double resolution, byte[] state) throws OneWireException, OneWireIOException {
 
 		// airball, there can be only ONE resolution!
@@ -1383,21 +1414,21 @@ public void setTemperatureResolution(double resolution, byte[] state) throws One
 	 * @throws OneWireIOException Error reading data
 	 * @throws OneWireException   Could not find device
 	 */
+	@Override
 	public byte[] readDevice() throws OneWireIOException, OneWireException {
-		byte[] result = new byte[32];
+		var result = new byte[32];
 
 		/* perform the read twice to ensure a good transmission */
-		doSpeed();
-		adapter.reset();
-
-		if (adapter.select(address)) {
+		this.doSpeed();
+		this.adapter.reset();
 
-			/* do the first read */
-			adapter.putByte(READ_DATA_COMMAND);
-			adapter.putByte(0);
-			adapter.getBlock(result, 0, 32);
-		} else
+		if (!this.adapter.select(this.address)) {
 			throw new OneWireException("OneWireContainer30-Device not found.");
+		}
+		/* do the first read */
+		this.adapter.putByte(READ_DATA_COMMAND);
+		this.adapter.putByte(0);
+		this.adapter.getBlock(result, 0, 32);
 
 		return result;
 	}
@@ -1412,6 +1443,7 @@ public byte[] readDevice() throws OneWireIOException, OneWireException {
 	 * @throws OneWireIOException Error writing data
 	 * @throws OneWireException   Could not find device
 	 */
+	@Override
 	public void writeDevice(byte[] state) throws OneWireIOException, OneWireException {
 
 		/*
diff --git a/io.openems.edge.bridge.onewire/src/com/dalsemi/onewire/container/OneWireContainer33.java b/io.openems.edge.bridge.onewire/src/com/dalsemi/onewire/container/OneWireContainer33.java
index af203e6c826..7759e6533b8 100644
--- a/io.openems.edge.bridge.onewire/src/com/dalsemi/onewire/container/OneWireContainer33.java
+++ b/io.openems.edge.bridge.onewire/src/com/dalsemi/onewire/container/OneWireContainer33.java
@@ -122,7 +122,7 @@
  * <DD>
  * <H4>Example 1</H4> Display some features of isMACValid where owd is an
  * instanceof OneWireContainer33 and bank is an instanceof PagedMemoryBank:
- * 
+ *
  * <PRE>
  *  <CODE>
  *  byte[] read_buf  = new byte [bank.getPageLength()];
@@ -167,29 +167,23 @@
  * @version 0.00, 19 Dec 2000
  * @author JPE
  */
-@SuppressWarnings({ "unused" })
 public class OneWireContainer33 extends OneWireContainer {
-	// turns on extra debugging output in all 1-wire containers
-	private static final boolean DEBUG = false;
 
 	// --------
 	// -------- Static Final Variables
 	// --------
 
 	/** Private Secret */
-	private byte[] secret = new byte[8];
+	private final byte[] secret = new byte[8];
 
 	/** Challenge to use for the Read Authenticate Methods */
-	private byte[] challenge = new byte[3];
+	private final byte[] challenge = new byte[3];
 
 	/** The different memory banks for the container. */
 	private MemoryBankScratchSHAEE mbScratchpad;
 	private MemoryBankSHAEE memstatus;
 	private final MemoryBankSHAEE[] memoryPages = new MemoryBankSHAEE[4];
 
-	/** Buffer used to hold MAC for certain calls */
-	private byte[] MAC_buffer = new byte[20];
-
 	/** Flag to indicate if the secret has been set. */
 	protected boolean secretSet;
 
@@ -220,13 +214,11 @@ public class OneWireContainer33 extends OneWireContainer {
 	 * using.
 	 */
 	public OneWireContainer33() {
-		super();
-
-		System.arraycopy(ffBlock, 0, secret, 0, 8);
-		System.arraycopy(ffBlock, 0, challenge, 0, 3);
+		System.arraycopy(ffBlock, 0, this.secret, 0, 8);
+		System.arraycopy(ffBlock, 0, this.challenge, 0, 3);
 
-		setAdapter = false;
-		container_check = false;
+		this.setAdapter = false;
+		this.container_check = false;
 	}
 
 	/**
@@ -240,12 +232,12 @@ public OneWireContainer33() {
 	public OneWireContainer33(DSPortAdapter sourceAdapter, byte[] newAddress) {
 		super(sourceAdapter, newAddress);
 
-		System.arraycopy(ffBlock, 0, secret, 0, 8);
-		System.arraycopy(ffBlock, 0, challenge, 0, 3);
+		System.arraycopy(ffBlock, 0, this.secret, 0, 8);
+		System.arraycopy(ffBlock, 0, this.challenge, 0, 3);
 
-		setAdapter = true;
-		container_check = false;
-		initmem();
+		this.setAdapter = true;
+		this.container_check = false;
+		this.initmem();
 	}
 
 	/**
@@ -259,12 +251,12 @@ public OneWireContainer33(DSPortAdapter sourceAdapter, byte[] newAddress) {
 	public OneWireContainer33(DSPortAdapter sourceAdapter, long newAddress) {
 		super(sourceAdapter, newAddress);
 
-		System.arraycopy(ffBlock, 0, secret, 0, 8);
-		System.arraycopy(ffBlock, 0, challenge, 0, 3);
+		System.arraycopy(ffBlock, 0, this.secret, 0, 8);
+		System.arraycopy(ffBlock, 0, this.challenge, 0, 3);
 
-		setAdapter = true;
-		container_check = false;
-		initmem();
+		this.setAdapter = true;
+		this.container_check = false;
+		this.initmem();
 	}
 
 	/**
@@ -278,12 +270,12 @@ public OneWireContainer33(DSPortAdapter sourceAdapter, long newAddress) {
 	public OneWireContainer33(DSPortAdapter sourceAdapter, String newAddress) {
 		super(sourceAdapter, newAddress);
 
-		System.arraycopy(ffBlock, 0, secret, 0, 8);
-		System.arraycopy(ffBlock, 0, challenge, 0, 3);
+		System.arraycopy(ffBlock, 0, this.secret, 0, 8);
+		System.arraycopy(ffBlock, 0, this.challenge, 0, 3);
 
-		setAdapter = true;
-		container_check = false;
-		initmem();
+		this.setAdapter = true;
+		this.container_check = false;
+		this.initmem();
 	}
 
 	// --------
@@ -296,7 +288,7 @@ public OneWireContainer33(DSPortAdapter sourceAdapter, String newAddress) {
 	 * @return boolean telling weather an adapter has been set.
 	 */
 	protected boolean adapterSet() {
-		return setAdapter;
+		return this.setAdapter;
 	}
 
 	/**
@@ -307,13 +299,15 @@ protected boolean adapterSet() {
 	 *                      iButton.
 	 * @param newAddress    address of this 1-Wire device
 	 */
+	@Override
 	public void setupContainer(DSPortAdapter sourceAdapter, byte[] newAddress) {
 		super.setupContainer(sourceAdapter, newAddress);
 
-		if (!setAdapter)
-			initmem();
+		if (!this.setAdapter) {
+			this.initmem();
+		}
 
-		setAdapter = true;
+		this.setAdapter = true;
 	}
 
 	/**
@@ -324,13 +318,15 @@ public void setupContainer(DSPortAdapter sourceAdapter, byte[] newAddress) {
 	 *                      iButton.
 	 * @param newAddress    address of this 1-Wire device
 	 */
+	@Override
 	public void setupContainer(DSPortAdapter sourceAdapter, long newAddress) {
 		super.setupContainer(sourceAdapter, newAddress);
 
-		if (!setAdapter)
-			initmem();
+		if (!this.setAdapter) {
+			this.initmem();
+		}
 
-		setAdapter = true;
+		this.setAdapter = true;
 	}
 
 	/**
@@ -341,13 +337,15 @@ public void setupContainer(DSPortAdapter sourceAdapter, long newAddress) {
 	 *                      iButton.
 	 * @param newAddress    address of this 1-Wire device
 	 */
+	@Override
 	public void setupContainer(DSPortAdapter sourceAdapter, String newAddress) {
 		super.setupContainer(sourceAdapter, newAddress);
 
-		if (!setAdapter)
-			initmem();
+		if (!this.setAdapter) {
+			this.initmem();
+		}
 
-		setAdapter = true;
+		this.setAdapter = true;
 	}
 
 	/**
@@ -356,6 +354,7 @@ public void setupContainer(DSPortAdapter sourceAdapter, String newAddress) {
 	 *
 	 * @return string representation of the iButton name.
 	 */
+	@Override
 	public String getName() {
 		return "DS1961S";
 	}
@@ -367,6 +366,7 @@ public String getName() {
 	 *
 	 * @return the alternate names for this iButton or 1-Wire device
 	 */
+	@Override
 	public String getAlternateNames() {
 		return "DS2432";
 	}
@@ -376,6 +376,7 @@ public String getAlternateNames() {
 	 *
 	 * @return string representation of the function description.
 	 */
+	@Override
 	public String getDescription() {
 		return "1K-Bit protected 1-Wire EEPROM with SHA-1 Engine.";
 	}
@@ -385,6 +386,7 @@ public String getDescription() {
 	 *
 	 * @return max. communication speed.
 	 */
+	@Override
 	public int getMaxSpeed() {
 		return DSPortAdapter.SPEED_OVERDRIVE;
 	}
@@ -395,17 +397,18 @@ public int getMaxSpeed() {
 	 * MemoryBank}, {@link com.dalsemi.onewire.container.PagedMemoryBank
 	 * PagedMemoryBank}, and {@link com.dalsemi.onewire.container.OTPMemoryBank
 	 * OTPMemoryBank}.
-	 * 
+	 *
 	 * @return <CODE>Enumeration</CODE> of memory banks
 	 */
+	@Override
 	public Enumeration<MemoryBank> getMemoryBanks() {
-		Vector<MemoryBank> bank_vector = new Vector<>(4);
+		var bank_vector = new Vector<MemoryBank>(4);
 
-		bank_vector.addElement(mbScratchpad);
-		bank_vector.addElement(memoryPages[0]);
-		bank_vector.addElement(memoryPages[1]);
-		bank_vector.addElement(memoryPages[2]);
-		bank_vector.addElement(memstatus);
+		bank_vector.addElement(this.mbScratchpad);
+		bank_vector.addElement(this.memoryPages[0]);
+		bank_vector.addElement(this.memoryPages[1]);
+		bank_vector.addElement(this.memoryPages[2]);
+		bank_vector.addElement(this.memstatus);
 
 		return bank_vector.elements();
 	}
@@ -418,7 +421,7 @@ public Enumeration<MemoryBank> getMemoryBanks() {
 	 * @return the instance of the Scratchpad memory bank
 	 */
 	public MemoryBankScratchSHAEE getScratchpadMemoryBank() {
-		return mbScratchpad;
+		return this.mbScratchpad;
 	}
 
 	/**
@@ -427,7 +430,7 @@ public MemoryBankScratchSHAEE getScratchpadMemoryBank() {
 	 * @return the instance of the Status page memory bank
 	 */
 	public MemoryBankSHAEE getStatusPageMemoryBank() {
-		return memstatus;
+		return this.memstatus;
 	}
 
 	/**
@@ -438,9 +441,10 @@ public MemoryBankSHAEE getStatusPageMemoryBank() {
 	 * @return the instance of the memory bank for the specified page
 	 */
 	public MemoryBankSHAEE getMemoryBankForPage(int page) {
-		if (page == 3)
+		if (page == 3) {
 			page = 2;
-		return memoryPages[page];
+		}
+		return this.memoryPages[page];
 	}
 
 	/**
@@ -450,8 +454,8 @@ public MemoryBankSHAEE getMemoryBankForPage(int page) {
 	 * @param offset    index into array to copy the secret from
 	 */
 	public void setContainerSecret(byte[] newSecret, int offset) {
-		System.arraycopy(newSecret, offset, secret, 0, 8);
-		secretSet = true;
+		System.arraycopy(newSecret, offset, this.secret, 0, 8);
+		this.secretSet = true;
 	}
 
 	/**
@@ -461,7 +465,7 @@ public void setContainerSecret(byte[] newSecret, int offset) {
 	 * @param offset    index into array to copy the secret to
 	 */
 	public void getContainerSecret(byte[] secretBuf, int offset) {
-		System.arraycopy(secret, 0, secretBuf, offset, 8);
+		System.arraycopy(this.secret, 0, secretBuf, offset, 8);
 	}
 
 	/**
@@ -476,7 +480,7 @@ public boolean isContainerSecretSet() throws OneWireIOException, OneWireExceptio
 		// if(!container_check)
 		// container_check = this.checkStatus();
 
-		return (secretSet);
+		return this.secretSet;
 	}
 
 	/**
@@ -488,10 +492,11 @@ public boolean isContainerSecretSet() throws OneWireIOException, OneWireExceptio
 	 * @throws OneWireException
 	 */
 	public boolean isSecretWriteProtected() throws OneWireIOException, OneWireException {
-		if (!container_check)
-			container_check = this.checkStatus();
+		if (!this.container_check) {
+			this.container_check = this.checkStatus();
+		}
 
-		return secretProtected;
+		return this.secretProtected;
 	}
 
 	/**
@@ -500,7 +505,7 @@ public boolean isSecretWriteProtected() throws OneWireIOException, OneWireExcept
 	 * @param challengeset Challenge for all the memory banks.
 	 */
 	public void setChallenge(byte[] challengeset, int offset) {
-		System.arraycopy(challengeset, offset, challenge, 0, 3);
+		System.arraycopy(challengeset, offset, this.challenge, 0, 3);
 	}
 
 	/**
@@ -509,7 +514,7 @@ public void setChallenge(byte[] challengeset, int offset) {
 	 * @param get array of bytes containing the iButton challenge
 	 */
 	public void getChallenge(byte[] get, int offset) {
-		System.arraycopy(challenge, 0, get, offset, 3);
+		System.arraycopy(this.challenge, 0, get, offset, 3);
 	}
 
 	/**
@@ -521,42 +526,45 @@ public void getChallenge(byte[] get, int offset) {
 	 * @throws OneWireException
 	 */
 	public boolean isWriteProtectAllSet() throws OneWireIOException, OneWireException {
-		if (!container_check)
-			container_check = this.checkStatus();
+		if (!this.container_check) {
+			this.container_check = this.checkStatus();
+		}
 
-		return memoryPages[2].readOnly;
+		return this.memoryPages[2].readOnly;
 	}
 
 	/**
 	 * Write protects the secret for the DS2432.
 	 */
 	public void writeProtectSecret() throws OneWireIOException, OneWireException {
-		if (!container_check)
-			container_check = this.checkStatus();
+		if (!this.container_check) {
+			this.container_check = this.checkStatus();
+		}
 
 		// write protect secret
 		// - write status byte to address
 		// ((8h) + physical) = 88h
-		memstatus.write(8, ACTIVATION_BYTE, 0, 1);
+		this.memstatus.write(8, ACTIVATION_BYTE, 0, 1);
 
-		secretProtected = true;
+		this.secretProtected = true;
 	}
 
 	/**
 	 * Write protect pages 0 to 3
 	 */
 	public void writeProtectAll() throws OneWireIOException, OneWireException {
-		if (!container_check)
-			container_check = this.checkStatus();
+		if (!this.container_check) {
+			this.container_check = this.checkStatus();
+		}
 
 		// write protect all pages
 		// - write status byte to address
 		// ((9h) + physical) = 89h
-		memstatus.write(9, ACTIVATION_BYTE, 0, 1);
+		this.memstatus.write(9, ACTIVATION_BYTE, 0, 1);
 
-		memoryPages[0].writeprotect();
-		memoryPages[1].writeprotect();
-		memoryPages[2].writeprotect();
+		this.memoryPages[0].writeprotect();
+		this.memoryPages[1].writeprotect();
+		this.memoryPages[2].writeprotect();
 	}
 
 	/**
@@ -564,15 +572,16 @@ public void writeProtectAll() throws OneWireIOException, OneWireException {
 	 * to once.
 	 */
 	public void setEPROMModePageOne() throws OneWireIOException, OneWireException {
-		if (!container_check)
-			container_check = this.checkStatus();
+		if (!this.container_check) {
+			this.container_check = this.checkStatus();
+		}
 
 		// Enable EPROM mode for page 1.
 		// - write status byte to address
 		// ((12h) + physical) = 8Ch
-		memstatus.write(12, ACTIVATION_BYTE, 0, 1);
+		this.memstatus.write(12, ACTIVATION_BYTE, 0, 1);
 
-		memoryPages[1].setEPROM();
+		this.memoryPages[1].setEPROM();
 	}
 
 	/**
@@ -584,25 +593,27 @@ public void setEPROMModePageOne() throws OneWireIOException, OneWireException {
 	 * @throws OneWireException
 	 */
 	public boolean isPageOneEPROMmode() throws OneWireIOException, OneWireException {
-		if (!container_check)
-			container_check = this.checkStatus();
+		if (!this.container_check) {
+			this.container_check = this.checkStatus();
+		}
 
-		return memoryPages[1].isWriteOnce();
+		return this.memoryPages[1].isWriteOnce();
 	}
 
 	/**
 	 * Write protect page zero only.
 	 */
 	public void writeProtectPageZero() throws OneWireIOException, OneWireException {
-		if (!container_check)
-			container_check = this.checkStatus();
+		if (!this.container_check) {
+			this.container_check = this.checkStatus();
+		}
 
 		// Enable Write protection for page zero.
 		// - write status byte to address
 		// ((13h) + physical) = 8Dh
-		memstatus.write(13, ACTIVATION_BYTE, 0, 1);
+		this.memstatus.write(13, ACTIVATION_BYTE, 0, 1);
 
-		memoryPages[0].writeprotect();
+		this.memoryPages[0].writeprotect();
 	}
 
 	/**
@@ -614,10 +625,11 @@ public void writeProtectPageZero() throws OneWireIOException, OneWireException {
 	 * @throws OneWireException
 	 */
 	public boolean isWriteProtectPageZeroSet() throws OneWireIOException, OneWireException {
-		if (!container_check)
-			container_check = this.checkStatus();
+		if (!this.container_check) {
+			this.container_check = this.checkStatus();
+		}
 
-		return memoryPages[0].isReadOnly();
+		return this.memoryPages[0].isReadOnly();
 	}
 
 	/**
@@ -629,10 +641,11 @@ public boolean isWriteProtectPageZeroSet() throws OneWireIOException, OneWireExc
 	 */
 	public void computeNextSecret(int pageNum, byte[] partialsecret, int offset)
 			throws OneWireIOException, OneWireException {
-		if (!container_check)
-			container_check = this.checkStatus();
+		if (!this.container_check) {
+			this.container_check = this.checkStatus();
+		}
 
-		mbScratchpad.computeNextSecret(pageNum * 32, partialsecret, offset);
+		this.mbScratchpad.computeNextSecret(pageNum * 32, partialsecret, offset);
 	}
 
 	/**
@@ -641,10 +654,11 @@ public void computeNextSecret(int pageNum, byte[] partialsecret, int offset)
 	 * @param addr address of page to use for the next secret computation.
 	 */
 	public void computeNextSecret(int pageNum) throws OneWireIOException, OneWireException {
-		if (!container_check)
-			container_check = this.checkStatus();
+		if (!this.container_check) {
+			this.container_check = this.checkStatus();
+		}
 
-		mbScratchpad.computeNextSecret(pageNum * 32);
+		this.mbScratchpad.computeNextSecret(pageNum * 32);
 	}
 
 	/**
@@ -656,10 +670,11 @@ public void computeNextSecret(int pageNum) throws OneWireIOException, OneWireExc
 	 * @throws OneWireException
 	 */
 	public boolean loadFirstSecret(byte[] data, int offset) throws OneWireIOException, OneWireException {
-		if (!container_check)
-			container_check = this.checkStatus();
+		if (!this.container_check) {
+			this.container_check = this.checkStatus();
+		}
 
-		mbScratchpad.loadFirstSecret(0x080, data, offset);
+		this.mbScratchpad.loadFirstSecret(0x080, data, offset);
 		return true;
 	}
 
@@ -676,19 +691,20 @@ public boolean loadFirstSecret(byte[] data, int offset) throws OneWireIOExceptio
 	 * @return <code>true</code> if refresh is successful.
 	 */
 	public boolean refreshPage(int page, int offset) throws OneWireException, OneWireIOException {
-		if (!container_check)
-			container_check = this.checkStatus();
+		if (!this.container_check) {
+			this.container_check = this.checkStatus();
+		}
 
-		int addr = page * 32 + offset;
+		var addr = page * 32 + offset;
 		try {
-			mbScratchpad.refreshScratchpad(addr);
+			this.mbScratchpad.refreshScratchpad(addr);
 		} catch (OneWireException owe) {
 			// only return false for the DS2432 devices
 			// which do not support this command
 			return false;
 		}
 
-		mbScratchpad.loadFirstSecret(addr);
+		this.mbScratchpad.loadFirstSecret(addr);
 		return true;
 	}
 
@@ -704,7 +720,8 @@ public boolean refreshPage(int page, int offset) throws OneWireException, OneWir
 	 * @return <code>true</code> if refresh is successful.
 	 */
 	public boolean refreshPage(int page) throws OneWireException, OneWireIOException {
-		return refreshPage(page, 0) && refreshPage(page, 8) && refreshPage(page, 16) && refreshPage(page, 24);
+		return this.refreshPage(page, 0) && this.refreshPage(page, 8) && this.refreshPage(page, 16)
+				&& this.refreshPage(page, 24);
 	}
 
 	/**
@@ -713,126 +730,127 @@ public boolean refreshPage(int page) throws OneWireException, OneWireIOException
 	 * @return boolean saying the part has been checked or was checked.
 	 */
 	protected boolean checkStatus() throws OneWireIOException, OneWireException {
-		if (!container_check) {
-			byte[] mem = new byte[8];
+		if (!this.container_check) {
+			var mem = new byte[8];
 
-			memstatus.read(8, false, mem, 0, 8);
+			this.memstatus.read(8, false, mem, 0, 8);
 
-			if ((mem[0] == (byte) 0xAA) || (mem[0] == (byte) 0x55))
-				secretProtected = true;
-			else
-				secretProtected = false;
+			if (mem[0] == (byte) 0xAA || mem[0] == (byte) 0x55) {
+				this.secretProtected = true;
+			} else {
+				this.secretProtected = false;
+			}
 
-			if (((mem[1] == (byte) 0xAA) || (mem[1] == (byte) 0x55))
-					|| ((mem[5] == (byte) 0xAA) || (mem[5] == (byte) 0x55))) {
-				memoryPages[0].readWrite = false;
-				memoryPages[0].readOnly = true;
+			if (mem[1] == (byte) 0xAA || mem[1] == (byte) 0x55 || mem[5] == (byte) 0xAA || mem[5] == (byte) 0x55) {
+				this.memoryPages[0].readWrite = false;
+				this.memoryPages[0].readOnly = true;
 			} else {
-				memoryPages[0].readWrite = true;
-				memoryPages[0].readOnly = false;
+				this.memoryPages[0].readWrite = true;
+				this.memoryPages[0].readOnly = false;
 			}
 
-			if ((mem[4] == (byte) 0xAA) || (mem[4] == (byte) 0x55))
-				memoryPages[1].writeOnce = true;
-			else
-				memoryPages[1].writeOnce = false;
+			if (mem[4] == (byte) 0xAA || mem[4] == (byte) 0x55) {
+				this.memoryPages[1].writeOnce = true;
+			} else {
+				this.memoryPages[1].writeOnce = false;
+			}
 
-			if ((mem[1] == (byte) 0xAA) || (mem[1] == (byte) 0x55)) {
-				memoryPages[1].readWrite = false;
-				memoryPages[1].readOnly = true;
+			if (mem[1] == (byte) 0xAA || mem[1] == (byte) 0x55) {
+				this.memoryPages[1].readWrite = false;
+				this.memoryPages[1].readOnly = true;
 			} else {
-				memoryPages[1].readWrite = true;
-				memoryPages[1].readOnly = false;
+				this.memoryPages[1].readWrite = true;
+				this.memoryPages[1].readOnly = false;
 			}
 
-			if ((mem[1] == (byte) 0xAA) || (mem[1] == (byte) 0x55)) {
-				memoryPages[2].readWrite = false;
-				memoryPages[2].readOnly = true;
+			if (mem[1] == (byte) 0xAA || mem[1] == (byte) 0x55) {
+				this.memoryPages[2].readWrite = false;
+				this.memoryPages[2].readOnly = true;
 			} else {
-				memoryPages[2].readWrite = true;
-				memoryPages[2].readOnly = false;
+				this.memoryPages[2].readWrite = true;
+				this.memoryPages[2].readOnly = false;
 			}
 
-			memstatus.checked = true;
-			memoryPages[0].checked = true;
-			memoryPages[1].checked = true;
-			memoryPages[2].checked = true;
-			container_check = true;
+			this.memstatus.checked = true;
+			this.memoryPages[0].checked = true;
+			this.memoryPages[1].checked = true;
+			this.memoryPages[2].checked = true;
+			this.container_check = true;
 		}
 
-		return container_check;
+		return this.container_check;
 	}
 
 	/**
 	 * Initialize the memory banks and data associated with each.
 	 */
 	private void initmem() {
-		secretSet = false;
+		this.secretSet = false;
 
-		mbScratchpad = new MemoryBankScratchSHAEE(this);
+		this.mbScratchpad = new MemoryBankScratchSHAEE(this);
 
 		// Set memory bank variables for the status and secret page
-		memstatus = new MemoryBankSHAEE(this, mbScratchpad);
-		memstatus.bankDescription = "Status Page that contains the secret and the status.";
-		memstatus.generalPurposeMemory = true;
-		memstatus.startPhysicalAddress = 128;
-		memstatus.size = 32;
-		memstatus.numberPages = 1;
-		memstatus.pageLength = 32;
-		memstatus.maxPacketDataLength = 32 - 3;
-		memstatus.extraInfo = false;
-		memstatus.extraInfoLength = 20;
-		memstatus.readWrite = false;
-		memstatus.writeOnce = false;
-		memstatus.pageCRC = false;
-		memstatus.readOnly = false;
-		memstatus.checked = false;
+		this.memstatus = new MemoryBankSHAEE(this, this.mbScratchpad);
+		this.memstatus.bankDescription = "Status Page that contains the secret and the status.";
+		this.memstatus.generalPurposeMemory = true;
+		this.memstatus.startPhysicalAddress = 128;
+		this.memstatus.size = 32;
+		this.memstatus.numberPages = 1;
+		this.memstatus.pageLength = 32;
+		this.memstatus.maxPacketDataLength = 32 - 3;
+		this.memstatus.extraInfo = false;
+		this.memstatus.extraInfoLength = 20;
+		this.memstatus.readWrite = false;
+		this.memstatus.writeOnce = false;
+		this.memstatus.pageCRC = false;
+		this.memstatus.readOnly = false;
+		this.memstatus.checked = false;
 
 		// Set memory bank variables
-		memoryPages[0] = new MemoryBankSHAEE(this, mbScratchpad);
-		memoryPages[0].bankDescription = "Page Zero with write protection.";
-		memoryPages[0].generalPurposeMemory = true;
-		memoryPages[0].startPhysicalAddress = 0;
-		memoryPages[0].size = 32;
-		memoryPages[0].numberPages = 1;
-		memoryPages[0].pageLength = 32;
-		memoryPages[0].maxPacketDataLength = 32 - 3;
-		memoryPages[0].extraInfo = true;
-		memoryPages[0].extraInfoLength = 20;
-		memoryPages[0].writeOnce = false;
-		memoryPages[0].pageCRC = true;
-		memoryPages[0].checked = false;
+		this.memoryPages[0] = new MemoryBankSHAEE(this, this.mbScratchpad);
+		this.memoryPages[0].bankDescription = "Page Zero with write protection.";
+		this.memoryPages[0].generalPurposeMemory = true;
+		this.memoryPages[0].startPhysicalAddress = 0;
+		this.memoryPages[0].size = 32;
+		this.memoryPages[0].numberPages = 1;
+		this.memoryPages[0].pageLength = 32;
+		this.memoryPages[0].maxPacketDataLength = 32 - 3;
+		this.memoryPages[0].extraInfo = true;
+		this.memoryPages[0].extraInfoLength = 20;
+		this.memoryPages[0].writeOnce = false;
+		this.memoryPages[0].pageCRC = true;
+		this.memoryPages[0].checked = false;
 
 		// Set memory bank varialbes
-		memoryPages[1] = new MemoryBankSHAEE(this, mbScratchpad);
-		memoryPages[1].bankDescription = "Page One with EPROM mode and write protection.";
-		memoryPages[1].generalPurposeMemory = true;
-		memoryPages[1].startPhysicalAddress = 32;
-		memoryPages[1].size = 32;
-		memoryPages[1].numberPages = 1;
-		memoryPages[1].pageLength = 32;
-		memoryPages[1].maxPacketDataLength = 32 - 3;
-		memoryPages[1].extraInfo = true;
-		memoryPages[1].extraInfoLength = 20;
-		memoryPages[1].pageCRC = true;
-		memoryPages[1].checked = false;
+		this.memoryPages[1] = new MemoryBankSHAEE(this, this.mbScratchpad);
+		this.memoryPages[1].bankDescription = "Page One with EPROM mode and write protection.";
+		this.memoryPages[1].generalPurposeMemory = true;
+		this.memoryPages[1].startPhysicalAddress = 32;
+		this.memoryPages[1].size = 32;
+		this.memoryPages[1].numberPages = 1;
+		this.memoryPages[1].pageLength = 32;
+		this.memoryPages[1].maxPacketDataLength = 32 - 3;
+		this.memoryPages[1].extraInfo = true;
+		this.memoryPages[1].extraInfoLength = 20;
+		this.memoryPages[1].pageCRC = true;
+		this.memoryPages[1].checked = false;
 
 		// Set memory bank varialbes
-		memoryPages[2] = new MemoryBankSHAEE(this, mbScratchpad);
-		memoryPages[2].bankDescription = "Page Two and Three with write protection.";
-		memoryPages[2].generalPurposeMemory = true;
-		memoryPages[2].startPhysicalAddress = 64;
-		memoryPages[2].size = 64;
-		memoryPages[2].numberPages = 2;
-		memoryPages[2].pageLength = 32;
-		memoryPages[2].maxPacketDataLength = 32 - 3;
-		memoryPages[2].extraInfo = true;
-		memoryPages[2].extraInfoLength = 20;
-		memoryPages[2].writeOnce = false;
-		memoryPages[2].pageCRC = true;
-		memoryPages[2].checked = false;
-
-		memoryPages[3] = memoryPages[2];
+		this.memoryPages[2] = new MemoryBankSHAEE(this, this.mbScratchpad);
+		this.memoryPages[2].bankDescription = "Page Two and Three with write protection.";
+		this.memoryPages[2].generalPurposeMemory = true;
+		this.memoryPages[2].startPhysicalAddress = 64;
+		this.memoryPages[2].size = 64;
+		this.memoryPages[2].numberPages = 2;
+		this.memoryPages[2].pageLength = 32;
+		this.memoryPages[2].maxPacketDataLength = 32 - 3;
+		this.memoryPages[2].extraInfo = true;
+		this.memoryPages[2].extraInfoLength = 20;
+		this.memoryPages[2].writeOnce = false;
+		this.memoryPages[2].pageCRC = true;
+		this.memoryPages[2].checked = false;
+
+		this.memoryPages[3] = this.memoryPages[2];
 	}
 
 	/**
@@ -848,13 +866,13 @@ private void initmem() {
 	 */
 	public static boolean isMACValid(int addr, byte[] SerNum, byte[] memory, byte[] mac, byte[] challenge,
 			byte[] secret) {
-		byte[] MT = new byte[64];
+		var MT = new byte[64];
 
 		System.arraycopy(secret, 0, MT, 0, 4);
 		System.arraycopy(memory, 0, MT, 4, 32);
 		System.arraycopy(ffBlock, 0, MT, 36, 4);
 
-		MT[40] = (byte) (0x40 | (((addr) << 3) & 0x08) | (((addr) >>> 5) & 0x07));
+		MT[40] = (byte) (0x40 | addr << 3 & 0x08 | addr >>> 5 & 0x07);
 
 		System.arraycopy(SerNum, 0, MT, 41, 7);
 		System.arraycopy(secret, 4, MT, 48, 4);
@@ -862,18 +880,19 @@ public static boolean isMACValid(int addr, byte[] SerNum, byte[] memory, byte[]
 
 		// finish up with proper padding
 		MT[55] = (byte) 0x80;
-		for (int i = 56; i < 62; i++)
+		for (var i = 56; i < 62; i++) {
 			MT[i] = (byte) 0x00;
+		}
 		MT[62] = (byte) 0x01;
 		MT[63] = (byte) 0xB8;
 
-		int[] AtoE = new int[5];
+		var AtoE = new int[5];
 		com.dalsemi.onewire.utils.SHA.ComputeSHA(MT, AtoE);
 
-		int cnt = 0;
-		for (int i = 0; i < 5; i++) {
-			int temp = AtoE[4 - i];
-			for (int j = 0; j < 4; j++) {
+		var cnt = 0;
+		for (var i = 0; i < 5; i++) {
+			var temp = AtoE[4 - i];
+			for (var j = 0; j < 4; j++) {
 				if (mac[cnt++] != (byte) (temp & 0x0FF)) {
 					return false;
 				}
@@ -914,32 +933,34 @@ public static boolean isMACValid(int addr, byte[] SerNum, byte[] memory, byte[]
 	 * @see #bindSecretToiButton(int,byte[])
 	 */
 	public boolean installMasterSecret(int page, byte[] newSecret) throws OneWireIOException, OneWireException {
-		for (int i = 0; i < secret.length; i++)
-			secret[i] = 0x00;
-		if (loadFirstSecret(secret, 0)) {
-			if (newSecret.length == 0)
-				return false;
-
-			byte[] input_secret = null;
-			byte[] sp_buffer = new byte[8];
-			int secret_mod_length = newSecret.length % 47;
-
-			if (secret_mod_length == 0) // if the length of the secret is divisible by 40
-				input_secret = newSecret;
-			else {
-				input_secret = new byte[newSecret.length + (47 - secret_mod_length)];
-
-				System.arraycopy(newSecret, 0, input_secret, 0, newSecret.length);
-			}
-
-			for (int i = 0; i < input_secret.length; i += 47) {
-				writeDataPage(page, input_secret, i);
-				System.arraycopy(input_secret, i + 36, sp_buffer, 0, 8);
-				mbScratchpad.computeNextSecret(page * 32, sp_buffer, 0);
-			}
-			return true;
-		} else
+		for (var i = 0; i < this.secret.length; i++) {
+			this.secret[i] = 0x00;
+		}
+		if (!this.loadFirstSecret(this.secret, 0)) {
 			throw new OneWireException("Load first secret failed");
+		}
+		if (newSecret.length == 0) {
+			return false;
+		}
+
+		byte[] input_secret = null;
+		var sp_buffer = new byte[8];
+		var secret_mod_length = newSecret.length % 47;
+
+		if (secret_mod_length == 0) {
+			input_secret = newSecret;
+		} else {
+			input_secret = new byte[newSecret.length + 47 - secret_mod_length];
+
+			System.arraycopy(newSecret, 0, input_secret, 0, newSecret.length);
+		}
+
+		for (var i = 0; i < input_secret.length; i += 47) {
+			this.writeDataPage(page, input_secret, i);
+			System.arraycopy(input_secret, i + 36, sp_buffer, 0, 8);
+			this.mbScratchpad.computeNextSecret(page * 32, sp_buffer, 0);
+		}
+		return true;
 	}
 
 	/**
@@ -966,13 +987,14 @@ public boolean installMasterSecret(int page, byte[] newSecret) throws OneWireIOE
 	 * @see #installMasterSecret(int,byte[])
 	 */
 	public boolean bindSecretToiButton(int pageNum, byte[] bindData) throws OneWireIOException, OneWireException {
-		if (!writeDataPage(pageNum, bindData))
+		if (!this.writeDataPage(pageNum, bindData)) {
 			return false;
+		}
 
-		byte[] bind_code = new byte[8];
+		var bind_code = new byte[8];
 		bind_code[0] = (byte) pageNum;
-		System.arraycopy(address, 0, bind_code, 1, 7);
-		mbScratchpad.computeNextSecret(pageNum * 32, bind_code, 0);
+		System.arraycopy(this.address, 0, bind_code, 1, 7);
+		this.mbScratchpad.computeNextSecret(pageNum * 32, bind_code, 0);
 
 		return true;
 	}
@@ -998,7 +1020,7 @@ public boolean bindSecretToiButton(int pageNum, byte[] bindData) throws OneWireI
 	 */
 	public boolean writeDataPage(int targetPage, byte[] pageData) throws OneWireIOException, OneWireException {
 
-		return writeDataPage(targetPage, pageData, 0);
+		return this.writeDataPage(targetPage, pageData, 0);
 	}
 
 	/**
@@ -1023,10 +1045,11 @@ public boolean writeDataPage(int targetPage, byte[] pageData) throws OneWireIOEx
 	 */
 	public boolean writeDataPage(int targetPage, byte[] pageData, int offset)
 			throws OneWireIOException, OneWireException {
-		int addr = 0;
-		if (targetPage == 3)
+		var addr = 0;
+		if (targetPage == 3) {
 			addr = 32;
-		memoryPages[targetPage].write(addr, pageData, offset, 32);
+		}
+		this.memoryPages[targetPage].write(addr, pageData, offset, 32);
 		return true;
 	}
 
@@ -1063,8 +1086,8 @@ public boolean writeDataPage(int targetPage, byte[] pageData, int offset)
 	 */
 	public boolean writeScratchpad(int targetPage, int targetPageOffset, byte[] inputbuffer, int start, int length)
 			throws OneWireIOException, OneWireException {
-		int addr = (targetPage << 5) + targetPageOffset;
-		mbScratchpad.writeScratchpad(addr, inputbuffer, start, length);
+		var addr = (targetPage << 5) + targetPageOffset;
+		this.mbScratchpad.writeScratchpad(addr, inputbuffer, start, length);
 		return true;
 	}
 
@@ -1082,7 +1105,7 @@ public boolean writeScratchpad(int targetPage, int targetPageOffset, byte[] inpu
 	 */
 	public void readScratchpad(byte[] scratchpad, int offset, byte[] extraInfo)
 			throws OneWireIOException, OneWireException {
-		mbScratchpad.readScratchpad(scratchpad, offset, 8, extraInfo);
+		this.mbScratchpad.readScratchpad(scratchpad, offset, 8, extraInfo);
 	}
 
 	/**
@@ -1099,8 +1122,8 @@ public void readScratchpad(byte[] scratchpad, int offset, byte[] extraInfo)
 	 */
 	public boolean copyScratchpad(int targetPage, int targetPageOffset, byte[] copy_auth, int authStart)
 			throws OneWireIOException, OneWireException {
-		int addr = (targetPage << 5) + targetPageOffset;
-		mbScratchpad.copyScratchpadWithMAC(addr, copy_auth, authStart);
+		var addr = (targetPage << 5) + targetPageOffset;
+		this.mbScratchpad.copyScratchpadWithMAC(addr, copy_auth, authStart);
 		return true;
 	}
 
@@ -1117,8 +1140,8 @@ public boolean copyScratchpad(int targetPage, int targetPageOffset, byte[] copy_
 	 * @throws OneWireException
 	 */
 	public boolean copyScratchpad(int targetPage, int targetPageOffset) throws OneWireIOException, OneWireException {
-		int addr = (targetPage << 5) + targetPageOffset;
-		mbScratchpad.copyScratchpad(addr, 8);
+		var addr = (targetPage << 5) + targetPageOffset;
+		this.mbScratchpad.copyScratchpad(addr, 8);
 
 		return true;
 	}
@@ -1134,10 +1157,11 @@ public boolean copyScratchpad(int targetPage, int targetPageOffset) throws OneWi
 	 * @throws OneWireException
 	 */
 	public boolean readMemoryPage(int page, byte[] pageData, int offset) throws OneWireIOException, OneWireException {
-		int addr = 0;
-		if (page == 3)
+		var addr = 0;
+		if (page == 3) {
 			addr = 32;
-		memoryPages[page].read(addr, false, pageData, offset, 32);
+		}
+		this.memoryPages[page].read(addr, false, pageData, offset, 32);
 		return true;
 	}
 
@@ -1168,11 +1192,11 @@ public boolean readMemoryPage(int page, byte[] pageData, int offset) throws OneW
 	 */
 	public boolean readAuthenticatedPage(int page, byte[] pagedata, int offset, byte[] computed_mac, int macStart)
 			throws OneWireIOException, OneWireException {
-		int mbPage = 0;
+		var mbPage = 0;
 		if (page == 3) {
 			mbPage = 1;
 			page = 2;
 		}
-		return memoryPages[page].readAuthenticatedPage(mbPage, pagedata, offset, computed_mac, macStart);
+		return this.memoryPages[page].readAuthenticatedPage(mbPage, pagedata, offset, computed_mac, macStart);
 	}
 }
diff --git a/io.openems.edge.bridge.onewire/src/com/dalsemi/onewire/container/OneWireContainer37.java b/io.openems.edge.bridge.onewire/src/com/dalsemi/onewire/container/OneWireContainer37.java
index 957b1288856..e6546a3bdfa 100644
--- a/io.openems.edge.bridge.onewire/src/com/dalsemi/onewire/container/OneWireContainer37.java
+++ b/io.openems.edge.bridge.onewire/src/com/dalsemi/onewire/container/OneWireContainer37.java
@@ -116,14 +116,6 @@
  */
 @SuppressWarnings({ "unused" })
 public class OneWireContainer37 extends OneWireContainer implements PasswordContainer {
-	// enables/disables debugging
-	private static final boolean DEBUG = false;
-
-	// when reading a page, the memory bank may throw a crc exception if the device
-	// is sampling or starts sampling during the read. This value sets how many
-	// times the device retries before passing the exception on to the application.
-	private static final int MAX_READ_RETRY_CNT = 15;
-
 	// the length of the Read-Only and Read/Write password registers
 	private static final int PASSWORD_LENGTH = 8;
 
@@ -135,13 +127,7 @@ public class OneWireContainer37 extends OneWireContainer implements PasswordCont
 	private MemoryBankNVCRCPW register = null;
 
 	// Maxim/Maxim Integrated Products Part number
-	private String partNumber = "DS1977";
-
-	// Letter appended at end of partNumber (S/H/L/T)
-	private char partLetter = '0';
-
-	// should we check the speed
-	private boolean doSpeedEnable = true;
+	private final String partNumber = "DS1977";
 
 	/**
 	 * The current password for readingfrom this device.
@@ -164,7 +150,7 @@ public class OneWireContainer37 extends OneWireContainer implements PasswordCont
 	// used to 'disable' passwords
 	private static final byte DISABLE_BYTE = 0x00;
 
-	private String descriptionString = "Rugged, self-sufficient 1-Wire device that, once setup can "
+	private final String descriptionString = "Rugged, self-sufficient 1-Wire device that, once setup can "
 			+ "store 32KB of password protected memory with a read only " + "and a read/write password.";
 
 // *****************************************************************************
@@ -228,10 +214,8 @@ public class OneWireContainer37 extends OneWireContainer implements PasswordCont
 	 *      OneWireContainer37(DSPortAdapter,String)
 	 */
 	public OneWireContainer37() {
-		super();
-
 		// initialize the memory banks
-		initMem();
+		this.initMem();
 	}
 
 	/**
@@ -250,7 +234,7 @@ public OneWireContainer37(DSPortAdapter sourceAdapter, byte[] newAddress) {
 		super(sourceAdapter, newAddress);
 
 		// initialize the memory banks
-		initMem();
+		this.initMem();
 	}
 
 	/**
@@ -269,7 +253,7 @@ public OneWireContainer37(DSPortAdapter sourceAdapter, long newAddress) {
 		super(sourceAdapter, newAddress);
 
 		// initialize the memory banks
-		initMem();
+		this.initMem();
 	}
 
 	/**
@@ -288,7 +272,7 @@ public OneWireContainer37(DSPortAdapter sourceAdapter, String newAddress) {
 		super(sourceAdapter, newAddress);
 
 		// initialize the memory banks
-		initMem();
+		this.initMem();
 	}
 
 	/**
@@ -299,11 +283,12 @@ public OneWireContainer37(DSPortAdapter sourceAdapter, String newAddress) {
 	 * @param newAddress    address of this 1-Wire device
 	 * @see com.dalsemi.onewire.utils.Address
 	 */
+	@Override
 	public void setupContainer(DSPortAdapter sourceAdapter, byte[] newAddress) {
 		super.setupContainer(sourceAdapter, newAddress);
 
 		// initialize the memory banks
-		initMem();
+		this.initMem();
 	}
 
 	/**
@@ -314,11 +299,12 @@ public void setupContainer(DSPortAdapter sourceAdapter, byte[] newAddress) {
 	 * @param newAddress    address of this 1-Wire device
 	 * @see com.dalsemi.onewire.utils.Address
 	 */
+	@Override
 	public void setupContainer(DSPortAdapter sourceAdapter, long newAddress) {
 		super.setupContainer(sourceAdapter, newAddress);
 
 		// initialize the memory banks
-		initMem();
+		this.initMem();
 	}
 
 	/**
@@ -329,11 +315,12 @@ public void setupContainer(DSPortAdapter sourceAdapter, long newAddress) {
 	 * @param newAddress    address of this 1-Wire device
 	 * @see com.dalsemi.onewire.utils.Address
 	 */
+	@Override
 	public void setupContainer(DSPortAdapter sourceAdapter, String newAddress) {
 		super.setupContainer(sourceAdapter, newAddress);
 
 		// initialize the memory banks
-		initMem();
+		this.initMem();
 	}
 
 // *****************************************************************************
@@ -348,15 +335,16 @@ public void setupContainer(DSPortAdapter sourceAdapter, String newAddress) {
 	 * MemoryBank}, {@link com.dalsemi.onewire.container.PagedMemoryBank
 	 * PagedMemoryBank}, and {@link com.dalsemi.onewire.container.OTPMemoryBank
 	 * OTPMemoryBank}.
-	 * 
+	 *
 	 * @return <CODE>Enumeration</CODE> of memory banks
 	 */
+	@Override
 	public Enumeration<MemoryBank> getMemoryBanks() {
-		Vector<MemoryBank> v = new Vector<>(3);
+		var v = new Vector<MemoryBank>(3);
 
-		v.addElement(scratch);
-		v.addElement(userDataMemory);
-		v.addElement(register);
+		v.addElement(this.scratch);
+		v.addElement(this.userDataMemory);
+		v.addElement(this.register);
 
 		return v.elements();
 	}
@@ -367,6 +355,7 @@ public Enumeration<MemoryBank> getMemoryBanks() {
 	 * @return maximum speed
 	 * @see DSPortAdapter#setSpeed
 	 */
+	@Override
 	public int getMaxSpeed() {
 		return DSPortAdapter.SPEED_OVERDRIVE;
 	}
@@ -377,8 +366,9 @@ public int getMaxSpeed() {
 	 *
 	 * @return iButton or 1-Wire device name
 	 */
+	@Override
 	public String getName() {
-		return partNumber;
+		return this.partNumber;
 	}
 
 	/**
@@ -388,6 +378,7 @@ public String getName() {
 	 *
 	 * @return the alternate names for this iButton or 1-Wire device
 	 */
+	@Override
 	public String getAlternateNames() {
 		return "";
 	}
@@ -398,8 +389,9 @@ public String getAlternateNames() {
 	 *
 	 * @return device description
 	 */
+	@Override
 	public String getDescription() {
-		return descriptionString;
+		return this.descriptionString;
 	}
 
 	/**
@@ -418,7 +410,7 @@ public String getDescription() {
 	 * @see OneWireContainer#doSpeed()
 	 */
 	public synchronized void setSpeedCheck(boolean doSpeedCheck) {
-		doSpeedEnable = doSpeedCheck;
+		var doSpeedEnable = doSpeedCheck;
 	}
 
 // *****************************************************************************
@@ -434,6 +426,7 @@ public synchronized void setSpeedCheck(boolean doSpeedCheck) {
 	 *
 	 * @throws OneWireException
 	 */
+	@Override
 	public int getReadOnlyPasswordLength() throws OneWireException {
 		return PASSWORD_LENGTH;
 	}
@@ -445,6 +438,7 @@ public int getReadOnlyPasswordLength() throws OneWireException {
 	 *
 	 * @throws OneWireException
 	 */
+	@Override
 	public int getReadWritePasswordLength() throws OneWireException {
 		return PASSWORD_LENGTH;
 	}
@@ -456,6 +450,7 @@ public int getReadWritePasswordLength() throws OneWireException {
 	 *
 	 * @throws OneWireException
 	 */
+	@Override
 	public int getWriteOnlyPasswordLength() throws OneWireException {
 		throw new OneWireException("The DS1977 does not have a write password.");
 	}
@@ -465,6 +460,7 @@ public int getWriteOnlyPasswordLength() throws OneWireException {
 	 *
 	 * @return the address of the read only password
 	 */
+	@Override
 	public int getReadOnlyPasswordAddress() throws OneWireException {
 		return READ_ACCESS_PASSWORD;
 	}
@@ -474,6 +470,7 @@ public int getReadOnlyPasswordAddress() throws OneWireException {
 	 *
 	 * @return the address of the read/write password
 	 */
+	@Override
 	public int getReadWritePasswordAddress() throws OneWireException {
 		return READ_WRITE_ACCESS_PASSWORD;
 	}
@@ -483,6 +480,7 @@ public int getReadWritePasswordAddress() throws OneWireException {
 	 *
 	 * @return the address of the write only password
 	 */
+	@Override
 	public int getWriteOnlyPasswordAddress() throws OneWireException {
 		throw new OneWireException("The DS1977 does not have a write password.");
 	}
@@ -492,6 +490,7 @@ public int getWriteOnlyPasswordAddress() throws OneWireException {
 	 *
 	 * @return if the device has a read only password
 	 */
+	@Override
 	public boolean hasReadOnlyPassword() {
 		return true;
 	}
@@ -501,6 +500,7 @@ public boolean hasReadOnlyPassword() {
 	 *
 	 * @return if the device has a read/write password
 	 */
+	@Override
 	public boolean hasReadWritePassword() {
 		return true;
 	}
@@ -510,6 +510,7 @@ public boolean hasReadWritePassword() {
 	 *
 	 * @return if the device has a write only password
 	 */
+	@Override
 	public boolean hasWriteOnlyPassword() {
 		return false;
 	}
@@ -521,8 +522,9 @@ public boolean hasWriteOnlyPassword() {
 	 *
 	 * @throws OneWireException
 	 */
+	@Override
 	public boolean getDeviceReadOnlyPasswordEnable() throws OneWireException {
-		return readOnlyPasswordEnabled;
+		return this.readOnlyPasswordEnabled;
 	}
 
 	/**
@@ -532,8 +534,9 @@ public boolean getDeviceReadOnlyPasswordEnable() throws OneWireException {
 	 *
 	 * @throws OneWireException
 	 */
+	@Override
 	public boolean getDeviceReadWritePasswordEnable() throws OneWireException {
-		return readWritePasswordEnabled;
+		return this.readWritePasswordEnabled;
 	}
 
 	/**
@@ -543,6 +546,7 @@ public boolean getDeviceReadWritePasswordEnable() throws OneWireException {
 	 *
 	 * @throws OneWireException
 	 */
+	@Override
 	public boolean getDeviceWriteOnlyPasswordEnable() throws OneWireException {
 		throw new OneWireException("The DS1977 does not have a Write Only Password.");
 	}
@@ -557,6 +561,7 @@ public boolean getDeviceWriteOnlyPasswordEnable() throws OneWireException {
 	 * @return <code>true</code> if the device has the capability to enable one type
 	 *         of password while leaving another type disabled.
 	 */
+	@Override
 	public boolean hasSinglePasswordEnable() {
 		return false;
 	}
@@ -588,8 +593,9 @@ public boolean hasSinglePasswordEnable() {
 	 * @param enableAll if <code>true</code>, all passwords are enabled. Otherwise,
 	 *                  all passwords are disabled.
 	 */
+	@Override
 	public void setDevicePasswordEnableAll(boolean enableAll) throws OneWireException, OneWireIOException {
-		setDevicePasswordEnable(enableAll, enableAll, false);
+		this.setDevicePasswordEnable(enableAll, enableAll, false);
 	}
 
 	/**
@@ -609,11 +615,13 @@ public void setDevicePasswordEnableAll(boolean enableAll) throws OneWireExceptio
 	 *                 into the devices register.
 	 * @param offset   the offset to start copying the 8 bytes from the array
 	 */
+	@Override
 	public void setDeviceReadOnlyPassword(byte[] password, int offset) throws OneWireException, OneWireIOException {
-		register.write(READ_ACCESS_PASSWORD & 0x3F, password, offset, 8);
+		this.register.write(READ_ACCESS_PASSWORD & 0x3F, password, offset, 8);
 
-		if (verifyPassword(password, offset, READ_ONLY_PWD))
-			setContainerReadOnlyPassword(password, offset);
+		if (this.verifyPassword(password, offset, READ_ONLY_PWD)) {
+			this.setContainerReadOnlyPassword(password, offset);
+		}
 	}
 
 	/**
@@ -626,11 +634,13 @@ public void setDeviceReadOnlyPassword(byte[] password, int offset) throws OneWir
 	 *                 copied into the devices register.
 	 * @param offset   the offset to start copying the 8 bytes from the array
 	 */
+	@Override
 	public void setDeviceReadWritePassword(byte[] password, int offset) throws OneWireException, OneWireIOException {
-		register.write(READ_WRITE_ACCESS_PASSWORD & 0x3F, password, offset, 8);
+		this.register.write(READ_WRITE_ACCESS_PASSWORD & 0x3F, password, offset, 8);
 
-		if (verifyPassword(password, offset, READ_WRITE_PWD))
-			setContainerReadWritePassword(password, offset);
+		if (this.verifyPassword(password, offset, READ_WRITE_PWD)) {
+			this.setContainerReadWritePassword(password, offset);
+		}
 	}
 
 	/**
@@ -643,6 +653,7 @@ public void setDeviceReadWritePassword(byte[] password, int offset) throws OneWi
 	 *                 copied into the devices register.
 	 * @param offset   the offset to start copying the 8 bytes from the array
 	 */
+	@Override
 	public void setDeviceWriteOnlyPassword(byte[] password, int offset) throws OneWireException, OneWireIOException {
 		throw new OneWireException("The DS1977 does not have a write only password.");
 	}
@@ -666,30 +677,35 @@ public void setDeviceWriteOnlyPassword(byte[] password, int offset) throws OneWi
 	 *               subsequent read and write operations will require that the
 	 *               passwords for the container are set.
 	 */
+	@Override
 	public void setDevicePasswordEnable(boolean enableReadOnly, boolean enableReadWrite, boolean enableWriteOnly)
 			throws OneWireException, OneWireIOException {
-		if (enableWriteOnly)
+		if (enableWriteOnly) {
 			throw new OneWireException("The DS1922 does not have a write only password.");
+		}
 
-		if (!isContainerReadOnlyPasswordSet() && enableReadOnly)
+		if (!this.isContainerReadOnlyPasswordSet() && enableReadOnly) {
 			throw new OneWireException("Container Read Password is not set");
-		if (!isContainerReadWritePasswordSet())
+		}
+		if (!this.isContainerReadWritePasswordSet()) {
 			throw new OneWireException("Container Read/Write Password is not set");
-		if (enableReadOnly != enableReadWrite)
+		}
+		if (enableReadOnly != enableReadWrite) {
 			throw new OneWireException("Both read only and read/write passwords " + "will both be disable or enabled");
+		}
 
 		// must write both passwords for this to work
-		byte[] enableCommand = new byte[1];
-		enableCommand[0] = (enableReadWrite ? ENABLE_BYTE : DISABLE_BYTE);
+		var enableCommand = new byte[1];
+		enableCommand[0] = enableReadWrite ? ENABLE_BYTE : DISABLE_BYTE;
 
-		register.write(PASSWORD_CONTROL_REGISTER & 0x3F, enableCommand, 0, 1);
+		this.register.write(PASSWORD_CONTROL_REGISTER & 0x3F, enableCommand, 0, 1);
 
 		if (enableReadOnly) {
-			readOnlyPasswordEnabled = true;
-			readWritePasswordEnabled = true;
+			this.readOnlyPasswordEnabled = true;
+			this.readWritePasswordEnabled = true;
 		} else {
-			readOnlyPasswordEnabled = false;
-			readWritePasswordEnabled = false;
+			this.readOnlyPasswordEnabled = false;
+			this.readWritePasswordEnabled = false;
 		}
 	}
 
@@ -702,9 +718,10 @@ public void setDevicePasswordEnable(boolean enableReadOnly, boolean enableReadWr
 	 * @param password New 8-byte value of container's read password.
 	 * @param offset   Index to start copying the password from the array.
 	 */
+	@Override
 	public void setContainerReadOnlyPassword(byte[] password, int offset) throws OneWireException {
-		System.arraycopy(password, offset, readPassword, 0, PASSWORD_LENGTH);
-		readPasswordSet = true;
+		System.arraycopy(password, offset, this.readPassword, 0, PASSWORD_LENGTH);
+		this.readPasswordSet = true;
 	}
 
 	/**
@@ -714,8 +731,9 @@ public void setContainerReadOnlyPassword(byte[] password, int offset) throws One
 	 * @param password Holds the 8-byte value of container's read password.
 	 * @param offset   Index to start copying the password into the array.
 	 */
+	@Override
 	public void getContainerReadOnlyPassword(byte[] password, int offset) throws OneWireException {
-		System.arraycopy(readPassword, 0, password, offset, PASSWORD_LENGTH);
+		System.arraycopy(this.readPassword, 0, password, offset, PASSWORD_LENGTH);
 	}
 
 	/**
@@ -725,8 +743,9 @@ public void getContainerReadOnlyPassword(byte[] password, int offset) throws One
 	 *
 	 * @return <code>true</code> if the container's read password has been set
 	 */
+	@Override
 	public boolean isContainerReadOnlyPasswordSet() throws OneWireException {
-		return readPasswordSet;
+		return this.readPasswordSet;
 	}
 
 	/**
@@ -739,9 +758,10 @@ public boolean isContainerReadOnlyPasswordSet() throws OneWireException {
 	 * @param password New 8-byte value of container's read/write password.
 	 * @param offset   Index to start copying the password from the array.
 	 */
+	@Override
 	public void setContainerReadWritePassword(byte[] password, int offset) throws OneWireException {
-		System.arraycopy(password, offset, readWritePassword, 0, 8);
-		readWritePasswordSet = true;
+		System.arraycopy(password, offset, this.readWritePassword, 0, 8);
+		this.readWritePasswordSet = true;
 	}
 
 	/**
@@ -751,8 +771,9 @@ public void setContainerReadWritePassword(byte[] password, int offset) throws On
 	 * @param password Holds the 8-byte value of container's read/write password.
 	 * @param offset   Index to start copying the password into the array.
 	 */
+	@Override
 	public void getContainerReadWritePassword(byte[] password, int offset) throws OneWireException {
-		System.arraycopy(readWritePassword, 0, password, offset, PASSWORD_LENGTH);
+		System.arraycopy(this.readWritePassword, 0, password, offset, PASSWORD_LENGTH);
 	}
 
 	/**
@@ -763,8 +784,9 @@ public void getContainerReadWritePassword(byte[] password, int offset) throws On
 	 * @return <code>true</code> if the container's read/write password has been
 	 *         set.
 	 */
+	@Override
 	public boolean isContainerReadWritePasswordSet() throws OneWireException {
-		return readWritePasswordSet;
+		return this.readWritePasswordSet;
 	}
 
 	/**
@@ -777,6 +799,7 @@ public boolean isContainerReadWritePasswordSet() throws OneWireException {
 	 * @param password New 8-byte value of container's read/write password.
 	 * @param offset   Index to start copying the password from the array.
 	 */
+	@Override
 	public void setContainerWriteOnlyPassword(byte[] password, int offset) throws OneWireException {
 		throw new OneWireException("The DS1977 does not have a write only password.");
 	}
@@ -788,6 +811,7 @@ public void setContainerWriteOnlyPassword(byte[] password, int offset) throws On
 	 * @param password Holds the 8-byte value of container's read/write password.
 	 * @param offset   Index to start copying the password into the array.
 	 */
+	@Override
 	public void getContainerWriteOnlyPassword(byte[] password, int offset) throws OneWireException {
 		throw new OneWireException("The DS1977 does not have a write only password.");
 	}
@@ -800,37 +824,38 @@ public void getContainerWriteOnlyPassword(byte[] password, int offset) throws On
 	 * @return <code>true</code> if the container's read/write password has been
 	 *         set.
 	 */
+	@Override
 	public boolean isContainerWriteOnlyPasswordSet() throws OneWireException {
 		throw new OneWireException("The DS1977 does not have a write only password.");
 	}
 
 	public boolean verifyPassword(byte[] password, int offset, int type) throws OneWireException, OneWireIOException {
-		byte[] raw_buf = new byte[15];
-		int addr = ((type == READ_ONLY_PWD) ? READ_ACCESS_PASSWORD : READ_WRITE_ACCESS_PASSWORD);
+		var raw_buf = new byte[15];
+		var addr = type == READ_ONLY_PWD ? READ_ACCESS_PASSWORD : READ_WRITE_ACCESS_PASSWORD;
 
 		// command, address, offset, password (except last byte)
 		raw_buf[0] = VERIFY_PSW_COMMAND;
 		raw_buf[1] = (byte) (addr & 0xFF);
-		raw_buf[2] = (byte) (((addr & 0xFFFF) >>> 8) & 0xFF);
+		raw_buf[2] = (byte) ((addr & 0xFFFF) >>> 8 & 0xFF);
 
 		System.arraycopy(password, offset, raw_buf, 3, 8);
 
 		// send block (check copy indication complete)
-		register.ib.adapter.dataBlock(raw_buf, 0, 10);
+		this.register.ib.adapter.dataBlock(raw_buf, 0, 10);
 
-		if (register.ib.adapter.startPowerDelivery(DSPortAdapter.CONDITION_AFTER_BYTE)) {
+		if (this.register.ib.adapter.startPowerDelivery(DSPortAdapter.CONDITION_AFTER_BYTE)) {
 
 			// send last byte of password and enable strong pullup
-			register.ib.adapter.putByte(raw_buf[11]);
+			this.register.ib.adapter.putByte(raw_buf[11]);
 
 			// delay for read to complete
 			msWait(5);
 
 			// turn off strong pullup
-			register.ib.adapter.setPowerNormal();
+			this.register.ib.adapter.setPowerNormal();
 
 			// read the confirmation byte
-			if (register.ib.adapter.getByte() != 0xAA) {
+			if (this.register.ib.adapter.getByte() != 0xAA) {
 				return false;
 			}
 
@@ -851,36 +876,36 @@ public boolean verifyPassword(byte[] password, int offset, int type) throws OneW
 	 */
 	private void initMem() {
 		// scratchpad
-		scratch = new MemoryBankScratchCRCPW(this);
-		scratch.pageLength = 64;
-		scratch.size = 64;
-		scratch.numberPages = 1;
-		scratch.maxPacketDataLength = 61;
-		scratch.enablePower = true;
+		this.scratch = new MemoryBankScratchCRCPW(this);
+		this.scratch.pageLength = 64;
+		this.scratch.size = 64;
+		this.scratch.numberPages = 1;
+		this.scratch.maxPacketDataLength = 61;
+		this.scratch.enablePower = true;
 
 		// User Data Memory
-		userDataMemory = new MemoryBankNVCRCPW(this, scratch);
-		userDataMemory.numberPages = 511;
-		userDataMemory.size = 32704;
-		userDataMemory.pageLength = 64;
-		userDataMemory.maxPacketDataLength = 61;
-		userDataMemory.bankDescription = "Data Memory";
-		userDataMemory.startPhysicalAddress = 0x0000;
-		userDataMemory.generalPurposeMemory = true;
-		userDataMemory.readOnly = false;
-		userDataMemory.readWrite = true;
-		userDataMemory.enablePower = true;
+		this.userDataMemory = new MemoryBankNVCRCPW(this, this.scratch);
+		this.userDataMemory.numberPages = 511;
+		this.userDataMemory.size = 32704;
+		this.userDataMemory.pageLength = 64;
+		this.userDataMemory.maxPacketDataLength = 61;
+		this.userDataMemory.bankDescription = "Data Memory";
+		this.userDataMemory.startPhysicalAddress = 0x0000;
+		this.userDataMemory.generalPurposeMemory = true;
+		this.userDataMemory.readOnly = false;
+		this.userDataMemory.readWrite = true;
+		this.userDataMemory.enablePower = true;
 
 		// Register
-		register = new MemoryBankNVCRCPW(this, scratch);
-		register.numberPages = 1;
-		register.size = 64;
-		register.pageLength = 64;
-		register.maxPacketDataLength = 61;
-		register.bankDescription = "Register control";
-		register.startPhysicalAddress = 0x7FC0;
-		register.generalPurposeMemory = false;
-		register.enablePower = true;
+		this.register = new MemoryBankNVCRCPW(this, this.scratch);
+		this.register.numberPages = 1;
+		this.register.size = 64;
+		this.register.pageLength = 64;
+		this.register.maxPacketDataLength = 61;
+		this.register.bankDescription = "Register control";
+		this.register.startPhysicalAddress = 0x7FC0;
+		this.register.generalPurposeMemory = false;
+		this.register.enablePower = true;
 	}
 
 	/**
@@ -890,7 +915,7 @@ private static final void msWait(final long ms) {
 		try {
 			Thread.sleep(ms);
 		} catch (InterruptedException ie) {
-			;
+
 		}
 	}
 
diff --git a/io.openems.edge.bridge.onewire/src/com/dalsemi/onewire/container/OneWireContainer3A.java b/io.openems.edge.bridge.onewire/src/com/dalsemi/onewire/container/OneWireContainer3A.java
index 72bf987488c..db6d0927e62 100644
--- a/io.openems.edge.bridge.onewire/src/com/dalsemi/onewire/container/OneWireContainer3A.java
+++ b/io.openems.edge.bridge.onewire/src/com/dalsemi/onewire/container/OneWireContainer3A.java
@@ -27,6 +27,8 @@
 
 package com.dalsemi.onewire.container;
 
+import java.util.Arrays;
+
 import com.dalsemi.onewire.OneWireException;
 // imports
 import com.dalsemi.onewire.adapter.DSPortAdapter;
@@ -60,22 +62,11 @@
  * @version 1.00, 01 Jun 2002
  * @author JPE
  */
-@SuppressWarnings({ "unused" })
 public class OneWireContainer3A extends OneWireContainer implements SwitchContainer {
 	// --------
 	// -------- Variables
 	// --------
 
-	/**
-	 * Status memory bank of the DS2413 for memory map registers
-	 */
-	private MemoryBankEEPROMstatus map;
-
-	/**
-	 * Status memory bank of the DS2413 for the conditional search
-	 */
-	private MemoryBankEEPROMstatus search;
-
 	/**
 	 * PIO Access read command
 	 */
@@ -89,7 +80,7 @@ public class OneWireContainer3A extends OneWireContainer implements SwitchContai
 	/**
 	 * Used for 0xFF array
 	 */
-	private byte[] FF = new byte[8];
+	private final byte[] FF = new byte[8];
 
 	// --------
 	// -------- Constructors
@@ -111,10 +102,7 @@ public class OneWireContainer3A extends OneWireContainer implements SwitchContai
 	 *      OneWireContainer3A(DSPortAdapter,String)
 	 */
 	public OneWireContainer3A() {
-		super();
-
-		for (int i = 0; i < FF.length; i++)
-			FF[i] = (byte) 0x0FF;
+		Arrays.fill(this.FF, (byte) 0x0FF);
 	}
 
 	/**
@@ -133,8 +121,7 @@ public OneWireContainer3A() {
 	public OneWireContainer3A(DSPortAdapter sourceAdapter, byte[] newAddress) {
 		super(sourceAdapter, newAddress);
 
-		for (int i = 0; i < FF.length; i++)
-			FF[i] = (byte) 0x0FF;
+		Arrays.fill(this.FF, (byte) 0x0FF);
 	}
 
 	/**
@@ -153,8 +140,7 @@ public OneWireContainer3A(DSPortAdapter sourceAdapter, byte[] newAddress) {
 	public OneWireContainer3A(DSPortAdapter sourceAdapter, long newAddress) {
 		super(sourceAdapter, newAddress);
 
-		for (int i = 0; i < FF.length; i++)
-			FF[i] = (byte) 0x0FF;
+		Arrays.fill(this.FF, (byte) 0x0FF);
 	}
 
 	/**
@@ -173,8 +159,7 @@ public OneWireContainer3A(DSPortAdapter sourceAdapter, long newAddress) {
 	public OneWireContainer3A(DSPortAdapter sourceAdapter, String newAddress) {
 		super(sourceAdapter, newAddress);
 
-		for (int i = 0; i < FF.length; i++)
-			FF[i] = (byte) 0x0FF;
+		Arrays.fill(this.FF, (byte) 0x0FF);
 	}
 
 	// --------
@@ -187,6 +172,7 @@ public OneWireContainer3A(DSPortAdapter sourceAdapter, String newAddress) {
 	 *
 	 * @return iButton or 1-Wire device name
 	 */
+	@Override
 	public String getName() {
 		return "DS2413";
 	}
@@ -198,6 +184,7 @@ public String getName() {
 	 *
 	 * @return the alternate names for this iButton or 1-Wire device
 	 */
+	@Override
 	public String getAlternateNames() {
 		return "Dual Channel Switch";
 	}
@@ -208,6 +195,7 @@ public String getAlternateNames() {
 	 *
 	 * @return device description
 	 */
+	@Override
 	public String getDescription() {
 		return "Dual Channel Addressable Switch";
 	}
@@ -218,6 +206,7 @@ public String getDescription() {
 	 * @return maximum speed
 	 * @see DSPortAdapter#setSpeed
 	 */
+	@Override
 	public int getMaxSpeed() {
 		return DSPortAdapter.SPEED_OVERDRIVE;
 	}
@@ -239,6 +228,7 @@ public int getMaxSpeed() {
 	 *
 	 * @see com.dalsemi.onewire.container.OneWireSensor#readDevice()
 	 */
+	@Override
 	public int getNumberChannels(byte[] state) {
 		return 2;
 	}
@@ -254,6 +244,7 @@ public int getNumberChannels(byte[] state) {
 	 *
 	 * @see #getLatchState(int,byte[])
 	 */
+	@Override
 	public boolean isHighSideSwitch() {
 		return false;
 	}
@@ -268,6 +259,7 @@ public boolean isHighSideSwitch() {
 	 * @see #getSensedActivity(int,byte[])
 	 * @see #clearActivity()
 	 */
+	@Override
 	public boolean hasActivitySensing() {
 		return false;
 	}
@@ -281,6 +273,7 @@ public boolean hasActivitySensing() {
 	 *
 	 * @see #getLevel(int,byte[])
 	 */
+	@Override
 	public boolean hasLevelSensing() {
 		return true;
 	}
@@ -297,6 +290,7 @@ public boolean hasLevelSensing() {
 	 *
 	 * @see #setLatchState(int,boolean,boolean,byte[])
 	 */
+	@Override
 	public boolean hasSmartOn() {
 		return false;
 	}
@@ -312,6 +306,7 @@ public boolean hasSmartOn() {
 	 *
 	 * @see #setLatchState(int,boolean,boolean,byte[])
 	 */
+	@Override
 	public boolean onlySingleChannelOn() {
 		return false;
 	}
@@ -337,9 +332,10 @@ public boolean onlySingleChannelOn() {
 	 * @see com.dalsemi.onewire.container.OneWireSensor#readDevice()
 	 * @see #hasLevelSensing()
 	 */
+	@Override
 	public boolean getLevel(int channel, byte[] state) {
-		byte level = (byte) (0x01 << (channel * 2));
-		return ((state[1] & level) == level);
+		var level = (byte) (0x01 << channel * 2);
+		return (state[1] & level) == level;
 	}
 
 	/**
@@ -359,9 +355,10 @@ public boolean getLevel(int channel, byte[] state) {
 	 * @see #isHighSideSwitch()
 	 * @see #setLatchState(int,boolean,boolean,byte[])
 	 */
+	@Override
 	public boolean getLatchState(int channel, byte[] state) {
-		byte latch = (byte) (0x01 << ((channel * 2) + 1));
-		return ((state[1] & latch) == latch);
+		var latch = (byte) (0x01 << channel * 2 + 1);
+		return (state[1] & latch) == latch;
 	}
 
 	/**
@@ -384,6 +381,7 @@ public boolean getLatchState(int channel, byte[] state) {
 	 * @see #hasActivitySensing()
 	 * @see #clearActivity()
 	 */
+	@Override
 	public boolean getSensedActivity(int channel, byte[] state) throws OneWireException {
 		return false;
 	}
@@ -398,6 +396,7 @@ public boolean getSensedActivity(int channel, byte[] state) throws OneWireExcept
 	 * @see com.dalsemi.onewire.container.OneWireSensor#readDevice()
 	 * @see #getSensedActivity(int,byte[])
 	 */
+	@Override
 	public void clearActivity() throws OneWireException {
 	}
 
@@ -429,26 +428,28 @@ public void clearActivity() throws OneWireException {
 	 * @see #getLatchState(int,byte[])
 	 * @see com.dalsemi.onewire.container.OneWireSensor#writeDevice(byte[])
 	 */
+	@Override
 	public void setLatchState(int channel, boolean latchState, boolean doSmart, byte[] state) {
-		byte latch = (byte) (0x01 << channel);
+		var latch = (byte) (0x01 << channel);
 		byte temp;
 
 		state[0] = (byte) 0x00FC;
 
-		if (getLatchState(0, state)) {
+		if (this.getLatchState(0, state)) {
 			temp = (byte) 0x01;
-			state[0] = (byte) (((byte) state[0]) | temp);
+			state[0] = (byte) (state[0] | temp);
 		}
 
-		if (getLatchState(1, state)) {
+		if (this.getLatchState(1, state)) {
 			temp = (byte) 0x02;
-			state[0] = (byte) (((byte) state[0]) | temp);
+			state[0] = (byte) (state[0] | temp);
 		}
 
-		if (latchState)
+		if (latchState) {
 			state[0] = (byte) (state[0] | latch);
-		else
+		} else {
 			state[0] = (byte) (state[0] & ~latch);
+		}
 	}
 
 	/**
@@ -466,7 +467,7 @@ public void setLatchState(int channel, boolean latchState, boolean doSmart, byte
 	 * @see com.dalsemi.onewire.container.OneWireSensor#writeDevice(byte[])
 	 */
 	public void setLatchState(byte set, byte[] state) {
-		state[0] = (byte) set;
+		state[0] = set;
 	}
 
 	/**
@@ -485,17 +486,18 @@ public void setLatchState(byte set, byte[] state) {
 	 * @throws OneWireException   on a communication or setup error with the 1-Wire
 	 *                            adapter
 	 */
+	@Override
 	public byte[] readDevice() throws OneWireIOException, OneWireException {
-		byte[] buff = new byte[2];
+		var buff = new byte[2];
 
 		buff[0] = (byte) 0xF5; // PIO Access Read Command
 		buff[1] = (byte) 0xFF; // Used to read the PIO Status Bit Assignment
 
 		// select the device
-		if (adapter.select(address)) {
-			adapter.dataBlock(buff, 0, 2);
-		} else
+		if (!this.adapter.select(this.address)) {
 			throw new OneWireIOException("Device select failed");
+		}
+		this.adapter.dataBlock(buff, 0, 2);
 
 		return buff;
 	}
@@ -517,9 +519,7 @@ public byte[] readDevice() throws OneWireIOException, OneWireException {
 	 *                            adapter
 	 */
 	public byte[] readRegister() throws OneWireIOException, OneWireException {
-		byte[] register = new byte[3];
-
-		return register;
+		return new byte[3];
 	}
 
 	/**
@@ -537,20 +537,21 @@ public byte[] readRegister() throws OneWireIOException, OneWireException {
 	 * @throws OneWireException   on a communication or setup error with the 1-Wire
 	 *                            adapter
 	 */
+	@Override
 	public void writeDevice(byte state[]) throws OneWireIOException, OneWireException {
-		byte[] buff = new byte[5];
+		var buff = new byte[5];
 
 		buff[0] = (byte) 0x5A; // PIO Access Write Command
-		buff[1] = (byte) state[0]; // Channel write information
+		buff[1] = state[0]; // Channel write information
 		buff[2] = (byte) ~state[0]; // Inverted write byte
 		buff[3] = (byte) 0xFF; // Confirmation Byte
 		buff[4] = (byte) 0xFF; // PIO Pin Status
 
 		// select the device
-		if (adapter.select(address)) {
-			adapter.dataBlock(buff, 0, 5);
-		} else
+		if (!this.adapter.select(this.address)) {
 			throw new OneWireIOException("Device select failed");
+		}
+		this.adapter.dataBlock(buff, 0, 5);
 
 		if (buff[3] != (byte) 0x00AA) {
 			throw new OneWireIOException("Failure to change latch state.");
diff --git a/io.openems.edge.bridge.onewire/src/com/dalsemi/onewire/container/OneWireContainer41.java b/io.openems.edge.bridge.onewire/src/com/dalsemi/onewire/container/OneWireContainer41.java
index 7d3edc4e09b..7f330ae9bcb 100644
--- a/io.openems.edge.bridge.onewire/src/com/dalsemi/onewire/container/OneWireContainer41.java
+++ b/io.openems.edge.bridge.onewire/src/com/dalsemi/onewire/container/OneWireContainer41.java
@@ -139,7 +139,7 @@
  * <li>A sample rate of 1.5 minutes.</li>
  * </ul>
  * </p>
- * 
+ *
  * <pre>
  * <code>
  *       // "ID" is a byte array of size 8 with an address of a part we
@@ -286,9 +286,6 @@ public class OneWireContainer41 extends OneWireContainer implements PasswordCont
 	// Temperature range width in degrees Celsius
 	private double temperatureRangeWidth = 125.0;
 
-	// Temperature resolution in degrees Celsius
-	private double temperatureResolution = 0.5;
-
 	// A-D Reference voltage
 	private double adReferenceVoltage = 5.02d;
 	// Number of valid bits in A-D Result
@@ -338,7 +335,7 @@ public class OneWireContainer41 extends OneWireContainer implements PasswordCont
 	// indicates whether or not to use calibration for the humidity values
 	private boolean useHumdCalibrationRegisters = false;
 	// reference humidities that the calibration was calculated over
-	private double Href1 = 20, Href2 = 60, Href3 = 90;
+	private double Href2 = 60, Href3 = 90;
 	// the average value for each reference point
 	private double Hread1 = 0, Hread2 = 0, Hread3 = 0;
 	// the average error for each reference point
@@ -348,8 +345,9 @@ public class OneWireContainer41 extends OneWireContainer implements PasswordCont
 
 	// indicates whether or not to use calibration for the temperature values
 	private boolean useTempCalibrationRegisters = false;
-	// reference temperatures that the calibration was calculated over
-	private double Tref1 = 0, Tref2 = 0, Tref3 = 0;
+	private double Tref2 = 0;
+
+	private double Tref3 = 0;
 	// the average value for each reference point
 	private double Tread1 = 0, Tread2 = 0, Tread3 = 0;
 	// the average error for each reference point
@@ -368,10 +366,10 @@ public class OneWireContainer41 extends OneWireContainer implements PasswordCont
 	private boolean hasHumiditySensor = false;
 
 	// temperature is 8-bit or 11-bit
-	private static final double temperatureResolutions[] = new double[] { .5d, .0625d };
+	private static final double temperatureResolutions[] = { .5d, .0625d };
 	// data is 10-bit or 16-bit
-	private static final double dataResolutions[] = new double[] { .5d, 0.001953125 };
-	private static final double humidityResolutions[] = new double[] { .6d, .04d };
+	private static final double dataResolutions[] = { .5d, 0.001953125 };
+	private static final double humidityResolutions[] = { .6d, .04d };
 
 	private String descriptionString = DESCRIPTION_UNKNOWN;
 
@@ -631,10 +629,9 @@ public class OneWireContainer41 extends OneWireContainer implements PasswordCont
 	 *      OneWireContainer41(DSPortAdapter,String)
 	 */
 	public OneWireContainer41() {
-		super();
 		// initialize the memory banks
-		initMem();
-		setContainerVariables(null);
+		this.initMem();
+		this.setContainerVariables(null);
 	}
 
 	/**
@@ -653,8 +650,8 @@ public OneWireContainer41(DSPortAdapter sourceAdapter, byte[] newAddress) {
 		super(sourceAdapter, newAddress);
 
 		// initialize the memory banks
-		initMem();
-		setContainerVariables(null);
+		this.initMem();
+		this.setContainerVariables(null);
 	}
 
 	/**
@@ -673,8 +670,8 @@ public OneWireContainer41(DSPortAdapter sourceAdapter, long newAddress) {
 		super(sourceAdapter, newAddress);
 
 		// initialize the memory banks
-		initMem();
-		setContainerVariables(null);
+		this.initMem();
+		this.setContainerVariables(null);
 	}
 
 	/**
@@ -693,8 +690,8 @@ public OneWireContainer41(DSPortAdapter sourceAdapter, String newAddress) {
 		super(sourceAdapter, newAddress);
 
 		// initialize the memory banks
-		initMem();
-		setContainerVariables(null);
+		this.initMem();
+		this.setContainerVariables(null);
 	}
 
 	/**
@@ -705,12 +702,13 @@ public OneWireContainer41(DSPortAdapter sourceAdapter, String newAddress) {
 	 * @param newAddress    address of this 1-Wire device
 	 * @see com.dalsemi.onewire.utils.Address
 	 */
+	@Override
 	public void setupContainer(DSPortAdapter sourceAdapter, byte[] newAddress) {
 		super.setupContainer(sourceAdapter, newAddress);
 
 		// initialize the memory banks
-		initMem();
-		setContainerVariables(null);
+		this.initMem();
+		this.setContainerVariables(null);
 	}
 
 	/**
@@ -721,12 +719,13 @@ public void setupContainer(DSPortAdapter sourceAdapter, byte[] newAddress) {
 	 * @param newAddress    address of this 1-Wire device
 	 * @see com.dalsemi.onewire.utils.Address
 	 */
+	@Override
 	public void setupContainer(DSPortAdapter sourceAdapter, long newAddress) {
 		super.setupContainer(sourceAdapter, newAddress);
 
 		// initialize the memory banks
-		initMem();
-		setContainerVariables(null);
+		this.initMem();
+		this.setContainerVariables(null);
 	}
 
 	/**
@@ -737,12 +736,13 @@ public void setupContainer(DSPortAdapter sourceAdapter, long newAddress) {
 	 * @param newAddress    address of this 1-Wire device
 	 * @see com.dalsemi.onewire.utils.Address
 	 */
+	@Override
 	public void setupContainer(DSPortAdapter sourceAdapter, String newAddress) {
 		super.setupContainer(sourceAdapter, newAddress);
 
 		// initialize the memory banks
-		initMem();
-		setContainerVariables(null);
+		this.initMem();
+		this.setContainerVariables(null);
 	}
 
 // *****************************************************************************
@@ -767,31 +767,33 @@ public void setupContainer(DSPortAdapter sourceAdapter, String newAddress) {
 	 * @throws OneWireException   on a communication or setup error with the 1-Wire
 	 *                            adapter
 	 */
+	@Override
 	public byte[] readDevice() throws OneWireIOException, OneWireException {
-		byte[] buffer = new byte[96];
+		var buffer = new byte[96];
 
-		int retryCnt = MAX_READ_RETRY_CNT;
-		int page = 0;
+		var retryCnt = MAX_READ_RETRY_CNT;
+		var page = 0;
 		do {
 			try {
 				switch (page) {
 				default:
 					break;
 				case 0:
-					register.readPageCRC(0, false, buffer, 0);
+					this.register.readPageCRC(0, false, buffer, 0);
 					page++;
 				case 1:
-					register.readPageCRC(1, retryCnt == MAX_READ_RETRY_CNT, buffer, 32);
+					this.register.readPageCRC(1, retryCnt == MAX_READ_RETRY_CNT, buffer, 32);
 					page++;
 				case 2:
-					register.readPageCRC(2, retryCnt == MAX_READ_RETRY_CNT, buffer, 64);
+					this.register.readPageCRC(2, retryCnt == MAX_READ_RETRY_CNT, buffer, 64);
 					page++;
 				}
 				retryCnt = MAX_READ_RETRY_CNT;
 			} catch (OneWireIOException owioe) {
 				// \\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\
-				if (DEBUG)
+				if (DEBUG) {
 					Debug.debug("readDevice exc, retryCnt=" + retryCnt, owioe);
+				}
 				// \\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\
 				/*
 				 * // this "workaround" is broken. Idea was based on suggestion // that
@@ -801,20 +803,24 @@ public byte[] readDevice() throws OneWireIOException, OneWireException {
 				 * catch(Exception e) { throw new
 				 * OneWireIOException("Invalid CRC16 read from device, battery may be dead."); }
 				 */
-				if (--retryCnt == 0)
+				if (--retryCnt == 0) {
 					throw owioe;
+				}
 			} catch (OneWireException owe) {
 				// \\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\
-				if (DEBUG)
+				if (DEBUG) {
 					Debug.debug("readDevice exc, retryCnt=" + retryCnt, owe);
+				}
 				// \\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\
-				if (--retryCnt == 0)
+				if (--retryCnt == 0) {
 					throw owe;
+				}
 			}
 		} while (page < 3);
 
-		if (!isContainerVariablesSet)
-			setContainerVariables(buffer);
+		if (!this.isContainerVariablesSet) {
+			this.setContainerVariables(buffer);
+		}
 
 		return buffer;
 	}
@@ -834,13 +840,14 @@ public byte[] readDevice() throws OneWireIOException, OneWireException {
 	 * @throws OneWireException   on a communication or setup error with the 1-Wire
 	 *                            adapter
 	 */
+	@Override
 	public void writeDevice(byte[] state) throws OneWireIOException, OneWireException {
-		int start = updatertc ? 0 : 6;
+		var start = this.updatertc ? 0 : 6;
 
-		register.write(start, state, start, 32 - start);
+		this.register.write(start, state, start, 32 - start);
 
 		synchronized (this) {
-			updatertc = false;
+			this.updatertc = false;
 		}
 	}
 
@@ -867,50 +874,57 @@ public void writeDevice(byte[] state) throws OneWireIOException, OneWireExceptio
 	 */
 	public byte readByte(int memAddr) throws OneWireIOException, OneWireException {
 		// break the address up into bytes
-		byte msbAddress = (byte) ((memAddr >> 8) & 0x0ff);
-		byte lsbAddress = (byte) (memAddr & 0x0ff);
+		var msbAddress = (byte) (memAddr >> 8 & 0x0ff);
+		var lsbAddress = (byte) (memAddr & 0x0ff);
 
 		/* check the validity of the address */
-		if ((msbAddress > 0x2F) || (msbAddress < 0))
+		if (msbAddress > 0x2F || msbAddress < 0) {
 			throw new IllegalArgumentException("OneWireContainer41-Address for read out of range.");
+		}
 
-		int numBytesToEndOfPage = 32 - (lsbAddress & 0x1F);
-		byte[] buffer = new byte[11 + numBytesToEndOfPage + 2];
+		var numBytesToEndOfPage = 32 - (lsbAddress & 0x1F);
+		var buffer = new byte[11 + numBytesToEndOfPage + 2];
 
-		if (doSpeedEnable)
-			doSpeed();
+		if (this.doSpeedEnable) {
+			this.doSpeed();
+		}
 
-		if (adapter.select(address)) {
-			buffer[0] = READ_MEMORY_CRC_PW_COMMAND;
-			buffer[1] = lsbAddress;
-			buffer[2] = msbAddress;
+		if (!this.adapter.select(this.address)) {
+			throw new OneWireException("OneWireContainer41-Device not present.");
+		}
+		buffer[0] = READ_MEMORY_CRC_PW_COMMAND;
+		buffer[1] = lsbAddress;
+		buffer[2] = msbAddress;
 
-			if (isContainerReadWritePasswordSet())
-				getContainerReadWritePassword(buffer, 3);
-			else
-				getContainerReadOnlyPassword(buffer, 3);
+		if (this.isContainerReadWritePasswordSet()) {
+			this.getContainerReadWritePassword(buffer, 3);
+		} else {
+			this.getContainerReadOnlyPassword(buffer, 3);
+		}
 
-			for (int i = 11; i < buffer.length; i++)
-				buffer[i] = (byte) 0x0ff;
+		for (var i = 11; i < buffer.length; i++) {
+			buffer[i] = (byte) 0x0ff;
+		}
 
+		// \\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\
+		if (DEBUG) {
+			Debug.debug("Send-> ", buffer);
+		}
+		// \\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\
+		this.adapter.dataBlock(buffer, 0, buffer.length);
+		// \\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\
+		if (DEBUG) {
+			Debug.debug("Recv<- ", buffer);
 			// \\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\
-			if (DEBUG)
-				Debug.debug("Send-> ", buffer);
-			// \\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\
-			adapter.dataBlock(buffer, 0, buffer.length);
-			// \\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\
-			if (DEBUG)
-				Debug.debug("Recv<- ", buffer);
-			// \\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\
+		}
 
-			// exclude password from CRC 16
-			if (CRC16.compute(buffer, 11, buffer.length - 11, CRC16.compute(buffer, 0, 3, 0)) != 0x0000B001)
-				throw new OneWireIOException(
-						"Invalid CRC16 read from device.  Password may be incorrect or a sample may be in progress.");
+		// exclude password from CRC 16
+		if (CRC16.compute(buffer, 11, buffer.length - 11, CRC16.compute(buffer, 0, 3, 0)) != 0x0000B001) {
+			throw new OneWireIOException(
+					"Invalid CRC16 read from device.  Password may be incorrect or a sample may be in progress.");
+		}
 
-			return buffer[11];
-		} else
-			throw new OneWireException("OneWireContainer41-Device not present.");
+		return buffer[11];
 	}
 
 	/**
@@ -999,13 +1013,14 @@ public byte readByte(int memAddr) throws OneWireIOException, OneWireException {
 	 * @see #setFlag(int,byte,boolean)
 	 */
 	public boolean getFlag(int register, byte bitMask) throws OneWireIOException, OneWireException {
-		int retryCnt = MAX_READ_RETRY_CNT;
+		var retryCnt = MAX_READ_RETRY_CNT;
 		while (true) {
 			try {
-				return ((readByte(register) & bitMask) != 0);
+				return (this.readByte(register) & bitMask) != 0;
 			} catch (OneWireException owe) {
-				if (--retryCnt == 0)
+				if (--retryCnt == 0) {
 					throw owe;
+				}
 			}
 		}
 	}
@@ -1037,7 +1052,7 @@ public boolean getFlag(int register, byte bitMask) throws OneWireIOException, On
 	 * @see #setFlag(int,byte,boolean,byte[])
 	 */
 	public boolean getFlag(int register, byte bitMask, byte[] state) {
-		return ((state[register & 0x3F] & bitMask) != 0);
+		return (state[register & 0x3F] & bitMask) != 0;
 	}
 
 	/**
@@ -1078,11 +1093,11 @@ public boolean getFlag(int register, byte bitMask, byte[] state) {
 	 * @see #readDevice()
 	 */
 	public void setFlag(int register, byte bitMask, boolean flagValue) throws OneWireIOException, OneWireException {
-		byte[] state = readDevice();
+		var state = this.readDevice();
 
-		setFlag(register, bitMask, flagValue, state);
+		this.setFlag(register, bitMask, flagValue, state);
 
-		writeDevice(state);
+		this.writeDevice(state);
 	}
 
 	/**
@@ -1119,12 +1134,13 @@ public void setFlag(int register, byte bitMask, boolean flagValue) throws OneWir
 	public void setFlag(int register, byte bitMask, boolean flagValue, byte[] state) {
 		register = register & 0x3F;
 
-		byte flags = state[register];
+		var flags = state[register];
 
-		if (flagValue)
+		if (flagValue) {
 			flags = (byte) (flags | bitMask);
-		else
-			flags = (byte) (flags & ~(bitMask));
+		} else {
+			flags = (byte) (flags & ~bitMask);
+		}
 
 		// write the regs back
 		state[register] = flags;
@@ -1142,16 +1158,17 @@ public void setFlag(int register, byte bitMask, boolean flagValue, byte[] state)
 	 * MemoryBank}, {@link com.dalsemi.onewire.container.PagedMemoryBank
 	 * PagedMemoryBank}, and {@link com.dalsemi.onewire.container.OTPMemoryBank
 	 * OTPMemoryBank}.
-	 * 
+	 *
 	 * @return <CODE>Enumeration</CODE> of memory banks
 	 */
+	@Override
 	public Enumeration<MemoryBank> getMemoryBanks() {
-		Vector<MemoryBank> v = new Vector<>(4);
+		var v = new Vector<MemoryBank>(4);
 
-		v.addElement(scratch);
-		v.addElement(userDataMemory);
-		v.addElement(register);
-		v.addElement(log);
+		v.addElement(this.scratch);
+		v.addElement(this.userDataMemory);
+		v.addElement(this.register);
+		v.addElement(this.log);
 
 		return v.elements();
 	}
@@ -1200,6 +1217,7 @@ public MemoryBankNVCRCPW getRegisterMemoryBank() {
 	 * @return maximum speed
 	 * @see DSPortAdapter#setSpeed
 	 */
+	@Override
 	public int getMaxSpeed() {
 		return DSPortAdapter.SPEED_OVERDRIVE;
 	}
@@ -1210,8 +1228,9 @@ public int getMaxSpeed() {
 	 *
 	 * @return iButton or 1-Wire device name
 	 */
+	@Override
 	public String getName() {
-		return partNumber;
+		return this.partNumber;
 	}
 
 	/**
@@ -1221,9 +1240,11 @@ public String getName() {
 	 *
 	 * @return the alternate names for this iButton or 1-Wire device
 	 */
+	@Override
 	public String getAlternateNames() {
-		if (partNumber.equals("DS1923"))
+		if (this.partNumber.equals("DS1923")) {
 			return "Hygrochron";
+		}
 		return "Thermochron8k";
 	}
 
@@ -1233,8 +1254,9 @@ public String getAlternateNames() {
 	 *
 	 * @return device description
 	 */
+	@Override
 	public String getDescription() {
-		return descriptionString;
+		return this.descriptionString;
 	}
 
 	/**
@@ -1246,12 +1268,13 @@ public String getDescription() {
 	 * @throws OneWireException
 	 */
 	public byte getDeviceConfigByte() throws OneWireIOException, OneWireException {
-		if (deviceConfigByte == (byte) 0xFF) {
-			byte[] state = readDevice();
-			if (deviceConfigByte == (byte) 0xFF)
-				deviceConfigByte = state[DEVICE_CONFIGURATION_BYTE & 0x3F];
+		if (this.deviceConfigByte == (byte) 0xFF) {
+			var state = this.readDevice();
+			if (this.deviceConfigByte == (byte) 0xFF) {
+				this.deviceConfigByte = state[DEVICE_CONFIGURATION_BYTE & 0x3F];
+			}
 		}
-		return deviceConfigByte;
+		return this.deviceConfigByte;
 	}
 
 	/**
@@ -1270,7 +1293,7 @@ public byte getDeviceConfigByte() throws OneWireIOException, OneWireException {
 	 * @see OneWireContainer#doSpeed()
 	 */
 	public synchronized void setSpeedCheck(boolean doSpeedCheck) {
-		doSpeedEnable = doSpeedCheck;
+		this.doSpeedEnable = doSpeedCheck;
 	}
 
 // *****************************************************************************
@@ -1283,23 +1306,27 @@ public synchronized void setSpeedCheck(boolean doSpeedCheck) {
 	 * Stops the currently running mission.
 	 *
 	 */
+	@Override
 	public void stopMission() throws OneWireException, OneWireIOException {
 		/* read a user specified amount of memory and verify its validity */
-		if (doSpeedEnable)
-			doSpeed();
+		if (this.doSpeedEnable) {
+			this.doSpeed();
+		}
 
-		if (!adapter.select(address))
+		if (!this.adapter.select(this.address)) {
 			throw new OneWireException("OneWireContainer41-Device not present.");
+		}
 
-		byte[] buffer = new byte[10];
+		var buffer = new byte[10];
 		buffer[0] = STOP_MISSION_PW_COMMAND;
-		getContainerReadWritePassword(buffer, 1);
+		this.getContainerReadWritePassword(buffer, 1);
 		buffer[9] = (byte) 0xFF;
 
-		adapter.dataBlock(buffer, 0, 10);
+		this.adapter.dataBlock(buffer, 0, 10);
 
-		if (getFlag(GENERAL_STATUS_REGISTER, GSR_BIT_MISSION_IN_PROGRESS))
+		if (this.getFlag(GENERAL_STATUS_REGISTER, GSR_BIT_MISSION_IN_PROGRESS)) {
 			throw new OneWireException("OneWireContainer41-Stop mission failed.  Check read/write password.");
+		}
 	}
 
 	/**
@@ -1307,51 +1334,59 @@ public void stopMission() throws OneWireException, OneWireIOException {
 	 * directly to the device registers, or by calling other setup methods.
 	 */
 	public void startMission() throws OneWireException, OneWireIOException {
-		if (getFlag(GENERAL_STATUS_REGISTER, GSR_BIT_MISSION_IN_PROGRESS))
+		if (this.getFlag(GENERAL_STATUS_REGISTER, GSR_BIT_MISSION_IN_PROGRESS)) {
 			throw new OneWireException("OneWireContainer41-Cannot start a mission while a mission is in progress.");
+		}
 
-		if (!getFlag(GENERAL_STATUS_REGISTER, GSR_BIT_MEMORY_CLEARED))
+		if (!this.getFlag(GENERAL_STATUS_REGISTER, GSR_BIT_MEMORY_CLEARED)) {
 			throw new OneWireException("OneWireContainer41-Must clear memory before calling start mission.");
+		}
 
-		if (doSpeedEnable)
-			doSpeed();
+		if (this.doSpeedEnable) {
+			this.doSpeed();
+		}
 
-		if (!adapter.select(address))
+		if (!this.adapter.select(this.address)) {
 			throw new OneWireException("OneWireContainer41-Device not present.");
+		}
 
-		byte[] buffer = new byte[10];
+		var buffer = new byte[10];
 		buffer[0] = START_MISSION_PW_COMMAND;
-		getContainerReadWritePassword(buffer, 1);
+		this.getContainerReadWritePassword(buffer, 1);
 		buffer[9] = (byte) 0xFF;
 
-		adapter.dataBlock(buffer, 0, 10);
+		this.adapter.dataBlock(buffer, 0, 10);
 	}
 
 	/**
 	 * Erases the log memory from this missioning device.
 	 */
 	public void clearMemory() throws OneWireException, OneWireIOException {
-		if (getFlag(GENERAL_STATUS_REGISTER, GSR_BIT_MISSION_IN_PROGRESS))
+		if (this.getFlag(GENERAL_STATUS_REGISTER, GSR_BIT_MISSION_IN_PROGRESS)) {
 			throw new OneWireException("OneWireContainer41-Cannot clear memory while mission is in progress.");
+		}
 
-		if (doSpeedEnable)
-			doSpeed();
+		if (this.doSpeedEnable) {
+			this.doSpeed();
+		}
 
-		if (!adapter.select(address))
+		if (!this.adapter.select(this.address)) {
 			throw new OneWireException("OneWireContainer41-Device not present.");
+		}
 
-		byte[] buffer = new byte[10];
+		var buffer = new byte[10];
 		buffer[0] = CLEAR_MEMORY_PW_COMMAND;
-		getContainerReadWritePassword(buffer, 1);
+		this.getContainerReadWritePassword(buffer, 1);
 		buffer[9] = (byte) 0xFF;
 
-		adapter.dataBlock(buffer, 0, 10);
+		this.adapter.dataBlock(buffer, 0, 10);
 
 		// wait 2 ms for Clear Memory to complete
 		msWait(2);
 
-		if (!getFlag(GENERAL_STATUS_REGISTER, GSR_BIT_MEMORY_CLEARED))
+		if (!this.getFlag(GENERAL_STATUS_REGISTER, GSR_BIT_MEMORY_CLEARED)) {
 			throw new OneWireException("OneWireContainer41-Clear Memory failed.  Check read/write password.");
+		}
 	}
 
 // *****************************************************************************
@@ -1365,6 +1400,7 @@ public void clearMemory() throws OneWireException, OneWireIOException {
 	 *
 	 * @return the length in bytes of the Read-Only password.
 	 */
+	@Override
 	public int getReadOnlyPasswordLength() throws OneWireException {
 		return PASSWORD_LENGTH;
 	}
@@ -1374,6 +1410,7 @@ public int getReadOnlyPasswordLength() throws OneWireException {
 	 *
 	 * @return the length in bytes of the Read/Write password.
 	 */
+	@Override
 	public int getReadWritePasswordLength() throws OneWireException {
 		return PASSWORD_LENGTH;
 	}
@@ -1383,6 +1420,7 @@ public int getReadWritePasswordLength() throws OneWireException {
 	 *
 	 * @return the length in bytes of the Write-Only password.
 	 */
+	@Override
 	public int getWriteOnlyPasswordLength() throws OneWireException {
 		throw new OneWireException("The DS1922 does not have a write only password.");
 	}
@@ -1394,6 +1432,7 @@ public int getWriteOnlyPasswordLength() throws OneWireException {
 	 * @return the absolute address of the memory location where the Read-Only
 	 *         password is written.
 	 */
+	@Override
 	public int getReadOnlyPasswordAddress() throws OneWireException {
 		return READ_ACCESS_PASSWORD;
 	}
@@ -1405,6 +1444,7 @@ public int getReadOnlyPasswordAddress() throws OneWireException {
 	 * @return the absolute address of the memory location where the Read/Write
 	 *         password is written.
 	 */
+	@Override
 	public int getReadWritePasswordAddress() throws OneWireException {
 		return READ_WRITE_ACCESS_PASSWORD;
 	}
@@ -1416,6 +1456,7 @@ public int getReadWritePasswordAddress() throws OneWireException {
 	 * @return the absolute address of the memory location where the Write-Only
 	 *         password is written.
 	 */
+	@Override
 	public int getWriteOnlyPasswordAddress() throws OneWireException {
 		throw new OneWireException("The DS1922 does not have a write password.");
 	}
@@ -1427,6 +1468,7 @@ public int getWriteOnlyPasswordAddress() throws OneWireException {
 	 *
 	 * @return <code>true</code> always, since DS1922 has Read-Only password.
 	 */
+	@Override
 	public boolean hasReadOnlyPassword() {
 		return true;
 	}
@@ -1438,6 +1480,7 @@ public boolean hasReadOnlyPassword() {
 	 *
 	 * @return <code>true</code> always, since DS1922 has Read/Write password.
 	 */
+	@Override
 	public boolean hasReadWritePassword() {
 		return true;
 	}
@@ -1449,6 +1492,7 @@ public boolean hasReadWritePassword() {
 	 *
 	 * @return <code>false</code> always, since DS1922 has no Write-Only password.
 	 */
+	@Override
 	public boolean hasWriteOnlyPassword() {
 		return false;
 	}
@@ -1459,8 +1503,9 @@ public boolean hasWriteOnlyPassword() {
 	 * @return <code>true</code> if the device's Read-Only password has been
 	 *         enabled.
 	 */
+	@Override
 	public boolean getDeviceReadOnlyPasswordEnable() throws OneWireException {
-		return readOnlyPasswordEnabled;
+		return this.readOnlyPasswordEnabled;
 	}
 
 	/**
@@ -1469,8 +1514,9 @@ public boolean getDeviceReadOnlyPasswordEnable() throws OneWireException {
 	 * @return <code>true</code> if the device's Read/Write password has been
 	 *         enabled.
 	 */
+	@Override
 	public boolean getDeviceReadWritePasswordEnable() throws OneWireException {
-		return readWritePasswordEnabled;
+		return this.readWritePasswordEnabled;
 	}
 
 	/**
@@ -1479,6 +1525,7 @@ public boolean getDeviceReadWritePasswordEnable() throws OneWireException {
 	 * @return <code>true</code> if the device's Write-Only password has been
 	 *         enabled.
 	 */
+	@Override
 	public boolean getDeviceWriteOnlyPasswordEnable() throws OneWireException {
 		throw new OneWireException("The DS1922 does not have a Write Only Password.");
 	}
@@ -1493,6 +1540,7 @@ public boolean getDeviceWriteOnlyPasswordEnable() throws OneWireException {
 	 * @return <code>true</code> if the device has the capability to enable one type
 	 *         of password while leaving another type disabled.
 	 */
+	@Override
 	public boolean hasSinglePasswordEnable() {
 		return false;
 	}
@@ -1526,31 +1574,36 @@ public boolean hasSinglePasswordEnable() {
 	 * @param enableWriteOnly if <code>true</code> Write-Only passwords will be
 	 *                        enabled.
 	 */
+	@Override
 	public void setDevicePasswordEnable(boolean enableReadOnly, boolean enableReadWrite, boolean enableWriteOnly)
 			throws OneWireException, OneWireIOException {
-		if (enableWriteOnly)
+		if (enableWriteOnly) {
 			throw new OneWireException("The DS1922 does not have a write only password.");
-		if (enableReadOnly != enableReadWrite)
+		}
+		if (enableReadOnly != enableReadWrite) {
 			throw new OneWireException("Both read-only and read/write will be set with enable.");
-		if (!isContainerReadOnlyPasswordSet())
+		}
+		if (!this.isContainerReadOnlyPasswordSet()) {
 			throw new OneWireException("Container Read Password is not set");
-		if (!isContainerReadWritePasswordSet())
+		}
+		if (!this.isContainerReadWritePasswordSet()) {
 			throw new OneWireException("Container Read/Write Password is not set");
+		}
 
 		// must write both passwords for this to work
-		byte[] bothPasswordsEnable = new byte[17];
-		bothPasswordsEnable[0] = (enableReadOnly ? ENABLE_BYTE : DISABLE_BYTE);
-		getContainerReadOnlyPassword(bothPasswordsEnable, 1);
-		getContainerReadWritePassword(bothPasswordsEnable, 9);
+		var bothPasswordsEnable = new byte[17];
+		bothPasswordsEnable[0] = enableReadOnly ? ENABLE_BYTE : DISABLE_BYTE;
+		this.getContainerReadOnlyPassword(bothPasswordsEnable, 1);
+		this.getContainerReadWritePassword(bothPasswordsEnable, 9);
 
-		register.write(PASSWORD_CONTROL_REGISTER & 0x3F, bothPasswordsEnable, 0, 17);
+		this.register.write(PASSWORD_CONTROL_REGISTER & 0x3F, bothPasswordsEnable, 0, 17);
 
 		if (enableReadOnly) {
-			readOnlyPasswordEnabled = true;
-			readWritePasswordEnabled = true;
+			this.readOnlyPasswordEnabled = true;
+			this.readWritePasswordEnabled = true;
 		} else {
-			readOnlyPasswordEnabled = false;
-			readWritePasswordEnabled = false;
+			this.readOnlyPasswordEnabled = false;
+			this.readWritePasswordEnabled = false;
 		}
 	}
 
@@ -1581,8 +1634,9 @@ public void setDevicePasswordEnable(boolean enableReadOnly, boolean enableReadWr
 	 * @param enableAll if <code>true</code>, all passwords are enabled. Otherwise,
 	 *                  all passwords are disabled.
 	 */
+	@Override
 	public void setDevicePasswordEnableAll(boolean enableAll) throws OneWireException, OneWireIOException {
-		setDevicePasswordEnable(enableAll, enableAll, false);
+		this.setDevicePasswordEnable(enableAll, enableAll, false);
 	}
 
 	/**
@@ -1610,20 +1664,23 @@ public void setDevicePasswordEnableAll(boolean enableAll) throws OneWireExceptio
 	 *                 <code>(offset + getReadOnlyPasswordLength)</code>
 	 * @param offset   the starting point for copying from the given password array
 	 */
+	@Override
 	public void setDeviceReadOnlyPassword(byte[] password, int offset) throws OneWireException, OneWireIOException {
-		if (getFlag(GENERAL_STATUS_REGISTER, GSR_BIT_MISSION_IN_PROGRESS))
+		if (this.getFlag(GENERAL_STATUS_REGISTER, GSR_BIT_MISSION_IN_PROGRESS)) {
 			throw new OneWireIOException("OneWireContainer41-Cannot change password while mission is in progress.");
+		}
 
-		if (!isContainerReadWritePasswordSet())
+		if (!this.isContainerReadWritePasswordSet()) {
 			throw new OneWireException("Container Read/Write Password is not set");
+		}
 
 		// must write both passwords for this to work
-		byte[] bothPasswords = new byte[16];
+		var bothPasswords = new byte[16];
 		System.arraycopy(password, offset, bothPasswords, 0, 8);
-		getContainerReadWritePassword(bothPasswords, 8);
+		this.getContainerReadWritePassword(bothPasswords, 8);
 
-		register.write(READ_ACCESS_PASSWORD & 0x3F, bothPasswords, 0, 16);
-		setContainerReadOnlyPassword(password, offset);
+		this.register.write(READ_ACCESS_PASSWORD & 0x3F, bothPasswords, 0, 16);
+		this.setContainerReadOnlyPassword(password, offset);
 	}
 
 	/**
@@ -1644,12 +1701,14 @@ public void setDeviceReadOnlyPassword(byte[] password, int offset) throws OneWir
 	 *                 <code>(offset + getReadWritePasswordLength)</code>
 	 * @param offset   the starting point for copying from the given password array
 	 */
+	@Override
 	public void setDeviceReadWritePassword(byte[] password, int offset) throws OneWireException, OneWireIOException {
-		if (getFlag(GENERAL_STATUS_REGISTER, GSR_BIT_MISSION_IN_PROGRESS))
+		if (this.getFlag(GENERAL_STATUS_REGISTER, GSR_BIT_MISSION_IN_PROGRESS)) {
 			throw new OneWireIOException("OneWireContainer41-Cannot change password while mission is in progress.");
+		}
 
-		register.write(READ_WRITE_ACCESS_PASSWORD & 0x3F, password, offset, 8);
-		setContainerReadWritePassword(password, offset);
+		this.register.write(READ_WRITE_ACCESS_PASSWORD & 0x3F, password, offset, 8);
+		this.setContainerReadWritePassword(password, offset);
 	}
 
 	/**
@@ -1670,6 +1729,7 @@ public void setDeviceReadWritePassword(byte[] password, int offset) throws OneWi
 	 *                 <code>(offset + getWriteOnlyPasswordLength)</code>
 	 * @param offset   the starting point for copying from the given password array
 	 */
+	@Override
 	public void setDeviceWriteOnlyPassword(byte[] password, int offset) throws OneWireException, OneWireIOException {
 		throw new OneWireException("The DS1922 does not have a write only password.");
 	}
@@ -1685,9 +1745,10 @@ public void setDeviceWriteOnlyPassword(byte[] password, int offset) throws OneWi
 	 *                 <code>(offset + getReadOnlyPasswordLength)</code>
 	 * @param offset   the starting point for copying from the given password array
 	 */
+	@Override
 	public void setContainerReadOnlyPassword(byte[] password, int offset) throws OneWireException {
-		System.arraycopy(password, offset, readPassword, 0, PASSWORD_LENGTH);
-		readPasswordSet = true;
+		System.arraycopy(password, offset, this.readPassword, 0, PASSWORD_LENGTH);
+		this.readPasswordSet = true;
 	}
 
 	/**
@@ -1701,9 +1762,10 @@ public void setContainerReadOnlyPassword(byte[] password, int offset) throws One
 	 *                 <code>(offset + getReadWritePasswordLength)</code>
 	 * @param offset   the starting point for copying from the given password array
 	 */
+	@Override
 	public void setContainerReadWritePassword(byte[] password, int offset) throws OneWireException {
-		System.arraycopy(password, offset, readWritePassword, 0, 8);
-		readWritePasswordSet = true;
+		System.arraycopy(password, offset, this.readWritePassword, 0, 8);
+		this.readWritePasswordSet = true;
 	}
 
 	/**
@@ -1717,6 +1779,7 @@ public void setContainerReadWritePassword(byte[] password, int offset) throws On
 	 *                 <code>(offset + getWriteOnlyPasswordLength)</code>
 	 * @param offset   the starting point for copying from the given password array
 	 */
+	@Override
 	public void setContainerWriteOnlyPassword(byte[] password, int offset) throws OneWireException {
 		throw new OneWireException("The DS1922 does not have a write only password.");
 	}
@@ -1730,8 +1793,9 @@ public void setContainerWriteOnlyPassword(byte[] password, int offset) throws On
 	 * @return <code>true</code> if the password used by the API for reading from
 	 *         the device's memory has been set.
 	 */
+	@Override
 	public boolean isContainerReadOnlyPasswordSet() throws OneWireException {
-		return readPasswordSet;
+		return this.readPasswordSet;
 	}
 
 	/**
@@ -1743,8 +1807,9 @@ public boolean isContainerReadOnlyPasswordSet() throws OneWireException {
 	 * @return <code>true</code> if the password used by the API for reading from or
 	 *         writing to the device's memory has been set.
 	 */
+	@Override
 	public boolean isContainerReadWritePasswordSet() throws OneWireException {
-		return readWritePasswordSet;
+		return this.readWritePasswordSet;
 	}
 
 	/**
@@ -1756,6 +1821,7 @@ public boolean isContainerReadWritePasswordSet() throws OneWireException {
 	 * @return <code>true</code> if the password used by the API for writing to the
 	 *         device's memory has been set.
 	 */
+	@Override
 	public boolean isContainerWriteOnlyPasswordSet() throws OneWireException {
 		throw new OneWireException("The DS1922 does not have a write only password");
 	}
@@ -1772,8 +1838,9 @@ public boolean isContainerWriteOnlyPasswordSet() throws OneWireException {
 	 *                 <code>(offset + getWriteOnlyPasswordLength)</code>
 	 * @param offset   the starting point for copying into the given password array
 	 */
+	@Override
 	public void getContainerReadOnlyPassword(byte[] password, int offset) throws OneWireException {
-		System.arraycopy(readPassword, 0, password, offset, PASSWORD_LENGTH);
+		System.arraycopy(this.readPassword, 0, password, offset, PASSWORD_LENGTH);
 	}
 
 	/**
@@ -1788,8 +1855,9 @@ public void getContainerReadOnlyPassword(byte[] password, int offset) throws One
 	 *                 be <code>(offset + getReadWritePasswordLength)</code>
 	 * @param offset   the starting point for copying into the given password array
 	 */
+	@Override
 	public void getContainerReadWritePassword(byte[] password, int offset) throws OneWireException {
-		System.arraycopy(readWritePassword, 0, password, offset, PASSWORD_LENGTH);
+		System.arraycopy(this.readWritePassword, 0, password, offset, PASSWORD_LENGTH);
 	}
 
 	/**
@@ -1804,6 +1872,7 @@ public void getContainerReadWritePassword(byte[] password, int offset) throws On
 	 *                 <code>(offset + getWriteOnlyPasswordLength)</code>
 	 * @param offset   the starting point for copying into the given password array
 	 */
+	@Override
 	public void getContainerWriteOnlyPassword(byte[] password, int offset) throws OneWireException {
 		throw new OneWireException("The DS1922 does not have a write only password");
 	}
@@ -1822,16 +1891,20 @@ public void getContainerWriteOnlyPassword(byte[] password, int offset) throws On
 	 *                <code>(getNumberOfMissionChannels()-1)</code>
 	 * @return friendly label for the specified channel
 	 */
+	@Override
 	public String getMissionLabel(int channel) throws OneWireException, OneWireIOException {
 		if (channel == TEMPERATURE_CHANNEL) {
 			return "Temperature";
-		} else if (channel == DATA_CHANNEL) {
-			if (hasHumiditySensor && !adForceResults)
+		}
+		if (channel == DATA_CHANNEL) {
+			if (this.hasHumiditySensor && !this.adForceResults) {
 				return "Humidity";
-			else
+			} else {
 				return "Data";
-		} else
+			}
+		} else {
 			throw new OneWireException("Invalid Channel");
+		}
 	}
 
 	/**
@@ -1841,7 +1914,7 @@ public String getMissionLabel(int channel) throws OneWireException, OneWireIOExc
 	 * @param enable sets/clears the SUTA bit in the Mission Control register.
 	 */
 	public void setStartUponTemperatureAlarmEnable(boolean enable) throws OneWireException, OneWireIOException {
-		setFlag(MISSION_CONTROL_REGISTER, MCR_BIT_START_MISSION_ON_TEMPERATURE_ALARM, enable);
+		this.setFlag(MISSION_CONTROL_REGISTER, MCR_BIT_START_MISSION_ON_TEMPERATURE_ALARM, enable);
 	}
 
 	/**
@@ -1857,7 +1930,7 @@ public void setStartUponTemperatureAlarmEnable(boolean enable) throws OneWireExc
 	 */
 	public void setStartUponTemperatureAlarmEnable(boolean enable, byte[] state)
 			throws OneWireException, OneWireIOException {
-		setFlag(MISSION_CONTROL_REGISTER, MCR_BIT_START_MISSION_ON_TEMPERATURE_ALARM, enable, state);
+		this.setFlag(MISSION_CONTROL_REGISTER, MCR_BIT_START_MISSION_ON_TEMPERATURE_ALARM, enable, state);
 	}
 
 	/**
@@ -1869,7 +1942,7 @@ public void setStartUponTemperatureAlarmEnable(boolean enable, byte[] state)
 	 *         set.
 	 */
 	public boolean isStartUponTemperatureAlarmEnabled() throws OneWireException, OneWireIOException {
-		return getFlag(MISSION_CONTROL_REGISTER, MCR_BIT_START_MISSION_ON_TEMPERATURE_ALARM);
+		return this.getFlag(MISSION_CONTROL_REGISTER, MCR_BIT_START_MISSION_ON_TEMPERATURE_ALARM);
 	}
 
 	/**
@@ -1884,7 +1957,7 @@ public boolean isStartUponTemperatureAlarmEnabled() throws OneWireException, One
 	 *         set.
 	 */
 	public boolean isStartUponTemperatureAlarmEnabled(byte[] state) throws OneWireException, OneWireIOException {
-		return getFlag(MISSION_CONTROL_REGISTER, MCR_BIT_START_MISSION_ON_TEMPERATURE_ALARM, state);
+		return this.getFlag(MISSION_CONTROL_REGISTER, MCR_BIT_START_MISSION_ON_TEMPERATURE_ALARM, state);
 	}
 
 	/**
@@ -1895,10 +1968,11 @@ public boolean isStartUponTemperatureAlarmEnabled(byte[] state) throws OneWireEx
 	 *         that this mission has the SUTA bit enabled.
 	 */
 	public boolean isMissionSUTA() throws OneWireException, OneWireIOException {
-		if (isMissionLoaded)
-			return getFlag(MISSION_CONTROL_REGISTER, MCR_BIT_START_MISSION_ON_TEMPERATURE_ALARM, missionRegister);
-		else
-			return getFlag(MISSION_CONTROL_REGISTER, MCR_BIT_START_MISSION_ON_TEMPERATURE_ALARM);
+		if (this.isMissionLoaded) {
+			return this.getFlag(MISSION_CONTROL_REGISTER, MCR_BIT_START_MISSION_ON_TEMPERATURE_ALARM,
+					this.missionRegister);
+		}
+		return this.getFlag(MISSION_CONTROL_REGISTER, MCR_BIT_START_MISSION_ON_TEMPERATURE_ALARM);
 	}
 
 	/**
@@ -1915,11 +1989,12 @@ public boolean isMissionWFTA() throws OneWireException, OneWireIOException {
 		// if MIP=0 or SUTA=0, WFTA could be in invalid state if previous
 		// mission did not get a temperature alarm. Clear Memory should
 		// clear this bit, so this is the workaround.
-		if (isMissionRunning() && isMissionSUTA()) {
-			if (isMissionLoaded)
-				return getFlag(GENERAL_STATUS_REGISTER, GSR_BIT_WAITING_FOR_TEMPERATURE_ALARM, missionRegister);
-			else
-				return getFlag(GENERAL_STATUS_REGISTER, GSR_BIT_WAITING_FOR_TEMPERATURE_ALARM);
+		if (this.isMissionRunning() && this.isMissionSUTA()) {
+			if (this.isMissionLoaded) {
+				return this.getFlag(GENERAL_STATUS_REGISTER, GSR_BIT_WAITING_FOR_TEMPERATURE_ALARM,
+						this.missionRegister);
+			}
+			return this.getFlag(GENERAL_STATUS_REGISTER, GSR_BIT_WAITING_FOR_TEMPERATURE_ALARM);
 		}
 		return false;
 	}
@@ -1940,9 +2015,10 @@ public boolean isMissionWFTA() throws OneWireException, OneWireIOException {
 	 *                          current time according to this
 	 *                          <code>java.util.Date</code>.
 	 */
+	@Override
 	public void startNewMission(int sampleRate, int missionStartDelay, boolean rolloverEnabled, boolean syncClock,
 			boolean[] channelEnabled) throws OneWireException, OneWireIOException {
-		byte[] state = readDevice();
+		var state = this.readDevice();
 		// if(isMissionLoaded)
 		// state = missionRegister;
 		// else
@@ -1950,90 +2026,95 @@ public void startNewMission(int sampleRate, int missionStartDelay, boolean rollo
 
 //      System.out.println("startNewMission: before state=" + Convert.toHexString(state));
 
-		for (int i = 0; i < getNumberMissionChannels(); i++)
-			setMissionChannelEnable(i, channelEnabled[i], state);
+		for (var i = 0; i < this.getNumberMissionChannels(); i++) {
+			this.setMissionChannelEnable(i, channelEnabled[i], state);
+		}
 
 		if (sampleRate % 60 == 0 || sampleRate > 0x03FFF) {
 			// convert to minutes
-			sampleRate = (sampleRate / 60) & 0x03FFF;
-			setFlag(RTC_CONTROL_REGISTER, RCR_BIT_ENABLE_HIGH_SPEED_SAMPLE, false, state);
+			sampleRate = sampleRate / 60 & 0x03FFF;
+			this.setFlag(RTC_CONTROL_REGISTER, RCR_BIT_ENABLE_HIGH_SPEED_SAMPLE, false, state);
 		} else {
-			setFlag(RTC_CONTROL_REGISTER, RCR_BIT_ENABLE_HIGH_SPEED_SAMPLE, true, state);
+			this.setFlag(RTC_CONTROL_REGISTER, RCR_BIT_ENABLE_HIGH_SPEED_SAMPLE, true, state);
 		}
 
 		Convert.toByteArray(sampleRate, state, SAMPLE_RATE & 0x3F, 2);
 
 		Convert.toByteArray(missionStartDelay, state, MISSION_START_DELAY & 0x3F, 3);
 
-		setFlag(MISSION_CONTROL_REGISTER, MCR_BIT_ENABLE_ROLLOVER, rolloverEnabled, state);
+		this.setFlag(MISSION_CONTROL_REGISTER, MCR_BIT_ENABLE_ROLLOVER, rolloverEnabled, state);
 
 		if (syncClock) {
-			setClock(new Date().getTime(), state);
-		} else if (!getFlag(RTC_CONTROL_REGISTER, RCR_BIT_ENABLE_OSCILLATOR, state)) {
-			setFlag(RTC_CONTROL_REGISTER, RCR_BIT_ENABLE_OSCILLATOR, true, state);
+			this.setClock(new Date().getTime(), state);
+		} else if (!this.getFlag(RTC_CONTROL_REGISTER, RCR_BIT_ENABLE_OSCILLATOR, state)) {
+			this.setFlag(RTC_CONTROL_REGISTER, RCR_BIT_ENABLE_OSCILLATOR, true, state);
 		}
 //      System.out.println("startNewMission: after  state=" + Convert.toHexString(state));
 
-		clearMemory();
-		writeDevice(state);
-		startMission();
+		this.clearMemory();
+		this.writeDevice(state);
+		this.startMission();
 	}
 
 	/**
 	 * Loads the results of the currently running mission. Must be called before all
 	 * mission result/status methods.
 	 */
+	@Override
 	public synchronized void loadMissionResults() throws OneWireException, OneWireIOException {
 		// read the register contents
-		missionRegister = readDevice();
+		this.missionRegister = this.readDevice();
 
 		// get the number of samples
-		sampleCount = Convert.toInt(missionRegister, MISSION_SAMPLE_COUNT & 0x3F, 3);
-		sampleCountTotal = sampleCount;
+		this.sampleCount = Convert.toInt(this.missionRegister, MISSION_SAMPLE_COUNT & 0x3F, 3);
+		this.sampleCountTotal = this.sampleCount;
 
 		// sample rate, in seconds
-		sampleRate = Convert.toInt(missionRegister, SAMPLE_RATE & 0x3F, 2);
-		if (!getFlag(RTC_CONTROL_REGISTER, RCR_BIT_ENABLE_HIGH_SPEED_SAMPLE, missionRegister))
+		this.sampleRate = Convert.toInt(this.missionRegister, SAMPLE_RATE & 0x3F, 2);
+		if (!this.getFlag(RTC_CONTROL_REGISTER, RCR_BIT_ENABLE_HIGH_SPEED_SAMPLE, this.missionRegister)) {
 			// if sample rate is in minutes, convert to seconds
-			sampleRate *= 60;
+			this.sampleRate *= 60;
+		}
 
 		// grab the time
-		int[] time = getTime(MISSION_TIMESTAMP_TIME & 0x3F, missionRegister);
+		var time = this.getTime(MISSION_TIMESTAMP_TIME & 0x3F, this.missionRegister);
 		// grab the date
-		int[] date = getDate(MISSION_TIMESTAMP_DATE & 0x3F, missionRegister);
+		var date = this.getDate(MISSION_TIMESTAMP_DATE & 0x3F, this.missionRegister);
 
 		// date[1] - 1 because Java months are 0 offset
 		Calendar d = new GregorianCalendar(date[0], date[1] - 1, date[2], time[2], time[1], time[0]);
 
-		missionTimeStamp = d.getTime().getTime();
+		this.missionTimeStamp = d.getTime().getTime();
 
 		// figure out how many bytes for each temperature sample
-		temperatureBytes = 0;
+		this.temperatureBytes = 0;
 		// if it's being logged, add 1 to the size
-		if (getFlag(MISSION_CONTROL_REGISTER, MCR_BIT_ENABLE_TEMPERATURE_LOGGING, missionRegister)) {
-			temperatureBytes += 1;
+		if (this.getFlag(MISSION_CONTROL_REGISTER, MCR_BIT_ENABLE_TEMPERATURE_LOGGING, this.missionRegister)) {
+			this.temperatureBytes += 1;
 			// if it's 16-bit resolution, add another 1 to the size
-			if (getFlag(MISSION_CONTROL_REGISTER, MCR_BIT_TEMPERATURE_RESOLUTION, missionRegister))
-				temperatureBytes += 1;
+			if (this.getFlag(MISSION_CONTROL_REGISTER, MCR_BIT_TEMPERATURE_RESOLUTION, this.missionRegister)) {
+				this.temperatureBytes += 1;
+			}
 		}
 
 		// figure out how many bytes for each data sample
-		dataBytes = 0;
+		this.dataBytes = 0;
 		// if it's being logged, add 1 to the size
-		if (getFlag(MISSION_CONTROL_REGISTER, MCR_BIT_ENABLE_DATA_LOGGING, missionRegister)) {
-			dataBytes += 1;
+		if (this.getFlag(MISSION_CONTROL_REGISTER, MCR_BIT_ENABLE_DATA_LOGGING, this.missionRegister)) {
+			this.dataBytes += 1;
 			// if it's 16-bit resolution, add another 1 to the size
-			if (getFlag(MISSION_CONTROL_REGISTER, MCR_BIT_DATA_RESOLUTION, missionRegister))
-				dataBytes += 1;
+			if (this.getFlag(MISSION_CONTROL_REGISTER, MCR_BIT_DATA_RESOLUTION, this.missionRegister)) {
+				this.dataBytes += 1;
+			}
 		}
 
 		// default size of the log, could be different if using an odd
 		// sample size combination.
-		int logSize = MISSION_LOG_SIZE;
+		var logSize = MISSION_LOG_SIZE;
 
 		// figure max number of samples
-		int maxSamples = 0;
-		switch (temperatureBytes + dataBytes) {
+		var maxSamples = 0;
+		switch (this.temperatureBytes + this.dataBytes) {
 		case 1:
 			maxSamples = 8192;
 			break;
@@ -2055,87 +2136,94 @@ public synchronized void loadMissionResults() throws OneWireException, OneWireIO
 
 		// check for rollover
 		int wrapCount = 0, offsetDepth = 0;
-		if (getFlag(MISSION_CONTROL_REGISTER, MCR_BIT_ENABLE_ROLLOVER, missionRegister)
-				&& (rolledOver = (sampleCount > maxSamples)))// intentional assignment
+		if (this.getFlag(MISSION_CONTROL_REGISTER, MCR_BIT_ENABLE_ROLLOVER, this.missionRegister)
+				&& (this.rolledOver = this.sampleCount > maxSamples))// intentional assignment
 		{
-			wrapCount = (sampleCount / maxSamples) - 1;
-			offsetDepth = sampleCount % maxSamples;
-			sampleCount = maxSamples;
+			wrapCount = this.sampleCount / maxSamples - 1;
+			offsetDepth = this.sampleCount % maxSamples;
+			this.sampleCount = maxSamples;
 		}
 
 		// DEBUG: For bad SOICS
-		if (!getFlag(MISSION_CONTROL_REGISTER, MCR_BIT_ENABLE_ROLLOVER, missionRegister) && rolledOver) {
+		if (!this.getFlag(MISSION_CONTROL_REGISTER, MCR_BIT_ENABLE_ROLLOVER, this.missionRegister) && this.rolledOver) {
 			throw new OneWireException("Device Error: rollover was not enabled, but it did occur.");
 		}
 
 		// figure out where the temperature bytes end, that's where
 		// the data bytes begin
-		int temperatureLogSize = temperatureBytes * maxSamples;
+		var temperatureLogSize = this.temperatureBytes * maxSamples;
 
 		// calculate first log entry time offset, in samples
-		timeOffset = ((wrapCount * maxSamples) + offsetDepth);
+		this.timeOffset = wrapCount * maxSamples + offsetDepth;
 
 		// temperature log
-		temperatureLog = new byte[sampleCount * temperatureBytes];
+		this.temperatureLog = new byte[this.sampleCount * this.temperatureBytes];
 		// data log
-		dataLog = new byte[sampleCount * dataBytes];
+		this.dataLog = new byte[this.sampleCount * this.dataBytes];
 		// cache for entire log
-		byte[] missionLogBuffer = new byte[Math.max(temperatureLog.length, dataLog.length)];
-		byte[] pagebuffer = new byte[32];
+		var missionLogBuffer = new byte[Math.max(this.temperatureLog.length, this.dataLog.length)];
+		var pagebuffer = new byte[32];
 
-		if (temperatureLog.length > 0) {
+		if (this.temperatureLog.length > 0) {
 			// read the data log for temperature
-			int numPages = (temperatureLog.length / 32) + ((temperatureLog.length % 32) > 0 ? 1 : 0);
-			int retryCnt = MAX_READ_RETRY_CNT;
-			for (int i = 0; i < numPages;) {
+			var numPages = this.temperatureLog.length / 32 + (this.temperatureLog.length % 32 > 0 ? 1 : 0);
+			var retryCnt = MAX_READ_RETRY_CNT;
+			for (var i = 0; i < numPages;) {
 				try {
-					log.readPageCRC(i, i > 0 && retryCnt == MAX_READ_RETRY_CNT, pagebuffer, 0);
+					this.log.readPageCRC(i, i > 0 && retryCnt == MAX_READ_RETRY_CNT, pagebuffer, 0);
 					System.arraycopy(pagebuffer, 0, missionLogBuffer, i * 32,
-							Math.min(32, temperatureLog.length - (i * 32)));
+							Math.min(32, this.temperatureLog.length - i * 32));
 					retryCnt = MAX_READ_RETRY_CNT;
 					i++;
 				} catch (OneWireIOException owioe) {
-					if (--retryCnt == 0)
+					if (--retryCnt == 0) {
 						throw owioe;
+					}
 				} catch (OneWireException owe) {
-					if (--retryCnt == 0)
+					if (--retryCnt == 0) {
 						throw owe;
+					}
 				}
 			}
 
 			// get the temperature bytes in order
-			int offsetIndex = offsetDepth * temperatureBytes;
-			System.arraycopy(missionLogBuffer, offsetIndex, temperatureLog, 0, temperatureLog.length - offsetIndex);
-			System.arraycopy(missionLogBuffer, 0, temperatureLog, temperatureLog.length - offsetIndex, offsetIndex);
+			var offsetIndex = offsetDepth * this.temperatureBytes;
+			System.arraycopy(missionLogBuffer, offsetIndex, this.temperatureLog, 0,
+					this.temperatureLog.length - offsetIndex);
+			System.arraycopy(missionLogBuffer, 0, this.temperatureLog, this.temperatureLog.length - offsetIndex,
+					offsetIndex);
 		}
 
-		if (dataLog.length > 0) {
+		if (this.dataLog.length > 0) {
 			// read the data log for humidity
-			int numPages = (dataLog.length / 32) + ((dataLog.length % 32) > 0 ? 1 : 0);
-			int retryCnt = MAX_READ_RETRY_CNT;
-			for (int i = 0; i < numPages;) {
+			var numPages = this.dataLog.length / 32 + (this.dataLog.length % 32 > 0 ? 1 : 0);
+			var retryCnt = MAX_READ_RETRY_CNT;
+			for (var i = 0; i < numPages;) {
 				try {
-					log.readPageCRC((temperatureLogSize / 32) + i, i > 0 && retryCnt == MAX_READ_RETRY_CNT, pagebuffer,
-							0);
-					System.arraycopy(pagebuffer, 0, missionLogBuffer, i * 32, Math.min(32, dataLog.length - (i * 32)));
+					this.log.readPageCRC(temperatureLogSize / 32 + i, i > 0 && retryCnt == MAX_READ_RETRY_CNT,
+							pagebuffer, 0);
+					System.arraycopy(pagebuffer, 0, missionLogBuffer, i * 32,
+							Math.min(32, this.dataLog.length - i * 32));
 					retryCnt = MAX_READ_RETRY_CNT;
 					i++;
 				} catch (OneWireIOException owioe) {
-					if (--retryCnt == 0)
+					if (--retryCnt == 0) {
 						throw owioe;
+					}
 				} catch (OneWireException owe) {
-					if (--retryCnt == 0)
+					if (--retryCnt == 0) {
 						throw owe;
+					}
 				}
 			}
 
 			// get the data bytes in order
-			int offsetIndex = offsetDepth * dataBytes;
-			System.arraycopy(missionLogBuffer, offsetIndex, dataLog, 0, dataLog.length - offsetIndex);
-			System.arraycopy(missionLogBuffer, 0, dataLog, dataLog.length - offsetIndex, offsetIndex);
+			var offsetIndex = offsetDepth * this.dataBytes;
+			System.arraycopy(missionLogBuffer, offsetIndex, this.dataLog, 0, this.dataLog.length - offsetIndex);
+			System.arraycopy(missionLogBuffer, 0, this.dataLog, this.dataLog.length - offsetIndex, offsetIndex);
 		}
 
-		isMissionLoaded = true;
+		this.isMissionLoaded = true;
 	}
 
 	/**
@@ -2143,8 +2231,9 @@ public synchronized void loadMissionResults() throws OneWireException, OneWireIO
 	 *
 	 * @return <code>true</code> if the mission results have been loaded.
 	 */
+	@Override
 	public boolean isMissionLoaded() {
-		return isMissionLoaded;
+		return this.isMissionLoaded;
 	}
 
 	/**
@@ -2154,12 +2243,13 @@ public boolean isMissionLoaded() {
 	 *
 	 * @return the number of channels
 	 */
+	@Override
 	public int getNumberMissionChannels() {
-		if (deviceConfigByte == DCB_DS1922L || deviceConfigByte == DCB_DS1922T || deviceConfigByte == DCB_DS1922E
-				|| deviceConfigByte == DCB_DS1922S)
+		if (this.deviceConfigByte == DCB_DS1922L || this.deviceConfigByte == DCB_DS1922T
+				|| this.deviceConfigByte == DCB_DS1922E || this.deviceConfigByte == DCB_DS1922S) {
 			return 1; // temperature only
-		else
-			return 2; // temperature and data/voltage/humidity
+		}
+		return 2; // temperature and data/voltage/humidity
 	}
 
 	/**
@@ -2169,11 +2259,13 @@ public int getNumberMissionChannels() {
 	 * @param channel the channel to enable/disable
 	 * @param enable  if true, the channel is enabled
 	 */
+	@Override
 	public void setMissionChannelEnable(int channel, boolean enable) throws OneWireException, OneWireIOException {
-		if (!isMissionLoaded)
-			missionRegister = readDevice();
-		setMissionChannelEnable(channel, enable, missionRegister);
-		writeDevice(missionRegister);
+		if (!this.isMissionLoaded) {
+			this.missionRegister = this.readDevice();
+		}
+		this.setMissionChannelEnable(channel, enable, this.missionRegister);
+		this.writeDevice(this.missionRegister);
 	}
 
 	/**
@@ -2187,9 +2279,9 @@ public void setMissionChannelEnable(int channel, boolean enable) throws OneWireE
 	public void setMissionChannelEnable(int channel, boolean enable, byte[] state)
 			throws OneWireException, OneWireIOException {
 		if (channel == TEMPERATURE_CHANNEL) {
-			setFlag(MISSION_CONTROL_REGISTER, MCR_BIT_ENABLE_TEMPERATURE_LOGGING, enable, state);
+			this.setFlag(MISSION_CONTROL_REGISTER, MCR_BIT_ENABLE_TEMPERATURE_LOGGING, enable, state);
 		} else if (channel == DATA_CHANNEL) {
-			setFlag(MISSION_CONTROL_REGISTER, MCR_BIT_ENABLE_DATA_LOGGING, enable, state);
+			this.setFlag(MISSION_CONTROL_REGISTER, MCR_BIT_ENABLE_DATA_LOGGING, enable, state);
 		} else {
 			throw new IllegalArgumentException("Invalid Channel");
 		}
@@ -2202,11 +2294,13 @@ public void setMissionChannelEnable(int channel, boolean enable, byte[] state)
 	 * @param channel the channel to enable/disable
 	 * @param enable  if true, the channel is enabled
 	 */
+	@Override
 	public boolean getMissionChannelEnable(int channel) throws OneWireException, OneWireIOException {
-		if (!isMissionLoaded)
-			missionRegister = readDevice();
+		if (!this.isMissionLoaded) {
+			this.missionRegister = this.readDevice();
+		}
 
-		return getMissionChannelEnable(channel, missionRegister);
+		return this.getMissionChannelEnable(channel, this.missionRegister);
 	}
 
 	/**
@@ -2218,9 +2312,10 @@ public boolean getMissionChannelEnable(int channel) throws OneWireException, One
 	 */
 	public boolean getMissionChannelEnable(int channel, byte[] state) throws OneWireException, OneWireIOException {
 		if (channel == TEMPERATURE_CHANNEL) {
-			return getFlag(MISSION_CONTROL_REGISTER, MCR_BIT_ENABLE_TEMPERATURE_LOGGING, state);
-		} else if (channel == DATA_CHANNEL) {
-			return getFlag(MISSION_CONTROL_REGISTER, MCR_BIT_ENABLE_DATA_LOGGING, state);
+			return this.getFlag(MISSION_CONTROL_REGISTER, MCR_BIT_ENABLE_TEMPERATURE_LOGGING, state);
+		}
+		if (channel == DATA_CHANNEL) {
+			return this.getFlag(MISSION_CONTROL_REGISTER, MCR_BIT_ENABLE_DATA_LOGGING, state);
 		} else {
 			throw new IllegalArgumentException("Invalid Channel");
 		}
@@ -2238,11 +2333,13 @@ public boolean getMissionChannelEnable(int channel, byte[] state) throws OneWire
 	 *                <code>(getNumberOfMissionChannels()-1)</code>
 	 * @return time, in seconds, between sampling
 	 */
+	@Override
 	public int getMissionSampleRate(int channel) throws OneWireException, OneWireIOException {
-		if (!isMissionLoaded)
+		if (!this.isMissionLoaded) {
 			throw new OneWireException("Must load mission results first.");
+		}
 
-		return sampleRate;
+		return this.sampleRate;
 	}
 
 	/**
@@ -2253,11 +2350,13 @@ public int getMissionSampleRate(int channel) throws OneWireException, OneWireIOE
 	 *                <code>(getNumberOfMissionChannels()-1)</code>
 	 * @return number of samples available for the specified channel
 	 */
+	@Override
 	public int getMissionSampleCount(int channel) throws OneWireException, OneWireIOException {
-		if (!isMissionLoaded)
+		if (!this.isMissionLoaded) {
 			throw new OneWireException("Must load mission results first.");
+		}
 
-		return sampleCount;
+		return this.sampleCount;
 	}
 
 	/**
@@ -2268,7 +2367,7 @@ public int getMissionSampleCount(int channel) throws OneWireException, OneWireIO
 	 *         device.
 	 */
 	public int getDeviceSampleCount() throws OneWireException, OneWireIOException {
-		return getDeviceSampleCount(readDevice());
+		return this.getDeviceSampleCount(this.readDevice());
 	}
 
 	/**
@@ -2293,11 +2392,13 @@ public int getDeviceSampleCount(byte[] state) throws OneWireException, OneWireIO
 	 *                <code>(getNumberOfMissionChannels()-1)</code>
 	 * @return number of samples taken for the specified channel
 	 */
+	@Override
 	public int getMissionSampleCountTotal(int channel) throws OneWireException, OneWireIOException {
-		if (!isMissionLoaded)
+		if (!this.isMissionLoaded) {
 			throw new OneWireException("Must load mission results first.");
+		}
 
-		return sampleCountTotal;
+		return this.sampleCountTotal;
 	}
 
 	/**
@@ -2312,43 +2413,50 @@ public int getMissionSampleCountTotal(int channel) throws OneWireException, OneW
 	 *                  <code>(getMissionSampleCount(channel)-1)</code>
 	 * @return the sample's value in degrees Celsius or percent RH.
 	 */
+	@Override
 	public double getMissionSample(int channel, int sampleNum) throws OneWireException, OneWireIOException {
-		if (!isMissionLoaded)
+		if (!this.isMissionLoaded) {
 			throw new OneWireException("Must load mission results first.");
+		}
 
-		if (sampleNum >= sampleCount || sampleNum < 0)
+		if (sampleNum >= this.sampleCount || sampleNum < 0) {
 			throw new IllegalArgumentException("Invalid sample number");
+		}
 
-		double val = 0;
+		var val = 0D;
 		if (channel == TEMPERATURE_CHANNEL) {
-			val = decodeTemperature(temperatureLog, sampleNum * temperatureBytes, temperatureBytes, true);
-			if (useTempCalibrationRegisters && (partNumber != PART_NUMBER_DS1922E)) // DS1922E does not use calibration
-																					// registers
+			val = this.decodeTemperature(this.temperatureLog, sampleNum * this.temperatureBytes, this.temperatureBytes,
+					true);
+			if (this.useTempCalibrationRegisters && this.partNumber != PART_NUMBER_DS1922E) // DS1922E does not use
+																							// calibration
+			// registers
 			{
-				double valsq = val * val;
-				double error = tempCoeffA * valsq + tempCoeffB * val + tempCoeffC;
+				var valsq = val * val;
+				var error = this.tempCoeffA * valsq + this.tempCoeffB * val + this.tempCoeffC;
 				val = val - error;
 			}
 
 		} else if (channel == DATA_CHANNEL) {
-			if (hasHumiditySensor && !adForceResults) {
-				val = decodeHumidity(dataLog, sampleNum * dataBytes, dataBytes, true);
+			if (this.hasHumiditySensor && !this.adForceResults) {
+				val = this.decodeHumidity(this.dataLog, sampleNum * this.dataBytes, this.dataBytes, true);
 
-				if (useTemperatureCompensation) {
+				if (this.useTemperatureCompensation) {
 					double T;
-					if (!overrideTemperatureLog && getMissionSampleCount(TEMPERATURE_CHANNEL) > 0)
-						T = getMissionSample(TEMPERATURE_CHANNEL, sampleNum);
-					else
-						T = (double) defaultTempCompensationValue;
-					double gamma = (T > 15) ? 0.00001 : -0.00005;
+					if (!this.overrideTemperatureLog && this.getMissionSampleCount(TEMPERATURE_CHANNEL) > 0) {
+						T = this.getMissionSample(TEMPERATURE_CHANNEL, sampleNum);
+					} else {
+						T = this.defaultTempCompensationValue;
+					}
+					var gamma = T > 15 ? 0.00001 : -0.00005;
 					T -= 25;
 					val = (val * 0.0307 + .0035 * T - 0.000043 * T * T) / (0.0307 + gamma * T - 0.000002 * T * T);
 				}
 			} else {
-				val = getADVoltage(dataLog, sampleNum * dataBytes, dataBytes, true);
+				val = this.getADVoltage(this.dataLog, sampleNum * this.dataBytes, this.dataBytes, true);
 			}
-		} else
+		} else {
 			throw new IllegalArgumentException("Invalid Channel");
+		}
 
 		return val;
 	}
@@ -2368,29 +2476,34 @@ public double getMissionSample(int channel, int sampleNum) throws OneWireExcepti
 	 *                  <code>(getMissionSampleCount(channel)-1)</code>
 	 * @return the sample as a whole integer
 	 */
+	@Override
 	public int getMissionSampleAsInteger(int channel, int sampleNum) throws OneWireException, OneWireIOException {
-		if (!isMissionLoaded)
+		if (!this.isMissionLoaded) {
 			throw new OneWireException("Must load mission results first.");
+		}
 
-		if (sampleNum >= sampleCount || sampleNum < 0)
+		if (sampleNum >= this.sampleCount || sampleNum < 0) {
 			throw new IllegalArgumentException("Invalid sample number");
+		}
 
-		int i = 0;
+		var i = 0;
 		if (channel == TEMPERATURE_CHANNEL) {
-			if (temperatureBytes == 2) {
-				i = ((0x0FF & temperatureLog[sampleNum * temperatureBytes]) << 8)
-						| ((0x0FF & temperatureLog[sampleNum * temperatureBytes + 1]));
+			if (this.temperatureBytes == 2) {
+				i = (0x0FF & this.temperatureLog[sampleNum * this.temperatureBytes]) << 8
+						| 0x0FF & this.temperatureLog[sampleNum * this.temperatureBytes + 1];
 			} else {
-				i = (0x0FF & temperatureLog[sampleNum * temperatureBytes]);
+				i = 0x0FF & this.temperatureLog[sampleNum * this.temperatureBytes];
 			}
 		} else if (channel == DATA_CHANNEL) {
-			if (dataBytes == 2) {
-				i = ((0x0FF & dataLog[sampleNum * dataBytes]) << 8) | ((0x0FF & dataLog[sampleNum * dataBytes + 1]));
+			if (this.dataBytes == 2) {
+				i = (0x0FF & this.dataLog[sampleNum * this.dataBytes]) << 8
+						| 0x0FF & this.dataLog[sampleNum * this.dataBytes + 1];
 			} else {
-				i = (0x0FF & dataLog[sampleNum * dataBytes]);
+				i = 0x0FF & this.dataLog[sampleNum * this.dataBytes];
 			}
-		} else
+		} else {
 			throw new IllegalArgumentException("Invalid Channel");
+		}
 
 		return i;
 	}
@@ -2405,43 +2518,49 @@ public int getMissionSampleAsInteger(int channel, int sampleNum) throws OneWireE
 	 *                  <code>(getMissionSampleCount(channel)-1)</code>
 	 * @return the sample's timestamp, in milliseconds
 	 */
+	@Override
 	public long getMissionSampleTimeStamp(int channel, int sampleNum) throws OneWireException, OneWireIOException {
-		if (!isMissionLoaded)
+		if (!this.isMissionLoaded) {
 			throw new OneWireException("Must load mission results first.");
+		}
 
-		long delta = ((long) ((long) timeOffset + (long) sampleNum)) * (long) sampleRate;
-		return delta * 1000L + missionTimeStamp;
+		var delta = ((long) this.timeOffset + (long) sampleNum) * this.sampleRate;
+		return delta * 1000L + this.missionTimeStamp;
 	}
 
 	/**
 	 * Returns <code>true</code> if a mission is currently running.
-	 * 
+	 *
 	 * @return <code>true</code> if a mission is currently running.
 	 */
+	@Override
 	public boolean isMissionRunning() throws OneWireException, OneWireIOException {
-		return getFlag(GENERAL_STATUS_REGISTER, GSR_BIT_MISSION_IN_PROGRESS);
+		return this.getFlag(GENERAL_STATUS_REGISTER, GSR_BIT_MISSION_IN_PROGRESS);
 	}
 
 	/**
 	 * Returns <code>true</code> if a rollover is enabled.
-	 * 
+	 *
 	 * @return <code>true</code> if a rollover is enabled.
 	 */
+	@Override
 	public boolean isMissionRolloverEnabled() throws OneWireException, OneWireIOException {
-		if (isMissionLoaded)
-			return getFlag(MISSION_CONTROL_REGISTER, MCR_BIT_ENABLE_ROLLOVER, missionRegister);
-		else
-			return getFlag(MISSION_CONTROL_REGISTER, MCR_BIT_ENABLE_ROLLOVER);
+		if (this.isMissionLoaded) {
+			return this.getFlag(MISSION_CONTROL_REGISTER, MCR_BIT_ENABLE_ROLLOVER, this.missionRegister);
+		}
+		return this.getFlag(MISSION_CONTROL_REGISTER, MCR_BIT_ENABLE_ROLLOVER);
 	}
 
 	/**
 	 * Returns <code>true</code> if a mission has rolled over.
-	 * 
+	 *
 	 * @return <code>true</code> if a mission has rolled over.
 	 */
+	@Override
 	public boolean hasMissionRolloverOccurred() throws OneWireException, OneWireIOException {
-		if (!isMissionLoaded)
+		if (!this.isMissionLoaded) {
 			throw new OneWireException("Must load mission results first.");
+		}
 
 		return this.rolledOver;
 	}
@@ -2450,9 +2569,10 @@ public boolean hasMissionRolloverOccurred() throws OneWireException, OneWireIOEx
 	 * Clears the mission results and erases the log memory from this missioning
 	 * device.
 	 */
+	@Override
 	public void clearMissionResults() throws OneWireException, OneWireIOException {
-		clearMemory();
-		isMissionLoaded = false;
+		this.clearMemory();
+		this.isMissionLoaded = false;
 	}
 
 	/**
@@ -2462,9 +2582,11 @@ public void clearMissionResults() throws OneWireException, OneWireIOException {
 	 *                <code>(getNumberOfMissionChannels()-1)</code>
 	 * @return time, in milliseconds, that the mission began
 	 */
+	@Override
 	public long getMissionTimeStamp(int channel) throws OneWireException, OneWireIOException {
-		if (!isMissionLoaded)
+		if (!this.isMissionLoaded) {
 			throw new OneWireException("Must load mission results first.");
+		}
 
 		return this.missionTimeStamp;
 	}
@@ -2477,11 +2599,13 @@ public long getMissionTimeStamp(int channel) throws OneWireException, OneWireIOE
 	 *                <code>(getNumberOfMissionChannels()-1)</code>
 	 * @return time, in milliseconds, before first sample occurred
 	 */
+	@Override
 	public long getFirstSampleOffset(int channel) throws OneWireException, OneWireIOException {
-		if (!isMissionLoaded)
+		if (!this.isMissionLoaded) {
 			throw new OneWireException("Must load mission results first.");
+		}
 
-		return timeOffset * sampleRate * 1000L;
+		return this.timeOffset * this.sampleRate * 1000L;
 	}
 
 	// - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
@@ -2495,18 +2619,22 @@ public long getFirstSampleOffset(int channel) throws OneWireException, OneWireIO
 	 *                <code>(getNumberOfMissionChannels()-1)</code>
 	 * @return all available resolutions for the specified mission channel.
 	 */
+	@Override
 	public double[] getMissionResolutions(int channel) throws OneWireException, OneWireIOException {
 		if (channel == TEMPERATURE_CHANNEL) {
 			return new double[] { temperatureResolutions[0], temperatureResolutions[1] };
-		} else if (channel == DATA_CHANNEL) {
-			if (hasHumiditySensor && !adForceResults)
+		}
+		if (channel == DATA_CHANNEL) {
+			if (this.hasHumiditySensor && !this.adForceResults) {
 				return new double[] { humidityResolutions[0], humidityResolutions[1] };
-			else if (adForceResults)
+			} else if (this.adForceResults) {
 				return new double[] { dataResolutions[0], dataResolutions[1] };
-			else
+			} else {
 				return new double[] { 8, 16 };
-		} else
+			}
+		} else {
 			throw new IllegalArgumentException("Invalid Channel");
+		}
 	}
 
 	/**
@@ -2516,31 +2644,34 @@ else if (adForceResults)
 	 *                <code>(getNumberOfMissionChannels()-1)</code>
 	 * @return the currently selected resolution for the specified channel.
 	 */
+	@Override
 	public double getMissionResolution(int channel) throws OneWireException, OneWireIOException {
-		if (!isMissionLoaded)
+		if (!this.isMissionLoaded) {
 			throw new OneWireException("Must load mission results first.");
+		}
 
-		double resolution = 0;
+		var resolution = 0D;
 		if (channel == TEMPERATURE_CHANNEL) {
-			if (getFlag(MISSION_CONTROL_REGISTER, MCR_BIT_TEMPERATURE_RESOLUTION, missionRegister))
+			if (this.getFlag(MISSION_CONTROL_REGISTER, MCR_BIT_TEMPERATURE_RESOLUTION, this.missionRegister)) {
 				resolution = temperatureResolutions[1];
-			else
+			} else {
 				resolution = temperatureResolutions[0];
+			}
 		} else if (channel == DATA_CHANNEL) {
-			if (getFlag(MISSION_CONTROL_REGISTER, MCR_BIT_DATA_RESOLUTION, missionRegister)) {
-				if (hasHumiditySensor && !adForceResults)
+			if (this.getFlag(MISSION_CONTROL_REGISTER, MCR_BIT_DATA_RESOLUTION, this.missionRegister)) {
+				if (this.hasHumiditySensor && !this.adForceResults) {
 					resolution = humidityResolutions[1];
-				else if (adForceResults)
+				} else if (this.adForceResults) {
 					resolution = dataResolutions[1];
-				else
+				} else {
 					resolution = 16;
+				}
+			} else if (this.hasHumiditySensor && !this.adForceResults) {
+				resolution = humidityResolutions[0];
+			} else if (this.adForceResults) {
+				resolution = dataResolutions[0];
 			} else {
-				if (hasHumiditySensor && !adForceResults)
-					resolution = humidityResolutions[0];
-				else if (adForceResults)
-					resolution = dataResolutions[0];
-				else
-					resolution = 8;
+				resolution = 8;
 			}
 		} else {
 			throw new IllegalArgumentException("Invalid Channel");
@@ -2555,27 +2686,30 @@ else if (adForceResults)
 	 *                   <code>(getNumberOfMissionChannels()-1)</code>
 	 * @param resolution the new resolution for the specified channel.
 	 */
+	@Override
 	public void setMissionResolution(int channel, double resolution) throws OneWireException, OneWireIOException {
-		if (!isMissionLoaded)
-			missionRegister = readDevice();
+		if (!this.isMissionLoaded) {
+			this.missionRegister = this.readDevice();
+		}
 
 		if (channel == TEMPERATURE_CHANNEL) {
-			setFlag(MISSION_CONTROL_REGISTER, MCR_BIT_TEMPERATURE_RESOLUTION, resolution == temperatureResolutions[1],
-					missionRegister);
+			this.setFlag(MISSION_CONTROL_REGISTER, MCR_BIT_TEMPERATURE_RESOLUTION,
+					resolution == temperatureResolutions[1], this.missionRegister);
 		} else if (channel == DATA_CHANNEL) {
-			if (hasHumiditySensor && !adForceResults)
-				setFlag(MISSION_CONTROL_REGISTER, MCR_BIT_DATA_RESOLUTION, resolution == humidityResolutions[1],
-						missionRegister);
-			else if (adForceResults)
-				setFlag(MISSION_CONTROL_REGISTER, MCR_BIT_DATA_RESOLUTION, resolution == dataResolutions[1],
-						missionRegister);
-			else
-				setFlag(MISSION_CONTROL_REGISTER, MCR_BIT_DATA_RESOLUTION, resolution == 16, missionRegister);
+			if (this.hasHumiditySensor && !this.adForceResults) {
+				this.setFlag(MISSION_CONTROL_REGISTER, MCR_BIT_DATA_RESOLUTION, resolution == humidityResolutions[1],
+						this.missionRegister);
+			} else if (this.adForceResults) {
+				this.setFlag(MISSION_CONTROL_REGISTER, MCR_BIT_DATA_RESOLUTION, resolution == dataResolutions[1],
+						this.missionRegister);
+			} else {
+				this.setFlag(MISSION_CONTROL_REGISTER, MCR_BIT_DATA_RESOLUTION, resolution == 16, this.missionRegister);
+			}
 		} else {
 			throw new IllegalArgumentException("Invalid Channel");
 		}
 
-		writeDevice(missionRegister);
+		this.writeDevice(this.missionRegister);
 	}
 
 	/**
@@ -2659,6 +2793,7 @@ public void setDefaultTemperatureCompensationValue(double temperatureValue, bool
 	 *                <code>(getNumberOfMissionChannels()-1)</code>
 	 * @return true if the device has mission alarms for the specified channel.
 	 */
+	@Override
 	public boolean hasMissionAlarms(int channel) {
 		return true;
 	}
@@ -2673,21 +2808,24 @@ public boolean hasMissionAlarms(int channel) {
 	 *                  <code>ALARM_LOW</code>
 	 * @return true if the alarm was triggered.
 	 */
+	@Override
 	public boolean hasMissionAlarmed(int channel, int alarmType) throws OneWireException, OneWireIOException {
-		if (!isMissionLoaded)
+		if (!this.isMissionLoaded) {
 			throw new OneWireException("Must load mission results first.");
+		}
 
 		if (channel == TEMPERATURE_CHANNEL) {
 			if (alarmType == MissionContainer.ALARM_HIGH) {
-				return getFlag(ALARM_STATUS_REGISTER, ASR_BIT_TEMPERATURE_HIGH_ALARM, missionRegister);
+				return this.getFlag(ALARM_STATUS_REGISTER, ASR_BIT_TEMPERATURE_HIGH_ALARM, this.missionRegister);
 			} else {
-				return getFlag(ALARM_STATUS_REGISTER, ASR_BIT_TEMPERATURE_LOW_ALARM, missionRegister);
+				return this.getFlag(ALARM_STATUS_REGISTER, ASR_BIT_TEMPERATURE_LOW_ALARM, this.missionRegister);
 			}
-		} else if (channel == DATA_CHANNEL) {
+		}
+		if (channel == DATA_CHANNEL) {
 			if (alarmType == MissionContainer.ALARM_HIGH) {
-				return getFlag(ALARM_STATUS_REGISTER, ASR_BIT_DATA_HIGH_ALARM, missionRegister);
+				return this.getFlag(ALARM_STATUS_REGISTER, ASR_BIT_DATA_HIGH_ALARM, this.missionRegister);
 			} else {
-				return getFlag(ALARM_STATUS_REGISTER, ASR_BIT_DATA_LOW_ALARM, missionRegister);
+				return this.getFlag(ALARM_STATUS_REGISTER, ASR_BIT_DATA_LOW_ALARM, this.missionRegister);
 			}
 		} else {
 			throw new IllegalArgumentException("Invalid Channel");
@@ -2705,21 +2843,26 @@ public boolean hasMissionAlarmed(int channel, int alarmType) throws OneWireExcep
 	 * @return true if the alarm of the specified type has been enabled for the
 	 *         specified channel.
 	 */
+	@Override
 	public boolean getMissionAlarmEnable(int channel, int alarmType) throws OneWireException, OneWireIOException {
-		if (!isMissionLoaded)
+		if (!this.isMissionLoaded) {
 			throw new OneWireException("Must load mission results first.");
+		}
 
 		if (channel == TEMPERATURE_CHANNEL) {
 			if (alarmType == MissionContainer.ALARM_HIGH) {
-				return getFlag(TEMPERATURE_CONTROL_REGISTER, TCR_BIT_ENABLE_TEMPERATURE_HIGH_ALARM, missionRegister);
+				return this.getFlag(TEMPERATURE_CONTROL_REGISTER, TCR_BIT_ENABLE_TEMPERATURE_HIGH_ALARM,
+						this.missionRegister);
 			} else {
-				return getFlag(TEMPERATURE_CONTROL_REGISTER, TCR_BIT_ENABLE_TEMPERATURE_LOW_ALARM, missionRegister);
+				return this.getFlag(TEMPERATURE_CONTROL_REGISTER, TCR_BIT_ENABLE_TEMPERATURE_LOW_ALARM,
+						this.missionRegister);
 			}
-		} else if (channel == DATA_CHANNEL) {
+		}
+		if (channel == DATA_CHANNEL) {
 			if (alarmType == MissionContainer.ALARM_HIGH) {
-				return getFlag(DATA_CONTROL_REGISTER, DCR_BIT_ENABLE_DATA_HIGH_ALARM, missionRegister);
+				return this.getFlag(DATA_CONTROL_REGISTER, DCR_BIT_ENABLE_DATA_HIGH_ALARM, this.missionRegister);
 			} else {
-				return getFlag(DATA_CONTROL_REGISTER, DCR_BIT_ENABLE_DATA_LOW_ALARM, missionRegister);
+				return this.getFlag(DATA_CONTROL_REGISTER, DCR_BIT_ENABLE_DATA_LOW_ALARM, this.missionRegister);
 			}
 		} else {
 			throw new IllegalArgumentException("Invalid Channel");
@@ -2735,30 +2878,34 @@ public boolean getMissionAlarmEnable(int channel, int alarmType) throws OneWireE
 	 *                  <code>ALARM_LOW</code>
 	 * @param enable    if true, alarm is enabled.
 	 */
+	@Override
 	public void setMissionAlarmEnable(int channel, int alarmType, boolean enable)
 			throws OneWireException, OneWireIOException {
-		if (!isMissionLoaded)
-			missionRegister = readDevice();
+		if (!this.isMissionLoaded) {
+			this.missionRegister = this.readDevice();
+		}
 
 //      System.out.println("setMissionAlarmEnable: channel=" + channel +", alarmType=" + alarmType + ", enable=" + enable);
 //      System.out.println("setMissionAlarmEnable: before state=" + Convert.toHexString(missionRegister));
 		if (channel == TEMPERATURE_CHANNEL) {
 			if (alarmType == MissionContainer.ALARM_HIGH) {
-				setFlag(TEMPERATURE_CONTROL_REGISTER, TCR_BIT_ENABLE_TEMPERATURE_HIGH_ALARM, enable, missionRegister);
+				this.setFlag(TEMPERATURE_CONTROL_REGISTER, TCR_BIT_ENABLE_TEMPERATURE_HIGH_ALARM, enable,
+						this.missionRegister);
 			} else {
-				setFlag(TEMPERATURE_CONTROL_REGISTER, TCR_BIT_ENABLE_TEMPERATURE_LOW_ALARM, enable, missionRegister);
+				this.setFlag(TEMPERATURE_CONTROL_REGISTER, TCR_BIT_ENABLE_TEMPERATURE_LOW_ALARM, enable,
+						this.missionRegister);
 			}
 		} else if (channel == DATA_CHANNEL) {
 			if (alarmType == MissionContainer.ALARM_HIGH) {
-				setFlag(DATA_CONTROL_REGISTER, DCR_BIT_ENABLE_DATA_HIGH_ALARM, enable, missionRegister);
+				this.setFlag(DATA_CONTROL_REGISTER, DCR_BIT_ENABLE_DATA_HIGH_ALARM, enable, this.missionRegister);
 			} else {
-				setFlag(DATA_CONTROL_REGISTER, DCR_BIT_ENABLE_DATA_LOW_ALARM, enable, missionRegister);
+				this.setFlag(DATA_CONTROL_REGISTER, DCR_BIT_ENABLE_DATA_LOW_ALARM, enable, this.missionRegister);
 			}
 		} else {
 			throw new IllegalArgumentException("Invalid Channel");
 		}
 //      System.out.println("setMissionAlarmEnable: after  state=" + Convert.toHexString(missionRegister));
-		writeDevice(missionRegister);
+		this.writeDevice(this.missionRegister);
 	}
 
 	/**
@@ -2771,32 +2918,34 @@ public void setMissionAlarmEnable(int channel, int alarmType, boolean enable)
 	 *                  <code>ALARM_LOW</code>
 	 * @return the threshold value which will trigger the alarm
 	 */
+	@Override
 	public double getMissionAlarm(int channel, int alarmType) throws OneWireException, OneWireIOException {
-		if (!isMissionLoaded)
+		if (!this.isMissionLoaded) {
 			throw new OneWireException("Must load mission results first.");
+		}
 
-		double th = 0;
+		var th = 0D;
 		if (channel == TEMPERATURE_CHANNEL) {
 			if (alarmType == MissionContainer.ALARM_HIGH) {
-				th = decodeTemperature(missionRegister, TEMPERATURE_HIGH_ALARM_THRESHOLD & 0x3F, 1, false);
+				th = this.decodeTemperature(this.missionRegister, TEMPERATURE_HIGH_ALARM_THRESHOLD & 0x3F, 1, false);
 			} else {
-				th = decodeTemperature(missionRegister, TEMPERATURE_LOW_ALARM_THRESHOLD & 0x3F, 1, false);
+				th = this.decodeTemperature(this.missionRegister, TEMPERATURE_LOW_ALARM_THRESHOLD & 0x3F, 1, false);
 			}
 		} else if (channel == DATA_CHANNEL) {
 			if (alarmType == MissionContainer.ALARM_HIGH) {
-				if (hasHumiditySensor && !adForceResults)
-					th = decodeHumidity(missionRegister, DATA_HIGH_ALARM_THRESHOLD & 0x3F, 1, false);
-				else if (adForceResults)
-					th = getADVoltage(missionRegister, DATA_HIGH_ALARM_THRESHOLD & 0x3F, 1, false);
-				else
-					th = (0x0FF & missionRegister[DATA_HIGH_ALARM_THRESHOLD & 0x3F]);
+				if (this.hasHumiditySensor && !this.adForceResults) {
+					th = this.decodeHumidity(this.missionRegister, DATA_HIGH_ALARM_THRESHOLD & 0x3F, 1, false);
+				} else if (this.adForceResults) {
+					th = this.getADVoltage(this.missionRegister, DATA_HIGH_ALARM_THRESHOLD & 0x3F, 1, false);
+				} else {
+					th = 0x0FF & this.missionRegister[DATA_HIGH_ALARM_THRESHOLD & 0x3F];
+				}
+			} else if (this.hasHumiditySensor && !this.adForceResults) {
+				th = this.decodeHumidity(this.missionRegister, DATA_LOW_ALARM_THRESHOLD & 0x3F, 1, false);
+			} else if (this.adForceResults) {
+				th = this.getADVoltage(this.missionRegister, DATA_LOW_ALARM_THRESHOLD & 0x3F, 1, false);
 			} else {
-				if (hasHumiditySensor && !adForceResults)
-					th = decodeHumidity(missionRegister, DATA_LOW_ALARM_THRESHOLD & 0x3F, 1, false);
-				else if (adForceResults)
-					th = getADVoltage(missionRegister, DATA_LOW_ALARM_THRESHOLD & 0x3F, 1, false);
-				else
-					th = (0x0FF & missionRegister[DATA_LOW_ALARM_THRESHOLD & 0x3F]);
+				th = 0x0FF & this.missionRegister[DATA_LOW_ALARM_THRESHOLD & 0x3F];
 			}
 		} else {
 			throw new IllegalArgumentException("Invalid Channel");
@@ -2814,41 +2963,45 @@ else if (adForceResults)
 	 *                  <code>ALARM_LOW</code>
 	 * @param threshold the threshold value which will trigger the alarm
 	 */
+	@Override
 	public void setMissionAlarm(int channel, int alarmType, double threshold)
 			throws OneWireException, OneWireIOException {
-		if (!isMissionLoaded)
-			missionRegister = readDevice();
+		if (!this.isMissionLoaded) {
+			this.missionRegister = this.readDevice();
+		}
 
 //      System.out.println("setMissionAlarm: channel=" + channel +", alarmType=" + alarmType + ", threshold=" + threshold);
 //      System.out.println("setMissionAlarm: before state=" + Convert.toHexString(missionRegister));
 
 		if (channel == TEMPERATURE_CHANNEL) {
 			if (alarmType == MissionContainer.ALARM_HIGH) {
-				encodeTemperature(threshold, missionRegister, TEMPERATURE_HIGH_ALARM_THRESHOLD & 0x3F, 1, false);
+				this.encodeTemperature(threshold, this.missionRegister, TEMPERATURE_HIGH_ALARM_THRESHOLD & 0x3F, 1,
+						false);
 			} else {
-				encodeTemperature(threshold, missionRegister, TEMPERATURE_LOW_ALARM_THRESHOLD & 0x3F, 1, false);
+				this.encodeTemperature(threshold, this.missionRegister, TEMPERATURE_LOW_ALARM_THRESHOLD & 0x3F, 1,
+						false);
 			}
 		} else if (channel == DATA_CHANNEL) {
 			if (alarmType == MissionContainer.ALARM_HIGH) {
-				if (hasHumiditySensor && !adForceResults)
-					encodeHumidity(threshold, missionRegister, DATA_HIGH_ALARM_THRESHOLD & 0x3F, 1, false);
-				else if (adForceResults)
-					setADVoltage(threshold, missionRegister, DATA_HIGH_ALARM_THRESHOLD & 0x3F, 1, false);
-				else
-					missionRegister[DATA_HIGH_ALARM_THRESHOLD & 0x3F] = (byte) threshold;
+				if (this.hasHumiditySensor && !this.adForceResults) {
+					this.encodeHumidity(threshold, this.missionRegister, DATA_HIGH_ALARM_THRESHOLD & 0x3F, 1, false);
+				} else if (this.adForceResults) {
+					this.setADVoltage(threshold, this.missionRegister, DATA_HIGH_ALARM_THRESHOLD & 0x3F, 1, false);
+				} else {
+					this.missionRegister[DATA_HIGH_ALARM_THRESHOLD & 0x3F] = (byte) threshold;
+				}
+			} else if (this.hasHumiditySensor && !this.adForceResults) {
+				this.encodeHumidity(threshold, this.missionRegister, DATA_LOW_ALARM_THRESHOLD & 0x3F, 1, false);
+			} else if (this.adForceResults) {
+				this.setADVoltage(threshold, this.missionRegister, DATA_LOW_ALARM_THRESHOLD & 0x3F, 1, false);
 			} else {
-				if (hasHumiditySensor && !adForceResults)
-					encodeHumidity(threshold, missionRegister, DATA_LOW_ALARM_THRESHOLD & 0x3F, 1, false);
-				else if (adForceResults)
-					setADVoltage(threshold, missionRegister, DATA_LOW_ALARM_THRESHOLD & 0x3F, 1, false);
-				else
-					missionRegister[DATA_LOW_ALARM_THRESHOLD & 0x3F] = (byte) threshold;
+				this.missionRegister[DATA_LOW_ALARM_THRESHOLD & 0x3F] = (byte) threshold;
 			}
 		} else {
 			throw new IllegalArgumentException("Invalid Channel");
 		}
 //      System.out.println("setMissionAlarm: after state=" + Convert.toHexString(missionRegister));
-		writeDevice(missionRegister);
+		this.writeDevice(this.missionRegister);
 	}
 
 // *****************************************************************************
@@ -2866,6 +3019,7 @@ else if (adForceResults)
 	 * @see #getTemperatureAlarm
 	 * @see #setTemperatureAlarm
 	 */
+	@Override
 	public boolean hasTemperatureAlarms() {
 		return true;
 	}
@@ -2880,6 +3034,7 @@ public boolean hasTemperatureAlarms() {
 	 * @see #getTemperatureResolutions
 	 * @see #setTemperatureResolution
 	 */
+	@Override
 	public boolean hasSelectableTemperatureResolution() {
 		return false;
 	}
@@ -2895,8 +3050,9 @@ public boolean hasSelectableTemperatureResolution() {
 	 * @see #getTemperatureResolution
 	 * @see #setTemperatureResolution
 	 */
+	@Override
 	public double[] getTemperatureResolutions() {
-		double[] d = new double[1];
+		var d = new double[1];
 
 		d[0] = temperatureResolutions[1];
 
@@ -2913,6 +3069,7 @@ public double[] getTemperatureResolutions() {
 	 * @see #setTemperatureAlarm
 	 *
 	 */
+	@Override
 	public double getTemperatureAlarmResolution() {
 		return temperatureResolutions[0];
 	}
@@ -2924,8 +3081,9 @@ public double getTemperatureAlarmResolution() {
 	 *
 	 * @see #getMinTemperature()
 	 */
+	@Override
 	public double getMaxTemperature() {
-		return temperatureRangeLow + temperatureRangeWidth;
+		return this.temperatureRangeLow + this.temperatureRangeWidth;
 	}
 
 	/**
@@ -2935,8 +3093,9 @@ public double getMaxTemperature() {
 	 *
 	 * @see #getMaxTemperature()
 	 */
+	@Override
 	public double getMinTemperature() {
-		return temperatureRangeLow;
+		return this.temperatureRangeLow;
 	}
 
 	/**
@@ -2955,33 +3114,37 @@ public double getMinTemperature() {
 	 * @throws OneWireException   on a communication or setup error with the 1-Wire
 	 *                            adapter
 	 */
+	@Override
 	public void doTemperatureConvert(byte[] state) throws OneWireIOException, OneWireException {
 		/* check for mission in progress */
-		if (getFlag(GENERAL_STATUS_REGISTER, GSR_BIT_MISSION_IN_PROGRESS, state))
+		if (this.getFlag(GENERAL_STATUS_REGISTER, GSR_BIT_MISSION_IN_PROGRESS, state)) {
 			throw new OneWireIOException("OneWireContainer41-Cant force " + "temperature read during a mission.");
+		}
 		/* check that the RTC is running */
-		if (!getFlag(RTC_CONTROL_REGISTER, RCR_BIT_ENABLE_OSCILLATOR, state))
+		if (!this.getFlag(RTC_CONTROL_REGISTER, RCR_BIT_ENABLE_OSCILLATOR, state)) {
 			throw new OneWireIOException(
 					"OneWireContainer41-Cant force " + "temperature conversion if the oscillator is not enabled");
+		}
 
 		/* get the temperature */
-		if (doSpeedEnable)
-			doSpeed(); // we aren't worried about how long this takes...we're sleeping for 750 ms!
+		if (this.doSpeedEnable) {
+			this.doSpeed(); // we aren't worried about how long this takes...we're sleeping for 750 ms!
+		}
 
-		adapter.reset();
+		this.adapter.reset();
 
-		if (adapter.select(address)) {
-			// perform the temperature conversion
-			byte[] buffer = new byte[] { FORCED_CONVERSION, (byte) 0xFF };
-			adapter.dataBlock(buffer, 0, 2);
+		if (!this.adapter.select(this.address)) {
+			throw new OneWireException("OneWireContainer41-Device not found!");
+		}
+		// perform the temperature conversion
+		byte[] buffer = { FORCED_CONVERSION, (byte) 0xFF };
+		this.adapter.dataBlock(buffer, 0, 2);
 
-			msWait(750);
+		msWait(750);
 
-			// grab the temperature
-			state[LAST_TEMPERATURE_CONVERSION_LSB & 0x3F] = readByte(LAST_TEMPERATURE_CONVERSION_LSB);
-			state[LAST_TEMPERATURE_CONVERSION_MSB & 0x3F] = readByte(LAST_TEMPERATURE_CONVERSION_MSB);
-		} else
-			throw new OneWireException("OneWireContainer41-Device not found!");
+		// grab the temperature
+		state[LAST_TEMPERATURE_CONVERSION_LSB & 0x3F] = this.readByte(LAST_TEMPERATURE_CONVERSION_LSB);
+		state[LAST_TEMPERATURE_CONVERSION_MSB & 0x3F] = this.readByte(LAST_TEMPERATURE_CONVERSION_MSB);
 	}
 
 	/**
@@ -2993,13 +3156,15 @@ public void doTemperatureConvert(byte[] state) throws OneWireIOException, OneWir
 	 * @return temperature in Celsius from the last
 	 *         <code>doTemperatureConvert()</code>
 	 */
+	@Override
 	public double getTemperature(byte[] state) {
-		double val = decodeTemperature(state, LAST_TEMPERATURE_CONVERSION_LSB & 0x3F, 2, false);
-		if (useTempCalibrationRegisters && (partNumber != PART_NUMBER_DS1922E)) // DS1922E does not use calibration
-																				// registers
+		var val = this.decodeTemperature(state, LAST_TEMPERATURE_CONVERSION_LSB & 0x3F, 2, false);
+		if (this.useTempCalibrationRegisters && this.partNumber != PART_NUMBER_DS1922E) // DS1922E does not use
+																						// calibration
+		// registers
 		{
-			double valsq = val * val;
-			double error = tempCoeffA * valsq + tempCoeffB * val + tempCoeffC;
+			var valsq = val * val;
+			var error = this.tempCoeffA * valsq + this.tempCoeffB * val + this.tempCoeffC;
 			val = val - error;
 		}
 		return val;
@@ -3018,17 +3183,20 @@ public double getTemperature(byte[] state) {
 	 * @see #hasTemperatureAlarms
 	 * @see #setTemperatureAlarm
 	 */
+	@Override
 	public double getTemperatureAlarm(int alarmType, byte[] state) {
-		double th = 0;
-		if (alarmType == TemperatureContainer.ALARM_HIGH)
-			th = decodeTemperature(state, TEMPERATURE_HIGH_ALARM_THRESHOLD & 0x3F, 1, false);
-		else
-			th = decodeTemperature(state, TEMPERATURE_LOW_ALARM_THRESHOLD & 0x3F, 1, false);
-		if (useTempCalibrationRegisters && (partNumber != PART_NUMBER_DS1922E)) // DS1922E does not use calibration
-																				// registers
+		var th = 0D;
+		if (alarmType == TemperatureContainer.ALARM_HIGH) {
+			th = this.decodeTemperature(state, TEMPERATURE_HIGH_ALARM_THRESHOLD & 0x3F, 1, false);
+		} else {
+			th = this.decodeTemperature(state, TEMPERATURE_LOW_ALARM_THRESHOLD & 0x3F, 1, false);
+		}
+		if (this.useTempCalibrationRegisters && this.partNumber != PART_NUMBER_DS1922E) // DS1922E does not use
+																						// calibration
+		// registers
 		{
-			double thsq = th * th;
-			double error = tempCoeffA * thsq + tempCoeffB * th + tempCoeffC;
+			var thsq = th * th;
+			var error = this.tempCoeffA * thsq + this.tempCoeffB * th + this.tempCoeffC;
 			th = th - error;
 		}
 		return th;
@@ -3046,6 +3214,7 @@ public double getTemperatureAlarm(int alarmType, byte[] state) {
 	 * @see #getTemperatureResolutions
 	 * @see #setTemperatureResolution
 	 */
+	@Override
 	public double getTemperatureResolution(byte[] state) {
 		return temperatureResolutions[1];
 	}
@@ -3063,19 +3232,20 @@ public double getTemperatureResolution(byte[] state) {
 	 * @see #hasTemperatureAlarms
 	 * @see #getTemperatureAlarm
 	 */
+	@Override
 	public void setTemperatureAlarm(int alarmType, double alarmValue, byte[] state) {
-		if (useTempCalibrationRegisters && (partNumber != PART_NUMBER_DS1922E)) // DS1922E does not use calibration
-																				// registers
+		if (this.useTempCalibrationRegisters && this.partNumber != PART_NUMBER_DS1922E) // DS1922E does not use
+																						// calibration
+		// registers
 		{
-			alarmValue = ((1 - tempCoeffB)
-					- Math.sqrt(((tempCoeffB - 1) * (tempCoeffB - 1)) - 4 * tempCoeffA * (tempCoeffC + alarmValue)))
-					/ (2 * tempCoeffA);
+			alarmValue = (1 - this.tempCoeffB - Math.sqrt((this.tempCoeffB - 1) * (this.tempCoeffB - 1)
+					- 4 * this.tempCoeffA * (this.tempCoeffC + alarmValue))) / (2 * this.tempCoeffA);
 		}
 
 		if (alarmType == TemperatureContainer.ALARM_HIGH) {
-			encodeTemperature(alarmValue, state, TEMPERATURE_HIGH_ALARM_THRESHOLD & 0x3F, 1, false);
+			this.encodeTemperature(alarmValue, state, TEMPERATURE_HIGH_ALARM_THRESHOLD & 0x3F, 1, false);
 		} else {
-			encodeTemperature(alarmValue, state, TEMPERATURE_LOW_ALARM_THRESHOLD & 0x3F, 1, false);
+			this.encodeTemperature(alarmValue, state, TEMPERATURE_LOW_ALARM_THRESHOLD & 0x3F, 1, false);
 		}
 	}
 
@@ -3094,6 +3264,7 @@ public void setTemperatureAlarm(int alarmType, double alarmValue, byte[] state)
 	 * @see #getTemperatureResolution
 	 * @see #getTemperatureResolutions
 	 */
+	@Override
 	public void setTemperatureResolution(double resolution, byte[] state) throws OneWireException {
 		throw new OneWireException("Selectable Temperature Resolution Not Supported");
 	}
@@ -3114,6 +3285,7 @@ public void setTemperatureResolution(double resolution, byte[] state) throws One
 	 * @see #getHumidityResolutions
 	 * @see #setHumidityResolution
 	 */
+	@Override
 	public boolean isRelative() {
 		return true;
 	}
@@ -3127,6 +3299,7 @@ public boolean isRelative() {
 	 * @see #getHumidityAlarm
 	 * @see #setHumidityAlarm
 	 */
+	@Override
 	public boolean hasHumidityAlarms() {
 		return true;
 	}
@@ -3141,6 +3314,7 @@ public boolean hasHumidityAlarms() {
 	 * @see #getHumidityResolutions
 	 * @see #setHumidityResolution
 	 */
+	@Override
 	public boolean hasSelectableHumidityResolution() {
 		return false;
 	}
@@ -3157,8 +3331,9 @@ public boolean hasSelectableHumidityResolution() {
 	 * @see #getHumidityResolution
 	 * @see #setHumidityResolution
 	 */
+	@Override
 	public double[] getHumidityResolutions() {
-		double[] d = new double[1];
+		var d = new double[1];
 
 		d[0] = humidityResolutions[1];
 
@@ -3177,6 +3352,7 @@ public double[] getHumidityResolutions() {
 	 * @see #setHumidityAlarm
 	 *
 	 */
+	@Override
 	public double getHumidityAlarmResolution() throws OneWireException {
 		return humidityResolutions[0];
 	}
@@ -3198,34 +3374,38 @@ public double getHumidityAlarmResolution() throws OneWireException {
 	 * @throws OneWireException   on a communication or setup error with the 1-Wire
 	 *                            adapter
 	 */
+	@Override
 	public void doHumidityConvert(byte[] state) throws OneWireIOException, OneWireException {
 		/* check for mission in progress */
-		if (getFlag(GENERAL_STATUS_REGISTER, GSR_BIT_MISSION_IN_PROGRESS, state))
+		if (this.getFlag(GENERAL_STATUS_REGISTER, GSR_BIT_MISSION_IN_PROGRESS, state)) {
 			throw new OneWireIOException("OneWireContainer41-Cant force " + "Humidity read during a mission.");
+		}
 
 		/* check that the RTC is running */
-		if (!getFlag(RTC_CONTROL_REGISTER, RCR_BIT_ENABLE_OSCILLATOR, state))
+		if (!this.getFlag(RTC_CONTROL_REGISTER, RCR_BIT_ENABLE_OSCILLATOR, state)) {
 			throw new OneWireIOException(
 					"OneWireContainer41-Cant force " + "Humidity conversion if the oscillator is not enabled");
+		}
 
 		/* get the temperature */
-		if (doSpeedEnable)
-			doSpeed(); // we aren't worried about how long this takes...we're sleeping for 750 ms!
+		if (this.doSpeedEnable) {
+			this.doSpeed(); // we aren't worried about how long this takes...we're sleeping for 750 ms!
+		}
 
-		adapter.reset();
+		this.adapter.reset();
 
-		if (adapter.select(address)) {
-			// perform the temperature conversion
-			byte[] buffer = new byte[] { FORCED_CONVERSION, (byte) 0xFF };
-			adapter.dataBlock(buffer, 0, 2);
+		if (!this.adapter.select(this.address)) {
+			throw new OneWireException("OneWireContainer41-Device not found!");
+		}
+		// perform the temperature conversion
+		byte[] buffer = { FORCED_CONVERSION, (byte) 0xFF };
+		this.adapter.dataBlock(buffer, 0, 2);
 
-			msWait(750);
+		msWait(750);
 
-			// grab the temperature
-			state[LAST_DATA_CONVERSION_LSB & 0x3F] = readByte(LAST_DATA_CONVERSION_LSB);
-			state[LAST_DATA_CONVERSION_MSB & 0x3F] = readByte(LAST_DATA_CONVERSION_MSB);
-		} else
-			throw new OneWireException("OneWireContainer41-Device not found!");
+		// grab the temperature
+		state[LAST_DATA_CONVERSION_LSB & 0x3F] = this.readByte(LAST_DATA_CONVERSION_LSB);
+		state[LAST_DATA_CONVERSION_MSB & 0x3F] = this.readByte(LAST_DATA_CONVERSION_MSB);
 	}
 
 	// --------
@@ -3242,11 +3422,12 @@ public void doHumidityConvert(byte[] state) throws OneWireIOException, OneWireEx
 	 * @see #getHumidityResolution
 	 * @see #setHumidityResolution
 	 */
+	@Override
 	public double getHumidity(byte[] state) {
-		double val = decodeHumidity(state, LAST_DATA_CONVERSION_LSB & 0x3F, 2, false);
-		if (useTemperatureCompensation) {
-			double T = decodeTemperature(state, LAST_TEMPERATURE_CONVERSION_LSB & 0x3F, 2, false);
-			double gamma = (T > 15) ? 0.00001 : -0.00005;
+		var val = this.decodeHumidity(state, LAST_DATA_CONVERSION_LSB & 0x3F, 2, false);
+		if (this.useTemperatureCompensation) {
+			var T = this.decodeTemperature(state, LAST_TEMPERATURE_CONVERSION_LSB & 0x3F, 2, false);
+			var gamma = T > 15 ? 0.00001 : -0.00005;
 			T -= 25;
 			val = (val * 0.0307 + .0035 * T - 0.000043 * T * T) / (0.0307 + gamma * T - 0.000002 * T * T);
 		}
@@ -3265,6 +3446,7 @@ public double getHumidity(byte[] state) {
 	 * @see #getHumidityResolutions
 	 * @see #setHumidityResolution
 	 */
+	@Override
 	public double getHumidityResolution(byte[] state) {
 		return humidityResolutions[1];
 	}
@@ -3284,12 +3466,14 @@ public double getHumidityResolution(byte[] state) {
 	 * @see #hasHumidityAlarms
 	 * @see #setHumidityAlarm
 	 */
+	@Override
 	public double getHumidityAlarm(int alarmType, byte[] state) throws OneWireException {
 		double th;
-		if (alarmType == HumidityContainer.ALARM_HIGH)
-			th = decodeHumidity(state, DATA_HIGH_ALARM_THRESHOLD & 0x3F, 1, false);
-		else
-			th = decodeHumidity(state, DATA_LOW_ALARM_THRESHOLD & 0x3F, 1, false);
+		if (alarmType == HumidityContainer.ALARM_HIGH) {
+			th = this.decodeHumidity(state, DATA_HIGH_ALARM_THRESHOLD & 0x3F, 1, false);
+		} else {
+			th = this.decodeHumidity(state, DATA_LOW_ALARM_THRESHOLD & 0x3F, 1, false);
+		}
 		return th;
 	}
 
@@ -3312,11 +3496,13 @@ public double getHumidityAlarm(int alarmType, byte[] state) throws OneWireExcept
 	 * @see #hasHumidityAlarms
 	 * @see #getHumidityAlarm
 	 */
+	@Override
 	public void setHumidityAlarm(int alarmType, double alarmValue, byte[] state) throws OneWireException {
-		if (alarmType == HumidityContainer.ALARM_HIGH)
-			encodeHumidity(alarmValue, state, DATA_HIGH_ALARM_THRESHOLD & 0x3F, 1, false);
-		else
-			encodeHumidity(alarmValue, state, DATA_LOW_ALARM_THRESHOLD & 0x3F, 1, false);
+		if (alarmType == HumidityContainer.ALARM_HIGH) {
+			this.encodeHumidity(alarmValue, state, DATA_HIGH_ALARM_THRESHOLD & 0x3F, 1, false);
+		} else {
+			this.encodeHumidity(alarmValue, state, DATA_LOW_ALARM_THRESHOLD & 0x3F, 1, false);
+		}
 	}
 
 	/**
@@ -3334,6 +3520,7 @@ public void setHumidityAlarm(int alarmType, double alarmValue, byte[] state) thr
 	 * @see #getHumidityResolution
 	 * @see #getHumidityResolutions
 	 */
+	@Override
 	public void setHumidityResolution(double resolution, byte[] state) throws OneWireException {
 		throw new OneWireException("Selectable Humidity Resolution Not Supported");
 	}
@@ -3350,6 +3537,7 @@ public void setHumidityResolution(double resolution, byte[] state) throws OneWir
 	 *
 	 * @return the number of channels
 	 */
+	@Override
 	public int getNumberADChannels() {
 		return 1;
 	}
@@ -3359,6 +3547,7 @@ public int getNumberADChannels() {
 	 *
 	 * @return true if this device has high/low trip alarms
 	 */
+	@Override
 	public boolean hasADAlarms() {
 		return true;
 	}
@@ -3374,6 +3563,7 @@ public boolean hasADAlarms() {
 	 *
 	 * @see #getNumberADChannels()
 	 */
+	@Override
 	public double[] getADRanges(int channel) {
 		return new double[] { 127 };
 	}
@@ -3393,6 +3583,7 @@ public double[] getADRanges(int channel) {
 	 * @see #getNumberADChannels()
 	 * @see #getADRanges(int)
 	 */
+	@Override
 	public double[] getADResolutions(int channel, double range) {
 		return new double[] { dataResolutions[1] };
 	}
@@ -3405,6 +3596,7 @@ public double[] getADResolutions(int channel, double range) {
 	 *
 	 * @see #doADConvert(boolean[],byte[])
 	 */
+	@Override
 	public boolean canADMultiChannelRead() {
 		return true;
 	}
@@ -3431,34 +3623,38 @@ public boolean canADMultiChannelRead() {
 	 * @see com.dalsemi.onewire.container.OneWireSensor#readDevice()
 	 * @see #getADVoltage(int,byte[])
 	 */
+	@Override
 	public void doADConvert(int channel, byte[] state) throws OneWireIOException, OneWireException {
 		/* check for mission in progress */
-		if (getFlag(GENERAL_STATUS_REGISTER, GSR_BIT_MISSION_IN_PROGRESS, state))
+		if (this.getFlag(GENERAL_STATUS_REGISTER, GSR_BIT_MISSION_IN_PROGRESS, state)) {
 			throw new OneWireIOException("OneWireContainer41-Cant force " + "temperature read during a mission.");
+		}
 
 		/* check that the RTC is running */
-		if (!getFlag(RTC_CONTROL_REGISTER, RCR_BIT_ENABLE_OSCILLATOR, state))
+		if (!this.getFlag(RTC_CONTROL_REGISTER, RCR_BIT_ENABLE_OSCILLATOR, state)) {
 			throw new OneWireIOException(
 					"OneWireContainer41-Cant force " + "A/D conversion if the oscillator is not enabled");
+		}
 
 		/* get the temperature */
-		if (doSpeedEnable)
-			doSpeed(); // we aren't worried about how long this takes...we're sleeping for 750 ms!
+		if (this.doSpeedEnable) {
+			this.doSpeed(); // we aren't worried about how long this takes...we're sleeping for 750 ms!
+		}
 
-		adapter.reset();
+		this.adapter.reset();
 
-		if (adapter.select(address)) {
-			// perform the conversion
-			byte[] buffer = new byte[] { FORCED_CONVERSION, (byte) 0xFF };
-			adapter.dataBlock(buffer, 0, 2);
+		if (!this.adapter.select(this.address)) {
+			throw new OneWireException("OneWireContainer41-Device not found!");
+		}
+		// perform the conversion
+		byte[] buffer = { FORCED_CONVERSION, (byte) 0xFF };
+		this.adapter.dataBlock(buffer, 0, 2);
 
-			msWait(750);
+		msWait(750);
 
-			// grab the data
-			state[LAST_DATA_CONVERSION_LSB & 0x3F] = readByte(LAST_DATA_CONVERSION_LSB);
-			state[LAST_DATA_CONVERSION_MSB & 0x3F] = readByte(LAST_DATA_CONVERSION_MSB);
-		} else
-			throw new OneWireException("OneWireContainer41-Device not found!");
+		// grab the data
+		state[LAST_DATA_CONVERSION_LSB & 0x3F] = this.readByte(LAST_DATA_CONVERSION_LSB);
+		state[LAST_DATA_CONVERSION_MSB & 0x3F] = this.readByte(LAST_DATA_CONVERSION_MSB);
 	}
 
 	/**
@@ -3485,8 +3681,9 @@ public void doADConvert(int channel, byte[] state) throws OneWireIOException, On
 	 * @see #getADVoltage(byte[])
 	 * @see #canADMultiChannelRead()
 	 */
+	@Override
 	public void doADConvert(boolean[] doConvert, byte[] state) throws OneWireIOException, OneWireException {
-		doADConvert(DATA_CHANNEL, state);
+		this.doADConvert(DATA_CHANNEL, state);
 	}
 
 	/**
@@ -3512,8 +3709,9 @@ public void doADConvert(boolean[] doConvert, byte[] state) throws OneWireIOExcep
 	 *
 	 * @see #doADConvert(boolean[],byte[])
 	 */
+	@Override
 	public double[] getADVoltage(byte[] state) throws OneWireIOException, OneWireException {
-		return new double[] { getADVoltage(DATA_CHANNEL, state) };
+		return new double[] { this.getADVoltage(DATA_CHANNEL, state) };
 	}
 
 	/**
@@ -3541,8 +3739,9 @@ public double[] getADVoltage(byte[] state) throws OneWireIOException, OneWireExc
 	 * @see #doADConvert(int,byte[])
 	 * @see #getADVoltage(byte[])
 	 */
+	@Override
 	public double getADVoltage(int channel, byte[] state) throws OneWireIOException, OneWireException {
-		return getADVoltage(state, LAST_DATA_CONVERSION_LSB & 0x3F, 2, false);
+		return this.getADVoltage(state, LAST_DATA_CONVERSION_LSB & 0x3F, 2, false);
 	}
 
 	/**
@@ -3564,12 +3763,13 @@ public double getADVoltage(int channel, byte[] state) throws OneWireIOException,
 	 * @see com.dalsemi.onewire.container.OneWireSensor#readDevice()
 	 * @see #hasADAlarms()
 	 */
+	@Override
 	public double getADAlarm(int channel, int alarmType, byte[] state) throws OneWireException {
-		double th = 0;
+		var th = 0D;
 		if (alarmType == ADContainer.ALARM_HIGH) {
-			th = getADVoltage(state, DATA_HIGH_ALARM_THRESHOLD & 0x3F, 1, false);
+			th = this.getADVoltage(state, DATA_HIGH_ALARM_THRESHOLD & 0x3F, 1, false);
 		} else {
-			th = getADVoltage(state, DATA_LOW_ALARM_THRESHOLD & 0x3F, 1, false);
+			th = this.getADVoltage(state, DATA_LOW_ALARM_THRESHOLD & 0x3F, 1, false);
 		}
 		return th;
 	}
@@ -3593,12 +3793,13 @@ public double getADAlarm(int channel, int alarmType, byte[] state) throws OneWir
 	 * @see com.dalsemi.onewire.container.OneWireSensor#readDevice()
 	 * @see #hasADAlarms()
 	 */
+	@Override
 	public boolean getADAlarmEnable(int channel, int alarmType, byte[] state) throws OneWireException {
-		boolean b = false;
+		var b = false;
 		if (alarmType == ADContainer.ALARM_HIGH) {
-			b = getFlag(DATA_CONTROL_REGISTER, DCR_BIT_ENABLE_DATA_HIGH_ALARM, state);
+			b = this.getFlag(DATA_CONTROL_REGISTER, DCR_BIT_ENABLE_DATA_HIGH_ALARM, state);
 		} else {
-			b = getFlag(DATA_CONTROL_REGISTER, DCR_BIT_ENABLE_DATA_LOW_ALARM, state);
+			b = this.getFlag(DATA_CONTROL_REGISTER, DCR_BIT_ENABLE_DATA_LOW_ALARM, state);
 		}
 		return b;
 	}
@@ -3624,12 +3825,13 @@ public boolean getADAlarmEnable(int channel, int alarmType, byte[] state) throws
 	 * @see #getADAlarmEnable(int,int,byte[])
 	 * @see #setADAlarmEnable(int,int,boolean,byte[])
 	 */
+	@Override
 	public boolean hasADAlarmed(int channel, int alarmType, byte[] state) throws OneWireException {
-		boolean b = false;
+		var b = false;
 		if (alarmType == ADContainer.ALARM_HIGH) {
-			b = getFlag(ALARM_STATUS_REGISTER, ASR_BIT_DATA_HIGH_ALARM, state);
+			b = this.getFlag(ALARM_STATUS_REGISTER, ASR_BIT_DATA_HIGH_ALARM, state);
 		} else {
-			b = getFlag(ALARM_STATUS_REGISTER, ASR_BIT_DATA_LOW_ALARM, state);
+			b = this.getFlag(ALARM_STATUS_REGISTER, ASR_BIT_DATA_LOW_ALARM, state);
 		}
 		return b;
 	}
@@ -3649,6 +3851,7 @@ public boolean hasADAlarmed(int channel, int alarmType, byte[] state) throws One
 	 * @see #getADResolutions(int,double)
 	 * @see #setADResolution(int,double,byte[])
 	 */
+	@Override
 	public double getADResolution(int channel, byte[] state) {
 		return dataResolutions[1];
 	}
@@ -3667,6 +3870,7 @@ public double getADResolution(int channel, byte[] state) {
 	 * @see #getADRanges(int)
 	 * @see #setADRange(int,double,byte[])
 	 */
+	@Override
 	public double getADRange(int channel, byte[] state) {
 		return 127;
 	}
@@ -3696,11 +3900,12 @@ public double getADRange(int channel, byte[] state) {
 	 * @see #setADAlarmEnable(int,int,boolean,byte[])
 	 * @see #hasADAlarmed(int,int,byte[])
 	 */
+	@Override
 	public void setADAlarm(int channel, int alarmType, double alarm, byte[] state) throws OneWireException {
 		if (alarmType == ADContainer.ALARM_HIGH) {
-			setADVoltage(alarm, state, DATA_HIGH_ALARM_THRESHOLD & 0x3F, 1, false);
+			this.setADVoltage(alarm, state, DATA_HIGH_ALARM_THRESHOLD & 0x3F, 1, false);
 		} else {
-			setADVoltage(alarm, state, DATA_LOW_ALARM_THRESHOLD & 0x3F, 1, false);
+			this.setADVoltage(alarm, state, DATA_LOW_ALARM_THRESHOLD & 0x3F, 1, false);
 		}
 	}
 
@@ -3729,12 +3934,13 @@ public void setADAlarm(int channel, int alarmType, double alarm, byte[] state) t
 	 * @see #getADAlarmEnable(int,int,byte[])
 	 * @see #hasADAlarmed(int,int,byte[])
 	 */
+	@Override
 	public void setADAlarmEnable(int channel, int alarmType, boolean alarmEnable, byte[] state)
 			throws OneWireException {
 		if (alarmType == ADContainer.ALARM_HIGH) {
-			setFlag(DATA_CONTROL_REGISTER, DCR_BIT_ENABLE_DATA_HIGH_ALARM, alarmEnable, state);
+			this.setFlag(DATA_CONTROL_REGISTER, DCR_BIT_ENABLE_DATA_HIGH_ALARM, alarmEnable, state);
 		} else {
-			setFlag(DATA_CONTROL_REGISTER, DCR_BIT_ENABLE_DATA_LOW_ALARM, alarmEnable, state);
+			this.setFlag(DATA_CONTROL_REGISTER, DCR_BIT_ENABLE_DATA_LOW_ALARM, alarmEnable, state);
 		}
 	}
 
@@ -3757,6 +3963,7 @@ public void setADAlarmEnable(int channel, int alarmType, boolean alarmEnable, by
 	 * @see #getADResolution(int,byte[])
 	 *
 	 */
+	@Override
 	public void setADResolution(int channel, double resolution, byte[] state) {
 		// throw new OneWireException("Selectable A-D Resolution Not Supported");
 	}
@@ -3778,36 +3985,39 @@ public void setADResolution(int channel, double resolution, byte[] state) {
 	 * @see #getADRanges(int)
 	 * @see #getADRange(int,byte[])
 	 */
+	@Override
 	public void setADRange(int channel, double range, byte[] state) {
 		// throw new OneWireException("Selectable A-D Range Not Supported");
 	}
 
 	public void setADReferenceVoltage(double referenceVoltage) {
-		adReferenceVoltage = referenceVoltage;
+		this.adReferenceVoltage = referenceVoltage;
 	}
 
 	public double getADReferenceVoltage() {
-		return adReferenceVoltage;
+		return this.adReferenceVoltage;
 	}
 
 	public void setADDeviceBitCount(int bits) {
-		if (bits > 16)
+		if (bits > 16) {
 			bits = 16;
-		if (bits < 8)
+		}
+		if (bits < 8) {
 			bits = 8;
-		adDeviceBits = bits;
+		}
+		this.adDeviceBits = bits;
 	}
 
 	public int getADDeviceBitCount() {
-		return adDeviceBits;
+		return this.adDeviceBits;
 	}
 
 	public void setForceADResults(boolean force) {
-		adForceResults = force;
+		this.adForceResults = force;
 	}
 
 	public boolean getForceADResults() {
-		return adForceResults;
+		return this.adForceResults;
 	}
 
 // *****************************************************************************
@@ -3827,6 +4037,7 @@ public boolean getForceADResults() {
 	 * @see #setClockAlarm(long,byte[])
 	 * @see #setClockAlarmEnable(boolean,byte[])
 	 */
+	@Override
 	public boolean hasClockAlarm() {
 		return false;
 	}
@@ -3839,6 +4050,7 @@ public boolean hasClockAlarm() {
 	 * @see #isClockRunning(byte[])
 	 * @see #setClockRunEnable(boolean,byte[])
 	 */
+	@Override
 	public boolean canDisableClock() {
 		return true;
 	}
@@ -3848,6 +4060,7 @@ public boolean canDisableClock() {
 	 *
 	 * @return the clock resolution in milliseconds
 	 */
+	@Override
 	public long getClockResolution() {
 		return 1000;
 	}
@@ -3867,11 +4080,12 @@ public long getClockResolution() {
 	 * @see com.dalsemi.onewire.container.OneWireSensor#readDevice()
 	 * @see #setClock(long,byte[])
 	 */
+	@Override
 	public long getClock(byte[] state) {
 		// grab the time
-		int[] time = getTime(RTC_TIME & 0x3F, state);
+		var time = this.getTime(RTC_TIME & 0x3F, state);
 		// grab the date
-		int[] date = getDate(RTC_DATE & 0x3F, state);
+		var date = this.getDate(RTC_DATE & 0x3F, state);
 
 		// date[1] - 1 because Java months are 0 offset
 		Calendar d = new GregorianCalendar(date[0], date[1] - 1, date[2], time[2], time[1], time[0]);
@@ -3894,6 +4108,7 @@ public long getClock(byte[] state) {
 	 * @see #setClockAlarm(long,byte[])
 	 * @see #setClockAlarmEnable(boolean,byte[])
 	 */
+	@Override
 	public long getClockAlarm(byte[] state) throws OneWireException {
 		throw new OneWireException("Device does not support clock alarms");
 	}
@@ -3914,6 +4129,7 @@ public long getClockAlarm(byte[] state) throws OneWireException {
 	 * @see #setClockAlarm(long,byte[])
 	 * @see #setClockAlarmEnable(boolean,byte[])
 	 */
+	@Override
 	public boolean isClockAlarming(byte[] state) {
 		return false;
 	}
@@ -3933,6 +4149,7 @@ public boolean isClockAlarming(byte[] state) {
 	 * @see #setClockAlarm(long,byte[])
 	 * @see #setClockAlarmEnable(boolean,byte[])
 	 */
+	@Override
 	public boolean isClockAlarmEnabled(byte[] state) {
 		return false;
 	}
@@ -3950,8 +4167,9 @@ public boolean isClockAlarmEnabled(byte[] state) {
 	 * @see #canDisableClock()
 	 * @see #setClockRunEnable(boolean,byte[])
 	 */
+	@Override
 	public boolean isClockRunning(byte[] state) {
-		return getFlag(RTC_CONTROL_REGISTER, RCR_BIT_ENABLE_OSCILLATOR, state);
+		return this.getFlag(RTC_CONTROL_REGISTER, RCR_BIT_ENABLE_OSCILLATOR, state);
 	}
 
 	// --------
@@ -3971,20 +4189,22 @@ public boolean isClockRunning(byte[] state) {
 	 * @see com.dalsemi.onewire.container.OneWireSensor#writeDevice(byte[])
 	 * @see #getClock(byte[])
 	 */
+	@Override
 	public void setClock(long time, byte[] state) {
-		Date x = new Date(time);
+		var x = new Date(time);
 		Calendar d = new GregorianCalendar();
 
 		d.setTime(x);
-		setTime(RTC_TIME & 0x3F, d.get(Calendar.HOUR_OF_DAY), d.get(Calendar.MINUTE), d.get(Calendar.SECOND), false,
-				state);
-		setDate(RTC_DATE & 0x3F, d.get(Calendar.YEAR), d.get(Calendar.MONTH) + 1, d.get(Calendar.DATE), state);
+		this.setTime(RTC_TIME & 0x3F, d.get(Calendar.HOUR_OF_DAY), d.get(Calendar.MINUTE), d.get(Calendar.SECOND),
+				false, state);
+		this.setDate(RTC_DATE & 0x3F, d.get(Calendar.YEAR), d.get(Calendar.MONTH) + 1, d.get(Calendar.DATE), state);
 
-		if (!getFlag(RTC_CONTROL_REGISTER, RCR_BIT_ENABLE_OSCILLATOR, state))
-			setFlag(RTC_CONTROL_REGISTER, RCR_BIT_ENABLE_OSCILLATOR, true, state);
+		if (!this.getFlag(RTC_CONTROL_REGISTER, RCR_BIT_ENABLE_OSCILLATOR, state)) {
+			this.setFlag(RTC_CONTROL_REGISTER, RCR_BIT_ENABLE_OSCILLATOR, true, state);
+		}
 
 		synchronized (this) {
-			updatertc = true;
+			this.updatertc = true;
 		}
 	}
 
@@ -4009,6 +4229,7 @@ public void setClock(long time, byte[] state) {
 	 * @see #isClockAlarming(byte[])
 	 * @see #setClockAlarmEnable(boolean,byte[])
 	 */
+	@Override
 	public void setClockAlarm(long time, byte[] state) throws OneWireException {
 		throw new OneWireException("Device does not support clock alarms");
 	}
@@ -4029,8 +4250,9 @@ public void setClockAlarm(long time, byte[] state) throws OneWireException {
 	 * @see #canDisableClock()
 	 * @see #isClockRunning(byte[])
 	 */
+	@Override
 	public void setClockRunEnable(boolean runEnable, byte[] state) {
-		setFlag(RTC_CONTROL_REGISTER, RCR_BIT_ENABLE_OSCILLATOR, runEnable, state);
+		this.setFlag(RTC_CONTROL_REGISTER, RCR_BIT_ENABLE_OSCILLATOR, runEnable, state);
 	}
 
 	/**
@@ -4051,6 +4273,7 @@ public void setClockRunEnable(boolean runEnable, byte[] state) {
 	 * @see #setClockAlarm(long,byte[])
 	 * @see #isClockAlarming(byte[])
 	 */
+	@Override
 	public void setClockAlarmEnable(boolean alarmEnable, byte[] state) throws OneWireException {
 		throw new OneWireException("Device does not support clock alarms");
 	}
@@ -4065,39 +4288,40 @@ public void setClockAlarmEnable(boolean alarmEnable, byte[] state) throws OneWir
 	 */
 	private int[] getTime(int timeReg, byte[] state) {
 		byte upper, lower;
-		int[] result = new int[3];
+		var result = new int[3];
 
 		// First grab the seconds. Upper half holds the 10's of seconds
 		lower = state[timeReg++];
-		upper = (byte) ((lower >>> 4) & 0x07);
+		upper = (byte) (lower >>> 4 & 0x07);
 		lower = (byte) (lower & 0x0f);
-		result[0] = (int) lower + (int) upper * 10;
+		result[0] = lower + upper * 10;
 
 		// now grab minutes. The upper half holds the 10s of minutes
 		lower = state[timeReg++];
-		upper = (byte) ((lower >>> 4) & 0x07);
+		upper = (byte) (lower >>> 4 & 0x07);
 		lower = (byte) (lower & 0x0f);
-		result[1] = (int) lower + (int) upper * 10;
+		result[1] = lower + upper * 10;
 
 		// now grab the hours. The lower half is single hours again, but the
 		// upper half of the byte is determined by the 2nd bit - specifying
 		// 12/24 hour time.
 		lower = state[timeReg];
-		upper = (byte) ((lower >>> 4) & 0x07);
+		upper = (byte) (lower >>> 4 & 0x07);
 		lower = (byte) (lower & 0x0f);
 
 		byte PM = 0;
 		// if the 2nd bit is 1, convert 12 hour time to 24 hour time.
 		if ((upper & 0x04) != 0) {
 			// extract the AM/PM byte (PM is indicated by a 1)
-			if ((upper & 0x02) > 0)
+			if ((upper & 0x02) > 0) {
 				PM = 12;
+			}
 
 			// isolate the 10s place
 			upper &= 0x01;
 		}
 
-		result[2] = (int) (upper * 10) + (int) lower + (int) PM;
+		result[2] = upper * 10 + lower + PM;
 
 		return result;
 	}
@@ -4109,39 +4333,43 @@ private void setTime(int timeReg, int hours, int minutes, int seconds, boolean A
 		byte upper, lower;
 
 		/* format in bytes and write seconds */
-		upper = (byte) (((seconds / 10) << 4) & 0xf0);
-		lower = (byte) ((seconds % 10) & 0x0f);
+		upper = (byte) (seconds / 10 << 4 & 0xf0);
+		lower = (byte) (seconds % 10 & 0x0f);
 		state[timeReg++] = (byte) (upper | lower);
 
 		/* format in bytes and write minutes */
-		upper = (byte) (((minutes / 10) << 4) & 0xf0);
-		lower = (byte) ((minutes % 10) & 0x0f);
+		upper = (byte) (minutes / 10 << 4 & 0xf0);
+		lower = (byte) (minutes % 10 & 0x0f);
 		state[timeReg++] = (byte) (upper | lower);
 
 		/* format in bytes and write hours/(12/24) bit */
 		if (AMPM) {
 			upper = (byte) 0x04;
 
-			if (hours > 11)
+			if (hours > 11) {
 				upper = (byte) (upper | 0x02);
+			}
 
 			// this next logic simply checks for a decade hour
-			if (((hours % 12) == 0) || ((hours % 12) > 9))
+			if (hours % 12 == 0 || hours % 12 > 9) {
 				upper = (byte) (upper | 0x01);
+			}
 
-			if (hours > 12)
+			if (hours > 12) {
 				hours = hours - 12;
+			}
 
-			if (hours == 0)
+			if (hours == 0) {
 				lower = (byte) 0x02;
-			else
-				lower = (byte) ((hours % 10) & 0x0f);
+			} else {
+				lower = (byte) (hours % 10 & 0x0f);
+			}
 		} else {
 			upper = (byte) (hours / 10);
 			lower = (byte) (hours % 10);
 		}
 
-		upper = (byte) ((upper << 4) & 0xf0);
+		upper = (byte) (upper << 4 & 0xf0);
 		lower = (byte) (lower & 0x0f);
 		state[timeReg] = (byte) (upper | lower);
 	}
@@ -4156,25 +4384,26 @@ private void setTime(int timeReg, int hours, int minutes, int seconds, boolean A
 	 */
 	private int[] getDate(int timeReg, byte[] state) {
 		byte upper, lower;
-		int[] result = new int[] { 0, 0, 0 };
+		int[] result = { 0, 0, 0 };
 
 		/* extract the day of the month */
 		lower = state[timeReg++];
-		upper = (byte) ((lower >>> 4) & 0x0f);
+		upper = (byte) (lower >>> 4 & 0x0f);
 		lower = (byte) (lower & 0x0f);
 		result[2] = upper * 10 + lower;
 
 		/* extract the month */
 		lower = state[timeReg++];
-		if ((lower & 0x80) == 0x80)
+		if ((lower & 0x80) == 0x80) {
 			result[0] = 100;
-		upper = (byte) ((lower >>> 4) & 0x01);
+		}
+		upper = (byte) (lower >>> 4 & 0x01);
 		lower = (byte) (lower & 0x0f);
 		result[1] = upper * 10 + lower;
 
 		/* grab the year */
 		lower = state[timeReg++];
-		upper = (byte) ((lower >>> 4) & 0x0f);
+		upper = (byte) (lower >>> 4 & 0x0f);
 		lower = (byte) (lower & 0x0f);
 		result[0] += upper * 10 + lower + FIRST_YEAR_EVER;
 
@@ -4192,16 +4421,16 @@ private void setDate(int timeReg, int year, int month, int day, byte[] state) {
 		byte upper, lower;
 
 		/* write the day byte (the upper holds 10s of days, lower holds single days) */
-		upper = (byte) (((day / 10) << 4) & 0xf0);
-		lower = (byte) ((day % 10) & 0x0f);
+		upper = (byte) (day / 10 << 4 & 0xf0);
+		lower = (byte) (day % 10 & 0x0f);
 		state[timeReg++] = (byte) (upper | lower);
 
 		/*
 		 * write the month bit in the same manner, with the MSBit indicating the century
 		 * (1 for 2000, 0 for 1900)
 		 */
-		upper = (byte) (((month / 10) << 4) & 0xf0);
-		lower = (byte) ((month % 10) & 0x0f);
+		upper = (byte) (month / 10 << 4 & 0xf0);
+		lower = (byte) (month % 10 & 0x0f);
 		state[timeReg++] = (byte) (upper | lower);
 
 		// now write the year
@@ -4210,8 +4439,8 @@ private void setDate(int timeReg, int year, int month, int day, byte[] state) {
 			state[timeReg - 1] |= 0x80;
 			year -= 100;
 		}
-		upper = (byte) (((year / 10) << 4) & 0xf0);
-		lower = (byte) ((year % 10) & 0x0f);
+		upper = (byte) (year / 10 << 4 & 0xf0);
+		lower = (byte) (year % 10 & 0x0f);
 		state[timeReg] = (byte) (upper | lower);
 	}
 
@@ -4227,35 +4456,35 @@ private void setDate(int timeReg, int year, int month, int day, byte[] state) {
 	private void initMem() {
 
 		// scratchpad
-		scratch = new MemoryBankScratchCRCPW(this);
+		this.scratch = new MemoryBankScratchCRCPW(this);
 
 		// User Data Memory
-		userDataMemory = new MemoryBankNVCRCPW(this, scratch);
-		userDataMemory.numberPages = 16;
-		userDataMemory.size = 512;
-		userDataMemory.bankDescription = "User Data Memory";
-		userDataMemory.startPhysicalAddress = 0x0000;
-		userDataMemory.generalPurposeMemory = true;
-		userDataMemory.readOnly = false;
-		userDataMemory.readWrite = true;
+		this.userDataMemory = new MemoryBankNVCRCPW(this, this.scratch);
+		this.userDataMemory.numberPages = 16;
+		this.userDataMemory.size = 512;
+		this.userDataMemory.bankDescription = "User Data Memory";
+		this.userDataMemory.startPhysicalAddress = 0x0000;
+		this.userDataMemory.generalPurposeMemory = true;
+		this.userDataMemory.readOnly = false;
+		this.userDataMemory.readWrite = true;
 
 		// Register
-		register = new MemoryBankNVCRCPW(this, scratch);
-		register.numberPages = 32;
-		register.size = 1024;
-		register.bankDescription = "Register control";
-		register.startPhysicalAddress = 0x0200;
-		register.generalPurposeMemory = false;
+		this.register = new MemoryBankNVCRCPW(this, this.scratch);
+		this.register.numberPages = 32;
+		this.register.size = 1024;
+		this.register.bankDescription = "Register control";
+		this.register.startPhysicalAddress = 0x0200;
+		this.register.generalPurposeMemory = false;
 
 		// Data Log
-		log = new MemoryBankNVCRCPW(this, scratch);
-		log.numberPages = 256;
-		log.size = 8192;
-		log.bankDescription = "Data log";
-		log.startPhysicalAddress = 0x1000;
-		log.generalPurposeMemory = false;
-		log.readOnly = true;
-		log.readWrite = false;
+		this.log = new MemoryBankNVCRCPW(this, this.scratch);
+		this.log.numberPages = 256;
+		this.log.size = 8192;
+		this.log.bankDescription = "Data log";
+		this.log.startPhysicalAddress = 0x1000;
+		this.log.generalPurposeMemory = false;
+		this.log.readOnly = true;
+		this.log.readWrite = false;
 	}
 
 	/**
@@ -4265,127 +4494,128 @@ private void initMem() {
 	 * Temperature/A-D iButton
 	 */
 	private void setContainerVariables(byte[] registerPages) {
-		double Tref1 = 60;
-		boolean autoLoadCalibration = true;
+		var Tref1 = 60D;
+		var autoLoadCalibration = true;
 
 		// clear this flag.. Gets set later if registerPages!=null
-		isContainerVariablesSet = false;
+		this.isContainerVariablesSet = false;
 
 		// reset mission parameters
-		hasHumiditySensor = false;
-		isMissionLoaded = false;
-		missionRegister = null;
-		dataLog = null;
-		temperatureLog = null;
-		adReferenceVoltage = 5.02d;
-		adDeviceBits = 10;
-		adForceResults = false;
-
-		deviceConfigByte = (byte) 0xFF;
+		this.hasHumiditySensor = false;
+		this.isMissionLoaded = false;
+		this.missionRegister = null;
+		this.dataLog = null;
+		this.temperatureLog = null;
+		this.adReferenceVoltage = 5.02d;
+		this.adDeviceBits = 10;
+		this.adForceResults = false;
+
+		this.deviceConfigByte = (byte) 0xFF;
 		if (registerPages != null) {
-			deviceConfigByte = registerPages[DEVICE_CONFIGURATION_BYTE & 0x03F];
+			this.deviceConfigByte = registerPages[DEVICE_CONFIGURATION_BYTE & 0x03F];
 		}
 
-		switch (deviceConfigByte) {
+		switch (this.deviceConfigByte) {
 		case DCB_DS2422:
-			partNumber = PART_NUMBER_DS2422;
-			temperatureRangeLow = -40;
-			temperatureRangeWidth = 125;
+			this.partNumber = PART_NUMBER_DS2422;
+			this.temperatureRangeLow = -40;
+			this.temperatureRangeWidth = 125;
 			Tref1 = 60;
-			descriptionString = DESCRIPTION_DS2422;
+			this.descriptionString = DESCRIPTION_DS2422;
 			autoLoadCalibration = false;
 			break;
 		case DCB_DS1923:
-			partNumber = PART_NUMBER_DS1923;
-			temperatureRangeLow = -40;
-			temperatureRangeWidth = 125;
+			this.partNumber = PART_NUMBER_DS1923;
+			this.temperatureRangeLow = -40;
+			this.temperatureRangeWidth = 125;
 			Tref1 = 60;
-			hasHumiditySensor = true;
-			descriptionString = DESCRIPTION_DS1923;
+			this.hasHumiditySensor = true;
+			this.descriptionString = DESCRIPTION_DS1923;
 			break;
 		case DCB_DS1922L:
-			partNumber = PART_NUMBER_DS1922L;
-			temperatureRangeLow = -40;
-			temperatureRangeWidth = 125;
+			this.partNumber = PART_NUMBER_DS1922L;
+			this.temperatureRangeLow = -40;
+			this.temperatureRangeWidth = 125;
 			Tref1 = 60;
-			descriptionString = DESCRIPTION_DS1922;
+			this.descriptionString = DESCRIPTION_DS1922;
 			break;
 		case DCB_DS1922T:
-			partNumber = PART_NUMBER_DS1922T;
-			temperatureRangeLow = 0;
-			temperatureRangeWidth = 125;
+			this.partNumber = PART_NUMBER_DS1922T;
+			this.temperatureRangeLow = 0;
+			this.temperatureRangeWidth = 125;
 			Tref1 = 90;
-			descriptionString = DESCRIPTION_DS1922;
+			this.descriptionString = DESCRIPTION_DS1922;
 			break;
 		case DCB_DS1922E:
-			partNumber = PART_NUMBER_DS1922E;
-			temperatureRangeLow = 15;
-			temperatureRangeWidth = 125;
-			descriptionString = DESCRIPTION_DS1922;
+			this.partNumber = PART_NUMBER_DS1922E;
+			this.temperatureRangeLow = 15;
+			this.temperatureRangeWidth = 125;
+			this.descriptionString = DESCRIPTION_DS1922;
 			break;
 		case DCB_DS1922S:
-			partNumber = PART_NUMBER_DS1922S;
-			temperatureRangeLow = -40;
-			temperatureRangeWidth = 125;
+			this.partNumber = PART_NUMBER_DS1922S;
+			this.temperatureRangeLow = -40;
+			this.temperatureRangeWidth = 125;
 			Tref1 = 60;
-			descriptionString = DESCRIPTION_DS1922
+			this.descriptionString = DESCRIPTION_DS1922
 					+ "\r\n\r\n* Please note that the DS1922S can be missioned only once.";
 			break;
 		default:
-			partNumber = PART_NUMBER_UNKNOWN;
-			temperatureRangeLow = -40;
-			temperatureRangeWidth = 125;
+			this.partNumber = PART_NUMBER_UNKNOWN;
+			this.temperatureRangeLow = -40;
+			this.temperatureRangeWidth = 125;
 			Tref1 = 60;
-			descriptionString = DESCRIPTION_UNKNOWN;
+			this.descriptionString = DESCRIPTION_UNKNOWN;
 			autoLoadCalibration = false;
 			break;
 		}
 
 		if (registerPages != null) {
-			isContainerVariablesSet = true;
+			this.isContainerVariablesSet = true;
 
 			if (autoLoadCalibration) {
 				// if humidity device, calculate the calibration coefficients
-				if (hasHumiditySensor) {
-					useHumdCalibrationRegisters = true;
+				if (this.hasHumiditySensor) {
+					this.useHumdCalibrationRegisters = true;
 
 					// DEBUG: Product samples were sent out uncalibrated. This flag
 					// allows the customer to not use the temperature calibration
-					String useHumdCal = OneWireAccessProvider.getProperty("DS1923.useHumidityCalibrationRegisters");
+					var useHumdCal = OneWireAccessProvider.getProperty("DS1923.useHumidityCalibrationRegisters");
 					if (useHumdCal != null && useHumdCal.toLowerCase().equals("false")) {
-						useHumdCalibrationRegisters = false;
+						this.useHumdCalibrationRegisters = false;
 						if (DEBUG) {
 							Debug.debug("DEBUG: Disabling Humidity Calibration Usage in Container");
 						}
 					}
 
-					Href1 = decodeHumidity(registerPages, 0x48, 2, true);
-					Hread1 = decodeHumidity(registerPages, 0x4A, 2, true);
-					Herror1 = Hread1 - Href1;
-					Href2 = decodeHumidity(registerPages, 0x4C, 2, true);
-					Hread2 = decodeHumidity(registerPages, 0x4E, 2, true);
-					Herror2 = Hread2 - Href2;
-					Href3 = decodeHumidity(registerPages, 0x50, 2, true);
-					Hread3 = decodeHumidity(registerPages, 0x52, 2, true);
-					Herror3 = Hread3 - Href3;
-
-					double Href1sq = Href1 * Href1;
-					double Href2sq = Href2 * Href2;
-					double Href3sq = Href3 * Href3;
-					humdCoeffB = ((Href2sq - Href1sq) * (Herror3 - Herror1) + Href3sq * (Herror1 - Herror2)
-							+ Href1sq * (Herror2 - Herror1))
-							/ ((Href2sq - Href1sq) * (Href3 - Href1) + (Href3sq - Href1sq) * (Href1 - Href2));
-					humdCoeffA = (Herror2 - Herror1 + humdCoeffB * (Href1 - Href2)) / (Href2sq - Href1sq);
-					humdCoeffC = Herror1 - humdCoeffA * Href1sq - humdCoeffB * Href1;
+					var Href1 = this.decodeHumidity(registerPages, 0x48, 2, true);
+					this.Hread1 = this.decodeHumidity(registerPages, 0x4A, 2, true);
+					this.Herror1 = this.Hread1 - Href1;
+					this.Href2 = this.decodeHumidity(registerPages, 0x4C, 2, true);
+					this.Hread2 = this.decodeHumidity(registerPages, 0x4E, 2, true);
+					this.Herror2 = this.Hread2 - this.Href2;
+					this.Href3 = this.decodeHumidity(registerPages, 0x50, 2, true);
+					this.Hread3 = this.decodeHumidity(registerPages, 0x52, 2, true);
+					this.Herror3 = this.Hread3 - this.Href3;
+
+					var Href1sq = Href1 * Href1;
+					var Href2sq = this.Href2 * this.Href2;
+					var Href3sq = this.Href3 * this.Href3;
+					this.humdCoeffB = ((Href2sq - Href1sq) * (this.Herror3 - this.Herror1)
+							+ Href3sq * (this.Herror1 - this.Herror2) + Href1sq * (this.Herror2 - this.Herror1))
+							/ ((Href2sq - Href1sq) * (this.Href3 - Href1) + (Href3sq - Href1sq) * (Href1 - this.Href2));
+					this.humdCoeffA = (this.Herror2 - this.Herror1 + this.humdCoeffB * (Href1 - this.Href2))
+							/ (Href2sq - Href1sq);
+					this.humdCoeffC = this.Herror1 - this.humdCoeffA * Href1sq - this.humdCoeffB * Href1;
 				}
 
-				useTempCalibrationRegisters = true;
+				this.useTempCalibrationRegisters = true;
 
 				// DEBUG: Product samples were sent out uncalibrated. This flag
 				// allows the customer to not use the temperature calibration
-				String useTempCal = OneWireAccessProvider.getProperty("DS1923.useTemperatureCalibrationRegisters");
+				var useTempCal = OneWireAccessProvider.getProperty("DS1923.useTemperatureCalibrationRegisters");
 				if (useTempCal != null && useTempCal.toLowerCase().equals("false")) {
-					useTempCalibrationRegisters = false;
+					this.useTempCalibrationRegisters = false;
 					if (DEBUG) {
 						Debug.debug("DEBUG: Disabling Temperature Calibration Usage in Container");
 					}
@@ -4394,35 +4624,36 @@ private void setContainerVariables(byte[] registerPages) {
 				// if (partNumber == PART_NUMBER_DS1922E)
 				// useTempCalibrationRegisters = false; // !!!
 
-				Tref2 = decodeTemperature(registerPages, 0x40, 2, true);
-				Tread2 = decodeTemperature(registerPages, 0x42, 2, true);
-				Terror2 = Tread2 - Tref2;
-				Tref3 = decodeTemperature(registerPages, 0x44, 2, true);
-				Tread3 = decodeTemperature(registerPages, 0x46, 2, true);
-				Terror3 = Tread3 - Tref3;
-				Terror1 = Terror2;
-				Tread1 = Tref1 + Terror1;
+				this.Tref2 = this.decodeTemperature(registerPages, 0x40, 2, true);
+				this.Tread2 = this.decodeTemperature(registerPages, 0x42, 2, true);
+				this.Terror2 = this.Tread2 - this.Tref2;
+				this.Tref3 = this.decodeTemperature(registerPages, 0x44, 2, true);
+				this.Tread3 = this.decodeTemperature(registerPages, 0x46, 2, true);
+				this.Terror3 = this.Tread3 - this.Tref3;
+				this.Terror1 = this.Terror2;
+				this.Tread1 = Tref1 + this.Terror1;
 
 				if (DEBUG) {
 					Debug.debug("Tref1=" + Tref1);
-					Debug.debug("Tread1=" + Tread1);
-					Debug.debug("Terror1=" + Terror1);
-					Debug.debug("Tref2=" + Tref2);
-					Debug.debug("Tread2=" + Tread2);
-					Debug.debug("Terror2=" + Terror2);
-					Debug.debug("Tref3=" + Tref3);
-					Debug.debug("Tread3=" + Tread3);
-					Debug.debug("Terror3=" + Terror3);
+					Debug.debug("Tread1=" + this.Tread1);
+					Debug.debug("Terror1=" + this.Terror1);
+					Debug.debug("Tref2=" + this.Tref2);
+					Debug.debug("Tread2=" + this.Tread2);
+					Debug.debug("Terror2=" + this.Terror2);
+					Debug.debug("Tref3=" + this.Tref3);
+					Debug.debug("Tread3=" + this.Tread3);
+					Debug.debug("Terror3=" + this.Terror3);
 				}
 
-				double Tref1sq = Tref1 * Tref1;
-				double Tref2sq = Tref2 * Tref2;
-				double Tref3sq = Tref3 * Tref3;
-				tempCoeffB = ((Tref2sq - Tref1sq) * (Terror3 - Terror1) + Tref3sq * (Terror1 - Terror2)
-						+ Tref1sq * (Terror2 - Terror1))
-						/ ((Tref2sq - Tref1sq) * (Tref3 - Tref1) + (Tref3sq - Tref1sq) * (Tref1 - Tref2));
-				tempCoeffA = (Terror2 - Terror1 + tempCoeffB * (Tref1 - Tref2)) / (Tref2sq - Tref1sq);
-				tempCoeffC = Terror1 - tempCoeffA * Tref1sq - tempCoeffB * Tref1;
+				var Tref1sq = Tref1 * Tref1;
+				var Tref2sq = this.Tref2 * this.Tref2;
+				var Tref3sq = this.Tref3 * this.Tref3;
+				this.tempCoeffB = ((Tref2sq - Tref1sq) * (this.Terror3 - this.Terror1)
+						+ Tref3sq * (this.Terror1 - this.Terror2) + Tref1sq * (this.Terror2 - this.Terror1))
+						/ ((Tref2sq - Tref1sq) * (this.Tref3 - Tref1) + (Tref3sq - Tref1sq) * (Tref1 - this.Tref2));
+				this.tempCoeffA = (this.Terror2 - this.Terror1 + this.tempCoeffB * (Tref1 - this.Tref2))
+						/ (Tref2sq - Tref1sq);
+				this.tempCoeffC = this.Terror1 - this.tempCoeffA * Tref1sq - this.tempCoeffB * Tref1;
 			}
 		}
 	}
@@ -4434,7 +4665,7 @@ private static final void msWait(final long ms) {
 		try {
 			Thread.sleep(ms);
 		} catch (InterruptedException ie) {
-			;
+
 		}
 	}
 
@@ -4443,22 +4674,23 @@ private static final void msWait(final long ms) {
 	 */
 	private final double decodeTemperature(byte[] data, int offset, int length, boolean reverse) {
 		// \\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\
-		if (DEBUG)
+		if (DEBUG) {
 			Debug.debug("decodeTemperature, data", data, offset, length);
+		}
 		// \\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\
 		double whole, fraction = 0;
 		if (reverse && length == 2) {
-			fraction = ((data[offset + 1] & 0x0FF) / 512d);
-			whole = (data[offset] & 0x0FF) / 2d + (temperatureRangeLow - 1);
+			fraction = (data[offset + 1] & 0x0FF) / 512d;
+			whole = (data[offset] & 0x0FF) / 2d + (this.temperatureRangeLow - 1);
 		} else if (length == 2) {
-			fraction = ((data[offset] & 0x0FF) / 512d);
-			whole = (data[offset + 1] & 0x0FF) / 2d + (temperatureRangeLow - 1);
+			fraction = (data[offset] & 0x0FF) / 512d;
+			whole = (data[offset + 1] & 0x0FF) / 2d + (this.temperatureRangeLow - 1);
 		} else {
-			whole = (data[offset] & 0x0FF) / 2d + (temperatureRangeLow - 1);
+			whole = (data[offset] & 0x0FF) / 2d + (this.temperatureRangeLow - 1);
 		}
 		// \\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\
 		if (DEBUG) {
-			Debug.debug("decodeTemperature, temperatureRangeLow= " + temperatureRangeLow);
+			Debug.debug("decodeTemperature, temperatureRangeLow= " + this.temperatureRangeLow);
 			Debug.debug("decodeTemperature, whole= " + whole);
 			Debug.debug("decodeTemperature, fraction= " + fraction);
 			Debug.debug("decodeTemperature, (whole+fraction)= " + (whole + fraction));
@@ -4471,12 +4703,13 @@ private final double decodeTemperature(byte[] data, int offset, int length, bool
 	 * helper method for encoding temperature values
 	 */
 	private final void encodeTemperature(double temperature, byte[] data, int offset, int length, boolean reverse) {
-		double val = 2 * ((temperature) - (temperatureRangeLow - 1));
-		// \\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\
-		if (DEBUG)
-			Debug.debug("encodeTemperature, temperature=" + temperature + ", temperatureRangeLow=" + temperatureRangeLow
-					+ ", val=" + val);
+		var val = 2 * (temperature - (this.temperatureRangeLow - 1));
 		// \\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\
+		if (DEBUG) {
+			Debug.debug("encodeTemperature, temperature=" + temperature + ", temperatureRangeLow="
+					+ this.temperatureRangeLow + ", val=" + val);
+			// \\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\
+		}
 
 		if (reverse && length == 2) {
 			data[offset + 1] = (byte) (0x0C0 & (byte) (val * 256));
@@ -4488,9 +4721,10 @@ private final void encodeTemperature(double temperature, byte[] data, int offset
 			data[offset] = (byte) val;
 		}
 		// \\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\
-		if (DEBUG)
+		if (DEBUG) {
 			Debug.debug("encodeTemperature, data", data, offset, length);
-		// \\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\
+			// \\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\
+		}
 	}
 
 	/**
@@ -4498,15 +4732,15 @@ private final void encodeTemperature(double temperature, byte[] data, int offset
 	 */
 	private final double decodeHumidity(byte[] data, int offset, int length, boolean reverse) {
 		// get the 10-bit value of Vout
-		double val = getADVoltage(data, offset, length, reverse);
+		var val = this.getADVoltage(data, offset, length, reverse);
 
 		// convert Vout to a humidity reading
 		// this formula is from HIH-3610 sensor datasheet
 		val = (val - .958) / .0307;
 
-		if (useHumdCalibrationRegisters) {
-			double valsq = val * val;
-			double error = humdCoeffA * valsq + humdCoeffB * val + humdCoeffC;
+		if (this.useHumdCalibrationRegisters) {
+			var valsq = val * val;
+			var error = this.humdCoeffA * valsq + this.humdCoeffB * val + this.humdCoeffC;
 			val = val - error;
 		}
 
@@ -4518,36 +4752,37 @@ private final double decodeHumidity(byte[] data, int offset, int length, boolean
 	 */
 	private final void encodeHumidity(double humidity, byte[] data, int offset, int length, boolean reverse) {
 		// uncalibrate the alarm value before writing
-		if (useHumdCalibrationRegisters) {
-			humidity = ((1 - humdCoeffB)
-					- Math.sqrt(((humdCoeffB - 1) * (humdCoeffB - 1)) - 4 * humdCoeffA * (humdCoeffC + humidity)))
-					/ (2 * humdCoeffA);
+		if (this.useHumdCalibrationRegisters) {
+			humidity = (1 - this.humdCoeffB - Math.sqrt(
+					(this.humdCoeffB - 1) * (this.humdCoeffB - 1) - 4 * this.humdCoeffA * (this.humdCoeffC + humidity)))
+					/ (2 * this.humdCoeffA);
 		}
 
 		// convert humidity value to Vout value
-		double val = (humidity * .0307) + .958;
+		var val = humidity * .0307 + .958;
 		// convert Vout to byte[]
-		setADVoltage(val, data, offset, length, reverse);
+		this.setADVoltage(val, data, offset, length, reverse);
 	}
 
 	private final double getADVoltage(byte[] data, int offset, int length, boolean reverse) {
 		// \\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\
-		if (DEBUG)
+		if (DEBUG) {
 			Debug.debug("getADVoltage, data", data, offset, length);
+		}
 		// \\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\
 		// get the 10-bit value of vout
-		int ival = 0;
+		var ival = 0;
 		if (reverse && length == 2) {
-			ival = ((data[offset] & 0x0FF) << (adDeviceBits - 8));
-			ival |= ((data[offset + 1] & 0x0FF) >> (16 - adDeviceBits));
+			ival = (data[offset] & 0x0FF) << this.adDeviceBits - 8;
+			ival |= (data[offset + 1] & 0x0FF) >> 16 - this.adDeviceBits;
 		} else if (length == 2) {
-			ival = ((data[offset + 1] & 0x0FF) << (adDeviceBits - 8));
-			ival |= ((data[offset] & 0x0FF) >> (16 - adDeviceBits));
+			ival = (data[offset + 1] & 0x0FF) << this.adDeviceBits - 8;
+			ival |= (data[offset] & 0x0FF) >> 16 - this.adDeviceBits;
 		} else {
-			ival = ((data[offset] & 0x0FF) << (adDeviceBits - 8));
+			ival = (data[offset] & 0x0FF) << this.adDeviceBits - 8;
 		}
 
-		double dval = (ival * adReferenceVoltage) / (1 << adDeviceBits);
+		var dval = ival * this.adReferenceVoltage / (1 << this.adDeviceBits);
 
 		// \\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\
 		if (DEBUG) {
@@ -4560,27 +4795,30 @@ private final double getADVoltage(byte[] data, int offset, int length, boolean r
 
 	private final void setADVoltage(double voltage, byte[] data, int offset, int length, boolean reverse) {
 		// \\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\
-		if (DEBUG)
+		if (DEBUG) {
 			Debug.debug("setADVoltage, voltage=" + voltage);
+		}
 		// \\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\
-		int val = (int) ((voltage * (1 << adDeviceBits)) / adReferenceVoltage);
-		val = val & ((1 << adDeviceBits) - 1);
+		var val = (int) (voltage * (1 << this.adDeviceBits) / this.adReferenceVoltage);
+		val = val & (1 << this.adDeviceBits) - 1;
 		// \\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\
-		if (DEBUG)
+		if (DEBUG) {
 			Debug.debug("setADVoltage, val=" + val);
+		}
 		// \\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\
 		if (reverse && length == 2) {
-			data[offset] = (byte) (val >> (adDeviceBits - 8));
-			data[offset + 1] = (byte) (val << (16 - adDeviceBits));
+			data[offset] = (byte) (val >> this.adDeviceBits - 8);
+			data[offset + 1] = (byte) (val << 16 - this.adDeviceBits);
 		} else if (length == 2) {
-			data[offset + 1] = (byte) (val >> (adDeviceBits - 8));
-			data[offset] = (byte) (val << (16 - adDeviceBits));
+			data[offset + 1] = (byte) (val >> this.adDeviceBits - 8);
+			data[offset] = (byte) (val << 16 - this.adDeviceBits);
 		} else {
-			data[offset] = (byte) ((val & 0x3FC) >> (adDeviceBits - 8));
+			data[offset] = (byte) ((val & 0x3FC) >> this.adDeviceBits - 8);
 		}
 		// \\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\
-		if (DEBUG)
+		if (DEBUG) {
 			Debug.debug("setADVoltage, data", data, offset, length);
-		// \\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\
+			// \\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\
+		}
 	}
 }
\ No newline at end of file
diff --git a/io.openems.edge.bridge.onewire/src/com/dalsemi/onewire/container/OneWireContainer42.java b/io.openems.edge.bridge.onewire/src/com/dalsemi/onewire/container/OneWireContainer42.java
index 1c655f065bd..6eb6d22be55 100644
--- a/io.openems.edge.bridge.onewire/src/com/dalsemi/onewire/container/OneWireContainer42.java
+++ b/io.openems.edge.bridge.onewire/src/com/dalsemi/onewire/container/OneWireContainer42.java
@@ -72,7 +72,7 @@
  * {@link com.dalsemi.onewire.container.TemperatureContainer
  * TemperatureContainer} for temperature specific operations.
  * </DL>
- * 
+ *
  * <DL>
  * <DD>See the switch usage example in
  * {@link com.dalsemi.onewire.container.SwitchContainer SwitchContainer} for
@@ -149,7 +149,6 @@ public class OneWireContainer42 extends OneWireContainer implements TemperatureC
 	 * @see #OneWireContainer42(DSPortAdapter,String)
 	 */
 	public OneWireContainer42() {
-		super();
 	}
 
 	/**
@@ -221,17 +220,18 @@ public OneWireContainer42(DSPortAdapter sourceAdapter, String newAddress) {
 	 * MemoryBank}, {@link com.dalsemi.onewire.container.PagedMemoryBank
 	 * PagedMemoryBank}, and {@link com.dalsemi.onewire.container.OTPMemoryBank
 	 * OTPMemoryBank}.
-	 * 
+	 *
 	 * @return <CODE>Enumeration</CODE> of memory banks
 	 */
+	@Override
 	public Enumeration<MemoryBank> getMemoryBanks() {
-		Vector<MemoryBank> bank_vector = new Vector<>(3);
+		var bank_vector = new Vector<MemoryBank>(3);
 
 		// Status
 		// bank_vector.addElement(new MemoryBankScratachTemp(this));
 
 		// Temperature
-		MemoryBankScratchTemp temp = new MemoryBankScratchTemp(this);
+		var temp = new MemoryBankScratchTemp(this);
 		temp.bankDescription = "Temperature";
 		temp.generalPurposeMemory = false;
 		temp.startPhysicalAddress = 0;
@@ -280,6 +280,7 @@ public Enumeration<MemoryBank> getMemoryBanks() {
 	 *
 	 * @return this <code>OneWireContainer42</code> name
 	 */
+	@Override
 	public String getName() {
 		return "DS28EA00";
 	}
@@ -291,6 +292,7 @@ public String getName() {
 	 *
 	 * @return this <code>OneWireContainer42</code> alternate names
 	 */
+	@Override
 	public String getAlternateNames() {
 		return "DS28EA00U+";
 	}
@@ -301,6 +303,7 @@ public String getAlternateNames() {
 	 *
 	 * @return <code>OneWireContainer42</code> functional description
 	 */
+	@Override
 	public String getDescription() {
 		return "Programmable resolution digital thermometer with "
 				+ "'sequence detect' and 2 PIO channels. It measures "
@@ -318,6 +321,7 @@ public String getDescription() {
 	 * @return maximum speed
 	 * @see DSPortAdapter#setSpeed
 	 */
+	@Override
 	public int getMaxSpeed() {
 		return DSPortAdapter.SPEED_OVERDRIVE;
 	}
@@ -335,6 +339,7 @@ public int getMaxSpeed() {
 	 * @see #getTemperatureAlarm
 	 * @see #setTemperatureAlarm
 	 */
+	@Override
 	public boolean hasTemperatureAlarms() {
 		return true;
 	}
@@ -349,6 +354,7 @@ public boolean hasTemperatureAlarms() {
 	 * @see #getTemperatureResolutions
 	 * @see #setTemperatureResolution
 	 */
+	@Override
 	public boolean hasSelectableTemperatureResolution() {
 		return true;
 	}
@@ -364,13 +370,14 @@ public boolean hasSelectableTemperatureResolution() {
 	 * @see #getTemperatureResolution
 	 * @see #setTemperatureResolution
 	 */
+	@Override
 	public double[] getTemperatureResolutions() {
-		double[] resolutions = new double[4];
+		var resolutions = new double[4];
 
-		resolutions[0] = (double) 0.5; // 9-bit
-		resolutions[1] = (double) 0.25; // 10-bit
-		resolutions[2] = (double) 0.125; // 11-bit
-		resolutions[3] = (double) 0.0625; // 12-bit
+		resolutions[0] = 0.5; // 9-bit
+		resolutions[1] = 0.25; // 10-bit
+		resolutions[2] = 0.125; // 11-bit
+		resolutions[3] = 0.0625; // 12-bit
 
 		return resolutions;
 	}
@@ -386,6 +393,7 @@ public double[] getTemperatureResolutions() {
 	 * @see #setTemperatureAlarm
 	 *
 	 */
+	@Override
 	public double getTemperatureAlarmResolution() {
 		return 1.0;
 	}
@@ -398,6 +406,7 @@ public double getTemperatureAlarmResolution() {
 	 *
 	 * @see #getMinTemperature
 	 */
+	@Override
 	public double getMaxTemperature() {
 		return 85.0;
 	}
@@ -410,6 +419,7 @@ public double getMaxTemperature() {
 	 *
 	 * @see #getMaxTemperature
 	 */
+	@Override
 	public double getMinTemperature() {
 		return -40.0;
 	}
@@ -434,59 +444,58 @@ public double getMinTemperature() {
 	 *
 	 * @see #getTemperature
 	 */
+	@Override
 	public void doTemperatureConvert(byte[] state) throws OneWireIOException, OneWireException {
-		int msDelay = 750; // in milliseconds
+		var msDelay = 750; // in milliseconds
 
 		// select the device
-		if (adapter.select(address)) {
-
-			// Setup Power Delivery
-			adapter.setPowerDuration(DSPortAdapter.DELIVERY_INFINITE);
-			adapter.startPowerDelivery(DSPortAdapter.CONDITION_AFTER_BYTE);
-			// send the convert temperature command
-			adapter.putByte(CONVERT_TEMPERATURE_COMMAND);
-
-			// calculate duration of delay according to resolution desired
-			switch (state[4]) {
-
-			case RESOLUTION_9_BIT:
-				msDelay = 94;
-				break;
-			case RESOLUTION_10_BIT:
-				msDelay = 188;
-				break;
-			case RESOLUTION_11_BIT:
-				msDelay = 375;
-				break;
-			case RESOLUTION_12_BIT:
-				msDelay = 750;
-				break;
-			default:
-				msDelay = 750;
-			} // switch
-
-			// delay for specified amount of time
-			try {
-				Thread.sleep(msDelay);
-			} catch (InterruptedException e) {
-			}
+		if (!this.adapter.select(this.address)) {
+
+			// device must not have been present
+			throw new OneWireIOException("OneWireContainer42-device not present");
+		}
+		// Setup Power Delivery
+		this.adapter.setPowerDuration(DSPortAdapter.DELIVERY_INFINITE);
+		this.adapter.startPowerDelivery(DSPortAdapter.CONDITION_AFTER_BYTE);
+		// send the convert temperature command
+		this.adapter.putByte(CONVERT_TEMPERATURE_COMMAND);
 
-			// Turn power back to normal.
-			adapter.setPowerNormal();
+		// calculate duration of delay according to resolution desired
+		switch (state[4]) {
 
-			// check to see if the temperature conversion is over
-			if (adapter.getByte() != 0xFF)
-				throw new OneWireIOException("OneWireContainer42-temperature conversion not complete");
+		case RESOLUTION_9_BIT:
+			msDelay = 94;
+			break;
+		case RESOLUTION_10_BIT:
+			msDelay = 188;
+			break;
+		case RESOLUTION_11_BIT:
+			msDelay = 375;
+			break;
+		case RESOLUTION_12_BIT:
+			msDelay = 750;
+			break;
+		default:
+			msDelay = 750;
+		} // switch
 
-			// return new converted temperature in "state" variable
-			adapter.select(address);
-			state = recallE2();
+		// delay for specified amount of time
+		try {
+			Thread.sleep(msDelay);
+		} catch (InterruptedException e) {
+		}
 
-		} else {
+		// Turn power back to normal.
+		this.adapter.setPowerNormal();
 
-			// device must not have been present
-			throw new OneWireIOException("OneWireContainer42-device not present");
+		// check to see if the temperature conversion is over
+		if (this.adapter.getByte() != 0xFF) {
+			throw new OneWireIOException("OneWireContainer42-temperature conversion not complete");
 		}
+
+		// return new converted temperature in "state" variable
+		this.adapter.select(this.address);
+		state = this.recallE2();
 	}
 
 	// --------
@@ -512,6 +521,7 @@ public void doTemperatureConvert(byte[] state) throws OneWireIOException, OneWir
 	 *
 	 * @see #doTemperatureConvert
 	 */
+	@Override
 	public double getTemperature(byte[] state) throws OneWireIOException {
 
 		// Take these three steps:
@@ -529,13 +539,13 @@ public double getTemperature(byte[] state) throws OneWireIOException {
 		// 0xFF5E = -10.125C
 		// 0xFE6F = -25.0625C
 		// 0xFC90 = -55.0C
-		double theTemperature = (double) 0.0;
+		var theTemperature = 0.0;
 		int inttemperature = state[1]; // inttemperature is automatically sign extended here.
 
-		inttemperature = (inttemperature << 8) | (state[0] & 0xFF); // this converts 2 bytes into integer
-		theTemperature = (double) ((double) inttemperature / (double) 16); // converts integer to a double
+		inttemperature = inttemperature << 8 | state[0] & 0xFF; // this converts 2 bytes into integer
+		theTemperature = (double) inttemperature / (double) 16; // converts integer to a double
 
-		return (theTemperature);
+		return theTemperature;
 	}
 
 	/**
@@ -552,8 +562,9 @@ public double getTemperature(byte[] state) throws OneWireIOException {
 	 * @see #hasTemperatureAlarms
 	 * @see #setTemperatureAlarm
 	 */
+	@Override
 	public double getTemperatureAlarm(int alarmType, byte[] state) {
-		return (double) state[alarmType == ALARM_LOW ? 3 : 2];
+		return state[alarmType == ALARM_LOW ? 3 : 2];
 	}
 
 	/**
@@ -573,26 +584,27 @@ public double getTemperatureAlarm(int alarmType, byte[] state) {
 	 * @see #getTemperatureResolutions
 	 * @see #setTemperatureResolution
 	 */
+	@Override
 	public double getTemperatureResolution(byte[] state) {
-		double tempres = (double) 0.0;
+		var tempres = 0.0;
 
 		// calculate temperature resolution according to configuration byte
 		switch (state[4]) {
 
 		case RESOLUTION_9_BIT:
-			tempres = (double) 0.5;
+			tempres = 0.5;
 			break;
 		case RESOLUTION_10_BIT:
-			tempres = (double) 0.25;
+			tempres = 0.25;
 			break;
 		case RESOLUTION_11_BIT:
-			tempres = (double) 0.125;
+			tempres = 0.125;
 			break;
 		case RESOLUTION_12_BIT:
-			tempres = (double) 0.0625;
+			tempres = 0.0625;
 			break;
 		default:
-			tempres = (double) 0.0;
+			tempres = 0.0;
 		} // switch
 
 		return tempres;
@@ -615,15 +627,18 @@ public double getTemperatureResolution(byte[] state) {
 	 * @see #hasTemperatureAlarms
 	 * @see #getTemperatureAlarm
 	 */
+	@Override
 	public void setTemperatureAlarm(int alarmType, double alarmValue, byte[] state)
 			throws OneWireException, OneWireIOException {
-		if ((alarmType != ALARM_LOW) && (alarmType != ALARM_HIGH))
+		if (alarmType != ALARM_LOW && alarmType != ALARM_HIGH) {
 			throw new IllegalArgumentException("Invalid alarm type.");
+		}
 
-		if (alarmValue > 85.0 || alarmValue < -40.0)
+		if (alarmValue > 85.0 || alarmValue < -40.0) {
 			throw new IllegalArgumentException("Value for alarm not in accepted range.  Must be -40 C <-> +85 C.");
+		}
 
-		state[(alarmType == ALARM_LOW) ? 3 : 2] = (byte) alarmValue;
+		state[alarmType == ALARM_LOW ? 3 : 2] = (byte) alarmValue;
 	}
 
 	/**
@@ -646,23 +661,28 @@ public void setTemperatureAlarm(int alarmType, double alarmValue, byte[] state)
 	 * @see #getTemperatureResolution
 	 * @see #getTemperatureResolutions
 	 */
+	@Override
 	public void setTemperatureResolution(double resolution, byte[] state) throws OneWireException {
-		byte configbyte = RESOLUTION_12_BIT;
+		var configbyte = RESOLUTION_12_BIT;
 
 		synchronized (this) {
 
 			// calculate configbyte from given resolution
-			if (resolution == 0.5)
+			if (resolution == 0.5) {
 				configbyte = RESOLUTION_9_BIT;
+			}
 
-			if (resolution == 0.25)
+			if (resolution == 0.25) {
 				configbyte = RESOLUTION_10_BIT;
+			}
 
-			if (resolution == 0.125)
+			if (resolution == 0.125) {
 				configbyte = RESOLUTION_11_BIT;
+			}
 
-			if (resolution == 0.0625)
+			if (resolution == 0.0625) {
 				configbyte = RESOLUTION_12_BIT;
+			}
 
 			state[4] = configbyte;
 		}
@@ -677,7 +697,7 @@ public void setTemperatureResolution(double resolution, byte[] state) throws One
 	 *
 	 * @return <code>OneWireContainer42</code> state information. Device state looks
 	 *         like this:
-	 * 
+	 *
 	 *         <pre>
 	 *   0 : temperature LSB
 	 *   1 : temperature MSB
@@ -690,19 +710,19 @@ public void setTemperatureResolution(double resolution, byte[] state) throws One
 	 *   8 : an 8 bit CRC of the previous 8 bytes
 	 *   9 : PIO Status bit assignment to write (this is a "don't care" for a read)
 	 *   10: PIO Status bit assignment to read
-	 * 
+	 *
 	 * PIO Status Bit Assignment from PIO Access Write [A5H]:
-	 *   b7-b2 = all ones      
-	 *   b1=PIOB Pin State     
-	 *   b0=PIOA Pin State   
-	 * 
+	 *   b7-b2 = all ones
+	 *   b1=PIOB Pin State
+	 *   b0=PIOA Pin State
+	 *
 	 * PIO Status Bit Assignment from PIO Access Read [F5H]:
-	 *   b7-b4 = Complement of b3 to b0     
-	 *   b3= PIOB Output Latch State   
-	 *   b2=PIOB Pin State     
-	 *   b1=PIOA Output Latch State   
+	 *   b7-b4 = Complement of b3 to b0
+	 *   b3= PIOB Output Latch State
+	 *   b2=PIOB Pin State
+	 *   b1=PIOA Output Latch State
 	 *   b0= PIOA Pin State
-	 * 
+	 *
 	 *         </pre>
 	 *
 	 * @throws OneWireIOException on a 1-Wire communication error such as reading an
@@ -716,24 +736,25 @@ public void setTemperatureResolution(double resolution, byte[] state) throws One
 	 *
 	 * @see #writeDevice
 	 */
+	@Override
 	public byte[] readDevice() throws OneWireIOException, OneWireException {
 
 		byte[] scratchData;
-		byte[] switchData = new byte[2];
-		byte[] resultBuff = new byte[11];
+		var switchData = new byte[2];
+		var resultBuff = new byte[11];
 
 		// scratchpad read
-		scratchData = recallE2();
+		scratchData = this.recallE2();
 
 		// switch read
-		switchData[0] = (byte) PIO_ACCESS_READ; // PIO Access Read Command
+		switchData[0] = PIO_ACCESS_READ; // PIO Access Read Command
 		switchData[1] = (byte) 0xFF; // Used to read the PIO Status Bit Assignment
 
 		// select the device
-		if (adapter.select(address)) {
-			adapter.dataBlock(switchData, 0, 2);
-		} else
+		if (!this.adapter.select(this.address)) {
 			throw new OneWireIOException("Device select failed");
+		}
+		this.adapter.dataBlock(switchData, 0, 2);
 
 		// copy data to the results buffer
 		System.arraycopy(scratchData, 0, resultBuff, 0, 9);
@@ -763,32 +784,33 @@ public byte[] readDevice() throws OneWireIOException, OneWireException {
 	 *
 	 * @see #readDevice
 	 */
+	@Override
 	public void writeDevice(byte[] state) throws OneWireIOException, OneWireException {
-		byte[] temp = new byte[3];
-		byte[] switchBuff = new byte[5];
+		var temp = new byte[3];
+		var switchBuff = new byte[5];
 
 		temp[0] = state[2];
 		temp[1] = state[3];
 		temp[2] = state[4];
 
 		// Write it to the Scratchpad.
-		writeScratchpad(temp);
+		this.writeScratchpad(temp);
 
 		// Place in memory.
-		copyScratchpad();
+		this.copyScratchpad();
 
 		// Write switch information
-		switchBuff[0] = (byte) PIO_ACCESS_WRITE; // PIO Access Write Command
-		switchBuff[1] = (byte) state[9]; // Channel write information
+		switchBuff[0] = PIO_ACCESS_WRITE; // PIO Access Write Command
+		switchBuff[1] = state[9]; // Channel write information
 		switchBuff[2] = (byte) ~state[9]; // Inverted write byte
 		switchBuff[3] = (byte) 0xFF; // Confirmation Byte
 		switchBuff[4] = (byte) 0xFF; // PIO Pin Status
 
 		// select the device
-		if (adapter.select(address)) {
-			adapter.dataBlock(switchBuff, 0, 5);
-		} else
+		if (!this.adapter.select(this.address)) {
 			throw new OneWireIOException("OneWireContainer42-Device select failed");
+		}
+		this.adapter.dataBlock(switchBuff, 0, 5);
 
 		if (switchBuff[3] != (byte) 0x00AA) {
 			throw new OneWireIOException("OneWireContainer42-Failure to change latch state.");
@@ -817,20 +839,21 @@ public byte[] readScratchpad() throws OneWireIOException, OneWireException {
 		byte[] result_block;
 
 		// select the device
-		if (adapter.select(address)) {
+		if (this.adapter.select(this.address)) {
 
 			// create a block to send that reads the scratchpad
-			byte[] send_block = new byte[10];
+			var send_block = new byte[10];
 
 			// read scratchpad command
-			send_block[0] = (byte) READ_SCRATCHPAD_COMMAND;
+			send_block[0] = READ_SCRATCHPAD_COMMAND;
 
 			// now add the read bytes for data bytes and crc8
-			for (int i = 1; i < 10; i++)
+			for (var i = 1; i < 10; i++) {
 				send_block[i] = (byte) 0xFF;
+			}
 
 			// send the block
-			adapter.dataBlock(send_block, 0, send_block.length);
+			this.adapter.dataBlock(send_block, 0, send_block.length);
 
 			// now, send_block contains the 9-byte Scratchpad plus READ_SCRATCHPAD_COMMAND
 			// byte
@@ -838,15 +861,15 @@ public byte[] readScratchpad() throws OneWireIOException, OneWireException {
 			// byte)
 			result_block = new byte[9];
 
-			for (int i = 0; i < 9; i++) {
+			for (var i = 0; i < 9; i++) {
 				result_block[i] = send_block[i + 1];
 			}
 
 			// see if CRC8 is correct
-			if (CRC8.compute(send_block, 1, 9) == 0)
-				return (result_block);
-			else
-				throw new OneWireIOException("OneWireContainer42-Error reading CRC8 from device.");
+			if (CRC8.compute(send_block, 1, 9) == 0) {
+				return result_block;
+			}
+			throw new OneWireIOException("OneWireContainer42-Error reading CRC8 from device.");
 		}
 
 		// device must not have been present
@@ -875,7 +898,7 @@ public byte[] readScratchpad() throws OneWireIOException, OneWireException {
 	public void writeScratchpad(byte[] data) throws OneWireIOException, OneWireException {
 
 		// setup buffer to write to scratchpad
-		byte[] writeBuffer = new byte[4];
+		var writeBuffer = new byte[4];
 
 		writeBuffer[0] = WRITE_SCRATCHPAD_COMMAND;
 		writeBuffer[1] = data[0];
@@ -883,26 +906,23 @@ public void writeScratchpad(byte[] data) throws OneWireIOException, OneWireExcep
 		writeBuffer[3] = data[2];
 
 		// send command block to device
-		if (adapter.select(address)) {
-			adapter.dataBlock(writeBuffer, 0, writeBuffer.length);
-		} else {
+		if (!this.adapter.select(this.address)) {
 
 			// device must not have been present
 			throw new OneWireIOException("OneWireContainer42-Device not found on 1-Wire Network");
 		}
+		this.adapter.dataBlock(writeBuffer, 0, writeBuffer.length);
 
 		// double check by reading scratchpad
 		byte[] readBuffer;
 
-		readBuffer = readScratchpad();
+		readBuffer = this.readScratchpad();
 
-		if ((readBuffer[2] != data[0]) || (readBuffer[3] != data[1]) || (readBuffer[4] != data[2])) {
+		if (readBuffer[2] != data[0] || readBuffer[3] != data[1] || readBuffer[4] != data[2]) {
 
 			// writing to scratchpad failed
 			throw new OneWireIOException("OneWireContainer42-Error writing to scratchpad");
 		}
-
-		return;
 	}
 
 	/**
@@ -922,40 +942,37 @@ public void copyScratchpad() throws OneWireIOException, OneWireException {
 		// first, let's read the scratchpad to compare later.
 		byte[] readfirstbuffer;
 
-		readfirstbuffer = readScratchpad();
+		readfirstbuffer = this.readScratchpad();
 
 		// second, let's copy the scratchpad.
-		if (adapter.select(address)) {
-
-			// apply the power delivery
-			adapter.setPowerDuration(DSPortAdapter.DELIVERY_INFINITE);
-			adapter.startPowerDelivery(DSPortAdapter.CONDITION_AFTER_BYTE);
-
-			// send the copy scratchpad command
-			adapter.putByte(COPY_SCRATCHPAD_COMMAND);
-
-			// sleep for 10 milliseconds to allow copy to take place.
-			try {
-				Thread.sleep(10);
-			} catch (InterruptedException e) {
-			}
-			;
-
-			// Turn power back to normal.
-			adapter.setPowerNormal();
-		} else {
+		if (!this.adapter.select(this.address)) {
 
 			// device must not have been present
 			throw new OneWireIOException("OneWireContainer42-Device not found on 1-Wire Network");
 		}
+		// apply the power delivery
+		this.adapter.setPowerDuration(DSPortAdapter.DELIVERY_INFINITE);
+		this.adapter.startPowerDelivery(DSPortAdapter.CONDITION_AFTER_BYTE);
+
+		// send the copy scratchpad command
+		this.adapter.putByte(COPY_SCRATCHPAD_COMMAND);
+
+		// sleep for 10 milliseconds to allow copy to take place.
+		try {
+			Thread.sleep(10);
+		} catch (InterruptedException e) {
+		}
+
+		// Turn power back to normal.
+		this.adapter.setPowerNormal();
 
 		// third, let's read the scratchpad again with the recallE2 command and compare.
 		byte[] readlastbuffer;
 
-		readlastbuffer = recallE2();
+		readlastbuffer = this.recallE2();
 
-		if ((readfirstbuffer[2] != readlastbuffer[2]) || (readfirstbuffer[3] != readlastbuffer[3])
-				|| (readfirstbuffer[4] != readlastbuffer[4])) {
+		if (readfirstbuffer[2] != readlastbuffer[2] || readfirstbuffer[3] != readlastbuffer[3]
+				|| readfirstbuffer[4] != readlastbuffer[4]) {
 
 			// copying to scratchpad failed
 			throw new OneWireIOException("OneWireContainer42-Error copying scratchpad to E2 memory.");
@@ -982,15 +999,15 @@ public byte[] recallE2() throws OneWireIOException, OneWireException {
 		byte[] ScratchBuff;
 
 		// select the device
-		if (adapter.select(address)) {
+		if (this.adapter.select(this.address)) {
 
 			// send the Recall E-squared memory command
-			adapter.putByte(RECALL_E2MEMORY_COMMAND);
+			this.adapter.putByte(RECALL_E2MEMORY_COMMAND);
 
 			// read scratchpad
-			ScratchBuff = readScratchpad();
+			ScratchBuff = this.readScratchpad();
 
-			return (ScratchBuff);
+			return ScratchBuff;
 		}
 
 		// device must not have been present
@@ -1013,23 +1030,23 @@ public byte[] recallE2() throws OneWireIOException, OneWireException {
 	 *                            adapter
 	 */
 	public boolean isExternalPowerSupplied() throws OneWireIOException, OneWireException {
-		int intresult = 0;
-		boolean result = false;
+		var intresult = 0;
+		var result = false;
 
 		// select the device
-		if (adapter.select(address)) {
-			// send the "Read Power Supply" memory command
-			adapter.putByte(READ_POWER_SUPPLY_COMMAND);
-
-			// read results
-			intresult = adapter.getByte();
-		} else {
+		if (!this.adapter.select(this.address)) {
 
 			// device must not have been present
 			throw new OneWireIOException("OneWireContainer42-Device not found on 1-Wire Network");
 		}
-		if (intresult != 0x00)
+		// send the "Read Power Supply" memory command
+		this.adapter.putByte(READ_POWER_SUPPLY_COMMAND);
+
+		// read results
+		intresult = this.adapter.getByte();
+		if (intresult != 0x00) {
 			result = true; // reads 0xFF for true and 0x00 for false
+		}
 
 		return result;
 	}
@@ -1051,6 +1068,7 @@ public boolean isExternalPowerSupplied() throws OneWireIOException, OneWireExcep
 	 *
 	 * @see com.dalsemi.onewire.container.OneWireSensor#readDevice()
 	 */
+	@Override
 	public int getNumberChannels(byte[] state) {
 		return 2;
 	}
@@ -1066,6 +1084,7 @@ public int getNumberChannels(byte[] state) {
 	 *
 	 * @see #getLatchState(int,byte[])
 	 */
+	@Override
 	public boolean isHighSideSwitch() {
 		return false;
 	}
@@ -1080,6 +1099,7 @@ public boolean isHighSideSwitch() {
 	 * @see #getSensedActivity(int,byte[])
 	 * @see #clearActivity()
 	 */
+	@Override
 	public boolean hasActivitySensing() {
 		return false;
 	}
@@ -1093,6 +1113,7 @@ public boolean hasActivitySensing() {
 	 *
 	 * @see #getLevel(int,byte[])
 	 */
+	@Override
 	public boolean hasLevelSensing() {
 		return true;
 	}
@@ -1109,6 +1130,7 @@ public boolean hasLevelSensing() {
 	 *
 	 * @see #setLatchState(int,boolean,boolean,byte[])
 	 */
+	@Override
 	public boolean hasSmartOn() {
 		return false;
 	}
@@ -1124,6 +1146,7 @@ public boolean hasSmartOn() {
 	 *
 	 * @see #setLatchState(int,boolean,boolean,byte[])
 	 */
+	@Override
 	public boolean onlySingleChannelOn() {
 		return false;
 	}
@@ -1149,9 +1172,10 @@ public boolean onlySingleChannelOn() {
 	 * @see com.dalsemi.onewire.container.OneWireSensor#readDevice()
 	 * @see #hasLevelSensing()
 	 */
+	@Override
 	public boolean getLevel(int channel, byte[] state) {
-		byte level = (byte) (0x01 << (channel * 2));
-		return ((state[10] & level) == level);
+		var level = (byte) (0x01 << channel * 2);
+		return (state[10] & level) == level;
 	}
 
 	/**
@@ -1171,9 +1195,10 @@ public boolean getLevel(int channel, byte[] state) {
 	 * @see #isHighSideSwitch()
 	 * @see #setLatchState(int,boolean,boolean,byte[])
 	 */
+	@Override
 	public boolean getLatchState(int channel, byte[] state) {
-		byte latch = (byte) (0x01 << ((channel * 2) + 1));
-		return ((state[10] & latch) == latch);
+		var latch = (byte) (0x01 << channel * 2 + 1);
+		return (state[10] & latch) == latch;
 	}
 
 	/**
@@ -1197,6 +1222,7 @@ public boolean getLatchState(int channel, byte[] state) {
 	 * @see #hasActivitySensing()
 	 * @see #clearActivity()
 	 */
+	@Override
 	public boolean getSensedActivity(int channel, byte[] state) throws OneWireException {
 		return false;
 	}
@@ -1211,6 +1237,7 @@ public boolean getSensedActivity(int channel, byte[] state) throws OneWireExcept
 	 * @see com.dalsemi.onewire.container.OneWireSensor#readDevice()
 	 * @see #getSensedActivity(int,byte[])
 	 */
+	@Override
 	public void clearActivity() throws OneWireException {
 	}
 
@@ -1242,26 +1269,28 @@ public void clearActivity() throws OneWireException {
 	 * @see #getLatchState(int,byte[])
 	 * @see com.dalsemi.onewire.container.OneWireSensor#writeDevice(byte[])
 	 */
+	@Override
 	public void setLatchState(int channel, boolean latchState, boolean doSmart, byte[] state) {
-		byte latch = (byte) (0x01 << channel);
+		var latch = (byte) (0x01 << channel);
 		byte temp;
 
 		state[9] = (byte) 0x00FC;
 
-		if (getLatchState(0, state)) {
+		if (this.getLatchState(0, state)) {
 			temp = (byte) 0x01;
-			state[9] = (byte) (((byte) state[9]) | temp);
+			state[9] = (byte) (state[9] | temp);
 		}
 
-		if (getLatchState(1, state)) {
+		if (this.getLatchState(1, state)) {
 			temp = (byte) 0x02;
-			state[9] = (byte) (((byte) state[9]) | temp);
+			state[9] = (byte) (state[9] | temp);
 		}
 
-		if (latchState)
+		if (latchState) {
 			state[9] = (byte) (state[9] | latch);
-		else
+		} else {
 			state[9] = (byte) (state[9] & ~latch);
+		}
 	}
 
 	/**
@@ -1279,7 +1308,7 @@ public void setLatchState(int channel, boolean latchState, boolean doSmart, byte
 	 * @see com.dalsemi.onewire.container.OneWireSensor#writeDevice(byte[])
 	 */
 	public void setLatchState(byte set, byte[] state) {
-		state[9] = (byte) set;
+		state[9] = set;
 	}
 
 	/**
@@ -1296,9 +1325,7 @@ public void setLatchState(byte set, byte[] state) {
 	 *                            adapter
 	 */
 	public byte[] readRegister() throws OneWireIOException, OneWireException {
-		byte[] register = new byte[3];
-
-		return register;
+		return new byte[3];
 	}
 
 	/**
diff --git a/io.openems.edge.bridge.onewire/src/com/dalsemi/onewire/container/OneWireContainer43.java b/io.openems.edge.bridge.onewire/src/com/dalsemi/onewire/container/OneWireContainer43.java
index e84f2fb331b..2491a05c4ae 100644
--- a/io.openems.edge.bridge.onewire/src/com/dalsemi/onewire/container/OneWireContainer43.java
+++ b/io.openems.edge.bridge.onewire/src/com/dalsemi/onewire/container/OneWireContainer43.java
@@ -100,7 +100,6 @@ public class OneWireContainer43 extends OneWireContainer {
 	 * using.
 	 */
 	public OneWireContainer43() {
-		super();
 	}
 
 	/**
@@ -115,7 +114,7 @@ public OneWireContainer43(DSPortAdapter sourceAdapter, byte[] newAddress) {
 		super(sourceAdapter, newAddress);
 
 		// initialize the memory banks
-		initMem();
+		this.initMem();
 	}
 
 	/**
@@ -130,7 +129,7 @@ public OneWireContainer43(DSPortAdapter sourceAdapter, long newAddress) {
 		super(sourceAdapter, newAddress);
 
 		// initialize the memory banks
-		initMem();
+		this.initMem();
 	}
 
 	/**
@@ -145,7 +144,7 @@ public OneWireContainer43(DSPortAdapter sourceAdapter, String newAddress) {
 		super(sourceAdapter, newAddress);
 
 		// initialize the memory banks
-		initMem();
+		this.initMem();
 	}
 
 	// --------
@@ -160,11 +159,12 @@ public OneWireContainer43(DSPortAdapter sourceAdapter, String newAddress) {
 	 *                      iButton.
 	 * @param newAddress    address of this 1-Wire device
 	 */
+	@Override
 	public void setupContainer(DSPortAdapter sourceAdapter, byte[] newAddress) {
 		super.setupContainer(sourceAdapter, newAddress);
 
 		// initialize the memory banks
-		initMem();
+		this.initMem();
 	}
 
 	/**
@@ -175,11 +175,12 @@ public void setupContainer(DSPortAdapter sourceAdapter, byte[] newAddress) {
 	 *                      iButton.
 	 * @param newAddress    address of this 1-Wire device
 	 */
+	@Override
 	public void setupContainer(DSPortAdapter sourceAdapter, long newAddress) {
 		super.setupContainer(sourceAdapter, newAddress);
 
 		// initialize the memory banks
-		initMem();
+		this.initMem();
 	}
 
 	/**
@@ -190,11 +191,12 @@ public void setupContainer(DSPortAdapter sourceAdapter, long newAddress) {
 	 *                      iButton.
 	 * @param newAddress    address of this 1-Wire device
 	 */
+	@Override
 	public void setupContainer(DSPortAdapter sourceAdapter, String newAddress) {
 		super.setupContainer(sourceAdapter, newAddress);
 
 		// initialize the memory banks
-		initMem();
+		this.initMem();
 	}
 
 	/**
@@ -203,6 +205,7 @@ public void setupContainer(DSPortAdapter sourceAdapter, String newAddress) {
 	 *
 	 * @return string representation of the iButton name.
 	 */
+	@Override
 	public String getName() {
 		return "DS28EC20";
 	}
@@ -214,6 +217,7 @@ public String getName() {
 	 *
 	 * @return the alternate names for this iButton or 1-Wire device
 	 */
+	@Override
 	public String getAlternateNames() {
 		return "";
 	}
@@ -223,6 +227,7 @@ public String getAlternateNames() {
 	 *
 	 * @return string representation of the function description.
 	 */
+	@Override
 	public String getDescription() {
 		return "20Kb 1-Wire EEPROM";
 	}
@@ -232,6 +237,7 @@ public String getDescription() {
 	 *
 	 * @return max. communication speed.
 	 */
+	@Override
 	public int getMaxSpeed() {
 		return DSPortAdapter.SPEED_OVERDRIVE;
 	}
@@ -242,20 +248,21 @@ public int getMaxSpeed() {
 	 * MemoryBank}, {@link com.dalsemi.onewire.container.PagedMemoryBank
 	 * PagedMemoryBank}, and {@link com.dalsemi.onewire.container.OTPMemoryBank
 	 * OTPMemoryBank}.
-	 * 
+	 *
 	 * @return <CODE>Enumeration</CODE> of memory banks
 	 */
+	@Override
 	public Enumeration<MemoryBank> getMemoryBanks() {
-		Vector<MemoryBank> bank_vector = new Vector<>(2);
+		var bank_vector = new Vector<MemoryBank>(2);
 
 		// scratchpad
 //	  bank_vector.addElement(( MemoryBank ) sp);
 
 		// main memory
-		bank_vector.addElement((MemoryBank) main_mem);
+		bank_vector.addElement(this.main_mem);
 
 		// register memory
-		bank_vector.addElement((MemoryBank) register);
+		bank_vector.addElement(this.register);
 
 		return bank_vector.elements();
 	}
@@ -265,21 +272,21 @@ public Enumeration<MemoryBank> getMemoryBanks() {
 	 */
 	private void initMem() {
 		// scratch pad
-		sp = new MemoryBankScratchEE(this);
-		sp.size = 32;
-		sp.pageLength = 32;
-		sp.maxPacketDataLength = 29;
-		sp.pageAutoCRC = true;
-		sp.COPY_DELAY_LEN = 10;
-		sp.ES_MASK = (byte) 0;
+		this.sp = new MemoryBankScratchEE(this);
+		this.sp.size = 32;
+		this.sp.pageLength = 32;
+		this.sp.maxPacketDataLength = 29;
+		this.sp.pageAutoCRC = true;
+		this.sp.COPY_DELAY_LEN = 10;
+		this.sp.ES_MASK = (byte) 0;
 
 		// main memory
-		main_mem = new MemoryBankEEPROM(this, sp);
+		this.main_mem = new MemoryBankEEPROM(this, this.sp);
 
 		// initialize main memory
-		main_mem.size = 2560;
-		main_mem.numberPages = 80;
-		main_mem.scratchPadSize = 32;
+		this.main_mem.size = 2560;
+		this.main_mem.numberPages = 80;
+		this.main_mem.scratchPadSize = 32;
 		// readOnly = false;
 		// nonVolatile = true;
 		// pageAutoCRC = false;
@@ -294,32 +301,32 @@ private void initMem() {
 		// doSetSpeed = true;
 
 		// register memory
-		register = new MemoryBankEEPROM(this, sp);
+		this.register = new MemoryBankEEPROM(this, this.sp);
 
 		// initialize attributes of this memory bank
-		register.generalPurposeMemory = false;
-		register.bankDescription = "Write-protect/EPROM-Mode control register";
-		register.numberPages = 2;
-		register.size = 64;
-		register.pageLength = 32;
-		register.maxPacketDataLength = 0;
-		register.readWrite = true;
-		register.writeOnce = false;
-		register.readOnly = false;
-		register.nonVolatile = true;
-		register.pageAutoCRC = false;
-		register.lockPage = false;
-		register.programPulse = false;
-		register.powerDelivery = true;
-		register.extraInfo = false;
-		register.extraInfoLength = 0;
-		register.extraInfoDescription = null;
-		register.writeVerification = false;
-		register.startPhysicalAddress = 2560;
-		register.doSetSpeed = true;
+		this.register.generalPurposeMemory = false;
+		this.register.bankDescription = "Write-protect/EPROM-Mode control register";
+		this.register.numberPages = 2;
+		this.register.size = 64;
+		this.register.pageLength = 32;
+		this.register.maxPacketDataLength = 0;
+		this.register.readWrite = true;
+		this.register.writeOnce = false;
+		this.register.readOnly = false;
+		this.register.nonVolatile = true;
+		this.register.pageAutoCRC = false;
+		this.register.lockPage = false;
+		this.register.programPulse = false;
+		this.register.powerDelivery = true;
+		this.register.extraInfo = false;
+		this.register.extraInfoLength = 0;
+		this.register.extraInfoDescription = null;
+		this.register.writeVerification = false;
+		this.register.startPhysicalAddress = 2560;
+		this.register.doSetSpeed = true;
 
 		// set the lock mb
-		main_mem.mbLock = register;
+		this.main_mem.mbLock = this.register;
 	}
 
 	// --------
@@ -333,11 +340,11 @@ private void initMem() {
 	 * @return 'true' if current memory bank can only be written once
 	 */
 	public boolean isPageWriteOnce(int page) throws OneWireIOException, OneWireException {
-		byte[] rd_byte = new byte[1];
+		var rd_byte = new byte[1];
 
-		register.read(page, false, rd_byte, 0, 1);
+		this.register.read(page, false, rd_byte, 0, 1);
 
-		return (rd_byte[0] == WRITEONCE_FLAG);
+		return rd_byte[0] == WRITEONCE_FLAG;
 	}
 
 	/**
@@ -350,14 +357,15 @@ public boolean isPageWriteOnce(int page) throws OneWireIOException, OneWireExcep
 	 * @throws OneWireException
 	 */
 	public void setPageWriteOnce(int page) throws OneWireIOException, OneWireException {
-		byte[] wr_byte = new byte[1];
+		var wr_byte = new byte[1];
 
 		wr_byte[0] = WRITEONCE_FLAG;
 
-		register.write(page, wr_byte, 0, 1);
+		this.register.write(page, wr_byte, 0, 1);
 
 		// read back to verify
-		if (!isPageWriteOnce(page))
+		if (!this.isPageWriteOnce(page)) {
 			throw new OneWireIOException("Failed to set page to write-once mode.");
+		}
 	}
 }
diff --git a/io.openems.edge.bridge.onewire/src/com/dalsemi/onewire/container/OneWireSensor.java b/io.openems.edge.bridge.onewire/src/com/dalsemi/onewire/container/OneWireSensor.java
index fd9da8c3180..398d5ed4be3 100644
--- a/io.openems.edge.bridge.onewire/src/com/dalsemi/onewire/container/OneWireSensor.java
+++ b/io.openems.edge.bridge.onewire/src/com/dalsemi/onewire/container/OneWireSensor.java
@@ -49,21 +49,21 @@
  * have 'get' and 'set' methods that manipulate the byte array. So a
  * OneWireSensor operation is:
  * </P>
- * 
+ *
  * <OL>
  * <LI>state = readDevice()
  * <LI>'get' and 'set' methods on state
  * <LI>writeDevice(state)
  * </OL>
- * 
+ *
  * <H3>Usage</H3>
- * 
+ *
  * <DL>
  * <DD>
  * <H4>Example 1</H4> Read the sensed level of a
  * {@link com.dalsemi.onewire.container.SwitchContainer SwitchContainer}
  * instance 'sw':
- * 
+ *
  * <PRE>
  *  <CODE>
  *  byte[] state = sw.readDevice();
@@ -82,12 +82,12 @@
  *      System.out.println("This SwitchContainer can not sense level");
  * </CODE>
  * </PRE>
- * 
+ *
  * <DD>
  * <H4>Example 2</H4> Set the clock of a
  * {@link com.dalsemi.onewire.container.ClockContainer ClockContainer} instance
  * 'cl':
- * 
+ *
  * <PRE>
  *  <CODE>
  *  byte[] state = cl.readDevice();
diff --git a/io.openems.edge.bridge.onewire/src/com/dalsemi/onewire/container/PagedMemoryBank.java b/io.openems.edge.bridge.onewire/src/com/dalsemi/onewire/container/PagedMemoryBank.java
index 9600d7e8dfd..494f186d2c4 100644
--- a/io.openems.edge.bridge.onewire/src/com/dalsemi/onewire/container/PagedMemoryBank.java
+++ b/io.openems.edge.bridge.onewire/src/com/dalsemi/onewire/container/PagedMemoryBank.java
@@ -48,7 +48,7 @@
  * <A HREF="http://dbserv.maxim-ic.com/appnotes.cfm?appnote_number=114">
  * http://dbserv.maxim-ic.com/appnotes.cfm?appnote_number=114</A>
  * </P>
- * 
+ *
  * <P>
  * The MemoryBank methods can be organized into the following categories:
  * </P>
@@ -78,11 +78,11 @@
  * </UL>
  *
  * <H3>Usage</H3>
- * 
+ *
  * <DL>
  * <DD>
  * <H4>Example 1</H4> Display some features of PagedMemoryBank instance 'pmb':
- * 
+ *
  * <PRE>
  *  <CODE>
  *  System.out.print("PagedMemoryBank has: " + pmb.getNumberPages() + " pages of length ");
@@ -99,13 +99,13 @@
  * <DD>
  * <H4>Example 2</H4> Write a packet into the first page of a PagedMemoryBank
  * instance 'pmb':
- * 
+ *
  * <PRE>
  *  <CODE>
  *  byte[] write_buf = new byte[pmb.getMaxPacketDataLength()];
  *  for (int i = 0; i < write_buf.length; i++)
  *      write_buf[i] = (byte)0;
- * 
+ *
  *  mb.writePagePacket(0, write_buf, 0, write_buf.length);
  * </CODE>
  * </PRE>
@@ -113,29 +113,29 @@
  * <DD>
  * <H4>Example 3</H4> Read all of the pages of a PagedMemoryBank instance 'pmb'
  * with device CRC verification:
- * 
+ *
  * <PRE>
  *  <CODE>
  *  byte[] read_buf = new byte[pmb.getPageLength()];
  *
  *  if (pmb.hasAutoCRC())
  *  {
- *     // loop to read each page with CRC 
+ *     // loop to read each page with CRC
  *     for (int pg = 0; pg < pmb.getNumberPages(); pg++)
  *     {
  *        // use 'readContinue' argument to only access device on first page
  *        pmb.readPageCRC(pg, (pg == 0), read_buf, 0);
  *
- *        // do something with data in read_buf ... 
+ *        // do something with data in read_buf ...
  *     }
  *  }
  *  else
  *     System.out.println("PagedMemoryBank does not support device generated CRC");
- * 
+ *
  * </CODE>
  * </PRE>
  * </DL>
- * 
+ *
  * @see com.dalsemi.onewire.container.MemoryBank
  * @see com.dalsemi.onewire.container.OTPMemoryBank
  * @see com.dalsemi.onewire.container.OneWireContainer04
@@ -188,7 +188,7 @@ public interface PagedMemoryBank extends MemoryBank {
 	 * general purpose memory.
 	 *
 	 * @return max packet page length in bytes in this memory bank
-	 * 
+	 *
 	 * @see #readPagePacket(int,boolean,byte[],int) readPagePacket
 	 * @see #readPagePacket(int,boolean,byte[],int,byte[]) readPagePacket(extra)
 	 * @see #writePagePacket(int,byte[],int,int) writePagePacket
@@ -375,7 +375,7 @@ public void readPage(int page, boolean readContinue, byte[] readBuf, int offset,
 	 *                            valid packet.
 	 * @throws OneWireException   on a communication or setup error with the 1-Wire
 	 *                            adapter
-	 * 
+	 *
 	 * @see #getMaxPacketDataLength() getMaxPacketDataLength
 	 */
 	public int readPagePacket(int page, boolean readContinue, byte[] readBuf, int offset)
@@ -487,7 +487,7 @@ public void readPageCRC(int page, boolean readContinue, byte[] readBuf, int offs
 	 * being read from. For example, if pages 0 - 4 are to be read, readContinue
 	 * would be set to false for page 0 and would be set to true for the next four
 	 * calls.
-	 * 
+	 *
 	 *
 	 * <P>
 	 * Note: Using readContinue = true can only be used if the new read continues
diff --git a/io.openems.edge.bridge.onewire/src/com/dalsemi/onewire/container/PasswordContainer.java b/io.openems.edge.bridge.onewire/src/com/dalsemi/onewire/container/PasswordContainer.java
index 2431afa7e94..16f1c8bf71a 100644
--- a/io.openems.edge.bridge.onewire/src/com/dalsemi/onewire/container/PasswordContainer.java
+++ b/io.openems.edge.bridge.onewire/src/com/dalsemi/onewire/container/PasswordContainer.java
@@ -35,7 +35,7 @@
  * to the device, or both. These interface methods will allow you to set the
  * passwords on the device, enable/disable the passwords on the device, and set
  * the passwords for the API to use when interacting with the device.
- * 
+ *
  * @version 1.00, 8 Aug 2003
  * @author shughes, JPE
  */
@@ -44,21 +44,21 @@ public interface PasswordContainer {
 
 	/**
 	 * Returns the length in bytes of the Read-Only password.
-	 * 
+	 *
 	 * @return the length in bytes of the Read-Only password.
 	 */
 	public int getReadOnlyPasswordLength() throws OneWireException;
 
 	/**
 	 * Returns the length in bytes of the Read/Write password.
-	 * 
+	 *
 	 * @return the length in bytes of the Read/Write password.
 	 */
 	public int getReadWritePasswordLength() throws OneWireException;
 
 	/**
 	 * Returns the length in bytes of the Write-Only password.
-	 * 
+	 *
 	 * @return the length in bytes of the Write-Only password.
 	 */
 	public int getWriteOnlyPasswordLength() throws OneWireException;
@@ -68,7 +68,7 @@ public interface PasswordContainer {
 	/**
 	 * Returns the absolute address of the memory location where the Read-Only
 	 * password is written.
-	 * 
+	 *
 	 * @return the absolute address of the memory location where the Read-Only
 	 *         password is written.
 	 */
@@ -77,7 +77,7 @@ public interface PasswordContainer {
 	/**
 	 * Returns the absolute address of the memory location where the Read/Write
 	 * password is written.
-	 * 
+	 *
 	 * @return the absolute address of the memory location where the Read/Write
 	 *         password is written.
 	 */
@@ -86,7 +86,7 @@ public interface PasswordContainer {
 	/**
 	 * Returns the absolute address of the memory location where the Write-Only
 	 * password is written.
-	 * 
+	 *
 	 * @return the absolute address of the memory location where the Write-Only
 	 *         password is written.
 	 */
@@ -98,7 +98,7 @@ public interface PasswordContainer {
 	 * Returns true if this device has a Read-Only password. If false, all other
 	 * functions dealing with the Read-Only password will throw an exception if
 	 * called.
-	 * 
+	 *
 	 * @return <code>true</code> if this device has a Read-Only password.
 	 */
 	public boolean hasReadOnlyPassword();
@@ -107,7 +107,7 @@ public interface PasswordContainer {
 	 * Returns true if this device has a Read/Write password. If false, all other
 	 * functions dealing with the Read/Write password will throw an exception if
 	 * called.
-	 * 
+	 *
 	 * @return <code>true</code> if this device has a Read/Write password.
 	 */
 	public boolean hasReadWritePassword();
@@ -116,7 +116,7 @@ public interface PasswordContainer {
 	 * Returns true if this device has a Write-Only password. If false, all other
 	 * functions dealing with the Write-Only password will throw an exception if
 	 * called.
-	 * 
+	 *
 	 * @return <code>true</code> if this device has a Write-Only password.
 	 */
 	public boolean hasWriteOnlyPassword();
@@ -125,7 +125,7 @@ public interface PasswordContainer {
 
 	/**
 	 * Returns true if the device's Read-Only password has been enabled.
-	 * 
+	 *
 	 * @return <code>true</code> if the device's Read-Only password has been
 	 *         enabled.
 	 */
@@ -133,7 +133,7 @@ public interface PasswordContainer {
 
 	/**
 	 * Returns true if the device's Read/Write password has been enabled.
-	 * 
+	 *
 	 * @return <code>true</code> if the device's Read/Write password has been
 	 *         enabled.
 	 */
@@ -141,7 +141,7 @@ public interface PasswordContainer {
 
 	/**
 	 * Returns true if the device's Write-Only password has been enabled.
-	 * 
+	 *
 	 * @return <code>true</code> if the device's Write-Only password has been
 	 *         enabled.
 	 */
@@ -155,7 +155,7 @@ public interface PasswordContainer {
 	 * password protection and Write-Only password protection, this method indicates
 	 * whether or not you can enable Read-Only protection while leaving the
 	 * Write-Only protection disabled.
-	 * 
+	 *
 	 * @return <code>true</code> if the device has the capability to enable one type
 	 *         of password while leaving another type disabled.
 	 */
@@ -169,13 +169,13 @@ public interface PasswordContainer {
 	 * enable particular types of passwords. Otherwise, this method will throw an
 	 * exception if all supported types are not enabled.
 	 * </p>
-	 * 
+	 *
 	 * <p>
 	 * For this to be successful, either write-protect passwords must be disabled,
 	 * or the write-protect password(s) for this container must be set and must
 	 * match the value of the write-protect password(s) in the device's register.
 	 * </p>
-	 * 
+	 *
 	 * @param enableReadOnly  if <code>true</code> Read-Only passwords will be
 	 *                        enabled.
 	 * @param enableReadWrite if <code>true</code> Read/Write passwords will be
@@ -192,17 +192,17 @@ public void setDevicePasswordEnable(boolean enableReadOnly, boolean enableReadWr
 	 * type of password (Read-Only, Write-Only, or Read/Write), all passwords will
 	 * be enabled. This function is equivalent to the following:
 	 * <code> owc41.setDevicePasswordEnable(
-	 *                    owc41.hasReadOnlyPassword(), 
+	 *                    owc41.hasReadOnlyPassword(),
 	 *                    owc41.hasReadWritePassword(),
 	 *                    owc41.hasWriteOnlyPassword() ); </code>
 	 * </p>
-	 * 
+	 *
 	 * <p>
 	 * For this to be successful, either write-protect passwords must be disabled,
 	 * or the write-protect password(s) for this container must be set and must
 	 * match the value of the write-protect password(s) in the device's register.
 	 * </p>
-	 * 
+	 *
 	 * @param enableAll if <code>true</code>, all passwords are enabled. Otherwise,
 	 *                  all passwords are disabled.
 	 */
@@ -216,13 +216,13 @@ public void setDevicePasswordEnable(boolean enableReadOnly, boolean enableReadWr
 	 * that this function does not enable the password, just writes the value to the
 	 * appropriate memory location.
 	 * </p>
-	 * 
+	 *
 	 * <p>
 	 * For this to be successful, either write-protect passwords must be disabled,
 	 * or the write-protect password(s) for this container must be set and must
 	 * match the value of the write-protect password(s) in the device's register.
 	 * </p>
-	 * 
+	 *
 	 * @param password the new password to be written to the device's Read-Only
 	 *                 password register. Length must be
 	 *                 <code>(offset + getReadOnlyPasswordLength)</code>
@@ -236,13 +236,13 @@ public void setDevicePasswordEnable(boolean enableReadOnly, boolean enableReadWr
 	 * that this function does not enable the password, just writes the value to the
 	 * appropriate memory location.
 	 * </p>
-	 * 
+	 *
 	 * <p>
 	 * For this to be successful, either write-protect passwords must be disabled,
 	 * or the write-protect password(s) for this container must be set and must
 	 * match the value of the write-protect password(s) in the device's register.
 	 * </p>
-	 * 
+	 *
 	 * @param password the new password to be written to the device's Read-Write
 	 *                 password register. Length must be
 	 *                 <code>(offset + getReadWritePasswordLength)</code>
@@ -256,13 +256,13 @@ public void setDevicePasswordEnable(boolean enableReadOnly, boolean enableReadWr
 	 * that this function does not enable the password, just writes the value to the
 	 * appropriate memory location.
 	 * </p>
-	 * 
+	 *
 	 * <p>
 	 * For this to be successful, either write-protect passwords must be disabled,
 	 * or the write-protect password(s) for this container must be set and must
 	 * match the value of the write-protect password(s) in the device's register.
 	 * </p>
-	 * 
+	 *
 	 * @param password the new password to be written to the device's Write-Only
 	 *                 password register. Length must be
 	 *                 <code>(offset + getWriteOnlyPasswordLength)</code>
@@ -277,7 +277,7 @@ public void setDevicePasswordEnable(boolean enableReadOnly, boolean enableReadWr
 	 * memory. This password is not written to the device's Read-Only password
 	 * register. It is the password used by the software for interacting with the
 	 * device only.
-	 * 
+	 *
 	 * @param password the new password to be used by the API when reading from the
 	 *                 device's memory. Length must be
 	 *                 <code>(offset + getReadOnlyPasswordLength)</code>
@@ -290,7 +290,7 @@ public void setDevicePasswordEnable(boolean enableReadOnly, boolean enableReadWr
 	 * the device's memory. This password is not written to the device's Read/Write
 	 * password register. It is the password used by the software for interacting
 	 * with the device only.
-	 * 
+	 *
 	 * @param password the new password to be used by the API when reading from or
 	 *                 writing to the device's memory. Length must be
 	 *                 <code>(offset + getReadWritePasswordLength)</code>
@@ -303,7 +303,7 @@ public void setDevicePasswordEnable(boolean enableReadOnly, boolean enableReadWr
 	 * memory. This password is not written to the device's Write-Only password
 	 * register. It is the password used by the software for interacting with the
 	 * device only.
-	 * 
+	 *
 	 * @param password the new password to be used by the API when writing to the
 	 *                 device's memory. Length must be
 	 *                 <code>(offset + getWriteOnlyPasswordLength)</code>
@@ -318,7 +318,7 @@ public void setDevicePasswordEnable(boolean enableReadOnly, boolean enableReadWr
 	 * memory has been set. The return value is not affected by whether or not the
 	 * read password of the container actually matches the value in the device's
 	 * password register.
-	 * 
+	 *
 	 * @return <code>true</code> if the password used by the API for reading from
 	 *         the device's memory has been set.
 	 */
@@ -329,7 +329,7 @@ public void setDevicePasswordEnable(boolean enableReadOnly, boolean enableReadWr
 	 * the device's memory has been set. The return value is not affected by whether
 	 * or not the read/write password of the container actually matches the value in
 	 * the device's password register.
-	 * 
+	 *
 	 * @return <code>true</code> if the password used by the API for reading from or
 	 *         writing to the device's memory has been set.
 	 */
@@ -340,7 +340,7 @@ public void setDevicePasswordEnable(boolean enableReadOnly, boolean enableReadWr
 	 * memory has been set. The return value is not affected by whether or not the
 	 * write password of the container actually matches the value in the device's
 	 * password register.
-	 * 
+	 *
 	 * @return <code>true</code> if the password used by the API for writing to the
 	 *         device's memory has been set.
 	 */
@@ -354,7 +354,7 @@ public void setDevicePasswordEnable(boolean enableReadOnly, boolean enableReadWr
 	 * register. It is the password used by the software for interacting with the
 	 * device only and must have been set using the
 	 * <code>setContainerReadOnlyPassword</code> method.
-	 * 
+	 *
 	 * @param password array for holding the password that is used by the API when
 	 *                 reading from the device's memory. Length must be
 	 *                 <code>(offset + getWriteOnlyPasswordLength)</code>
@@ -368,7 +368,7 @@ public void setDevicePasswordEnable(boolean enableReadOnly, boolean enableReadWr
 	 * password register. It is the password used by the software for interacting
 	 * with the device only and must have been set using the
 	 * <code>setContainerReadWritePassword</code> method.
-	 * 
+	 *
 	 * @param password array for holding the password that is used by the API when
 	 *                 reading from or writing to the device's memory. Length must
 	 *                 be <code>(offset + getReadWritePasswordLength)</code>
@@ -382,7 +382,7 @@ public void setDevicePasswordEnable(boolean enableReadOnly, boolean enableReadWr
 	 * register. It is the password used by the software for interacting with the
 	 * device only and must have been set using the
 	 * <code>setContainerWriteOnlyPassword</code> method.
-	 * 
+	 *
 	 * @param password array for holding the password that is used by the API when
 	 *                 writing to the device's memory. Length must be
 	 *                 <code>(offset + getWriteOnlyPasswordLength)</code>
diff --git a/io.openems.edge.bridge.onewire/src/com/dalsemi/onewire/container/PotentiometerContainer.java b/io.openems.edge.bridge.onewire/src/com/dalsemi/onewire/container/PotentiometerContainer.java
index 6bbb30363ec..f8c11d7c202 100644
--- a/io.openems.edge.bridge.onewire/src/com/dalsemi/onewire/container/PotentiometerContainer.java
+++ b/io.openems.edge.bridge.onewire/src/com/dalsemi/onewire/container/PotentiometerContainer.java
@@ -73,7 +73,7 @@
  * <H3>Usage</H3>
  *
  * Display some features of PotentiometerContainer instance '<code>pc</code>':
- * 
+ *
  * <PRE>
  *  <CODE>
  *      byte[] state = pc.readDevice();
diff --git a/io.openems.edge.bridge.onewire/src/com/dalsemi/onewire/container/ResponseAPDU.java b/io.openems.edge.bridge.onewire/src/com/dalsemi/onewire/container/ResponseAPDU.java
index aa0bcb248b6..0111e2e4f6f 100644
--- a/io.openems.edge.bridge.onewire/src/com/dalsemi/onewire/container/ResponseAPDU.java
+++ b/io.openems.edge.bridge.onewire/src/com/dalsemi/onewire/container/ResponseAPDU.java
@@ -54,7 +54,7 @@
  * qualifier.
  * </ul>
  *
- * 
+ *
  * <H3>Usage</H3>
  * <OL>
  * <LI><code><pre>
@@ -62,7 +62,7 @@
  *   ResponseAPDU rapdu = new ResponseAPDU(buffer); </pre></code>
  * <LI><code><pre>
  *   OneWireContainer16 owc16 = new OneWireContainer16(adapter, address);
- *   byte[] buffer = {(byte)0x90, (byte)0x00, (byte)0x00, (byte)0x00, 
+ *   byte[] buffer = {(byte)0x90, (byte)0x00, (byte)0x00, (byte)0x00,
  *                    (byte)0x01, (byte)0x02, (byte)0x03};
  *   CommandAPDU capdu = new CommandAPDU(buffer);
  *   ResponseAPDU rapdu = owc16.sendAPDU(capdu, runTime); </pre></code>
@@ -72,10 +72,10 @@
  * <DL>
  * <DD><A HREF="http://www.opencard.org"> http://www.opencard.org</A>
  * </DL>
- * 
+ *
  * @see com.dalsemi.onewire.container.CommandAPDU
  * @see com.dalsemi.onewire.container.OneWireContainer16
- * 
+ *
  * @version 0.00, 28 Aug 2000
  * @author YL
  *
@@ -98,20 +98,21 @@ public class ResponseAPDU {
 	 *
 	 * @param buffer the byte array with data for the internal
 	 *               <code>apduBuffer</code>
-	 * 
+	 *
 	 * @throws RuntimeException thrown when <code>buffer</code> length <
 	 *                          <code>2</code>.
 	 *
 	 * @see CommandAPDU
 	 */
 	public ResponseAPDU(byte[] buffer) {
-		if (buffer.length < 2)
+		if (buffer.length < 2) {
 			throw new RuntimeException("invalid ResponseAPDU, " + "length must be at least 2 bytes");
+		}
 
-		apduLength = buffer.length;
-		apduBuffer = new byte[apduLength];
+		this.apduLength = buffer.length;
+		this.apduBuffer = new byte[this.apduLength];
 
-		System.arraycopy(buffer, 0, apduBuffer, 0, apduLength);
+		System.arraycopy(buffer, 0, this.apduBuffer, 0, this.apduLength);
 	} // ResponseAPDU
 
 	/**
@@ -120,14 +121,14 @@ public ResponseAPDU(byte[] buffer) {
 	 * @return a byte array containing this <code>ResponseAPDU</code> data field
 	 */
 	public byte[] getData() {
-		if (apduLength > 2) {
-			byte[] data = new byte[apduLength - 2];
+		if (this.apduLength > 2) {
+			var data = new byte[this.apduLength - 2];
 
-			System.arraycopy(apduBuffer, 0, data, 0, apduLength - 2);
+			System.arraycopy(this.apduBuffer, 0, data, 0, this.apduLength - 2);
 
 			return data;
-		} else
-			return null;
+		}
+		return null;
 	} // data
 
 	/**
@@ -138,7 +139,7 @@ public byte[] getData() {
 	 * @return <code>(((SW1 << 8) & 0xFF00) | (SW2 & 0xFF))</code> as an integer
 	 */
 	public final int getSW() {
-		return (((getSW1() << 8) & 0xFF00) | (getSW2() & 0xFF));
+		return this.getSW1() << 8 & 0xFF00 | this.getSW2() & 0xFF;
 	} // getSW
 
 	/**
@@ -147,7 +148,7 @@ public final int getSW() {
 	 * @return value of SW1 as a byte
 	 */
 	public final byte getSW1() {
-		return apduBuffer[apduLength - 2];
+		return this.apduBuffer[this.apduLength - 2];
 	} // getSW1
 
 	/**
@@ -156,7 +157,7 @@ public final byte getSW1() {
 	 * @return value of SW2 as a byte
 	 */
 	public final byte getSW2() {
-		return apduBuffer[apduLength - 1];
+		return this.apduBuffer[this.apduLength - 1];
 	} // getSW2
 
 	/**
@@ -170,10 +171,11 @@ public final byte getSW2() {
 	 * @see #getLength
 	 */
 	final public byte getByte(int index) {
-		if (index >= apduLength)
+		if (index >= this.apduLength) {
 			return (byte) -1; // read beyond end of ResponseAPDU
+		}
 
-		return (apduBuffer[index]);
+		return this.apduBuffer[index];
 	} // getByte
 
 	/**
@@ -186,9 +188,9 @@ final public byte getByte(int index) {
 	 * @see #getLength
 	 */
 	final public byte[] getBytes() {
-		byte[] apdu = new byte[apduLength];
+		var apdu = new byte[this.apduLength];
 
-		System.arraycopy(apduBuffer, 0, apdu, 0, apduLength);
+		System.arraycopy(this.apduBuffer, 0, apdu, 0, this.apduLength);
 
 		return apdu;
 	} // getBytes
@@ -200,7 +202,7 @@ final public byte[] getBytes() {
 	 *         currently stored
 	 */
 	final public int getLength() {
-		return apduLength;
+		return this.apduLength;
 	} // getLength
 
 	/**
@@ -208,40 +210,44 @@ final public int getLength() {
 	 *
 	 * @return a string describing this <code>ResponseAPDU</code>
 	 */
+	@Override
 	public String toString() {
-		String apduString = "";
+		var apduString = new StringBuilder();
 
-		if (apduLength > 2) {
-			byte[] dataBuffer = new byte[apduLength - 2];
+		if (this.apduLength > 2) {
+			var dataBuffer = new byte[this.apduLength - 2];
 
-			dataBuffer = getData();
-			apduString += "DATA = ";
+			dataBuffer = this.getData();
+			apduString.append("DATA = ");
 
-			for (int i = 0; i < dataBuffer.length; i++) {
+			for (byte element : dataBuffer) {
 
 				// make hex String representation of byte array
-				if ((dataBuffer[i] & 0xFF) < 0x10)
-					apduString += '0';
+				if ((element & 0xFF) < 0x10) {
+					apduString.append('0');
+				}
 
-				apduString += Integer.toHexString((int) (dataBuffer[i] & 0xFF)) + " ";
+				apduString.append(Integer.toHexString(element & 0xFF)).append(" ");
 			}
 
-			apduString += " | ";
+			apduString.append(" | ");
 		}
 
-		apduString += "SW1 = ";
+		apduString.append("SW1 = ");
 
-		if ((getSW1() & 0xFF) < 0x10)
-			apduString += '0';
+		if ((this.getSW1() & 0xFF) < 0x10) {
+			apduString.append('0');
+		}
 
-		apduString += Integer.toHexString(getSW1() & 0xFF);
-		apduString += ", SW2 = ";
+		apduString.append(Integer.toHexString(this.getSW1() & 0xFF));
+		apduString.append(", SW2 = ");
 
-		if ((getSW2() & 0xFF) < 0x10)
-			apduString += '0';
+		if ((this.getSW2() & 0xFF) < 0x10) {
+			apduString.append('0');
+		}
 
-		apduString += Integer.toHexString(getSW2() & 0xFF);
+		apduString.append(Integer.toHexString(this.getSW2() & 0xFF));
 
-		return (apduString.toUpperCase());
+		return apduString.toString().toUpperCase();
 	} // toString
 }
diff --git a/io.openems.edge.bridge.onewire/src/com/dalsemi/onewire/container/TemperatureContainer.java b/io.openems.edge.bridge.onewire/src/com/dalsemi/onewire/container/TemperatureContainer.java
index 506fd30cb4c..1e0f4b645c7 100644
--- a/io.openems.edge.bridge.onewire/src/com/dalsemi/onewire/container/TemperatureContainer.java
+++ b/io.openems.edge.bridge.onewire/src/com/dalsemi/onewire/container/TemperatureContainer.java
@@ -75,7 +75,7 @@
  * <DD>
  * <H4>Example 1</H4> Display some features of TemperatureContainer instance
  * '<code>tc</code>':
- * 
+ *
  * <PRE>
  *  <CODE>
  *   // Read High and Low Alarms
@@ -94,7 +94,7 @@
  * <DD>
  * <H4>Example 2</H4> Gets temperature reading from a TemperatureContainer
  * instance '<code>tc</code>':
- * 
+ *
  * <PRE>
  *  <CODE>
  *   double lastTemperature;
@@ -122,7 +122,7 @@
  * to do a conversion without reading the result. One could take advantage of
  * the alarm features of a device by setting a threshold and doing conversions
  * until the device is alarming. For example:
- * 
+ *
  * <PRE>
  *  <CODE>
  *   // get the current resolution of the device
@@ -143,7 +143,7 @@
  * <DD>
  * <H4>Example 3</H4> Sets the temperature resolution of a TemperatureContainer
  * instance '<code>tc</code>':
- * 
+ *
  * <PRE>
  *  <CODE>
  *   byte[] state = tc.readDevice();
diff --git a/io.openems.edge.bridge.onewire/src/com/dalsemi/onewire/debug/Debug.java b/io.openems.edge.bridge.onewire/src/com/dalsemi/onewire/debug/Debug.java
index d13c32f3fa3..8d56d24d575 100644
--- a/io.openems.edge.bridge.onewire/src/com/dalsemi/onewire/debug/Debug.java
+++ b/io.openems.edge.bridge.onewire/src/com/dalsemi/onewire/debug/Debug.java
@@ -58,14 +58,15 @@ public class Debug {
 	 * by default. Also, will redirect debug output to a log file if specified.
 	 */
 	static {
-		String enable = OneWireAccessProvider.getProperty("onewire.debug");
-		if (enable != null && enable.toLowerCase().equals("true"))
+		var enable = OneWireAccessProvider.getProperty("onewire.debug");
+		if (enable != null && enable.toLowerCase().equals("true")) {
 			DEBUG = true;
-		else
+		} else {
 			DEBUG = false;
+		}
 
 		if (DEBUG) {
-			String logFile = OneWireAccessProvider.getProperty("onewire.debug.logfile");
+			var logFile = OneWireAccessProvider.getProperty("onewire.debug.logfile");
 			if (logFile != null) {
 				try {
 					out = new PrintStream(new java.io.FileOutputStream(logFile), true);
@@ -111,13 +112,13 @@ public static final void setPrintStream(PrintStream outStream) {
 	 * enabled. This method calls <code>PrintStream.println(String)</code>, and
 	 * pre-pends the <code>String</code> "&gt;&gt; " to the message, so that if a
 	 * program were to call (when debug mode was enabled):
-	 * 
+	 *
 	 * <pre>
 	 * com.dalsemi.onewire.debug.Debug.debug("Some notification...");
 	 * </pre>
-	 * 
+	 *
 	 * the resulting output would look like:
-	 * 
+	 *
 	 * <pre>
 	 *     &gt;&gt; Some notification...
 	 * </pre>
@@ -125,8 +126,9 @@ public static final void setPrintStream(PrintStream outStream) {
 	 * @param x the message to print out if in debug mode
 	 */
 	public static final void debug(String x) {
-		if (DEBUG)
+		if (DEBUG) {
 			out.println(">> " + x);
+		}
 	}
 
 	/**
@@ -134,13 +136,13 @@ public static final void debug(String x) {
 	 * enabled. This method calls <code>PrintStream.println(String)</code>, and
 	 * pre-pends the <code>String</code> "&gt;&gt; " to the message, so that if a
 	 * program were to call (when debug mode was enabled):
-	 * 
+	 *
 	 * <pre>
 	 * com.dalsemi.onewire.debug.Debug.debug("Some notification...", myBytes);
 	 * </pre>
-	 * 
+	 *
 	 * the resulting output would look like:
-	 * 
+	 *
 	 * <pre>
 	 *     >> my label
 	 *     >>   FF F1 F2 F3 F4 F5 F6 FF
@@ -150,8 +152,9 @@ public static final void debug(String x) {
 	 * @param bytes the byte array to print out
 	 */
 	public static final void debug(String lbl, byte[] bytes) {
-		if (DEBUG)
+		if (DEBUG) {
 			debug(lbl, bytes, 0, bytes.length);
+		}
 	}
 
 	/**
@@ -159,13 +162,13 @@ public static final void debug(String lbl, byte[] bytes) {
 	 * enabled. This method calls <code>PrintStream.println(String)</code>, and
 	 * pre-pends the <code>String</code> "&gt;&gt; " to the message, so that if a
 	 * program were to call (when debug mode was enabled):
-	 * 
+	 *
 	 * <pre>
 	 * com.dalsemi.onewire.debug.Debug.debug("Some notification...", myBytes, 0, 8);
 	 * </pre>
-	 * 
+	 *
 	 * the resulting output would look like:
-	 * 
+	 *
 	 * <pre>
 	 *     &gt;&gt; my label
 	 *     &gt;&gt; FF F1 F2 F3 F4 F5 F6 FF
@@ -180,16 +183,16 @@ public static final void debug(String lbl, byte[] bytes, int offset, int length)
 		if (DEBUG) {
 			out.print(">> " + lbl + ", offset=" + offset + ", length=" + length);
 			length += offset;
-			int inc = 8;
-			boolean printHead = true;
-			for (int i = offset; i < length; i += inc) {
+			var inc = 8;
+			var printHead = true;
+			for (var i = offset; i < length; i += inc) {
 				if (printHead) {
 					out.println();
 					out.print(">>    ");
 				} else {
 					out.print(" : ");
 				}
-				int len = Math.min(inc, length - i);
+				var len = Math.min(inc, length - i);
 				out.print(Convert.toHexString(bytes, i, len, " "));
 				printHead = !printHead;
 			}
diff --git a/io.openems.edge.bridge.onewire/src/com/dalsemi/onewire/utils/Address.java b/io.openems.edge.bridge.onewire/src/com/dalsemi/onewire/utils/Address.java
index 99f86612fdf..9a1efe7b49b 100644
--- a/io.openems.edge.bridge.onewire/src/com/dalsemi/onewire/utils/Address.java
+++ b/io.openems.edge.bridge.onewire/src/com/dalsemi/onewire/utils/Address.java
@@ -61,7 +61,7 @@
  * <p>
  * </li>
  * </ul>
- * 
+ *
  * @version 0.00, 21 August 2000
  * @author DS
  */
@@ -94,16 +94,18 @@ private Address() {
 	 * @see com.dalsemi.onewire.utils.CRC8
 	 */
 	public static boolean isValid(byte[] address) {
-		if ((address[0] != 0) && (CRC8.compute(address) == 0))
+		if (address[0] != 0 && CRC8.compute(address) == 0) {
 			return true;
-		else if ((address[0] & 0x7F) == 0x1C) // DS28E04
+		}
+		if ((address[0] & 0x7F) == 0x1C) // DS28E04
 		{
 			// The DS28E04 has a pin selectable ROM ID input. However,
 			// the CRC8 for the ROM ID assumes that the selecatable bits
 			// are always 1.
 			return 0 == CRC8.compute(address, 2, 6, CRC8.compute(0x7F, CRC8.compute(address[0], 0)));
-		} else
+		} else {
 			return false;
+		}
 	}
 
 	/**
@@ -150,16 +152,16 @@ public static String toString(byte[] address) {
 		// When displaying, the CRC is first, family code is last so
 		// that the center 6 bytes are a real serial number (not byte reversed).
 
-		byte[] barr = new byte[16];
-		int index = 0;
+		var barr = new byte[16];
+		var index = 0;
 		int ch;
 
-		for (int i = 7; i >= 0; i--) {
-			ch = (address[i] >> 4) & 0x0F;
-			ch += ((ch > 9) ? 'A' - 10 : '0');
+		for (var i = 7; i >= 0; i--) {
+			ch = address[i] >> 4 & 0x0F;
+			ch += ch > 9 ? 'A' - 10 : '0';
 			barr[index++] = (byte) ch;
 			ch = address[i] & 0x0F;
-			ch += ((ch > 9) ? 'A' - 10 : '0');
+			ch += ch > 9 ? 'A' - 10 : '0';
 			barr[index++] = (byte) ch;
 		}
 
@@ -189,9 +191,9 @@ public static String toString(long address) {
 	public static byte[] toByteArray(String address) {
 		byte address_byte[] = new byte[8];
 
-		for (int i = 0; i < 8; i++) {
-			address_byte[7 - i] = (byte) ((Character.digit((address.charAt(i * 2)), 16) << 4)
-					| (Character.digit(address.charAt(i * 2 + 1), 16)));
+		for (var i = 0; i < 8; i++) {
+			address_byte[7 - i] = (byte) (Character.digit(address.charAt(i * 2), 16) << 4
+					| Character.digit(address.charAt(i * 2 + 1), 16));
 		}
 
 		return address_byte;
@@ -238,21 +240,21 @@ public static long toLong(byte[] address) {
 		 * This looks funny, but it should actually take less time since I do 7 eight
 		 * bit shifts instead of 8+16+24+32+40+48+56 shifts.
 		 */
-		long longVal = (long) (address[7] & 0xFF);
+		long longVal = address[7] & 0xFF;
 		longVal <<= 8;
-		longVal |= (long) (address[6] & 0xFF);
+		longVal |= address[6] & 0xFF;
 		longVal <<= 8;
-		longVal |= (long) (address[5] & 0xFF);
+		longVal |= address[5] & 0xFF;
 		longVal <<= 8;
-		longVal |= (long) (address[4] & 0xFF);
+		longVal |= address[4] & 0xFF;
 		longVal <<= 8;
-		longVal |= (long) (address[3] & 0xFF);
+		longVal |= address[3] & 0xFF;
 		longVal <<= 8;
-		longVal |= (long) (address[2] & 0xFF);
+		longVal |= address[2] & 0xFF;
 		longVal <<= 8;
-		longVal |= (long) (address[1] & 0xFF);
+		longVal |= address[1] & 0xFF;
 		longVal <<= 8;
-		longVal |= (long) (address[0] & 0xFF);
+		longVal |= address[0] & 0xFF;
 
 		return longVal;
 	}
diff --git a/io.openems.edge.bridge.onewire/src/com/dalsemi/onewire/utils/Bit.java b/io.openems.edge.bridge.onewire/src/com/dalsemi/onewire/utils/Bit.java
index 63c7e4c031a..536d1f10405 100644
--- a/io.openems.edge.bridge.onewire/src/com/dalsemi/onewire/utils/Bit.java
+++ b/io.openems.edge.bridge.onewire/src/com/dalsemi/onewire/utils/Bit.java
@@ -45,13 +45,14 @@ public class Bit {
 	 * @param buf    byte array to manipulate
 	 */
 	public static void arrayWriteBit(int state, int index, int offset, byte[] buf) {
-		int nbyt = (index >>> 3);
-		int nbit = index - (nbyt << 3);
+		var nbyt = index >>> 3;
+		var nbit = index - (nbyt << 3);
 
-		if (state == 1)
-			buf[nbyt + offset] |= (0x01 << nbit);
-		else
+		if (state == 1) {
+			buf[nbyt + offset] |= 0x01 << nbit;
+		} else {
 			buf[nbyt + offset] &= ~(0x01 << nbit);
+		}
 	}
 
 	/**
@@ -64,9 +65,9 @@ public static void arrayWriteBit(int state, int index, int offset, byte[] buf) {
 	 * @return bit state 1 or 0
 	 */
 	public static int arrayReadBit(int index, int offset, byte[] buf) {
-		int nbyt = (index >>> 3);
-		int nbit = index - (nbyt << 3);
+		var nbyt = index >>> 3;
+		var nbit = index - (nbyt << 3);
 
-		return ((buf[nbyt + offset] >>> nbit) & 0x01);
+		return buf[nbyt + offset] >>> nbit & 0x01;
 	}
 }
diff --git a/io.openems.edge.bridge.onewire/src/com/dalsemi/onewire/utils/CRC16.java b/io.openems.edge.bridge.onewire/src/com/dalsemi/onewire/utils/CRC16.java
index 55ce94af06c..1f291a5c988 100644
--- a/io.openems.edge.bridge.onewire/src/com/dalsemi/onewire/utils/CRC16.java
+++ b/io.openems.edge.bridge.onewire/src/com/dalsemi/onewire/utils/CRC16.java
@@ -83,22 +83,21 @@ public static int compute(int dataToCrc) {
 	 * @return CRC16 value
 	 */
 	public static int compute(int dataToCrc, int seed) {
-		int dat = ((dataToCrc ^ (seed & 0xFF)) & 0xFF);
+		var dat = (dataToCrc ^ seed & 0xFF) & 0xFF;
 
 		seed = (seed & 0xFFFF) >>> 8;
 
-		int indx1 = (dat & 0x0F);
-		int indx2 = (dat >>> 4);
+		var indx1 = dat & 0x0F;
+		var indx2 = dat >>> 4;
 
-		if ((ODD_PARITY[indx1] ^ ODD_PARITY[indx2]) == 1)
+		if ((ODD_PARITY[indx1] ^ ODD_PARITY[indx2]) == 1) {
 			seed = seed ^ 0xC001;
+		}
 
-		dat = (dat << 6);
+		dat = dat << 6;
 		seed = seed ^ dat;
-		dat = (dat << 1);
-		seed = seed ^ dat;
-
-		return seed;
+		dat = dat << 1;
+		return seed ^ dat;
 	}
 
 	/**
@@ -144,8 +143,9 @@ public static int compute(byte dataToCrc[], int off, int len) {
 	public static int compute(byte dataToCrc[], int off, int len, int seed) {
 
 		// loop to do the crc on each data element
-		for (int i = 0; i < len; i++)
+		for (var i = 0; i < len; i++) {
 			seed = compute(dataToCrc[i + off], seed);
+		}
 
 		return seed;
 	}
diff --git a/io.openems.edge.bridge.onewire/src/com/dalsemi/onewire/utils/CRC8.java b/io.openems.edge.bridge.onewire/src/com/dalsemi/onewire/utils/CRC8.java
index 7a7fbbb2fe7..a9f9dfc510c 100644
--- a/io.openems.edge.bridge.onewire/src/com/dalsemi/onewire/utils/CRC8.java
+++ b/io.openems.edge.bridge.onewire/src/com/dalsemi/onewire/utils/CRC8.java
@@ -61,15 +61,16 @@ public class CRC8 {
 		int acc;
 		int crc;
 
-		for (int i = 0; i < 256; i++) {
+		for (var i = 0; i < 256; i++) {
 			acc = i;
 			crc = 0;
 
-			for (int j = 0; j < 8; j++) {
+			for (var j = 0; j < 8; j++) {
 				if (((acc ^ crc) & 0x01) == 0x01) {
-					crc = ((crc ^ 0x18) >> 1) | 0x80;
-				} else
+					crc = (crc ^ 0x18) >> 1 | 0x80;
+				} else {
 					crc = crc >> 1;
+				}
 
 				acc = acc >> 1;
 			}
@@ -102,7 +103,7 @@ private CRC8() {
 	 * @return CRC8 value
 	 */
 	public static int compute(int dataToCRC, int seed) {
-		return (dscrc_table[(seed ^ dataToCRC) & 0x0FF] & 0x0FF);
+		return dscrc_table[(seed ^ dataToCRC) & 0x0FF] & 0x0FF;
 	}
 
 	/**
@@ -114,7 +115,7 @@ public static int compute(int dataToCRC, int seed) {
 	 * @return CRC8 value
 	 */
 	public static int compute(int dataToCRC) {
-		return (dscrc_table[dataToCRC & 0x0FF] & 0x0FF);
+		return dscrc_table[dataToCRC & 0x0FF] & 0x0FF;
 	}
 
 	/**
@@ -157,12 +158,13 @@ public static int compute(byte dataToCrc[], int off, int len) {
 	public static int compute(byte dataToCrc[], int off, int len, int seed) {
 
 		// loop to do the crc on each data element
-		int CRC8 = seed;
+		var CRC8 = seed;
 
-		for (int i = 0; i < len; i++)
+		for (var i = 0; i < len; i++) {
 			CRC8 = dscrc_table[(CRC8 ^ dataToCrc[i + off]) & 0x0FF];
+		}
 
-		return (CRC8 & 0x0FF);
+		return CRC8 & 0x0FF;
 	}
 
 	/**
diff --git a/io.openems.edge.bridge.onewire/src/com/dalsemi/onewire/utils/Convert.java b/io.openems.edge.bridge.onewire/src/com/dalsemi/onewire/utils/Convert.java
index 26b590e1dd1..257853a7976 100644
--- a/io.openems.edge.bridge.onewire/src/com/dalsemi/onewire/utils/Convert.java
+++ b/io.openems.edge.bridge.onewire/src/com/dalsemi/onewire/utils/Convert.java
@@ -37,8 +37,8 @@
 @SuppressWarnings({ "serial" })
 public class Convert {
 	/** returns hex character for each digit, 0-15 */
-	private static final char[] lookup_hex = new char[] { '0', '1', '2', '3', '4', '5', '6', '7', '8', '9', 'A', 'B',
-			'C', 'D', 'E', 'F' };
+	private static final char[] lookup_hex = { '0', '1', '2', '3', '4', '5', '6', '7', '8', '9', 'A', 'B', 'C', 'D',
+			'E', 'F' };
 
 	/**
 	 * Inner class for conversion exceptions
@@ -50,7 +50,6 @@ public ConvertException(String message) {
 		}
 
 		public ConvertException() {
-			super();
 		}
 	}
 
@@ -58,7 +57,7 @@ public ConvertException() {
 	 * Not to be instantiated
 	 */
 	private Convert() {
-		;
+
 	}
 
 	// ----------------------------------------------------------------------
@@ -69,7 +68,7 @@ private Convert() {
 	// ??? potentially slower? If not, feel free to delete it.
 	// ???
 	/** cache the value of five divided by nine, which is irrational */
-	private static final double FIVE_NINTHS = (5.0d / 9.0d);
+	private static final double FIVE_NINTHS = 5.0d / 9.0d;
 
 	/**
 	 * Converts a temperature reading from Celsius to Fahrenheit.
@@ -108,14 +107,14 @@ public static final double toCelsius(double fahrenheitTemperature) {
 	 * @returns value constructed from bytes
 	 */
 	public static final long toLong(byte[] byteArray, int offset, int len) {
-		long val = 0;
+		var val = 0L;
 
 		len = Math.min(len, 8);
 
 		// Concatanate the byte array into one variable.
-		for (int i = (len - 1); i >= 0; i--) {
+		for (var i = len - 1; i >= 0; i--) {
 			val <<= 8;
-			val |= (byteArray[offset + i] & 0x00FF);
+			val |= byteArray[offset + i] & 0x00FF;
 		}
 
 		return val;
@@ -144,10 +143,10 @@ public static final long toLong(byte[] byteArray) {
 	 * @returns value constructed from bytes
 	 */
 	public static final void toByteArray(long longVal, byte[] byteArray, int offset, int len) {
-		int max = offset + len;
+		var max = offset + len;
 
 		// Concatanate the byte array into one variable.
-		for (int i = offset; i < max; i++) {
+		for (var i = offset; i < max; i++) {
 			byteArray[i] = (byte) longVal;
 			longVal >>>= 8;
 		}
@@ -172,7 +171,7 @@ public static final void toByteArray(long longVal, byte[] byteArray) {
 	 * @returns value constructed from bytes
 	 */
 	public static final byte[] toByteArray(long longVal) {
-		byte[] byteArray = new byte[8];
+		var byteArray = new byte[8];
 		toByteArray(longVal, byteArray, 0, 8);
 		return byteArray;
 	}
@@ -191,14 +190,14 @@ public static final byte[] toByteArray(long longVal) {
 	 * @returns value constructed from bytes
 	 */
 	public static final int toInt(byte[] byteArray, int offset, int len) {
-		int val = 0;
+		var val = 0;
 
 		len = Math.min(len, 4);
 
 		// Concatanate the byte array into one variable.
-		for (int i = (len - 1); i >= 0; i--) {
+		for (var i = len - 1; i >= 0; i--) {
 			val <<= 8;
-			val |= (byteArray[offset + i] & 0x00FF);
+			val |= byteArray[offset + i] & 0x00FF;
 		}
 
 		return val;
@@ -225,10 +224,10 @@ public static final int toInt(byte[] byteArray) {
 	 * @param len       number of bytes to get
 	 */
 	public static final void toByteArray(int intVal, byte[] byteArray, int offset, int len) {
-		int max = offset + len;
+		var max = offset + len;
 
 		// Concatanate the byte array into one variable.
-		for (int i = offset; i < max; i++) {
+		for (var i = offset; i < max; i++) {
 			byteArray[i] = (byte) intVal;
 			intVal >>>= 8;
 		}
@@ -253,7 +252,7 @@ public static final void toByteArray(int intVal, byte[] byteArray) {
 	 * @returns value constructed from bytes
 	 */
 	public static final byte[] toByteArray(int intVal) {
-		byte[] byteArray = new byte[4];
+		var byteArray = new byte[4];
 		toByteArray(intVal, byteArray, 0, 4);
 		return byteArray;
 	}
@@ -277,9 +276,9 @@ public static final byte[] toByteArray(int intVal) {
 	 * @return byte[] the decoded bytes
 	 */
 	public static final byte[] toByteArray(String strData) throws ConvertException {
-		byte[] bDataTmp = new byte[strData.length() * 2];
-		int len = toByteArray(strData, bDataTmp, 0, bDataTmp.length);
-		byte[] bData = new byte[len];
+		var bDataTmp = new byte[strData.length() * 2];
+		var len = toByteArray(strData, bDataTmp, 0, bDataTmp.length);
+		var bData = new byte[len];
 		System.arraycopy(bDataTmp, 0, bData, 0, len);
 		return bData;
 	}
@@ -322,8 +321,8 @@ public static final int toByteArray(String strData, byte[] bData) throws Convert
 	 */
 	public static final int toByteArray(String strData, byte[] bData, int offset, int length) throws ConvertException {
 		int strIndex = 0, strLength = strData.length();
-		int index = offset;
-		int end = length + offset;
+		var index = offset;
+		var end = length + offset;
 		char upper, lower;
 		int uVal, lVal;
 
@@ -347,17 +346,18 @@ else if (!Character.isWhitespace(upper)) {
 				upper = '0';
 			}
 			// passed the end of string with no characters
-			else
+			else {
 				continue;
+			}
 
 			uVal = Character.digit(upper, 16);
 			lVal = Character.digit(lower, 16);
-			if (uVal != -1 && lVal != -1) {
-				bData[index++] = (byte) (((uVal & 0x0F) << 4) | (lVal & 0x0F));
-			} else
-				throw new ConvertException(("Bad character in input string: " + upper) + lower);
+			if (uVal == -1 || lVal == -1) {
+				throw new ConvertException("Bad character in input string: " + upper + lower);
+			}
+			bData[index++] = (byte) ((uVal & 0x0F) << 4 | lVal & 0x0F);
 		}
-		return (index - offset);
+		return index - offset;
 	}
 
 	/**
@@ -407,15 +407,16 @@ public static final String toHexString(byte[] data, String delimiter) {
 	 * @return Hex-encoded String
 	 */
 	public static final String toHexString(byte[] data, int offset, int length, String delimiter) {
-		StringBuffer value = new StringBuffer(length * (2 + delimiter.length()));
-		int max = length + offset;
-		int lastDelim = max - 1;
-		for (int i = offset; i < max; i++) {
-			byte bits = data[i];
-			value.append(lookup_hex[(bits >> 4) & 0x0F]);
+		var value = new StringBuilder(length * (2 + delimiter.length()));
+		var max = length + offset;
+		var lastDelim = max - 1;
+		for (var i = offset; i < max; i++) {
+			var bits = data[i];
+			value.append(lookup_hex[bits >> 4 & 0x0F]);
 			value.append(lookup_hex[bits & 0x0F]);
-			if (i < lastDelim)
+			if (i < lastDelim) {
 				value.append(delimiter);
+			}
 		}
 		return value.toString();
 	}
@@ -429,9 +430,9 @@ public static final String toHexString(byte[] data, int offset, int length, Stri
 	 * @return String Hex-encoded String
 	 */
 	public static final String toHexString(byte bValue) {
-		char[] hexValue = new char[2];
+		var hexValue = new char[2];
 		hexValue[1] = lookup_hex[bValue & 0x0F];
-		hexValue[0] = lookup_hex[(bValue >> 4) & 0x0F];
+		hexValue[0] = lookup_hex[bValue >> 4 & 0x0F];
 		return new String(hexValue);
 	}
 
@@ -482,15 +483,16 @@ public static final String toHexString(char[] data, String delimiter) {
 	 * @return Hex-encoded String
 	 */
 	public static final String toHexString(char[] data, int offset, int length, String delimiter) {
-		StringBuffer value = new StringBuffer(length * (2 + delimiter.length()));
-		int max = length + offset;
-		int lastDelim = max - 1;
-		for (int i = offset; i < max; i++) {
-			char bits = data[i];
-			value.append(lookup_hex[(bits >> 4) & 0x0F]);
+		var value = new StringBuilder(length * (2 + delimiter.length()));
+		var max = length + offset;
+		var lastDelim = max - 1;
+		for (var i = offset; i < max; i++) {
+			var bits = data[i];
+			value.append(lookup_hex[bits >> 4 & 0x0F]);
 			value.append(lookup_hex[bits & 0x0F]);
-			if (i < lastDelim)
+			if (i < lastDelim) {
 				value.append(delimiter);
+			}
 		}
 		return value.toString();
 	}
@@ -504,9 +506,9 @@ public static final String toHexString(char[] data, int offset, int length, Stri
 	 * @return String Hex-encoded String
 	 */
 	public static final String toHexString(char bValue) {
-		char[] hexValue = new char[2];
+		var hexValue = new char[2];
 		hexValue[1] = lookup_hex[bValue & 0x0F];
-		hexValue[0] = lookup_hex[(bValue >> 4) & 0x0F];
+		hexValue[0] = lookup_hex[bValue >> 4 & 0x0F];
 		return new String(hexValue);
 	}
 
@@ -601,36 +603,40 @@ public static final String toHexString(int iValue) {
 	 */
 	public static final String toString(double dubbel, int nFrac) {
 		// check for special case
-		if (dubbel == d_POSITIVE_INFINITY)
+		if (dubbel == d_POSITIVE_INFINITY) {
 			return "Infinity";
-		else if (dubbel == d_NEGATIVE_INFINITY)
+		}
+		if (dubbel == d_NEGATIVE_INFINITY) {
 			return "-Infinity";
-		else if (dubbel != dubbel)
+		} else if (dubbel != dubbel) {
 			return "NaN";
+		}
 
 		// check for fast out (no fractional digits)
-		if (nFrac <= 0)
+		if (nFrac <= 0) {
 			// round the whole portion
 			return Long.toString((long) (dubbel + 0.5d));
+		}
 
 		// extract the non-fractional portion
-		long dWhole = (long) dubbel;
+		var dWhole = (long) dubbel;
 
 		// figure out if it's positive or negative. We need to remove
 		// the sign from the fractional part
-		double sign = (dWhole < 0) ? -1d : 1d;
+		var sign = dWhole < 0 ? -1d : 1d;
 
 		// figure out how many places to shift fractional portion
-		double shifter = 1;
-		for (int i = 0; i < nFrac; i++)
+		var shifter = 1D;
+		for (var i = 0; i < nFrac; i++) {
 			shifter *= 10;
+		}
 
 		// extract, unsign, shift, and round the fractional portion
-		long dFrac = (long) ((dubbel - dWhole) * sign * shifter + 0.5d);
+		var dFrac = (long) ((dubbel - dWhole) * sign * shifter + 0.5d);
 
 		// convert the fractional portion to a string
-		String fracString = Long.toString(dFrac);
-		int fracLength = fracString.length();
+		var fracString = Long.toString(dFrac);
+		var fracLength = fracString.length();
 
 		// ensure that rounding the fraction didn't carry into the whole portion
 		if (fracLength > nFrac) {
@@ -639,11 +645,11 @@ else if (dubbel != dubbel)
 		}
 
 		// convert the whole portion to a string
-		String wholeString = Long.toString(dWhole);
-		int wholeLength = wholeString.length();
+		var wholeString = Long.toString(dWhole);
+		var wholeLength = wholeString.length();
 
 		// create the string buffer
-		char[] dubbelChars = new char[wholeLength + 1 + nFrac];
+		var dubbelChars = new char[wholeLength + 1 + nFrac];
 
 		// append the non-fractional portion
 		wholeString.getChars(0, wholeLength, dubbelChars, 0);
@@ -652,14 +658,16 @@ else if (dubbel != dubbel)
 		dubbelChars[wholeLength] = '.';
 
 		// append any necessary leading zeroes
-		int i = wholeLength + 1;
-		int max = i + nFrac - fracLength;
-		for (; i < max; i++)
+		var i = wholeLength + 1;
+		var max = i + nFrac - fracLength;
+		for (; i < max; i++) {
 			dubbelChars[i] = '0';
+		}
 
 		// append the fractional portion
-		if (fracLength > 0)
+		if (fracLength > 0) {
 			fracString.getChars(0, fracLength, dubbelChars, max);
+		}
 
 		return new String(dubbelChars, 0, dubbelChars.length);
 	}
@@ -691,36 +699,40 @@ else if (dubbel != dubbel)
 	 */
 	public static final String toString(float flote, int nFrac) {
 		// check for special case
-		if (flote == f_POSITIVE_INFINITY)
+		if (flote == f_POSITIVE_INFINITY) {
 			return "Infinity";
-		else if (flote == f_NEGATIVE_INFINITY)
+		}
+		if (flote == f_NEGATIVE_INFINITY) {
 			return "-Infinity";
-		else if (flote != flote)
+		} else if (flote != flote) {
 			return "NaN";
+		}
 
 		// check for fast out (no fractional digits)
-		if (nFrac <= 0)
+		if (nFrac <= 0) {
 			// round the whole portion
 			return Long.toString((long) (flote + 0.5f));
+		}
 
 		// extract the non-fractional portion
-		long fWhole = (long) flote;
+		var fWhole = (long) flote;
 
 		// figure out if it's positive or negative. We need to remove
 		// the sign from the fractional part
-		float sign = (fWhole < 0) ? -1f : 1f;
+		var sign = fWhole < 0 ? -1f : 1f;
 
 		// figure out how many places to shift fractional portion
-		float shifter = 1;
-		for (int i = 0; i < nFrac; i++)
+		var shifter = 1F;
+		for (var i = 0; i < nFrac; i++) {
 			shifter *= 10;
+		}
 
 		// extract, shift, and round the fractional portion
-		long fFrac = (long) ((flote - fWhole) * sign * shifter + 0.5f);
+		var fFrac = (long) ((flote - fWhole) * sign * shifter + 0.5f);
 
 		// convert the fractional portion to a string
-		String fracString = Long.toString(fFrac);
-		int fracLength = fracString.length();
+		var fracString = Long.toString(fFrac);
+		var fracLength = fracString.length();
 
 		// ensure that rounding the fraction didn't carry into the whole portion
 		if (fracLength > nFrac) {
@@ -729,11 +741,11 @@ else if (flote != flote)
 		}
 
 		// convert the whole portion to a string
-		String wholeString = String.valueOf(fWhole);
-		int wholeLength = wholeString.length();
+		var wholeString = String.valueOf(fWhole);
+		var wholeLength = wholeString.length();
 
 		// create the string buffer
-		char[] floteChars = new char[wholeLength + 1 + nFrac];
+		var floteChars = new char[wholeLength + 1 + nFrac];
 
 		// append the non-fractional portion
 		wholeString.getChars(0, wholeLength, floteChars, 0);
@@ -742,14 +754,16 @@ else if (flote != flote)
 		floteChars[wholeLength] = '.';
 
 		// append any necessary leading zeroes
-		int i = wholeLength + 1;
-		int max = i + nFrac - fracLength;
-		for (; i < max; i++)
+		var i = wholeLength + 1;
+		var max = i + nFrac - fracLength;
+		for (; i < max; i++) {
 			floteChars[i] = '0';
+		}
 
 		// append the fractional portion
-		if (fracLength > 0)
+		if (fracLength > 0) {
 			fracString.getChars(0, fracLength, floteChars, max);
+		}
 
 		return new String(floteChars, 0, floteChars.length);
 	}
diff --git a/io.openems.edge.bridge.onewire/src/com/dalsemi/onewire/utils/IOHelper.java b/io.openems.edge.bridge.onewire/src/com/dalsemi/onewire/utils/IOHelper.java
index f53a3efdeed..af6e49b0b24 100644
--- a/io.openems.edge.bridge.onewire/src/com/dalsemi/onewire/utils/IOHelper.java
+++ b/io.openems.edge.bridge.onewire/src/com/dalsemi/onewire/utils/IOHelper.java
@@ -41,14 +41,14 @@
  * from any stream as well as the destination for written bytes. All routines
  * are static and final and handle all exceptional cases by returning a default
  * value.
- * 
+ *
  * @version 0.02, 2 June 2001
  * @author SH
  */
 public final class IOHelper {
 	/** Do not instantiate this class */
 	private IOHelper() {
-		;
+
 	}
 
 	/*----------------------------------------------------------------*/
@@ -79,34 +79,37 @@ public static final synchronized String readLine() {
 	}
 
 	public static final synchronized byte[] readBytes(int count, int pad, boolean hex) {
-		if (hex)
+		if (hex) {
 			return readBytesHex(count, pad);
-		else
-			return readBytesAsc(count, pad);
+		}
+		return readBytesAsc(count, pad);
 	}
 
 	public static final synchronized byte[] readBytesHex(int count, int pad) {
 		try {
-			String s = br.readLine();
-			int len = s.length() > count ? count : s.length();
+			var s = br.readLine();
+			var len = s.length() > count ? count : s.length();
 			byte[] ret;
 
-			if (count > 0)
+			if (count > 0) {
 				ret = new byte[count];
-			else
+			} else {
 				ret = new byte[s.length()];
+			}
 
-			byte[] temp = parseHex(s, 0);
+			var temp = parseHex(s, 0);
 
-			if (count == 0)
+			if (count == 0) {
 				return temp;
+			}
 
 			len = temp.length;
 
 			System.arraycopy(temp, 0, ret, 0, len);
 
-			for (; len < count; len++)
+			for (; len < count; len++) {
 				ret[len] = (byte) pad;
+			}
 
 			return ret;
 		} catch (Exception e) {
@@ -116,14 +119,15 @@ public static final synchronized byte[] readBytesHex(int count, int pad) {
 
 	public static final synchronized byte[] readBytesAsc(int count, int pad) {
 		try {
-			String s = br.readLine();
-			int len = s.length() > count ? count : s.length();
+			var s = br.readLine();
+			var len = s.length() > count ? count : s.length();
 			byte[] ret;
 
-			if (count > 0)
+			if (count > 0) {
 				ret = new byte[count];
-			else
+			} else {
 				ret = new byte[s.length()];
+			}
 
 			if (count == 0) {
 				System.arraycopy(s.getBytes(), 0, ret, 0, s.length());
@@ -133,8 +137,9 @@ public static final synchronized byte[] readBytesAsc(int count, int pad) {
 
 			System.arraycopy(s.getBytes(), 0, ret, 0, len);
 
-			for (; len < count; len++)
+			for (; len < count; len++) {
 				ret[len] = (byte) pad;
+			}
 
 			return ret;
 		} catch (IOException e) {
@@ -144,32 +149,37 @@ public static final synchronized byte[] readBytesAsc(int count, int pad) {
 
 	private static final byte[] parseHex(String s, int size) {
 		byte[] temp;
-		int index = 0;
-		char[] x = s.toLowerCase().toCharArray();
+		var index = 0;
+		var x = s.toLowerCase().toCharArray();
 
-		if (size > 0)
+		if (size > 0) {
 			temp = new byte[size];
-		else
+		} else {
 			temp = new byte[x.length];
+		}
 
 		try {
-			for (int i = 0; i < x.length && index < temp.length; index++) {
-				int digit = -1;
+			for (var i = 0; i < x.length && index < temp.length; index++) {
+				var digit = -1;
 
-				while (i < x.length && digit == -1)
+				while (i < x.length && digit == -1) {
 					digit = Character.digit(x[i++], 16);
-				if (digit != -1)
-					temp[index] = (byte) ((digit << 4) & 0xF0);
+				}
+				if (digit != -1) {
+					temp[index] = (byte) (digit << 4 & 0xF0);
+				}
 
 				digit = -1;
 
-				while (i < x.length && digit == -1)
+				while (i < x.length && digit == -1) {
 					digit = Character.digit(x[i++], 16);
-				if (digit != -1)
+				}
+				if (digit != -1) {
 					temp[index] |= (byte) (digit & 0x0F);
+				}
 			}
 		} catch (Exception e) {
-			;
+
 		}
 
 		byte[] t;
@@ -177,8 +187,9 @@ private static final byte[] parseHex(String s, int size) {
 		if (size == 0 && temp.length != index) {
 			t = new byte[index];
 			System.arraycopy(temp, 0, t, 0, t.length);
-		} else
+		} else {
 			t = temp;
+		}
 
 		return t;
 	}
@@ -217,10 +228,11 @@ public static final synchronized void setWriter(Writer w) {
 	}
 
 	public static final synchronized void writeBytesHex(String delim, byte[] b, int offset, int cnt) {
-		int i = offset;
-		for (; i < (offset + cnt);) {
-			if (i != offset && ((i - offset) & 15) == 0)
+		var i = offset;
+		for (; i < offset + cnt;) {
+			if (i != offset && (i - offset & 15) == 0) {
 				pw.println();
+			}
 			pw.print(byteStr(b[i++]));
 			pw.print(delim);
 		}
@@ -242,7 +254,7 @@ public static final synchronized void writeBytesHex(byte[] b) {
 	 * 16 bytes of data in hex followed by three spaces and the ascii representation
 	 * of those bytes. To write out just the Hex representation, use
 	 * <code>writeBytesHex(byte[],int,int)</code>.
-	 * 
+	 *
 	 * @param b      the byte array to print out.
 	 * @param offset the starting location to begin printing
 	 * @param cnt    the number of bytes to print.
@@ -250,23 +262,25 @@ public static final synchronized void writeBytesHex(byte[] b) {
 	public static final synchronized void writeBytes(String delim, byte[] b, int offset, int cnt) {
 		int last, i;
 		last = i = offset;
-		for (; i < (offset + cnt);) {
-			if (i != offset && ((i - offset) & 15) == 0) {
+		for (; i < offset + cnt;) {
+			if (i != offset && (i - offset & 15) == 0) {
 				pw.print("  ");
-				for (; last < i; last++)
+				for (; last < i; last++) {
 					pw.print((char) b[last]);
+				}
 				pw.println();
 			}
 			pw.print(byteStr(b[i++]));
 			pw.print(delim);
 		}
-		for (int k = i; ((k - offset) & 15) != 0; k++) {
+		for (var k = i; (k - offset & 15) != 0; k++) {
 			pw.print("  ");
 			pw.print(delim);
 		}
 		pw.print("  ");
-		for (; last < i; last++)
+		for (; last < i; last++) {
 			pw.print((char) b[last]);
+		}
 		pw.println();
 		pw.flush();
 	}
@@ -277,7 +291,7 @@ public static final synchronized void writeBytes(String delim, byte[] b, int off
 	 * 16 bytes of data in hex followed by three spaces and the ascii representation
 	 * of those bytes. To write out just the Hex representation, use
 	 * <code>writeBytesHex(byte[],int,int)</code>.
-	 * 
+	 *
 	 * @param b the byte array to print out.
 	 */
 	public static final synchronized void writeBytes(byte[] b) {
@@ -356,7 +370,7 @@ public static final synchronized void writeLineHex(long l) {
 	private static final char[] hex = "0123456789ABCDEF".toCharArray();
 
 	private static final String byteStr(byte b) {
-		return "" + hex[((b >> 4) & 0x0F)] + hex[(b & 0x0F)];
+		return "" + hex[b >> 4 & 0x0F] + hex[b & 0x0F];
 	}
 
 }
diff --git a/io.openems.edge.bridge.onewire/src/com/dalsemi/onewire/utils/OWPath.java b/io.openems.edge.bridge.onewire/src/com/dalsemi/onewire/utils/OWPath.java
index 5a16178ede3..d07553ee81f 100644
--- a/io.openems.edge.bridge.onewire/src/com/dalsemi/onewire/utils/OWPath.java
+++ b/io.openems.edge.bridge.onewire/src/com/dalsemi/onewire/utils/OWPath.java
@@ -50,7 +50,7 @@
  * <DD>
  * <H4>Example</H4> Open the path 'path' to the 1-Wire temperature device 'tc'
  * and read the temperature:
- * 
+ *
  * <PRE>
  *  <CODE>
  *  // open a path to the temp device
@@ -86,10 +86,10 @@ public class OWPath {
 	// --------
 
 	/** Elements of the path in a Vector */
-	private Vector<OWPathElement> elements;
+	private final Vector<OWPathElement> elements;
 
 	/** Adapter where this path is based */
-	private DSPortAdapter adapter;
+	private final DSPortAdapter adapter;
 
 	// --------
 	// -------- Constructor
@@ -106,7 +106,7 @@ public class OWPath {
 	 */
 	public OWPath(DSPortAdapter adapter) {
 		this.adapter = adapter;
-		elements = new Vector<>(2, 1);
+		this.elements = new Vector<>(2, 1);
 	}
 
 	/**
@@ -120,9 +120,9 @@ public OWPath(DSPortAdapter adapter) {
 	 */
 	public OWPath(DSPortAdapter adapter, OWPath currentOWPath) {
 		this.adapter = adapter;
-		elements = new Vector<>(2, 1);
+		this.elements = new Vector<>(2, 1);
 
-		copy(currentOWPath);
+		this.copy(currentOWPath);
 	}
 
 	/**
@@ -131,16 +131,16 @@ public OWPath(DSPortAdapter adapter, OWPath currentOWPath) {
 	 * @param currentOWPath path to copy from
 	 */
 	public void copy(OWPath currentOWPath) {
-		elements.removeAllElements();
+		this.elements.removeAllElements();
 
 		if (currentOWPath != null) {
 
 			// enumerature through elements in current path
-			for (Enumeration<OWPathElement> path_enum = currentOWPath.getAllOWPathElements(); path_enum
+			for (var path_enum = currentOWPath.getAllOWPathElements(); path_enum
 					.hasMoreElements();) {
 
 				// cast the enum as a OWPathElements and add to vector
-				elements.addElement((OWPathElement) path_enum.nextElement());
+				this.elements.addElement(path_enum.nextElement());
 			}
 		}
 	}
@@ -154,7 +154,7 @@ public void copy(OWPath currentOWPath) {
 	 * @see #copy(OWPath) copy
 	 */
 	public void add(OneWireContainer owc, int channel) {
-		elements.addElement(new OWPathElement(owc, channel));
+		this.elements.addElement(new OWPathElement(owc, channel));
 	}
 
 	/**
@@ -165,7 +165,7 @@ public void add(OneWireContainer owc, int channel) {
 	 * @return <CODE> true </CODE> if the 1-Wire paths are the same
 	 */
 	public boolean equals(OWPath compareOWPath) {
-		return (this.toString().equals(compareOWPath.toString()));
+		return this.toString().equals(compareOWPath.toString());
 	}
 
 	/**
@@ -176,7 +176,7 @@ public boolean equals(OWPath compareOWPath) {
 	 * @see com.dalsemi.onewire.utils.OWPathElement
 	 */
 	public Enumeration<OWPathElement> getAllOWPathElements() {
-		return elements.elements();
+		return this.elements.elements();
 	}
 
 	/**
@@ -184,20 +184,21 @@ public Enumeration<OWPathElement> getAllOWPathElements() {
 	 *
 	 * @return string 1-Wire path as string
 	 */
+	@Override
 	public String toString() {
-		String st = new String("");
+		var st = "";
 		OWPathElement element;
 		OneWireContainer owc;
 
 		// append 'drive'
 		try {
-			st = adapter.getAdapterName() + "_" + adapter.getPortName() + "/";
+			st = this.adapter.getAdapterName() + "_" + this.adapter.getPortName() + "/";
 		} catch (OneWireException e) {
-			st = adapter.getAdapterName() + "/";
+			st = this.adapter.getAdapterName() + "/";
 		}
 
-		for (int i = 0; i < elements.size(); i++) {
-			element = (OWPathElement) elements.elementAt(i);
+		for (var i = 0; i < this.elements.size(); i++) {
+			element = this.elements.elementAt(i);
 			owc = element.getContainer();
 
 			// append 'directory' name
@@ -225,10 +226,10 @@ public void open() throws OneWireException, OneWireIOException {
 		byte[] sw_state;
 
 		// enumerature through elements in path
-		for (int i = 0; i < elements.size(); i++) {
+		for (var i = 0; i < this.elements.size(); i++) {
 
 			// cast the enum as a OWPathElement
-			path_element = (OWPathElement) elements.elementAt(i);
+			path_element = this.elements.elementAt(i);
 
 			// get the switch
 			sw = (SwitchContainer) path_element.getContainer();
@@ -241,8 +242,8 @@ public void open() throws OneWireException, OneWireIOException {
 		}
 
 		// check if not depth in path, do a reset so a resetless search will work
-		if (elements.size() == 0) {
-			adapter.reset();
+		if (this.elements.size() == 0) {
+			this.adapter.reset();
 		}
 	}
 
@@ -264,10 +265,10 @@ public void close() throws OneWireException, OneWireIOException {
 		byte[] sw_state;
 
 		// loop through elements in path in reverse order
-		for (int i = elements.size() - 1; i >= 0; i--) {
+		for (var i = this.elements.size() - 1; i >= 0; i--) {
 
 			// cast the element as a OWPathElement
-			path_element = (OWPathElement) elements.elementAt(i);
+			path_element = this.elements.elementAt(i);
 
 			// get the switch
 			sw = (SwitchContainer) path_element.getContainer();
diff --git a/io.openems.edge.bridge.onewire/src/com/dalsemi/onewire/utils/OWPathElement.java b/io.openems.edge.bridge.onewire/src/com/dalsemi/onewire/utils/OWPathElement.java
index 498bd1e4c97..2ee3e793064 100644
--- a/io.openems.edge.bridge.onewire/src/com/dalsemi/onewire/utils/OWPathElement.java
+++ b/io.openems.edge.bridge.onewire/src/com/dalsemi/onewire/utils/OWPathElement.java
@@ -30,89 +30,88 @@
 
 import com.dalsemi.onewire.container.OneWireContainer;
 
-
 /**
- * 1-Wire&reg; Network path element.  Instances of this class are
- * used to represent a single branch of a complex 1-Wire network.
+ * 1-Wire&reg; Network path element. Instances of this class are used to
+ * represent a single branch of a complex 1-Wire network.
+ *
+ * <H3>Usage</H3>
  *
- * <H3> Usage </H3> 
- * 
- * <DL> 
- * <DD> <H4> Example</H4> 
- * Enumerate through the 1-wire path elements in the 1-Wire path 'path' and print information:
- * <PRE> <CODE>
+ * <DL>
+ * <DD>
+ * <H4>Example</H4> Enumerate through the 1-wire path elements in the 1-Wire
+ * path 'path' and print information:
+ *
+ * <PRE>
+ *  <CODE>
  *   OWPathElement path_element;
  *
  *   // enumerature through the path elements
- *   for (Enumeration path_enum = path.getAllOWPathElements(); 
+ *   for (Enumeration path_enum = path.getAllOWPathElements();
  *           path_enum.hasMoreElements(); )
  *   {
  *
  *      // cast the enum as a OWPathElement
  *      path_element = (OWPathElement)path_enum.nextElement();
- *   
+ *
  *      // print info
  *      System.out.println("Address: " + path_element.getContainer().getAddressAsString());
- *      System.out.println("Channel number: " + path_element.getChannel()); 
+ *      System.out.println("Channel number: " + path_element.getChannel());
  *   }
- * </CODE> </PRE>
+ * </CODE>
+ * </PRE>
  * </DL>
  *
  * @see com.dalsemi.onewire.utils.OWPath
  * @see com.dalsemi.onewire.container.OneWireContainer
  *
- * @version    0.00, 18 September 2000
- * @author     DS
+ * @version 0.00, 18 September 2000
+ * @author DS
  */
-public class OWPathElement
-{
+public class OWPathElement {
 
-   //--------
-   //-------- Variables 
-   //--------
+	// --------
+	// -------- Variables
+	// --------
 
-   /** OneWireContainer of the path element */
-   private OneWireContainer owc;
+	/** OneWireContainer of the path element */
+	private final OneWireContainer owc;
 
-   /** Channel the path is on */
-   private int channel;
+	/** Channel the path is on */
+	private final int channel;
 
-   //--------
-   //-------- Constructors
-   //--------
+	// --------
+	// -------- Constructors
+	// --------
 
-   /**
-    * Create a new 1-Wire path element.
-    *
-    * @param  owcInstance device that is the path element. Must implement
-    *         SwitchContainer.
-    * @param  channelNumber channel number of the 1-Wire path 
-    */
-   public OWPathElement (OneWireContainer owcInstance, int channelNumber)
-   {
-      owc     = owcInstance;
-      channel = channelNumber;
-   }
+	/**
+	 * Create a new 1-Wire path element.
+	 *
+	 * @param owcInstance   device that is the path element. Must implement
+	 *                      SwitchContainer.
+	 * @param channelNumber channel number of the 1-Wire path
+	 */
+	public OWPathElement(OneWireContainer owcInstance, int channelNumber) {
+		this.owc = owcInstance;
+		this.channel = channelNumber;
+	}
 
-   /**
-    * Get the 1-Wire container for this 1-Wire path element.
-    *
-    * @return OneWireContainer of this 1-Wire path element
-    *
-    * @see com.dalsemi.onewire.container.OneWireContainer
-    */
-   public OneWireContainer getContainer ()
-   {
-      return owc;
-   }
+	/**
+	 * Get the 1-Wire container for this 1-Wire path element.
+	 *
+	 * @return OneWireContainer of this 1-Wire path element
+	 *
+	 * @see com.dalsemi.onewire.container.OneWireContainer
+	 */
+	public OneWireContainer getContainer() {
+		return this.owc;
+	}
 
-   /**
-    * Get the channel number of this 1-Wire path element.
-    *
-    * @return channel number of this element
-    */
-   public int getChannel ()
-   {
-      return channel;
-   }
+	/**
+	 * Get the channel number of this 1-Wire path element.
+	 *
+	 * @return channel number of this element
+	 */
+	public int getChannel() {
+		return this.channel;
+	}
 }
diff --git a/io.openems.edge.bridge.onewire/src/com/dalsemi/onewire/utils/SHA.java b/io.openems.edge.bridge.onewire/src/com/dalsemi/onewire/utils/SHA.java
index 4a0ceb5c1dc..33335335b3a 100644
--- a/io.openems.edge.bridge.onewire/src/com/dalsemi/onewire/utils/SHA.java
+++ b/io.openems.edge.bridge.onewire/src/com/dalsemi/onewire/utils/SHA.java
@@ -32,7 +32,7 @@
 public class SHA {
 
 	// SHA constants
-	private static final int[] KTN = new int[] { 0x5a827999, 0x6ed9eba1, 0x8f1bbcdc, 0xca62c1d6 };
+	private static final int[] KTN = { 0x5a827999, 0x6ed9eba1, 0x8f1bbcdc, 0xca62c1d6 };
 
 	private static final int H0 = 0x67452301;
 	private static final int H1 = 0xEFCDAB89;
@@ -44,7 +44,7 @@ public class SHA {
 	// can't 'static final' methods with no locals be
 	// inlined easier? I think so, but I need to remember
 	// to look into that.
-	private static int word, i, j;
+	private static int i, j;
 	private static int ShftTmp, Temp;
 
 	private static final int[] MTword;
@@ -72,12 +72,12 @@ public synchronized static final byte[] ComputeSHA(byte[] MT, byte[] result, int
 
 		// split up the result into a byte array, LSB first
 		for (i = 0; i < 5; i++) {
-			word = H[4 - i];
+			var word = H[4 - i];
 			j = (i << 2) + offset;
-			result[j + 0] = (byte) ((word) & 0x00FF);
-			result[j + 1] = (byte) ((word >>> 8) & 0x00FF);
-			result[j + 2] = (byte) ((word >>> 16) & 0x00FF);
-			result[j + 3] = (byte) ((word >>> 24) & 0x00FF);
+			result[j + 0] = (byte) (word & 0x00FF);
+			result[j + 1] = (byte) (word >>> 8 & 0x00FF);
+			result[j + 2] = (byte) (word >>> 16 & 0x00FF);
+			result[j + 3] = (byte) (word >>> 24 & 0x00FF);
 		}
 
 		return result;
@@ -91,13 +91,14 @@ public synchronized static final byte[] ComputeSHA(byte[] MT, byte[] result, int
 	 * @param ABCDE The result will be copied into this 5-int array.
 	 */
 	public synchronized static final void ComputeSHA(byte[] MT, int[] ABCDE) {
-		for (i = 0; i < 16; i++)
-			MTword[i] = ((MT[i * 4] & 0x00FF) << 24) | ((MT[i * 4 + 1] & 0x00FF) << 16)
-					| ((MT[i * 4 + 2] & 0x00FF) << 8) | (MT[i * 4 + 3] & 0x00FF);
+		for (i = 0; i < 16; i++) {
+			MTword[i] = (MT[i * 4] & 0x00FF) << 24 | (MT[i * 4 + 1] & 0x00FF) << 16 | (MT[i * 4 + 2] & 0x00FF) << 8
+					| MT[i * 4 + 3] & 0x00FF;
+		}
 
 		for (i = 16; i < 80; i++) {
 			ShftTmp = MTword[i - 3] ^ MTword[i - 8] ^ MTword[i - 14] ^ MTword[i - 16];
-			MTword[i] = ((ShftTmp << 1) & 0xFFFFFFFE) | ((ShftTmp >>> 31) & 0x00000001);
+			MTword[i] = ShftTmp << 1 & 0xFFFFFFFE | ShftTmp >>> 31 & 0x00000001;
 		}
 
 		ABCDE[0] = H0; // A
@@ -107,11 +108,11 @@ public synchronized static final void ComputeSHA(byte[] MT, int[] ABCDE) {
 		ABCDE[4] = H4; // E
 
 		for (i = 0; i < 80; i++) {
-			ShftTmp = ((ABCDE[0] << 5) & 0xFFFFFFE0) | ((ABCDE[0] >>> 27) & 0x0000001F);
+			ShftTmp = ABCDE[0] << 5 & 0xFFFFFFE0 | ABCDE[0] >>> 27 & 0x0000001F;
 			Temp = NLF(ABCDE[1], ABCDE[2], ABCDE[3], i) + ABCDE[4] + KTN[i / 20] + MTword[i] + ShftTmp;
 			ABCDE[4] = ABCDE[3];
 			ABCDE[3] = ABCDE[2];
-			ABCDE[2] = ((ABCDE[1] << 30) & 0xC0000000) | ((ABCDE[1] >>> 2) & 0x3FFFFFFF);
+			ABCDE[2] = ABCDE[1] << 30 & 0xC0000000 | ABCDE[1] >>> 2 & 0x3FFFFFFF;
 			ABCDE[1] = ABCDE[0];
 			ABCDE[0] = Temp;
 		}
@@ -121,13 +122,15 @@ public synchronized static final void ComputeSHA(byte[] MT, int[] ABCDE) {
 	// static final methods with no locals should definitely be inlined
 	// by the compiler.
 	private static final int NLF(int B, int C, int D, int n) {
-		if (n < 20)
-			return ((B & C) | ((~B) & D));
-		else if (n < 40)
-			return (B ^ C ^ D);
-		else if (n < 60)
-			return ((B & C) | (B & D) | (C & D));
-		else
-			return (B ^ C ^ D);
+		if (n < 20) {
+			return B & C | ~B & D;
+		}
+		if (n < 40) {
+			return B ^ C ^ D;
+		} else if (n < 60) {
+			return (B & (C | D)) | C & D;
+		} else {
+			return B ^ C ^ D;
+		}
 	}
 }
diff --git a/io.openems.edge.bridge.onewire/src/io/openems/edge/bridge/onewire/BridgeOnewire.java b/io.openems.edge.bridge.onewire/src/io/openems/edge/bridge/onewire/BridgeOnewire.java
index e905a2657a6..596903e6362 100644
--- a/io.openems.edge.bridge.onewire/src/io/openems/edge/bridge/onewire/BridgeOnewire.java
+++ b/io.openems.edge.bridge.onewire/src/io/openems/edge/bridge/onewire/BridgeOnewire.java
@@ -32,7 +32,7 @@ public Doc doc() {
 
 	/**
 	 * Gets the Channel for {@link ChannelId#UNABLE_TO_SELECT_PORT_FAULT}.
-	 * 
+	 *
 	 * @return the Channel
 	 */
 	public default StateChannel getUnableToSelectPortFaultChannel() {
@@ -42,7 +42,7 @@ public default StateChannel getUnableToSelectPortFaultChannel() {
 	/**
 	 * Gets the Unable-To-Select-Port Fault State. See
 	 * {@link ChannelId#UNABLE_TO_SELECT_PORT_FAULT}.
-	 * 
+	 *
 	 * @return the Channel {@link Value}
 	 */
 	public default Value<Boolean> getUnableToSelectPortFault() {
@@ -52,7 +52,7 @@ public default Value<Boolean> getUnableToSelectPortFault() {
 	/**
 	 * Internal method to set the 'nextValue' on
 	 * {@link ChannelId#UNABLE_TO_SELECT_PORT_FAULT} Channel.
-	 * 
+	 *
 	 * @param value the next value
 	 */
 	public default void _setUnableToSelectPortFault(boolean value) {
@@ -61,17 +61,17 @@ public default void _setUnableToSelectPortFault(boolean value) {
 
 	/**
 	 * Add a Task.
-	 * 
+	 *
 	 * <p>
 	 * Tasks are executed sequentially in a separate thread.
-	 * 
+	 *
 	 * @param task the task
 	 */
 	public void addTask(Consumer<DSPortAdapter> task);
 
 	/**
 	 * Removes a Task.
-	 * 
+	 *
 	 * @param task the task
 	 */
 	public void removeTask(Consumer<DSPortAdapter> task);
diff --git a/io.openems.edge.bridge.onewire/src/io/openems/edge/bridge/onewire/impl/BridgeOnewireImpl.java b/io.openems.edge.bridge.onewire/src/io/openems/edge/bridge/onewire/impl/BridgeOnewireImpl.java
index 450a8d374e4..a5dcd44434e 100644
--- a/io.openems.edge.bridge.onewire/src/io/openems/edge/bridge/onewire/impl/BridgeOnewireImpl.java
+++ b/io.openems.edge.bridge.onewire/src/io/openems/edge/bridge/onewire/impl/BridgeOnewireImpl.java
@@ -53,6 +53,7 @@ void activate(ComponentContext context, Config config) {
 		}
 	}
 
+	@Override
 	@Deactivate
 	protected void deactivate() {
 		if (this.taskWorker != null) {
diff --git a/io.openems.edge.bridge.onewire/src/io/openems/edge/bridge/onewire/impl/OneWireTaskWorker.java b/io.openems.edge.bridge.onewire/src/io/openems/edge/bridge/onewire/impl/OneWireTaskWorker.java
index c744552bd2e..c9d24f4e0b0 100644
--- a/io.openems.edge.bridge.onewire/src/io/openems/edge/bridge/onewire/impl/OneWireTaskWorker.java
+++ b/io.openems.edge.bridge.onewire/src/io/openems/edge/bridge/onewire/impl/OneWireTaskWorker.java
@@ -47,7 +47,7 @@ protected synchronized void forever() throws InterruptedException {
 
 	/**
 	 * Gets the DSPortAdapter and opens the port.
-	 * 
+	 *
 	 * @return the DSPortAdapter
 	 * @throws OpenemsException on error
 	 */
@@ -55,17 +55,16 @@ private synchronized DSPortAdapter getAdapter() throws OpenemsException {
 		if (this._adapter != null) {
 			return this._adapter;
 		}
-		PDKAdapterUSB adapter = new PDKAdapterUSB();
+		var adapter = new PDKAdapterUSB();
 		try {
 			if (adapter.selectPort(this.port)) {
 				this.parent._setUnableToSelectPortFault(false);
 				this._adapter = adapter;
 				return this._adapter;
 
-			} else {
-				this.parent._setUnableToSelectPortFault(true);
-				throw new OpenemsException("Unable to select port [" + this.port + "]");
 			}
+			this.parent._setUnableToSelectPortFault(true);
+			throw new OpenemsException("Unable to select port [" + this.port + "]");
 		} catch (IllegalArgumentException | OneWireException e) {
 			this.parent._setUnableToSelectPortFault(true);
 			throw new OpenemsException("Unable to select port [" + this.port + "]: " + e.getMessage());
@@ -93,9 +92,9 @@ public void removeTask(Consumer<DSPortAdapter> task) {
 	}
 
 	public synchronized GetDeviceResponse handleGetDevicesRequest(JsonrpcRequest request) throws OpenemsException {
-		GetDeviceResponse response = new GetDeviceResponse(request.getId());
+		var response = new GetDeviceResponse(request.getId());
 
-		DSPortAdapter adapter = this.getAdapter();
+		var adapter = this.getAdapter();
 		try {
 			while (adapter.findNextDevice()) {
 				response.addDevice(//
diff --git a/io.openems.edge.bridge.onewire/src/io/openems/edge/bridge/onewire/jsonrpc/GetDeviceResponse.java b/io.openems.edge.bridge.onewire/src/io/openems/edge/bridge/onewire/jsonrpc/GetDeviceResponse.java
index 9fea97fdc42..961d75bf920 100644
--- a/io.openems.edge.bridge.onewire/src/io/openems/edge/bridge/onewire/jsonrpc/GetDeviceResponse.java
+++ b/io.openems.edge.bridge.onewire/src/io/openems/edge/bridge/onewire/jsonrpc/GetDeviceResponse.java
@@ -15,9 +15,9 @@
 
 /**
  * Wraps a JSON-RPC Response to "getDevices" Request.
- * 
+ *
  * <p>
- * 
+ *
  * <pre>
  * {
  *   "jsonrpc": "2.0",
@@ -44,16 +44,16 @@ public static class Device {
 		final JsonObject details;
 
 		public static Device from(OneWireContainer owc) {
-			final JsonObject details = new JsonObject();
+			final var details = new JsonObject();
 
 			if (owc instanceof TemperatureContainer) {
 				details.addProperty("type", "TemperatureContainer");
 				try {
-					TemperatureContainer tc = (TemperatureContainer) owc;
-					byte[] state = tc.readDevice();
+					var tc = (TemperatureContainer) owc;
+					var state = tc.readDevice();
 					tc.doTemperatureConvert(state);
 					state = tc.readDevice();
-					double temp = tc.getTemperature(state);
+					var temp = tc.getTemperature(state);
 					details.addProperty("temperature", temp);
 				} catch (OneWireException e) {
 					e.printStackTrace();
@@ -66,7 +66,6 @@ public static Device from(OneWireContainer owc) {
 		}
 
 		private Device(String address, String name, String alternateName, String description, JsonObject details) {
-			super();
 			this.address = address;
 			this.name = name;
 			this.alternateName = alternateName;
@@ -87,7 +86,7 @@ public void addDevice(Device device) {
 
 	@Override
 	public JsonObject getResult() {
-		JsonArray devices = new JsonArray();
+		var devices = new JsonArray();
 		for (Device device : this.devices) {
 			devices.add(JsonUtils.buildJsonObject() //
 					.addProperty("address", device.address) //
@@ -97,7 +96,7 @@ public JsonObject getResult() {
 					.add("details", device.details) //
 					.build());
 		}
-		JsonObject j = new JsonObject();
+		var j = new JsonObject();
 		j.add("devices", devices);
 		return j;
 	}
diff --git a/io.openems.edge.bridge.onewire/src/io/openems/edge/bridge/onewire/jsonrpc/GetDevicesRequest.java b/io.openems.edge.bridge.onewire/src/io/openems/edge/bridge/onewire/jsonrpc/GetDevicesRequest.java
index ee9d854bbdc..8d8c6499f52 100644
--- a/io.openems.edge.bridge.onewire/src/io/openems/edge/bridge/onewire/jsonrpc/GetDevicesRequest.java
+++ b/io.openems.edge.bridge.onewire/src/io/openems/edge/bridge/onewire/jsonrpc/GetDevicesRequest.java
@@ -6,7 +6,7 @@
 
 /**
  * Wraps a JSON-RPC Request to query the available OneWire devices.
- * 
+ *
  * <pre>
  * {
  *   "jsonrpc": "2.0",

From cad56b4e7749d1cb7a02c29d2f6438c1aa8ac423 Mon Sep 17 00:00:00 2001
From: Stefan Feilmeier <stefan.feilmeier@fenecon.de>
Date: Mon, 7 Mar 2022 22:30:22 +0100
Subject: [PATCH 10/96] Update io.openems.edge.common

---
 .../AbstractChannelListenerManager.java       |   9 +-
 .../common/channel/BooleanWriteChannel.java   |   2 +-
 .../openems/edge/common/channel/Channel.java  |  44 ++--
 .../edge/common/channel/ChannelId.java        |  32 ++-
 .../io/openems/edge/common/channel/Doc.java   |  44 ++--
 .../common/channel/DoubleWriteChannel.java    |   2 +-
 .../openems/edge/common/channel/EnumDoc.java  |  24 +-
 .../edge/common/channel/EnumWriteChannel.java |   6 +-
 .../common/channel/FloatWriteChannel.java     |   2 +-
 .../common/channel/IntegerWriteChannel.java   |   2 +-
 .../edge/common/channel/LongWriteChannel.java |   2 +-
 .../common/channel/ShortWriteChannel.java     |   2 +-
 .../edge/common/channel/StateChannel.java     |   9 +-
 .../edge/common/channel/StateChannelDoc.java  |   8 +-
 .../common/channel/StringWriteChannel.java    |   2 +-
 .../edge/common/channel/WriteChannel.java     |  18 +-
 .../channel/calculate/CalculateAverage.java   |  17 +-
 .../calculate/CalculateIntegerSum.java        |  13 +-
 .../channel/calculate/CalculateLongSum.java   |   7 +-
 .../common/channel/internal/AbstractDoc.java  |  23 +-
 .../channel/internal/AbstractReadChannel.java |  15 +-
 .../channel/internal/OpenemsTypeDoc.java      |   9 +-
 .../internal/StateCollectorChannel.java       |  26 +-
 .../internal/StateCollectorChannelDoc.java    |   2 +-
 .../edge/common/channel/value/Value.java      |  94 ++++---
 .../component/AbstractOpenemsComponent.java   |  93 ++++---
 .../edge/common/component/ClockProvider.java  |   4 +-
 .../common/component/ComponentManager.java    |  26 +-
 .../component/ComponentManagerProvider.java   |   2 +-
 .../common/component/OpenemsComponent.java    | 141 +++++------
 .../common/converter/StaticConverters.java    |  10 +-
 .../io/openems/edge/common/cycle/Cycle.java   |   7 +-
 .../edge/common/event/EdgeEventConstants.java |  16 +-
 .../common/filter/DisabledRampFilter.java     |   3 +-
 .../openems/edge/common/filter/PidFilter.java |  24 +-
 .../edge/common/filter/RampFilter.java        |  21 +-
 .../openems/edge/common/host/DummyHost.java   |   2 +-
 .../src/io/openems/edge/common/host/Host.java |   1 +
 .../openems/edge/common/jsonapi/JsonApi.java  |   2 +-
 .../common/linecharacteristic/PolyLine.java   |  37 +--
 .../src/io/openems/edge/common/meta/Meta.java |   3 +-
 .../edge/common/modbusslave/ModbusRecord.java |   6 +-
 .../modbusslave/ModbusRecordChannel.java      |  33 ++-
 .../modbusslave/ModbusRecordConstant.java     |   4 +-
 .../modbusslave/ModbusRecordFloat32.java      |   7 +-
 .../ModbusRecordFloat32Reserved.java          |   2 +-
 .../modbusslave/ModbusRecordFloat64.java      |   9 +-
 .../ModbusRecordFloat64Reserved.java          |   2 +-
 .../modbusslave/ModbusRecordString16.java     |   9 +-
 .../ModbusRecordString16Reserved.java         |   2 +-
 .../modbusslave/ModbusRecordUint16.java       |  12 +-
 .../ModbusRecordUint16BlockLength.java        |   2 +-
 .../modbusslave/ModbusRecordUint16Hash.java   |   2 +-
 .../ModbusRecordUint16Reserved.java           |   2 +-
 .../modbusslave/ModbusRecordUint32.java       |  12 +-
 .../ModbusRecordUint32Reserved.java           |   2 +-
 .../edge/common/modbusslave/ModbusSlave.java  |   2 +-
 .../modbusslave/ModbusSlaveNatureTable.java   |  26 +-
 .../common/modbusslave/ModbusSlaveTable.java  |   6 +-
 .../edge/common/modbusslave/ModbusType.java   |   5 +-
 .../openems/edge/common/offgrid/GridType.java |   9 +-
 .../edge/common/offgrid/OperationMode.java    |   4 +-
 .../edge/common/startstop/StartStop.java      |   4 +-
 .../common/startstop/StartStopConfig.java     |   4 +-
 .../edge/common/startstop/StartStoppable.java |  36 +--
 .../common/statemachine/AbstractContext.java  |  12 +-
 .../statemachine/AbstractStateMachine.java    |  22 +-
 .../edge/common/statemachine/State.java       |   6 +-
 .../common/statemachine/StateHandler.java     |   2 +-
 .../common/statemachine/package-info.java     |   6 +-
 .../io/openems/edge/common/sum/GridMode.java  |   4 +-
 .../src/io/openems/edge/common/sum/Sum.java   |  83 ++++---
 .../common/taskmanager/MetaTasksManager.java  |  24 +-
 .../edge/common/taskmanager/TasksManager.java |  43 ++--
 .../common/test/AbstractComponentConfig.java  |   6 +-
 .../common/test/AbstractComponentTest.java    | 112 +++++----
 .../edge/common/test/ComponentTest.java       |   2 +-
 .../common/test/DummyComponentManager.java    |  25 +-
 .../common/test/DummyConfigurationAdmin.java  |  28 +--
 .../openems/edge/common/test/TestUtils.java   |   6 +-
 .../edge/common/test/TimeLeapClock.java       |   2 +-
 .../edge/common/type/CircularTreeMap.java     |   9 +-
 .../openems/edge/common/type/TypeUtils.java   | 154 ++++++------
 .../type/slidingvalue/DoubleSlidingValue.java |   6 +-
 .../type/slidingvalue/FloatSlidingValue.java  |  18 +-
 .../slidingvalue/IntegerSlidingValue.java     |  20 +-
 .../type/slidingvalue/LongSlidingValue.java   |   8 +-
 .../type/slidingvalue/ShortSlidingValue.java  |  20 +-
 .../type/slidingvalue/SlidingValue.java       |  18 +-
 .../openems/edge/common/user/ManagedUser.java |  22 +-
 .../src/io/openems/edge/common/user/User.java |  16 +-
 .../edge/common/channel/TestOptions.java      |   4 +-
 .../edge/common/filter/PidFilterTest.java     | 182 +++++++-------
 .../linecharacteristic/PolyLineTest.java      |  10 +-
 .../common/taskmanager/TasksManagerTest.java  |  16 +-
 .../edge/common/type/CircularTreeMapTest.java |  19 +-
 .../edge/common/type/TypeUtilsTest.java       | 233 +++++++++---------
 97 files changed, 1052 insertions(+), 1094 deletions(-)

diff --git a/io.openems.edge.common/src/io/openems/edge/common/channel/AbstractChannelListenerManager.java b/io.openems.edge.common/src/io/openems/edge/common/channel/AbstractChannelListenerManager.java
index 42509930b62..4b85ee6b477 100644
--- a/io.openems.edge.common/src/io/openems/edge/common/channel/AbstractChannelListenerManager.java
+++ b/io.openems.edge.common/src/io/openems/edge/common/channel/AbstractChannelListenerManager.java
@@ -20,7 +20,6 @@ private abstract static class Listener<CALLBACK> {
 		protected final CALLBACK callback;
 
 		public Listener(OpenemsComponent component, ChannelId channelId, CALLBACK callback) {
-			super();
 			this.component = component;
 			this.channelId = channelId;
 			this.callback = callback;
@@ -64,7 +63,7 @@ public synchronized void deactivate() {
 	/**
 	 * Adds a Listener. Also applies the callback once to make sure it applies
 	 * already existing values.
-	 * 
+	 *
 	 * @param <T>       the Channel value type
 	 * @param component the Component
 	 * @param channelId the ChannelId
@@ -72,7 +71,7 @@ public synchronized void deactivate() {
 	 */
 	protected <T> void addOnSetNextValueListener(OpenemsComponent component, ChannelId channelId,
 			Consumer<Value<T>> callback) {
-		this.onSetNextValueListeners.add(new OnSetNextValueListener<T>(component, channelId, callback));
+		this.onSetNextValueListeners.add(new OnSetNextValueListener<>(component, channelId, callback));
 		Channel<T> channel = component.channel(channelId);
 		channel.onSetNextValue(callback);
 		callback.accept(channel.getNextValue());
@@ -81,7 +80,7 @@ protected <T> void addOnSetNextValueListener(OpenemsComponent component, Channel
 	/**
 	 * Adds a Listener. Also applies the callback once to make sure it applies
 	 * already existing values.
-	 * 
+	 *
 	 * @param <T>       the Channel value type
 	 * @param component the Component
 	 * @param channelId the ChannelId
@@ -89,7 +88,7 @@ protected <T> void addOnSetNextValueListener(OpenemsComponent component, Channel
 	 */
 	protected <T> void addOnChangeListener(OpenemsComponent component, ChannelId channelId,
 			BiConsumer<Value<T>, Value<T>> callback) {
-		this.onChangeListeners.add(new OnChangeListener<T>(component, channelId, callback));
+		this.onChangeListeners.add(new OnChangeListener<>(component, channelId, callback));
 		Channel<T> channel = component.channel(channelId);
 		channel.onChange(callback);
 		callback.accept(null, channel.getNextValue());
diff --git a/io.openems.edge.common/src/io/openems/edge/common/channel/BooleanWriteChannel.java b/io.openems.edge.common/src/io/openems/edge/common/channel/BooleanWriteChannel.java
index beb60524c2b..e530cf203e5 100644
--- a/io.openems.edge.common/src/io/openems/edge/common/channel/BooleanWriteChannel.java
+++ b/io.openems.edge.common/src/io/openems/edge/common/channel/BooleanWriteChannel.java
@@ -46,7 +46,7 @@ protected BooleanWriteChannel(OpenemsComponent component, ChannelId channelId, B
 
 	/**
 	 * Internal method. Do not call directly.
-	 * 
+	 *
 	 * @param value
 	 */
 	@Deprecated
diff --git a/io.openems.edge.common/src/io/openems/edge/common/channel/Channel.java b/io.openems.edge.common/src/io/openems/edge/common/channel/Channel.java
index 436fe46f250..3d375347ca1 100644
--- a/io.openems.edge.common/src/io/openems/edge/common/channel/Channel.java
+++ b/io.openems.edge.common/src/io/openems/edge/common/channel/Channel.java
@@ -32,13 +32,13 @@
  * {@link Channel#onChange(Consumer)}, {@link Channel#onUpdate(Consumer)} and
  * {@link Channel#onSetNextValue(Consumer)})
  * </ul>
- * 
+ *
  * <p>
  * Channels implement a 'Process Image' pattern. They provide an 'active' value
  * which should be used for any operations on the channel value. The 'next'
  * value is filled by asynchronous workers in the background. At the 'Process
  * Image Switch' the 'next' value is copied to the 'current' value.
- * 
+ *
  * <p>
  * The recommended implementation of an OpenEMS Channel is via
  * {@link AbstractReadChannel}.
@@ -55,14 +55,14 @@ public interface Channel<T> {
 
 	/**
 	 * Gets the ChannelId of this Channel.
-	 * 
+	 *
 	 * @return
 	 */
 	io.openems.edge.common.channel.ChannelId channelId();
 
 	/**
 	 * Gets the ChannelDoc of this Channel.
-	 * 
+	 *
 	 * @return
 	 */
 	default Doc channelDoc() {
@@ -71,14 +71,14 @@ default Doc channelDoc() {
 
 	/**
 	 * Gets the OpenemsComponent this Channel belongs to.
-	 * 
+	 *
 	 * @return
 	 */
 	OpenemsComponent getComponent();
 
 	/**
 	 * Gets the address of this Channel.
-	 * 
+	 *
 	 * @return
 	 */
 	ChannelAddress address();
@@ -91,14 +91,14 @@ default Doc channelDoc() {
 
 	/**
 	 * Gets the type of this Channel, e.g. INTEGER, BOOLEAN,..
-	 * 
+	 *
 	 * @return
 	 */
 	OpenemsType getType();
 
 	/**
 	 * Updates the 'next value' of Channel.
-	 * 
+	 *
 	 * @param value the 'next value'. It is going to be the 'value' after the next
 	 *              ProcessImage gets activated.
 	 */
@@ -113,10 +113,10 @@ public default void setNextValue(Object value) {
 
 	/**
 	 * Gets the 'next value'.
-	 * 
+	 *
 	 * <p>
 	 * Note that usually you should prefer the value() method.
-	 * 
+	 *
 	 * @return the 'next value'
 	 */
 	public Value<T> getNextValue();
@@ -124,14 +124,14 @@ public default void setNextValue(Object value) {
 	/**
 	 * Add an onSetNextValue callback. It is called, after a new NextValue was set.
 	 * Note that usually you should prefer the onUpdate() callback.
-	 * 
+	 *
 	 * <p>
 	 * Remember to remove the callback using
 	 * {@link #removeOnSetNextValueCallback(Consumer)} once it is not needed
 	 * anymore, e.g. on deactivate().
-	 * 
+	 *
 	 * @see #onUpdate
-	 * 
+	 *
 	 * @param callback the callback {@link Consumer}
 	 * @return the callback to enable fluent programming
 	 */
@@ -141,7 +141,7 @@ public default void setNextValue(Object value) {
 
 	/**
 	 * Removes an onSetNextValue callback.
-	 * 
+	 *
 	 * @see #onSetNextValue(Consumer)
 	 * @param callback the callback {@link Consumer}
 	 */
@@ -149,7 +149,7 @@ public default void setNextValue(Object value) {
 
 	/**
 	 * Internal method. Do not call directly.
-	 * 
+	 *
 	 * @param value the 'next value'
 	 */
 	@Deprecated
@@ -157,7 +157,7 @@ public default void setNextValue(Object value) {
 
 	/**
 	 * Gets the currently active value, wrapped in a @{link Value}.
-	 * 
+	 *
 	 * @throws IllegalArgumentException if value cannot be access, e.g. because the
 	 *                                  Channel is Write-Only.
 	 */
@@ -165,7 +165,7 @@ public default void setNextValue(Object value) {
 
 	/**
 	 * Gets the past values for this Channel.
-	 * 
+	 *
 	 * @return a map of recording time and historic value at that time
 	 */
 	// TODO this should be a ZonedDateTime
@@ -179,7 +179,7 @@ public default void setNextValue(Object value) {
 
 	/**
 	 * Removes an onUpdate callback.
-	 * 
+	 *
 	 * @see #onUpdate(Consumer)
 	 * @param callback the callback {@link Consumer}
 	 */
@@ -188,14 +188,14 @@ public default void setNextValue(Object value) {
 	/**
 	 * Add an onChange callback. It is called, after a new, different active value
 	 * was set by nextProcessImage().
-	 * 
+	 *
 	 * @param callback old value and new value
 	 */
 	public BiConsumer<Value<T>, Value<T>> onChange(BiConsumer<Value<T>, Value<T>> callback);
 
 	/**
 	 * Removes an onChange callback.
-	 * 
+	 *
 	 * @see #onChange(BiConsumer)
 	 * @param callback the callback {@link BiConsumer}
 	 */
@@ -211,7 +211,7 @@ public default void setNextValue(Object value) {
 	 * Sets an object that holds meta information about the Channel, e.g. a read
 	 * source or write target of this Channel, like a Modbus Register or REST-Api
 	 * endpoint address. Defaults to null.
-	 * 
+	 *
 	 * @param <META_INFO> the type of the meta info
 	 * @param metaInfo    the meta info object
 	 * @throws IllegalArgumentException if there is already a different meta-info
@@ -221,7 +221,7 @@ public default void setNextValue(Object value) {
 
 	/**
 	 * Gets the meta information object. Defaults to null.
-	 * 
+	 *
 	 * @param <META_INFO> the type of the meta info attachment
 	 * @return the meta info object
 	 */
diff --git a/io.openems.edge.common/src/io/openems/edge/common/channel/ChannelId.java b/io.openems.edge.common/src/io/openems/edge/common/channel/ChannelId.java
index d7a707bead4..3463226654a 100644
--- a/io.openems.edge.common/src/io/openems/edge/common/channel/ChannelId.java
+++ b/io.openems.edge.common/src/io/openems/edge/common/channel/ChannelId.java
@@ -8,7 +8,7 @@
 /**
  * A {@link ChannelId} defines a Channel. It provides a unique Name and and a
  * {@link Doc}.
- * 
+ *
  * <p>
  * This interface is typically implemented by an {@link Enum} type which
  * automatically provides a {@link ChannelId#name()} method.
@@ -18,14 +18,14 @@ public interface ChannelId {
 	/**
 	 * Converts a Channel-ID in UPPER_UNDERSCORE format (like from an {@link Enum})
 	 * to the preferred UPPER_CAMEL format.
-	 * 
+	 *
 	 * <p>
 	 * Examples: converts "ACTIVE_POWER" to "ActivePower".
-	 * 
+	 *
 	 * <p>
 	 * Special reserved Channel-IDs starting with "_" have a special handling:
 	 * "_PROPERTY_ENABLED" is converted to "_PropertyEnabled".
-	 * 
+	 *
 	 * @param name a Channel-ID in UPPER_UNDERSCORE format
 	 * @return the Channel-ID in UPPER_CAMEL format.
 	 */
@@ -33,17 +33,16 @@ public static String channelIdUpperToCamel(String name) {
 		if (name.startsWith("_")) {
 			// special handling for reserved Channel-IDs starting with "_".
 			return "_" + CaseFormat.UPPER_UNDERSCORE.to(CaseFormat.UPPER_CAMEL, name.substring(1));
-		} else {
-			return CaseFormat.UPPER_UNDERSCORE.to(CaseFormat.UPPER_CAMEL, name);
 		}
+		return CaseFormat.UPPER_UNDERSCORE.to(CaseFormat.UPPER_CAMEL, name);
 	}
 
 	/**
 	 * Converts a Channel-ID in UPPER_CAMEL format to the UPPER_UNDERSCORE format.
-	 * 
+	 *
 	 * <p>
 	 * Examples: converts "ActivePower" to "ACTIVE_POWER".
-	 * 
+	 *
 	 * @param name Channel-ID in UPPER_CAMEL format.
 	 * @return the a Channel-ID in UPPER_UNDERSCORE format
 	 */
@@ -51,25 +50,24 @@ public static String channelIdCamelToUpper(String name) {
 		if (name.startsWith("_")) {
 			// special handling for reserved Channel-IDs starting with "_".
 			return "_" + CaseFormat.UPPER_CAMEL.to(CaseFormat.UPPER_UNDERSCORE, name.substring(1));
-		} else {
-			return CaseFormat.UPPER_CAMEL.to(CaseFormat.UPPER_UNDERSCORE, name);
 		}
+		return CaseFormat.UPPER_CAMEL.to(CaseFormat.UPPER_UNDERSCORE, name);
 	}
 
 	/**
 	 * Lists all Channel-IDs of the given Channel-ID Enum in a form that is suitable
 	 * for a InfluxDB-Query in a Grafana Dashboard.
-	 * 
+	 *
 	 * <p>
 	 * To create a query, call this function like
 	 * `ChannelId.printChannelIdsForInfluxQuery(FeneconMiniEss.ServiceInfoChannelId.values());`
-	 * 
+	 *
 	 * @param channelIds the {@link ChannelId}s, e.g. from ChannelId.values().
 	 */
 	public static <T extends Enum<T>> void printChannelIdsForInfluxQuery(ChannelId[] channelIds) {
 		System.out.println(Stream.of(channelIds) //
 				.map(c -> {
-					String name = c.doc().getText();
+					var name = c.doc().getText();
 					if (name.isEmpty()) {
 						name = c.id();
 					}
@@ -80,17 +78,17 @@ public static <T extends Enum<T>> void printChannelIdsForInfluxQuery(ChannelId[]
 	/**
 	 * Gets the name in format {@link CaseFormat#UPPER_UNDERSCORE}. This is
 	 * available by default for an Enum.
-	 * 
+	 *
 	 * <p>
 	 * Names starting with underscore ("_") are reserved for internal usage.
-	 * 
+	 *
 	 * @return the name
 	 */
 	String name();
 
 	/**
 	 * Gets the name in CamelCase.
-	 * 
+	 *
 	 * @return the Channel-ID in CamelCase
 	 */
 	default String id() {
@@ -99,7 +97,7 @@ default String id() {
 
 	/**
 	 * Gets the Channel Doc for this ChannelId.
-	 * 
+	 *
 	 * @return the Channel-Doc
 	 */
 	Doc doc();
diff --git a/io.openems.edge.common/src/io/openems/edge/common/channel/Doc.java b/io.openems.edge.common/src/io/openems/edge/common/channel/Doc.java
index 3dcbbfe9c61..29257d4927c 100644
--- a/io.openems.edge.common/src/io/openems/edge/common/channel/Doc.java
+++ b/io.openems.edge.common/src/io/openems/edge/common/channel/Doc.java
@@ -13,10 +13,10 @@
 
 /**
  * Provides static meta information for a {@link Channel}.
- * 
+ *
  * <p>
  * Possible meta information include:
- * 
+ *
  * <ul>
  * <li>access-mode (read-only/read-write/write-only) flag
  * {@link Doc#accessMode(AccessMode)}. Defaults to Read-Only.
@@ -31,15 +31,15 @@ public interface Doc {
 
 	/**
 	 * Create a Channel-Doc with a specific OpenemsType.
-	 * 
+	 *
 	 * <p>
 	 * use like this:
-	 * 
+	 *
 	 * <pre>
 	 * Doc.of(OpenemsType.INTEGER)
 	 * </pre>
-	 * 
-	 * 
+	 *
+	 *
 	 * @param type the OpenemsType
 	 * @return an instance of {@link OpenemsTypeDoc}
 	 */
@@ -49,14 +49,14 @@ public static OpenemsTypeDoc<?> of(OpenemsType type) {
 
 	/**
 	 * Create a Channel-Doc with specific options defined by an {@link OptionsEnum}.
-	 * 
+	 *
 	 * <p>
 	 * use like this:
-	 * 
+	 *
 	 * <pre>
 	 * Doc.of([YourOptionsEnum].values())
 	 * </pre>
-	 * 
+	 *
 	 * @param options the possible options as an OptionsEnum
 	 * @return an instance of {@link EnumDoc}
 	 */
@@ -66,14 +66,14 @@ public static EnumDoc of(OptionsEnum[] options) {
 
 	/**
 	 * Create a Channel-Doc for a {@link StateChannel} with a given {@link Level}.
-	 * 
+	 *
 	 * <p>
 	 * use like this:
-	 * 
+	 *
 	 * <pre>
 	 * Doc.of(Level.FAULT)
 	 * </pre>
-	 * 
+	 *
 	 * @param level the Level
 	 * @return an instance of {@link StateChannelDoc}
 	 */
@@ -83,46 +83,46 @@ public static StateChannelDoc of(Level level) {
 
 	/**
 	 * Gets the {@link ChannelCategory} of the Channel of this Doc.
-	 * 
+	 *
 	 * @return the ChannelCategory
 	 */
 	public ChannelCategory getChannelCategory();
 
 	/**
 	 * Gets the OpenemsType.
-	 * 
+	 *
 	 * @return the OpenemsType
 	 */
 	public OpenemsType getType();
 
 	/**
 	 * Gets the 'Access-Mode' information.
-	 * 
+	 *
 	 * @return the {@link AccessMode}
 	 */
 	public AccessMode getAccessMode();
 
 	/**
 	 * Gets the Unit. Defaults to NONE.
-	 * 
+	 *
 	 * @return the unit
 	 */
 	public Unit getUnit();
 
 	/**
 	 * Gets the Persistence Priority. Defaults to VERY_LOW.
-	 * 
+	 *
 	 * <p>
 	 * This parameter may be used by persistence services to decide, if the Channel
 	 * should be persisted to the hard disk.
-	 * 
+	 *
 	 * @return the {@link PersistencePriority}
 	 */
 	public PersistencePriority getPersistencePriority();
 
 	/**
 	 * Sets the descriptive text. Defaults to an empty string.
-	 * 
+	 *
 	 * @param text the text
 	 * @return myself
 	 */
@@ -130,14 +130,14 @@ public static StateChannelDoc of(Level level) {
 
 	/**
 	 * Gets the descriptive text. Defaults to empty String.
-	 * 
+	 *
 	 * @return the text
 	 */
 	public String getText();
 
 	/**
 	 * Is the more verbose debug mode activated?.
-	 * 
+	 *
 	 * @return true for debug mode
 	 */
 	public boolean isDebug();
@@ -145,7 +145,7 @@ public static StateChannelDoc of(Level level) {
 	/**
 	 * Creates an instance of {@link Channel} for the given Channel-ID using its
 	 * Channel-{@link AbstractDoc}.
-	 * 
+	 *
 	 * @param <C>       the type of the Channel
 	 * @param component the {@link OpenemsComponent}
 	 * @param channelId the Channel-ID
diff --git a/io.openems.edge.common/src/io/openems/edge/common/channel/DoubleWriteChannel.java b/io.openems.edge.common/src/io/openems/edge/common/channel/DoubleWriteChannel.java
index 01b6c90a528..b04a6bbd4f5 100644
--- a/io.openems.edge.common/src/io/openems/edge/common/channel/DoubleWriteChannel.java
+++ b/io.openems.edge.common/src/io/openems/edge/common/channel/DoubleWriteChannel.java
@@ -17,7 +17,7 @@ protected DoubleWriteChannel(OpenemsComponent component, ChannelId channelId, Do
 
 	/**
 	 * Internal method. Do not call directly.
-	 * 
+	 *
 	 * @param value
 	 */
 	@Deprecated
diff --git a/io.openems.edge.common/src/io/openems/edge/common/channel/EnumDoc.java b/io.openems.edge.common/src/io/openems/edge/common/channel/EnumDoc.java
index a0aaa761507..c9fd247c5b7 100644
--- a/io.openems.edge.common/src/io/openems/edge/common/channel/EnumDoc.java
+++ b/io.openems.edge.common/src/io/openems/edge/common/channel/EnumDoc.java
@@ -33,12 +33,12 @@ protected EnumDoc self() {
 	}
 
 	public OptionsEnum[] getOptions() {
-		return options;
+		return this.options;
 	}
 
 	/**
 	 * Initial-Value. Default: none
-	 * 
+	 *
 	 * @param initialValue
 	 * @return myself
 	 */
@@ -50,7 +50,7 @@ public EnumDoc initialValue(OptionsEnum initialValue) {
 	/**
 	 * Creates an instance of {@link Channel} for the given Channel-ID using its
 	 * Channel-{@link Doc}.
-	 * 
+	 *
 	 * @param channelId the Channel-ID
 	 * @return the Channel
 	 */
@@ -72,7 +72,7 @@ public EnumReadChannel createChannelInstance(OpenemsComponent component,
 	/**
 	 * Gets the Undefined-Option, i.e. the default Option if the value has not been
 	 * set.
-	 * 
+	 *
 	 * @return the Undefined-Option
 	 */
 	public OptionsEnum getUndefinedOption() {
@@ -84,7 +84,7 @@ public OptionsEnum getUndefinedOption() {
 
 	/**
 	 * Gets the Option from a String.
-	 * 
+	 *
 	 * @param name the name of the option. Comparison is case insensitive
 	 * @return the {@link OptionsEnum}
 	 * @throws OpenemsNamedException if there is no option with that name
@@ -100,7 +100,7 @@ public OptionsEnum getOptionFromString(String name) throws OpenemsNamedException
 
 	/**
 	 * Gets the Option value from a String.
-	 * 
+	 *
 	 * @param name the name of the option. Comparison is case insensitive
 	 * @return the integer value of the {@link OptionsEnum}
 	 * @throws OpenemsNamedException if there is no option with that name
@@ -111,7 +111,7 @@ public int getOptionValueFromString(String name) throws OpenemsNamedException {
 
 	/**
 	 * Gets the {@link OptionsEnum} from the integer value.
-	 * 
+	 *
 	 * @param value the integer value of the option
 	 * @return the {@link OptionsEnum}
 	 */
@@ -119,7 +119,7 @@ public OptionsEnum getOption(Integer value) {
 		if (this.options.length == 0) {
 			return null;
 		}
-		OptionsEnum undefined = this.options[0].getUndefined();
+		var undefined = this.options[0].getUndefined();
 		if (value == null) {
 			return undefined;
 		}
@@ -134,12 +134,12 @@ public OptionsEnum getOption(Integer value) {
 	/**
 	 * Gets the name of the Option or 'UNDEFINED' if there is no option with that
 	 * value
-	 * 
+	 *
 	 * @param value the integer value of the Option
 	 * @return the name of the Option as a String
 	 */
 	public String getOptionString(Integer value) {
-		OptionsEnum option = this.getOption(value);
+		var option = this.getOption(value);
 		if (option == null) {
 			return Value.UNDEFINED_VALUE_STRING;
 		}
@@ -157,9 +157,7 @@ public String getText() {
 		// "<value>:<name>, <value>:<name>".
 		return Stream.of(this.options) //
 				.filter(option -> !option.isUndefined()) //
-				.map(option -> { //
-					return option.getValue() + ":" + option.getName(); //
-				}) //
+				.map(option -> (option.getValue() + ":" + option.getName())) //
 				.collect(Collectors.joining(", "));
 	}
 }
diff --git a/io.openems.edge.common/src/io/openems/edge/common/channel/EnumWriteChannel.java b/io.openems.edge.common/src/io/openems/edge/common/channel/EnumWriteChannel.java
index c141d036449..f9b701139ff 100644
--- a/io.openems.edge.common/src/io/openems/edge/common/channel/EnumWriteChannel.java
+++ b/io.openems.edge.common/src/io/openems/edge/common/channel/EnumWriteChannel.java
@@ -49,7 +49,7 @@ protected EnumWriteChannel(OpenemsComponent component, ChannelId channelId, Enum
 
 	/**
 	 * Updates the 'next' write value of Channel from an Enum-String value.
-	 * 
+	 *
 	 * @param value the name of the option as string
 	 * @throws OpenemsNamedException one error
 	 */
@@ -64,7 +64,7 @@ public void setNextWriteValue(String value) throws OpenemsNamedException {
 
 	/**
 	 * Updates the 'next' write value of Channel from an Enum value.
-	 * 
+	 *
 	 * @param value the OptionsEnum value
 	 * @throws OpenemsNamedException on error
 	 */
@@ -74,7 +74,7 @@ public void setNextWriteValue(OptionsEnum value) throws OpenemsNamedException {
 
 	/**
 	 * Internal method. Do not call directly.
-	 * 
+	 *
 	 * @param value
 	 */
 	@Deprecated
diff --git a/io.openems.edge.common/src/io/openems/edge/common/channel/FloatWriteChannel.java b/io.openems.edge.common/src/io/openems/edge/common/channel/FloatWriteChannel.java
index b40d04a6157..53d20769297 100644
--- a/io.openems.edge.common/src/io/openems/edge/common/channel/FloatWriteChannel.java
+++ b/io.openems.edge.common/src/io/openems/edge/common/channel/FloatWriteChannel.java
@@ -46,7 +46,7 @@ protected FloatWriteChannel(OpenemsComponent component, ChannelId channelId, Flo
 
 	/**
 	 * Internal method. Do not call directly.
-	 * 
+	 *
 	 * @param value
 	 */
 	@Deprecated
diff --git a/io.openems.edge.common/src/io/openems/edge/common/channel/IntegerWriteChannel.java b/io.openems.edge.common/src/io/openems/edge/common/channel/IntegerWriteChannel.java
index e43a30e7b3a..3be6b7803d3 100644
--- a/io.openems.edge.common/src/io/openems/edge/common/channel/IntegerWriteChannel.java
+++ b/io.openems.edge.common/src/io/openems/edge/common/channel/IntegerWriteChannel.java
@@ -46,7 +46,7 @@ protected IntegerWriteChannel(OpenemsComponent component, ChannelId channelId, I
 
 	/**
 	 * Internal method. Do not call directly.
-	 * 
+	 *
 	 * @param value
 	 */
 	@Deprecated
diff --git a/io.openems.edge.common/src/io/openems/edge/common/channel/LongWriteChannel.java b/io.openems.edge.common/src/io/openems/edge/common/channel/LongWriteChannel.java
index 9b0562eeaeb..0b6b7a6af0c 100644
--- a/io.openems.edge.common/src/io/openems/edge/common/channel/LongWriteChannel.java
+++ b/io.openems.edge.common/src/io/openems/edge/common/channel/LongWriteChannel.java
@@ -46,7 +46,7 @@ protected LongWriteChannel(OpenemsComponent component, ChannelId channelId, Long
 
 	/**
 	 * Internal method. Do not call directly.
-	 * 
+	 *
 	 * @param value
 	 */
 	@Deprecated
diff --git a/io.openems.edge.common/src/io/openems/edge/common/channel/ShortWriteChannel.java b/io.openems.edge.common/src/io/openems/edge/common/channel/ShortWriteChannel.java
index ac5ac8af701..c30161a5749 100644
--- a/io.openems.edge.common/src/io/openems/edge/common/channel/ShortWriteChannel.java
+++ b/io.openems.edge.common/src/io/openems/edge/common/channel/ShortWriteChannel.java
@@ -46,7 +46,7 @@ protected ShortWriteChannel(OpenemsComponent component, ChannelId channelId, Sho
 
 	/**
 	 * Internal method. Do not call directly.
-	 * 
+	 *
 	 * @param value
 	 */
 	@Deprecated
diff --git a/io.openems.edge.common/src/io/openems/edge/common/channel/StateChannel.java b/io.openems.edge.common/src/io/openems/edge/common/channel/StateChannel.java
index 9c6afd324cb..89465ca0bb1 100644
--- a/io.openems.edge.common/src/io/openems/edge/common/channel/StateChannel.java
+++ b/io.openems.edge.common/src/io/openems/edge/common/channel/StateChannel.java
@@ -2,7 +2,6 @@
 
 import java.util.ArrayList;
 import java.util.List;
-import java.util.Optional;
 import java.util.function.BiConsumer;
 import java.util.function.Consumer;
 
@@ -40,7 +39,7 @@ public TriggerOnAny(ChannelId... sourceChannelIds) {
 		@Override
 		public void accept(Channel<Boolean> channel) {
 			// Create shared onChangeCallback
-			final OpenemsComponent parent = channel.getComponent();
+			final var parent = channel.getComponent();
 			final BiConsumer<Value<Boolean>, Value<Boolean>> onChangeCallback = (oldValue, newValue) -> {
 				List<String> activeSourceStates = new ArrayList<>();
 				for (ChannelId sourceChannelId : this.sourceChannelIds) {
@@ -86,11 +85,11 @@ protected StateChannel(OpenemsComponent component, ChannelId channelId, Abstract
 
 	/**
 	 * Gets the Level of this {@link StateChannel}.
-	 * 
+	 *
 	 * @return the level
 	 */
 	public Level getLevel() {
-		return level;
+		return this.level;
 	}
 
 	@SuppressWarnings("deprecation")
@@ -112,7 +111,7 @@ public void _setNextValue(Boolean value) {
 			break;
 
 		case SAME_VALUES_IN_A_ROW_TO_CHANGE:
-			Optional<Boolean> currentValueOpt = this.value().asOptional();
+			var currentValueOpt = this.value().asOptional();
 			if (!currentValueOpt.isPresent()) {
 				super._setNextValue(value);
 				return;
diff --git a/io.openems.edge.common/src/io/openems/edge/common/channel/StateChannelDoc.java b/io.openems.edge.common/src/io/openems/edge/common/channel/StateChannelDoc.java
index 3d4411baa1c..bcf856c3c34 100644
--- a/io.openems.edge.common/src/io/openems/edge/common/channel/StateChannelDoc.java
+++ b/io.openems.edge.common/src/io/openems/edge/common/channel/StateChannelDoc.java
@@ -28,13 +28,13 @@ protected StateChannelDoc self() {
 	}
 
 	public Level getLevel() {
-		return level;
+		return this.level;
 	}
 
 	/**
 	 * Creates an instance of {@link Channel} for the given Channel-ID using its
 	 * Channel-{@link Doc}.
-	 * 
+	 *
 	 * @param channelId the Channel-ID
 	 * @return the Channel
 	 */
@@ -59,10 +59,10 @@ public StateChannelDoc debounce(int debounce, Debounce debounceMode) {
 	}
 
 	public int getDebounce() {
-		return debounce;
+		return this.debounce;
 	}
 
 	public Debounce getDebounceMode() {
-		return debounceMode;
+		return this.debounceMode;
 	}
 }
diff --git a/io.openems.edge.common/src/io/openems/edge/common/channel/StringWriteChannel.java b/io.openems.edge.common/src/io/openems/edge/common/channel/StringWriteChannel.java
index f289b08ff10..dcbcf363efa 100644
--- a/io.openems.edge.common/src/io/openems/edge/common/channel/StringWriteChannel.java
+++ b/io.openems.edge.common/src/io/openems/edge/common/channel/StringWriteChannel.java
@@ -46,7 +46,7 @@ public StringWriteChannel(OpenemsComponent component, ChannelId channelId, Strin
 
 	/**
 	 * Internal method. Do not call directly.
-	 * 
+	 *
 	 * @param value
 	 */
 	@Deprecated
diff --git a/io.openems.edge.common/src/io/openems/edge/common/channel/WriteChannel.java b/io.openems.edge.common/src/io/openems/edge/common/channel/WriteChannel.java
index 1184c697d10..e3e60dffc29 100644
--- a/io.openems.edge.common/src/io/openems/edge/common/channel/WriteChannel.java
+++ b/io.openems.edge.common/src/io/openems/edge/common/channel/WriteChannel.java
@@ -11,7 +11,7 @@ public interface WriteChannel<T> extends Channel<T> {
 
 	/**
 	 * Updates the 'next' write value of Channel.
-	 * 
+	 *
 	 * @param value the typed value
 	 * @throws OpenemsNamedException on error
 	 */
@@ -27,18 +27,18 @@ public default void setNextWriteValue(T value) throws OpenemsNamedException {
 
 	/**
 	 * Updates the 'next' write value of Channel from an Object value.
-	 * 
+	 *
 	 * <p>
 	 * Use this method if the value is not yet in the correct Type. Otherwise use
 	 * {@link WriteChannel#setNextWriteValue(Object)} directly.
-	 * 
+	 *
 	 * @param value the value as an Object
 	 * @throws OpenemsNamedException    on error
 	 * @throws IllegalArgumentException on error
 	 */
 	public default void setNextWriteValueFromObject(Object value)
 			throws OpenemsNamedException, IllegalArgumentException {
-		T typedValue = TypeUtils.<T>getAsType(this.getType(), value);
+		var typedValue = TypeUtils.<T>getAsType(this.getType(), value);
 		OpenemsNamedException exception = null;
 		// set the write value
 		this._setNextWriteValue(typedValue);
@@ -56,7 +56,7 @@ public default void setNextWriteValueFromObject(Object value)
 
 	/**
 	 * Internal method. Do not call directly.
-	 * 
+	 *
 	 * @param value
 	 */
 	@Deprecated
@@ -64,11 +64,11 @@ public default void setNextWriteValueFromObject(Object value)
 
 	/**
 	 * Gets the next write value and resets it.
-	 * 
+	 *
 	 * @return
 	 */
 	public default Optional<T> getNextWriteValueAndReset() {
-		Optional<T> valueOpt = this.getNextWriteValue();
+		var valueOpt = this.getNextWriteValue();
 		if (valueOpt.isPresent()) {
 			this._setNextWriteValue(null);
 		}
@@ -77,7 +77,7 @@ public default Optional<T> getNextWriteValueAndReset() {
 
 	/**
 	 * Gets the next write value.
-	 * 
+	 *
 	 * @return the next write value; not-present if no write value had been set
 	 */
 	public Optional<T> getNextWriteValue();
@@ -85,7 +85,7 @@ public default Optional<T> getNextWriteValueAndReset() {
 	/**
 	 * Add an onSetNextWrite callback. It is called when a 'next write value' was
 	 * set.
-	 * 
+	 *
 	 * <p>
 	 * The callback can throw an {@link OpenemsNamedException}.
 	 */
diff --git a/io.openems.edge.common/src/io/openems/edge/common/channel/calculate/CalculateAverage.java b/io.openems.edge.common/src/io/openems/edge/common/channel/calculate/CalculateAverage.java
index cc3790c0ddb..eb3471f6a30 100644
--- a/io.openems.edge.common/src/io/openems/edge/common/channel/calculate/CalculateAverage.java
+++ b/io.openems.edge.common/src/io/openems/edge/common/channel/calculate/CalculateAverage.java
@@ -3,7 +3,6 @@
 import java.util.ArrayList;
 import java.util.List;
 import java.util.NoSuchElementException;
-import java.util.Optional;
 
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -20,11 +19,11 @@ public class CalculateAverage {
 
 	/**
 	 * Adds a Channel-Value.
-	 * 
+	 *
 	 * @param channel
 	 */
 	public void addValue(Channel<Integer> channel) {
-		Optional<Integer> value = channel.value().asOptional();
+		var value = channel.value().asOptional();
 		if (value.isPresent()) {
 			try {
 				this.values.add(Double.valueOf(value.get()));
@@ -38,7 +37,7 @@ public void addValue(Channel<Integer> channel) {
 
 	/**
 	 * Calculates the average.
-	 * 
+	 *
 	 * @return the average or null
 	 */
 	public Double calculate() throws NoSuchElementException {
@@ -54,20 +53,18 @@ public Double calculate() throws NoSuchElementException {
 
 	/**
 	 * Calculates the average and rounds to Integer.
-	 * 
+	 *
 	 * @return the average or null
 	 */
 	public Integer calculateRounded() throws NoSuchElementException {
-		Double value = this.calculate();
+		var value = this.calculate();
 		if (value == null) {
 			return null;
 		}
-		long longValue = Math.round(value);
+		var longValue = Math.round(value);
 		if (longValue >= Integer.MIN_VALUE && longValue <= Integer.MAX_VALUE) {
 			return Integer.valueOf((int) longValue);
-		} else {
-			throw new IllegalArgumentException(
-					"Cannot convert. Double [" + value + "] is not fitting in Integer range.");
 		}
+		throw new IllegalArgumentException("Cannot convert. Double [" + value + "] is not fitting in Integer range.");
 	}
 }
diff --git a/io.openems.edge.common/src/io/openems/edge/common/channel/calculate/CalculateIntegerSum.java b/io.openems.edge.common/src/io/openems/edge/common/channel/calculate/CalculateIntegerSum.java
index 6b2271dda5a..20d7587277e 100644
--- a/io.openems.edge.common/src/io/openems/edge/common/channel/calculate/CalculateIntegerSum.java
+++ b/io.openems.edge.common/src/io/openems/edge/common/channel/calculate/CalculateIntegerSum.java
@@ -3,7 +3,6 @@
 import java.util.ArrayList;
 import java.util.List;
 import java.util.NoSuchElementException;
-import java.util.Optional;
 import java.util.function.Function;
 
 import org.slf4j.Logger;
@@ -16,15 +15,15 @@
  */
 public class CalculateIntegerSum {
 
-	public static final Function<Integer, Integer> DIRECT_CONVERTER = (value) -> value;
-	public static final Function<Integer, Integer> DIVIDE_BY_THREE = (value) -> Math.round(value / 3f);
+	public static final Function<Integer, Integer> DIRECT_CONVERTER = value -> value;
+	public static final Function<Integer, Integer> DIVIDE_BY_THREE = value -> Math.round(value / 3f);
 
 	private final Logger log = LoggerFactory.getLogger(CalculateLongSum.class);
 	private final List<Integer> values = new ArrayList<>();
 
 	/**
 	 * Adds a Channel-Value.
-	 * 
+	 *
 	 * @param channel the Channel
 	 */
 	public void addValue(Channel<Integer> channel) {
@@ -33,12 +32,12 @@ public void addValue(Channel<Integer> channel) {
 
 	/**
 	 * Adds a Channel-Value.
-	 * 
+	 *
 	 * @param channel   the Channel
 	 * @param converter is applied to the channel value
 	 */
 	public void addValue(Channel<Integer> channel, Function<Integer, Integer> converter) {
-		Optional<Integer> value = channel.value().asOptional();
+		var value = channel.value().asOptional();
 		if (value.isPresent()) {
 			try {
 				this.values.add(converter.apply(value.get()));
@@ -52,7 +51,7 @@ public void addValue(Channel<Integer> channel, Function<Integer, Integer> conver
 
 	/**
 	 * Calculates the sum.
-	 * 
+	 *
 	 * @return the sum or null
 	 * @throws NoSuchElementException on error
 	 */
diff --git a/io.openems.edge.common/src/io/openems/edge/common/channel/calculate/CalculateLongSum.java b/io.openems.edge.common/src/io/openems/edge/common/channel/calculate/CalculateLongSum.java
index 38a85b4b53c..4a5aa843e40 100644
--- a/io.openems.edge.common/src/io/openems/edge/common/channel/calculate/CalculateLongSum.java
+++ b/io.openems.edge.common/src/io/openems/edge/common/channel/calculate/CalculateLongSum.java
@@ -3,7 +3,6 @@
 import java.util.ArrayList;
 import java.util.List;
 import java.util.NoSuchElementException;
-import java.util.Optional;
 
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -20,11 +19,11 @@ public class CalculateLongSum {
 
 	/**
 	 * Adds a Channel-Value.
-	 * 
+	 *
 	 * @param channel the Channel
 	 */
 	public void addValue(Channel<Long> channel) {
-		Optional<Long> value = channel.value().asOptional();
+		var value = channel.value().asOptional();
 		if (value.isPresent()) {
 			try {
 				this.values.add(value.get());
@@ -38,7 +37,7 @@ public void addValue(Channel<Long> channel) {
 
 	/**
 	 * Calculates the sum.
-	 * 
+	 *
 	 * @return the sum or null
 	 * @throws NoSuchElementException on error
 	 */
diff --git a/io.openems.edge.common/src/io/openems/edge/common/channel/internal/AbstractDoc.java b/io.openems.edge.common/src/io/openems/edge/common/channel/internal/AbstractDoc.java
index 44be47af9d8..14c5699fbe6 100644
--- a/io.openems.edge.common/src/io/openems/edge/common/channel/internal/AbstractDoc.java
+++ b/io.openems.edge.common/src/io/openems/edge/common/channel/internal/AbstractDoc.java
@@ -26,7 +26,7 @@ protected AbstractDoc(OpenemsType type) {
 
 	/**
 	 * Gets an instance of the correct subclass of myself.
-	 * 
+	 *
 	 * @return myself
 	 */
 	protected abstract AbstractDoc<T> self();
@@ -43,11 +43,11 @@ public OpenemsType getType() {
 
 	/**
 	 * Sets the {@link AccessMode} for the Channel.
-	 * 
+	 *
 	 * <p>
 	 * This is validated on construction of the Channel by
 	 * {@link AbstractReadChannel}
-	 * 
+	 *
 	 * @param accessMode the {@link AccessMode}
 	 * @return myself
 	 */
@@ -69,11 +69,11 @@ public AccessMode getAccessMode() {
 	/**
 	 * Sets the {@link PersistencePriority}. Defaults to
 	 * {@link PersistencePriority#VERY_LOW}.
-	 * 
+	 *
 	 * <p>
 	 * This parameter may be used by persistence services to decide, if the Channel
 	 * should be persisted to the hard disk.
-	 * 
+	 *
 	 * @param persistencePriority the {@link PersistencePriority}
 	 * @return myself
 	 */
@@ -94,7 +94,7 @@ public PersistencePriority getPersistencePriority() {
 
 	/**
 	 * Initial-Value. Default: none
-	 * 
+	 *
 	 * @param initialValue the initial value
 	 * @return myself
 	 */
@@ -105,7 +105,7 @@ public AbstractDoc<T> initialValue(T initialValue) {
 
 	/**
 	 * Gets the initial value.
-	 * 
+	 *
 	 * @return the initial value
 	 */
 	public T getInitialValue() {
@@ -140,7 +140,7 @@ public Unit getUnit() {
 
 	/**
 	 * Activates the more verbose debug mode.
-	 * 
+	 *
 	 * @return myself
 	 */
 	public AbstractDoc<T> debug() {
@@ -160,7 +160,7 @@ public boolean isDebug() {
 
 	/**
 	 * Provides a callback on initialization of the actual Channel.
-	 * 
+	 *
 	 * @param callback the method to call on initialization
 	 * @return myself
 	 */
@@ -171,7 +171,7 @@ public AbstractDoc<T> onInit(Consumer<Channel<T>> callback) {
 
 	/**
 	 * Gets the callbacks for initialization of the actual Channel.
-	 * 
+	 *
 	 * @return a list of callbacks
 	 */
 	protected List<Consumer<Channel<T>>> getOnInitCallbacks() {
@@ -181,12 +181,13 @@ protected List<Consumer<Channel<T>>> getOnInitCallbacks() {
 	/**
 	 * Creates an instance of {@link Channel} for the given Channel-ID using its
 	 * Channel-{@link AbstractDoc}.
-	 * 
+	 *
 	 * @param <C>       the {@link Channel} type
 	 * @param component the {@link OpenemsComponent}
 	 * @param channelId the {@link ChannelId}
 	 * @return the Channel
 	 */
+	@Override
 	public abstract <C extends Channel<?>> C createChannelInstance(OpenemsComponent component,
 			io.openems.edge.common.channel.ChannelId channelId);
 }
diff --git a/io.openems.edge.common/src/io/openems/edge/common/channel/internal/AbstractReadChannel.java b/io.openems.edge.common/src/io/openems/edge/common/channel/internal/AbstractReadChannel.java
index e071083c635..8e70aa3e969 100644
--- a/io.openems.edge.common/src/io/openems/edge/common/channel/internal/AbstractReadChannel.java
+++ b/io.openems.edge.common/src/io/openems/edge/common/channel/internal/AbstractReadChannel.java
@@ -43,8 +43,8 @@ protected AbstractReadChannel(OpenemsType type, OpenemsComponent parent, Channel
 		this.parent = parent;
 		this.channelId = channelId;
 		this.channelDoc = channelDoc;
-		this.nextValue = new Value<T>(this, null);
-		this.activeValue = new Value<T>(this, null);
+		this.nextValue = new Value<>(this, null);
+		this.activeValue = new Value<>(this, null);
 
 		// validate Type
 		if (!this.validateType(channelDoc.getType(), type)) {
@@ -99,7 +99,7 @@ public OpenemsComponent getComponent() {
 
 	@Override
 	public void nextProcessImage() {
-		Value<T> oldValue = this.activeValue;
+		var oldValue = this.activeValue;
 		final boolean valueHasChanged;
 		if (oldValue == null && this.nextValue == null) {
 			valueHasChanged = false;
@@ -128,12 +128,13 @@ public OpenemsType getType() {
 
 	/**
 	 * Sets the next value. Internal method. Do not call directly.
-	 * 
+	 *
 	 * @param value the next value
 	 */
+	@Override
 	@Deprecated
 	public void _setNextValue(T value) {
-		this.nextValue = new Value<T>(this, value);
+		this.nextValue = new Value<>(this, value);
 		if (this.channelDoc.isDebug()) {
 			this.log.info("Next value for [" + this.address() + "]: " + this.nextValue.asString());
 		}
@@ -216,7 +217,7 @@ protected List<ThrowingConsumer<T, OpenemsNamedException>> getOnSetNextWrites()
 
 	/**
 	 * Validates the Type of the Channel.
-	 * 
+	 *
 	 * @param expected the expected Type
 	 * @param actual   the actual Type
 	 * @return true if validation ok
@@ -252,7 +253,7 @@ private boolean validateType(OpenemsType expected, OpenemsType actual) {
 
 	/**
 	 * Gets the past values for this Channel.
-	 * 
+	 *
 	 * @return a map of recording time and historic value at that time
 	 */
 	@Override
diff --git a/io.openems.edge.common/src/io/openems/edge/common/channel/internal/OpenemsTypeDoc.java b/io.openems.edge.common/src/io/openems/edge/common/channel/internal/OpenemsTypeDoc.java
index c5fd4a7bb74..34a45c46dc8 100644
--- a/io.openems.edge.common/src/io/openems/edge/common/channel/internal/OpenemsTypeDoc.java
+++ b/io.openems.edge.common/src/io/openems/edge/common/channel/internal/OpenemsTypeDoc.java
@@ -45,13 +45,14 @@ public ChannelCategory getChannelCategory() {
 
 	/**
 	 * Sets the Access-Mode for the Channel.
-	 * 
+	 *
 	 * <p>
 	 * This is validated on construction of the Channel by
 	 * {@link AbstractReadChannel}
-	 * 
+	 *
 	 * @return myself
 	 */
+	@Override
 	public OpenemsTypeDoc<T> accessMode(AccessMode accessMode) {
 		super.accessMode(accessMode);
 		return this;
@@ -64,7 +65,7 @@ public OpenemsTypeDoc<T> accessMode(AccessMode accessMode) {
 
 	/**
 	 * Unit. Default: none
-	 * 
+	 *
 	 * @param unit the Unit
 	 * @return myself
 	 */
@@ -75,7 +76,7 @@ public OpenemsTypeDoc<T> unit(Unit unit) {
 
 	/**
 	 * Gets the Unit.
-	 * 
+	 *
 	 * @return the unit
 	 */
 	@Override
diff --git a/io.openems.edge.common/src/io/openems/edge/common/channel/internal/StateCollectorChannel.java b/io.openems.edge.common/src/io/openems/edge/common/channel/internal/StateCollectorChannel.java
index 65cd0733ae7..8cf7aba1589 100644
--- a/io.openems.edge.common/src/io/openems/edge/common/channel/internal/StateCollectorChannel.java
+++ b/io.openems.edge.common/src/io/openems/edge/common/channel/internal/StateCollectorChannel.java
@@ -1,6 +1,5 @@
 package io.openems.edge.common.channel.internal;
 
-import java.util.Collection;
 import java.util.Collections;
 import java.util.HashMap;
 import java.util.Map;
@@ -19,8 +18,8 @@
 import io.openems.edge.common.component.OpenemsComponent;
 
 /**
- * Collects the values of all {@link StateChannel}s. This class is used for
- * the "State" Channel of every OpenEMS Component.
+ * Collects the values of all {@link StateChannel}s. This class is used for the
+ * "State" Channel of every OpenEMS Component.
  */
 public class StateCollectorChannel extends EnumReadChannel {
 
@@ -42,8 +41,7 @@ protected StateCollectorChannel(OpenemsComponent parent, ChannelId channelId, St
 
 	@Override
 	public Value<Integer> value() {
-		Value<Integer> result = super.value();
-		return result;
+		return super.value();
 	}
 
 	private final BiConsumer<StateChannel, Value<Boolean>> onChangeFunction = (channel, value) -> {
@@ -60,10 +58,10 @@ public Value<Integer> value() {
 
 		/*
 		 * Set my own next value according to activeStates.
-		 * 
+		 *
 		 * Higher value of Level beats lower value.
 		 */
-		int nextValue = 0;
+		var nextValue = 0;
 		for (Level level : Level.values()) {
 			if (this.activeStates.get(level).size() > 0) {
 				nextValue = Math.max(nextValue, level.getValue());
@@ -74,7 +72,7 @@ public Value<Integer> value() {
 
 	/**
 	 * Adds a Channel to this StateCollector.
-	 * 
+	 *
 	 * @param channel the Channel
 	 */
 	public void addChannel(StateChannel channel) {
@@ -89,7 +87,7 @@ public void addChannel(StateChannel channel) {
 	 * Removes a Channel from this StateCollector.
 	 * <p>
 	 * The onChange listener is removed by the {@link Channel#deactivate()} method.
-	 * 
+	 *
 	 * @param channel the Channel
 	 */
 	public void removeChannel(StateChannel channel) {
@@ -99,7 +97,7 @@ public void removeChannel(StateChannel channel) {
 
 	/**
 	 * Lists all States as Text
-	 * 
+	 *
 	 * @return the text
 	 */
 	public String listStates() {
@@ -108,18 +106,18 @@ public String listStates() {
 
 	/**
 	 * Lists all States that are at least 'fromLevel' as text.
-	 * 
+	 *
 	 * @param fromLevel the minimum Level
 	 * @return the text
 	 */
 	public String listStates(Level fromLevel) {
-		StringBuilder result = new StringBuilder();
+		var result = new StringBuilder();
 		for (Level level : Level.values()) {
 			if (level.ordinal() < fromLevel.ordinal()) {
 				// filter levels below 'fromLevel'
 				continue;
 			}
-			Collection<ChannelId> channelIds = this.activeStates.get(level);
+			var channelIds = this.activeStates.get(level);
 			if (channelIds.size() > 0) {
 				if (result.length() > 0) {
 					result.append("| ");
@@ -127,7 +125,7 @@ public String listStates(Level fromLevel) {
 				result.append(level.name() + ": ");
 				result.append(channelIds.stream() //
 						.map(channelId -> {
-							String docText = this.parent.channel(channelId).channelDoc().getText();
+							var docText = this.parent.channel(channelId).channelDoc().getText();
 							if (!docText.isEmpty()) {
 								return docText;
 							}
diff --git a/io.openems.edge.common/src/io/openems/edge/common/channel/internal/StateCollectorChannelDoc.java b/io.openems.edge.common/src/io/openems/edge/common/channel/internal/StateCollectorChannelDoc.java
index d7d500f9929..c70ad40756c 100644
--- a/io.openems.edge.common/src/io/openems/edge/common/channel/internal/StateCollectorChannelDoc.java
+++ b/io.openems.edge.common/src/io/openems/edge/common/channel/internal/StateCollectorChannelDoc.java
@@ -15,7 +15,7 @@ public StateCollectorChannelDoc() {
 	/**
 	 * Creates an instance of {@link Channel} for the given Channel-ID using its
 	 * Channel-{@link Doc}.
-	 * 
+	 *
 	 * @param channelId the Channel-ID
 	 * @return the Channel
 	 */
diff --git a/io.openems.edge.common/src/io/openems/edge/common/channel/value/Value.java b/io.openems.edge.common/src/io/openems/edge/common/channel/value/Value.java
index 1db3f7b6b59..428d88daf6b 100644
--- a/io.openems.edge.common/src/io/openems/edge/common/channel/value/Value.java
+++ b/io.openems.edge.common/src/io/openems/edge/common/channel/value/Value.java
@@ -18,9 +18,9 @@
  * Device or Service, or because the system is just starting up and does not yet
  * have any data. This class wraps a 'value' information for a Channel and
  * provides convenience methods for retrieving it.
- * 
+ *
  * <p>
- * 
+ *
  * To get the actual value of a Channel using this object, typically one of the
  * following methods will fit:
  * <ul>
@@ -31,7 +31,7 @@
  * <li>{@link #orElse(Object)}: gets the value; or fallback alternative if the
  * value is null
  * </ul>
- * 
+ *
  * @param <T> the type of the value
  */
 public class Value<T> {
@@ -50,27 +50,27 @@ public Value(Channel<T> parent, T value) {
 
 	/**
 	 * Gets the value as a formatted String with its unit. (Same as toString())
-	 * 
+	 *
 	 * @return
 	 */
 	public String asString() {
 		return this.toString();
 	}
 
+	@Override
 	public String toString() {
-		if (this.value == null) {
-			EnumDoc enumDoc = this.isEnumValue();
-			if (enumDoc != null) {
-				// special handling for EnumDocs
-				return enumDoc.getOptionString(null);
-			} else {
-				return UNDEFINED_VALUE_STRING;
-			}
-		} else {
-			String optionString = this.asOptionString();
+		if (this.value != null) {
+			var optionString = this.asOptionString();
 			return this.parent.channelDoc().getUnit().format(this.value, this.parent.getType())
 					+ (optionString.isEmpty() ? "" : ":" + optionString);
 		}
+		var enumDoc = this.isEnumValue();
+		if (enumDoc != null) {
+			// special handling for EnumDocs
+			return enumDoc.getOptionString(null);
+		} else {
+			return UNDEFINED_VALUE_STRING;
+		}
 	}
 
 	/**
@@ -79,7 +79,7 @@ public String toString() {
 	 * @return
 	 */
 	public String asStringWithoutUnit() {
-		T value = this.get();
+		var value = this.get();
 		if (value == null) {
 			return Value.UNDEFINED_VALUE_STRING;
 		}
@@ -101,7 +101,7 @@ public T get() {
 	 * @return
 	 */
 	public T getOrError() throws InvalidValueException {
-		T value = this.get();
+		var value = this.get();
 		if (value != null) {
 			return value;
 		}
@@ -115,7 +115,7 @@ public T getOrError() throws InvalidValueException {
 	 */
 	public Optional<T> asOptional() {
 		return Optional.ofNullable(this.get());
-	};
+	}
 
 	/**
 	 * Is the value defined?. This is an abbreviation for
@@ -125,7 +125,7 @@ public Optional<T> asOptional() {
 	 */
 	public boolean isDefined() {
 		return this.asOptional().isPresent();
-	};
+	}
 
 	/**
 	 * Gets the value or the given alternativeValue. This is short for
@@ -135,7 +135,7 @@ public boolean isDefined() {
 	 */
 	public T orElse(T alternativeValue) {
 		return Optional.ofNullable(this.get()).orElse(alternativeValue);
-	};
+	}
 
 	/**
 	 * Gets the value as its String option. Enum options are converted to Strings.
@@ -144,18 +144,17 @@ public T orElse(T alternativeValue) {
 	 * @return
 	 */
 	public String asOptionString() {
-		EnumDoc enumDoc = this.isEnumValue();
-		if (enumDoc != null) {
-			T value = this.get();
-			try {
-				Integer intValue = TypeUtils.<Integer>getAsType(OpenemsType.INTEGER, value);
-				return enumDoc.getOptionString(intValue);
-			} catch (IllegalArgumentException e) {
-				return enumDoc.getOptionString(null);
-			}
-		} else {
+		var enumDoc = this.isEnumValue();
+		if (enumDoc == null) {
 			return "";
 		}
+		var value = this.get();
+		try {
+			var intValue = TypeUtils.<Integer>getAsType(OpenemsType.INTEGER, value);
+			return enumDoc.getOptionString(intValue);
+		} catch (IllegalArgumentException e) {
+			return enumDoc.getOptionString(null);
+		}
 	}
 
 	/**
@@ -166,26 +165,25 @@ public String asOptionString() {
 	 */
 	@SuppressWarnings("unchecked")
 	public <O extends OptionsEnum> O asEnum() {
-		EnumDoc enumDoc = this.isEnumValue();
-		if (enumDoc != null) {
-			T value = this.get();
-			if (value == null) {
-				return (O) enumDoc.getOption(null);
-			}
-			try {
-				int intValue = TypeUtils.<Integer>getAsType(OpenemsType.INTEGER, value);
-				return (O) enumDoc.getOption(intValue);
-			} catch (Exception e) {
-				return (O) enumDoc.getOption(null);
-			}
-		} else {
+		var enumDoc = this.isEnumValue();
+		if (enumDoc == null) {
 			return null;
 		}
+		var value = this.get();
+		if (value == null) {
+			return (O) enumDoc.getOption(null);
+		}
+		try {
+			int intValue = TypeUtils.<Integer>getAsType(OpenemsType.INTEGER, value);
+			return (O) enumDoc.getOption(intValue);
+		} catch (Exception e) {
+			return (O) enumDoc.getOption(null);
+		}
 	}
 
 	/**
 	 * Gets the value in GSON JSON format
-	 * 
+	 *
 	 * @return
 	 */
 	public JsonElement asJson() {
@@ -194,22 +192,20 @@ public JsonElement asJson() {
 
 	/**
 	 * Internal helper to find out if this Value refers to an EnumValue.
-	 * 
+	 *
 	 * @return the corresponding {@link EnumDoc}; or null if this Value is not an
 	 *         enum
 	 */
 	private EnumDoc isEnumValue() {
 		if (this.parent.channelDoc() instanceof EnumDoc) {
-			EnumDoc enumDoc = (EnumDoc) this.parent.channelDoc();
-			return enumDoc;
-		} else {
-			return null;
+			return (EnumDoc) this.parent.channelDoc();
 		}
+		return null;
 	}
 
 	/**
 	 * Gets the timestamp when the value was created.
-	 * 
+	 *
 	 * @return the timestamp
 	 */
 	public LocalDateTime getTimestamp() {
diff --git a/io.openems.edge.common/src/io/openems/edge/common/component/AbstractOpenemsComponent.java b/io.openems.edge.common/src/io/openems/edge/common/component/AbstractOpenemsComponent.java
index df9d5672f01..009ade1319a 100644
--- a/io.openems.edge.common/src/io/openems/edge/common/component/AbstractOpenemsComponent.java
+++ b/io.openems.edge.common/src/io/openems/edge/common/component/AbstractOpenemsComponent.java
@@ -8,11 +8,9 @@
 import java.util.concurrent.atomic.AtomicInteger;
 import java.util.concurrent.atomic.AtomicReference;
 
-import org.osgi.framework.Bundle;
 import org.osgi.framework.ServiceReference;
 import org.osgi.service.component.ComponentConstants;
 import org.osgi.service.component.ComponentContext;
-import org.osgi.service.metatype.MetaTypeInformation;
 import org.osgi.service.metatype.MetaTypeService;
 import org.osgi.service.metatype.ObjectClassDefinition;
 import org.osgi.util.tracker.ServiceTracker;
@@ -35,7 +33,7 @@
 
 /**
  * This is the default implementation of the {@link OpenemsComponent} interface.
- * 
+ *
  * {@link #activate(ComponentContext, String, boolean)} and
  * {@link #deactivate()} methods should be called by the corresponding methods
  * in the OSGi component.
@@ -59,24 +57,24 @@ public abstract class AbstractOpenemsComponent implements OpenemsComponent {
 	private boolean enabled = true;
 
 	private ServiceTracker<MetaTypeService, MetaTypeService> metaTypeServiceTracker = null;
-	private AtomicReference<MetaTypeService> metaTypeService = new AtomicReference<>();
+	private final AtomicReference<MetaTypeService> metaTypeService = new AtomicReference<>();
 
 	/**
 	 * Default constructor for AbstractOpenemsComponent.
-	 * 
+	 *
 	 * <p>
 	 * Automatically initializes (i.e. creates {@link Channel} instances for each
 	 * given {@link ChannelId} using the Channel-{@link Doc}.
-	 * 
+	 *
 	 * <p>
 	 * It is important to list all Channel-ID enums of all inherited
 	 * OpenEMS-Natures, i.e. for every OpenEMS Java interface you are implementing,
 	 * you need to list the interface' ChannelID-enum here like
 	 * Interface.ChannelId.values().
-	 * 
+	 *
 	 * <p>
 	 * Use as follows:
-	 * 
+	 *
 	 * <pre>
 	 * public YourPhantasticOpenemsComponent() {
 	 * 	super(//
@@ -84,17 +82,17 @@ public abstract class AbstractOpenemsComponent implements OpenemsComponent {
 	 * 			YourPhantasticOpenemsComponent.ChannelId.values());
 	 * }
 	 * </pre>
-	 * 
+	 *
 	 * <p>
 	 * Note: the separation in firstInitialChannelIds and furtherInitialChannelIds
 	 * is only there to enforce that calling the constructor cannot be forgotten.
 	 * This way it needs to be called with at least one parameter - which is always
 	 * at least "OpenemsComponent.ChannelId.values()". Just use it as if it was:
-	 * 
+	 *
 	 * <pre>
 	 * AbstractOpenemsComponent(ChannelId[]... channelIds)
 	 * </pre>
-	 * 
+	 *
 	 * @param firstInitialChannelIds   the Channel-IDs to initialize.
 	 * @param furtherInitialChannelIds the Channel-IDs to initialize.
 	 */
@@ -106,7 +104,7 @@ protected AbstractOpenemsComponent(io.openems.edge.common.channel.ChannelId[] fi
 
 	/**
 	 * Handles @Activate of implementations. Prints log output.
-	 * 
+	 *
 	 * @param context the OSGi ComponentContext
 	 * @param id      the unique OpenEMS Component ID
 	 * @param alias   Human-readable name of this Component. Typically
@@ -118,12 +116,12 @@ protected void activate(ComponentContext context, String id, String alias, boole
 		// If we wouldn't do this here, each inheriting Component would have to get an
 		// @Reference to MetaTypeService, which would be cumbersome.
 		if (context != null && context.getBundleContext() != null) {
-			this.metaTypeServiceTracker = new ServiceTracker<MetaTypeService, MetaTypeService>(
+			this.metaTypeServiceTracker = new ServiceTracker<>(
 					context.getBundleContext(), MetaTypeService.class, null) {
 
 				@Override
 				public MetaTypeService addingService(ServiceReference<MetaTypeService> serviceReference) {
-					MetaTypeService metaTypeService = super.addingService(serviceReference);
+					var metaTypeService = super.addingService(serviceReference);
 					AbstractOpenemsComponent.this.metaTypeService.set(metaTypeService);
 					AbstractOpenemsComponent.this.addChannelsForProperties();
 					return metaTypeService;
@@ -150,7 +148,7 @@ public void removedService(ServiceReference<MetaTypeService> serviceReference,
 
 	/**
 	 * Handles @Modified of implementations.
-	 * 
+	 *
 	 * @param context the OSGi ComponentContext
 	 * @param id      the unique OpenEMS Component ID
 	 * @param alias   Human-readable name of this Component. Typically
@@ -199,7 +197,7 @@ public ComponentContext getComponentContext() {
 
 	/**
 	 * Helper method to update the Context on @Activate and @Modified.
-	 * 
+	 *
 	 * @param context the OSGi ComponentContext
 	 * @param id      the unique OpenEMS Component ID
 	 * @param alias   Human-readable name of this Component. Typically
@@ -229,7 +227,7 @@ private void updateContext(ComponentContext context, String id, String alias, bo
 
 	/**
 	 * Add a Channel for each Property and set the configured value.
-	 * 
+	 *
 	 * <p>
 	 * If the Property key is "enabled" then a Channel with the ID
 	 * "_PropertyEnabled" is generated.
@@ -237,28 +235,28 @@ private void updateContext(ComponentContext context, String id, String alias, bo
 	private synchronized void addChannelsForProperties() {
 		// Make sure ComponentContext, MetaTypeService, Bundle and MetaTypeInformation
 		// are available
-		final ComponentContext context = this.componentContext;
-		final MetaTypeService metaTypeService = this.metaTypeService.get();
+		final var context = this.componentContext;
+		final var metaTypeService = this.metaTypeService.get();
 		if (context == null || metaTypeService == null) {
 			return;
 		}
-		final Bundle bundle = context.getUsingBundle();
+		final var bundle = context.getUsingBundle();
 		if (bundle == null) {
 			return;
 		}
-		final MetaTypeInformation mti = metaTypeService.getMetaTypeInformation(bundle);
+		final var mti = metaTypeService.getMetaTypeInformation(bundle);
 		if (mti == null) {
 			return;
 		}
-		final Dictionary<String, Object> properties = context.getProperties();
+		final var properties = context.getProperties();
 		if (properties == null) {
 			return;
 		}
 
 		// get Factory-PIDs in this Bundle
-		String[] factoryPids = mti.getFactoryPids();
+		var factoryPids = mti.getFactoryPids();
 		for (String factoryPid : factoryPids) {
-			ObjectClassDefinition ocd = mti.getObjectClassDefinition(factoryPid, null);
+			var ocd = mti.getObjectClassDefinition(factoryPid, null);
 			this.addChannelsForProperties(ocd, properties);
 		}
 
@@ -266,7 +264,7 @@ private synchronized void addChannelsForProperties() {
 		for (String pid : mti.getPids()) {
 			switch (pid) {
 			default:
-				ObjectClassDefinition ocd = mti.getObjectClassDefinition(pid, null);
+				var ocd = mti.getObjectClassDefinition(pid, null);
 				this.addChannelsForProperties(ocd, properties);
 			}
 		}
@@ -274,7 +272,7 @@ private synchronized void addChannelsForProperties() {
 
 	/**
 	 * Adds Channels for Properties defined by {@link ObjectClassDefinition}..
-	 * 
+	 *
 	 * @param ocd        The {@link ObjectClassDefinition}, i.e. the main annotation
 	 *                   on the Config class
 	 * @param properties the configuration properties {@link Dictionary}
@@ -288,7 +286,7 @@ private void addChannelsForProperties(ObjectClassDefinition ocd, Dictionary<Stri
 
 			// Evaluate Channel-Type
 			final OpenemsType channelType;
-			Object propertyValue = properties.get(property.getId());
+			var propertyValue = properties.get(property.getId());
 			if (propertyValue != null && propertyValue.getClass().isArray() && Array.getLength(propertyValue) > 1) {
 				// Arrays with more than one value can only be stored as string
 				channelType = OpenemsType.STRING;
@@ -297,7 +295,7 @@ private void addChannelsForProperties(ObjectClassDefinition ocd, Dictionary<Stri
 			}
 
 			// Create Channel
-			String channelName = PROPERTY_CHANNEL_ID_PREFIX
+			var channelName = PROPERTY_CHANNEL_ID_PREFIX
 					+ CaseFormat.LOWER_CAMEL.to(CaseFormat.UPPER_UNDERSCORE, property.getId().replace(".", "_"));
 			Channel<?> channel = this.channels
 					.get(io.openems.edge.common.channel.ChannelId.channelIdUpperToCamel(channelName));
@@ -341,17 +339,17 @@ public Doc doc() {
 
 	/**
 	 * Initializes the given Channel-ID.
-	 * 
+	 *
 	 * <ul>
 	 * <li>Creates an object instance from Channel-Doc
 	 * <li>Registers the Channel
 	 * </ul>
-	 * 
+	 *
 	 * @param channelId the given Channel-ID
 	 * @return the newly created Channel
 	 */
 	protected Channel<?> addChannel(io.openems.edge.common.channel.ChannelId channelId) {
-		Doc doc = channelId.doc();
+		var doc = channelId.doc();
 		Channel<?> channel = doc.createChannelInstance(this, channelId);
 		this.addChannel(channel);
 		return channel;
@@ -359,7 +357,7 @@ protected Channel<?> addChannel(io.openems.edge.common.channel.ChannelId channel
 
 	/**
 	 * Adds a Channel to this Component.
-	 * 
+	 *
 	 * @param channel the Channel
 	 * @throws NullPointerException     if the Channel was not initialized.
 	 * @throws IllegalArgumentException if the Channel-ID had already been added.
@@ -383,12 +381,12 @@ private void addChannel(Channel<?> channel) throws NullPointerException, Illegal
 
 	/**
 	 * Initializes the given Channel-IDs.
-	 * 
+	 *
 	 * <ul>
 	 * <li>Creates object instances from Channel-Doc
 	 * <li>Registers the Channels
 	 * </ul>
-	 * 
+	 *
 	 * @param initialChannelIds the given Channel-IDs
 	 */
 	protected void addChannels(io.openems.edge.common.channel.ChannelId[] initialChannelIds) {
@@ -399,12 +397,12 @@ protected void addChannels(io.openems.edge.common.channel.ChannelId[] initialCha
 
 	/**
 	 * Initializes the given Channel-IDs.
-	 * 
+	 *
 	 * <ul>
 	 * <li>Creates object instances from Channel-Doc
 	 * <li>Registers the Channels
 	 * </ul>
-	 * 
+	 *
 	 * @param initialChannelIds the given Channel-IDs
 	 */
 	protected void addChannels(io.openems.edge.common.channel.ChannelId[][] initialChannelIds) {
@@ -417,19 +415,19 @@ protected void addChannels(io.openems.edge.common.channel.ChannelId[][] initialC
 
 	/**
 	 * Nicely writes a log message on activate/deactivate/modified events.
-	 * 
+	 *
 	 * @param message the message
 	 */
 	private void logMessage(String message) {
 		// by default: use the class name
-		String name = this.getClass().getSimpleName();
+		var name = this.getClass().getSimpleName();
 
 		// try to find the component name
-		ComponentContext context = this.componentContext;
+		var context = this.componentContext;
 		if (context != null) {
-			Dictionary<String, Object> properties = context.getProperties();
+			var properties = context.getProperties();
 			if (properties != null) {
-				Object obj = properties.get(ComponentConstants.COMPONENT_NAME);
+				var obj = properties.get(ComponentConstants.COMPONENT_NAME);
 				if (obj != null) {
 					name = obj.toString();
 				}
@@ -451,13 +449,12 @@ public String alias() {
 	@Deprecated()
 	@Override
 	public Channel<?> _channel(String channelName) {
-		Channel<?> channel = this.channels.get(channelName);
-		return channel;
+		return this.channels.get(channelName);
 	}
 
 	/**
 	 * Removes a Channel from this Component.
-	 * 
+	 *
 	 * @param channel the Channel
 	 */
 	// TODO remove Channel(s) using Channel-ID; see addChannels()-method above.
@@ -477,7 +474,7 @@ public Collection<Channel<?>> channels() {
 
 	/**
 	 * Log a debug message including the Component ID.
-	 * 
+	 *
 	 * @param log     the Logger instance
 	 * @param message the message
 	 */
@@ -487,7 +484,7 @@ protected void logDebug(Logger log, String message) {
 
 	/**
 	 * Log an info message including the Component ID.
-	 * 
+	 *
 	 * @param log     the Logger instance
 	 * @param message the message
 	 */
@@ -497,7 +494,7 @@ protected void logInfo(Logger log, String message) {
 
 	/**
 	 * Log a warn message including the Component ID.
-	 * 
+	 *
 	 * @param log     the Logger instance
 	 * @param message the message
 	 */
@@ -507,7 +504,7 @@ protected void logWarn(Logger log, String message) {
 
 	/**
 	 * Log an error message including the Component ID.
-	 * 
+	 *
 	 * @param log     the Logger instance
 	 * @param message the message
 	 */
diff --git a/io.openems.edge.common/src/io/openems/edge/common/component/ClockProvider.java b/io.openems.edge.common/src/io/openems/edge/common/component/ClockProvider.java
index ba23da44d2f..f24b2035826 100644
--- a/io.openems.edge.common/src/io/openems/edge/common/component/ClockProvider.java
+++ b/io.openems.edge.common/src/io/openems/edge/common/component/ClockProvider.java
@@ -2,6 +2,8 @@
 
 import java.time.Clock;
 
+import io.openems.edge.common.test.TimeLeapClock;
+
 /**
  * {@link ClockProvider} provides a Clock - real or mocked like
  * {@link TimeLeapClock}.
@@ -10,7 +12,7 @@ public interface ClockProvider {
 
 	/**
 	 * Gets the Clock - real or mocked like {@link TimeLeapClock}.
-	 * 
+	 *
 	 * @return the {@link Clock}
 	 */
 	public Clock getClock();
diff --git a/io.openems.edge.common/src/io/openems/edge/common/component/ComponentManager.java b/io.openems.edge.common/src/io/openems/edge/common/component/ComponentManager.java
index be5d6c9cd9a..953e6947849 100644
--- a/io.openems.edge.common/src/io/openems/edge/common/component/ComponentManager.java
+++ b/io.openems.edge.common/src/io/openems/edge/common/component/ComponentManager.java
@@ -38,6 +38,7 @@ private ChannelId(Doc doc) {
 			this.doc = doc;
 		}
 
+		@Override
 		public Doc doc() {
 			return this.doc;
 		}
@@ -162,14 +163,15 @@ public default void _setDefaultConfigurationFailed(boolean value) {
 	/**
 	 * Gets the OpenEMS Clock - either the real system clock or a mocked clock for
 	 * simulations.
-	 * 
+	 *
 	 * @return the Clock
 	 */
+	@Override
 	public Clock getClock();
 
 	/**
 	 * Gets all enabled OpenEMS-Components.
-	 * 
+	 *
 	 * @return a List of OpenEMS-Components
 	 * @throws IllegalArgumentException if the Component was not found
 	 */
@@ -177,7 +179,7 @@ public default void _setDefaultConfigurationFailed(boolean value) {
 
 	/**
 	 * Gets all enabled OpenEMS-Components of the given Type.
-	 * 
+	 *
 	 * @param <T>   the given Type, subclass of {@link OpenemsComponent}
 	 * @param clazz the given Type, subclass of {@link OpenemsComponent}
 	 * @return a List of OpenEMS-Components
@@ -186,7 +188,7 @@ public default void _setDefaultConfigurationFailed(boolean value) {
 
 	/**
 	 * Gets all OpenEMS-Components.
-	 * 
+	 *
 	 * @return a List of OpenEMS-Components
 	 * @throws IllegalArgumentException if the Component was not found
 	 */
@@ -195,7 +197,7 @@ public default void _setDefaultConfigurationFailed(boolean value) {
 	/**
 	 * Gets a OpenEMS-Component by its Component-ID. The Component is guaranteed to
 	 * be enabled.
-	 * 
+	 *
 	 * @param componentId the Component-ID (e.g. "_sum")
 	 * @param <T>         the typed Component
 	 * @return the OpenEMS-Component
@@ -206,7 +208,7 @@ public default <T extends OpenemsComponent> T getComponent(String componentId) t
 		if (SINGLETON_COMPONENT_ID.equals(componentId)) {
 			return (T) this;
 		}
-		List<OpenemsComponent> components = this.getEnabledComponents();
+		var components = this.getEnabledComponents();
 		for (OpenemsComponent component : components) {
 			if (component.id().equals(componentId)) {
 				return (T) component;
@@ -219,7 +221,7 @@ public default <T extends OpenemsComponent> T getComponent(String componentId) t
 	 * Gets a OpenEMS-Component by its Component-ID. Be careful, that the Component
 	 * might not be 'enabled'. If in doubt, use {@link #getComponent(String)}
 	 * instead.
-	 * 
+	 *
 	 * @param componentId the Component-ID (e.g. "_sum")
 	 * @param <T>         the typed Component
 	 * @return the OpenEMS-Component
@@ -231,7 +233,7 @@ public default <T extends OpenemsComponent> T getPossiblyDisabledComponent(Strin
 		if (SINGLETON_COMPONENT_ID.equals(componentId)) {
 			return (T) this;
 		}
-		List<OpenemsComponent> components = this.getAllComponents();
+		var components = this.getAllComponents();
 		for (OpenemsComponent component : components) {
 			if (component.id().equals(componentId)) {
 				return (T) component;
@@ -242,7 +244,7 @@ public default <T extends OpenemsComponent> T getPossiblyDisabledComponent(Strin
 
 	/**
 	 * Gets a Channel by its Channel-Address.
-	 * 
+	 *
 	 * @param channelAddress the Channel-Address
 	 * @param <T>            the typed Channel
 	 * @return the Channel
@@ -251,17 +253,17 @@ public default <T extends OpenemsComponent> T getPossiblyDisabledComponent(Strin
 	 */
 	public default <T extends Channel<?>> T getChannel(ChannelAddress channelAddress)
 			throws IllegalArgumentException, OpenemsNamedException {
-		OpenemsComponent component = this.getComponent(channelAddress.getComponentId());
+		var component = this.getComponent(channelAddress.getComponentId());
 		return component.channel(channelAddress.getChannelId());
 	}
 
 	/**
 	 * Gets the complete configuration of this OpenEMS Edge.
-	 * 
+	 *
 	 * <p>
 	 * Internally updates the cache if necessary and publishes a CONFIG_UPDATE event
 	 * on update.
-	 * 
+	 *
 	 * @return the {@link EdgeConfig} object
 	 */
 	public EdgeConfig getEdgeConfig();
diff --git a/io.openems.edge.common/src/io/openems/edge/common/component/ComponentManagerProvider.java b/io.openems.edge.common/src/io/openems/edge/common/component/ComponentManagerProvider.java
index 50200e59390..8399eaea5a2 100644
--- a/io.openems.edge.common/src/io/openems/edge/common/component/ComponentManagerProvider.java
+++ b/io.openems.edge.common/src/io/openems/edge/common/component/ComponentManagerProvider.java
@@ -7,7 +7,7 @@ public interface ComponentManagerProvider extends OpenemsComponent {
 
 	/**
 	 * Gets the {@link ComponentManager} service.
-	 * 
+	 *
 	 * @return the service or null if it is not (yet) available.
 	 */
 	public ComponentManager getComponentManager();
diff --git a/io.openems.edge.common/src/io/openems/edge/common/component/OpenemsComponent.java b/io.openems.edge.common/src/io/openems/edge/common/component/OpenemsComponent.java
index 1279e161a0e..40020fc8699 100644
--- a/io.openems.edge.common/src/io/openems/edge/common/component/OpenemsComponent.java
+++ b/io.openems.edge.common/src/io/openems/edge/common/component/OpenemsComponent.java
@@ -2,7 +2,6 @@
 
 import java.io.IOException;
 import java.util.Collection;
-import java.util.Dictionary;
 import java.util.Hashtable;
 import java.util.stream.Collectors;
 import java.util.stream.Stream;
@@ -30,7 +29,7 @@
 /**
  * This is the base interface for and should be implemented by every service
  * component in OpenEMS Edge.
- * 
+ *
  * <p>
  * Every OpenEMS service has:
  * <ul>
@@ -44,7 +43,7 @@
  * <li>a kind of 'toString' method which provides the most important info about
  * the component. (see {@link #debugLog()})
  * </ul>
- * 
+ *
  * <p>
  * The recommended implementation of an OpenEMS component is via
  * {@link AbstractOpenemsComponent}.
@@ -53,35 +52,35 @@ public interface OpenemsComponent {
 
 	/**
 	 * Returns a unique ID for this OpenEMS component.
-	 * 
+	 *
 	 * @return the unique ID
 	 */
 	public String id();
 
 	/**
 	 * Returns a human-readable name of this Component..
-	 * 
+	 *
 	 * @return the human-readable name
 	 */
 	public String alias();
 
 	/**
 	 * Returns whether this component is enabled.
-	 * 
+	 *
 	 * @return true if the component is enabled
 	 */
 	public boolean isEnabled();
 
 	/**
 	 * Returns the Service PID.
-	 * 
+	 *
 	 * @return the OSGi Service PID
 	 */
 	default String servicePid() {
-		ComponentContext context = this.getComponentContext();
+		var context = this.getComponentContext();
 		if (context != null) {
-			Dictionary<String, Object> properties = context.getProperties();
-			Object servicePid = properties.get(Constants.SERVICE_PID);
+			var properties = context.getProperties();
+			var servicePid = properties.get(Constants.SERVICE_PID);
 			if (servicePid != null) {
 				return servicePid.toString();
 			}
@@ -91,15 +90,15 @@ default String servicePid() {
 
 	/**
 	 * Returns the Service Factory-PID.
-	 * 
+	 *
 	 * @return the OSGi Service Factory-PID
 	 */
 	default String serviceFactoryPid() {
-		ComponentContext context = this.getComponentContext();
+		var context = this.getComponentContext();
 		if (context != null) {
-			Dictionary<String, Object> properties = context.getProperties();
+			var properties = context.getProperties();
 
-			Object servicePid = properties.get("service.factoryPid");
+			var servicePid = properties.get("service.factoryPid");
 			if (servicePid != null) {
 				return servicePid.toString();
 			}
@@ -115,18 +114,18 @@ default String serviceFactoryPid() {
 
 	/**
 	 * Returns the ComponentContext.
-	 * 
+	 *
 	 * @return the OSGi ComponentContext
 	 */
 	public ComponentContext getComponentContext();
 
 	/**
 	 * Returns an undefined Channel defined by its ChannelId string representation.
-	 * 
+	 *
 	 * <p>
 	 * Note: It is preferred to use the typed channel()-method, that's why it is
 	 * marked as @Deprecated.
-	 * 
+	 *
 	 * @param channelName the Channel-ID as a string
 	 * @return the Channel or null
 	 */
@@ -135,7 +134,7 @@ default String serviceFactoryPid() {
 
 	/**
 	 * Returns a Channel defined by its ChannelId string representation.
-	 * 
+	 *
 	 * @param channelName the Channel-ID as a string
 	 * @param <T>         the expected typed Channel
 	 * @throws IllegalArgumentException on error
@@ -149,10 +148,9 @@ default <T extends Channel<?>> T channel(String channelName) throws IllegalArgum
 			if (this.id() == null) {
 				throw new IllegalArgumentException("Channel [" + channelName + "] is not defined for implementation ["
 						+ this.getClass().getCanonicalName() + "].");
-			} else {
-				throw new IllegalArgumentException("Channel [" + channelName + "] is not defined for ID [" + this.id()
-						+ "]. Implementation [" + this.getClass().getCanonicalName() + "]");
 			}
+			throw new IllegalArgumentException("Channel [" + channelName + "] is not defined for ID [" + this.id()
+					+ "]. Implementation [" + this.getClass().getCanonicalName() + "]");
 		}
 		// check correct type
 		T typedChannel;
@@ -167,7 +165,7 @@ default <T extends Channel<?>> T channel(String channelName) throws IllegalArgum
 
 	/**
 	 * Returns a Channel defined by its ChannelId.
-	 * 
+	 *
 	 * @param <T>       the Type of the Channel. See {@link Doc#getType()}
 	 * @param channelId the Channel-ID
 	 * @return the Channel
@@ -175,13 +173,12 @@ default <T extends Channel<?>> T channel(String channelName) throws IllegalArgum
 	 */
 	default <T extends Channel<?>> T channel(io.openems.edge.common.channel.ChannelId channelId)
 			throws IllegalArgumentException {
-		T channel = this.<T>channel(channelId.id());
-		return channel;
+		return this.<T>channel(channelId.id());
 	}
 
 	/**
 	 * Returns all Channels.
-	 * 
+	 *
 	 * @return a Collection of Channels
 	 */
 	public Collection<Channel<?>> channels();
@@ -191,9 +188,7 @@ public enum ChannelId implements io.openems.edge.common.channel.ChannelId {
 		STATE(new StateCollectorChannelDoc() //
 				// Set Text to "0:Ok, 1:Info, 2:Warning, 3:Fault"
 				.text(Stream.of(Level.values()) //
-						.map(option -> { //
-							return option.getValue() + ":" + option.getName(); //
-						}) //
+						.map(option -> (option.getValue() + ":" + option.getName())) //
 						.collect(Collectors.joining(", "))) //
 				.persistencePriority(PersistencePriority.VERY_HIGH));
 
@@ -212,7 +207,7 @@ public Doc doc() {
 	/**
 	 * Used for Modbus/TCP Api Controller. Provides a modbus table for the Channels
 	 * of this Component.
-	 * 
+	 *
 	 * @param accessMode the {@link AccessMode} of the Controller
 	 * @return a {@link ModbusSlaveNatureTable}
 	 */
@@ -224,7 +219,7 @@ public static ModbusSlaveNatureTable getModbusSlaveNatureTable(AccessMode access
 
 	/**
 	 * Gets the Component State-Channel.
-	 * 
+	 *
 	 * @return the StateCollectorChannel
 	 */
 	public default StateCollectorChannel getStateChannel() {
@@ -241,7 +236,7 @@ public default StateCollectorChannel getStateChannel() {
 
 	/**
 	 * Gets the Component State {@link Level}.
-	 * 
+	 *
 	 * @return the StateCollectorChannel
 	 */
 	public default Level getState() {
@@ -250,7 +245,7 @@ public default Level getState() {
 
 	/**
 	 * Gets the Channel as the given Type.
-	 * 
+	 *
 	 * @param <T>       the expected Channel type
 	 * @param channelId the Channel-ID
 	 * @param type      the expected Type
@@ -272,7 +267,7 @@ public default <T extends Channel<?>> T _getChannelAs(ChannelId channelId, Class
 	/**
 	 * Gets some output that is suitable for a continuous Debug log. Returns 'null'
 	 * by default which causes no output.
-	 * 
+	 *
 	 * @return the debug log output
 	 */
 	public default String debugLog() {
@@ -281,28 +276,28 @@ public default String debugLog() {
 
 	/**
 	 * Does this OpenEMS Component report any Faults?
-	 * 
+	 *
 	 * <p>
 	 * Evaluates all {@link StateChannel}s and returns true if any Channel with
 	 * {@link Level#FAULT} is set.
-	 * 
+	 *
 	 * @return true if there is a Fault.
 	 */
 	public default boolean hasFaults() {
-		Level level = this.getState();
+		var level = this.getState();
 		return level.isAtLeast(Level.FAULT);
 	}
 
 	/**
 	 * Sets a target filter for a Declarative Service @Reference member.
-	 * 
+	 *
 	 * <p>
 	 * Usage:
-	 * 
+	 *
 	 * <pre>
 	 * updateReferenceFilter(config.service_pid(), "Controllers", controllersIds);
 	 * </pre>
-	 * 
+	 *
 	 * <p>
 	 * Generates a 'target' filter on the 'Controllers' member so, that the the
 	 * expected service to be injected needs to fulfill:
@@ -311,37 +306,37 @@ public default boolean hasFaults() {
 	 * <li>the service must not have the same PID as the calling component
 	 * <li>the service "id" must be one of the provided "controllersIds"
 	 * </ul>
-	 * 
-	 * 
+	 *
+	 *
 	 * @param cm     a ConfigurationAdmin instance. Get one using
-	 * 
+	 *
 	 *               <pre>
 	 *               &#64;Reference
 	 *               ConfigurationAdmin cm;
 	 *               </pre>
-	 * 
+	 *
 	 * @param pid    PID of the calling component (use 'config.service_pid()' or
 	 *               '(String)prop.get(Constants.SERVICE_PID)'; if null, PID filter
 	 *               is not added to the resulting target filter
 	 * @param member Name of the Method or Field with the Reference annotation, e.g.
-	 * 
+	 *
 	 * @param ids    Component IDs to be filtered for; for empty list, no ids are
 	 *               added to the target filter
-	 * 
+	 *
 	 * @return true if the filter was updated. You may use it to abort the
 	 *         activate() method.
 	 */
 	public static boolean updateReferenceFilter(ConfigurationAdmin cm, String pid, String member, String... ids) {
-		final String targetProperty = member + ".target";
-		final String requiredTarget = ConfigUtils.generateReferenceTargetFilter(pid, ids);
+		final var targetProperty = member + ".target";
+		final var requiredTarget = ConfigUtils.generateReferenceTargetFilter(pid, ids);
 		/*
 		 * read existing target filter
 		 */
 		Configuration c;
 		try {
 			c = cm.getConfiguration(pid, "?");
-			Dictionary<String, Object> properties = c.getProperties();
-			String existingTarget = (String) properties.get(targetProperty);
+			var properties = c.getProperties();
+			var existingTarget = (String) properties.get(targetProperty);
 			/*
 			 * update target filter if required
 			 */
@@ -359,52 +354,52 @@ public static boolean updateReferenceFilter(ConfigurationAdmin cm, String pid, S
 
 	/**
 	 * Validates and possibly fixes the Component-ID of a Singleton.
-	 * 
+	 *
 	 * <p>
 	 * Singleton Components are allowed to live only exactly once in an OpenEMS
 	 * instance. These Components are marked with an Annotation:
-	 * 
+	 *
 	 * <pre>
 	 * &#64;Designate(factory = false)
 	 * </pre>
-	 * 
+	 *
 	 * By design it is required for these Singleton Components to have a predefined
 	 * Component-ID, like '_cycle', '_sum', etc. This method makes sure the
 	 * Component-ID matches this predefined ID - and if not automatically adjusts
 	 * it.
-	 * 
+	 *
 	 * <p>
 	 * Sidenote: ideally it would be possible to use the Component Annotation
-	 * 
+	 *
 	 * <pre>
 	 * &#64;Component(property = { "id=_cycle" })
 	 * </pre>
-	 * 
+	 *
 	 * for this purpose. Unfortunately this is not sufficient to have the 'id'
 	 * property listed in EdgeConfig, ConfigurationAdmin, etc. This is why this
 	 * workaround is required.
-	 * 
+	 *
 	 * <p>
 	 * Usage:
-	 * 
+	 *
 	 * <pre>
 	 * if (OpenemsComponent.validateSingletonComponentId(this.cm, this.serviceFactoryPid(), SINGLETON_COMPONENT_ID)) {
 	 * 	return;
 	 * }
 	 * </pre>
-	 * 
+	 *
 	 * @param cm         a ConfigurationAdmin instance. Get one using
-	 * 
+	 *
 	 *                   <pre>
 	 *                   &#64;Reference
 	 *                   ConfigurationAdmin cm;
 	 *                   </pre>
-	 * 
+	 *
 	 * @param pid        PID of the calling component (use 'config.service_pid()' or
 	 *                   '(String)prop.get(Constants.SERVICE_PID)'; if null,
 	 *                   Component-ID can not be updated.
 	 * @param expectedId The expected predefined Component-ID
-	 * 
+	 *
 	 * @return true if the ID was updated. You may use it to abort the activate()
 	 *         method.
 	 */
@@ -412,7 +407,7 @@ public static boolean validateSingleton(ConfigurationAdmin cm, String pid, Strin
 		Configuration c;
 		try {
 			c = cm.getConfiguration(pid, "?");
-			Dictionary<String, Object> properties = c.getProperties();
+			var properties = c.getProperties();
 
 			final String actualId;
 			final String actualAlias;
@@ -442,23 +437,23 @@ public static boolean validateSingleton(ConfigurationAdmin cm, String pid, Strin
 
 	/**
 	 * Update a configuration property.
-	 * 
+	 *
 	 * <p>
 	 * Usage:
-	 * 
+	 *
 	 * <pre>
 	 * updateConfigurationProperty(cm, servicePid, "propertyName", "propertyValue");
 	 * </pre>
-	 * 
+	 *
 	 * <p>
-	 * 
+	 *
 	 * @param cm       a ConfigurationAdmin instance. Get one using
-	 * 
+	 *
 	 *                 <pre>
 	 *                 &#64;Reference
 	 *                 ConfigurationAdmin cm;
 	 *                 </pre>
-	 * 
+	 *
 	 * @param pid      PID of the calling component (use 'config.service_pid()' or
 	 *                 '(String)prop.get(Constants.SERVICE_PID)'
 	 * @param property Name of the configuration property
@@ -468,7 +463,7 @@ public static void updateConfigurationProperty(ConfigurationAdmin cm, String pid
 		Configuration c;
 		try {
 			c = cm.getConfiguration(pid, "?");
-			Dictionary<String, Object> properties = c.getProperties();
+			var properties = c.getProperties();
 			properties.put(property, value);
 			c.update(properties);
 		} catch (IOException | SecurityException e) {
@@ -478,7 +473,7 @@ public static void updateConfigurationProperty(ConfigurationAdmin cm, String pid
 
 	/**
 	 * Log a debug message including the Component ID.
-	 * 
+	 *
 	 * @param component the {@link OpenemsComponent}
 	 * @param log       the {@link Logger} instance
 	 * @param message   the message
@@ -494,7 +489,7 @@ public static void logDebug(OpenemsComponent component, Logger log, String messa
 
 	/**
 	 * Log a info message including the Component ID.
-	 * 
+	 *
 	 * @param component the {@link OpenemsComponent}
 	 * @param log       the {@link Logger} instance
 	 * @param message   the message
@@ -509,7 +504,7 @@ public static void logInfo(OpenemsComponent component, Logger log, String messag
 
 	/**
 	 * Log a warn message including the Component ID.
-	 * 
+	 *
 	 * @param component the {@link OpenemsComponent}
 	 * @param log       the {@link Logger} instance
 	 * @param message   the message
@@ -524,7 +519,7 @@ public static void logWarn(OpenemsComponent component, Logger log, String messag
 
 	/**
 	 * Log a error message including the Component ID.
-	 * 
+	 *
 	 * @param component the {@link OpenemsComponent}
 	 * @param log       the {@link Logger} instance
 	 * @param message   the message
diff --git a/io.openems.edge.common/src/io/openems/edge/common/converter/StaticConverters.java b/io.openems.edge.common/src/io/openems/edge/common/converter/StaticConverters.java
index 7501f476d6b..efd4351eb4c 100644
--- a/io.openems.edge.common/src/io/openems/edge/common/converter/StaticConverters.java
+++ b/io.openems.edge.common/src/io/openems/edge/common/converter/StaticConverters.java
@@ -8,7 +8,7 @@ public class StaticConverters {
 	/**
 	 * Converts only positive values from Element to Channel
 	 */
-	public final static Function<Object, Object> KEEP_POSITIVE = (value) -> {
+	public final static Function<Object, Object> KEEP_POSITIVE = value -> {
 		if (value == null) {
 			return null;
 		}
@@ -26,7 +26,8 @@ public class StaticConverters {
 			case STRING:
 				if (value instanceof Boolean || value instanceof String) {
 					return value; // impossible
-				} else if (value instanceof Short) {
+				}
+				if (value instanceof Short) {
 					short shortValue = (Short) value;
 					if (shortValue > 0) {
 						return shortValue;
@@ -71,7 +72,7 @@ public class StaticConverters {
 	/**
 	 * Invert a value
 	 */
-	public final static Function<Object, Object> INVERT = (value) -> {
+	public final static Function<Object, Object> INVERT = value -> {
 		if (value == null) {
 			return null;
 		}
@@ -89,7 +90,8 @@ public class StaticConverters {
 			case STRING:
 				if (value instanceof String) {
 					return value; // impossible
-				} else if (value instanceof Boolean) {
+				}
+				if (value instanceof Boolean) {
 					return Boolean.valueOf(!(boolean) value);
 				} else if (value instanceof Short) {
 					return Short.valueOf((short) ((short) value * -1));
diff --git a/io.openems.edge.common/src/io/openems/edge/common/cycle/Cycle.java b/io.openems.edge.common/src/io/openems/edge/common/cycle/Cycle.java
index 50c20d7ef35..f7092e30084 100644
--- a/io.openems.edge.common/src/io/openems/edge/common/cycle/Cycle.java
+++ b/io.openems.edge.common/src/io/openems/edge/common/cycle/Cycle.java
@@ -19,7 +19,7 @@ public interface Cycle extends OpenemsComponent {
 	public enum ChannelId implements io.openems.edge.common.channel.ChannelId {
 		/**
 		 * Actual, measured Cycle-Time in [ms].
-		 * 
+		 *
 		 * <ul>
 		 * <li>Interface: Cycle
 		 * <li>Type: Integer
@@ -29,7 +29,7 @@ public enum ChannelId implements io.openems.edge.common.channel.ChannelId {
 				.unit(Unit.MILLISECONDS)),
 		/**
 		 * A configured Controller is not executed because it is disabled.
-		 * 
+		 *
 		 * <ul>
 		 * <li>Interface: Cycle
 		 * <li>Type: State
@@ -43,6 +43,7 @@ private ChannelId(Doc doc) {
 			this.doc = doc;
 		}
 
+		@Override
 		public Doc doc() {
 			return this.doc;
 		}
@@ -118,7 +119,7 @@ public default void _setIgnoreDisabledController(boolean value) {
 
 	/**
 	 * Gets the duration of one global OpenEMS Cycle in [ms].
-	 * 
+	 *
 	 * @return the duration in milliseconds
 	 */
 	public int getCycleTime();
diff --git a/io.openems.edge.common/src/io/openems/edge/common/event/EdgeEventConstants.java b/io.openems.edge.common/src/io/openems/edge/common/event/EdgeEventConstants.java
index 6526cd2cbb9..fd5a36b3c29 100644
--- a/io.openems.edge.common/src/io/openems/edge/common/event/EdgeEventConstants.java
+++ b/io.openems.edge.common/src/io/openems/edge/common/event/EdgeEventConstants.java
@@ -17,7 +17,7 @@ private EdgeEventConstants() {
 
 	/**
 	 * BEFORE_PROCESS_IMAGE event
-	 * 
+	 *
 	 * allows to execute anything that is required to be executed before the current
 	 * processimage is built - i.e. channel.nextProcessImage() is called. The event
 	 * is executed synchronously.
@@ -26,7 +26,7 @@ private EdgeEventConstants() {
 
 	/**
 	 * AFTER_PROCESS_IMAGE event
-	 * 
+	 *
 	 * allows to execute anything that is required to be executed after the current
 	 * processimage is built - i.e. channel.nextProcessImage() was called. The event
 	 * is executed synchronously.
@@ -35,7 +35,7 @@ private EdgeEventConstants() {
 
 	/**
 	 * BEFORE_CONTROLLERS event
-	 * 
+	 *
 	 * allows to execute anything that is required to be executed before the
 	 * controllers are executed. The event is executed synchronously.
 	 */
@@ -43,7 +43,7 @@ private EdgeEventConstants() {
 
 	/**
 	 * AFTER_CONTROLLERS event
-	 * 
+	 *
 	 * allows to execute anything that is required to be executed after the
 	 * controllers were executed. The event is executed synchronously.
 	 */
@@ -51,7 +51,7 @@ private EdgeEventConstants() {
 
 	/**
 	 * BEFORE_WRITE event
-	 * 
+	 *
 	 * allows to execute anything that is required to be executed before the data is
 	 * actually written to the devices. The event is executed synchronously.
 	 */
@@ -59,7 +59,7 @@ private EdgeEventConstants() {
 
 	/**
 	 * EXECUTE_WRITE event
-	 * 
+	 *
 	 * triggers to actually write the data to the devices. The event is executed
 	 * synchronously.
 	 */
@@ -67,7 +67,7 @@ private EdgeEventConstants() {
 
 	/**
 	 * AFTER_WRITE event
-	 * 
+	 *
 	 * allows to execute anything that is required to be executed after the data was
 	 * actually written to the devices. The event is executed synchronously.
 	 */
@@ -81,7 +81,7 @@ private EdgeEventConstants() {
 
 	/**
 	 * UPDATE event
-	 * 
+	 *
 	 * Called when the {@link EdgeConfig} was updated, e.g. because configuration
 	 * properties changed or Channels changed. The EdgeConfig object is sent with
 	 * the event - see {@value #TOPIC_CONFIG_UPDATE_KEY}. The event is executed
diff --git a/io.openems.edge.common/src/io/openems/edge/common/filter/DisabledRampFilter.java b/io.openems.edge.common/src/io/openems/edge/common/filter/DisabledRampFilter.java
index 6e710c9fb27..ef9250fcc2a 100644
--- a/io.openems.edge.common/src/io/openems/edge/common/filter/DisabledRampFilter.java
+++ b/io.openems.edge.common/src/io/openems/edge/common/filter/DisabledRampFilter.java
@@ -26,8 +26,7 @@ public Integer getFilteredValueAsInteger(float lastValue, Float targetValue, flo
 	private Integer getAsInt(Float value) {
 		if (value == null) {
 			return null;
-		} else {
-			return Math.round(value);
 		}
+		return Math.round(value);
 	}
 }
diff --git a/io.openems.edge.common/src/io/openems/edge/common/filter/PidFilter.java b/io.openems.edge.common/src/io/openems/edge/common/filter/PidFilter.java
index 75197beffc3..edf8e403114 100644
--- a/io.openems.edge.common/src/io/openems/edge/common/filter/PidFilter.java
+++ b/io.openems.edge.common/src/io/openems/edge/common/filter/PidFilter.java
@@ -2,7 +2,7 @@
 
 /**
  * A proportional-integral-derivative controller.
- * 
+ *
  * @see <a href=
  *      "https://en.wikipedia.org/wiki/PID_controller">https://en.wikipedia.org/wiki/PID_controller</a>
  */
@@ -27,7 +27,7 @@ public class PidFilter {
 
 	/**
 	 * Creates a PidFilter.
-	 * 
+	 *
 	 * @param p the proportional gain
 	 * @param i the integral gain
 	 * @param d the derivative gain
@@ -47,7 +47,7 @@ public PidFilter() {
 
 	/**
 	 * Limit the output value.
-	 * 
+	 *
 	 * @param lowLimit  lowest allowed output value
 	 * @param highLimit highest allowed output value
 	 */
@@ -63,7 +63,7 @@ public void setLimits(Integer lowLimit, Integer highLimit) {
 	/**
 	 * Apply the PID filter using the current Channel value as input and the target
 	 * value.
-	 * 
+	 *
 	 * @param input  the input value, e.g. the measured Channel value
 	 * @param target the target value
 	 * @return the filtered set-point value
@@ -73,7 +73,7 @@ public int applyPidFilter(int input, int target) {
 		target = this.applyLowHighLimits(target);
 
 		// Calculate the error
-		int error = target - input;
+		var error = target - input;
 
 		// We are already there
 		if (error == 0) {
@@ -81,7 +81,7 @@ public int applyPidFilter(int input, int target) {
 		}
 
 		// Calculate P
-		double outputP = this.p * error;
+		var outputP = this.p * error;
 
 		// Set last values on first run
 		if (this.firstRun) {
@@ -90,16 +90,16 @@ public int applyPidFilter(int input, int target) {
 		}
 
 		// Calculate I
-		double outputI = this.i * this.errorSum;
+		var outputI = this.i * this.errorSum;
 
 		// Calculate D
-		double outputD = -this.d * (input - this.lastInput);
+		var outputD = -this.d * (input - this.lastInput);
 
 		// Store last input value
 		this.lastInput = input;
 
 		// Sum outputs
-		double output = outputP + outputI + outputD;
+		var output = outputP + outputI + outputD;
 
 		// Sum up the error and limit Error-Sum to not grow too much. Otherwise the PID
 		// filter will stop reacting on changes properly.
@@ -111,7 +111,7 @@ public int applyPidFilter(int input, int target) {
 
 	/**
 	 * Reset the PID filter.
-	 * 
+	 *
 	 * <p>
 	 * This method should be called when the filter was not used for a while.
 	 */
@@ -122,7 +122,7 @@ public void reset() {
 
 	/**
 	 * Applies the configured PID low and high limits to a value.
-	 * 
+	 *
 	 * @param value the input value
 	 * @return the value within low and high limit
 	 */
@@ -138,7 +138,7 @@ protected int applyLowHighLimits(int value) {
 
 	/**
 	 * Applies the low and high limits to the error sum.
-	 * 
+	 *
 	 * @param value the input value
 	 * @return the value within low and high limit
 	 */
diff --git a/io.openems.edge.common/src/io/openems/edge/common/filter/RampFilter.java b/io.openems.edge.common/src/io/openems/edge/common/filter/RampFilter.java
index cb989f0ef77..52eb5f9aa07 100644
--- a/io.openems.edge.common/src/io/openems/edge/common/filter/RampFilter.java
+++ b/io.openems.edge.common/src/io/openems/edge/common/filter/RampFilter.java
@@ -19,32 +19,30 @@ public RampFilter(Float initialValue) {
 	/**
 	 * Get filtered value using the present lastValue, the value to reach and a
 	 * fixed maximum change per call.
-	 * 
+	 *
 	 * @param targetValue      Value to reach
 	 * @param maxChangePerCall Fixed change per call
 	 * @return value as Integer with applied ramp filter
 	 */
 	public Integer getFilteredValueAsInteger(Float targetValue, float maxChangePerCall) {
-		Float result = this.applyRampFilter(targetValue, maxChangePerCall);
+		var result = this.applyRampFilter(targetValue, maxChangePerCall);
 		if (result == null) {
 			return null;
-		} else {
-			return Math.round(result);
 		}
+		return Math.round(result);
 	}
 
 	/**
 	 * Get filtered value using the given lastValue, the value to reach and a
 	 * calculated maximum change per call.
-	 * 
-	 * @param targetValue Value to reach
+	 *
+	 * @param targetValue  Value to reach
 	 * @param lastValue    Last or current value that needs to be adjusted
 	 * @param maximumLimit Maximum limit used to calculate a fixed change per call
 	 * @param increaseRate Increasing rate used to calculate a fixed change per call
 	 * @return value as Integer with applied ramp filter
 	 */
-	public Integer getFilteredValueAsInteger(float lastValue,
-			Float targetValue, float maximumLimit,
+	public Integer getFilteredValueAsInteger(float lastValue, Float targetValue, float maximumLimit,
 			float increaseRate) {
 		this.lastValue = lastValue;
 		return this.getFilteredValueAsInteger(targetValue, maximumLimit * increaseRate);
@@ -53,8 +51,8 @@ public Integer getFilteredValueAsInteger(float lastValue,
 	/**
 	 * Get filtered value using the given lastValue, the value to reach and a fixed
 	 * maximum change per call.
-	 * 
-	 * @param targetValue     Value to reach
+	 *
+	 * @param targetValue      Value to reach
 	 * @param lastValue        Last or current value that needs to be adjusted
 	 * @param maxChangePerCall Fixed change per call
 	 * @return value as Integer with applied ramp filter
@@ -72,7 +70,8 @@ private Float applyRampFilter(Float targetValue, float maxChangePerCall) {
 		if (this.lastValue == null) {
 			this.lastValue = targetValue;
 			return targetValue;
-		} else if (targetValue > this.lastValue) {
+		}
+		if (targetValue > this.lastValue) {
 			return this.increase(targetValue, maxChangePerCall);
 		} else {
 			return this.decrease(targetValue, maxChangePerCall);
diff --git a/io.openems.edge.common/src/io/openems/edge/common/host/DummyHost.java b/io.openems.edge.common/src/io/openems/edge/common/host/DummyHost.java
index e8400b93485..1b6d7ae161d 100644
--- a/io.openems.edge.common/src/io/openems/edge/common/host/DummyHost.java
+++ b/io.openems.edge.common/src/io/openems/edge/common/host/DummyHost.java
@@ -29,7 +29,7 @@ public DummyHost() {
 
 	/**
 	 * Sets and applies the {@link Host.ChannelId#HOSTNAME}.
-	 * 
+	 *
 	 * @param value the Hostname
 	 * @return myself
 	 */
diff --git a/io.openems.edge.common/src/io/openems/edge/common/host/Host.java b/io.openems.edge.common/src/io/openems/edge/common/host/Host.java
index b494e50af84..82987f95219 100644
--- a/io.openems.edge.common/src/io/openems/edge/common/host/Host.java
+++ b/io.openems.edge.common/src/io/openems/edge/common/host/Host.java
@@ -26,6 +26,7 @@ private ChannelId(Doc doc) {
 			this.doc = doc;
 		}
 
+		@Override
 		public Doc doc() {
 			return this.doc;
 		}
diff --git a/io.openems.edge.common/src/io/openems/edge/common/jsonapi/JsonApi.java b/io.openems.edge.common/src/io/openems/edge/common/jsonapi/JsonApi.java
index 6684ec67b85..370dbae51d9 100644
--- a/io.openems.edge.common/src/io/openems/edge/common/jsonapi/JsonApi.java
+++ b/io.openems.edge.common/src/io/openems/edge/common/jsonapi/JsonApi.java
@@ -14,7 +14,7 @@ public interface JsonApi {
 
 	/**
 	 * Handles a JSON-RPC Request.
-	 * 
+	 *
 	 * @param user    the authenticated {@link User}
 	 * @param request the JSON-RPC Request
 	 * @return a Future JSON-RPC Success Response; null response results in a
diff --git a/io.openems.edge.common/src/io/openems/edge/common/linecharacteristic/PolyLine.java b/io.openems.edge.common/src/io/openems/edge/common/linecharacteristic/PolyLine.java
index 8f6d0f4054b..f3d17ad3bc7 100644
--- a/io.openems.edge.common/src/io/openems/edge/common/linecharacteristic/PolyLine.java
+++ b/io.openems.edge.common/src/io/openems/edge/common/linecharacteristic/PolyLine.java
@@ -12,7 +12,7 @@
 
 /**
  * Defines a polyline built of multiple points defined by a JsonArray.
- * 
+ *
  * <p>
  * This class can be used e.g. to build Q-by-U characteristics Controllers.
  */
@@ -43,7 +43,7 @@ public PolyLine build() {
 
 	/**
 	 * Create a PolyLine builder.
-	 * 
+	 *
 	 * @return a {@link Builder}
 	 */
 	public static Builder create() {
@@ -52,7 +52,7 @@ public static Builder create() {
 
 	/**
 	 * Create a PolyLine that returns null for every 'x'.
-	 * 
+	 *
 	 * @return a {@link PolyLine}
 	 */
 	public static PolyLine empty() {
@@ -61,25 +61,25 @@ public static PolyLine empty() {
 
 	/**
 	 * Creates a static PolyLine, i.e. the 'y' value is the same for each 'x'.
-	 * 
+	 *
 	 * @param y 'y' value
 	 */
 	public PolyLine(Double y) {
-		TreeMap<Double, Double> points = new TreeMap<>();
+		var points = new TreeMap<Double, Double>();
 		points.put(0D, y);
 		this.points = points;
 	}
 
 	/**
 	 * Creates a PolyLine from two points.
-	 * 
+	 *
 	 * @param x1 'x' value of point 1
 	 * @param y1 'y' value of point 1
 	 * @param x2 'x' value of point 2
 	 * @param y2 'y' value of point 2
 	 */
 	public PolyLine(double x1, Double y1, double x2, Double y2) {
-		TreeMap<Double, Double> points = new TreeMap<>();
+		var points = new TreeMap<Double, Double>();
 		points.put(x1, y1);
 		points.put(x2, y2);
 		this.points = points;
@@ -87,7 +87,7 @@ public PolyLine(double x1, Double y1, double x2, Double y2) {
 
 	/**
 	 * Creates a PolyLine from a map of points.
-	 * 
+	 *
 	 * @param points a map of points
 	 */
 	public PolyLine(TreeMap<Double, Double> points) {
@@ -96,7 +96,7 @@ public PolyLine(TreeMap<Double, Double> points) {
 
 	/**
 	 * Creates a PolyLine from a JSON line configuration.
-	 * 
+	 *
 	 * @param x          the name of the 'x' value inside the Json-Array
 	 * @param y          the name of the 'y' value inside the Json-Array
 	 * @param lineConfig the configured x and y coordinates values; parsed to a
@@ -128,7 +128,7 @@ public PolyLine(String x, String y, String lineConfig) throws OpenemsNamedExcept
 	 * @throws OpenemsNamedException on error
 	 */
 	public PolyLine(String x, String y, JsonArray lineConfig) throws OpenemsNamedException {
-		TreeMap<Double, Double> points = new TreeMap<>();
+		var points = new TreeMap<Double, Double>();
 		for (JsonElement element : lineConfig) {
 			Double xValue = JsonUtils.getAsDouble(element, x);
 			Double yValue = JsonUtils.getAsDouble(element, y);
@@ -139,7 +139,7 @@ public PolyLine(String x, String y, JsonArray lineConfig) throws OpenemsNamedExc
 
 	/**
 	 * Gets the Y-value for the given X.
-	 * 
+	 *
 	 * @param x the 'x' value, possibly null
 	 * @return the 'y' value, possibly null
 	 */
@@ -148,13 +148,14 @@ public Double getValue(Double x) {
 			return null;
 		}
 
-		Entry<Double, Double> floorEntry = this.points.floorEntry(x);
-		Entry<Double, Double> ceilingEntry = this.points.ceilingEntry(x);
+		var floorEntry = this.points.floorEntry(x);
+		var ceilingEntry = this.points.ceilingEntry(x);
 
 		if (floorEntry == null && ceilingEntry == null) {
 			return null;
 
-		} else if (floorEntry == null) {
+		}
+		if (floorEntry == null) {
 			return ceilingEntry.getValue();
 
 		} else if (ceilingEntry == null) {
@@ -164,9 +165,9 @@ public Double getValue(Double x) {
 			return floorEntry.getValue();
 
 		} else {
-			Double m = (ceilingEntry.getValue() - floorEntry.getValue())
+			var m = (ceilingEntry.getValue() - floorEntry.getValue())
 					/ (ceilingEntry.getKey() - floorEntry.getKey());
-			Double t = floorEntry.getValue() - m * floorEntry.getKey();
+			var t = floorEntry.getValue() - m * floorEntry.getKey();
 			return m * x + t;
 		}
 	}
@@ -174,7 +175,7 @@ public Double getValue(Double x) {
 	/**
 	 * Gets the Y-value for the given X. Convenience method that internally converts
 	 * the Float to a Double.
-	 * 
+	 *
 	 * @param x the 'x' value, possibly null
 	 * @return the 'y' value, possibly null
 	 */
@@ -185,7 +186,7 @@ public Double getValue(Float x) {
 	/**
 	 * Gets the Y-value for the given X. Convenience method that internally converts
 	 * the Integer to a Double.
-	 * 
+	 *
 	 * @param x the 'x' value, possibly null
 	 * @return the 'y' value, possibly null
 	 */
diff --git a/io.openems.edge.common/src/io/openems/edge/common/meta/Meta.java b/io.openems.edge.common/src/io/openems/edge/common/meta/Meta.java
index d4322d0072d..7546b61c758 100644
--- a/io.openems.edge.common/src/io/openems/edge/common/meta/Meta.java
+++ b/io.openems.edge.common/src/io/openems/edge/common/meta/Meta.java
@@ -16,7 +16,7 @@ public interface Meta extends ModbusSlave {
 	public enum ChannelId implements io.openems.edge.common.channel.ChannelId {
 		/**
 		 * OpenEMS Version
-		 * 
+		 *
 		 * <ul>
 		 * <li>Interface: Meta
 		 * <li>Type: String
@@ -30,6 +30,7 @@ private ChannelId(Doc doc) {
 			this.doc = doc;
 		}
 
+		@Override
 		public Doc doc() {
 			return this.doc;
 		}
diff --git a/io.openems.edge.common/src/io/openems/edge/common/modbusslave/ModbusRecord.java b/io.openems.edge.common/src/io/openems/edge/common/modbusslave/ModbusRecord.java
index cf58b2cd032..fbf70e49f24 100644
--- a/io.openems.edge.common/src/io/openems/edge/common/modbusslave/ModbusRecord.java
+++ b/io.openems.edge.common/src/io/openems/edge/common/modbusslave/ModbusRecord.java
@@ -17,11 +17,11 @@ public ModbusRecord(int offset, ModbusType type) {
 	}
 
 	public int getOffset() {
-		return offset;
+		return this.offset;
 	}
 
 	public ModbusType getType() {
-		return type;
+		return this.type;
 	}
 
 	public void setComponentId(String componentId) {
@@ -29,7 +29,7 @@ public void setComponentId(String componentId) {
 	}
 
 	public String getComponentId() {
-		return componentId;
+		return this.componentId;
 	}
 
 	public abstract String getName();
diff --git a/io.openems.edge.common/src/io/openems/edge/common/modbusslave/ModbusRecordChannel.java b/io.openems.edge.common/src/io/openems/edge/common/modbusslave/ModbusRecordChannel.java
index 6b2c198f89a..b5593192f0d 100644
--- a/io.openems.edge.common/src/io/openems/edge/common/modbusslave/ModbusRecordChannel.java
+++ b/io.openems.edge.common/src/io/openems/edge/common/modbusslave/ModbusRecordChannel.java
@@ -1,6 +1,7 @@
 package io.openems.edge.common.modbusslave;
 
 import java.nio.ByteBuffer;
+import java.util.Arrays;
 import java.util.function.Consumer;
 
 import org.slf4j.Logger;
@@ -34,7 +35,7 @@ public ModbusRecordChannel(int offset, ModbusType type, ChannelId channelId, Acc
 		this.accessMode = evaluateActualAccessMode(channelId, modbusApiAccessMode);
 
 		// initialize buffer
-		int byteLength = 0;
+		var byteLength = 0;
 		switch (this.getType()) {
 		case FLOAT32:
 			byteLength = ModbusRecordFloat32.BYTE_LENGTH;
@@ -59,13 +60,13 @@ public ModbusRecordChannel(int offset, ModbusType type, ChannelId channelId, Acc
 	/**
 	 * Evaluate the AccessMode from configured Modbus-Api-AccessMode and
 	 * Channel-AccessMode.
-	 * 
+	 *
 	 * @param channelId         the {@link ChannelId}
 	 * @param channelAccessMode the configured {@link AccessMode}
 	 * @return the actual {@link AccessMode}
 	 */
 	private static AccessMode evaluateActualAccessMode(ChannelId channelId, AccessMode modbusApiAccessMode) {
-		AccessMode channelAccessMode = channelId.doc().getAccessMode();
+		var channelAccessMode = channelId.doc().getAccessMode();
 		switch (modbusApiAccessMode) {
 		case READ_ONLY:
 			switch (channelAccessMode) {
@@ -93,7 +94,7 @@ private static AccessMode evaluateActualAccessMode(ChannelId channelId, AccessMo
 			}
 		}
 		// should never come here
-		assert (true);
+		assert true;
 		return AccessMode.READ_ONLY;
 	}
 
@@ -120,7 +121,7 @@ public byte[] getValue(OpenemsComponent component) {
 			case READ_WRITE:
 				return ModbusRecordFloat32.toByteArray(channel.value().get());
 			case WRITE_ONLY:
-				return ModbusRecordFloat32Reserved.UNDEFINED_VALUE;
+				return ModbusRecordFloat32.UNDEFINED_VALUE;
 			}
 		case FLOAT64:
 			switch (this.accessMode) {
@@ -128,7 +129,7 @@ public byte[] getValue(OpenemsComponent component) {
 			case READ_WRITE:
 				return ModbusRecordFloat64.toByteArray(channel.value().get());
 			case WRITE_ONLY:
-				return ModbusRecordFloat64Reserved.UNDEFINED_VALUE;
+				return ModbusRecordFloat64.UNDEFINED_VALUE;
 			}
 		case STRING16:
 			switch (this.accessMode) {
@@ -136,7 +137,7 @@ public byte[] getValue(OpenemsComponent component) {
 			case READ_WRITE:
 				return ModbusRecordString16.toByteArray(channel.value().get());
 			case WRITE_ONLY:
-				return ModbusRecordString16Reserved.UNDEFINED_VALUE;
+				return ModbusRecordString16.UNDEFINED_VALUE;
 			}
 		case ENUM16:
 		case UINT16:
@@ -145,7 +146,7 @@ public byte[] getValue(OpenemsComponent component) {
 			case READ_WRITE:
 				return ModbusRecordUint16.toByteArray(channel.value().get());
 			case WRITE_ONLY:
-				return ModbusRecordUint16Reserved.UNDEFINED_VALUE;
+				return ModbusRecordUint16.UNDEFINED_VALUE;
 			}
 		case UINT32:
 			switch (this.accessMode) {
@@ -153,7 +154,7 @@ public byte[] getValue(OpenemsComponent component) {
 			case READ_WRITE:
 				return ModbusRecordUint32.toByteArray(channel.value().get());
 			case WRITE_ONLY:
-				return ModbusRecordUint32Reserved.UNDEFINED_VALUE;
+				return ModbusRecordUint32.UNDEFINED_VALUE;
 			}
 		}
 		assert true;
@@ -179,23 +180,21 @@ public void writeValue(OpenemsComponent component, int index, byte byte1, byte b
 		this.writeValueBuffer[index * 2] = byte1;
 		this.writeValueBuffer[index * 2 + 1] = byte2;
 		// is the buffer full?
-		for (int i = 0; i < this.writeValueBuffer.length; i++) {
-			if (this.writeValueBuffer[i] == null) {
+		for (Byte element : this.writeValueBuffer) {
+			if (element == null) {
 				return; // no, it is not full
 			}
 		}
 
 		// yes, it is full -> Prepare ByteBuffer
-		ByteBuffer buff = ByteBuffer.allocate(this.writeValueBuffer.length);
-		for (int i = 0; i < this.writeValueBuffer.length; i++) {
-			buff.put(this.writeValueBuffer[i]);
+		var buff = ByteBuffer.allocate(this.writeValueBuffer.length);
+		for (Byte element : this.writeValueBuffer) {
+			buff.put(element);
 		}
 		buff.rewind();
 
 		// clear buffer
-		for (int i = 0; i < this.writeValueBuffer.length; i++) {
-			this.writeValueBuffer[i] = null;
-		}
+		Arrays.fill(this.writeValueBuffer, null);
 
 		// Get Value-Object from ByteBuffer
 		Object value = null;
diff --git a/io.openems.edge.common/src/io/openems/edge/common/modbusslave/ModbusRecordConstant.java b/io.openems.edge.common/src/io/openems/edge/common/modbusslave/ModbusRecordConstant.java
index 5062e33f837..51bdc26375e 100644
--- a/io.openems.edge.common/src/io/openems/edge/common/modbusslave/ModbusRecordConstant.java
+++ b/io.openems.edge.common/src/io/openems/edge/common/modbusslave/ModbusRecordConstant.java
@@ -21,17 +21,19 @@ public ModbusRecordConstant(int offset, String name, ModbusType type, byte[] val
 
 	@Override
 	public String toString() {
-		return "ModbusRecordConstant [getOffset()=" + getOffset() + ", getType()=" + getType() + "]";
+		return "ModbusRecordConstant [getOffset()=" + this.getOffset() + ", getType()=" + this.getType() + "]";
 	}
 
 	public byte[] getValue() {
 		return this.value;
 	}
 
+	@Override
 	public byte[] getValue(OpenemsComponent component) {
 		return this.getValue();
 	}
 
+	@Override
 	public void writeValue(OpenemsComponent component, int index, byte byte1, byte byte2) {
 		this.log.warn("Writing to Read-Only Modbus Record is not allowed! [" + this.getOffset() + ", " + this.getType()
 				+ "]");
diff --git a/io.openems.edge.common/src/io/openems/edge/common/modbusslave/ModbusRecordFloat32.java b/io.openems.edge.common/src/io/openems/edge/common/modbusslave/ModbusRecordFloat32.java
index 3db0a20833d..d539375931b 100644
--- a/io.openems.edge.common/src/io/openems/edge/common/modbusslave/ModbusRecordFloat32.java
+++ b/io.openems.edge.common/src/io/openems/edge/common/modbusslave/ModbusRecordFloat32.java
@@ -7,7 +7,7 @@
 
 public class ModbusRecordFloat32 extends ModbusRecordConstant {
 
-	public final static byte[] UNDEFINED_VALUE = new byte[] { (byte) 0x7F, (byte) 0xC0, (byte) 0x00, (byte) 0x00 };
+	public final static byte[] UNDEFINED_VALUE = { (byte) 0x7F, (byte) 0xC0, (byte) 0x00, (byte) 0x00 };
 
 	public final static int BYTE_LENGTH = 4;
 
@@ -20,7 +20,7 @@ public ModbusRecordFloat32(int offset, String name, Float value) {
 
 	@Override
 	public String toString() {
-		return "ModbusRecordFloat32 [value=" + this.value + ", type=" + getType() + "]";
+		return "ModbusRecordFloat32 [value=" + this.value + ", type=" + this.getType() + "]";
 	}
 
 	public static byte[] toByteArray(float value) {
@@ -30,9 +30,8 @@ public static byte[] toByteArray(float value) {
 	public static byte[] toByteArray(Object value) {
 		if (value == null) {
 			return UNDEFINED_VALUE;
-		} else {
-			return toByteArray((float) TypeUtils.getAsType(OpenemsType.FLOAT, value));
 		}
+		return toByteArray((float) TypeUtils.getAsType(OpenemsType.FLOAT, value));
 	}
 
 	@Override
diff --git a/io.openems.edge.common/src/io/openems/edge/common/modbusslave/ModbusRecordFloat32Reserved.java b/io.openems.edge.common/src/io/openems/edge/common/modbusslave/ModbusRecordFloat32Reserved.java
index c32dd5b0227..f1748bcf154 100644
--- a/io.openems.edge.common/src/io/openems/edge/common/modbusslave/ModbusRecordFloat32Reserved.java
+++ b/io.openems.edge.common/src/io/openems/edge/common/modbusslave/ModbusRecordFloat32Reserved.java
@@ -8,7 +8,7 @@ public ModbusRecordFloat32Reserved(int offset) {
 
 	@Override
 	public String toString() {
-		return "ModbusRecordFloat32Reserved [type=" + getType() + "]";
+		return "ModbusRecordFloat32Reserved [type=" + this.getType() + "]";
 	}
 
 }
diff --git a/io.openems.edge.common/src/io/openems/edge/common/modbusslave/ModbusRecordFloat64.java b/io.openems.edge.common/src/io/openems/edge/common/modbusslave/ModbusRecordFloat64.java
index fef6ae080c7..6190e68beab 100644
--- a/io.openems.edge.common/src/io/openems/edge/common/modbusslave/ModbusRecordFloat64.java
+++ b/io.openems.edge.common/src/io/openems/edge/common/modbusslave/ModbusRecordFloat64.java
@@ -7,8 +7,8 @@
 
 public class ModbusRecordFloat64 extends ModbusRecordConstant {
 
-	public final static byte[] UNDEFINED_VALUE = new byte[] { (byte) 0x7F, (byte) 0xF8, (byte) 0x00, (byte) 0x00,
-			(byte) 0x00, (byte) 0x00, (byte) 0x00, (byte) 0x00 };
+	public final static byte[] UNDEFINED_VALUE = { (byte) 0x7F, (byte) 0xF8, (byte) 0x00, (byte) 0x00, (byte) 0x00,
+			(byte) 0x00, (byte) 0x00, (byte) 0x00 };
 
 	public final static int BYTE_LENGTH = 8;
 
@@ -21,7 +21,7 @@ public ModbusRecordFloat64(int offset, String name, Double value) {
 
 	@Override
 	public String toString() {
-		return "ModbusRecordFloat64 [value=" + this.value + ", type=" + getType() + "]";
+		return "ModbusRecordFloat64 [value=" + this.value + ", type=" + this.getType() + "]";
 	}
 
 	public static byte[] toByteArray(double value) {
@@ -31,9 +31,8 @@ public static byte[] toByteArray(double value) {
 	public static byte[] toByteArray(Object value) {
 		if (value == null) {
 			return UNDEFINED_VALUE;
-		} else {
-			return toByteArray((double) TypeUtils.getAsType(OpenemsType.DOUBLE, value));
 		}
+		return toByteArray((double) TypeUtils.getAsType(OpenemsType.DOUBLE, value));
 	}
 
 	@Override
diff --git a/io.openems.edge.common/src/io/openems/edge/common/modbusslave/ModbusRecordFloat64Reserved.java b/io.openems.edge.common/src/io/openems/edge/common/modbusslave/ModbusRecordFloat64Reserved.java
index bac4fbd0bd0..aded6e5f43a 100644
--- a/io.openems.edge.common/src/io/openems/edge/common/modbusslave/ModbusRecordFloat64Reserved.java
+++ b/io.openems.edge.common/src/io/openems/edge/common/modbusslave/ModbusRecordFloat64Reserved.java
@@ -8,7 +8,7 @@ public ModbusRecordFloat64Reserved(int offset) {
 
 	@Override
 	public String toString() {
-		return "ModbusRecordFloat64Reserved [type=" + getType() + "]";
+		return "ModbusRecordFloat64Reserved [type=" + this.getType() + "]";
 	}
 
 }
diff --git a/io.openems.edge.common/src/io/openems/edge/common/modbusslave/ModbusRecordString16.java b/io.openems.edge.common/src/io/openems/edge/common/modbusslave/ModbusRecordString16.java
index a31c0b4ed68..89b8da43336 100644
--- a/io.openems.edge.common/src/io/openems/edge/common/modbusslave/ModbusRecordString16.java
+++ b/io.openems.edge.common/src/io/openems/edge/common/modbusslave/ModbusRecordString16.java
@@ -20,12 +20,12 @@ public ModbusRecordString16(int offset, String name, String value) {
 
 	@Override
 	public String toString() {
-		return "ModbusRecordString16 [value=" + this.value + ", type=" + getType() + "]";
+		return "ModbusRecordString16 [value=" + this.value + ", type=" + this.getType() + "]";
 	}
 
 	public static byte[] toByteArray(String value) {
-		byte[] result = new byte[BYTE_LENGTH];
-		byte[] converted = value.getBytes(StandardCharsets.US_ASCII);
+		var result = new byte[BYTE_LENGTH];
+		var converted = value.getBytes(StandardCharsets.US_ASCII);
 		System.arraycopy(converted, 0, result, 0, Math.min(BYTE_LENGTH, converted.length));
 		return result;
 	}
@@ -33,9 +33,8 @@ public static byte[] toByteArray(String value) {
 	public static byte[] toByteArray(Object value) {
 		if (value == null) {
 			return UNDEFINED_VALUE;
-		} else {
-			return toByteArray((String) TypeUtils.getAsType(OpenemsType.STRING, value));
 		}
+		return toByteArray((String) TypeUtils.getAsType(OpenemsType.STRING, value));
 	}
 
 	@Override
diff --git a/io.openems.edge.common/src/io/openems/edge/common/modbusslave/ModbusRecordString16Reserved.java b/io.openems.edge.common/src/io/openems/edge/common/modbusslave/ModbusRecordString16Reserved.java
index 3803976e6e5..9a23228d818 100644
--- a/io.openems.edge.common/src/io/openems/edge/common/modbusslave/ModbusRecordString16Reserved.java
+++ b/io.openems.edge.common/src/io/openems/edge/common/modbusslave/ModbusRecordString16Reserved.java
@@ -8,7 +8,7 @@ public ModbusRecordString16Reserved(int offset) {
 
 	@Override
 	public String toString() {
-		return "ModbusRecordString16Reserved [type=" + getType() + "]";
+		return "ModbusRecordString16Reserved [type=" + this.getType() + "]";
 	}
 
 }
diff --git a/io.openems.edge.common/src/io/openems/edge/common/modbusslave/ModbusRecordUint16.java b/io.openems.edge.common/src/io/openems/edge/common/modbusslave/ModbusRecordUint16.java
index 4f7bafbdf71..f49c0b5052a 100644
--- a/io.openems.edge.common/src/io/openems/edge/common/modbusslave/ModbusRecordUint16.java
+++ b/io.openems.edge.common/src/io/openems/edge/common/modbusslave/ModbusRecordUint16.java
@@ -7,7 +7,7 @@
 
 public class ModbusRecordUint16 extends ModbusRecordConstant {
 
-	public final static byte[] UNDEFINED_VALUE = new byte[] { (byte) 0xFF, (byte) 0xFF };
+	public final static byte[] UNDEFINED_VALUE = { (byte) 0xFF, (byte) 0xFF };
 
 	public final static int BYTE_LENGTH = 2;
 
@@ -20,7 +20,8 @@ public ModbusRecordUint16(int offset, String name, Short value) {
 
 	@Override
 	public String toString() {
-		return "ModbusRecordUInt16 [value=" + value + "/0x" + Integer.toHexString(value) + ", type=" + getType() + "]";
+		return "ModbusRecordUInt16 [value=" + this.value + "/0x" + Integer.toHexString(this.value) + ", type="
+				+ this.getType() + "]";
 	}
 
 	public static byte[] toByteArray(short value) {
@@ -28,12 +29,11 @@ public static byte[] toByteArray(short value) {
 	}
 
 	public static byte[] toByteArray(Object value) {
-		if (value == null || (value instanceof io.openems.common.types.OptionsEnum
-				&& ((io.openems.common.types.OptionsEnum) value).isUndefined())) {
+		if (value == null || value instanceof io.openems.common.types.OptionsEnum
+				&& ((io.openems.common.types.OptionsEnum) value).isUndefined()) {
 			return UNDEFINED_VALUE;
-		} else {
-			return toByteArray((short) TypeUtils.getAsType(OpenemsType.SHORT, value));
 		}
+		return toByteArray((short) TypeUtils.getAsType(OpenemsType.SHORT, value));
 	}
 
 	@Override
diff --git a/io.openems.edge.common/src/io/openems/edge/common/modbusslave/ModbusRecordUint16BlockLength.java b/io.openems.edge.common/src/io/openems/edge/common/modbusslave/ModbusRecordUint16BlockLength.java
index c4c74cf6f4e..03fb4a11ecf 100644
--- a/io.openems.edge.common/src/io/openems/edge/common/modbusslave/ModbusRecordUint16BlockLength.java
+++ b/io.openems.edge.common/src/io/openems/edge/common/modbusslave/ModbusRecordUint16BlockLength.java
@@ -12,7 +12,7 @@ public ModbusRecordUint16BlockLength(int offset, String blockName, short length)
 	@Override
 	public String toString() {
 		return "ModbusRecordUint16BlockLength [blockName=" + this.blockName + ", value=" + this.value + "/0x"
-				+ Integer.toHexString(this.value) + ", type=" + getType() + "]";
+				+ Integer.toHexString(this.value) + ", type=" + this.getType() + "]";
 	}
 
 }
diff --git a/io.openems.edge.common/src/io/openems/edge/common/modbusslave/ModbusRecordUint16Hash.java b/io.openems.edge.common/src/io/openems/edge/common/modbusslave/ModbusRecordUint16Hash.java
index f713755fbe7..ba5c75e10d3 100644
--- a/io.openems.edge.common/src/io/openems/edge/common/modbusslave/ModbusRecordUint16Hash.java
+++ b/io.openems.edge.common/src/io/openems/edge/common/modbusslave/ModbusRecordUint16Hash.java
@@ -12,7 +12,7 @@ public ModbusRecordUint16Hash(int offset, String text) {
 	@Override
 	public String toString() {
 		return "ModbusRecordUint16Hash [text=" + this.text + ", value=" + this.value + "/0x"
-				+ Integer.toHexString(this.value) + ", type=" + getType() + "]";
+				+ Integer.toHexString(this.value) + ", type=" + this.getType() + "]";
 	}
 
 	@Override
diff --git a/io.openems.edge.common/src/io/openems/edge/common/modbusslave/ModbusRecordUint16Reserved.java b/io.openems.edge.common/src/io/openems/edge/common/modbusslave/ModbusRecordUint16Reserved.java
index 0cc4d584f96..b98ca000974 100644
--- a/io.openems.edge.common/src/io/openems/edge/common/modbusslave/ModbusRecordUint16Reserved.java
+++ b/io.openems.edge.common/src/io/openems/edge/common/modbusslave/ModbusRecordUint16Reserved.java
@@ -8,7 +8,7 @@ public ModbusRecordUint16Reserved(int offset) {
 
 	@Override
 	public String toString() {
-		return "ModbusRecordUint16Reserved [type=" + getType() + "]";
+		return "ModbusRecordUint16Reserved [type=" + this.getType() + "]";
 	}
 
 }
diff --git a/io.openems.edge.common/src/io/openems/edge/common/modbusslave/ModbusRecordUint32.java b/io.openems.edge.common/src/io/openems/edge/common/modbusslave/ModbusRecordUint32.java
index 329c80067d8..cf23c3ade6f 100644
--- a/io.openems.edge.common/src/io/openems/edge/common/modbusslave/ModbusRecordUint32.java
+++ b/io.openems.edge.common/src/io/openems/edge/common/modbusslave/ModbusRecordUint32.java
@@ -7,7 +7,7 @@
 
 public class ModbusRecordUint32 extends ModbusRecordConstant {
 
-	public final static byte[] UNDEFINED_VALUE = new byte[] { (byte) 0xFF, (byte) 0xFF, (byte) 0xFF, (byte) 0xFF };
+	public final static byte[] UNDEFINED_VALUE = { (byte) 0xFF, (byte) 0xFF, (byte) 0xFF, (byte) 0xFF };
 
 	public final static int BYTE_LENGTH = 4;
 
@@ -20,7 +20,8 @@ public ModbusRecordUint32(int offset, String name, Integer value) {
 
 	@Override
 	public String toString() {
-		return "ModbusRecordUInt32 [value=" + value + "/0x" + Integer.toHexString(value) + ", type=" + getType() + "]";
+		return "ModbusRecordUInt32 [value=" + this.value + "/0x" + Integer.toHexString(this.value) + ", type="
+				+ this.getType() + "]";
 	}
 
 	public static byte[] toByteArray(int value) {
@@ -28,12 +29,11 @@ public static byte[] toByteArray(int value) {
 	}
 
 	public static byte[] toByteArray(Object value) {
-		if (value == null || (value instanceof io.openems.common.types.OptionsEnum
-				&& ((io.openems.common.types.OptionsEnum) value).isUndefined())) {
+		if (value == null || value instanceof io.openems.common.types.OptionsEnum
+				&& ((io.openems.common.types.OptionsEnum) value).isUndefined()) {
 			return UNDEFINED_VALUE;
-		} else {
-			return toByteArray((int) TypeUtils.getAsType(OpenemsType.INTEGER, value));
 		}
+		return toByteArray((int) TypeUtils.getAsType(OpenemsType.INTEGER, value));
 	}
 
 	@Override
diff --git a/io.openems.edge.common/src/io/openems/edge/common/modbusslave/ModbusRecordUint32Reserved.java b/io.openems.edge.common/src/io/openems/edge/common/modbusslave/ModbusRecordUint32Reserved.java
index 0b29136f4ea..e362cf05372 100644
--- a/io.openems.edge.common/src/io/openems/edge/common/modbusslave/ModbusRecordUint32Reserved.java
+++ b/io.openems.edge.common/src/io/openems/edge/common/modbusslave/ModbusRecordUint32Reserved.java
@@ -8,7 +8,7 @@ public ModbusRecordUint32Reserved(int offset) {
 
 	@Override
 	public String toString() {
-		return "ModbusRecordUint32Reserved [type=" + getType() + "]";
+		return "ModbusRecordUint32Reserved [type=" + this.getType() + "]";
 	}
 
 }
diff --git a/io.openems.edge.common/src/io/openems/edge/common/modbusslave/ModbusSlave.java b/io.openems.edge.common/src/io/openems/edge/common/modbusslave/ModbusSlave.java
index 4817a7f5394..09ebb58158e 100644
--- a/io.openems.edge.common/src/io/openems/edge/common/modbusslave/ModbusSlave.java
+++ b/io.openems.edge.common/src/io/openems/edge/common/modbusslave/ModbusSlave.java
@@ -7,7 +7,7 @@ public interface ModbusSlave extends OpenemsComponent {
 
 	/**
 	 * Gets the Modbus-Slave-Table for this OpenEMS-Component.
-	 * 
+	 *
 	 * @param accessMode filters the Modbus-Records that should be shown
 	 * @return the Modbus-Slave-Table
 	 */
diff --git a/io.openems.edge.common/src/io/openems/edge/common/modbusslave/ModbusSlaveNatureTable.java b/io.openems.edge.common/src/io/openems/edge/common/modbusslave/ModbusSlaveNatureTable.java
index e84968cca88..5bcc15b8c18 100644
--- a/io.openems.edge.common/src/io/openems/edge/common/modbusslave/ModbusSlaveNatureTable.java
+++ b/io.openems.edge.common/src/io/openems/edge/common/modbusslave/ModbusSlaveNatureTable.java
@@ -2,6 +2,7 @@
 
 import java.util.ArrayList;
 import java.util.Collections;
+import java.util.Comparator;
 import java.util.List;
 
 import io.openems.common.channel.AccessMode;
@@ -24,16 +25,16 @@ public Builder(Class<?> nature, AccessMode accessModeFilter, int length) {
 		}
 
 		public Builder channel(int offset, ChannelId channelId, ModbusType type) {
-			AccessMode filter = this.accessModeFilter;
-			AccessMode channel = channelId.doc().getAccessMode();
+			var filter = this.accessModeFilter;
+			var channel = channelId.doc().getAccessMode();
 			if (
 			// Filter for READ_ONLY Channels
-			(filter == AccessMode.READ_ONLY && (channel == AccessMode.READ_ONLY || channel == AccessMode.READ_WRITE)) || //
+			filter == AccessMode.READ_ONLY && (channel == AccessMode.READ_ONLY || channel == AccessMode.READ_WRITE) || //
 			// Filter for READ_WRITE channels -> allow all Channels
-					(filter == AccessMode.READ_WRITE) || //
+					filter == AccessMode.READ_WRITE || //
 					// Filter for WRITE_ONLY channels
-					(filter == AccessMode.WRITE_ONLY
-							&& (channel == AccessMode.WRITE_ONLY || channel == AccessMode.READ_WRITE))) {
+					filter == AccessMode.WRITE_ONLY
+							&& (channel == AccessMode.WRITE_ONLY || channel == AccessMode.READ_WRITE)) {
 				this.add(new ModbusRecordChannel(offset, type, channelId, filter));
 
 			} else {
@@ -121,10 +122,9 @@ private void add(ModbusRecord record) throws IllegalArgumentException {
 		}
 
 		public ModbusSlaveNatureTable build() {
-			Collections.sort(this.maps, (m1, m2) -> {
-				return Integer.compare(m1.getOffset(), m2.getOffset());
-			});
-			return new ModbusSlaveNatureTable(nature, length, this.maps.toArray(new ModbusRecord[this.maps.size()]));
+			Collections.sort(this.maps, Comparator.comparing(ModbusRecord::getOffset));
+			return new ModbusSlaveNatureTable(this.nature, this.length,
+					this.maps.toArray(new ModbusRecord[this.maps.size()]));
 		}
 
 	}
@@ -144,14 +144,14 @@ private ModbusSlaveNatureTable(Class<?> nature, int length, ModbusRecord[] modbu
 	}
 
 	public Class<?> getNature() {
-		return nature;
+		return this.nature;
 	}
 
 	public int getLength() {
-		return length;
+		return this.length;
 	}
 
 	public ModbusRecord[] getModbusRecords() {
-		return modbusRecords;
+		return this.modbusRecords;
 	}
 }
diff --git a/io.openems.edge.common/src/io/openems/edge/common/modbusslave/ModbusSlaveTable.java b/io.openems.edge.common/src/io/openems/edge/common/modbusslave/ModbusSlaveTable.java
index 9b84e166df3..0d6caef6330 100644
--- a/io.openems.edge.common/src/io/openems/edge/common/modbusslave/ModbusSlaveTable.java
+++ b/io.openems.edge.common/src/io/openems/edge/common/modbusslave/ModbusSlaveTable.java
@@ -9,7 +9,7 @@ public ModbusSlaveTable(ModbusSlaveNatureTable... natureTables) {
 		this.natureTables = natureTables;
 
 		// calculate total length
-		int length = 0;
+		var length = 0;
 		for (ModbusSlaveNatureTable natureTable : natureTables) {
 			length += natureTable.getLength();
 		}
@@ -17,10 +17,10 @@ public ModbusSlaveTable(ModbusSlaveNatureTable... natureTables) {
 	}
 
 	public int getLength() {
-		return length;
+		return this.length;
 	}
 
 	public ModbusSlaveNatureTable[] getNatureTables() {
-		return natureTables;
+		return this.natureTables;
 	}
 }
diff --git a/io.openems.edge.common/src/io/openems/edge/common/modbusslave/ModbusType.java b/io.openems.edge.common/src/io/openems/edge/common/modbusslave/ModbusType.java
index 88f2067b89c..5da35991871 100644
--- a/io.openems.edge.common/src/io/openems/edge/common/modbusslave/ModbusType.java
+++ b/io.openems.edge.common/src/io/openems/edge/common/modbusslave/ModbusType.java
@@ -17,10 +17,11 @@ private ModbusType(int words, String name) {
 	}
 
 	public int getWords() {
-		return words;
+		return this.words;
 	}
 
+	@Override
 	public String toString() {
-		return name;
+		return this.name;
 	}
 }
\ No newline at end of file
diff --git a/io.openems.edge.common/src/io/openems/edge/common/offgrid/GridType.java b/io.openems.edge.common/src/io/openems/edge/common/offgrid/GridType.java
index aa2b646122b..db5fb121da0 100644
--- a/io.openems.edge.common/src/io/openems/edge/common/offgrid/GridType.java
+++ b/io.openems.edge.common/src/io/openems/edge/common/offgrid/GridType.java
@@ -4,9 +4,8 @@
 
 public enum GridType implements OptionsEnum {
 	UNDEFINED(-1, "Undefined"), //
-	THREE_PHASE_FOUR_WIRE(0, "3 Phase 4 Wire"),
-	THREE_PHASE_THREE_WIRE(1, "3 Phase 3 Wire"); //
-	
+	THREE_PHASE_FOUR_WIRE(0, "3 Phase 4 Wire"), THREE_PHASE_THREE_WIRE(1, "3 Phase 3 Wire"); //
+
 	private int value;
 	private String name;
 
@@ -17,12 +16,12 @@ private GridType(int value, String name) {
 
 	@Override
 	public int getValue() {
-		return value;
+		return this.value;
 	}
 
 	@Override
 	public String getName() {
-		return name;
+		return this.name;
 	}
 
 	@Override
diff --git a/io.openems.edge.common/src/io/openems/edge/common/offgrid/OperationMode.java b/io.openems.edge.common/src/io/openems/edge/common/offgrid/OperationMode.java
index 95b37b79cba..2a1882a1a2b 100644
--- a/io.openems.edge.common/src/io/openems/edge/common/offgrid/OperationMode.java
+++ b/io.openems.edge.common/src/io/openems/edge/common/offgrid/OperationMode.java
@@ -17,12 +17,12 @@ private OperationMode(int value, String name) {
 
 	@Override
 	public int getValue() {
-		return value;
+		return this.value;
 	}
 
 	@Override
 	public String getName() {
-		return name;
+		return this.name;
 	}
 
 	@Override
diff --git a/io.openems.edge.common/src/io/openems/edge/common/startstop/StartStop.java b/io.openems.edge.common/src/io/openems/edge/common/startstop/StartStop.java
index 3ad99d14c90..f30e1631816 100644
--- a/io.openems.edge.common/src/io/openems/edge/common/startstop/StartStop.java
+++ b/io.openems.edge.common/src/io/openems/edge/common/startstop/StartStop.java
@@ -35,12 +35,12 @@ private StartStop(int value, String name) {
 
 	@Override
 	public int getValue() {
-		return value;
+		return this.value;
 	}
 
 	@Override
 	public String getName() {
-		return name;
+		return this.name;
 	}
 
 	@Override
diff --git a/io.openems.edge.common/src/io/openems/edge/common/startstop/StartStopConfig.java b/io.openems.edge.common/src/io/openems/edge/common/startstop/StartStopConfig.java
index 981b3b66eac..65aa5be198c 100644
--- a/io.openems.edge.common/src/io/openems/edge/common/startstop/StartStopConfig.java
+++ b/io.openems.edge.common/src/io/openems/edge/common/startstop/StartStopConfig.java
@@ -4,12 +4,12 @@
  * Every OpenEMS Component that implements {@link StartStoppable} is required to
  * have a configuration property "startStop" of this type that overrides the
  * logic of the {@link StartStoppable#setStartStop(StartStop)} method:
- * 
+ *
  * <pre>
  * 	&#64;AttributeDefinition(name = "Start/stop behaviour?", description = "Should this Component be forced to start or stop?")
  *	StartStopConfig startStop() default StartStopConfig.AUTO;
  * </pre>
- * 
+ *
  * <ul>
  * <li>if config is {@link StartStopConfig#START} -> always start
  * <li>if config is {@link StartStopConfig#STOP} -> always stop
diff --git a/io.openems.edge.common/src/io/openems/edge/common/startstop/StartStoppable.java b/io.openems.edge.common/src/io/openems/edge/common/startstop/StartStoppable.java
index 06853721d34..e5885f246f9 100644
--- a/io.openems.edge.common/src/io/openems/edge/common/startstop/StartStoppable.java
+++ b/io.openems.edge.common/src/io/openems/edge/common/startstop/StartStoppable.java
@@ -11,21 +11,21 @@
 
 /**
  * Declares an OpenEMS Component as being able to get started and stopped.
- * 
+ *
  * <p>
  * A device or service inside OpenEMS that implements this OpenEMS Nature can be
  * started or stopped.
- * 
+ *
  * <p>
  * Implementing this Nature also requires the Component to have a configuration
  * property "startStop" of type {@link StartStopConfig} that overrides the logic
  * of the {@link StartStoppable#setStartStop(StartStop)} method:
- * 
+ *
  * <pre>
  * 	&#64;AttributeDefinition(name = "Start/stop behaviour?", description = "Should this Component be forced to start or stop?")
  *	StartStopConfig startStop() default StartStopConfig.AUTO;
  * </pre>
- * 
+ *
  * <ul>
  * <li>if config is {@link StartStopConfig#START} -> always start
  * <li>if config is {@link StartStopConfig#STOP} -> always stop
@@ -39,7 +39,7 @@ public interface StartStoppable extends OpenemsComponent {
 	public enum ChannelId implements io.openems.edge.common.channel.ChannelId {
 		/**
 		 * Start/Stop.
-		 * 
+		 *
 		 * <ul>
 		 * <li>Interface: StartStoppable
 		 * <li>Type: {@link StartStop}
@@ -63,7 +63,7 @@ public Doc doc() {
 	/**
 	 * Gets the {@link ModbusSlaveNatureTable} for {@link StartStoppable} used by
 	 * the Modbus/TCP Slave API.
-	 * 
+	 *
 	 * @param accessMode the {@link AccessMode}
 	 * @return the {@link ModbusSlaveNatureTable}
 	 */
@@ -75,7 +75,7 @@ public static ModbusSlaveNatureTable getModbusSlaveNatureTable(AccessMode access
 
 	/**
 	 * Gets the Channel for {@link ChannelId#START_STOP}.
-	 * 
+	 *
 	 * @return the Channel
 	 */
 	public default Channel<StartStop> getStartStopChannel() {
@@ -85,7 +85,7 @@ public default Channel<StartStop> getStartStopChannel() {
 	/**
 	 * Gets the current {@link StartStop} state of the {@link StartStoppable}
 	 * Component. See {@link ChannelId#START_STOP}.
-	 * 
+	 *
 	 * @return the Channel {@link Value}
 	 */
 	public default StartStop getStartStop() {
@@ -94,14 +94,14 @@ public default StartStop getStartStop() {
 
 	/**
 	 * Is this device or service started?.
-	 * 
+	 *
 	 * <ul>
 	 * <li>true - if (and only if) {@link ChannelId#START_STOP} is
 	 * {@link StartStop#START}
 	 * <li>false - if {@link ChannelId#START_STOP} is {@link StartStop#STOP} or
 	 * {@link StartStop#UNDEFINED}
 	 * </ul>
-	 * 
+	 *
 	 * @return true if started
 	 */
 	public default boolean isStarted() {
@@ -110,14 +110,14 @@ public default boolean isStarted() {
 
 	/**
 	 * Is this device or service stopped?.
-	 * 
+	 *
 	 * <ul>
 	 * <li>true - if (and only if) {@link ChannelId#START_STOP} is
 	 * {@link StartStop#STOP}
 	 * <li>false - if {@link ChannelId#START_STOP} is {@link StartStop#START} or
 	 * {@link StartStop#UNDEFINED}
 	 * </ul>
-	 * 
+	 *
 	 * @return true if stopped
 	 */
 	public default boolean isStopped() {
@@ -127,7 +127,7 @@ public default boolean isStopped() {
 	/**
 	 * Internal method to set the 'nextValue' on {@link ChannelId#START_STOP}
 	 * Channel.
-	 * 
+	 *
 	 * @param value the next value
 	 */
 	public default void _setStartStop(StartStop value) {
@@ -136,7 +136,7 @@ public default void _setStartStop(StartStop value) {
 
 	/**
 	 * Starts or stops the device or service represented by this OpenEMS Component.
-	 * 
+	 *
 	 * @param value target {@link StartStop} state
 	 * @throws OpenemsNamedException on error
 	 */
@@ -144,10 +144,10 @@ public default void _setStartStop(StartStop value) {
 
 	/**
 	 * Starts the device or service represented by this OpenEMS Component.
-	 * 
+	 *
 	 * <p>
 	 * This calls {@link #setStartStop(StartStop)} with {@link StartStop#START}.
-	 * 
+	 *
 	 * @throws OpenemsNamedException on error
 	 */
 	public default void start() throws OpenemsNamedException {
@@ -156,10 +156,10 @@ public default void start() throws OpenemsNamedException {
 
 	/**
 	 * Stops the device or service represented by this OpenEMS Component.
-	 * 
+	 *
 	 * <p>
 	 * This calls {@link #setStartStop(StartStop)} with {@link StartStop#STOP}.
-	 * 
+	 *
 	 * @throws OpenemsNamedException on error
 	 */
 	public default void stop() throws OpenemsNamedException {
diff --git a/io.openems.edge.common/src/io/openems/edge/common/statemachine/AbstractContext.java b/io.openems.edge.common/src/io/openems/edge/common/statemachine/AbstractContext.java
index 33554a9c8b4..89914b218b3 100644
--- a/io.openems.edge.common/src/io/openems/edge/common/statemachine/AbstractContext.java
+++ b/io.openems.edge.common/src/io/openems/edge/common/statemachine/AbstractContext.java
@@ -17,7 +17,7 @@ public AbstractContext() {
 
 	/**
 	 * Constructs an {@link AbstractContext}.
-	 * 
+	 *
 	 * @param parent the parent {@link OpenemsComponent}. This is used to provide
 	 *               useful logging.
 	 */
@@ -27,7 +27,7 @@ public AbstractContext(PARENT parent) {
 
 	/**
 	 * Gets the parent {@link OpenemsComponent}.
-	 * 
+	 *
 	 * @return the parent
 	 */
 	public PARENT getParent() {
@@ -36,7 +36,7 @@ public PARENT getParent() {
 
 	/**
 	 * Log a debug message including the Component ID.
-	 * 
+	 *
 	 * @param log     the Logger instance
 	 * @param message the message
 	 */
@@ -46,7 +46,7 @@ public void logDebug(Logger log, String message) {
 
 	/**
 	 * Log an info message including the Component ID.
-	 * 
+	 *
 	 * @param log     the Logger instance
 	 * @param message the message
 	 */
@@ -56,7 +56,7 @@ public void logInfo(Logger log, String message) {
 
 	/**
 	 * Log a warn message including the Component ID.
-	 * 
+	 *
 	 * @param log     the Logger instance
 	 * @param message the message
 	 */
@@ -66,7 +66,7 @@ public void logWarn(Logger log, String message) {
 
 	/**
 	 * Log an error message including the Component ID.
-	 * 
+	 *
 	 * @param log     the Logger instance
 	 * @param message the message
 	 */
diff --git a/io.openems.edge.common/src/io/openems/edge/common/statemachine/AbstractStateMachine.java b/io.openems.edge.common/src/io/openems/edge/common/statemachine/AbstractStateMachine.java
index 1a6f1a56ffd..0646de7c107 100644
--- a/io.openems.edge.common/src/io/openems/edge/common/statemachine/AbstractStateMachine.java
+++ b/io.openems.edge.common/src/io/openems/edge/common/statemachine/AbstractStateMachine.java
@@ -10,7 +10,7 @@
 
 /**
  * Manages the States of the StateMachine.
- * 
+ *
  * @param <STATE>   the {@link State} type, e.g. typically an enum
  * @param <CONTEXT> the context type, i.e. a class wrapping a State-Machine
  *                  context
@@ -28,11 +28,11 @@ public abstract class AbstractStateMachine<STATE extends State<STATE>, CONTEXT e
 
 	/**
 	 * Initialize the State-Machine and set an initial State.
-	 * 
+	 *
 	 * <p>
 	 * TODO Note that for the initialState the {@link StateHandler#onEntry(Object)
 	 * method is not called in the beginning.
-	 * 
+	 *
 	 * @param initialState the initial State
 	 */
 	public AbstractStateMachine(STATE initialState) {
@@ -46,11 +46,11 @@ public AbstractStateMachine(STATE initialState) {
 
 	/**
 	 * Gets the {@link StateHandler} for each State.
-	 * 
+	 *
 	 * <p>
 	 * This method is called once for every available State during construction of
 	 * the StateMachine in order to initialize an internal list of StateHandlers.
-	 * 
+	 *
 	 * @param state the State
 	 * @return the {@link StateHandler} for the given State
 	 */
@@ -58,7 +58,7 @@ public AbstractStateMachine(STATE initialState) {
 
 	/**
 	 * Gets the previously activate State.
-	 * 
+	 *
 	 * @return the State
 	 */
 	public STATE getPreviousState() {
@@ -67,7 +67,7 @@ public STATE getPreviousState() {
 
 	/**
 	 * Gets the currently activate State.
-	 * 
+	 *
 	 * @return the State
 	 */
 	public STATE getCurrentState() {
@@ -76,10 +76,10 @@ public STATE getCurrentState() {
 
 	/**
 	 * Forcibly change the next State from outside. Use with care!
-	 * 
+	 *
 	 * <p>
 	 * Note that transition events will get called.
-	 * 
+	 *
 	 * @param state the next State
 	 */
 	public void forceNextState(STATE state) {
@@ -90,7 +90,7 @@ public void forceNextState(STATE state) {
 
 	/**
 	 * Execute the StateMachine.
-	 * 
+	 *
 	 * @throws OpenemsNamedException on error
 	 */
 	public void run(CONTEXT context) throws OpenemsNamedException {
@@ -110,7 +110,7 @@ public void run(CONTEXT context) throws OpenemsNamedException {
 			try {
 				// Call the State Handler and receive next State.
 				nextState = this.stateHandlers //
-						.get(state) //
+						.get(this.state) //
 						.runAndGetNextState(context);
 			} catch (OpenemsNamedException e) {
 				exception = e;
diff --git a/io.openems.edge.common/src/io/openems/edge/common/statemachine/State.java b/io.openems.edge.common/src/io/openems/edge/common/statemachine/State.java
index 8a5937c4792..cb9128e6946 100644
--- a/io.openems.edge.common/src/io/openems/edge/common/statemachine/State.java
+++ b/io.openems.edge.common/src/io/openems/edge/common/statemachine/State.java
@@ -12,17 +12,17 @@ public interface State<STATE extends State<STATE>> extends OptionsEnum {
 
 	/**
 	 * Gets all the available States.
-	 * 
+	 *
 	 * <p>
 	 * If used inside a 'State' enum, just implement this method using
-	 * 
+	 *
 	 * <pre>
 	 * &#64;Override
 	 * public State[] getStates() {
 	 * 	return State.values();
 	 * }
 	 * </pre>
-	 * 
+	 *
 	 * @return an array of States, as provided by an enum.
 	 */
 	public STATE[] getStates();
diff --git a/io.openems.edge.common/src/io/openems/edge/common/statemachine/StateHandler.java b/io.openems.edge.common/src/io/openems/edge/common/statemachine/StateHandler.java
index f3ece76d7db..90654fa2cf5 100644
--- a/io.openems.edge.common/src/io/openems/edge/common/statemachine/StateHandler.java
+++ b/io.openems.edge.common/src/io/openems/edge/common/statemachine/StateHandler.java
@@ -12,7 +12,7 @@ public abstract class StateHandler<STATE extends State<STATE>, CONTEXT> {
 
 	/**
 	 * Runs the main logic of StateMachine State and returns the next State.
-	 * 
+	 *
 	 * @param context the {@link CONTEXT}.
 	 * @return the next State
 	 */
diff --git a/io.openems.edge.common/src/io/openems/edge/common/statemachine/package-info.java b/io.openems.edge.common/src/io/openems/edge/common/statemachine/package-info.java
index 19bd379c4fc..0a6d35950af 100644
--- a/io.openems.edge.common/src/io/openems/edge/common/statemachine/package-info.java
+++ b/io.openems.edge.common/src/io/openems/edge/common/statemachine/package-info.java
@@ -1,13 +1,13 @@
 /**
  * This package holds helper classes to define a State-Machine inside an OpenEMS
  * Component.
- * 
+ *
  * Finite State-Machines are a good, reliable and well-tested way of handling
  * the logic inside an OpenEMS Controller or inside OpenEMS Device
  * implementations.
- * 
+ *
  * This package consists of three classes:
- * 
+ *
  * <ul>
  * <li>StateMachine manages the different States
  * <li>State is typically implemented by an enum that represents the different
diff --git a/io.openems.edge.common/src/io/openems/edge/common/sum/GridMode.java b/io.openems.edge.common/src/io/openems/edge/common/sum/GridMode.java
index e3dcff84e04..5adadd085f5 100644
--- a/io.openems.edge.common/src/io/openems/edge/common/sum/GridMode.java
+++ b/io.openems.edge.common/src/io/openems/edge/common/sum/GridMode.java
@@ -17,12 +17,12 @@ private GridMode(int value, String name) {
 
 	@Override
 	public int getValue() {
-		return value;
+		return this.value;
 	}
 
 	@Override
 	public String getName() {
-		return name;
+		return this.name;
 	}
 
 	@Override
diff --git a/io.openems.edge.common/src/io/openems/edge/common/sum/Sum.java b/io.openems.edge.common/src/io/openems/edge/common/sum/Sum.java
index 0368998f070..060afae8488 100644
--- a/io.openems.edge.common/src/io/openems/edge/common/sum/Sum.java
+++ b/io.openems.edge.common/src/io/openems/edge/common/sum/Sum.java
@@ -26,7 +26,7 @@ public interface Sum extends OpenemsComponent {
 	public enum ChannelId implements io.openems.edge.common.channel.ChannelId {
 		/**
 		 * Ess: Average State of Charge.
-		 * 
+		 *
 		 * <ul>
 		 * <li>Interface: Sum (origin: Ess)
 		 * <li>Type: Integer
@@ -40,7 +40,7 @@ public enum ChannelId implements io.openems.edge.common.channel.ChannelId {
 				.text("Range 0..100")), //
 		/**
 		 * Ess: Active Power.
-		 * 
+		 *
 		 * <ul>
 		 * <li>Interface: Sum (origin: SymmetricEss)
 		 * <li>Type: Integer
@@ -56,7 +56,7 @@ public enum ChannelId implements io.openems.edge.common.channel.ChannelId {
 						+ "Negative values for charge; positive for discharge")),
 		/**
 		 * Reactive Power.
-		 * 
+		 *
 		 * <ul>
 		 * <li>Interface: Ess Symmetric
 		 * <li>Type: Integer
@@ -68,7 +68,7 @@ public enum ChannelId implements io.openems.edge.common.channel.ChannelId {
 				.persistencePriority(PersistencePriority.VERY_HIGH)), //
 		/**
 		 * Ess: Active Power L1.
-		 * 
+		 *
 		 * <ul>
 		 * <li>Interface: Sum (origin: SymmetricEss / AsymmetricEss)
 		 * <li>Type: Integer
@@ -84,7 +84,7 @@ public enum ChannelId implements io.openems.edge.common.channel.ChannelId {
 						+ "Negative values for charge; positive for discharge")),
 		/**
 		 * Ess: Active Power L2.
-		 * 
+		 *
 		 * <ul>
 		 * <li>Interface: Sum (origin: SymmetricEss / AsymmetricEss)
 		 * <li>Type: Integer
@@ -100,7 +100,7 @@ public enum ChannelId implements io.openems.edge.common.channel.ChannelId {
 						+ "Negative values for charge; positive for discharge")),
 		/**
 		 * Ess: Active Power L3.
-		 * 
+		 *
 		 * <ul>
 		 * <li>Interface: Sum (origin: SymmetricEss / AsymmetricEss)
 		 * <li>Type: Integer
@@ -116,7 +116,7 @@ public enum ChannelId implements io.openems.edge.common.channel.ChannelId {
 						+ "Negative values for charge; positive for discharge")),
 		/**
 		 * Ess: Discharge Power.
-		 * 
+		 *
 		 * <ul>
 		 * <li>Interface: Sum (origin: SymmetricEss)
 		 * <li>Type: Integer
@@ -136,7 +136,7 @@ public enum ChannelId implements io.openems.edge.common.channel.ChannelId {
 						+ "Negative values for charge; positive for discharge")),
 		/**
 		 * Ess: Capacity.
-		 * 
+		 *
 		 * <ul>
 		 * <li>Interface: Sum (origin: Ess)
 		 * <li>Type: Integer
@@ -150,7 +150,7 @@ public enum ChannelId implements io.openems.edge.common.channel.ChannelId {
 
 		/**
 		 * Grid: Active Power.
-		 * 
+		 *
 		 * <ul>
 		 * <li>Interface: Sum (origin: SymmetricMeter))
 		 * <li>Type: Integer
@@ -167,7 +167,7 @@ public enum ChannelId implements io.openems.edge.common.channel.ChannelId {
 						+ "Negative values for sell-to-grid; positive for buy-from-grid")),
 		/**
 		 * Grid: Active Power L1.
-		 * 
+		 *
 		 * <ul>
 		 * <li>Interface: Sum (origin: SymmetricMeter / AsymmetricMeter)
 		 * <li>Type: Integer
@@ -184,7 +184,7 @@ public enum ChannelId implements io.openems.edge.common.channel.ChannelId {
 						+ "Negative values for sell-to-grid; positive for buy-from-grid")),
 		/**
 		 * Grid: Active Power L2.
-		 * 
+		 *
 		 * <ul>
 		 * <li>Interface: Sum (origin: SymmetricMeter / AsymmetricMeter)
 		 * <li>Type: Integer
@@ -201,7 +201,7 @@ public enum ChannelId implements io.openems.edge.common.channel.ChannelId {
 						+ "Negative values for sell-to-grid; positive for buy-from-grid")),
 		/**
 		 * Grid: Active Power L3.
-		 * 
+		 *
 		 * <ul>
 		 * <li>Interface: Sum (origin: SymmetricMeter / AsymmetricMeter)
 		 * <li>Type: Integer
@@ -218,7 +218,7 @@ public enum ChannelId implements io.openems.edge.common.channel.ChannelId {
 						+ "Negative values for sell-to-grid; positive for buy-from-grid")),
 		/**
 		 * Grid: Minimum Ever Active Power.
-		 * 
+		 *
 		 * <ul>
 		 * <li>Interface: Sum (origin: SymmetricMeter))
 		 * <li>Type: Integer
@@ -231,7 +231,7 @@ public enum ChannelId implements io.openems.edge.common.channel.ChannelId {
 				.persistencePriority(PersistencePriority.VERY_HIGH)),
 		/**
 		 * Grid: Maximum Ever Active Power.
-		 * 
+		 *
 		 * <ul>
 		 * <li>Interface: Sum (origin: SymmetricMeter)
 		 * <li>Type: Integer
@@ -244,7 +244,7 @@ public enum ChannelId implements io.openems.edge.common.channel.ChannelId {
 				.persistencePriority(PersistencePriority.VERY_HIGH)),
 		/**
 		 * Production: Active Power.
-		 * 
+		 *
 		 * <ul>
 		 * <li>Interface: Sum (origin: SymmetricMeter and ESS DC Charger)
 		 * <li>Type: Integer
@@ -258,7 +258,7 @@ public enum ChannelId implements io.openems.edge.common.channel.ChannelId {
 				.text("Total production; always positive")),
 		/**
 		 * Production: AC Active Power.
-		 * 
+		 *
 		 * <ul>
 		 * <li>Interface: Sum (origin: SymmetricMeter)
 		 * <li>Type: Integer
@@ -272,7 +272,7 @@ public enum ChannelId implements io.openems.edge.common.channel.ChannelId {
 				.text("Production from AC source")),
 		/**
 		 * Production: AC Active Power L1.
-		 * 
+		 *
 		 * <ul>
 		 * <li>Interface: Sum (origin: SymmetricMeter / AsymmetricMeter)
 		 * <li>Type: Integer
@@ -286,7 +286,7 @@ public enum ChannelId implements io.openems.edge.common.channel.ChannelId {
 				.text("Production from AC source on phase L1")),
 		/**
 		 * Production: AC Active Power L2.
-		 * 
+		 *
 		 * <ul>
 		 * <li>Interface: Sum (origin: SymmetricMeter / AsymmetricMeter)
 		 * <li>Type: Integer
@@ -300,7 +300,7 @@ public enum ChannelId implements io.openems.edge.common.channel.ChannelId {
 				.text("Production from AC source on phase L2")),
 		/**
 		 * Production: AC Active Power L3.
-		 * 
+		 *
 		 * <ul>
 		 * <li>Interface: Sum (origin: SymmetricMeter / AsymmetricMeter)
 		 * <li>Type: Integer
@@ -314,7 +314,7 @@ public enum ChannelId implements io.openems.edge.common.channel.ChannelId {
 				.text("Production from AC source on phase L3")),
 		/**
 		 * Production: DC Actual Power.
-		 * 
+		 *
 		 * <ul>
 		 * <li>Interface: Sum (origin: EssDcCharger)
 		 * <li>Type: Integer
@@ -328,7 +328,7 @@ public enum ChannelId implements io.openems.edge.common.channel.ChannelId {
 				.text("Production from DC source")),
 		/**
 		 * Production: Maximum Ever Active Power.
-		 * 
+		 *
 		 * <ul>
 		 * <li>Interface: Sum (origin: SymmetricMeter))
 		 * <li>Type: Integer
@@ -341,7 +341,7 @@ public enum ChannelId implements io.openems.edge.common.channel.ChannelId {
 				.persistencePriority(PersistencePriority.VERY_HIGH)), //
 		/**
 		 * Production: Maximum Ever AC Active Power.
-		 * 
+		 *
 		 * <ul>
 		 * <li>Interface: Sum (origin: SymmetricMeter))
 		 * <li>Type: Integer
@@ -354,7 +354,7 @@ public enum ChannelId implements io.openems.edge.common.channel.ChannelId {
 				.persistencePriority(PersistencePriority.VERY_HIGH)), //
 		/**
 		 * Production: Maximum Ever DC Actual Power.
-		 * 
+		 *
 		 * <ul>
 		 * <li>Interface: Sum (origin: EssDcCharger}))
 		 * <li>Type: Integer
@@ -367,7 +367,7 @@ public enum ChannelId implements io.openems.edge.common.channel.ChannelId {
 				.persistencePriority(PersistencePriority.VERY_HIGH)), //
 		/**
 		 * Consumption: Active Power.
-		 * 
+		 *
 		 * <ul>
 		 * <li>Interface: Sum
 		 * <li>Type: Integer
@@ -382,7 +382,7 @@ public enum ChannelId implements io.openems.edge.common.channel.ChannelId {
 				.persistencePriority(PersistencePriority.VERY_HIGH)), //
 		/**
 		 * Consumption: Active Power L1.
-		 * 
+		 *
 		 * <ul>
 		 * <li>Interface: Sum
 		 * <li>Type: Integer
@@ -397,7 +397,7 @@ public enum ChannelId implements io.openems.edge.common.channel.ChannelId {
 				.persistencePriority(PersistencePriority.VERY_HIGH)), //
 		/**
 		 * Consumption: Active Power L2.
-		 * 
+		 *
 		 * <ul>
 		 * <li>Interface: Sum
 		 * <li>Type: Integer
@@ -412,7 +412,7 @@ public enum ChannelId implements io.openems.edge.common.channel.ChannelId {
 				.persistencePriority(PersistencePriority.VERY_HIGH)), //
 		/**
 		 * Consumption: Active Power L3.
-		 * 
+		 *
 		 * <ul>
 		 * <li>Interface: Sum
 		 * <li>Type: Integer
@@ -427,7 +427,7 @@ public enum ChannelId implements io.openems.edge.common.channel.ChannelId {
 				.persistencePriority(PersistencePriority.VERY_HIGH)), //
 		/**
 		 * Consumption: Maximum Ever Active Power.
-		 * 
+		 *
 		 * <ul>
 		 * <li>Interface: Sum (origin: SymmetricEss))
 		 * <li>Type: Integer
@@ -440,7 +440,7 @@ public enum ChannelId implements io.openems.edge.common.channel.ChannelId {
 				.persistencePriority(PersistencePriority.VERY_HIGH)), //
 		/**
 		 * Grid-Mode.
-		 * 
+		 *
 		 * <ul>
 		 * <li>Interface: Sum (origin: SymmetricEss))
 		 * <li>Type: Integer
@@ -452,7 +452,7 @@ public enum ChannelId implements io.openems.edge.common.channel.ChannelId {
 
 		/**
 		 * Ess: Max Apparent Power.
-		 * 
+		 *
 		 * <ul>
 		 * <li>Interface: Max Apparent Power (origin: SymmetricEss))
 		 * <li>Type: Integer
@@ -464,7 +464,7 @@ public enum ChannelId implements io.openems.edge.common.channel.ChannelId {
 				.persistencePriority(PersistencePriority.VERY_HIGH)), //
 		/**
 		 * Ess: Active Charge Energy.
-		 * 
+		 *
 		 * <ul>
 		 * <li>Interface: Sum (origin: SymmetricEss)
 		 * <li>Type: Long
@@ -476,7 +476,7 @@ public enum ChannelId implements io.openems.edge.common.channel.ChannelId {
 				.persistencePriority(PersistencePriority.VERY_HIGH)), //
 		/**
 		 * Ess: Active Discharge Energy.
-		 * 
+		 *
 		 * <ul>
 		 * <li>Interface: Sum (origin: SymmetricEss)
 		 * <li>Type: Long
@@ -488,7 +488,7 @@ public enum ChannelId implements io.openems.edge.common.channel.ChannelId {
 				.persistencePriority(PersistencePriority.VERY_HIGH)), //
 		/**
 		 * Ess: DC Discharge Energy.
-		 * 
+		 *
 		 * <ul>
 		 * <li>Interface: Sum (origin: HybridEss)
 		 * <li>Type: Long
@@ -500,7 +500,7 @@ public enum ChannelId implements io.openems.edge.common.channel.ChannelId {
 				.persistencePriority(PersistencePriority.VERY_HIGH)), //
 		/**
 		 * Ess: DC Charge Energy.
-		 * 
+		 *
 		 * <ul>
 		 * <li>Interface: Sum (origin: HybridEss)
 		 * <li>Type: Long
@@ -512,7 +512,7 @@ public enum ChannelId implements io.openems.edge.common.channel.ChannelId {
 				.persistencePriority(PersistencePriority.VERY_HIGH)), //
 		/**
 		 * Grid: Buy-from-grid Energy ("Production").
-		 * 
+		 *
 		 * <ul>
 		 * <li>Interface: Sum (origin: SymmetricMeter)
 		 * <li>Type: Integer
@@ -524,7 +524,7 @@ public enum ChannelId implements io.openems.edge.common.channel.ChannelId {
 				.persistencePriority(PersistencePriority.VERY_HIGH)), //
 		/**
 		 * Grid: Sell-to-grid Energy ("Consumption").
-		 * 
+		 *
 		 * <ul>
 		 * <li>Interface: Sum (origin: SymmetricMeter)
 		 * <li>Type: Long
@@ -536,7 +536,7 @@ public enum ChannelId implements io.openems.edge.common.channel.ChannelId {
 				.persistencePriority(PersistencePriority.VERY_HIGH)), //
 		/**
 		 * Production: Energy.
-		 * 
+		 *
 		 * <ul>
 		 * <li>Type: Long
 		 * <li>Unit: Wh
@@ -547,7 +547,7 @@ public enum ChannelId implements io.openems.edge.common.channel.ChannelId {
 				.persistencePriority(PersistencePriority.VERY_HIGH)), //
 		/**
 		 * Production: AC Energy.
-		 * 
+		 *
 		 * <ul>
 		 * <li>Interface: Sum (origin: SymmetricMeter)
 		 * <li>Type: Long
@@ -559,7 +559,7 @@ public enum ChannelId implements io.openems.edge.common.channel.ChannelId {
 				.persistencePriority(PersistencePriority.VERY_HIGH)), //
 		/**
 		 * Production: DC Energy.
-		 * 
+		 *
 		 * <ul>
 		 * <li>Interface: Sum (origin: EssDcCharger)
 		 * <li>Type: Long
@@ -571,7 +571,7 @@ public enum ChannelId implements io.openems.edge.common.channel.ChannelId {
 				.persistencePriority(PersistencePriority.VERY_HIGH)), //
 		/**
 		 * Consumption: Energy.
-		 * 
+		 *
 		 * <ul>
 		 * <li>Interface: Sum (origin: SymmetricMeter)
 		 * <li>Type: Long
@@ -594,6 +594,7 @@ private ChannelId(Doc doc) {
 			this.doc = doc;
 		}
 
+		@Override
 		public Doc doc() {
 			return this.doc;
 		}
@@ -601,7 +602,7 @@ public Doc doc() {
 
 	/**
 	 * Update all Channel-Values of this Sum-Component.
-	 * 
+	 *
 	 * <p>
 	 * This method is called by the 'Cycle' just before the
 	 * TOPIC_CYCLE_AFTER_PROCESS_IMAGE event.
diff --git a/io.openems.edge.common/src/io/openems/edge/common/taskmanager/MetaTasksManager.java b/io.openems.edge.common/src/io/openems/edge/common/taskmanager/MetaTasksManager.java
index 3b85c4ef5d6..4716bc2cebe 100644
--- a/io.openems.edge.common/src/io/openems/edge/common/taskmanager/MetaTasksManager.java
+++ b/io.openems.edge.common/src/io/openems/edge/common/taskmanager/MetaTasksManager.java
@@ -12,22 +12,22 @@
 
 /**
  * Manages a number of {@link TasksManager}s.
- * 
+ *
  * <p>
  * A useful application for MetaTasksManager is to provide a list of Tasks that
  * need to be handled on an OpenEMS Cycle run.
- * 
+ *
  * @param <T>
  */
 public class MetaTasksManager<T extends ManagedTask> {
 
 	private final Multimap<String, TasksManager<T>> tasksManagers = Multimaps
 			.synchronizedListMultimap(ArrayListMultimap.create());
-	private Map<Priority, Queue<T>> nextTasks;
+	private final Map<Priority, Queue<T>> nextTasks;
 
 	public MetaTasksManager() {
 		// initialize Queues for next tasks
-		EnumMap<Priority, Queue<T>> nextTasks = new EnumMap<>(Priority.class);
+		var nextTasks = new EnumMap<Priority, Queue<T>>(Priority.class);
 		for (Priority priority : Priority.values()) {
 			nextTasks.put(priority, new LinkedList<>());
 		}
@@ -36,7 +36,7 @@ public MetaTasksManager() {
 
 	/**
 	 * Adds a TasksManager.
-	 * 
+	 *
 	 * @param sourceId a source identifier
 	 * @param task     the TasksManager
 	 */
@@ -46,7 +46,7 @@ public synchronized void addTasksManager(String sourceId, TasksManager<T> tasksM
 
 	/**
 	 * Removes a TasksManager.
-	 * 
+	 *
 	 * @param sourceId a source identifier
 	 * @param task     the TasksManager
 	 */
@@ -56,7 +56,7 @@ public synchronized void removeTasksManager(String sourceId, TasksManager<T> tas
 
 	/**
 	 * Removes all TasksManagers with the given Source-ID.
-	 * 
+	 *
 	 * @param sourceId a source identifier
 	 */
 	public synchronized void removeTasksManager(String sourceId) {
@@ -65,11 +65,11 @@ public synchronized void removeTasksManager(String sourceId) {
 
 	/**
 	 * Gets one task that with the given Priority sequentially.
-	 * 
+	 *
 	 * @return the next task; null if there are no tasks with the given Priority
 	 */
 	public synchronized T getOneTask(Priority priority) {
-		Queue<T> tasks = this.nextTasks.get(priority);
+		var tasks = this.nextTasks.get(priority);
 		if (tasks.isEmpty()) {
 			// refill the queue
 			for (TasksManager<T> tasksManager : this.tasksManagers.values()) {
@@ -83,7 +83,7 @@ public synchronized T getOneTask(Priority priority) {
 
 	/**
 	 * Gets all Tasks with the given Priority by their Source-ID.
-	 * 
+	 *
 	 * @param priority the priority
 	 * @return a list of tasks
 	 */
@@ -97,7 +97,7 @@ public Multimap<String, T> getAllTasksBySourceId(Priority priority) {
 
 	/**
 	 * Gets all Tasks with by their Source-ID.
-	 * 
+	 *
 	 * @param priority the priority
 	 * @return a list of tasks
 	 */
@@ -111,7 +111,7 @@ public Multimap<String, T> getAllTasksBySourceId() {
 
 	/**
 	 * Does this {@link TasksManager} have any Tasks?.
-	 * 
+	 *
 	 * @return true if there are Tasks
 	 */
 	public boolean hasTasks() {
diff --git a/io.openems.edge.common/src/io/openems/edge/common/taskmanager/TasksManager.java b/io.openems.edge.common/src/io/openems/edge/common/taskmanager/TasksManager.java
index 838b19f32f5..d0576a16c8c 100644
--- a/io.openems.edge.common/src/io/openems/edge/common/taskmanager/TasksManager.java
+++ b/io.openems.edge.common/src/io/openems/edge/common/taskmanager/TasksManager.java
@@ -10,11 +10,11 @@
 
 /**
  * Manages a number of {@link ManagedTask}s with different priorities.
- * 
+ *
  * <p>
  * A useful application for TasksManager is to provide a list of Tasks that need
  * to be handled on an OpenEMS Cycle run.
- * 
+ *
  * @param <T>
  */
 public class TasksManager<T extends ManagedTask> {
@@ -29,7 +29,7 @@ public class TasksManager<T extends ManagedTask> {
 	private final Queue<T> nextOnceTasks = new LinkedList<>();
 
 	private int nextTaskIndex = 0;
-	private EnumMap<Priority, Integer> nextTaskIndexPerPriority = new EnumMap<>(Priority.class);
+	private final EnumMap<Priority, Integer> nextTaskIndexPerPriority = new EnumMap<>(Priority.class);
 
 	@SafeVarargs
 	public TasksManager(T... tasks) {
@@ -38,7 +38,7 @@ public TasksManager(T... tasks) {
 
 	/**
 	 * Adds multiple Tasks.
-	 * 
+	 *
 	 * @param tasks an array of Tasks
 	 */
 	@SafeVarargs
@@ -50,7 +50,7 @@ public final synchronized void addTasks(T... tasks) {
 
 	/**
 	 * Adds multiple Tasks.
-	 * 
+	 *
 	 * @param tasks an array of Tasks
 	 */
 	public void addTasks(List<T> tasks) {
@@ -61,7 +61,7 @@ public void addTasks(List<T> tasks) {
 
 	/**
 	 * Adds a Task, taking its Priority in consideration.
-	 * 
+	 *
 	 * @param task the Task
 	 */
 	public synchronized void addTask(T task) {
@@ -83,7 +83,7 @@ public synchronized void addTask(T task) {
 
 	/**
 	 * Removes a Task.
-	 * 
+	 *
 	 * @param task the Task
 	 */
 	public synchronized void removeTask(T task) {
@@ -117,7 +117,7 @@ public synchronized void clearAll() {
 
 	/**
 	 * Get all tasks with the given Priority.
-	 * 
+	 *
 	 * @param priority the Priority
 	 * @return a list of Tasks
 	 */
@@ -136,24 +136,19 @@ public synchronized List<T> getAllTasks(Priority priority) {
 
 	/**
 	 * Gets the next Tasks. This should normally be called once per Cycle.
-	 * 
+	 *
 	 * @return a list of Tasks.
 	 */
 	public synchronized List<T> getNextTasks() {
-		List<T> result = new ArrayList<>();
-		/*
-		 * Handle HIGH
-		 */
-		result.addAll(this.prioHighTasks);
-
+		List<T> result = new ArrayList<>(this.prioHighTasks);
 		/*
 		 * Handle LOW
 		 */
-		if (nextLowTasks.isEmpty()) {
+		if (this.nextLowTasks.isEmpty()) {
 			// Refill the 'nextLowTasks'. This happens every time the list is empty.
-			this.nextLowTasks.addAll(prioLowTasks);
+			this.nextLowTasks.addAll(this.prioLowTasks);
 		}
-		T task = nextLowTasks.poll();
+		var task = this.nextLowTasks.poll();
 		if (task != null) {
 			result.add(task);
 		}
@@ -161,7 +156,7 @@ public synchronized List<T> getNextTasks() {
 		/*
 		 * Handle ONCE
 		 */
-		task = nextOnceTasks.poll();
+		task = this.nextOnceTasks.poll();
 		if (task != null) {
 			result.add(task);
 		}
@@ -170,7 +165,7 @@ public synchronized List<T> getNextTasks() {
 
 	/**
 	 * Gets all Tasks.
-	 * 
+	 *
 	 * @return a list of all Tasks.
 	 */
 	public synchronized List<T> getAllTasks() {
@@ -179,7 +174,7 @@ public synchronized List<T> getAllTasks() {
 
 	/**
 	 * Gets tasks sequentially.
-	 * 
+	 *
 	 * @return the next task; null if there are no tasks
 	 */
 	public synchronized T getOneTask() {
@@ -195,15 +190,15 @@ public synchronized T getOneTask() {
 
 	/**
 	 * Gets one task that is lower than the given Priority sequentially.
-	 * 
+	 *
 	 * @return the next task; null if there are no tasks with the given Priority
 	 */
 	public synchronized T getOneTask(Priority priority) {
-		List<T> tasks = this.getAllTasks(priority);
+		var tasks = this.getAllTasks(priority);
 		if (tasks.isEmpty()) {
 			return null;
 		}
-		Integer nextTaskIndex = this.nextTaskIndexPerPriority.get(priority);
+		var nextTaskIndex = this.nextTaskIndexPerPriority.get(priority);
 		if (nextTaskIndex == null) {
 			// start new
 			nextTaskIndex = 0;
diff --git a/io.openems.edge.common/src/io/openems/edge/common/test/AbstractComponentConfig.java b/io.openems.edge.common/src/io/openems/edge/common/test/AbstractComponentConfig.java
index 5827c5c9d8c..385f6c5659b 100644
--- a/io.openems.edge.common/src/io/openems/edge/common/test/AbstractComponentConfig.java
+++ b/io.openems.edge.common/src/io/openems/edge/common/test/AbstractComponentConfig.java
@@ -48,7 +48,7 @@ public String webconsole_configurationFactory_nameHint() {
 	/**
 	 * Gets the configuration attributes in a format suitable for
 	 * {@link ConfigurationAdmin} properties.
-	 * 
+	 *
 	 * @return the properties
 	 * @throws IllegalAccessException    on error
 	 * @throws IllegalArgumentException  on error
@@ -84,8 +84,8 @@ public Dictionary<String, Object> getAsProperties()
 				continue;
 			}
 
-			String key = method.getName().replace("_", ".");
-			Object value = method.invoke(this);
+			var key = method.getName().replace("_", ".");
+			var value = method.invoke(this);
 			if (value == null) {
 				throw new IllegalArgumentException("Configuration for [" + key + "] is null");
 			}
diff --git a/io.openems.edge.common/src/io/openems/edge/common/test/AbstractComponentTest.java b/io.openems.edge.common/src/io/openems/edge/common/test/AbstractComponentTest.java
index 292b5acf9c5..d9c522ca34d 100644
--- a/io.openems.edge.common/src/io/openems/edge/common/test/AbstractComponentTest.java
+++ b/io.openems.edge.common/src/io/openems/edge/common/test/AbstractComponentTest.java
@@ -1,10 +1,8 @@
 package io.openems.edge.common.test;
 
 import java.io.IOException;
-import java.lang.reflect.Field;
 import java.lang.reflect.InvocationTargetException;
 import java.lang.reflect.Method;
-import java.lang.reflect.Parameter;
 import java.time.temporal.ChronoUnit;
 import java.time.temporal.TemporalUnit;
 import java.util.ArrayList;
@@ -60,7 +58,7 @@ public ChannelValue(ChannelAddress address, Object value) {
 
 		/**
 		 * Gets the {@link ChannelAddress}.
-		 * 
+		 *
 		 * @return the {@link ChannelAddress}
 		 */
 		public ChannelAddress getAddress() {
@@ -69,7 +67,7 @@ public ChannelAddress getAddress() {
 
 		/**
 		 * Gets the value {@link Object}.
-		 * 
+		 *
 		 * @return the {@link Object}
 		 */
 		public Object getValue() {
@@ -127,7 +125,7 @@ public TestCase() {
 
 		/**
 		 * Create a TestCase with a description.
-		 * 
+		 *
 		 * @param description the description
 		 */
 		public TestCase(String description) {
@@ -136,7 +134,7 @@ public TestCase(String description) {
 
 		/**
 		 * Adds an input value for a Channel.
-		 * 
+		 *
 		 * @param address the {@link ChannelAddress}
 		 * @param value   the value {@link Object}
 		 * @return myself
@@ -148,7 +146,7 @@ public TestCase input(ChannelAddress address, Object value) {
 
 		/**
 		 * Adds an expected output value for a Channel.
-		 * 
+		 *
 		 * @param address the {@link ChannelAddress}
 		 * @param value   the value {@link Object}
 		 * @return myself
@@ -160,7 +158,7 @@ public TestCase output(ChannelAddress address, Object value) {
 
 		/**
 		 * Adds a simulated timeleap, i.e. simulates that a given amount of time passed.
-		 * 
+		 *
 		 * @param clock       the active {@link TimeLeapClock}, i.e. provided to the
 		 *                    system-under-test by a {@link ClockProvider} like
 		 *                    {@link ComponentManager}.
@@ -177,7 +175,7 @@ public TestCase timeleap(TimeLeapClock clock, long amountToAdd, TemporalUnit uni
 		/**
 		 * Adds a Callback that is called on
 		 * {@link EdgeEventConstants#TOPIC_CYCLE_BEFORE_PROCESS_IMAGE} event.
-		 * 
+		 *
 		 * @param callback the callback
 		 * @return myself
 		 */
@@ -189,7 +187,7 @@ public TestCase onBeforeProcessImage(ThrowingRunnable<Exception> callback) {
 		/**
 		 * Adds a Callback that is called on
 		 * {@link EdgeEventConstants#TOPIC_CYCLE_AFTER_PROCESS_IMAGE} event.
-		 * 
+		 *
 		 * @param callback the callback
 		 * @return myself
 		 */
@@ -201,7 +199,7 @@ public TestCase onAfterProcessImage(ThrowingRunnable<Exception> callback) {
 		/**
 		 * Adds a Callback that is called on
 		 * {@link EdgeEventConstants#TOPIC_CYCLE_BEFORE_CONTROLLERS} event.
-		 * 
+		 *
 		 * @param callback the callback
 		 * @return myself
 		 */
@@ -214,7 +212,7 @@ public TestCase onBeforeControllersCallbacks(ThrowingRunnable<Exception> callbac
 		 * Adds a Callback that is called after
 		 * {@link EdgeEventConstants#TOPIC_CYCLE_BEFORE_CONTROLLERS} and before
 		 * {@link EdgeEventConstants#TOPIC_CYCLE_AFTER_CONTROLLERS}. events.
-		 * 
+		 *
 		 * @param callback the callback
 		 * @return myself
 		 */
@@ -226,7 +224,7 @@ public TestCase onExecuteControllersCallbacks(ThrowingRunnable<Exception> callba
 		/**
 		 * Adds a Callback that is called on
 		 * {@link EdgeEventConstants#TOPIC_CYCLE_AFTER_CONTROLLERS} event.
-		 * 
+		 *
 		 * @param callback the callback
 		 * @return myself
 		 */
@@ -238,7 +236,7 @@ public TestCase onAfterControllersCallbacks(ThrowingRunnable<Exception> callback
 		/**
 		 * Adds a Callback that is called on
 		 * {@link EdgeEventConstants#TOPIC_CYCLE_BEFORE_WRITE} event.
-		 * 
+		 *
 		 * @param callback the callback
 		 * @return myself
 		 */
@@ -250,7 +248,7 @@ public TestCase onBeforeWriteCallbacks(ThrowingRunnable<Exception> callback) {
 		/**
 		 * Adds a Callback that is called on
 		 * {@link EdgeEventConstants#TOPIC_CYCLE_EXECUTE_WRITE} event.
-		 * 
+		 *
 		 * @param callback the callback
 		 * @return myself
 		 */
@@ -262,7 +260,7 @@ public TestCase onExecuteWriteCallbacks(ThrowingRunnable<Exception> callback) {
 		/**
 		 * Adds a Callback that is called on
 		 * {@link EdgeEventConstants#TOPIC_CYCLE_AFTER_WRITE} event.
-		 * 
+		 *
 		 * @param callback the callback
 		 * @return myself
 		 */
@@ -282,7 +280,7 @@ public void applyTimeLeap() {
 
 		/**
 		 * Applies the values for input channels.
-		 * 
+		 *
 		 * @param components Referenced components
 		 * @throws OpenemsNamedException    on error
 		 * @throws IllegalArgumentException on error
@@ -290,7 +288,7 @@ public void applyTimeLeap() {
 		protected void applyInputs(Map<String, OpenemsComponent> components)
 				throws IllegalArgumentException, OpenemsNamedException {
 			for (ChannelValue input : this.inputs) {
-				OpenemsComponent component = components.get(input.address.getComponentId());
+				var component = components.get(input.address.getComponentId());
 				if (component == null) {
 					throw new IllegalArgumentException("On TestCase [" + this.description + "]: " + //
 							"the component [" + input.address.getComponentId() + "] " //
@@ -307,13 +305,13 @@ protected void applyInputs(Map<String, OpenemsComponent> components)
 
 		/**
 		 * Validates the output values.
-		 * 
+		 *
 		 * @param components Referenced components
 		 * @throws Exception on validation failure
 		 */
 		protected void validateOutputs(Map<String, OpenemsComponent> components) throws Exception {
 			for (ChannelValue output : this.outputs) {
-				Object expected = output.value;
+				var expected = output.value;
 				Channel<?> channel = components.get(output.address.getComponentId())
 						.channel(output.address.getChannelId());
 				Object got;
@@ -326,8 +324,8 @@ protected void validateOutputs(Map<String, OpenemsComponent> components) throws
 
 				// Try to parse an Enum
 				if (channel.channelDoc() instanceof EnumDoc) {
-					EnumDoc enumDoc = (EnumDoc) channel.channelDoc();
-					Integer intGot = TypeUtils.<Integer>getAsType(OpenemsType.INTEGER, got);
+					var enumDoc = (EnumDoc) channel.channelDoc();
+					var intGot = TypeUtils.<Integer>getAsType(OpenemsType.INTEGER, got);
 					got = enumDoc.getOption(intGot);
 				}
 				if (!Objects.equals(expected, got)) {
@@ -358,7 +356,7 @@ protected void validateOutputs(Map<String, OpenemsComponent> components) throws
 
 	/**
 	 * Constructs the Component-Test and validates the implemented Channel-IDs.
-	 * 
+	 *
 	 * @param sut the 'system-under-test'
 	 * @throws OpenemsException on error
 	 */
@@ -373,7 +371,7 @@ public AbstractComponentTest(SUT sut) throws OpenemsException {
 				if (Arrays.asList(subclass.getInterfaces()).contains(io.openems.edge.common.channel.ChannelId.class)) {
 					// Then read all the Channel-IDs...
 					for (Object enumConstant : subclass.getEnumConstants()) {
-						ChannelId channelId = (ChannelId) enumConstant;
+						var channelId = (ChannelId) enumConstant;
 						// and validate that they were initialized in the constructor.
 						try {
 							sut.channel(channelId);
@@ -391,7 +389,7 @@ public AbstractComponentTest(SUT sut) throws OpenemsException {
 
 	/**
 	 * Gets the 'system-under-test', i.e. the tested {@link OpenemsComponent}.
-	 * 
+	 *
 	 * @return the tested Component
 	 */
 	public SUT getSut() {
@@ -400,17 +398,17 @@ public SUT getSut() {
 
 	/**
 	 * Gets an instance of the correct subclass of myself.
-	 * 
+	 *
 	 * @return myself
 	 */
 	protected abstract SELF self();
 
 	/**
 	 * Adds a OSGi Declarative Services @Reference via java reflection.
-	 * 
+	 *
 	 * <p>
 	 * Can also be used to set any other private field via reflection.
-	 * 
+	 *
 	 * @param memberName the name of the field or method
 	 * @param object     the reference object
 	 * @return itself, to use as a builder
@@ -448,7 +446,7 @@ public SELF addReference(String memberName, Object object) throws Exception {
 	private boolean addReference(Class<?> clazz, String memberName, Object object)
 			throws IllegalArgumentException, IllegalAccessException, InvocationTargetException {
 		try {
-			Field field = clazz.getDeclaredField(memberName);
+			var field = clazz.getDeclaredField(memberName);
 			field.setAccessible(true);
 			field.set(this.sut, object);
 			return true;
@@ -469,10 +467,10 @@ private boolean addReference(Class<?> clazz, String memberName, Object object)
 
 	/**
 	 * Adds an available {@link OpenemsComponent}.
-	 * 
+	 *
 	 * <p>
 	 * If the provided Component is a {@link DummyComponentManager}.
-	 * 
+	 *
 	 * @param component the {@link OpenemsComponent}s
 	 * @return itself, to use as a builder
 	 */
@@ -490,11 +488,11 @@ public SELF addComponent(OpenemsComponent component) {
 
 	/**
 	 * Calls the 'activate()' method of the 'system-under-test'.
-	 * 
+	 *
 	 * <p>
 	 * If 'activate()' changes the configuration, the OSGi behavior is simulated by
 	 * calling 'deactivate()' and then again 'activate()'
-	 * 
+	 *
 	 * @param config the configuration
 	 * @return itself, to use as a builder
 	 * @throws Exception on error
@@ -503,12 +501,12 @@ public SELF activate(AbstractComponentConfig config) throws Exception {
 		// Add the configuration to ConfigurationAdmin
 		for (Object object : this.references) {
 			if (object instanceof DummyConfigurationAdmin) {
-				DummyConfigurationAdmin cm = (DummyConfigurationAdmin) object;
+				var cm = (DummyConfigurationAdmin) object;
 				cm.addConfig(config);
 			}
 		}
 
-		int configChangeCount = this.getConfigChangeCount();
+		var configChangeCount = this.getConfigChangeCount();
 		this.callActivate(config);
 
 		if (configChangeCount != this.getConfigChangeCount()) {
@@ -523,11 +521,11 @@ public SELF activate(AbstractComponentConfig config) throws Exception {
 	}
 
 	private int getConfigChangeCount() throws IOException, InvalidSyntaxException {
-		int result = 0;
+		var result = 0;
 		for (Object object : this.references) {
 			if (object instanceof ConfigurationAdmin) {
-				ConfigurationAdmin cm = (ConfigurationAdmin) object;
-				Configuration[] configs = cm.listConfigurations(null);
+				var cm = (ConfigurationAdmin) object;
+				var configs = cm.listConfigurations(null);
 				for (Configuration config : configs) {
 					result += config.getChangeCount();
 				}
@@ -539,14 +537,14 @@ private int getConfigChangeCount() throws IOException, InvalidSyntaxException {
 	private void callActivate(AbstractComponentConfig config)
 			throws IllegalAccessException, IllegalArgumentException, InvocationTargetException {
 		Class<?> clazz = this.sut.getClass();
-		Method[] methods = clazz.getDeclaredMethods();
+		var methods = clazz.getDeclaredMethods();
 		for (Method method : methods) {
 			if (!method.getName().equals("activate")) {
 				continue;
 			}
-			Object[] args = new Object[method.getParameterCount()];
-			for (int i = 0; i < method.getParameterCount(); i++) {
-				Parameter parameter = method.getParameters()[i];
+			var args = new Object[method.getParameterCount()];
+			for (var i = 0; i < method.getParameterCount(); i++) {
+				var parameter = method.getParameters()[i];
 				Object arg;
 
 				if (ComponentContext.class.isAssignableFrom(parameter.getType())) {
@@ -576,14 +574,14 @@ private void callActivate(AbstractComponentConfig config)
 	private void callDeactivate() throws IllegalAccessException, IllegalArgumentException, InvocationTargetException,
 			NoSuchMethodException, SecurityException {
 		Class<?> clazz = this.sut.getClass();
-		Method method = clazz.getDeclaredMethod("deactivate");
+		var method = clazz.getDeclaredMethod("deactivate");
 		method.setAccessible(true);
 		method.invoke(this.sut);
 	}
 
 	private boolean invokeSingleArgMethod(Class<?> clazz, String methodName, Object arg)
 			throws IllegalAccessException, IllegalArgumentException, InvocationTargetException {
-		Method[] methods = clazz.getDeclaredMethods();
+		var methods = clazz.getDeclaredMethods();
 		for (Method method : methods) {
 			if (!method.getName().equals(methodName)) {
 				continue;
@@ -592,7 +590,7 @@ private boolean invokeSingleArgMethod(Class<?> clazz, String methodName, Object
 				continue;
 			}
 
-			Parameter parameter = method.getParameters()[0];
+			var parameter = method.getParameters()[0];
 			if (!parameter.getType().isAssignableFrom(arg.getClass())) {
 				continue;
 			}
@@ -608,7 +606,7 @@ private boolean invokeSingleArgMethod(Class<?> clazz, String methodName, Object
 
 	/**
 	 * Runs a Test-Case.
-	 * 
+	 *
 	 * @param testCase The TestCase
 	 * @return itself, to use as a builder
 	 * @throws Exception on error
@@ -655,14 +653,14 @@ private static void executeCallbacks(List<ThrowingRunnable<Exception>> callbacks
 	/**
 	 * If the 'system-under-test' is a {@link EventHandler} call the
 	 * {@link EventHandler#handleEvent(Event)} method.
-	 * 
+	 *
 	 * @param topic the {@link Event} topic
 	 * @throws Exception on error
-	 * 
+	 *
 	 */
 	protected void handleEvent(String topic) throws Exception {
 		if (this.sut instanceof EventHandler) {
-			Event event = new Event(topic, new HashMap<String, Object>());
+			var event = new Event(topic, new HashMap<String, Object>());
 			((EventHandler) this.sut).handleEvent(event);
 		}
 	}
@@ -670,7 +668,7 @@ protected void handleEvent(String topic) throws Exception {
 	/**
 	 * This method is executed before the
 	 * {@link EdgeEventConstants#TOPIC_CYCLE_BEFORE_PROCESS_IMAGE} event.
-	 * 
+	 *
 	 * @throws OpenemsNamedException on error
 	 */
 	protected void onBeforeProcessImage() throws OpenemsNamedException {
@@ -679,7 +677,7 @@ protected void onBeforeProcessImage() throws OpenemsNamedException {
 	/**
 	 * This method is executed before the
 	 * {@link EdgeEventConstants#TOPIC_CYCLE_AFTER_PROCESS_IMAGE} event.
-	 * 
+	 *
 	 * @throws OpenemsNamedException on error
 	 */
 	protected void onAfterProcessImage() throws OpenemsNamedException {
@@ -688,7 +686,7 @@ protected void onAfterProcessImage() throws OpenemsNamedException {
 	/**
 	 * This method is executed before the
 	 * {@link EdgeEventConstants#TOPIC_CYCLE_BEFORE_CONTROLLERS} event.
-	 * 
+	 *
 	 * @throws OpenemsNamedException on error
 	 */
 	protected void onBeforeControllers() throws OpenemsNamedException {
@@ -698,7 +696,7 @@ protected void onBeforeControllers() throws OpenemsNamedException {
 	 * This method is executed after
 	 * {@link EdgeEventConstants#TOPIC_CYCLE_BEFORE_CONTROLLERS} and before
 	 * {@link EdgeEventConstants#TOPIC_CYCLE_AFTER_CONTROLLERS}.
-	 * 
+	 *
 	 * @throws OpenemsNamedException on error
 	 */
 	protected void onExecuteControllers() throws OpenemsNamedException {
@@ -707,7 +705,7 @@ protected void onExecuteControllers() throws OpenemsNamedException {
 	/**
 	 * This method is executed before the
 	 * {@link EdgeEventConstants#TOPIC_CYCLE_AFTER_CONTROLLERS} event.
-	 * 
+	 *
 	 * @throws OpenemsNamedException on error
 	 */
 	protected void onAfterControllers() throws OpenemsNamedException {
@@ -716,7 +714,7 @@ protected void onAfterControllers() throws OpenemsNamedException {
 	/**
 	 * This method is executed before the
 	 * {@link EdgeEventConstants#TOPIC_CYCLE_BEFORE_WRITE} event.
-	 * 
+	 *
 	 * @throws OpenemsNamedException on error
 	 */
 	protected void onBeforeWrite() throws OpenemsNamedException {
@@ -725,7 +723,7 @@ protected void onBeforeWrite() throws OpenemsNamedException {
 	/**
 	 * This method is executed before the
 	 * {@link EdgeEventConstants#TOPIC_CYCLE_EXECUTE_WRITE} event.
-	 * 
+	 *
 	 * @throws OpenemsNamedException on error
 	 */
 	protected void onExecuteWrite() throws OpenemsNamedException {
@@ -734,7 +732,7 @@ protected void onExecuteWrite() throws OpenemsNamedException {
 	/**
 	 * This method is executed before
 	 * {@link EdgeEventConstants#TOPIC_CYCLE_AFTER_WRITE}.
-	 * 
+	 *
 	 * @throws OpenemsNamedException on error
 	 */
 	protected void onAfterWrite() throws OpenemsNamedException {
diff --git a/io.openems.edge.common/src/io/openems/edge/common/test/ComponentTest.java b/io.openems.edge.common/src/io/openems/edge/common/test/ComponentTest.java
index d3358821e5b..9b877eac0bf 100644
--- a/io.openems.edge.common/src/io/openems/edge/common/test/ComponentTest.java
+++ b/io.openems.edge.common/src/io/openems/edge/common/test/ComponentTest.java
@@ -5,7 +5,7 @@
 
 /**
  * Provides a generic test framework for OpenEMS Components.
- * 
+ *
  * @see {@link AbstractComponentTest} for implementation details
  */
 public class ComponentTest extends AbstractComponentTest<ComponentTest, OpenemsComponent> {
diff --git a/io.openems.edge.common/src/io/openems/edge/common/test/DummyComponentManager.java b/io.openems.edge.common/src/io/openems/edge/common/test/DummyComponentManager.java
index f551dea48e6..a1387ad5a3d 100644
--- a/io.openems.edge.common/src/io/openems/edge/common/test/DummyComponentManager.java
+++ b/io.openems.edge.common/src/io/openems/edge/common/test/DummyComponentManager.java
@@ -65,7 +65,7 @@ public <T extends OpenemsComponent> List<T> getEnabledComponentsOfType(Class<T>
 
 	/**
 	 * Specific for this Dummy implementation.
-	 * 
+	 *
 	 * @param component
 	 */
 	public DummyComponentManager addComponent(OpenemsComponent component) {
@@ -77,7 +77,7 @@ public DummyComponentManager addComponent(OpenemsComponent component) {
 
 	/**
 	 * Sets a {@link EdgeConfig} json.
-	 * 
+	 *
 	 * @param the {@link EdgeConfig} json
 	 */
 	public void setConfigJson(JsonObject json) {
@@ -86,16 +86,15 @@ public void setConfigJson(JsonObject json) {
 
 	@Override
 	public EdgeConfig getEdgeConfig() {
-		if (this.edgeConfigJson != null) {
-			try {
-				return EdgeConfig.fromJson(this.edgeConfigJson);
-			} catch (OpenemsNamedException e) {
-				e.printStackTrace();
-				throw new IllegalArgumentException(e.getMessage());
-			}
-		} else {
+		if (this.edgeConfigJson == null) {
 			return new EdgeConfig();
 		}
+		try {
+			return EdgeConfig.fromJson(this.edgeConfigJson);
+		} catch (OpenemsNamedException e) {
+			e.printStackTrace();
+			throw new IllegalArgumentException(e.getMessage());
+		}
 	}
 
 	@Override
@@ -146,7 +145,7 @@ public CompletableFuture<JsonrpcResponseSuccess> handleJsonrpcRequest(User user,
 
 	/**
 	 * Handles a {@link GetEdgeConfigRequest}.
-	 * 
+	 *
 	 * @param user    the {@link User}
 	 * @param request the {@link GetEdgeConfigRequest}
 	 * @return the Future JSON-RPC Response
@@ -154,8 +153,8 @@ public CompletableFuture<JsonrpcResponseSuccess> handleJsonrpcRequest(User user,
 	 */
 	private CompletableFuture<JsonrpcResponseSuccess> handleGetEdgeConfigRequest(User user,
 			GetEdgeConfigRequest request) throws OpenemsNamedException {
-		EdgeConfig config = this.getEdgeConfig();
-		GetEdgeConfigResponse response = new GetEdgeConfigResponse(request.getId(), config);
+		var config = this.getEdgeConfig();
+		var response = new GetEdgeConfigResponse(request.getId(), config);
 		return CompletableFuture.completedFuture(response);
 	}
 
diff --git a/io.openems.edge.common/src/io/openems/edge/common/test/DummyConfigurationAdmin.java b/io.openems.edge.common/src/io/openems/edge/common/test/DummyConfigurationAdmin.java
index e0009373c07..c6d446bf752 100644
--- a/io.openems.edge.common/src/io/openems/edge/common/test/DummyConfigurationAdmin.java
+++ b/io.openems.edge.common/src/io/openems/edge/common/test/DummyConfigurationAdmin.java
@@ -3,7 +3,6 @@
 import java.io.IOException;
 import java.lang.reflect.InvocationTargetException;
 import java.util.Dictionary;
-import java.util.Enumeration;
 import java.util.HashMap;
 import java.util.HashSet;
 import java.util.Hashtable;
@@ -22,7 +21,7 @@ public class DummyConfigurationAdmin implements ConfigurationAdmin {
 
 	public static class DummyConfiguration implements Configuration {
 
-		private final Hashtable<String, Object> properties = new Hashtable<String, Object>();
+		private final Hashtable<String, Object> properties = new Hashtable<>();
 		private int changeCount = 0;
 
 		@Override
@@ -37,7 +36,7 @@ public Dictionary<String, Object> getProperties() {
 
 		/**
 		 * Adds a configuration property to this {@link DummyConfiguration}.
-		 * 
+		 *
 		 * @param key   the property key
 		 * @param value the property value
 		 */
@@ -47,18 +46,19 @@ public void addProperty(String key, Object value) {
 
 		@Override
 		public void update(Dictionary<String, ?> properties) throws IOException {
-			Enumeration<String> keys = properties.keys();
+			var keys = properties.keys();
 			while (keys.hasMoreElements()) {
-				String key = keys.nextElement();
+				var key = keys.nextElement();
 				Object value = properties.get(key);
 				this.properties.put(key, value);
 			}
 			this.changeCount++;
 		}
 
+		@Override
 		public void update() throws IOException {
 			this.changeCount++;
-		};
+		}
 
 		@Override
 		public String getFactoryPid() {
@@ -150,18 +150,18 @@ public Configuration getFactoryConfiguration(String factoryPid, String name) thr
 	/**
 	 * Gets a {@link DummyConfiguration} by id or creates a new empty
 	 * {@link DummyConfiguration} for the given id.
-	 * 
+	 *
 	 * @param id the given id
 	 * @return the {@link DummyConfiguration}
 	 */
 	public synchronized DummyConfiguration getOrCreateEmptyConfiguration(String id) {
-		return this.configurations.computeIfAbsent(id, (ignore) -> new DummyConfiguration());
+		return this.configurations.computeIfAbsent(id, ignore -> new DummyConfiguration());
 	}
 
 	/**
 	 * Adds a simulated {@link AbstractComponentConfig} with all its properties to
 	 * the configurations.
-	 * 
+	 *
 	 * @param config the {@link AbstractComponentConfig}
 	 * @throws IllegalAccessException    on error
 	 * @throws IllegalArgumentException  on error
@@ -169,19 +169,19 @@ public synchronized DummyConfiguration getOrCreateEmptyConfiguration(String id)
 	 */
 	public void addConfig(AbstractComponentConfig config)
 			throws IllegalAccessException, IllegalArgumentException, InvocationTargetException {
-		Dictionary<String, Object> properties = config.getAsProperties();
-		Enumeration<String> keys = properties.keys();
+		var properties = config.getAsProperties();
+		var keys = properties.keys();
 
-		DummyConfiguration c = this.getOrCreateEmptyConfiguration(config.id());
+		var c = this.getOrCreateEmptyConfiguration(config.id());
 		while (keys.hasMoreElements()) {
-			String key = keys.nextElement();
+			var key = keys.nextElement();
 			c.properties.put(key, properties.get(key));
 		}
 	}
 
 	/**
 	 * Adds a simulated {@link DummyConfiguration}.
-	 * 
+	 *
 	 * @param key           the PID
 	 * @param configuration the {@link DummyConfiguration}.
 	 */
diff --git a/io.openems.edge.common/src/io/openems/edge/common/test/TestUtils.java b/io.openems.edge.common/src/io/openems/edge/common/test/TestUtils.java
index a3166c47db6..3b2d13f09eb 100644
--- a/io.openems.edge.common/src/io/openems/edge/common/test/TestUtils.java
+++ b/io.openems.edge.common/src/io/openems/edge/common/test/TestUtils.java
@@ -11,15 +11,15 @@ private TestUtils() {
 
 	/**
 	 * Finds and returns an open port.
-	 * 
+	 *
 	 * <p>
 	 * Source https://stackoverflow.com/a/26644672
-	 * 
+	 *
 	 * @return an open port
 	 * @throws IOException on error
 	 */
 	public static int findRandomOpenPortOnAllLocalInterfaces() throws IOException {
-		try (ServerSocket socket = new ServerSocket(0);) {
+		try (var socket = new ServerSocket(0);) {
 			return socket.getLocalPort();
 		}
 	}
diff --git a/io.openems.edge.common/src/io/openems/edge/common/test/TimeLeapClock.java b/io.openems.edge.common/src/io/openems/edge/common/test/TimeLeapClock.java
index 62317a71a52..5f9f33bb0fe 100644
--- a/io.openems.edge.common/src/io/openems/edge/common/test/TimeLeapClock.java
+++ b/io.openems.edge.common/src/io/openems/edge/common/test/TimeLeapClock.java
@@ -55,7 +55,7 @@ public Instant instant() {
 	@Override
 	public boolean equals(Object obj) {
 		if (obj instanceof TimeLeapClock) {
-			TimeLeapClock other = (TimeLeapClock) obj;
+			var other = (TimeLeapClock) obj;
 			return this.instant.equals(other.instant) && this.zone.equals(other.zone);
 		}
 		return false;
diff --git a/io.openems.edge.common/src/io/openems/edge/common/type/CircularTreeMap.java b/io.openems.edge.common/src/io/openems/edge/common/type/CircularTreeMap.java
index 19cc3e69332..ad1b613a668 100644
--- a/io.openems.edge.common/src/io/openems/edge/common/type/CircularTreeMap.java
+++ b/io.openems.edge.common/src/io/openems/edge/common/type/CircularTreeMap.java
@@ -1,15 +1,14 @@
 package io.openems.edge.common.type;
 
-import java.util.Iterator;
 import java.util.TreeMap;
 
 /**
  * Implements a circular buffer with a TreeMap.
- * 
+ *
  * <p>
  * Be aware that not the eldest entry is removed when the buffer is full, but
  * the entry with the lowest key is removed!
- * 
+ *
  * @param <K> the type of the Key
  * @param <V> the type of the Value
  */
@@ -25,7 +24,7 @@ public CircularTreeMap(int limit) {
 
 	@Override
 	public V put(K key, V value) {
-		V result = super.put(key, value);
+		var result = super.put(key, value);
 		if (super.size() > this.limit) {
 			this.removeLowest();
 		}
@@ -33,7 +32,7 @@ public V put(K key, V value) {
 	}
 
 	private void removeLowest() {
-		Iterator<K> iterator = this.keySet().iterator();
+		var iterator = this.keySet().iterator();
 		if (iterator.hasNext()) {
 			this.remove(iterator.next());
 		}
diff --git a/io.openems.edge.common/src/io/openems/edge/common/type/TypeUtils.java b/io.openems.edge.common/src/io/openems/edge/common/type/TypeUtils.java
index 656029bd45e..5ff2cf5d0ef 100644
--- a/io.openems.edge.common/src/io/openems/edge/common/type/TypeUtils.java
+++ b/io.openems.edge.common/src/io/openems/edge/common/type/TypeUtils.java
@@ -19,7 +19,7 @@ public class TypeUtils {
 
 	/**
 	 * Converts and casts a Object to a given type.
-	 * 
+	 *
 	 * @param <T>   the Type for implicit casting of the result
 	 * @param type  the type as {@link OpenemsType}
 	 * @param value the value as {@link Object}
@@ -48,9 +48,8 @@ public static <T> T getAsType(OpenemsType type, Object value) throws IllegalArgu
 		if (type != OpenemsType.STRING && value != null && value.getClass().isArray()) {
 			if (Array.getLength(value) == 1) {
 				return TypeUtils.getAsType(type, Array.get(value, 0));
-			} else {
-				return null;
 			}
+			return null;
 		}
 
 		switch (type) {
@@ -58,7 +57,8 @@ public static <T> T getAsType(OpenemsType type, Object value) throws IllegalArgu
 			if (value == null) {
 				return (T) (Boolean) value;
 
-			} else if (value instanceof Boolean) {
+			}
+			if (value instanceof Boolean) {
 				return (T) (Boolean) value;
 
 			} else if (value instanceof Short) {
@@ -77,7 +77,7 @@ public static <T> T getAsType(OpenemsType type, Object value) throws IllegalArgu
 				return (T) ((Double) value == 0 ? Boolean.FALSE : Boolean.TRUE);
 
 			} else if (value instanceof String) {
-				String stringValue = (String) value;
+				var stringValue = (String) value;
 				if (stringValue.isEmpty()) {
 					return null;
 				} else if (stringValue.equalsIgnoreCase("false")) {
@@ -94,9 +94,10 @@ public static <T> T getAsType(OpenemsType type, Object value) throws IllegalArgu
 			if (value == null) {
 				return (T) (Short) value;
 
-			} else if (value instanceof Boolean) {
+			}
+			if (value instanceof Boolean) {
 				boolean boolValue = (Boolean) value;
-				return (T) Short.valueOf((boolValue ? (short) 1 : (short) 0));
+				return (T) Short.valueOf(boolValue ? (short) 1 : (short) 0);
 
 			} else if (value instanceof Short) {
 				return (T) (Short) value;
@@ -121,7 +122,7 @@ public static <T> T getAsType(OpenemsType type, Object value) throws IllegalArgu
 
 			} else if (value instanceof Float) {
 				float floatValue = (Float) value;
-				int intValue = Math.round(floatValue);
+				var intValue = Math.round(floatValue);
 				if (intValue >= Short.MIN_VALUE && intValue <= Short.MAX_VALUE) {
 					return (T) Short.valueOf((short) intValue);
 				} else {
@@ -131,7 +132,7 @@ public static <T> T getAsType(OpenemsType type, Object value) throws IllegalArgu
 
 			} else if (value instanceof Double) {
 				double doubleValue = (Double) value;
-				long longValue = Math.round(doubleValue);
+				var longValue = Math.round(doubleValue);
 				if (longValue >= Short.MIN_VALUE && longValue <= Short.MAX_VALUE) {
 					return (T) Short.valueOf((short) longValue);
 				} else {
@@ -140,7 +141,7 @@ public static <T> T getAsType(OpenemsType type, Object value) throws IllegalArgu
 				}
 
 			} else if (value instanceof String) {
-				String stringValue = (String) value;
+				var stringValue = (String) value;
 				if (stringValue.isEmpty()) {
 					return null;
 				}
@@ -154,11 +155,12 @@ public static <T> T getAsType(OpenemsType type, Object value) throws IllegalArgu
 
 		case INTEGER:
 			if (value == null) {
-				return (T) ((Integer) value);
+				return (T) (Integer) value;
 
-			} else if (value instanceof Boolean) {
+			}
+			if (value instanceof Boolean) {
 				boolean boolValue = (Boolean) value;
-				return (T) Integer.valueOf((boolValue ? 1 : 0));
+				return (T) Integer.valueOf(boolValue ? 1 : 0);
 
 			} else if (value instanceof Short) {
 				return (T) Integer.valueOf((Short) value);
@@ -186,7 +188,7 @@ public static <T> T getAsType(OpenemsType type, Object value) throws IllegalArgu
 
 			} else if (value instanceof Double) {
 				double doubleValue = (Double) value;
-				long longValue = Math.round(doubleValue);
+				var longValue = Math.round(doubleValue);
 				if (longValue >= Integer.MIN_VALUE && longValue <= Integer.MAX_VALUE) {
 					return (T) Integer.valueOf((int) longValue);
 				} else {
@@ -195,7 +197,7 @@ public static <T> T getAsType(OpenemsType type, Object value) throws IllegalArgu
 				}
 
 			} else if (value instanceof String) {
-				String stringValue = (String) value;
+				var stringValue = (String) value;
 				if (stringValue.isEmpty()) {
 					return null;
 				}
@@ -211,9 +213,10 @@ public static <T> T getAsType(OpenemsType type, Object value) throws IllegalArgu
 			if (value == null) {
 				return (T) (Long) value;
 
-			} else if (value instanceof Boolean) {
+			}
+			if (value instanceof Boolean) {
 				boolean boolValue = (Boolean) value;
-				return (T) Long.valueOf((boolValue ? 1L : 0L));
+				return (T) Long.valueOf(boolValue ? 1L : 0L);
 
 			} else if (value instanceof Short) {
 				return (T) (Long) ((Short) value).longValue();
@@ -235,16 +238,16 @@ public static <T> T getAsType(OpenemsType type, Object value) throws IllegalArgu
 
 			} else if (value instanceof Double) {
 				double doubleValue = (Double) value;
-				long longValue = Math.round(doubleValue);
+				var longValue = Math.round(doubleValue);
 				if (longValue >= Long.MIN_VALUE && longValue <= Long.MAX_VALUE) {
-					return (T) Long.valueOf((long) longValue);
+					return (T) Long.valueOf(longValue);
 				} else {
 					throw new IllegalArgumentException(
 							"Cannot convert. Double [" + value + "] is not fitting in Long range.");
 				}
 
 			} else if (value instanceof String) {
-				String stringValue = (String) value;
+				var stringValue = (String) value;
 				if (stringValue.isEmpty()) {
 					return null;
 				}
@@ -260,9 +263,10 @@ public static <T> T getAsType(OpenemsType type, Object value) throws IllegalArgu
 			if (value == null) {
 				return (T) (Float) value;
 
-			} else if (value instanceof Boolean) {
+			}
+			if (value instanceof Boolean) {
 				boolean boolValue = (Boolean) value;
-				return (T) Float.valueOf((boolValue ? 1f : 0f));
+				return (T) Float.valueOf(boolValue ? 1f : 0f);
 
 			} else if (value instanceof Short) {
 				return (T) (Float) ((Short) value).floatValue();
@@ -279,10 +283,10 @@ public static <T> T getAsType(OpenemsType type, Object value) throws IllegalArgu
 			} else if (value instanceof Double) {
 				// Returns the value of this Double as a float after a narrowing primitive
 				// conversion.
-				return (T) (Float) Float.valueOf(((Double) value).floatValue());
+				return (T) Float.valueOf(((Double) value).floatValue());
 
 			} else if (value instanceof String) {
-				String stringValue = (String) value;
+				var stringValue = (String) value;
 				if (stringValue.isEmpty()) {
 					return null;
 				}
@@ -298,9 +302,10 @@ public static <T> T getAsType(OpenemsType type, Object value) throws IllegalArgu
 			if (value == null) {
 				return (T) (Double) value;
 
-			} else if (value instanceof Boolean) {
+			}
+			if (value instanceof Boolean) {
 				boolean boolValue = (Boolean) value;
-				return (T) Double.valueOf((boolValue ? 1L : 0L));
+				return (T) Double.valueOf(boolValue ? 1L : 0L);
 
 			} else if (value instanceof Short) {
 				return (T) Double.valueOf((Short) value);
@@ -318,7 +323,7 @@ public static <T> T getAsType(OpenemsType type, Object value) throws IllegalArgu
 				return (T) (Double) value;
 
 			} else if (value instanceof String) {
-				String stringValue = (String) value;
+				var stringValue = (String) value;
 				if (stringValue.isEmpty()) {
 					return null;
 				}
@@ -332,9 +337,10 @@ public static <T> T getAsType(OpenemsType type, Object value) throws IllegalArgu
 
 		case STRING:
 			if (value == null) {
-				return (T) ((String) value);
+				return (T) (String) value;
 
-			} else if (value instanceof Object[]) {
+			}
+			if (value instanceof Object[]) {
 				return (T) Arrays.deepToString((Object[]) value);
 
 			} else if (value.getClass().isArray()) {
@@ -370,7 +376,7 @@ public static <T> T getAsType(OpenemsType type, Object value) throws IllegalArgu
 
 	/**
 	 * Gets the value of the given type as {@link JsonElement}.
-	 * 
+	 *
 	 * @param type          the type as {@link OpenemsType}
 	 * @param originalValue the value
 	 * @return the converted value
@@ -379,10 +385,10 @@ public static JsonElement getAsJson(OpenemsType type, Object originalValue) {
 		if (originalValue == null) {
 			return JsonNull.INSTANCE;
 		}
-		Object value = TypeUtils.getAsType(type, originalValue);
+		var value = TypeUtils.getAsType(type, originalValue);
 		switch (type) {
 		case BOOLEAN:
-			return new JsonPrimitive(((Boolean) value) ? 1 : 0);
+			return new JsonPrimitive((Boolean) value ? 1 : 0);
 		case SHORT:
 			return new JsonPrimitive((Short) value);
 		case INTEGER:
@@ -402,7 +408,7 @@ public static JsonElement getAsJson(OpenemsType type, Object originalValue) {
 	/**
 	 * Safely add Integers. If one of them is null it is considered '0'. If all of
 	 * them are null, 'null' is returned.
-	 * 
+	 *
 	 * @param values the {@link Integer} values
 	 * @return the sum
 	 */
@@ -424,7 +430,7 @@ public static Integer sum(Integer... values) {
 	/**
 	 * Safely add Longs. If one of them is null it is considered '0'. If all of them
 	 * are null, 'null' is returned.
-	 * 
+	 *
 	 * @param values the {@link Long} values
 	 * @return the sum
 	 */
@@ -445,13 +451,13 @@ public static Long sum(Long... values) {
 
 	/**
 	 * Safely subtract Integers.
-	 * 
+	 *
 	 * <ul>
 	 * <li>if minuend is null -&gt; result is null
 	 * <li>if subtrahend is null -&gt; result is minuend
 	 * <li>if both are null -&gt; result is null
 	 * </ul>
-	 * 
+	 *
 	 * @param minuend    the minuend of the subtraction
 	 * @param subtrahend the subtrahend of the subtraction
 	 * @return the result, possibly null
@@ -468,13 +474,13 @@ public static Integer subtract(Integer minuend, Integer subtrahend) {
 
 	/**
 	 * Safely subtract Longs.
-	 * 
+	 *
 	 * <ul>
 	 * <li>if minuend is null -&gt; result is null
 	 * <li>if subtrahend is null -&gt; result is minuend
 	 * <li>if both are null -&gt; result is null
 	 * </ul>
-	 * 
+	 *
 	 * @param minuend    the minuend of the subtraction
 	 * @param subtrahend the subtrahend of the subtraction
 	 * @return the result, possibly null
@@ -491,7 +497,7 @@ public static Long subtract(Long minuend, Long subtrahend) {
 
 	/**
 	 * Safely multiply Integers.
-	 * 
+	 *
 	 * @param factors the factors of the multiplication
 	 * @return the result, possibly null if all factors are null
 	 */
@@ -509,7 +515,7 @@ public static Integer multiply(Integer... factors) {
 
 	/**
 	 * Safely multiply Floats.
-	 * 
+	 *
 	 * @param factors the factors of the multiplication
 	 * @return the result, possibly null if all factors are null
 	 */
@@ -527,7 +533,7 @@ public static Float multiply(Float... factors) {
 
 	/**
 	 * Safely multiply Doubles.
-	 * 
+	 *
 	 * @param factors the factors of the multiplication
 	 * @return the result, possibly null if all factors are null
 	 */
@@ -545,11 +551,11 @@ public static Double multiply(Double... factors) {
 
 	/**
 	 * Safely divides Integers.
-	 * 
+	 *
 	 * <ul>
 	 * <li>if dividend is null -&gt; result is null
 	 * </ul>
-	 * 
+	 *
 	 * @param dividend the dividend of the division
 	 * @param divisor  the divisor of the division
 	 * @return the result, possibly null
@@ -563,11 +569,11 @@ public static Integer divide(Integer dividend, int divisor) {
 
 	/**
 	 * Safely divides Longs.
-	 * 
+	 *
 	 * <ul>
 	 * <li>if dividend is null -&gt; result is null
 	 * </ul>
-	 * 
+	 *
 	 * @param dividend the dividend of the division
 	 * @param divisor  the divisor of the division
 	 * @return the result, possibly null
@@ -581,7 +587,7 @@ public static Long divide(Long dividend, long divisor) {
 
 	/**
 	 * Safely finds the max value of all values.
-	 * 
+	 *
 	 * @param values the {@link Integer} values
 	 * @return the max value; or null if all values are null
 	 */
@@ -601,7 +607,7 @@ public static Integer max(Integer... values) {
 
 	/**
 	 * Safely finds the max value of all values.
-	 * 
+	 *
 	 * @param values the {@link Float} values
 	 * @return the max value; or null if all values are null
 	 */
@@ -621,7 +627,7 @@ public static Float max(Float... values) {
 
 	/**
 	 * Safely finds the min value of all values.
-	 * 
+	 *
 	 * @param values the {@link Integer} values
 	 * @return the min value; or null if all values are null
 	 */
@@ -639,7 +645,7 @@ public static Integer min(Integer... values) {
 
 	/**
 	 * Safely finds the min value of all values.
-	 * 
+	 *
 	 * @param values the {@link Double} values
 	 * @return the min value; or null if all values are null
 	 */
@@ -659,13 +665,13 @@ public static Double min(Double... values) {
 
 	/**
 	 * Safely finds the average value of all values.
-	 * 
+	 *
 	 * @param values the {@link Integer} values
 	 * @return the average value; or null if all values are null
 	 */
 	public static Float average(Integer... values) {
-		int count = 0;
-		float sum = 0.f;
+		var count = 0;
+		var sum = 0.f;
 		for (Integer value : values) {
 			if (value != null) {
 				count++;
@@ -680,20 +686,19 @@ public static Float average(Integer... values) {
 
 	/**
 	 * Safely finds the average value of all values.
-	 * 
+	 *
 	 * @param values the double values
 	 * @return the average value; or Double.NaN if all values are invalid.
 	 */
 	public static double average(double... values) {
-		int count = 0;
-		double sum = 0.;
+		var count = 0;
+		var sum = 0.;
 		for (double value : values) {
 			if (Double.isNaN(value)) {
 				continue;
-			} else {
-				count++;
-				sum += value;
 			}
+			count++;
+			sum += value;
 		}
 		if (count == 0) {
 			return Double.NaN;
@@ -704,22 +709,21 @@ public static double average(double... values) {
 	/**
 	 * Safely finds the average value of all values and rounds the result to an
 	 * Integer using {@link Math#round(float)}.
-	 * 
+	 *
 	 * @param values the {@link Integer} values
 	 * @return the rounded average value; or null if all values are null
 	 */
 	public static Integer averageRounded(Integer... values) {
-		Float result = average(values);
+		var result = average(values);
 		if (result == null) {
 			return null;
-		} else {
-			return Math.round(result);
 		}
+		return Math.round(result);
 	}
 
 	/**
 	 * Throws an descriptive exception if the object is null.
-	 * 
+	 *
 	 * @param description text that is added to the exception
 	 * @param objects     the objects
 	 * @throws IllegalArgumentException if any object is null
@@ -734,35 +738,33 @@ public static void assertNull(String description, Object... objects) throws Ille
 
 	/**
 	 * Safely convert from {@link Integer} to {@link Double}.
-	 * 
+	 *
 	 * @param value the Integer value, possibly null
 	 * @return the Double value, possibly null
 	 */
 	public static Double toDouble(Integer value) {
 		if (value == null) {
-			return (Double) null;
-		} else {
-			return Double.valueOf(value);
+			return null;
 		}
+		return Double.valueOf(value);
 	}
 
 	/**
 	 * Safely convert from {@link Float} to {@link Double}.
-	 * 
+	 *
 	 * @param value the Float value, possibly null
 	 * @return the Double value, possibly null
 	 */
 	public static Double toDouble(Float value) {
 		if (value == null) {
-			return (Double) null;
-		} else {
-			return Double.valueOf(value);
+			return null;
 		}
+		return Double.valueOf(value);
 	}
 
 	/**
 	 * Returns the 'alternativeValue' if the 'nullableValue' is null.
-	 * 
+	 *
 	 * @param <T>              the Type for implicit casting
 	 * @param nullableValue    the value, can be null
 	 * @param alternativeValue the alternative value
@@ -771,14 +773,13 @@ public static Double toDouble(Float value) {
 	public static <T> T orElse(T nullableValue, T alternativeValue) {
 		if (nullableValue != null) {
 			return nullableValue;
-		} else {
-			return alternativeValue;
 		}
+		return alternativeValue;
 	}
 
 	/**
 	 * Fits a value within a lower and upper boundary.
-	 * 
+	 *
 	 * @param lowLimit  the lower boundary
 	 * @param highLimit the upper boundary
 	 * @param value     the actual value
@@ -798,8 +799,7 @@ public static int fitWithin(int lowLimit, int highLimit, int value) {
 	public static Integer abs(Integer value) {
 		if (value == null) {
 			return null;
-		} else {
-			return Math.abs(value);
 		}
+		return Math.abs(value);
 	}
 }
diff --git a/io.openems.edge.common/src/io/openems/edge/common/type/slidingvalue/DoubleSlidingValue.java b/io.openems.edge.common/src/io/openems/edge/common/type/slidingvalue/DoubleSlidingValue.java
index 6801dfcd04e..2d7b2044b98 100644
--- a/io.openems.edge.common/src/io/openems/edge/common/type/slidingvalue/DoubleSlidingValue.java
+++ b/io.openems.edge.common/src/io/openems/edge/common/type/slidingvalue/DoubleSlidingValue.java
@@ -1,7 +1,6 @@
 package io.openems.edge.common.type.slidingvalue;
 
 import java.util.Optional;
-import java.util.OptionalDouble;
 
 import io.openems.common.types.OpenemsType;
 
@@ -13,14 +12,13 @@ public DoubleSlidingValue() {
 
 	@Override
 	protected Optional<Double> getSlidingValue() {
-		OptionalDouble result = this.values.stream() //
+		var result = this.values.stream() //
 				.mapToDouble(Double::doubleValue) //
 				.average();
 		if (result.isPresent()) {
 			return Optional.of(result.getAsDouble());
-		} else {
-			return Optional.empty();
 		}
+		return Optional.empty();
 	}
 
 }
diff --git a/io.openems.edge.common/src/io/openems/edge/common/type/slidingvalue/FloatSlidingValue.java b/io.openems.edge.common/src/io/openems/edge/common/type/slidingvalue/FloatSlidingValue.java
index 1804742f07b..e441ed64344 100644
--- a/io.openems.edge.common/src/io/openems/edge/common/type/slidingvalue/FloatSlidingValue.java
+++ b/io.openems.edge.common/src/io/openems/edge/common/type/slidingvalue/FloatSlidingValue.java
@@ -1,7 +1,6 @@
 package io.openems.edge.common.type.slidingvalue;
 
 import java.util.Optional;
-import java.util.OptionalDouble;
 
 import io.openems.common.types.OpenemsType;
 
@@ -13,18 +12,17 @@ public FloatSlidingValue() {
 
 	@Override
 	protected Optional<Float> getSlidingValue() {
-		OptionalDouble result = this.values.stream() //
+		var result = this.values.stream() //
 				.mapToDouble(Float::doubleValue) //
 				.average();
-		if (result.isPresent()) {
-			double value = result.getAsDouble();
-			if (value < Float.MIN_VALUE || value > Float.MAX_VALUE) {
-				return Optional.empty();
-			} else {
-				return Optional.of((float) value);
-			}
-		} else {
+		if (!result.isPresent()) {
+			return Optional.empty();
+		}
+		var value = result.getAsDouble();
+		if (value < Float.MIN_VALUE || value > Float.MAX_VALUE) {
 			return Optional.empty();
+		} else {
+			return Optional.of((float) value);
 		}
 	}
 
diff --git a/io.openems.edge.common/src/io/openems/edge/common/type/slidingvalue/IntegerSlidingValue.java b/io.openems.edge.common/src/io/openems/edge/common/type/slidingvalue/IntegerSlidingValue.java
index 360ad604fe9..7ed6cdec6ae 100644
--- a/io.openems.edge.common/src/io/openems/edge/common/type/slidingvalue/IntegerSlidingValue.java
+++ b/io.openems.edge.common/src/io/openems/edge/common/type/slidingvalue/IntegerSlidingValue.java
@@ -1,7 +1,6 @@
 package io.openems.edge.common.type.slidingvalue;
 
 import java.util.Optional;
-import java.util.OptionalDouble;
 
 import io.openems.common.types.OpenemsType;
 
@@ -13,19 +12,18 @@ public IntegerSlidingValue() {
 
 	@Override
 	protected Optional<Integer> getSlidingValue() {
-		OptionalDouble result = this.values.stream() //
+		var result = this.values.stream() //
 				.mapToInt(Integer::intValue) //
 				.average();
-		if (result.isPresent()) {
-			double doubleValue = result.getAsDouble();
-			long value = Math.round(doubleValue);
-			if (value < Integer.MIN_VALUE || value > Integer.MAX_VALUE) {
-				return Optional.empty();
-			} else {
-				return Optional.of((int) value);
-			}
-		} else {
+		if (!result.isPresent()) {
+			return Optional.empty();
+		}
+		var doubleValue = result.getAsDouble();
+		var value = Math.round(doubleValue);
+		if (value < Integer.MIN_VALUE || value > Integer.MAX_VALUE) {
 			return Optional.empty();
+		} else {
+			return Optional.of((int) value);
 		}
 	}
 }
diff --git a/io.openems.edge.common/src/io/openems/edge/common/type/slidingvalue/LongSlidingValue.java b/io.openems.edge.common/src/io/openems/edge/common/type/slidingvalue/LongSlidingValue.java
index a3ae023fa56..4367316a5a8 100644
--- a/io.openems.edge.common/src/io/openems/edge/common/type/slidingvalue/LongSlidingValue.java
+++ b/io.openems.edge.common/src/io/openems/edge/common/type/slidingvalue/LongSlidingValue.java
@@ -1,7 +1,6 @@
 package io.openems.edge.common.type.slidingvalue;
 
 import java.util.Optional;
-import java.util.OptionalDouble;
 
 import io.openems.common.types.OpenemsType;
 
@@ -13,14 +12,13 @@ public LongSlidingValue() {
 
 	@Override
 	protected Optional<Long> getSlidingValue() {
-		OptionalDouble result = this.values.stream() //
+		var result = this.values.stream() //
 				.mapToLong(Long::longValue) //
 				.average();
 		if (result.isPresent()) {
-			double doubleValue = result.getAsDouble();
+			var doubleValue = result.getAsDouble();
 			return Optional.of(Math.round(doubleValue));
-		} else {
-			return Optional.empty();
 		}
+		return Optional.empty();
 	}
 }
diff --git a/io.openems.edge.common/src/io/openems/edge/common/type/slidingvalue/ShortSlidingValue.java b/io.openems.edge.common/src/io/openems/edge/common/type/slidingvalue/ShortSlidingValue.java
index 34f2abb8b02..6081d5faefc 100644
--- a/io.openems.edge.common/src/io/openems/edge/common/type/slidingvalue/ShortSlidingValue.java
+++ b/io.openems.edge.common/src/io/openems/edge/common/type/slidingvalue/ShortSlidingValue.java
@@ -1,7 +1,6 @@
 package io.openems.edge.common.type.slidingvalue;
 
 import java.util.Optional;
-import java.util.OptionalDouble;
 
 import io.openems.common.types.OpenemsType;
 
@@ -13,19 +12,18 @@ public ShortSlidingValue() {
 
 	@Override
 	protected Optional<Short> getSlidingValue() {
-		OptionalDouble result = this.values.stream() //
+		var result = this.values.stream() //
 				.mapToInt(Short::intValue) //
 				.average();
-		if (result.isPresent()) {
-			double doubleValue = result.getAsDouble();
-			long value = Math.round(doubleValue);
-			if (value < Short.MIN_VALUE || value > Short.MAX_VALUE) {
-				return Optional.empty();
-			} else {
-				return Optional.of((short) value);
-			}
-		} else {
+		if (!result.isPresent()) {
+			return Optional.empty();
+		}
+		var doubleValue = result.getAsDouble();
+		var value = Math.round(doubleValue);
+		if (value < Short.MIN_VALUE || value > Short.MAX_VALUE) {
 			return Optional.empty();
+		} else {
+			return Optional.of((short) value);
 		}
 	}
 }
diff --git a/io.openems.edge.common/src/io/openems/edge/common/type/slidingvalue/SlidingValue.java b/io.openems.edge.common/src/io/openems/edge/common/type/slidingvalue/SlidingValue.java
index 79fa9e8ddb7..e1e28a6dbd4 100644
--- a/io.openems.edge.common/src/io/openems/edge/common/type/slidingvalue/SlidingValue.java
+++ b/io.openems.edge.common/src/io/openems/edge/common/type/slidingvalue/SlidingValue.java
@@ -10,14 +10,14 @@
 
 /**
  * Calculates the 'Sliding Value' for a value.
- * 
+ *
  * <p>
  * Using the existing subclasses, this class can be used to
  * <ul>
  * <li>calculate the average of several numeric values
  * <li>use the latest value for Enum and Boolean values
  * </ul>
- * 
+ *
  * @param <T> the type of the Value
  */
 public abstract class SlidingValue<T> {
@@ -32,14 +32,14 @@ protected SlidingValue(OpenemsType type) {
 
 	/**
 	 * Adds a value.
-	 * 
+	 *
 	 * @param value the value
 	 */
 	public abstract void addValue(T value);
 
 	/**
 	 * Gets the sliding value, e.g. the average of all values.
-	 * 
+	 *
 	 * @return the sliding value
 	 */
 	protected abstract Optional<T> getSlidingValue();
@@ -51,7 +51,7 @@ protected SlidingValue(OpenemsType type) {
 
 	/**
 	 * Gets the OpenemsType of this SlidingValue.
-	 * 
+	 *
 	 * @return the OpenemsType
 	 */
 	protected OpenemsType getType() {
@@ -60,11 +60,11 @@ protected OpenemsType getType() {
 
 	/**
 	 * Gets the value as a JsonElement if it changed. Resets the values.
-	 * 
+	 *
 	 * @return the value; or null if it had not changed
 	 */
 	public JsonElement getChangedValueOrNull() {
-		T value = this.getSlidingValue().orElse(null);
+		var value = this.getSlidingValue().orElse(null);
 		this.resetValues();
 		if (Objects.equals(this.lastSentValue, value)) {
 			return null;
@@ -75,11 +75,11 @@ public JsonElement getChangedValueOrNull() {
 
 	/**
 	 * Gets the value as a JsonElement. Resets the values.
-	 * 
+	 *
 	 * @return the value; null if is null
 	 */
 	public JsonElement getValue() {
-		T value = this.getSlidingValue().orElse(null);
+		var value = this.getSlidingValue().orElse(null);
 		this.resetValues();
 		return TypeUtils.getAsJson(this.getType(), value);
 	}
diff --git a/io.openems.edge.common/src/io/openems/edge/common/user/ManagedUser.java b/io.openems.edge.common/src/io/openems/edge/common/user/ManagedUser.java
index 4edb1febb4d..f5c179a10e3 100644
--- a/io.openems.edge.common/src/io/openems/edge/common/user/ManagedUser.java
+++ b/io.openems.edge.common/src/io/openems/edge/common/user/ManagedUser.java
@@ -5,7 +5,6 @@
 import java.util.Arrays;
 import java.util.Base64;
 
-import javax.crypto.SecretKey;
 import javax.crypto.SecretKeyFactory;
 import javax.crypto.spec.PBEKeySpec;
 
@@ -35,7 +34,7 @@ public ManagedUser(String id, String name, Role role, final byte[] password, fin
 
 	/**
 	 * Validates a given password against the Users password+salt.
-	 * 
+	 *
 	 * @param password the given password
 	 * @return true if passwords match
 	 */
@@ -44,13 +43,13 @@ public boolean validatePassword(String password) {
 			// no password existing -> allow access
 			return true;
 		}
-		byte[] hashedPassword = ManagedUser.hashPassword(password, this.salt, ITERATIONS, KEY_LENGTH);
+		var hashedPassword = ManagedUser.hashPassword(password, this.salt, ITERATIONS, KEY_LENGTH);
 		return Arrays.equals(hashedPassword, this.password);
 	}
 
 	/**
 	 * Validates if password+salt match the given password.
-	 * 
+	 *
 	 * @param passwordAsBase64 the hashed password
 	 * @param saltAsBase64     the salt
 	 * @param password         the given password
@@ -63,20 +62,20 @@ public static boolean validatePassword(String passwordAsBase64, String saltAsBas
 
 	/**
 	 * Validates if password+salt match the given password.
-	 * 
+	 *
 	 * @param password1 the hashed password
 	 * @param salt      the salt
 	 * @param password2 the given password
 	 * @return true if they match.
 	 */
 	public static boolean validatePassword(final byte[] password1, final byte[] salt, String password2) {
-		byte[] hashedPassword = ManagedUser.hashPassword(password2, salt, ITERATIONS, KEY_LENGTH);
+		var hashedPassword = ManagedUser.hashPassword(password2, salt, ITERATIONS, KEY_LENGTH);
 		return Arrays.equals(hashedPassword, password1);
 	}
 
 	/**
 	 * Hashes a password. Source: https://www.owasp.org/index.php/Hashing_Java.
-	 * 
+	 *
 	 * @param password   the password
 	 * @param salt       the salt
 	 * @param iterations the number of iterations
@@ -100,11 +99,10 @@ public static byte[] hashPassword(final String password, final byte[] salt, fina
 	public static byte[] hashPassword(final char[] password, final byte[] salt, final int iterations,
 			final int keyLength) {
 		try {
-			SecretKeyFactory skf = SecretKeyFactory.getInstance("PBKDF2WithHmacSHA512");
-			PBEKeySpec spec = new PBEKeySpec(password, salt, iterations, keyLength);
-			SecretKey key = skf.generateSecret(spec);
-			byte[] res = key.getEncoded();
-			return res;
+			var skf = SecretKeyFactory.getInstance("PBKDF2WithHmacSHA512");
+			var spec = new PBEKeySpec(password, salt, iterations, keyLength);
+			var key = skf.generateSecret(spec);
+			return key.getEncoded();
 
 		} catch (NoSuchAlgorithmException | InvalidKeySpecException e) {
 			throw new RuntimeException(e);
diff --git a/io.openems.edge.common/src/io/openems/edge/common/user/User.java b/io.openems.edge.common/src/io/openems/edge/common/user/User.java
index 00925d7c2ae..4313872b1be 100644
--- a/io.openems.edge.common/src/io/openems/edge/common/user/User.java
+++ b/io.openems.edge.common/src/io/openems/edge/common/user/User.java
@@ -21,7 +21,7 @@ public class User extends AbstractUser {
 
 	/**
 	 * Constructs an {@link User}.
-	 * 
+	 *
 	 * @param id   the User-ID
 	 * @param name the name
 	 * @param role the {@link Role}; used as global Role and assigned to
@@ -34,7 +34,7 @@ protected User(String id, String name, Role role) {
 	/**
 	 * Gets the Role (Global and Per-Edge-Role are the same for OpenEMS Edge
 	 * {@link User}).
-	 * 
+	 *
 	 * @return the {@link Role}
 	 */
 	public Role getRole() {
@@ -44,7 +44,7 @@ public Role getRole() {
 	/**
 	 * Throws an exception if the Role (Global and Per-Edge-Role are the same for
 	 * OpenEMS Edge {@link User}) is equal or more privileged than the given Role.
-	 * 
+	 *
 	 * @param resource a resource identifier; used for the exception
 	 * @param role     the compared {@link Role}
 	 * @throws OpenemsNamedException if the global Role privileges are less
@@ -55,7 +55,7 @@ public void assertRoleIsAtLeast(String resource, Role role) throws OpenemsNamedE
 
 	/**
 	 * Parses a {@link JsonObject} to a User.
-	 * 
+	 *
 	 * <pre>
 	 * {
 	 *   "id": string,
@@ -63,15 +63,15 @@ public void assertRoleIsAtLeast(String resource, Role role) throws OpenemsNamedE
 	 *   "role": string
 	 * }
 	 * </pre>
-	 * 
+	 *
 	 * @param j the {@link JsonObject}
 	 * @return a {@link User}
 	 * @throws OpenemsNamedException on error
 	 */
 	public static User from(JsonObject j) throws OpenemsNamedException {
-		String id = JsonUtils.getAsString(j, "id");
-		String name = JsonUtils.getAsString(j, "name");
-		Role role = Role.getRole(JsonUtils.getAsString(j, "role"));
+		var id = JsonUtils.getAsString(j, "id");
+		var name = JsonUtils.getAsString(j, "name");
+		var role = Role.getRole(JsonUtils.getAsString(j, "role"));
 		return new User(id, name, role);
 	}
 }
diff --git a/io.openems.edge.common/test/io/openems/edge/common/channel/TestOptions.java b/io.openems.edge.common/test/io/openems/edge/common/channel/TestOptions.java
index b5024c2908a..7af1a82d07a 100644
--- a/io.openems.edge.common/test/io/openems/edge/common/channel/TestOptions.java
+++ b/io.openems.edge.common/test/io/openems/edge/common/channel/TestOptions.java
@@ -17,12 +17,12 @@ private TestOptions(int value, String name) {
 
 	@Override
 	public int getValue() {
-		return value;
+		return this.value;
 	}
 
 	@Override
 	public String getName() {
-		return name;
+		return this.name;
 	}
 
 	@Override
diff --git a/io.openems.edge.common/test/io/openems/edge/common/filter/PidFilterTest.java b/io.openems.edge.common/test/io/openems/edge/common/filter/PidFilterTest.java
index 406106a4474..295822fbd20 100644
--- a/io.openems.edge.common/test/io/openems/edge/common/filter/PidFilterTest.java
+++ b/io.openems.edge.common/test/io/openems/edge/common/filter/PidFilterTest.java
@@ -19,92 +19,92 @@ public void prepare() {
 
 	@Test
 	public void test() {
-		PidFilter p = new PidFilter(0.3, 0.3, 0);
+		var p = new PidFilter(0.3, 0.3, 0);
 		p.setLimits(-100000, 100000);
-		t(p, 0, 0, 0);
-		t(p, 0, 0, 0);
-		t(p, 0, 0, 0);
-		t(p, 0, 0, 0);
-		t(p, 0, 0, 0);
-		t(p, 0, 0, 0);
-		t(p, 0, 0, 0);
-		t(p, 0, 0, 0);
-		t(p, 0, 0, 0);
-		t(p, 0, 0, 0);
-		t(p, 0, 20000, 6000);
-		t(p, 0, 20000, 12000);
-		t(p, 3793, 20000, 16862);
-		t(p, 8981, 20000, 20168);
-		t(p, 13963, 20000, 21979);
-		t(p, 17885, 20000, 22613);
-		t(p, 20473, 20000, 22472);
-		t(p, 21826, 20000, 21924);
-		t(p, 22234, 20000, 21254);
-		t(p, 22038, 20000, 20642);
-		t(p, 21542, 20000, 20180);
-		t(p, 20973, 20000, 19888);
-		t(p, 20472, 20000, 19746);
-		t(p, 20103, 20000, 19715);
-		t(p, 19877, 20000, 19752);
-		t(p, 19775, 20000, 19820);
-		t(p, 19760, 20000, 19892);
-		t(p, 19798, 20000, 19952);
-		t(p, 19857, 20000, 19995);
-		t(p, 19917, 20000, 20020);
-		t(p, 19966, 20000, 20030);
-		t(p, 20000, 20000, 20000);
-		t(p, 20019, 20000, 20024);
-		t(p, 20007, 20000, 20022);
-		t(p, 20018, 20000, 20017);
-		t(p, 20021, 20000, 20011);
-		t(p, 20018, 20000, 20005);
-		t(p, 20014, 20000, 20001);
-		t(p, 20008, 20000, 19999);
+		this.t(p, 0, 0, 0);
+		this.t(p, 0, 0, 0);
+		this.t(p, 0, 0, 0);
+		this.t(p, 0, 0, 0);
+		this.t(p, 0, 0, 0);
+		this.t(p, 0, 0, 0);
+		this.t(p, 0, 0, 0);
+		this.t(p, 0, 0, 0);
+		this.t(p, 0, 0, 0);
+		this.t(p, 0, 0, 0);
+		this.t(p, 0, 20000, 6000);
+		this.t(p, 0, 20000, 12000);
+		this.t(p, 3793, 20000, 16862);
+		this.t(p, 8981, 20000, 20168);
+		this.t(p, 13963, 20000, 21979);
+		this.t(p, 17885, 20000, 22613);
+		this.t(p, 20473, 20000, 22472);
+		this.t(p, 21826, 20000, 21924);
+		this.t(p, 22234, 20000, 21254);
+		this.t(p, 22038, 20000, 20642);
+		this.t(p, 21542, 20000, 20180);
+		this.t(p, 20973, 20000, 19888);
+		this.t(p, 20472, 20000, 19746);
+		this.t(p, 20103, 20000, 19715);
+		this.t(p, 19877, 20000, 19752);
+		this.t(p, 19775, 20000, 19820);
+		this.t(p, 19760, 20000, 19892);
+		this.t(p, 19798, 20000, 19952);
+		this.t(p, 19857, 20000, 19995);
+		this.t(p, 19917, 20000, 20020);
+		this.t(p, 19966, 20000, 20030);
+		this.t(p, 20000, 20000, 20000);
+		this.t(p, 20019, 20000, 20024);
+		this.t(p, 20007, 20000, 20022);
+		this.t(p, 20018, 20000, 20017);
+		this.t(p, 20021, 20000, 20011);
+		this.t(p, 20018, 20000, 20005);
+		this.t(p, 20014, 20000, 20001);
+		this.t(p, 20008, 20000, 19999);
 	}
 
 	@Test
 	public void testLimits() {
-		PidFilter p = new PidFilter(0.3, 0.3, 0);
+		var p = new PidFilter(0.3, 0.3, 0);
 		p.setLimits(-10000, 10000);
-		t(p, 0, 0, 0);
-		t(p, 0, 0, 0);
-		t(p, 0, 0, 0);
-		t(p, 0, 0, 0);
-		t(p, 0, 0, 0);
-		t(p, 0, 0, 0);
-		t(p, 0, 0, 0);
-		t(p, 0, 0, 0);
-		t(p, 0, 0, 0);
-		t(p, 0, 0, 0);
-		t(p, 0, 10000, 3000);
-		t(p, 0, 10000, 6000);
-		t(p, 1896, 10000, 8431);
-		t(p, 4490, 10000, 10000);
-		t(p, 6981, 10000, 10000);
-		t(p, 8889, 10000, 10000);
-		t(p, 9591, 10000, 10000);
-		t(p, 9850, 10000, 10000);
-		t(p, 9945, 10000, 10000);
-		t(p, 9980, 10000, 10000);
-		t(p, 9993, 10000, 10000);
-		t(p, 9997, 10000, 10000);
-		t(p, 9999, 10000, 10000);
-		t(p, 10000, 10000, 10000);
-		t(p, 10000, 10000, 10000);
-		t(p, 10000, 10000, 10000);
-		t(p, 10000, 10000, 10000);
-		t(p, 10000, 10000, 10000);
-		t(p, 10000, 10000, 10000);
-		t(p, 10000, 10000, 10000);
-		t(p, 10000, 10000, 10000);
-		t(p, 10000, 10000, 10000);
-		t(p, 10000, 10000, 10000);
-		t(p, 10000, 10000, 10000);
-		t(p, 10000, 10000, 10000);
-		t(p, 10000, 10000, 10000);
-		t(p, 10000, 10000, 10000);
-		t(p, 10000, 10000, 10000);
-		t(p, 10000, 10000, 10000);
+		this.t(p, 0, 0, 0);
+		this.t(p, 0, 0, 0);
+		this.t(p, 0, 0, 0);
+		this.t(p, 0, 0, 0);
+		this.t(p, 0, 0, 0);
+		this.t(p, 0, 0, 0);
+		this.t(p, 0, 0, 0);
+		this.t(p, 0, 0, 0);
+		this.t(p, 0, 0, 0);
+		this.t(p, 0, 0, 0);
+		this.t(p, 0, 10000, 3000);
+		this.t(p, 0, 10000, 6000);
+		this.t(p, 1896, 10000, 8431);
+		this.t(p, 4490, 10000, 10000);
+		this.t(p, 6981, 10000, 10000);
+		this.t(p, 8889, 10000, 10000);
+		this.t(p, 9591, 10000, 10000);
+		this.t(p, 9850, 10000, 10000);
+		this.t(p, 9945, 10000, 10000);
+		this.t(p, 9980, 10000, 10000);
+		this.t(p, 9993, 10000, 10000);
+		this.t(p, 9997, 10000, 10000);
+		this.t(p, 9999, 10000, 10000);
+		this.t(p, 10000, 10000, 10000);
+		this.t(p, 10000, 10000, 10000);
+		this.t(p, 10000, 10000, 10000);
+		this.t(p, 10000, 10000, 10000);
+		this.t(p, 10000, 10000, 10000);
+		this.t(p, 10000, 10000, 10000);
+		this.t(p, 10000, 10000, 10000);
+		this.t(p, 10000, 10000, 10000);
+		this.t(p, 10000, 10000, 10000);
+		this.t(p, 10000, 10000, 10000);
+		this.t(p, 10000, 10000, 10000);
+		this.t(p, 10000, 10000, 10000);
+		this.t(p, 10000, 10000, 10000);
+		this.t(p, 10000, 10000, 10000);
+		this.t(p, 10000, 10000, 10000);
+		this.t(p, 10000, 10000, 10000);
 	}
 
 	/**
@@ -114,40 +114,40 @@ public void testLimits() {
 	 */
 	@Test
 	public void testPriority() {
-		PidFilter p = new PidFilter(0.3, 0.3, 0.1);
+		var p = new PidFilter(0.3, 0.3, 0.1);
 
 		// Cycle 1
 		p.setLimits(-1000, 1000); // set by FixActivePower
-		t(p, 1000, 5000, 1000);
+		this.t(p, 1000, 5000, 1000);
 
 		// Cycle 2
 		// Limits and input value stay always at 1000 by FixActivePower
-		t(p, 1000, 5000, 1000);
+		this.t(p, 1000, 5000, 1000);
 
 		// Cycle 3
-		t(p, 1000, 5000, 1000);
+		this.t(p, 1000, 5000, 1000);
 
 		// Cycle 4
-		t(p, 1000, 5000, 1000);
+		this.t(p, 1000, 5000, 1000);
 
 		// Cycle 5
-		t(p, 1000, 5000, 1000);
+		this.t(p, 1000, 5000, 1000);
 
 		// Cycle 6
-		t(p, 1000, 5000, 1000);
+		this.t(p, 1000, 5000, 1000);
 
 		// Cycle 7
-		t(p, 1000, 5000, 1000);
+		this.t(p, 1000, 5000, 1000);
 
 		// Cycle 8
 		p.setLimits(-9999, 9999); // disable FixActivePower
-		t(p, 1000, 5000, 1200);
+		this.t(p, 1000, 5000, 1200);
 
 		// Cycle 9
-		t(p, 1000, 5000, 2400);
+		this.t(p, 1000, 5000, 2400);
 
 		// Cycle 10
-		t(p, 1000, 5000, 3600);
+		this.t(p, 1000, 5000, 3600);
 	}
 
 	private void t(PidFilter p, int input, int output, int expectedOutput) {
diff --git a/io.openems.edge.common/test/io/openems/edge/common/linecharacteristic/PolyLineTest.java b/io.openems.edge.common/test/io/openems/edge/common/linecharacteristic/PolyLineTest.java
index e805742f4c8..a60084336fd 100644
--- a/io.openems.edge.common/test/io/openems/edge/common/linecharacteristic/PolyLineTest.java
+++ b/io.openems.edge.common/test/io/openems/edge/common/linecharacteristic/PolyLineTest.java
@@ -4,8 +4,6 @@
 
 import org.junit.Test;
 
-import com.google.gson.JsonArray;
-
 import io.openems.common.exceptions.OpenemsError.OpenemsNamedException;
 import io.openems.common.utils.JsonUtils;
 
@@ -13,7 +11,7 @@ public class PolyLineTest {
 
 	@Test
 	public void test() throws OpenemsNamedException {
-		JsonArray lineConfig = JsonUtils.buildJsonArray()//
+		var lineConfig = JsonUtils.buildJsonArray()//
 				.add(JsonUtils.buildJsonObject()//
 						.addProperty("xCoord", 0.9) //
 						.addProperty("yCoord", 60) //
@@ -32,7 +30,7 @@ public void test() throws OpenemsNamedException {
 						.build() //
 				).build();
 
-		PolyLine polyline = new PolyLine("xCoord", "yCoord", lineConfig);
+		var polyline = new PolyLine("xCoord", "yCoord", lineConfig);
 
 		// exactly first
 		assertEquals(60f, polyline.getValue(0.9), 0.00001);
@@ -52,9 +50,9 @@ public void test() throws OpenemsNamedException {
 
 	@Test
 	public void testEmpty() throws OpenemsNamedException {
-		JsonArray lineConfig = JsonUtils.buildJsonArray().build();
+		var lineConfig = JsonUtils.buildJsonArray().build();
 
-		PolyLine polyline = new PolyLine("xCoord", "yCoord", lineConfig);
+		var polyline = new PolyLine("xCoord", "yCoord", lineConfig);
 
 		// exactly first
 		assertEquals(null, polyline.getValue(0.9));
diff --git a/io.openems.edge.common/test/io/openems/edge/common/taskmanager/TasksManagerTest.java b/io.openems.edge.common/test/io/openems/edge/common/taskmanager/TasksManagerTest.java
index 6054d692324..7806050c16a 100644
--- a/io.openems.edge.common/test/io/openems/edge/common/taskmanager/TasksManagerTest.java
+++ b/io.openems.edge.common/test/io/openems/edge/common/taskmanager/TasksManagerTest.java
@@ -3,13 +3,11 @@
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertTrue;
 
-import java.util.List;
-
 import org.junit.Test;
 
 public class TasksManagerTest {
 
-	private class Task implements ManagedTask {
+	private static class Task implements ManagedTask {
 
 		private final Priority priority;
 
@@ -35,9 +33,9 @@ public void testNextReadTasks() {
 		ManagedTask h2 = new Task(Priority.HIGH);
 		ManagedTask h3 = new Task(Priority.HIGH);
 
-		TasksManager<ManagedTask> m = new TasksManager<ManagedTask>(o1, o2, l1, l2, l3, h1, h2, h3);
+		var m = new TasksManager<>(o1, o2, l1, l2, l3, h1, h2, h3);
 
-		List<ManagedTask> t1 = m.getNextTasks();
+		var t1 = m.getNextTasks();
 		assertEquals(5, t1.size());
 		assertTrue(t1.contains(h1));
 		assertTrue(t1.contains(h2));
@@ -45,7 +43,7 @@ public void testNextReadTasks() {
 		assertTrue(t1.contains(o1));
 		assertTrue(t1.contains(l1));
 
-		List<ManagedTask> t2 = m.getNextTasks();
+		var t2 = m.getNextTasks();
 		assertEquals(5, t2.size());
 		assertTrue(t2.contains(h1));
 		assertTrue(t2.contains(h2));
@@ -53,14 +51,14 @@ public void testNextReadTasks() {
 		assertTrue(t2.contains(o2));
 		assertTrue(t2.contains(l2));
 
-		List<ManagedTask> t3 = m.getNextTasks();
+		var t3 = m.getNextTasks();
 		assertEquals(4, t3.size());
 		assertTrue(t3.contains(h1));
 		assertTrue(t3.contains(h2));
 		assertTrue(t3.contains(h3));
 		assertTrue(t3.contains(l3));
 
-		List<ManagedTask> t4 = m.getNextTasks();
+		var t4 = m.getNextTasks();
 		assertEquals(4, t4.size());
 		assertTrue(t4.contains(h1));
 		assertTrue(t4.contains(h2));
@@ -75,7 +73,7 @@ public void testGetOneTask() {
 		ManagedTask l1 = new Task(Priority.LOW);
 		ManagedTask h1 = new Task(Priority.HIGH);
 
-		TasksManager<ManagedTask> m = new TasksManager<ManagedTask>(o1, l1, h1);
+		var m = new TasksManager<>(o1, l1, h1);
 
 		assertEquals(o1, m.getOneTask());
 		assertEquals(l1, m.getOneTask());
diff --git a/io.openems.edge.common/test/io/openems/edge/common/type/CircularTreeMapTest.java b/io.openems.edge.common/test/io/openems/edge/common/type/CircularTreeMapTest.java
index 9e5dad09cc6..d498fc25faf 100644
--- a/io.openems.edge.common/test/io/openems/edge/common/type/CircularTreeMapTest.java
+++ b/io.openems.edge.common/test/io/openems/edge/common/type/CircularTreeMapTest.java
@@ -1,9 +1,6 @@
 package io.openems.edge.common.type;
 
-import static org.junit.Assert.*;
-
-import java.util.Iterator;
-import java.util.Set;
+import static org.junit.Assert.assertEquals;
 
 import org.junit.Test;
 
@@ -11,14 +8,14 @@ public class CircularTreeMapTest {
 
 	@Test
 	public void test() {
-		CircularTreeMap<String, String> m = new CircularTreeMap<>(3);
+		var m = new CircularTreeMap<String, String>(3);
 		m.put("1", "one");
 		m.put("2", "two");
 		m.put("3", "three");
 		m.put("4", "four");
 
-		Set<String> ks = m.keySet();
-		Iterator<String> i = ks.iterator();
+		var ks = m.keySet();
+		var i = ks.iterator();
 		assertEquals("2", i.next());
 		assertEquals("3", i.next());
 		assertEquals("4", i.next());
@@ -26,14 +23,14 @@ public void test() {
 
 	@Test
 	public void testAnotherOrder() {
-		CircularTreeMap<String, String> m = new CircularTreeMap<>(3);
+		var m = new CircularTreeMap<String, String>(3);
 		m.put("4", "four");
 		m.put("3", "three");
 		m.put("2", "two");
 		m.put("1", "one");
-		
-		Set<String> ks = m.keySet();
-		Iterator<String> i = ks.iterator();
+
+		var ks = m.keySet();
+		var i = ks.iterator();
 		assertEquals("2", i.next());
 		assertEquals("3", i.next());
 		assertEquals("4", i.next());
diff --git a/io.openems.edge.common/test/io/openems/edge/common/type/TypeUtilsTest.java b/io.openems.edge.common/test/io/openems/edge/common/type/TypeUtilsTest.java
index cd887687730..c1e22258e21 100644
--- a/io.openems.edge.common/test/io/openems/edge/common/type/TypeUtilsTest.java
+++ b/io.openems.edge.common/test/io/openems/edge/common/type/TypeUtilsTest.java
@@ -60,162 +60,163 @@ public void testGetAsType() {
 		 * Extract values
 		 */
 		{
-			Short expected = Short.valueOf((short) 123);
-			assertEquals(expected, getAsShort(new Value<Integer>(null, 123)));
-			assertEquals(expected, getAsShort(Optional.of(123)));
-			assertEquals(expected, getAsShort(MyOptionsEnum.E123));
-			assertEquals(Short.valueOf((short) 0), getAsShort(MyEnum.E123));
-			assertEquals(expected, getAsShort(new Integer[] { 123 }));
-			assertEquals(null, getAsShort(new Integer[0]));
+			var expected = Short.valueOf((short) 123);
+			assertEquals(expected, this.getAsShort(new Value<>(null, 123)));
+			assertEquals(expected, this.getAsShort(Optional.of(123)));
+			assertEquals(expected, this.getAsShort(MyOptionsEnum.E123));
+			assertEquals(Short.valueOf((short) 0), this.getAsShort(MyEnum.E123));
+			assertEquals(expected, this.getAsShort(new Integer[] { 123 }));
+			assertEquals(null, this.getAsShort(new Integer[0]));
 		}
 		/*
 		 * To BOOLEAN
 		 */
 		{
-			assertEquals(null, getAsBoolean(null));
-			assertEquals(true, getAsBoolean(Boolean.TRUE));
-			assertEquals(false, getAsBoolean(Boolean.FALSE));
-			assertEquals(true, getAsBoolean(Short.valueOf((short) 1)));
-			assertEquals(false, getAsBoolean(Short.valueOf((short) 0)));
-			assertEquals(true, getAsBoolean(Integer.valueOf(1)));
-			assertEquals(false, getAsBoolean(Integer.valueOf(0)));
-			assertEquals(true, getAsBoolean(Long.valueOf(1)));
-			assertEquals(false, getAsBoolean(Long.valueOf(0)));
-			assertEquals(true, getAsBoolean(Float.valueOf(1)));
-			assertEquals(false, getAsBoolean(Float.valueOf(0)));
-			assertEquals(true, getAsBoolean(Double.valueOf(1)));
-			assertEquals(false, getAsBoolean(Double.valueOf(0)));
-			assertEquals(null, getAsBoolean(""));
-			assertEquals(false, getAsBoolean("fAlSe"));
-			assertEquals(true, getAsBoolean("tRuE"));
-			assertException(() -> getAsBoolean("foo"));
-			assertException(() -> getAsBoolean(new Object()));
+			assertEquals(null, this.getAsBoolean(null));
+			assertEquals(true, this.getAsBoolean(Boolean.TRUE));
+			assertEquals(false, this.getAsBoolean(Boolean.FALSE));
+			assertEquals(true, this.getAsBoolean(Short.valueOf((short) 1)));
+			assertEquals(false, this.getAsBoolean(Short.valueOf((short) 0)));
+			assertEquals(true, this.getAsBoolean(Integer.valueOf(1)));
+			assertEquals(false, this.getAsBoolean(Integer.valueOf(0)));
+			assertEquals(true, this.getAsBoolean(Long.valueOf(1)));
+			assertEquals(false, this.getAsBoolean(Long.valueOf(0)));
+			assertEquals(true, this.getAsBoolean(Float.valueOf(1)));
+			assertEquals(false, this.getAsBoolean(Float.valueOf(0)));
+			assertEquals(true, this.getAsBoolean(Double.valueOf(1)));
+			assertEquals(false, this.getAsBoolean(Double.valueOf(0)));
+			assertEquals(null, this.getAsBoolean(""));
+			assertEquals(false, this.getAsBoolean("fAlSe"));
+			assertEquals(true, this.getAsBoolean("tRuE"));
+			this.assertException(() -> this.getAsBoolean("foo"));
+			this.assertException(() -> this.getAsBoolean(new Object()));
 		}
 		/*
 		 * To SHORT
 		 */
 		{
-			Short expected = Short.valueOf((short) 123);
-			assertEquals(null, getAsShort(null));
-			assertEquals(Short.valueOf((short) 1), getAsShort(Boolean.TRUE));
-			assertEquals(Short.valueOf((short) 0), getAsShort(Boolean.FALSE));
-			assertEquals(expected, getAsShort(expected));
-			assertException(() -> getAsShort(Integer.valueOf(Short.MAX_VALUE + 1)));
-			assertException(() -> getAsShort(Integer.valueOf(Short.MIN_VALUE - 1)));
-			assertEquals(expected, getAsShort(Integer.valueOf(123)));
-			assertException(() -> getAsShort(Long.valueOf(Short.MAX_VALUE + 1)));
-			assertException(() -> getAsShort(Long.valueOf(Short.MIN_VALUE - 1)));
-			assertEquals(expected, getAsShort(Long.valueOf(123)));
-			assertException(() -> getAsShort(Float.valueOf(Short.MAX_VALUE + 1)));
-			assertException(() -> getAsShort(Float.valueOf(Short.MIN_VALUE - 1)));
-			assertEquals(expected, getAsShort(Float.valueOf(123)));
-			assertException(() -> getAsShort(Double.valueOf(Short.MAX_VALUE + 1)));
-			assertException(() -> getAsShort(Double.valueOf(Short.MIN_VALUE - 1)));
-			assertEquals(expected, getAsShort(Double.valueOf(123)));
-			assertEquals(null, getAsShort(""));
-			assertException(() -> getAsShort("foo"));
-			assertEquals(expected, getAsShort("123"));
-			assertException(() -> getAsShort(new Object()));
+			var expected = Short.valueOf((short) 123);
+			assertEquals(null, this.getAsShort(null));
+			assertEquals(Short.valueOf((short) 1), this.getAsShort(Boolean.TRUE));
+			assertEquals(Short.valueOf((short) 0), this.getAsShort(Boolean.FALSE));
+			assertEquals(expected, this.getAsShort(expected));
+			this.assertException(() -> this.getAsShort(Integer.valueOf(Short.MAX_VALUE + 1)));
+			this.assertException(() -> this.getAsShort(Integer.valueOf(Short.MIN_VALUE - 1)));
+			assertEquals(expected, this.getAsShort(Integer.valueOf(123)));
+			this.assertException(() -> this.getAsShort(Long.valueOf(Short.MAX_VALUE + 1)));
+			this.assertException(() -> this.getAsShort(Long.valueOf(Short.MIN_VALUE - 1)));
+			assertEquals(expected, this.getAsShort(Long.valueOf(123)));
+			this.assertException(() -> this.getAsShort(Float.valueOf(Short.MAX_VALUE + 1)));
+			this.assertException(() -> this.getAsShort(Float.valueOf(Short.MIN_VALUE - 1)));
+			assertEquals(expected, this.getAsShort(Float.valueOf(123)));
+			this.assertException(() -> this.getAsShort(Double.valueOf(Short.MAX_VALUE + 1)));
+			this.assertException(() -> this.getAsShort(Double.valueOf(Short.MIN_VALUE - 1)));
+			assertEquals(expected, this.getAsShort(Double.valueOf(123)));
+			assertEquals(null, this.getAsShort(""));
+			this.assertException(() -> this.getAsShort("foo"));
+			assertEquals(expected, this.getAsShort("123"));
+			this.assertException(() -> this.getAsShort(new Object()));
 		}
 
 		/*
 		 * To INTEGER
 		 */
 		{
-			Integer expected = Integer.valueOf(123);
-			assertEquals(null, getAsInteger(null));
-			assertEquals(Integer.valueOf(0), getAsInteger(Boolean.FALSE));
-			assertEquals(Integer.valueOf(1), getAsInteger(Boolean.TRUE));
-			assertEquals(expected, getAsInteger(Short.valueOf((short) 123)));
-			assertEquals(expected, getAsInteger(123));
-			assertException(() -> getAsInteger(Long.valueOf(Long.valueOf(Integer.MAX_VALUE) + 1)));
-			assertException(() -> getAsInteger(Long.valueOf(Long.valueOf(Integer.MIN_VALUE) - 1)));
-			assertEquals(expected, getAsInteger(Long.valueOf(123)));
-			assertException(() -> getAsInteger(Float.valueOf(Float.valueOf(Integer.MAX_VALUE) + 1000)));
-			assertException(() -> getAsInteger(Float.valueOf(Float.valueOf(Integer.MIN_VALUE) - 1000)));
-			assertEquals(expected, getAsInteger(Float.valueOf(123)));
-			assertException(() -> getAsInteger(Double.valueOf(Double.valueOf(Integer.MAX_VALUE) + 1000)));
-			assertException(() -> getAsInteger(Double.valueOf(Double.valueOf(Integer.MIN_VALUE) - 1000)));
-			assertEquals(expected, getAsInteger(Double.valueOf(123)));
-			assertEquals(null, getAsInteger(""));
-			assertException(() -> getAsInteger("foo"));
-			assertEquals(expected, getAsInteger("123"));
-			assertException(() -> getAsInteger(new Object()));
+			var expected = Integer.valueOf(123);
+			assertEquals(null, this.getAsInteger(null));
+			assertEquals(Integer.valueOf(0), this.getAsInteger(Boolean.FALSE));
+			assertEquals(Integer.valueOf(1), this.getAsInteger(Boolean.TRUE));
+			assertEquals(expected, this.getAsInteger(Short.valueOf((short) 123)));
+			assertEquals(expected, this.getAsInteger(123));
+			this.assertException(() -> this.getAsInteger(Long.valueOf(Long.valueOf(Integer.MAX_VALUE) + 1)));
+			this.assertException(() -> this.getAsInteger(Long.valueOf(Long.valueOf(Integer.MIN_VALUE) - 1)));
+			assertEquals(expected, this.getAsInteger(Long.valueOf(123)));
+			this.assertException(() -> this.getAsInteger(Float.valueOf(Float.valueOf(Integer.MAX_VALUE) + 1000)));
+			this.assertException(() -> this.getAsInteger(Float.valueOf(Float.valueOf(Integer.MIN_VALUE) - 1000)));
+			assertEquals(expected, this.getAsInteger(Float.valueOf(123)));
+			this.assertException(() -> this.getAsInteger(Double.valueOf(Double.valueOf(Integer.MAX_VALUE) + 1000)));
+			this.assertException(() -> this.getAsInteger(Double.valueOf(Double.valueOf(Integer.MIN_VALUE) - 1000)));
+			assertEquals(expected, this.getAsInteger(Double.valueOf(123)));
+			assertEquals(null, this.getAsInteger(""));
+			this.assertException(() -> this.getAsInteger("foo"));
+			assertEquals(expected, this.getAsInteger("123"));
+			this.assertException(() -> this.getAsInteger(new Object()));
 		}
 
 		/*
 		 * To LONG
 		 */
 		{
-			Long expected = Long.valueOf(123);
-			assertEquals(null, getAsLong(null));
-			assertEquals(Long.valueOf(0), getAsLong(Boolean.FALSE));
-			assertEquals(Long.valueOf(1), getAsLong(Boolean.TRUE));
-			assertEquals(expected, getAsLong(Short.valueOf((short) 123)));
-			assertEquals(expected, getAsLong(123));
-			assertEquals(expected, getAsLong(Long.valueOf(123)));
-			assertEquals(expected, getAsLong(Float.valueOf(123)));
-			assertEquals(expected, getAsLong(Double.valueOf(123)));
-			assertEquals(null, getAsLong(""));
-			assertException(() -> getAsLong("foo"));
-			assertEquals(expected, getAsLong("123"));
-			assertException(() -> getAsLong(new Object()));
+			var expected = Long.valueOf(123);
+			assertEquals(null, this.getAsLong(null));
+			assertEquals(Long.valueOf(0), this.getAsLong(Boolean.FALSE));
+			assertEquals(Long.valueOf(1), this.getAsLong(Boolean.TRUE));
+			assertEquals(expected, this.getAsLong(Short.valueOf((short) 123)));
+			assertEquals(expected, this.getAsLong(123));
+			assertEquals(expected, this.getAsLong(Long.valueOf(123)));
+			assertEquals(expected, this.getAsLong(Float.valueOf(123)));
+			assertEquals(expected, this.getAsLong(Double.valueOf(123)));
+			assertEquals(null, this.getAsLong(""));
+			this.assertException(() -> this.getAsLong("foo"));
+			assertEquals(expected, this.getAsLong("123"));
+			this.assertException(() -> this.getAsLong(new Object()));
 		}
 
 		/*
 		 * To FLOAT
 		 */
 		{
-			Float expected = Float.valueOf(123);
-			assertEquals(null, getAsFloat(null));
-			assertEquals(Float.valueOf(0), getAsFloat(Boolean.FALSE));
-			assertEquals(Float.valueOf(1), getAsFloat(Boolean.TRUE));
-			assertEquals(expected, getAsFloat(Short.valueOf((short) 123)));
-			assertEquals(expected, getAsFloat(123));
-			assertEquals(expected, getAsFloat(Long.valueOf(123)));
-			assertEquals(expected, getAsFloat(Float.valueOf(123)));
-			assertEquals(expected, getAsFloat(Double.valueOf(123)));
-			assertEquals(null, getAsFloat(""));
-			assertException(() -> getAsFloat("foo"));
-			assertEquals(expected, getAsFloat("123"));
-			assertException(() -> getAsFloat(new Object()));
-			assertEquals(Float.valueOf(0.0f), getAsFloat(Double.valueOf(0.0)));
+			var expected = Float.valueOf(123);
+			assertEquals(null, this.getAsFloat(null));
+			assertEquals(Float.valueOf(0), this.getAsFloat(Boolean.FALSE));
+			assertEquals(Float.valueOf(1), this.getAsFloat(Boolean.TRUE));
+			assertEquals(expected, this.getAsFloat(Short.valueOf((short) 123)));
+			assertEquals(expected, this.getAsFloat(123));
+			assertEquals(expected, this.getAsFloat(Long.valueOf(123)));
+			assertEquals(expected, this.getAsFloat(Float.valueOf(123)));
+			assertEquals(expected, this.getAsFloat(Double.valueOf(123)));
+			assertEquals(null, this.getAsFloat(""));
+			this.assertException(() -> this.getAsFloat("foo"));
+			assertEquals(expected, this.getAsFloat("123"));
+			this.assertException(() -> this.getAsFloat(new Object()));
+			assertEquals(Float.valueOf(0.0f), this.getAsFloat(Double.valueOf(0.0)));
 		}
 
 		/*
 		 * To DOUBLE
 		 */
 		{
-			Double expected = Double.valueOf(123);
-			assertEquals(null, getAsDouble(null));
-			assertEquals(Double.valueOf(0), getAsDouble(Boolean.FALSE));
-			assertEquals(Double.valueOf(1), getAsDouble(Boolean.TRUE));
-			assertEquals(expected, getAsDouble(Short.valueOf((short) 123)));
-			assertEquals(expected, getAsDouble(123));
-			assertEquals(expected, getAsDouble(Long.valueOf(123)));
-			assertEquals(expected, getAsDouble(Float.valueOf(123)));
-			assertEquals(expected, getAsDouble(Double.valueOf(123)));
-			assertEquals(null, getAsDouble(""));
-			assertException(() -> getAsDouble("foo"));
-			assertEquals(expected, getAsDouble("123"));
-			assertException(() -> getAsDouble(new Object()));
+			var expected = Double.valueOf(123);
+			assertEquals(null, this.getAsDouble(null));
+			assertEquals(Double.valueOf(0), this.getAsDouble(Boolean.FALSE));
+			assertEquals(Double.valueOf(1), this.getAsDouble(Boolean.TRUE));
+			assertEquals(expected, this.getAsDouble(Short.valueOf((short) 123)));
+			assertEquals(expected, this.getAsDouble(123));
+			assertEquals(expected, this.getAsDouble(Long.valueOf(123)));
+			assertEquals(expected, this.getAsDouble(Float.valueOf(123)));
+			assertEquals(expected, this.getAsDouble(Double.valueOf(123)));
+			assertEquals(null, this.getAsDouble(""));
+			this.assertException(() -> this.getAsDouble("foo"));
+			assertEquals(expected, this.getAsDouble("123"));
+			this.assertException(() -> this.getAsDouble(new Object()));
 		}
 
 		/*
 		 * To STRING
 		 */
 		{
-			assertEquals(null, getAsString(null));
-			assertEquals("", getAsString(""));
-			assertEquals("[Hello, [World, !]]", getAsString(new Object[] { "Hello", new Object[] { "World", "!" } }));
-			assertEquals("[true, false]", getAsString(new boolean[] { true, false }));
-			assertEquals("[1, 2]", getAsString(new byte[] { 1, 2 }));
-			assertEquals("[f, o, o]", getAsString(new char[] { 'f', 'o', 'o' }));
-			assertEquals("[0.1, 0.2]", getAsString(new double[] { 0.1, 0.2 }));
-			assertEquals("[0.1, 0.2]", getAsString(new float[] { 0.1f, 0.2f }));
-			assertEquals("[1, 2]", getAsString(new int[] { 1, 2 }));
-			assertEquals("[1, 2]", getAsString(new long[] { 1, 2 }));
-			assertEquals("[1, 2]", getAsString(new short[] { 1, 2 }));
+			assertEquals(null, this.getAsString(null));
+			assertEquals("", this.getAsString(""));
+			assertEquals("[Hello, [World, !]]",
+					this.getAsString(new Object[] { "Hello", new Object[] { "World", "!" } }));
+			assertEquals("[true, false]", this.getAsString(new boolean[] { true, false }));
+			assertEquals("[1, 2]", this.getAsString(new byte[] { 1, 2 }));
+			assertEquals("[f, o, o]", this.getAsString(new char[] { 'f', 'o', 'o' }));
+			assertEquals("[0.1, 0.2]", this.getAsString(new double[] { 0.1, 0.2 }));
+			assertEquals("[0.1, 0.2]", this.getAsString(new float[] { 0.1f, 0.2f }));
+			assertEquals("[1, 2]", this.getAsString(new int[] { 1, 2 }));
+			assertEquals("[1, 2]", this.getAsString(new long[] { 1, 2 }));
+			assertEquals("[1, 2]", this.getAsString(new short[] { 1, 2 }));
 		}
 	}
 

From ee4b685c1237edd6b6d5de352652f68583acf291 Mon Sep 17 00:00:00 2001
From: Stefan Feilmeier <stefan.feilmeier@fenecon.de>
Date: Mon, 7 Mar 2022 22:38:54 +0100
Subject: [PATCH 11/96] Update io.openems.edge.controller.api

---
 .../src/io/openems/edge/controller/api/Controller.java    | 8 ++++----
 .../io/openems/edge/controller/test/DummyController.java  | 2 +-
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/io.openems.edge.controller.api/src/io/openems/edge/controller/api/Controller.java b/io.openems.edge.controller.api/src/io/openems/edge/controller/api/Controller.java
index 34e22a63c67..0fccf286c7d 100644
--- a/io.openems.edge.controller.api/src/io/openems/edge/controller/api/Controller.java
+++ b/io.openems.edge.controller.api/src/io/openems/edge/controller/api/Controller.java
@@ -18,7 +18,7 @@ public interface Controller extends OpenemsComponent {
 
 	/**
 	 * Executes the Controller logic.
-	 * 
+	 *
 	 * @throws OpenemsNamedException on error
 	 */
 	public void run() throws OpenemsNamedException;
@@ -42,7 +42,7 @@ public Doc doc() {
 
 	/**
 	 * Gets the Channel for {@link ChannelId#RUN_FAILED}.
-	 * 
+	 *
 	 * @return the Channel
 	 */
 	public default StateChannel getRunFailedChannel() {
@@ -51,7 +51,7 @@ public default StateChannel getRunFailedChannel() {
 
 	/**
 	 * Gets the Run-Failed State. See {@link ChannelId#RUN_FAILED}.
-	 * 
+	 *
 	 * @return the Channel {@link Value}
 	 */
 	public default Value<Boolean> getRunFailed() {
@@ -61,7 +61,7 @@ public default Value<Boolean> getRunFailed() {
 	/**
 	 * Internal method to set the 'nextValue' on {@link ChannelId#RUN_FAILED}
 	 * Channel.
-	 * 
+	 *
 	 * @param value the next value
 	 */
 	public default void _setRunFailed(boolean value) {
diff --git a/io.openems.edge.controller.api/src/io/openems/edge/controller/test/DummyController.java b/io.openems.edge.controller.api/src/io/openems/edge/controller/test/DummyController.java
index c021d403ce2..71a00689cab 100644
--- a/io.openems.edge.controller.api/src/io/openems/edge/controller/test/DummyController.java
+++ b/io.openems.edge.controller.api/src/io/openems/edge/controller/test/DummyController.java
@@ -36,7 +36,7 @@ public DummyController(String id, String alias) {
 
 	/**
 	 * Set callback for applyPower() of this {@link DummyController}.
-	 * 
+	 *
 	 * @param callback the callback
 	 * @return myself
 	 */

From e428f49170f6b9e0ef3e07286ae9484803637bd2 Mon Sep 17 00:00:00 2001
From: Stefan Feilmeier <stefan.feilmeier@fenecon.de>
Date: Mon, 7 Mar 2022 22:40:12 +0100
Subject: [PATCH 12/96] Update io.openems.edge.controller.api.backend

---
 .../api/backend/BackendApiImpl.java           | 29 ++++++++-------
 .../edge/controller/api/backend/OnOpen.java   |  5 ++-
 .../controller/api/backend/OnRequest.java     | 36 +++++++++----------
 .../api/backend/SendChannelValuesWorker.java  | 20 +++++------
 .../api/backend/WebsocketClient.java          |  2 +-
 .../api/backend/BackendApiImplTest.java       | 16 ++++-----
 .../edge/controller/api/backend/MyConfig.java |  2 +-
 7 files changed, 53 insertions(+), 57 deletions(-)

diff --git a/io.openems.edge.controller.api.backend/src/io/openems/edge/controller/api/backend/BackendApiImpl.java b/io.openems.edge.controller.api.backend/src/io/openems/edge/controller/api/backend/BackendApiImpl.java
index 5432144b63a..7754970263f 100644
--- a/io.openems.edge.controller.api.backend/src/io/openems/edge/controller/api/backend/BackendApiImpl.java
+++ b/io.openems.edge.controller.api.backend/src/io/openems/edge/controller/api/backend/BackendApiImpl.java
@@ -103,9 +103,8 @@ void activate(ComponentContext context, Config config) {
 		}
 
 		// initialize Executor
-		String name = COMPONENT_NAME + ":" + this.id();
-		this.executor = Executors
-				.newScheduledThreadPool(10,
+		var name = COMPONENT_NAME + ":" + this.id();
+		this.executor = Executors.newScheduledThreadPool(10,
 				new ThreadFactoryBuilder().setNameFormat(name + "-%d").build());
 
 		// initialize ApiWorker
@@ -137,6 +136,7 @@ void activate(ComponentContext context, Config config) {
 		this.websocket.start();
 	}
 
+	@Override
 	@Deactivate
 	protected void deactivate() {
 		super.deactivate();
@@ -144,7 +144,7 @@ protected void deactivate() {
 		if (this.websocket != null) {
 			this.websocket.stop();
 		}
-		ThreadPoolUtils.shutdownAndAwaitTermination(executor, 5);
+		ThreadPoolUtils.shutdownAndAwaitTermination(this.executor, 5);
 	}
 
 	@Override
@@ -164,11 +164,11 @@ protected void logWarn(Logger log, String message) {
 
 	/**
 	 * Activates/deactivates subscription to System-Log.
-	 * 
+	 *
 	 * <p>
 	 * If activated, all System-Log events are sent via
 	 * {@link SystemLogNotification}s.
-	 * 
+	 *
 	 * @param isSystemLogSubscribed true to activate
 	 */
 	protected void setSystemLogSubscribed(boolean isSystemLogSubscribed) {
@@ -180,11 +180,11 @@ public void doAppend(PaxLoggingEvent event) {
 		if (!this.isSystemLogSubscribed) {
 			return;
 		}
-		WebsocketClient ws = this.websocket;
+		var ws = this.websocket;
 		if (ws == null) {
 			return;
 		}
-		SystemLogNotification notification = SystemLogNotification.fromPaxLoggingEvent(event);
+		var notification = SystemLogNotification.fromPaxLoggingEvent(event);
 		ws.sendMessage(notification);
 	}
 
@@ -200,9 +200,9 @@ public void handleEvent(Event event) {
 
 		case EdgeEventConstants.TOPIC_CONFIG_UPDATE:
 			// Send new EdgeConfig
-			EdgeConfig config = (EdgeConfig) event.getProperty(EdgeEventConstants.TOPIC_CONFIG_UPDATE_KEY);
-			EdgeConfigNotification message = new EdgeConfigNotification(config);
-			WebsocketClient ws = this.websocket;
+			var config = (EdgeConfig) event.getProperty(EdgeEventConstants.TOPIC_CONFIG_UPDATE_KEY);
+			var message = new EdgeConfigNotification(config);
+			var ws = this.websocket;
 			if (ws == null) {
 				return;
 			}
@@ -220,7 +220,7 @@ public boolean isConnected() {
 
 	/**
 	 * Execute a command using the {@link ScheduledExecutorService}.
-	 * 
+	 *
 	 * @param command a {@link Runnable}
 	 */
 	protected void execute(Runnable command) {
@@ -231,7 +231,7 @@ protected void execute(Runnable command) {
 
 	/**
 	 * Schedules a command using the {@link ScheduledExecutorService}.
-	 * 
+	 *
 	 * @param command      a {@link Runnable}
 	 * @param initialDelay the initial delay
 	 * @param delay        the delay
@@ -241,8 +241,7 @@ protected void execute(Runnable command) {
 	public ScheduledFuture<?> scheduleWithFixedDelay(Runnable command, long initialDelay, long delay, TimeUnit unit) {
 		if (this.executor.isShutdown()) {
 			return null;
-		} else {
-			return this.executor.scheduleWithFixedDelay(command, initialDelay, delay, unit);
 		}
+		return this.executor.scheduleWithFixedDelay(command, initialDelay, delay, unit);
 	}
 }
diff --git a/io.openems.edge.controller.api.backend/src/io/openems/edge/controller/api/backend/OnOpen.java b/io.openems.edge.controller.api.backend/src/io/openems/edge/controller/api/backend/OnOpen.java
index 424262dd01b..98fe13fa8cd 100644
--- a/io.openems.edge.controller.api.backend/src/io/openems/edge/controller/api/backend/OnOpen.java
+++ b/io.openems.edge.controller.api.backend/src/io/openems/edge/controller/api/backend/OnOpen.java
@@ -7,7 +7,6 @@
 import com.google.gson.JsonObject;
 
 import io.openems.common.jsonrpc.notification.EdgeConfigNotification;
-import io.openems.common.types.EdgeConfig;
 
 public class OnOpen implements io.openems.common.websocket.OnOpen {
 
@@ -23,8 +22,8 @@ public void run(WebSocket ws, JsonObject handshake) {
 		this.parent.logInfo(this.log, "Connected to OpenEMS Backend");
 
 		// Immediately send Config
-		EdgeConfig config = this.parent.componentManager.getEdgeConfig();
-		EdgeConfigNotification message = new EdgeConfigNotification(config);
+		var config = this.parent.componentManager.getEdgeConfig();
+		var message = new EdgeConfigNotification(config);
 		this.parent.websocket.sendMessage(message);
 
 		// Send all Channel values
diff --git a/io.openems.edge.controller.api.backend/src/io/openems/edge/controller/api/backend/OnRequest.java b/io.openems.edge.controller.api.backend/src/io/openems/edge/controller/api/backend/OnRequest.java
index a4daed8282e..91701f4459f 100644
--- a/io.openems.edge.controller.api.backend/src/io/openems/edge/controller/api/backend/OnRequest.java
+++ b/io.openems.edge.controller.api.backend/src/io/openems/edge/controller/api/backend/OnRequest.java
@@ -25,7 +25,6 @@
 import io.openems.common.jsonrpc.response.AuthenticatedRpcResponse;
 import io.openems.common.session.Role;
 import io.openems.edge.common.component.ComponentManager;
-import io.openems.edge.common.component.OpenemsComponent;
 import io.openems.edge.common.jsonapi.JsonApi;
 import io.openems.edge.common.user.User;
 
@@ -61,8 +60,8 @@ public CompletableFuture<? extends JsonrpcResponseSuccess> run(WebSocket ws, Jso
 	 */
 	private CompletableFuture<AuthenticatedRpcResponse> handleAuthenticatedRpcRequest(
 			AuthenticatedRpcRequest<User> authenticatedRpcRequest) throws OpenemsNamedException {
-		User user = authenticatedRpcRequest.getUser();
-		JsonrpcRequest request = authenticatedRpcRequest.getPayload();
+		var user = authenticatedRpcRequest.getUser();
+		var request = authenticatedRpcRequest.getPayload();
 
 		CompletableFuture<? extends JsonrpcResponseSuccess> resultFuture;
 		switch (request.getMethod()) {
@@ -102,7 +101,7 @@ private CompletableFuture<AuthenticatedRpcResponse> handleAuthenticatedRpcReques
 			throw OpenemsError.JSONRPC_UNHANDLED_METHOD.exception(request.getMethod());
 		}
 
-		CompletableFuture<AuthenticatedRpcResponse> result = new CompletableFuture<AuthenticatedRpcResponse>();
+		var result = new CompletableFuture<AuthenticatedRpcResponse>();
 		resultFuture.whenComplete((r, ex) -> {
 			if (ex != null) {
 				result.completeExceptionally(ex);
@@ -127,15 +126,14 @@ private CompletableFuture<AuthenticatedRpcResponse> handleAuthenticatedRpcReques
 	private CompletableFuture<GenericJsonrpcResponseSuccess> handleGetEdgeConfigRequest(User user,
 			GetEdgeConfigRequest getEdgeConfigRequest) throws OpenemsNamedException {
 		// wrap original request inside ComponentJsonApiRequest
-		ComponentJsonApiRequest request = new ComponentJsonApiRequest(ComponentManager.SINGLETON_COMPONENT_ID,
-				getEdgeConfigRequest);
+		var request = new ComponentJsonApiRequest(ComponentManager.SINGLETON_COMPONENT_ID, getEdgeConfigRequest);
 
 		return this.handleComponentJsonApiRequest(user, request);
 	}
 
 	/**
 	 * Handles a {@link CreateComponentConfigRequest}.
-	 * 
+	 *
 	 * @param user                         the {@link User}
 	 * @param createComponentConfigRequest the {@link CreateComponentConfigRequest}
 	 * @return the Future JSON-RPC Response
@@ -146,7 +144,7 @@ private CompletableFuture<GenericJsonrpcResponseSuccess> handleCreateComponentCo
 		user.assertRoleIsAtLeast(DeleteComponentConfigRequest.METHOD, Role.INSTALLER);
 
 		// wrap original request inside ComponentJsonApiRequest
-		ComponentJsonApiRequest request = new ComponentJsonApiRequest(ComponentManager.SINGLETON_COMPONENT_ID,
+		var request = new ComponentJsonApiRequest(ComponentManager.SINGLETON_COMPONENT_ID,
 				createComponentConfigRequest);
 
 		return this.handleComponentJsonApiRequest(user, request);
@@ -154,7 +152,7 @@ private CompletableFuture<GenericJsonrpcResponseSuccess> handleCreateComponentCo
 
 	/**
 	 * Handles a {@link UpdateComponentConfigRequest}.
-	 * 
+	 *
 	 * @param user                         the {@link User}
 	 * @param updateComponentConfigRequest the {@link UpdateComponentConfigRequest}
 	 * @return the Future JSON-RPC Response
@@ -165,7 +163,7 @@ private CompletableFuture<GenericJsonrpcResponseSuccess> handleUpdateComponentCo
 		user.assertRoleIsAtLeast(DeleteComponentConfigRequest.METHOD, Role.OWNER);
 
 		// wrap original request inside ComponentJsonApiRequest
-		ComponentJsonApiRequest request = new ComponentJsonApiRequest(ComponentManager.SINGLETON_COMPONENT_ID,
+		var request = new ComponentJsonApiRequest(ComponentManager.SINGLETON_COMPONENT_ID,
 				updateComponentConfigRequest);
 
 		return this.handleComponentJsonApiRequest(user, request);
@@ -173,7 +171,7 @@ private CompletableFuture<GenericJsonrpcResponseSuccess> handleUpdateComponentCo
 
 	/**
 	 * Handles a {@link DeleteComponentConfigRequest}.
-	 * 
+	 *
 	 * @param user                         the {@link User}
 	 * @param deleteComponentConfigRequest the {@link DeleteComponentConfigRequest}
 	 * @return the Future JSON-RPC Response
@@ -184,7 +182,7 @@ private CompletableFuture<GenericJsonrpcResponseSuccess> handleDeleteComponentCo
 		user.assertRoleIsAtLeast(DeleteComponentConfigRequest.METHOD, Role.INSTALLER);
 
 		// wrap original request inside ComponentJsonApiRequest
-		ComponentJsonApiRequest request = new ComponentJsonApiRequest(ComponentManager.SINGLETON_COMPONENT_ID,
+		var request = new ComponentJsonApiRequest(ComponentManager.SINGLETON_COMPONENT_ID,
 				deleteComponentConfigRequest);
 
 		return this.handleComponentJsonApiRequest(user, request);
@@ -192,7 +190,7 @@ private CompletableFuture<GenericJsonrpcResponseSuccess> handleDeleteComponentCo
 
 	/**
 	 * Handles a {@link SetChannelValueRequest}.
-	 * 
+	 *
 	 * @param user    the {@link User}
 	 * @param request the {@link SetChannelValueRequest}
 	 * @return the Future JSON-RPC Response
@@ -207,7 +205,7 @@ private CompletableFuture<JsonrpcResponseSuccess> handleSetChannelValueRequest(U
 
 	/**
 	 * Handles a {@link ComponentJsonApiRequest}.
-	 * 
+	 *
 	 * @param user    the {@link User}
 	 * @param request the {@link ComponentJsonApiRequest}
 	 * @return the JSON-RPC Success Response Future
@@ -216,8 +214,8 @@ private CompletableFuture<JsonrpcResponseSuccess> handleSetChannelValueRequest(U
 	private CompletableFuture<GenericJsonrpcResponseSuccess> handleComponentJsonApiRequest(User user,
 			ComponentJsonApiRequest request) throws OpenemsNamedException {
 		// get Component
-		String componentId = request.getComponentId();
-		OpenemsComponent component = this.parent.componentManager.getComponent(componentId);
+		var componentId = request.getComponentId();
+		var component = this.parent.componentManager.getComponent(componentId);
 
 		if (component == null) {
 			throw new OpenemsException("Unable to find Component [" + componentId + "]");
@@ -228,7 +226,7 @@ private CompletableFuture<GenericJsonrpcResponseSuccess> handleComponentJsonApiR
 		}
 
 		// call JsonApi
-		JsonApi jsonApi = (JsonApi) component;
+		var jsonApi = (JsonApi) component;
 		CompletableFuture<? extends JsonrpcResponseSuccess> responseFuture = jsonApi.handleJsonrpcRequest(user,
 				request.getPayload());
 
@@ -238,7 +236,7 @@ private CompletableFuture<GenericJsonrpcResponseSuccess> handleComponentJsonApiR
 		}
 
 		// Wrap reply in EdgeRpcResponse
-		CompletableFuture<GenericJsonrpcResponseSuccess> edgeRpcResponse = new CompletableFuture<>();
+		var edgeRpcResponse = new CompletableFuture<GenericJsonrpcResponseSuccess>();
 		responseFuture.whenComplete((r, ex) -> {
 			if (ex != null) {
 				edgeRpcResponse.completeExceptionally(ex);
@@ -269,7 +267,7 @@ private CompletableFuture<JsonrpcResponseSuccess> handleSubscribeSystemLogReques
 
 	/**
 	 * Handles a {@link UpdateUserLanguageRequest}.
-	 * 
+	 *
 	 * @param user    the {@link User}
 	 * @param request the {@link UpdateUserLanguageRequest}
 	 * @return the JSON-RPC Success Response Future
diff --git a/io.openems.edge.controller.api.backend/src/io/openems/edge/controller/api/backend/SendChannelValuesWorker.java b/io.openems.edge.controller.api.backend/src/io/openems/edge/controller/api/backend/SendChannelValuesWorker.java
index bfd86233539..77274b17ad3 100644
--- a/io.openems.edge.controller.api.backend/src/io/openems/edge/controller/api/backend/SendChannelValuesWorker.java
+++ b/io.openems.edge.controller.api.backend/src/io/openems/edge/controller/api/backend/SendChannelValuesWorker.java
@@ -30,7 +30,7 @@
  * Method {@link #collectData()} is called Synchronously with the Core.Cycle to
  * collect values of Channels. Sending of values is then delegated to an
  * asynchronous task.
- * 
+ *
  * <p>
  * The logic tries to send changed values once per Cycle and all values once
  * every {@link #SEND_VALUES_OF_ALL_CHANNELS_AFTER_SECONDS}.
@@ -50,7 +50,7 @@ public class SendChannelValuesWorker {
 	/**
 	 * If true: next 'send' sends all channel values.
 	 */
-	private AtomicBoolean sendValuesOfAllChannels = new AtomicBoolean(true);
+	private final AtomicBoolean sendValuesOfAllChannels = new AtomicBoolean(true);
 
 	/**
 	 * Keeps the last timestamp when all channel values were sent.
@@ -86,11 +86,11 @@ public void deactivate() {
 	 * triggers asynchronous sending.
 	 */
 	public synchronized void collectData() {
-		Instant now = Instant.now(this.parent.componentManager.getClock());
+		var now = Instant.now(this.parent.componentManager.getClock());
 
 		// Update the values of all channels
-		final List<OpenemsComponent> enabledComponents = this.parent.componentManager.getEnabledComponents();
-		final ImmutableTable<String, String, JsonElement> allValues = this.collectData(enabledComponents);
+		final var enabledComponents = this.parent.componentManager.getEnabledComponents();
+		final var allValues = this.collectData(enabledComponents);
 
 		// Add to send Queue
 		this.executor.execute(new SendTask(this, now, allValues));
@@ -98,7 +98,7 @@ public synchronized void collectData() {
 
 	/**
 	 * Cycles through all Channels and collects the value.
-	 * 
+	 *
 	 * @param enabledComponents the enabled components
 	 * @return collected data
 	 */
@@ -158,8 +158,8 @@ public void run() {
 			}
 
 			// Round timestamp to Global Cycle-Time
-			final int cycleTime = this.parent.parent.cycle.getCycleTime();
-			final long timestampMillis = this.timestamp.toEpochMilli() / cycleTime * cycleTime;
+			final var cycleTime = this.parent.parent.cycle.getCycleTime();
+			final var timestampMillis = this.timestamp.toEpochMilli() / cycleTime * cycleTime;
 
 			// Prepare message values
 			Map<ChannelAddress, JsonElement> sendValuesMap = new HashMap<>();
@@ -174,7 +174,7 @@ public void run() {
 			}
 
 			// Create JSON-RPC notification
-			TimestampedDataNotification message = new TimestampedDataNotification();
+			var message = new TimestampedDataNotification();
 			message.add(timestampMillis, sendValuesMap);
 
 			// Debug-Log
@@ -184,7 +184,7 @@ public void run() {
 			}
 
 			// Try to send
-			boolean wasSent = this.parent.parent.websocket.sendMessage(message);
+			var wasSent = this.parent.parent.websocket.sendMessage(message);
 
 			// Set the UNABLE_TO_SEND channel
 			this.parent.parent.getUnableToSendChannel().setNextValue(!wasSent);
diff --git a/io.openems.edge.controller.api.backend/src/io/openems/edge/controller/api/backend/WebsocketClient.java b/io.openems.edge.controller.api.backend/src/io/openems/edge/controller/api/backend/WebsocketClient.java
index d65701b32e7..37b7fcd7532 100644
--- a/io.openems.edge.controller.api.backend/src/io/openems/edge/controller/api/backend/WebsocketClient.java
+++ b/io.openems.edge.controller.api.backend/src/io/openems/edge/controller/api/backend/WebsocketClient.java
@@ -89,7 +89,7 @@ protected void execute(Runnable command) {
 
 	/**
 	 * Schedules a command using the {@link ScheduledExecutorService}.
-	 * 
+	 *
 	 * @param command      a {@link Runnable}
 	 * @param initialDelay the initial delay
 	 * @param delay        the delay
diff --git a/io.openems.edge.controller.api.backend/test/io/openems/edge/controller/api/backend/BackendApiImplTest.java b/io.openems.edge.controller.api.backend/test/io/openems/edge/controller/api/backend/BackendApiImplTest.java
index 8e04f7d372b..7491aa897f0 100644
--- a/io.openems.edge.controller.api.backend/test/io/openems/edge/controller/api/backend/BackendApiImplTest.java
+++ b/io.openems.edge.controller.api.backend/test/io/openems/edge/controller/api/backend/BackendApiImplTest.java
@@ -54,7 +54,7 @@ public void onNotification(ThrowingBiConsumer<Long, JsonObject, OpenemsNamedExce
 		}
 
 		public void waitForCallback(int timeout) throws InterruptedException, OpenemsException {
-			Instant start = Instant.now();
+			var start = Instant.now();
 			while (!this.wasCalled) {
 				if (Duration.between(start, Instant.now()).getSeconds() > timeout) {
 					throw new OpenemsException("Timeout [" + timeout + "s]");
@@ -72,7 +72,7 @@ public void run(WebSocket websocket, JsonrpcNotification notification) throws Op
 			}
 			if (notification.getMethod().equals(TimestampedDataNotification.METHOD)) {
 				for (String timestamp : notification.getParams().keySet()) {
-					JsonObject values = JsonUtils.getAsJsonObject(notification.getParams().get(timestamp));
+					var values = JsonUtils.getAsJsonObject(notification.getParams().get(timestamp));
 					this.wasCalled = true;
 					this.callback.accept(Long.valueOf(timestamp), values);
 				}
@@ -83,17 +83,17 @@ public void run(WebSocket websocket, JsonrpcNotification notification) throws Op
 
 	@Test
 	public void test() throws Exception {
-		TimestampedDataNotificationHandler handler = new TimestampedDataNotificationHandler();
+		var handler = new TimestampedDataNotificationHandler();
 
-		try (final DummyWebsocketServer server = DummyWebsocketServer.create() //
+		try (final var server = DummyWebsocketServer.create() //
 				.onNotification(handler) //
 				.build()) {
-			int port = server.startBlocking();
+			var port = server.startBlocking();
 
-			final TimeLeapClock clock = new TimeLeapClock(
+			final var clock = new TimeLeapClock(
 					Instant.ofEpochSecond(1577836800L) /* starts at 1. January 2020 00:00:00 */, ZoneOffset.UTC);
-			final BackendApiImpl sut = new BackendApiImpl();
-			ComponentTest test = new ComponentTest(sut) //
+			final var sut = new BackendApiImpl();
+			var test = new ComponentTest(sut) //
 					.addReference("componentManager", new DummyComponentManager(clock)) //
 					.addReference("cycle", new DummyCycle(1000)) //
 					.addComponent(new DummySum()) //
diff --git a/io.openems.edge.controller.api.backend/test/io/openems/edge/controller/api/backend/MyConfig.java b/io.openems.edge.controller.api.backend/test/io/openems/edge/controller/api/backend/MyConfig.java
index 46771968219..95dfe7f265e 100644
--- a/io.openems.edge.controller.api.backend/test/io/openems/edge/controller/api/backend/MyConfig.java
+++ b/io.openems.edge.controller.api.backend/test/io/openems/edge/controller/api/backend/MyConfig.java
@@ -74,7 +74,7 @@ public MyConfig build() {
 
 	/**
 	 * Create a Config builder.
-	 * 
+	 *
 	 * @return a {@link Builder}
 	 */
 	public static Builder create() {

From 8444c1525a081fe6362573b1bb93ac021ce4558a Mon Sep 17 00:00:00 2001
From: Stefan Feilmeier <stefan.feilmeier@fenecon.de>
Date: Mon, 7 Mar 2022 22:47:42 +0100
Subject: [PATCH 13/96] Update io.openems.edge.controller.api.common

---
 .../edge/controller/api/common/ApiWorker.java |  10 +-
 .../edge/controller/api/common/Utils.java     | 122 ------------------
 .../controller/api/common/WriteObject.java    |  24 ++--
 .../edge/controller/api/common/WritePojo.java |   1 -
 4 files changed, 17 insertions(+), 140 deletions(-)
 delete mode 100644 io.openems.edge.controller.api.common/src/io/openems/edge/controller/api/common/Utils.java

diff --git a/io.openems.edge.controller.api.common/src/io/openems/edge/controller/api/common/ApiWorker.java b/io.openems.edge.controller.api.common/src/io/openems/edge/controller/api/common/ApiWorker.java
index d4cf6ccfe9a..7ad767546d7 100644
--- a/io.openems.edge.controller.api.common/src/io/openems/edge/controller/api/common/ApiWorker.java
+++ b/io.openems.edge.controller.api.common/src/io/openems/edge/controller/api/common/ApiWorker.java
@@ -66,7 +66,7 @@ public ApiWorker(OpenemsComponent parent) {
 	/**
 	 * Sets the Channel that should be used to log debug information about writes to
 	 * channels.
-	 * 
+	 *
 	 * @param logChannel a {@link StringReadChannel}
 	 */
 	public void setLogChannel(StringReadChannel logChannel) {
@@ -76,7 +76,7 @@ public void setLogChannel(StringReadChannel logChannel) {
 	/**
 	 * Adds a value to the write-pipeline. The values are then set in the next
 	 * execution of {@link #run()}, until the timeout is reached.
-	 * 
+	 *
 	 * @param channel     the {@link WriteChannel}
 	 * @param writeObject the {@link WriteObject}
 	 */
@@ -99,7 +99,7 @@ public void addValue(WriteChannel<?> channel, WriteObject writeObject) {
 
 	/**
 	 * Adds a value via JSON-RPC {@link SetChannelValueRequest}.
-	 * 
+	 *
 	 * @param componentManager the {@link ComponentManager}
 	 * @param user             the authenticated {@link User}
 	 * @param request          the Request
@@ -171,7 +171,7 @@ public void setTimeoutSeconds(int timeoutSeconds) {
 	/**
 	 * Sets the channels. This method is called by the run() method of the
 	 * Controller
-	 * 
+	 *
 	 * @throws OpenemsNamedException on error
 	 */
 	public void run() throws OpenemsNamedException {
@@ -180,7 +180,7 @@ public void run() throws OpenemsNamedException {
 		synchronized (this.values) {
 			for (Entry<WriteChannel<?>, WriteObject> entry : this.values.entrySet()) {
 				WriteChannel<?> channel = entry.getKey();
-				WriteObject writeObject = entry.getValue();
+				var writeObject = entry.getValue();
 				try {
 					OpenemsComponent.logInfo(this.parent, this.log,
 							"Set Channel [" + channel.address() + "] to Value [" + writeObject.valueToString() + "]");
diff --git a/io.openems.edge.controller.api.common/src/io/openems/edge/controller/api/common/Utils.java b/io.openems.edge.controller.api.common/src/io/openems/edge/controller/api/common/Utils.java
deleted file mode 100644
index 0ea79e41ca0..00000000000
--- a/io.openems.edge.controller.api.common/src/io/openems/edge/controller/api/common/Utils.java
+++ /dev/null
@@ -1,122 +0,0 @@
-package io.openems.edge.controller.api.common;
-
-import java.util.Arrays;
-import java.util.Collections;
-import java.util.Dictionary;
-import java.util.List;
-
-import org.osgi.service.cm.Configuration;
-
-import com.google.gson.JsonArray;
-import com.google.gson.JsonObject;
-import com.google.gson.JsonPrimitive;
-
-import io.openems.edge.common.component.OpenemsComponent;
-
-public class Utils {
-
-	/**
-	 * Gets Meta information about active components.
-	 * 
-	 * @param components the Components
-	 * @return a JsonObject in the form
-	 * 
-	 *         <pre>
-	 * {
-	 *   "Controller.Symmetric.Balancing": {
-	 *     "implements":[ "Controller" ]
-	 *   },
-	 *   "Simulator.EssSymmetric.Reacting": {
-	 *     "implements":[ "Ess", "SymmetricEss" ]
-	 *   }
-	 * }
-	 *         </pre>
-	 */
-	protected static JsonObject getComponentsMeta(List<OpenemsComponent> components) {
-		JsonObject j = new JsonObject();
-		components.stream() //
-				// sort by Component ID
-				.sorted((c1, c2) -> c1.id().compareTo(c2.id())) //
-				.forEach(component -> {
-					JsonObject jComponent = new JsonObject();
-
-					JsonArray jImplements = new JsonArray();
-					Arrays.stream(component.getClass().getInterfaces()) //
-							// filter interesting Interfaces
-							.filter(iface -> !(iface.equals(OpenemsComponent.class))
-									&& OpenemsComponent.class.isAssignableFrom(iface))
-							// sort by SimpleName
-							.sorted((i1, i2) -> i1.getSimpleName().compareTo(i2.getSimpleName())) //
-							.forEach(iface -> {
-								jImplements.add(iface.getSimpleName());
-							});
-					jComponent.add("implements", jImplements);
-
-					j.add(component.getComponentContext().getProperties().get("component.name").toString(), jComponent);
-				});
-		return j;
-	}
-
-	/**
-	 * Converts the configuration of components to Json.
-	 * 
-	 * @param configs the Configurations
-	 * @return a JsonObject in the form
-	 * 
-	 *         <pre>
-	 * {
-	 *   "ess0": {
-	 *     "enabled": "true",
-	 *     "modbus.id": "modbus0",
-	 *     "service.factoryPid": "Ess.Fenecon.Commercial40",
-	 *     "service.pid": "Ess.Fenecon.Commercial40.bcd5e8da-33c8-4258-ade5-480b5c0bbd2e"
-	 * }
-	 *         </pre>
-	 */
-	protected static JsonObject getComponents(Configuration[] configs) {
-		JsonObject j = new JsonObject();
-		for (Configuration config : configs) {
-			Dictionary<String, Object> properties = config.getProperties();
-			if (properties == null) {
-				continue;
-			}
-			String id = (String) properties.get("id");
-			if (id == null) {
-				continue;
-			}
-			JsonObject jComponent = new JsonObject();
-			Collections.list(properties.keys()).stream() //
-					// filter interesting config properties
-					.filter(key -> !key.equals("id") && !key.endsWith(".target")) //
-					// sort by key (property name)
-					.sorted() //
-					.forEach(key -> {
-						Object obj = properties.get(key);
-						if (obj instanceof String[]) {
-							jComponent.addProperty(key, String.join(",", (String[]) obj));
-						} else {
-							jComponent.add(key, toJson(obj));
-						}
-					});
-
-			j.add(id, jComponent);
-		}
-		return j;
-	}
-
-	/**
-	 * Converts an object to a JsonPrimitive.
-	 * 
-	 * @param value the object
-	 * @return the JsonPrimitive
-	 */
-	private static JsonPrimitive toJson(Object value) {
-		if (value instanceof Number) {
-			return new JsonPrimitive((Number) value);
-		} else if (value instanceof Boolean) {
-			return new JsonPrimitive((Boolean) value);
-		} else {
-			return new JsonPrimitive(value.toString());
-		}
-	}
-}
diff --git a/io.openems.edge.controller.api.common/src/io/openems/edge/controller/api/common/WriteObject.java b/io.openems.edge.controller.api.common/src/io/openems/edge/controller/api/common/WriteObject.java
index 58bd5e96271..25d3b9f8297 100644
--- a/io.openems.edge.controller.api.common/src/io/openems/edge/controller/api/common/WriteObject.java
+++ b/io.openems.edge.controller.api.common/src/io/openems/edge/controller/api/common/WriteObject.java
@@ -20,7 +20,7 @@ public abstract class WriteObject {
 
 	/**
 	 * Callback on successful setting of the value.
-	 * 
+	 *
 	 * @param callback a callback {@link Runnable}
 	 * @return myself
 	 */
@@ -31,7 +31,7 @@ public WriteObject onSuccess(Runnable callback) {
 
 	/**
 	 * Callback on first successful setting of the value.
-	 * 
+	 *
 	 * @param callback a callback {@link Runnable}
 	 * @return myself
 	 */
@@ -42,7 +42,7 @@ public WriteObject onFirstSuccess(Runnable callback) {
 
 	/**
 	 * Callback on error while setting the value.
-	 * 
+	 *
 	 * @param callback a callback {@link Runnable}
 	 * @return myself
 	 */
@@ -53,7 +53,7 @@ public WriteObject onError(Consumer<OpenemsException> callback) {
 
 	/**
 	 * Callback on first error while setting the value.
-	 * 
+	 *
 	 * @param callback a callback {@link Runnable}
 	 * @return myself
 	 */
@@ -64,7 +64,7 @@ public WriteObject onFirstError(Consumer<OpenemsException> callback) {
 
 	/**
 	 * Callback on timeout while setting the value.
-	 * 
+	 *
 	 * @param callback a callback {@link Runnable}
 	 * @return myself
 	 */
@@ -78,15 +78,15 @@ public WriteObject onTimeout(Runnable callback) {
 	 */
 	public void notifySuccess() {
 		if (!this.notifiedSuccess) {
-			this.onFirstSuccessCallbacks.forEach(callback -> callback.run());
+			this.onFirstSuccessCallbacks.forEach(Runnable::run);
 			this.notifiedSuccess = true;
 		}
-		this.onSuccessCallbacks.forEach(callback -> callback.run());
+		this.onSuccessCallbacks.forEach(Runnable::run);
 	}
 
 	/**
 	 * Notify error while setting the value.
-	 * 
+	 *
 	 * @param e the {@link OpenemsException}
 	 */
 	public void notifyError(OpenemsException e) {
@@ -101,12 +101,12 @@ public void notifyError(OpenemsException e) {
 	 * Notify a timeout for setting the value.
 	 */
 	public void notifyTimeout() {
-		this.onTimeoutCallbacks.forEach(callback -> callback.run());
+		this.onTimeoutCallbacks.forEach(Runnable::run);
 	}
 
 	/**
 	 * Set the next write value of the Channel.
-	 * 
+	 *
 	 * @param writeChannel the {@link WriteChannel}
 	 * @throws OpenemsNamedException on error
 	 */
@@ -114,14 +114,14 @@ public void notifyTimeout() {
 
 	/**
 	 * Gets the value as a String for logging purposes.
-	 * 
+	 *
 	 * @return the value as String
 	 */
 	public abstract String valueToString();
 
 	/**
 	 * Is there a defined value?.
-	 * 
+	 *
 	 * @return true if no value is there; false if a value is available.
 	 */
 	public abstract boolean isNull();
diff --git a/io.openems.edge.controller.api.common/src/io/openems/edge/controller/api/common/WritePojo.java b/io.openems.edge.controller.api.common/src/io/openems/edge/controller/api/common/WritePojo.java
index 6c33e72b3e7..c6d390c5eed 100644
--- a/io.openems.edge.controller.api.common/src/io/openems/edge/controller/api/common/WritePojo.java
+++ b/io.openems.edge.controller.api.common/src/io/openems/edge/controller/api/common/WritePojo.java
@@ -11,7 +11,6 @@ public class WritePojo extends WriteObject {
 	public final Object value;
 
 	public WritePojo(Object value) {
-		super();
 		this.value = value;
 	}
 

From 69261aba41ba7ed0ddcf60bb5ae26e2c05997447 Mon Sep 17 00:00:00 2001
From: Stefan Feilmeier <stefan.feilmeier@fenecon.de>
Date: Mon, 7 Mar 2022 22:48:38 +0100
Subject: [PATCH 14/96] Update io.openems.edge.controller.api.modbus

---
 .../api/modbus/AbstractModbusTcpApi.java      | 38 ++++++++--------
 .../controller/api/modbus/MyProcessImage.java | 44 +++++++++----------
 .../controller/api/modbus/MyRegister.java     |  4 +-
 .../GetModbusProtocolExportXlsxRequest.java   |  2 +-
 .../GetModbusProtocolExportXlsxResponse.java  | 34 ++++++--------
 .../jsonrpc/GetModbusProtocolRequest.java     |  2 +-
 .../jsonrpc/GetModbusProtocolResponse.java    | 10 ++---
 .../readonly/ModbusTcpApiReadOnlyImpl.java    |  2 +
 .../readwrite/ModbusTcpApiReadWriteImpl.java  |  2 +
 .../api/modbus/ModbusTcpApiTest.java          | 38 ++++++++--------
 10 files changed, 86 insertions(+), 90 deletions(-)

diff --git a/io.openems.edge.controller.api.modbus/src/io/openems/edge/controller/api/modbus/AbstractModbusTcpApi.java b/io.openems.edge.controller.api.modbus/src/io/openems/edge/controller/api/modbus/AbstractModbusTcpApi.java
index ba289a92b00..9ca281bef2f 100644
--- a/io.openems.edge.controller.api.modbus/src/io/openems/edge/controller/api/modbus/AbstractModbusTcpApi.java
+++ b/io.openems.edge.controller.api.modbus/src/io/openems/edge/controller/api/modbus/AbstractModbusTcpApi.java
@@ -32,7 +32,6 @@
 import io.openems.edge.common.modbusslave.ModbusRecordUint16Hash;
 import io.openems.edge.common.modbusslave.ModbusSlave;
 import io.openems.edge.common.modbusslave.ModbusSlaveNatureTable;
-import io.openems.edge.common.modbusslave.ModbusSlaveTable;
 import io.openems.edge.common.user.User;
 import io.openems.edge.controller.api.Controller;
 import io.openems.edge.controller.api.common.ApiWorker;
@@ -114,6 +113,7 @@ protected void activate(ComponentContext context, String id, String alias, boole
 		this.startApiWorker.activate(id);
 	}
 
+	@Override
 	protected void deactivate() {
 		this.startApiWorker.deactivate();
 		ModbusSlaveFactory.close();
@@ -130,7 +130,7 @@ protected void deactivate() {
 
 		@Override
 		protected void forever() {
-			int port = AbstractModbusTcpApi.this.port;
+			var port = AbstractModbusTcpApi.this.port;
 			if (this.slave == null) {
 				try {
 					// start new server
@@ -151,7 +151,7 @@ protected void forever() {
 
 			} else {
 				// regular check for errors
-				String error = this.slave.getError();
+				var error = this.slave.getError();
 				if (error != null) {
 					AbstractModbusTcpApi.this.logError(this.log,
 							"Unable to start Modbus/TCP Api on port [" + port + "]: " + error);
@@ -172,14 +172,14 @@ protected int getCycleTime() {
 
 	/**
 	 * Initialize Modbus-Records for all configured Component-IDs.
-	 * 
+	 *
 	 * @param metaComponent the {@link Meta} component
 	 * @param componentIds  the configured Component-IDs.
 	 */
 	private void initializeModbusRecords(Meta metaComponent, String[] componentIds) {
 		// Add generic header
 		this.records.put(0, new ModbusRecordUint16Hash(0, "OpenEMS"));
-		int nextAddress = 1;
+		var nextAddress = 1;
 
 		// add Meta-Component
 		nextAddress = this.addMetaComponentToProcessImage(nextAddress, metaComponent);
@@ -187,7 +187,7 @@ private void initializeModbusRecords(Meta metaComponent, String[] componentIds)
 		// add remaining components; sorted by configured componentIds
 		for (String id : componentIds) {
 			// find next component in order
-			ModbusSlave component = this._components.get(id);
+			var component = this._components.get(id);
 			if (component == null) {
 				this.logWarn(this.log, "Required Component [" + id + "] is not available.");
 				continue;
@@ -200,16 +200,16 @@ private void initializeModbusRecords(Meta metaComponent, String[] componentIds)
 
 	/**
 	 * Adds the Meta-Component to the Process Image.
-	 * 
+	 *
 	 * @param startAddress the start-address
 	 * @param component    the {@link Meta} component
 	 * @return the next start-address
 	 */
 	private int addMetaComponentToProcessImage(int startAddress, Meta component) {
-		ModbusSlaveTable table = component.getModbusSlaveTable(this.getAccessMode());
+		var table = component.getModbusSlaveTable(this.getAccessMode());
 
 		// add the Component-Model Length
-		int nextAddress = this.addRecordToProcessImage(startAddress,
+		var nextAddress = this.addRecordToProcessImage(startAddress,
 				new ModbusRecordUint16BlockLength(-1, component.id(), (short) table.getLength()), component);
 
 		// add Records
@@ -223,22 +223,22 @@ private int addMetaComponentToProcessImage(int startAddress, Meta component) {
 
 	/**
 	 * Adds a Component to the Process Image.
-	 * 
+	 *
 	 * @param startAddress the start-address
 	 * @param component    the OpenEMS Component
 	 * @return the next start-address
 	 */
 	private int addComponentToProcessImage(int startAddress, ModbusSlave component) {
 		this.components.put(startAddress, component.alias());
-		ModbusSlaveTable table = component.getModbusSlaveTable(this.getAccessMode());
+		var table = component.getModbusSlaveTable(this.getAccessMode());
 
 		// add the Component-ID and Component-Model Length
-		int nextAddress = this.addRecordToProcessImage(startAddress,
+		var nextAddress = this.addRecordToProcessImage(startAddress,
 				new ModbusRecordString16(-1, "Component-ID", component.id()), component);
 		this.addRecordToProcessImage(nextAddress,
 				new ModbusRecordUint16BlockLength(-1, component.id(), (short) table.getLength()), component);
 		nextAddress = startAddress + 20;
-		int nextNatureAddress = nextAddress;
+		var nextNatureAddress = nextAddress;
 
 		// add all Nature-Tables
 		for (ModbusSlaveNatureTable natureTable : table.getNatureTables()) {
@@ -262,7 +262,7 @@ private int addComponentToProcessImage(int startAddress, ModbusSlave component)
 
 	/**
 	 * Adds a Record to the process image at the given address.
-	 * 
+	 *
 	 * @param address   the address
 	 * @param record    the record
 	 * @param component the OpenEMS Component
@@ -273,8 +273,8 @@ private int addRecordToProcessImage(int address, ModbusRecord record, OpenemsCom
 
 		// Handle writes to the Channel; limited to ModbusRecordChannels
 		if (record instanceof ModbusRecordChannel) {
-			ModbusRecordChannel r = (ModbusRecordChannel) record;
-			r.onWriteValue((value) -> {
+			var r = (ModbusRecordChannel) record;
+			r.onWriteValue(value -> {
 				Channel<?> readChannel = component.channel(r.getChannelId());
 				if (!(readChannel instanceof WriteChannel)) {
 					this.logWarn(this.log, "Unable to write to Read-Only-Channel [" + readChannel.address() + "]");
@@ -326,16 +326,16 @@ public CompletableFuture<JsonrpcResponseSuccess> handleJsonrpcRequest(User user,
 
 	/**
 	 * Gets the AccessMode.
-	 * 
+	 *
 	 * @return the {@link AccessMode}
 	 */
 	protected abstract AccessMode getAccessMode();
 
 	/**
 	 * Gets the Component.
-	 * 
+	 *
 	 * @param componentId the Component-ID
-	 * 
+	 *
 	 * @return the {@link ModbusSlave} Component
 	 */
 	protected ModbusSlave getComponent(String componentId) {
diff --git a/io.openems.edge.controller.api.modbus/src/io/openems/edge/controller/api/modbus/MyProcessImage.java b/io.openems.edge.controller.api.modbus/src/io/openems/edge/controller/api/modbus/MyProcessImage.java
index 51c227945da..bea5871f79a 100644
--- a/io.openems.edge.controller.api.modbus/src/io/openems/edge/controller/api/modbus/MyProcessImage.java
+++ b/io.openems.edge.controller.api.modbus/src/io/openems/edge/controller/api/modbus/MyProcessImage.java
@@ -1,7 +1,5 @@
 package io.openems.edge.controller.api.modbus;
 
-import java.util.SortedMap;
-
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -36,9 +34,9 @@ protected MyProcessImage(AbstractModbusTcpApi parent) {
 	public synchronized InputRegister[] getInputRegisterRange(int offset, int count) throws MyIllegalAddressException {
 		try {
 			this.parent.logDebug(this.log, "Reading Input Registers. Address [" + offset + "] Count [" + count + "].");
-			Register[] registers = this.getRegisterRange(offset, count);
-			Register[] result = new Register[registers.length];
-			for (int i = 0; i < registers.length; i++) {
+			var registers = this.getRegisterRange(offset, count);
+			var result = new Register[registers.length];
+			for (var i = 0; i < registers.length; i++) {
 				result[i] = registers[i];
 			}
 			this.parent._setProcessImageFault(false);
@@ -56,25 +54,25 @@ public synchronized Register[] getRegisterRange(int offset, int count) throws My
 		this.parent.logDebug(this.log, "Reading Registers. Address [" + offset + "] Count [" + count + "].");
 
 		try {
-			SortedMap<Integer, ModbusRecord> records = this.parent.records.subMap(offset, offset + count);
-			Register[] result = new Register[count];
-			for (int i = 0; i < count;) {
+			var records = this.parent.records.subMap(offset, offset + count);
+			var result = new Register[count];
+			for (var i = 0; i < count;) {
 				// Get record for modbus address
-				int ref = i + offset;
-				ModbusRecord record = records.get(ref);
+				var ref = i + offset;
+				var record = records.get(ref);
 				if (record == null) {
 					throw new MyIllegalAddressException(this, "Record for Modbus address [" + ref + "] is undefined.");
 				}
 
 				// Get Registers from Record
-				Register[] registers = this.getRecordValueRegisters(record);
+				var registers = this.getRecordValueRegisters(record);
 
 				// make sure this Record fits
 				if (result.length < i + registers.length) {
 					throw new MyIllegalAddressException(this,
 							"Record for Modbus address [" + ref + "] does not fit in Result.");
 				}
-				for (int j = 0; j < registers.length; j++) {
+				for (var j = 0; j < registers.length; j++) {
 					result[i + j] = registers[j];
 				}
 
@@ -95,7 +93,7 @@ public synchronized Register getRegister(int ref) throws MyIllegalAddressExcepti
 		this.parent.logDebug(this.log, "Get Register. Address [" + ref + "].");
 
 		try {
-			ModbusRecord record = this.parent.records.get(ref);
+			var record = this.parent.records.get(ref);
 
 			// make sure the ModbusRecord is available
 			if (record == null) {
@@ -103,7 +101,7 @@ public synchronized Register getRegister(int ref) throws MyIllegalAddressExcepti
 			}
 
 			// Get Registers from Record
-			Register[] registers = this.getRecordValueRegisters(record);
+			var registers = this.getRecordValueRegisters(record);
 
 			// make sure this Record requires only one Register/Word
 			if (registers.length > 1) {
@@ -122,20 +120,20 @@ public synchronized Register getRegister(int ref) throws MyIllegalAddressExcepti
 
 	/**
 	 * Get value as byte-array and convert it to InputRegisters.
-	 * 
+	 *
 	 * @param record the record
 	 * @return the Register
 	 */
 	private Register[] getRecordValueRegisters(ModbusRecord record) {
-		MyRegister[] result = new MyRegister[record.getType().getWords()];
+		var result = new MyRegister[record.getType().getWords()];
 		OpenemsComponent component = this.parent.getComponent(record.getComponentId());
-		byte[] value = record.getValue(component);
-		for (int j = 0; j < value.length / 2; j++) {
+		var value = record.getValue(component);
+		for (var j = 0; j < value.length / 2; j++) {
 			result[j] = new MyRegister(j, value[j * 2], value[j * 2 + 1], //
 					/*
 					 * On Set-Value event:
 					 */
-					(register) -> {
+					register -> {
 						record.writeValue(component, register.getIndex(), register.getByte1(), register.getByte2());
 					});
 		}
@@ -165,8 +163,8 @@ public synchronized int getInputRegisterCount() {
 	public synchronized DigitalOut[] getDigitalOutRange(int offset, int count) {
 		this.parent.logWarn(this.log, "getDigitalOutRange is not implemented");
 		this.parent._setProcessImageFault(true);
-		DigitalOut[] result = new DigitalOut[count];
-		for (int i = 0; i < count; i++) {
+		var result = new DigitalOut[count];
+		for (var i = 0; i < count; i++) {
 			result[i] = new SimpleDigitalOut(false);
 		}
 		return result;
@@ -190,8 +188,8 @@ public synchronized int getDigitalOutCount() {
 	public synchronized DigitalIn[] getDigitalInRange(int offset, int count) {
 		this.parent.logWarn(this.log, "getDigitalInRange is not implemented");
 		this.parent._setProcessImageFault(true);
-		DigitalIn[] result = new DigitalIn[count];
-		for (int i = 0; i < count; i++) {
+		var result = new DigitalIn[count];
+		for (var i = 0; i < count; i++) {
 			result[i] = new SimpleDigitalIn(false);
 		}
 		return result;
diff --git a/io.openems.edge.controller.api.modbus/src/io/openems/edge/controller/api/modbus/MyRegister.java b/io.openems.edge.controller.api.modbus/src/io/openems/edge/controller/api/modbus/MyRegister.java
index d03a6230d52..d6968a7a488 100644
--- a/io.openems.edge.controller.api.modbus/src/io/openems/edge/controller/api/modbus/MyRegister.java
+++ b/io.openems.edge.controller.api.modbus/src/io/openems/edge/controller/api/modbus/MyRegister.java
@@ -36,7 +36,7 @@ protected byte getByte2() {
 
 	@Override
 	public int getValue() {
-		return ((this.byte1 & 0xff) << 8 | (this.byte2 & 0xff));
+		return (this.byte1 & 0xff) << 8 | this.byte2 & 0xff;
 	}
 
 	@Override
@@ -67,7 +67,7 @@ public void setValue(int v) {
 
 	@Override
 	public final synchronized void setValue(short s) {
-		this.setValue((byte) (0xff & (s >> 8)), (byte) (0xff & s));
+		this.setValue((byte) (0xff & s >> 8), (byte) (0xff & s));
 	}
 
 	@Override
diff --git a/io.openems.edge.controller.api.modbus/src/io/openems/edge/controller/api/modbus/jsonrpc/GetModbusProtocolExportXlsxRequest.java b/io.openems.edge.controller.api.modbus/src/io/openems/edge/controller/api/modbus/jsonrpc/GetModbusProtocolExportXlsxRequest.java
index a99c5a1b1f9..834d884cf47 100644
--- a/io.openems.edge.controller.api.modbus/src/io/openems/edge/controller/api/modbus/jsonrpc/GetModbusProtocolExportXlsxRequest.java
+++ b/io.openems.edge.controller.api.modbus/src/io/openems/edge/controller/api/modbus/jsonrpc/GetModbusProtocolExportXlsxRequest.java
@@ -6,7 +6,7 @@
 
 /**
  * Exports the Modbus Protocol to an Excel (xlsx) file.
- * 
+ *
  * <pre>
  * {
  *   "jsonrpc": "2.0",
diff --git a/io.openems.edge.controller.api.modbus/src/io/openems/edge/controller/api/modbus/jsonrpc/GetModbusProtocolExportXlsxResponse.java b/io.openems.edge.controller.api.modbus/src/io/openems/edge/controller/api/modbus/jsonrpc/GetModbusProtocolExportXlsxResponse.java
index f400d9e6e35..21f2447965c 100644
--- a/io.openems.edge.controller.api.modbus/src/io/openems/edge/controller/api/modbus/jsonrpc/GetModbusProtocolExportXlsxResponse.java
+++ b/io.openems.edge.controller.api.modbus/src/io/openems/edge/controller/api/modbus/jsonrpc/GetModbusProtocolExportXlsxResponse.java
@@ -23,9 +23,9 @@
 
 /**
  * Represents a JSON-RPC Response for 'getModbusProtocolExportXlsx'.
- * 
+ *
  * <p>
- * 
+ *
  * <pre>
  * {
  *   "jsonrpc": "2.0",
@@ -52,10 +52,9 @@ public GetModbusProtocolExportXlsxResponse(UUID id, TreeMap<Integer, String> com
 
 	private static byte[] generatePayload(TreeMap<Integer, String> components, TreeMap<Integer, ModbusRecord> records)
 			throws OpenemsException {
-		byte[] payload = new byte[0];
 		Worksheet ws = null;
 		try {
-			try (ByteArrayOutputStream os = new ByteArrayOutputStream()) {
+			try (var os = new ByteArrayOutputStream()) {
 				Workbook wb = null;
 				try {
 					wb = new Workbook(os, "OpenEMS Modbus-TCP", "1.0");
@@ -70,11 +69,11 @@ private static byte[] generatePayload(TreeMap<Integer, String> components, TreeM
 					// Add headers
 					addSheetHeader(wb, ws);
 					// Create Sheet
-					int nextRow = 1;
+					var nextRow = 1;
 					for (Entry<Integer, ModbusRecord> entry : records.entrySet()) {
 						int address = entry.getKey();
 
-						String component = components.get(address);
+						var component = components.get(address);
 						if (address == 0 || component != null) {
 							if (address == 0) {
 								// Add the global header row
@@ -87,12 +86,8 @@ private static byte[] generatePayload(TreeMap<Integer, String> components, TreeM
 						}
 
 						// Add a Record-Row
-						ModbusRecord record = entry.getValue();
-						if (nextRow % 2 == 0) {
-							addRecord(ws, address, record, nextRow);
-						} else {
-							addRecord(ws, address, record, nextRow);
-						}
+						var record = entry.getValue();
+						addRecord(ws, address, record, nextRow);
 						nextRow++;
 					}
 					// Shading alternative Rows
@@ -105,8 +100,7 @@ private static byte[] generatePayload(TreeMap<Integer, String> components, TreeM
 					}
 				}
 				os.flush();
-				payload = os.toByteArray();
-				return payload;
+				return os.toByteArray();
 			}
 		} catch (IOException e) {
 			throw new OpenemsException("Unable to generate Xlsx payload: " + e.getMessage());
@@ -133,7 +127,7 @@ private static void addRecord(Worksheet sheet, int address, ModbusRecord record,
 		sheet.value(rowCount, COL_NAME, record.getName());
 		sheet.value(rowCount, COL_TYPE, record.getType().toString());
 		sheet.value(rowCount, COL_VALUE_DESCRIPTION, record.getValueDescription());
-		Unit unit = record.getUnit();
+		var unit = record.getUnit();
 		if (unit != Unit.NONE) {
 			sheet.value(rowCount, COL_UNIT, unit.toString());
 		}
@@ -142,19 +136,19 @@ private static void addRecord(Worksheet sheet, int address, ModbusRecord record,
 
 	/**
 	 * Add Sheet to describe UNDEFINED values.
-	 * 
+	 *
 	 * @param wb the Workbook
 	 */
 	private static void addUndefinedSheet(Workbook wb) {
-		Worksheet ws = wb.newWorksheet("Undefined values");
+		var ws = wb.newWorksheet("Undefined values");
 
 		ws.value(0, COL_ADDRESS, "In case a modbus value is 'undefined', the following value will be read:");
 		ws.value(1, 0, "type");
 		ws.value(1, 1, "value");
 
-		int nextRow = 2;
+		var nextRow = 2;
 		for (ModbusType modbusType : ModbusType.values()) {
-			byte[] value = new byte[0];
+			byte[] value = {};
 			switch (modbusType) {
 			case FLOAT32:
 				value = ModbusRecordFloat32.UNDEFINED_VALUE;
@@ -185,7 +179,7 @@ private static String byteArrayToString(byte[] value) {
 		if (value.length == 0) {
 			return "";
 		}
-		StringBuilder result = new StringBuilder("0x");
+		var result = new StringBuilder("0x");
 		for (byte b : value) {
 			result.append(Integer.toHexString(b & 0xff));
 		}
diff --git a/io.openems.edge.controller.api.modbus/src/io/openems/edge/controller/api/modbus/jsonrpc/GetModbusProtocolRequest.java b/io.openems.edge.controller.api.modbus/src/io/openems/edge/controller/api/modbus/jsonrpc/GetModbusProtocolRequest.java
index 4a4bbfa9adc..d321a448f73 100644
--- a/io.openems.edge.controller.api.modbus/src/io/openems/edge/controller/api/modbus/jsonrpc/GetModbusProtocolRequest.java
+++ b/io.openems.edge.controller.api.modbus/src/io/openems/edge/controller/api/modbus/jsonrpc/GetModbusProtocolRequest.java
@@ -7,7 +7,7 @@
 /**
  * Wraps a JSON-RPC Request to query the Modbus Protocol from Modbus/TCP
  * Api-Controller.
- * 
+ *
  * <pre>
  * {
  *   "jsonrpc": "2.0",
diff --git a/io.openems.edge.controller.api.modbus/src/io/openems/edge/controller/api/modbus/jsonrpc/GetModbusProtocolResponse.java b/io.openems.edge.controller.api.modbus/src/io/openems/edge/controller/api/modbus/jsonrpc/GetModbusProtocolResponse.java
index 3bd813817be..a46c4436da7 100644
--- a/io.openems.edge.controller.api.modbus/src/io/openems/edge/controller/api/modbus/jsonrpc/GetModbusProtocolResponse.java
+++ b/io.openems.edge.controller.api.modbus/src/io/openems/edge/controller/api/modbus/jsonrpc/GetModbusProtocolResponse.java
@@ -14,9 +14,9 @@
 
 /**
  * Wraps a JSON-RPC Response to "getModbusProtocol" Request.
- * 
+ *
  * <p>
- * 
+ *
  * <pre>
  * {
  *   "jsonrpc": "2.0",
@@ -44,9 +44,9 @@ public GetModbusProtocolResponse(UUID id, TreeMap<Integer, ModbusRecord> records
 
 	@Override
 	public JsonObject getResult() {
-		JsonArray table = new JsonArray();
+		var table = new JsonArray();
 		for (Entry<Integer, ModbusRecord> entry : this.tableRecords.entrySet()) {
-			ModbusRecord record = entry.getValue();
+			var record = entry.getValue();
 			table.add(JsonUtils.buildJsonObject() //
 					.addProperty("ref", entry.getKey()) //
 					.addProperty("name", record.getName()) //
@@ -56,7 +56,7 @@ public JsonObject getResult() {
 					.addProperty("access", record.getAccessMode().getAbbreviation()) //
 					.build());
 		}
-		JsonObject j = new JsonObject();
+		var j = new JsonObject();
 		j.add("table", table);
 		return j;
 	}
diff --git a/io.openems.edge.controller.api.modbus/src/io/openems/edge/controller/api/modbus/readonly/ModbusTcpApiReadOnlyImpl.java b/io.openems.edge.controller.api.modbus/src/io/openems/edge/controller/api/modbus/readonly/ModbusTcpApiReadOnlyImpl.java
index 823f43fb39c..a824f735751 100644
--- a/io.openems.edge.controller.api.modbus/src/io/openems/edge/controller/api/modbus/readonly/ModbusTcpApiReadOnlyImpl.java
+++ b/io.openems.edge.controller.api.modbus/src/io/openems/edge/controller/api/modbus/readonly/ModbusTcpApiReadOnlyImpl.java
@@ -35,6 +35,7 @@ public class ModbusTcpApiReadOnlyImpl extends AbstractModbusTcpApi
 	@Reference(policy = ReferencePolicy.STATIC, policyOption = ReferencePolicyOption.GREEDY, cardinality = ReferenceCardinality.MANDATORY)
 	protected Meta metaComponent = null;
 
+	@Override
 	@Reference(policy = ReferencePolicy.STATIC, policyOption = ReferencePolicyOption.GREEDY, cardinality = ReferenceCardinality.MULTIPLE)
 	protected void addComponent(ModbusSlave component) {
 		super.addComponent(component);
@@ -58,6 +59,7 @@ void activate(ComponentContext context, Config config) throws ModbusException, O
 				config.component_ids(), 0 /* no timeout */, config.port(), config.maxConcurrentConnections());
 	}
 
+	@Override
 	@Deactivate
 	protected void deactivate() {
 		super.deactivate();
diff --git a/io.openems.edge.controller.api.modbus/src/io/openems/edge/controller/api/modbus/readwrite/ModbusTcpApiReadWriteImpl.java b/io.openems.edge.controller.api.modbus/src/io/openems/edge/controller/api/modbus/readwrite/ModbusTcpApiReadWriteImpl.java
index ac6e7e5330d..8f79030177f 100644
--- a/io.openems.edge.controller.api.modbus/src/io/openems/edge/controller/api/modbus/readwrite/ModbusTcpApiReadWriteImpl.java
+++ b/io.openems.edge.controller.api.modbus/src/io/openems/edge/controller/api/modbus/readwrite/ModbusTcpApiReadWriteImpl.java
@@ -35,6 +35,7 @@ public class ModbusTcpApiReadWriteImpl extends AbstractModbusTcpApi
 	@Reference(policy = ReferencePolicy.STATIC, policyOption = ReferencePolicyOption.GREEDY, cardinality = ReferenceCardinality.MANDATORY)
 	protected Meta metaComponent = null;
 
+	@Override
 	@Reference(policy = ReferencePolicy.STATIC, policyOption = ReferencePolicyOption.GREEDY, cardinality = ReferenceCardinality.MULTIPLE)
 	protected void addComponent(ModbusSlave component) {
 		super.addComponent(component);
@@ -59,6 +60,7 @@ void activate(ComponentContext context, Config config) throws ModbusException, O
 				config.component_ids(), config.apiTimeout(), config.port(), config.maxConcurrentConnections());
 	}
 
+	@Override
 	@Deactivate
 	protected void deactivate() {
 		super.deactivate();
diff --git a/io.openems.edge.controller.api.modbus/test/io/openems/edge/controller/api/modbus/ModbusTcpApiTest.java b/io.openems.edge.controller.api.modbus/test/io/openems/edge/controller/api/modbus/ModbusTcpApiTest.java
index ca8531a6c65..afe2505e505 100644
--- a/io.openems.edge.controller.api.modbus/test/io/openems/edge/controller/api/modbus/ModbusTcpApiTest.java
+++ b/io.openems.edge.controller.api.modbus/test/io/openems/edge/controller/api/modbus/ModbusTcpApiTest.java
@@ -22,7 +22,7 @@
 public class ModbusTcpApiTest {
 
 	private static ModbusTCPMaster getMaster() throws Exception {
-		ModbusTCPMaster master = new ModbusTCPMaster("127.0.0.1");
+		var master = new ModbusTCPMaster("127.0.0.1");
 		master.setRetries(1);
 		master.connect();
 		return master;
@@ -30,20 +30,20 @@ private static ModbusTCPMaster getMaster() throws Exception {
 
 	// @Test
 	public void testOpenemsHashCode() throws Exception {
-		ModbusTCPMaster master = getMaster();
-		InputRegister[] registers = master.readInputRegisters(0, 1);
+		var master = getMaster();
+		var registers = master.readInputRegisters(0, 1);
 		assertEquals((short) "OpenEMS".hashCode(), registers[0].getValue());
 		master.disconnect();
 	}
 
 	// @Test
 	public void testVersion() throws Exception {
-		ModbusTCPMaster master = getMaster();
-		InputRegister[] registers = master.readInputRegisters(2, 3);
+		var master = getMaster();
+		var registers = master.readInputRegisters(2, 3);
 
-		int versionMajor = registers[0].getValue();
-		int versionMinor = registers[1].getValue();
-		int versionPatch = registers[2].getValue();
+		var versionMajor = registers[0].getValue();
+		var versionMinor = registers[1].getValue();
+		var versionPatch = registers[2].getValue();
 
 		System.out.println(versionMajor + "-" + versionMinor + "-" + versionPatch);
 
@@ -55,26 +55,26 @@ public void testVersion() throws Exception {
 
 	// @Test
 	public void testSumEssSocFC4() throws Exception {
-		ModbusTCPMaster master = getMaster();
-		InputRegister[] registers = master.readInputRegisters(302, 1);
-		int soc = registers[0].getValue();
+		var master = getMaster();
+		var registers = master.readInputRegisters(302, 1);
+		var soc = registers[0].getValue();
 		assertTrue(soc >= 0 && soc <= 100);
 		master.disconnect();
 	}
 
 	// @Test
 	public void testSumStateOfChargeFC3() throws Exception {
-		ModbusTCPMaster master = getMaster();
+		var master = getMaster();
 		InputRegister[] registers = master.readMultipleRegisters(302, 1);
-		int soc = registers[0].getValue();
+		var soc = registers[0].getValue();
 		assertTrue(soc >= 0 && soc <= 100);
 		master.disconnect();
 	}
 
 	// @Test
 	public void testWrite() throws Exception {
-		byte[] bytes = ByteBuffer.allocate(4).putFloat(2500).array();
-		ModbusTCPMaster master = getMaster();
+		var bytes = ByteBuffer.allocate(4).putFloat(2500).array();
+		var master = getMaster();
 		master.writeMultipleRegisters(902, new Register[] { //
 				new SimpleRegister(bytes[0], bytes[1]), new SimpleRegister(bytes[2], bytes[3]), //
 				new SimpleRegister(bytes[0], bytes[1]), new SimpleRegister(bytes[2], bytes[3]) //
@@ -84,13 +84,13 @@ public void testWrite() throws Exception {
 
 	// @Test
 	public void testFloat32() throws Exception {
-		ModbusTCPMaster master = getMaster();
-		InputRegister[] registers = master.readInputRegisters(884, 2);
-		ByteBuffer buff = ByteBuffer.allocate(4).order(ByteOrder.BIG_ENDIAN);
+		var master = getMaster();
+		var registers = master.readInputRegisters(884, 2);
+		var buff = ByteBuffer.allocate(4).order(ByteOrder.BIG_ENDIAN);
 		buff.put(registers[0].toBytes());
 		buff.put(registers[1].toBytes());
 		buff.rewind();
-		float value = buff.order(ByteOrder.BIG_ENDIAN).getFloat(0);
+		var value = buff.order(ByteOrder.BIG_ENDIAN).getFloat(0);
 
 		System.out.println(value);
 

From 82267c1ac36f08d60e0798317bd7b4862f54b734 Mon Sep 17 00:00:00 2001
From: Stefan Feilmeier <stefan.feilmeier@fenecon.de>
Date: Mon, 7 Mar 2022 22:49:12 +0100
Subject: [PATCH 15/96] Update io.openems.edge.controller.api.mqtt

---
 .../api/mqtt/MqttApiControllerImpl.java        | 11 ++++++-----
 .../controller/api/mqtt/MqttConnector.java     |  6 +++---
 .../api/mqtt/SendChannelValuesWorker.java      | 18 +++++++++---------
 .../api/mqtt/MqttApiControllerImplTest.java    |  2 +-
 .../edge/controller/api/mqtt/MyConfig.java     |  2 +-
 5 files changed, 20 insertions(+), 19 deletions(-)

diff --git a/io.openems.edge.controller.api.mqtt/src/io/openems/edge/controller/api/mqtt/MqttApiControllerImpl.java b/io.openems.edge.controller.api.mqtt/src/io/openems/edge/controller/api/mqtt/MqttApiControllerImpl.java
index e6c26fa8d27..6ec3323abde 100644
--- a/io.openems.edge.controller.api.mqtt/src/io/openems/edge/controller/api/mqtt/MqttApiControllerImpl.java
+++ b/io.openems.edge.controller.api.mqtt/src/io/openems/edge/controller/api/mqtt/MqttApiControllerImpl.java
@@ -83,6 +83,7 @@ void activate(ComponentContext context, Config config) throws Exception {
 				});
 	}
 
+	@Override
 	@Deactivate
 	protected void deactivate() {
 		super.deactivate();
@@ -125,7 +126,7 @@ public void handleEvent(Event event) {
 
 		case EdgeEventConstants.TOPIC_CONFIG_UPDATE:
 			// Send new EdgeConfig
-			EdgeConfig config = (EdgeConfig) event.getProperty(EdgeEventConstants.TOPIC_CONFIG_UPDATE_KEY);
+			var config = (EdgeConfig) event.getProperty(EdgeEventConstants.TOPIC_CONFIG_UPDATE_KEY);
 			this.publish(MqttApiController.TOPIC_EDGE_CONFIG, config.toJson().toString(), //
 					1 /* QOS */, true /* retain */, new MqttProperties() /* no specific properties */);
 
@@ -137,14 +138,14 @@ public void handleEvent(Event event) {
 
 	/**
 	 * Publish a message to a topic.
-	 * 
+	 *
 	 * @param subTopic the MQTT topic. The global MQTT Topic prefix is added in
 	 *                 front of this string
 	 * @param message  the message
 	 * @return true if message was successfully published; false otherwise
 	 */
 	protected boolean publish(String subTopic, MqttMessage message) {
-		IMqttClient mqttClient = this.mqttClient;
+		var mqttClient = this.mqttClient;
 		if (mqttClient == null) {
 			return false;
 		}
@@ -159,7 +160,7 @@ protected boolean publish(String subTopic, MqttMessage message) {
 
 	/**
 	 * Publish a message to a topic.
-	 * 
+	 *
 	 * @param subTopic   the MQTT topic. The global MQTT Topic prefix is added in
 	 *                   front of this string
 	 * @param message    the message; internally translated to a UTF-8 byte array
@@ -169,7 +170,7 @@ protected boolean publish(String subTopic, MqttMessage message) {
 	 * @return true if message was successfully published; false otherwise
 	 */
 	protected boolean publish(String subTopic, String message, int qos, boolean retained, MqttProperties properties) {
-		MqttMessage msg = new MqttMessage(message.getBytes(StandardCharsets.UTF_8), qos, retained, properties);
+		var msg = new MqttMessage(message.getBytes(StandardCharsets.UTF_8), qos, retained, properties);
 		return this.publish(subTopic, msg);
 	}
 }
diff --git a/io.openems.edge.controller.api.mqtt/src/io/openems/edge/controller/api/mqtt/MqttConnector.java b/io.openems.edge.controller.api.mqtt/src/io/openems/edge/controller/api/mqtt/MqttConnector.java
index a5634e680fa..7c18f13c13d 100644
--- a/io.openems.edge.controller.api.mqtt/src/io/openems/edge/controller/api/mqtt/MqttConnector.java
+++ b/io.openems.edge.controller.api.mqtt/src/io/openems/edge/controller/api/mqtt/MqttConnector.java
@@ -16,7 +16,7 @@
 
 /**
  * This helper class wraps a connection to an MQTT broker.
- * 
+ *
  * <p>
  * One main feature of this class is to retry the initial connection to an MQTT
  * broker. A feature that is unfortunately not present in Eclipse Paho. After
@@ -27,7 +27,7 @@ public class MqttConnector {
 
 	private static final int INCREASE_WAIT_SECONDS = 5;
 	private static final int MAX_WAIT_SECONDS = 60 * 5;
-	private AtomicInteger waitSeconds = new AtomicInteger(0);
+	private final AtomicInteger waitSeconds = new AtomicInteger(0);
 
 	/**
 	 * Private inner class handles actual connection. It is executed via the
@@ -77,7 +77,7 @@ protected synchronized CompletableFuture<IMqttClient> connect(String serverUri,
 			client.setCallback(callback);
 		}
 
-		MqttConnectionOptions options = new MqttConnectionOptions();
+		var options = new MqttConnectionOptions();
 		options.setUserName(username);
 		if (password != null) {
 			options.setPassword(password.getBytes(StandardCharsets.UTF_8));
diff --git a/io.openems.edge.controller.api.mqtt/src/io/openems/edge/controller/api/mqtt/SendChannelValuesWorker.java b/io.openems.edge.controller.api.mqtt/src/io/openems/edge/controller/api/mqtt/SendChannelValuesWorker.java
index 30ddc8510b3..11835393b46 100644
--- a/io.openems.edge.controller.api.mqtt/src/io/openems/edge/controller/api/mqtt/SendChannelValuesWorker.java
+++ b/io.openems.edge.controller.api.mqtt/src/io/openems/edge/controller/api/mqtt/SendChannelValuesWorker.java
@@ -30,7 +30,7 @@
  * Method {@link #collectData()} is called Synchronously with the Core.Cycle to
  * collect values of Channels. Sending of values is then delegated to an
  * asynchronous task.
- * 
+ *
  * <p>
  * The logic tries to send changed values once per Cycle and all values once
  * every {@link #SEND_VALUES_OF_ALL_CHANNELS_AFTER_SECONDS}.
@@ -59,7 +59,7 @@ public class SendChannelValuesWorker {
 	/**
 	 * If true: next 'send' sends all channel values.
 	 */
-	private AtomicBoolean sendValuesOfAllChannels = new AtomicBoolean(true);
+	private final AtomicBoolean sendValuesOfAllChannels = new AtomicBoolean(true);
 
 	/**
 	 * Keeps the last timestamp when all channel values were sent.
@@ -95,11 +95,11 @@ public void deactivate() {
 	 * triggers asynchronous sending.
 	 */
 	public synchronized void collectData() {
-		Instant now = Instant.now(this.parent.componentManager.getClock());
+		var now = Instant.now(this.parent.componentManager.getClock());
 
 		// Update the values of all channels
-		final List<OpenemsComponent> enabledComponents = this.parent.componentManager.getEnabledComponents();
-		final ImmutableTable<String, String, JsonElement> allValues = this.collectData(enabledComponents);
+		final var enabledComponents = this.parent.componentManager.getEnabledComponents();
+		final var allValues = this.collectData(enabledComponents);
 
 		// Add to send Queue
 		this.executor.execute(new SendTask(this, now, allValues));
@@ -107,7 +107,7 @@ public synchronized void collectData() {
 
 	/**
 	 * Cycles through all Channels and collects the value.
-	 * 
+	 *
 	 * @param enabledComponents the enabled components
 	 * @return collected data
 	 */
@@ -179,12 +179,12 @@ public void run() {
 			}
 
 			// Send changed values
-			boolean allSendSuccessful = true;
+			var allSendSuccessful = true;
 			List<String> sendTopics = new ArrayList<>();
 			for (Entry<String, Map<String, JsonElement>> row : this.allValues.rowMap().entrySet()) {
 				for (Entry<String, JsonElement> column : row.getValue().entrySet()) {
 					if (!Objects.equals(column.getValue(), lastAllValues.get(row.getKey(), column.getKey()))) {
-						String subtopic = row.getKey() + "/" + column.getKey();
+						var subtopic = row.getKey() + "/" + column.getKey();
 						sendTopics.add(subtopic);
 						if (!this.publish(row.getKey() + "/" + column.getKey(), column.getValue().toString())) {
 							allSendSuccessful = false;
@@ -215,7 +215,7 @@ public void run() {
 
 		/**
 		 * Publish a Channel value message.
-		 * 
+		 *
 		 * @param subTopic the Channel Subtopic
 		 * @param value    the value Json.toString()
 		 * @return true if sent successfully; false otherwise
diff --git a/io.openems.edge.controller.api.mqtt/test/io/openems/edge/controller/api/mqtt/MqttApiControllerImplTest.java b/io.openems.edge.controller.api.mqtt/test/io/openems/edge/controller/api/mqtt/MqttApiControllerImplTest.java
index 83df46a6004..f4f710dd12e 100644
--- a/io.openems.edge.controller.api.mqtt/test/io/openems/edge/controller/api/mqtt/MqttApiControllerImplTest.java
+++ b/io.openems.edge.controller.api.mqtt/test/io/openems/edge/controller/api/mqtt/MqttApiControllerImplTest.java
@@ -17,7 +17,7 @@ public class MqttApiControllerImplTest {
 
 	@Test
 	public void test() throws Exception {
-		final TimeLeapClock clock = new TimeLeapClock(
+		final var clock = new TimeLeapClock(
 				Instant.ofEpochSecond(1577836800L) /* starts at 1. January 2020 00:00:00 */, ZoneOffset.UTC);
 		new ComponentTest(new MqttApiControllerImpl()) //
 				.addReference("componentManager", new DummyComponentManager(clock)) //
diff --git a/io.openems.edge.controller.api.mqtt/test/io/openems/edge/controller/api/mqtt/MyConfig.java b/io.openems.edge.controller.api.mqtt/test/io/openems/edge/controller/api/mqtt/MyConfig.java
index d030819d32a..7afb397c171 100644
--- a/io.openems.edge.controller.api.mqtt/test/io/openems/edge/controller/api/mqtt/MyConfig.java
+++ b/io.openems.edge.controller.api.mqtt/test/io/openems/edge/controller/api/mqtt/MyConfig.java
@@ -60,7 +60,7 @@ public MyConfig build() {
 
 	/**
 	 * Create a Config builder.
-	 * 
+	 *
 	 * @return a {@link Builder}
 	 */
 	public static Builder create() {

From 5bdac941664c65f03e6a44f3e9704322b1dcae04 Mon Sep 17 00:00:00 2001
From: Stefan Feilmeier <stefan.feilmeier@fenecon.de>
Date: Mon, 7 Mar 2022 22:49:42 +0100
Subject: [PATCH 16/96] Update io.openems.edge.controller.api.rest

---
 .../controller/api/rest/AbstractRestApi.java  |  11 +-
 .../edge/controller/api/rest/RestHandler.java | 106 +++++++++---------
 .../controller/api/rest/readonly/Config.java  |   2 +-
 .../rest/readonly/RestApiReadOnlyImpl.java    |   2 +
 .../controller/api/rest/readwrite/Config.java |   2 +-
 .../rest/readwrite/RestApiReadWriteImpl.java  |   1 +
 .../readwrite/RestApiReadWriteImplTest.java   |  28 +++--
 7 files changed, 75 insertions(+), 77 deletions(-)

diff --git a/io.openems.edge.controller.api.rest/src/io/openems/edge/controller/api/rest/AbstractRestApi.java b/io.openems.edge.controller.api.rest/src/io/openems/edge/controller/api/rest/AbstractRestApi.java
index a458fb95c78..064d97bb68e 100644
--- a/io.openems.edge.controller.api.rest/src/io/openems/edge/controller/api/rest/AbstractRestApi.java
+++ b/io.openems.edge.controller.api.rest/src/io/openems/edge/controller/api/rest/AbstractRestApi.java
@@ -43,7 +43,7 @@ public AbstractRestApi(String implementationName, io.openems.edge.common.channel
 
 	/**
 	 * Activate the {@link AbstractRestApi}.
-	 * 
+	 *
 	 * @param context            the {@link ComponentContext}
 	 * @param id                 the ID
 	 * @param alias              the Alias
@@ -85,6 +85,7 @@ protected void activate(ComponentContext context, String id, String alias, boole
 		}
 	}
 
+	@Override
 	@Deactivate
 	protected void deactivate() {
 		super.deactivate();
@@ -123,7 +124,7 @@ protected boolean isDebugModeEnabled() {
 
 	/**
 	 * Gets the Timedata service.
-	 * 
+	 *
 	 * @return the service
 	 * @throws OpenemsException if the timeservice is not available
 	 */
@@ -131,21 +132,21 @@ protected boolean isDebugModeEnabled() {
 
 	/**
 	 * Gets the UserService.
-	 * 
+	 *
 	 * @return the service
 	 */
 	protected abstract UserService getUserService();
 
 	/**
 	 * Gets the ComponentManager.
-	 * 
+	 *
 	 * @return the service
 	 */
 	protected abstract ComponentManager getComponentManager();
 
 	/**
 	 * Gets the AccessMode.
-	 * 
+	 *
 	 * @return the {@link AccessMode}
 	 */
 	protected abstract AccessMode getAccessMode();
diff --git a/io.openems.edge.controller.api.rest/src/io/openems/edge/controller/api/rest/RestHandler.java b/io.openems.edge.controller.api.rest/src/io/openems/edge/controller/api/rest/RestHandler.java
index 89b880ebdcc..b9d8ba87eed 100644
--- a/io.openems.edge.controller.api.rest/src/io/openems/edge/controller/api/rest/RestHandler.java
+++ b/io.openems.edge.controller.api.rest/src/io/openems/edge/controller/api/rest/RestHandler.java
@@ -4,14 +4,11 @@
 import java.io.IOException;
 import java.io.InputStreamReader;
 import java.io.UnsupportedEncodingException;
-import java.time.ZonedDateTime;
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.Base64;
 import java.util.List;
 import java.util.Map;
-import java.util.Optional;
-import java.util.SortedMap;
 import java.util.StringTokenizer;
 import java.util.UUID;
 import java.util.concurrent.CompletableFuture;
@@ -77,7 +74,7 @@ public RestHandler(AbstractRestApi parent) {
 	public void handle(String target, Request baseRequest, HttpServletRequest request, HttpServletResponse response)
 			throws IOException, ServletException {
 		try {
-			User user = this.authenticate(request);
+			var user = this.authenticate(request);
 
 			List<String> targets = Arrays.asList(//
 					target.substring(1) // remove leading '/'
@@ -87,8 +84,8 @@ public void handle(String target, Request baseRequest, HttpServletRequest reques
 				throw new OpenemsException("Missing arguments to handle request");
 			}
 
-			String thisTarget = targets.get(0);
-			List<String> remainingTargets = targets.subList(1, targets.size());
+			var thisTarget = targets.get(0);
+			var remainingTargets = targets.subList(1, targets.size());
 
 			switch (thisTarget) {
 			case "rest":
@@ -120,17 +117,17 @@ public void handle(String target, Request baseRequest, HttpServletRequest reques
 
 	/**
 	 * Authenticate a user.
-	 * 
+	 *
 	 * @param request the HttpServletRequest
 	 * @return the User
 	 * @throws OpenemsNamedException on error
 	 */
 	private User authenticate(HttpServletRequest request) throws OpenemsNamedException {
-		String authHeader = request.getHeader("Authorization");
+		var authHeader = request.getHeader("Authorization");
 		if (authHeader != null) {
-			StringTokenizer st = new StringTokenizer(authHeader);
+			var st = new StringTokenizer(authHeader);
 			if (st.hasMoreTokens()) {
-				String basic = st.nextToken();
+				var basic = st.nextToken();
 				if (basic.equalsIgnoreCase("Basic")) {
 					String credentials;
 					try {
@@ -138,12 +135,12 @@ private User authenticate(HttpServletRequest request) throws OpenemsNamedExcepti
 					} catch (UnsupportedEncodingException e) {
 						throw OpenemsError.COMMON_AUTHENTICATION_FAILED.exception();
 					}
-					int p = credentials.indexOf(":");
+					var p = credentials.indexOf(":");
 					if (p != -1) {
-						String username = credentials.substring(0, p).trim();
-						String password = credentials.substring(p + 1).trim();
+						var username = credentials.substring(0, p).trim();
+						var password = credentials.substring(p + 1).trim();
 						// authenticate using username & password
-						Optional<User> userOpt = this.parent.getUserService().authenticate(username, password);
+						var userOpt = this.parent.getUserService().authenticate(username, password);
 						if (userOpt.isPresent()) {
 							return userOpt.get();
 						}
@@ -165,8 +162,8 @@ private boolean handleRest(User user, List<String> targets, Request baseRequest,
 			throw new OpenemsException("Missing arguments to handle REST-request");
 		}
 
-		String thisTarget = targets.get(0);
-		List<String> remainingTargets = targets.subList(1, targets.size());
+		var thisTarget = targets.get(0);
+		var remainingTargets = targets.subList(1, targets.size());
 
 		switch (thisTarget) {
 		case "channel":
@@ -184,7 +181,7 @@ private boolean handleChannel(User user, List<String> targets, Request baseReque
 		}
 
 		// get request attributes
-		ChannelAddress channelAddress = new ChannelAddress(targets.get(0), targets.get(1));
+		var channelAddress = new ChannelAddress(targets.get(0), targets.get(1));
 
 		// call handler methods
 		switch (request.getMethod()) {
@@ -208,7 +205,7 @@ private boolean handleChannel(User user, List<String> targets, Request baseReque
 
 	/**
 	 * Handles HTTP GET request.
-	 * 
+	 *
 	 * @param user           the {@link User}
 	 * @param channelAddress the ChannelAddress (may include RegExp)
 	 * @param baseRequest    the HTTP POST base-request
@@ -221,7 +218,7 @@ private boolean handleGet(User user, ChannelAddress channelAddress, Request base
 			HttpServletResponse response) throws OpenemsNamedException {
 		user.assertRoleIsAtLeast("HTTP GET", Role.GUEST);
 
-		List<Channel<?>> channellist = new ArrayList<Channel<?>>();
+		List<Channel<?>> channellist = new ArrayList<>();
 
 		if (this.parent.isDebugModeEnabled()) {
 			this.parent.logInfo(this.log,
@@ -229,13 +226,13 @@ private boolean handleGet(User user, ChannelAddress channelAddress, Request base
 		}
 
 		// Build list of all channels where components are enabled
-		List<OpenemsComponent> ComponentList = this.parent.getComponentManager().getEnabledComponents();
+		var ComponentList = this.parent.getComponentManager().getEnabledComponents();
 		for (OpenemsComponent component : ComponentList) {
 			// Loop over enabled ComponentIds, look for exact or RegExp match
-			if (matchesSafely(component.id(), channelAddress.getComponentId())) {
+			if (this.matchesSafely(component.id(), channelAddress.getComponentId())) {
 				for (Channel<?> channel : component.channels()) {
 					// Loop over attached channels, look for exact or RegExp match
-					if (matchesSafely(channelAddress.getChannelId(), channel.channelId().id())) {
+					if (this.matchesSafely(channelAddress.getChannelId(), channel.channelId().id())) {
 						channellist.add(channel);
 					}
 				}
@@ -251,9 +248,9 @@ private boolean handleGet(User user, ChannelAddress channelAddress, Request base
 		}
 
 		// Creating JSON response for all matched channels
-		JsonArray channeljson = new JsonArray();
+		var channeljson = new JsonArray();
 		for (Channel<?> channel : channellist) {
-			JsonObject j = new JsonObject();
+			var j = new JsonObject();
 			// name
 			j.addProperty("address", channel.address().toString());
 			// type
@@ -271,7 +268,7 @@ private boolean handleGet(User user, ChannelAddress channelAddress, Request base
 
 		// if this a request for a single channel only return a single JsonObject, not
 		// an array (for compatibility to previous versions)
-		JsonElement result = channeljson.size() == 1 ? channeljson.get(0) : channeljson;
+		var result = channeljson.size() == 1 ? channeljson.get(0) : channeljson;
 
 		if (this.parent.isDebugModeEnabled()) {
 			this.parent.logInfo(this.log, "REST call by User [" + user.getName() + "]: GET Channel ["
@@ -283,7 +280,7 @@ private boolean handleGet(User user, ChannelAddress channelAddress, Request base
 
 	/**
 	 * Safely matches a regular expression against a string.
-	 * 
+	 *
 	 * @param str   the string
 	 * @param regex the regular expression
 	 * @return true on match
@@ -350,15 +347,14 @@ private boolean handlePost(User user, ChannelAddress channelAddress, Request bas
 		user.assertRoleIsAtLeast("HTTP POST", Role.OWNER);
 
 		// parse json
-		JsonObject jHttpPost = RestHandler.parseJson(baseRequest);
+		var jHttpPost = RestHandler.parseJson(baseRequest);
 
 		// parse value
 		JsonElement jValue;
-		if (jHttpPost.has("value")) {
-			jValue = jHttpPost.get("value");
-		} else {
+		if (!jHttpPost.has("value")) {
 			throw new OpenemsException("Value is missing");
 		}
+		jValue = jHttpPost.get("value");
 
 		if (this.parent.isDebugModeEnabled()) {
 			this.parent.logInfo(this.log, "REST call by User [" + user.getName() + "]: POST Channel ["
@@ -374,7 +370,7 @@ private boolean handlePost(User user, ChannelAddress channelAddress, Request bas
 
 	/**
 	 * Parses a Request to JSON.
-	 * 
+	 *
 	 * @param baseRequest the Request
 	 * @return the request as JSON
 	 * @throws OpenemsException on error
@@ -393,7 +389,7 @@ private static JsonObject parseJson(Request baseRequest) throws OpenemsException
 
 	/**
 	 * Handles an http request to 'jsonrpc' endpoint.
-	 * 
+	 *
 	 * @param user         the {@link User}
 	 * @param baseRequest  the HTTP POST base-request
 	 * @param httpRequest  the HTTP POST request
@@ -404,7 +400,7 @@ private void handleJsonRpc(User user, Request baseRequest, HttpServletRequest ht
 			HttpServletResponse httpResponse) throws OpenemsNamedException {
 		user.assertRoleIsAtLeast("HTTP POST JSON-RPC", Role.OWNER);
 
-		UUID requestId = new UUID(0L, 0L); /* dummy UUID */
+		var requestId = new UUID(0L, 0L); /* dummy UUID */
 		try {
 			// call handler methods
 			if (!httpRequest.getMethod().equals("POST")) {
@@ -413,7 +409,7 @@ private void handleJsonRpc(User user, Request baseRequest, HttpServletRequest ht
 			}
 
 			// parse json and add "jsonrpc" and "id" properties if missing
-			JsonObject json = RestHandler.parseJson(baseRequest);
+			var json = RestHandler.parseJson(baseRequest);
 			if (this.parent.isDebugModeEnabled()) {
 				this.parent.logInfo(this.log,
 						"REST/JsonRpc call by User [" + user.getName() + "]: " + StringUtils.toShortString(json, 100));
@@ -426,9 +422,9 @@ private void handleJsonRpc(User user, Request baseRequest, HttpServletRequest ht
 				json.addProperty("id", UUID.randomUUID().toString());
 			}
 			if (json.has("params")) {
-				JsonObject params = JsonUtils.getAsJsonObject(json, "params");
+				var params = JsonUtils.getAsJsonObject(json, "params");
 				if (params.has("payload")) {
-					JsonObject payload = JsonUtils.getAsJsonObject(params, "payload");
+					var payload = JsonUtils.getAsJsonObject(params, "payload");
 					if (!payload.has("jsonrpc")) {
 						payload.addProperty("jsonrpc", "2.0");
 					}
@@ -441,15 +437,15 @@ private void handleJsonRpc(User user, Request baseRequest, HttpServletRequest ht
 			}
 
 			// parse JSON-RPC Request
-			JsonrpcMessage message = JsonrpcMessage.from(json);
+			var message = JsonrpcMessage.from(json);
 			if (!(message instanceof JsonrpcRequest)) {
 				throw new OpenemsException("Only JSON-RPC Request is supported here.");
 			}
-			JsonrpcRequest request = (JsonrpcRequest) message;
+			var request = (JsonrpcRequest) message;
 			requestId = request.getId();
 
 			// handle the request
-			CompletableFuture<JsonrpcResponseSuccess> responseFuture = this.handleJsonRpcRequest(user, request);
+			var responseFuture = this.handleJsonRpcRequest(user, request);
 
 			// wait for response
 			JsonrpcResponseSuccess response;
@@ -472,7 +468,7 @@ private void handleJsonRpc(User user, Request baseRequest, HttpServletRequest ht
 
 	/**
 	 * Handles an JSON-RPC Request.
-	 * 
+	 *
 	 * @param user    the {@link User}
 	 * @param request the {@link JsonrpcRequest}
 	 * @return the JSON-RPC Success Response Future
@@ -511,7 +507,7 @@ private CompletableFuture<JsonrpcResponseSuccess> handleJsonRpcRequest(User user
 
 	/**
 	 * Handles a QueryHistoricDataRequest.
-	 * 
+	 *
 	 * @param user    the {@link User}
 	 * @param request the {@link QueryHistoricTimeseriesDataRequest}
 	 * @return the Future JSON-RPC Response
@@ -519,7 +515,7 @@ private CompletableFuture<JsonrpcResponseSuccess> handleJsonRpcRequest(User user
 	 */
 	private CompletableFuture<JsonrpcResponseSuccess> handleQueryHistoricDataRequest(User user,
 			QueryHistoricTimeseriesDataRequest request) throws OpenemsNamedException {
-		SortedMap<ZonedDateTime, SortedMap<ChannelAddress, JsonElement>> data = this.parent.getTimedata()
+		var data = this.parent.getTimedata()
 				.queryHistoricData(//
 						null, /* ignore Edge-ID */
 						request);
@@ -530,7 +526,7 @@ private CompletableFuture<JsonrpcResponseSuccess> handleQueryHistoricDataRequest
 
 	/**
 	 * Handles a QueryHistoricEnergyRequest.
-	 * 
+	 *
 	 * @param user    the {@link User}
 	 * @param request the {@link QueryHistoricTimeseriesEnergyRequest}
 	 * @return the Future JSPN-RPC Response
@@ -557,7 +553,7 @@ private CompletableFuture<JsonrpcResponseSuccess> handleQueryHistoricEnergyReque
 	private CompletableFuture<JsonrpcResponseSuccess> handleGetEdgeConfigRequest(User user,
 			GetEdgeConfigRequest getEdgeConfigRequest) throws OpenemsNamedException {
 		// wrap original request inside ComponentJsonApiRequest
-		ComponentJsonApiRequest request = new ComponentJsonApiRequest(ComponentManager.SINGLETON_COMPONENT_ID,
+		var request = new ComponentJsonApiRequest(ComponentManager.SINGLETON_COMPONENT_ID,
 				getEdgeConfigRequest);
 
 		return this.handleComponentJsonApiRequest(user, request);
@@ -565,7 +561,7 @@ private CompletableFuture<JsonrpcResponseSuccess> handleGetEdgeConfigRequest(Use
 
 	/**
 	 * Handles a CreateComponentConfigRequest.
-	 * 
+	 *
 	 * @param user                         the {@link User}
 	 * @param createComponentConfigRequest the {@link CreateComponentConfigRequest}
 	 * @return the Future JSON-RPC Response
@@ -574,7 +570,7 @@ private CompletableFuture<JsonrpcResponseSuccess> handleGetEdgeConfigRequest(Use
 	private CompletableFuture<JsonrpcResponseSuccess> handleCreateComponentConfigRequest(User user,
 			CreateComponentConfigRequest createComponentConfigRequest) throws OpenemsNamedException {
 		// wrap original request inside ComponentJsonApiRequest
-		ComponentJsonApiRequest request = new ComponentJsonApiRequest(ComponentManager.SINGLETON_COMPONENT_ID,
+		var request = new ComponentJsonApiRequest(ComponentManager.SINGLETON_COMPONENT_ID,
 				createComponentConfigRequest);
 
 		return this.handleComponentJsonApiRequest(user, request);
@@ -582,7 +578,7 @@ private CompletableFuture<JsonrpcResponseSuccess> handleCreateComponentConfigReq
 
 	/**
 	 * Handles a UpdateComponentConfigRequest.
-	 * 
+	 *
 	 * @param user                         the {@link User}
 	 * @param updateComponentConfigRequest the {@link UpdateComponentConfigRequest}
 	 * @return the Future JSON-RPC Response
@@ -591,7 +587,7 @@ private CompletableFuture<JsonrpcResponseSuccess> handleCreateComponentConfigReq
 	private CompletableFuture<JsonrpcResponseSuccess> handleUpdateComponentConfigRequest(User user,
 			UpdateComponentConfigRequest updateComponentConfigRequest) throws OpenemsNamedException {
 		// wrap original request inside ComponentJsonApiRequest
-		ComponentJsonApiRequest request = new ComponentJsonApiRequest(ComponentManager.SINGLETON_COMPONENT_ID,
+		var request = new ComponentJsonApiRequest(ComponentManager.SINGLETON_COMPONENT_ID,
 				updateComponentConfigRequest);
 
 		return this.handleComponentJsonApiRequest(user, request);
@@ -599,7 +595,7 @@ private CompletableFuture<JsonrpcResponseSuccess> handleUpdateComponentConfigReq
 
 	/**
 	 * Handles a DeleteComponentConfigRequest.
-	 * 
+	 *
 	 * @param user                         the User
 	 * @param deleteComponentConfigRequest the DeleteComponentConfigRequest
 	 * @return the Future JSON-RPC Response
@@ -608,7 +604,7 @@ private CompletableFuture<JsonrpcResponseSuccess> handleUpdateComponentConfigReq
 	private CompletableFuture<JsonrpcResponseSuccess> handleDeleteComponentConfigRequest(User user,
 			DeleteComponentConfigRequest deleteComponentConfigRequest) throws OpenemsNamedException {
 		// wrap original request inside ComponentJsonApiRequest
-		ComponentJsonApiRequest request = new ComponentJsonApiRequest(ComponentManager.SINGLETON_COMPONENT_ID,
+		var request = new ComponentJsonApiRequest(ComponentManager.SINGLETON_COMPONENT_ID,
 				deleteComponentConfigRequest);
 
 		return this.handleComponentJsonApiRequest(user, request);
@@ -616,7 +612,7 @@ private CompletableFuture<JsonrpcResponseSuccess> handleDeleteComponentConfigReq
 
 	/**
 	 * Handles a ComponentJsonApiRequest.
-	 * 
+	 *
 	 * @param user    the User
 	 * @param request the ComponentJsonApiRequest
 	 * @return the JSON-RPC Success Response Future
@@ -625,8 +621,8 @@ private CompletableFuture<JsonrpcResponseSuccess> handleDeleteComponentConfigReq
 	private CompletableFuture<JsonrpcResponseSuccess> handleComponentJsonApiRequest(User user,
 			ComponentJsonApiRequest request) throws OpenemsNamedException {
 		// get Component
-		String componentId = request.getComponentId();
-		OpenemsComponent component = this.parent.getComponentManager().getComponent(componentId);
+		var componentId = request.getComponentId();
+		var component = this.parent.getComponentManager().getComponent(componentId);
 
 		if (component == null) {
 			throw new OpenemsException("Unable to find Component [" + componentId + "]");
@@ -637,7 +633,7 @@ private CompletableFuture<JsonrpcResponseSuccess> handleComponentJsonApiRequest(
 		}
 
 		// call JsonApi
-		JsonApi jsonApi = (JsonApi) component;
+		var jsonApi = (JsonApi) component;
 		CompletableFuture<? extends JsonrpcResponseSuccess> responseFuture = jsonApi.handleJsonrpcRequest(user,
 				request.getPayload());
 
@@ -647,7 +643,7 @@ private CompletableFuture<JsonrpcResponseSuccess> handleComponentJsonApiRequest(
 		}
 
 		// Wrap reply in EdgeRpcResponse
-		CompletableFuture<JsonrpcResponseSuccess> edgeRpcResponse = new CompletableFuture<>();
+		var edgeRpcResponse = new CompletableFuture<JsonrpcResponseSuccess>();
 		responseFuture.whenComplete((r, ex) -> {
 			if (ex != null) {
 				edgeRpcResponse.completeExceptionally(ex);
diff --git a/io.openems.edge.controller.api.rest/src/io/openems/edge/controller/api/rest/readonly/Config.java b/io.openems.edge.controller.api.rest/src/io/openems/edge/controller/api/rest/readonly/Config.java
index d70ee18ce40..54b1ded17e8 100644
--- a/io.openems.edge.controller.api.rest/src/io/openems/edge/controller/api/rest/readonly/Config.java
+++ b/io.openems.edge.controller.api.rest/src/io/openems/edge/controller/api/rest/readonly/Config.java
@@ -21,7 +21,7 @@
 
 	@AttributeDefinition(name = "Port", description = "Port on which the webserver should listen.")
 	int port() default 8084;
-	
+
 	@AttributeDefinition(name = "Connection limit", description = "Maximum number of connections")
 	int connectionlimit() default 5;
 
diff --git a/io.openems.edge.controller.api.rest/src/io/openems/edge/controller/api/rest/readonly/RestApiReadOnlyImpl.java b/io.openems.edge.controller.api.rest/src/io/openems/edge/controller/api/rest/readonly/RestApiReadOnlyImpl.java
index b9bf919d4d0..b3687dac94a 100644
--- a/io.openems.edge.controller.api.rest/src/io/openems/edge/controller/api/rest/readonly/RestApiReadOnlyImpl.java
+++ b/io.openems.edge.controller.api.rest/src/io/openems/edge/controller/api/rest/readonly/RestApiReadOnlyImpl.java
@@ -53,11 +53,13 @@ void activate(ComponentContext context, Config config) throws OpenemsException {
 				config.port(), config.connectionlimit());
 	}
 
+	@Override
 	@Deactivate
 	protected void deactivate() {
 		super.deactivate();
 	}
 
+	@Override
 	protected Timedata getTimedata() throws OpenemsException {
 		if (this.timedata != null) {
 			return this.timedata;
diff --git a/io.openems.edge.controller.api.rest/src/io/openems/edge/controller/api/rest/readwrite/Config.java b/io.openems.edge.controller.api.rest/src/io/openems/edge/controller/api/rest/readwrite/Config.java
index ddec9ebf5c3..7f95a71c64d 100644
--- a/io.openems.edge.controller.api.rest/src/io/openems/edge/controller/api/rest/readwrite/Config.java
+++ b/io.openems.edge.controller.api.rest/src/io/openems/edge/controller/api/rest/readwrite/Config.java
@@ -21,7 +21,7 @@
 
 	@AttributeDefinition(name = "Port", description = "Port on which the webserver should listen.")
 	int port() default 8084;
-	
+
 	@AttributeDefinition(name = "Connection limit", description = "Maximum number of connections")
 	int connectionlimit() default 5;
 
diff --git a/io.openems.edge.controller.api.rest/src/io/openems/edge/controller/api/rest/readwrite/RestApiReadWriteImpl.java b/io.openems.edge.controller.api.rest/src/io/openems/edge/controller/api/rest/readwrite/RestApiReadWriteImpl.java
index 08b9d19260e..0888fc5b41c 100644
--- a/io.openems.edge.controller.api.rest/src/io/openems/edge/controller/api/rest/readwrite/RestApiReadWriteImpl.java
+++ b/io.openems.edge.controller.api.rest/src/io/openems/edge/controller/api/rest/readwrite/RestApiReadWriteImpl.java
@@ -54,6 +54,7 @@ void activate(ComponentContext context, Config config) throws OpenemsException {
 				config.port(), config.connectionlimit());
 	}
 
+	@Override
 	@Deactivate
 	protected void deactivate() {
 		super.deactivate();
diff --git a/io.openems.edge.controller.api.rest/test/io/openems/edge/controller/api/rest/readwrite/RestApiReadWriteImplTest.java b/io.openems.edge.controller.api.rest/test/io/openems/edge/controller/api/rest/readwrite/RestApiReadWriteImplTest.java
index b5bb0f9ef84..9584a1a9c4a 100644
--- a/io.openems.edge.controller.api.rest/test/io/openems/edge/controller/api/rest/readwrite/RestApiReadWriteImplTest.java
+++ b/io.openems.edge.controller.api.rest/test/io/openems/edge/controller/api/rest/readwrite/RestApiReadWriteImplTest.java
@@ -6,7 +6,6 @@
 import java.io.BufferedReader;
 import java.io.IOException;
 import java.io.InputStreamReader;
-import java.io.OutputStream;
 import java.net.HttpURLConnection;
 import java.net.URL;
 import java.util.Base64;
@@ -51,10 +50,10 @@ public class RestApiReadWriteImplTest {
 
 	@Test
 	public void test() throws OpenemsException, Exception {
-		final int port = TestUtils.findRandomOpenPortOnAllLocalInterfaces();
+		final var port = TestUtils.findRandomOpenPortOnAllLocalInterfaces();
 
-		RestApiReadWriteImpl sut = new RestApiReadWriteImpl();
-		ControllerTest test = new ControllerTest(sut) //
+		var sut = new RestApiReadWriteImpl();
+		var test = new ControllerTest(sut) //
 				.addReference("componentManager", new DummyComponentManager()) //
 				.addReference("userService", new DummyUserService(//
 						new DummyUser(GUEST, GUEST, Role.GUEST), //
@@ -75,7 +74,7 @@ public void test() throws OpenemsException, Exception {
 		 * /rest/channel/*
 		 */
 		// GET successful as GUEST
-		JsonElement channelGet = sendGetRequest(port, GUEST, "/rest/channel/dummy0/ReadChannel");
+		var channelGet = sendGetRequest(port, GUEST, "/rest/channel/dummy0/ReadChannel");
 		assertEquals(JsonUtils.buildJsonObject() //
 				.addProperty("address", "dummy0/ReadChannel") //
 				.addProperty("type", "INTEGER") //
@@ -86,7 +85,7 @@ public void test() throws OpenemsException, Exception {
 				.build(), channelGet);
 
 		// POST successful as OWNER
-		JsonElement channelPost = sendPostRequest(port, OWNER, "/rest/channel/dummy0/WriteChannel",
+		var channelPost = sendPostRequest(port, OWNER, "/rest/channel/dummy0/WriteChannel",
 				JsonUtils.buildJsonObject() //
 						.addProperty("value", 4321) //
 						.build());
@@ -138,8 +137,8 @@ private static JsonElement sendPostRequest(int port, String password, String end
 	private static JsonElement sendRequest(int port, String requestMethod, String password, String endpoint,
 			JsonObject request) throws OpenemsNamedException {
 		try {
-			URL url = new URL("http://127.0.0.1:" + port + endpoint);
-			HttpURLConnection con = (HttpURLConnection) url.openConnection();
+			var url = new URL("http://127.0.0.1:" + port + endpoint);
+			var con = (HttpURLConnection) url.openConnection();
 			con.setRequestProperty("Authorization",
 					"Basic " + new String(Base64.getEncoder().encode(("x:" + password).getBytes())));
 			con.setRequestMethod(requestMethod);
@@ -149,17 +148,17 @@ private static JsonElement sendRequest(int port, String requestMethod, String pa
 			con.setReadTimeout(50000);
 			if (request != null) {
 				con.setDoOutput(true);
-				try (OutputStream os = con.getOutputStream()) {
-					byte[] input = request.toString().getBytes("utf-8");
+				try (var os = con.getOutputStream()) {
+					var input = request.toString().getBytes("utf-8");
 					os.write(input, 0, input.length);
 				}
 			}
 
-			int status = con.getResponseCode();
+			var status = con.getResponseCode();
 			String body;
-			try (BufferedReader in = new BufferedReader(new InputStreamReader(con.getInputStream()))) {
+			try (var in = new BufferedReader(new InputStreamReader(con.getInputStream()))) {
 				// Read HTTP response
-				StringBuilder content = new StringBuilder();
+				var content = new StringBuilder();
 				String line;
 				while ((line = in.readLine()) != null) {
 					content.append(line);
@@ -170,9 +169,8 @@ private static JsonElement sendRequest(int port, String requestMethod, String pa
 			if (status < 300) {
 				// Parse response to JSON
 				return JsonUtils.parse(body);
-			} else {
-				throw new OpenemsException("Error while reading from API. Response code: " + status + ". " + body);
 			}
+			throw new OpenemsException("Error while reading from API. Response code: " + status + ". " + body);
 		} catch (OpenemsNamedException | IOException e) {
 			throw new OpenemsException(
 					"Unable to read from API. " + e.getClass().getSimpleName() + ": " + e.getMessage());

From 88094b3f36b7d344e05578f86b440f2eab3b78b0 Mon Sep 17 00:00:00 2001
From: Stefan Feilmeier <stefan.feilmeier@fenecon.de>
Date: Mon, 7 Mar 2022 22:54:36 +0100
Subject: [PATCH 17/96] Update io.openems.edge.controller.api.websocket

---
 .../controller/api/websocket/OnClose.java     |  5 +-
 .../controller/api/websocket/OnError.java     |  5 +-
 .../controller/api/websocket/OnRequest.java   | 74 +++++++++----------
 .../api/websocket/SystemLogHandler.java       | 11 ++-
 .../edge/controller/api/websocket/Utils.java  |  2 +-
 .../api/websocket/WebsocketApi.java           | 26 +++----
 .../api/websocket/WebsocketServer.java        |  2 +-
 .../edge/controller/api/websocket/WsData.java | 17 ++---
 8 files changed, 63 insertions(+), 79 deletions(-)

diff --git a/io.openems.edge.controller.api.websocket/src/io/openems/edge/controller/api/websocket/OnClose.java b/io.openems.edge.controller.api.websocket/src/io/openems/edge/controller/api/websocket/OnClose.java
index 4f731bb2864..aa58fb7b432 100644
--- a/io.openems.edge.controller.api.websocket/src/io/openems/edge/controller/api/websocket/OnClose.java
+++ b/io.openems.edge.controller.api.websocket/src/io/openems/edge/controller/api/websocket/OnClose.java
@@ -1,13 +1,10 @@
 package io.openems.edge.controller.api.websocket;
 
-import java.util.Optional;
-
 import org.java_websocket.WebSocket;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
 import io.openems.common.exceptions.OpenemsException;
-import io.openems.edge.common.user.User;
 
 public class OnClose implements io.openems.common.websocket.OnClose {
 
@@ -22,7 +19,7 @@ public OnClose(WebsocketApi parent) {
 	public void run(WebSocket ws, int code, String reason, boolean remote) throws OpenemsException {
 		// get websocket attachment
 		WsData wsData = ws.getAttachment();
-		Optional<User> user = wsData.getUser();
+		var user = wsData.getUser();
 
 		// print log message
 		String logMessage;
diff --git a/io.openems.edge.controller.api.websocket/src/io/openems/edge/controller/api/websocket/OnError.java b/io.openems.edge.controller.api.websocket/src/io/openems/edge/controller/api/websocket/OnError.java
index 47d0c4581f9..d7d26cebeee 100644
--- a/io.openems.edge.controller.api.websocket/src/io/openems/edge/controller/api/websocket/OnError.java
+++ b/io.openems.edge.controller.api.websocket/src/io/openems/edge/controller/api/websocket/OnError.java
@@ -1,13 +1,10 @@
 package io.openems.edge.controller.api.websocket;
 
-import java.util.Optional;
-
 import org.java_websocket.WebSocket;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
 import io.openems.common.exceptions.OpenemsException;
-import io.openems.edge.common.user.User;
 
 public class OnError implements io.openems.common.websocket.OnError {
 
@@ -22,7 +19,7 @@ public OnError(WebsocketApi parent) {
 	public void run(WebSocket ws, Exception ex) throws OpenemsException {
 		// get websocket attachment
 		WsData wsData = ws.getAttachment();
-		Optional<User> user = wsData.getUser();
+		var user = wsData.getUser();
 
 		String logMessage;
 		if (user.isPresent()) {
diff --git a/io.openems.edge.controller.api.websocket/src/io/openems/edge/controller/api/websocket/OnRequest.java b/io.openems.edge.controller.api.websocket/src/io/openems/edge/controller/api/websocket/OnRequest.java
index f2092aca3b4..b1608cf6e58 100644
--- a/io.openems.edge.controller.api.websocket/src/io/openems/edge/controller/api/websocket/OnRequest.java
+++ b/io.openems.edge.controller.api.websocket/src/io/openems/edge/controller/api/websocket/OnRequest.java
@@ -1,9 +1,7 @@
 package io.openems.edge.controller.api.websocket;
 
-import java.time.ZonedDateTime;
 import java.util.Map;
 import java.util.Optional;
-import java.util.SortedMap;
 import java.util.UUID;
 import java.util.concurrent.CompletableFuture;
 
@@ -42,7 +40,6 @@
 import io.openems.common.types.ChannelAddress;
 import io.openems.common.websocket.SubscribedChannelsWorker;
 import io.openems.edge.common.component.ComponentManager;
-import io.openems.edge.common.component.OpenemsComponent;
 import io.openems.edge.common.jsonapi.JsonApi;
 import io.openems.edge.common.user.User;
 
@@ -71,7 +68,7 @@ public CompletableFuture<? extends JsonrpcResponseSuccess> run(WebSocket ws, Jso
 		}
 
 		// is user authenticated?
-		User user = wsData.assertUserIsAuthenticated(request.getMethod());
+		var user = wsData.assertUserIsAuthenticated(request.getMethod());
 		user.assertRoleIsAtLeast(request.getMethod(), Role.GUEST);
 
 		switch (request.getMethod()) {
@@ -89,7 +86,7 @@ public CompletableFuture<? extends JsonrpcResponseSuccess> run(WebSocket ws, Jso
 
 	/**
 	 * Handles a {@link LogoutRequest}.
-	 * 
+	 *
 	 * @param wsData  the WebSocket attachment
 	 * @param user    the authenticated {@link User}
 	 * @param request the {@link LogoutRequest}
@@ -105,7 +102,7 @@ private CompletableFuture<JsonrpcResponseSuccess> handleLogoutRequest(WsData wsD
 
 	/**
 	 * Handles a {@link EdgeRpcRequest}.
-	 * 
+	 *
 	 * @param wsData         the WebSocket attachment
 	 * @param edgeRpcRequest the EdgeRpcRequest
 	 * @param user           the {@link User}
@@ -114,7 +111,7 @@ private CompletableFuture<JsonrpcResponseSuccess> handleLogoutRequest(WsData wsD
 	 */
 	private CompletableFuture<EdgeRpcResponse> handleEdgeRpcRequest(WsData wsData, User user,
 			EdgeRpcRequest edgeRpcRequest) throws OpenemsNamedException {
-		JsonrpcRequest request = edgeRpcRequest.getPayload();
+		var request = edgeRpcRequest.getPayload();
 
 		CompletableFuture<JsonrpcResponseSuccess> resultFuture;
 		switch (request.getMethod()) {
@@ -171,7 +168,7 @@ private CompletableFuture<EdgeRpcResponse> handleEdgeRpcRequest(WsData wsData, U
 		}
 
 		// Wrap reply in EdgeRpcResponse
-		CompletableFuture<EdgeRpcResponse> result = new CompletableFuture<EdgeRpcResponse>();
+		var result = new CompletableFuture<EdgeRpcResponse>();
 		resultFuture.whenComplete((r, ex) -> {
 			if (ex != null) {
 				result.completeExceptionally(ex);
@@ -187,7 +184,7 @@ private CompletableFuture<EdgeRpcResponse> handleEdgeRpcRequest(WsData wsData, U
 
 	/**
 	 * Handles a {@link AuthenticateWithTokenRequest}.
-	 * 
+	 *
 	 * @param wsData  the WebSocket attachment
 	 * @param request the {@link AuthenticateWithTokenRequest}
 	 * @return the JSON-RPC Success Response Future
@@ -195,14 +192,14 @@ private CompletableFuture<EdgeRpcResponse> handleEdgeRpcRequest(WsData wsData, U
 	 */
 	private CompletableFuture<JsonrpcResponseSuccess> handleAuthenticateWithTokenRequest(WsData wsData,
 			AuthenticateWithTokenRequest request) throws OpenemsNamedException {
-		String token = request.getToken();
+		var token = request.getToken();
 		return this.handleAuthentication(wsData, request.getId(),
 				Optional.ofNullable(this.parent.sessionTokens.get(token)), token);
 	}
 
 	/**
 	 * Handles a {@link AuthenticateWithPasswordRequest}.
-	 * 
+	 *
 	 * @param wsData  the WebSocket attachment
 	 * @param request the {@link AuthenticateWithPasswordRequest}
 	 * @return the JSON-RPC Success Response Future
@@ -217,7 +214,7 @@ private CompletableFuture<JsonrpcResponseSuccess> handleAuthenticateWithPassword
 	/**
 	 * Common handler for {@link AuthenticateWithTokenRequest} and
 	 * {@link AuthenticateWithPasswordRequest}.
-	 * 
+	 *
 	 * @param wsData    the WebSocket attachment
 	 * @param requestId the ID of the original {@link JsonrpcRequest}
 	 * @param userOpt   the optional {@link User}
@@ -228,7 +225,7 @@ private CompletableFuture<JsonrpcResponseSuccess> handleAuthenticateWithPassword
 	private CompletableFuture<JsonrpcResponseSuccess> handleAuthentication(WsData wsData, UUID requestId,
 			Optional<User> userOpt, String token) throws OpenemsNamedException {
 		if (userOpt.isPresent()) {
-			User user = userOpt.get();
+			var user = userOpt.get();
 			wsData.setSessionToken(token);
 			wsData.setUser(user);
 			this.parent.sessionTokens.put(token, user);
@@ -236,15 +233,14 @@ private CompletableFuture<JsonrpcResponseSuccess> handleAuthentication(WsData ws
 
 			return CompletableFuture.completedFuture(
 					new AuthenticateResponse(requestId, token, user, Utils.getEdgeMetadata(user.getRole())));
-		} else {
-			wsData.unsetUser();
-			throw OpenemsError.COMMON_AUTHENTICATION_FAILED.exception();
 		}
+		wsData.unsetUser();
+		throw OpenemsError.COMMON_AUTHENTICATION_FAILED.exception();
 	}
 
 	/**
 	 * Handles a {@link SubscribeChannelsRequest}.
-	 * 
+	 *
 	 * @param wsData  the WebSocket attachment
 	 * @param user    the {@link User}
 	 * @param request the {@link SubscribeChannelsRequest}
@@ -263,7 +259,7 @@ private CompletableFuture<JsonrpcResponseSuccess> handleSubscribeChannelsRequest
 
 	/**
 	 * Handles a {@link QueryHistoricTimeseriesDataRequest}.
-	 * 
+	 *
 	 * @param user    the {@link User}
 	 * @param request the {@link QueryHistoricTimeseriesDataRequest}
 	 * @return the Future JSON-RPC Response
@@ -271,10 +267,9 @@ private CompletableFuture<JsonrpcResponseSuccess> handleSubscribeChannelsRequest
 	 */
 	private CompletableFuture<JsonrpcResponseSuccess> handleQueryHistoricDataRequest(User user,
 			QueryHistoricTimeseriesDataRequest request) throws OpenemsNamedException {
-		SortedMap<ZonedDateTime, SortedMap<ChannelAddress, JsonElement>> data = this.parent.getTimedata()
-				.queryHistoricData(//
-						null, /* ignore Edge-ID */
-						request);
+		var data = this.parent.getTimedata().queryHistoricData(//
+				null, /* ignore Edge-ID */
+				request);
 
 		// JSON-RPC response
 		return CompletableFuture.completedFuture(new QueryHistoricTimeseriesDataResponse(request.getId(), data));
@@ -282,7 +277,7 @@ private CompletableFuture<JsonrpcResponseSuccess> handleQueryHistoricDataRequest
 
 	/**
 	 * Handles a QueryHistoricEnergyRequest.
-	 * 
+	 *
 	 * @param request the QueryHistoricEnergyRequest
 	 * @return the Future JSPN-RPC Response
 	 * @throws OpenemsNamedException on error
@@ -299,7 +294,7 @@ private CompletableFuture<JsonrpcResponseSuccess> handleQueryHistoricEnergyReque
 
 	/**
 	 * Handles a {@link QueryHistoricTimeseriesExportXlxsRequest}.
-	 * 
+	 *
 	 * @param user    the {@link User}
 	 * @param request the {@link QueryHistoricTimeseriesExportXlxsRequest}
 	 * @return the Future JSON-RPC Response
@@ -313,7 +308,7 @@ private CompletableFuture<JsonrpcResponseSuccess> handleQueryHistoricTimeseriesE
 
 	/**
 	 * Handles a {@link CreateComponentConfigRequest}.
-	 * 
+	 *
 	 * @param user                         the {@link User}
 	 * @param createComponentConfigRequest the {@link CreateComponentConfigRequest}
 	 * @return the Future JSON-RPC Response
@@ -322,7 +317,7 @@ private CompletableFuture<JsonrpcResponseSuccess> handleQueryHistoricTimeseriesE
 	private CompletableFuture<JsonrpcResponseSuccess> handleCreateComponentConfigRequest(User user,
 			CreateComponentConfigRequest createComponentConfigRequest) throws OpenemsNamedException {
 		// wrap original request inside ComponentJsonApiRequest
-		ComponentJsonApiRequest request = new ComponentJsonApiRequest(ComponentManager.SINGLETON_COMPONENT_ID,
+		var request = new ComponentJsonApiRequest(ComponentManager.SINGLETON_COMPONENT_ID,
 				createComponentConfigRequest);
 
 		return this.handleComponentJsonApiRequest(user, request);
@@ -330,7 +325,7 @@ private CompletableFuture<JsonrpcResponseSuccess> handleCreateComponentConfigReq
 
 	/**
 	 * Handles a {@link UpdateComponentConfigRequest}.
-	 * 
+	 *
 	 * @param user                         the {@link User}
 	 * @param updateComponentConfigRequest the {@link UpdateComponentConfigRequest}
 	 * @return the Future JSON-RPC Response
@@ -339,7 +334,7 @@ private CompletableFuture<JsonrpcResponseSuccess> handleCreateComponentConfigReq
 	private CompletableFuture<JsonrpcResponseSuccess> handleUpdateComponentConfigRequest(User user,
 			UpdateComponentConfigRequest updateComponentConfigRequest) throws OpenemsNamedException {
 		// wrap original request inside ComponentJsonApiRequest
-		ComponentJsonApiRequest request = new ComponentJsonApiRequest(ComponentManager.SINGLETON_COMPONENT_ID,
+		var request = new ComponentJsonApiRequest(ComponentManager.SINGLETON_COMPONENT_ID,
 				updateComponentConfigRequest);
 
 		return this.handleComponentJsonApiRequest(user, request);
@@ -347,7 +342,7 @@ private CompletableFuture<JsonrpcResponseSuccess> handleUpdateComponentConfigReq
 
 	/**
 	 * Handles a {@link DeleteComponentConfigRequest}.
-	 * 
+	 *
 	 * @param user                         the {@link User}
 	 * @param deleteComponentConfigRequest the {@link DeleteComponentConfigRequest}
 	 * @return the Future JSON-RPC Response
@@ -356,7 +351,7 @@ private CompletableFuture<JsonrpcResponseSuccess> handleUpdateComponentConfigReq
 	private CompletableFuture<JsonrpcResponseSuccess> handleDeleteComponentConfigRequest(User user,
 			DeleteComponentConfigRequest deleteComponentConfigRequest) throws OpenemsNamedException {
 		// wrap original request inside ComponentJsonApiRequest
-		ComponentJsonApiRequest request = new ComponentJsonApiRequest(ComponentManager.SINGLETON_COMPONENT_ID,
+		var request = new ComponentJsonApiRequest(ComponentManager.SINGLETON_COMPONENT_ID,
 				deleteComponentConfigRequest);
 
 		return this.handleComponentJsonApiRequest(user, request);
@@ -364,7 +359,7 @@ private CompletableFuture<JsonrpcResponseSuccess> handleDeleteComponentConfigReq
 
 	/**
 	 * Handles a {@link GetEdgeConfigRequest}.
-	 * 
+	 *
 	 * @param user                 the {@link User}
 	 * @param getEdgeConfigRequest the {@link GetEdgeConfigRequest}
 	 * @return the Future JSON-RPC Response
@@ -373,15 +368,14 @@ private CompletableFuture<JsonrpcResponseSuccess> handleDeleteComponentConfigReq
 	private CompletableFuture<JsonrpcResponseSuccess> handleGetEdgeConfigRequest(User user,
 			GetEdgeConfigRequest getEdgeConfigRequest) throws OpenemsNamedException {
 		// wrap original request inside ComponentJsonApiRequest
-		ComponentJsonApiRequest request = new ComponentJsonApiRequest(ComponentManager.SINGLETON_COMPONENT_ID,
-				getEdgeConfigRequest);
+		var request = new ComponentJsonApiRequest(ComponentManager.SINGLETON_COMPONENT_ID, getEdgeConfigRequest);
 
 		return this.handleComponentJsonApiRequest(user, request);
 	}
 
 	/**
 	 * Handles a {@link SetChannelValueRequest}.
-	 * 
+	 *
 	 * @param user    the User
 	 * @param request the {@link SetChannelValueRequest}
 	 * @return the Future JSON-RPC Response
@@ -396,7 +390,7 @@ private CompletableFuture<JsonrpcResponseSuccess> handleSetChannelValueRequest(U
 
 	/**
 	 * Handles a {@link ComponentJsonApiRequest}.
-	 * 
+	 *
 	 * @param user    the User
 	 * @param request the {@link ComponentJsonApiRequest}
 	 * @return the Future JSON-RPC Response
@@ -405,8 +399,8 @@ private CompletableFuture<JsonrpcResponseSuccess> handleSetChannelValueRequest(U
 	private CompletableFuture<JsonrpcResponseSuccess> handleComponentJsonApiRequest(User user,
 			ComponentJsonApiRequest request) throws OpenemsNamedException {
 		// get Component
-		String componentId = request.getComponentId();
-		OpenemsComponent component = this.parent.componentManager.getComponent(componentId);
+		var componentId = request.getComponentId();
+		var component = this.parent.componentManager.getComponent(componentId);
 
 		if (component == null) {
 			throw new OpenemsException("Unable to find Component [" + componentId + "]");
@@ -417,7 +411,7 @@ private CompletableFuture<JsonrpcResponseSuccess> handleComponentJsonApiRequest(
 		}
 
 		// call JsonApi
-		JsonApi jsonApi = (JsonApi) component;
+		var jsonApi = (JsonApi) component;
 		CompletableFuture<? extends JsonrpcResponseSuccess> responseFuture = jsonApi.handleJsonrpcRequest(user,
 				request.getPayload());
 
@@ -427,7 +421,7 @@ private CompletableFuture<JsonrpcResponseSuccess> handleComponentJsonApiRequest(
 		}
 
 		// Wrap reply in new JsonrpcResponseSuccess
-		CompletableFuture<JsonrpcResponseSuccess> jsonrpcResponse = new CompletableFuture<>();
+		var jsonrpcResponse = new CompletableFuture<JsonrpcResponseSuccess>();
 		responseFuture.whenComplete((r, ex) -> {
 			if (ex != null) {
 				jsonrpcResponse.completeExceptionally(ex);
@@ -453,7 +447,7 @@ private CompletableFuture<JsonrpcResponseSuccess> handleComponentJsonApiRequest(
 	 */
 	private CompletableFuture<JsonrpcResponseSuccess> handleSubscribeSystemLogRequest(WsData wsData, User user,
 			SubscribeSystemLogRequest request) throws OpenemsNamedException {
-		String token = wsData.getSessionToken();
+		var token = wsData.getSessionToken();
 		if (token == null) {
 			throw OpenemsError.BACKEND_UI_TOKEN_MISSING.exception();
 		}
diff --git a/io.openems.edge.controller.api.websocket/src/io/openems/edge/controller/api/websocket/SystemLogHandler.java b/io.openems.edge.controller.api.websocket/src/io/openems/edge/controller/api/websocket/SystemLogHandler.java
index c78f701246a..f5199ba3195 100644
--- a/io.openems.edge.controller.api.websocket/src/io/openems/edge/controller/api/websocket/SystemLogHandler.java
+++ b/io.openems.edge.controller.api.websocket/src/io/openems/edge/controller/api/websocket/SystemLogHandler.java
@@ -1,7 +1,6 @@
 package io.openems.edge.controller.api.websocket;
 
 import java.util.HashSet;
-import java.util.Iterator;
 import java.util.Set;
 import java.util.concurrent.CompletableFuture;
 
@@ -28,7 +27,7 @@ public SystemLogHandler(WebsocketApi parent) {
 
 	/**
 	 * Handles a {@link SubscribeSystemLogRequest}.
-	 * 
+	 *
 	 * @param token   the UI session token
 	 * @param request the {@link SubscribeSystemLogRequest}
 	 * @return a reply
@@ -55,7 +54,7 @@ public CompletableFuture<JsonrpcResponseSuccess> handleSubscribeSystemLogRequest
 	/**
 	 * Handles a PaxLoggingEvent and sends a SystemLogNotification to all subscribed
 	 * UI sessions.
-	 * 
+	 *
 	 * @param event the event
 	 */
 	public void handlePaxLoggingEvent(PaxLoggingEvent event) {
@@ -63,10 +62,10 @@ public void handlePaxLoggingEvent(PaxLoggingEvent event) {
 			if (this.subscriptions.isEmpty()) {
 				return;
 			}
-			EdgeRpcNotification notification = new EdgeRpcNotification(WebsocketApi.EDGE_ID,
+			var notification = new EdgeRpcNotification(WebsocketApi.EDGE_ID,
 					SystemLogNotification.fromPaxLoggingEvent(event));
-			for (Iterator<String> iter = this.subscriptions.iterator(); iter.hasNext();) {
-				String token = iter.next();
+			for (var iter = this.subscriptions.iterator(); iter.hasNext();) {
+				var token = iter.next();
 				try {
 					this.parent.getWsDataForTokenOrError(token).send(notification);
 				} catch (OpenemsNamedException e) {
diff --git a/io.openems.edge.controller.api.websocket/src/io/openems/edge/controller/api/websocket/Utils.java b/io.openems.edge.controller.api.websocket/src/io/openems/edge/controller/api/websocket/Utils.java
index fa884556b19..a1c6ad9d84f 100644
--- a/io.openems.edge.controller.api.websocket/src/io/openems/edge/controller/api/websocket/Utils.java
+++ b/io.openems.edge.controller.api.websocket/src/io/openems/edge/controller/api/websocket/Utils.java
@@ -11,7 +11,7 @@
 public class Utils {
 	/**
 	 * Gets the EdgeMetadata for one Edge.
-	 * 
+	 *
 	 * @param role the {@link Role} for this Edge
 	 * @return a list of {@link EdgeMetadata}s
 	 */
diff --git a/io.openems.edge.controller.api.websocket/src/io/openems/edge/controller/api/websocket/WebsocketApi.java b/io.openems.edge.controller.api.websocket/src/io/openems/edge/controller/api/websocket/WebsocketApi.java
index edcbdfcb0d2..9d90bace3da 100644
--- a/io.openems.edge.controller.api.websocket/src/io/openems/edge/controller/api/websocket/WebsocketApi.java
+++ b/io.openems.edge.controller.api.websocket/src/io/openems/edge/controller/api/websocket/WebsocketApi.java
@@ -1,7 +1,5 @@
 package io.openems.edge.controller.api.websocket;
 
-import java.util.Collection;
-import java.util.Iterator;
 import java.util.Map;
 import java.util.concurrent.ConcurrentHashMap;
 import java.util.concurrent.Executors;
@@ -120,7 +118,7 @@ protected void activate(ComponentContext context, Config config) {
 		}
 
 		// initialize Executor
-		String name = "Controller.Api.Websocket" + ":" + this.id();
+		var name = "Controller.Api.Websocket" + ":" + this.id();
 		this.executor = Executors.newScheduledThreadPool(10,
 				new ThreadFactoryBuilder().setNameFormat(name + "-%d").build());
 
@@ -128,16 +126,17 @@ protected void activate(ComponentContext context, Config config) {
 		this.startServer(config.port(), POOL_SIZE, false);
 	}
 
+	@Override
 	@Deactivate
 	protected void deactivate() {
 		super.deactivate();
 		this.stopServer();
-		ThreadPoolUtils.shutdownAndAwaitTermination(executor, 5);
+		ThreadPoolUtils.shutdownAndAwaitTermination(this.executor, 5);
 	}
 
 	/**
 	 * Create and start new server.
-	 * 
+	 *
 	 * @param port      the port
 	 * @param poolSize  number of threads dedicated to handle the tasks
 	 * @param debugMode activate a regular debug log about the state of the tasks
@@ -178,17 +177,16 @@ public void doAppend(PaxLoggingEvent event) {
 
 	/**
 	 * Gets the WebSocket connection attachment for a UI token.
-	 * 
+	 *
 	 * @param token the UI token
 	 * @return the WsData
 	 * @throws OpenemsNamedException if there is no connection with this token
 	 */
 	protected WsData getWsDataForTokenOrError(String token) throws OpenemsNamedException {
-		Collection<WebSocket> connections = this.server.getConnections();
-		for (Iterator<WebSocket> iter = connections.iterator(); iter.hasNext();) {
-			WebSocket websocket = iter.next();
+		var connections = this.server.getConnections();
+		for (WebSocket websocket : connections) {
 			WsData wsData = websocket.getAttachment();
-			String thisToken = wsData.getSessionToken();
+			var thisToken = wsData.getSessionToken();
 			if (thisToken != null && thisToken.equals(token)) {
 				return wsData;
 			}
@@ -199,7 +197,7 @@ protected WsData getWsDataForTokenOrError(String token) throws OpenemsNamedExcep
 	/**
 	 * Handles a SubscribeSystemLogRequest by forwarding it to the
 	 * 'SystemLogHandler'.
-	 * 
+	 *
 	 * @param token   the UI token
 	 * @param request the SubscribeSystemLogRequest
 	 * @throws OpenemsNamedException on error
@@ -220,15 +218,15 @@ public void handleEvent(Event event) {
 				// No Connections? It's not required to build the EdgeConfig.
 				return;
 			}
-			EdgeConfig config = (EdgeConfig) event.getProperty(EdgeEventConstants.TOPIC_CONFIG_UPDATE_KEY);
-			EdgeConfigNotification message = new EdgeConfigNotification(config);
+			var config = (EdgeConfig) event.getProperty(EdgeEventConstants.TOPIC_CONFIG_UPDATE_KEY);
+			var message = new EdgeConfigNotification(config);
 			this.server.broadcastMessage(new EdgeRpcNotification(WebsocketApi.EDGE_ID, message));
 		}
 	}
 
 	/**
 	 * Gets the Timedata service.
-	 * 
+	 *
 	 * @return the service
 	 * @throws OpenemsException if the timeservice is not available
 	 */
diff --git a/io.openems.edge.controller.api.websocket/src/io/openems/edge/controller/api/websocket/WebsocketServer.java b/io.openems.edge.controller.api.websocket/src/io/openems/edge/controller/api/websocket/WebsocketServer.java
index db347bd090b..373b38147a3 100644
--- a/io.openems.edge.controller.api.websocket/src/io/openems/edge/controller/api/websocket/WebsocketServer.java
+++ b/io.openems.edge.controller.api.websocket/src/io/openems/edge/controller/api/websocket/WebsocketServer.java
@@ -40,7 +40,7 @@ protected OnRequest getOnRequest() {
 
 	@Override
 	public OnNotification getOnNotification() {
-		return onNotification;
+		return this.onNotification;
 	}
 
 	@Override
diff --git a/io.openems.edge.controller.api.websocket/src/io/openems/edge/controller/api/websocket/WsData.java b/io.openems.edge.controller.api.websocket/src/io/openems/edge/controller/api/websocket/WsData.java
index f68fff9e661..ca06969c657 100644
--- a/io.openems.edge.controller.api.websocket/src/io/openems/edge/controller/api/websocket/WsData.java
+++ b/io.openems.edge.controller.api.websocket/src/io/openems/edge/controller/api/websocket/WsData.java
@@ -36,7 +36,7 @@ public void logout() {
 
 	/**
 	 * Sets the Session Token.
-	 * 
+	 *
 	 * @param sessionToken the Session Token
 	 */
 	public void setSessionToken(String sessionToken) {
@@ -45,7 +45,7 @@ public void setSessionToken(String sessionToken) {
 
 	/**
 	 * Gets the Session Token.
-	 * 
+	 *
 	 * @return the Session Token
 	 */
 	public String getSessionToken() {
@@ -54,7 +54,7 @@ public String getSessionToken() {
 
 	/**
 	 * Sets the {@link User}.
-	 * 
+	 *
 	 * @param user the {@link User}
 	 */
 	public void setUser(User user) {
@@ -70,7 +70,7 @@ public void unsetUser() {
 
 	/**
 	 * Gets the {@link User}.
-	 * 
+	 *
 	 * @return the {@link Optional} {@link User}
 	 */
 	public Optional<User> getUser() {
@@ -79,7 +79,7 @@ public Optional<User> getUser() {
 
 	/**
 	 * Throws an exception if the User is not authenticated.
-	 * 
+	 *
 	 * @param resource a resource identifier; used for the exception
 	 * @return the current {@link User}
 	 * @throws OpenemsNamedException if the current Role privileges are less
@@ -87,16 +87,15 @@ public Optional<User> getUser() {
 	public User assertUserIsAuthenticated(String resource) throws OpenemsNamedException {
 		if (this.getUser().isPresent()) {
 			return this.getUser().get();
-		} else {
-			throw OpenemsError.COMMON_USER_NOT_AUTHENTICATED
-					.exception("Session [" + this.getSessionToken() + "]. Ignoring [" + resource + "]");
 		}
+		throw OpenemsError.COMMON_USER_NOT_AUTHENTICATED
+				.exception("Session [" + this.getSessionToken() + "]. Ignoring [" + resource + "]");
 	}
 
 	/**
 	 * Gets the {@link SubscribedChannelsWorker} to take care of subscribe to
 	 * CurrentData.
-	 * 
+	 *
 	 * @return the {@link SubscribedChannelsWorker}
 	 */
 	public SubscribedChannelsWorker getSubscribedChannelsWorker() {

From d1942f0d2b300f95f5134fd30bd28437337a7e0d Mon Sep 17 00:00:00 2001
From: Stefan Feilmeier <stefan.feilmeier@fenecon.de>
Date: Mon, 7 Mar 2022 22:55:44 +0100
Subject: [PATCH 18/96] Update
 io.openems.edge.controller.asymmetric.balancingcosphi

---
 .../controller/asymmetric/balancingcosphi/Config.java  |  2 +-
 .../controller/asymmetric/balancingcosphi/CosPhi.java  | 10 +++++-----
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/io.openems.edge.controller.asymmetric.balancingcosphi/src/io/openems/edge/controller/asymmetric/balancingcosphi/Config.java b/io.openems.edge.controller.asymmetric.balancingcosphi/src/io/openems/edge/controller/asymmetric/balancingcosphi/Config.java
index d1b027c7f44..2a7853861c0 100644
--- a/io.openems.edge.controller.asymmetric.balancingcosphi/src/io/openems/edge/controller/asymmetric/balancingcosphi/Config.java
+++ b/io.openems.edge.controller.asymmetric.balancingcosphi/src/io/openems/edge/controller/asymmetric/balancingcosphi/Config.java
@@ -7,7 +7,7 @@
 		name = "Controller Balancing Cos-Phi Asymmetric", //
 		description = "Keeps the Grid meter on a defined Cos-Phi.")
 @interface Config {
-	
+
 	@AttributeDefinition(name = "Component-ID", description = "Unique ID of this Component")
 	String id() default "ctrlBalancingCosPhi0";
 
diff --git a/io.openems.edge.controller.asymmetric.balancingcosphi/src/io/openems/edge/controller/asymmetric/balancingcosphi/CosPhi.java b/io.openems.edge.controller.asymmetric.balancingcosphi/src/io/openems/edge/controller/asymmetric/balancingcosphi/CosPhi.java
index 3095d26f80b..a12851f62b2 100644
--- a/io.openems.edge.controller.asymmetric.balancingcosphi/src/io/openems/edge/controller/asymmetric/balancingcosphi/CosPhi.java
+++ b/io.openems.edge.controller.asymmetric.balancingcosphi/src/io/openems/edge/controller/asymmetric/balancingcosphi/CosPhi.java
@@ -22,7 +22,6 @@
 import io.openems.edge.ess.power.api.Constraint;
 import io.openems.edge.ess.power.api.LinearCoefficient;
 import io.openems.edge.ess.power.api.Phase;
-import io.openems.edge.ess.power.api.Power;
 import io.openems.edge.ess.power.api.PowerException;
 import io.openems.edge.ess.power.api.Pwr;
 import io.openems.edge.ess.power.api.Relationship;
@@ -77,6 +76,7 @@ void activate(ComponentContext context, Config config) {
 		this.cosPhi = Math.abs(config.cosPhi());
 	}
 
+	@Override
 	@Deactivate
 	protected void deactivate() {
 		super.deactivate();
@@ -101,17 +101,17 @@ private void addConstraint(ManagedAsymmetricEss ess, Phase phase, Value<Integer>
 		// Calculate the startpoint of the cosPhi line in relation to the ess zero power
 		long pNull = meterActivePower.getOrError() + essActivePower.getOrError();
 		long qNull = meterReactivePower.getOrError() + essReactivePower.getOrError();
-		double m = Math.tan(Math.acos(Math.abs(cosPhi)));
+		var m = Math.tan(Math.acos(Math.abs(this.cosPhi)));
 		if (this.direction == CosPhiDirection.INDUCTIVE) {
 			m *= -1;
 		}
 		System.out.println("Steigung [" + m + "] pNull [" + pNull + "] qNull [" + qNull + "]");
 
-		double staticValueOfEquation = m * pNull * qNull;
+		var staticValueOfEquation = m * pNull * qNull;
 
 		try {
-			Power power = ess.getPower();
-			Constraint c = new Constraint(ess.id() + phase + ": CosPhi [" + cosPhi + "]", new LinearCoefficient[] { //
+			var power = ess.getPower();
+			var c = new Constraint(ess.id() + phase + ": CosPhi [" + this.cosPhi + "]", new LinearCoefficient[] { //
 					new LinearCoefficient(power.getCoefficient(ess, phase, Pwr.ACTIVE), m), //
 					new LinearCoefficient(power.getCoefficient(ess, phase, Pwr.REACTIVE), 1) //
 			}, Relationship.EQUALS, staticValueOfEquation);

From e25fb8d136037c39368287ec59f5171d0c4c9755 Mon Sep 17 00:00:00 2001
From: Stefan Feilmeier <stefan.feilmeier@fenecon.de>
Date: Mon, 7 Mar 2022 22:56:34 +0100
Subject: [PATCH 19/96] Update
 io.openems.edge.controller.asymmetric.fixactivepower

---
 .../asymmetric/fixactivepower/AsymmetricFixActivePower.java    | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/io.openems.edge.controller.asymmetric.fixactivepower/src/io/openems/edge/controller/asymmetric/fixactivepower/AsymmetricFixActivePower.java b/io.openems.edge.controller.asymmetric.fixactivepower/src/io/openems/edge/controller/asymmetric/fixactivepower/AsymmetricFixActivePower.java
index aa9d8a5a293..c5a6a67d0ec 100644
--- a/io.openems.edge.controller.asymmetric.fixactivepower/src/io/openems/edge/controller/asymmetric/fixactivepower/AsymmetricFixActivePower.java
+++ b/io.openems.edge.controller.asymmetric.fixactivepower/src/io/openems/edge/controller/asymmetric/fixactivepower/AsymmetricFixActivePower.java
@@ -57,6 +57,7 @@ void activate(ComponentContext context, Config config) {
 		this.config = config;
 	}
 
+	@Override
 	@Deactivate
 	protected void deactivate() {
 		super.deactivate();
@@ -73,7 +74,7 @@ public void run() throws OpenemsNamedException {
 
 	private void addConstraint(ManagedAsymmetricEss ess, Phase phase, int power) throws OpenemsException {
 		// adjust value so that it fits into Min/MaxActivePower
-		int calculatedPower = ess.getPower().fitValueIntoMinMaxPower(this.id(), ess, phase, Pwr.ACTIVE, power);
+		var calculatedPower = ess.getPower().fitValueIntoMinMaxPower(this.id(), ess, phase, Pwr.ACTIVE, power);
 
 		/*
 		 * set result

From 889258f2cbf0aad7a0328f58b7507a843c2959b5 Mon Sep 17 00:00:00 2001
From: Stefan Feilmeier <stefan.feilmeier@fenecon.de>
Date: Mon, 7 Mar 2022 22:57:06 +0100
Subject: [PATCH 20/96] Update
 io.openems.edge.controller.asymmetric.fixreactivepower

---
 .../fixreactivepower/AsymmetricFixReactivePower.java           | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/io.openems.edge.controller.asymmetric.fixreactivepower/src/io/openems/edge/controller/asymmetric/fixreactivepower/AsymmetricFixReactivePower.java b/io.openems.edge.controller.asymmetric.fixreactivepower/src/io/openems/edge/controller/asymmetric/fixreactivepower/AsymmetricFixReactivePower.java
index 4f3fa218c8f..3ad29edcc70 100644
--- a/io.openems.edge.controller.asymmetric.fixreactivepower/src/io/openems/edge/controller/asymmetric/fixreactivepower/AsymmetricFixReactivePower.java
+++ b/io.openems.edge.controller.asymmetric.fixreactivepower/src/io/openems/edge/controller/asymmetric/fixreactivepower/AsymmetricFixReactivePower.java
@@ -57,6 +57,7 @@ void activate(ComponentContext context, Config config) {
 		this.config = config;
 	}
 
+	@Override
 	@Deactivate
 	protected void deactivate() {
 		super.deactivate();
@@ -73,7 +74,7 @@ public void run() throws OpenemsNamedException {
 
 	private void addConstraint(ManagedAsymmetricEss ess, Phase phase, int power) throws OpenemsException {
 		// adjust value so that it fits into Min/MaxActivePower
-		int calculatedPower = ess.getPower().fitValueIntoMinMaxPower(this.id(), ess, phase, Pwr.REACTIVE, power);
+		var calculatedPower = ess.getPower().fitValueIntoMinMaxPower(this.id(), ess, phase, Pwr.REACTIVE, power);
 
 		/*
 		 * set result

From 99c95288f83e858a5e083376c6d5f89dd6f7b775 Mon Sep 17 00:00:00 2001
From: Stefan Feilmeier <stefan.feilmeier@fenecon.de>
Date: Mon, 7 Mar 2022 22:58:01 +0100
Subject: [PATCH 21/96] Update
 io.openems.edge.controller.asymmetric.peakshaving

---
 .../asymmetric/peakshaving/PeakShaving.java        | 14 +++++++-------
 .../asymmetric/peakshaving/MyConfig.java           |  2 +-
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/io.openems.edge.controller.asymmetric.peakshaving/src/io/openems/edge/controller/asymmetric/peakshaving/PeakShaving.java b/io.openems.edge.controller.asymmetric.peakshaving/src/io/openems/edge/controller/asymmetric/peakshaving/PeakShaving.java
index 8b5bf95f980..a8a1a831ce9 100644
--- a/io.openems.edge.controller.asymmetric.peakshaving/src/io/openems/edge/controller/asymmetric/peakshaving/PeakShaving.java
+++ b/io.openems.edge.controller.asymmetric.peakshaving/src/io/openems/edge/controller/asymmetric/peakshaving/PeakShaving.java
@@ -15,7 +15,6 @@
 import io.openems.edge.common.component.AbstractOpenemsComponent;
 import io.openems.edge.common.component.ComponentManager;
 import io.openems.edge.common.component.OpenemsComponent;
-import io.openems.edge.common.sum.GridMode;
 import io.openems.edge.controller.api.Controller;
 import io.openems.edge.ess.api.ManagedSymmetricEss;
 import io.openems.edge.ess.power.api.Power;
@@ -68,6 +67,7 @@ void activate(ComponentContext context, Config config) {
 		this.config = config;
 	}
 
+	@Override
 	@Deactivate
 	protected void deactivate() {
 		super.deactivate();
@@ -81,7 +81,7 @@ public void run() throws OpenemsNamedException {
 		/*
 		 * Check that we are On-Grid (and warn on undefined Grid-Mode)
 		 */
-		GridMode gridMode = ess.getGridMode();
+		var gridMode = ess.getGridMode();
 		if (gridMode.isUndefined()) {
 			this.logWarn(this.log, "Grid-Mode is [UNDEFINED]");
 		}
@@ -98,23 +98,23 @@ public void run() throws OpenemsNamedException {
 		 */
 		int gridPower;
 		if (meter instanceof AsymmetricMeter) {
-			AsymmetricMeter asymmetricMeter = (AsymmetricMeter) meter;
+			var asymmetricMeter = (AsymmetricMeter) meter;
 
 			int gridPowerL1 = asymmetricMeter.getActivePowerL1().getOrError();
 			int gridPowerL2 = asymmetricMeter.getActivePowerL2().getOrError();
 			int gridPowerL3 = asymmetricMeter.getActivePowerL3().getOrError();
 
-			int maxPowerOnPhase = Math.max(Math.max(gridPowerL1, gridPowerL2), gridPowerL3);
+			var maxPowerOnPhase = Math.max(Math.max(gridPowerL1, gridPowerL2), gridPowerL3);
 			gridPower = maxPowerOnPhase * 3;
 
 		} else {
 			gridPower = meter.getActivePower().getOrError();
 		}
-		int effectiveGridPower = gridPower + ess.getActivePower().getOrError();
+		var effectiveGridPower = gridPower + ess.getActivePower().getOrError();
 
 		int calculatedPower;
-		int wholePeakShavingPower = this.config.peakShavingPower() * 3;
-		int wholeRechargePower = this.config.rechargePower() * 3;
+		var wholePeakShavingPower = this.config.peakShavingPower() * 3;
+		var wholeRechargePower = this.config.rechargePower() * 3;
 		if (effectiveGridPower >= wholePeakShavingPower) {
 
 			// Peak-Shaving
diff --git a/io.openems.edge.controller.asymmetric.peakshaving/test/io/openems/edge/controller/asymmetric/peakshaving/MyConfig.java b/io.openems.edge.controller.asymmetric.peakshaving/test/io/openems/edge/controller/asymmetric/peakshaving/MyConfig.java
index 3831d496a0f..eda8a3ece28 100644
--- a/io.openems.edge.controller.asymmetric.peakshaving/test/io/openems/edge/controller/asymmetric/peakshaving/MyConfig.java
+++ b/io.openems.edge.controller.asymmetric.peakshaving/test/io/openems/edge/controller/asymmetric/peakshaving/MyConfig.java
@@ -47,7 +47,7 @@ public MyConfig build() {
 
 	/**
 	 * Create a Config builder.
-	 * 
+	 *
 	 * @return a {@link Builder}
 	 */
 	public static Builder create() {

From c9b4faad75b7ebaf11281013bfd8573ab0be24d9 Mon Sep 17 00:00:00 2001
From: Stefan Feilmeier <stefan.feilmeier@fenecon.de>
Date: Mon, 7 Mar 2022 22:58:48 +0100
Subject: [PATCH 22/96] Update
 io.openems.edge.controller.asymmetric.phaserectification

---
 .../PhaseRectification.java                   | 27 +++++++++----------
 1 file changed, 13 insertions(+), 14 deletions(-)

diff --git a/io.openems.edge.controller.asymmetric.phaserectification/src/io/openems/edge/controller/asymmetric/phaserectification/PhaseRectification.java b/io.openems.edge.controller.asymmetric.phaserectification/src/io/openems/edge/controller/asymmetric/phaserectification/PhaseRectification.java
index ea27b7063ed..54f4fe976cc 100644
--- a/io.openems.edge.controller.asymmetric.phaserectification/src/io/openems/edge/controller/asymmetric/phaserectification/PhaseRectification.java
+++ b/io.openems.edge.controller.asymmetric.phaserectification/src/io/openems/edge/controller/asymmetric/phaserectification/PhaseRectification.java
@@ -15,13 +15,11 @@
 import io.openems.edge.common.component.AbstractOpenemsComponent;
 import io.openems.edge.common.component.ComponentManager;
 import io.openems.edge.common.component.OpenemsComponent;
-import io.openems.edge.common.sum.GridMode;
 import io.openems.edge.controller.api.Controller;
 import io.openems.edge.ess.api.ManagedAsymmetricEss;
 import io.openems.edge.ess.power.api.Constraint;
 import io.openems.edge.ess.power.api.LinearCoefficient;
 import io.openems.edge.ess.power.api.Phase;
-import io.openems.edge.ess.power.api.Power;
 import io.openems.edge.ess.power.api.Pwr;
 import io.openems.edge.ess.power.api.Relationship;
 import io.openems.edge.meter.api.AsymmetricMeter;
@@ -65,6 +63,7 @@ void activate(ComponentContext context, Config config) {
 		this.config = config;
 	}
 
+	@Override
 	@Deactivate
 	protected void deactivate() {
 		super.deactivate();
@@ -78,7 +77,7 @@ public void run() throws OpenemsNamedException {
 		/*
 		 * Check that we are On-Grid (and warn on undefined Grid-Mode)
 		 */
-		GridMode gridMode = ess.getGridMode();
+		var gridMode = ess.getGridMode();
 		if (gridMode.isUndefined()) {
 			this.logWarn(this.log, "Grid-Mode is [UNDEFINED]");
 		}
@@ -90,21 +89,21 @@ public void run() throws OpenemsNamedException {
 			return;
 		}
 
-		int meterL1 = meter.getActivePowerL1().getOrError() * -1;
-		int meterL2 = meter.getActivePowerL2().getOrError() * -1;
-		int meterL3 = meter.getActivePowerL3().getOrError() * -1;
-		int meterPowerAvg = (meterL1 + meterL2 + meterL3) / 3;
-		int meterL1Delta = meterPowerAvg - meterL1;
-		int meterL2Delta = meterPowerAvg - meterL2;
-		int meterL3Delta = meterPowerAvg - meterL3;
+		var meterL1 = meter.getActivePowerL1().getOrError() * -1;
+		var meterL2 = meter.getActivePowerL2().getOrError() * -1;
+		var meterL3 = meter.getActivePowerL3().getOrError() * -1;
+		var meterPowerAvg = (meterL1 + meterL2 + meterL3) / 3;
+		var meterL1Delta = meterPowerAvg - meterL1;
+		var meterL2Delta = meterPowerAvg - meterL2;
+		var meterL3Delta = meterPowerAvg - meterL3;
 		int essL1 = ess.getActivePowerL1().getOrError();
 		int essL2 = ess.getActivePowerL2().getOrError();
 		int essL3 = ess.getActivePowerL3().getOrError();
-		int activePowerL1 = essL1 + meterL1Delta;
-		int activePowerL2 = essL2 + meterL2Delta;
-		int activePowerL3 = essL3 + meterL3Delta;
+		var activePowerL1 = essL1 + meterL1Delta;
+		var activePowerL2 = essL2 + meterL2Delta;
+		var activePowerL3 = essL3 + meterL3Delta;
 
-		Power power = ess.getPower();
+		var power = ess.getPower();
 		power.addConstraintAndValidate(new Constraint(ess.id() + ": Symmetric L1/L2", new LinearCoefficient[] { //
 				new LinearCoefficient(power.getCoefficient(ess, Phase.L1, Pwr.ACTIVE), 1), //
 				new LinearCoefficient(power.getCoefficient(ess, Phase.L2, Pwr.ACTIVE), -1) //

From af7a9bbc8022155d3305731054c846488c1f8404 Mon Sep 17 00:00:00 2001
From: Stefan Feilmeier <stefan.feilmeier@fenecon.de>
Date: Mon, 7 Mar 2022 23:01:12 +0100
Subject: [PATCH 23/96] Update io.openems.edge.controller.channelthreshold

---
 .../controller/channelthreshold/ChannelThreshold.java | 11 +++++------
 .../edge/controller/channelthreshold/State.java       |  4 ++--
 2 files changed, 7 insertions(+), 8 deletions(-)

diff --git a/io.openems.edge.controller.channelthreshold/src/io/openems/edge/controller/channelthreshold/ChannelThreshold.java b/io.openems.edge.controller.channelthreshold/src/io/openems/edge/controller/channelthreshold/ChannelThreshold.java
index c18ef81746e..481340aa0c4 100644
--- a/io.openems.edge.controller.channelthreshold/src/io/openems/edge/controller/channelthreshold/ChannelThreshold.java
+++ b/io.openems.edge.controller.channelthreshold/src/io/openems/edge/controller/channelthreshold/ChannelThreshold.java
@@ -1,7 +1,5 @@
 package io.openems.edge.controller.channelthreshold;
 
-import java.util.Optional;
-
 import org.osgi.service.component.ComponentContext;
 import org.osgi.service.component.annotations.Activate;
 import org.osgi.service.component.annotations.Component;
@@ -80,6 +78,7 @@ void activate(ComponentContext context, Config config) throws OpenemsNamedExcept
 		super.activate(context, config.id(), config.alias(), config.enabled());
 	}
 
+	@Override
 	@Deactivate
 	protected void deactivate() {
 		super.deactivate();
@@ -238,7 +237,7 @@ public void run() throws IllegalArgumentException, OpenemsNamedException {
 
 	/**
 	 * Switch the output ON.
-	 * 
+	 *
 	 * @throws OpenemsNamedException
 	 * @throws IllegalArgumentException
 	 */
@@ -248,7 +247,7 @@ private void on() throws IllegalArgumentException, OpenemsNamedException {
 
 	/**
 	 * Switch the output OFF.
-	 * 
+	 *
 	 * @throws OpenemsNamedException
 	 * @throws IllegalArgumentException
 	 */
@@ -267,11 +266,11 @@ private void off() throws IllegalArgumentException, OpenemsNamedException {
 	private void setOutput(boolean value) throws IllegalArgumentException, OpenemsNamedException {
 		try {
 			WriteChannel<Boolean> outputChannel = this.componentManager.getChannel(this.outputChannelAddress);
-			Optional<Boolean> currentValueOpt = outputChannel.value().asOptional();
+			var currentValueOpt = outputChannel.value().asOptional();
 			if (!currentValueOpt.isPresent() || currentValueOpt.get() != (value ^ this.invertOutput)) {
 				this.logInfo(this.log, "Set output [" + outputChannel.address() + "] "
 						+ (value ^ this.invertOutput ? "ON" : "OFF") + ".");
-				outputChannel.setNextWriteValue(value ^ invertOutput);
+				outputChannel.setNextWriteValue(value ^ this.invertOutput);
 			}
 		} catch (OpenemsException e) {
 			this.logError(this.log, "Unable to set output: [" + this.outputChannelAddress + "] " + e.getMessage());
diff --git a/io.openems.edge.controller.channelthreshold/src/io/openems/edge/controller/channelthreshold/State.java b/io.openems.edge.controller.channelthreshold/src/io/openems/edge/controller/channelthreshold/State.java
index 3f964200ec3..45a17fb0d5b 100644
--- a/io.openems.edge.controller.channelthreshold/src/io/openems/edge/controller/channelthreshold/State.java
+++ b/io.openems.edge.controller.channelthreshold/src/io/openems/edge/controller/channelthreshold/State.java
@@ -46,12 +46,12 @@ private State(int value, String name) {
 
 	@Override
 	public int getValue() {
-		return value;
+		return this.value;
 	}
 
 	@Override
 	public String getName() {
-		return name;
+		return this.name;
 	}
 
 	@Override

From c9b7fc2d3d94717ff4cc2df8120346751753e7ed Mon Sep 17 00:00:00 2001
From: Stefan Feilmeier <stefan.feilmeier@fenecon.de>
Date: Mon, 7 Mar 2022 23:01:37 +0100
Subject: [PATCH 24/96] Update io.openems.edge.controller.chp.soc

---
 .../controller/chp/soc/ControllerChpSoc.java  | 23 ++++++++-----------
 .../openems/edge/controller/chp/soc/Mode.java |  4 ++--
 .../edge/controller/chp/soc/State.java        |  4 ++--
 .../edge/controller/chp/soc/MyConfig.java     |  2 +-
 4 files changed, 15 insertions(+), 18 deletions(-)

diff --git a/io.openems.edge.controller.chp.soc/src/io/openems/edge/controller/chp/soc/ControllerChpSoc.java b/io.openems.edge.controller.chp.soc/src/io/openems/edge/controller/chp/soc/ControllerChpSoc.java
index 70c0eb4b229..fd4fd5137da 100644
--- a/io.openems.edge.controller.chp.soc/src/io/openems/edge/controller/chp/soc/ControllerChpSoc.java
+++ b/io.openems.edge.controller.chp.soc/src/io/openems/edge/controller/chp/soc/ControllerChpSoc.java
@@ -1,7 +1,5 @@
 package io.openems.edge.controller.chp.soc;
 
-import java.util.Optional;
-
 import org.osgi.service.component.ComponentContext;
 import org.osgi.service.component.annotations.Activate;
 import org.osgi.service.component.annotations.Component;
@@ -80,11 +78,12 @@ void activate(ComponentContext context, Config config) throws OpenemsNamedExcept
 		this.inputChannelAddress = ChannelAddress.fromString(config.inputChannelAddress());
 		this.outputChannelAddress = ChannelAddress.fromString(config.outputChannelAddress());
 		this.mode = config.mode();
-		this.channel(ChannelId.MODE).setNextValue(mode);
+		this.channel(ChannelId.MODE).setNextValue(this.mode);
 		this.invertOutput = config.invert();
 		super.activate(context, config.id(), config.alias(), config.enabled());
 	}
 
+	@Override
 	@Deactivate
 	protected void deactivate() {
 		super.deactivate();
@@ -105,11 +104,11 @@ public void run() throws OpenemsNamedException {
 			modeChanged = false;
 			switch (this.mode) {
 			case MANUAL_ON:
-				setOutput(true);
+				this.setOutput(true);
 				modeChanged = this.changeMode(Mode.MANUAL_ON);
 				break;
 			case MANUAL_OFF:
-				setOutput(false);
+				this.setOutput(false);
 				modeChanged = this.changeMode(Mode.MANUAL_OFF);
 				break;
 			case AUTOMATIC:
@@ -185,7 +184,7 @@ private void automaticMode() throws IllegalArgumentException, OpenemsNamedExcept
 
 	/**
 	 * A flag to maintain change in the state.
-	 * 
+	 *
 	 * @param nextState the target state
 	 * @return Flag that the state is changed or not
 	 */
@@ -193,9 +192,8 @@ private boolean changeState(State nextState) {
 		if (this.state != nextState) {
 			this.state = nextState;
 			return true;
-		} else {
-			return false;
 		}
+		return false;
 	}
 
 	/**
@@ -208,9 +206,9 @@ private boolean changeState(State nextState) {
 	private void setOutput(Boolean value) throws IllegalArgumentException, OpenemsNamedException {
 		try {
 			WriteChannel<Boolean> outputChannel = this.componentManager.getChannel(this.outputChannelAddress);
-			Optional<Boolean> currentValueOpt = outputChannel.value().asOptional();
+			var currentValueOpt = outputChannel.value().asOptional();
 			if (!currentValueOpt.isPresent() || currentValueOpt.get() != value) {
-				this.logInfo(this.log, "Set output [" + outputChannel.address() + "] " + (value) + ".");
+				this.logInfo(this.log, "Set output [" + outputChannel.address() + "] " + value + ".");
 				outputChannel.setNextWriteValue(value);
 			}
 		} catch (OpenemsException e) {
@@ -220,7 +218,7 @@ private void setOutput(Boolean value) throws IllegalArgumentException, OpenemsNa
 
 	/**
 	 * A flag to maintain change in the mode.
-	 * 
+	 *
 	 * @param nextMode the target mode
 	 * @return Flag that the mode is changed or not
 	 */
@@ -228,8 +226,7 @@ private boolean changeMode(Mode nextMode) {
 		if (this.mode != nextMode) {
 			this.mode = nextMode;
 			return true;
-		} else {
-			return false;
 		}
+		return false;
 	}
 }
diff --git a/io.openems.edge.controller.chp.soc/src/io/openems/edge/controller/chp/soc/Mode.java b/io.openems.edge.controller.chp.soc/src/io/openems/edge/controller/chp/soc/Mode.java
index 3759bda2d1d..a5df5462d24 100644
--- a/io.openems.edge.controller.chp.soc/src/io/openems/edge/controller/chp/soc/Mode.java
+++ b/io.openems.edge.controller.chp.soc/src/io/openems/edge/controller/chp/soc/Mode.java
@@ -17,12 +17,12 @@ private Mode(int value, String name) {
 
 	@Override
 	public int getValue() {
-		return value;
+		return this.value;
 	}
 
 	@Override
 	public String getName() {
-		return name;
+		return this.name;
 	}
 
 	@Override
diff --git a/io.openems.edge.controller.chp.soc/src/io/openems/edge/controller/chp/soc/State.java b/io.openems.edge.controller.chp.soc/src/io/openems/edge/controller/chp/soc/State.java
index 11a6e799cae..e5731d705ff 100644
--- a/io.openems.edge.controller.chp.soc/src/io/openems/edge/controller/chp/soc/State.java
+++ b/io.openems.edge.controller.chp.soc/src/io/openems/edge/controller/chp/soc/State.java
@@ -27,12 +27,12 @@ private State(int value, String name) {
 
 	@Override
 	public int getValue() {
-		return value;
+		return this.value;
 	}
 
 	@Override
 	public String getName() {
-		return name;
+		return this.name;
 	}
 
 	@Override
diff --git a/io.openems.edge.controller.chp.soc/test/io/openems/edge/controller/chp/soc/MyConfig.java b/io.openems.edge.controller.chp.soc/test/io/openems/edge/controller/chp/soc/MyConfig.java
index ef35c136aa6..6f58d1f595c 100644
--- a/io.openems.edge.controller.chp.soc/test/io/openems/edge/controller/chp/soc/MyConfig.java
+++ b/io.openems.edge.controller.chp.soc/test/io/openems/edge/controller/chp/soc/MyConfig.java
@@ -59,7 +59,7 @@ public MyConfig build() {
 
 	/**
 	 * Create a Config builder.
-	 * 
+	 *
 	 * @return a {@link Builder}
 	 */
 	public static Builder create() {

From 3027a97a114c18e25513cfb4fb33ea21a107c186 Mon Sep 17 00:00:00 2001
From: Stefan Feilmeier <stefan.feilmeier@fenecon.de>
Date: Mon, 7 Mar 2022 23:02:13 +0100
Subject: [PATCH 25/96] Update io.openems.edge.controller.debug.detailedlog

---
 .../debug/detailedlog/DebugDetailedLog.java   | 33 ++++++++++---------
 1 file changed, 17 insertions(+), 16 deletions(-)

diff --git a/io.openems.edge.controller.debug.detailedlog/src/io/openems/edge/controller/debug/detailedlog/DebugDetailedLog.java b/io.openems.edge.controller.debug.detailedlog/src/io/openems/edge/controller/debug/detailedlog/DebugDetailedLog.java
index 4b0c37d4c4f..99cfdc448d2 100644
--- a/io.openems.edge.controller.debug.detailedlog/src/io/openems/edge/controller/debug/detailedlog/DebugDetailedLog.java
+++ b/io.openems.edge.controller.debug.detailedlog/src/io/openems/edge/controller/debug/detailedlog/DebugDetailedLog.java
@@ -77,6 +77,7 @@ void activate(ComponentContext context, Config config) {
 		this.config = config;
 	}
 
+	@Override
 	@Deactivate
 	protected void deactivate() {
 		super.deactivate();
@@ -85,24 +86,24 @@ protected void deactivate() {
 	@Override
 	public void run() throws OpenemsNamedException {
 		for (String componentId : this.config.component_ids()) {
-			OpenemsComponent component = this.componentManager.getComponent(componentId);
-			boolean printedHeader = false;
+			var component = this.componentManager.getComponent(componentId);
+			var printedHeader = false;
 
 			if (!this.finishedFirstRun.contains(component.id())) {
 				/*
 				 * Print on first run
 				 */
-				logInfo(this.log, "=======================================");
+				this.logInfo(this.log, "=======================================");
 				this.log("ID", component.id());
 				this.log("Service-PID", component.servicePid());
 				this.log("Implementation", reducePackageName(component.getClass()));
 				getInheritanceViaReflection(component.getClass(), null).asMap().forEach((inheritance, names) -> {
-					boolean first = true;
+					var first = true;
 					for (String name : names) {
 						if (first) {
-							log(CaseFormat.UPPER_UNDERSCORE.to(CaseFormat.UPPER_CAMEL, inheritance.name()), name);
+							this.log(CaseFormat.UPPER_UNDERSCORE.to(CaseFormat.UPPER_CAMEL, inheritance.name()), name);
 						} else {
-							log("", name);
+							this.log("", name);
 						}
 						first = false;
 					}
@@ -115,15 +116,15 @@ public void run() throws OpenemsNamedException {
 			component.channels().stream() //
 					.sorted((c1, c2) -> c1.channelId().name().compareTo(c2.channelId().name())) //
 					.forEach(channel -> {
-						String unit = channel.channelDoc().getUnit().getSymbol();
+						var unit = channel.channelDoc().getUnit().getSymbol();
 						/*
 						 * create descriptive text
 						 */
-						String channelText = "";
+						var channelText = "";
 						switch (channel.channelDoc().getAccessMode()) {
 						case READ_ONLY:
 						case READ_WRITE:
-							String description = "";
+							var description = "";
 							if (channel instanceof EnumReadChannel) {
 								try {
 									description += channel.value().asOptionString();
@@ -156,11 +157,11 @@ public void run() throws OpenemsNamedException {
 							channelText += "WRITE_ONLY";
 						}
 						// Build complete line
-						String line = String.format("%-" + WIDTH_FIRST + "s : %s", channel.channelId().id(),
+						var line = String.format("%-" + this.WIDTH_FIRST + "s : %s", channel.channelId().id(),
 								channelText);
 						// Print the line only if is not equal to the last printed line
-						if ((!this.lastPrinted.containsKey(channel.address()))
-								|| !(this.lastPrinted.get(channel.address()).equals(line))) {
+						if (!this.lastPrinted.containsKey(channel.address())
+								|| !this.lastPrinted.get(channel.address()).equals(line)) {
 							shouldPrint.put(channel.address(), line);
 						}
 						// Add line to last printed lines
@@ -172,15 +173,15 @@ public void run() throws OpenemsNamedException {
 					/*
 					 * Print header (this is not the first run)
 					 */
-					logInfo(this.log, "=======================================");
+					this.logInfo(this.log, "=======================================");
 					this.log("ID", component.id());
 				}
 
-				logInfo(this.log, "---------------------------------------");
+				this.logInfo(this.log, "---------------------------------------");
 				shouldPrint.values().stream().sorted().forEach(line -> {
 					this.logInfo(this.log, line);
 				});
-				logInfo(this.log, "---------------------------------------");
+				this.logInfo(this.log, "---------------------------------------");
 			}
 		}
 	}
@@ -207,7 +208,7 @@ private static Multimap<Inheritance, String> getInheritanceViaReflection(Class<?
 	}
 
 	private void log(String topic, String message) {
-		this.logInfo(this.log, String.format("%-" + WIDTH_FIRST + "s : %s", topic, message));
+		this.logInfo(this.log, String.format("%-" + this.WIDTH_FIRST + "s : %s", topic, message));
 	}
 
 	private static String reducePackageName(Class<?> clazz) {

From cb1ed97c7afbef286e2e7f6b2d01ce6e52059482 Mon Sep 17 00:00:00 2001
From: Stefan Feilmeier <stefan.feilmeier@fenecon.de>
Date: Mon, 7 Mar 2022 23:03:04 +0100
Subject: [PATCH 26/96] Update io.openems.edge.controller.debug.log

---
 .../controller/debuglog/DebugLogImpl.java     | 32 +++++++++----------
 .../controller/debuglog/DebugLogImplTest.java |  4 +--
 .../edge/controller/debuglog/MyConfig.java    |  3 +-
 3 files changed, 18 insertions(+), 21 deletions(-)

diff --git a/io.openems.edge.controller.debug.log/src/io/openems/edge/controller/debuglog/DebugLogImpl.java b/io.openems.edge.controller.debug.log/src/io/openems/edge/controller/debuglog/DebugLogImpl.java
index 9a0dafbdb72..8b0ddb7d2eb 100644
--- a/io.openems.edge.controller.debug.log/src/io/openems/edge/controller/debuglog/DebugLogImpl.java
+++ b/io.openems.edge.controller.debug.log/src/io/openems/edge/controller/debuglog/DebugLogImpl.java
@@ -6,7 +6,6 @@
 import java.util.Set;
 import java.util.SortedSet;
 import java.util.concurrent.CopyOnWriteArrayList;
-import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 
 import org.osgi.service.component.ComponentContext;
@@ -85,7 +84,7 @@ private synchronized void applyConfig(Config config) throws OpenemsNamedExceptio
 			if (channel.isEmpty()) {
 				continue;
 			}
-			ChannelAddress c = ChannelAddress.fromString(channel);
+			var c = ChannelAddress.fromString(channel);
 			this.additionalChannels.put(c.getComponentId(), c.getChannelId());
 		}
 
@@ -99,6 +98,7 @@ private synchronized void applyConfig(Config config) throws OpenemsNamedExceptio
 		}
 	}
 
+	@Override
 	@Deactivate
 	protected void deactivate() {
 		super.deactivate();
@@ -117,20 +117,19 @@ protected String getLogMessage() {
 		 */
 		this.components.stream() //
 				.sorted((c1, c2) -> {
-					Matcher c1Matcher = COMPONENT_ID_PATTERN.matcher(c1.id());
-					Matcher c2Matcher = COMPONENT_ID_PATTERN.matcher(c2.id());
+					var c1Matcher = COMPONENT_ID_PATTERN.matcher(c1.id());
+					var c2Matcher = COMPONENT_ID_PATTERN.matcher(c2.id());
 					if (c1Matcher.find() && c2Matcher.find()) {
-						String c1Name = c1Matcher.group(1);
-						int c1Number = Integer.parseInt(c1Matcher.group(2));
-						String c2Name = c2Matcher.group(1);
-						int c2Number = Integer.parseInt(c2Matcher.group(2));
+						var c1Name = c1Matcher.group(1);
+						var c1Number = Integer.parseInt(c1Matcher.group(2));
+						var c2Name = c2Matcher.group(1);
+						var c2Number = Integer.parseInt(c2Matcher.group(2));
 						if (c1Name.equals(c2Name)) {
 							// Sort by Component-ID numbers
 							return Integer.compare(c1Number, c2Number);
-						} else {
-							// Sort by full Component-ID
-							return c1.id().compareTo(c2.id());
 						}
+						// Sort by full Component-ID
+						return c1.id().compareTo(c2.id());
 					}
 					// Sort by full Component-ID
 					return c1.id().compareTo(c2.id());
@@ -142,13 +141,13 @@ protected String getLogMessage() {
 					if (this.ignoreComponents.stream() //
 							.noneMatch(pattern -> StringUtils.matchWildcard(component.id(), pattern) >= 0)) {
 						// Component Debug-Log
-						String debugLog = component.debugLog();
+						var debugLog = component.debugLog();
 						if (debugLog != null) {
 							logs.add(debugLog);
 						}
 
 						// State
-						String state = component.getStateChannel().listStates();
+						var state = component.getStateChannel().listStates();
 						if (!state.isEmpty()) {
 							logs.add("State:" + state);
 						}
@@ -163,7 +162,7 @@ protected String getLogMessage() {
 
 					// Any logs? Add them to the output
 					if (!logs.isEmpty()) {
-						StringBuilder b = new StringBuilder();
+						var b = new StringBuilder();
 						b.append(component.id()).append("[");
 						if (this.config.showAlias() && !Objects.equal(component.id(), component.alias())) {
 							b.append(component.alias()).append("|");
@@ -176,9 +175,8 @@ protected String getLogMessage() {
 		if (this.config.condensedOutput()) {
 			// separate components by space; one line in total
 			return String.join(" ", result);
-		} else {
-			// separate components by newline
-			return String.join("\n", result);
 		}
+		// separate components by newline
+		return String.join("\n", result);
 	}
 }
diff --git a/io.openems.edge.controller.debug.log/test/io/openems/edge/controller/debuglog/DebugLogImplTest.java b/io.openems.edge.controller.debug.log/test/io/openems/edge/controller/debuglog/DebugLogImplTest.java
index da6538c2683..7dd32528cdb 100644
--- a/io.openems.edge.controller.debug.log/test/io/openems/edge/controller/debuglog/DebugLogImplTest.java
+++ b/io.openems.edge.controller.debug.log/test/io/openems/edge/controller/debuglog/DebugLogImplTest.java
@@ -63,7 +63,7 @@ public String debugLog() {
 			}
 		});
 
-		DebugLogImpl sut = new DebugLogImpl();
+		var sut = new DebugLogImpl();
 		new ControllerTest(sut) //
 				.addReference("components", components) //
 				.activate(MyConfig.create() //
@@ -108,7 +108,7 @@ public String debugLog() {
 			}
 		});
 
-		DebugLogImpl sut = new DebugLogImpl();
+		var sut = new DebugLogImpl();
 		new ControllerTest(sut) //
 				.addReference("components", components) //
 				.addComponent(components.get(0)) //
diff --git a/io.openems.edge.controller.debug.log/test/io/openems/edge/controller/debuglog/MyConfig.java b/io.openems.edge.controller.debug.log/test/io/openems/edge/controller/debuglog/MyConfig.java
index 4ea3407217d..608cb5b2e9a 100644
--- a/io.openems.edge.controller.debug.log/test/io/openems/edge/controller/debuglog/MyConfig.java
+++ b/io.openems.edge.controller.debug.log/test/io/openems/edge/controller/debuglog/MyConfig.java
@@ -7,7 +7,6 @@ public class MyConfig extends AbstractComponentConfig implements Config {
 
 	protected static class Builder {
 		private String id = "ctrlJsonLogic0";
-		private String rule = null;
 		public boolean showAlias;
 		public String[] additionalChannels;
 		public String[] ignoreComponents;
@@ -26,7 +25,7 @@ public Builder setShowAlias(boolean showAlias) {
 			this.showAlias = showAlias;
 			return this;
 		}
-		
+
 		public Builder setAdditionalChannels(String[] additionalChannels) {
 			this.additionalChannels = additionalChannels;
 			return this;

From 3b87a0461d0816496faf0aeefdbd88de1d072863 Mon Sep 17 00:00:00 2001
From: Stefan Feilmeier <stefan.feilmeier@fenecon.de>
Date: Mon, 7 Mar 2022 23:04:19 +0100
Subject: [PATCH 27/96] Update io.openems.edge.controller.ess.acisland

---
 .../controller/ess/acisland/AcIsland.java     | 65 +++++++++----------
 .../edge/controller/ess/acisland/State.java   |  4 +-
 2 files changed, 32 insertions(+), 37 deletions(-)

diff --git a/io.openems.edge.controller.ess.acisland/src/io/openems/edge/controller/ess/acisland/AcIsland.java b/io.openems.edge.controller.ess.acisland/src/io/openems/edge/controller/ess/acisland/AcIsland.java
index 1ad4a91254f..8cbc2548293 100644
--- a/io.openems.edge.controller.ess.acisland/src/io/openems/edge/controller/ess/acisland/AcIsland.java
+++ b/io.openems.edge.controller.ess.acisland/src/io/openems/edge/controller/ess/acisland/AcIsland.java
@@ -1,7 +1,5 @@
 package io.openems.edge.controller.ess.acisland;
 
-import java.util.Optional;
-
 import org.osgi.service.component.ComponentContext;
 import org.osgi.service.component.annotations.Activate;
 import org.osgi.service.component.annotations.Component;
@@ -78,6 +76,7 @@ void activate(ComponentContext context, Config config) throws OpenemsNamedExcept
 		this.onGridOutputChannelAddress = ChannelAddress.fromString(config.onGridOutputChannelAddress());
 	}
 
+	@Override
 	@Deactivate
 	protected void deactivate() {
 		super.deactivate();
@@ -87,14 +86,14 @@ protected void deactivate() {
 	public void run() throws OpenemsNamedException {
 		// Get all required values - or abort with exception
 		SymmetricEss ess = this.componentManager.getComponent(this.config.ess_id());
-		GridMode gridMode = ess.getGridMode();
+		var gridMode = ess.getGridMode();
 		int soc = ess.getSoc().getOrError();
 
 		BooleanWriteChannel onGridOutputChannel = this.componentManager.getChannel(this.onGridOutputChannelAddress);
 		BooleanWriteChannel offGridOutputChannel = this.componentManager.getChannel(this.offGridOutputChannelAddress);
-		boolean isProducerOffGrid = this.isProducerOffGrid(onGridOutputChannel, offGridOutputChannel);
-		boolean isProducerOff = this.isProducerOff(onGridOutputChannel, offGridOutputChannel);
-		boolean isProducerOnGrid = this.isProducerOnGrid(onGridOutputChannel, offGridOutputChannel);
+		var isProducerOffGrid = this.isProducerOffGrid(onGridOutputChannel, offGridOutputChannel);
+		var isProducerOff = this.isProducerOff(onGridOutputChannel, offGridOutputChannel);
+		var isProducerOnGrid = this.isProducerOnGrid(onGridOutputChannel, offGridOutputChannel);
 
 		/*
 		 * State Machine
@@ -108,12 +107,10 @@ public void run() throws OpenemsNamedException {
 				if (isProducerOffGrid || isProducerOff) {
 					if (gridMode == GridMode.ON_GRID) {
 						stateChanged = this.changeState(State.SWITCH_TO_ONGRID);
-					} else {
-						if (soc >= config.maxSoc()) {
-							this.disconnectOffGrid(offGridOutputChannel);
-						} else if (soc <= config.minSoc()) {
-							this.connectOffGrid(offGridOutputChannel);
-						}
+					} else if (soc >= this.config.maxSoc()) {
+						this.disconnectOffGrid(offGridOutputChannel);
+					} else if (soc <= this.config.minSoc()) {
+						this.connectOffGrid(offGridOutputChannel);
 					}
 				} else {
 					stateChanged = this.changeState(State.SWITCH_TO_OFFGRID);
@@ -138,7 +135,7 @@ public void run() throws OpenemsNamedException {
 						this.isProducerDisconnected = true;
 						this.timeProducerDisconnected = System.currentTimeMillis();
 					}
-					if (this.timeProducerDisconnected + config.switchDelay() <= System.currentTimeMillis()
+					if (this.timeProducerDisconnected + this.config.switchDelay() <= System.currentTimeMillis()
 							&& this.isProducerDisconnected) {
 						stateChanged = this.changeState(State.OFF_GRID);
 					}
@@ -154,21 +151,19 @@ public void run() throws OpenemsNamedException {
 				if (isProducerOnGrid) {
 					this.changeState(State.ON_GRID);
 					this.isProducerDisconnected = false;
-				} else {
-					if (isProducerOff) {
-						if (!this.isProducerDisconnected) {
-							this.isProducerDisconnected = true;
-							this.timeProducerDisconnected = System.currentTimeMillis();
-						}
-						if (this.timeProducerDisconnected + config.switchDelay() <= System.currentTimeMillis()
-								&& this.isProducerDisconnected) {
-							this.connectOnGrid(onGridOutputChannel);
-						}
-					} else {
-						this.isProducerDisconnected = false;
-						this.disconnectOnGrid(onGridOutputChannel);
-						this.disconnectOffGrid(offGridOutputChannel);
+				} else if (isProducerOff) {
+					if (!this.isProducerDisconnected) {
+						this.isProducerDisconnected = true;
+						this.timeProducerDisconnected = System.currentTimeMillis();
 					}
+					if (this.timeProducerDisconnected + this.config.switchDelay() <= System.currentTimeMillis()
+							&& this.isProducerDisconnected) {
+						this.connectOnGrid(onGridOutputChannel);
+					}
+				} else {
+					this.isProducerDisconnected = false;
+					this.disconnectOnGrid(onGridOutputChannel);
+					this.disconnectOffGrid(offGridOutputChannel);
 				}
 				break;
 			}
@@ -201,11 +196,11 @@ private boolean isProducerOnGrid(BooleanWriteChannel onGridOutputChannel,
 	}
 
 	private void connectOnGrid(BooleanWriteChannel onGridOutputChannel) throws OpenemsNamedException {
-		this.switchOutput(onGridOutputChannel, true, config.invertOnGridOutput());
+		this.switchOutput(onGridOutputChannel, true, this.config.invertOnGridOutput());
 	}
 
 	private void disconnectOnGrid(BooleanWriteChannel onGridOutputChannel) throws OpenemsNamedException {
-		this.switchOutput(onGridOutputChannel, false, config.invertOnGridOutput());
+		this.switchOutput(onGridOutputChannel, false, this.config.invertOnGridOutput());
 	}
 
 	private boolean isOnGridOn(BooleanWriteChannel onGridOutputChannel) {
@@ -213,11 +208,11 @@ private boolean isOnGridOn(BooleanWriteChannel onGridOutputChannel) {
 	}
 
 	private void connectOffGrid(BooleanWriteChannel offGridOutputChannel) throws OpenemsNamedException {
-		this.switchOutput(offGridOutputChannel, true, config.invertOffGridOutput());
+		this.switchOutput(offGridOutputChannel, true, this.config.invertOffGridOutput());
 	}
 
 	private void disconnectOffGrid(BooleanWriteChannel offGridOutputChannel) throws OpenemsNamedException {
-		this.switchOutput(offGridOutputChannel, false, config.invertOffGridOutput());
+		this.switchOutput(offGridOutputChannel, false, this.config.invertOffGridOutput());
 	}
 
 	private boolean isOffGridOn(BooleanWriteChannel offGridOutputChannel) {
@@ -226,7 +221,7 @@ private boolean isOffGridOn(BooleanWriteChannel offGridOutputChannel) {
 
 	private void switchOutput(BooleanWriteChannel outputChannel, boolean on, boolean invertOutput)
 			throws OpenemsNamedException {
-		Optional<Boolean> currentValueOpt = outputChannel.value().asOptional();
+		var currentValueOpt = outputChannel.value().asOptional();
 		if (!currentValueOpt.isPresent() || currentValueOpt.get() != (on ^ invertOutput)) {
 			this.logInfo(this.log,
 					"Set output [" + outputChannel.address() + "] " + (on ^ invertOutput ? "ON" : "OFF") + ".");
@@ -236,7 +231,7 @@ private void switchOutput(BooleanWriteChannel outputChannel, boolean on, boolean
 
 	/**
 	 * A flag to maintain change in the state
-	 * 
+	 *
 	 * @param nextState the target state
 	 * @return Flag that the state is changed or not
 	 */
@@ -244,8 +239,8 @@ private boolean changeState(State nextState) {
 		if (this.state != nextState) {
 			this.state = nextState;
 			return true;
-		} else
-			return false;
+		}
+		return false;
 	}
 
 }
diff --git a/io.openems.edge.controller.ess.acisland/src/io/openems/edge/controller/ess/acisland/State.java b/io.openems.edge.controller.ess.acisland/src/io/openems/edge/controller/ess/acisland/State.java
index fbd6e67c9b6..c16d97c4ab6 100644
--- a/io.openems.edge.controller.ess.acisland/src/io/openems/edge/controller/ess/acisland/State.java
+++ b/io.openems.edge.controller.ess.acisland/src/io/openems/edge/controller/ess/acisland/State.java
@@ -26,12 +26,12 @@ private State(int value, String name) {
 
 	@Override
 	public int getValue() {
-		return value;
+		return this.value;
 	}
 
 	@Override
 	public String getName() {
-		return name;
+		return this.name;
 	}
 
 	@Override

From 6108b9e75b2f5f0d38f51bfefc5ffcb81ea57907 Mon Sep 17 00:00:00 2001
From: Stefan Feilmeier <stefan.feilmeier@fenecon.de>
Date: Mon, 7 Mar 2022 23:04:52 +0100
Subject: [PATCH 28/96] Update
 io.openems.edge.controller.ess.activepowervoltagecharacteristics

---
 .../ActivePowerVoltageCharacteristic.java          |  8 ++++----
 .../ActivePowerVoltageCharacteristicImpl.java      | 14 ++++++--------
 .../CharacteristicImplTest.java                    |  2 +-
 .../activepowervoltagecharacteristic/MyConfig.java |  2 +-
 4 files changed, 12 insertions(+), 14 deletions(-)

diff --git a/io.openems.edge.controller.ess.activepowervoltagecharacteristic/src/io/openems/edge/controller/ess/activepowervoltagecharacteristic/ActivePowerVoltageCharacteristic.java b/io.openems.edge.controller.ess.activepowervoltagecharacteristic/src/io/openems/edge/controller/ess/activepowervoltagecharacteristic/ActivePowerVoltageCharacteristic.java
index caadf870e7e..a2af24ae4f4 100644
--- a/io.openems.edge.controller.ess.activepowervoltagecharacteristic/src/io/openems/edge/controller/ess/activepowervoltagecharacteristic/ActivePowerVoltageCharacteristic.java
+++ b/io.openems.edge.controller.ess.activepowervoltagecharacteristic/src/io/openems/edge/controller/ess/activepowervoltagecharacteristic/ActivePowerVoltageCharacteristic.java
@@ -30,7 +30,7 @@ public Doc doc() {
 
 	/**
 	 * Gets the Channel for {@link ChannelId#CALCULATED_POWER}.
-	 * 
+	 *
 	 * @return the Channel
 	 */
 	public default IntegerReadChannel getCalculatedPowerChannel() {
@@ -40,7 +40,7 @@ public default IntegerReadChannel getCalculatedPowerChannel() {
 	/**
 	 * Internal method to set the 'nextValue' on {@link ChannelId#CALCULATED_POWER}
 	 * Channel.
-	 * 
+	 *
 	 * @param value the next value
 	 */
 	public default void _setCalculatedPower(Integer value) {
@@ -49,7 +49,7 @@ public default void _setCalculatedPower(Integer value) {
 
 	/**
 	 * Gets the Channel for {@link ChannelId#VOLTAGE_RATIO}.
-	 * 
+	 *
 	 * @return the Channel
 	 */
 	public default FloatReadChannel getVoltageRatioChannel() {
@@ -59,7 +59,7 @@ public default FloatReadChannel getVoltageRatioChannel() {
 	/**
 	 * Internal method to set the 'nextValue' on {@link ChannelId#VOLTAGE_RATIO}
 	 * Channel.
-	 * 
+	 *
 	 * @param value the next value
 	 */
 	public default void _setVoltageRatio(Float value) {
diff --git a/io.openems.edge.controller.ess.activepowervoltagecharacteristic/src/io/openems/edge/controller/ess/activepowervoltagecharacteristic/ActivePowerVoltageCharacteristicImpl.java b/io.openems.edge.controller.ess.activepowervoltagecharacteristic/src/io/openems/edge/controller/ess/activepowervoltagecharacteristic/ActivePowerVoltageCharacteristicImpl.java
index 3f41c2351ea..c223ce521ab 100644
--- a/io.openems.edge.controller.ess.activepowervoltagecharacteristic/src/io/openems/edge/controller/ess/activepowervoltagecharacteristic/ActivePowerVoltageCharacteristicImpl.java
+++ b/io.openems.edge.controller.ess.activepowervoltagecharacteristic/src/io/openems/edge/controller/ess/activepowervoltagecharacteristic/ActivePowerVoltageCharacteristicImpl.java
@@ -1,6 +1,5 @@
 package io.openems.edge.controller.ess.activepowervoltagecharacteristic;
 
-import java.time.Clock;
 import java.time.Duration;
 import java.time.LocalDateTime;
 
@@ -19,12 +18,10 @@
 import org.slf4j.LoggerFactory;
 
 import io.openems.common.exceptions.OpenemsError.OpenemsNamedException;
-import io.openems.edge.common.channel.value.Value;
 import io.openems.edge.common.component.AbstractOpenemsComponent;
 import io.openems.edge.common.component.ComponentManager;
 import io.openems.edge.common.component.OpenemsComponent;
 import io.openems.edge.common.linecharacteristic.PolyLine;
-import io.openems.edge.common.sum.GridMode;
 import io.openems.edge.controller.api.Controller;
 import io.openems.edge.ess.api.ManagedSymmetricEss;
 import io.openems.edge.meter.api.SymmetricMeter;
@@ -78,6 +75,7 @@ void activate(ComponentContext context, Config config) throws OpenemsNamedExcept
 		this.pByUCharacteristics = new PolyLine("voltageRatio", "power", config.lineConfig());
 	}
 
+	@Override
 	@Deactivate
 	protected void deactivate() {
 		super.deactivate();
@@ -85,7 +83,7 @@ protected void deactivate() {
 
 	@Override
 	public void run() throws OpenemsNamedException {
-		GridMode gridMode = this.ess.getGridMode();
+		var gridMode = this.ess.getGridMode();
 		if (gridMode.isUndefined()) {
 			this.logWarn(this.log, "Grid-Mode is [UNDEFINED]");
 		}
@@ -101,7 +99,7 @@ public void run() throws OpenemsNamedException {
 
 		// Ratio between current voltage and nominal voltage
 		final Float voltageRatio;
-		Value<Integer> gridVoltage = this.meter.getVoltage();
+		var gridVoltage = this.meter.getVoltage();
 		if (gridVoltage.isDefined()) {
 			voltageRatio = gridVoltage.get() / (this.config.nominalVoltage() * 1000);
 		} else {
@@ -113,8 +111,8 @@ public void run() throws OpenemsNamedException {
 		}
 
 		// Do NOT change Set Power If it Does not exceed the hysteresis time
-		Clock clock = this.componentManager.getClock();
-		LocalDateTime now = LocalDateTime.now(clock);
+		var clock = this.componentManager.getClock();
+		var now = LocalDateTime.now(clock);
 		if (Duration.between(this.lastSetPowerTime, now).getSeconds() < this.config.waitForHysteresis()) {
 			return;
 		}
@@ -125,7 +123,7 @@ public void run() throws OpenemsNamedException {
 		if (this.pByUCharacteristics == null) {
 			power = null;
 		} else {
-			Double p = this.pByUCharacteristics.getValue(voltageRatio);
+			var p = this.pByUCharacteristics.getValue(voltageRatio);
 			if (p == null) {
 				power = null;
 			} else {
diff --git a/io.openems.edge.controller.ess.activepowervoltagecharacteristic/test/io/openems/edge/controller/ess/activepowervoltagecharacteristic/CharacteristicImplTest.java b/io.openems.edge.controller.ess.activepowervoltagecharacteristic/test/io/openems/edge/controller/ess/activepowervoltagecharacteristic/CharacteristicImplTest.java
index ca31132129f..5f371db4a98 100644
--- a/io.openems.edge.controller.ess.activepowervoltagecharacteristic/test/io/openems/edge/controller/ess/activepowervoltagecharacteristic/CharacteristicImplTest.java
+++ b/io.openems.edge.controller.ess.activepowervoltagecharacteristic/test/io/openems/edge/controller/ess/activepowervoltagecharacteristic/CharacteristicImplTest.java
@@ -26,7 +26,7 @@ public class CharacteristicImplTest {
 
 	@Test
 	public void test() throws Exception {
-		final TimeLeapClock clock = new TimeLeapClock(Instant.parse("2020-10-05T14:00:00.00Z"), ZoneOffset.UTC);
+		final var clock = new TimeLeapClock(Instant.parse("2020-10-05T14:00:00.00Z"), ZoneOffset.UTC);
 		new ControllerTest(new ActivePowerVoltageCharacteristicImpl())//
 				.addReference("cm", new DummyConfigurationAdmin()) //
 				.addReference("componentManager", new DummyComponentManager(clock)) //
diff --git a/io.openems.edge.controller.ess.activepowervoltagecharacteristic/test/io/openems/edge/controller/ess/activepowervoltagecharacteristic/MyConfig.java b/io.openems.edge.controller.ess.activepowervoltagecharacteristic/test/io/openems/edge/controller/ess/activepowervoltagecharacteristic/MyConfig.java
index afc868684f9..0a59fafdc3a 100644
--- a/io.openems.edge.controller.ess.activepowervoltagecharacteristic/test/io/openems/edge/controller/ess/activepowervoltagecharacteristic/MyConfig.java
+++ b/io.openems.edge.controller.ess.activepowervoltagecharacteristic/test/io/openems/edge/controller/ess/activepowervoltagecharacteristic/MyConfig.java
@@ -57,7 +57,7 @@ public MyConfig build() {
 
 	/**
 	 * Create a Config builder.
-	 * 
+	 *
 	 * @return a {@link Builder}
 	 */
 	public static Builder create() {

From a9be7b40acdfb6b03c0f8396ee47d4e4252475cd Mon Sep 17 00:00:00 2001
From: Stefan Feilmeier <stefan.feilmeier@fenecon.de>
Date: Mon, 7 Mar 2022 23:05:16 +0100
Subject: [PATCH 29/96] Update io.openems.edge.controller.ess.cycle

---
 .../edge/controller/ess/cycle/EssCycleImpl.java    | 14 +++++++-------
 .../cycle/statemachine/CompletedCycleHandler.java  |  2 +-
 .../controller/ess/cycle/statemachine/Context.java | 12 +++++-------
 .../statemachine/ContinueWithChargeHandler.java    | 11 ++++-------
 .../statemachine/ContinueWithDischargeHandler.java |  8 +++-----
 .../ess/cycle/statemachine/FinalSocHandler.java    | 10 +++++-----
 .../ess/cycle/statemachine/StartChargeHandler.java |  8 +++-----
 .../cycle/statemachine/StartDischargeHandler.java  |  8 +++-----
 .../ess/cycle/statemachine/UndefinedHandler.java   | 13 ++++++-------
 .../edge/controller/ess/cycle/CycleTest.java       |  8 ++++----
 .../edge/controller/ess/cycle/MyConfig.java        |  4 ++--
 11 files changed, 43 insertions(+), 55 deletions(-)

diff --git a/io.openems.edge.controller.ess.cycle/src/io/openems/edge/controller/ess/cycle/EssCycleImpl.java b/io.openems.edge.controller.ess.cycle/src/io/openems/edge/controller/ess/cycle/EssCycleImpl.java
index 460be438afe..03d2c6449ea 100644
--- a/io.openems.edge.controller.ess.cycle/src/io/openems/edge/controller/ess/cycle/EssCycleImpl.java
+++ b/io.openems.edge.controller.ess.cycle/src/io/openems/edge/controller/ess/cycle/EssCycleImpl.java
@@ -42,7 +42,7 @@ public class EssCycleImpl extends AbstractOpenemsComponent implements Controller
 	// Time formatter from the String
 	public static final String TIME_FORMAT = "HH:mm";
 
-	private StateMachine stateMachine = new StateMachine(State.UNDEFINED);
+	private final StateMachine stateMachine = new StateMachine(State.UNDEFINED);
 
 	private Config config;
 
@@ -77,12 +77,12 @@ private void activate(ComponentContext context, Config config) throws OpenemsNam
 		this.config = config;
 		super.activate(context, this.config.id(), this.config.alias(), this.config.enabled());
 		if (OpenemsComponent.updateReferenceFilter(this.cm, this.servicePid(), "ess", this.config.ess_id())) {
-			return;
 		}
 	}
 
 	// TODO add @Modified to enable configuration changes during long running cycles
 
+	@Override
 	@Deactivate
 	protected void deactivate() {
 		super.deactivate();
@@ -92,16 +92,16 @@ protected void deactivate() {
 	public void run() throws OpenemsNamedException {
 
 		// get max charge/discharge power
-		int maxDischargePower = this.ess.getPower().getMaxPower(this.ess, Phase.ALL, Pwr.ACTIVE);
-		int maxChargePower = this.ess.getPower().getMinPower(this.ess, Phase.ALL, Pwr.ACTIVE);
+		var maxDischargePower = this.ess.getPower().getMaxPower(this.ess, Phase.ALL, Pwr.ACTIVE);
+		var maxChargePower = this.ess.getPower().getMinPower(this.ess, Phase.ALL, Pwr.ACTIVE);
 
 		// store current state in StateMachine channel
-		State state = this.stateMachine.getCurrentState();
+		var state = this.stateMachine.getCurrentState();
 		this.channel(EssCycle.ChannelId.STATE_MACHINE).setNextValue(state);
 
 		// Prepare Context
-		State previousState = this.stateMachine.getPreviousState();
-		Context context = new Context(this, this.config, this.componentManager, this.ess, maxChargePower,
+		var previousState = this.stateMachine.getPreviousState();
+		var context = new Context(this, this.config, this.componentManager, this.ess, maxChargePower,
 				maxDischargePower, previousState, this.lastStateChange);
 
 		// Call the StateMachine
diff --git a/io.openems.edge.controller.ess.cycle/src/io/openems/edge/controller/ess/cycle/statemachine/CompletedCycleHandler.java b/io.openems.edge.controller.ess.cycle/src/io/openems/edge/controller/ess/cycle/statemachine/CompletedCycleHandler.java
index e5eebd757e4..544050e14f7 100644
--- a/io.openems.edge.controller.ess.cycle/src/io/openems/edge/controller/ess/cycle/statemachine/CompletedCycleHandler.java
+++ b/io.openems.edge.controller.ess.cycle/src/io/openems/edge/controller/ess/cycle/statemachine/CompletedCycleHandler.java
@@ -8,7 +8,7 @@ public class CompletedCycleHandler extends StateHandler<State, Context> {
 
 	@Override
 	public State runAndGetNextState(Context context) throws IllegalArgumentException, OpenemsNamedException {
-		int completedCycles = context.getParent().getCompletedCycles().orElse(0) + 1;
+		var completedCycles = context.getParent().getCompletedCycles().orElse(0) + 1;
 		context.getParent()._setCompletedCycles(completedCycles);
 
 		if (completedCycles == context.config.totalCycleNumber()) {
diff --git a/io.openems.edge.controller.ess.cycle/src/io/openems/edge/controller/ess/cycle/statemachine/Context.java b/io.openems.edge.controller.ess.cycle/src/io/openems/edge/controller/ess/cycle/statemachine/Context.java
index b32a41b8f06..e91416fabf3 100644
--- a/io.openems.edge.controller.ess.cycle/src/io/openems/edge/controller/ess/cycle/statemachine/Context.java
+++ b/io.openems.edge.controller.ess.cycle/src/io/openems/edge/controller/ess/cycle/statemachine/Context.java
@@ -41,7 +41,7 @@ public Context(EssCycle parent, Config config, ComponentManager componentManager
 	/**
 	 * Helper for a state change. If awaiting hysteresis time exceeded switches from
 	 * currentState to NextState.
-	 * 
+	 *
 	 * @param currentState Used to output better log.
 	 * @param nextState    state which will be switched to.
 	 * @return boolean true if change state is allowed
@@ -50,19 +50,17 @@ protected boolean waitForChangeState(State currentState, State nextState) {
 		if (LocalDateTime.now(this.componentManager.getClock()).minus(Duration.ofMinutes(this.config.standbyTime()))
 				.isAfter(this.lastStateChange)) {
 			return true;
-		} else {
-			this.logInfo(this.log,
-					"Awaiting hysteresis for changing from [" + currentState + "] to [" + nextState + "]");
-			return false;
 		}
+		this.logInfo(this.log, "Awaiting hysteresis for changing from [" + currentState + "] to [" + nextState + "]");
+		return false;
 	}
 
 	protected int getChargePower() {
 		// get max charge/discharge power
-		int power = Math.max(this.maxChargePower, this.config.power() * -1);
+		var power = Math.max(this.maxChargePower, this.config.power() * -1);
 		if (this.ess instanceof HybridEss) {
 			// modify target power by DC production for HybridEss
-			HybridEss ess = (HybridEss) this.ess;
+			var ess = (HybridEss) this.ess;
 			power -= ess.getActivePower().orElse(0) - ess.getDcDischargePower().orElse(0);
 		}
 		return power;
diff --git a/io.openems.edge.controller.ess.cycle/src/io/openems/edge/controller/ess/cycle/statemachine/ContinueWithChargeHandler.java b/io.openems.edge.controller.ess.cycle/src/io/openems/edge/controller/ess/cycle/statemachine/ContinueWithChargeHandler.java
index f7a49fec257..ddb0de2850a 100644
--- a/io.openems.edge.controller.ess.cycle/src/io/openems/edge/controller/ess/cycle/statemachine/ContinueWithChargeHandler.java
+++ b/io.openems.edge.controller.ess.cycle/src/io/openems/edge/controller/ess/cycle/statemachine/ContinueWithChargeHandler.java
@@ -6,7 +6,6 @@
 import io.openems.common.exceptions.OpenemsError.OpenemsNamedException;
 import io.openems.edge.common.statemachine.StateHandler;
 import io.openems.edge.controller.ess.cycle.statemachine.StateMachine.State;
-import io.openems.edge.ess.api.ManagedSymmetricEss;
 
 public class ContinueWithChargeHandler extends StateHandler<State, Context> {
 
@@ -14,28 +13,26 @@ public class ContinueWithChargeHandler extends StateHandler<State, Context> {
 
 	@Override
 	public State runAndGetNextState(Context context) throws IllegalArgumentException, OpenemsNamedException {
-		final ManagedSymmetricEss ess = context.ess;
+		final var ess = context.ess;
 
 		if (context.config.maxSoc() > 99) {
 			if (context.maxChargePower == 0) {
 				// Wait for hysteresis
 				if (context.waitForChangeState(State.CONTINUE_WITH_CHARGE, State.COMPLETED_CYCLE)) {
 					return State.COMPLETED_CYCLE;
-				} else {
-					return State.CONTINUE_WITH_CHARGE;
 				}
+				return State.CONTINUE_WITH_CHARGE;
 			}
 		} else if (ess.getSoc().orElse(0) >= context.config.maxSoc()) {
 			// Wait for hysteresis
 			if (context.waitForChangeState(State.CONTINUE_WITH_CHARGE, State.COMPLETED_CYCLE)) {
 				return State.COMPLETED_CYCLE;
-			} else {
-				return State.CONTINUE_WITH_CHARGE;
 			}
+			return State.CONTINUE_WITH_CHARGE;
 		}
 
 		// get max charge/discharge power
-		int power = context.getChargePower();
+		var power = context.getChargePower();
 		context.logInfo(this.log, "CONTINUE CHARGE with [" + power + " W]" //
 				+ " Current Cycle [ " + context.getParent().getCompletedCycles() + "] " //
 				+ "out of " + context.config.totalCycleNumber() + "]");
diff --git a/io.openems.edge.controller.ess.cycle/src/io/openems/edge/controller/ess/cycle/statemachine/ContinueWithDischargeHandler.java b/io.openems.edge.controller.ess.cycle/src/io/openems/edge/controller/ess/cycle/statemachine/ContinueWithDischargeHandler.java
index 032120a4cc6..3c603965d86 100644
--- a/io.openems.edge.controller.ess.cycle/src/io/openems/edge/controller/ess/cycle/statemachine/ContinueWithDischargeHandler.java
+++ b/io.openems.edge.controller.ess.cycle/src/io/openems/edge/controller/ess/cycle/statemachine/ContinueWithDischargeHandler.java
@@ -18,20 +18,18 @@ public State runAndGetNextState(Context context) throws IllegalArgumentException
 				// Wait for hysteresis
 				if (context.waitForChangeState(State.CONTINUE_WITH_DISCHARGE, State.COMPLETED_CYCLE)) {
 					return State.COMPLETED_CYCLE;
-				} else {
-					return State.CONTINUE_WITH_DISCHARGE;
 				}
+				return State.CONTINUE_WITH_DISCHARGE;
 			}
 		} else if (context.ess.getSoc().orElse(0) <= context.config.minSoc()) {
 			// Wait for hysteresis
 			if (context.waitForChangeState(State.CONTINUE_WITH_DISCHARGE, State.COMPLETED_CYCLE)) {
 				return State.COMPLETED_CYCLE;
-			} else {
-				return State.CONTINUE_WITH_DISCHARGE;
 			}
+			return State.CONTINUE_WITH_DISCHARGE;
 		}
 
-		int power = context.getDischargePower();
+		var power = context.getDischargePower();
 		context.logInfo(this.log, "CONTINUE DISCHARGE with [" + power + " W]" //
 				+ " Current Cycle [ " + context.getParent().getCompletedCycles() + "] " //
 				+ "out of " + context.config.totalCycleNumber() + "]");
diff --git a/io.openems.edge.controller.ess.cycle/src/io/openems/edge/controller/ess/cycle/statemachine/FinalSocHandler.java b/io.openems.edge.controller.ess.cycle/src/io/openems/edge/controller/ess/cycle/statemachine/FinalSocHandler.java
index e1b2a5be5f1..6d9f6bc7e24 100644
--- a/io.openems.edge.controller.ess.cycle/src/io/openems/edge/controller/ess/cycle/statemachine/FinalSocHandler.java
+++ b/io.openems.edge.controller.ess.cycle/src/io/openems/edge/controller/ess/cycle/statemachine/FinalSocHandler.java
@@ -6,7 +6,6 @@
 import io.openems.common.exceptions.OpenemsError.OpenemsNamedException;
 import io.openems.edge.common.statemachine.StateHandler;
 import io.openems.edge.controller.ess.cycle.statemachine.StateMachine.State;
-import io.openems.edge.ess.api.ManagedSymmetricEss;
 
 public class FinalSocHandler extends StateHandler<State, Context> {
 
@@ -14,18 +13,19 @@ public class FinalSocHandler extends StateHandler<State, Context> {
 
 	@Override
 	public State runAndGetNextState(Context context) throws IllegalArgumentException, OpenemsNamedException {
-		final ManagedSymmetricEss ess = context.ess;
+		final var ess = context.ess;
 
 		if (ess.getSoc().orElse(0) == context.config.finalSoc()) {
 			return State.FINISHED;
 
-		} else if (ess.getSoc().orElse(0) > context.config.finalSoc()) {
-			int power = Math.min(context.maxDischargePower, context.config.power());
+		}
+		if (ess.getSoc().orElse(0) > context.config.finalSoc()) {
+			var power = Math.min(context.maxDischargePower, context.config.power());
 			context.logInfo(this.log, "DISCHARGE with [" + power + " W]");
 			context.ess.setActivePowerGreaterOrEquals(power);
 
 		} else {
-			int power = Math.max(context.maxChargePower, context.config.power() * -1);
+			var power = Math.max(context.maxChargePower, context.config.power() * -1);
 			context.logInfo(this.log, "CHARGE with [" + power + " W]");
 			context.ess.setActivePowerLessOrEquals(power);
 		}
diff --git a/io.openems.edge.controller.ess.cycle/src/io/openems/edge/controller/ess/cycle/statemachine/StartChargeHandler.java b/io.openems.edge.controller.ess.cycle/src/io/openems/edge/controller/ess/cycle/statemachine/StartChargeHandler.java
index 6f8e5a49b7f..d55ce6df09f 100644
--- a/io.openems.edge.controller.ess.cycle/src/io/openems/edge/controller/ess/cycle/statemachine/StartChargeHandler.java
+++ b/io.openems.edge.controller.ess.cycle/src/io/openems/edge/controller/ess/cycle/statemachine/StartChargeHandler.java
@@ -18,21 +18,19 @@ public State runAndGetNextState(Context context) throws IllegalArgumentException
 				// Wait for hysteresis
 				if (context.waitForChangeState(State.START_CHARGE, State.CONTINUE_WITH_DISCHARGE)) {
 					return State.CONTINUE_WITH_DISCHARGE;
-				} else {
-					return State.START_CHARGE;
 				}
+				return State.START_CHARGE;
 			}
 		} else if (context.ess.getSoc().orElse(0) >= context.config.maxSoc()) {
 			// Wait for hysteresis
 			if (context.waitForChangeState(State.START_CHARGE, State.CONTINUE_WITH_DISCHARGE)) {
 				return State.CONTINUE_WITH_DISCHARGE;
-			} else {
-				return State.START_CHARGE;
 			}
+			return State.START_CHARGE;
 		}
 
 		// get max charge/discharge power
-		int power = context.getChargePower();
+		var power = context.getChargePower();
 		context.logInfo(this.log, "START CHARGE with [" + power + " W]" //
 				+ " Current Cycle [ " + context.getParent().getCompletedCycles() + "] " //
 				+ "out of " + context.config.totalCycleNumber() + "]");
diff --git a/io.openems.edge.controller.ess.cycle/src/io/openems/edge/controller/ess/cycle/statemachine/StartDischargeHandler.java b/io.openems.edge.controller.ess.cycle/src/io/openems/edge/controller/ess/cycle/statemachine/StartDischargeHandler.java
index e7aca974ade..e2585260cf2 100644
--- a/io.openems.edge.controller.ess.cycle/src/io/openems/edge/controller/ess/cycle/statemachine/StartDischargeHandler.java
+++ b/io.openems.edge.controller.ess.cycle/src/io/openems/edge/controller/ess/cycle/statemachine/StartDischargeHandler.java
@@ -18,20 +18,18 @@ public State runAndGetNextState(Context context) throws IllegalArgumentException
 				// Wait for hysteresis
 				if (context.waitForChangeState(State.START_DISCHARGE, State.CONTINUE_WITH_CHARGE)) {
 					return State.CONTINUE_WITH_CHARGE;
-				} else {
-					return State.START_DISCHARGE;
 				}
+				return State.START_DISCHARGE;
 			}
 		} else if (context.ess.getSoc().orElse(0) <= context.config.minSoc()) {
 			// Wait for hysteresis
 			if (context.waitForChangeState(State.START_DISCHARGE, State.CONTINUE_WITH_CHARGE)) {
 				return State.CONTINUE_WITH_CHARGE;
-			} else {
-				return State.START_DISCHARGE;
 			}
+			return State.START_DISCHARGE;
 		}
 
-		int power = context.getDischargePower();
+		var power = context.getDischargePower();
 		context.logInfo(this.log, "START DISCHARGE with [" + power + " W]" //
 				+ " Current Cycle [ " + context.getParent().getCompletedCycles() + "] " //
 				+ "out of " + context.config.totalCycleNumber() + "]");
diff --git a/io.openems.edge.controller.ess.cycle/src/io/openems/edge/controller/ess/cycle/statemachine/UndefinedHandler.java b/io.openems.edge.controller.ess.cycle/src/io/openems/edge/controller/ess/cycle/statemachine/UndefinedHandler.java
index 7342f11a273..6f90576bbf7 100644
--- a/io.openems.edge.controller.ess.cycle/src/io/openems/edge/controller/ess/cycle/statemachine/UndefinedHandler.java
+++ b/io.openems.edge.controller.ess.cycle/src/io/openems/edge/controller/ess/cycle/statemachine/UndefinedHandler.java
@@ -28,17 +28,17 @@ public State runAndGetNextState(Context context) throws IllegalArgumentException
 
 	/**
 	 * Helper to activate the full cycle activated or not.
-	 * 
+	 *
 	 * @param context the {@link Context}
 	 * @return true if the Controller should be executed now
 	 * @throws OpenemsNamedException throws Openems Named Exception.
 	 */
 	private boolean initializeTime(Context context) throws OpenemsNamedException {
-		LocalTime time = LocalTime.now(context.componentManager.getClock());
+		var time = LocalTime.now(context.componentManager.getClock());
 		// TODO: it would be better to do the parsing of `startTime` once and not every
 		// Cycle/Second.
-		DateTimeFormatter formatter = DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm");
-		LocalTime localTime = LocalTime.parse(context.config.startTime(), formatter);
+		var formatter = DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm");
+		var localTime = LocalTime.parse(context.config.startTime(), formatter);
 		if (time.isAfter(localTime.minusSeconds(1))) {
 			if (time.isBefore(localTime.plusSeconds(59))) {
 				return true;
@@ -50,7 +50,7 @@ private boolean initializeTime(Context context) throws OpenemsNamedException {
 	/**
 	 * Gets the configured {@link CycleOrder} or automatically derives it from the
 	 * ESS State-of-Charge.
-	 * 
+	 *
 	 * @param context the {@link Context}
 	 * @return the {@link CycleOrder}
 	 */
@@ -64,9 +64,8 @@ private CycleOrder getCycleOrder(Context context) {
 			int soc = context.ess.getSoc().orElse(0); // defaults to START_WITH_DISCHARGE
 			if (soc < 50) {
 				return CycleOrder.START_WITH_DISCHARGE;
-			} else {
-				return CycleOrder.START_WITH_CHARGE;
 			}
+			return CycleOrder.START_WITH_CHARGE;
 		}
 		return CycleOrder.AUTO;
 	}
diff --git a/io.openems.edge.controller.ess.cycle/test/io/openems/edge/controller/ess/cycle/CycleTest.java b/io.openems.edge.controller.ess.cycle/test/io/openems/edge/controller/ess/cycle/CycleTest.java
index de5743e7630..f6b67bac507 100644
--- a/io.openems.edge.controller.ess.cycle/test/io/openems/edge/controller/ess/cycle/CycleTest.java
+++ b/io.openems.edge.controller.ess.cycle/test/io/openems/edge/controller/ess/cycle/CycleTest.java
@@ -34,10 +34,10 @@ public class CycleTest {
 
 	@Test
 	public void test() throws Exception {
-		final TimeLeapClock clock = new TimeLeapClock(Instant.parse("2021-09-12T17:55:10.00Z"), ZoneOffset.UTC);
-		final DummyPower power = new DummyPower(10_000);
-		final DummyManagedSymmetricEss ess = new DummyManagedSymmetricEss(ESS_ID, power);
-		final ControllerTest test = new ControllerTest(new EssCycleImpl()) //
+		final var clock = new TimeLeapClock(Instant.parse("2021-09-12T17:55:10.00Z"), ZoneOffset.UTC);
+		final var power = new DummyPower(10_000);
+		final var ess = new DummyManagedSymmetricEss(ESS_ID, power);
+		final var test = new ControllerTest(new EssCycleImpl()) //
 				.addReference("componentManager", new DummyComponentManager(clock)) //
 				.addReference("cm", new DummyConfigurationAdmin()) //
 				.addReference("ess", ess) //
diff --git a/io.openems.edge.controller.ess.cycle/test/io/openems/edge/controller/ess/cycle/MyConfig.java b/io.openems.edge.controller.ess.cycle/test/io/openems/edge/controller/ess/cycle/MyConfig.java
index a4ef85e7537..24c649130c3 100644
--- a/io.openems.edge.controller.ess.cycle/test/io/openems/edge/controller/ess/cycle/MyConfig.java
+++ b/io.openems.edge.controller.ess.cycle/test/io/openems/edge/controller/ess/cycle/MyConfig.java
@@ -70,7 +70,7 @@ public Builder setFinalSoc(int finalSoc) {
 			this.finalSoc = finalSoc;
 			return this;
 		}
-	
+
 		public MyConfig build() {
 			return new MyConfig(this);
 		}
@@ -78,7 +78,7 @@ public MyConfig build() {
 
 	/**
 	 * Create a Config builder.
-	 * 
+	 *
 	 * @return a {@link Builder}
 	 */
 	public static Builder create() {

From 63bc394f82a87e7b1a99b3372e5baa5d0d23db82 Mon Sep 17 00:00:00 2001
From: Stefan Feilmeier <stefan.feilmeier@fenecon.de>
Date: Mon, 7 Mar 2022 23:05:54 +0100
Subject: [PATCH 30/96] Update io.openems.edge.controller.ess.delaycharge

---
 .../delaycharge/DelayChargeController.java    | 19 +++++++++----------
 .../controller/ess/delaycharge/State.java     |  4 ++--
 .../DelayChargeControllerTest.java            |  2 +-
 .../controller/ess/delaycharge/MyConfig.java  |  2 +-
 4 files changed, 13 insertions(+), 14 deletions(-)

diff --git a/io.openems.edge.controller.ess.delaycharge/src/io/openems/edge/controller/ess/delaycharge/DelayChargeController.java b/io.openems.edge.controller.ess.delaycharge/src/io/openems/edge/controller/ess/delaycharge/DelayChargeController.java
index eb821e4dd6a..36fc1fe8a57 100644
--- a/io.openems.edge.controller.ess.delaycharge/src/io/openems/edge/controller/ess/delaycharge/DelayChargeController.java
+++ b/io.openems.edge.controller.ess.delaycharge/src/io/openems/edge/controller/ess/delaycharge/DelayChargeController.java
@@ -13,8 +13,6 @@
 import io.openems.common.exceptions.OpenemsError.OpenemsNamedException;
 import io.openems.common.types.OpenemsType;
 import io.openems.edge.common.channel.Doc;
-import io.openems.edge.common.channel.EnumReadChannel;
-import io.openems.edge.common.channel.IntegerReadChannel;
 import io.openems.edge.common.component.AbstractOpenemsComponent;
 import io.openems.edge.common.component.ComponentManager;
 import io.openems.edge.common.component.OpenemsComponent;
@@ -66,6 +64,7 @@ void activate(ComponentContext context, Config config) {
 		this.config = config;
 	}
 
+	@Override
 	@Deactivate
 	protected void deactivate() {
 		super.deactivate();
@@ -76,10 +75,10 @@ public void run() throws OpenemsNamedException {
 		// Get required variables
 		ManagedSymmetricEss ess = this.componentManager.getComponent(this.config.ess_id());
 		int capacity = ess.getCapacity().getOrError();
-		int targetSecondOfDay = this.config.targetHour() * 3600;
+		var targetSecondOfDay = this.config.targetHour() * 3600;
 
 		// calculate remaining capacity in Ws
-		int remainingCapacity = capacity * (100 - ess.getSoc().getOrError()) * 36;
+		var remainingCapacity = capacity * (100 - ess.getSoc().getOrError()) * 36;
 
 		// No remaining capacity -> no restrictions
 		if (remainingCapacity < 0) {
@@ -88,7 +87,7 @@ public void run() throws OpenemsNamedException {
 		}
 
 		// calculate remaining time
-		int remainingTime = targetSecondOfDay - currentSecondOfDay();
+		var remainingTime = targetSecondOfDay - this.currentSecondOfDay();
 
 		// We already passed the "target hour of day" -> no restrictions
 		if (remainingTime < 0) {
@@ -97,29 +96,29 @@ public void run() throws OpenemsNamedException {
 		}
 
 		// calculate charge power limit
-		int limit = remainingCapacity / remainingTime * -1;
+		var limit = remainingCapacity / remainingTime * -1;
 
 		// reduce limit to MaxApparentPower to avoid very high values in the last
 		// seconds
 		limit = Math.min(limit, ess.getMaxApparentPower().orElse(0));
 
 		// set ActiveLimit channel
-		setChannels(State.ACTIVE_LIMIT, limit * -1);
+		this.setChannels(State.ACTIVE_LIMIT, limit * -1);
 
 		// Set limitation for ChargePower
 		ess.setActivePowerGreaterOrEquals(limit);
 	}
 
 	private int currentSecondOfDay() {
-		LocalDateTime now = LocalDateTime.now(this.componentManager.getClock());
+		var now = LocalDateTime.now(this.componentManager.getClock());
 		return now.getHour() * 3600 + now.getMinute() * 60 + now.getSecond();
 	}
 
 	private void setChannels(State state, int limit) {
-		EnumReadChannel stateMachineChannel = this.channel(ChannelId.STATE_MACHINE);
+		var stateMachineChannel = this.channel(ChannelId.STATE_MACHINE);
 		stateMachineChannel.setNextValue(state);
 
-		IntegerReadChannel chargePowerLimitChannel = this.channel(ChannelId.CHARGE_POWER_LIMIT);
+		var chargePowerLimitChannel = this.channel(ChannelId.CHARGE_POWER_LIMIT);
 		chargePowerLimitChannel.setNextValue(limit);
 	}
 }
diff --git a/io.openems.edge.controller.ess.delaycharge/src/io/openems/edge/controller/ess/delaycharge/State.java b/io.openems.edge.controller.ess.delaycharge/src/io/openems/edge/controller/ess/delaycharge/State.java
index 06be95b7726..e384a5abd0b 100644
--- a/io.openems.edge.controller.ess.delaycharge/src/io/openems/edge/controller/ess/delaycharge/State.java
+++ b/io.openems.edge.controller.ess.delaycharge/src/io/openems/edge/controller/ess/delaycharge/State.java
@@ -18,12 +18,12 @@ private State(int value, String name) {
 
 	@Override
 	public int getValue() {
-		return value;
+		return this.value;
 	}
 
 	@Override
 	public String getName() {
-		return name;
+		return this.name;
 	}
 
 	@Override
diff --git a/io.openems.edge.controller.ess.delaycharge/test/io/openems/edge/controller/ess/delaycharge/DelayChargeControllerTest.java b/io.openems.edge.controller.ess.delaycharge/test/io/openems/edge/controller/ess/delaycharge/DelayChargeControllerTest.java
index dc6c84f7548..58b8b118dc3 100644
--- a/io.openems.edge.controller.ess.delaycharge/test/io/openems/edge/controller/ess/delaycharge/DelayChargeControllerTest.java
+++ b/io.openems.edge.controller.ess.delaycharge/test/io/openems/edge/controller/ess/delaycharge/DelayChargeControllerTest.java
@@ -23,7 +23,7 @@ public class DelayChargeControllerTest {
 	@Test
 	public void test() throws Exception {
 		// Initialize mocked Clock
-		final TimeLeapClock clock = new TimeLeapClock(
+		final var clock = new TimeLeapClock(
 				Instant.ofEpochMilli(1546300800000L /* Tuesday, 1. January 2019 00:00:00 */), ZoneId.of("UTC"));
 		new ControllerTest(new DelayChargeController()) //
 				.addReference("componentManager", new DummyComponentManager(clock)) //
diff --git a/io.openems.edge.controller.ess.delaycharge/test/io/openems/edge/controller/ess/delaycharge/MyConfig.java b/io.openems.edge.controller.ess.delaycharge/test/io/openems/edge/controller/ess/delaycharge/MyConfig.java
index fd6877f0898..84d15cf4650 100644
--- a/io.openems.edge.controller.ess.delaycharge/test/io/openems/edge/controller/ess/delaycharge/MyConfig.java
+++ b/io.openems.edge.controller.ess.delaycharge/test/io/openems/edge/controller/ess/delaycharge/MyConfig.java
@@ -35,7 +35,7 @@ public MyConfig build() {
 
 	/**
 	 * Create a Config builder.
-	 * 
+	 *
 	 * @return a {@link Builder}
 	 */
 	public static Builder create() {

From cc5a8a3e7d4d97c1e52897316e1d5aa204d75656 Mon Sep 17 00:00:00 2001
From: Stefan Feilmeier <stefan.feilmeier@fenecon.de>
Date: Mon, 7 Mar 2022 23:06:48 +0100
Subject: [PATCH 31/96] Update io.openems.edge.controller.ess.delayedselltogrid

---
 .../ess/delayedselltogrid/DelayedSellToGridImpl.java      | 8 ++++----
 .../edge/controller/ess/delayedselltogrid/MyConfig.java   | 4 ++--
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/io.openems.edge.controller.ess.delayedselltogrid/src/io/openems/edge/controller/ess/delayedselltogrid/DelayedSellToGridImpl.java b/io.openems.edge.controller.ess.delayedselltogrid/src/io/openems/edge/controller/ess/delayedselltogrid/DelayedSellToGridImpl.java
index 41fb4142b2e..352fb9f3fb1 100644
--- a/io.openems.edge.controller.ess.delayedselltogrid/src/io/openems/edge/controller/ess/delayedselltogrid/DelayedSellToGridImpl.java
+++ b/io.openems.edge.controller.ess.delayedselltogrid/src/io/openems/edge/controller/ess/delayedselltogrid/DelayedSellToGridImpl.java
@@ -18,7 +18,6 @@
 import io.openems.edge.common.component.AbstractOpenemsComponent;
 import io.openems.edge.common.component.ComponentManager;
 import io.openems.edge.common.component.OpenemsComponent;
-import io.openems.edge.common.sum.GridMode;
 import io.openems.edge.controller.api.Controller;
 import io.openems.edge.ess.api.ManagedSymmetricEss;
 import io.openems.edge.ess.power.api.Power;
@@ -71,6 +70,7 @@ void activate(ComponentContext context, Config config) {
 		}
 	}
 
+	@Override
 	@Deactivate
 	protected void deactivate() {
 		super.deactivate();
@@ -84,7 +84,7 @@ public void run() throws OpenemsNamedException {
 		/*
 		 * Check that we are On-Grid (and warn on undefined Grid-Mode)
 		 */
-		GridMode gridMode = ess.getGridMode();
+		var gridMode = ess.getGridMode();
 		if (gridMode.isUndefined()) {
 			this.logWarn(this.log, "Grid-Mode is [UNDEFINED]");
 		}
@@ -98,7 +98,7 @@ public void run() throws OpenemsNamedException {
 
 		int essPower = ess.getActivePower().getOrError();/* current charge/discharge Ess */
 		// Calculate 'real' grid-power (without current ESS charge/discharge)
-		int gridPower = meter.getActivePower().getOrError() + essPower;
+		var gridPower = meter.getActivePower().getOrError() + essPower;
 
 		int calculatedPower;
 		if (gridPower <= -this.config.sellToGridPowerLimit()) {
@@ -107,7 +107,7 @@ public void run() throws OpenemsNamedException {
 			 */
 			calculatedPower = gridPower - (-this.config.sellToGridPowerLimit());
 
-		} else if (gridPower >= -this.config.continuousSellToGridPower()) { 
+		} else if (gridPower >= -this.config.continuousSellToGridPower()) {
 
 			/*
 			 * Continuous Sell To Grid
diff --git a/io.openems.edge.controller.ess.delayedselltogrid/test/io/openems/edge/controller/ess/delayedselltogrid/MyConfig.java b/io.openems.edge.controller.ess.delayedselltogrid/test/io/openems/edge/controller/ess/delayedselltogrid/MyConfig.java
index 3d79543a3ec..cfd07288214 100644
--- a/io.openems.edge.controller.ess.delayedselltogrid/test/io/openems/edge/controller/ess/delayedselltogrid/MyConfig.java
+++ b/io.openems.edge.controller.ess.delayedselltogrid/test/io/openems/edge/controller/ess/delayedselltogrid/MyConfig.java
@@ -40,7 +40,7 @@ public Builder setSellToGridPowerLimit(int sellToGridPowerLimit) {
 			this.sellToGridPowerLimit = sellToGridPowerLimit;
 			return this;
 		}
-		
+
 		public MyConfig build() {
 			return new MyConfig(this);
 		}
@@ -48,7 +48,7 @@ public MyConfig build() {
 
 	/**
 	 * Create a Config builder.
-	 * 
+	 *
 	 * @return a {@link Builder}
 	 */
 	public static Builder create() {

From 205808ed55d726c20a938aa792db9093b31ea2d5 Mon Sep 17 00:00:00 2001
From: Stefan Feilmeier <stefan.feilmeier@fenecon.de>
Date: Mon, 7 Mar 2022 23:07:22 +0100
Subject: [PATCH 32/96] Update
 io.openems.edge.controller.ess.emergencycapacityreserve

---
 .../EmergencyCapacityReserveImpl.java         | 32 +++++++++----------
 .../statemachine/AboveReserveSocHandler.java  |  7 ++--
 .../statemachine/AtReserveSocHandler.java     |  7 ++--
 .../statemachine/BelowReserveSocHandler.java  |  2 +-
 .../statemachine/ForceChargeHandler.java      |  5 ++-
 .../statemachine/NoLimitHandler.java          |  4 +--
 .../EmergencyCapacityReserveImplTest.java     | 10 +++---
 .../emergencycapacityreserve/MyConfig.java    |  2 +-
 8 files changed, 33 insertions(+), 36 deletions(-)

diff --git a/io.openems.edge.controller.ess.emergencycapacityreserve/src/io/openems/edge/controller/ess/emergencycapacityreserve/EmergencyCapacityReserveImpl.java b/io.openems.edge.controller.ess.emergencycapacityreserve/src/io/openems/edge/controller/ess/emergencycapacityreserve/EmergencyCapacityReserveImpl.java
index c189597da72..23448293f8b 100644
--- a/io.openems.edge.controller.ess.emergencycapacityreserve/src/io/openems/edge/controller/ess/emergencycapacityreserve/EmergencyCapacityReserveImpl.java
+++ b/io.openems.edge.controller.ess.emergencycapacityreserve/src/io/openems/edge/controller/ess/emergencycapacityreserve/EmergencyCapacityReserveImpl.java
@@ -83,9 +83,10 @@ void activate(ComponentContext context, Config config) {
 	@Override
 	protected void modified(ComponentContext context, String id, String alias, boolean enabled) {
 		super.modified(context, id, alias, enabled);
-		this.updateConfig(config);
+		this.updateConfig(this.config);
 	}
 
+	@Override
 	@Deactivate
 	protected void deactivate() {
 		super.deactivate();
@@ -93,19 +94,19 @@ protected void deactivate() {
 
 	@Override
 	public void run() throws OpenemsNamedException {
-		Context context = this.handleStateMachine();
+		var context = this.handleStateMachine();
 
 		if (this.config.isReserveSocEnabled()) {
-			Integer activePowerConstraint = rampFilter.getFilteredValueAsInteger(context.getTargetPower(),
+			var activePowerConstraint = this.rampFilter.getFilteredValueAsInteger(context.getTargetPower(),
 					context.getRampPower());
 
 			if (activePowerConstraint != null && context.maxApparentPower > activePowerConstraint) {
 				// Set constraint did not reach max apparent power
-				ess.setActivePowerLessOrEquals(activePowerConstraint);
+				this.ess.setActivePowerLessOrEquals(activePowerConstraint);
 				this._setDebugSetActivePowerLessOrEquals(activePowerConstraint);
 			} else {
 				// Set no constraint max apparent power reached
-				ess.setActivePowerLessOrEquals(null);
+				this.ess.setActivePowerLessOrEquals(null);
 				this._setDebugSetActivePowerLessOrEquals(null);
 			}
 
@@ -118,13 +119,13 @@ public void run() throws OpenemsNamedException {
 
 	/**
 	 * Update {@link Config} for the controller.
-	 * 
+	 *
 	 * @param config to update
 	 */
 	private void updateConfig(Config config) {
 		this.config = config;
 
-		boolean enableWarning = false;
+		var enableWarning = false;
 		if (this.config.reserveSoc() < reservSocMinValue || this.config.reserveSoc() > reservSocMaxValue) {
 			enableWarning = true;
 		}
@@ -132,25 +133,24 @@ private void updateConfig(Config config) {
 		this._setRangeOfReserveSocOutsideAllowedValue(enableWarning);
 
 		if (OpenemsComponent.updateReferenceFilter(this.cm, this.servicePid(), "ess", config.ess_id())) {
-			return;
 		}
 	}
 
 	/**
 	 * Handle different {@link State} of the {@link StateMachine}.
-	 * 
+	 *
 	 * @return created {@link Context}
 	 */
 	private Context handleStateMachine() {
 		this._setStateMachine(this.stateMachine.getCurrentState());
 
-		Value<Integer> soc = ess.getSoc();
-		Value<Integer> maxApparentPower = ess.getMaxApparentPower();
+		var soc = this.ess.getSoc();
+		var maxApparentPower = this.ess.getMaxApparentPower();
 
 		Integer socToUse = null;
 		if (!soc.isDefined()) {
 			// use last valid soc value
-			OptionalInt lastSocValue = this.getLastValidSoc(ess.getSocChannel());
+			var lastSocValue = this.getLastValidSoc(this.ess.getSocChannel());
 			if (lastSocValue.isPresent()) {
 				socToUse = lastSocValue.getAsInt();
 			}
@@ -163,7 +163,7 @@ private Context handleStateMachine() {
 			this.stateMachine.forceNextState(State.NO_LIMIT);
 		}
 
-		Context context = new Context(this, this.sum, maxApparentPower.get(), socToUse, this.config.reserveSoc());
+		var context = new Context(this, this.sum, maxApparentPower.get(), socToUse, this.config.reserveSoc());
 		try {
 			this.stateMachine.run(context);
 
@@ -180,7 +180,7 @@ private Context handleStateMachine() {
 	/**
 	 * Get last defined value of an {@link IntegerReadChannel} as an
 	 * {@link OptionalInt}.
-	 * 
+	 *
 	 * @param channel {@link IntegerReadChannel} to get values
 	 * @return Last defined value from given {@link IntegerReadChannel}
 	 */
@@ -188,8 +188,8 @@ private OptionalInt getLastValidSoc(IntegerReadChannel channel) {
 		// get first defined value
 		return channel.getPastValues().values() //
 				.stream() //
-				.filter(value -> value.isDefined()) //
-				.mapToInt(value -> value.get()) //
+				.filter(Value::isDefined) //
+				.mapToInt(Value::get) //
 				.findFirst();
 	}
 
diff --git a/io.openems.edge.controller.ess.emergencycapacityreserve/src/io/openems/edge/controller/ess/emergencycapacityreserve/statemachine/AboveReserveSocHandler.java b/io.openems.edge.controller.ess.emergencycapacityreserve/src/io/openems/edge/controller/ess/emergencycapacityreserve/statemachine/AboveReserveSocHandler.java
index ad2e4eb1c5a..2583d542f6a 100644
--- a/io.openems.edge.controller.ess.emergencycapacityreserve/src/io/openems/edge/controller/ess/emergencycapacityreserve/statemachine/AboveReserveSocHandler.java
+++ b/io.openems.edge.controller.ess.emergencycapacityreserve/src/io/openems/edge/controller/ess/emergencycapacityreserve/statemachine/AboveReserveSocHandler.java
@@ -2,21 +2,20 @@
 
 import io.openems.common.exceptions.OpenemsError.OpenemsNamedException;
 import io.openems.edge.common.statemachine.StateHandler;
-import io.openems.edge.common.sum.Sum;
 import io.openems.edge.controller.ess.emergencycapacityreserve.statemachine.StateMachine.State;
 
 public class AboveReserveSocHandler extends StateHandler<State, Context> {
 
 	@Override
 	protected State runAndGetNextState(Context context) throws OpenemsNamedException {
-		Sum sum = context.sum;
+		var sum = context.sum;
 
 		// calculate target and ramp power
-		int targetPower = Math.max(context.maxApparentPower / 2, sum.getProductionDcActualPower().orElse(0));
+		var targetPower = Math.max(context.maxApparentPower / 2, sum.getProductionDcActualPower().orElse(0));
 		context.setTargetPower(targetPower);
 		context.setRampPower(context.maxApparentPower * 0.01);
 
-		int reserveSoc = context.reserveSoc;
+		var reserveSoc = context.reserveSoc;
 		int soc = context.soc;
 
 		// SoC is less or equals then configured reserveSoC
diff --git a/io.openems.edge.controller.ess.emergencycapacityreserve/src/io/openems/edge/controller/ess/emergencycapacityreserve/statemachine/AtReserveSocHandler.java b/io.openems.edge.controller.ess.emergencycapacityreserve/src/io/openems/edge/controller/ess/emergencycapacityreserve/statemachine/AtReserveSocHandler.java
index 74250c6ad42..cdf5d039757 100644
--- a/io.openems.edge.controller.ess.emergencycapacityreserve/src/io/openems/edge/controller/ess/emergencycapacityreserve/statemachine/AtReserveSocHandler.java
+++ b/io.openems.edge.controller.ess.emergencycapacityreserve/src/io/openems/edge/controller/ess/emergencycapacityreserve/statemachine/AtReserveSocHandler.java
@@ -2,21 +2,20 @@
 
 import io.openems.common.exceptions.OpenemsError.OpenemsNamedException;
 import io.openems.edge.common.statemachine.StateHandler;
-import io.openems.edge.common.sum.Sum;
 import io.openems.edge.controller.ess.emergencycapacityreserve.statemachine.StateMachine.State;
 
 public class AtReserveSocHandler extends StateHandler<State, Context> {
 
 	@Override
 	protected State runAndGetNextState(Context context) throws OpenemsNamedException {
-		Sum sum = context.sum;
+		var sum = context.sum;
 
 		// calculate target and ramp power
-		int targetPower = Math.max(0, sum.getProductionDcActualPower().orElse(0));
+		var targetPower = Math.max(0, sum.getProductionDcActualPower().orElse(0));
 		context.setTargetPower(targetPower);
 		context.setRampPower(context.maxApparentPower * 0.01);
 
-		int reserveSoc = context.reserveSoc;
+		var reserveSoc = context.reserveSoc;
 		int soc = context.soc;
 
 		// SoC is under configured reserveSoC
diff --git a/io.openems.edge.controller.ess.emergencycapacityreserve/src/io/openems/edge/controller/ess/emergencycapacityreserve/statemachine/BelowReserveSocHandler.java b/io.openems.edge.controller.ess.emergencycapacityreserve/src/io/openems/edge/controller/ess/emergencycapacityreserve/statemachine/BelowReserveSocHandler.java
index e64fc4558f7..f68c5ca26fa 100644
--- a/io.openems.edge.controller.ess.emergencycapacityreserve/src/io/openems/edge/controller/ess/emergencycapacityreserve/statemachine/BelowReserveSocHandler.java
+++ b/io.openems.edge.controller.ess.emergencycapacityreserve/src/io/openems/edge/controller/ess/emergencycapacityreserve/statemachine/BelowReserveSocHandler.java
@@ -12,7 +12,7 @@ protected State runAndGetNextState(Context context) throws OpenemsNamedException
 		context.setTargetPower(0);
 		context.setRampPower(context.maxApparentPower * 0.05);
 
-		int reserveSoc = context.reserveSoc;
+		var reserveSoc = context.reserveSoc;
 		int soc = context.soc;
 
 		// SoC is 4% under configured reserveSoC
diff --git a/io.openems.edge.controller.ess.emergencycapacityreserve/src/io/openems/edge/controller/ess/emergencycapacityreserve/statemachine/ForceChargeHandler.java b/io.openems.edge.controller.ess.emergencycapacityreserve/src/io/openems/edge/controller/ess/emergencycapacityreserve/statemachine/ForceChargeHandler.java
index 773aa06c404..8b986abe91b 100644
--- a/io.openems.edge.controller.ess.emergencycapacityreserve/src/io/openems/edge/controller/ess/emergencycapacityreserve/statemachine/ForceChargeHandler.java
+++ b/io.openems.edge.controller.ess.emergencycapacityreserve/src/io/openems/edge/controller/ess/emergencycapacityreserve/statemachine/ForceChargeHandler.java
@@ -2,21 +2,20 @@
 
 import io.openems.common.exceptions.OpenemsError.OpenemsNamedException;
 import io.openems.edge.common.statemachine.StateHandler;
-import io.openems.edge.common.sum.Sum;
 import io.openems.edge.controller.ess.emergencycapacityreserve.statemachine.StateMachine.State;
 
 public class ForceChargeHandler extends StateHandler<State, Context> {
 
 	@Override
 	protected State runAndGetNextState(Context context) throws OpenemsNamedException {
-		Sum sum = context.sum;
+		var sum = context.sum;
 
 		// calculate target and ramp power
 		int acProduction = sum.getProductionAcActivePower().orElse(0);
 		context.setTargetPower(acProduction * -1);
 		context.setRampPower(context.maxApparentPower * 0.01);
 
-		int reserveSoc = context.reserveSoc;
+		var reserveSoc = context.reserveSoc;
 		int soc = context.soc;
 
 		// SoC is greater or equals then configured reserveSoC
diff --git a/io.openems.edge.controller.ess.emergencycapacityreserve/src/io/openems/edge/controller/ess/emergencycapacityreserve/statemachine/NoLimitHandler.java b/io.openems.edge.controller.ess.emergencycapacityreserve/src/io/openems/edge/controller/ess/emergencycapacityreserve/statemachine/NoLimitHandler.java
index 93f601fd276..0706c35b65b 100644
--- a/io.openems.edge.controller.ess.emergencycapacityreserve/src/io/openems/edge/controller/ess/emergencycapacityreserve/statemachine/NoLimitHandler.java
+++ b/io.openems.edge.controller.ess.emergencycapacityreserve/src/io/openems/edge/controller/ess/emergencycapacityreserve/statemachine/NoLimitHandler.java
@@ -13,8 +13,8 @@ protected State runAndGetNextState(Context context) throws OpenemsNamedException
 			context.setTargetPower(context.maxApparentPower);
 			context.setRampPower(context.maxApparentPower * 0.01);
 
-			int reserveSoc = context.reserveSoc;
-			Integer soc = context.soc;
+			var reserveSoc = context.reserveSoc;
+			var soc = context.soc;
 
 			// SoC is just above reserveSoC
 			if (soc <= reserveSoc + 1) {
diff --git a/io.openems.edge.controller.ess.emergencycapacityreserve/test/io/openems/edge/controller/ess/emergencycapacityreserve/EmergencyCapacityReserveImplTest.java b/io.openems.edge.controller.ess.emergencycapacityreserve/test/io/openems/edge/controller/ess/emergencycapacityreserve/EmergencyCapacityReserveImplTest.java
index b62d78f12e9..ddcb45ca983 100644
--- a/io.openems.edge.controller.ess.emergencycapacityreserve/test/io/openems/edge/controller/ess/emergencycapacityreserve/EmergencyCapacityReserveImplTest.java
+++ b/io.openems.edge.controller.ess.emergencycapacityreserve/test/io/openems/edge/controller/ess/emergencycapacityreserve/EmergencyCapacityReserveImplTest.java
@@ -112,7 +112,7 @@ public void testReserveSocRange() throws Exception {
 
 	@Test
 	public void testReachTargetPower() throws Exception {
-		ControllerTest controllerTest = new ControllerTest(new EmergencyCapacityReserveImpl()) //
+		var controllerTest = new ControllerTest(new EmergencyCapacityReserveImpl()) //
 				.addReference("componentManager", new DummyComponentManager()) //
 				.addReference("cm", new DummyConfigurationAdmin()) //
 				.addReference("sum", new DummySum()) //
@@ -131,12 +131,12 @@ public void testReachTargetPower() throws Exception {
 						.input(ESS_SOC, 21) //
 						.output(STATE_MACHINE, State.NO_LIMIT)); //
 
-		int maxApparentPower = 10000;
+		var maxApparentPower = 10000;
 		Integer targetPower = maxApparentPower / 2;
-		double rampPower = maxApparentPower * 0.01;
+		var rampPower = maxApparentPower * 0.01;
 
-		int result = maxApparentPower;
-		for (int i = 0; i < 100; i++) {
+		var result = maxApparentPower;
+		for (var i = 0; i < 100; i++) {
 			if (result > targetPower) {
 				result -= rampPower;
 			}
diff --git a/io.openems.edge.controller.ess.emergencycapacityreserve/test/io/openems/edge/controller/ess/emergencycapacityreserve/MyConfig.java b/io.openems.edge.controller.ess.emergencycapacityreserve/test/io/openems/edge/controller/ess/emergencycapacityreserve/MyConfig.java
index c9d3cdf5bc7..4908b16b9c9 100644
--- a/io.openems.edge.controller.ess.emergencycapacityreserve/test/io/openems/edge/controller/ess/emergencycapacityreserve/MyConfig.java
+++ b/io.openems.edge.controller.ess.emergencycapacityreserve/test/io/openems/edge/controller/ess/emergencycapacityreserve/MyConfig.java
@@ -43,7 +43,7 @@ public MyConfig build() {
 
 	/**
 	 * Create a Config builder.
-	 * 
+	 *
 	 * @return a {@link Builder}
 	 */
 	public static Builder create() {

From f16cf4997e9ffe597ab78758313294ec199be026 Mon Sep 17 00:00:00 2001
From: Stefan Feilmeier <stefan.feilmeier@fenecon.de>
Date: Mon, 7 Mar 2022 23:07:55 +0100
Subject: [PATCH 33/96] Update io.openems.edge.controller.ess.fixactivepower

---
 .../ess/fixactivepower/EssFixActivePowerImpl.java           | 3 +--
 .../edge/controller/ess/fixactivepower/MyConfig.java        | 6 +++---
 2 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/io.openems.edge.controller.ess.fixactivepower/src/io/openems/edge/controller/ess/fixactivepower/EssFixActivePowerImpl.java b/io.openems.edge.controller.ess.fixactivepower/src/io/openems/edge/controller/ess/fixactivepower/EssFixActivePowerImpl.java
index d191ebb786e..7067e5fbb77 100644
--- a/io.openems.edge.controller.ess.fixactivepower/src/io/openems/edge/controller/ess/fixactivepower/EssFixActivePowerImpl.java
+++ b/io.openems.edge.controller.ess.fixactivepower/src/io/openems/edge/controller/ess/fixactivepower/EssFixActivePowerImpl.java
@@ -48,7 +48,6 @@ public EssFixActivePowerImpl() {
 	private void activate(ComponentContext context, Config config) {
 		super.activate(context, config.id(), config.alias(), config.enabled());
 		if (this.applyConfig(context, config)) {
-			return;
 		}
 	}
 
@@ -56,7 +55,6 @@ private void activate(ComponentContext context, Config config) {
 	private void modified(ComponentContext context, Config config) {
 		super.modified(context, config.id(), config.alias(), config.enabled());
 		if (this.applyConfig(context, config)) {
-			return;
 		}
 	}
 
@@ -65,6 +63,7 @@ private boolean applyConfig(ComponentContext context, Config config) {
 		return OpenemsComponent.updateReferenceFilter(this.cm, this.servicePid(), "ess", config.ess_id());
 	}
 
+	@Override
 	@Deactivate
 	protected void deactivate() {
 		super.deactivate();
diff --git a/io.openems.edge.controller.ess.fixactivepower/test/io/openems/edge/controller/ess/fixactivepower/MyConfig.java b/io.openems.edge.controller.ess.fixactivepower/test/io/openems/edge/controller/ess/fixactivepower/MyConfig.java
index f913eafbd61..d5990392272 100644
--- a/io.openems.edge.controller.ess.fixactivepower/test/io/openems/edge/controller/ess/fixactivepower/MyConfig.java
+++ b/io.openems.edge.controller.ess.fixactivepower/test/io/openems/edge/controller/ess/fixactivepower/MyConfig.java
@@ -24,7 +24,7 @@ public Builder setEssId(String essId) {
 			this.essId = essId;
 			return this;
 		}
-		
+
 		public Builder setPower(int power) {
 			this.power = power;
 			return this;
@@ -34,7 +34,7 @@ public Builder setMode(Mode mode) {
 			this.mode = mode;
 			return this;
 		}
-		
+
 		public MyConfig build() {
 			return new MyConfig(this);
 		}
@@ -42,7 +42,7 @@ public MyConfig build() {
 
 	/**
 	 * Create a Config builder.
-	 * 
+	 *
 	 * @return a {@link Builder}
 	 */
 	public static Builder create() {

From 8986c806fc5463c46434ebc59da27a834f6861c5 Mon Sep 17 00:00:00 2001
From: Stefan Feilmeier <stefan.feilmeier@fenecon.de>
Date: Mon, 7 Mar 2022 23:08:33 +0100
Subject: [PATCH 34/96] Update
 io.openems.edge.controller.ess.gridoptimizedcharge

---
 .../ess/gridoptimizedcharge/DelayCharge.java  | 112 +++++-----
 .../DelayChargeRiskLevel.java                 |   2 +-
 .../GridOptimizedCharge.java                  |  27 ++-
 .../GridOptimizedChargeImpl.java              |  70 +++----
 .../gridoptimizedcharge/SellToGridLimit.java  |  25 +--
 .../ess/gridoptimizedcharge/MyConfig.java     |   2 +-
 .../gridoptimizedcharge/MyControllerTest.java | 198 +++++++++---------
 7 files changed, 206 insertions(+), 230 deletions(-)

diff --git a/io.openems.edge.controller.ess.gridoptimizedcharge/src/io/openems/edge/controller/ess/gridoptimizedcharge/DelayCharge.java b/io.openems.edge.controller.ess.gridoptimizedcharge/src/io/openems/edge/controller/ess/gridoptimizedcharge/DelayCharge.java
index 9b0035194fc..6256d36c61e 100644
--- a/io.openems.edge.controller.ess.gridoptimizedcharge/src/io/openems/edge/controller/ess/gridoptimizedcharge/DelayCharge.java
+++ b/io.openems.edge.controller.ess.gridoptimizedcharge/src/io/openems/edge/controller/ess/gridoptimizedcharge/DelayCharge.java
@@ -7,18 +7,14 @@
 import java.time.temporal.ChronoField;
 import java.time.temporal.ChronoUnit;
 import java.util.Arrays;
-import java.util.Optional;
-import java.util.OptionalDouble;
 import java.util.stream.IntStream;
 
 import io.openems.common.exceptions.OpenemsError.OpenemsNamedException;
 import io.openems.common.exceptions.OpenemsException;
 import io.openems.common.types.ChannelAddress;
-import io.openems.edge.common.channel.IntegerReadChannel;
-import io.openems.edge.common.channel.StateChannel;
+import io.openems.edge.common.channel.value.Value;
 import io.openems.edge.ess.power.api.Phase;
 import io.openems.edge.ess.power.api.Pwr;
-import io.openems.edge.predictor.api.oneday.Prediction24Hours;
 
 public class DelayCharge {
 
@@ -39,13 +35,13 @@ public DelayCharge(GridOptimizedChargeImpl parent) {
 
 	/**
 	 * Get the maximum active power limit depending on the prediction values.
-	 * 
+	 *
 	 * <p>
 	 * Calculates the target minute, when the state of charge should reach 100
 	 * percent depending on the predicted production and consumption and limits the
 	 * charge value of the ESS, to get full at this calculated target minute
 	 * including a configured buffer.
-	 * 
+	 *
 	 * @return Maximum charge power
 	 * @throws OpenemsNamedException on error
 	 */
@@ -56,15 +52,15 @@ protected Integer getPredictiveDelayChargeMaxCharge() throws OpenemsNamedExcepti
 
 	/**
 	 * Get the maximum active power limit depending the configured target time.
-	 * 
+	 *
 	 * <p>
 	 * Limits the charge value of the ESS, to get full at the given target minute.
-	 * 
+	 *
 	 * @return Maximum charge power
 	 * @throws OpenemsNamedException on error
 	 */
 	protected Integer getManualDelayChargeMaxCharge() throws OpenemsNamedException {
-		LocalTime targetTime = LocalTime.of(17, 0);
+		var targetTime = LocalTime.of(17, 0);
 
 		// Try to parse the configured Time as LocalTime or ZonedDateTime, which is the
 		// format that comes from UI.
@@ -79,20 +75,20 @@ protected Integer getManualDelayChargeMaxCharge() throws OpenemsNamedException {
 			} catch (DateTimeParseException i) {
 
 				// Set Info state channel and log
-				StateChannel noValidManualTargetTime = this.parent
+				var noValidManualTargetTime = this.parent
 						.channel(GridOptimizedCharge.ChannelId.NO_VALID_MANUAL_TARGET_TIME);
 				noValidManualTargetTime.setNextValue(true);
 				this.parent.logDebug(noValidManualTargetTime.channelDoc().getText());
 			}
 		}
 
-		int targetMinute = targetTime.get(ChronoField.MINUTE_OF_DAY);
+		var targetMinute = targetTime.get(ChronoField.MINUTE_OF_DAY);
 		return this.calculateDelayChargeMaxCharge(targetMinute);
 	}
 
 	/**
 	 * Apply the calculated power limit as constraint.
-	 * 
+	 *
 	 * @param rawDelayChargeMaxChargePower raw maximum charge power (Not adapted to
 	 *                                     DC)
 	 * @param delayChargeMaxChargePower    maximum power that should be charged by
@@ -102,7 +98,7 @@ protected Integer getManualDelayChargeMaxCharge() throws OpenemsNamedException {
 	protected void applyCalculatedLimit(int rawDelayChargeMaxChargePower, int delayChargeMaxChargePower) {
 
 		// Current DelayCharge state
-		DelayChargeState state = DelayChargeState.ACTIVE_LIMIT;
+		var state = DelayChargeState.ACTIVE_LIMIT;
 
 		try {
 			// Set the power limitation constraint
@@ -119,12 +115,12 @@ protected void applyCalculatedLimit(int rawDelayChargeMaxChargePower, int delayC
 	/**
 	 * Calculate the maximum active power limit depending on the given target
 	 * minute.
-	 * 
+	 *
 	 * <p>
 	 * Limits the charge value of the ESS, to reach 100 percent at this calculated
 	 * target minute.
-	 * 
-	 * 
+	 *
+	 *
 	 * @param targetMinute Minute when the production get's lower than the
 	 *                     consumption
 	 * @return Maximum charge power
@@ -145,17 +141,15 @@ private Integer calculateDelayChargeMaxCharge(Integer targetMinute) throws Opene
 		if (this.passedTargetMinute(targetMinute)) {
 			// Slowly increasing the maximum charge power with a ramp
 			float maximum = this.parent.ess.getMaxApparentPower().getOrError();
-			Optional<Integer> currentLimitOpt = this.parent.getDelayChargeLimit().asOptional();
+			var currentLimitOpt = this.parent.getDelayChargeLimit().asOptional();
 
 			if (currentLimitOpt.isPresent() && currentLimitOpt.get() < maximum) {
-				// Apply ramp filter
-				Integer filteredLimit = this.parent.rampFilter.getFilteredValueAsInteger(currentLimitOpt.get(), maximum,
-						maximum, 0.0025f);
-				return filteredLimit;
+				return this.parent.rampFilter.getFilteredValueAsInteger(currentLimitOpt.get(), maximum, maximum,
+						0.0025f);
 			}
 
 			// Already reached the maximum
-			if ((!currentLimitOpt.isPresent()) || maximum <= currentLimitOpt.get()) {
+			if (!currentLimitOpt.isPresent() || maximum <= currentLimitOpt.get()) {
 				this.setDelayChargeStateAndLimit(DelayChargeState.NO_REMAINING_TIME, null);
 				return null;
 
@@ -163,7 +157,7 @@ private Integer calculateDelayChargeMaxCharge(Integer targetMinute) throws Opene
 		}
 
 		// Calculate the power limit depending on the remaining time and capacity
-		Integer calculatedPower = this.getCalculatedPowerLimit(targetMinute);
+		var calculatedPower = this.getCalculatedPowerLimit(targetMinute);
 		if (calculatedPower == null) {
 			return null;
 		}
@@ -181,27 +175,27 @@ private Integer calculateDelayChargeMaxCharge(Integer targetMinute) throws Opene
 
 	/**
 	 * Gets the calculated target minute.
-	 * 
+	 *
 	 * <p>
 	 * Calculates the target minute when there is no longer surplus power depending
 	 * on the predicted production and consumption.
-	 * 
+	 *
 	 * @return predicted target minute (Minute of the day)
 	 */
 	private Integer getCalculatedTargetMinute() {
 
 		// Predictions
-		Prediction24Hours hourlyPredictionProduction = this.parent.predictorManager
+		var hourlyPredictionProduction = this.parent.predictorManager
 				.get24HoursPrediction(new ChannelAddress("_sum", "ProductionActivePower"));
-		Prediction24Hours hourlyPredictionConsumption = this.parent.predictorManager
+		var hourlyPredictionConsumption = this.parent.predictorManager
 				.get24HoursPrediction(new ChannelAddress("_sum", "ConsumptionActivePower"));
 
-		ZonedDateTime now = ZonedDateTime.now(this.parent.componentManager.getClock());
-		ZonedDateTime predictionStartQuarterHour = roundZonedDateTimeDownTo15Minutes(now);
+		var now = ZonedDateTime.now(this.parent.componentManager.getClock());
+		var predictionStartQuarterHour = roundZonedDateTimeDownTo15Minutes(now);
 
 		// Predictions as Integer array
-		Integer[] hourlyProduction = hourlyPredictionProduction.getValues();
-		Integer[] hourlyConsumption = hourlyPredictionConsumption.getValues();
+		var hourlyProduction = hourlyPredictionProduction.getValues();
+		var hourlyConsumption = hourlyPredictionConsumption.getValues();
 
 		// Displays the production values once, if debug mode is activated.
 		if (this.predictionDebugLog) {
@@ -211,7 +205,7 @@ private Integer getCalculatedTargetMinute() {
 		}
 
 		// Calculate target minute
-		Integer targetMinute = this.calculateTargetMinute(hourlyProduction, hourlyConsumption,
+		var targetMinute = this.calculateTargetMinute(hourlyProduction, hourlyConsumption,
 				predictionStartQuarterHour);
 
 		// Production was never higher than consumption
@@ -227,7 +221,7 @@ private Integer getCalculatedTargetMinute() {
 
 	/**
 	 * Calculates the charging power limit for the current cycle.
-	 * 
+	 *
 	 * @param targetMinute target as minute of the day
 	 * @return the calculated charging power limit or null if no limit should be
 	 *         applied
@@ -246,7 +240,7 @@ public Integer getCalculatedPowerLimit(Integer targetMinute) throws OpenemsNamed
 		int capacity = this.parent.ess.getCapacity().getOrError();
 
 		// No remaining capacity
-		int minPower = this.parent.ess.getPower().getMinPower(this.parent.ess, Phase.ALL, Pwr.ACTIVE);
+		var minPower = this.parent.ess.getPower().getMinPower(this.parent.ess, Phase.ALL, Pwr.ACTIVE);
 		if (minPower >= 0 && soc > 95) {
 			this.setDelayChargeStateAndLimit(DelayChargeState.NO_REMAINING_CAPACITY, null);
 			return null;
@@ -257,10 +251,10 @@ public Integer getCalculatedPowerLimit(Integer targetMinute) throws OpenemsNamed
 		soc -= 1;
 
 		// Remaining capacity of the battery in Ws till target point.
-		int remainingCapacity = Math.round(capacity * (100 - soc) * 36);
+		var remainingCapacity = Math.round(capacity * (100 - soc) * 36);
 
 		// Remaining time in seconds till the target point.
-		int remainingTime = this.calculateRemainingTime(targetMinute);
+		var remainingTime = this.calculateRemainingTime(targetMinute);
 
 		// No remaining time -> no restrictions
 		if (remainingTime <= 0) {
@@ -268,7 +262,7 @@ public Integer getCalculatedPowerLimit(Integer targetMinute) throws OpenemsNamed
 			return null;
 		}
 		// Calculate charge power limit
-		int calculatedPower = remainingCapacity / remainingTime;
+		var calculatedPower = remainingCapacity / remainingTime;
 
 		// Max apparent power
 		int maxApparentPower = this.parent.ess.getMaxApparentPower().orElse(Integer.MAX_VALUE);
@@ -282,19 +276,19 @@ public Integer getCalculatedPowerLimit(Integer targetMinute) throws OpenemsNamed
 		/**
 		 * Calculate the average with the last 900 limits
 		 */
-		IntegerReadChannel delayChargeLimitRawChannel = this.parent.getRawDelayChargeLimitChannel();
+		var delayChargeLimitRawChannel = this.parent.getRawDelayChargeLimitChannel();
 
-		IntStream pastLimits = delayChargeLimitRawChannel.getPastValues()
+		var pastLimits = delayChargeLimitRawChannel.getPastValues()
 				.tailMap(LocalDateTime.now(this.parent.componentManager.getClock()).minusSeconds(900), true) //
-				.values().stream().filter(v -> v.isDefined()).mapToInt(v -> v.get());
+				.values().stream().filter(Value::isDefined).mapToInt(Value::get);
 
-		IntStream currentLimit = IntStream.of(calculatedPower);
+		var currentLimit = IntStream.of(calculatedPower);
 
 		// Concat the limit values of the last 900 seconds with the current limit
-		IntStream limits = IntStream.concat(pastLimits, currentLimit); //
+		var limits = IntStream.concat(pastLimits, currentLimit); //
 
 		// Get the average of the past values including the current
-		OptionalDouble limitValueOpt = limits.average();
+		var limitValueOpt = limits.average();
 
 		if (!limitValueOpt.isPresent()) {
 			return null;
@@ -305,26 +299,24 @@ public Integer getCalculatedPowerLimit(Integer targetMinute) throws OpenemsNamed
 
 	/**
 	 * Calculates the number of seconds left to the target hour.
-	 * 
+	 *
 	 * @param targetMinute target as minute of the day
 	 * @return the remaining time
 	 */
 	private int calculateRemainingTime(int targetMinute) {
-		int targetSecondOfDay = targetMinute * 60;
-		int remainingTime = targetSecondOfDay
+		var targetSecondOfDay = targetMinute * 60;
+		return targetSecondOfDay
 				- ZonedDateTime.now(this.parent.componentManager.getClock()).get(ChronoField.SECOND_OF_DAY);
-
-		return remainingTime;
 	}
 
 	/**
 	 * Calculates the target minute from quarter-hourly production and consumption
 	 * predictions.
-	 * 
+	 *
 	 * <p>
 	 * Returning the last valid target minute if it is present and the new
 	 * calculated target minute would be null.
-	 * 
+	 *
 	 * @param quarterHourlyProduction    the production prediction
 	 * @param quarterHourlyConsumption   the consumption prediction
 	 * @param predictionStartQuarterHour the prediction start quarterHour
@@ -333,18 +325,18 @@ private int calculateRemainingTime(int targetMinute) {
 	private Integer calculateTargetMinute(Integer[] quarterHourlyProduction, Integer[] quarterHourlyConsumption,
 			ZonedDateTime predictionStartQuarterHour) {
 
-		int predictionStartQuarterHourIndex = predictionStartQuarterHour.get(ChronoField.MINUTE_OF_DAY) / 15;
+		var predictionStartQuarterHourIndex = predictionStartQuarterHour.get(ChronoField.MINUTE_OF_DAY) / 15;
 
 		// Last hour when production was greater than consumption.
-		int lastQuarterHour = -1;
+		var lastQuarterHour = -1;
 		Integer targetMinuteActual = null;
 		Integer targetMinuteAdjusted = null;
 
 		// Iterate predictions till midnight
-		for (int i = 0; i < (96 - predictionStartQuarterHourIndex); i++) {
+		for (var i = 0; i < 96 - predictionStartQuarterHourIndex; i++) {
 			// to avoid null and negative consumption values.
-			if ((quarterHourlyProduction[i] != null && quarterHourlyConsumption[i] != null
-					&& quarterHourlyConsumption[i] >= 0)) {
+			if (quarterHourlyProduction[i] != null && quarterHourlyConsumption[i] != null
+					&& quarterHourlyConsumption[i] >= 0) {
 
 				// Updating last quarter hour if production is higher than consumption plus
 				// power buffer
@@ -386,18 +378,18 @@ private Integer calculateTargetMinute(Integer[] quarterHourlyProduction, Integer
 
 	/**
 	 * Rounds a {@link ZonedDateTime} down to 15 minutes.
-	 * 
+	 *
 	 * @param d the {@link ZonedDateTime}
 	 * @return the rounded result
 	 */
 	private static ZonedDateTime roundZonedDateTimeDownTo15Minutes(ZonedDateTime d) {
-		int minuteOfDay = d.get(ChronoField.MINUTE_OF_DAY);
+		var minuteOfDay = d.get(ChronoField.MINUTE_OF_DAY);
 		return d.with(ChronoField.NANO_OF_DAY, 0).plus(minuteOfDay / 15 * 15, ChronoUnit.MINUTES);
 	}
 
 	/**
 	 * Update the StateMachine and ChargePowerLimit channels.
-	 * 
+	 *
 	 * @param state the {@link DelayChargeState}
 	 * @param limit the ChargePowerLimit
 	 */
@@ -408,7 +400,7 @@ protected void setDelayChargeStateAndLimit(DelayChargeState state, Integer limit
 
 	/**
 	 * Checks if we passed already the target minute.
-	 * 
+	 *
 	 * @param targetMinute target as minute of the day
 	 * @return true if it is later than the target minute.
 	 */
diff --git a/io.openems.edge.controller.ess.gridoptimizedcharge/src/io/openems/edge/controller/ess/gridoptimizedcharge/DelayChargeRiskLevel.java b/io.openems.edge.controller.ess.gridoptimizedcharge/src/io/openems/edge/controller/ess/gridoptimizedcharge/DelayChargeRiskLevel.java
index d5165458aac..89718f5386b 100644
--- a/io.openems.edge.controller.ess.gridoptimizedcharge/src/io/openems/edge/controller/ess/gridoptimizedcharge/DelayChargeRiskLevel.java
+++ b/io.openems.edge.controller.ess.gridoptimizedcharge/src/io/openems/edge/controller/ess/gridoptimizedcharge/DelayChargeRiskLevel.java
@@ -36,7 +36,7 @@ private DelayChargeRiskLevel(int bufferMinutes) {
 
 	/**
 	 * Get buffer minutes.
-	 * 
+	 *
 	 * @return buffer minutes
 	 */
 	public int getBufferMinutes() {
diff --git a/io.openems.edge.controller.ess.gridoptimizedcharge/src/io/openems/edge/controller/ess/gridoptimizedcharge/GridOptimizedCharge.java b/io.openems.edge.controller.ess.gridoptimizedcharge/src/io/openems/edge/controller/ess/gridoptimizedcharge/GridOptimizedCharge.java
index ba02dcd1063..38a36cc0541 100644
--- a/io.openems.edge.controller.ess.gridoptimizedcharge/src/io/openems/edge/controller/ess/gridoptimizedcharge/GridOptimizedCharge.java
+++ b/io.openems.edge.controller.ess.gridoptimizedcharge/src/io/openems/edge/controller/ess/gridoptimizedcharge/GridOptimizedCharge.java
@@ -2,7 +2,6 @@
 
 import java.time.Clock;
 import java.time.LocalDate;
-import java.time.LocalDateTime;
 import java.time.LocalTime;
 import java.time.ZoneId;
 import java.time.ZonedDateTime;
@@ -45,7 +44,7 @@ public enum ChannelId implements io.openems.edge.common.channel.ChannelId {
 
 		/**
 		 * Raw Delay-Charge without consideration of the last limits.
-		 * 
+		 *
 		 * <p>
 		 * This channel is used for debugging and to calculate the average for the
 		 * {@link ChannelId#DELAY_CHARGE_MAXIMUM_CHARGE_LIMIT} channel.
@@ -63,7 +62,7 @@ public enum ChannelId implements io.openems.edge.common.channel.ChannelId {
 
 		/**
 		 * Raw sell to grid limit charge power limitation.
-		 * 
+		 *
 		 * <p>
 		 * This value is negative for DC systems. Prefer
 		 * SELL_TO_GRID_LIMIT_MINIMUM_CHARGE_LIMIT for visualization.
@@ -74,7 +73,7 @@ public enum ChannelId implements io.openems.edge.common.channel.ChannelId {
 
 		/**
 		 * Predicted target minute as minute of the day.
-		 * 
+		 *
 		 * <p>
 		 * Actual target minute calculated from prediction without buffer hours (for
 		 * automatic mode).
@@ -84,7 +83,7 @@ public enum ChannelId implements io.openems.edge.common.channel.ChannelId {
 
 		/**
 		 * Predicted target minute adjusted with a buffer as minute of the day.
-		 * 
+		 *
 		 * <p>
 		 * Adjusted target minute calculated from prediction including the buffer hours
 		 * (for automatic mode).
@@ -94,7 +93,7 @@ public enum ChannelId implements io.openems.edge.common.channel.ChannelId {
 
 		/**
 		 * Target minute as epoch seconds.
-		 * 
+		 *
 		 * <p>
 		 * Automatically set, when the original TARGET_MINUTE is set.
 		 */
@@ -103,7 +102,7 @@ public enum ChannelId implements io.openems.edge.common.channel.ChannelId {
 
 		/**
 		 * Target minute as minute of the day.
-		 * 
+		 *
 		 * <p>
 		 * Target minute independent of the current mode Manual and Automatic.
 		 */
@@ -113,16 +112,16 @@ public enum ChannelId implements io.openems.edge.common.channel.ChannelId {
 					((IntegerReadChannel) channel).onSetNextValue(value -> {
 						if (value != null && value.isDefined()) {
 							int targetTime = value.get();
-							GridOptimizedChargeImpl gridOptimizedCharge = (GridOptimizedChargeImpl) channel
+							var gridOptimizedCharge = (GridOptimizedChargeImpl) channel
 									.getComponent();
 
-							LocalDateTime targetDateTime = LocalDate
+							var targetDateTime = LocalDate
 									.now(gridOptimizedCharge.componentManager.getClock())
 									.atTime(LocalTime.of(targetTime / 60, targetTime % 60));
 
-							ZonedDateTime zonedDateTime = ZonedDateTime.ofLocal(targetDateTime, ZoneId.systemDefault(),
+							var zonedDateTime = ZonedDateTime.ofLocal(targetDateTime, ZoneId.systemDefault(),
 									null);
-							long targetEpochTime = zonedDateTime.toEpochSecond();
+							var targetEpochTime = zonedDateTime.toEpochSecond();
 
 							gridOptimizedCharge.channel(ChannelId.TARGET_EPOCH_SECONDS).setNextValue(targetEpochTime);
 						}
@@ -131,7 +130,7 @@ public enum ChannelId implements io.openems.edge.common.channel.ChannelId {
 
 		/**
 		 * Start time as epoch seconds of the current day.
-		 * 
+		 *
 		 * <p>
 		 * Keeps the time, when the production higher than the consumption for the first
 		 * time on the current day.
@@ -550,8 +549,8 @@ public default Value<Long> getStartEpochSeconds() {
 	 */
 	public default void _setStartEpochSeconds(LocalTime value, Clock clock) {
 
-		LocalDateTime startDateTime = LocalDate.now(clock).atTime(value);
-		ZonedDateTime zonedDateTime = ZonedDateTime.ofLocal(startDateTime, clock.getZone(), null);
+		var startDateTime = LocalDate.now(clock).atTime(value);
+		var zonedDateTime = ZonedDateTime.ofLocal(startDateTime, clock.getZone(), null);
 
 		this.getStartEpochSecondsChannel().setNextValue(zonedDateTime.toEpochSecond());
 	}
diff --git a/io.openems.edge.controller.ess.gridoptimizedcharge/src/io/openems/edge/controller/ess/gridoptimizedcharge/GridOptimizedChargeImpl.java b/io.openems.edge.controller.ess.gridoptimizedcharge/src/io/openems/edge/controller/ess/gridoptimizedcharge/GridOptimizedChargeImpl.java
index c2b174532a9..18f447ee1e6 100644
--- a/io.openems.edge.controller.ess.gridoptimizedcharge/src/io/openems/edge/controller/ess/gridoptimizedcharge/GridOptimizedChargeImpl.java
+++ b/io.openems.edge.controller.ess.gridoptimizedcharge/src/io/openems/edge/controller/ess/gridoptimizedcharge/GridOptimizedChargeImpl.java
@@ -1,11 +1,9 @@
 package io.openems.edge.controller.ess.gridoptimizedcharge;
 
-import java.time.Clock;
 import java.time.LocalDate;
 import java.time.LocalDateTime;
 import java.time.LocalTime;
 import java.util.ArrayList;
-import java.util.Collection;
 import java.util.OptionalDouble;
 
 import org.osgi.service.cm.ConfigurationAdmin;
@@ -31,7 +29,6 @@
 import io.openems.edge.common.component.ComponentManagerProvider;
 import io.openems.edge.common.component.OpenemsComponent;
 import io.openems.edge.common.filter.RampFilter;
-import io.openems.edge.common.sum.GridMode;
 import io.openems.edge.common.sum.Sum;
 import io.openems.edge.controller.api.Controller;
 import io.openems.edge.ess.api.ManagedSymmetricEss;
@@ -69,7 +66,7 @@ public class GridOptimizedChargeImpl extends AbstractOpenemsComponent
 	 * time when production is lower or higher than consumption.
 	 */
 	protected static final int DEFAULT_POWER_BUFFER = 100;
-	
+
 	protected final RampFilter rampFilter = new RampFilter();
 
 	/**
@@ -140,7 +137,6 @@ private void updateConfig(Config config) {
 
 		// update filter for 'meter'
 		if (OpenemsComponent.updateReferenceFilter(this.cm, this.servicePid(), "meter", config.meter_id())) {
-			return;
 		}
 	}
 
@@ -165,7 +161,7 @@ public void run() throws OpenemsNamedException {
 		/*
 		 * Check that we are On-Grid (and warn on undefined Grid-Mode)
 		 */
-		GridMode gridMode = this.ess.getGridMode();
+		var gridMode = this.ess.getGridMode();
 		if (gridMode.isUndefined()) {
 			this.logWarn(this.log, "Grid-Mode is [UNDEFINED]");
 		}
@@ -187,35 +183,32 @@ public void run() throws OpenemsNamedException {
 		// Check if the logic already started or should start
 		if (!this.getStartEpochSeconds().isDefined()) {
 
-			Clock clock = this.componentManager.getClock();
-			IntegerReadChannel productionChannel = this.sum.getProductionActivePowerChannel();
+			var clock = this.componentManager.getClock();
+			var productionChannel = this.sum.getProductionActivePowerChannel();
 
 			// Fallback if the current production reached the maximum sell to grid power
 			if (productionChannel.value().orElse(0) >= this.config.maximumSellToGridPower()) {
-
-				this._setStartEpochSeconds(LocalTime.now(clock), clock);
 			} else {
 
 				/*
 				 * Calculate the average with the last 100 values of production and consumption
 				 */
-				OptionalDouble productionAvgOpt = this.getChannelAverageOfPastSeconds(100, productionChannel);
-				OptionalDouble consumptionAvgOpt = this.getChannelAverageOfPastSeconds(100,
+				var productionAvgOpt = this.getChannelAverageOfPastSeconds(100, productionChannel);
+				var consumptionAvgOpt = this.getChannelAverageOfPastSeconds(100,
 						this.sum.getConsumptionActivePowerChannel());
 
-				double production = productionAvgOpt.isPresent() ? productionAvgOpt.getAsDouble() : 0;
-				double consumption = consumptionAvgOpt.isPresent() ? consumptionAvgOpt.getAsDouble() : 0;
+				var production = productionAvgOpt.isPresent() ? productionAvgOpt.getAsDouble() : 0;
+				var consumption = consumptionAvgOpt.isPresent() ? consumptionAvgOpt.getAsDouble() : 0;
 
 				// Initiate the start time if the production is higher than the consumption
-				if (production > 100 && production > consumption + DEFAULT_POWER_BUFFER) {
-					this._setStartEpochSeconds(LocalTime.now(clock), clock);
-				} else {
+				if ((production <= 100) || (production <= consumption + DEFAULT_POWER_BUFFER)) {
 					// No restriction required so far, as not enough is produced
 					this.delayCharge.setDelayChargeStateAndLimit(DelayChargeState.NOT_STARTED, null);
 					this.sellToGridLimit.setSellToGridLimitChannelsAndLastLimit(SellToGridLimitState.NOT_STARTED, null);
 					return;
 				}
 			}
+			this._setStartEpochSeconds(LocalTime.now(clock), clock);
 		}
 
 		/*
@@ -242,7 +235,7 @@ public void run() throws OpenemsNamedException {
 
 	/**
 	 * Apply the calculated power limits.
-	 * 
+	 *
 	 * @param sellToGridLimitMinChargePower minimum charge power
 	 * @param delayChargeMaxChargePower     maximum charge power
 	 * @throws OpenemsNamedException on error
@@ -250,10 +243,10 @@ public void run() throws OpenemsNamedException {
 	private void applyCalculatedPowerLimits(Integer sellToGridLimitMinChargePower, Integer delayChargeMaxChargePower)
 			throws OpenemsNamedException {
 
-		boolean delayChargeIsDefined = delayChargeMaxChargePower != null;
-		boolean sellToGridLimitIsDefined = sellToGridLimitMinChargePower != null;
+		var delayChargeIsDefined = delayChargeMaxChargePower != null;
+		var sellToGridLimitIsDefined = sellToGridLimitMinChargePower != null;
 
-		Integer rawDelayChargeMaxChargePower = delayChargeMaxChargePower;
+		var rawDelayChargeMaxChargePower = delayChargeMaxChargePower;
 
 		if (delayChargeIsDefined) {
 			// Calculate AC-Setpoint depending on the DC production
@@ -262,7 +255,7 @@ private void applyCalculatedPowerLimits(Integer sellToGridLimitMinChargePower, I
 
 		/*
 		 * Set sellToGridLimit if its lower than delayChargeLimit as fix value.
-		 * 
+		 *
 		 * <p> e.g. sellToGridLimit [-10kW | -3kW] & delayCharge [-2kW | 10kW] - it will
 		 * take -3 kW to reduce the grid power with the minimum power and avoid to
 		 * charge more than needed.
@@ -295,11 +288,11 @@ private void applyCalculatedPowerLimits(Integer sellToGridLimitMinChargePower, I
 
 	/**
 	 * Calculating the AC limit.
-	 * 
+	 *
 	 * <p>
 	 * Calculating the maximum charge power in AC systems and the maximum discharge
 	 * power in DC systems as inverter setpoint.
-	 * 
+	 *
 	 * @param delayChargeMaxChargePower maximum charge power of the battery
 	 * @return Maximum power to is allowed to charged(AC) or discharged(DC)
 	 */
@@ -307,21 +300,19 @@ private int calculateDelayChargeAcLimit(int delayChargeMaxChargePower) {
 
 		// Calculate AC-Setpoint depending on the DC production
 		int productionDcPower = this.sum.getProductionDcActualPower().orElse(0);
-		delayChargeMaxChargePower = productionDcPower - delayChargeMaxChargePower;
-
-		return delayChargeMaxChargePower;
+		return productionDcPower - delayChargeMaxChargePower;
 	}
 
 	/**
 	 * Counts up the time of each state when it is active.
 	 */
 	private void calculateTime() {
-		boolean sellToGridLimitIsActive = false;
-		boolean delayChargeLimitIsActive = false;
-		boolean noLimitIsActive = false;
+		var sellToGridLimitIsActive = false;
+		var delayChargeLimitIsActive = false;
+		var noLimitIsActive = false;
 
-		SellToGridLimitState sellToGridLimitState = this.getSellToGridLimitState();
-		DelayChargeState delayChargeState = this.getDelayChargeState();
+		var sellToGridLimitState = this.getSellToGridLimitState();
+		var delayChargeState = this.getDelayChargeState();
 		int sellToGridLimit = this.getSellToGridLimitMinimumChargeLimit().orElse(0);
 
 		if (sellToGridLimitState.equals(SellToGridLimitState.ACTIVE_LIMIT_FIXED)) {
@@ -343,7 +334,7 @@ private void calculateTime() {
 	 * Resets the predicted target minutes at midnight.
 	 */
 	private void resetTargetMinutesAtMidnight() {
-		LocalDate today = LocalDate.now(this.componentManager.getClock());
+		var today = LocalDate.now(this.componentManager.getClock());
 		if (!this.currentDay.equals(today)) {
 			this._setPredictedTargetMinute(null);
 			this._setPredictedTargetMinuteAdjusted(null);
@@ -354,7 +345,7 @@ private void resetTargetMinutesAtMidnight() {
 
 	/**
 	 * Calculates the average of the past channel values.
-	 * 
+	 *
 	 * @param consideredSeconds Seconds that should be taken into account for the
 	 *                          past channels
 	 * @param channel           Channel whose values are calculated
@@ -363,22 +354,19 @@ private void resetTargetMinutesAtMidnight() {
 	private OptionalDouble getChannelAverageOfPastSeconds(int consideredSeconds, IntegerReadChannel channel) {
 
 		// Get the past channel values
-		Collection<Value<Integer>> pastValues = channel.getPastValues()
+		var pastValues = channel.getPastValues()
 				.tailMap(LocalDateTime.now(this.componentManager.getClock()).minusSeconds(consideredSeconds), true)
 				.values();
 
 		// Make sure we have at least one value
 		if (pastValues.isEmpty()) {
-			pastValues = new ArrayList<Value<Integer>>();
+			pastValues = new ArrayList<>();
 			pastValues.add(channel.value());
 		}
 
-		// Get the average of the past values
-		OptionalDouble averageOpt = pastValues.stream().filter(v -> v.isDefined()) //
-				.mapToInt(v -> v.get()) //
+		return pastValues.stream().filter(Value::isDefined) //
+				.mapToInt(Value::get) //
 				.average();
-
-		return averageOpt;
 	}
 
 	protected void logDebug(String message) {
diff --git a/io.openems.edge.controller.ess.gridoptimizedcharge/src/io/openems/edge/controller/ess/gridoptimizedcharge/SellToGridLimit.java b/io.openems.edge.controller.ess.gridoptimizedcharge/src/io/openems/edge/controller/ess/gridoptimizedcharge/SellToGridLimit.java
index 44175efaf2d..804f9822205 100644
--- a/io.openems.edge.controller.ess.gridoptimizedcharge/src/io/openems/edge/controller/ess/gridoptimizedcharge/SellToGridLimit.java
+++ b/io.openems.edge.controller.ess.gridoptimizedcharge/src/io/openems/edge/controller/ess/gridoptimizedcharge/SellToGridLimit.java
@@ -21,7 +21,7 @@ public SellToGridLimit(GridOptimizedChargeImpl parent) {
 
 	/**
 	 * Set active power limits depending on the maximum sell to grid power.
-	 * 
+	 *
 	 * @return result
 	 * @throws OpenemsNamedException on error
 	 */
@@ -41,7 +41,7 @@ protected Integer getSellToGridLimit() throws OpenemsNamedException {
 		// State of charge
 		int soc = this.parent.ess.getSoc().getOrError();
 
-		int maximumSellToGridPower = this.parent.config.maximumSellToGridPower();
+		var maximumSellToGridPower = this.parent.config.maximumSellToGridPower();
 
 		// Reduce the maximum sell to grid power with a buffer, to avoid PV curtail
 		// TODO improve logic to make sure we always meet the maximum sell to grid
@@ -53,23 +53,20 @@ protected Integer getSellToGridLimit() throws OpenemsNamedException {
 		}
 
 		// Calculate actual limit for Ess
-		int essMinChargePower = gridPower + essActivePower + maximumSellToGridPower;
+		var essMinChargePower = gridPower + essActivePower + maximumSellToGridPower;
 
 		// Log debug
 		this.parent.logDebug("Maximum Discharge/Minimum Charge Power: " + essMinChargePower + "(Grid:" + gridPower
 				+ " + Ess:" + essActivePower + " + MaximumGrid:" + maximumSellToGridPower + ")| Last limit: "
 				+ this.lastSellToGridLimit);
 
-		// Adjust ramp
-		essMinChargePower = this.applyPowerRamp(essMinChargePower);
-
-		return essMinChargePower;
+		return this.applyPowerRamp(essMinChargePower);
 	}
 
 	protected void applyCalculatedMinimumChargePower(int sellToGridLimit) {
 
 		// Current DelayCharge state
-		SellToGridLimitState state = SellToGridLimitState.ACTIVE_LIMIT_CONSTRAINT;
+		var state = SellToGridLimitState.ACTIVE_LIMIT_CONSTRAINT;
 
 		try {
 			// Set the power limitation constraint
@@ -84,12 +81,12 @@ protected void applyCalculatedMinimumChargePower(int sellToGridLimit) {
 
 	/**
 	 * Apply power ramp, to react in a smooth way.
-	 * 
+	 *
 	 * <p>
 	 * Calculates a limit depending on the given power limit and the last power
 	 * limit. Stronger limits are taken directly, while the last limit will only be
 	 * reduced if the new limit is lower.
-	 * 
+	 *
 	 * @param essPowerLimit essPowerLimit
 	 * @return adjusted ess power limit
 	 * @throws OpenemsException on error
@@ -105,8 +102,8 @@ private int applyPowerRamp(int essPowerLimit) throws OpenemsException {
 		int maxEssPower = this.parent.ess.getMaxApparentPower().getOrError();
 
 		// Reduce last SellToGridLimit by configured percentage
-		double percentage = (this.parent.config.sellToGridLimitRampPercentage() / 100.0);
-		int rampValue = (int) (maxEssPower * percentage);
+		var percentage = this.parent.config.sellToGridLimitRampPercentage() / 100.0;
+		var rampValue = (int) (maxEssPower * percentage);
 
 		// Use ramp only when the difference would be higher than the applied ramp
 		if (Math.abs(this.lastSellToGridLimit - essPowerLimit) > rampValue) {
@@ -119,7 +116,7 @@ private int applyPowerRamp(int essPowerLimit) throws OpenemsException {
 
 	/**
 	 * Set Channels and lastLimit for SellToGridLimit part.
-	 * 
+	 *
 	 * @param state             SellToGridLimit state
 	 * @param essMinChargePower SellToGridLimit absolute charge limit
 	 */
@@ -137,7 +134,7 @@ protected void setSellToGridLimitChannelsAndLastLimit(SellToGridLimitState state
 
 		// Calculate & set readable AC format
 		int dcProduction = this.parent.sum.getProductionDcActualPower().orElse(0);
-		int essMinChargePowerAc = essMinChargePower - dcProduction;
+		var essMinChargePowerAc = essMinChargePower - dcProduction;
 		this.parent._setSellToGridLimitMinimumChargeLimit(essMinChargePowerAc * -1);
 	}
 }
diff --git a/io.openems.edge.controller.ess.gridoptimizedcharge/test/io/openems/edge/controller/ess/gridoptimizedcharge/MyConfig.java b/io.openems.edge.controller.ess.gridoptimizedcharge/test/io/openems/edge/controller/ess/gridoptimizedcharge/MyConfig.java
index 2bb7e35231f..8d03520a447 100644
--- a/io.openems.edge.controller.ess.gridoptimizedcharge/test/io/openems/edge/controller/ess/gridoptimizedcharge/MyConfig.java
+++ b/io.openems.edge.controller.ess.gridoptimizedcharge/test/io/openems/edge/controller/ess/gridoptimizedcharge/MyConfig.java
@@ -69,7 +69,7 @@ public MyConfig build() {
 
 	/**
 	 * Create a Config builder.
-	 * 
+	 *
 	 * @return a {@link Builder}
 	 */
 	public static Builder create() {
diff --git a/io.openems.edge.controller.ess.gridoptimizedcharge/test/io/openems/edge/controller/ess/gridoptimizedcharge/MyControllerTest.java b/io.openems.edge.controller.ess.gridoptimizedcharge/test/io/openems/edge/controller/ess/gridoptimizedcharge/MyControllerTest.java
index 17b1aa7c580..75aedd32f00 100644
--- a/io.openems.edge.controller.ess.gridoptimizedcharge/test/io/openems/edge/controller/ess/gridoptimizedcharge/MyControllerTest.java
+++ b/io.openems.edge.controller.ess.gridoptimizedcharge/test/io/openems/edge/controller/ess/gridoptimizedcharge/MyControllerTest.java
@@ -133,21 +133,21 @@ public class MyControllerTest {
 
 	@Test
 	public void automatic_default_predictions_at_midnight_test() throws Exception {
-		final TimeLeapClock clock = new TimeLeapClock(Instant.parse("2020-01-01T00:00:00.00Z"), ZoneOffset.UTC);
-		final DummyComponentManager cm = new DummyComponentManager(clock);
+		final var clock = new TimeLeapClock(Instant.parse("2020-01-01T00:00:00.00Z"), ZoneOffset.UTC);
+		final var cm = new DummyComponentManager(clock);
 
 		// Predictions
-		final DummyPrediction24Hours productionPrediction = new DummyPrediction24Hours(DEFAULT_PRODUCTION_PREDICTION);
-		final DummyPrediction24Hours consumptionPrediction = new DummyPrediction24Hours(DEFAULT_CONSUMPTION_PREDICTION);
+		final var productionPrediction = new DummyPrediction24Hours(DEFAULT_PRODUCTION_PREDICTION);
+		final var consumptionPrediction = new DummyPrediction24Hours(DEFAULT_CONSUMPTION_PREDICTION);
 
 		// Predictors
-		final DummyPredictor24Hours productionPredictor = new DummyPredictor24Hours(PREDICTOR_ID, cm,
+		final var productionPredictor = new DummyPredictor24Hours(PREDICTOR_ID, cm,
 				productionPrediction, "_sum/ProductionActivePower");
-		final DummyPredictor24Hours consumptionPredictor = new DummyPredictor24Hours(PREDICTOR_ID, cm,
+		final var consumptionPredictor = new DummyPredictor24Hours(PREDICTOR_ID, cm,
 				consumptionPrediction, "_sum/ConsumptionActivePower");
 
 		// PredictorManager
-		final DummyPredictorManager predictorManager = new DummyPredictorManager(productionPredictor,
+		final var predictorManager = new DummyPredictorManager(productionPredictor,
 				consumptionPredictor);
 
 		System.out.println(Arrays.toString(predictorManager
@@ -190,21 +190,21 @@ public void automatic_default_predictions_at_midnight_test() throws Exception {
 
 	@Test
 	public void automatic_default_predictions_at_midday_test() throws Exception {
-		final TimeLeapClock clock = new TimeLeapClock(Instant.parse("2020-01-01T12:00:00.00Z"), ZoneOffset.UTC);
-		final DummyComponentManager cm = new DummyComponentManager(clock);
+		final var clock = new TimeLeapClock(Instant.parse("2020-01-01T12:00:00.00Z"), ZoneOffset.UTC);
+		final var cm = new DummyComponentManager(clock);
 
 		// Predictions
-		final DummyPrediction24Hours productionPrediction = new DummyPrediction24Hours(DEFAULT_PRODUCTION_PREDICTION);
-		final DummyPrediction24Hours consumptionPrediction = new DummyPrediction24Hours(DEFAULT_CONSUMPTION_PREDICTION);
+		final var productionPrediction = new DummyPrediction24Hours(DEFAULT_PRODUCTION_PREDICTION);
+		final var consumptionPrediction = new DummyPrediction24Hours(DEFAULT_CONSUMPTION_PREDICTION);
 
 		// Predictors
-		final DummyPredictor24Hours productionPredictor = new DummyPredictor24Hours(PREDICTOR_ID, cm,
+		final var productionPredictor = new DummyPredictor24Hours(PREDICTOR_ID, cm,
 				productionPrediction, "_sum/ProductionActivePower");
-		final DummyPredictor24Hours consumptionPredictor = new DummyPredictor24Hours(PREDICTOR_ID, cm,
+		final var consumptionPredictor = new DummyPredictor24Hours(PREDICTOR_ID, cm,
 				consumptionPrediction, "_sum/ConsumptionActivePower");
 
 		// PredictorManager
-		final DummyPredictorManager predictorManager = new DummyPredictorManager(productionPredictor,
+		final var predictorManager = new DummyPredictorManager(productionPredictor,
 				consumptionPredictor);
 
 		System.out.println(Arrays.toString(predictorManager
@@ -252,21 +252,21 @@ public void automatic_default_predictions_at_midday_averaged_test() throws Excep
 		// does not consider the mocked Clock.
 		final ThrowingRunnable<Exception> sleep = () -> Thread.sleep(10);
 
-		final TimeLeapClock clock = new TimeLeapClock(Instant.parse("2020-01-01T12:00:00.00Z"), ZoneOffset.UTC);
-		final DummyComponentManager cm = new DummyComponentManager(clock);
+		final var clock = new TimeLeapClock(Instant.parse("2020-01-01T12:00:00.00Z"), ZoneOffset.UTC);
+		final var cm = new DummyComponentManager(clock);
 
 		// Predictions
-		final DummyPrediction24Hours productionPrediction = new DummyPrediction24Hours(DEFAULT_PRODUCTION_PREDICTION);
-		final DummyPrediction24Hours consumptionPrediction = new DummyPrediction24Hours(DEFAULT_CONSUMPTION_PREDICTION);
+		final var productionPrediction = new DummyPrediction24Hours(DEFAULT_PRODUCTION_PREDICTION);
+		final var consumptionPrediction = new DummyPrediction24Hours(DEFAULT_CONSUMPTION_PREDICTION);
 
 		// Predictors
-		final DummyPredictor24Hours productionPredictor = new DummyPredictor24Hours(PREDICTOR_ID, cm,
+		final var productionPredictor = new DummyPredictor24Hours(PREDICTOR_ID, cm,
 				productionPrediction, "_sum/ProductionActivePower");
-		final DummyPredictor24Hours consumptionPredictor = new DummyPredictor24Hours(PREDICTOR_ID, cm,
+		final var consumptionPredictor = new DummyPredictor24Hours(PREDICTOR_ID, cm,
 				consumptionPrediction, "_sum/ConsumptionActivePower");
 
 		// PredictorManager
-		final DummyPredictorManager predictorManager = new DummyPredictorManager(productionPredictor,
+		final var predictorManager = new DummyPredictorManager(productionPredictor,
 				consumptionPredictor);
 
 		System.out.println(Arrays.toString(predictorManager
@@ -331,21 +331,21 @@ public void automatic_default_predictions_at_midday_averaged_test() throws Excep
 
 	@Test
 	public void automatic_default_predictions_at_evening_test() throws Exception {
-		final TimeLeapClock clock = new TimeLeapClock(Instant.parse("2020-01-01T20:00:00.00Z"), ZoneOffset.UTC);
-		final DummyComponentManager cm = new DummyComponentManager(clock);
+		final var clock = new TimeLeapClock(Instant.parse("2020-01-01T20:00:00.00Z"), ZoneOffset.UTC);
+		final var cm = new DummyComponentManager(clock);
 
 		// Predictions
-		final DummyPrediction24Hours productionPrediction = new DummyPrediction24Hours(DEFAULT_PRODUCTION_PREDICTION);
-		final DummyPrediction24Hours consumptionPrediction = new DummyPrediction24Hours(DEFAULT_CONSUMPTION_PREDICTION);
+		final var productionPrediction = new DummyPrediction24Hours(DEFAULT_PRODUCTION_PREDICTION);
+		final var consumptionPrediction = new DummyPrediction24Hours(DEFAULT_CONSUMPTION_PREDICTION);
 
 		// Predictors
-		final DummyPredictor24Hours productionPredictor = new DummyPredictor24Hours(PREDICTOR_ID, cm,
+		final var productionPredictor = new DummyPredictor24Hours(PREDICTOR_ID, cm,
 				productionPrediction, "_sum/ProductionActivePower");
-		final DummyPredictor24Hours consumptionPredictor = new DummyPredictor24Hours(PREDICTOR_ID, cm,
+		final var consumptionPredictor = new DummyPredictor24Hours(PREDICTOR_ID, cm,
 				consumptionPrediction, "_sum/ConsumptionActivePower");
 
 		// PredictorManager
-		final DummyPredictorManager predictorManager = new DummyPredictorManager(productionPredictor,
+		final var predictorManager = new DummyPredictorManager(productionPredictor,
 				consumptionPredictor);
 
 		System.out.println(Arrays.toString(predictorManager
@@ -408,21 +408,21 @@ public void automatic_default_predictions_at_evening_test() throws Exception {
 
 	@Test
 	public void automatic_no_predictions_test() throws Exception {
-		final TimeLeapClock clock = new TimeLeapClock(Instant.parse("2020-01-01T00:00:00.00Z"), ZoneOffset.UTC);
-		final DummyComponentManager cm = new DummyComponentManager(clock);
+		final var clock = new TimeLeapClock(Instant.parse("2020-01-01T00:00:00.00Z"), ZoneOffset.UTC);
+		final var cm = new DummyComponentManager(clock);
 
 		// Predictions
-		final DummyPrediction24Hours productionPrediction = new DummyPrediction24Hours();
-		final DummyPrediction24Hours consumptionPrediction = new DummyPrediction24Hours();
+		final var productionPrediction = new DummyPrediction24Hours();
+		final var consumptionPrediction = new DummyPrediction24Hours();
 
 		// Predictors
-		final DummyPredictor24Hours productionPredictor = new DummyPredictor24Hours(PREDICTOR_ID, cm,
+		final var productionPredictor = new DummyPredictor24Hours(PREDICTOR_ID, cm,
 				productionPrediction, "_sum/ProductionActivePower");
-		final DummyPredictor24Hours consumptionPredictor = new DummyPredictor24Hours(PREDICTOR_ID, cm,
+		final var consumptionPredictor = new DummyPredictor24Hours(PREDICTOR_ID, cm,
 				consumptionPrediction, "_sum/ConsumptionActivePower");
 
 		// PredictorManager
-		final DummyPredictorManager predictorManager = new DummyPredictorManager(productionPredictor,
+		final var predictorManager = new DummyPredictorManager(productionPredictor,
 				consumptionPredictor);
 
 		new ControllerTest(new GridOptimizedChargeImpl()) //
@@ -457,17 +457,17 @@ public void automatic_no_predictions_test() throws Exception {
 
 	@Test
 	public void automatic_sell_to_grid_limit_test() throws Exception {
-		final TimeLeapClock clock = new TimeLeapClock(Instant.parse("2020-01-01T00:00:00.00Z"), ZoneOffset.UTC);
-		final DummyComponentManager cm = new DummyComponentManager(clock);
+		final var clock = new TimeLeapClock(Instant.parse("2020-01-01T00:00:00.00Z"), ZoneOffset.UTC);
+		final var cm = new DummyComponentManager(clock);
 
 		// Predictors
-		final DummyPredictor24Hours productionPredictor = new DummyPredictor24Hours(PREDICTOR_ID, cm,
+		final var productionPredictor = new DummyPredictor24Hours(PREDICTOR_ID, cm,
 				new DummyPrediction24Hours(), "_sum/ProductionActivePower");
-		final DummyPredictor24Hours consumptionPredictor = new DummyPredictor24Hours(PREDICTOR_ID, cm,
+		final var consumptionPredictor = new DummyPredictor24Hours(PREDICTOR_ID, cm,
 				new DummyPrediction24Hours(), "_sum/ConsumptionActivePower");
 
 		// PredictorManager
-		final DummyPredictorManager predictorManager = new DummyPredictorManager(productionPredictor,
+		final var predictorManager = new DummyPredictorManager(productionPredictor,
 				consumptionPredictor);
 
 		new ControllerTest(new GridOptimizedChargeImpl()) //
@@ -555,17 +555,17 @@ public void automatic_sell_to_grid_limit_test() throws Exception {
 
 	@Test
 	public void automatic_sell_to_grid_limit_test_with_full_ess() throws Exception {
-		final TimeLeapClock clock = new TimeLeapClock(Instant.parse("2020-01-01T00:00:00.00Z"), ZoneOffset.UTC);
-		final DummyComponentManager cm = new DummyComponentManager(clock);
+		final var clock = new TimeLeapClock(Instant.parse("2020-01-01T00:00:00.00Z"), ZoneOffset.UTC);
+		final var cm = new DummyComponentManager(clock);
 
 		// Predictors
-		final DummyPredictor24Hours productionPredictor = new DummyPredictor24Hours(PREDICTOR_ID, cm,
+		final var productionPredictor = new DummyPredictor24Hours(PREDICTOR_ID, cm,
 				new DummyPrediction24Hours(), "_sum/ProductionActivePower");
-		final DummyPredictor24Hours consumptionPredictor = new DummyPredictor24Hours(PREDICTOR_ID, cm,
+		final var consumptionPredictor = new DummyPredictor24Hours(PREDICTOR_ID, cm,
 				new DummyPrediction24Hours(), "_sum/ConsumptionActivePower");
 
 		// PredictorManager
-		final DummyPredictorManager predictorManager = new DummyPredictorManager(productionPredictor,
+		final var predictorManager = new DummyPredictorManager(productionPredictor,
 				consumptionPredictor);
 
 		new ControllerTest(new GridOptimizedChargeImpl()) //
@@ -655,17 +655,17 @@ public void automatic_sell_to_grid_limit_test_with_full_ess() throws Exception {
 
 	@Test
 	public void automatic_sell_to_grid_limit_buffer_test() throws Exception {
-		final TimeLeapClock clock = new TimeLeapClock(Instant.parse("2020-01-01T00:00:00.00Z"), ZoneOffset.UTC);
-		final DummyComponentManager cm = new DummyComponentManager(clock);
+		final var clock = new TimeLeapClock(Instant.parse("2020-01-01T00:00:00.00Z"), ZoneOffset.UTC);
+		final var cm = new DummyComponentManager(clock);
 
 		// Predictors
-		final DummyPredictor24Hours productionPredictor = new DummyPredictor24Hours(PREDICTOR_ID, cm,
+		final var productionPredictor = new DummyPredictor24Hours(PREDICTOR_ID, cm,
 				new DummyPrediction24Hours(), "_sum/ProductionActivePower");
-		final DummyPredictor24Hours consumptionPredictor = new DummyPredictor24Hours(PREDICTOR_ID, cm,
+		final var consumptionPredictor = new DummyPredictor24Hours(PREDICTOR_ID, cm,
 				new DummyPrediction24Hours(), "_sum/ConsumptionActivePower");
 
 		// PredictorManager
-		final DummyPredictorManager predictorManager = new DummyPredictorManager(productionPredictor,
+		final var predictorManager = new DummyPredictorManager(productionPredictor,
 				consumptionPredictor);
 
 		new ControllerTest(new GridOptimizedChargeImpl()) //
@@ -753,21 +753,21 @@ public void automatic_sell_to_grid_limit_buffer_test() throws Exception {
 
 	@Test
 	public void manual_midnight_test() throws Exception {
-		final TimeLeapClock clock = new TimeLeapClock(Instant.parse("2020-01-01T00:00:00.00Z"), ZoneOffset.UTC);
-		final DummyComponentManager cm = new DummyComponentManager(clock);
+		final var clock = new TimeLeapClock(Instant.parse("2020-01-01T00:00:00.00Z"), ZoneOffset.UTC);
+		final var cm = new DummyComponentManager(clock);
 
 		// Predictions
-		final DummyPrediction24Hours productionPrediction = new DummyPrediction24Hours(DEFAULT_PRODUCTION_PREDICTION);
-		final DummyPrediction24Hours consumptionPrediction = new DummyPrediction24Hours(DEFAULT_CONSUMPTION_PREDICTION);
+		final var productionPrediction = new DummyPrediction24Hours(DEFAULT_PRODUCTION_PREDICTION);
+		final var consumptionPrediction = new DummyPrediction24Hours(DEFAULT_CONSUMPTION_PREDICTION);
 
 		// Predictors
-		final DummyPredictor24Hours productionPredictor = new DummyPredictor24Hours(PREDICTOR_ID, cm,
+		final var productionPredictor = new DummyPredictor24Hours(PREDICTOR_ID, cm,
 				productionPrediction, "_sum/ProductionActivePower");
-		final DummyPredictor24Hours consumptionPredictor = new DummyPredictor24Hours(PREDICTOR_ID, cm,
+		final var consumptionPredictor = new DummyPredictor24Hours(PREDICTOR_ID, cm,
 				consumptionPrediction, "_sum/ConsumptionActivePower");
 
 		// PredictorManager
-		final DummyPredictorManager predictorManager = new DummyPredictorManager(productionPredictor,
+		final var predictorManager = new DummyPredictorManager(productionPredictor,
 				consumptionPredictor);
 
 		System.out.println(Arrays.toString(predictorManager
@@ -811,21 +811,21 @@ public void manual_midnight_test() throws Exception {
 
 	@Test
 	public void manual_midday_test() throws Exception {
-		final TimeLeapClock clock = new TimeLeapClock(Instant.parse("2020-01-01T12:00:00.00Z"), ZoneOffset.UTC);
-		final DummyComponentManager cm = new DummyComponentManager(clock);
+		final var clock = new TimeLeapClock(Instant.parse("2020-01-01T12:00:00.00Z"), ZoneOffset.UTC);
+		final var cm = new DummyComponentManager(clock);
 
 		// Predictions
-		final DummyPrediction24Hours productionPrediction = new DummyPrediction24Hours(DEFAULT_PRODUCTION_PREDICTION);
-		final DummyPrediction24Hours consumptionPrediction = new DummyPrediction24Hours(DEFAULT_CONSUMPTION_PREDICTION);
+		final var productionPrediction = new DummyPrediction24Hours(DEFAULT_PRODUCTION_PREDICTION);
+		final var consumptionPrediction = new DummyPrediction24Hours(DEFAULT_CONSUMPTION_PREDICTION);
 
 		// Predictors
-		final DummyPredictor24Hours productionPredictor = new DummyPredictor24Hours(PREDICTOR_ID, cm,
+		final var productionPredictor = new DummyPredictor24Hours(PREDICTOR_ID, cm,
 				productionPrediction, "_sum/ProductionActivePower");
-		final DummyPredictor24Hours consumptionPredictor = new DummyPredictor24Hours(PREDICTOR_ID, cm,
+		final var consumptionPredictor = new DummyPredictor24Hours(PREDICTOR_ID, cm,
 				consumptionPrediction, "_sum/ConsumptionActivePower");
 
 		// PredictorManager
-		final DummyPredictorManager predictorManager = new DummyPredictorManager(productionPredictor,
+		final var predictorManager = new DummyPredictorManager(productionPredictor,
 				consumptionPredictor);
 
 		System.out.println(Arrays.toString(predictorManager
@@ -867,21 +867,21 @@ public void manual_midday_test() throws Exception {
 
 	@Test
 	public void hybridEss_manual_midday_test() throws Exception {
-		final TimeLeapClock clock = new TimeLeapClock(Instant.parse("2020-01-01T12:00:00.00Z"), ZoneOffset.UTC);
-		final DummyComponentManager cm = new DummyComponentManager(clock);
+		final var clock = new TimeLeapClock(Instant.parse("2020-01-01T12:00:00.00Z"), ZoneOffset.UTC);
+		final var cm = new DummyComponentManager(clock);
 
 		// Predictions
-		final DummyPrediction24Hours productionPrediction = new DummyPrediction24Hours(DEFAULT_PRODUCTION_PREDICTION);
-		final DummyPrediction24Hours consumptionPrediction = new DummyPrediction24Hours(DEFAULT_CONSUMPTION_PREDICTION);
+		final var productionPrediction = new DummyPrediction24Hours(DEFAULT_PRODUCTION_PREDICTION);
+		final var consumptionPrediction = new DummyPrediction24Hours(DEFAULT_CONSUMPTION_PREDICTION);
 
 		// Predictors
-		final DummyPredictor24Hours productionPredictor = new DummyPredictor24Hours(PREDICTOR_ID, cm,
+		final var productionPredictor = new DummyPredictor24Hours(PREDICTOR_ID, cm,
 				productionPrediction, "_sum/ProductionActivePower");
-		final DummyPredictor24Hours consumptionPredictor = new DummyPredictor24Hours(PREDICTOR_ID, cm,
+		final var consumptionPredictor = new DummyPredictor24Hours(PREDICTOR_ID, cm,
 				consumptionPrediction, "_sum/ConsumptionActivePower");
 
 		// PredictorManager
-		final DummyPredictorManager predictorManager = new DummyPredictorManager(productionPredictor,
+		final var predictorManager = new DummyPredictorManager(productionPredictor,
 				consumptionPredictor);
 
 		System.out.println(Arrays.toString(predictorManager
@@ -925,21 +925,21 @@ public void hybridEss_manual_midday_test() throws Exception {
 
 	@Test
 	public void mode_off_test() throws Exception {
-		final TimeLeapClock clock = new TimeLeapClock(Instant.parse("2020-01-01T00:00:00.00Z"), ZoneOffset.UTC);
-		final DummyComponentManager cm = new DummyComponentManager(clock);
+		final var clock = new TimeLeapClock(Instant.parse("2020-01-01T00:00:00.00Z"), ZoneOffset.UTC);
+		final var cm = new DummyComponentManager(clock);
 
 		// Predictions
-		final DummyPrediction24Hours productionPrediction = new DummyPrediction24Hours(DEFAULT_PRODUCTION_PREDICTION);
-		final DummyPrediction24Hours consumptionPrediction = new DummyPrediction24Hours(DEFAULT_CONSUMPTION_PREDICTION);
+		final var productionPrediction = new DummyPrediction24Hours(DEFAULT_PRODUCTION_PREDICTION);
+		final var consumptionPrediction = new DummyPrediction24Hours(DEFAULT_CONSUMPTION_PREDICTION);
 
 		// Predictors
-		final DummyPredictor24Hours productionPredictor = new DummyPredictor24Hours(PREDICTOR_ID, cm,
+		final var productionPredictor = new DummyPredictor24Hours(PREDICTOR_ID, cm,
 				productionPrediction, "_sum/ProductionActivePower");
-		final DummyPredictor24Hours consumptionPredictor = new DummyPredictor24Hours(PREDICTOR_ID, cm,
+		final var consumptionPredictor = new DummyPredictor24Hours(PREDICTOR_ID, cm,
 				consumptionPrediction, "_sum/ConsumptionActivePower");
 
 		// PredictorManager
-		final DummyPredictorManager predictorManager = new DummyPredictorManager(productionPredictor,
+		final var predictorManager = new DummyPredictorManager(productionPredictor,
 				consumptionPredictor);
 
 		new ControllerTest(new GridOptimizedChargeImpl()) //
@@ -975,21 +975,21 @@ public void mode_off_test() throws Exception {
 
 	@Test
 	public void no_capacity_left_test() throws Exception {
-		final TimeLeapClock clock = new TimeLeapClock(Instant.parse("2020-01-01T12:00:00.00Z"), ZoneOffset.UTC);
-		final DummyComponentManager cm = new DummyComponentManager(clock);
+		final var clock = new TimeLeapClock(Instant.parse("2020-01-01T12:00:00.00Z"), ZoneOffset.UTC);
+		final var cm = new DummyComponentManager(clock);
 
 		// Predictions
-		final DummyPrediction24Hours productionPrediction = new DummyPrediction24Hours(DEFAULT_PRODUCTION_PREDICTION);
-		final DummyPrediction24Hours consumptionPrediction = new DummyPrediction24Hours(DEFAULT_CONSUMPTION_PREDICTION);
+		final var productionPrediction = new DummyPrediction24Hours(DEFAULT_PRODUCTION_PREDICTION);
+		final var consumptionPrediction = new DummyPrediction24Hours(DEFAULT_CONSUMPTION_PREDICTION);
 
 		// Predictors
-		final DummyPredictor24Hours productionPredictor = new DummyPredictor24Hours(PREDICTOR_ID, cm,
+		final var productionPredictor = new DummyPredictor24Hours(PREDICTOR_ID, cm,
 				productionPrediction, "_sum/ProductionActivePower");
-		final DummyPredictor24Hours consumptionPredictor = new DummyPredictor24Hours(PREDICTOR_ID, cm,
+		final var consumptionPredictor = new DummyPredictor24Hours(PREDICTOR_ID, cm,
 				consumptionPrediction, "_sum/ConsumptionActivePower");
 
 		// PredictorManager
-		final DummyPredictorManager predictorManager = new DummyPredictorManager(productionPredictor,
+		final var predictorManager = new DummyPredictorManager(productionPredictor,
 				consumptionPredictor);
 
 		System.out.println(Arrays.toString(predictorManager
@@ -1037,21 +1037,21 @@ public void start_production_no_enough_test() throws Exception {
 		// does not consider the mocked Clock.
 		final ThrowingRunnable<Exception> sleep = () -> Thread.sleep(10);
 
-		final TimeLeapClock clock = new TimeLeapClock(Instant.parse("2020-01-01T00:00:00.00Z"), ZoneOffset.UTC);
-		final DummyComponentManager cm = new DummyComponentManager(clock);
+		final var clock = new TimeLeapClock(Instant.parse("2020-01-01T00:00:00.00Z"), ZoneOffset.UTC);
+		final var cm = new DummyComponentManager(clock);
 
 		// Predictions
-		final DummyPrediction24Hours productionPrediction = new DummyPrediction24Hours(DEFAULT_PRODUCTION_PREDICTION);
-		final DummyPrediction24Hours consumptionPrediction = new DummyPrediction24Hours(DEFAULT_CONSUMPTION_PREDICTION);
+		final var productionPrediction = new DummyPrediction24Hours(DEFAULT_PRODUCTION_PREDICTION);
+		final var consumptionPrediction = new DummyPrediction24Hours(DEFAULT_CONSUMPTION_PREDICTION);
 
 		// Predictors
-		final DummyPredictor24Hours productionPredictor = new DummyPredictor24Hours(PREDICTOR_ID, cm,
+		final var productionPredictor = new DummyPredictor24Hours(PREDICTOR_ID, cm,
 				productionPrediction, "_sum/ProductionActivePower");
-		final DummyPredictor24Hours consumptionPredictor = new DummyPredictor24Hours(PREDICTOR_ID, cm,
+		final var consumptionPredictor = new DummyPredictor24Hours(PREDICTOR_ID, cm,
 				consumptionPrediction, "_sum/ConsumptionActivePower");
 
 		// PredictorManager
-		final DummyPredictorManager predictorManager = new DummyPredictorManager(productionPredictor,
+		final var predictorManager = new DummyPredictorManager(productionPredictor,
 				consumptionPredictor);
 
 		new ControllerTest(new GridOptimizedChargeImpl()) //
@@ -1102,22 +1102,22 @@ public void start_production_average_test() throws Exception {
 		// does not consider the mocked Clock.
 		final ThrowingRunnable<Exception> sleep = () -> Thread.sleep(10);
 
-		final TimeLeapClock clock = new TimeLeapClock(Instant.parse("2020-01-01T00:00:00.00Z"),
+		final var clock = new TimeLeapClock(Instant.parse("2020-01-01T00:00:00.00Z"),
 				ZoneId.of("Europe/Berlin"));
-		final DummyComponentManager cm = new DummyComponentManager(clock);
+		final var cm = new DummyComponentManager(clock);
 
 		// Predictions
-		final DummyPrediction24Hours productionPrediction = new DummyPrediction24Hours(DEFAULT_PRODUCTION_PREDICTION);
-		final DummyPrediction24Hours consumptionPrediction = new DummyPrediction24Hours(DEFAULT_CONSUMPTION_PREDICTION);
+		final var productionPrediction = new DummyPrediction24Hours(DEFAULT_PRODUCTION_PREDICTION);
+		final var consumptionPrediction = new DummyPrediction24Hours(DEFAULT_CONSUMPTION_PREDICTION);
 
 		// Predictors
-		final DummyPredictor24Hours productionPredictor = new DummyPredictor24Hours(PREDICTOR_ID, cm,
+		final var productionPredictor = new DummyPredictor24Hours(PREDICTOR_ID, cm,
 				productionPrediction, "_sum/ProductionActivePower");
-		final DummyPredictor24Hours consumptionPredictor = new DummyPredictor24Hours(PREDICTOR_ID, cm,
+		final var consumptionPredictor = new DummyPredictor24Hours(PREDICTOR_ID, cm,
 				consumptionPrediction, "_sum/ConsumptionActivePower");
 
 		// PredictorManager
-		final DummyPredictorManager predictorManager = new DummyPredictorManager(productionPredictor,
+		final var predictorManager = new DummyPredictorManager(productionPredictor,
 				consumptionPredictor);
 
 		new ControllerTest(new GridOptimizedChargeImpl()) //

From 6e6b14c0dea99c888f267889b45a0afec3f069ec Mon Sep 17 00:00:00 2001
From: Stefan Feilmeier <stefan.feilmeier@fenecon.de>
Date: Mon, 7 Mar 2022 23:08:56 +0100
Subject: [PATCH 35/96] Update io.openems.edge.controller.ess.surplusfeedtogrid

---
 .../surplusfeedtogrid/SurplusFeedToGridController.java    | 6 +++---
 .../SurplusFeedToGridControllerImpl.java                  | 8 ++++----
 .../controller/ess/hybrid/surplusfeedtogrid/MyConfig.java | 2 +-
 .../SurplusFeedToGridControllerImplTest.java              | 4 ++--
 4 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/io.openems.edge.controller.ess.hybrid.surplusfeedtogrid/src/io/openems/edge/controller/ess/hybrid/surplusfeedtogrid/SurplusFeedToGridController.java b/io.openems.edge.controller.ess.hybrid.surplusfeedtogrid/src/io/openems/edge/controller/ess/hybrid/surplusfeedtogrid/SurplusFeedToGridController.java
index 9f48c47e4c2..6bcda706136 100644
--- a/io.openems.edge.controller.ess.hybrid.surplusfeedtogrid/src/io/openems/edge/controller/ess/hybrid/surplusfeedtogrid/SurplusFeedToGridController.java
+++ b/io.openems.edge.controller.ess.hybrid.surplusfeedtogrid/src/io/openems/edge/controller/ess/hybrid/surplusfeedtogrid/SurplusFeedToGridController.java
@@ -27,7 +27,7 @@ public Doc doc() {
 
 	/**
 	 * Gets the Channel for {@link ChannelId#SURPLUS_FEED_TO_GRID_IS_LIMITED}.
-	 * 
+	 *
 	 * @return the Channel
 	 */
 	public default StateChannel getSurplusFeedToGridIsLimitedChannel() {
@@ -37,7 +37,7 @@ public default StateChannel getSurplusFeedToGridIsLimitedChannel() {
 	/**
 	 * Gets the Run-Failed State. See
 	 * {@link ChannelId#SURPLUS_FEED_TO_GRID_IS_LIMITED}.
-	 * 
+	 *
 	 * @return the Channel {@link Value}
 	 */
 	public default Value<Boolean> getSurplusFeedToGridIsLimited() {
@@ -47,7 +47,7 @@ public default Value<Boolean> getSurplusFeedToGridIsLimited() {
 	/**
 	 * Internal method to set the 'nextValue' on
 	 * {@link ChannelId#SURPLUS_FEED_TO_GRID_IS_LIMITED} Channel.
-	 * 
+	 *
 	 * @param value the next value
 	 */
 	public default void _setSurplusFeedToGridIsLimited(boolean value) {
diff --git a/io.openems.edge.controller.ess.hybrid.surplusfeedtogrid/src/io/openems/edge/controller/ess/hybrid/surplusfeedtogrid/SurplusFeedToGridControllerImpl.java b/io.openems.edge.controller.ess.hybrid.surplusfeedtogrid/src/io/openems/edge/controller/ess/hybrid/surplusfeedtogrid/SurplusFeedToGridControllerImpl.java
index 308afca8c72..eace3325afc 100644
--- a/io.openems.edge.controller.ess.hybrid.surplusfeedtogrid/src/io/openems/edge/controller/ess/hybrid/surplusfeedtogrid/SurplusFeedToGridControllerImpl.java
+++ b/io.openems.edge.controller.ess.hybrid.surplusfeedtogrid/src/io/openems/edge/controller/ess/hybrid/surplusfeedtogrid/SurplusFeedToGridControllerImpl.java
@@ -50,10 +50,10 @@ void activate(ComponentContext context, Config config) {
 
 		// update filter for 'ess'
 		if (OpenemsComponent.updateReferenceFilter(this.cm, this.servicePid(), "ess", config.ess_id())) {
-			return;
 		}
 	}
 
+	@Override
 	@Deactivate
 	protected void deactivate() {
 		super.deactivate();
@@ -61,7 +61,7 @@ protected void deactivate() {
 
 	@Override
 	public void run() throws OpenemsNamedException {
-		Integer surplusPower = this.ess.getSurplusPower();
+		var surplusPower = this.ess.getSurplusPower();
 
 		// No surplus power by Ess? -> stop
 		if (surplusPower == null) {
@@ -69,10 +69,10 @@ public void run() throws OpenemsNamedException {
 			return;
 		}
 
-		ManagedSymmetricEss managedEss = (ManagedSymmetricEss) this.ess;
+		var managedEss = (ManagedSymmetricEss) this.ess;
 
 		// Get maximum possible surplus feed-in power
-		int maxDischargePower = managedEss.getPower().getMaxPower(managedEss, Phase.ALL, Pwr.ACTIVE);
+		var maxDischargePower = managedEss.getPower().getMaxPower(managedEss, Phase.ALL, Pwr.ACTIVE);
 
 		// Is surplus power limited by a higher priority Controller? -> set info state
 		final int minDischargePower;
diff --git a/io.openems.edge.controller.ess.hybrid.surplusfeedtogrid/test/io/openems/edge/controller/ess/hybrid/surplusfeedtogrid/MyConfig.java b/io.openems.edge.controller.ess.hybrid.surplusfeedtogrid/test/io/openems/edge/controller/ess/hybrid/surplusfeedtogrid/MyConfig.java
index 407fc91d1ea..15348308a56 100644
--- a/io.openems.edge.controller.ess.hybrid.surplusfeedtogrid/test/io/openems/edge/controller/ess/hybrid/surplusfeedtogrid/MyConfig.java
+++ b/io.openems.edge.controller.ess.hybrid.surplusfeedtogrid/test/io/openems/edge/controller/ess/hybrid/surplusfeedtogrid/MyConfig.java
@@ -30,7 +30,7 @@ public MyConfig build() {
 
 	/**
 	 * Create a Config builder.
-	 * 
+	 *
 	 * @return a {@link Builder}
 	 */
 	public static Builder create() {
diff --git a/io.openems.edge.controller.ess.hybrid.surplusfeedtogrid/test/io/openems/edge/controller/ess/hybrid/surplusfeedtogrid/SurplusFeedToGridControllerImplTest.java b/io.openems.edge.controller.ess.hybrid.surplusfeedtogrid/test/io/openems/edge/controller/ess/hybrid/surplusfeedtogrid/SurplusFeedToGridControllerImplTest.java
index eda370edbad..4577c78c8dc 100644
--- a/io.openems.edge.controller.ess.hybrid.surplusfeedtogrid/test/io/openems/edge/controller/ess/hybrid/surplusfeedtogrid/SurplusFeedToGridControllerImplTest.java
+++ b/io.openems.edge.controller.ess.hybrid.surplusfeedtogrid/test/io/openems/edge/controller/ess/hybrid/surplusfeedtogrid/SurplusFeedToGridControllerImplTest.java
@@ -22,8 +22,8 @@ public class SurplusFeedToGridControllerImplTest {
 
 	@Test
 	public void test() throws Exception {
-		final DummyHybridEss ess = new DummyHybridEss(ESS_ID);
-		final ControllerTest test = new ControllerTest(new SurplusFeedToGridControllerImpl()) //
+		final var ess = new DummyHybridEss(ESS_ID);
+		final var test = new ControllerTest(new SurplusFeedToGridControllerImpl()) //
 				.addReference("cm", new DummyConfigurationAdmin()) //
 				.addReference("ess", ess) //
 				.activate(MyConfig.create() //

From bfce17cf874641fda7598a0204b4c72a70c8f074 Mon Sep 17 00:00:00 2001
From: Stefan Feilmeier <stefan.feilmeier@fenecon.de>
Date: Mon, 7 Mar 2022 23:10:00 +0100
Subject: [PATCH 36/96] Update
 io.openems.edge.controller.ess.limittotaldischarge

---
 .../LimitTotalDischargeController.java        |  2 +-
 .../LimitTotalDischargeControllerImpl.java    | 38 +++++++++----------
 .../LimitTotalDischargeControllerTest.java    |  2 +-
 .../ess/limittotaldischarge/MyConfig.java     |  2 +-
 4 files changed, 22 insertions(+), 22 deletions(-)

diff --git a/io.openems.edge.controller.ess.limittotaldischarge/src/io/openems/edge/controller/ess/limittotaldischarge/LimitTotalDischargeController.java b/io.openems.edge.controller.ess.limittotaldischarge/src/io/openems/edge/controller/ess/limittotaldischarge/LimitTotalDischargeController.java
index 06e904a810a..c4a8e6d45a2 100644
--- a/io.openems.edge.controller.ess.limittotaldischarge/src/io/openems/edge/controller/ess/limittotaldischarge/LimitTotalDischargeController.java
+++ b/io.openems.edge.controller.ess.limittotaldischarge/src/io/openems/edge/controller/ess/limittotaldischarge/LimitTotalDischargeController.java
@@ -28,7 +28,7 @@ public Doc doc() {
 
 	/**
 	 * Gets the {@link Config}.
-	 * 
+	 *
 	 * @return the Config
 	 */
 	public Config getConfig();
diff --git a/io.openems.edge.controller.ess.limittotaldischarge/src/io/openems/edge/controller/ess/limittotaldischarge/LimitTotalDischargeControllerImpl.java b/io.openems.edge.controller.ess.limittotaldischarge/src/io/openems/edge/controller/ess/limittotaldischarge/LimitTotalDischargeControllerImpl.java
index 29bc3ab0b4c..fd90f76e2d8 100644
--- a/io.openems.edge.controller.ess.limittotaldischarge/src/io/openems/edge/controller/ess/limittotaldischarge/LimitTotalDischargeControllerImpl.java
+++ b/io.openems.edge.controller.ess.limittotaldischarge/src/io/openems/edge/controller/ess/limittotaldischarge/LimitTotalDischargeControllerImpl.java
@@ -15,7 +15,6 @@
 import org.slf4j.LoggerFactory;
 
 import io.openems.common.exceptions.OpenemsError.OpenemsNamedException;
-import io.openems.edge.common.channel.value.Value;
 import io.openems.edge.common.component.AbstractOpenemsComponent;
 import io.openems.edge.common.component.ComponentManager;
 import io.openems.edge.common.component.OpenemsComponent;
@@ -92,6 +91,7 @@ private void activate(ComponentContext context, Config config) {
 		}
 	}
 
+	@Override
 	@Deactivate
 	protected void deactivate() {
 		super.deactivate();
@@ -102,7 +102,7 @@ public void run() throws OpenemsNamedException {
 		ManagedSymmetricEss ess = this.componentManager.getComponent(this.essId);
 
 		// Set to normal state and return if SoC is not available
-		Value<Integer> socOpt = ess.getSoc();
+		var socOpt = ess.getSoc();
 		if (!socOpt.isDefined()) {
 			this.state = State.NORMAL;
 			return;
@@ -128,7 +128,8 @@ public void run() throws OpenemsNamedException {
 				if (soc <= this.forceChargeSoc) {
 					stateChanged = this.changeState(State.FORCE_CHARGE_SOC);
 					break;
-				} else if (soc <= this.minSoc) {
+				}
+				if (soc <= this.minSoc) {
 					stateChanged = this.changeState(State.MIN_SOC);
 					break;
 				}
@@ -159,7 +160,7 @@ public void run() throws OpenemsNamedException {
 				if (this.forceChargePower.isPresent()) {
 					calculatedPower = this.forceChargePower.get() * -1; // convert to negative for charging
 				} else {
-					int maxCharge = ess.getPower().getMinPower(ess, Phase.ALL, Pwr.ACTIVE);
+					var maxCharge = ess.getPower().getMinPower(ess, Phase.ALL, Pwr.ACTIVE);
 					calculatedPower = maxCharge / 5;
 				}
 
@@ -187,28 +188,27 @@ public void run() throws OpenemsNamedException {
 
 	/**
 	 * Changes the state if hysteresis time passed, to avoid too quick changes.
-	 * 
+	 *
 	 * @param nextState the target state
 	 * @return whether the state was changed
 	 */
 	private boolean changeState(State nextState) {
-		if (this.state != nextState) {
-			if (Duration.between(//
-					this.lastStateChange, //
-					Instant.now(this.componentManager.getClock()) //
-			).toMinutes() >= HYSTERESIS) {
-				this.state = nextState;
-				this.lastStateChange = Instant.now(this.componentManager.getClock());
-				this._setAwaitingHysteresisValue(false);
-				return true;
-			} else {
-				this._setAwaitingHysteresisValue(true);
-				return false;
-			}
-		} else {
+		if (this.state == nextState) {
 			this._setAwaitingHysteresisValue(false);
 			return false;
 		}
+		if (Duration.between(//
+				this.lastStateChange, //
+				Instant.now(this.componentManager.getClock()) //
+		).toMinutes() >= HYSTERESIS) {
+			this.state = nextState;
+			this.lastStateChange = Instant.now(this.componentManager.getClock());
+			this._setAwaitingHysteresisValue(false);
+			return true;
+		} else {
+			this._setAwaitingHysteresisValue(true);
+			return false;
+		}
 	}
 
 	@Override
diff --git a/io.openems.edge.controller.ess.limittotaldischarge/test/io/openems/edge/controller/ess/limittotaldischarge/LimitTotalDischargeControllerTest.java b/io.openems.edge.controller.ess.limittotaldischarge/test/io/openems/edge/controller/ess/limittotaldischarge/LimitTotalDischargeControllerTest.java
index aa94f349ae6..d41c0b617d1 100644
--- a/io.openems.edge.controller.ess.limittotaldischarge/test/io/openems/edge/controller/ess/limittotaldischarge/LimitTotalDischargeControllerTest.java
+++ b/io.openems.edge.controller.ess.limittotaldischarge/test/io/openems/edge/controller/ess/limittotaldischarge/LimitTotalDischargeControllerTest.java
@@ -24,7 +24,7 @@ public class LimitTotalDischargeControllerTest {
 	@Test
 	public void test() throws Exception {
 		// Initialize mocked Clock
-		final TimeLeapClock clock = new TimeLeapClock();
+		final var clock = new TimeLeapClock();
 		new ControllerTest(new LimitTotalDischargeControllerImpl()) //
 				.addReference("componentManager", new DummyComponentManager(clock)) //
 				.addComponent(new DummyManagedSymmetricEss(ESS_ID) //
diff --git a/io.openems.edge.controller.ess.limittotaldischarge/test/io/openems/edge/controller/ess/limittotaldischarge/MyConfig.java b/io.openems.edge.controller.ess.limittotaldischarge/test/io/openems/edge/controller/ess/limittotaldischarge/MyConfig.java
index 676e7800c69..95fb4c74b67 100644
--- a/io.openems.edge.controller.ess.limittotaldischarge/test/io/openems/edge/controller/ess/limittotaldischarge/MyConfig.java
+++ b/io.openems.edge.controller.ess.limittotaldischarge/test/io/openems/edge/controller/ess/limittotaldischarge/MyConfig.java
@@ -47,7 +47,7 @@ public MyConfig build() {
 
 	/**
 	 * Create a Config builder.
-	 * 
+	 *
 	 * @return a {@link Builder}
 	 */
 	public static Builder create() {

From e59389597118da3a8f19c9f85758e3f83844a931 Mon Sep 17 00:00:00 2001
From: Stefan Feilmeier <stefan.feilmeier@fenecon.de>
Date: Mon, 7 Mar 2022 23:10:29 +0100
Subject: [PATCH 37/96] Update io.openems.edge.controller.ess.linearpowerband

---
 .../controller/ess/linearpowerband/EssLinearPowerBand.java  | 6 +++---
 .../ess/linearpowerband/EssLinearPowerBandImpl.java         | 1 +
 .../edge/controller/ess/linearpowerband/MyConfig.java       | 2 +-
 3 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/io.openems.edge.controller.ess.linearpowerband/src/io/openems/edge/controller/ess/linearpowerband/EssLinearPowerBand.java b/io.openems.edge.controller.ess.linearpowerband/src/io/openems/edge/controller/ess/linearpowerband/EssLinearPowerBand.java
index ca1d5d50af5..f413edef5f4 100644
--- a/io.openems.edge.controller.ess.linearpowerband/src/io/openems/edge/controller/ess/linearpowerband/EssLinearPowerBand.java
+++ b/io.openems.edge.controller.ess.linearpowerband/src/io/openems/edge/controller/ess/linearpowerband/EssLinearPowerBand.java
@@ -29,7 +29,7 @@ public Doc doc() {
 
 	/**
 	 * Gets the Channel for {@link ChannelId#TARGET_POWER}.
-	 * 
+	 *
 	 * @return the Channel
 	 */
 	public default IntegerReadChannel getTargetPowerChannel() {
@@ -38,7 +38,7 @@ public default IntegerReadChannel getTargetPowerChannel() {
 
 	/**
 	 * Gets the Target Power in [W]. See {@link ChannelId#TARGET_POWER}.
-	 * 
+	 *
 	 * @return the Channel {@link Value}
 	 */
 	public default Value<Integer> getTargetPower() {
@@ -48,7 +48,7 @@ public default Value<Integer> getTargetPower() {
 	/**
 	 * Internal method to set the 'nextValue' on {@link ChannelId#TARGET_POWER}
 	 * Channel.
-	 * 
+	 *
 	 * @param value the next value
 	 */
 	public default void _setTargetPower(Integer value) {
diff --git a/io.openems.edge.controller.ess.linearpowerband/src/io/openems/edge/controller/ess/linearpowerband/EssLinearPowerBandImpl.java b/io.openems.edge.controller.ess.linearpowerband/src/io/openems/edge/controller/ess/linearpowerband/EssLinearPowerBandImpl.java
index 312385b75c2..54522960e85 100644
--- a/io.openems.edge.controller.ess.linearpowerband/src/io/openems/edge/controller/ess/linearpowerband/EssLinearPowerBandImpl.java
+++ b/io.openems.edge.controller.ess.linearpowerband/src/io/openems/edge/controller/ess/linearpowerband/EssLinearPowerBandImpl.java
@@ -64,6 +64,7 @@ void activate(ComponentContext context, Config config) {
 		}
 	}
 
+	@Override
 	@Deactivate
 	protected void deactivate() {
 		super.deactivate();
diff --git a/io.openems.edge.controller.ess.linearpowerband/test/io/openems/edge/controller/ess/linearpowerband/MyConfig.java b/io.openems.edge.controller.ess.linearpowerband/test/io/openems/edge/controller/ess/linearpowerband/MyConfig.java
index 16ddb8e0f45..c972c6a12ef 100644
--- a/io.openems.edge.controller.ess.linearpowerband/test/io/openems/edge/controller/ess/linearpowerband/MyConfig.java
+++ b/io.openems.edge.controller.ess.linearpowerband/test/io/openems/edge/controller/ess/linearpowerband/MyConfig.java
@@ -54,7 +54,7 @@ public MyConfig build() {
 
 	/**
 	 * Create a Config builder.
-	 * 
+	 *
 	 * @return a {@link Builder}
 	 */
 	public static Builder create() {

From 14b6b3b02a522e7efeb3e2a64f97bddfb2ea1ad6 Mon Sep 17 00:00:00 2001
From: Stefan Feilmeier <stefan.feilmeier@fenecon.de>
Date: Mon, 7 Mar 2022 23:11:11 +0100
Subject: [PATCH 38/96] Update
 io.openems.edge.controller.ess.mindischargeperiod

---
 .../controller/ess/mindischargeperiod/MinDischargePeriod.java | 4 ++--
 .../openems/edge/controller/ess/mindischargeperiod/State.java | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/io.openems.edge.controller.ess.mindischargeperiod/src/io/openems/edge/controller/ess/mindischargeperiod/MinDischargePeriod.java b/io.openems.edge.controller.ess.mindischargeperiod/src/io/openems/edge/controller/ess/mindischargeperiod/MinDischargePeriod.java
index 09809a03fc3..18a65b45569 100644
--- a/io.openems.edge.controller.ess.mindischargeperiod/src/io/openems/edge/controller/ess/mindischargeperiod/MinDischargePeriod.java
+++ b/io.openems.edge.controller.ess.mindischargeperiod/src/io/openems/edge/controller/ess/mindischargeperiod/MinDischargePeriod.java
@@ -21,7 +21,6 @@
 import io.openems.edge.common.component.AbstractOpenemsComponent;
 import io.openems.edge.common.component.ComponentManager;
 import io.openems.edge.common.component.OpenemsComponent;
-import io.openems.edge.common.sum.GridMode;
 import io.openems.edge.controller.api.Controller;
 import io.openems.edge.ess.api.ManagedSymmetricEss;
 import io.openems.edge.ess.power.api.Phase;
@@ -81,6 +80,7 @@ void activate(ComponentContext context, Config config) {
 		this.stopwatch = Stopwatch.createUnstarted();
 	}
 
+	@Override
 	@Deactivate
 	protected void deactivate() {
 		super.deactivate();
@@ -93,7 +93,7 @@ public void run() throws OpenemsNamedException {
 		/*
 		 * Check that we are On-Grid (and warn on undefined Grid-Mode)
 		 */
-		GridMode gridMode = ess.getGridMode();
+		var gridMode = ess.getGridMode();
 		if (gridMode.isUndefined()) {
 			this.logWarn(this.log, "Grid-Mode is [UNDEFINED]");
 		}
diff --git a/io.openems.edge.controller.ess.mindischargeperiod/src/io/openems/edge/controller/ess/mindischargeperiod/State.java b/io.openems.edge.controller.ess.mindischargeperiod/src/io/openems/edge/controller/ess/mindischargeperiod/State.java
index d112599a87e..ac214388f2a 100644
--- a/io.openems.edge.controller.ess.mindischargeperiod/src/io/openems/edge/controller/ess/mindischargeperiod/State.java
+++ b/io.openems.edge.controller.ess.mindischargeperiod/src/io/openems/edge/controller/ess/mindischargeperiod/State.java
@@ -17,12 +17,12 @@ private State(int value, String name) {
 
 	@Override
 	public int getValue() {
-		return value;
+		return this.value;
 	}
 
 	@Override
 	public String getName() {
-		return name;
+		return this.name;
 	}
 
 	@Override

From a389a6d79b5205eee1bc0375587baa0de4919c3a Mon Sep 17 00:00:00 2001
From: Stefan Feilmeier <stefan.feilmeier@fenecon.de>
Date: Mon, 7 Mar 2022 23:11:52 +0100
Subject: [PATCH 39/96] Update
 io.openems.edge.controller.ess.reactivepowervoltagecharacteristics

---
 .../ReactivePowerVoltageCharacteristic.java      |  8 ++++----
 .../ReactivePwrVoltChractersticImpl.java         | 16 +++++++---------
 .../CharacteristicImplTest.java                  |  2 +-
 3 files changed, 12 insertions(+), 14 deletions(-)

diff --git a/io.openems.edge.controller.ess.reactivepowervoltagecharacteristic/src/io/openems/edge/controller/ess/reactivepowervoltagecharacteristic/ReactivePowerVoltageCharacteristic.java b/io.openems.edge.controller.ess.reactivepowervoltagecharacteristic/src/io/openems/edge/controller/ess/reactivepowervoltagecharacteristic/ReactivePowerVoltageCharacteristic.java
index 533bb3bfb51..0868f500e5b 100644
--- a/io.openems.edge.controller.ess.reactivepowervoltagecharacteristic/src/io/openems/edge/controller/ess/reactivepowervoltagecharacteristic/ReactivePowerVoltageCharacteristic.java
+++ b/io.openems.edge.controller.ess.reactivepowervoltagecharacteristic/src/io/openems/edge/controller/ess/reactivepowervoltagecharacteristic/ReactivePowerVoltageCharacteristic.java
@@ -30,7 +30,7 @@ public Doc doc() {
 
 	/**
 	 * Gets the Channel for {@link ChannelId#CALCULATED_POWER}.
-	 * 
+	 *
 	 * @return the Channel
 	 */
 	public default IntegerReadChannel getCalculatedPowerChannel() {
@@ -40,7 +40,7 @@ public default IntegerReadChannel getCalculatedPowerChannel() {
 	/**
 	 * Internal method to set the 'nextValue' on {@link ChannelId#CALCULATED_POWER}
 	 * Channel.
-	 * 
+	 *
 	 * @param value the next value
 	 */
 	public default void _setCalculatedPower(Integer value) {
@@ -49,7 +49,7 @@ public default void _setCalculatedPower(Integer value) {
 
 	/**
 	 * Gets the Channel for {@link ChannelId#VOLTAGE_RATIO}.
-	 * 
+	 *
 	 * @return the Channel
 	 */
 	public default FloatReadChannel getVoltageRatioChannel() {
@@ -59,7 +59,7 @@ public default FloatReadChannel getVoltageRatioChannel() {
 	/**
 	 * Internal method to set the 'nextValue' on {@link ChannelId#VOLTAGE_RATIO}
 	 * Channel.
-	 * 
+	 *
 	 * @param value the next value
 	 */
 	public default void _setVoltageRatio(Float value) {
diff --git a/io.openems.edge.controller.ess.reactivepowervoltagecharacteristic/src/io/openems/edge/controller/ess/reactivepowervoltagecharacteristic/ReactivePwrVoltChractersticImpl.java b/io.openems.edge.controller.ess.reactivepowervoltagecharacteristic/src/io/openems/edge/controller/ess/reactivepowervoltagecharacteristic/ReactivePwrVoltChractersticImpl.java
index d5ac5a4721c..e75307c6e6b 100644
--- a/io.openems.edge.controller.ess.reactivepowervoltagecharacteristic/src/io/openems/edge/controller/ess/reactivepowervoltagecharacteristic/ReactivePwrVoltChractersticImpl.java
+++ b/io.openems.edge.controller.ess.reactivepowervoltagecharacteristic/src/io/openems/edge/controller/ess/reactivepowervoltagecharacteristic/ReactivePwrVoltChractersticImpl.java
@@ -1,6 +1,5 @@
 package io.openems.edge.controller.ess.reactivepowervoltagecharacteristic;
 
-import java.time.Clock;
 import java.time.Duration;
 import java.time.LocalDateTime;
 
@@ -19,12 +18,10 @@
 import org.slf4j.LoggerFactory;
 
 import io.openems.common.exceptions.OpenemsError.OpenemsNamedException;
-import io.openems.edge.common.channel.value.Value;
 import io.openems.edge.common.component.AbstractOpenemsComponent;
 import io.openems.edge.common.component.ComponentManager;
 import io.openems.edge.common.component.OpenemsComponent;
 import io.openems.edge.common.linecharacteristic.PolyLine;
-import io.openems.edge.common.sum.GridMode;
 import io.openems.edge.controller.api.Controller;
 import io.openems.edge.ess.api.ManagedSymmetricEss;
 import io.openems.edge.meter.api.SymmetricMeter;
@@ -78,6 +75,7 @@ void activate(ComponentContext context, Config config) throws OpenemsNamedExcept
 		this.qByUCharacteristics = new PolyLine("voltageRatio", "percent", config.lineConfig());
 	}
 
+	@Override
 	@Deactivate
 	protected void deactivate() {
 		super.deactivate();
@@ -85,7 +83,7 @@ protected void deactivate() {
 
 	@Override
 	public void run() throws OpenemsNamedException {
-		GridMode gridMode = this.ess.getGridMode();
+		var gridMode = this.ess.getGridMode();
 		if (gridMode.isUndefined()) {
 			this.logWarn(this.log, "Grid-Mode is [UNDEFINED]");
 		}
@@ -101,7 +99,7 @@ public void run() throws OpenemsNamedException {
 
 		// Ratio between current voltage and nominal voltage
 		final Float voltageRatio;
-		Value<Integer> gridVoltage = this.meter.getVoltage();
+		var gridVoltage = this.meter.getVoltage();
 		if (gridVoltage.isDefined()) {
 			voltageRatio = gridVoltage.get() / (this.config.nominalVoltage() * 1000);
 		} else {
@@ -113,8 +111,8 @@ public void run() throws OpenemsNamedException {
 		}
 
 		// Do NOT change Set Power If it Does not exceed the hysteresis time
-		Clock clock = this.componentManager.getClock();
-		LocalDateTime now = LocalDateTime.now(clock);
+		var clock = this.componentManager.getClock();
+		var now = LocalDateTime.now(clock);
 		if (Duration.between(this.lastSetPowerTime, now).getSeconds() < this.config.waitForHysteresis()) {
 			return;
 		}
@@ -125,7 +123,7 @@ public void run() throws OpenemsNamedException {
 		if (this.qByUCharacteristics == null) {
 			percent = null;
 		} else {
-			Double p = this.qByUCharacteristics.getValue(voltageRatio);
+			var p = this.qByUCharacteristics.getValue(voltageRatio);
 			if (p == null) {
 				percent = null;
 			} else {
@@ -136,7 +134,7 @@ public void run() throws OpenemsNamedException {
 		// Gets required maxApparentPower
 		// which is used in calculation of reactive power:
 		// Otherwise should not calcula the reactive power and has to return here
-		Value<Integer> apparentPower = this.ess.getMaxApparentPower();
+		var apparentPower = this.ess.getMaxApparentPower();
 		Integer power = (int) (apparentPower.getOrError() * percent * 0.01);
 		this._setCalculatedPower(power);
 
diff --git a/io.openems.edge.controller.ess.reactivepowervoltagecharacteristic/test/io/openems/edge/controller/ess/reactivepowervoltagecharacteristic/CharacteristicImplTest.java b/io.openems.edge.controller.ess.reactivepowervoltagecharacteristic/test/io/openems/edge/controller/ess/reactivepowervoltagecharacteristic/CharacteristicImplTest.java
index b47cf62db3d..a2f2a932ed0 100644
--- a/io.openems.edge.controller.ess.reactivepowervoltagecharacteristic/test/io/openems/edge/controller/ess/reactivepowervoltagecharacteristic/CharacteristicImplTest.java
+++ b/io.openems.edge.controller.ess.reactivepowervoltagecharacteristic/test/io/openems/edge/controller/ess/reactivepowervoltagecharacteristic/CharacteristicImplTest.java
@@ -27,7 +27,7 @@ public class CharacteristicImplTest {
 
 	@Test
 	public void test() throws Exception {
-		final TimeLeapClock clock = new TimeLeapClock(Instant.parse("2020-10-05T14:00:00.00Z"), ZoneOffset.UTC);
+		final var clock = new TimeLeapClock(Instant.parse("2020-10-05T14:00:00.00Z"), ZoneOffset.UTC);
 		new ControllerTest(new ReactivePwrVoltChractersticImpl())//
 				.addReference("cm", new DummyConfigurationAdmin()) //
 				.addReference("componentManager", new DummyComponentManager(clock)) //

From 0a0c9ef6ee216156791f2568c17eeec6885adfdd Mon Sep 17 00:00:00 2001
From: Stefan Feilmeier <stefan.feilmeier@fenecon.de>
Date: Mon, 7 Mar 2022 23:12:19 +0100
Subject: [PATCH 40/96] Update io.openems.edge.controller.ess.selltogridlimit

---
 .../symmetric/selltogridlimit/EssSellToGridLimitImpl.java  | 7 +++----
 .../controller/symmetric/selltogridlimit/MyConfig.java     | 2 +-
 2 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/io.openems.edge.controller.ess.selltogridlimit/src/io/openems/edge/controller/symmetric/selltogridlimit/EssSellToGridLimitImpl.java b/io.openems.edge.controller.ess.selltogridlimit/src/io/openems/edge/controller/symmetric/selltogridlimit/EssSellToGridLimitImpl.java
index 6fa3cc28087..951d542ae38 100644
--- a/io.openems.edge.controller.ess.selltogridlimit/src/io/openems/edge/controller/symmetric/selltogridlimit/EssSellToGridLimitImpl.java
+++ b/io.openems.edge.controller.ess.selltogridlimit/src/io/openems/edge/controller/symmetric/selltogridlimit/EssSellToGridLimitImpl.java
@@ -17,7 +17,6 @@
 import io.openems.common.exceptions.OpenemsError.OpenemsNamedException;
 import io.openems.edge.common.component.AbstractOpenemsComponent;
 import io.openems.edge.common.component.OpenemsComponent;
-import io.openems.edge.common.sum.GridMode;
 import io.openems.edge.controller.api.Controller;
 import io.openems.edge.ess.api.ManagedSymmetricEss;
 import io.openems.edge.meter.api.SymmetricMeter;
@@ -63,10 +62,10 @@ void activate(ComponentContext context, Config config) {
 
 		// update filter for 'meter'
 		if (OpenemsComponent.updateReferenceFilter(this.cm, this.servicePid(), "meter", config.meter_id())) {
-			return;
 		}
 	}
 
+	@Override
 	@Deactivate
 	protected void deactivate() {
 		super.deactivate();
@@ -77,7 +76,7 @@ public void run() throws OpenemsNamedException {
 		/*
 		 * Check that we are On-Grid (and warn on undefined Grid-Mode)
 		 */
-		GridMode gridMode = this.ess.getGridMode();
+		var gridMode = this.ess.getGridMode();
 		if (gridMode.isUndefined()) {
 			this.logWarn(this.log, "Grid-Mode is [UNDEFINED]");
 		}
@@ -96,7 +95,7 @@ public void run() throws OpenemsNamedException {
 		if (gridPower * -1 > this.config.maximumSellToGridPower()) {
 
 			// Calculate actual limit for Ess
-			int essPowerLimit = gridPower + this.ess.getActivePower().getOrError()
+			var essPowerLimit = gridPower + this.ess.getActivePower().getOrError()
 					+ this.config.maximumSellToGridPower();
 
 			// Apply limit
diff --git a/io.openems.edge.controller.ess.selltogridlimit/test/io/openems/edge/controller/symmetric/selltogridlimit/MyConfig.java b/io.openems.edge.controller.ess.selltogridlimit/test/io/openems/edge/controller/symmetric/selltogridlimit/MyConfig.java
index 2a408552a8c..414062f91e3 100644
--- a/io.openems.edge.controller.ess.selltogridlimit/test/io/openems/edge/controller/symmetric/selltogridlimit/MyConfig.java
+++ b/io.openems.edge.controller.ess.selltogridlimit/test/io/openems/edge/controller/symmetric/selltogridlimit/MyConfig.java
@@ -43,7 +43,7 @@ public MyConfig build() {
 
 	/**
 	 * Create a Config builder.
-	 * 
+	 *
 	 * @return a {@link Builder}
 	 */
 	public static Builder create() {

From aeb5331aef690c1ac831415959c6f92d64cf3adf Mon Sep 17 00:00:00 2001
From: Stefan Feilmeier <stefan.feilmeier@fenecon.de>
Date: Mon, 7 Mar 2022 23:12:59 +0100
Subject: [PATCH 41/96] Update io.openems.edge.controller.ess.standby

---
 .../ess/standby/StandbyControllerImpl.java       | 13 ++++++-------
 .../standby/statemachine/DischargeHandler.java   | 16 ++++++++--------
 .../standby/statemachine/FastChargeHandler.java  |  7 +++----
 .../standby/statemachine/FinishedHandler.java    |  5 ++---
 .../standby/statemachine/SlowCharge1Handler.java |  5 ++---
 .../standby/statemachine/SlowCharge2Handler.java |  5 ++---
 .../standby/statemachine/SlowChargeUtils.java    |  8 ++++----
 .../standby/statemachine/UndefinedHandler.java   |  4 ++--
 .../edge/controller/ess/standby/MyConfig.java    |  1 -
 .../ess/standby/StandbyControllerImplTest.java   |  2 +-
 10 files changed, 30 insertions(+), 36 deletions(-)

diff --git a/io.openems.edge.controller.ess.standby/src/io/openems/edge/controller/ess/standby/StandbyControllerImpl.java b/io.openems.edge.controller.ess.standby/src/io/openems/edge/controller/ess/standby/StandbyControllerImpl.java
index e01190c571a..1a38a457bd1 100644
--- a/io.openems.edge.controller.ess.standby/src/io/openems/edge/controller/ess/standby/StandbyControllerImpl.java
+++ b/io.openems.edge.controller.ess.standby/src/io/openems/edge/controller/ess/standby/StandbyControllerImpl.java
@@ -17,7 +17,6 @@
 import io.openems.edge.common.component.AbstractOpenemsComponent;
 import io.openems.edge.common.component.ComponentManager;
 import io.openems.edge.common.component.OpenemsComponent;
-import io.openems.edge.common.sum.GridMode;
 import io.openems.edge.common.sum.Sum;
 import io.openems.edge.controller.api.Controller;
 import io.openems.edge.controller.ess.standby.statemachine.Context;
@@ -70,6 +69,7 @@ void activate(ComponentContext context, Config config) {
 		this.configuredEndDate = convertDate(config.endDate());
 	}
 
+	@Override
 	@Deactivate
 	protected void deactivate() {
 		super.deactivate();
@@ -82,7 +82,7 @@ public void run() throws OpenemsNamedException {
 		/*
 		 * Check that we are On-Grid (and warn on undefined Grid-Mode)
 		 */
-		GridMode gridMode = ess.getGridMode();
+		var gridMode = ess.getGridMode();
 		if (gridMode.isUndefined()) {
 			this.logWarn(this.log, "Grid-Mode is [UNDEFINED]");
 		}
@@ -98,7 +98,7 @@ public void run() throws OpenemsNamedException {
 		this.channel(StandbyController.ChannelId.STATE_MACHINE).setNextValue(this.stateMachine.getCurrentState());
 
 		// Prepare Context
-		Context context = new Context(this, ess, this.sum, this.configuredStartDate, this.configuredEndDate,
+		var context = new Context(this, ess, this.sum, this.configuredStartDate, this.configuredEndDate,
 				this.config.dayOfWeek(), this.componentManager.getClock());
 
 		// Call the StateMachine
@@ -107,13 +107,12 @@ public void run() throws OpenemsNamedException {
 
 	/**
 	 * Converts a string to a LocalDate.
-	 * 
+	 *
 	 * @param date the date as string in the format "dd.MM.yyyy" (DATE_FORMAT).
 	 * @return the date as {@link LocalDate}
 	 */
 	private static LocalDate convertDate(String date) {
-		DateTimeFormatter dateTimeFormatter = DateTimeFormatter.ofPattern(DATE_FORMAT);
-		LocalDate localDate = LocalDate.parse(date, dateTimeFormatter);
-		return localDate;
+		var dateTimeFormatter = DateTimeFormatter.ofPattern(DATE_FORMAT);
+		return LocalDate.parse(date, dateTimeFormatter);
 	}
 }
diff --git a/io.openems.edge.controller.ess.standby/src/io/openems/edge/controller/ess/standby/statemachine/DischargeHandler.java b/io.openems.edge.controller.ess.standby/src/io/openems/edge/controller/ess/standby/statemachine/DischargeHandler.java
index 8bfb5c570ca..445adeca922 100644
--- a/io.openems.edge.controller.ess.standby/src/io/openems/edge/controller/ess/standby/statemachine/DischargeHandler.java
+++ b/io.openems.edge.controller.ess.standby/src/io/openems/edge/controller/ess/standby/statemachine/DischargeHandler.java
@@ -26,7 +26,7 @@ public State runAndGetNextState(Context context) throws IllegalArgumentException
 		// Discharge without feeding to grid (just like in Balancing Controller)
 		int gridPower = context.sum.getGridActivePower().getOrError();
 		int essPower = context.ess.getActivePower().getOrError();
-		int setPower = gridPower + essPower;
+		var setPower = gridPower + essPower;
 		if (setPower < 0) {
 			// do not charge
 			setPower = 0;
@@ -44,7 +44,7 @@ public State runAndGetNextState(Context context) throws IllegalArgumentException
 
 	/**
 	 * Handles the limitation of Discharge Power according to the specification.
-	 * 
+	 *
 	 * <ul>
 	 * <li>discharge like in Balancing (keep grid at 0)
 	 * <li>if discharge power > 70 %
@@ -96,7 +96,7 @@ protected void initialize() {
 
 		/**
 		 * Applies the power limit.
-		 * 
+		 *
 		 * @param context  the {@link Context}
 		 * @param setPower the initial power setpoint
 		 * @return the new limit
@@ -110,7 +110,7 @@ protected int applyPowerLimit(Context context, int setPower)
 			// to 50 %
 			int maxApparentPower = context.ess.getMaxApparentPower().getOrError();
 			if (setPower > maxApparentPower * HIGH_POWER_THRESHOLD) {
-				Instant now = Instant.now(context.clock);
+				var now = Instant.now(context.clock);
 				if (this.highDischargePowerSince == null) {
 					this.highDischargePowerSince = now;
 				}
@@ -121,7 +121,7 @@ protected int applyPowerLimit(Context context, int setPower)
 
 			// Apply power limitation
 			if (this.isDischargePowerLimited) {
-				int limit = Math.round(maxApparentPower * POWER_LIMIT_FACTOR);
+				var limit = Math.round(maxApparentPower * POWER_LIMIT_FACTOR);
 				if (setPower > limit) {
 					setPower = limit;
 				}
@@ -133,7 +133,7 @@ protected int applyPowerLimit(Context context, int setPower)
 	/**
 	 * Wraps the evaluation of the next State after DISCHARGE according to the
 	 * specification.
-	 * 
+	 *
 	 * <ul>
 	 * <li>Production is higher than Consumption for more than 1 minute.
 	 * ({@link EvaluateNextStateHandler#MAX_PRODUCTION_HIGHER_THAN_CONSUMPTION_MINUTES})
@@ -167,7 +167,7 @@ protected void initialize() {
 
 		/**
 		 * Gets the next State.
-		 * 
+		 *
 		 * @param context the {@link Context}
 		 * @return the next {@link State}.
 		 * @throws IllegalArgumentException on error
@@ -181,7 +181,7 @@ public State getNextState(Context context) throws InvalidValueException, Illegal
 			int production = context.sum.getProductionActivePower().orElse(0);
 			int consumption = context.sum.getConsumptionActivePower().orElse(0);
 			if (production > consumption) {
-				Instant now = Instant.now(context.clock);
+				var now = Instant.now(context.clock);
 				if (this.productionHigherThanConsumptionSince == null) {
 					this.productionHigherThanConsumptionSince = now;
 				}
diff --git a/io.openems.edge.controller.ess.standby/src/io/openems/edge/controller/ess/standby/statemachine/FastChargeHandler.java b/io.openems.edge.controller.ess.standby/src/io/openems/edge/controller/ess/standby/statemachine/FastChargeHandler.java
index 9683622b3a2..b017db47616 100644
--- a/io.openems.edge.controller.ess.standby/src/io/openems/edge/controller/ess/standby/statemachine/FastChargeHandler.java
+++ b/io.openems.edge.controller.ess.standby/src/io/openems/edge/controller/ess/standby/statemachine/FastChargeHandler.java
@@ -27,7 +27,7 @@ protected void onEntry(Context context) throws OpenemsNamedException {
 	@Override
 	public State runAndGetNextState(Context context) throws IllegalArgumentException, OpenemsNamedException {
 		int maxApparentPower = context.ess.getMaxApparentPower().getOrError();
-		int setPower = maxApparentPower * -1; // Charge
+		var setPower = maxApparentPower * -1; // Charge
 
 		// Apply power constraint
 		context.ess.setActivePowerEqualsWithPid(setPower);
@@ -37,10 +37,9 @@ public State runAndGetNextState(Context context) throws IllegalArgumentException
 				.toMinutes() >= MAX_STATE_DURATION_MINUTES) {
 			// time passed
 			return State.SLOW_CHARGE_2;
-		} else {
-			// stay in this State
-			return State.FAST_CHARGE;
 		}
+		// stay in this State
+		return State.FAST_CHARGE;
 	}
 
 }
diff --git a/io.openems.edge.controller.ess.standby/src/io/openems/edge/controller/ess/standby/statemachine/FinishedHandler.java b/io.openems.edge.controller.ess.standby/src/io/openems/edge/controller/ess/standby/statemachine/FinishedHandler.java
index fad05f75bfa..0e6a2a58b6b 100644
--- a/io.openems.edge.controller.ess.standby/src/io/openems/edge/controller/ess/standby/statemachine/FinishedHandler.java
+++ b/io.openems.edge.controller.ess.standby/src/io/openems/edge/controller/ess/standby/statemachine/FinishedHandler.java
@@ -26,10 +26,9 @@ public State runAndGetNextState(Context context) throws IllegalArgumentException
 		if (LocalDate.now(context.clock).isAfter(this.enteredStateAt)) {
 			// day changed
 			return State.UNDEFINED;
-		} else {
-			// stay in this State
-			return State.FINISHED;
 		}
+		// stay in this State
+		return State.FINISHED;
 	}
 
 }
diff --git a/io.openems.edge.controller.ess.standby/src/io/openems/edge/controller/ess/standby/statemachine/SlowCharge1Handler.java b/io.openems.edge.controller.ess.standby/src/io/openems/edge/controller/ess/standby/statemachine/SlowCharge1Handler.java
index ad6f2ecde45..d90ded82434 100644
--- a/io.openems.edge.controller.ess.standby/src/io/openems/edge/controller/ess/standby/statemachine/SlowCharge1Handler.java
+++ b/io.openems.edge.controller.ess.standby/src/io/openems/edge/controller/ess/standby/statemachine/SlowCharge1Handler.java
@@ -30,10 +30,9 @@ public State runAndGetNextState(Context context) throws IllegalArgumentException
 				.toMinutes() >= MAX_STATE_DURATION_MINUTES) {
 			// time passed
 			return State.FAST_CHARGE;
-		} else {
-			// stay in this State
-			return State.SLOW_CHARGE_1;
 		}
+		// stay in this State
+		return State.SLOW_CHARGE_1;
 	}
 
 }
diff --git a/io.openems.edge.controller.ess.standby/src/io/openems/edge/controller/ess/standby/statemachine/SlowCharge2Handler.java b/io.openems.edge.controller.ess.standby/src/io/openems/edge/controller/ess/standby/statemachine/SlowCharge2Handler.java
index 8ca0af6ecac..5129c7d2676 100644
--- a/io.openems.edge.controller.ess.standby/src/io/openems/edge/controller/ess/standby/statemachine/SlowCharge2Handler.java
+++ b/io.openems.edge.controller.ess.standby/src/io/openems/edge/controller/ess/standby/statemachine/SlowCharge2Handler.java
@@ -15,10 +15,9 @@ public State runAndGetNextState(Context context) throws IllegalArgumentException
 		if (allowedChargePower == 0) {
 			// no more charging allowed
 			return State.FINISHED;
-		} else {
-			// stay in this State
-			return State.SLOW_CHARGE_2;
 		}
+		// stay in this State
+		return State.SLOW_CHARGE_2;
 	}
 
 }
diff --git a/io.openems.edge.controller.ess.standby/src/io/openems/edge/controller/ess/standby/statemachine/SlowChargeUtils.java b/io.openems.edge.controller.ess.standby/src/io/openems/edge/controller/ess/standby/statemachine/SlowChargeUtils.java
index d73645ccde4..380607abecb 100644
--- a/io.openems.edge.controller.ess.standby/src/io/openems/edge/controller/ess/standby/statemachine/SlowChargeUtils.java
+++ b/io.openems.edge.controller.ess.standby/src/io/openems/edge/controller/ess/standby/statemachine/SlowChargeUtils.java
@@ -17,7 +17,7 @@ public class SlowChargeUtils {
 	/**
 	 * Calculates and applies the charging power for {@link State#SLOW_CHARGE_1} and
 	 * {@link State#SLOW_CHARGE_2}.
-	 * 
+	 *
 	 * @param context the Context
 	 * @throws IllegalArgumentException on error
 	 * @throws OpenemsNamedException    on error
@@ -27,7 +27,7 @@ protected static void calculateAndApplyPower(Context context)
 		// Charge by keeping the grid to zero (just like in Balancing Controller)
 		int gridPower = context.sum.getGridActivePower().getOrError();
 		int essPower = context.ess.getActivePower().getOrError();
-		int setPower = gridPower + essPower;
+		var setPower = gridPower + essPower;
 		if (setPower > 0) {
 			// do not discharge
 			setPower = 0;
@@ -35,11 +35,11 @@ protected static void calculateAndApplyPower(Context context)
 
 		// Fit within minimum and maximum power limits
 		int maxApparentPower = context.ess.getMaxApparentPower().getOrError();
-		int minPower = Math.round(maxApparentPower * -1 * MIN_POWER_LIMIT_FACTOR);
+		var minPower = Math.round(maxApparentPower * -1 * MIN_POWER_LIMIT_FACTOR);
 		if (setPower > minPower) {
 			setPower = minPower;
 		}
-		int maxPower = Math.round(maxApparentPower * -1 * MAX_POWER_LIMIT_FACTOR);
+		var maxPower = Math.round(maxApparentPower * -1 * MAX_POWER_LIMIT_FACTOR);
 		if (setPower < maxPower) {
 			setPower = maxPower;
 		}
diff --git a/io.openems.edge.controller.ess.standby/src/io/openems/edge/controller/ess/standby/statemachine/UndefinedHandler.java b/io.openems.edge.controller.ess.standby/src/io/openems/edge/controller/ess/standby/statemachine/UndefinedHandler.java
index 4f547fc3b65..cbbb1c28369 100644
--- a/io.openems.edge.controller.ess.standby/src/io/openems/edge/controller/ess/standby/statemachine/UndefinedHandler.java
+++ b/io.openems.edge.controller.ess.standby/src/io/openems/edge/controller/ess/standby/statemachine/UndefinedHandler.java
@@ -20,13 +20,13 @@ public State runAndGetNextState(Context context) {
 
 	/**
 	 * Checks if the logic should be run today.
-	 * 
+	 *
 	 * @return true if today is within {@link Config#startDate()} and
 	 *         {@link Config#endDate()} and is the configured
 	 *         {@link Config#dayOfWeek()}
 	 */
 	private boolean isActiveDay(Context context) {
-		LocalDate today = LocalDate.now(context.clock);
+		var today = LocalDate.now(context.clock);
 		if (today.isBefore(context.configuredStartDate)) {
 			return false;
 		}
diff --git a/io.openems.edge.controller.ess.standby/test/io/openems/edge/controller/ess/standby/MyConfig.java b/io.openems.edge.controller.ess.standby/test/io/openems/edge/controller/ess/standby/MyConfig.java
index 71140fe567d..4729af7e79c 100644
--- a/io.openems.edge.controller.ess.standby/test/io/openems/edge/controller/ess/standby/MyConfig.java
+++ b/io.openems.edge.controller.ess.standby/test/io/openems/edge/controller/ess/standby/MyConfig.java
@@ -2,7 +2,6 @@
 
 import java.time.DayOfWeek;
 
-import io.openems.edge.common.startstop.StartStopConfig;
 import io.openems.edge.common.test.AbstractComponentConfig;
 
 @SuppressWarnings("all")
diff --git a/io.openems.edge.controller.ess.standby/test/io/openems/edge/controller/ess/standby/StandbyControllerImplTest.java b/io.openems.edge.controller.ess.standby/test/io/openems/edge/controller/ess/standby/StandbyControllerImplTest.java
index c6d4feee973..4d72a5994eb 100644
--- a/io.openems.edge.controller.ess.standby/test/io/openems/edge/controller/ess/standby/StandbyControllerImplTest.java
+++ b/io.openems.edge.controller.ess.standby/test/io/openems/edge/controller/ess/standby/StandbyControllerImplTest.java
@@ -49,7 +49,7 @@ public void initialize() {
 
 	private static ControllerTest tillDischarge() throws Exception {
 		// Initialize ESS
-		final DummyManagedSymmetricEss ess = new DummyManagedSymmetricEss(ESS_ID) //
+		final var ess = new DummyManagedSymmetricEss(ESS_ID) //
 				.setGridMode(GridMode.ON_GRID) //
 				.setMaxApparentPower(MAX_APPARENT_POWER) //
 				.setSoc(70);

From c3538d1683e435a43d96e6840beb26998857b062 Mon Sep 17 00:00:00 2001
From: Stefan Feilmeier <stefan.feilmeier@fenecon.de>
Date: Mon, 7 Mar 2022 23:13:37 +0100
Subject: [PATCH 42/96] Update
 io.openems.edge.controller.ess.timeofusetariff.discharge

---
 .../discharge/BoundarySpace.java              |  24 ++---
 .../discharge/DelayDischargeRiskLevel.java    |   2 +-
 .../TimeOfUseTariffDischargeImpl.java         | 101 +++++++++---------
 .../timeofusetariff/discharge/MyConfig.java   |   2 +-
 .../TimeOfUseTariffDischargeTest.java         |  65 ++++++-----
 5 files changed, 96 insertions(+), 98 deletions(-)

diff --git a/io.openems.edge.controller.ess.timeofusetariff.discharge/src/io/openems/edge/controller/ess/timeofusetariff/discharge/BoundarySpace.java b/io.openems.edge.controller.ess.timeofusetariff.discharge/src/io/openems/edge/controller/ess/timeofusetariff/discharge/BoundarySpace.java
index 2bbc9049672..985e1688e93 100644
--- a/io.openems.edge.controller.ess.timeofusetariff.discharge/src/io/openems/edge/controller/ess/timeofusetariff/discharge/BoundarySpace.java
+++ b/io.openems.edge.controller.ess.timeofusetariff.discharge/src/io/openems/edge/controller/ess/timeofusetariff/discharge/BoundarySpace.java
@@ -12,7 +12,7 @@ class BoundarySpace {
 	/**
 	 * Factory method for {@link BoundarySpace}: calculates the boundary space
 	 * within which the schedule logic works.
-	 * 
+	 *
 	 * @param startQuarterHour {@link ZonedDateTime} start time of the prediction
 	 * @param productionMap    predictions for production
 	 * @param consumptionMap   predictions for consumption
@@ -28,17 +28,17 @@ public static BoundarySpace from(ZonedDateTime startQuarterHour, TreeMap<ZonedDa
 		ZonedDateTime proMoreThanCon = null;
 
 		for (Entry<ZonedDateTime, Integer> entry : consumptionMap.entrySet()) {
-			Integer production = productionMap.get(entry.getKey());
-			Integer consumption = entry.getValue();
+			var production = productionMap.get(entry.getKey());
+			var consumption = entry.getValue();
 
 			if (production != null && consumption != null) {
 
 				final ZonedDateTime start;
 				if (isBeforeMidnight(startQuarterHour.getHour())) {
 					// Last hour of the day when Production < Consumption.
-					if ((production > consumption) //
-							&& (entry.getKey().getDayOfYear() == startQuarterHour.getDayOfYear())
-							&& (entry.getKey().getHour() >= 14)) {
+					if (production > consumption //
+							&& entry.getKey().getDayOfYear() == startQuarterHour.getDayOfYear()
+							&& entry.getKey().getHour() >= 14) {
 						proLessThanCon = entry.getKey(); // Sunset
 					}
 
@@ -49,10 +49,10 @@ public static BoundarySpace from(ZonedDateTime startQuarterHour, TreeMap<ZonedDa
 				}
 
 				// First hour of the day when production > consumption
-				if ((production > consumption) //
-						&& (entry.getKey().getDayOfYear() == start.getDayOfYear()) //
-						&& (proMoreThanCon == null) //
-						&& (entry.getKey().getHour() <= 10)) {
+				if (production > consumption //
+						&& entry.getKey().getDayOfYear() == start.getDayOfYear() //
+						&& proMoreThanCon == null //
+						&& entry.getKey().getHour() <= 10) {
 					proMoreThanCon = entry.getKey(); // Sunrise
 				}
 			}
@@ -96,7 +96,7 @@ private BoundarySpace(ZonedDateTime proLessThanCon, ZonedDateTime proMoreThanCon
 
 	/**
 	 * Is the given date between the boundaries?.
-	 * 
+	 *
 	 * @param now the given date
 	 * @return true if it is within the boundaries
 	 */
@@ -112,7 +112,7 @@ public boolean isWithinBoundary(ZonedDateTime now) {
 
 	/**
 	 * Is the given hour before or after the midnight?.
-	 * 
+	 *
 	 * @param hour the given hour
 	 * @return true if it is before the midnight.
 	 */
diff --git a/io.openems.edge.controller.ess.timeofusetariff.discharge/src/io/openems/edge/controller/ess/timeofusetariff/discharge/DelayDischargeRiskLevel.java b/io.openems.edge.controller.ess.timeofusetariff.discharge/src/io/openems/edge/controller/ess/timeofusetariff/discharge/DelayDischargeRiskLevel.java
index 48615c98989..87138f9622d 100644
--- a/io.openems.edge.controller.ess.timeofusetariff.discharge/src/io/openems/edge/controller/ess/timeofusetariff/discharge/DelayDischargeRiskLevel.java
+++ b/io.openems.edge.controller.ess.timeofusetariff.discharge/src/io/openems/edge/controller/ess/timeofusetariff/discharge/DelayDischargeRiskLevel.java
@@ -37,7 +37,7 @@ private DelayDischargeRiskLevel(int bufferMinutes) {
 
 	/**
 	 * Get buffer minutes.
-	 * 
+	 *
 	 * @return buffer minutes
 	 */
 	public int getBufferMinutes() {
diff --git a/io.openems.edge.controller.ess.timeofusetariff.discharge/src/io/openems/edge/controller/ess/timeofusetariff/discharge/TimeOfUseTariffDischargeImpl.java b/io.openems.edge.controller.ess.timeofusetariff.discharge/src/io/openems/edge/controller/ess/timeofusetariff/discharge/TimeOfUseTariffDischargeImpl.java
index 4cbf577b2bd..b0ad31c1f7a 100644
--- a/io.openems.edge.controller.ess.timeofusetariff.discharge/src/io/openems/edge/controller/ess/timeofusetariff/discharge/TimeOfUseTariffDischargeImpl.java
+++ b/io.openems.edge.controller.ess.timeofusetariff.discharge/src/io/openems/edge/controller/ess/timeofusetariff/discharge/TimeOfUseTariffDischargeImpl.java
@@ -91,10 +91,10 @@ public class TimeOfUseTariffDischargeImpl extends AbstractOpenemsComponent
 
 	private Config config = null;
 	private BoundarySpace boundarySpace = null;
-	private TreeMap<ZonedDateTime, Integer> consumptionMap = new TreeMap<>();
-	private TreeMap<ZonedDateTime, Integer> productionMap = new TreeMap<>();
-	private List<ZonedDateTime> targetPeriods = new ArrayList<ZonedDateTime>();
-	private TreeMap<ZonedDateTime, Float> quarterlyPricesMap = new TreeMap<>();
+	private final TreeMap<ZonedDateTime, Integer> consumptionMap = new TreeMap<>();
+	private final TreeMap<ZonedDateTime, Integer> productionMap = new TreeMap<>();
+	private List<ZonedDateTime> targetPeriods = new ArrayList<>();
+	private final TreeMap<ZonedDateTime, Float> quarterlyPricesMap = new TreeMap<>();
 	private TreeMap<ZonedDateTime, Integer> socWithoutLogic = new TreeMap<>();
 	private ZonedDateTime lastAccessedTime = ZonedDateTime.of(2021, 1, 1, 0, 0, 0, 0, ZoneId.systemDefault());
 	private ZonedDateTime lastUpdatePriceTime = ZonedDateTime.of(2021, 1, 1, 0, 0, 0, 0, ZoneId.systemDefault());
@@ -114,10 +114,10 @@ void activate(ComponentContext context, Config config) {
 
 		// update filter for 'ess'
 		if (OpenemsComponent.updateReferenceFilter(this.cm, this.servicePid(), "ess", config.ess_id())) {
-			return;
 		}
 	}
 
+	@Override
 	@Deactivate
 	protected void deactivate() {
 		super.deactivate();
@@ -127,10 +127,10 @@ protected void deactivate() {
 	public void run() throws OpenemsNamedException {
 
 		// Current Date Time rounded off to 15 minutes.
-		ZonedDateTime now = TimeOfUseTariffUtils.getNowRoundedDownToMinutes(this.componentManager.getClock(), 15);
+		var now = TimeOfUseTariffUtils.getNowRoundedDownToMinutes(this.componentManager.getClock(), 15);
 
 		// Prices contains the price values and the time it is retrieved.
-		TimeOfUsePrices prices = this.timeOfUseTariff.getPrices();
+		var prices = this.timeOfUseTariff.getPrices();
 		this.calculateBoundarySpace(now, prices);
 
 		// Mode given from the configuration.
@@ -149,7 +149,7 @@ public void run() throws OpenemsNamedException {
 
 	/**
 	 * calculates the boundary space for the activation of the controller.
-	 * 
+	 *
 	 * @param now    Current Date Time rounded off to 15 minutes.
 	 * @param prices TimeOfUsePrices object, containing prices and the time it
 	 *               retrieved.
@@ -159,7 +159,7 @@ private void calculateBoundarySpace(ZonedDateTime now, TimeOfUsePrices prices) {
 		/*
 		 * Every day, Prices are updated in API at a certain hour. we update the
 		 * predictions and the prices during those hour.
-		 * 
+		 *
 		 * gets the prices and predictions when the controller is restarted or //
 		 * re-enabled in any time.
 		 */
@@ -177,7 +177,7 @@ private void calculateBoundarySpace(ZonedDateTime now, TimeOfUsePrices prices) {
 
 	/**
 	 * Calculate the Target Periods every 15 minutes within the boundary period.
-	 * 
+	 *
 	 * @param now Current Date Time rounded off to 15 minutes.
 	 * @throws InvalidValueException on error
 	 */
@@ -192,8 +192,8 @@ private void calculateTargetPeriodsWithinBoundarySpace(ZonedDateTime now) throws
 			// Runs every 15 minutes.
 			if (now.isAfter(this.lastAccessedTime)) {
 
-				long availableEnergy = this.getAvailableEnergy(now);
-				long remainingEnergy = this.getRemainingCapacity(availableEnergy, this.productionMap,
+				var availableEnergy = this.getAvailableEnergy(now);
+				var remainingEnergy = this.getRemainingCapacity(availableEnergy, this.productionMap,
 						this.consumptionMap, now, this.boundarySpace);
 
 				// Resetting
@@ -219,7 +219,7 @@ private void calculateTargetPeriodsWithinBoundarySpace(ZonedDateTime now) throws
 	/**
 	 * Returns the available energy in the battery which is usable for consumption
 	 * after adjusting the minimum SoC capacity.
-	 * 
+	 *
 	 * @param now Current Date Time rounded off to 15 minutes.
 	 * @return available energy in Watt-milliseconds[Wmsec].
 	 * @throws InvalidValueException on error
@@ -231,7 +231,7 @@ private long getAvailableEnergy(ZonedDateTime now) throws InvalidValueException
 
 		// Usable capacity based on minimum SoC from Limit total discharge and emergency
 		// reserve controllers.
-		int limitSoc = 0;
+		var limitSoc = 0;
 		for (LimitTotalDischargeController ctrl : this.ctrlLimitTotalDischarges) {
 			limitSoc = Math.max(limitSoc, ctrl.getConfig().minSoc());
 		}
@@ -241,16 +241,16 @@ private long getAvailableEnergy(ZonedDateTime now) throws InvalidValueException
 		this.channel(TimeOfUseTariffDischarge.ChannelId.MIN_SOC).setNextValue(limitSoc);
 
 		// Calculating available energy and usable energy [Wmsec] in the battery.
-		long availableEnergy = (long) (((double) netCapacity /* [Wh] */ * 3600 /* [Wsec] */ * 1000 /* [Wmsec] */
-				/ 100 /* [%] */) * soc /* [current SoC] */);
+		var availableEnergy = (long) ((double) netCapacity /* [Wh] */ * 3600 /* [Wsec] */ * 1000 /* [Wmsec] */
+				/ 100 * soc /* [current SoC] */);
 
 		// Value is divided by 3600 * 1000 to convert from [Wmsec] to [Wh].
 		this.channel(TimeOfUseTariffDischarge.ChannelId.AVAILABLE_CAPACITY).setNextValue(availableEnergy / 3600000);
 
-		long limitEnergy = (long) (((double) netCapacity /* [Wh] */ * 3600 /* [Wsec] */ * 1000 /* [Wmsec] */
-				/ 100 /* [%] */) * limitSoc /* [current SoC] */);
+		var limitEnergy = (long) ((double) netCapacity /* [Wh] */ * 3600 /* [Wsec] */ * 1000 /* [Wmsec] */
+				/ 100 * limitSoc /* [current SoC] */);
 
-		availableEnergy = Math.max(0, (availableEnergy - limitEnergy));
+		availableEnergy = Math.max(0, availableEnergy - limitEnergy);
 
 		// Value is divided by 3600 * 1000 to convert from [Wmsec] to [Wh].
 		this.channel(TimeOfUseTariffDischarge.ChannelId.USABLE_CAPACITY).setNextValue(availableEnergy / 3600000);
@@ -266,7 +266,7 @@ private long getAvailableEnergy(ZonedDateTime now) throws InvalidValueException
 
 	/**
 	 * This method calculates the boundary space within the prediction hours.
-	 * 
+	 *
 	 * @param now    current time.
 	 * @param prices TimeOfUsePrices object, containing prices and the time it
 	 *               retrieved.
@@ -274,13 +274,13 @@ private long getAvailableEnergy(ZonedDateTime now) throws InvalidValueException
 	private void getBoundarySpace(ZonedDateTime now, TimeOfUsePrices prices) {
 
 		// Predictions as Integer array in 15 minute intervals.
-		final Integer[] predictionProduction = this.predictorManager.get24HoursPrediction(SUM_PRODUCTION) //
+		final var predictionProduction = this.predictorManager.get24HoursPrediction(SUM_PRODUCTION) //
 				.getValues();
-		final Integer[] predictionConsumption = this.predictorManager.get24HoursPrediction(SUM_CONSUMPTION) //
+		final var predictionConsumption = this.predictorManager.get24HoursPrediction(SUM_CONSUMPTION) //
 				.getValues();
 
 		// Prices as Float array in 15 minute intervals.
-		final Float[] quarterlyPrices = prices.getValues();
+		final var quarterlyPrices = prices.getValues();
 		this.channel(TimeOfUseTariffDischarge.ChannelId.QUATERLY_PRICES_TAKEN).setNextValue(true);
 
 		// Converts the given 15 minute integer array to a TreeMap values.
@@ -291,7 +291,7 @@ private void getBoundarySpace(ZonedDateTime now, TimeOfUsePrices prices) {
 		}
 
 		// Buffer minutes to adjust sunrise based on the risk level.
-		int bufferMinutes = this.config.delayDischargeRiskLevel().bufferMinutes;
+		var bufferMinutes = this.config.delayDischargeRiskLevel().bufferMinutes;
 
 		// calculates the boundary space, within which the controller needs to work.
 		this.boundarySpace = BoundarySpace.from(now, this.productionMap, this.consumptionMap,
@@ -309,7 +309,7 @@ private void getBoundarySpace(ZonedDateTime now, TimeOfUsePrices prices) {
 	/**
 	 * This method returns the map of 15 minutes soc curve values when no controller
 	 * logic is applied.
-	 * 
+	 *
 	 * @param netCapacity     Net Capacity of the battery.
 	 * @param availableEnergy available energy in the battery.
 	 * @param limitEnergy     energy restricted to used based on min soc.
@@ -317,14 +317,14 @@ private void getBoundarySpace(ZonedDateTime now, TimeOfUsePrices prices) {
 	 * @param soc             current SoC of the battery.
 	 * @param now             current time.
 	 * @param boundarySpace   the {@link BoundarySpace}
-	 * 
+	 *
 	 * @return {@link TreeMap} with {@link ZonedDateTime} as key and SoC as value.
 	 */
 	private TreeMap<ZonedDateTime, Integer> generateSocCurveWithoutLogic(int netCapacity, long availableEnergy,
 			long limitEnergy, TreeMap<ZonedDateTime, Integer> consumptionMap, int soc, ZonedDateTime now,
 			BoundarySpace boundarySpace) {
 
-		TreeMap<ZonedDateTime, Integer> socWithoutLogic = new TreeMap<>();
+		var socWithoutLogic = new TreeMap<ZonedDateTime, Integer>();
 
 		// current values.
 		socWithoutLogic.put(now, soc);
@@ -333,13 +333,13 @@ private TreeMap<ZonedDateTime, Integer> generateSocCurveWithoutLogic(int netCapa
 				.entrySet()) {
 
 			long duration = 15 * 60 * 1000;
-			long currentConsumptionEnergy = entry.getValue() * duration;
+			var currentConsumptionEnergy = entry.getValue() * duration;
 
 			if (availableEnergy > limitEnergy) {
 				availableEnergy -= currentConsumptionEnergy;
 			}
 
-			double calculatedSoc = availableEnergy //
+			var calculatedSoc = availableEnergy //
 					/ (netCapacity * 3600. /* [Wsec] */ * 1000 /* [Wmsec] */) //
 					* 100 /* [SoC] */;
 
@@ -360,7 +360,7 @@ private TreeMap<ZonedDateTime, Integer> generateSocCurveWithoutLogic(int netCapa
 	/**
 	 * Apply the actual logic of avoiding to discharge the battery during target
 	 * periods.
-	 * 
+	 *
 	 * @param now Current Date Time rounded off to 15 minutes.
 	 * @throws OpenemsNamedException on error
 	 */
@@ -370,7 +370,7 @@ private void modeAutomatic(ZonedDateTime now) throws OpenemsNamedException {
 
 		this._setTargetHoursIsEmpty(this.targetPeriods.isEmpty());
 
-		ZonedDateTime currentQuarterHour = TimeOfUseTariffUtils
+		var currentQuarterHour = TimeOfUseTariffUtils
 				.getNowRoundedDownToMinutes(this.componentManager.getClock(), 15) //
 				.withZoneSameInstant(ZoneId.systemDefault());
 
@@ -410,7 +410,7 @@ private void modeOff() {
 
 	/**
 	 * This is only to visualize data for better debugging.
-	 * 
+	 *
 	 * @param now Current Date Time rounded off to 15 minutes.
 	 */
 	private void updateVisualizationChannels(ZonedDateTime now) {
@@ -454,7 +454,7 @@ private void updateVisualizationChannels(ZonedDateTime now) {
 	/**
 	 * This method converts the 15 minute integer array values to a {@link TreeMap}
 	 * format for ease in later calculations.
-	 * 
+	 *
 	 * @param productionValues  list of 96 production values predicted, comprising
 	 *                          for next 24 hours.
 	 * @param consumptionValues list of 96 consumption values predicted, comprising
@@ -469,11 +469,11 @@ private void convertDataStructure(Integer[] productionValues, Integer[] consumpt
 		this.consumptionMap.clear();
 		this.quarterlyPricesMap.clear();
 
-		for (int i = 0; i < Prediction24Hours.NUMBER_OF_VALUES; i++) {
-			Integer production = productionValues[i];
-			Integer consumption = consumptionValues[i];
-			Float price = quarterlyPrices[i];
-			ZonedDateTime time = startHour.plusMinutes(i * 15);
+		for (var i = 0; i < Prediction24Hours.NUMBER_OF_VALUES; i++) {
+			var production = productionValues[i];
+			var consumption = consumptionValues[i];
+			var price = quarterlyPrices[i];
+			var time = startHour.plusMinutes(i * 15);
 
 			if (production != null) {
 				this.productionMap.put(time, production);
@@ -492,7 +492,7 @@ private void convertDataStructure(Integer[] productionValues, Integer[] consumpt
 	/**
 	 * This Method Returns the remaining Capacity that needs to be consumed from the
 	 * Grid.
-	 * 
+	 *
 	 * @param availableEnergy Amount of energy available in the ess based on SoC.
 	 * @param productionMap   predicted production data along with time in
 	 *                        {@link TreeMap} format.
@@ -506,28 +506,27 @@ private void convertDataStructure(Integer[] productionValues, Integer[] consumpt
 	private long getRemainingCapacity(long availableEnergy, TreeMap<ZonedDateTime, Integer> productionMap,
 			TreeMap<ZonedDateTime, Integer> consumptionMap, ZonedDateTime now, BoundarySpace boundarySpace) {
 
-		long consumptionEnergy = 0;
-		long remainingEnergy = 0;
+		var consumptionEnergy = 0L;
+		var remainingEnergy = 0L;
 
 		for (Entry<ZonedDateTime, Integer> entry : consumptionMap //
 				.subMap(now, boundarySpace.proMoreThanCon) //
 				.entrySet()) {
 
 			long duration = 15 * 60 * 1000;
-			long currentConsumptionEnergy = entry.getValue() * duration;
-			long currentProductionEnergy = productionMap.get(entry.getKey()) * duration;
+			var currentConsumptionEnergy = entry.getValue() * duration;
+			var currentProductionEnergy = productionMap.get(entry.getKey()) * duration;
 
 			consumptionEnergy = consumptionEnergy + currentConsumptionEnergy - Math.max(0, currentProductionEnergy);
 		}
 
 		// remaining amount of energy that should be covered from grid.
-		remainingEnergy = Math.max(0, (consumptionEnergy - availableEnergy));
+		remainingEnergy = Math.max(0, consumptionEnergy - availableEnergy);
 
 		// Update Channels
 		// Values are divided by 3600 * 1000 to convert from [Wmsec] to [Wh].
-		this.channel(TimeOfUseTariffDischarge.ChannelId.TOTAL_CONSUMPTION).setNextValue((consumptionEnergy / 3600000));
-		this.channel(TimeOfUseTariffDischarge.ChannelId.REMAINING_CONSUMPTION)
-				.setNextValue((remainingEnergy / 3600000));
+		this.channel(TimeOfUseTariffDischarge.ChannelId.TOTAL_CONSUMPTION).setNextValue(consumptionEnergy / 3600000);
+		this.channel(TimeOfUseTariffDischarge.ChannelId.REMAINING_CONSUMPTION).setNextValue(remainingEnergy / 3600000);
 
 		return remainingEnergy;
 	}
@@ -535,7 +534,7 @@ private long getRemainingCapacity(long availableEnergy, TreeMap<ZonedDateTime, I
 	/**
 	 * This method returns the list of periods, during which ESS is avoided for
 	 * consumption.
-	 * 
+	 *
 	 * @param consumptionMap  predicted consumption data along with time in
 	 *                        {@link TreeMap} format.
 	 * @param quarterlyPrices {@link TreeMap} consisting of hourly electricity
@@ -549,8 +548,8 @@ private long getRemainingCapacity(long availableEnergy, TreeMap<ZonedDateTime, I
 	private List<ZonedDateTime> calculateTargetPeriods(TreeMap<ZonedDateTime, Integer> consumptionMap,
 			TreeMap<ZonedDateTime, Float> quarterlyPrices, long remainingEnergy, BoundarySpace boundarySpace) {
 
-		List<ZonedDateTime> targetHours = new ArrayList<ZonedDateTime>();
-		ZonedDateTime currentQuarterHour = TimeOfUseTariffUtils
+		List<ZonedDateTime> targetHours = new ArrayList<>();
+		var currentQuarterHour = TimeOfUseTariffUtils
 				.getNowRoundedDownToMinutes(this.componentManager.getClock(), 15) //
 				.withZoneSameInstant(ZoneId.systemDefault());
 
@@ -563,7 +562,7 @@ private List<ZonedDateTime> calculateTargetPeriods(TreeMap<ZonedDateTime, Intege
 		for (Entry<ZonedDateTime, Float> entry : priceList) {
 			targetHours.add(entry.getKey());
 
-			remainingEnergy = remainingEnergy - (consumptionMap.get(entry.getKey()) * duration);
+			remainingEnergy = remainingEnergy - consumptionMap.get(entry.getKey()) * duration;
 
 			// checks if we have sufficient capacity.
 			if (remainingEnergy <= 0) {
diff --git a/io.openems.edge.controller.ess.timeofusetariff.discharge/test/io/openems/edge/controller/ess/timeofusetariff/discharge/MyConfig.java b/io.openems.edge.controller.ess.timeofusetariff.discharge/test/io/openems/edge/controller/ess/timeofusetariff/discharge/MyConfig.java
index c2f64a79e0c..95a198a4819 100644
--- a/io.openems.edge.controller.ess.timeofusetariff.discharge/test/io/openems/edge/controller/ess/timeofusetariff/discharge/MyConfig.java
+++ b/io.openems.edge.controller.ess.timeofusetariff.discharge/test/io/openems/edge/controller/ess/timeofusetariff/discharge/MyConfig.java
@@ -54,7 +54,7 @@ public Builder setDelayDischargeRiskLevel(DelayDischargeRiskLevel delayDischarge
 
 	/**
 	 * Create a Config builder.
-	 * 
+	 *
 	 * @return a {@link Builder}
 	 */
 	public static Builder create() {
diff --git a/io.openems.edge.controller.ess.timeofusetariff.discharge/test/io/openems/edge/controller/ess/timeofusetariff/discharge/TimeOfUseTariffDischargeTest.java b/io.openems.edge.controller.ess.timeofusetariff.discharge/test/io/openems/edge/controller/ess/timeofusetariff/discharge/TimeOfUseTariffDischargeTest.java
index 4a6b6f0cff1..229961d6ed0 100644
--- a/io.openems.edge.controller.ess.timeofusetariff.discharge/test/io/openems/edge/controller/ess/timeofusetariff/discharge/TimeOfUseTariffDischargeTest.java
+++ b/io.openems.edge.controller.ess.timeofusetariff.discharge/test/io/openems/edge/controller/ess/timeofusetariff/discharge/TimeOfUseTariffDischargeTest.java
@@ -110,27 +110,26 @@ public class TimeOfUseTariffDischargeTest {
 	@Test
 	public void nullTimeOfUseTariffTest() throws Exception {
 
-		final TimeLeapClock clock = new TimeLeapClock(Instant.parse("2021-01-01T13:45:00.00Z"), ZoneOffset.UTC);
-		final DummyComponentManager cm = new DummyComponentManager(clock);
+		final var clock = new TimeLeapClock(Instant.parse("2021-01-01T13:45:00.00Z"), ZoneOffset.UTC);
+		final var cm = new DummyComponentManager(clock);
 
 		// Predictions
-		final DummyPrediction24Hours productionPrediction = new DummyPrediction24Hours(DEFAULT_PRODUCTION_PREDICTION);
-		final DummyPrediction24Hours consumptionPrediction = new DummyPrediction24Hours(DEFAULT_CONSUMPTION_PREDICTION);
+		final var productionPrediction = new DummyPrediction24Hours(DEFAULT_PRODUCTION_PREDICTION);
+		final var consumptionPrediction = new DummyPrediction24Hours(DEFAULT_CONSUMPTION_PREDICTION);
 
 		// Predictors
-		final DummyPredictor24Hours productionPredictor = new DummyPredictor24Hours(PREDICTOR_ID, cm,
+		final var productionPredictor = new DummyPredictor24Hours(PREDICTOR_ID, cm,
 				productionPrediction, "_sum/ProductionActivePower");
-		final DummyPredictor24Hours consumptionPredictor = new DummyPredictor24Hours(PREDICTOR_ID, cm,
+		final var consumptionPredictor = new DummyPredictor24Hours(PREDICTOR_ID, cm,
 				consumptionPrediction, "_sum/ConsumptionActivePower");
 
 		// PredictorManager
-		final DummyPredictorManager predictorManager = new DummyPredictorManager(productionPredictor,
+		final var predictorManager = new DummyPredictorManager(productionPredictor,
 				consumptionPredictor);
 
 		// Price provider
-		final DummyTimeOfUseTariffProvider timeOfUseTariffProvider = DummyTimeOfUseTariffProvider.fromHourlyPrices(null,
+		final var timeOfUseTariffProvider = DummyTimeOfUseTariffProvider.fromHourlyPrices(null,
 				DEFAULT_HOURLY_PRICES);
-		;
 
 		// Printing
 		// System.out.println("Time: " + clock);
@@ -164,25 +163,25 @@ public void nullTimeOfUseTariffTest() throws Exception {
 	@Test
 	public void executesDuringMarketTimeTest() throws Exception {
 
-		final TimeLeapClock clock = new TimeLeapClock(Instant.parse("2021-01-01T16:00:00.00Z"), ZoneOffset.UTC);
-		final DummyComponentManager cm = new DummyComponentManager(clock);
+		final var clock = new TimeLeapClock(Instant.parse("2021-01-01T16:00:00.00Z"), ZoneOffset.UTC);
+		final var cm = new DummyComponentManager(clock);
 
 		// Predictions
-		final DummyPrediction24Hours productionPrediction = new DummyPrediction24Hours(DEFAULT_PRODUCTION_PREDICTION);
-		final DummyPrediction24Hours consumptionPrediction = new DummyPrediction24Hours(DEFAULT_CONSUMPTION_PREDICTION);
+		final var productionPrediction = new DummyPrediction24Hours(DEFAULT_PRODUCTION_PREDICTION);
+		final var consumptionPrediction = new DummyPrediction24Hours(DEFAULT_CONSUMPTION_PREDICTION);
 
 		// Predictors
-		final DummyPredictor24Hours productionPredictor = new DummyPredictor24Hours(PREDICTOR_ID, cm,
+		final var productionPredictor = new DummyPredictor24Hours(PREDICTOR_ID, cm,
 				productionPrediction, "_sum/ProductionActivePower");
-		final DummyPredictor24Hours consumptionPredictor = new DummyPredictor24Hours(PREDICTOR_ID, cm,
+		final var consumptionPredictor = new DummyPredictor24Hours(PREDICTOR_ID, cm,
 				consumptionPrediction, "_sum/ConsumptionActivePower");
 
 		// PredictorManager
-		final DummyPredictorManager predictorManager = new DummyPredictorManager(productionPredictor,
+		final var predictorManager = new DummyPredictorManager(productionPredictor,
 				consumptionPredictor);
 
 		// Price provider
-		final DummyTimeOfUseTariffProvider timeOfUseTariffProvider = DummyTimeOfUseTariffProvider
+		final var timeOfUseTariffProvider = DummyTimeOfUseTariffProvider
 				.fromHourlyPrices(ZonedDateTime.now(clock), DEFAULT_HOURLY_PRICES);
 
 		// Printing
@@ -246,25 +245,25 @@ public void executesDuringMarketTimeTest() throws Exception {
 	@Test
 	public void executesBeforeMidnight() throws Exception {
 
-		final TimeLeapClock clock = new TimeLeapClock(Instant.parse("2021-01-01T21:00:00.00Z"), ZoneOffset.UTC);
-		final DummyComponentManager cm = new DummyComponentManager(clock);
+		final var clock = new TimeLeapClock(Instant.parse("2021-01-01T21:00:00.00Z"), ZoneOffset.UTC);
+		final var cm = new DummyComponentManager(clock);
 
 		// Predictions
-		final DummyPrediction24Hours productionPrediction = new DummyPrediction24Hours(DEFAULT_PRODUCTION_PREDICTION);
-		final DummyPrediction24Hours consumptionPrediction = new DummyPrediction24Hours(DEFAULT_CONSUMPTION_PREDICTION);
+		final var productionPrediction = new DummyPrediction24Hours(DEFAULT_PRODUCTION_PREDICTION);
+		final var consumptionPrediction = new DummyPrediction24Hours(DEFAULT_CONSUMPTION_PREDICTION);
 
 		// Predictors
-		final DummyPredictor24Hours productionPredictor = new DummyPredictor24Hours(PREDICTOR_ID, cm,
+		final var productionPredictor = new DummyPredictor24Hours(PREDICTOR_ID, cm,
 				productionPrediction, "_sum/ProductionActivePower");
-		final DummyPredictor24Hours consumptionPredictor = new DummyPredictor24Hours(PREDICTOR_ID, cm,
+		final var consumptionPredictor = new DummyPredictor24Hours(PREDICTOR_ID, cm,
 				consumptionPrediction, "_sum/ConsumptionActivePower");
 
 		// PredictorManager
-		final DummyPredictorManager predictorManager = new DummyPredictorManager(productionPredictor,
+		final var predictorManager = new DummyPredictorManager(productionPredictor,
 				consumptionPredictor);
 
 		// Price provider
-		final DummyTimeOfUseTariffProvider timeOfUseTariffProvider = DummyTimeOfUseTariffProvider
+		final var timeOfUseTariffProvider = DummyTimeOfUseTariffProvider
 				.fromHourlyPrices(ZonedDateTime.now(clock), DEFAULT_HOURLY_PRICES);
 
 		// Printing
@@ -303,25 +302,25 @@ public void executesBeforeMidnight() throws Exception {
 	@Test
 	public void executesAfterMidnight() throws Exception {
 
-		final TimeLeapClock clock = new TimeLeapClock(Instant.parse("2021-01-01T11:00:00.00Z"), ZoneOffset.UTC);
-		final DummyComponentManager cm = new DummyComponentManager(clock);
+		final var clock = new TimeLeapClock(Instant.parse("2021-01-01T11:00:00.00Z"), ZoneOffset.UTC);
+		final var cm = new DummyComponentManager(clock);
 
 		// Predictions
-		final DummyPrediction24Hours productionPrediction = new DummyPrediction24Hours(DEFAULT_PRODUCTION_PREDICTION);
-		final DummyPrediction24Hours consumptionPrediction = new DummyPrediction24Hours(DEFAULT_CONSUMPTION_PREDICTION);
+		final var productionPrediction = new DummyPrediction24Hours(DEFAULT_PRODUCTION_PREDICTION);
+		final var consumptionPrediction = new DummyPrediction24Hours(DEFAULT_CONSUMPTION_PREDICTION);
 
 		// Predictors
-		final DummyPredictor24Hours productionPredictor = new DummyPredictor24Hours(PREDICTOR_ID, cm,
+		final var productionPredictor = new DummyPredictor24Hours(PREDICTOR_ID, cm,
 				productionPrediction, "_sum/ProductionActivePower");
-		final DummyPredictor24Hours consumptionPredictor = new DummyPredictor24Hours(PREDICTOR_ID, cm,
+		final var consumptionPredictor = new DummyPredictor24Hours(PREDICTOR_ID, cm,
 				consumptionPrediction, "_sum/ConsumptionActivePower");
 
 		// PredictorManager
-		final DummyPredictorManager predictorManager = new DummyPredictorManager(productionPredictor,
+		final var predictorManager = new DummyPredictorManager(productionPredictor,
 				consumptionPredictor);
 
 		// Price provider
-		final DummyTimeOfUseTariffProvider timeOfUseTariffProvider = DummyTimeOfUseTariffProvider
+		final var timeOfUseTariffProvider = DummyTimeOfUseTariffProvider
 				.fromHourlyPrices(ZonedDateTime.now(clock), DEFAULT_HOURLY_PRICES);
 
 		// Printing

From 0dbc0a687242500ca3c981cb6a9397dd666eecb6 Mon Sep 17 00:00:00 2001
From: Stefan Feilmeier <stefan.feilmeier@fenecon.de>
Date: Mon, 7 Mar 2022 23:15:32 +0100
Subject: [PATCH 43/96] Update io.openems.edge.controller.evcs

---
 .../edge/controller/evcs/ChargeMode.java      |  4 +-
 .../evcs/ChargingLowerThanTargetHandler.java  | 13 ++--
 .../openems/edge/controller/evcs/Config.java  |  2 +-
 .../edge/controller/evcs/EvcsController.java  | 65 +++++++++----------
 .../edge/controller/evcs/Priority.java        |  4 +-
 .../controller/evcs/EvcsControllerTest.java   |  6 +-
 .../edge/controller/evcs/MyConfig.java        | 17 ++---
 7 files changed, 51 insertions(+), 60 deletions(-)

diff --git a/io.openems.edge.controller.evcs/src/io/openems/edge/controller/evcs/ChargeMode.java b/io.openems.edge.controller.evcs/src/io/openems/edge/controller/evcs/ChargeMode.java
index 1a8c10c8388..164c566aa7e 100644
--- a/io.openems.edge.controller.evcs/src/io/openems/edge/controller/evcs/ChargeMode.java
+++ b/io.openems.edge.controller.evcs/src/io/openems/edge/controller/evcs/ChargeMode.java
@@ -16,12 +16,12 @@ private ChargeMode(int value, String name) {
 
 	@Override
 	public int getValue() {
-		return value;
+		return this.value;
 	}
 
 	@Override
 	public String getName() {
-		return name;
+		return this.name;
 	}
 
 	@Override
diff --git a/io.openems.edge.controller.evcs/src/io/openems/edge/controller/evcs/ChargingLowerThanTargetHandler.java b/io.openems.edge.controller.evcs/src/io/openems/edge/controller/evcs/ChargingLowerThanTargetHandler.java
index 3f27eee1653..c2bf81ef13f 100644
--- a/io.openems.edge.controller.evcs/src/io/openems/edge/controller/evcs/ChargingLowerThanTargetHandler.java
+++ b/io.openems.edge.controller.evcs/src/io/openems/edge/controller/evcs/ChargingLowerThanTargetHandler.java
@@ -30,7 +30,7 @@ public ChargingLowerThanTargetHandler(EvcsController parent) {
 	 * Check if the difference between the requested charging target and the real
 	 * charging power is higher than the CHARGING_TARGET_MAX_DIFFERENCE for at least
 	 * MAXIMUM_OUT_OF_RANGE_TRIES.
-	 * 
+	 *
 	 * @param evcs EVCS
 	 * @return true if the difference is too high
 	 * @throws InvalidValueException invalidValueException
@@ -56,7 +56,7 @@ protected boolean isLower(ManagedEvcs evcs) throws InvalidValueException {
 	 * Check if the difference between the requested charging target and the real
 	 * charging power is higher than the CHARGING_TARGET_MAX_DIFFERENCE. If it
 	 * returns true, it is setting the maximumPower.
-	 * 
+	 *
 	 * @param evcs EVCS
 	 * @return true if the difference is too high
 	 * @throws InvalidValueException invalidValueException
@@ -66,7 +66,7 @@ protected boolean isChargingLowerThanTarget(ManagedEvcs evcs) throws InvalidValu
 		int chargePowerTarget = evcs.getSetChargePowerLimit().orElse(evcs.getMaximumHardwarePower().getOrError());
 
 		if (chargePowerTarget - chargePower > chargePowerTarget * CHARGING_TARGET_MAX_DIFFERENCE_PERCENT) {
-			this.maximumChargePower = calculateMaximumPower(chargePower);
+			this.maximumChargePower = this.calculateMaximumPower(chargePower);
 			this.lastChargingCheck = LocalDateTime.now();
 			return true;
 		}
@@ -77,7 +77,7 @@ protected boolean isChargingLowerThanTarget(ManagedEvcs evcs) throws InvalidValu
 	/**
 	 * Returns the calculated maximum charge power depending on the current charge
 	 * power and the current maximum charge power.
-	 * 
+	 *
 	 * @param chargingPower current charge power
 	 * @return the current charge power or one of the past charge power values
 	 */
@@ -89,8 +89,9 @@ private Integer calculateMaximumPower(int currentChargePower) {
 	}
 
 	/**
-	 * Maximum charge power of the EV depending on the last {@link #isChargingLowerThanTarget(ManagedEvcs)} try's.
-	 * 
+	 * Maximum charge power of the EV depending on the last
+	 * {@link #isChargingLowerThanTarget(ManagedEvcs)} try's.
+	 *
 	 * @return The maximum charge power of the EV.
 	 */
 	protected Integer getMaximumChargePower() {
diff --git a/io.openems.edge.controller.evcs/src/io/openems/edge/controller/evcs/Config.java b/io.openems.edge.controller.evcs/src/io/openems/edge/controller/evcs/Config.java
index 7797b90efcb..746e599b812 100644
--- a/io.openems.edge.controller.evcs/src/io/openems/edge/controller/evcs/Config.java
+++ b/io.openems.edge.controller.evcs/src/io/openems/edge/controller/evcs/Config.java
@@ -43,7 +43,7 @@
 
 	@AttributeDefinition(name = "Energy limit in this session in [Wh]", description = "Set the Energylimit in this Session in Wh. The charging station will only charge till this limit; '0' is no limit.")
 	int energySessionLimit() default 0;
-	
+
 	@AttributeDefinition(name = "Evcs target filter", description = "This is auto-generated by 'Evcs-ID'.")
 	String evcs_target() default "(enabled=true)";
 
diff --git a/io.openems.edge.controller.evcs/src/io/openems/edge/controller/evcs/EvcsController.java b/io.openems.edge.controller.evcs/src/io/openems/edge/controller/evcs/EvcsController.java
index 223c8fa7991..d237753f14e 100644
--- a/io.openems.edge.controller.evcs/src/io/openems/edge/controller/evcs/EvcsController.java
+++ b/io.openems.edge.controller.evcs/src/io/openems/edge/controller/evcs/EvcsController.java
@@ -2,8 +2,6 @@
 
 import java.io.IOException;
 import java.time.Clock;
-import java.util.Dictionary;
-import java.util.Optional;
 
 import org.osgi.service.cm.Configuration;
 import org.osgi.service.cm.ConfigurationAdmin;
@@ -34,7 +32,6 @@
 import io.openems.edge.ess.api.SymmetricEss;
 import io.openems.edge.evcs.api.Evcs;
 import io.openems.edge.evcs.api.ManagedEvcs;
-import io.openems.edge.evcs.api.Status;
 
 @Designate(ocd = Config.class, factory = true)
 @Component(//
@@ -94,10 +91,10 @@ void activate(ComponentContext context, Config config) throws OpenemsNamedExcept
 
 		this.config = config;
 
-		if (OpenemsComponent.updateReferenceFilter(cm, this.servicePid(), "evcs", config.evcs_id())) {
+		if (OpenemsComponent.updateReferenceFilter(this.cm, this.servicePid(), "evcs", config.evcs_id())) {
 			return;
 		}
-		if (OpenemsComponent.updateReferenceFilter(cm, this.servicePid(), "ess", config.ess_id())) {
+		if (OpenemsComponent.updateReferenceFilter(this.cm, this.servicePid(), "ess", config.ess_id())) {
 			return;
 		}
 		this.evcs._setMaximumPower(null);
@@ -130,7 +127,7 @@ public void run() throws OpenemsNamedException {
 			return;
 		}
 
-		adaptConfigToHardwareLimits();
+		this.adaptConfigToHardwareLimits();
 
 		this.evcs.setEnergyLimit(this.config.energySessionLimit());
 
@@ -139,7 +136,7 @@ public void run() throws OpenemsNamedException {
 		 */
 		if (isClustered) {
 
-			Status status = this.evcs.getStatus();
+			var status = this.evcs.getStatus();
 			switch (status) {
 			case ERROR:
 			case STARTING:
@@ -147,7 +144,7 @@ public void run() throws OpenemsNamedException {
 			case NOT_READY_FOR_CHARGING:
 			case ENERGY_LIMIT_REACHED:
 				this.evcs.setChargePowerRequest(0);
-				resetMinMaxChannels();
+				this.resetMinMaxChannels();
 				return;
 			case CHARGING_REJECTED:
 			case READY_FOR_CHARGING:
@@ -158,18 +155,18 @@ public void run() throws OpenemsNamedException {
 			}
 		}
 
-		int nextChargePower = 0;
-		int nextMinPower = 0;
+		var nextChargePower = 0;
+		var nextMinPower = 0;
 
 		/*
 		 * Calculates the next charging power depending on the charge mode
 		 */
-		switch (config.chargeMode()) {
+		switch (this.config.chargeMode()) {
 		case EXCESS_POWER:
 			/*
 			 * Get the next charge power depending on the priority.
 			 */
-			switch (config.priority()) {
+			switch (this.config.priority()) {
 			case CAR:
 				nextChargePower = this.calculateChargePowerFromExcessPower(this.evcs);
 				break;
@@ -184,19 +181,19 @@ public void run() throws OpenemsNamedException {
 				break;
 			}
 
-			Channel<Integer> minimumHardwarePowerChannel = evcs.channel(Evcs.ChannelId.MINIMUM_HARDWARE_POWER);
+			Channel<Integer> minimumHardwarePowerChannel = this.evcs.channel(Evcs.ChannelId.MINIMUM_HARDWARE_POWER);
 			if (nextChargePower < minimumHardwarePowerChannel.value()
 					.orElse(0)) { /* charging under 6A isn't possible */
 				nextChargePower = 0;
 			}
 
-			this.evcs._setMinimumPower(config.defaultChargeMinPower());
-			nextMinPower = config.defaultChargeMinPower();
+			this.evcs._setMinimumPower(this.config.defaultChargeMinPower());
+			nextMinPower = this.config.defaultChargeMinPower();
 			break;
 
 		case FORCE_CHARGE:
 			this.evcs._setMinimumPower(0);
-			nextChargePower = config.forceChargeMinPower() * this.evcs.getPhases().orElse(3);
+			nextChargePower = this.config.forceChargeMinPower() * this.evcs.getPhases().orElse(3);
 			break;
 		}
 
@@ -205,7 +202,7 @@ public void run() throws OpenemsNamedException {
 		}
 
 		// charging under minimum hardware power isn't possible
-		Channel<Integer> minimumHardwarePowerChannel = evcs.channel(Evcs.ChannelId.MINIMUM_HARDWARE_POWER);
+		Channel<Integer> minimumHardwarePowerChannel = this.evcs.channel(Evcs.ChannelId.MINIMUM_HARDWARE_POWER);
 		if (nextChargePower < minimumHardwarePowerChannel.value().orElse(0)) {
 			nextChargePower = 0;
 		}
@@ -223,7 +220,7 @@ public void run() throws OpenemsNamedException {
 			 */
 			if (this.chargingLowerThanTargetHandler.isLower(this.evcs)) {
 
-				Integer maximumPower = this.chargingLowerThanTargetHandler.getMaximumChargePower();
+				var maximumPower = this.chargingLowerThanTargetHandler.getMaximumChargePower();
 				if (maximumPower != null) {
 					this.evcs._setMaximumPower(maximumPower + CHARGE_POWER_BUFFER);
 					this.logDebug(this.log,
@@ -254,8 +251,8 @@ public void run() throws OpenemsNamedException {
 	 * Resetting the minimum and maximum power channels.
 	 */
 	private void resetMinMaxChannels() {
-		evcs._setMinimumPower(0);
-		evcs._setMaximumPower(null);
+		this.evcs._setMinimumPower(0);
+		this.evcs._setMaximumPower(null);
 	}
 
 	/**
@@ -263,13 +260,13 @@ private void resetMinMaxChannels() {
 	 */
 	private void adaptConfigToHardwareLimits() {
 
-		Optional<Integer> maxHardwareOpt = this.evcs.getMaximumHardwarePower().asOptional();
+		var maxHardwareOpt = this.evcs.getMaximumHardwarePower().asOptional();
 		if (maxHardwareOpt.isPresent()) {
 			int maxHW = maxHardwareOpt.get();
 			if (maxHW != 0) {
 				maxHW = (int) Math.ceil(maxHW / 100.0) * 100;
-				if (config.defaultChargeMinPower() > maxHW) {
-					configUpdate("defaultChargeMinPower", maxHW);
+				if (this.config.defaultChargeMinPower() > maxHW) {
+					this.configUpdate("defaultChargeMinPower", maxHW);
 				}
 			}
 		}
@@ -279,7 +276,7 @@ private void adaptConfigToHardwareLimits() {
 	/**
 	 * Calculates the next charging power, depending on the current PV production
 	 * and house consumption.
-	 * 
+	 *
 	 * @param evcs Electric Vehicle Charging Station
 	 * @return the available excess power for charging
 	 * @throws OpenemsNamedException on error
@@ -296,7 +293,7 @@ private int calculateChargePowerFromExcessPower(ManagedEvcs evcs) throws Openems
 
 	/**
 	 * Calculate result depending on the current evcs power and grid power.
-	 * 
+	 *
 	 * @param evcs
 	 * @return
 	 */
@@ -304,7 +301,7 @@ private int calculateExcessPowerAfterEss(ManagedEvcs evcs) {
 		int buyFromGrid = this.sum.getGridActivePower().orElse(0);
 		int evcsCharge = evcs.getChargePower().orElse(0);
 
-		int result = evcsCharge - buyFromGrid;
+		var result = evcsCharge - buyFromGrid;
 
 		// Add a buffer in Watt to have lower priority than the ess
 		result -= 200;
@@ -321,7 +318,7 @@ public ModbusSlaveTable getModbusSlaveTable(AccessMode accessMode) {
 
 	/**
 	 * Updating the configuration property to given value.
-	 * 
+	 *
 	 * @param targetProperty Property that should be changed
 	 * @param requiredValue  Value that should be set
 	 */
@@ -329,21 +326,21 @@ public void configUpdate(String targetProperty, Object requiredValue) {
 
 		Configuration c;
 		try {
-			String pid = this.servicePid();
+			var pid = this.servicePid();
 			if (pid.isEmpty()) {
-				this.logInfo(log, "PID of " + this.id() + " is Empty");
+				this.logInfo(this.log, "PID of " + this.id() + " is Empty");
 				return;
 			}
-			c = cm.getConfiguration(pid, "?");
-			Dictionary<String, Object> properties = c.getProperties();
-			Object target = properties.get(targetProperty);
-			String existingTarget = target.toString();
+			c = this.cm.getConfiguration(pid, "?");
+			var properties = c.getProperties();
+			var target = properties.get(targetProperty);
+			var existingTarget = target.toString();
 			if (!existingTarget.isEmpty()) {
 				properties.put(targetProperty, requiredValue);
 				c.update(properties);
 			}
 		} catch (IOException | SecurityException e) {
-			this.logError(log, "ERROR: " + e.getMessage());
+			this.logError(this.log, "ERROR: " + e.getMessage());
 		}
 	}
 
diff --git a/io.openems.edge.controller.evcs/src/io/openems/edge/controller/evcs/Priority.java b/io.openems.edge.controller.evcs/src/io/openems/edge/controller/evcs/Priority.java
index 5d611c8b9b5..203156446a0 100644
--- a/io.openems.edge.controller.evcs/src/io/openems/edge/controller/evcs/Priority.java
+++ b/io.openems.edge.controller.evcs/src/io/openems/edge/controller/evcs/Priority.java
@@ -19,12 +19,12 @@ private Priority(int value, String name) {
 
 	@Override
 	public int getValue() {
-		return value;
+		return this.value;
 	}
 
 	@Override
 	public String getName() {
-		return name;
+		return this.name;
 	}
 
 	@Override
diff --git a/io.openems.edge.controller.evcs/test/io/openems/edge/controller/evcs/EvcsControllerTest.java b/io.openems.edge.controller.evcs/test/io/openems/edge/controller/evcs/EvcsControllerTest.java
index 2e1b3eaeb4f..584747b73c8 100644
--- a/io.openems.edge.controller.evcs/test/io/openems/edge/controller/evcs/EvcsControllerTest.java
+++ b/io.openems.edge.controller.evcs/test/io/openems/edge/controller/evcs/EvcsControllerTest.java
@@ -83,8 +83,8 @@ public void excessChargeTest2() throws Exception {
 		ENABLE_CHARGING = true;
 		CHARGE_MODE = ChargeMode.EXCESS_POWER;
 		PRIORITY = Priority.STORAGE;
-		final DummyHybridEss ess = new DummyHybridEss(ESS_ID);
-		final ControllerTest test = new ControllerTest(new EvcsController()) //
+		final var ess = new DummyHybridEss(ESS_ID);
+		final var test = new ControllerTest(new EvcsController()) //
 				.addReference("cm", new DummyConfigurationAdmin()) //
 				.addReference("componentManager", new DummyComponentManager()) //
 				.addReference("sum", new DummySum()) //
@@ -180,7 +180,7 @@ public void wrongConfigParametersTest() throws Exception {
 		DEFAULT_CHARGE_MIN_POWER = 30000;
 		FORCE_CHARGE_MIN_POWER = 30000;
 
-		DummyConfigurationAdmin cm = new DummyConfigurationAdmin();
+		var cm = new DummyConfigurationAdmin();
 		new ControllerTest(new EvcsController()) //
 				.addReference("cm", cm) //
 				.addReference("componentManager", new DummyComponentManager()) //
diff --git a/io.openems.edge.controller.evcs/test/io/openems/edge/controller/evcs/MyConfig.java b/io.openems.edge.controller.evcs/test/io/openems/edge/controller/evcs/MyConfig.java
index 6e924681469..d75d869c646 100644
--- a/io.openems.edge.controller.evcs/test/io/openems/edge/controller/evcs/MyConfig.java
+++ b/io.openems.edge.controller.evcs/test/io/openems/edge/controller/evcs/MyConfig.java
@@ -1,6 +1,5 @@
 package io.openems.edge.controller.evcs;
 
-import io.openems.edge.common.startstop.StartStopConfig;
 import io.openems.edge.common.test.AbstractComponentConfig;
 
 @SuppressWarnings("all")
@@ -8,7 +7,6 @@ public class MyConfig extends AbstractComponentConfig implements Config {
 
 	protected static class Builder {
 		private String id;
-		private String alias = "Controller Evcs";
 		private boolean enabled = true;
 		private boolean debugMode = false;
 		private String evcsId = "evcs0";
@@ -28,21 +26,16 @@ public Builder setId(String id) {
 			return this;
 		}
 
-		public Builder setAlias(String alias) {
-			this.alias = alias;
-			return this;
-		}
-
 		public Builder setEnabled(boolean enabled) {
 			this.enabled = enabled;
 			return this;
 		}
-		
+
 		public Builder setDebugMode(boolean debugMode) {
 			this.debugMode = debugMode;
 			return this;
 		}
-		
+
 		public Builder setEvcsId(String evcsId) {
 			this.evcsId = evcsId;
 			return this;
@@ -77,11 +70,12 @@ public Builder setEssId(String essId) {
 			this.essId = essId;
 			return this;
 		}
+
 		public Builder setEnergySessionLimit(int energySessionLimit) {
 			this.energySessionLimit = energySessionLimit;
 			return this;
 		}
-		
+
 		public MyConfig build() {
 			return new MyConfig(this);
 		}
@@ -98,7 +92,6 @@ private MyConfig(Builder builder) {
 		this.builder = builder;
 	}
 
-
 	@Override
 	public String id() {
 		return this.builder.id;
@@ -148,7 +141,7 @@ public int energySessionLimit() {
 	public boolean debugMode() {
 		return this.builder.debugMode;
 	}
-	
+
 	@Override
 	public String evcs_target() {
 		return "(&(enabled=true)(!(service.pid=ctrlEvcs0))(|(id=" + this.evcs_id() + ")))";

From d59816a4d8f258469d1bd12397b233696b08f5a6 Mon Sep 17 00:00:00 2001
From: Stefan Feilmeier <stefan.feilmeier@fenecon.de>
Date: Mon, 7 Mar 2022 23:16:00 +0100
Subject: [PATCH 44/96] Update io.openems.edge.controller.evcs.fixactivepower

---
 .../edge/controller/evcs/fixactivepower/EvcsFixActivePower.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/io.openems.edge.controller.evcs.fixactivepower/src/io/openems/edge/controller/evcs/fixactivepower/EvcsFixActivePower.java b/io.openems.edge.controller.evcs.fixactivepower/src/io/openems/edge/controller/evcs/fixactivepower/EvcsFixActivePower.java
index 5bf72d93754..63491154f7a 100644
--- a/io.openems.edge.controller.evcs.fixactivepower/src/io/openems/edge/controller/evcs/fixactivepower/EvcsFixActivePower.java
+++ b/io.openems.edge.controller.evcs.fixactivepower/src/io/openems/edge/controller/evcs/fixactivepower/EvcsFixActivePower.java
@@ -70,7 +70,7 @@ protected void deactivate() {
 
 	@Override
 	public void run() throws OpenemsNamedException {
-		LocalDateTime now = LocalDateTime.now(this.componentManager.getClock());
+		var now = LocalDateTime.now(this.componentManager.getClock());
 
 		// Execute only every ... minutes
 		if (this.lastRun.plusMinutes(RUN_EVERY_MINUTES).isAfter(now)) {

From df9a7b56deec2454db359b8bd96642034d08518b Mon Sep 17 00:00:00 2001
From: Stefan Feilmeier <stefan.feilmeier@fenecon.de>
Date: Mon, 7 Mar 2022 23:16:54 +0100
Subject: [PATCH 45/96] Update io.openems.edge.controller.generic.jsonlogic

---
 .../generic/jsonlogic/JsonLogicController.java     | 14 ++++++--------
 .../controller/generic/jsonlogic/MyConfig.java     |  1 -
 2 files changed, 6 insertions(+), 9 deletions(-)

diff --git a/io.openems.edge.controller.generic.jsonlogic/src/io/openems/edge/controller/generic/jsonlogic/JsonLogicController.java b/io.openems.edge.controller.generic.jsonlogic/src/io/openems/edge/controller/generic/jsonlogic/JsonLogicController.java
index d22f1a4f6dd..7d601f90a3d 100644
--- a/io.openems.edge.controller.generic.jsonlogic/src/io/openems/edge/controller/generic/jsonlogic/JsonLogicController.java
+++ b/io.openems.edge.controller.generic.jsonlogic/src/io/openems/edge/controller/generic/jsonlogic/JsonLogicController.java
@@ -15,7 +15,6 @@
 import org.osgi.service.metatype.annotations.Designate;
 
 import com.google.gson.JsonElement;
-import com.google.gson.JsonPrimitive;
 
 import io.github.meiskalt7.jsonlogic.JsonLogic;
 import io.github.meiskalt7.jsonlogic.JsonLogicException;
@@ -77,6 +76,7 @@ protected void activate(ComponentContext context, Config config) throws OpenemsN
 		this.recursivelyParseVars(JsonUtils.parse(config.rule()));
 	}
 
+	@Override
 	@Deactivate
 	protected void deactivate() {
 		super.deactivate();
@@ -84,7 +84,7 @@ protected void deactivate() {
 
 	/**
 	 * Parse the JsonLogic rule and try to find "var" entries.
-	 * 
+	 *
 	 * @param json the JsonLogic rule
 	 * @throws OpenemsNamedException on error
 	 */
@@ -94,7 +94,7 @@ private void recursivelyParseVars(JsonElement json) throws OpenemsNamedException
 			for (Entry<String, JsonElement> entry : json.getAsJsonObject().entrySet()) {
 				// Is there any key "var"
 				if (entry.getKey().equals("var") && entry.getValue().isJsonPrimitive()) {
-					JsonPrimitive var = entry.getValue().getAsJsonPrimitive();
+					var var = entry.getValue().getAsJsonPrimitive();
 					if (var.isString()) {
 						// Parse as ChannelAddress and add to list
 						this.channelAddresses.add(ChannelAddress.fromString(var.getAsString()));
@@ -109,8 +109,6 @@ private void recursivelyParseVars(JsonElement json) throws OpenemsNamedException
 				// Recursive call
 				this.recursivelyParseVars(entry);
 			}
-		} else {
-			return;
 		}
 	}
 
@@ -136,7 +134,7 @@ public void run() throws OpenemsNamedException {
 		// Get Set-Channel requests
 		for (Object entry : result) {
 			List<?> request = (List<?>) entry;
-			ChannelAddress channelAddress = ChannelAddress.fromString((String) request.get(0));
+			var channelAddress = ChannelAddress.fromString((String) request.get(0));
 			WriteChannel<?> channel = this.componentManager.getChannel(channelAddress);
 			Object value = request.get(1);
 			channel.setNextWriteValueFromObject(value);
@@ -144,11 +142,11 @@ public void run() throws OpenemsNamedException {
 	}
 }
 
-// TODO: once gson version 2.8.6 or higher is compatible with OSGi on Java 8: use json-logic library 
+// TODO: once gson version 2.8.6 or higher is compatible with OSGi on Java 8: use json-logic library
 // from maven instead of local file. Json-logic library on maven requires Gson 2.8.6; but Gson 2.8.6
 // is not compatible with OSGi on Java 8 as it has the wrong manifest headers.
 // See -> https://github.com/google/gson/issues/1601
-// This is why we are using a manually compiled jar here, based on the fork at 
+// This is why we are using a manually compiled jar here, based on the fork at
 // https://github.com/sfeilmeier/json-logic-java
 //
 // To revert back to official version, add to pom.xml:
diff --git a/io.openems.edge.controller.generic.jsonlogic/test/io/openems/edge/controller/generic/jsonlogic/MyConfig.java b/io.openems.edge.controller.generic.jsonlogic/test/io/openems/edge/controller/generic/jsonlogic/MyConfig.java
index edf56e73b51..ae550a17a30 100644
--- a/io.openems.edge.controller.generic.jsonlogic/test/io/openems/edge/controller/generic/jsonlogic/MyConfig.java
+++ b/io.openems.edge.controller.generic.jsonlogic/test/io/openems/edge/controller/generic/jsonlogic/MyConfig.java
@@ -2,7 +2,6 @@
 
 import io.openems.common.exceptions.OpenemsError.OpenemsNamedException;
 import io.openems.common.utils.JsonUtils;
-import io.openems.edge.common.startstop.StartStopConfig;
 import io.openems.edge.common.test.AbstractComponentConfig;
 
 @SuppressWarnings("all")

From 8cc8b4a13359ab5ee86f9ac9fe083c30022760a1 Mon Sep 17 00:00:00 2001
From: Stefan Feilmeier <stefan.feilmeier@fenecon.de>
Date: Mon, 7 Mar 2022 23:17:38 +0100
Subject: [PATCH 46/96] Update io.openems.edge.controller.highloadtimeslot

---
 .../highloadtimeslot/HighLoadTimeslot.java    | 60 +++++++++----------
 .../ControllerSimpleTests.java                | 29 +++++----
 2 files changed, 46 insertions(+), 43 deletions(-)

diff --git a/io.openems.edge.controller.highloadtimeslot/src/io/openems/edge/controller/highloadtimeslot/HighLoadTimeslot.java b/io.openems.edge.controller.highloadtimeslot/src/io/openems/edge/controller/highloadtimeslot/HighLoadTimeslot.java
index d966952ad23..1619aa7e941 100644
--- a/io.openems.edge.controller.highloadtimeslot/src/io/openems/edge/controller/highloadtimeslot/HighLoadTimeslot.java
+++ b/io.openems.edge.controller.highloadtimeslot/src/io/openems/edge/controller/highloadtimeslot/HighLoadTimeslot.java
@@ -93,6 +93,7 @@ void activate(ComponentContext context, Config config) throws OpenemsException {
 		super.activate(context, config.id(), config.alias(), config.enabled());
 	}
 
+	@Override
 	@Deactivate
 	protected void deactivate() {
 		super.deactivate();
@@ -102,7 +103,7 @@ protected void deactivate() {
 	public void run() throws OpenemsNamedException {
 		ManagedSymmetricEss ess = this.componentManager.getComponent(this.essId);
 
-		int power = getPower(ess);
+		var power = this.getPower(ess);
 		this.applyPower(ess, power);
 	}
 
@@ -110,20 +111,21 @@ public void run() throws OpenemsNamedException {
 
 	/**
 	 * Gets the current ActivePower.
-	 * 
+	 *
 	 * @return
 	 */
 	private int getPower(ManagedSymmetricEss ess) {
-		LocalDateTime now = LocalDateTime.now(this.componentManager.getClock());
+		var now = LocalDateTime.now(this.componentManager.getClock());
 		if (this.isHighLoadTimeslot(now)) {
 			/*
 			 * We are in a High-Load period -> discharge
 			 */
 			// reset charge state
 			this.chargeState = ChargeState.NORMAL;
-			this.logInfo(log, "Within High-Load timeslot. Discharge with [" + this.dischargePower + "]");
+			this.logInfo(this.log, "Within High-Load timeslot. Discharge with [" + this.dischargePower + "]");
 			return this.dischargePower;
-		} else if (this.isHighLoadTimeslot(now.plusMinutes(FORCE_CHARGE_MINUTES))) {
+		}
+		if (this.isHighLoadTimeslot(now.plusMinutes(FORCE_CHARGE_MINUTES))) {
 			/*
 			 * We are soon going to be in High-Load period -> activate FORCE_CHARGE mode
 			 */
@@ -137,10 +139,10 @@ private int getPower(ManagedSymmetricEss ess) {
 			/*
 			 * charge with configured charge-power
 			 */
-			this.logInfo(log, "Outside High-Load timeslot. Charge with [" + this.chargePower + "]");
-			int minPower = ess.getPower().getMinPower(ess, Phase.ALL, Pwr.ACTIVE);
+			this.logInfo(this.log, "Outside High-Load timeslot. Charge with [" + this.chargePower + "]");
+			var minPower = ess.getPower().getMinPower(ess, Phase.ALL, Pwr.ACTIVE);
 			if (minPower >= 0) {
-				this.logInfo(log, "Min-Power [" + minPower + " >= 0]. Switch to Charge-Hystereses state.");
+				this.logInfo(this.log, "Min-Power [" + minPower + " >= 0]. Switch to Charge-Hystereses state.");
 				// activate Charge-hysteresis if no charge power (i.e. >= 0) is allowed
 				this.chargeState = ChargeState.HYSTERESIS;
 			}
@@ -150,9 +152,9 @@ private int getPower(ManagedSymmetricEss ess) {
 			/*
 			 * block charging till configured hysteresisSoc
 			 */
-			this.logInfo(log, "Outside High-Load timeslot. Charge-Hysteresis-Mode: Block charging.");
+			this.logInfo(this.log, "Outside High-Load timeslot. Charge-Hysteresis-Mode: Block charging.");
 			if (ess.getSoc().orElse(0) <= this.hysteresisSoc) {
-				this.logInfo(log, "SoC [" + ess.getSoc().orElse(0) + " <= " + this.hysteresisSoc
+				this.logInfo(this.log, "SoC [" + ess.getSoc().orElse(0) + " <= " + this.hysteresisSoc
 						+ "]. Switch to Charge-Normal state.");
 				this.chargeState = ChargeState.NORMAL;
 			}
@@ -162,7 +164,7 @@ private int getPower(ManagedSymmetricEss ess) {
 			/*
 			 * force full charging just before the high-load timeslot starts
 			 */
-			this.logInfo(log, "Just before High-Load timeslot. Charge with [" + this.chargePower + "]");
+			this.logInfo(this.log, "Just before High-Load timeslot. Charge with [" + this.chargePower + "]");
 			return this.chargePower;
 		}
 		// we should never come here...
@@ -171,7 +173,7 @@ private int getPower(ManagedSymmetricEss ess) {
 
 	/**
 	 * Is the current time in a high-load timeslot?
-	 * 
+	 *
 	 * @return
 	 */
 	private boolean isHighLoadTimeslot(LocalDateTime dateTime) {
@@ -190,7 +192,7 @@ private boolean isHighLoadTimeslot(LocalDateTime dateTime) {
 
 	/**
 	 * Is 'dateTime' within the ActiveWeekdayFilter?
-	 * 
+	 *
 	 * @param activeDayFilter
 	 * @param dateTime
 	 * @return
@@ -209,70 +211,68 @@ protected static boolean isActiveWeekday(WeekdayFilter activeDayFilter, LocalDat
 	}
 
 	protected static boolean isActiveDate(LocalDate startDate, LocalDate endDate, LocalDateTime dateTime) {
-		LocalDate date = dateTime.toLocalDate();
+		var date = dateTime.toLocalDate();
 		return !(date.isBefore(startDate) || date.isAfter(endDate));
 	}
 
 	/**
 	 * Is the time of 'dateTime' within startTime and endTime?
-	 * 
+	 *
 	 * @param startTime
 	 * @param endTime
 	 * @param dateTime
 	 * @return
 	 */
 	protected static boolean isActiveTime(LocalTime startTime, LocalTime endTime, LocalDateTime dateTime) {
-		LocalTime time = dateTime.toLocalTime();
+		var time = dateTime.toLocalTime();
 		return !(time.isBefore(startTime) || time.isAfter(endTime));
 	}
 
 	/**
 	 * Converts a string to a LocalDate.
-	 * 
+	 *
 	 * @param date
 	 * @return
 	 */
 	protected static LocalDate convertDate(String date) {
-		DateTimeFormatter dateTimeFormatter = DateTimeFormatter.ofPattern(DATE_FORMAT);
-		LocalDate localDate = LocalDate.parse(date, dateTimeFormatter);
-		return localDate;
+		var dateTimeFormatter = DateTimeFormatter.ofPattern(DATE_FORMAT);
+		return LocalDate.parse(date, dateTimeFormatter);
 	}
 
 	/**
 	 * Converts a string to a LocalTime.
-	 * 
+	 *
 	 * @param time
 	 * @return
 	 */
 	protected static LocalTime convertTime(String time) {
-		DateTimeFormatter dateTimeFormatter = DateTimeFormatter.ofPattern(TIME_FORMAT);
-		LocalTime localDate = LocalTime.parse(time, dateTimeFormatter);
-		return localDate;
+		var dateTimeFormatter = DateTimeFormatter.ofPattern(TIME_FORMAT);
+		return LocalTime.parse(time, dateTimeFormatter);
 	}
 
 	/**
 	 * Is 'dateTime' a Saturday or Sunday?
-	 * 
+	 *
 	 * @param dateTime
 	 * @return
 	 */
 	protected static boolean isWeekend(LocalDateTime dateTime) {
-		DayOfWeek dayOfWeek = dateTime.getDayOfWeek();
-		return (dayOfWeek == DayOfWeek.SATURDAY || dayOfWeek == DayOfWeek.SUNDAY);
+		var dayOfWeek = dateTime.getDayOfWeek();
+		return dayOfWeek == DayOfWeek.SATURDAY || dayOfWeek == DayOfWeek.SUNDAY;
 	}
 
 	/**
 	 * Applies the power constraint on the Ess
-	 * 
+	 *
 	 * @param activePower
 	 * @throws OpenemsException
 	 */
 	private void applyPower(ManagedSymmetricEss ess, int activePower) throws OpenemsException {
 		// adjust value so that it fits into Min/MaxActivePower
-		int calculatedPower = ess.getPower().fitValueIntoMinMaxPower(this.id(), ess, Phase.ALL, Pwr.ACTIVE,
+		var calculatedPower = ess.getPower().fitValueIntoMinMaxPower(this.id(), ess, Phase.ALL, Pwr.ACTIVE,
 				activePower);
 		if (calculatedPower != activePower) {
-			this.logInfo(log, "- Applying [" + calculatedPower + " W] instead of [" + activePower + "] W");
+			this.logInfo(this.log, "- Applying [" + calculatedPower + " W] instead of [" + activePower + "] W");
 		}
 
 		// set result
diff --git a/io.openems.edge.controller.highloadtimeslot/test/io/openems/edge/controller/highloadtimeslot/ControllerSimpleTests.java b/io.openems.edge.controller.highloadtimeslot/test/io/openems/edge/controller/highloadtimeslot/ControllerSimpleTests.java
index a52a1f987bd..5597c9b7680 100644
--- a/io.openems.edge.controller.highloadtimeslot/test/io/openems/edge/controller/highloadtimeslot/ControllerSimpleTests.java
+++ b/io.openems.edge.controller.highloadtimeslot/test/io/openems/edge/controller/highloadtimeslot/ControllerSimpleTests.java
@@ -1,6 +1,9 @@
 package io.openems.edge.controller.highloadtimeslot;
 
-import static org.junit.Assert.*;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertTrue;
+import static org.junit.Assert.fail;
 
 import java.time.LocalDate;
 import java.time.LocalDateTime;
@@ -13,10 +16,10 @@ public class ControllerSimpleTests {
 
 	@Test
 	public void testIsActiveDay() {
-		LocalDate startDate = LocalDate.of(2018, 11, 10);
-		LocalDate endDate = LocalDate.of(2018, 11, 12);
+		var startDate = LocalDate.of(2018, 11, 10);
+		var endDate = LocalDate.of(2018, 11, 12);
 
-		LocalDateTime currentDate = LocalDateTime.of(2018, 11, 9, 12, 0);
+		var currentDate = LocalDateTime.of(2018, 11, 9, 12, 0);
 		assertFalse(HighLoadTimeslot.isActiveDate(startDate, endDate, currentDate));
 
 		currentDate = LocalDateTime.of(2018, 11, 10, 12, 0);
@@ -34,10 +37,10 @@ public void testIsActiveDay() {
 
 	@Test
 	public void testIsActiveTime() {
-		LocalTime startTime = LocalTime.of(8, 0);
-		LocalTime endTime = LocalTime.of(8, 10);
+		var startTime = LocalTime.of(8, 0);
+		var endTime = LocalTime.of(8, 10);
 
-		LocalDateTime currentDateTime = LocalDateTime.of(2018, 11, 11, 7, 59);
+		var currentDateTime = LocalDateTime.of(2018, 11, 11, 7, 59);
 		assertFalse(HighLoadTimeslot.isActiveTime(startTime, endTime, currentDateTime));
 
 		currentDateTime = LocalDateTime.of(2018, 11, 11, 8, 0);
@@ -58,8 +61,8 @@ public void testIsActiveTime() {
 
 	@Test
 	public void testIsActiveWeekday() {
-		LocalDateTime currentDate = LocalDateTime.of(2018, 11, 5, 12, 0);
-		WeekdayFilter weekdayFilter = WeekdayFilter.ONLY_WEEKDAYS;
+		var currentDate = LocalDateTime.of(2018, 11, 5, 12, 0);
+		var weekdayFilter = WeekdayFilter.ONLY_WEEKDAYS;
 		assertTrue(HighLoadTimeslot.isActiveWeekday(weekdayFilter, currentDate)); // Monday
 
 		currentDate = LocalDateTime.of(2018, 11, 6, 12, 0);
@@ -83,8 +86,8 @@ public void testIsActiveWeekday() {
 
 	@Test
 	public void testconvertDate() {
-		String dateString = "11.11.2018";
-		LocalDate expectedDate = LocalDate.of(2018, 11, 11);
+		var dateString = "11.11.2018";
+		var expectedDate = LocalDate.of(2018, 11, 11);
 		assertEquals(expectedDate, HighLoadTimeslot.convertDate(dateString));
 
 		dateString = "karlheinz";
@@ -118,8 +121,8 @@ public void testconvertDate() {
 
 	@Test
 	public void testconvertTime() {
-		String timeString = "11:11";
-		LocalTime expectedTime = LocalTime.of(11, 11);
+		var timeString = "11:11";
+		var expectedTime = LocalTime.of(11, 11);
 		assertEquals(expectedTime, HighLoadTimeslot.convertTime(timeString));
 
 		timeString = "karlheinz";

From c8c3f4bcdbcc5486feea70efe0bad33db5875387 Mon Sep 17 00:00:00 2001
From: Stefan Feilmeier <stefan.feilmeier@fenecon.de>
Date: Mon, 7 Mar 2022 23:18:32 +0100
Subject: [PATCH 47/96] Update io.openems.edge.controller.io.alarm

---
 .../openems/edge/controller/io/alarm/IoAlarm.java  | 10 ++++------
 .../edge/controller/io/alarm/DummyComponent.java   | 14 +++++++-------
 .../openems/edge/controller/io/alarm/MyConfig.java |  2 +-
 3 files changed, 12 insertions(+), 14 deletions(-)

diff --git a/io.openems.edge.controller.io.alarm/src/io/openems/edge/controller/io/alarm/IoAlarm.java b/io.openems.edge.controller.io.alarm/src/io/openems/edge/controller/io/alarm/IoAlarm.java
index 0f721a6b6f0..5b595f79752 100644
--- a/io.openems.edge.controller.io.alarm/src/io/openems/edge/controller/io/alarm/IoAlarm.java
+++ b/io.openems.edge.controller.io.alarm/src/io/openems/edge/controller/io/alarm/IoAlarm.java
@@ -1,7 +1,5 @@
 package io.openems.edge.controller.io.alarm;
 
-import java.util.Optional;
-
 import org.osgi.service.component.ComponentContext;
 import org.osgi.service.component.annotations.Activate;
 import org.osgi.service.component.annotations.Component;
@@ -16,7 +14,6 @@
 import io.openems.common.types.ChannelAddress;
 import io.openems.common.types.OpenemsType;
 import io.openems.edge.common.channel.Doc;
-import io.openems.edge.common.channel.StateChannel;
 import io.openems.edge.common.channel.WriteChannel;
 import io.openems.edge.common.component.AbstractOpenemsComponent;
 import io.openems.edge.common.component.ComponentManager;
@@ -66,6 +63,7 @@ void activate(ComponentContext context, Config config) throws OpenemsNamedExcept
 		this.config = config;
 	}
 
+	@Override
 	@Deactivate
 	protected void deactivate() {
 		super.deactivate();
@@ -73,10 +71,10 @@ protected void deactivate() {
 
 	@Override
 	public void run() throws IllegalArgumentException, OpenemsNamedException {
-		boolean setOutput = false;
+		var setOutput = false;
 
 		for (String channelAddress : this.config.inputChannelAddress()) {
-			StateChannel channel = this.componentManager.getChannel(ChannelAddress.fromString(channelAddress));
+			var channel = this.componentManager.getChannel(ChannelAddress.fromString(channelAddress));
 			// Reading the value of all input channels
 			boolean isStateChannelSet = TypeUtils.getAsType(OpenemsType.BOOLEAN, channel.value().getOrError());
 
@@ -90,7 +88,7 @@ public void run() throws IllegalArgumentException, OpenemsNamedException {
 		// Set Output Channel
 		WriteChannel<Boolean> outputChannel = this.componentManager
 				.getChannel(ChannelAddress.fromString(this.config.outputChannelAddress()));
-		Optional<Boolean> currentValueOpt = outputChannel.value().asOptional();
+		var currentValueOpt = outputChannel.value().asOptional();
 		if (!currentValueOpt.isPresent() || currentValueOpt.get() != setOutput) {
 			this.logInfo(this.log, "Set output [" + outputChannel.address() + "] " + setOutput + ".");
 			outputChannel.setNextWriteValue(setOutput);
diff --git a/io.openems.edge.controller.io.alarm/test/io/openems/edge/controller/io/alarm/DummyComponent.java b/io.openems.edge.controller.io.alarm/test/io/openems/edge/controller/io/alarm/DummyComponent.java
index 0773a116185..cfe6307b56e 100644
--- a/io.openems.edge.controller.io.alarm/test/io/openems/edge/controller/io/alarm/DummyComponent.java
+++ b/io.openems.edge.controller.io.alarm/test/io/openems/edge/controller/io/alarm/DummyComponent.java
@@ -1,7 +1,7 @@
 package io.openems.edge.controller.io.alarm;
 
-import io.openems.edge.common.channel.Doc;
 import io.openems.common.channel.Level;
+import io.openems.edge.common.channel.Doc;
 import io.openems.edge.common.component.AbstractOpenemsComponent;
 import io.openems.edge.common.component.OpenemsComponent;
 
@@ -14,9 +14,8 @@ public enum ChannelId implements io.openems.edge.common.channel.ChannelId {
 		/**
 		 * Dummy state channels for testing.
 		 */
-		STATE_0(Doc.of(Level.WARNING).text("State 0")),
-		STATE_1(Doc.of(Level.WARNING).text("State 1")),
-		;
+		STATE_0(Doc.of(Level.WARNING).text("State 0")), //
+		STATE_1(Doc.of(Level.WARNING).text("State 1")),;
 
 		private final Doc doc;
 
@@ -24,14 +23,15 @@ private ChannelId(Doc doc) {
 			this.doc = doc;
 		}
 
-		public Doc doc() {	
+		@Override
+		public Doc doc() {
 			return this.doc;
 		}
 	}
-	
+
 	public DummyComponent(String id) {
 		super(//
-				OpenemsComponent.ChannelId.values(),//
+				OpenemsComponent.ChannelId.values(), //
 				ChannelId.values() //
 		);
 		super.activate(null, id, "", true);
diff --git a/io.openems.edge.controller.io.alarm/test/io/openems/edge/controller/io/alarm/MyConfig.java b/io.openems.edge.controller.io.alarm/test/io/openems/edge/controller/io/alarm/MyConfig.java
index 3c0fa1e062d..7c80285c925 100644
--- a/io.openems.edge.controller.io.alarm/test/io/openems/edge/controller/io/alarm/MyConfig.java
+++ b/io.openems.edge.controller.io.alarm/test/io/openems/edge/controller/io/alarm/MyConfig.java
@@ -35,7 +35,7 @@ public MyConfig build() {
 
 	/**
 	 * Create a Config builder.
-	 * 
+	 *
 	 * @return a {@link Builder}
 	 */
 	public static Builder create() {

From 54058e6bd3163fc80f88b4e1533447a683c63b3f Mon Sep 17 00:00:00 2001
From: Stefan Feilmeier <stefan.feilmeier@fenecon.de>
Date: Mon, 7 Mar 2022 23:20:12 +0100
Subject: [PATCH 48/96] Update
 io.openems.edge.controller.io.channelsinglethreshold

---
 .../ChannelSingleThreshold.java               |  6 ++--
 .../ChannelSingleThresholdImpl.java           | 32 +++++++++----------
 .../ChannelSingleThresholdTest.java           |  2 +-
 .../io/channelsinglethreshold/MyConfig.java   |  2 +-
 4 files changed, 20 insertions(+), 22 deletions(-)

diff --git a/io.openems.edge.controller.io.channelsinglethreshold/src/io/openems/edge/controller/io/channelsinglethreshold/ChannelSingleThreshold.java b/io.openems.edge.controller.io.channelsinglethreshold/src/io/openems/edge/controller/io/channelsinglethreshold/ChannelSingleThreshold.java
index be369723cb4..c5f5357ae70 100644
--- a/io.openems.edge.controller.io.channelsinglethreshold/src/io/openems/edge/controller/io/channelsinglethreshold/ChannelSingleThreshold.java
+++ b/io.openems.edge.controller.io.channelsinglethreshold/src/io/openems/edge/controller/io/channelsinglethreshold/ChannelSingleThreshold.java
@@ -27,7 +27,7 @@ public Doc doc() {
 
 	/**
 	 * Gets the Channel for {@link ChannelId#AWAITING_HYSTERESIS}.
-	 * 
+	 *
 	 * @return the Channel
 	 */
 	public default StateChannel getAwaitingHysteresisChannel() {
@@ -36,7 +36,7 @@ public default StateChannel getAwaitingHysteresisChannel() {
 
 	/**
 	 * Gets the Run-Failed State. See {@link ChannelId#AWAITING_HYSTERESIS}.
-	 * 
+	 *
 	 * @return the Channel {@link Value}
 	 */
 	public default Value<Boolean> getAwaitingHysteresis() {
@@ -46,7 +46,7 @@ public default Value<Boolean> getAwaitingHysteresis() {
 	/**
 	 * Internal method to set the 'nextValue' on
 	 * {@link ChannelId#AWAITING_HYSTERESIS} Channel.
-	 * 
+	 *
 	 * @param value the next value
 	 */
 	public default void _setAwaitingHysteresis(boolean value) {
diff --git a/io.openems.edge.controller.io.channelsinglethreshold/src/io/openems/edge/controller/io/channelsinglethreshold/ChannelSingleThresholdImpl.java b/io.openems.edge.controller.io.channelsinglethreshold/src/io/openems/edge/controller/io/channelsinglethreshold/ChannelSingleThresholdImpl.java
index c46cea96120..3b8f092ddf5 100644
--- a/io.openems.edge.controller.io.channelsinglethreshold/src/io/openems/edge/controller/io/channelsinglethreshold/ChannelSingleThresholdImpl.java
+++ b/io.openems.edge.controller.io.channelsinglethreshold/src/io/openems/edge/controller/io/channelsinglethreshold/ChannelSingleThresholdImpl.java
@@ -3,10 +3,8 @@
 import java.time.Duration;
 import java.time.LocalDateTime;
 import java.util.ArrayList;
-import java.util.Collection;
 import java.util.HashSet;
 import java.util.List;
-import java.util.OptionalDouble;
 import java.util.Set;
 
 import org.osgi.service.component.ComponentContext;
@@ -87,6 +85,7 @@ private synchronized void applyConfig(Config config) throws OpenemsNamedExceptio
 		}
 	}
 
+	@Override
 	@Deactivate
 	protected void deactivate() {
 		super.deactivate();
@@ -94,7 +93,7 @@ protected void deactivate() {
 
 	@Override
 	public void run() throws OpenemsNamedException {
-		List<WriteChannel<Boolean>> outputChannels = this.getOutputChannels();
+		var outputChannels = this.getOutputChannels();
 
 		switch (this.config.mode()) {
 		case ON:
@@ -111,7 +110,7 @@ public void run() throws OpenemsNamedException {
 
 	/**
 	 * From the configured outputChannelAddresses get the actual Channel Objects.
-	 * 
+	 *
 	 * @return the list of Channels
 	 * @throws Exception if no configured Channel is available; if at least one
 	 *                   Channel is available, that one is returned even if other
@@ -133,35 +132,34 @@ private List<WriteChannel<Boolean>> getOutputChannels() throws OpenemsNamedExcep
 		}
 		if (result.isEmpty() && exceptionHappened != null) {
 			throw exceptionHappened;
-		} else {
-			return result;
 		}
+		return result;
 	}
 
 	/**
 	 * Automated control.
-	 * 
+	 *
 	 * @param outputChannels the configured output channels
 	 * @throws OpenemsNamedException on error
 	 */
 	private void automaticMode(List<WriteChannel<Boolean>> outputChannels) throws OpenemsNamedException {
 
-		ChannelAddress inputChannelAddress = ChannelAddress.fromString(this.config.inputChannelAddress());
+		var inputChannelAddress = ChannelAddress.fromString(this.config.inputChannelAddress());
 
 		// Get average input value of the last 'minimumSwitchingTime' seconds
 		IntegerReadChannel inputChannel = this.componentManager.getChannel(inputChannelAddress);
-		Collection<Value<Integer>> values = inputChannel.getPastValues().tailMap(
+		var values = inputChannel.getPastValues().tailMap(
 				LocalDateTime.now(this.componentManager.getClock()).minusSeconds(this.config.minimumSwitchingTime()),
 				true).values();
 
 		// make sure we have at least one value
 		if (values.isEmpty()) {
-			values = new ArrayList<Value<Integer>>();
+			values = new ArrayList<>();
 			values.add(inputChannel.value());
 		}
 
-		OptionalDouble inputValueOpt = values.stream().filter(v -> v.isDefined()) //
-				.mapToInt(v -> v.get()) //
+		var inputValueOpt = values.stream().filter(Value::isDefined) //
+				.mapToInt(Value::get) //
 				.average();
 		int inputValue;
 		if (inputValueOpt.isPresent()) {
@@ -171,7 +169,7 @@ private void automaticMode(List<WriteChannel<Boolean>> outputChannels) throws Op
 			 * Power value (switchedLoadPower) of the output device is added to the input
 			 * channel value to avoid immediate switching based on threshold - e.g. helpful
 			 * when the input channel is the Grid Active Power.
-			 * 
+			 *
 			 * Example use case: if the feed-in is more than threshold, the output device is
 			 * switched on and next second feed-in reduces below threshold and immediately
 			 * switches off the device.
@@ -248,11 +246,11 @@ private void automaticMode(List<WriteChannel<Boolean>> outputChannels) throws Op
 
 	/**
 	 * A flag to maintain change in the state.
-	 * 
+	 *
 	 * @param nextState the target state
 	 */
 	private void changeState(State nextState) {
-		Duration hysteresis = Duration.ofSeconds(this.config.minimumSwitchingTime());
+		var hysteresis = Duration.ofSeconds(this.config.minimumSwitchingTime());
 		if (this.state != nextState) {
 			if (this.lastStateChange.plus(hysteresis).isBefore(LocalDateTime.now(this.componentManager.getClock()))) {
 				this.state = nextState;
@@ -268,14 +266,14 @@ private void changeState(State nextState) {
 
 	/**
 	 * Helper function to switch multiple outputs if they were not switched before.
-	 * 
+	 *
 	 * @param outputChannels the output channels
 	 * @param value          true to switch ON, false to switch ON
 	 * @throws OpenemsNamedException on error
 	 */
 	private void setOutputs(List<WriteChannel<Boolean>> outputChannels, boolean value) throws OpenemsNamedException {
 		for (WriteChannel<Boolean> outputChannel : outputChannels) {
-			Value<Boolean> currentValue = outputChannel.value();
+			var currentValue = outputChannel.value();
 			if (!currentValue.isDefined() || currentValue.get() != value) {
 				this.logInfo(this.log, "Set output [" + outputChannel.address() + "] " + (value ? "ON" : "OFF") + ".");
 				outputChannel.setNextWriteValue(value);
diff --git a/io.openems.edge.controller.io.channelsinglethreshold/test/io/openems/edge/controller/io/channelsinglethreshold/ChannelSingleThresholdTest.java b/io.openems.edge.controller.io.channelsinglethreshold/test/io/openems/edge/controller/io/channelsinglethreshold/ChannelSingleThresholdTest.java
index c035c9f28fd..2fe4d487935 100644
--- a/io.openems.edge.controller.io.channelsinglethreshold/test/io/openems/edge/controller/io/channelsinglethreshold/ChannelSingleThresholdTest.java
+++ b/io.openems.edge.controller.io.channelsinglethreshold/test/io/openems/edge/controller/io/channelsinglethreshold/ChannelSingleThresholdTest.java
@@ -23,7 +23,7 @@ public class ChannelSingleThresholdTest {
 
 	@Test
 	public void test() throws Exception {
-		final TimeLeapClock clock = new TimeLeapClock();
+		final var clock = new TimeLeapClock();
 		new ControllerTest(new ChannelSingleThresholdImpl()) //
 				.addReference("componentManager", new DummyComponentManager(clock)) //
 				.addComponent(new DummyManagedSymmetricEss(ESS_ID)) //
diff --git a/io.openems.edge.controller.io.channelsinglethreshold/test/io/openems/edge/controller/io/channelsinglethreshold/MyConfig.java b/io.openems.edge.controller.io.channelsinglethreshold/test/io/openems/edge/controller/io/channelsinglethreshold/MyConfig.java
index 2eaabb4bb14..058f668e70b 100644
--- a/io.openems.edge.controller.io.channelsinglethreshold/test/io/openems/edge/controller/io/channelsinglethreshold/MyConfig.java
+++ b/io.openems.edge.controller.io.channelsinglethreshold/test/io/openems/edge/controller/io/channelsinglethreshold/MyConfig.java
@@ -65,7 +65,7 @@ public MyConfig build() {
 
 	/**
 	 * Create a Config builder.
-	 * 
+	 *
 	 * @return a {@link Builder}
 	 */
 	public static Builder create() {

From 81a2a2c77156c8475844669ecae36d4fe1912236 Mon Sep 17 00:00:00 2001
From: Stefan Feilmeier <stefan.feilmeier@fenecon.de>
Date: Mon, 7 Mar 2022 23:20:39 +0100
Subject: [PATCH 49/96] Update io.openems.edge.controller.io.fixdigitaloutput

---
 .../controller/io/fixdigitaloutput/FixDigitalOutput.java     | 5 +++--
 .../edge/controller/io/fixdigitaloutput/MyConfig.java        | 2 +-
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/io.openems.edge.controller.io.fixdigitaloutput/src/io/openems/edge/controller/io/fixdigitaloutput/FixDigitalOutput.java b/io.openems.edge.controller.io.fixdigitaloutput/src/io/openems/edge/controller/io/fixdigitaloutput/FixDigitalOutput.java
index d17ca18b809..6cda7fabfbc 100644
--- a/io.openems.edge.controller.io.fixdigitaloutput/src/io/openems/edge/controller/io/fixdigitaloutput/FixDigitalOutput.java
+++ b/io.openems.edge.controller.io.fixdigitaloutput/src/io/openems/edge/controller/io/fixdigitaloutput/FixDigitalOutput.java
@@ -71,6 +71,7 @@ void activate(ComponentContext context, Config config) throws OpenemsNamedExcept
 		super.activate(context, config.id(), config.alias(), config.enabled());
 	}
 
+	@Override
 	@Deactivate
 	protected void deactivate() {
 		super.deactivate();
@@ -87,7 +88,7 @@ public void run() throws IllegalArgumentException, OpenemsNamedException {
 
 	/**
 	 * Switch the output ON.
-	 * 
+	 *
 	 * @throws OpenemsNamedException    on error
 	 * @throws IllegalArgumentException on error
 	 */
@@ -97,7 +98,7 @@ private void switchOn() throws IllegalArgumentException, OpenemsNamedException {
 
 	/**
 	 * Switch the output OFF.
-	 * 
+	 *
 	 * @throws OpenemsNamedException    on error
 	 * @throws IllegalArgumentException on error
 	 */
diff --git a/io.openems.edge.controller.io.fixdigitaloutput/test/io/openems/edge/controller/io/fixdigitaloutput/MyConfig.java b/io.openems.edge.controller.io.fixdigitaloutput/test/io/openems/edge/controller/io/fixdigitaloutput/MyConfig.java
index 2b90297b1db..a9a3aabf98f 100644
--- a/io.openems.edge.controller.io.fixdigitaloutput/test/io/openems/edge/controller/io/fixdigitaloutput/MyConfig.java
+++ b/io.openems.edge.controller.io.fixdigitaloutput/test/io/openems/edge/controller/io/fixdigitaloutput/MyConfig.java
@@ -35,7 +35,7 @@ public MyConfig build() {
 
 	/**
 	 * Create a Config builder.
-	 * 
+	 *
 	 * @return a {@link Builder}
 	 */
 	public static Builder create() {

From 9d9f26271d47cc0453b3de3859d7913e676a68cb Mon Sep 17 00:00:00 2001
From: Stefan Feilmeier <stefan.feilmeier@fenecon.de>
Date: Mon, 7 Mar 2022 23:23:29 +0100
Subject: [PATCH 50/96] Update io.openems.edge.controller.io.heatingelement

---
 .../ControllerHeatingElementImpl.java         | 89 +++++++++----------
 .../io/heatingelement/PhaseDef.java           | 19 ++--
 .../io/heatingelement/HeatingElementTest.java |  5 +-
 .../heatingelement/HeatingElementTest2.java   |  5 +-
 .../HeatingElementTestManual.java             |  3 -
 .../io/heatingelement/MyConfig.java           |  6 --
 6 files changed, 57 insertions(+), 70 deletions(-)

diff --git a/io.openems.edge.controller.io.heatingelement/src/io/openems/edge/controller/io/heatingelement/ControllerHeatingElementImpl.java b/io.openems.edge.controller.io.heatingelement/src/io/openems/edge/controller/io/heatingelement/ControllerHeatingElementImpl.java
index 7fd385b70bf..1d9814e8015 100644
--- a/io.openems.edge.controller.io.heatingelement/src/io/openems/edge/controller/io/heatingelement/ControllerHeatingElementImpl.java
+++ b/io.openems.edge.controller.io.heatingelement/src/io/openems/edge/controller/io/heatingelement/ControllerHeatingElementImpl.java
@@ -3,7 +3,6 @@
 import java.time.Duration;
 import java.time.LocalDateTime;
 import java.time.LocalTime;
-import java.util.Optional;
 
 import org.osgi.service.component.ComponentContext;
 import org.osgi.service.component.annotations.Activate;
@@ -76,6 +75,7 @@ void modified(ComponentContext context, Config config) throws OpenemsNamedExcept
 		this.updateConfig(config);
 	}
 
+	@Override
 	@Deactivate
 	protected void deactivate() {
 		super.deactivate();
@@ -104,10 +104,10 @@ public void run() throws OpenemsNamedException {
 		}
 
 		// Calculate Phase Time
-		int phase1Time = (int) this.phase1.getTotalDuration().getSeconds();
-		int phase2Time = (int) this.phase2.getTotalDuration().getSeconds();
-		int phase3Time = (int) this.phase3.getTotalDuration().getSeconds();
-		int totalPhaseTime = phase1Time + phase2Time + phase3Time;
+		var phase1Time = (int) this.phase1.getTotalDuration().getSeconds();
+		var phase2Time = (int) this.phase2.getTotalDuration().getSeconds();
+		var phase3Time = (int) this.phase3.getTotalDuration().getSeconds();
+		var totalPhaseTime = phase1Time + phase2Time + phase3Time;
 
 		// Update Channels
 		this.channel(ControllerHeatingElement.ChannelId.PHASE1_TIME).setNextValue(phase1Time);
@@ -122,7 +122,7 @@ public void run() throws OpenemsNamedException {
 
 	/**
 	 * Handle Mode "Manual On".
-	 * 
+	 *
 	 * @throws OpenemsNamedException    on error
 	 * @throws IllegalArgumentException on error
 	 */
@@ -132,7 +132,7 @@ private void modeManualOn() throws IllegalArgumentException, OpenemsNamedExcepti
 
 	/**
 	 * Handle Mode "Manual Off".
-	 * 
+	 *
 	 * @throws OpenemsNamedException    on error
 	 * @throws IllegalArgumentException on error
 	 */
@@ -142,7 +142,7 @@ private void modeManualOff() throws IllegalArgumentException, OpenemsNamedExcept
 
 	/**
 	 * Handle Mode "Automatic".
-	 * 
+	 *
 	 * @throws IllegalArgumentException on error.
 	 * @throws OpenemsNamedException    on error.
 	 */
@@ -160,8 +160,8 @@ protected void modeAutomatic() throws IllegalArgumentException, OpenemsNamedExce
 		if (gridActivePower > 0) {
 			excessPower = 0;
 		} else {
-			excessPower = (gridActivePower * -1) - essDischargePower
-					+ (this.currentLevel.getValue() * this.config.powerPerPhase());
+			excessPower = gridActivePower * -1 - essDischargePower
+					+ this.currentLevel.getValue() * this.config.powerPerPhase();
 		}
 
 		// Calculate Level from excessPower
@@ -177,9 +177,9 @@ protected void modeAutomatic() throws IllegalArgumentException, OpenemsNamedExce
 		}
 
 		// Do we need to force-heat?
-		LocalTime now = LocalTime.now(this.componentManager.getClock());
-		LocalTime configuredEndTime = LocalTime.parse(this.config.endTime());
-		LocalTime latestForceChargeStartTime = this.calculateLatestForceHeatingStartTime();
+		var now = LocalTime.now(this.componentManager.getClock());
+		var configuredEndTime = LocalTime.parse(this.config.endTime());
+		var latestForceChargeStartTime = this.calculateLatestForceHeatingStartTime();
 		if (now.isAfter(latestForceChargeStartTime) && now.isBefore(configuredEndTime)) {
 			if (targetLevel.getValue() < this.config.defaultLevel().getValue()) {
 				targetLevel = this.config.defaultLevel(); // force-heat with configured default level
@@ -200,7 +200,7 @@ protected void modeAutomatic() throws IllegalArgumentException, OpenemsNamedExce
 
 	/**
 	 * Calculates the minimum total phase time the user demands in [s].
-	 * 
+	 *
 	 * <ul>
 	 * <li>in {@link WorkMode#TIME}:
 	 * <ul>
@@ -211,7 +211,7 @@ protected void modeAutomatic() throws IllegalArgumentException, OpenemsNamedExce
 	 * </ul>
 	 * <li>in {@link WorkMode#NONE}: always return 0
 	 * </ul>
-	 * 
+	 *
 	 * @return the minimum total phase time [s]
 	 */
 	private static long calculateMinimumTotalPhaseTime(Config config) {
@@ -232,44 +232,43 @@ private static long calculateMinimumTotalPhaseTime(Config config) {
 		case NONE:
 			return 0;
 		}
-		assert (true);
+		assert true;
 		return 0;
 	}
 
 	/**
 	 * Calculates the time from when force-heating needs to start latest.
-	 * 
+	 *
 	 * @return the time, or {@link LocalTime#MAX} if no force-heating is required
 	 */
 	private LocalTime calculateLatestForceHeatingStartTime() {
-		long totalPhaseTime = this.phase1.getTotalDuration().getSeconds() //
+		var totalPhaseTime = this.phase1.getTotalDuration().getSeconds() //
 				+ this.phase2.getTotalDuration().getSeconds() //
 				+ this.phase3.getTotalDuration().getSeconds(); // [s]
-		long remainingTotalPhaseTime = this.minimumTotalPhaseTime - totalPhaseTime; // [s]
+		var remainingTotalPhaseTime = this.minimumTotalPhaseTime - totalPhaseTime; // [s]
 		if (remainingTotalPhaseTime < 0) {
 			return LocalTime.MAX;
-		} else {
-			LocalTime endTime = LocalTime.parse(this.config.endTime());
-			switch (this.config.defaultLevel()) {
-			case LEVEL_0:
-			case UNDEFINED:
-			case LEVEL_1:
-				// keep value
-				break;
-			case LEVEL_2:
-				remainingTotalPhaseTime /= 2;
-				break;
-			case LEVEL_3:
-				remainingTotalPhaseTime /= 3;
-				break;
-			}
-			return endTime.minusSeconds(remainingTotalPhaseTime);
 		}
+		var endTime = LocalTime.parse(this.config.endTime());
+		switch (this.config.defaultLevel()) {
+		case LEVEL_0:
+		case UNDEFINED:
+		case LEVEL_1:
+			// keep value
+			break;
+		case LEVEL_2:
+			remainingTotalPhaseTime /= 2;
+			break;
+		case LEVEL_3:
+			remainingTotalPhaseTime /= 3;
+			break;
+		}
+		return endTime.minusSeconds(remainingTotalPhaseTime);
 	}
 
 	/**
 	 * Switch on Phases according to selected {@link Level}.
-	 * 
+	 *
 	 * @param level the target Level
 	 * @throws IllegalArgumentException on error
 	 * @throws OpenemsNamedException    on error
@@ -306,15 +305,15 @@ public void applyLevel(Level level) throws IllegalArgumentException, OpenemsName
 
 	/**
 	 * Applies the {@link #HYSTERESIS} to avoid too quick changes of Levels.
-	 * 
+	 *
 	 * @param targetLevel the target {@link Level}
 	 * @return the targetLevel if no hysteresis needs to be applied; the
 	 *         currentLevel if hysteresis is to be applied
 	 */
 	private Level applyHysteresis(Level targetLevel) {
 		if (this.currentLevel != targetLevel) {
-			LocalDateTime now = LocalDateTime.now(this.componentManager.getClock());
-			Duration hysteresis = Duration.ofSeconds(this.config.minimumSwitchingTime());
+			var now = LocalDateTime.now(this.componentManager.getClock());
+			var hysteresis = Duration.ofSeconds(this.config.minimumSwitchingTime());
 			if (this.lastLevelChange.plus(hysteresis).isBefore(now)) {
 				// no hysteresis applied
 				this.currentLevel = targetLevel;
@@ -336,7 +335,7 @@ private Level applyHysteresis(Level targetLevel) {
 
 	/**
 	 * Gets the configured Power-per-Phase in [W].
-	 * 
+	 *
 	 * @return power per phase
 	 */
 	protected int getPowerPerPhase() {
@@ -353,18 +352,18 @@ protected int getPowerPerPhase() {
 	 * @throws IllegalArgumentException on error.
 	 */
 	protected void setOutput(Phase phase, boolean value) throws IllegalArgumentException, OpenemsNamedException {
-		ChannelAddress channelAddress = this.getChannelAddressForPhase(phase);
+		var channelAddress = this.getChannelAddressForPhase(phase);
 		WriteChannel<Boolean> outputChannel = this.componentManager.getChannel(channelAddress);
-		Optional<Boolean> currentValueOpt = outputChannel.value().asOptional();
+		var currentValueOpt = outputChannel.value().asOptional();
 		if (!currentValueOpt.isPresent() || currentValueOpt.get() != value) {
-			this.logInfo(this.log, "Set output [" + outputChannel.address() + "] " + (value) + ".");
+			this.logInfo(this.log, "Set output [" + outputChannel.address() + "] " + value + ".");
 			outputChannel.setNextWriteValue(value);
 		}
 	}
 
 	/**
 	 * Gets the Output ChannelAddress for a given Phase.
-	 * 
+	 *
 	 * @param phase the Phase
 	 * @return the Output ChannelAddress
 	 * @throws OpenemsNamedException on error
@@ -378,7 +377,7 @@ private ChannelAddress getChannelAddressForPhase(Phase phase) throws OpenemsName
 		case L3:
 			return ChannelAddress.fromString(this.config.outputChannelPhaseL3());
 		}
-		assert (true); // can never happen
+		assert true; // can never happen
 		return null;
 	}
 }
\ No newline at end of file
diff --git a/io.openems.edge.controller.io.heatingelement/src/io/openems/edge/controller/io/heatingelement/PhaseDef.java b/io.openems.edge.controller.io.heatingelement/src/io/openems/edge/controller/io/heatingelement/PhaseDef.java
index 6c0935d3901..d60733f25ab 100644
--- a/io.openems.edge.controller.io.heatingelement/src/io/openems/edge/controller/io/heatingelement/PhaseDef.java
+++ b/io.openems.edge.controller.io.heatingelement/src/io/openems/edge/controller/io/heatingelement/PhaseDef.java
@@ -8,7 +8,7 @@
 
 /**
  * PhaseDef represents one Phase of the Heating Element.
- * 
+ *
  * <ul>
  * <li>Keeps info about whether the phase is switched ON or OFF
  * <li>Calculates totalTime and totalEnergy
@@ -42,9 +42,9 @@ public PhaseDef(ControllerHeatingElementImpl parent, Phase phase) {
 
 	/**
 	 * Switch the output ON.
-	 * 
+	 *
 	 * @param outputChannelAddress address of the channel which must set to ON
-	 * 
+	 *
 	 * @throws OpenemsNamedException    on error.
 	 * @throws IllegalArgumentException on error.
 	 */
@@ -58,9 +58,9 @@ protected void switchOn() throws IllegalArgumentException, OpenemsNamedException
 
 	/**
 	 * Switch the output OFF.
-	 * 
+	 *
 	 * @param outputChannelAddress address of the channel which must set to OFF.
-	 * 
+	 *
 	 * @throws OpenemsNamedException    on error.
 	 * @throws IllegalArgumentException on error.
 	 */
@@ -75,13 +75,13 @@ protected void switchOff() throws IllegalArgumentException, OpenemsNamedExceptio
 
 	/**
 	 * Gets the total switch-on time in seconds since last reset on midnight.
-	 * 
+	 *
 	 * @return the total elapsed time
 	 */
 	public Duration getTotalDuration() {
 
 		// Did we pass midnight?
-		LocalDate today = LocalDate.now(this.parent.componentManager.getClock());
+		var today = LocalDate.now(this.parent.componentManager.getClock());
 		if (!this.currentDay.equals(today)) {
 			// Always reset Duration
 			this.currentDay = today;
@@ -93,10 +93,9 @@ public Duration getTotalDuration() {
 
 		// Calculate and return the Duration
 		if (this.lastSwitchOn != null) {
-			LocalTime now = LocalTime.now(this.parent.componentManager.getClock());
+			var now = LocalTime.now(this.parent.componentManager.getClock());
 			return this.duration.plus(Duration.between(this.lastSwitchOn, now));
-		} else {
-			return this.duration;
 		}
+		return this.duration;
 	}
 }
diff --git a/io.openems.edge.controller.io.heatingelement/test/io/openems/edge/controller/io/heatingelement/HeatingElementTest.java b/io.openems.edge.controller.io.heatingelement/test/io/openems/edge/controller/io/heatingelement/HeatingElementTest.java
index effb61aa011..de130ce35f7 100644
--- a/io.openems.edge.controller.io.heatingelement/test/io/openems/edge/controller/io/heatingelement/HeatingElementTest.java
+++ b/io.openems.edge.controller.io.heatingelement/test/io/openems/edge/controller/io/heatingelement/HeatingElementTest.java
@@ -31,15 +31,14 @@ public class HeatingElementTest {
 
 	@Test
 	public void test() throws Exception {
-		final TimeLeapClock clock = new TimeLeapClock(
-				Instant.ofEpochSecond(1577836800) /* starts at 1. January 2020 00:00:00 */, ZoneOffset.UTC);
+		final var clock = new TimeLeapClock(Instant.ofEpochSecond(1577836800) /* starts at 1. January 2020 00:00:00 */,
+				ZoneOffset.UTC);
 		new ControllerTest(new ControllerHeatingElementImpl()) //
 				.addReference("componentManager", new DummyComponentManager(clock)) //
 				.addReference("sum", new DummySum()) //
 				.addComponent(new DummyInputOutput(IO_ID)) //
 				.activate(MyConfig.create() //
 						.setId(CTRL_ID) //
-						.setInputChannelAddress(SUM_GRID_ACTIVE_POWER.toString()) //
 						.setOutputChannelPhaseL1(IO_OUTPUT1.toString()) //
 						.setOutputChannelPhaseL2(IO_OUTPUT2.toString()) //
 						.setOutputChannelPhaseL3(IO_OUTPUT3.toString()) //
diff --git a/io.openems.edge.controller.io.heatingelement/test/io/openems/edge/controller/io/heatingelement/HeatingElementTest2.java b/io.openems.edge.controller.io.heatingelement/test/io/openems/edge/controller/io/heatingelement/HeatingElementTest2.java
index afcf81bb4d9..a421000f7f3 100644
--- a/io.openems.edge.controller.io.heatingelement/test/io/openems/edge/controller/io/heatingelement/HeatingElementTest2.java
+++ b/io.openems.edge.controller.io.heatingelement/test/io/openems/edge/controller/io/heatingelement/HeatingElementTest2.java
@@ -31,15 +31,14 @@ public class HeatingElementTest2 {
 
 	@Test
 	public void test() throws Exception {
-		final TimeLeapClock clock = new TimeLeapClock(
-				Instant.ofEpochSecond(1577836800) /* starts at 1. January 2020 00:00:00 */, ZoneOffset.UTC);
+		final var clock = new TimeLeapClock(Instant.ofEpochSecond(1577836800) /* starts at 1. January 2020 00:00:00 */,
+				ZoneOffset.UTC);
 		new ControllerTest(new ControllerHeatingElementImpl()) //
 				.addReference("componentManager", new DummyComponentManager(clock)) //
 				.addReference("sum", new DummySum()) //
 				.addComponent(new DummyInputOutput(IO_ID)) //
 				.activate(MyConfig.create() //
 						.setId(CTRL_ID) //
-						.setInputChannelAddress(SUM_GRID_ACTIVE_POWER.toString()) //
 						.setOutputChannelPhaseL1(IO_OUTPUT1.toString()) //
 						.setOutputChannelPhaseL2(IO_OUTPUT2.toString()) //
 						.setOutputChannelPhaseL3(IO_OUTPUT3.toString()) //
diff --git a/io.openems.edge.controller.io.heatingelement/test/io/openems/edge/controller/io/heatingelement/HeatingElementTestManual.java b/io.openems.edge.controller.io.heatingelement/test/io/openems/edge/controller/io/heatingelement/HeatingElementTestManual.java
index c5c18b7998a..d9d7fd1751f 100644
--- a/io.openems.edge.controller.io.heatingelement/test/io/openems/edge/controller/io/heatingelement/HeatingElementTestManual.java
+++ b/io.openems.edge.controller.io.heatingelement/test/io/openems/edge/controller/io/heatingelement/HeatingElementTestManual.java
@@ -19,8 +19,6 @@ public class HeatingElementTestManual {
 	private final static String CTRL_ID = "ctrl0";
 	private final static String IO_ID = "io0";
 
-	private final static ChannelAddress SUM_GRID_ACTIVE_POWER = new ChannelAddress("_sum", "GridActivePower");
-
 	private final static ChannelAddress IO_OUTPUT1 = new ChannelAddress(IO_ID, "InputOutput1");
 	private final static ChannelAddress IO_OUTPUT2 = new ChannelAddress(IO_ID, "InputOutput2");
 	private final static ChannelAddress IO_OUTPUT3 = new ChannelAddress(IO_ID, "InputOutput3");
@@ -35,7 +33,6 @@ private static ControllerTest prepareTest(Mode mode, Level level) throws Openems
 				.addComponent(new DummyInputOutput("io0")) //
 				.activate(MyConfig.create() //
 						.setId(CTRL_ID) //
-						.setInputChannelAddress(SUM_GRID_ACTIVE_POWER.toString()) //
 						.setOutputChannelPhaseL1(IO_OUTPUT1.toString()) //
 						.setOutputChannelPhaseL2(IO_OUTPUT2.toString()) //
 						.setOutputChannelPhaseL3(IO_OUTPUT3.toString()) //
diff --git a/io.openems.edge.controller.io.heatingelement/test/io/openems/edge/controller/io/heatingelement/MyConfig.java b/io.openems.edge.controller.io.heatingelement/test/io/openems/edge/controller/io/heatingelement/MyConfig.java
index bfd87e4e063..93f923cbcba 100644
--- a/io.openems.edge.controller.io.heatingelement/test/io/openems/edge/controller/io/heatingelement/MyConfig.java
+++ b/io.openems.edge.controller.io.heatingelement/test/io/openems/edge/controller/io/heatingelement/MyConfig.java
@@ -7,7 +7,6 @@ public class MyConfig extends AbstractComponentConfig implements Config {
 
 	protected static class Builder {
 		private String id;
-		private String inputChannelAddress;
 		private String outputChannelPhaseL1;
 		private String outputChannelPhaseL2;
 		private String outputChannelPhaseL3;
@@ -28,11 +27,6 @@ public Builder setId(String id) {
 			return this;
 		}
 
-		public Builder setInputChannelAddress(String inputChannelAddress) {
-			this.inputChannelAddress = inputChannelAddress;
-			return this;
-		}
-
 		public Builder setOutputChannelPhaseL1(String outputChannelPhaseL1) {
 			this.outputChannelPhaseL1 = outputChannelPhaseL1;
 			return this;

From aa405146cfe427485e4fb473a06a3b5fe4dcc81b Mon Sep 17 00:00:00 2001
From: Stefan Feilmeier <stefan.feilmeier@fenecon.de>
Date: Mon, 7 Mar 2022 23:23:52 +0100
Subject: [PATCH 51/96] Update io.openems.edge.controller.io.heatpump

---
 .../io/heatpump/sgready/HeatPumpImpl.java     | 38 +++++++++----------
 .../io/heatpump/sgready/Status.java           |  4 +-
 .../io/heatpump/sgready/StatusDefinition.java |  8 ++--
 .../io/heatpump/sgready/MyConfig.java         |  3 +-
 .../io/heatpump/sgready/MyControllerTest.java | 18 ++++-----
 5 files changed, 35 insertions(+), 36 deletions(-)

diff --git a/io.openems.edge.controller.io.heatpump.sgready/src/io/openems/edge/controller/io/heatpump/sgready/HeatPumpImpl.java b/io.openems.edge.controller.io.heatpump.sgready/src/io/openems/edge/controller/io/heatpump/sgready/HeatPumpImpl.java
index 2dc013160d0..ba6a043ab60 100644
--- a/io.openems.edge.controller.io.heatpump.sgready/src/io/openems/edge/controller/io/heatpump/sgready/HeatPumpImpl.java
+++ b/io.openems.edge.controller.io.heatpump.sgready/src/io/openems/edge/controller/io/heatpump/sgready/HeatPumpImpl.java
@@ -1,7 +1,6 @@
 package io.openems.edge.controller.io.heatpump.sgready;
 
 import java.time.Instant;
-import java.util.Optional;
 
 import org.osgi.service.component.ComponentContext;
 import org.osgi.service.component.annotations.Activate;
@@ -95,6 +94,7 @@ void modified(ComponentContext context, Config config) throws OpenemsNamedExcept
 		this.config = config;
 	}
 
+	@Override
 	@Deactivate
 	protected void deactivate() {
 		super.deactivate();
@@ -131,11 +131,11 @@ public void run() throws OpenemsNamedException {
 
 	/**
 	 * Automatic mode.
-	 * 
+	 *
 	 * <p>
 	 * Sets the digital outputs and the state depending on the surplus or grid-buy
 	 * power.
-	 * 
+	 *
 	 * @throws IllegalArgumentException on error
 	 * @throws OpenemsNamedException    on error
 	 */
@@ -150,19 +150,19 @@ private void modeAutomatic() throws IllegalArgumentException, OpenemsNamedExcept
 		this._setAwaitingHysteresis(false);
 
 		// Values to calculate the surplus/grid-buy power
-		int gridActivePower = this.getGridActivePowerOrZero();
-		int soc = this.getEssSocOrZero();
-		int essDischargePower = this.getEssDischargePowerOrZero();
+		var gridActivePower = this.getGridActivePowerOrZero();
+		var soc = this.getEssSocOrZero();
+		var essDischargePower = this.getEssDischargePowerOrZero();
 
 		// We are only interested in discharging, not charging
 		essDischargePower = essDischargePower < 0 ? 0 : essDischargePower;
 
 		// Calculate power used by the heat pump
-		int heatPumpPower = this.recommState.isActive() ? this.config.automaticRecommendationSurplusPower() : 0;
+		var heatPumpPower = this.recommState.isActive() ? this.config.automaticRecommendationSurplusPower() : 0;
 		heatPumpPower = this.forceOnState.isActive() ? this.config.automaticForceOnSurplusPower() : heatPumpPower;
 
 		// Calculate surplus power
-		long surplusPower = (gridActivePower * -1) - essDischargePower + heatPumpPower;
+		long surplusPower = gridActivePower * -1 - essDischargePower + heatPumpPower;
 
 		// Check conditions for lock mode (Lock mode is not depending on the
 		// essDischarge Power)
@@ -193,15 +193,15 @@ private void modeAutomatic() throws IllegalArgumentException, OpenemsNamedExcept
 
 	/**
 	 * Manual mode.
-	 * 
+	 *
 	 * <p>
 	 * Sets the digital outputs and the state depending on a fix user input.
-	 * 
+	 *
 	 * @throws IllegalArgumentException on error
 	 * @throws OpenemsNamedException    on error
 	 */
 	private void modeManual() throws IllegalArgumentException, OpenemsNamedException {
-		Status state = this.config.manualState();
+		var state = this.config.manualState();
 		switch (state) {
 		case FORCE_ON:
 			this.forceOnState.switchOn();
@@ -239,14 +239,14 @@ private int getGridActivePowerOrZero() {
 	/**
 	 * Get the IntegerReadChannel value or 0 if not present - Sets also the
 	 * according state channel depending on the channel.
-	 * 
+	 *
 	 * @param channel      Channel that value should be read.
 	 * @param stateChannel Referring StateChannel that will be set if the value is
 	 *                     not present.
 	 * @return Current channel value as int.
 	 */
 	private int getChannelValueOrZeroAndSetStateChannel(IntegerReadChannel channel, StateChannel stateChannel) {
-		Optional<Integer> channelOptional = channel.getNextValue().asOptional();
+		var channelOptional = channel.getNextValue().asOptional();
 
 		if (channelOptional.isPresent()) {
 			stateChannel.setNextValue(false);
@@ -258,7 +258,7 @@ private int getChannelValueOrZeroAndSetStateChannel(IntegerReadChannel channel,
 
 	/**
 	 * Helper method to set the two booleans for the two outputs.
-	 * 
+	 *
 	 * @param output1 Value that should be set on output 1.
 	 * @param output2 Value that should be set on output 2.
 	 * @throws IllegalArgumentException on error
@@ -271,7 +271,7 @@ protected void setOutputs(boolean output1, boolean output2) throws IllegalArgume
 
 	/**
 	 * Switch an output if it was not switched before.
-	 * 
+	 *
 	 * @param channelAddress The address of the channel.
 	 * @param value          Boolean that should be set on the output.
 	 * @throws IllegalArgumentException on error
@@ -281,10 +281,10 @@ protected void setOutput(ChannelAddress channelAddress, boolean value)
 			throws IllegalArgumentException, OpenemsNamedException {
 
 		WriteChannel<Boolean> outputChannel = this.componentManager.getChannel(channelAddress);
-		Optional<Boolean> currentValueOpt = outputChannel.value().asOptional();
+		var currentValueOpt = outputChannel.value().asOptional();
 
 		if (!currentValueOpt.isPresent() || currentValueOpt.get() != value) {
-			this.logDebug(this.log, "Set output [" + outputChannel.address() + "] " + (value) + ".");
+			this.logDebug(this.log, "Set output [" + outputChannel.address() + "] " + value + ".");
 			outputChannel.setNextWriteValue(value);
 		}
 	}
@@ -303,11 +303,11 @@ public Timedata getTimedata() {
 
 	/**
 	 * Change of a state.
-	 * 
+	 *
 	 * <p>
 	 * Sets the digital outputs, the currently active status and the lastStateChange
 	 * time set point.
-	 * 
+	 *
 	 * @param status New active status
 	 * @throws OpenemsNamedException    on error
 	 * @throws IllegalArgumentException on error
diff --git a/io.openems.edge.controller.io.heatpump.sgready/src/io/openems/edge/controller/io/heatpump/sgready/Status.java b/io.openems.edge.controller.io.heatpump.sgready/src/io/openems/edge/controller/io/heatpump/sgready/Status.java
index 5cc2f9ff99e..ca6f179aa40 100644
--- a/io.openems.edge.controller.io.heatpump.sgready/src/io/openems/edge/controller/io/heatpump/sgready/Status.java
+++ b/io.openems.edge.controller.io.heatpump.sgready/src/io/openems/edge/controller/io/heatpump/sgready/Status.java
@@ -58,7 +58,7 @@ public String getName() {
 
 	/**
 	 * Get the value of output 1.
-	 * 
+	 *
 	 * @return value as boolean
 	 */
 	public boolean getOutput1() {
@@ -67,7 +67,7 @@ public boolean getOutput1() {
 
 	/**
 	 * Get the value of output 2.
-	 * 
+	 *
 	 * @return value as boolean
 	 */
 	public boolean getOutput2() {
diff --git a/io.openems.edge.controller.io.heatpump.sgready/src/io/openems/edge/controller/io/heatpump/sgready/StatusDefinition.java b/io.openems.edge.controller.io.heatpump.sgready/src/io/openems/edge/controller/io/heatpump/sgready/StatusDefinition.java
index a9cb73c1872..a04c3788a3c 100644
--- a/io.openems.edge.controller.io.heatpump.sgready/src/io/openems/edge/controller/io/heatpump/sgready/StatusDefinition.java
+++ b/io.openems.edge.controller.io.heatpump.sgready/src/io/openems/edge/controller/io/heatpump/sgready/StatusDefinition.java
@@ -5,7 +5,7 @@
 
 /**
  * State Definition.
- * 
+ *
  * <p>
  * Stores information about the time, it was switched on and provides an method
  * to set this state.
@@ -24,11 +24,11 @@ public StatusDefinition(HeatPumpImpl parent, Status status, HeatPump.ChannelId a
 
 	/**
 	 * Switch on the state/it's referring relays.
-	 * 
+	 *
 	 * <p>
 	 * Forward its state to the parent changeState method, to set the corresponding
 	 * relay outputs and the present state, if the state is not already active.
-	 * 
+	 *
 	 * @throws OpenemsNamedException    on error
 	 * @throws IllegalArgumentException on error
 	 */
@@ -48,7 +48,7 @@ protected void updateActiveTime() {
 
 	/**
 	 * Returns if this state is the active state.
-	 * 
+	 *
 	 * @return Is this state active.
 	 */
 	protected boolean isActive() {
diff --git a/io.openems.edge.controller.io.heatpump.sgready/test/io/openems/edge/controller/io/heatpump/sgready/MyConfig.java b/io.openems.edge.controller.io.heatpump.sgready/test/io/openems/edge/controller/io/heatpump/sgready/MyConfig.java
index 9b26fbc4e93..f8151f9ef8c 100644
--- a/io.openems.edge.controller.io.heatpump.sgready/test/io/openems/edge/controller/io/heatpump/sgready/MyConfig.java
+++ b/io.openems.edge.controller.io.heatpump.sgready/test/io/openems/edge/controller/io/heatpump/sgready/MyConfig.java
@@ -1,7 +1,6 @@
 package io.openems.edge.controller.io.heatpump.sgready;
 
 import io.openems.edge.common.test.AbstractComponentConfig;
-import io.openems.edge.controller.io.heatpump.sgready.Config;
 
 @SuppressWarnings("all")
 public class MyConfig extends AbstractComponentConfig implements Config {
@@ -102,7 +101,7 @@ public Builder setMinimumSwitchingTime(int minimumSwitchingTime) {
 
 	/**
 	 * Create a Config builder.
-	 * 
+	 *
 	 * @return a {@link Builder}
 	 */
 	public static Builder create() {
diff --git a/io.openems.edge.controller.io.heatpump.sgready/test/io/openems/edge/controller/io/heatpump/sgready/MyControllerTest.java b/io.openems.edge.controller.io.heatpump.sgready/test/io/openems/edge/controller/io/heatpump/sgready/MyControllerTest.java
index 68c7ce38e44..3e88518a7d2 100644
--- a/io.openems.edge.controller.io.heatpump.sgready/test/io/openems/edge/controller/io/heatpump/sgready/MyControllerTest.java
+++ b/io.openems.edge.controller.io.heatpump.sgready/test/io/openems/edge/controller/io/heatpump/sgready/MyControllerTest.java
@@ -34,7 +34,7 @@ public class MyControllerTest {
 	@Test
 	public void manual_undefined_test() throws Exception {
 
-		final TimeLeapClock clock = new TimeLeapClock(
+		final var clock = new TimeLeapClock(
 				Instant.ofEpochSecond(1577836800) /* starts at 1. January 2020 00:00:00 */, ZoneOffset.UTC);
 
 		new ControllerTest(new HeatPumpImpl()) //
@@ -57,7 +57,7 @@ public void manual_undefined_test() throws Exception {
 	@Test
 	public void manual_regular_test() throws Exception {
 
-		final TimeLeapClock clock = new TimeLeapClock(
+		final var clock = new TimeLeapClock(
 				Instant.ofEpochSecond(1577836800) /* starts at 1. January 2020 00:00:00 */, ZoneOffset.UTC);
 
 		new ControllerTest(new HeatPumpImpl()) //
@@ -80,7 +80,7 @@ public void manual_regular_test() throws Exception {
 	@Test
 	public void manual_recommendation_test() throws Exception {
 
-		final TimeLeapClock clock = new TimeLeapClock(
+		final var clock = new TimeLeapClock(
 				Instant.ofEpochSecond(1577836800) /* starts at 1. January 2020 00:00:00 */, ZoneOffset.UTC);
 
 		new ControllerTest(new HeatPumpImpl()) //
@@ -103,7 +103,7 @@ public void manual_recommendation_test() throws Exception {
 	@Test
 	public void manual_force_on_test() throws Exception {
 
-		final TimeLeapClock clock = new TimeLeapClock(
+		final var clock = new TimeLeapClock(
 				Instant.ofEpochSecond(1577836800) /* starts at 1. January 2020 00:00:00 */, ZoneOffset.UTC);
 
 		new ControllerTest(new HeatPumpImpl()) //
@@ -126,7 +126,7 @@ public void manual_force_on_test() throws Exception {
 	@Test
 	public void manual_lock_test() throws Exception {
 
-		final TimeLeapClock clock = new TimeLeapClock(
+		final var clock = new TimeLeapClock(
 				Instant.ofEpochSecond(1577836800) /* starts at 1. January 2020 00:00:00 */, ZoneOffset.UTC);
 
 		new ControllerTest(new HeatPumpImpl()) //
@@ -149,7 +149,7 @@ public void manual_lock_test() throws Exception {
 	@Test
 	public void automatic_regular_test() throws Exception {
 
-		final TimeLeapClock clock = new TimeLeapClock(
+		final var clock = new TimeLeapClock(
 				Instant.ofEpochSecond(1577836800) /* starts at 1. January 2020 00:00:00 */, ZoneOffset.UTC);
 
 		new ControllerTest(new HeatPumpImpl()) //
@@ -174,7 +174,7 @@ public void automatic_regular_test() throws Exception {
 	@Test
 	public void automatic_normal_config_test() throws Exception {
 
-		final TimeLeapClock clock = new TimeLeapClock(
+		final var clock = new TimeLeapClock(
 				Instant.ofEpochSecond(1577836800) /* starts at 1. January 2020 00:00:00 */, ZoneOffset.UTC);
 
 		new ControllerTest(new HeatPumpImpl()) //
@@ -236,7 +236,7 @@ public void automatic_normal_config_test() throws Exception {
 	@Test
 	public void automatic_switching_time_test() throws Exception {
 
-		final TimeLeapClock clock = new TimeLeapClock(
+		final var clock = new TimeLeapClock(
 				Instant.ofEpochSecond(1577836800) /* starts at 1. January 2020 00:00:00 */, ZoneOffset.UTC);
 
 		new ControllerTest(new HeatPumpImpl()) //
@@ -304,7 +304,7 @@ public void automatic_switching_time_test() throws Exception {
 	@Test
 	public void automatic_switching2_time_test() throws Exception {
 
-		final TimeLeapClock clock = new TimeLeapClock(Instant.ofEpochSecond(1577836800), ZoneOffset.UTC);
+		final var clock = new TimeLeapClock(Instant.ofEpochSecond(1577836800), ZoneOffset.UTC);
 
 		new ControllerTest(new HeatPumpImpl()).addReference("componentManager", //
 				new DummyComponentManager(clock)) //

From 3f190c621a512f49a8da20dc0b286f97997b9104 Mon Sep 17 00:00:00 2001
From: Stefan Feilmeier <stefan.feilmeier@fenecon.de>
Date: Mon, 7 Mar 2022 23:26:58 +0100
Subject: [PATCH 52/96] Update
 io.openems.edge.controller.symmetric.fixreactivepower

---
 .../PvInverterFixPowerLimit.java              |  1 +
 .../PvInverterSellToGridLimit.java            | 11 +--
 .../symmetric/balancing/Balancing.java        | 10 +--
 .../symmetric/balancing/MyConfig.java         |  2 +-
 .../balancingschedule/BalancingSchedule.java  | 14 +--
 .../BalancingScheduleImpl.java                | 30 +++----
 .../BalancingScheduleImplTest.java            |  4 +-
 .../symmetric/balancingschedule/MyConfig.java |  2 +-
 .../symmetric/fixreactivepower/Config.java    |  4 +-
 .../SymmetricFixReactivePower.java            |  4 +-
 .../SymmetricLimitActivePower.java            | 15 ++--
 .../symmetric/peakshaving/PeakShaving.java    |  6 +-
 .../symmetric/peakshaving/MyConfig.java       |  2 +-
 .../randompower/SymmetricRandomPower.java     |  3 +-
 .../timeslotpeakshaving/ChargeState.java      |  4 +-
 .../TimeslotPeakshaving.java                  | 88 +++++++++----------
 .../timeslotpeakshaving/MyConfig.java         |  2 +-
 .../TimeslotPeakshavingTest.java              |  2 +-
 18 files changed, 102 insertions(+), 102 deletions(-)

diff --git a/io.openems.edge.controller.pvinverter.fixpowerlimit/src/io/openems/edge/controller/pvinverter/fixpowerlimit/PvInverterFixPowerLimit.java b/io.openems.edge.controller.pvinverter.fixpowerlimit/src/io/openems/edge/controller/pvinverter/fixpowerlimit/PvInverterFixPowerLimit.java
index 867f8e0eee3..61d6d821b7f 100644
--- a/io.openems.edge.controller.pvinverter.fixpowerlimit/src/io/openems/edge/controller/pvinverter/fixpowerlimit/PvInverterFixPowerLimit.java
+++ b/io.openems.edge.controller.pvinverter.fixpowerlimit/src/io/openems/edge/controller/pvinverter/fixpowerlimit/PvInverterFixPowerLimit.java
@@ -64,6 +64,7 @@ void activate(ComponentContext context, Config config) {
 		this.powerLimit = config.powerLimit();
 	}
 
+	@Override
 	@Deactivate
 	protected void deactivate() {
 		// Reset limit
diff --git a/io.openems.edge.controller.pvinverter.selltogridlimit/src/io/openems/edge/controller/selltogridlimit/PvInverterSellToGridLimit.java b/io.openems.edge.controller.pvinverter.selltogridlimit/src/io/openems/edge/controller/selltogridlimit/PvInverterSellToGridLimit.java
index 9d93f2648da..746a73c2fd0 100644
--- a/io.openems.edge.controller.pvinverter.selltogridlimit/src/io/openems/edge/controller/selltogridlimit/PvInverterSellToGridLimit.java
+++ b/io.openems.edge.controller.pvinverter.selltogridlimit/src/io/openems/edge/controller/selltogridlimit/PvInverterSellToGridLimit.java
@@ -58,6 +58,7 @@ void activate(ComponentContext context, Config config) {
 		this.config = config;
 	}
 
+	@Override
 	@Deactivate
 	protected void deactivate() {
 		super.deactivate();
@@ -65,7 +66,7 @@ protected void deactivate() {
 
 	/**
 	 * Calculates required charge/discharge power.
-	 * 
+	 *
 	 * @param pvInverter the SymmetricPvInverter
 	 * @param meter      the Meter
 	 * @return the required power
@@ -75,7 +76,7 @@ private int calculateRequiredPower(ManagedSymmetricPvInverter pvInverter, Symmet
 			throws InvalidValueException {
 		return meter.getActivePower().getOrError() /* current buy-from/sell-to grid */
 				+ pvInverter.getActivePower().getOrError() /* current charge/discharge Ess */
-				+ config.maximumSellToGridPower(); /* the configured limit */
+				+ this.config.maximumSellToGridPower(); /* the configured limit */
 	}
 
 	@Override
@@ -84,10 +85,10 @@ public void run() throws OpenemsNamedException {
 		SymmetricMeter meter = this.componentManager.getComponent(this.config.meter_id());
 
 		// Calculates required charge/discharge power
-		int calculatedPower = this.calculateRequiredPower(pvInverter, meter);
+		var calculatedPower = this.calculateRequiredPower(pvInverter, meter);
 
-		if (Math.abs(this.lastSetLimit) > 100 && Math.abs(calculatedPower) > 100 && Math.abs(
-				this.lastSetLimit - calculatedPower) > (Math.abs(this.lastSetLimit) * DEFAULT_MAX_ADJUSTMENT_RATE)) {
+		if (Math.abs(this.lastSetLimit) > 100 && Math.abs(calculatedPower) > 100 && Math
+				.abs(this.lastSetLimit - calculatedPower) > Math.abs(this.lastSetLimit) * DEFAULT_MAX_ADJUSTMENT_RATE) {
 			if (this.lastSetLimit > calculatedPower) {
 				calculatedPower = this.lastSetLimit - (int) Math.abs(this.lastSetLimit * DEFAULT_MAX_ADJUSTMENT_RATE);
 			} else {
diff --git a/io.openems.edge.controller.symmetric.balancing/src/io/openems/edge/controller/symmetric/balancing/Balancing.java b/io.openems.edge.controller.symmetric.balancing/src/io/openems/edge/controller/symmetric/balancing/Balancing.java
index ce668dd2d2b..1ee1cabfcc6 100644
--- a/io.openems.edge.controller.symmetric.balancing/src/io/openems/edge/controller/symmetric/balancing/Balancing.java
+++ b/io.openems.edge.controller.symmetric.balancing/src/io/openems/edge/controller/symmetric/balancing/Balancing.java
@@ -16,7 +16,6 @@
 import io.openems.edge.common.component.AbstractOpenemsComponent;
 import io.openems.edge.common.component.ComponentManager;
 import io.openems.edge.common.component.OpenemsComponent;
-import io.openems.edge.common.sum.GridMode;
 import io.openems.edge.controller.api.Controller;
 import io.openems.edge.ess.api.ManagedSymmetricEss;
 import io.openems.edge.ess.power.api.Power;
@@ -64,6 +63,7 @@ void activate(ComponentContext context, Config config) {
 		this.config = config;
 	}
 
+	@Override
 	@Deactivate
 	protected void deactivate() {
 		super.deactivate();
@@ -71,7 +71,7 @@ protected void deactivate() {
 
 	/**
 	 * Calculates required charge/discharge power.
-	 * 
+	 *
 	 * @param ess   the Ess
 	 * @param meter the Meter
 	 * @return the required power
@@ -80,7 +80,7 @@ protected void deactivate() {
 	private int calculateRequiredPower(ManagedSymmetricEss ess, SymmetricMeter meter) throws InvalidValueException {
 		return meter.getActivePower().getOrError() /* current buy-from/sell-to grid */
 				+ ess.getActivePower().getOrError() /* current charge/discharge Ess */
-				- config.targetGridSetpoint(); /* the configured target setpoint */
+				- this.config.targetGridSetpoint(); /* the configured target setpoint */
 	}
 
 	@Override
@@ -91,7 +91,7 @@ public void run() throws OpenemsNamedException {
 		/*
 		 * Check that we are On-Grid (and warn on undefined Grid-Mode)
 		 */
-		GridMode gridMode = ess.getGridMode();
+		var gridMode = ess.getGridMode();
 		if (gridMode.isUndefined()) {
 			this.logWarn(this.log, "Grid-Mode is [UNDEFINED]");
 		}
@@ -106,7 +106,7 @@ public void run() throws OpenemsNamedException {
 		/*
 		 * Calculates required charge/discharge power
 		 */
-		int calculatedPower = this.calculateRequiredPower(ess, meter);
+		var calculatedPower = this.calculateRequiredPower(ess, meter);
 
 		/*
 		 * set result
diff --git a/io.openems.edge.controller.symmetric.balancing/test/io/openems/edge/controller/symmetric/balancing/MyConfig.java b/io.openems.edge.controller.symmetric.balancing/test/io/openems/edge/controller/symmetric/balancing/MyConfig.java
index 21785fb1d76..34cfe19279f 100644
--- a/io.openems.edge.controller.symmetric.balancing/test/io/openems/edge/controller/symmetric/balancing/MyConfig.java
+++ b/io.openems.edge.controller.symmetric.balancing/test/io/openems/edge/controller/symmetric/balancing/MyConfig.java
@@ -41,7 +41,7 @@ public MyConfig build() {
 
 	/**
 	 * Create a Config builder.
-	 * 
+	 *
 	 * @return a {@link Builder}
 	 */
 	public static Builder create() {
diff --git a/io.openems.edge.controller.symmetric.balancingschedule/src/io/openems/edge/controller/symmetric/balancingschedule/BalancingSchedule.java b/io.openems.edge.controller.symmetric.balancingschedule/src/io/openems/edge/controller/symmetric/balancingschedule/BalancingSchedule.java
index ca0df207fff..11c151ac808 100644
--- a/io.openems.edge.controller.symmetric.balancingschedule/src/io/openems/edge/controller/symmetric/balancingschedule/BalancingSchedule.java
+++ b/io.openems.edge.controller.symmetric.balancingschedule/src/io/openems/edge/controller/symmetric/balancingschedule/BalancingSchedule.java
@@ -38,7 +38,7 @@ public Doc doc() {
 
 	/**
 	 * Gets the Channel for {@link ChannelId#NO_ACTIVE_SETPOINT}.
-	 * 
+	 *
 	 * @return the Channel
 	 */
 	public default StateChannel getNoActiveSetpointChannel() {
@@ -47,7 +47,7 @@ public default StateChannel getNoActiveSetpointChannel() {
 
 	/**
 	 * Gets the Run-Failed State. See {@link ChannelId#NO_ACTIVE_SETPOINT}.
-	 * 
+	 *
 	 * @return the Channel {@link Value}
 	 */
 	public default Value<Boolean> getNoActiveSetpoint() {
@@ -57,7 +57,7 @@ public default Value<Boolean> getNoActiveSetpoint() {
 	/**
 	 * Internal method to set the 'nextValue' on
 	 * {@link ChannelId#NO_ACTIVE_SETPOINT} Channel.
-	 * 
+	 *
 	 * @param value the next value
 	 */
 	public default void _setNoActiveSetpoint(boolean value) {
@@ -66,7 +66,7 @@ public default void _setNoActiveSetpoint(boolean value) {
 
 	/**
 	 * Gets the Channel for {@link ChannelId#SCHEDULE_PARSE_FAILED}.
-	 * 
+	 *
 	 * @return the Channel
 	 */
 	public default StateChannel getScheduleParseFailedChannel() {
@@ -75,7 +75,7 @@ public default StateChannel getScheduleParseFailedChannel() {
 
 	/**
 	 * Gets the Run-Failed State. See {@link ChannelId#SCHEDULE_PARSE_FAILED}.
-	 * 
+	 *
 	 * @return the Channel {@link Value}
 	 */
 	public default Value<Boolean> getScheduleParseFailed() {
@@ -85,7 +85,7 @@ public default Value<Boolean> getScheduleParseFailed() {
 	/**
 	 * Internal method to set the 'nextValue' on
 	 * {@link ChannelId#SCHEDULE_PARSE_FAILED} Channel.
-	 * 
+	 *
 	 * @param value the next value
 	 */
 	public default void _setScheduleParseFailed(boolean value) {
@@ -124,7 +124,7 @@ public default void _setGridActivePowerSetPoint(Integer value) {
 	/**
 	 * Sets the Active Power Limit in [W]. See
 	 * {@link ChannelId#GRID_ACTIVE_POWER_SET_POINT}.
-	 * 
+	 *
 	 * @return the Channel
 	 * @throws OpenemsNamedException on error
 	 */
diff --git a/io.openems.edge.controller.symmetric.balancingschedule/src/io/openems/edge/controller/symmetric/balancingschedule/BalancingScheduleImpl.java b/io.openems.edge.controller.symmetric.balancingschedule/src/io/openems/edge/controller/symmetric/balancingschedule/BalancingScheduleImpl.java
index aeef3f37afd..7fef5623bf6 100644
--- a/io.openems.edge.controller.symmetric.balancingschedule/src/io/openems/edge/controller/symmetric/balancingschedule/BalancingScheduleImpl.java
+++ b/io.openems.edge.controller.symmetric.balancingschedule/src/io/openems/edge/controller/symmetric/balancingschedule/BalancingScheduleImpl.java
@@ -21,7 +21,6 @@
 import org.slf4j.LoggerFactory;
 
 import com.google.gson.JsonArray;
-import com.google.gson.JsonElement;
 import com.google.gson.JsonObject;
 
 import io.openems.common.exceptions.InvalidValueException;
@@ -38,7 +37,6 @@
 import io.openems.edge.common.component.ComponentManager;
 import io.openems.edge.common.component.OpenemsComponent;
 import io.openems.edge.common.jsonapi.JsonApi;
-import io.openems.edge.common.sum.GridMode;
 import io.openems.edge.common.user.User;
 import io.openems.edge.controller.api.Controller;
 import io.openems.edge.ess.api.ManagedSymmetricEss;
@@ -90,8 +88,8 @@ void activate(ComponentContext context, Config config) {
 		// parse Schedule
 		try {
 			if (!config.schedule().trim().isEmpty()) {
-				JsonElement scheduleElement = JsonUtils.parse(config.schedule());
-				JsonArray scheduleArray = JsonUtils.getAsJsonArray(scheduleElement);
+				var scheduleElement = JsonUtils.parse(config.schedule());
+				var scheduleArray = JsonUtils.getAsJsonArray(scheduleElement);
 				this.applySchedule(scheduleArray);
 			}
 			this._setScheduleParseFailed(false);
@@ -103,6 +101,7 @@ void activate(ComponentContext context, Config config) {
 		}
 	}
 
+	@Override
 	@Deactivate
 	protected void deactivate() {
 		super.deactivate();
@@ -110,7 +109,7 @@ protected void deactivate() {
 
 	/**
 	 * Calculates required charge/discharge power.
-	 * 
+	 *
 	 * @throws InvalidValueException on error
 	 */
 	private int calculateRequiredPower(int offset) throws InvalidValueException {
@@ -124,20 +123,19 @@ public void run() throws OpenemsNamedException {
 		/*
 		 * Get the current grid connection setpoint from the schedule
 		 */
-		Optional<Integer> gridConnSetPointOpt = this.getGridConnSetPoint();
+		var gridConnSetPointOpt = this.getGridConnSetPoint();
 		this._setGridActivePowerSetPoint(gridConnSetPointOpt.orElse(null));
-		if (gridConnSetPointOpt.isPresent()) {
-			this._setNoActiveSetpoint(false);
-		} else {
+		if (!gridConnSetPointOpt.isPresent()) {
 			this._setNoActiveSetpoint(true);
 			return;
 		}
+		this._setNoActiveSetpoint(false);
 		int gridConnSetPoint = gridConnSetPointOpt.get();
 
 		/*
 		 * Check that we are On-Grid (and warn on undefined Grid-Mode)
 		 */
-		GridMode gridMode = this.ess.getGridMode();
+		var gridMode = this.ess.getGridMode();
 		if (gridMode.isUndefined()) {
 			this.logWarn(this.log, "Grid-Mode is [UNDEFINED]");
 		}
@@ -152,7 +150,7 @@ public void run() throws OpenemsNamedException {
 		/*
 		 * Calculates required charge/discharge power
 		 */
-		int calculatedPower = this.calculateRequiredPower(gridConnSetPoint);
+		var calculatedPower = this.calculateRequiredPower(gridConnSetPoint);
 
 		/*
 		 * set result
@@ -178,7 +176,7 @@ public CompletableFuture<JsonrpcResponseSuccess> handleJsonrpcRequest(User user,
 
 	/**
 	 * Handles a SetGridConnScheduleRequest.
-	 * 
+	 *
 	 * @param user    the User
 	 * @param request the SetGridConnScheduleRequest
 	 * @return the Future JSON-RPC Response
@@ -192,7 +190,7 @@ private CompletableFuture<JsonrpcResponseSuccess> handleSetGridConnScheduleReque
 
 	/**
 	 * Parses the Schedule and applies it to this Controller.
-	 * 
+	 *
 	 * @param j the {@link JsonArray} with the Schedule
 	 * @throws OpenemsNamedException on error
 	 */
@@ -202,18 +200,18 @@ private void applySchedule(JsonArray j) throws OpenemsNamedException {
 
 	/**
 	 * Gets the currently valid GridConnSetPoint.
-	 * 
+	 *
 	 * @return the current setpoint.
 	 */
 	private Optional<Integer> getGridConnSetPoint() {
 		// Is the Grid Active-Power Set-Point currently overwritten using the channel?
-		Optional<Integer> setPointFromChannel = this.getGridActivePowerSetPointChannel().getNextWriteValueAndReset();
+		var setPointFromChannel = this.getGridActivePowerSetPointChannel().getNextWriteValueAndReset();
 		if (setPointFromChannel.isPresent()) {
 			// Yes -> use the channel value
 			return setPointFromChannel;
 		}
 		// No -> use the value from the Schedule
-		long now = ZonedDateTime.now(this.componentManager.getClock()).toEpochSecond();
+		var now = ZonedDateTime.now(this.componentManager.getClock()).toEpochSecond();
 		for (GridConnSchedule e : this.schedule) {
 			if (now >= e.getStartTimestamp() && now <= e.getStartTimestamp() + e.getDuration()) {
 				// -> this entry is valid!
diff --git a/io.openems.edge.controller.symmetric.balancingschedule/test/io/openems/edge/controller/symmetric/balancingschedule/BalancingScheduleImplTest.java b/io.openems.edge.controller.symmetric.balancingschedule/test/io/openems/edge/controller/symmetric/balancingschedule/BalancingScheduleImplTest.java
index 17e55fe3c5a..9dcfb402dbd 100644
--- a/io.openems.edge.controller.symmetric.balancingschedule/test/io/openems/edge/controller/symmetric/balancingschedule/BalancingScheduleImplTest.java
+++ b/io.openems.edge.controller.symmetric.balancingschedule/test/io/openems/edge/controller/symmetric/balancingschedule/BalancingScheduleImplTest.java
@@ -36,8 +36,8 @@ public class BalancingScheduleImplTest {
 
 	@Test
 	public void test() throws Exception {
-		final long start = 1577836800L;
-		final TimeLeapClock clock = new TimeLeapClock(
+		final var start = 1577836800L;
+		final var clock = new TimeLeapClock(
 				Instant.ofEpochSecond(start) /* starts at 1. January 2020 00:00:00 */, ZoneOffset.UTC);
 		new ControllerTest(new BalancingScheduleImpl()) //
 				.addReference("cm", new DummyConfigurationAdmin()) //
diff --git a/io.openems.edge.controller.symmetric.balancingschedule/test/io/openems/edge/controller/symmetric/balancingschedule/MyConfig.java b/io.openems.edge.controller.symmetric.balancingschedule/test/io/openems/edge/controller/symmetric/balancingschedule/MyConfig.java
index 09da1a00f06..92a6109265f 100644
--- a/io.openems.edge.controller.symmetric.balancingschedule/test/io/openems/edge/controller/symmetric/balancingschedule/MyConfig.java
+++ b/io.openems.edge.controller.symmetric.balancingschedule/test/io/openems/edge/controller/symmetric/balancingschedule/MyConfig.java
@@ -43,7 +43,7 @@ public MyConfig build() {
 
 	/**
 	 * Create a Config builder.
-	 * 
+	 *
 	 * @return a {@link Builder}
 	 */
 	public static Builder create() {
diff --git a/io.openems.edge.controller.symmetric.fixreactivepower/src/io/openems/edge/controller/symmetric/fixreactivepower/Config.java b/io.openems.edge.controller.symmetric.fixreactivepower/src/io/openems/edge/controller/symmetric/fixreactivepower/Config.java
index 8f1b2b3ed85..70f1f8d5d2c 100644
--- a/io.openems.edge.controller.symmetric.fixreactivepower/src/io/openems/edge/controller/symmetric/fixreactivepower/Config.java
+++ b/io.openems.edge.controller.symmetric.fixreactivepower/src/io/openems/edge/controller/symmetric/fixreactivepower/Config.java
@@ -1,7 +1,7 @@
 package io.openems.edge.controller.symmetric.fixreactivepower;
 
-import org.osgi.service.metatype.annotations.ObjectClassDefinition;
-import org.osgi.service.metatype.annotations.AttributeDefinition;;
+import org.osgi.service.metatype.annotations.AttributeDefinition;
+import org.osgi.service.metatype.annotations.ObjectClassDefinition;;
 
 @ObjectClassDefinition( //
 		name = "Controller Fix Reactive Power Symmetric", //
diff --git a/io.openems.edge.controller.symmetric.fixreactivepower/src/io/openems/edge/controller/symmetric/fixreactivepower/SymmetricFixReactivePower.java b/io.openems.edge.controller.symmetric.fixreactivepower/src/io/openems/edge/controller/symmetric/fixreactivepower/SymmetricFixReactivePower.java
index 2aed372268c..97238d8ab41 100644
--- a/io.openems.edge.controller.symmetric.fixreactivepower/src/io/openems/edge/controller/symmetric/fixreactivepower/SymmetricFixReactivePower.java
+++ b/io.openems.edge.controller.symmetric.fixreactivepower/src/io/openems/edge/controller/symmetric/fixreactivepower/SymmetricFixReactivePower.java
@@ -59,6 +59,7 @@ void activate(ComponentContext context, Config config) {
 		this.config = config;
 	}
 
+	@Override
 	@Deactivate
 	protected void deactivate() {
 		super.deactivate();
@@ -69,7 +70,8 @@ public void run() throws OpenemsNamedException {
 		ManagedSymmetricEss ess = this.componentManager.getComponent(this.config.ess_id());
 
 		// adjust value so that it fits into Min/MaxActivePower
-		int calculatedPower = ess.getPower().fitValueIntoMinMaxPower(this.id(), ess, Phase.ALL, Pwr.REACTIVE, this.config.power());
+		var calculatedPower = ess.getPower().fitValueIntoMinMaxPower(this.id(), ess, Phase.ALL, Pwr.REACTIVE,
+				this.config.power());
 
 		/*
 		 * set result
diff --git a/io.openems.edge.controller.symmetric.limitactivepower/src/io/openems/edge/controller/symmetric/limitactivepower/SymmetricLimitActivePower.java b/io.openems.edge.controller.symmetric.limitactivepower/src/io/openems/edge/controller/symmetric/limitactivepower/SymmetricLimitActivePower.java
index 78ab430a195..76091202494 100644
--- a/io.openems.edge.controller.symmetric.limitactivepower/src/io/openems/edge/controller/symmetric/limitactivepower/SymmetricLimitActivePower.java
+++ b/io.openems.edge.controller.symmetric.limitactivepower/src/io/openems/edge/controller/symmetric/limitactivepower/SymmetricLimitActivePower.java
@@ -30,13 +30,13 @@ public class SymmetricLimitActivePower extends AbstractOpenemsComponent implemen
 
 	/**
 	 * the configured Max Charge ActivePower
-	 * 
+	 *
 	 * value is zero or negative
 	 */
 	private int maxChargePower = 0;
 	/**
 	 * the configured Max Discharge ActivePower
-	 * 
+	 *
 	 * value is zero or positive
 	 */
 	private int maxDischargePower = 0;
@@ -71,6 +71,7 @@ void activate(ComponentContext context, Config config) {
 		this.maxDischargePower = config.maxDischargePower();
 	}
 
+	@Override
 	@Deactivate
 	protected void deactivate() {
 		super.deactivate();
@@ -81,12 +82,12 @@ public void run() throws OpenemsNamedException {
 		ManagedSymmetricEss ess = this.componentManager.getComponent(this.config.ess_id());
 
 		if (this.config.validatePowerConstraints()) {
-			
+
 			// adjust value so that it fits into Min/MaxActivePower
-			int maxPower = ess.getPower().getMaxPower(ess, Phase.ALL, Pwr.ACTIVE);
-			int minPower = ess.getPower().getMinPower(ess, Phase.ALL, Pwr.ACTIVE);
-			int calculatedMaxDischargePower = fitIntoMinMax(minPower, maxPower, this.maxDischargePower);
-			int calculatedMaxChargePower = fitIntoMinMax(minPower, maxPower, this.maxChargePower);
+			var maxPower = ess.getPower().getMaxPower(ess, Phase.ALL, Pwr.ACTIVE);
+			var minPower = ess.getPower().getMinPower(ess, Phase.ALL, Pwr.ACTIVE);
+			var calculatedMaxDischargePower = fitIntoMinMax(minPower, maxPower, this.maxDischargePower);
+			var calculatedMaxChargePower = fitIntoMinMax(minPower, maxPower, this.maxChargePower);
 
 			// set result
 			ess.addPowerConstraintAndValidate("SymmetricLimitActivePower", Phase.ALL, Pwr.ACTIVE,
diff --git a/io.openems.edge.controller.symmetric.peakshaving/src/io/openems/edge/controller/symmetric/peakshaving/PeakShaving.java b/io.openems.edge.controller.symmetric.peakshaving/src/io/openems/edge/controller/symmetric/peakshaving/PeakShaving.java
index 30a9da437d1..27ea5d733c7 100644
--- a/io.openems.edge.controller.symmetric.peakshaving/src/io/openems/edge/controller/symmetric/peakshaving/PeakShaving.java
+++ b/io.openems.edge.controller.symmetric.peakshaving/src/io/openems/edge/controller/symmetric/peakshaving/PeakShaving.java
@@ -15,7 +15,6 @@
 import io.openems.edge.common.component.AbstractOpenemsComponent;
 import io.openems.edge.common.component.ComponentManager;
 import io.openems.edge.common.component.OpenemsComponent;
-import io.openems.edge.common.sum.GridMode;
 import io.openems.edge.controller.api.Controller;
 import io.openems.edge.ess.api.ManagedSymmetricEss;
 import io.openems.edge.ess.power.api.Power;
@@ -69,6 +68,7 @@ void activate(ComponentContext context, Config config) {
 		this.config = config;
 	}
 
+	@Override
 	@Deactivate
 	protected void deactivate() {
 		super.deactivate();
@@ -82,7 +82,7 @@ public void run() throws OpenemsNamedException {
 		/*
 		 * Check that we are On-Grid (and warn on undefined Grid-Mode)
 		 */
-		GridMode gridMode = ess.getGridMode();
+		var gridMode = ess.getGridMode();
 		if (gridMode.isUndefined()) {
 			this.logWarn(this.log, "Grid-Mode is [UNDEFINED]");
 		}
@@ -95,7 +95,7 @@ public void run() throws OpenemsNamedException {
 		}
 
 		// Calculate 'real' grid-power (without current ESS charge/discharge)
-		int gridPower = meter.getActivePower().getOrError() /* current buy-from/sell-to grid */
+		var gridPower = meter.getActivePower().getOrError() /* current buy-from/sell-to grid */
 				+ ess.getActivePower().getOrError() /* current charge/discharge Ess */;
 
 		int calculatedPower;
diff --git a/io.openems.edge.controller.symmetric.peakshaving/test/io/openems/edge/controller/symmetric/peakshaving/MyConfig.java b/io.openems.edge.controller.symmetric.peakshaving/test/io/openems/edge/controller/symmetric/peakshaving/MyConfig.java
index 5e7b78c9afd..b74b7607f13 100644
--- a/io.openems.edge.controller.symmetric.peakshaving/test/io/openems/edge/controller/symmetric/peakshaving/MyConfig.java
+++ b/io.openems.edge.controller.symmetric.peakshaving/test/io/openems/edge/controller/symmetric/peakshaving/MyConfig.java
@@ -47,7 +47,7 @@ public MyConfig build() {
 
 	/**
 	 * Create a Config builder.
-	 * 
+	 *
 	 * @return a {@link Builder}
 	 */
 	public static Builder create() {
diff --git a/io.openems.edge.controller.symmetric.randompower/src/io/openems/edge/controller/symmetric/randompower/SymmetricRandomPower.java b/io.openems.edge.controller.symmetric.randompower/src/io/openems/edge/controller/symmetric/randompower/SymmetricRandomPower.java
index bcf3ac76c17..0982b741086 100644
--- a/io.openems.edge.controller.symmetric.randompower/src/io/openems/edge/controller/symmetric/randompower/SymmetricRandomPower.java
+++ b/io.openems.edge.controller.symmetric.randompower/src/io/openems/edge/controller/symmetric/randompower/SymmetricRandomPower.java
@@ -61,6 +61,7 @@ void activate(ComponentContext context, Config config) {
 		this.config = config;
 	}
 
+	@Override
 	@Deactivate
 	protected void deactivate() {
 		super.deactivate();
@@ -70,7 +71,7 @@ protected void deactivate() {
 	public void run() throws OpenemsNamedException {
 		ManagedSymmetricEss ess = this.componentManager.getComponent(this.config.ess_id());
 
-		int randomPower = ThreadLocalRandom.current().nextInt(this.config.minPower(), this.config.maxPower() + 1);
+		var randomPower = ThreadLocalRandom.current().nextInt(this.config.minPower(), this.config.maxPower() + 1);
 
 		// adjust value so that it fits into Min/MaxActivePower
 		randomPower = ess.getPower().fitValueIntoMinMaxPower(this.id(), ess, Phase.ALL, Pwr.ACTIVE, randomPower);
diff --git a/io.openems.edge.controller.symmetric.timeslotpeakshaving/src/io/openems/edge/controller/timeslotpeakshaving/ChargeState.java b/io.openems.edge.controller.symmetric.timeslotpeakshaving/src/io/openems/edge/controller/timeslotpeakshaving/ChargeState.java
index 7f784065947..b8ce8b201d0 100644
--- a/io.openems.edge.controller.symmetric.timeslotpeakshaving/src/io/openems/edge/controller/timeslotpeakshaving/ChargeState.java
+++ b/io.openems.edge.controller.symmetric.timeslotpeakshaving/src/io/openems/edge/controller/timeslotpeakshaving/ChargeState.java
@@ -35,12 +35,12 @@ private ChargeState(int value, String name) {
 
 	@Override
 	public int getValue() {
-		return value;
+		return this.value;
 	}
 
 	@Override
 	public String getName() {
-		return name;
+		return this.name;
 	}
 
 	@Override
diff --git a/io.openems.edge.controller.symmetric.timeslotpeakshaving/src/io/openems/edge/controller/timeslotpeakshaving/TimeslotPeakshaving.java b/io.openems.edge.controller.symmetric.timeslotpeakshaving/src/io/openems/edge/controller/timeslotpeakshaving/TimeslotPeakshaving.java
index 49b03180568..7e3e8d09c47 100644
--- a/io.openems.edge.controller.symmetric.timeslotpeakshaving/src/io/openems/edge/controller/timeslotpeakshaving/TimeslotPeakshaving.java
+++ b/io.openems.edge.controller.symmetric.timeslotpeakshaving/src/io/openems/edge/controller/timeslotpeakshaving/TimeslotPeakshaving.java
@@ -26,7 +26,6 @@
 import io.openems.edge.common.component.AbstractOpenemsComponent;
 import io.openems.edge.common.component.ComponentManager;
 import io.openems.edge.common.component.OpenemsComponent;
-import io.openems.edge.common.sum.GridMode;
 import io.openems.edge.controller.api.Controller;
 import io.openems.edge.ess.api.ManagedSymmetricEss;
 import io.openems.edge.ess.power.api.Phase;
@@ -95,6 +94,7 @@ void activate(ComponentContext context, Config config) throws OpenemsException {
 		super.activate(context, config.id(), config.alias(), config.enabled());
 	}
 
+	@Override
 	@Deactivate
 	protected void deactivate() {
 		super.deactivate();
@@ -105,13 +105,13 @@ public void run() throws OpenemsNamedException {
 		ManagedSymmetricEss ess = this.componentManager.getComponent(this.config.ess());
 		SymmetricMeter meter = this.componentManager.getComponent(this.config.meter_id());
 
-		Integer power = this.getPower(ess, meter);
+		var power = this.getPower(ess, meter);
 		this.applyPower(ess, power);
 	}
 
 	/**
 	 * Applies the power on the Ess.
-	 * 
+	 *
 	 * @param ess {@link ManagedSymmetricEss} where the power needs to be set
 	 * @throws OpenemsNamedException on error
 	 */
@@ -123,7 +123,7 @@ private void applyPower(ManagedSymmetricEss ess, Integer activePower) throws Ope
 
 	/**
 	 * Gets the current ActivePower.
-	 * 
+	 *
 	 * @return the currently valid active power, or null to set no power
 	 * @throws IllegalArgumentException on error
 	 * @throws OpenemsException         on error
@@ -131,7 +131,7 @@ private void applyPower(ManagedSymmetricEss ess, Integer activePower) throws Ope
 	private Integer getPower(ManagedSymmetricEss ess, SymmetricMeter meter)
 			throws OpenemsException, IllegalArgumentException {
 
-		LocalDateTime now = LocalDateTime.now(this.componentManager.getClock());
+		var now = LocalDateTime.now(this.componentManager.getClock());
 
 		boolean stateChanged;
 		Integer power = null;
@@ -141,38 +141,38 @@ private Integer getPower(ManagedSymmetricEss ess, SymmetricMeter meter)
 			switch (this.chargeState) {
 			case NORMAL:
 				if (this.isHighLoadTimeslot(now.plusMinutes(this.slowforceChargeMinutes))) {
-					stateChanged = changeState(ChargeState.SLOWCHARGE);
+					stateChanged = this.changeState(ChargeState.SLOWCHARGE);
 				}
 				if (this.isHighLoadTimeslot(now)) {
-					stateChanged = changeState(ChargeState.HIGHTHRESHOLD_TIMESLOT);
+					stateChanged = this.changeState(ChargeState.HIGHTHRESHOLD_TIMESLOT);
 				}
 
 				power = null;
 				break;
 			case SLOWCHARGE:
 				if (this.isHighLoadTimeslot(now)) {
-					stateChanged = changeState(ChargeState.HIGHTHRESHOLD_TIMESLOT);
+					stateChanged = this.changeState(ChargeState.HIGHTHRESHOLD_TIMESLOT);
 				}
 
-				int minPower = ess.getPower().getMinPower(ess, Phase.ALL, Pwr.ACTIVE);
+				var minPower = ess.getPower().getMinPower(ess, Phase.ALL, Pwr.ACTIVE);
 				if (ess.getSoc().orElse(0) == 100 || minPower >= 0) {
 					// no need to charge anymore, the soc would be 100 %
-					stateChanged = changeState(ChargeState.HYSTERESIS);
+					stateChanged = this.changeState(ChargeState.HYSTERESIS);
 				}
-				power = config.slowChargePower();
+				power = this.config.slowChargePower();
 				break;
 			case HYSTERESIS:
-				if (ess.getSoc().orElse(0) <= config.hysteresisSoc()) {
-					stateChanged = changeState(ChargeState.SLOWCHARGE);
+				if (ess.getSoc().orElse(0) <= this.config.hysteresisSoc()) {
+					stateChanged = this.changeState(ChargeState.SLOWCHARGE);
 				}
 				if (this.isHighLoadTimeslot(now)) {
-					stateChanged = changeState(ChargeState.HIGHTHRESHOLD_TIMESLOT);
+					stateChanged = this.changeState(ChargeState.HIGHTHRESHOLD_TIMESLOT);
 				}
 				power = null;
 				break;
 			case HIGHTHRESHOLD_TIMESLOT:
 				if (!this.isHighLoadTimeslot(now)) {
-					stateChanged = changeState(ChargeState.NORMAL);
+					stateChanged = this.changeState(ChargeState.NORMAL);
 				}
 
 				power = this.calculatePeakShavePower(ess, meter);
@@ -188,7 +188,7 @@ private Integer getPower(ManagedSymmetricEss ess, SymmetricMeter meter)
 
 	/**
 	 * A flag to maintain change in the state.
-	 * 
+	 *
 	 * @param nextState the target state
 	 * @return Flag that the state is changed or not
 	 */
@@ -196,15 +196,14 @@ private boolean changeState(ChargeState nextState) {
 		if (this.chargeState != nextState) {
 			this.chargeState = nextState;
 			return true;
-		} else {
-			return false;
 		}
+		return false;
 	}
 
 	/**
 	 * This method calculates the power that is required to cut the peak during
 	 * timeslot.
-	 * 
+	 *
 	 * @param ess   the {@link ManagedSymmetricEss}
 	 * @param meter the {@link SymmetricMeter} of the grid
 	 * @return activepower to be set on the ess
@@ -214,7 +213,7 @@ private int calculatePeakShavePower(ManagedSymmetricEss ess, SymmetricMeter mete
 		/*
 		 * Check that we are On-Grid (and warn on undefined Grid-Mode)
 		 */
-		GridMode gridMode = ess.getGridMode();
+		var gridMode = ess.getGridMode();
 		switch (gridMode) {
 		case UNDEFINED:
 			this.logWarn(this.log, "Grid-Mode is [UNDEFINED]");
@@ -226,21 +225,21 @@ private int calculatePeakShavePower(ManagedSymmetricEss ess, SymmetricMeter mete
 		}
 
 		// Calculate 'real' grid-power (without current ESS charge/discharge)
-		int gridPower = meter.getActivePower().getOrError() /* current buy-from/sell-to grid */
+		var gridPower = meter.getActivePower().getOrError() /* current buy-from/sell-to grid */
 				+ ess.getActivePower().getOrError() /* current charge/discharge Ess */;
 
 		int calculatedPower;
-		if (gridPower >= config.peakShavingPower()) {
+		if (gridPower >= this.config.peakShavingPower()) {
 			/*
 			 * Peak-Shaving
 			 */
-			calculatedPower = gridPower -= config.peakShavingPower();
+			calculatedPower = gridPower -= this.config.peakShavingPower();
 
-		} else if (gridPower <= config.rechargePower()) {
+		} else if (gridPower <= this.config.rechargePower()) {
 			/*
 			 * Recharge
 			 */
-			calculatedPower = gridPower -= config.rechargePower();
+			calculatedPower = gridPower -= this.config.rechargePower();
 
 		} else {
 			/*
@@ -254,7 +253,7 @@ private int calculatePeakShavePower(ManagedSymmetricEss ess, SymmetricMeter mete
 
 	/**
 	 * Is the current time in a high-load timeslot?.
-	 * 
+	 *
 	 * @param dateTime the datetime to be checked
 	 * @return boolean true if time is within timeslot
 	 * @throws OpenemsException on error
@@ -276,15 +275,15 @@ private boolean isHighLoadTimeslot(LocalDateTime dateTime) throws OpenemsExcepti
 
 	/**
 	 * Is "day" configured to run algorithm?.
-	 * 
+	 *
 	 * @param config the configuration
 	 * @return configuredDay boolean value specifying the day is set or not.
 	 */
 	private static boolean isConfiguredActiveDay(Config config) {
 
-		Calendar calendar = Calendar.getInstance();
-		int day = calendar.get(Calendar.DAY_OF_WEEK);
-		boolean configuredDay = false;
+		var calendar = Calendar.getInstance();
+		var day = calendar.get(Calendar.DAY_OF_WEEK);
+		var configuredDay = false;
 
 		switch (day) {
 		case Calendar.SUNDAY:
@@ -329,7 +328,7 @@ private static boolean isConfiguredActiveDay(Config config) {
 	/**
 	 * This method returns true if the Current date is within configured StartDate
 	 * and endDate.
-	 * 
+	 *
 	 * @param startDate the configured start date
 	 * @param endDate   the configured end date
 	 * @param dateTime  the date to be tested
@@ -337,64 +336,61 @@ private static boolean isConfiguredActiveDay(Config config) {
 	 *         configured date range
 	 */
 	protected static boolean isActiveDate(LocalDate startDate, LocalDate endDate, LocalDateTime dateTime) {
-		LocalDate date = dateTime.toLocalDate();
+		var date = dateTime.toLocalDate();
 		return !(date.isBefore(startDate) || date.isAfter(endDate));
 	}
 
 	/**
 	 * Is the time of 'dateTime' within startTime and endTime?.
-	 * 
+	 *
 	 * @param startTime the configured start time
 	 * @param endTime   the configured end time
 	 * @param dateTime  the time to be tested
 	 * @return
 	 */
 	protected static boolean isActiveTime(LocalTime startTime, LocalTime endTime, LocalDateTime dateTime) {
-		LocalTime time = dateTime.toLocalTime();
+		var time = dateTime.toLocalTime();
 		return !(time.isBefore(startTime) || time.isAfter(endTime));
 	}
 
 	/**
 	 * Converts a string to a LocalDate.
-	 * 
+	 *
 	 * @param date the date as a String
 	 * @return the converted date
 	 */
 	protected static LocalDate convertDate(String date) throws OpenemsException {
-		DateTimeFormatter dateTimeFormatter = DateTimeFormatter.ofPattern(DATE_FORMAT);
-		LocalDate localDate = LocalDate.parse(date, dateTimeFormatter);
-		return localDate;
+		var dateTimeFormatter = DateTimeFormatter.ofPattern(DATE_FORMAT);
+		return LocalDate.parse(date, dateTimeFormatter);
 	}
 
 	/**
 	 * Converts a string to a LocalTime.
-	 * 
+	 *
 	 * @param time the time as a string
 	 * @return the converted time
 	 */
 	protected static LocalTime convertTime(String time) throws OpenemsException {
-		DateTimeFormatter dateTimeFormatter = DateTimeFormatter.ofPattern(TIME_FORMAT);
-		LocalTime localDate = LocalTime.parse(time, dateTimeFormatter);
-		return localDate;
+		var dateTimeFormatter = DateTimeFormatter.ofPattern(TIME_FORMAT);
+		return LocalTime.parse(time, dateTimeFormatter);
 	}
 
 	/**
 	 * This methods calculates the slow charging minutes from slowStartTime and
 	 * startTime, this is the period for charging the battery to 100% and getting
 	 * ready for highthreshold period.
-	 * 
+	 *
 	 * @param slowStartTime start of slow charging the battery
 	 * @param startTime     start of the high threshold period
 	 * @return forceChargeMinutes in int, which specifies the total time the battery
 	 *         should be slowly charged
 	 */
 	private static int calculateSlowForceChargeMinutes(LocalTime slowStartTime, LocalTime startTime) {
-		int forceChargeTime = (int) ChronoUnit.MINUTES.between(slowStartTime, startTime);
+		var forceChargeTime = (int) ChronoUnit.MINUTES.between(slowStartTime, startTime);
 		if (forceChargeTime > 0) {
 			return forceChargeTime;
-		} else {
-			return forceChargeTime + 1440; // 1440 - total minutes in a day
 		}
+		return forceChargeTime + 1440; // 1440 - total minutes in a day
 	}
 
 }
\ No newline at end of file
diff --git a/io.openems.edge.controller.symmetric.timeslotpeakshaving/test/io/openems/edge/controller/timeslotpeakshaving/MyConfig.java b/io.openems.edge.controller.symmetric.timeslotpeakshaving/test/io/openems/edge/controller/timeslotpeakshaving/MyConfig.java
index 3f0f025216c..bce50f2b7b0 100644
--- a/io.openems.edge.controller.symmetric.timeslotpeakshaving/test/io/openems/edge/controller/timeslotpeakshaving/MyConfig.java
+++ b/io.openems.edge.controller.symmetric.timeslotpeakshaving/test/io/openems/edge/controller/timeslotpeakshaving/MyConfig.java
@@ -131,7 +131,7 @@ public MyConfig build() {
 
 	/**
 	 * Create a Config builder.
-	 * 
+	 *
 	 * @return a {@link Builder}
 	 */
 	public static Builder create() {
diff --git a/io.openems.edge.controller.symmetric.timeslotpeakshaving/test/io/openems/edge/controller/timeslotpeakshaving/TimeslotPeakshavingTest.java b/io.openems.edge.controller.symmetric.timeslotpeakshaving/test/io/openems/edge/controller/timeslotpeakshaving/TimeslotPeakshavingTest.java
index 81064fab6c3..c6e08558ee2 100644
--- a/io.openems.edge.controller.symmetric.timeslotpeakshaving/test/io/openems/edge/controller/timeslotpeakshaving/TimeslotPeakshavingTest.java
+++ b/io.openems.edge.controller.symmetric.timeslotpeakshaving/test/io/openems/edge/controller/timeslotpeakshaving/TimeslotPeakshavingTest.java
@@ -31,7 +31,7 @@ public class TimeslotPeakshavingTest {
 
 	@Test
 	public void test() throws Exception {
-		final TimeLeapClock clock = new TimeLeapClock(Instant.parse("2020-02-03T08:30:00.00Z"), ZoneOffset.UTC);
+		final var clock = new TimeLeapClock(Instant.parse("2020-02-03T08:30:00.00Z"), ZoneOffset.UTC);
 		new ControllerTest(new TimeslotPeakshaving()) //
 				.addReference("componentManager", new DummyComponentManager(clock)) //
 				.addComponent(new DummyManagedSymmetricEss(ESS_ID, new DummyPower(0.3, 0.3, 0.1)) //

From 704ee7aba06b8f502c0178d8244ab1e904a5381e Mon Sep 17 00:00:00 2001
From: Stefan Feilmeier <stefan.feilmeier@fenecon.de>
Date: Tue, 8 Mar 2022 06:28:32 +0100
Subject: [PATCH 53/96] Update io.openems.edge.core

---
 .../core/appmanager/AbstractOpenemsApp.java   |  21 +--
 .../edge/core/appmanager/AppAssistant.java    |   8 +-
 .../edge/core/appmanager/AppManager.java      |   1 +
 .../edge/core/appmanager/AppManagerImpl.java  |  27 ++-
 .../core/appmanager/AppValidateWorker.java    |  22 +--
 .../edge/core/appmanager/OpenemsApp.java      |  12 +-
 .../core/appmanager/OpenemsAppInstance.java   |   2 +-
 .../appmanager/jsonrpc/AddAppInstance.java    |  10 +-
 .../appmanager/jsonrpc/GetAppAssistant.java   |  14 +-
 .../appmanager/jsonrpc/GetAppInstances.java   |  10 +-
 .../edge/core/appmanager/jsonrpc/GetApps.java |  12 +-
 .../appmanager/jsonrpc/UpdateAppInstance.java |  10 +-
 .../ComponentManagerImpl.java                 |  69 ++++---
 .../ComponentManagerWorker.java               |   3 +-
 .../DefaultConfigurationWorker.java           |  47 +++--
 .../componentmanager/DictionaryUtils.java     |  12 +-
 .../componentmanager/EdgeConfigWorker.java    | 176 ++++++++----------
 .../edge/core/componentmanager/MapUtils.java  |   8 +-
 .../componentmanager/OsgiValidateWorker.java  |  89 +++++----
 .../OutOfMemoryHeapDumpWorker.java            |  10 +-
 .../jsonrpc/ChannelExportXlsxRequest.java     |  10 +-
 .../jsonrpc/ChannelExportXlsxResponse.java    |  28 ++-
 .../io/openems/edge/core/cycle/CycleImpl.java |  12 +-
 .../openems/edge/core/cycle/CycleWorker.java  |   8 +-
 .../edge/core/host/DiskSpaceWorker.java       |   5 +-
 .../io/openems/edge/core/host/HostImpl.java   |  21 ++-
 .../edge/core/host/NetworkConfiguration.java  |  10 +-
 .../core/host/NetworkConfigurationWorker.java |  14 +-
 .../edge/core/host/NetworkInterface.java      |  50 ++---
 .../edge/core/host/OperatingSystem.java       |   8 +-
 .../host/OperatingSystemDebianSystemd.java    |  63 +++----
 .../core/host/OperatingSystemWindows.java     |   4 +-
 .../edge/core/host/SystemUpdateHandler.java   |  91 +++++----
 .../core/host/UsbConfigurationWorker.java     |  14 +-
 .../jsonrpc/ExecuteSystemCommandRequest.java  |  29 ++-
 .../jsonrpc/ExecuteSystemCommandResponse.java |   8 +-
 .../jsonrpc/ExecuteSystemUpdateRequest.java   |   8 +-
 .../host/jsonrpc/GetNetworkConfigRequest.java |   4 +-
 .../jsonrpc/GetNetworkConfigResponse.java     |   4 +-
 .../jsonrpc/GetSystemUpdateStateRequest.java  |   4 +-
 .../jsonrpc/GetSystemUpdateStateResponse.java |  30 ++-
 .../host/jsonrpc/SetNetworkConfigRequest.java |  12 +-
 .../host/jsonrpc/SystemUpdateRequest.java     |   4 +-
 .../io/openems/edge/core/meta/MetaImpl.java   |   2 +-
 .../Get24HoursPredictionRequest.java          |  12 +-
 .../Get24HoursPredictionResponse.java         |  10 +-
 .../PredictorManagerImpl.java                 |  48 ++---
 .../edge/core/sum/EnergyValuesHandler.java    |  13 +-
 .../src/io/openems/edge/core/sum/SumImpl.java | 164 ++++++++--------
 .../src/io/openems/edge/core/user/Config.java |   2 +-
 .../edge/core/user/UserServiceImpl.java       |   7 +-
 .../ComponentManagerImplTest.java             |   2 +-
 .../edge/core/componentmanager/MyConfig.java  |   5 +-
 .../io/openems/edge/core/host/MyConfig.java   |   2 +-
 54 files changed, 610 insertions(+), 661 deletions(-)

diff --git a/io.openems.edge.core/src/io/openems/edge/core/appmanager/AbstractOpenemsApp.java b/io.openems.edge.core/src/io/openems/edge/core/appmanager/AbstractOpenemsApp.java
index 20c1ffbc541..eff668e8288 100644
--- a/io.openems.edge.core/src/io/openems/edge/core/appmanager/AbstractOpenemsApp.java
+++ b/io.openems.edge.core/src/io/openems/edge/core/appmanager/AbstractOpenemsApp.java
@@ -54,7 +54,7 @@ public AppConfiguration(List<Component> components, List<String> schedulerExecut
 
 	/**
 	 * Provides a factory for {@link AppConfiguration}s.
-	 * 
+	 *
 	 * @return a {@link Function} that creates a {@link AppConfiguration} from a
 	 *         JsonObject config.
 	 */
@@ -70,7 +70,7 @@ public void validate(JsonObject properties) throws OpenemsException {
 
 	/**
 	 * Validate the App configuration.
-	 * 
+	 *
 	 * @param jProperties a JsonObject holding the App properties
 	 * @return a list of validation errors. Empty list says 'no errors'
 	 */
@@ -93,7 +93,7 @@ private List<String> getValidationErrors(JsonObject jProperties) {
 
 	/**
 	 * Validates the execution order in the Scheduler.
-	 * 
+	 *
 	 * @param errors                   a collection of validation errors
 	 * @param actualEdgeConfig         the currently active {@link EdgeConfig}
 	 * @param expectedAppConfiguration the expected {@link AppConfiguration}
@@ -121,8 +121,7 @@ private void validateScheduler(ArrayList<String> errors, EdgeConfig actualEdgeCo
 		}
 
 		// Prepare Queue
-		var controllers = new LinkedList<String>();
-		controllers.addAll(expectedAppConfiguration.schedulerExecutionOrder);
+		var controllers = new LinkedList<String>(expectedAppConfiguration.schedulerExecutionOrder);
 		var nextControllerId = controllers.poll();
 
 		// Remove found Controllers from Queue in order
@@ -146,7 +145,7 @@ private void validateScheduler(ArrayList<String> errors, EdgeConfig actualEdgeCo
 
 	/**
 	 * Gets the {@link AppConfiguration} for the given properties.
-	 * 
+	 *
 	 * @param errors     a collection of validation errors
 	 * @param properties the configured App properties
 	 * @return the {@link AppConfiguration} or null
@@ -162,7 +161,7 @@ private AppConfiguration getAppConfiguration(ArrayList<String> errors, EnumMap<P
 
 	/**
 	 * Convert JsonObject with Properties to EnumMap.
-	 * 
+	 *
 	 * @param errors     a collection of validation errors
 	 * @param properties the configured App properties
 	 * @return a typed {@link EnumMap} of Properties
@@ -191,7 +190,7 @@ private EnumMap<PROPERTY, JsonElement> convertToEnumMap(ArrayList<String> errors
 
 	/**
 	 * Compare actual and expected Components.
-	 * 
+	 *
 	 * @param errors                   a collection of validation errors
 	 * @param actualEdgeConfig         the currently active {@link EdgeConfig}
 	 * @param expectedAppConfiguration the expected {@link AppConfiguration}
@@ -221,8 +220,8 @@ private void validateComponentConfigurations(ArrayList<String> errors, EdgeConfi
 			}
 
 			for (Entry<String, JsonElement> entry : expectedComponent.getProperties().entrySet()) {
-				String key = entry.getKey();
-				JsonElement expectedProperty = entry.getValue();
+				var key = entry.getKey();
+				var expectedProperty = entry.getValue();
 				JsonElement actualProperty;
 				try {
 					actualProperty = actualComponent.getPropertyOrError(key);
@@ -255,7 +254,7 @@ private void validateComponentConfigurations(ArrayList<String> errors, EdgeConfi
 
 	/**
 	 * Validates if the 'actual' matches the 'expected' value.
-	 * 
+	 *
 	 * @param expected the expected value
 	 * @param actual   the actual value
 	 * @return true if they match
diff --git a/io.openems.edge.core/src/io/openems/edge/core/appmanager/AppAssistant.java b/io.openems.edge.core/src/io/openems/edge/core/appmanager/AppAssistant.java
index e8ee1f887ca..b892ebb3b43 100644
--- a/io.openems.edge.core/src/io/openems/edge/core/appmanager/AppAssistant.java
+++ b/io.openems.edge.core/src/io/openems/edge/core/appmanager/AppAssistant.java
@@ -9,7 +9,7 @@ public class AppAssistant {
 
 	/**
 	 * Creates an {@link AppAssistant} using a Builder.
-	 * 
+	 *
 	 * @return the {@link Builder}
 	 */
 	public static Builder create() {
@@ -28,7 +28,7 @@ protected Builder() {
 
 		/**
 		 * Sets the Fields.
-		 * 
+		 *
 		 * @param fields the fields
 		 * @return the {@link Builder}
 		 */
@@ -39,7 +39,7 @@ public Builder fields(JsonArray fields) {
 
 		/**
 		 * Return the built {@link JsonArray}.
-		 * 
+		 *
 		 * @return the {@link JsonArray}
 		 */
 		public AppAssistant build() {
@@ -56,7 +56,7 @@ private AppAssistant(JsonArray fields) {
 
 	/**
 	 * Gets this {@link AppAssistant} as {@link JsonObject}.
-	 * 
+	 *
 	 * @return the {@link JsonObject}
 	 */
 	public JsonObject toJsonObject() {
diff --git a/io.openems.edge.core/src/io/openems/edge/core/appmanager/AppManager.java b/io.openems.edge.core/src/io/openems/edge/core/appmanager/AppManager.java
index c2e56989b5b..24b5a8aa086 100644
--- a/io.openems.edge.core/src/io/openems/edge/core/appmanager/AppManager.java
+++ b/io.openems.edge.core/src/io/openems/edge/core/appmanager/AppManager.java
@@ -29,6 +29,7 @@ private ChannelId(Doc doc) {
 			this.doc = doc;
 		}
 
+		@Override
 		public Doc doc() {
 			return this.doc;
 		}
diff --git a/io.openems.edge.core/src/io/openems/edge/core/appmanager/AppManagerImpl.java b/io.openems.edge.core/src/io/openems/edge/core/appmanager/AppManagerImpl.java
index 4085a568988..e350a0ade47 100644
--- a/io.openems.edge.core/src/io/openems/edge/core/appmanager/AppManagerImpl.java
+++ b/io.openems.edge.core/src/io/openems/edge/core/appmanager/AppManagerImpl.java
@@ -4,14 +4,12 @@
 import java.time.LocalDateTime;
 import java.time.temporal.ChronoUnit;
 import java.util.ArrayList;
-import java.util.Dictionary;
 import java.util.Hashtable;
 import java.util.List;
 import java.util.UUID;
 import java.util.concurrent.CompletableFuture;
 import java.util.stream.Collectors;
 
-import org.osgi.service.cm.Configuration;
 import org.osgi.service.cm.ConfigurationAdmin;
 import org.osgi.service.cm.ConfigurationEvent;
 import org.osgi.service.cm.ConfigurationListener;
@@ -96,7 +94,7 @@ private void modified(ComponentContext componentContext, Config config) throws O
 	}
 
 	private synchronized void applyConfig(Config config) {
-		String apps = config.apps();
+		var apps = config.apps();
 		if (apps.isBlank()) {
 			apps = "[]"; // default to empty array
 		}
@@ -111,6 +109,7 @@ private synchronized void applyConfig(Config config) {
 		}
 	}
 
+	@Override
 	@Deactivate
 	protected void deactivate() {
 		super.deactivate();
@@ -119,7 +118,7 @@ protected void deactivate() {
 
 	/**
 	 * Parses the configured apps to a List of {@link OpenemsAppInstance}s.
-	 * 
+	 *
 	 * @param apps the app configuration from Config.json as {@link JsonArray}
 	 * @return List of {@link OpenemsAppInstance}s
 	 * @throws OpenemsNamedException on parse error
@@ -175,7 +174,7 @@ public CompletableFuture<? extends JsonrpcResponseSuccess> handleJsonrpcRequest(
 
 	/**
 	 * Handles a {@link GetAppsRequest}.
-	 * 
+	 *
 	 * @param user    the User
 	 * @param request the {@link GetAppsRequest}
 	 * @return the Future JSON-RPC Response
@@ -189,7 +188,7 @@ private CompletableFuture<JsonrpcResponseSuccess> handleGetAppsRequest(User user
 
 	/**
 	 * Handles {@link GetAppAssistant}.
-	 * 
+	 *
 	 * @param user    the User
 	 * @param request the {@link GetAppAssistant} Request
 	 * @return the Future JSON-RPC Response
@@ -208,7 +207,7 @@ private CompletableFuture<JsonrpcResponseSuccess> handleGetAppAssistantRequest(U
 
 	/**
 	 * Handles {@link GetAppInstances}.
-	 * 
+	 *
 	 * @param user    the User
 	 * @param request the {@link GetAppInstances} Request
 	 * @return the Future JSON-RPC Response
@@ -224,7 +223,7 @@ private CompletableFuture<JsonrpcResponseSuccess> handleGetAppInstancesRequest(U
 
 	/**
 	 * Handles {@link AddAppInstance}.
-	 * 
+	 *
 	 * @param user    the User
 	 * @param request the {@link AddAppInstance} Request
 	 * @return the Future JSON-RPC Response
@@ -233,7 +232,7 @@ private CompletableFuture<JsonrpcResponseSuccess> handleGetAppInstancesRequest(U
 	private CompletableFuture<JsonrpcResponseSuccess> handleAddAppInstanceRequest(User user,
 			AddAppInstance.Request request) throws OpenemsNamedException {
 		// Create new list of Apps
-		final var newApps = new ArrayList<OpenemsAppInstance>(this.instantiatedApps);
+		final var newApps = new ArrayList<>(this.instantiatedApps);
 		var instanceId = UUID.randomUUID();
 		var app = new OpenemsAppInstance(request.appId, instanceId, request.properties);
 		newApps.add(app);
@@ -251,7 +250,7 @@ private CompletableFuture<JsonrpcResponseSuccess> handleAddAppInstanceRequest(Us
 
 	/**
 	 * Handles {@link UpdateAppInstance}.
-	 * 
+	 *
 	 * @param user    the User
 	 * @param request the {@link UpdateAppInstance} Request
 	 * @return the Future JSON-RPC Response
@@ -293,15 +292,15 @@ private CompletableFuture<JsonrpcResponseSuccess> handleUpdateAppInstanceRequest
 
 	/**
 	 * Reconfigure myself to persist the actual App configuration.
-	 * 
+	 *
 	 * @param user the executing user
 	 * @param apps a list of {@link OpenemsAppInstance}s
 	 * @throws IOException on error
 	 */
 	private void updateAppManagerConfiguration(User user, List<OpenemsAppInstance> apps) throws IOException {
-		String factoryPid = this.serviceFactoryPid();
-		final Configuration config = this.cm.getConfiguration(factoryPid, null);
-		Dictionary<String, Object> properties = config.getProperties();
+		var factoryPid = this.serviceFactoryPid();
+		final var config = this.cm.getConfiguration(factoryPid, null);
+		var properties = config.getProperties();
 		if (properties == null) {
 			// No configuration existing yet -> create new configuration
 			properties = new Hashtable<>();
diff --git a/io.openems.edge.core/src/io/openems/edge/core/appmanager/AppValidateWorker.java b/io.openems.edge.core/src/io/openems/edge/core/appmanager/AppValidateWorker.java
index 1f19b3cc12c..d7e62c23e7c 100644
--- a/io.openems.edge.core/src/io/openems/edge/core/appmanager/AppValidateWorker.java
+++ b/io.openems.edge.core/src/io/openems/edge/core/appmanager/AppValidateWorker.java
@@ -14,7 +14,7 @@
 
 /**
  * This Worker constantly validates:.
- * 
+ *
  * <ul>
  * <li>that all enabled OpenEMS Apps are properly configured, including required
  * OpenEMS Components, IP addresses, Scheduler settings, etc.
@@ -26,7 +26,7 @@ public class AppValidateWorker extends AbstractWorker {
 	 * For INITIAL_CYCLES cycles the distance between two checks is
 	 * INITIAL_CYCLE_TIME, afterwards the check runs every REGULAR_CYCLE_TIME
 	 * milliseconds.
-	 * 
+	 *
 	 * Why? In the beginning it takes a while till all components are up and
 	 * running. So it is likely, that in the beginning not all are immediately
 	 * running.
@@ -55,7 +55,7 @@ protected void forever() {
 
 	/**
 	 * Validates all Apps.
-	 * 
+	 *
 	 * <p>
 	 * 'protected' so that it can be used in a JUnit test.
 	 */
@@ -71,16 +71,16 @@ protected void validateApps() {
 
 	/**
 	 * Validates all Apps.
-	 * 
+	 *
 	 * <p>
 	 * 'protected' so that it can be used in a JUnit test.
-	 * 
+	 *
 	 * @param app        the {@link OpenemsApp}
 	 * @param properties the App properties
 	 */
 	protected void validateApp(OpenemsApp app, JsonObject properties) {
 		// Found correct OpenemsApp -> validate
-		String key = app.getName();
+		var key = app.getName();
 		try {
 			app.validate(properties);
 
@@ -97,14 +97,13 @@ protected int getCycleTime() {
 		if (this.cycleCountDown > 0) {
 			this.cycleCountDown--;
 			return AppValidateWorker.INITIAL_CYCLE_TIME;
-		} else {
-			return AppValidateWorker.REGULAR_CYCLE_TIME;
 		}
+		return AppValidateWorker.REGULAR_CYCLE_TIME;
 	}
 
 	/**
 	 * Called by {@link ConfigurationListener}.
-	 * 
+	 *
 	 * @param event a {@link ConfigurationEvent}
 	 */
 	protected void configurationEvent(ConfigurationEvent event) {
@@ -121,7 +120,7 @@ public void triggerNextRun() {
 
 	/**
 	 * Called by parent debugLog.
-	 * 
+	 *
 	 * @return a debug log String or null
 	 */
 	protected String debugLog() {
@@ -132,9 +131,8 @@ protected String debugLog() {
 		if (defectiveApps.isEmpty()) {
 			return null;
 
-		} else {
-			return defectiveApps;
 		}
+		return defectiveApps;
 	}
 
 }
diff --git a/io.openems.edge.core/src/io/openems/edge/core/appmanager/OpenemsApp.java b/io.openems.edge.core/src/io/openems/edge/core/appmanager/OpenemsApp.java
index e23a00d06f8..e483fe7b3e7 100644
--- a/io.openems.edge.core/src/io/openems/edge/core/appmanager/OpenemsApp.java
+++ b/io.openems.edge.core/src/io/openems/edge/core/appmanager/OpenemsApp.java
@@ -10,14 +10,14 @@ public interface OpenemsApp {
 
 	/**
 	 * Gets the {@link OpenemsAppCategory} of the {@link OpenemsApp}.
-	 * 
+	 *
 	 * @return the category
 	 */
 	public OpenemsAppCategory getCategory();
 
 	/**
 	 * Gets the unique App-ID of the {@link OpenemsApp}.
-	 * 
+	 *
 	 * @return a unique PID, usually the {@link ComponentConstants#COMPONENT_NAME}
 	 *         of the OSGi Component provider.
 	 */
@@ -25,28 +25,28 @@ public interface OpenemsApp {
 
 	/**
 	 * Gets the name of the {@link OpenemsApp}.
-	 * 
+	 *
 	 * @return a human readable name
 	 */
 	public String getName();
 
 	/**
 	 * Gets the image of the {@link OpenemsApp} in Base64 encoding.
-	 * 
+	 *
 	 * @return a human readable name
 	 */
 	public String getImage();
 
 	/**
 	 * Validate the {@link OpenemsApp}.
-	 * 
+	 *
 	 * @param config the configured app 'properties'
 	 */
 	public void validate(JsonObject config) throws OpenemsNamedException;
 
 	/**
 	 * Gets the {@link AppAssistant} for this {@link OpenemsApp}.
-	 * 
+	 *
 	 * @return the AppAssistant
 	 */
 	public AppAssistant getAppAssistant();
diff --git a/io.openems.edge.core/src/io/openems/edge/core/appmanager/OpenemsAppInstance.java b/io.openems.edge.core/src/io/openems/edge/core/appmanager/OpenemsAppInstance.java
index 076287153a5..81188e91544 100644
--- a/io.openems.edge.core/src/io/openems/edge/core/appmanager/OpenemsAppInstance.java
+++ b/io.openems.edge.core/src/io/openems/edge/core/appmanager/OpenemsAppInstance.java
@@ -24,7 +24,7 @@ public OpenemsAppInstance(String appId, UUID instanceId, JsonObject properties)
 
 	/**
 	 * Gets this {@link OpenemsAppInstance} as {@link JsonObject}.
-	 * 
+	 *
 	 * @return the {@link JsonObject}
 	 */
 	public JsonObject toJsonObject() {
diff --git a/io.openems.edge.core/src/io/openems/edge/core/appmanager/jsonrpc/AddAppInstance.java b/io.openems.edge.core/src/io/openems/edge/core/appmanager/jsonrpc/AddAppInstance.java
index 2961b603646..6107e5b8b65 100644
--- a/io.openems.edge.core/src/io/openems/edge/core/appmanager/jsonrpc/AddAppInstance.java
+++ b/io.openems.edge.core/src/io/openems/edge/core/appmanager/jsonrpc/AddAppInstance.java
@@ -12,10 +12,10 @@
 
 /**
  * Adds an {@link OpenemsAppInstance}.
- * 
+ *
  * <p>
  * Request:
- * 
+ *
  * <pre>
  * {
  *   "jsonrpc": "2.0",
@@ -27,10 +27,10 @@
  *   }
  * }
  * </pre>
- * 
+ *
  * <p>
  * Response:
- * 
+ *
  * <pre>
  * {
  *   "jsonrpc": "2.0",
@@ -49,7 +49,7 @@ public static class Request extends JsonrpcRequest {
 
 		/**
 		 * Parses a generic {@link JsonrpcRequest} to a {@link AddAppInstance}.
-		 * 
+		 *
 		 * @param r the {@link JsonrpcRequest}
 		 * @return the {@link AddAppInstance} Request
 		 * @throws OpenemsNamedException on error
diff --git a/io.openems.edge.core/src/io/openems/edge/core/appmanager/jsonrpc/GetAppAssistant.java b/io.openems.edge.core/src/io/openems/edge/core/appmanager/jsonrpc/GetAppAssistant.java
index 90cfd0a6226..324775e6684 100644
--- a/io.openems.edge.core/src/io/openems/edge/core/appmanager/jsonrpc/GetAppAssistant.java
+++ b/io.openems.edge.core/src/io/openems/edge/core/appmanager/jsonrpc/GetAppAssistant.java
@@ -13,10 +13,10 @@
 
 /**
  * Gets the App-Assistant for a {@link OpenemsApp}.
- * 
+ *
  * <p>
  * Request:
- * 
+ *
  * <pre>
  * {
  *   "jsonrpc": "2.0",
@@ -27,10 +27,10 @@
  *   }
  * }
  * </pre>
- * 
+ *
  * <p>
  * Response:
- * 
+ *
  * <pre>
  * {
  *   "jsonrpc": "2.0",
@@ -49,14 +49,14 @@ public static class Request extends JsonrpcRequest {
 
 		/**
 		 * Parses a generic {@link JsonrpcRequest} to a {@link GetAppAssistantRequest}.
-		 * 
+		 *
 		 * @param r the {@link JsonrpcRequest}
 		 * @return the {@link GetAppAssistantRequest}
 		 * @throws OpenemsNamedException on error
 		 */
 		public static Request from(JsonrpcRequest r) throws OpenemsNamedException {
-			JsonObject p = r.getParams();
-			String appId = JsonUtils.getAsString(p, "appId");
+			var p = r.getParams();
+			var appId = JsonUtils.getAsString(p, "appId");
 			return new Request(r, appId);
 		}
 
diff --git a/io.openems.edge.core/src/io/openems/edge/core/appmanager/jsonrpc/GetAppInstances.java b/io.openems.edge.core/src/io/openems/edge/core/appmanager/jsonrpc/GetAppInstances.java
index 3bd7ad1cbba..213be8d239a 100644
--- a/io.openems.edge.core/src/io/openems/edge/core/appmanager/jsonrpc/GetAppInstances.java
+++ b/io.openems.edge.core/src/io/openems/edge/core/appmanager/jsonrpc/GetAppInstances.java
@@ -15,10 +15,10 @@
 
 /**
  * Gets the active instances of an {@link OpenemsApp}.
- * 
+ *
  * <p>
  * Request:
- * 
+ *
  * <pre>
  * {
  *   "jsonrpc": "2.0",
@@ -29,10 +29,10 @@
  *   }
  * }
  * </pre>
- * 
+ *
  * <p>
  * Response:
- * 
+ *
  * <pre>
  * {
  *   "jsonrpc": "2.0",
@@ -51,7 +51,7 @@ public static class Request extends JsonrpcRequest {
 
 		/**
 		 * Parses a generic {@link JsonrpcRequest} to a {@link GetAppInstances}.
-		 * 
+		 *
 		 * @param r the {@link JsonrpcRequest}
 		 * @return the {@link GetAppInstances}
 		 * @throws OpenemsNamedException on error
diff --git a/io.openems.edge.core/src/io/openems/edge/core/appmanager/jsonrpc/GetApps.java b/io.openems.edge.core/src/io/openems/edge/core/appmanager/jsonrpc/GetApps.java
index 12c1450e512..61e426a793a 100644
--- a/io.openems.edge.core/src/io/openems/edge/core/appmanager/jsonrpc/GetApps.java
+++ b/io.openems.edge.core/src/io/openems/edge/core/appmanager/jsonrpc/GetApps.java
@@ -16,10 +16,10 @@
 
 /**
  * Gets the available {@link OpenemsApp}s.
- * 
+ *
  * <p>
  * Request:
- * 
+ *
  * <pre>
  * {
  *   "jsonrpc": "2.0",
@@ -28,10 +28,10 @@
  *   "params": {}
  * }
  * </pre>
- * 
+ *
  * <p>
  * Response:
- * 
+ *
  * <pre>
  * {
  *   "jsonrpc": "2.0",
@@ -41,7 +41,7 @@
  *       "category": string (OpenemsAppCategory enum),
  *       "appId": string,
  *       "name": string,
- *       "image": string (base64), 
+ *       "image": string (base64),
  *       "instanceIds": UUID[],
  *     }]
  *   }
@@ -57,7 +57,7 @@ public static class Request extends JsonrpcRequest {
 
 		/**
 		 * Parses a generic {@link JsonrpcRequest} to a {@link Request}.
-		 * 
+		 *
 		 * @param r the {@link JsonrpcRequest}
 		 * @return the {@link GetAppsRequest}
 		 * @throws OpenemsNamedException on error
diff --git a/io.openems.edge.core/src/io/openems/edge/core/appmanager/jsonrpc/UpdateAppInstance.java b/io.openems.edge.core/src/io/openems/edge/core/appmanager/jsonrpc/UpdateAppInstance.java
index ab1d10fde3e..b598df044c0 100644
--- a/io.openems.edge.core/src/io/openems/edge/core/appmanager/jsonrpc/UpdateAppInstance.java
+++ b/io.openems.edge.core/src/io/openems/edge/core/appmanager/jsonrpc/UpdateAppInstance.java
@@ -11,10 +11,10 @@
 
 /**
  * Updates an {@link OpenemsAppInstance}..
- * 
+ *
  * <p>
  * Request:
- * 
+ *
  * <pre>
  * {
  *   "jsonrpc": "2.0",
@@ -26,10 +26,10 @@
  *   }
  * }
  * </pre>
- * 
+ *
  * <p>
  * Response:
- * 
+ *
  * <pre>
  * {
  *   "jsonrpc": "2.0",
@@ -46,7 +46,7 @@ public static class Request extends JsonrpcRequest {
 
 		/**
 		 * Parses a generic {@link JsonrpcRequest} to a {@link UpdateAppInstance}.
-		 * 
+		 *
 		 * @param r the {@link JsonrpcRequest}
 		 * @return the {@link UpdateAppInstance}
 		 * @throws OpenemsNamedException on error
diff --git a/io.openems.edge.core/src/io/openems/edge/core/componentmanager/ComponentManagerImpl.java b/io.openems.edge.core/src/io/openems/edge/core/componentmanager/ComponentManagerImpl.java
index b527c9a261c..e2eaac7b5f8 100644
--- a/io.openems.edge.core/src/io/openems/edge/core/componentmanager/ComponentManagerImpl.java
+++ b/io.openems.edge.core/src/io/openems/edge/core/componentmanager/ComponentManagerImpl.java
@@ -7,10 +7,8 @@
 import java.util.ArrayList;
 import java.util.Collections;
 import java.util.Dictionary;
-import java.util.Enumeration;
 import java.util.Hashtable;
 import java.util.List;
-import java.util.Optional;
 import java.util.concurrent.CompletableFuture;
 import java.util.concurrent.CopyOnWriteArrayList;
 
@@ -34,7 +32,6 @@
 import org.osgi.service.metatype.annotations.Designate;
 import org.slf4j.Logger;
 
-import com.google.gson.JsonElement;
 import com.google.gson.JsonNull;
 
 import io.openems.common.OpenemsConstants;
@@ -52,7 +49,6 @@
 import io.openems.common.jsonrpc.response.GetEdgeConfigResponse;
 import io.openems.common.session.Role;
 import io.openems.common.types.EdgeConfig;
-import io.openems.common.types.EdgeConfig.Factory;
 import io.openems.common.utils.JsonUtils;
 import io.openems.edge.common.component.AbstractOpenemsComponent;
 import io.openems.edge.common.component.ClockProvider;
@@ -130,6 +126,7 @@ void activate(ComponentContext componentContext, BundleContext bundleContext) th
 		}
 	}
 
+	@Override
 	@Deactivate
 	protected void deactivate() {
 		super.deactivate();
@@ -163,18 +160,17 @@ public List<OpenemsComponent> getAllComponents() {
 
 	@Override
 	public String debugLog() {
-		final List<String> logs = new ArrayList<String>();
+		final List<String> logs = new ArrayList<>();
 		for (ComponentManagerWorker worker : this.workers) {
-			String message = worker.debugLog();
+			var message = worker.debugLog();
 			if (message != null) {
 				logs.add(message);
 			}
 		}
 		if (logs.isEmpty()) {
 			return null;
-		} else {
-			return String.join("|", logs);
 		}
+		return String.join("|", logs);
 	}
 
 	@Override
@@ -221,7 +217,7 @@ public CompletableFuture<JsonrpcResponseSuccess> handleJsonrpcRequest(User user,
 
 	/**
 	 * Handles a {@link GetEdgeConfigRequest}.
-	 * 
+	 *
 	 * @param user    the {@link User}
 	 * @param request the {@link GetEdgeConfigRequest}
 	 * @return the Future JSON-RPC Response
@@ -229,14 +225,14 @@ public CompletableFuture<JsonrpcResponseSuccess> handleJsonrpcRequest(User user,
 	 */
 	private CompletableFuture<JsonrpcResponseSuccess> handleGetEdgeConfigRequest(User user,
 			GetEdgeConfigRequest request) throws OpenemsNamedException {
-		EdgeConfig config = this.getEdgeConfig();
-		GetEdgeConfigResponse response = new GetEdgeConfigResponse(request.getId(), config);
+		var config = this.getEdgeConfig();
+		var response = new GetEdgeConfigResponse(request.getId(), config);
 		return CompletableFuture.completedFuture(response);
 	}
 
 	/**
 	 * Handles a {@link CreateComponentConfigRequest}.
-	 * 
+	 *
 	 * @param user    the {@link User}
 	 * @param request the {@link CreateComponentConfigRequest}
 	 * @return the Future JSON-RPC Response
@@ -292,7 +288,7 @@ protected CompletableFuture<JsonrpcResponseSuccess> handleCreateComponentConfigR
 		// Create map with configuration attributes
 		Dictionary<String, Object> properties = new Hashtable<>();
 		for (Property property : request.getProperties()) {
-			Object value = JsonUtils.getAsBestType(property.getValue());
+			var value = JsonUtils.getAsBestType(property.getValue());
 			if (value instanceof Object[] && ((Object[]) value).length == 0) {
 				value = new String[0];
 			}
@@ -312,7 +308,7 @@ protected CompletableFuture<JsonrpcResponseSuccess> handleCreateComponentConfigR
 
 	/**
 	 * Handles a {@link UpdateComponentConfigRequest}.
-	 * 
+	 *
 	 * @param user    the {@link User}
 	 * @param request the {@link UpdateComponentConfigRequest}
 	 * @return the Future JSON-RPC Response
@@ -320,18 +316,18 @@ protected CompletableFuture<JsonrpcResponseSuccess> handleCreateComponentConfigR
 	 */
 	protected CompletableFuture<JsonrpcResponseSuccess> handleUpdateComponentConfigRequest(User user,
 			UpdateComponentConfigRequest request) throws OpenemsNamedException {
-		Configuration config = this.getExistingConfigForId(request.getComponentId());
+		var config = this.getExistingConfigForId(request.getComponentId());
 
 		// Create map with changed configuration attributes
-		Dictionary<String, Object> properties = config.getProperties();
+		var properties = config.getProperties();
 		if (properties == null) {
 			throw OpenemsError.EDGE_UNABLE_TO_APPLY_CONFIG.exception(request.getComponentId(),
 					config.getPid() + ": Properties is 'null'");
 		}
 
 		// Reset all target properties to avoid missing old references
-		for (Enumeration<String> k = properties.keys(); k.hasMoreElements();) {
-			String property = k.nextElement();
+		for (var k = properties.keys(); k.hasMoreElements();) {
+			var property = k.nextElement();
 			if (property.endsWith(".target")) {
 				properties.put(property, "(enabled=true)");
 			}
@@ -340,13 +336,13 @@ protected CompletableFuture<JsonrpcResponseSuccess> handleUpdateComponentConfigR
 		for (Property property : request.getProperties()) {
 			// do not allow certain properties to be updated, like pid and service.pid
 			if (!EdgeConfig.ignorePropertyKey(property.getName())) {
-				JsonElement jValue = property.getValue();
+				var jValue = property.getValue();
 				if (jValue == null || jValue == JsonNull.INSTANCE) {
 					// Remove NULL property
 					properties.remove(property.getName());
 				} else {
 					// Add updated Property
-					Object value = JsonUtils.getAsBestType(property.getValue());
+					var value = JsonUtils.getAsBestType(property.getValue());
 					if (value instanceof Object[] && ((Object[]) value).length == 0) {
 						value = new String[0];
 					}
@@ -368,7 +364,7 @@ protected CompletableFuture<JsonrpcResponseSuccess> handleUpdateComponentConfigR
 
 	/**
 	 * Handles a {@link DeleteComponentConfigRequest}.
-	 * 
+	 *
 	 * @param user    the {@link User}
 	 * @param request the {@link DeleteComponentConfigRequest}
 	 * @return the Future JSON-RPC Response
@@ -376,7 +372,7 @@ protected CompletableFuture<JsonrpcResponseSuccess> handleUpdateComponentConfigR
 	 */
 	protected CompletableFuture<JsonrpcResponseSuccess> handleDeleteComponentConfigRequest(User user,
 			DeleteComponentConfigRequest request) throws OpenemsNamedException {
-		Configuration config = this.getExistingConfigForId(request.getComponentId());
+		var config = this.getExistingConfigForId(request.getComponentId());
 
 		try {
 			config.delete();
@@ -390,7 +386,7 @@ protected CompletableFuture<JsonrpcResponseSuccess> handleDeleteComponentConfigR
 
 	/**
 	 * Handles a {@link ChannelExportXlsxRequest}.
-	 * 
+	 *
 	 * @param user    the {@link User}
 	 * @param request the {@link ChannelExportXlsxRequest}
 	 * @return the Future JSON-RPC Response
@@ -399,7 +395,7 @@ protected CompletableFuture<JsonrpcResponseSuccess> handleDeleteComponentConfigR
 	protected CompletableFuture<JsonrpcResponseSuccess> handleChannelExportXlsxRequest(User user,
 			ChannelExportXlsxRequest request) throws OpenemsNamedException {
 		user.assertRoleIsAtLeast("ChannelExportXlsxRequest", Role.ADMIN);
-		OpenemsComponent component = this.getComponent(request.getComponentId());
+		var component = this.getComponent(request.getComponentId());
 		if (component == null) {
 			throw OpenemsError.EDGE_NO_COMPONENT_WITH_ID.exception(request.getComponentId());
 		}
@@ -409,7 +405,7 @@ protected CompletableFuture<JsonrpcResponseSuccess> handleChannelExportXlsxReque
 	/**
 	 * Updates the Configuration from the given Properties and adds some meta
 	 * information.
-	 * 
+	 *
 	 * @param user       the {@link User}
 	 * @param config     the Configuration object
 	 * @param properties the properties
@@ -432,7 +428,7 @@ private void applyConfiguration(User user, Configuration config, Dictionary<Stri
 	/**
 	 * Gets the ConfigAdmin Configuration for the OpenEMS Component with the given
 	 * Component-ID.
-	 * 
+	 *
 	 * @param componentId the Component-ID
 	 * @return the Configuration
 	 * @throws OpenemsNamedException on error
@@ -449,7 +445,7 @@ protected Configuration getExistingConfigForId(String componentId) throws Openem
 
 		if (configs.isEmpty()) {
 			// Maybe this is a Singleton?
-			String factoryPid = this.getComponent(componentId).serviceFactoryPid();
+			var factoryPid = this.getComponent(componentId).serviceFactoryPid();
 			try {
 				return this.cm.getConfiguration(factoryPid, null);
 			} catch (IOException e) {
@@ -470,7 +466,7 @@ protected Configuration getExistingConfigForId(String componentId) throws Openem
 	/**
 	 * Extends the ConfigurationAdmin 'listConfigurations' method by additionally
 	 * searching through Factory default values.
-	 * 
+	 *
 	 * @param componentId the Component-ID
 	 * @return an array of Configurations
 	 * @throws InvalidSyntaxException on error
@@ -478,23 +474,23 @@ protected Configuration getExistingConfigForId(String componentId) throws Openem
 	 */
 	private List<Configuration> listConfigurations(String componentId) throws IOException, InvalidSyntaxException {
 		List<Configuration> result = new ArrayList<>();
-		Configuration[] configs = this.cm.listConfigurations(null);
+		var configs = this.cm.listConfigurations(null);
 		if (configs == null) {
 			return result;
 		}
 
 		for (Configuration config : configs) {
-			Object id = config.getProperties().get("id");
+			var id = config.getProperties().get("id");
 			if (id != null) {
 				// Configuration has an 'id' property
-				if (id instanceof String && componentId.equals((String) id)) {
+				if (id instanceof String && componentId.equals(id)) {
 					// 'id' property matches
 					result.add(config);
 				}
 
 			} else {
 				// compare default value for property 'id'
-				String factoryPid = config.getFactoryPid();
+				var factoryPid = config.getFactoryPid();
 				if (factoryPid == null) {
 					// Singleton?
 					factoryPid = config.getPid();
@@ -502,11 +498,11 @@ private List<Configuration> listConfigurations(String componentId) throws IOExce
 						continue;
 					}
 				}
-				Factory factory = this.getEdgeConfig().getFactories().get(factoryPid);
+				var factory = this.getEdgeConfig().getFactories().get(factoryPid);
 				if (factory == null) {
 					continue;
 				}
-				Optional<String> defaultValue = JsonUtils.getAsOptionalString(factory.getPropertyDefaultValue("id"));
+				var defaultValue = JsonUtils.getAsOptionalString(factory.getPropertyDefaultValue("id"));
 				if (defaultValue.isPresent() && componentId.equals(defaultValue.get())) {
 					result.add(config);
 				}
@@ -529,12 +525,11 @@ public void configurationEvent(ConfigurationEvent event) {
 
 	@Override
 	public Clock getClock() {
-		ClockProvider clockProvider = this.clockProvider;
+		var clockProvider = this.clockProvider;
 		if (clockProvider != null) {
 			return clockProvider.getClock();
-		} else {
-			return Clock.systemDefaultZone();
 		}
+		return Clock.systemDefaultZone();
 	}
 
 }
diff --git a/io.openems.edge.core/src/io/openems/edge/core/componentmanager/ComponentManagerWorker.java b/io.openems.edge.core/src/io/openems/edge/core/componentmanager/ComponentManagerWorker.java
index 04f76193d31..80e9d167250 100644
--- a/io.openems.edge.core/src/io/openems/edge/core/componentmanager/ComponentManagerWorker.java
+++ b/io.openems.edge.core/src/io/openems/edge/core/componentmanager/ComponentManagerWorker.java
@@ -16,7 +16,7 @@ public ComponentManagerWorker(ComponentManagerImpl parent) {
 	/**
 	 * Gets some output that is suitable for a continuous Debug log. Returns 'null'
 	 * by default which causes no output.
-	 * 
+	 *
 	 * @return the debug log output
 	 */
 	public String debugLog() {
@@ -25,7 +25,6 @@ public String debugLog() {
 
 	@Override
 	public void configurationEvent(ConfigurationEvent event) {
-		return;
 	}
 
 }
diff --git a/io.openems.edge.core/src/io/openems/edge/core/componentmanager/DefaultConfigurationWorker.java b/io.openems.edge.core/src/io/openems/edge/core/componentmanager/DefaultConfigurationWorker.java
index 0fc189016f0..20e855f850f 100644
--- a/io.openems.edge.core/src/io/openems/edge/core/componentmanager/DefaultConfigurationWorker.java
+++ b/io.openems.edge.core/src/io/openems/edge/core/componentmanager/DefaultConfigurationWorker.java
@@ -6,7 +6,6 @@
 import java.util.Hashtable;
 import java.util.List;
 import java.util.Optional;
-import java.util.concurrent.CompletableFuture;
 import java.util.concurrent.ExecutionException;
 import java.util.concurrent.TimeUnit;
 import java.util.concurrent.TimeoutException;
@@ -14,13 +13,11 @@
 import java.util.stream.Collectors;
 
 import org.osgi.service.cm.Configuration;
-import org.osgi.service.cm.ConfigurationAdmin;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
 import io.openems.common.exceptions.OpenemsError.OpenemsNamedException;
 import io.openems.common.exceptions.OpenemsException;
-import io.openems.common.jsonrpc.base.JsonrpcResponseSuccess;
 import io.openems.common.jsonrpc.request.CreateComponentConfigRequest;
 import io.openems.common.jsonrpc.request.DeleteComponentConfigRequest;
 import io.openems.common.jsonrpc.request.UpdateComponentConfigRequest;
@@ -30,10 +27,10 @@
  * This Worker checks if certain OpenEMS-Components are configured and - if not
  * - configures them. It is used to make sure a set of standard components are
  * always activated by default on a deployed energy management system.
- * 
+ *
  * <p>
  * Example 1: Add JSON/REST-Api Controller by default:
- * 
+ *
  * <pre>
  * if (existingConfigs.stream().noneMatch(c -> //
  * // Check if either "Controller.Api.Rest.ReadOnly" or
@@ -49,10 +46,10 @@
  * 	));
  * }
  * </pre>
- * 
+ *
  * <p>
  * Example 2: Add Modbus/TCP-Api Controller by default:
- * 
+ *
  * <pre>
  * if (existingConfigs.stream().noneMatch(c -> //
  * // Check if either "Controller.Api.Rest.ReadOnly" or
@@ -87,13 +84,13 @@ public DefaultConfigurationWorker(ComponentManagerImpl parent) {
 
 	/**
 	 * Creates all default configurations.
-	 * 
+	 *
 	 * @param existingConfigs already existing {@link Config}s
 	 * @return true on error, false if default configuration was successfully
 	 *         applied
 	 */
 	private boolean createDefaultConfigurations(List<Config> existingConfigs) {
-		final AtomicBoolean defaultConfigurationFailed = new AtomicBoolean(false);
+		final var defaultConfigurationFailed = new AtomicBoolean(false);
 
 		/*
 		 * Create Default Logging configuration
@@ -102,7 +99,7 @@ private boolean createDefaultConfigurations(List<Config> existingConfigs) {
 		"org.ops4j.pax.logging".equals(c.pid) && c.properties.get("log4j2.rootLogger.level") != null)) {
 			// Adding Configuration manually, because this is not a OpenEMS Configuration
 			try {
-				Hashtable<String, Object> log4j = new Hashtable<>();
+				var log4j = new Hashtable<String, Object>();
 				log4j.put("log4j2.appender.console.type", "Console");
 				log4j.put("log4j2.appender.console.name", "console");
 				log4j.put("log4j2.appender.console.layout.type", "PatternLayout");
@@ -114,7 +111,7 @@ private boolean createDefaultConfigurations(List<Config> existingConfigs) {
 				log4j.put("log4j2.rootLogger.level", "INFO");
 				log4j.put("log4j2.rootLogger.appenderRef.console.ref", "console");
 				log4j.put("log4j2.rootLogger.appenderRef.paxosgi.ref", "paxosgi");
-				Configuration config = this.parent.cm.getConfiguration("org.ops4j.pax.logging", null);
+				var config = this.parent.cm.getConfiguration("org.ops4j.pax.logging", null);
 				config.update(log4j);
 			} catch (IOException e) {
 				this.parent.logError(this.log, "Unable to create Default Logging configuration: " + e.getMessage());
@@ -128,7 +125,7 @@ private boolean createDefaultConfigurations(List<Config> existingConfigs) {
 
 	@Override
 	protected void forever() {
-		List<Config> existingConfigs = this.readConfigs();
+		var existingConfigs = this.readConfigs();
 
 		boolean defaultConfigurationFailed;
 		try {
@@ -148,14 +145,14 @@ protected void forever() {
 
 	/**
 	 * Reads all currently active configurations.
-	 * 
+	 *
 	 * @return a list of currently active {@link Config}s
 	 */
 	private List<Config> readConfigs() {
-		List<Config> result = new ArrayList<Config>();
+		List<Config> result = new ArrayList<>();
 		try {
-			ConfigurationAdmin cm = this.parent.cm;
-			Configuration[] configs = cm.listConfigurations(null); // NOTE: here we are not filtering for enabled=true
+			var cm = this.parent.cm;
+			var configs = cm.listConfigurations(null); // NOTE: here we are not filtering for enabled=true
 			if (configs != null) {
 				for (Configuration config : configs) {
 					result.add(Config.from(config));
@@ -170,7 +167,7 @@ private List<Config> readConfigs() {
 
 	/**
 	 * Creates a Component configuration.
-	 * 
+	 *
 	 * @param defaultConfigurationFailed the result of the last configuration,
 	 *                                   updated on error
 	 * @param factoryPid                 the Factory-PID
@@ -183,7 +180,7 @@ protected void createConfiguration(AtomicBoolean defaultConfigurationFailed, Str
 					"Creating Component configuration [" + factoryPid + "]: " + properties.stream() //
 							.map(p -> p.getName() + ":" + p.getValue().toString()) //
 							.collect(Collectors.joining(", ")));
-			CompletableFuture<JsonrpcResponseSuccess> response = this.parent.handleCreateComponentConfigRequest(
+			var response = this.parent.handleCreateComponentConfigRequest(
 					null /* no user */, new CreateComponentConfigRequest(factoryPid, properties));
 			response.get(60, TimeUnit.SECONDS);
 
@@ -197,7 +194,7 @@ protected void createConfiguration(AtomicBoolean defaultConfigurationFailed, Str
 
 	/**
 	 * Updates a Component configuration.
-	 * 
+	 *
 	 * @param defaultConfigurationFailed the result of the last configuration,
 	 *                                   updated on error
 	 * @param componentId                the Component-ID
@@ -211,7 +208,7 @@ protected void updateConfiguration(AtomicBoolean defaultConfigurationFailed, Str
 							.map(p -> p.getName() + ":" + p.getValue().toString()) //
 							.collect(Collectors.joining(", ")));
 
-			CompletableFuture<JsonrpcResponseSuccess> response = this.parent.handleUpdateComponentConfigRequest(
+			var response = this.parent.handleUpdateComponentConfigRequest(
 					null /* no user */, new UpdateComponentConfigRequest(componentId, properties));
 			response.get(60, TimeUnit.SECONDS);
 
@@ -225,7 +222,7 @@ protected void updateConfiguration(AtomicBoolean defaultConfigurationFailed, Str
 
 	/**
 	 * Deletes a Component configuration.
-	 * 
+	 *
 	 * @param defaultConfigurationFailed the result of the last configuration,
 	 *                                   updated on error
 	 * @param componentId                the Component-ID
@@ -234,7 +231,7 @@ protected void deleteConfiguration(AtomicBoolean defaultConfigurationFailed, Str
 		try {
 			this.parent.logInfo(this.log, "Deleting Component [" + componentId + "]");
 
-			CompletableFuture<JsonrpcResponseSuccess> response = this.parent.handleDeleteComponentConfigRequest(
+			var response = this.parent.handleDeleteComponentConfigRequest(
 					null /* no user */, new DeleteComponentConfigRequest(componentId));
 			response.get(60, TimeUnit.SECONDS);
 
@@ -250,18 +247,18 @@ protected void deleteConfiguration(AtomicBoolean defaultConfigurationFailed, Str
 	 */
 	protected static class Config {
 		protected static Config from(Configuration config) throws OpenemsException {
-			Dictionary<String, Object> properties = config.getProperties();
+			var properties = config.getProperties();
 			if (properties == null) {
 				throw new OpenemsException(config.getPid() + ": Properties is 'null'");
 			}
-			Object componentIdObj = properties.get("id");
+			var componentIdObj = properties.get("id");
 			String componentId;
 			if (componentIdObj != null) {
 				componentId = componentIdObj.toString();
 			} else {
 				componentId = null;
 			}
-			String pid = config.getPid();
+			var pid = config.getPid();
 			return new Config(config.getFactoryPid(), componentId, pid, properties);
 		}
 
diff --git a/io.openems.edge.core/src/io/openems/edge/core/componentmanager/DictionaryUtils.java b/io.openems.edge.core/src/io/openems/edge/core/componentmanager/DictionaryUtils.java
index e8af064a3c5..5a6fb7d8143 100644
--- a/io.openems.edge.core/src/io/openems/edge/core/componentmanager/DictionaryUtils.java
+++ b/io.openems.edge.core/src/io/openems/edge/core/componentmanager/DictionaryUtils.java
@@ -13,7 +13,7 @@ public class DictionaryUtils {
 
 	/**
 	 * Get the Dictionary value as String.
-	 * 
+	 *
 	 * @param dict the {@link Dictionary}
 	 * @param key  the identifier key
 	 * @return the value as {@link String}
@@ -24,7 +24,7 @@ public static String getAsString(Dictionary<String, Object> dict, String key) {
 
 	/**
 	 * Get the Dictionary value as Optional String.
-	 * 
+	 *
 	 * @param dict the {@link Dictionary}
 	 * @param key  the identifier key
 	 * @return the value as {@link Optional} {@link String}
@@ -35,7 +35,7 @@ public static Optional<String> getAsOptionalString(Dictionary<String, Object> di
 
 	/**
 	 * Get the Dictionary value as Integer.
-	 * 
+	 *
 	 * @param dict the {@link Dictionary}
 	 * @param key  the identifier key
 	 * @return the value as {@link Integer}
@@ -46,7 +46,7 @@ public static Integer getAsInteger(Dictionary<String, Object> dict, String key)
 
 	/**
 	 * Get the Dictionary value as Optional Integer.
-	 * 
+	 *
 	 * @param dict the {@link Dictionary}
 	 * @param key  the identifier key
 	 * @return the value as {@link Optional} {@link Integer}
@@ -57,7 +57,7 @@ public static Optional<Integer> getAsOptionalInteger(Dictionary<String, Object>
 
 	/**
 	 * Get the Dictionary value as Boolean.
-	 * 
+	 *
 	 * @param dict the {@link Dictionary}
 	 * @param key  the identifier key
 	 * @return the value as {@link Integer}
@@ -68,7 +68,7 @@ public static Boolean getAsBoolean(Dictionary<String, Object> dict, String key)
 
 	/**
 	 * Get the Dictionary value as Optional Boolean.
-	 * 
+	 *
 	 * @param dict the {@link Dictionary}
 	 * @param key  the identifier key
 	 * @return the value as {@link Optional} {@link Integer}
diff --git a/io.openems.edge.core/src/io/openems/edge/core/componentmanager/EdgeConfigWorker.java b/io.openems.edge.core/src/io/openems/edge/core/componentmanager/EdgeConfigWorker.java
index 5b7a370fdbd..e721b47e38b 100644
--- a/io.openems.edge.core/src/io/openems/edge/core/componentmanager/EdgeConfigWorker.java
+++ b/io.openems.edge.core/src/io/openems/edge/core/componentmanager/EdgeConfigWorker.java
@@ -1,22 +1,17 @@
 package io.openems.edge.core.componentmanager;
 
 import java.io.IOException;
-import java.net.URL;
 import java.util.ArrayDeque;
 import java.util.Dictionary;
-import java.util.Enumeration;
 import java.util.HashMap;
 import java.util.HashSet;
-import java.util.Iterator;
 import java.util.Map;
 import java.util.Map.Entry;
-import java.util.Optional;
 import java.util.Queue;
 import java.util.Set;
 import java.util.TreeMap;
 import java.util.jar.Manifest;
 
-import javax.xml.parsers.DocumentBuilder;
 import javax.xml.parsers.DocumentBuilderFactory;
 import javax.xml.parsers.ParserConfigurationException;
 
@@ -27,14 +22,9 @@
 import org.osgi.service.cm.ConfigurationEvent;
 import org.osgi.service.component.ComponentConstants;
 import org.osgi.service.event.Event;
-import org.osgi.service.metatype.MetaTypeInformation;
-import org.osgi.service.metatype.ObjectClassDefinition;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
-import org.w3c.dom.Document;
-import org.w3c.dom.NamedNodeMap;
 import org.w3c.dom.Node;
-import org.w3c.dom.NodeList;
 import org.xml.sax.SAXException;
 
 import com.google.gson.JsonElement;
@@ -42,18 +32,14 @@
 import com.google.gson.JsonPrimitive;
 
 import io.openems.common.OpenemsConstants;
-import io.openems.common.channel.Level;
 import io.openems.common.exceptions.OpenemsError.OpenemsNamedException;
 import io.openems.common.types.EdgeConfig;
-import io.openems.common.types.EdgeConfig.Component;
 import io.openems.common.types.EdgeConfig.Component.Channel.ChannelDetail;
 import io.openems.common.types.EdgeConfig.Component.Channel.ChannelDetailOpenemsType;
 import io.openems.common.types.EdgeConfig.Component.Channel.ChannelDetailState;
-import io.openems.common.types.EdgeConfig.Factory;
 import io.openems.common.types.OptionsEnum;
 import io.openems.common.utils.JsonUtils;
 import io.openems.edge.common.channel.Channel;
-import io.openems.edge.common.channel.Doc;
 import io.openems.edge.common.channel.EnumDoc;
 import io.openems.edge.common.channel.StateChannelDoc;
 import io.openems.edge.common.component.OpenemsComponent;
@@ -71,7 +57,7 @@ public class EdgeConfigWorker extends ComponentManagerWorker {
 	private static final Logger LOG = LoggerFactory.getLogger(EdgeConfigWorker.class);
 
 	private final Logger log = LoggerFactory.getLogger(EdgeConfigWorker.class);
-	private final Queue<ConfigurationEvent> events = new ArrayDeque<ConfigurationEvent>();
+	private final Queue<ConfigurationEvent> events = new ArrayDeque<>();
 
 	private EdgeConfig cache = null;
 
@@ -87,11 +73,11 @@ protected synchronized void forever() {
 	/**
 	 * Gets the EdgeConfig object; updates the cache if necessary and publishes a
 	 * CONFIG_UPDATE event on update.
-	 * 
+	 *
 	 * @return the {@link EdgeConfig}
 	 */
 	public synchronized EdgeConfig getEdgeConfig() {
-		boolean wasConfigUpdated = false;
+		var wasConfigUpdated = false;
 
 		if (this.cache != null) {
 			// Use Cache
@@ -133,29 +119,28 @@ public synchronized void configurationEvent(ConfigurationEvent event) {
 
 	/**
 	 * Update the local EdgeConfig cache from event.
-	 * 
+	 *
 	 * @param event the {@link ConfigurationEvent}
 	 * @return true if this operation changed the {@link EdgeConfig}
 	 */
 	private boolean updateCacheFromEvent(ConfigurationEvent event) {
 		if (event.getType() == ConfigurationEvent.CM_UPDATED) {
 			// Update/Create: apply only changes
-			String pid = event.getPid();
+			var pid = event.getPid();
 			return this.readConfigurations(this.cache, "(service.pid=" + pid + ")");
-		} else {
-			// Something else - e.g. delete - create full EdgeConfig
-			this.cache = this.buildNewEdgeConfig();
-			return true;
 		}
+		// Something else - e.g. delete - create full EdgeConfig
+		this.cache = this.buildNewEdgeConfig();
+		return true;
 	}
 
 	/**
 	 * Build a new EdgeConfig without using Cache.
-	 * 
+	 *
 	 * @return the {@link EdgeConfig}
 	 */
 	private EdgeConfig buildNewEdgeConfig() {
-		EdgeConfig result = new EdgeConfig();
+		var result = new EdgeConfig();
 		try {
 			this.readFactories(result);
 			this.readConfigurations(result, null /* no filter: read all */);
@@ -168,14 +153,14 @@ private EdgeConfig buildNewEdgeConfig() {
 
 	/**
 	 * Update EdgeConfig Channels.
-	 * 
+	 *
 	 * @param config the {@link EdgeConfig}
 	 * @return true if this operation changed the {@link EdgeConfig}
 	 */
 	private boolean updateChannels(EdgeConfig config) {
-		boolean wasConfigUpdated = false;
+		var wasConfigUpdated = false;
 		for (OpenemsComponent component : this.parent.getAllComponents()) {
-			EdgeConfig.Component comp = config.getComponents().get(component.id());
+			var comp = config.getComponents().get(component.id());
 			if (comp == null) {
 				this.log.warn("Component [" + component.id() + "] was missing!");
 				continue;
@@ -210,17 +195,16 @@ private TreeMap<String, EdgeConfig.Component.Channel> getChannels(String compone
 	 * @return a map of Channels; or empty map if the Component is not active
 	 */
 	private TreeMap<String, EdgeConfig.Component.Channel> getChannels(OpenemsComponent component) {
-		TreeMap<String, EdgeConfig.Component.Channel> result = new TreeMap<>();
+		var result = new TreeMap<String, EdgeConfig.Component.Channel>();
 		if (component != null) {
-			for (Iterator<Channel<?>> iter = component.channels().iterator(); iter.hasNext();) {
-				Channel<?> channel = iter.next();
-				io.openems.edge.common.channel.ChannelId channelId = channel.channelId();
-				Doc doc = channelId.doc();
+			for (Channel<?> channel : component.channels()) {
+				var channelId = channel.channelId();
+				var doc = channelId.doc();
 				ChannelDetail detail = null;
 				switch (doc.getChannelCategory()) {
 				case ENUM: {
 					Map<String, JsonElement> values = new HashMap<>();
-					EnumDoc d = (EnumDoc) doc;
+					var d = (EnumDoc) doc;
 					for (OptionsEnum option : d.getOptions()) {
 						values.put(option.getName(), new JsonPrimitive(option.getValue()));
 					}
@@ -231,8 +215,8 @@ private TreeMap<String, EdgeConfig.Component.Channel> getChannels(OpenemsCompone
 					detail = new ChannelDetailOpenemsType();
 					break;
 				case STATE:
-					StateChannelDoc d = (StateChannelDoc) doc;
-					Level level = d.getLevel();
+					var d = (StateChannelDoc) doc;
+					var level = d.getLevel();
 					detail = new ChannelDetailState(level);
 					break;
 				}
@@ -252,7 +236,7 @@ private TreeMap<String, EdgeConfig.Component.Channel> getChannels(OpenemsCompone
 	/**
 	 * Read all existing configurations, even those that are not properly
 	 * initialized.
-	 * 
+	 *
 	 * @param result the {@link EdgeConfig}
 	 * @param filter the filter string for
 	 *               {@link ConfigurationAdmin#listConfigurations(String)}, null for
@@ -270,15 +254,15 @@ private boolean readConfigurations(EdgeConfig result, String filter) {
 		Set<String> missingComponentIds = new HashSet<>(result.getComponents().keySet());
 		if (configs != null) {
 			for (Configuration config : configs) {
-				Dictionary<String, Object> properties = config.getProperties();
+				var properties = config.getProperties();
 				if (properties == null) {
 					this.log.warn(config.getPid() + ": Properties is 'null'");
 					continue;
 				}
 				// Read Component-ID
 				String componentId = null;
-				Object componentIdObj = properties.get("id");
-				if (componentIdObj != null && (componentIdObj instanceof String)) {
+				var componentIdObj = properties.get("id");
+				if (componentIdObj instanceof String) {
 					// Read 'id' property
 					componentId = (String) componentIdObj;
 
@@ -294,13 +278,13 @@ private boolean readConfigurations(EdgeConfig result, String filter) {
 
 				if (componentId == null) {
 					// Use default value for 'id' property
-					String factoryPid = config.getFactoryPid();
+					var factoryPid = config.getFactoryPid();
 					if (factoryPid == null) {
 						continue;
 					}
-					Factory factory = result.getFactories().get(factoryPid);
+					var factory = result.getFactories().get(factoryPid);
 					if (factory != null) {
-						Optional<String> defaultValue = JsonUtils
+						var defaultValue = JsonUtils
 								.getAsOptionalString(factory.getPropertyDefaultValue("id"));
 						if (defaultValue.isPresent()) {
 							componentId = defaultValue.get();
@@ -316,11 +300,10 @@ private boolean readConfigurations(EdgeConfig result, String filter) {
 				missingComponentIds.remove(componentId);
 
 				// Read Alias
-				String componentAlias = componentId;
+				var componentAlias = componentId;
 				{
-					Object componentAliasObj = properties.get("alias");
-					if (componentAliasObj != null && componentAliasObj instanceof String
-							&& !((String) componentAliasObj).trim().isEmpty()) {
+					var componentAliasObj = properties.get("alias");
+					if (componentAliasObj instanceof String && !((String) componentAliasObj).trim().isEmpty()) {
 						componentAlias = (String) componentAliasObj;
 					}
 				}
@@ -335,13 +318,13 @@ private boolean readConfigurations(EdgeConfig result, String filter) {
 				}
 
 				// Read Factory
-				EdgeConfig.Factory factory = result.getFactories().get(factoryPid);
+				var factory = result.getFactories().get(factoryPid);
 
 				// Read all Properties
-				TreeMap<String, JsonElement> propertyMap = convertProperties(properties, factory);
+				var propertyMap = convertProperties(properties, factory);
 
 				// Read all Channels
-				TreeMap<String, EdgeConfig.Component.Channel> channels = this.getChannels(componentId);
+				var channels = this.getChannels(componentId);
 
 				// Create EdgeConfig.Component and add it to Result
 				result.addComponent(componentId, new EdgeConfig.Component(config.getPid(), componentId, componentAlias,
@@ -362,12 +345,12 @@ private boolean readConfigurations(EdgeConfig result, String filter) {
 
 	/**
 	 * Read active, properly initialized Components.
-	 * 
+	 *
 	 * @param result the {@link EdgeConfig}
 	 * @return true if this operation changed the {@link EdgeConfig}
 	 */
 	private boolean readComponents(EdgeConfig result) {
-		boolean wasConfigUpdated = false;
+		var wasConfigUpdated = false;
 		for (OpenemsComponent component : this.parent.getAllComponents()) {
 			this.readComponent(result, component);
 			wasConfigUpdated = true;
@@ -377,26 +360,26 @@ private boolean readComponents(EdgeConfig result) {
 
 	/**
 	 * Read this Component.
-	 * 
+	 *
 	 * @param result    the {@link EdgeConfig}
 	 * @param component the Component
 	 */
 	private void readComponent(EdgeConfig result, OpenemsComponent component) {
-		String factoryPid = component.serviceFactoryPid();
-		String componentId = component.id();
+		var factoryPid = component.serviceFactoryPid();
+		var componentId = component.id();
 
 		// get configuration properties
-		TreeMap<String, JsonElement> properties = convertProperties(//
+		var properties = convertProperties(//
 				component.getComponentContext().getProperties(), //
 				result.getFactories().get(factoryPid));
 
 		// get Channels
-		TreeMap<String, io.openems.common.types.EdgeConfig.Component.Channel> channels = this.getChannels(component);
+		var channels = this.getChannels(component);
 
-		Optional<Component> resultComponent = result.getComponent(componentId);
+		var resultComponent = result.getComponent(componentId);
 		if (resultComponent.isPresent()) {
 			// Update existing properties
-			Map<String, JsonElement> resultProperties = resultComponent.get().getProperties();
+			var resultProperties = resultComponent.get().getProperties();
 			for (Entry<String, JsonElement> property : properties.entrySet()) {
 				switch (property.getKey()) {
 				case "org.ops4j.pax.logging.appender.name":
@@ -409,7 +392,7 @@ private void readComponent(EdgeConfig result, OpenemsComponent component) {
 			}
 
 			// Update existing Channels
-			Map<String, io.openems.common.types.EdgeConfig.Component.Channel> resultChannels = resultComponent.get()
+			var resultChannels = resultComponent.get()
 					.getChannels();
 			for (Entry<String, io.openems.common.types.EdgeConfig.Component.Channel> channel : channels.entrySet()) {
 				if (!resultChannels.containsKey(channel.getKey())) {
@@ -426,19 +409,19 @@ private void readComponent(EdgeConfig result, OpenemsComponent component) {
 
 	/**
 	 * Read Factories.
-	 * 
+	 *
 	 * @param result the {@link EdgeConfig}
 	 */
 	private void readFactories(EdgeConfig result) {
-		final Bundle[] bundles = this.parent.bundleContext.getBundles();
+		final var bundles = this.parent.bundleContext.getBundles();
 		for (Bundle bundle : bundles) {
-			final MetaTypeInformation mti = this.parent.metaTypeService.getMetaTypeInformation(bundle);
+			final var mti = this.parent.metaTypeService.getMetaTypeInformation(bundle);
 			if (mti == null) {
 				continue;
 			}
 
 			// read Bundle Manifest
-			URL manifestUrl = bundle.getResource("META-INF/MANIFEST.MF");
+			var manifestUrl = bundle.getResource("META-INF/MANIFEST.MF");
 			Manifest manifest;
 			try {
 				manifest = new Manifest(manifestUrl.openStream());
@@ -448,7 +431,7 @@ private void readFactories(EdgeConfig result) {
 			}
 
 			// get Factory-PIDs in this Bundle
-			String[] factoryPids = mti.getFactoryPids();
+			var factoryPids = mti.getFactoryPids();
 			for (String factoryPid : factoryPids) {
 				switch (factoryPid) {
 				case "osgi.executor.provider":
@@ -456,9 +439,9 @@ private void readFactories(EdgeConfig result) {
 					break;
 				default:
 					// Get ObjectClassDefinition (i.e. the main annotation on the Config class)
-					ObjectClassDefinition objectClassDefinition = mti.getObjectClassDefinition(factoryPid, null);
+					var objectClassDefinition = mti.getObjectClassDefinition(factoryPid, null);
 					// Get Natures implemented by this Factory-PID
-					String[] natures = this.getNatures(bundle, manifest, factoryPid);
+					var natures = this.getNatures(bundle, manifest, factoryPid);
 					// Add Factory to config
 					result.addFactory(factoryPid,
 							EdgeConfig.Factory.create(factoryPid, objectClassDefinition, natures));
@@ -470,9 +453,9 @@ private void readFactories(EdgeConfig result) {
 				switch (pid) {
 				default:
 					// Get ObjectClassDefinition (i.e. the main annotation on the Config class)
-					ObjectClassDefinition objectClassDefinition = mti.getObjectClassDefinition(pid, null);
+					var objectClassDefinition = mti.getObjectClassDefinition(pid, null);
 					// Get Natures implemented by this Factory-PID
-					String[] natures = this.getNatures(bundle, manifest, pid);
+					var natures = this.getNatures(bundle, manifest, pid);
 					// Add Factory to config
 					result.addFactory(pid, EdgeConfig.Factory.create(pid, objectClassDefinition, natures));
 				}
@@ -482,7 +465,7 @@ private void readFactories(EdgeConfig result) {
 
 	/**
 	 * Reads Natures from an XML.
-	 * 
+	 *
 	 * <pre>
 	 * &lt;scr:component&gt;
 	 *   &lt;service&gt;
@@ -490,7 +473,7 @@ private void readFactories(EdgeConfig result) {
 	 *   &lt;/service&gt;
 	 * &lt;/scr:component&gt;
 	 * </pre>
-	 * 
+	 *
 	 * @param bundle     the {@link Bundle}
 	 * @param manifest   the {@link Manifest}
 	 * @param factoryPid the Factory-PID
@@ -499,12 +482,12 @@ private void readFactories(EdgeConfig result) {
 	private String[] getNatures(Bundle bundle, Manifest manifest, String factoryPid) {
 		try {
 			// get "Service-Component"-Entry of Manifest
-			String serviceComponentsString = manifest.getMainAttributes()
+			var serviceComponentsString = manifest.getMainAttributes()
 					.getValue(ComponentConstants.SERVICE_COMPONENT);
 			if (serviceComponentsString == null) {
 				return new String[0];
 			}
-			String[] serviceComponents = serviceComponentsString.split(",");
+			var serviceComponents = serviceComponentsString.split(",");
 
 			// read Service-Component XML files from OSGI-INF folder
 			for (String serviceComponent : serviceComponents) {
@@ -513,26 +496,26 @@ private String[] getNatures(Bundle bundle, Manifest manifest, String factoryPid)
 					continue;
 				}
 
-				URL componentUrl = bundle.getResource(serviceComponent);
-				DocumentBuilderFactory dbFactory = DocumentBuilderFactory.newInstance();
-				DocumentBuilder dBuilder = dbFactory.newDocumentBuilder();
-				Document doc = dBuilder.parse(componentUrl.openStream());
+				var componentUrl = bundle.getResource(serviceComponent);
+				var dbFactory = DocumentBuilderFactory.newInstance();
+				var dBuilder = dbFactory.newDocumentBuilder();
+				var doc = dBuilder.parse(componentUrl.openStream());
 				doc.getDocumentElement().normalize();
 
-				NodeList serviceNodes = doc.getElementsByTagName("service");
-				for (int i = 0; i < serviceNodes.getLength(); i++) {
-					Node serviceNode = serviceNodes.item(i);
+				var serviceNodes = doc.getElementsByTagName("service");
+				for (var i = 0; i < serviceNodes.getLength(); i++) {
+					var serviceNode = serviceNodes.item(i);
 					if (serviceNode.getNodeType() == Node.ELEMENT_NODE) {
-						NodeList provideNodes = serviceNode.getChildNodes();
+						var provideNodes = serviceNode.getChildNodes();
 
 						// Read "interface" attributes and return them
 						Set<String> result = new HashSet<>();
-						for (int j = 0; j < provideNodes.getLength(); j++) {
-							Node provideNode = provideNodes.item(j);
-							NamedNodeMap attributes = provideNode.getAttributes();
+						for (var j = 0; j < provideNodes.getLength(); j++) {
+							var provideNode = provideNodes.item(j);
+							var attributes = provideNode.getAttributes();
 							if (attributes != null) {
-								Node interfaceNode = attributes.getNamedItem("interface");
-								String nature = interfaceNode.getNodeValue();
+								var interfaceNode = attributes.getNamedItem("interface");
+								var nature = interfaceNode.getNodeValue();
 								switch (nature) {
 								case "org.osgi.service.event.EventHandler":
 								case "org.ops4j.pax.logging.spi.PaxAppender":
@@ -557,24 +540,25 @@ private String[] getNatures(Bundle bundle, Manifest manifest, String factoryPid)
 	/**
 	 * Gets a component Property as JsonElement. Uses some more techniques to find
 	 * the proper type than {@link JsonUtils#getAsJsonElement(Object)}.
-	 * 
+	 *
 	 * @param properties the properties
 	 * @param key        the property key
 	 * @return the value as JsonElement
 	 */
 	private static JsonElement getPropertyAsJsonElement(Dictionary<String, Object> properties, String key) {
 		var valueObj = properties.get(key);
-		if (valueObj != null && valueObj instanceof String) {
+		if (valueObj instanceof String) {
 			var value = ((String) valueObj).trim();
 			// find boolean
 			if (value.equalsIgnoreCase("true")) {
 				return new JsonPrimitive(true);
-			} else if (value.equalsIgnoreCase("false")) {
+			}
+			if (value.equalsIgnoreCase("false")) {
 				return new JsonPrimitive(false);
 			}
 			// find JSON
-			if ((value.startsWith("{") && value.endsWith("}")) /* JsonObject */
-					|| (value.startsWith("[") && value.endsWith("]")) /* JsonObject */
+			if (value.startsWith("{") && value.endsWith("}") /* JsonObject */
+					|| value.startsWith("[") && value.endsWith("]") /* JsonObject */
 			) {
 				try {
 					return JsonUtils.parse(value);
@@ -589,21 +573,21 @@ private static JsonElement getPropertyAsJsonElement(Dictionary<String, Object> p
 
 	/**
 	 * Convert properties to a String/JsonElement Map.
-	 * 
+	 *
 	 * @param properties the component properties
 	 * @param factory    the {@link EdgeConfig.Factory}
 	 * @return converted properties
 	 */
 	private static TreeMap<String, JsonElement> convertProperties(Dictionary<String, Object> properties,
 			EdgeConfig.Factory factory) {
-		TreeMap<String, JsonElement> result = new TreeMap<>();
+		var result = new TreeMap<String, JsonElement>();
 
 		/*
 		 * Read Factory Properties
 		 */
 		if (factory != null) {
 			for (EdgeConfig.Factory.Property property : factory.getProperties()) {
-				String key = property.getId();
+				var key = property.getId();
 
 				if (EdgeConfig.ignorePropertyKey(key)) {
 					// Ignore this Property
@@ -637,9 +621,9 @@ private static TreeMap<String, JsonElement> convertProperties(Dictionary<String,
 		/*
 		 * Add remaining existing properties
 		 */
-		Enumeration<String> keys = properties.keys();
+		var keys = properties.keys();
 		while (keys.hasMoreElements()) {
-			String key = keys.nextElement();
+			var key = keys.nextElement();
 			if (result.containsKey(key)) {
 				// already added
 				continue;
diff --git a/io.openems.edge.core/src/io/openems/edge/core/componentmanager/MapUtils.java b/io.openems.edge.core/src/io/openems/edge/core/componentmanager/MapUtils.java
index eed0c6375dd..0cfa5e5b443 100644
--- a/io.openems.edge.core/src/io/openems/edge/core/componentmanager/MapUtils.java
+++ b/io.openems.edge.core/src/io/openems/edge/core/componentmanager/MapUtils.java
@@ -13,7 +13,7 @@ public class MapUtils {
 
 	/**
 	 * Get the Map value as String.
-	 * 
+	 *
 	 * @param map the {@link Map}
 	 * @param key the identifier key
 	 * @return the value as {@link String}
@@ -24,7 +24,7 @@ public static String getAsString(Map<String, Object> map, String key) {
 
 	/**
 	 * Get the Map value as Optional String.
-	 * 
+	 *
 	 * @param map the {@link Map}
 	 * @param key the identifier key
 	 * @return the value as {@link Optional} {@link String}
@@ -35,7 +35,7 @@ public static Optional<String> getAsOptionalString(Map<String, Object> map, Stri
 
 	/**
 	 * Get the Map value as Boolean.
-	 * 
+	 *
 	 * @param map the {@link Map}
 	 * @param key the identifier key
 	 * @return the value as {@link Integer}
@@ -46,7 +46,7 @@ public static Boolean getAsBoolean(Map<String, Object> map, String key) {
 
 	/**
 	 * Get the Map value as Optional Boolean.
-	 * 
+	 *
 	 * @param map the {@link Map}
 	 * @param key the identifier key
 	 * @return the value as {@link Optional} {@link Integer}
diff --git a/io.openems.edge.core/src/io/openems/edge/core/componentmanager/OsgiValidateWorker.java b/io.openems.edge.core/src/io/openems/edge/core/componentmanager/OsgiValidateWorker.java
index 32f3d2254e9..15b27e9a445 100644
--- a/io.openems.edge.core/src/io/openems/edge/core/componentmanager/OsgiValidateWorker.java
+++ b/io.openems.edge.core/src/io/openems/edge/core/componentmanager/OsgiValidateWorker.java
@@ -1,14 +1,11 @@
 package io.openems.edge.core.componentmanager;
 
 import java.io.IOException;
-import java.util.Collection;
 import java.util.Dictionary;
 import java.util.HashMap;
 import java.util.HashSet;
-import java.util.Iterator;
 import java.util.List;
 import java.util.Map;
-import java.util.Map.Entry;
 import java.util.Set;
 import java.util.stream.Collectors;
 import java.util.stream.Stream;
@@ -28,14 +25,14 @@
 
 /**
  * This Worker constantly validates:.
- * 
+ *
  * <ul>
  * <li>that all configured OpenEMS-Components are actually activated. Otherwise
  * it sets the {@link ComponentManager.ChannelId#CONFIG_NOT_ACTIVATED} channel.
  * <li>that there is no duplicated Component-ID in the system. Otherwise it sets
  * the {@link ComponentManager.ChannelId#DUPLICATED_COMPONENT_ID} channel.
  * </ul>
- * 
+ *
  * <p>
  * Next to the Warning/Fault channels details are also printed to console on
  * debugLog.
@@ -46,7 +43,7 @@ public class OsgiValidateWorker extends ComponentManagerWorker {
 	 * For INITIAL_CYCLES cycles the distance between two checks is
 	 * INITIAL_CYCLE_TIME, afterwards the check runs every REGULAR_CYCLE_TIME
 	 * milliseconds.
-	 * 
+	 *
 	 * Why? In the beginning it takes a while till all components are up and
 	 * running. So it is likely, that in the beginning not all are immediately
 	 * running.
@@ -66,12 +63,12 @@ public class OsgiValidateWorker extends ComponentManagerWorker {
 	/**
 	 * Components with duplicated Component-IDs.
 	 */
-	private final Set<String> duplicatedComponentIds = new HashSet<String>();
+	private final Set<String> duplicatedComponentIds = new HashSet<>();
 
 	/**
 	 * Components waiting for restart.
 	 */
-	private final Map<String, Integer> restartComponents = new HashMap<String, Integer>();
+	private final Map<String, Integer> restartComponents = new HashMap<>();
 
 	public OsgiValidateWorker(ComponentManagerImpl parent) {
 		super(parent);
@@ -85,8 +82,8 @@ protected void forever() {
 	}
 
 	private void findDuplicatedComponentIds() {
-		final Configuration[] configs = this.readAllConfigurations();
-		final Set<String> duplicatedComponentIds = new HashSet<String>();
+		final var configs = this.readAllConfigurations();
+		final Set<String> duplicatedComponentIds = new HashSet<>();
 		updateDuplicatedComponentIds(duplicatedComponentIds, configs);
 		this.parent._setDuplicatedComponentId(!this.duplicatedComponentIds.isEmpty());
 		synchronized (this.duplicatedComponentIds) {
@@ -96,7 +93,7 @@ private void findDuplicatedComponentIds() {
 	}
 
 	private void findDefectiveComponents() {
-		final Configuration[] configs = this.readEnabledConfigurations();
+		final var configs = this.readEnabledConfigurations();
 		final Map<String, String> defectiveComponents = new HashMap<>();
 		updateInactiveComponentsUsingScr(defectiveComponents, this.parent.serviceComponentRuntime);
 		this.updateInactiveComponentsUsingConfigurationAdmin(defectiveComponents, this.parent.getEnabledComponents(),
@@ -109,16 +106,16 @@ private void findDefectiveComponents() {
 	}
 
 	private void restartDefectiveComponents() {
-		Iterator<Entry<String, Integer>> it = this.restartComponents.entrySet().iterator();
+		var it = this.restartComponents.entrySet().iterator();
 		while (it.hasNext()) {
-			Entry<String, Integer> entry = it.next();
+			var entry = it.next();
 			if (entry.getValue() >= RESTART_COMPONENTS_AFTER) {
-				String componentId = entry.getKey();
+				var componentId = entry.getKey();
 				// Update Configuration to try to restart Component
 				try {
 					this.parent.logInfo(this.log, "Trying to restart Component [" + componentId + "]");
-					Configuration config = this.parent.getExistingConfigForId(componentId);
-					Dictionary<String, Object> properties = config.getProperties();
+					var config = this.parent.getExistingConfigForId(componentId);
+					var properties = config.getProperties();
 					config.update(properties);
 
 				} catch (IOException | OpenemsNamedException e) {
@@ -134,19 +131,19 @@ private void restartDefectiveComponents() {
 
 	/**
 	 * Updates the inactive Components.
-	 * 
+	 *
 	 * <p>
 	 * This method uses {@link ServiceComponentRuntime} to get details about why the
 	 * Component is inactive.
-	 * 
+	 *
 	 * @param defectiveComponents the map to be updated
 	 * @param scr                 the {@link ServiceComponentRuntime}
 	 */
 	private static void updateInactiveComponentsUsingScr(Map<String, String> defectiveComponents,
 			ServiceComponentRuntime scr) {
-		Collection<ComponentDescriptionDTO> descriptions = scr.getComponentDescriptionDTOs();
+		var descriptions = scr.getComponentDescriptionDTOs();
 		for (ComponentDescriptionDTO description : descriptions) {
-			Collection<ComponentConfigurationDTO> configurations = scr.getComponentConfigurationDTOs(description);
+			var configurations = scr.getComponentConfigurationDTOs(description);
 			for (ComponentConfigurationDTO configuration : configurations) {
 				if (!MapUtils.getAsOptionalBoolean(configuration.properties, "enabled").orElse(true)) {
 					// Component is not enabled -> ignore
@@ -166,11 +163,11 @@ private static void updateInactiveComponentsUsingScr(Map<String, String> defecti
 					defectDetails = "Unsatisfied reference for " + //
 							Stream.of(configuration.unsatisfiedReferences) //
 									.map(ref -> {
-										String result = ref.name;
+										var result = new StringBuilder().append(ref.name);
 										if (ref.target != null && !ref.target.isEmpty()) {
-											result += " (" + ref.target + ")";
+											result.append(" (").append(ref.target).append(")");
 										}
-										return result;
+										return result.toString();
 									}) //
 									.collect(Collectors.joining(",")); //
 					break;
@@ -182,7 +179,7 @@ private static void updateInactiveComponentsUsingScr(Map<String, String> defecti
 				default:
 					defectDetails = "Undefined failure [" + configuration.state + "];";
 				}
-				String componentId = (String) configuration.properties.get("id");
+				var componentId = (String) configuration.properties.get("id");
 				defectiveComponents.put(componentId, defectDetails);
 			}
 		}
@@ -191,7 +188,7 @@ private static void updateInactiveComponentsUsingScr(Map<String, String> defecti
 	/*
 	 * Compare all Configuration Admin Configurations with actually existing and
 	 * active OpenEMS Components.
-	 * 
+	 *
 	 * @param configs enabled {@link Configuration}s from {@link ConfigurationAdmin}
 	 */
 	private void updateInactiveComponentsUsingConfigurationAdmin(Map<String, String> defectiveComponents,
@@ -210,14 +207,14 @@ private void updateInactiveComponentsUsingConfigurationAdmin(Map<String, String>
 				// Configuration has been deleted
 				continue;
 			}
-			String componentId = (String) properties.get("id");
+			var componentId = (String) properties.get("id");
 			if (componentId != null) {
 				if (defectiveComponents.containsKey(componentId)) {
 					// already in the list
 					continue;
 				}
 				if (!isComponentActivated(enabledComponents, componentId)) {
-					String factoryPid = config.getFactoryPid();
+					var factoryPid = config.getFactoryPid();
 					if (factoryPid != null && scr.getComponentDescriptionDTOs().stream()
 							.anyMatch(description -> factoryPid.equals(description.name))) {
 						// Bundle exists -> try to restart Component
@@ -233,9 +230,9 @@ private void updateInactiveComponentsUsingConfigurationAdmin(Map<String, String>
 		/*
 		 * Update already known list of Components that should be restarted
 		 */
-		Iterator<Entry<String, Integer>> it = this.restartComponents.entrySet().iterator();
+		var it = this.restartComponents.entrySet().iterator();
 		while (it.hasNext()) {
-			Entry<String, Integer> entry = it.next();
+			var entry = it.next();
 			if (restartComponents.remove(entry.getKey())) {
 				// increase count value
 				entry.setValue(entry.getValue() + 1);
@@ -253,19 +250,18 @@ private void updateInactiveComponentsUsingConfigurationAdmin(Map<String, String>
 	/**
 	 * Read all configurations from ConfigurationAdmin - no matter if enabled or
 	 * not.
-	 * 
+	 *
 	 * @return {@link Configuration}s from {@link ConfigurationAdmin}; empty array
 	 *         on error
 	 */
 	private Configuration[] readAllConfigurations() {
 		try {
-			ConfigurationAdmin cm = this.parent.cm;
-			Configuration[] configs = cm.listConfigurations(null);
+			var cm = this.parent.cm;
+			var configs = cm.listConfigurations(null);
 			if (configs != null) {
 				return configs;
-			} else {
-				return new Configuration[0];
 			}
+			return new Configuration[0];
 		} catch (Exception e) {
 			this.parent.logError(this.log, e.getMessage());
 			e.printStackTrace();
@@ -275,19 +271,18 @@ private Configuration[] readAllConfigurations() {
 
 	/**
 	 * Read all enabled configurations from ConfigurationAdmin.
-	 * 
+	 *
 	 * @return enabled {@link Configuration}s from {@link ConfigurationAdmin}; empty
 	 *         array on error
 	 */
 	private Configuration[] readEnabledConfigurations() {
 		try {
-			ConfigurationAdmin cm = this.parent.cm;
-			Configuration[] configs = cm.listConfigurations("(enabled=true)");
+			var cm = this.parent.cm;
+			var configs = cm.listConfigurations("(enabled=true)");
 			if (configs != null) {
 				return configs;
-			} else {
-				return new Configuration[0];
 			}
+			return new Configuration[0];
 		} catch (Exception e) {
 			this.parent.logError(this.log, e.getMessage());
 			e.printStackTrace();
@@ -307,7 +302,7 @@ private static boolean isComponentActivated(List<OpenemsComponent> enabledCompon
 
 	/**
 	 * Checks for duplicated Component-IDs.
-	 * 
+	 *
 	 * @param duplicatedComponentIds the Set of Component-IDs to be updated
 	 * @param configs                enabled {@link Configuration}s from
 	 *                               {@link ConfigurationAdmin}
@@ -315,12 +310,12 @@ private static boolean isComponentActivated(List<OpenemsComponent> enabledCompon
 	private static void updateDuplicatedComponentIds(Set<String> duplicatedComponentIds, Configuration[] configs) {
 		Set<String> componentIds = new HashSet<>();
 		for (Configuration config : configs) {
-			Dictionary<String, Object> properties = config.getProperties();
+			var properties = config.getProperties();
 			if (properties == null) {
 				System.err.println(config.getPid() + ": Properties is 'null'");
 				continue;
 			}
-			String componentId = (String) properties.get("id");
+			var componentId = (String) properties.get("id");
 			if (componentId != null) {
 				if (componentIds.contains(componentId)) {
 					duplicatedComponentIds.add(componentId);
@@ -338,9 +333,8 @@ protected int getCycleTime() {
 		if (this.cycleCountDown > 0) {
 			this.cycleCountDown--;
 			return OsgiValidateWorker.INITIAL_CYCLE_TIME;
-		} else {
-			return OsgiValidateWorker.REGULAR_CYCLE_TIME;
 		}
+		return OsgiValidateWorker.REGULAR_CYCLE_TIME;
 	}
 
 	@Override
@@ -358,13 +352,13 @@ public void triggerNextRun() {
 
 	@Override
 	public String debugLog() {
-		String defectiveComponents = "";
+		var defectiveComponents = "";
 		synchronized (this.defectiveComponents) {
 			defectiveComponents = this.defectiveComponents.entrySet().stream() //
 					.map(e -> e.getKey() + "[" + e.getValue() + "]") //
 					.collect(Collectors.joining(" "));
 		}
-		String duplicatedComponents = "";
+		var duplicatedComponents = "";
 		synchronized (this.duplicatedComponentIds) {
 			duplicatedComponents = String.join(",", this.duplicatedComponentIds);
 		}
@@ -372,7 +366,8 @@ public String debugLog() {
 		if (defectiveComponents.isEmpty() && duplicatedComponents.isEmpty()) {
 			return null;
 
-		} else if (defectiveComponents.isEmpty()) {
+		}
+		if (defectiveComponents.isEmpty()) {
 			return "Duplicated:" + duplicatedComponents;
 
 		} else if (duplicatedComponents.isEmpty()) {
diff --git a/io.openems.edge.core/src/io/openems/edge/core/componentmanager/OutOfMemoryHeapDumpWorker.java b/io.openems.edge.core/src/io/openems/edge/core/componentmanager/OutOfMemoryHeapDumpWorker.java
index 3e87bdd76c8..f0d7cd15e57 100644
--- a/io.openems.edge.core/src/io/openems/edge/core/componentmanager/OutOfMemoryHeapDumpWorker.java
+++ b/io.openems.edge.core/src/io/openems/edge/core/componentmanager/OutOfMemoryHeapDumpWorker.java
@@ -8,6 +8,8 @@
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
+import io.openems.edge.common.component.ComponentManager;
+
 /**
  * This Worker constantly checks for heap-dump files in /usr/lib/openems
  * directory. Those get created on OutOfMemory-Errors. All but the latest
@@ -26,10 +28,10 @@ public OutOfMemoryHeapDumpWorker(ComponentManagerImpl parent) {
 
 	@Override
 	protected void forever() {
-		boolean foundhprof = false;
+		var foundhprof = false;
 
-		File currentWorkingDir = Paths.get("").toAbsolutePath().toFile();
-		File[] files = currentWorkingDir.listFiles();
+		var currentWorkingDir = Paths.get("").toAbsolutePath().toFile();
+		var files = currentWorkingDir.listFiles();
 		// From the docs: 'files' is null if this abstract pathname does not denote a
 		// directory, or if an I/O error occurs.
 		if (files != null) {
@@ -37,7 +39,7 @@ protected void forever() {
 			Arrays.sort(files, Comparator.comparingLong(File::lastModified).reversed());
 
 			for (File file : files) {
-				String filename = file.getName();
+				var filename = file.getName();
 
 				// delete 'core' files
 				if (filename.equals("core")) {
diff --git a/io.openems.edge.core/src/io/openems/edge/core/componentmanager/jsonrpc/ChannelExportXlsxRequest.java b/io.openems.edge.core/src/io/openems/edge/core/componentmanager/jsonrpc/ChannelExportXlsxRequest.java
index 95efeb4bd88..6ec0d26bc3a 100644
--- a/io.openems.edge.core/src/io/openems/edge/core/componentmanager/jsonrpc/ChannelExportXlsxRequest.java
+++ b/io.openems.edge.core/src/io/openems/edge/core/componentmanager/jsonrpc/ChannelExportXlsxRequest.java
@@ -8,7 +8,7 @@
 
 /**
  * Exports Channels with current value and metadata to an Excel (xlsx) file.
- * 
+ *
  * <pre>
  * {
  *   "jsonrpc": "2.0",
@@ -27,14 +27,14 @@ public class ChannelExportXlsxRequest extends JsonrpcRequest {
 	/**
 	 * Create {@link ChannelExportXlsxRequest} from a template
 	 * {@link JsonrpcRequest}.
-	 * 
+	 *
 	 * @param r the template {@link JsonrpcRequest}
 	 * @return the {@link ChannelExportXlsxRequest}
 	 * @throws OpenemsNamedException on parse error
 	 */
 	public static ChannelExportXlsxRequest from(JsonrpcRequest r) throws OpenemsNamedException {
-		JsonObject p = r.getParams();
-		String componentId = JsonUtils.getAsString(p, "componentId");
+		var p = r.getParams();
+		var componentId = JsonUtils.getAsString(p, "componentId");
 		return new ChannelExportXlsxRequest(r, componentId);
 	}
 
@@ -59,7 +59,7 @@ public JsonObject getParams() {
 
 	/**
 	 * Gets the Component-ID.
-	 * 
+	 *
 	 * @return Component-ID
 	 */
 	public String getComponentId() {
diff --git a/io.openems.edge.core/src/io/openems/edge/core/componentmanager/jsonrpc/ChannelExportXlsxResponse.java b/io.openems.edge.core/src/io/openems/edge/core/componentmanager/jsonrpc/ChannelExportXlsxResponse.java
index 96dce3f11da..b94d3b2cb36 100644
--- a/io.openems.edge.core/src/io/openems/edge/core/componentmanager/jsonrpc/ChannelExportXlsxResponse.java
+++ b/io.openems.edge.core/src/io/openems/edge/core/componentmanager/jsonrpc/ChannelExportXlsxResponse.java
@@ -6,7 +6,6 @@
 import java.time.format.DateTimeFormatter;
 import java.util.Collection;
 import java.util.List;
-import java.util.Map;
 import java.util.Map.Entry;
 import java.util.UUID;
 import java.util.stream.Collectors;
@@ -29,9 +28,9 @@
 
 /**
  * Represents a JSON-RPC Response for 'channelExportXlsxRequest'.
- * 
+ *
  * <p>
- * 
+ *
  * <pre>
  * {
  *   "jsonrpc": "2.0",
@@ -58,17 +57,16 @@ public ChannelExportXlsxResponse(UUID id, OpenemsComponent component) throws Ope
 	}
 
 	protected static byte[] generatePayload(OpenemsComponent component) throws OpenemsException {
-		byte[] payload = new byte[0];
 		Worksheet ws = null;
 		try {
-			try (ByteArrayOutputStream os = new ByteArrayOutputStream()) {
+			try (var os = new ByteArrayOutputStream()) {
 				Workbook wb = null;
 				try {
 					wb = new Workbook(os, "OpenEMS Modbus-Register Export", "1.0");
 					ws = wb.newWorksheet("Modbus-Registers");
 
 					// Add headers
-					int row = addSheetHeader(wb, ws, component);
+					var row = addSheetHeader(wb, ws, component);
 
 					ws.setAutoFilter(row, COL_CHANNEL_ID, COL_ACCESS);
 
@@ -80,7 +78,7 @@ protected static byte[] generatePayload(OpenemsComponent component) throws Opene
 						/*
 						 * create descriptive text
 						 */
-						String description = "";
+						var description = "";
 						if (channel instanceof EnumReadChannel) {
 							try {
 								description += channel.value().asOptionString();
@@ -120,7 +118,7 @@ protected static byte[] generatePayload(OpenemsComponent component) throws Opene
 						ws.value(row, COL_ACCESS, channel.channelDoc().getAccessMode().getAbbreviation());
 
 						// Source
-						final Object readSource = channel.getMetaInfo();
+						final var readSource = channel.getMetaInfo();
 						if (readSource != null) {
 							ws.value(row, COL_SOURCE, readSource.toString());
 						}
@@ -133,8 +131,7 @@ protected static byte[] generatePayload(OpenemsComponent component) throws Opene
 					}
 				}
 				os.flush();
-				payload = os.toByteArray();
-				return payload;
+				return os.toByteArray();
 			}
 		} catch (IOException e) {
 			throw new OpenemsException("Unable to generate Xlsx payload: " + e.getMessage());
@@ -142,7 +139,7 @@ protected static byte[] generatePayload(OpenemsComponent component) throws Opene
 	}
 
 	private static int addSheetHeader(Workbook wb, Worksheet ws, OpenemsComponent component) {
-		int row = 0;
+		var row = 0;
 		addHeader(wb, ws, row++, "Export created on", ZonedDateTime.now().format(DATE_TIME_FORMATTER));
 		addHeader(wb, ws, row++, "Version", OpenemsConstants.VERSION.toString());
 		addHeader(wb, ws, row++, "", "");
@@ -151,12 +148,11 @@ private static int addSheetHeader(Workbook wb, Worksheet ws, OpenemsComponent co
 		addHeader(wb, ws, row++, "Service-ID", component.servicePid());
 		addHeader(wb, ws, row++, "Implementation", reducePackageName(component.getClass()));
 
-		Map<Inheritance, Collection<String>> inheritances = getInheritanceViaReflection(component.getClass(), null)
-				.asMap();
+		var inheritances = getInheritanceViaReflection(component.getClass(), null).asMap();
 		for (Entry<Inheritance, Collection<String>> entry : inheritances.entrySet()) {
-			Inheritance inheritance = entry.getKey();
-			Collection<String> names = entry.getValue();
-			boolean first = true;
+			var inheritance = entry.getKey();
+			var names = entry.getValue();
+			var first = true;
 			for (String name : names) {
 				if (first) {
 					addHeader(wb, ws, row++, CaseFormat.UPPER_UNDERSCORE.to(CaseFormat.UPPER_CAMEL, inheritance.name()),
diff --git a/io.openems.edge.core/src/io/openems/edge/core/cycle/CycleImpl.java b/io.openems.edge.core/src/io/openems/edge/core/cycle/CycleImpl.java
index bec01d54f03..678fe33e41b 100644
--- a/io.openems.edge.core/src/io/openems/edge/core/cycle/CycleImpl.java
+++ b/io.openems.edge.core/src/io/openems/edge/core/cycle/CycleImpl.java
@@ -55,9 +55,9 @@ public class CycleImpl extends AbstractOpenemsComponent implements OpenemsCompon
 	 * Holds the Schedulers and their relative cycleTime. They are sorted ascending
 	 * by their cycleTimes.
 	 */
-	protected final TreeSet<Scheduler> schedulers = new TreeSet<Scheduler>(Comparator.comparing(Scheduler::id));
+	protected final TreeSet<Scheduler> schedulers = new TreeSet<>(Comparator.comparing(Scheduler::id));
 
-	private Config config = null;;
+	private Config config = null;
 
 	@Reference(//
 			policy = ReferencePolicy.DYNAMIC, //
@@ -93,6 +93,7 @@ private void activate(ComponentContext context, Config config) throws OpenemsExc
 		this.worker.activate(SINGLETON_SERVICE_PID);
 	}
 
+	@Override
 	@Deactivate
 	protected void deactivate() {
 		super.deactivate();
@@ -102,7 +103,7 @@ protected void deactivate() {
 	@Modified
 	void modified(ComponentContext context, Config config) throws OpenemsNamedException {
 		super.modified(context, SINGLETON_COMPONENT_ID, SINGLETON_SERVICE_PID, true);
-		Config oldConfig = this.config;
+		var oldConfig = this.config;
 		this.config = config;
 		if (OpenemsComponent.validateSingleton(this.cm, SINGLETON_SERVICE_PID, SINGLETON_COMPONENT_ID)) {
 			return;
@@ -125,12 +126,11 @@ protected void logWarn(Logger log, String message) {
 
 	@Override
 	public int getCycleTime() {
-		Config config = this.config;
+		var config = this.config;
 		if (config != null) {
 			return config.cycleTime();
-		} else {
-			return Cycle.DEFAULT_CYCLE_TIME;
 		}
+		return Cycle.DEFAULT_CYCLE_TIME;
 	}
 
 }
diff --git a/io.openems.edge.core/src/io/openems/edge/core/cycle/CycleWorker.java b/io.openems.edge.core/src/io/openems/edge/core/cycle/CycleWorker.java
index 5d1ad4039d1..b9254d17475 100644
--- a/io.openems.edge.core/src/io/openems/edge/core/cycle/CycleWorker.java
+++ b/io.openems.edge.core/src/io/openems/edge/core/cycle/CycleWorker.java
@@ -34,10 +34,10 @@ protected int getCycleTime() {
 	@Override
 	protected void forever() {
 		// Prepare Cycle-Time measurement
-		Stopwatch stopwatch = Stopwatch.createStarted();
+		var stopwatch = Stopwatch.createStarted();
 
 		// Kick Operating System Watchdog
-		String socketName = System.getenv().get("NOTIFY_SOCKET");
+		var socketName = System.getenv().get("NOTIFY_SOCKET");
 		if (socketName != null && socketName.length() != 0) {
 			if (SDNotify.isAvailable()) {
 				SDNotify.sendWatchdog();
@@ -85,7 +85,7 @@ protected void forever() {
 			this.parent.eventAdmin
 					.sendEvent(new Event(EdgeEventConstants.TOPIC_CYCLE_BEFORE_CONTROLLERS, new HashMap<>()));
 
-			boolean hasDisabledController = false;
+			var hasDisabledController = false;
 
 			/*
 			 * Execute Schedulers and their Controllers
@@ -94,7 +94,7 @@ protected void forever() {
 				this.parent.logWarn(this.log, "There are no Schedulers configured!");
 			} else {
 				for (Scheduler scheduler : this.parent.schedulers) {
-					boolean schedulerControllerIsMissing = false;
+					var schedulerControllerIsMissing = false;
 
 					for (String controllerId : scheduler.getControllers()) {
 						Controller controller;
diff --git a/io.openems.edge.core/src/io/openems/edge/core/host/DiskSpaceWorker.java b/io.openems.edge.core/src/io/openems/edge/core/host/DiskSpaceWorker.java
index a4d9ff1dd52..f69f53e598f 100644
--- a/io.openems.edge.core/src/io/openems/edge/core/host/DiskSpaceWorker.java
+++ b/io.openems.edge.core/src/io/openems/edge/core/host/DiskSpaceWorker.java
@@ -1,7 +1,6 @@
 package io.openems.edge.core.host;
 
 import java.io.IOException;
-import java.nio.file.FileStore;
 import java.nio.file.FileSystems;
 import java.nio.file.Files;
 import java.nio.file.Path;
@@ -30,10 +29,10 @@ public DiskSpaceWorker(HostImpl parent) {
 
 	@Override
 	protected void forever() {
-		long totalUsableSpace = 0;
+		var totalUsableSpace = 0L;
 		for (Path root : FileSystems.getDefault().getRootDirectories()) {
 			try {
-				FileStore store = Files.getFileStore(root);
+				var store = Files.getFileStore(root);
 				totalUsableSpace += store.getUsableSpace();
 			} catch (IOException e) {
 				this.parent.logInfo(this.log, "Unable to query disk space: " + e.getMessage());
diff --git a/io.openems.edge.core/src/io/openems/edge/core/host/HostImpl.java b/io.openems.edge.core/src/io/openems/edge/core/host/HostImpl.java
index c31a7172815..225ca5b5650 100644
--- a/io.openems.edge.core/src/io/openems/edge/core/host/HostImpl.java
+++ b/io.openems.edge.core/src/io/openems/edge/core/host/HostImpl.java
@@ -107,6 +107,7 @@ void activate(ComponentContext componentContext, BundleContext bundleContext, Co
 		this.usbConfigurationWorker.triggerNextRun();
 	}
 
+	@Override
 	@Deactivate
 	protected void deactivate() {
 		// Stop the Workers
@@ -147,7 +148,7 @@ public CompletableFuture<? extends JsonrpcResponseSuccess> handleJsonrpcRequest(
 
 	/**
 	 * Handles a GetNetworkConfigRequest.
-	 * 
+	 *
 	 * @param user    the User
 	 * @param request the GetNetworkConfigRequest
 	 * @return the Future JSON-RPC Response
@@ -156,14 +157,14 @@ public CompletableFuture<? extends JsonrpcResponseSuccess> handleJsonrpcRequest(
 	private CompletableFuture<JsonrpcResponseSuccess> handleGetNetworkConfigRequest(User user,
 			GetNetworkConfigRequest request) throws OpenemsNamedException {
 		user.assertRoleIsAtLeast("handleGetNetworkConfigRequest", Role.OWNER);
-		NetworkConfiguration config = this.operatingSystem.getNetworkConfiguration();
-		GetNetworkConfigResponse response = new GetNetworkConfigResponse(request.getId(), config);
+		var config = this.operatingSystem.getNetworkConfiguration();
+		var response = new GetNetworkConfigResponse(request.getId(), config);
 		return CompletableFuture.completedFuture(response);
 	}
 
 	/**
 	 * Handles a SetNetworkConfigRequest.
-	 * 
+	 *
 	 * @param user    the User
 	 * @param request the SetNetworkConfigRequest
 	 * @return the Future JSON-RPC Response
@@ -172,7 +173,7 @@ private CompletableFuture<JsonrpcResponseSuccess> handleGetNetworkConfigRequest(
 	private CompletableFuture<JsonrpcResponseSuccess> handleSetNetworkConfigRequest(User user,
 			SetNetworkConfigRequest request) throws OpenemsNamedException {
 		user.assertRoleIsAtLeast("handleSetNetworkConfigRequest", Role.OWNER);
-		NetworkConfiguration oldNetworkConfiguration = this.operatingSystem.getNetworkConfiguration();
+		var oldNetworkConfiguration = this.operatingSystem.getNetworkConfiguration();
 		this.operatingSystem.handleSetNetworkConfigRequest(oldNetworkConfiguration, request);
 
 		// Notify NetworkConfigurationWorker about the change
@@ -183,7 +184,7 @@ private CompletableFuture<JsonrpcResponseSuccess> handleSetNetworkConfigRequest(
 
 	/**
 	 * Handles a {@link GetSystemUpdateStateRequest}.
-	 * 
+	 *
 	 * @param user    the User
 	 * @param request the {@link GetSystemUpdateStateRequest}
 	 * @return the Future JSON-RPC Response
@@ -198,7 +199,7 @@ private CompletableFuture<JsonrpcResponseSuccess> handleGetSystemUpdateStateRequ
 
 	/**
 	 * Handles a {@link ExecuteSystemUpdateRequest}.
-	 * 
+	 *
 	 * @param user    the User
 	 * @param request the {@link ExecuteSystemUpdateRequest}
 	 * @return the Future JSON-RPC Response
@@ -213,7 +214,7 @@ private CompletableFuture<JsonrpcResponseSuccess> handleExecuteSystemUpdateReque
 
 	/**
 	 * Handles a ExecuteCommandRequest.
-	 * 
+	 *
 	 * @param user    the User
 	 * @param request the ExecuteCommandRequest
 	 * @return the Future JSON-RPC Response
@@ -242,13 +243,13 @@ protected void logError(Logger log, String message) {
 
 	/**
 	 * Source: https://stackoverflow.com/a/28043703.
-	 * 
+	 *
 	 * @param execCommand the command
 	 * @return the parsed result
 	 * @throws IOException on error
 	 */
 	private static String execReadToString(String execCommand) throws IOException {
-		try (Scanner s = new Scanner(Runtime.getRuntime().exec(execCommand).getInputStream()).useDelimiter("\\A")) {
+		try (var s = new Scanner(Runtime.getRuntime().exec(execCommand).getInputStream()).useDelimiter("\\A")) {
 			return s.hasNext() ? s.next().trim() : "";
 		}
 	}
diff --git a/io.openems.edge.core/src/io/openems/edge/core/host/NetworkConfiguration.java b/io.openems.edge.core/src/io/openems/edge/core/host/NetworkConfiguration.java
index cdf50ce322a..79fa13ec2f2 100644
--- a/io.openems.edge.core/src/io/openems/edge/core/host/NetworkConfiguration.java
+++ b/io.openems.edge.core/src/io/openems/edge/core/host/NetworkConfiguration.java
@@ -19,9 +19,9 @@ public NetworkConfiguration(TreeMap<String, NetworkInterface<?>> interfaces) {
 
 	/**
 	 * Return this NetworkConfiguration as a JSON object.
-	 * 
+	 *
 	 * <p>
-	 * 
+	 *
 	 * <pre>
 	 * {
 	 *   "interfaces": {
@@ -35,11 +35,11 @@ public NetworkConfiguration(TreeMap<String, NetworkInterface<?>> interfaces) {
 	 *   }
 	 * }
 	 * </pre>
-	 * 
+	 *
 	 * @return this configuration as JSON
 	 */
 	public JsonObject toJson() {
-		JsonObject interfaces = new JsonObject();
+		var interfaces = new JsonObject();
 		for (Entry<String, NetworkInterface<?>> entry : this.interfaces.entrySet()) {
 			interfaces.add(entry.getKey(), entry.getValue().toJson());
 		}
@@ -50,7 +50,7 @@ public JsonObject toJson() {
 
 	/**
 	 * Gets the network interfaces configuration.
-	 * 
+	 *
 	 * @return a map of network interfaces per name
 	 */
 	public TreeMap<String, NetworkInterface<?>> getInterfaces() {
diff --git a/io.openems.edge.core/src/io/openems/edge/core/host/NetworkConfigurationWorker.java b/io.openems.edge.core/src/io/openems/edge/core/host/NetworkConfigurationWorker.java
index 7abd23a18f0..893d21511fb 100644
--- a/io.openems.edge.core/src/io/openems/edge/core/host/NetworkConfigurationWorker.java
+++ b/io.openems.edge.core/src/io/openems/edge/core/host/NetworkConfigurationWorker.java
@@ -3,10 +3,8 @@
 import java.io.IOException;
 import java.time.LocalDateTime;
 import java.time.temporal.ChronoUnit;
-import java.util.Dictionary;
 import java.util.Hashtable;
 
-import org.osgi.service.cm.Configuration;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -32,9 +30,9 @@ public NetworkConfigurationWorker(HostImpl parent) {
 	@Override
 	protected void forever() {
 		try {
-			String actualNetworkConfiguration = JsonUtils
+			var actualNetworkConfiguration = JsonUtils
 					.prettyToString(this.parent.operatingSystem.getNetworkConfiguration().toJson());
-			String persistedNetworkConfiguration = this.parent.config.networkConfiguration();
+			var persistedNetworkConfiguration = this.parent.config.networkConfiguration();
 
 			if (!actualNetworkConfiguration.equals(persistedNetworkConfiguration)) {
 				this.persistNetworkConfiguration(actualNetworkConfiguration);
@@ -48,14 +46,14 @@ protected void forever() {
 
 	/**
 	 * Reconfigure Parent to persist the actual network configuration.
-	 * 
+	 *
 	 * @param networkConfiguration the actual network configuration
 	 * @throws IOException on error
 	 */
 	private void persistNetworkConfiguration(String networkConfiguration) throws IOException {
-		String factoryPid = this.parent.serviceFactoryPid();
-		final Configuration config = this.parent.cm.getConfiguration(factoryPid, null);
-		Dictionary<String, Object> properties = config.getProperties();
+		var factoryPid = this.parent.serviceFactoryPid();
+		final var config = this.parent.cm.getConfiguration(factoryPid, null);
+		var properties = config.getProperties();
 		if (properties == null) {
 			// No 'Host' configuration existing yet -> create new configuration
 			properties = new Hashtable<>();
diff --git a/io.openems.edge.core/src/io/openems/edge/core/host/NetworkInterface.java b/io.openems.edge.core/src/io/openems/edge/core/host/NetworkInterface.java
index 2e2bf2253f9..79a4bf65012 100644
--- a/io.openems.edge.core/src/io/openems/edge/core/host/NetworkInterface.java
+++ b/io.openems.edge.core/src/io/openems/edge/core/host/NetworkInterface.java
@@ -1,6 +1,7 @@
 package io.openems.edge.core.host;
 
 import java.net.Inet4Address;
+import java.net.InetAddress;
 import java.net.UnknownHostException;
 import java.util.HashSet;
 import java.util.Objects;
@@ -40,7 +41,6 @@ public static class Inet4AddressWithNetmask {
 		private final int netmask;
 
 		public Inet4AddressWithNetmask(Inet4Address inet4Address, int netmask) {
-			super();
 			this.inet4Address = inet4Address;
 			this.netmask = netmask;
 		}
@@ -52,15 +52,15 @@ public String toString() {
 
 		/**
 		 * Parse a string in the form "192.168.100.100/24" to an IPv4 address.
-		 * 
+		 *
 		 * @param value the string
 		 * @return the new {@link Inet4AddressWithNetmask}
 		 * @throws OpenemsException on error
 		 */
 		public static Inet4AddressWithNetmask fromString(String value) throws OpenemsException {
-			String[] arr = value.split("/");
+			var arr = value.split("/");
 			try {
-				return new Inet4AddressWithNetmask((Inet4Address) Inet4Address.getByName(arr[0]),
+				return new Inet4AddressWithNetmask((Inet4Address) InetAddress.getByName(arr[0]),
 						Integer.parseInt(arr[1]));
 			} catch (NumberFormatException | UnknownHostException | IndexOutOfBoundsException e) {
 				throw new OpenemsException(
@@ -77,12 +77,13 @@ public int hashCode() {
 		public boolean equals(Object obj) {
 			if (this == obj) {
 				return true;
-			} else if (obj == null) {
+			}
+			if (obj == null) {
 				return false;
-			} else if (getClass() != obj.getClass()) {
+			} else if (this.getClass() != obj.getClass()) {
 				return false;
 			} else {
-				Inet4AddressWithNetmask other = (Inet4AddressWithNetmask) obj;
+				var other = (Inet4AddressWithNetmask) obj;
 				return Objects.equals(this.toString(), other.toString());
 			}
 		}
@@ -90,7 +91,7 @@ public boolean equals(Object obj) {
 
 	/**
 	 * Parses a JsonObject to a {@link java.net.NetworkInterface} object.
-	 * 
+	 *
 	 * @param name the name of the network interface, e.g. "eth0"
 	 * @param j    the JsonObject
 	 * @return the new {@link java.net.NetworkInterface}
@@ -183,7 +184,7 @@ public NetworkInterface(String name, ConfigurationProperty<Boolean> dhcp,
 
 	/**
 	 * Gets the network interface name.
-	 * 
+	 *
 	 * @return the name
 	 */
 	public String getName() {
@@ -192,7 +193,7 @@ public String getName() {
 
 	/**
 	 * Gets the network interface DHCP option.
-	 * 
+	 *
 	 * @return the DHCP option; true for enabled; false for disabled
 	 */
 	public ConfigurationProperty<Boolean> getDhcp() {
@@ -201,7 +202,7 @@ public ConfigurationProperty<Boolean> getDhcp() {
 
 	/**
 	 * Gets the network interface LinkLocalAddressing option.
-	 * 
+	 *
 	 * @return the LinkLocalAddressing option; true for enabled; false for disabled
 	 */
 	public ConfigurationProperty<Boolean> getLinkLocalAddressing() {
@@ -210,7 +211,7 @@ public ConfigurationProperty<Boolean> getLinkLocalAddressing() {
 
 	/**
 	 * Gets the network interface Gateway.
-	 * 
+	 *
 	 * @return the Gateway
 	 */
 	public ConfigurationProperty<Inet4Address> getGateway() {
@@ -219,7 +220,7 @@ public ConfigurationProperty<Inet4Address> getGateway() {
 
 	/**
 	 * Gets the network interface DNS server.
-	 * 
+	 *
 	 * @return the DNS server
 	 */
 	public ConfigurationProperty<Inet4Address> getDns() {
@@ -228,7 +229,7 @@ public ConfigurationProperty<Inet4Address> getDns() {
 
 	/**
 	 * Gets the network interface addresses.
-	 * 
+	 *
 	 * @return the addresses
 	 */
 	public ConfigurationProperty<Set<Inet4AddressWithNetmask>> getAddresses() {
@@ -237,11 +238,11 @@ public ConfigurationProperty<Set<Inet4AddressWithNetmask>> getAddresses() {
 
 	/**
 	 * Gets the network interface attachment.
-	 * 
+	 *
 	 * <p>
 	 * An arbitrary attachment to this NetworkInterface. Can be used to store e.g. a
 	 * configuration file path.
-	 * 
+	 *
 	 * @return the attachment
 	 */
 	public A getAttachment() {
@@ -250,7 +251,7 @@ public A getAttachment() {
 
 	/**
 	 * Gets the configured addresses including the default addresses if any.
-	 * 
+	 *
 	 * @return all addresses
 	 */
 	public ConfigurationProperty<Set<Inet4AddressWithNetmask>> getAddressesIncludingDefaults() {
@@ -259,14 +260,13 @@ public ConfigurationProperty<Set<Inet4AddressWithNetmask>> getAddressesIncluding
 			// add default eth0 network address
 			value.add(DEFAULT_ETH0_ADDRESS);
 			return ConfigurationProperty.of(value);
-		} else {
-			return this.addresses;
 		}
+		return this.addresses;
 	}
 
 	/**
 	 * Exports this NetworkInterface configuration as JSON.
-	 * 
+	 *
 	 * <pre>
 	 * {
 	 *   "dhcp": boolean,
@@ -276,11 +276,11 @@ public ConfigurationProperty<Set<Inet4AddressWithNetmask>> getAddressesIncluding
 	 *   "addresses": string[]
 	 * }
 	 * </pre>
-	 * 
+	 *
 	 * @return configuration as JSON
 	 */
 	public JsonObject toJson() {
-		JsonObject result = new JsonObject();
+		var result = new JsonObject();
 		if (this.dhcp.isSet()) {
 			result.addProperty("dhcp", this.dhcp.getValue());
 		}
@@ -294,7 +294,7 @@ public JsonObject toJson() {
 			result.addProperty("dns", this.dns.getValue().getHostAddress());
 		}
 		if (this.getAddresses().isSet()) {
-			JsonArray jAddresses = new JsonArray();
+			var jAddresses = new JsonArray();
 			for (Inet4AddressWithNetmask address : this.getAddresses().getValue()) {
 				jAddresses.add(address.toString());
 			}
@@ -306,12 +306,12 @@ public JsonObject toJson() {
 
 	/**
 	 * Updates the interface from a NetworkInterfaceChange object.
-	 * 
+	 *
 	 * @param change the object containing the changes
 	 * @return true if values changed
 	 */
 	public boolean updateFrom(NetworkInterface<?> change) {
-		boolean isChanged = false;
+		var isChanged = false;
 		if (change.getDhcp().isSet()) {
 			if (change.getDhcp() == null) {
 				this.dhcp = ConfigurationProperty.asNotSet();
diff --git a/io.openems.edge.core/src/io/openems/edge/core/host/OperatingSystem.java b/io.openems.edge.core/src/io/openems/edge/core/host/OperatingSystem.java
index a509610ea08..930d668ecb1 100644
--- a/io.openems.edge.core/src/io/openems/edge/core/host/OperatingSystem.java
+++ b/io.openems.edge.core/src/io/openems/edge/core/host/OperatingSystem.java
@@ -11,7 +11,7 @@ public interface OperatingSystem {
 
 	/**
 	 * Gets the network configuration.
-	 * 
+	 *
 	 * @return the network configuration object
 	 * @throws OpenemsNamedException on error
 	 */
@@ -19,7 +19,7 @@ public interface OperatingSystem {
 
 	/**
 	 * Handles a SetNetworkConfigRequest.
-	 * 
+	 *
 	 * @param oldNetworkConfiguration the current/old network configuration
 	 * @param request                 the SetNetworkConfigRequest
 	 * @throws OpenemsNamedException on error
@@ -29,7 +29,7 @@ public void handleSetNetworkConfigRequest(NetworkConfiguration oldNetworkConfigu
 
 	/**
 	 * Gets the USB configuration.
-	 * 
+	 *
 	 * @return the original configuration in textual form
 	 * @throws OpenemsNamedException on error
 	 */
@@ -37,7 +37,7 @@ public void handleSetNetworkConfigRequest(NetworkConfiguration oldNetworkConfigu
 
 	/**
 	 * Executes a command.
-	 * 
+	 *
 	 * @param request the ExecuteCommandRequest
 	 * @return a ExecuteCommandResponse
 	 * @throws OpenemsNamedException on error
diff --git a/io.openems.edge.core/src/io/openems/edge/core/host/OperatingSystemDebianSystemd.java b/io.openems.edge.core/src/io/openems/edge/core/host/OperatingSystemDebianSystemd.java
index f0b5c6b34af..2a5f45eec29 100644
--- a/io.openems.edge.core/src/io/openems/edge/core/host/OperatingSystemDebianSystemd.java
+++ b/io.openems.edge.core/src/io/openems/edge/core/host/OperatingSystemDebianSystemd.java
@@ -6,6 +6,7 @@
 import java.io.InputStream;
 import java.io.InputStreamReader;
 import java.net.Inet4Address;
+import java.net.InetAddress;
 import java.net.UnknownHostException;
 import java.nio.charset.StandardCharsets;
 import java.nio.file.Files;
@@ -21,7 +22,6 @@
 import java.util.concurrent.TimeUnit;
 import java.util.concurrent.atomic.AtomicReference;
 import java.util.function.Supplier;
-import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 
 import org.slf4j.Logger;
@@ -58,18 +58,18 @@ protected OperatingSystemDebianSystemd(HostImpl parent) {
 
 	/**
 	 * Gets the current network configuration for systemd-networkd.
-	 * 
+	 *
 	 * @return the current network configuration
 	 * @throws OpenemsException on error
 	 */
 	@Override
 	public NetworkConfiguration getNetworkConfiguration() throws OpenemsNamedException {
-		File path = Paths.get(NETWORK_BASE_PATH).toFile();
+		var path = Paths.get(NETWORK_BASE_PATH).toFile();
 		if (!path.exists()) {
 			throw new OpenemsException("Base-Path [" + path + "] does not exist.");
 		}
 
-		TreeMap<String, NetworkInterface<?>> interfaces = new TreeMap<>();
+		var interfaces = new TreeMap<String, NetworkInterface<?>>();
 
 		for (final File file : path.listFiles()) {
 			/*
@@ -82,7 +82,7 @@ public NetworkConfiguration getNetworkConfiguration() throws OpenemsNamedExcepti
 				/*
 				 * Parse the content of the network configuration file
 				 */
-				List<String> lines = Files.readAllLines(file.toPath(), StandardCharsets.US_ASCII);
+				var lines = Files.readAllLines(file.toPath(), StandardCharsets.US_ASCII);
 				NetworkInterface<File> networkInterface = parseSystemdNetworkdConfigurationFile(lines, file);
 
 				// check for null value
@@ -101,7 +101,7 @@ public NetworkConfiguration getNetworkConfiguration() throws OpenemsNamedExcepti
 
 	/**
 	 * Handles a SetNetworkConfigRequest for systemd-networkd.
-	 * 
+	 *
 	 * @param oldNetworkConfiguration the current/old network configuration
 	 * @param request                 the JSON-RPC request
 	 * @throws OpenemsException on error
@@ -109,8 +109,8 @@ public NetworkConfiguration getNetworkConfiguration() throws OpenemsNamedExcepti
 	@Override
 	public void handleSetNetworkConfigRequest(NetworkConfiguration oldNetworkConfiguration,
 			SetNetworkConfigRequest request) throws OpenemsNamedException {
-		boolean isChanged = false;
-		List<NetworkInterface<?>> networkInterfaces = request.getNetworkInterface();
+		var isChanged = false;
+		var networkInterfaces = request.getNetworkInterface();
 		for (NetworkInterface<?> networkInterface : networkInterfaces) {
 			NetworkInterface<?> iface = oldNetworkConfiguration.getInterfaces().get(networkInterface.getName());
 			if (iface == null) {
@@ -130,8 +130,8 @@ public void handleSetNetworkConfigRequest(NetworkConfiguration oldNetworkConfigu
 		IOException writeException = null;
 		for (Entry<String, NetworkInterface<?>> entry : oldNetworkConfiguration.getInterfaces().entrySet()) {
 			NetworkInterface<?> iface = entry.getValue();
-			File file = (File) iface.getAttachment();
-			List<String> lines = this.toFileFormat(iface);
+			var file = (File) iface.getAttachment();
+			var lines = this.toFileFormat(iface);
 			try {
 				Files.write(file.toPath(), lines, StandardCharsets.US_ASCII);
 			} catch (IOException e) {
@@ -152,7 +152,7 @@ public void handleSetNetworkConfigRequest(NetworkConfiguration oldNetworkConfigu
 
 	/**
 	 * Helper function to match a String in the configuration file.
-	 * 
+	 *
 	 * @param pattern  the regular expression pattern
 	 * @param line     the line of the file
 	 * @param callback the callback that should get called
@@ -160,7 +160,7 @@ public void handleSetNetworkConfigRequest(NetworkConfiguration oldNetworkConfigu
 	 */
 	private static void onMatchString(Pattern pattern, String line,
 			ThrowingConsumer<String, OpenemsNamedException> callback) throws OpenemsNamedException {
-		Matcher matcher = pattern.matcher(line);
+		var matcher = pattern.matcher(line);
 		if (matcher.find() && matcher.groupCount() > 0) {
 			callback.accept(matcher.group(1));
 		}
@@ -168,7 +168,7 @@ private static void onMatchString(Pattern pattern, String line,
 
 	/**
 	 * Helper function to match an Inet4Address in the configuration file.
-	 * 
+	 *
 	 * @param pattern  the regular expression pattern
 	 * @param line     the line of the file
 	 * @param callback the callback that should get called
@@ -178,7 +178,7 @@ private static void onMatchInet4Address(Pattern pattern, String line,
 			ThrowingConsumer<Inet4Address, OpenemsNamedException> callback) throws OpenemsNamedException {
 		onMatchString(pattern, line, property -> {
 			try {
-				callback.accept((Inet4Address) Inet4Address.getByName(property));
+				callback.accept((Inet4Address) InetAddress.getByName(property));
 			} catch (UnknownHostException e) {
 				throw new OpenemsException("Unable to parse IPv4 address [" + property + "]: " + e.getMessage());
 			}
@@ -187,7 +187,7 @@ private static void onMatchInet4Address(Pattern pattern, String line,
 
 	/**
 	 * Converts the NetworkInterface object to systemd-networkd file format.
-	 * 
+	 *
 	 * @param iface the input network interface configuration
 	 * @return a list of strings for writing it to a file
 	 */
@@ -221,7 +221,7 @@ private List<String> toFileFormat(NetworkInterface<?> iface) {
 	@Override
 	public CompletableFuture<ExecuteSystemCommandResponse> handleExecuteCommandRequest(
 			ExecuteSystemCommandRequest request) {
-		CompletableFuture<ExecuteSystemCommandResponse> result = new CompletableFuture<>();
+		var result = new CompletableFuture<ExecuteSystemCommandResponse>();
 
 		try {
 			Process proc;
@@ -255,7 +255,7 @@ public CompletableFuture<ExecuteSystemCommandResponse> handleExecuteCommandReque
 				/*
 				 * run in background
 				 */
-				String[] stdout = new String[] { //
+				String[] stdout = { //
 						"Command [" + request.getCommand() + "] executed in background...", //
 						"Check system logs for more information." };
 				result.complete(new ExecuteSystemCommandResponse(request.getId(), stdout, new String[0], 0));
@@ -273,7 +273,7 @@ public CompletableFuture<ExecuteSystemCommandResponse> handleExecuteCommandReque
 							proc.destroy();
 						}
 
-						List<String> stdout = stdoutFuture.get(1, TimeUnit.SECONDS);
+						var stdout = stdoutFuture.get(1, TimeUnit.SECONDS);
 						stderr.addAll(stderrFuture.get(1, TimeUnit.SECONDS));
 						result.complete(new ExecuteSystemCommandResponse(request.getId(), //
 								stdout.toArray(new String[stdout.size()]), //
@@ -340,10 +340,9 @@ public String getUsbConfiguration() throws OpenemsNamedException {
 		try {
 			if (!Files.exists(UDEV_PATH)) {
 				return "";
-			} else {
-				List<String> lines = Files.readAllLines(UDEV_PATH, StandardCharsets.US_ASCII);
-				return String.join("\n", lines);
 			}
+			var lines = Files.readAllLines(UDEV_PATH, StandardCharsets.US_ASCII);
+			return String.join("\n", lines);
 		} catch (IOException e) {
 			throw new OpenemsException("Unable to read file [" + UDEV_PATH + "]: " + e.getMessage());
 		}
@@ -361,12 +360,12 @@ public String getUsbConfiguration() throws OpenemsNamedException {
 
 	/**
 	 * Parses a Systemd-Networkd configuration file.
-	 * 
+	 *
 	 * <p>
 	 * See <a href=
 	 * "https://man7.org/linux/man-pages/man5/systemd.network.5.html">systemd.network.5</a>
 	 * man page
-	 * 
+	 *
 	 * @param <A>        the type of the attachment
 	 * @param lines      the lines to parse
 	 * @param attachment to be added as an attachment to the
@@ -376,17 +375,17 @@ public String getUsbConfiguration() throws OpenemsNamedException {
 	 */
 	protected static <A> NetworkInterface<A> parseSystemdNetworkdConfigurationFile(List<String> lines, A attachment)
 			throws OpenemsNamedException {
-		Block currentBlock = Block.UNDEFINED;
-		final AtomicReference<String> name = new AtomicReference<>();
-		final AtomicReference<ConfigurationProperty<Boolean>> dhcp = new AtomicReference<>(
+		var currentBlock = Block.UNDEFINED;
+		final var name = new AtomicReference<String>();
+		final var dhcp = new AtomicReference<ConfigurationProperty<Boolean>>(
 				ConfigurationProperty.asNotSet());
-		final AtomicReference<ConfigurationProperty<Boolean>> linkLocalAddressing = new AtomicReference<>(
+		final var linkLocalAddressing = new AtomicReference<ConfigurationProperty<Boolean>>(
 				ConfigurationProperty.asNotSet());
-		final AtomicReference<ConfigurationProperty<Inet4Address>> gateway = new AtomicReference<>(
+		final var gateway = new AtomicReference<ConfigurationProperty<Inet4Address>>(
 				ConfigurationProperty.asNotSet());
-		final AtomicReference<ConfigurationProperty<Inet4Address>> dns = new AtomicReference<>(
+		final var dns = new AtomicReference<ConfigurationProperty<Inet4Address>>(
 				ConfigurationProperty.asNotSet());
-		final AtomicReference<ConfigurationProperty<Set<Inet4AddressWithNetmask>>> addresses = new AtomicReference<>(
+		final var addresses = new AtomicReference<ConfigurationProperty<Set<Inet4AddressWithNetmask>>>(
 				ConfigurationProperty.asNotSet());
 
 		for (String line : lines) {
@@ -420,7 +419,7 @@ protected static <A> NetworkInterface<A> parseSystemdNetworkdConfigurationFile(L
 				break;
 			case NETWORK:
 				onMatchString(NETWORK_ADDRESS, line, property -> {
-					Set<Inet4AddressWithNetmask> content = addresses.get().getValue();
+					var content = addresses.get().getValue();
 					if (content == null) {
 						content = new HashSet<>();
 					}
@@ -444,7 +443,7 @@ protected static <A> NetworkInterface<A> parseSystemdNetworkdConfigurationFile(L
 				break;
 			}
 		}
-		return new NetworkInterface<A>(name.get(), //
+		return new NetworkInterface<>(name.get(), //
 				dhcp.get(), linkLocalAddressing.get(), gateway.get(), dns.get(), addresses.get(), attachment);
 	}
 
diff --git a/io.openems.edge.core/src/io/openems/edge/core/host/OperatingSystemWindows.java b/io.openems.edge.core/src/io/openems/edge/core/host/OperatingSystemWindows.java
index cb1d6e3fc4f..e15f875dc43 100644
--- a/io.openems.edge.core/src/io/openems/edge/core/host/OperatingSystemWindows.java
+++ b/io.openems.edge.core/src/io/openems/edge/core/host/OperatingSystemWindows.java
@@ -20,7 +20,7 @@ protected OperatingSystemWindows() {
 
 	/**
 	 * Gets the current network configuration.
-	 * 
+	 *
 	 * @return the current network configuration
 	 * @throws OpenemsException on error
 	 */
@@ -32,7 +32,7 @@ public NetworkConfiguration getNetworkConfiguration() throws OpenemsNamedExcepti
 
 	/**
 	 * Handles a SetNetworkConfigRequest for Windows.
-	 * 
+	 *
 	 * @param oldNetworkConfiguration the current/old network configuration
 	 * @param request                 the JSON-RPC request
 	 * @throws OpenemsException on error
diff --git a/io.openems.edge.core/src/io/openems/edge/core/host/SystemUpdateHandler.java b/io.openems.edge.core/src/io/openems/edge/core/host/SystemUpdateHandler.java
index f4e0001930c..f539dc7fb29 100644
--- a/io.openems.edge.core/src/io/openems/edge/core/host/SystemUpdateHandler.java
+++ b/io.openems.edge.core/src/io/openems/edge/core/host/SystemUpdateHandler.java
@@ -28,7 +28,6 @@
 import io.openems.edge.core.host.jsonrpc.GetSystemUpdateStateResponse.UpdateState;
 import okhttp3.OkHttpClient;
 import okhttp3.Request;
-import okhttp3.Response;
 
 /**
  * This Worker reads the actual network configuration and stores it in the Host
@@ -63,14 +62,14 @@ public void deactivate() {
 
 	/**
 	 * Handles a {@link GetSystemUpdateStateRequest}.
-	 * 
+	 *
 	 * @param request the {@link GetSystemUpdateStateRequest}
 	 * @return the Future JSON-RPC Response
 	 * @throws OpenemsNamedException on error
 	 */
 	protected CompletableFuture<JsonrpcResponseSuccess> handleGetSystemUpdateStateRequest(
 			GetSystemUpdateStateRequest request) throws OpenemsNamedException {
-		final CompletableFuture<JsonrpcResponseSuccess> result = new CompletableFuture<JsonrpcResponseSuccess>();
+		final var result = new CompletableFuture<JsonrpcResponseSuccess>();
 
 		if (this.updateState.isRunning()) {
 			result.complete(GetSystemUpdateStateResponse.isRunning(request.getId(), this.updateState));
@@ -83,19 +82,18 @@ protected CompletableFuture<JsonrpcResponseSuccess> handleGetSystemUpdateStateRe
 							result.completeExceptionally(ex);
 							return;
 						}
-						String[] stdout = response.getStdout();
+						var stdout = response.getStdout();
 						if (stdout.length < 1) {
 							result.completeExceptionally(ex /* todo */);
 							return;
 						}
-						String currentVersion = stdout[0];
+						var currentVersion = stdout[0];
 
 						// Read latest version
 						try {
-							String latestVersion = this.download(OpenemsOEM.SYSTEM_UPDATE_LATEST_VERSION_URL).trim();
+							var latestVersion = this.download(OpenemsOEM.SYSTEM_UPDATE_LATEST_VERSION_URL).trim();
 							result.complete(
 									GetSystemUpdateStateResponse.from(request.getId(), currentVersion, latestVersion));
-							return;
 
 						} catch (IOException e) {
 							result.completeExceptionally(e);
@@ -107,11 +105,11 @@ protected CompletableFuture<JsonrpcResponseSuccess> handleGetSystemUpdateStateRe
 	}
 
 	private String download(String url) throws IOException {
-		OkHttpClient client = new OkHttpClient();
-		Request r = new Request.Builder() //
+		var client = new OkHttpClient();
+		var r = new Request.Builder() //
 				.url(url) //
 				.build();
-		try (Response resp = client.newCall(r).execute()) {
+		try (var resp = client.newCall(r).execute()) {
 			if (!resp.isSuccessful()) {
 				throw new IOException(resp.message());
 			}
@@ -122,7 +120,7 @@ private String download(String url) throws IOException {
 
 	private CompletableFuture<ExecuteSystemCommandResponse> executeSystemCommand(String command, int timeoutSeconds)
 			throws OpenemsNamedException {
-		final boolean runInBackground = false;
+		final var runInBackground = false;
 		final Optional<String> username = Optional.empty();
 		final Optional<String> password = Optional.empty();
 		return this.parent.operatingSystem.handleExecuteCommandRequest(
@@ -132,7 +130,7 @@ private CompletableFuture<ExecuteSystemCommandResponse> executeSystemCommand(Str
 	/**
 	 * Handles a {@link ExecuteSystemUpdateRequest} and makes sure the update is
 	 * executed only once.
-	 * 
+	 *
 	 * @param request the {@link ExecuteSystemUpdateRequest}
 	 * @return the {@link JsonrpcResponseSuccess}
 	 * @throws OpenemsNamedException on error
@@ -142,31 +140,30 @@ protected CompletableFuture<JsonrpcResponseSuccess> handleExecuteSystemUpdateReq
 		if (this.updateState.isRunning()) {
 			throw new OpenemsException("System Update is already running");
 
-		} else {
-			this.updateState.reset();
-			this.updateState.setRunning(true);
-			this.updateState.setDebugMode(request.isDebug());
-
-			CompletableFuture<JsonrpcResponseSuccess> result = new CompletableFuture<JsonrpcResponseSuccess>();
-			this.executor.execute(() -> {
-				GetSystemUpdateStateResponse response = GetSystemUpdateStateResponse.isRunning(request.getId(),
-						this.updateState);
-				try {
-					this.executeUpdate(result);
-					this.updateState.setPercentCompleted(100);
-					this.updateState.addLog("# Finished successfully");
-					result.complete(response);
-
-				} catch (Exception e) {
-					this.updateState.addLog("# Finished with error");
-					this.parent.logError(this.log, "Error while executing System Update: " + e.getMessage());
-					e.printStackTrace();
-					result.completeExceptionally(new OpenemsException(e.getMessage() + "\n" + response.toString()));
-				}
-				this.updateState.setRunning(false);
-			});
-			return result;
 		}
+		this.updateState.reset();
+		this.updateState.setRunning(true);
+		this.updateState.setDebugMode(request.isDebug());
+
+		var result = new CompletableFuture<JsonrpcResponseSuccess>();
+		this.executor.execute(() -> {
+			var response = GetSystemUpdateStateResponse.isRunning(request.getId(),
+					this.updateState);
+			try {
+				this.executeUpdate(result);
+				this.updateState.setPercentCompleted(100);
+				this.updateState.addLog("# Finished successfully");
+				result.complete(response);
+
+			} catch (Exception e) {
+				this.updateState.addLog("# Finished with error");
+				this.parent.logError(this.log, "Error while executing System Update: " + e.getMessage());
+				e.printStackTrace();
+				result.completeExceptionally(new OpenemsException(e.getMessage() + "\n" + response.toString()));
+			}
+			this.updateState.setRunning(false);
+		});
+		return result;
 	}
 
 	private void executeUpdate(CompletableFuture<JsonrpcResponseSuccess> result) throws Exception {
@@ -179,7 +176,7 @@ private void executeUpdate(CompletableFuture<JsonrpcResponseSuccess> result) thr
 			// Download Update Script to temporary file
 			this.updateState.addLog("# Downloading update script [" + OpenemsOEM.SYSTEM_UPDATE_SCRIPT_URL + "]");
 			scriptFile = Files.createTempFile("system-update-script-", null);
-			String script = //
+			var script = //
 					"export PS4='" + MARKER_BASH_TRACE + "${LINENO} '; \n" //
 							+ this.download(OpenemsOEM.SYSTEM_UPDATE_SCRIPT_URL);
 			Files.write(scriptFile, script.getBytes(StandardCharsets.US_ASCII));
@@ -192,7 +189,7 @@ private void executeUpdate(CompletableFuture<JsonrpcResponseSuccess> result) thr
 
 				{
 					this.updateState.addLog("# Executing 'apt-get update'");
-					ExecuteSystemCommandResponse response = this.executeSystemCommand("apt-get update", 3600).get();
+					var response = this.executeSystemCommand("apt-get update", 3600).get();
 					this.updateState.addLog("'apt-get update'", response);
 					if (response.getExitCode() != 0) {
 						throw new Exception("'apt-get update' failed");
@@ -200,7 +197,7 @@ private void executeUpdate(CompletableFuture<JsonrpcResponseSuccess> result) thr
 				}
 				{
 					this.updateState.addLog("# Executing 'apt-get install at'");
-					ExecuteSystemCommandResponse response = this.executeSystemCommand("apt-get -y install at", 3600)
+					var response = this.executeSystemCommand("apt-get -y install at", 3600)
 							.get();
 					this.updateState.addLog("'apt-get install at'", response);
 					if (response.getExitCode() != 0) {
@@ -212,7 +209,7 @@ private void executeUpdate(CompletableFuture<JsonrpcResponseSuccess> result) thr
 			// Execute Update Script
 			{
 				this.updateState.addLog("# Executing update script [" + scriptFile + "]");
-				ExecuteSystemCommandResponse response = this.executeSystemCommand("echo '" //
+				var response = this.executeSystemCommand("echo '" //
 						+ "  {" //
 						+ "    bash -ex " + scriptFile.toString() + "; " //
 						+ "    if [ $? -eq 0 ]; then " //
@@ -228,12 +225,12 @@ private void executeUpdate(CompletableFuture<JsonrpcResponseSuccess> result) thr
 			}
 
 			// Read log output
-			boolean keepReading = true;
+			var keepReading = true;
 
-			try (final BufferedReader reader = new BufferedReader(
+			try (final var reader = new BufferedReader(
 					new InputStreamReader(new FileInputStream(logFile.toFile()), StandardCharsets.ISO_8859_1))) {
 				while (keepReading) {
-					final String line = reader.readLine();
+					final var line = reader.readLine();
 					if (line == null) {
 						// wait until there is more of the file for us to read
 						Thread.sleep(500);
@@ -245,11 +242,11 @@ private void executeUpdate(CompletableFuture<JsonrpcResponseSuccess> result) thr
 						/*
 						 * Update percent completed + reformat commands
 						 */
-						String lineWithNumber = line.substring(MARKER_BASH_TRACE.length());
-						int lengthOfNumber = lineWithNumber.indexOf(" ");
+						var lineWithNumber = line.substring(MARKER_BASH_TRACE.length());
+						var lengthOfNumber = lineWithNumber.indexOf(" ");
 						// Parse number of line and calculate percent completed
-						int numberOfLine = Integer.parseInt(lineWithNumber.substring(0, lengthOfNumber));
-						this.updateState.setPercentCompleted(Math.round((numberOfLine * 100) / totalNumberOfLines));
+						var numberOfLine = Integer.parseInt(lineWithNumber.substring(0, lengthOfNumber));
+						this.updateState.setPercentCompleted(Math.round(numberOfLine * 100 / totalNumberOfLines));
 						// Strip number of line and prefix with '#'
 						log = "# " + lineWithNumber.substring(lengthOfNumber);
 
diff --git a/io.openems.edge.core/src/io/openems/edge/core/host/UsbConfigurationWorker.java b/io.openems.edge.core/src/io/openems/edge/core/host/UsbConfigurationWorker.java
index 17261127459..4e0ea8ba2d2 100644
--- a/io.openems.edge.core/src/io/openems/edge/core/host/UsbConfigurationWorker.java
+++ b/io.openems.edge.core/src/io/openems/edge/core/host/UsbConfigurationWorker.java
@@ -3,10 +3,8 @@
 import java.io.IOException;
 import java.time.LocalDateTime;
 import java.time.temporal.ChronoUnit;
-import java.util.Dictionary;
 import java.util.Hashtable;
 
-import org.osgi.service.cm.Configuration;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -31,8 +29,8 @@ public UsbConfigurationWorker(HostImpl parent) {
 	@Override
 	protected void forever() {
 		try {
-			String actualUsbConfiguration = this.parent.operatingSystem.getUsbConfiguration();
-			String persistedUsbConfiguration = this.parent.config.usbConfiguration();
+			var actualUsbConfiguration = this.parent.operatingSystem.getUsbConfiguration();
+			var persistedUsbConfiguration = this.parent.config.usbConfiguration();
 
 			if (!actualUsbConfiguration.equals(persistedUsbConfiguration)) {
 				this.persistUsbConfiguration(actualUsbConfiguration);
@@ -46,14 +44,14 @@ protected void forever() {
 
 	/**
 	 * Reconfigure Parent to persist the actual network configuration.
-	 * 
+	 *
 	 * @param networkConfiguration the actual network configuration
 	 * @throws IOException on error
 	 */
 	private void persistUsbConfiguration(String networkConfiguration) throws IOException {
-		String factoryPid = this.parent.serviceFactoryPid();
-		final Configuration config = this.parent.cm.getConfiguration(factoryPid, null);
-		Dictionary<String, Object> properties = config.getProperties();
+		var factoryPid = this.parent.serviceFactoryPid();
+		final var config = this.parent.cm.getConfiguration(factoryPid, null);
+		var properties = config.getProperties();
 		if (properties == null) {
 			// No 'Host' configuration existing yet -> create new configuration
 			properties = new Hashtable<>();
diff --git a/io.openems.edge.core/src/io/openems/edge/core/host/jsonrpc/ExecuteSystemCommandRequest.java b/io.openems.edge.core/src/io/openems/edge/core/host/jsonrpc/ExecuteSystemCommandRequest.java
index 6e36e0ee621..cd39b464af7 100644
--- a/io.openems.edge.core/src/io/openems/edge/core/host/jsonrpc/ExecuteSystemCommandRequest.java
+++ b/io.openems.edge.core/src/io/openems/edge/core/host/jsonrpc/ExecuteSystemCommandRequest.java
@@ -8,11 +8,10 @@
 import io.openems.common.exceptions.OpenemsError.OpenemsNamedException;
 import io.openems.common.jsonrpc.base.JsonrpcRequest;
 import io.openems.common.utils.JsonUtils;
-import io.openems.common.utils.JsonUtils.JsonObjectBuilder;
 
 /**
  * Represents a JSON-RPC Request to execute a system command on OpenEMS Edge.
- * 
+ *
  * <pre>
  * {
  *   "jsonrpc": "2.0",
@@ -37,19 +36,19 @@ public class ExecuteSystemCommandRequest extends JsonrpcRequest {
 	/**
 	 * Parses a generic {@link JsonrpcRequest} to a
 	 * {@link ExecuteSystemCommandRequest}.
-	 * 
+	 *
 	 * @param r the {@link JsonrpcRequest}
 	 * @return the {@link ExecuteSystemCommandRequest}
 	 * @throws OpenemsNamedException on error
 	 */
 	public static ExecuteSystemCommandRequest from(JsonrpcRequest r) throws OpenemsNamedException {
-		JsonObject p = r.getParams();
-		String command = JsonUtils.getAsString(p, "command");
+		var p = r.getParams();
+		var command = JsonUtils.getAsString(p, "command");
 		boolean runInBackground = JsonUtils.getAsOptionalBoolean(p, "runInBackground")
 				.orElse(DEFAULT_RUN_IN_BACKGROUND);
 		int timeoutSeconds = JsonUtils.getAsOptionalInt(p, "timeoutSeconds").orElse(DEFAULT_TIMEOUT_SECONDS);
-		Optional<String> username = JsonUtils.getAsOptionalString(p, "username");
-		Optional<String> password = JsonUtils.getAsOptionalString(p, "password");
+		var username = JsonUtils.getAsOptionalString(p, "username");
+		var password = JsonUtils.getAsOptionalString(p, "password");
 		return new ExecuteSystemCommandRequest(r.getId(), command, runInBackground, timeoutSeconds, username, password);
 	}
 
@@ -61,7 +60,7 @@ public static ExecuteSystemCommandRequest from(JsonrpcRequest r) throws OpenemsN
 
 	/**
 	 * Factory without Username + Password; run in background without timeout.
-	 * 
+	 *
 	 * @param command the command
 	 * @return the {@link ExecuteSystemCommandRequest}
 	 */
@@ -71,7 +70,7 @@ public static ExecuteSystemCommandRequest runInBackgroundWithoutAuthentication(S
 
 	/**
 	 * Factory without Username + Password.
-	 * 
+	 *
 	 * @param command         the command
 	 * @param runInBackground run the command in background (true) or in foreground
 	 *                        (false)
@@ -102,7 +101,7 @@ public ExecuteSystemCommandRequest(UUID id, String command, boolean runInBackgro
 
 	@Override
 	public JsonObject getParams() {
-		JsonObjectBuilder result = JsonUtils.buildJsonObject() //
+		var result = JsonUtils.buildJsonObject() //
 				.addProperty("command", this.command) //
 				.addProperty("runInBackground", this.runInBackground) //
 				.addProperty("timeoutSeconds", this.timeoutSeconds); //
@@ -117,7 +116,7 @@ public JsonObject getParams() {
 
 	/**
 	 * Gets the request command.
-	 * 
+	 *
 	 * @return the command
 	 */
 	public String getCommand() {
@@ -126,7 +125,7 @@ public String getCommand() {
 
 	/**
 	 * Gets the request isRunInBackground option.
-	 * 
+	 *
 	 * @return the isRunInBackground option
 	 */
 	public boolean isRunInBackground() {
@@ -135,7 +134,7 @@ public boolean isRunInBackground() {
 
 	/**
 	 * Gets the request timeout.
-	 * 
+	 *
 	 * @return the timeout in seconds
 	 */
 	public int getTimeoutSeconds() {
@@ -144,7 +143,7 @@ public int getTimeoutSeconds() {
 
 	/**
 	 * Gets the request username.
-	 * 
+	 *
 	 * @return the username
 	 */
 	public Optional<String> getUsername() {
@@ -153,7 +152,7 @@ public Optional<String> getUsername() {
 
 	/**
 	 * Gets the request password.
-	 * 
+	 *
 	 * @return the password
 	 */
 	public Optional<String> getPassword() {
diff --git a/io.openems.edge.core/src/io/openems/edge/core/host/jsonrpc/ExecuteSystemCommandResponse.java b/io.openems.edge.core/src/io/openems/edge/core/host/jsonrpc/ExecuteSystemCommandResponse.java
index ba8937e964d..bc112a3bd5b 100644
--- a/io.openems.edge.core/src/io/openems/edge/core/host/jsonrpc/ExecuteSystemCommandResponse.java
+++ b/io.openems.edge.core/src/io/openems/edge/core/host/jsonrpc/ExecuteSystemCommandResponse.java
@@ -10,9 +10,9 @@
 
 /**
  * JSON-RPC Response to "executeSystemCommand" Request.
- * 
+ *
  * <p>
- * 
+ *
  * <pre>
  * {
  *   "jsonrpc": "2.0",
@@ -40,11 +40,11 @@ public ExecuteSystemCommandResponse(UUID id, String[] stdout, String[] stderr, i
 
 	@Override
 	public JsonObject getResult() {
-		JsonArray stdout = new JsonArray();
+		var stdout = new JsonArray();
 		for (String line : this.stdout) {
 			stdout.add(line);
 		}
-		JsonArray stderr = new JsonArray();
+		var stderr = new JsonArray();
 		for (String line : this.stderr) {
 			stderr.add(line);
 		}
diff --git a/io.openems.edge.core/src/io/openems/edge/core/host/jsonrpc/ExecuteSystemUpdateRequest.java b/io.openems.edge.core/src/io/openems/edge/core/host/jsonrpc/ExecuteSystemUpdateRequest.java
index 90b25ecdccd..d6f942688da 100644
--- a/io.openems.edge.core/src/io/openems/edge/core/host/jsonrpc/ExecuteSystemUpdateRequest.java
+++ b/io.openems.edge.core/src/io/openems/edge/core/host/jsonrpc/ExecuteSystemUpdateRequest.java
@@ -9,7 +9,7 @@
 
 /**
  * Executes a System Update.
- * 
+ *
  * <pre>
  * {
  *   "jsonrpc": "2.0",
@@ -28,14 +28,14 @@ public class ExecuteSystemUpdateRequest extends JsonrpcRequest {
 	/**
 	 * Parses a generic {@link JsonrpcRequest} to a
 	 * {@link ExecuteSystemUpdateRequest}.
-	 * 
+	 *
 	 * @param r the {@link JsonrpcRequest}
 	 * @return the {@link ExecuteSystemUpdateRequest}
 	 * @throws OpenemsNamedException on error
 	 */
 	public static ExecuteSystemUpdateRequest from(JsonrpcRequest r) throws OpenemsNamedException {
-		JsonObject p = r.getParams();
-		boolean isDebug = JsonUtils.getAsBoolean(p, "isDebug");
+		var p = r.getParams();
+		var isDebug = JsonUtils.getAsBoolean(p, "isDebug");
 		return new ExecuteSystemUpdateRequest(r, isDebug);
 	}
 
diff --git a/io.openems.edge.core/src/io/openems/edge/core/host/jsonrpc/GetNetworkConfigRequest.java b/io.openems.edge.core/src/io/openems/edge/core/host/jsonrpc/GetNetworkConfigRequest.java
index b302d8937c1..000e5770ed1 100644
--- a/io.openems.edge.core/src/io/openems/edge/core/host/jsonrpc/GetNetworkConfigRequest.java
+++ b/io.openems.edge.core/src/io/openems/edge/core/host/jsonrpc/GetNetworkConfigRequest.java
@@ -8,7 +8,7 @@
 
 /**
  * Gets the current network configuration.
- * 
+ *
  * <pre>
  * {
  *   "jsonrpc": "2.0",
@@ -24,7 +24,7 @@ public class GetNetworkConfigRequest extends JsonrpcRequest {
 
 	/**
 	 * Parses a generic {@link JsonrpcRequest} to a {@link GetNetworkConfigRequest}.
-	 * 
+	 *
 	 * @param r the {@link JsonrpcRequest}
 	 * @return the {@link GetNetworkConfigRequest}
 	 * @throws OpenemsNamedException on error
diff --git a/io.openems.edge.core/src/io/openems/edge/core/host/jsonrpc/GetNetworkConfigResponse.java b/io.openems.edge.core/src/io/openems/edge/core/host/jsonrpc/GetNetworkConfigResponse.java
index 5e141876c9a..109addf184b 100644
--- a/io.openems.edge.core/src/io/openems/edge/core/host/jsonrpc/GetNetworkConfigResponse.java
+++ b/io.openems.edge.core/src/io/openems/edge/core/host/jsonrpc/GetNetworkConfigResponse.java
@@ -9,9 +9,9 @@
 
 /**
  * JSON-RPC Response to "getNetworkConfig" Request.
- * 
+ *
  * <p>
- * 
+ *
  * <pre>
  * {
  *   "jsonrpc": "2.0",
diff --git a/io.openems.edge.core/src/io/openems/edge/core/host/jsonrpc/GetSystemUpdateStateRequest.java b/io.openems.edge.core/src/io/openems/edge/core/host/jsonrpc/GetSystemUpdateStateRequest.java
index e4fdb48b156..1ec7f1c7edd 100644
--- a/io.openems.edge.core/src/io/openems/edge/core/host/jsonrpc/GetSystemUpdateStateRequest.java
+++ b/io.openems.edge.core/src/io/openems/edge/core/host/jsonrpc/GetSystemUpdateStateRequest.java
@@ -9,7 +9,7 @@
 
 /**
  * Gets the System Update State.
- * 
+ *
  * <pre>
  * {
  *   "jsonrpc": "2.0",
@@ -28,7 +28,7 @@ public class GetSystemUpdateStateRequest extends JsonrpcRequest {
 	/**
 	 * Parses a generic {@link JsonrpcRequest} to a
 	 * {@link GetSystemUpdateStateRequest}.
-	 * 
+	 *
 	 * @param r the {@link JsonrpcRequest}
 	 * @return the {@link GetSystemUpdateStateRequest}
 	 * @throws OpenemsNamedException on error
diff --git a/io.openems.edge.core/src/io/openems/edge/core/host/jsonrpc/GetSystemUpdateStateResponse.java b/io.openems.edge.core/src/io/openems/edge/core/host/jsonrpc/GetSystemUpdateStateResponse.java
index 9fbc200aa97..e5db265bab7 100644
--- a/io.openems.edge.core/src/io/openems/edge/core/host/jsonrpc/GetSystemUpdateStateResponse.java
+++ b/io.openems.edge.core/src/io/openems/edge/core/host/jsonrpc/GetSystemUpdateStateResponse.java
@@ -16,14 +16,13 @@
 import io.openems.common.jsonrpc.base.JsonrpcResponseSuccess;
 import io.openems.common.types.SemanticVersion;
 import io.openems.common.utils.JsonUtils;
-import io.openems.common.utils.JsonUtils.JsonArrayBuilder;
 import io.openems.edge.core.host.SystemUpdateHandler;
 
 /**
  * JSON-RPC Response to "getSystemUpdateState" Request.
- * 
+ *
  * <p>
- * 
+ *
  * <pre>
  * {
  *   "jsonrpc": "2.0",
@@ -110,7 +109,7 @@ public static class UpdateState {
 
 		private final AtomicBoolean isRunning = new AtomicBoolean(false);
 		private final AtomicInteger percentCompleted = new AtomicInteger(0);
-		private List<String> logs = new ArrayList<>();
+		private final List<String> logs = new ArrayList<>();
 		private boolean debugMode = false;
 
 		public UpdateState() {
@@ -135,7 +134,7 @@ public synchronized void setDebugMode(boolean debugMode) {
 
 		/**
 		 * Adds a line to the log.
-		 * 
+		 *
 		 * @param line the line
 		 */
 		public void addLog(String line) {
@@ -149,32 +148,32 @@ public void addLog(String line) {
 
 		/**
 		 * Adds a {@link Exception} to the log.
-		 * 
+		 *
 		 * @param e the {@link Exception}
 		 */
 		public void addLog(Exception e) {
-			StringWriter sw = new StringWriter();
-			PrintWriter pw = new PrintWriter(sw);
+			var sw = new StringWriter();
+			var pw = new PrintWriter(sw);
 			e.printStackTrace(pw);
 			this.addLog(pw.toString());
 		}
 
 		/**
 		 * Adds a {@link ExecuteSystemCommandResponse} with a label to the log.
-		 * 
+		 *
 		 * @param label    the label
 		 * @param response the {@link ExecuteSystemCommandResponse}
 		 */
 		public void addLog(String label, ExecuteSystemCommandResponse response) {
 			synchronized (this.log) {
-				String[] stdout = response.getStdout();
+				var stdout = response.getStdout();
 				if (stdout.length > 0) {
 					this.addLog(label + ": STDOUT");
 					for (String line : stdout) {
 						this.addLog(label + ": " + line);
 					}
 				}
-				String[] stderr = response.getStderr();
+				var stderr = response.getStderr();
 				if (stderr.length > 0) {
 					this.addLog(label + ": STDERR");
 					for (String line : stderr) {
@@ -190,7 +189,7 @@ public void addLog(String label, ExecuteSystemCommandResponse response) {
 		}
 
 		protected JsonObject toJsonObject() {
-			JsonArrayBuilder logs = JsonUtils.buildJsonArray();
+			var logs = JsonUtils.buildJsonArray();
 			synchronized (this.log) {
 				for (String log : this.logs) {
 					logs.add(log);
@@ -233,7 +232,7 @@ public JsonObject toJsonObject() {
 
 	/**
 	 * Builds a {@link GetSystemUpdateStateResponse} for {@link Running} state.
-	 * 
+	 *
 	 * @param id          the request ID
 	 * @param updateState the {@link UpdateState}
 	 * @return the {@link GetSystemUpdateStateResponse}
@@ -245,7 +244,7 @@ public static GetSystemUpdateStateResponse isRunning(UUID id, UpdateState update
 	/**
 	 * Builds a {@link GetSystemUpdateStateResponse} for {@link Unknown},
 	 * {@link Updated} or {@link Available} state.
-	 * 
+	 *
 	 * @param id             the request ID
 	 * @param currentVersion the current version
 	 * @param latestVersion  the latest version
@@ -262,9 +261,8 @@ public static GetSystemUpdateStateResponse from(UUID id, String currentVersion,
 		}
 		if (current.isAtLeast(latest)) {
 			return new GetSystemUpdateStateResponse(id, new Updated(current));
-		} else {
-			return new GetSystemUpdateStateResponse(id, new Available(current, latest));
 		}
+		return new GetSystemUpdateStateResponse(id, new Available(current, latest));
 	}
 
 	private GetSystemUpdateStateResponse(UUID id, SystemUpdateState state) {
diff --git a/io.openems.edge.core/src/io/openems/edge/core/host/jsonrpc/SetNetworkConfigRequest.java b/io.openems.edge.core/src/io/openems/edge/core/host/jsonrpc/SetNetworkConfigRequest.java
index 00fd4f774b1..2f004cf07d8 100644
--- a/io.openems.edge.core/src/io/openems/edge/core/host/jsonrpc/SetNetworkConfigRequest.java
+++ b/io.openems.edge.core/src/io/openems/edge/core/host/jsonrpc/SetNetworkConfigRequest.java
@@ -14,7 +14,7 @@
 
 /**
  * Updates the current network configuration.
- * 
+ *
  * <pre>
  * {
  *   "jsonrpc": "2.0",
@@ -39,14 +39,14 @@ public class SetNetworkConfigRequest extends JsonrpcRequest {
 
 	/**
 	 * Parses a generic {@link JsonrpcRequest} to a {@link SetNetworkConfigRequest}.
-	 * 
+	 *
 	 * @param r the {@link JsonrpcRequest}
 	 * @return the {@link SetNetworkConfigRequest}
 	 * @throws OpenemsNamedException on error
 	 */
 	public static SetNetworkConfigRequest from(JsonrpcRequest r) throws OpenemsNamedException {
-		JsonObject p = r.getParams();
-		JsonObject jInterfaces = JsonUtils.getAsJsonObject(p, "interfaces");
+		var p = r.getParams();
+		var jInterfaces = JsonUtils.getAsJsonObject(p, "interfaces");
 		List<NetworkInterface<?>> interfaces = new ArrayList<>();
 		for (Entry<String, JsonElement> entry : jInterfaces.entrySet()) {
 			interfaces.add(NetworkInterface.from(entry.getKey(), JsonUtils.getAsJsonObject(entry.getValue())));
@@ -68,7 +68,7 @@ private SetNetworkConfigRequest(JsonrpcRequest request, List<NetworkInterface<?>
 
 	@Override
 	public JsonObject getParams() {
-		JsonObject interfaces = new JsonObject();
+		var interfaces = new JsonObject();
 		for (NetworkInterface<?> iface : this.networkInterfaces) {
 			interfaces.add(iface.getName(), iface.toJson());
 		}
@@ -79,7 +79,7 @@ public JsonObject getParams() {
 
 	/**
 	 * Gets the request network interfaces.
-	 * 
+	 *
 	 * @return the network interfaces
 	 */
 	public List<NetworkInterface<?>> getNetworkInterface() {
diff --git a/io.openems.edge.core/src/io/openems/edge/core/host/jsonrpc/SystemUpdateRequest.java b/io.openems.edge.core/src/io/openems/edge/core/host/jsonrpc/SystemUpdateRequest.java
index 8e8d76ba775..4c5fec853a3 100644
--- a/io.openems.edge.core/src/io/openems/edge/core/host/jsonrpc/SystemUpdateRequest.java
+++ b/io.openems.edge.core/src/io/openems/edge/core/host/jsonrpc/SystemUpdateRequest.java
@@ -8,7 +8,7 @@
 
 /**
  * Represents a JSON-RPC Request to execute a system update.
- * 
+ *
  * <pre>
  * {
  *   "jsonrpc": "2.0",
@@ -24,7 +24,7 @@ public class SystemUpdateRequest extends JsonrpcRequest {
 
 	/**
 	 * Parses a generic {@link JsonrpcRequest} to a {@link SystemUpdateRequest}.
-	 * 
+	 *
 	 * @param r the {@link JsonrpcRequest}
 	 * @return the {@link SystemUpdateRequest}
 	 * @throws OpenemsNamedException on error
diff --git a/io.openems.edge.core/src/io/openems/edge/core/meta/MetaImpl.java b/io.openems.edge.core/src/io/openems/edge/core/meta/MetaImpl.java
index e1a6fec4a52..492981f9008 100644
--- a/io.openems.edge.core/src/io/openems/edge/core/meta/MetaImpl.java
+++ b/io.openems.edge.core/src/io/openems/edge/core/meta/MetaImpl.java
@@ -38,10 +38,10 @@ public MetaImpl() {
 	void activate(ComponentContext context) {
 		super.activate(context, SINGLETON_COMPONENT_ID, Meta.SINGLETON_SERVICE_PID, true);
 		if (OpenemsComponent.validateSingleton(this.cm, Meta.SINGLETON_SERVICE_PID, SINGLETON_COMPONENT_ID)) {
-			return;
 		}
 	}
 
+	@Override
 	@Deactivate
 	protected void deactivate() {
 		super.deactivate();
diff --git a/io.openems.edge.core/src/io/openems/edge/core/predictormanager/Get24HoursPredictionRequest.java b/io.openems.edge.core/src/io/openems/edge/core/predictormanager/Get24HoursPredictionRequest.java
index 2d09cdb307c..0bfd17c6c57 100644
--- a/io.openems.edge.core/src/io/openems/edge/core/predictormanager/Get24HoursPredictionRequest.java
+++ b/io.openems.edge.core/src/io/openems/edge/core/predictormanager/Get24HoursPredictionRequest.java
@@ -14,7 +14,7 @@
 
 /**
  * Wraps a JSON-RPC Request to query a 24 Hours Prediction.
- * 
+ *
  * <pre>
  * {
  *   "jsonrpc": "2.0",
@@ -33,14 +33,14 @@ public class Get24HoursPredictionRequest extends JsonrpcRequest {
 	/**
 	 * Create {@link Get24HoursPredictionRequest} from a template
 	 * {@link JsonrpcRequest}.
-	 * 
+	 *
 	 * @param r the template {@link JsonrpcRequest}
 	 * @return the {@link Get24HoursPredictionRequest}
 	 * @throws OpenemsNamedException on parse error
 	 */
 	public static Get24HoursPredictionRequest from(JsonrpcRequest r) throws OpenemsNamedException {
-		JsonObject p = r.getParams();
-		JsonArray cs = JsonUtils.getAsJsonArray(p, "channels");
+		var p = r.getParams();
+		var cs = JsonUtils.getAsJsonArray(p, "channels");
 		List<ChannelAddress> channels = new ArrayList<>();
 		for (JsonElement c : cs) {
 			channels.add(ChannelAddress.fromString(JsonUtils.getAsString(c)));
@@ -62,7 +62,7 @@ private Get24HoursPredictionRequest(JsonrpcRequest request, List<ChannelAddress>
 
 	@Override
 	public JsonObject getParams() {
-		JsonArray channels = new JsonArray();
+		var channels = new JsonArray();
 		for (ChannelAddress channel : this.channels) {
 			channels.add(channel.toString());
 		}
@@ -73,7 +73,7 @@ public JsonObject getParams() {
 
 	/**
 	 * Gets the {@link ChannelAddress}es.
-	 * 
+	 *
 	 * @return a list of {@link ChannelAddress}
 	 */
 	public List<ChannelAddress> getChannels() {
diff --git a/io.openems.edge.core/src/io/openems/edge/core/predictormanager/Get24HoursPredictionResponse.java b/io.openems.edge.core/src/io/openems/edge/core/predictormanager/Get24HoursPredictionResponse.java
index 674038be72d..ef582f5a079 100644
--- a/io.openems.edge.core/src/io/openems/edge/core/predictormanager/Get24HoursPredictionResponse.java
+++ b/io.openems.edge.core/src/io/openems/edge/core/predictormanager/Get24HoursPredictionResponse.java
@@ -13,9 +13,9 @@
 
 /**
  * Wraps a JSON-RPC Response to "get24HoursPrediction" Request.
- * 
+ *
  * <p>
- * 
+ *
  * <pre>
  * {
  *   "jsonrpc": "2.0",
@@ -39,9 +39,9 @@ public Get24HoursPredictionResponse(UUID id, Map<ChannelAddress, Prediction24Hou
 
 	@Override
 	public JsonObject getResult() {
-		JsonObject j = new JsonObject();
+		var j = new JsonObject();
 		for (Entry<ChannelAddress, Prediction24Hours> entry : this.predictions.entrySet()) {
-			JsonArray values = new JsonArray();
+			var values = new JsonArray();
 			for (Integer value : entry.getValue().getValues()) {
 				values.add(value);
 			}
@@ -52,7 +52,7 @@ public JsonObject getResult() {
 
 	/**
 	 * Gets the {@link Prediction24Hours}s per {@link ChannelAddress}.
-	 * 
+	 *
 	 * @return a map of Predictions
 	 */
 	public Map<ChannelAddress, Prediction24Hours> getPredictions() {
diff --git a/io.openems.edge.core/src/io/openems/edge/core/predictormanager/PredictorManagerImpl.java b/io.openems.edge.core/src/io/openems/edge/core/predictormanager/PredictorManagerImpl.java
index 16ff47c56da..caf99bd9ded 100644
--- a/io.openems.edge.core/src/io/openems/edge/core/predictormanager/PredictorManagerImpl.java
+++ b/io.openems.edge.core/src/io/openems/edge/core/predictormanager/PredictorManagerImpl.java
@@ -67,10 +67,10 @@ public PredictorManagerImpl() {
 	void activate(ComponentContext context) {
 		super.activate(context, PredictorManager.SINGLETON_COMPONENT_ID, SINGLETON_SERVICE_PID, true);
 		if (OpenemsComponent.validateSingleton(this.cm, SINGLETON_SERVICE_PID, SINGLETON_COMPONENT_ID)) {
-			return;
 		}
 	}
 
+	@Override
 	@Deactivate
 	protected void deactivate() {
 		super.deactivate();
@@ -97,25 +97,24 @@ private CompletableFuture<? extends JsonrpcResponseSuccess> handleGet24HoursPred
 
 	@Override
 	public Prediction24Hours get24HoursPrediction(ChannelAddress channelAddress) {
-		Predictor24Hours predictor = this.getPredictorBestMatch(channelAddress);
-		if (predictor == null) {
-			// No explicit predictor found
-			if (channelAddress.getComponentId().equals(Sum.SINGLETON_COMPONENT_ID)) {
-				// This is a Sum-Channel. Try to get predictions for each source channel.
-				Sum.ChannelId channelId = Sum.ChannelId.valueOf(
-						io.openems.edge.common.channel.ChannelId.channelIdCamelToUpper(channelAddress.getChannelId()));
-				return this.getPredictionSum(channelId);
-			} else {
-				return Prediction24Hours.EMPTY;
-			}
-		} else {
+		var predictor = this.getPredictorBestMatch(channelAddress);
+		if (predictor != null) {
 			return predictor.get24HoursPrediction(channelAddress);
 		}
+		// No explicit predictor found
+		if (channelAddress.getComponentId().equals(Sum.SINGLETON_COMPONENT_ID)) {
+			// This is a Sum-Channel. Try to get predictions for each source channel.
+			var channelId = Sum.ChannelId.valueOf(
+					io.openems.edge.common.channel.ChannelId.channelIdCamelToUpper(channelAddress.getChannelId()));
+			return this.getPredictionSum(channelId);
+		} else {
+			return Prediction24Hours.EMPTY;
+		}
 	}
 
 	/**
 	 * Gets the {@link Prediction24Hours} for a Sum-Channel.
-	 * 
+	 *
 	 * @param channelId the {@link Sum.ChannelId}
 	 * @return the {@link Prediction24Hours}
 	 */
@@ -167,9 +166,9 @@ private Prediction24Hours getPredictionSum(Sum.ChannelId channelId) {
 		case PRODUCTION_DC_ACTUAL_POWER: {
 			// Sum up "ActualPower" prediction of all EssDcChargers
 			List<EssDcCharger> chargers = this.componentManager.getEnabledComponentsOfType(EssDcCharger.class);
-			Prediction24Hours[] predictions = new Prediction24Hours[chargers.size()];
-			for (int i = 0; i < chargers.size(); i++) {
-				EssDcCharger charger = chargers.get(i);
+			var predictions = new Prediction24Hours[chargers.size()];
+			for (var i = 0; i < chargers.size(); i++) {
+				var charger = chargers.get(i);
 				predictions[i] = this.get24HoursPrediction(
 						new ChannelAddress(charger.id(), EssDcCharger.ChannelId.ACTUAL_POWER.id()));
 			}
@@ -193,9 +192,9 @@ private Prediction24Hours getPredictionSum(Sum.ChannelId channelId) {
 						// should never come here
 						return false;
 					}).collect(Collectors.toList());
-			Prediction24Hours[] predictions = new Prediction24Hours[meters.size()];
-			for (int i = 0; i < meters.size(); i++) {
-				SymmetricMeter meter = meters.get(i);
+			var predictions = new Prediction24Hours[meters.size()];
+			for (var i = 0; i < meters.size(); i++) {
+				var meter = meters.get(i);
 				predictions[i] = this.get24HoursPrediction(
 						new ChannelAddress(meter.id(), SymmetricMeter.ChannelId.ACTIVE_POWER.id()));
 			}
@@ -216,20 +215,21 @@ private Prediction24Hours getPredictionSum(Sum.ChannelId channelId) {
 	/**
 	 * Gets the best matching {@link Predictor24Hours} for the given
 	 * {@link ChannelAddress}.
-	 * 
+	 *
 	 * @param channelAddress the {@link ChannelAddress}
 	 * @return the {@link Predictor24Hours} - or null if none matches
 	 */
 	private synchronized Predictor24Hours getPredictorBestMatch(ChannelAddress channelAddress) {
-		int bestMatchValue = -1;
+		var bestMatchValue = -1;
 		Predictor24Hours bestPredictor = null;
 		for (Predictor24Hours predictor : this.predictors) {
 			for (ChannelAddress pattern : predictor.getChannelAddresses()) {
-				int matchValue = ChannelAddress.match(channelAddress, pattern);
+				var matchValue = ChannelAddress.match(channelAddress, pattern);
 				if (matchValue == 0) {
 					// Exact match
 					return predictor;
-				} else if (matchValue > bestMatchValue) {
+				}
+				if (matchValue > bestMatchValue) {
 					bestMatchValue = matchValue;
 					bestPredictor = predictor;
 				}
diff --git a/io.openems.edge.core/src/io/openems/edge/core/sum/EnergyValuesHandler.java b/io.openems.edge.core/src/io/openems/edge/core/sum/EnergyValuesHandler.java
index f2edfc40ef2..1d12cc9beb0 100644
--- a/io.openems.edge.core/src/io/openems/edge/core/sum/EnergyValuesHandler.java
+++ b/io.openems.edge.core/src/io/openems/edge/core/sum/EnergyValuesHandler.java
@@ -2,7 +2,6 @@
 
 import java.util.HashMap;
 import java.util.Map;
-import java.util.Optional;
 import java.util.concurrent.Executors;
 import java.util.concurrent.ScheduledExecutorService;
 import java.util.concurrent.ScheduledFuture;
@@ -41,7 +40,7 @@ public class EnergyValuesHandler {
 	/**
 	 * Keeps the last energy values. This map is initially filled using the Timedata
 	 * service if it is available.
-	 * 
+	 *
 	 * <ul>
 	 * <li>no entry indicates that the value was not yet read
 	 * <li>null value indicates that there does no historic value exist
@@ -56,7 +55,7 @@ public EnergyValuesHandler(SumImpl parent) {
 
 	public void activate() {
 		this.scheduledFuture = this.executor.schedule(() -> {
-			Timedata timedata = this.parent.timedata;
+			var timedata = this.parent.timedata;
 			if (timedata == null) {
 				// no Timedata service available: fill lastEnergyValues map with nulls.
 				for (Sum.ChannelId channelId : ENERGY_CHANNEL_IDS) {
@@ -65,10 +64,10 @@ public void activate() {
 			} else {
 				// Fill lastEnergyValues map with values from Timedata service
 				for (Sum.ChannelId channelId : ENERGY_CHANNEL_IDS) {
-					ChannelAddress channelAddress = new ChannelAddress("_sum", channelId.id());
+					var channelAddress = new ChannelAddress("_sum", channelId.id());
 					Long value = null;
 					try {
-						Optional<Object> latestValueOpt = this.parent.timedata.getLatestValue(channelAddress).get();
+						var latestValueOpt = this.parent.timedata.getLatestValue(channelAddress).get();
 						if (latestValueOpt.isPresent()) {
 							value = TypeUtils.getAsType(OpenemsType.LONG, latestValueOpt.get());
 						}
@@ -89,7 +88,7 @@ public void deactivate() {
 
 	/**
 	 * Sets the value of the Channel if it is greater-or-equals the lastValue.
-	 * 
+	 *
 	 * @param channelId the Channel-Id
 	 * @param value     the energy value
 	 * @return the value that was set; might be null
@@ -101,7 +100,7 @@ public Long setValue(Sum.ChannelId channelId, Long value) {
 
 		} else if (value == null) {
 			// if value is null, replace it by last value
-			Long lastValue = this.lastEnergyValues.get(channelId);
+			var lastValue = this.lastEnergyValues.get(channelId);
 			value = lastValue;
 		}
 
diff --git a/io.openems.edge.core/src/io/openems/edge/core/sum/SumImpl.java b/io.openems.edge.core/src/io/openems/edge/core/sum/SumImpl.java
index c8c31631594..0c2ab3c0ac0 100644
--- a/io.openems.edge.core/src/io/openems/edge/core/sum/SumImpl.java
+++ b/io.openems.edge.core/src/io/openems/edge/core/sum/SumImpl.java
@@ -21,7 +21,6 @@
 import io.openems.edge.common.channel.calculate.CalculateAverage;
 import io.openems.edge.common.channel.calculate.CalculateIntegerSum;
 import io.openems.edge.common.channel.calculate.CalculateLongSum;
-import io.openems.edge.common.channel.value.Value;
 import io.openems.edge.common.component.AbstractOpenemsComponent;
 import io.openems.edge.common.component.ComponentManager;
 import io.openems.edge.common.component.OpenemsComponent;
@@ -103,6 +102,7 @@ private synchronized void applyConfig(Config config) {
 		}
 	}
 
+	@Override
 	@Deactivate
 	protected void deactivate() {
 		this.energyValuesHandler.deactivate();
@@ -120,52 +120,52 @@ public void updateChannelsBeforeProcessImage() {
 	 */
 	private void calculateChannelValues() {
 		// Ess
-		final CalculateAverage essSoc = new CalculateAverage();
-		final CalculateIntegerSum essActivePower = new CalculateIntegerSum();
-		final CalculateIntegerSum essActivePowerL1 = new CalculateIntegerSum();
-		final CalculateIntegerSum essActivePowerL2 = new CalculateIntegerSum();
-		final CalculateIntegerSum essActivePowerL3 = new CalculateIntegerSum();
-
-		final CalculateIntegerSum essReactivePower = new CalculateIntegerSum();
-
-		final CalculateIntegerSum essMaxApparentPower = new CalculateIntegerSum();
-		final CalculateGridMode essGridMode = new CalculateGridMode();
-		final CalculateLongSum essActiveChargeEnergy = new CalculateLongSum();
-		final CalculateLongSum essActiveDischargeEnergy = new CalculateLongSum();
-		final CalculateLongSum essDcChargeEnergy = new CalculateLongSum();
-		final CalculateLongSum essDcDischargeEnergy = new CalculateLongSum();
-		final CalculateIntegerSum essCapacity = new CalculateIntegerSum();
+		final var essSoc = new CalculateAverage();
+		final var essActivePower = new CalculateIntegerSum();
+		final var essActivePowerL1 = new CalculateIntegerSum();
+		final var essActivePowerL2 = new CalculateIntegerSum();
+		final var essActivePowerL3 = new CalculateIntegerSum();
+
+		final var essReactivePower = new CalculateIntegerSum();
+
+		final var essMaxApparentPower = new CalculateIntegerSum();
+		final var essGridMode = new CalculateGridMode();
+		final var essActiveChargeEnergy = new CalculateLongSum();
+		final var essActiveDischargeEnergy = new CalculateLongSum();
+		final var essDcChargeEnergy = new CalculateLongSum();
+		final var essDcDischargeEnergy = new CalculateLongSum();
+		final var essCapacity = new CalculateIntegerSum();
 
 		// Grid
-		final CalculateIntegerSum gridActivePower = new CalculateIntegerSum();
-		final CalculateIntegerSum gridActivePowerL1 = new CalculateIntegerSum();
-		final CalculateIntegerSum gridActivePowerL2 = new CalculateIntegerSum();
-		final CalculateIntegerSum gridActivePowerL3 = new CalculateIntegerSum();
-		final CalculateIntegerSum gridMinActivePower = new CalculateIntegerSum();
-		final CalculateIntegerSum gridMaxActivePower = new CalculateIntegerSum();
-		final CalculateLongSum gridBuyActiveEnergy = new CalculateLongSum();
-		final CalculateLongSum gridSellActiveEnergy = new CalculateLongSum();
+		final var gridActivePower = new CalculateIntegerSum();
+		final var gridActivePowerL1 = new CalculateIntegerSum();
+		final var gridActivePowerL2 = new CalculateIntegerSum();
+		final var gridActivePowerL3 = new CalculateIntegerSum();
+		final var gridMinActivePower = new CalculateIntegerSum();
+		final var gridMaxActivePower = new CalculateIntegerSum();
+		final var gridBuyActiveEnergy = new CalculateLongSum();
+		final var gridSellActiveEnergy = new CalculateLongSum();
 
 		// Production
-		final CalculateIntegerSum productionAcActivePower = new CalculateIntegerSum();
-		final CalculateIntegerSum productionAcActivePowerL1 = new CalculateIntegerSum();
-		final CalculateIntegerSum productionAcActivePowerL2 = new CalculateIntegerSum();
-		final CalculateIntegerSum productionAcActivePowerL3 = new CalculateIntegerSum();
-		final CalculateIntegerSum productionMaxAcActivePower = new CalculateIntegerSum();
-		final CalculateIntegerSum productionDcActualPower = new CalculateIntegerSum();
-		final CalculateIntegerSum productionMaxDcActualPower = new CalculateIntegerSum();
-		final CalculateLongSum productionAcActiveEnergy = new CalculateLongSum();
-		final CalculateLongSum productionDcActiveEnergy = new CalculateLongSum();
+		final var productionAcActivePower = new CalculateIntegerSum();
+		final var productionAcActivePowerL1 = new CalculateIntegerSum();
+		final var productionAcActivePowerL2 = new CalculateIntegerSum();
+		final var productionAcActivePowerL3 = new CalculateIntegerSum();
+		final var productionMaxAcActivePower = new CalculateIntegerSum();
+		final var productionDcActualPower = new CalculateIntegerSum();
+		final var productionMaxDcActualPower = new CalculateIntegerSum();
+		final var productionAcActiveEnergy = new CalculateLongSum();
+		final var productionDcActiveEnergy = new CalculateLongSum();
 		// handling the corner-case of wrongly measured negative production, due to
 		// cabling errors, etc.
-		final CalculateLongSum productionAcActiveEnergyNegative = new CalculateLongSum();
+		final var productionAcActiveEnergyNegative = new CalculateLongSum();
 
 		for (OpenemsComponent component : this.componentManager.getEnabledComponents()) {
 			if (component instanceof SymmetricEss) {
 				/*
 				 * Ess
 				 */
-				SymmetricEss ess = (SymmetricEss) component;
+				var ess = (SymmetricEss) component;
 
 				if (ess instanceof MetaEss) {
 					// ignore this Ess
@@ -181,7 +181,7 @@ private void calculateChannelValues() {
 				essCapacity.addValue(ess.getCapacityChannel());
 
 				if (ess instanceof AsymmetricEss) {
-					AsymmetricEss e = (AsymmetricEss) ess;
+					var e = (AsymmetricEss) ess;
 					essActivePowerL1.addValue(e.getActivePowerL1Channel());
 					essActivePowerL2.addValue(e.getActivePowerL2Channel());
 					essActivePowerL3.addValue(e.getActivePowerL3Channel());
@@ -192,7 +192,7 @@ private void calculateChannelValues() {
 				}
 
 				if (ess instanceof HybridEss) {
-					HybridEss e = (HybridEss) ess;
+					var e = (HybridEss) ess;
 					essDcChargeEnergy.addValue(e.getDcChargeEnergyChannel());
 					essDcDischargeEnergy.addValue(e.getDcDischargeEnergyChannel());
 				} else {
@@ -211,7 +211,7 @@ private void calculateChannelValues() {
 				/*
 				 * Meter
 				 */
-				SymmetricMeter meter = (SymmetricMeter) component;
+				var meter = (SymmetricMeter) component;
 				switch (meter.getMeterType()) {
 				case PRODUCTION_AND_CONSUMPTION:
 					// TODO PRODUCTION_AND_CONSUMPTION
@@ -236,7 +236,7 @@ private void calculateChannelValues() {
 					gridSellActiveEnergy.addValue(meter.getActiveConsumptionEnergyChannel());
 
 					if (meter instanceof AsymmetricMeter) {
-						AsymmetricMeter m = (AsymmetricMeter) meter;
+						var m = (AsymmetricMeter) meter;
 						gridActivePowerL1.addValue(m.getActivePowerL1Channel());
 						gridActivePowerL2.addValue(m.getActivePowerL2Channel());
 						gridActivePowerL3.addValue(m.getActivePowerL3Channel());
@@ -257,7 +257,7 @@ private void calculateChannelValues() {
 					productionAcActiveEnergyNegative.addValue(meter.getActiveConsumptionEnergyChannel());
 
 					if (meter instanceof AsymmetricMeter) {
-						AsymmetricMeter m = (AsymmetricMeter) meter;
+						var m = (AsymmetricMeter) meter;
 						productionAcActivePowerL1.addValue(m.getActivePowerL1Channel());
 						productionAcActivePowerL2.addValue(m.getActivePowerL2Channel());
 						productionAcActivePowerL3.addValue(m.getActivePowerL3Channel());
@@ -277,7 +277,7 @@ private void calculateChannelValues() {
 				/*
 				 * Ess DC-Charger
 				 */
-				EssDcCharger charger = (EssDcCharger) component;
+				var charger = (EssDcCharger) component;
 				productionDcActualPower.addValue(charger.getActualPowerChannel());
 				productionMaxDcActualPower.addValue(charger.getMaxActualPowerChannel());
 				productionDcActiveEnergy.addValue(charger.getActualEnergyChannel());
@@ -289,81 +289,81 @@ private void calculateChannelValues() {
 		 */
 		// Ess
 		this.getEssSocChannel().setNextValue(essSoc.calculate());
-		Integer essActivePowerSum = essActivePower.calculate();
+		var essActivePowerSum = essActivePower.calculate();
 		this._setEssActivePower(essActivePowerSum);
-		Integer essActivePowerL1Sum = essActivePowerL1.calculate();
+		var essActivePowerL1Sum = essActivePowerL1.calculate();
 		this._setEssActivePowerL1(essActivePowerL1Sum);
-		Integer essActivePowerL2Sum = essActivePowerL2.calculate();
+		var essActivePowerL2Sum = essActivePowerL2.calculate();
 		this._setEssActivePowerL2(essActivePowerL2Sum);
-		Integer essActivePowerL3Sum = essActivePowerL3.calculate();
+		var essActivePowerL3Sum = essActivePowerL3.calculate();
 		this._setEssActivePowerL3(essActivePowerL3Sum);
 
-		Integer essReactivePowerSum = essReactivePower.calculate();
+		var essReactivePowerSum = essReactivePower.calculate();
 		this._setEssReactivePower(essReactivePowerSum);
 
-		Integer essMaxApparentPowerSum = essMaxApparentPower.calculate();
+		var essMaxApparentPowerSum = essMaxApparentPower.calculate();
 		this._setEssMaxApparentPower(essMaxApparentPowerSum);
 		this._setGridMode(essGridMode.calculate());
 
-		Long essActiveChargeEnergySum = essActiveChargeEnergy.calculate();
+		var essActiveChargeEnergySum = essActiveChargeEnergy.calculate();
 		essActiveChargeEnergySum = this.energyValuesHandler.setValue(Sum.ChannelId.ESS_ACTIVE_CHARGE_ENERGY,
 				essActiveChargeEnergySum);
-		Long essActiveDischargeEnergySum = essActiveDischargeEnergy.calculate();
+		var essActiveDischargeEnergySum = essActiveDischargeEnergy.calculate();
 		essActiveDischargeEnergySum = this.energyValuesHandler.setValue(Sum.ChannelId.ESS_ACTIVE_DISCHARGE_ENERGY,
 				essActiveDischargeEnergySum);
 
 		this.energyValuesHandler.setValue(Sum.ChannelId.ESS_DC_CHARGE_ENERGY, essDcChargeEnergy.calculate());
 		this.energyValuesHandler.setValue(Sum.ChannelId.ESS_DC_DISCHARGE_ENERGY, essDcDischargeEnergy.calculate());
 
-		Integer essCapacitySum = essCapacity.calculate();
+		var essCapacitySum = essCapacity.calculate();
 		this._setEssCapacity(essCapacitySum);
 
 		// Grid
-		Integer gridActivePowerSum = gridActivePower.calculate();
+		var gridActivePowerSum = gridActivePower.calculate();
 		this._setGridActivePower(gridActivePowerSum);
-		Integer gridActivePowerL1Sum = gridActivePowerL1.calculate();
+		var gridActivePowerL1Sum = gridActivePowerL1.calculate();
 		this._setGridActivePowerL1(gridActivePowerL1Sum);
-		Integer gridActivePowerL2Sum = gridActivePowerL2.calculate();
+		var gridActivePowerL2Sum = gridActivePowerL2.calculate();
 		this._setGridActivePowerL2(gridActivePowerL2Sum);
-		Integer gridActivePowerL3Sum = gridActivePowerL3.calculate();
+		var gridActivePowerL3Sum = gridActivePowerL3.calculate();
 		this._setGridActivePowerL3(gridActivePowerL3Sum);
 		this._setGridMinActivePower(gridMinActivePower.calculate());
-		Integer gridMaxActivePowerSum = gridMaxActivePower.calculate();
+		var gridMaxActivePowerSum = gridMaxActivePower.calculate();
 		this._setGridMaxActivePower(gridMaxActivePowerSum);
 
-		Long gridBuyActiveEnergySum = gridBuyActiveEnergy.calculate();
+		var gridBuyActiveEnergySum = gridBuyActiveEnergy.calculate();
 		gridBuyActiveEnergySum = this.energyValuesHandler.setValue(Sum.ChannelId.GRID_BUY_ACTIVE_ENERGY,
 				gridBuyActiveEnergySum);
-		Long gridSellActiveEnergySum = gridSellActiveEnergy.calculate();
+		var gridSellActiveEnergySum = gridSellActiveEnergy.calculate();
 		gridSellActiveEnergySum = this.energyValuesHandler.setValue(Sum.ChannelId.GRID_SELL_ACTIVE_ENERGY,
 				gridSellActiveEnergySum);
 
 		// Production
-		Integer productionAcActivePowerSum = productionAcActivePower.calculate();
+		var productionAcActivePowerSum = productionAcActivePower.calculate();
 		this._setProductionAcActivePower(productionAcActivePowerSum);
-		Integer productionAcActivePowerL1Sum = productionAcActivePowerL1.calculate();
+		var productionAcActivePowerL1Sum = productionAcActivePowerL1.calculate();
 		this._setProductionAcActivePowerL1(productionAcActivePowerL1Sum);
-		Integer productionAcActivePowerL2Sum = productionAcActivePowerL2.calculate();
+		var productionAcActivePowerL2Sum = productionAcActivePowerL2.calculate();
 		this._setProductionAcActivePowerL2(productionAcActivePowerL2Sum);
-		Integer productionAcActivePowerL3Sum = productionAcActivePowerL3.calculate();
+		var productionAcActivePowerL3Sum = productionAcActivePowerL3.calculate();
 		this._setProductionAcActivePowerL3(productionAcActivePowerL3Sum);
-		Integer productionDcActualPowerSum = productionDcActualPower.calculate();
+		var productionDcActualPowerSum = productionDcActualPower.calculate();
 		this._setProductionDcActualPower(productionDcActualPowerSum);
 		this._setProductionActivePower(TypeUtils.sum(productionAcActivePowerSum, productionDcActualPowerSum));
 
-		Integer productionMaxAcActivePowerSum = productionMaxAcActivePower.calculate();
+		var productionMaxAcActivePowerSum = productionMaxAcActivePower.calculate();
 		this._setProductionMaxAcActivePower(productionMaxAcActivePowerSum);
-		Integer productionMaxDcActualPowerSum = productionMaxDcActualPower.calculate();
+		var productionMaxDcActualPowerSum = productionMaxDcActualPower.calculate();
 		this._setProductionMaxDcActualPower(productionMaxDcActualPowerSum);
 		this._setProductionMaxActivePower(TypeUtils.sum(productionMaxAcActivePowerSum, productionMaxDcActualPowerSum));
 
-		Long productionAcActiveEnergySum = productionAcActiveEnergy.calculate();
+		var productionAcActiveEnergySum = productionAcActiveEnergy.calculate();
 		productionAcActiveEnergySum = this.energyValuesHandler.setValue(Sum.ChannelId.PRODUCTION_AC_ACTIVE_ENERGY,
 				productionAcActiveEnergySum);
-		Long productionDcActiveEnergySum = productionDcActiveEnergy.calculate();
+		var productionDcActiveEnergySum = productionDcActiveEnergy.calculate();
 		productionDcActiveEnergySum = this.energyValuesHandler.setValue(Sum.ChannelId.PRODUCTION_DC_ACTIVE_ENERGY,
 				productionDcActiveEnergySum);
-		Long productionActiveEnergySum = TypeUtils.sum(productionAcActiveEnergySum, productionDcActiveEnergySum);
+		var productionActiveEnergySum = TypeUtils.sum(productionAcActiveEnergySum, productionDcActiveEnergySum);
 		productionActiveEnergySum = this.energyValuesHandler.setValue(Sum.ChannelId.PRODUCTION_ACTIVE_ENERGY,
 				productionActiveEnergySum);
 
@@ -379,9 +379,9 @@ private void calculateChannelValues() {
 		this._setConsumptionMaxActivePower(TypeUtils.sum(//
 				essMaxApparentPowerSum, gridMaxActivePowerSum, productionMaxAcActivePowerSum));
 
-		Long enterTheSystem = TypeUtils.sum(essActiveDischargeEnergySum, gridBuyActiveEnergySum,
+		var enterTheSystem = TypeUtils.sum(essActiveDischargeEnergySum, gridBuyActiveEnergySum,
 				productionAcActiveEnergySum);
-		Long leaveTheSystem = TypeUtils.sum(essActiveChargeEnergySum, gridSellActiveEnergySum,
+		var leaveTheSystem = TypeUtils.sum(essActiveChargeEnergySum, gridSellActiveEnergySum,
 				/* handling corner-case */ productionAcActiveEnergyNegative.calculate());
 		this.energyValuesHandler.setValue(Sum.ChannelId.CONSUMPTION_ACTIVE_ENERGY,
 				Optional.ofNullable(enterTheSystem).orElse(0L) - Optional.ofNullable(leaveTheSystem).orElse(0L));
@@ -395,14 +395,14 @@ private void calculateChannelValues() {
 	 * Combines the State of all Components.
 	 */
 	private void calculateState() {
-		Level highestLevel = Level.OK;
-		boolean hasIgnoredComponentStates = false;
+		var highestLevel = Level.OK;
+		var hasIgnoredComponentStates = false;
 		for (OpenemsComponent component : this.componentManager.getEnabledComponents()) {
 			if (component == this) {
 				// ignore myself
 				continue;
 			}
-			Level level = component.getState();
+			var level = component.getState();
 			if (this.ignoreStateComponents.contains(component.id()) && level != Level.OK) {
 				// This Components State should be ignored
 				hasIgnoredComponentStates = true;
@@ -432,13 +432,13 @@ private void calculateState() {
 
 	@Override
 	public String debugLog() {
-		StringBuilder result = new StringBuilder();
+		var result = new StringBuilder();
 		// State
-		Level state = this.getState();
+		var state = this.getState();
 		result.append("State:" + state.getName() + " ");
 		// Ess
-		Value<Integer> essSoc = this.getEssSoc();
-		Value<Integer> essActivePower = this.getEssActivePower();
+		var essSoc = this.getEssSoc();
+		var essActivePower = this.getEssActivePower();
 		if (essSoc.isDefined() || essActivePower.isDefined()) {
 			result.append("Ess ");
 			if (essSoc.isDefined() && essActivePower.isDefined()) {
@@ -451,16 +451,16 @@ public String debugLog() {
 			result.append(" ");
 		}
 		// Grid
-		Value<Integer> gridActivePower = this.getGridActivePower();
+		var gridActivePower = this.getGridActivePower();
 		if (gridActivePower.isDefined()) {
 			result.append("Grid:" + gridActivePower.asString() + " ");
 		}
 		// Production
-		Value<Integer> production = this.getProductionActivePower();
+		var production = this.getProductionActivePower();
 		if (production.isDefined()) {
 			result.append("Production");
-			Value<Integer> productionAc = this.getProductionAcActivePower();
-			Value<Integer> productionDc = this.getProductionDcActualPower();
+			var productionAc = this.getProductionAcActivePower();
+			var productionDc = this.getProductionDcActualPower();
 			if (productionAc.isDefined() && productionDc.isDefined()) {
 				result.append(" Total:" + production.asString() //
 						+ ",AC:" + productionAc.asString() //
@@ -472,12 +472,12 @@ public String debugLog() {
 			result.append(" ");
 		}
 		// Consumption
-		Value<Integer> consumptionActivePower = this.getConsumptionActivePower();
+		var consumptionActivePower = this.getConsumptionActivePower();
 		if (consumptionActivePower.isDefined()) {
 			result.append("Consumption:" + consumptionActivePower.asString() + " ");
 		}
 		// Remove last 'space' character and return result
-		String resultString = result.toString();
+		var resultString = result.toString();
 		return resultString.substring(0, resultString.length() - 1);
 	}
 }
diff --git a/io.openems.edge.core/src/io/openems/edge/core/user/Config.java b/io.openems.edge.core/src/io/openems/edge/core/user/Config.java
index b5b016e94a8..e1f58985f37 100644
--- a/io.openems.edge.core/src/io/openems/edge/core/user/Config.java
+++ b/io.openems.edge.core/src/io/openems/edge/core/user/Config.java
@@ -6,7 +6,7 @@
 
 /**
  * Configures the User Service.
- * 
+ *
  * By default the following passwords are set:
  * <ul>
  * <li>User admin: admin
diff --git a/io.openems.edge.core/src/io/openems/edge/core/user/UserServiceImpl.java b/io.openems.edge.core/src/io/openems/edge/core/user/UserServiceImpl.java
index ddf550666b6..2f27fcb4f2b 100644
--- a/io.openems.edge.core/src/io/openems/edge/core/user/UserServiceImpl.java
+++ b/io.openems.edge.core/src/io/openems/edge/core/user/UserServiceImpl.java
@@ -60,14 +60,13 @@ public final Optional<User> authenticate(String username, String password) {
 				if (user.validatePassword(password)) {
 					this.log.info("Authentication successful for user[" + username + "].");
 					return Optional.of(user);
-				} else {
-					this.log.info("Authentication failed for user[" + username + "]: wrong password");
-					return Optional.empty();
 				}
+				this.log.info("Authentication failed for user[" + username + "]: wrong password");
+				return Optional.empty();
 			}
 		}
 		// Try authenticating with password only
-		return authenticate(password);
+		return this.authenticate(password);
 	}
 
 	@Override
diff --git a/io.openems.edge.core/test/io/openems/edge/core/componentmanager/ComponentManagerImplTest.java b/io.openems.edge.core/test/io/openems/edge/core/componentmanager/ComponentManagerImplTest.java
index 4d88fdcb548..3b50e4ddaf3 100644
--- a/io.openems.edge.core/test/io/openems/edge/core/componentmanager/ComponentManagerImplTest.java
+++ b/io.openems.edge.core/test/io/openems/edge/core/componentmanager/ComponentManagerImplTest.java
@@ -11,7 +11,7 @@ public class ComponentManagerImplTest {
 
 	@Test
 	public void test() throws OpenemsException, Exception {
-		final DummyConfigurationAdmin cm = new DummyConfigurationAdmin();
+		final var cm = new DummyConfigurationAdmin();
 		cm.getOrCreateEmptyConfiguration(ComponentManager.SINGLETON_SERVICE_PID);
 		new ComponentTest(new ComponentManagerImpl()) //
 				.addReference("cm", cm) //
diff --git a/io.openems.edge.core/test/io/openems/edge/core/componentmanager/MyConfig.java b/io.openems.edge.core/test/io/openems/edge/core/componentmanager/MyConfig.java
index 8c690fb47fa..f7caf276429 100644
--- a/io.openems.edge.core/test/io/openems/edge/core/componentmanager/MyConfig.java
+++ b/io.openems.edge.core/test/io/openems/edge/core/componentmanager/MyConfig.java
@@ -18,18 +18,15 @@ public MyConfig build() {
 
 	/**
 	 * Create a Config builder.
-	 * 
+	 *
 	 * @return a {@link Builder}
 	 */
 	public static Builder create() {
 		return new Builder();
 	}
 
-	private final Builder builder;
-
 	private MyConfig(Builder builder) {
 		super(Config.class, ComponentManager.SINGLETON_COMPONENT_ID);
-		this.builder = builder;
 	}
 
 }
\ No newline at end of file
diff --git a/io.openems.edge.core/test/io/openems/edge/core/host/MyConfig.java b/io.openems.edge.core/test/io/openems/edge/core/host/MyConfig.java
index 3c20a88b8ab..2468158f6a6 100644
--- a/io.openems.edge.core/test/io/openems/edge/core/host/MyConfig.java
+++ b/io.openems.edge.core/test/io/openems/edge/core/host/MyConfig.java
@@ -30,7 +30,7 @@ public MyConfig build() {
 
 	/**
 	 * Create a Config builder.
-	 * 
+	 *
 	 * @return a {@link Builder}
 	 */
 	public static Builder create() {

From f9f3dc17430fb98de5f0c201b5b38eac5ca90e9f Mon Sep 17 00:00:00 2001
From: Stefan Feilmeier <stefan.feilmeier@fenecon.de>
Date: Tue, 8 Mar 2022 06:31:47 +0100
Subject: [PATCH 54/96] Update io.openems.edge.ess.adstec.storaxe

---
 .../openems/edge/ess/adstec/storaxe/AdstecStoraxeEss.java   | 2 +-
 .../edge/ess/adstec/storaxe/AdstecStoraxeEssImpl.java       | 6 ++++--
 .../test/io/openems/edge/ess/adstec/storaxe/MyConfig.java   | 2 +-
 3 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/io.openems.edge.ess.adstec.storaxe/src/io/openems/edge/ess/adstec/storaxe/AdstecStoraxeEss.java b/io.openems.edge.ess.adstec.storaxe/src/io/openems/edge/ess/adstec/storaxe/AdstecStoraxeEss.java
index 41aa03f143e..2fc29d78530 100644
--- a/io.openems.edge.ess.adstec.storaxe/src/io/openems/edge/ess/adstec/storaxe/AdstecStoraxeEss.java
+++ b/io.openems.edge.ess.adstec.storaxe/src/io/openems/edge/ess/adstec/storaxe/AdstecStoraxeEss.java
@@ -5,7 +5,7 @@
 /**
  * This file should contain all the extra channels apart from the standard
  * natures that the StoraXe provides.
- * 
+ *
  * @author les
  *
  */
diff --git a/io.openems.edge.ess.adstec.storaxe/src/io/openems/edge/ess/adstec/storaxe/AdstecStoraxeEssImpl.java b/io.openems.edge.ess.adstec.storaxe/src/io/openems/edge/ess/adstec/storaxe/AdstecStoraxeEssImpl.java
index 43fd1255f72..fa1dbd3e43f 100644
--- a/io.openems.edge.ess.adstec.storaxe/src/io/openems/edge/ess/adstec/storaxe/AdstecStoraxeEssImpl.java
+++ b/io.openems.edge.ess.adstec.storaxe/src/io/openems/edge/ess/adstec/storaxe/AdstecStoraxeEssImpl.java
@@ -44,6 +44,7 @@ public class AdstecStoraxeEssImpl extends AbstractOpenemsModbusComponent
 	@Reference
 	protected ConfigurationAdmin cm;
 
+	@Override
 	@Reference(policy = ReferencePolicy.STATIC, policyOption = ReferencePolicyOption.GREEDY, cardinality = ReferenceCardinality.MANDATORY)
 	protected void setModbus(BridgeModbus modbus) {
 		super.setModbus(modbus);
@@ -66,6 +67,7 @@ void activate(ComponentContext context, Config config) throws OpenemsException {
 		this._setCapacity(config.capacity());
 	}
 
+	@Override
 	@Deactivate
 	protected void deactivate() {
 		super.deactivate();
@@ -73,12 +75,12 @@ protected void deactivate() {
 
 	@Override
 	protected ModbusProtocol defineModbusProtocol() throws OpenemsException {
-		final int offset = -1; // The Modbus library seems to use 0 offsets.
+		final var offset = -1; // The Modbus library seems to use 0 offsets.
 
 		// We need to override because the ess returns neg for capacitative, pos for
 		// inductive, but the channel expects
 		// pos for from-battery, neg for to-battery.
-		final ElementToChannelConverter reactivePowerConverter = new ElementToChannelConverter(
+		final var reactivePowerConverter = new ElementToChannelConverter(
 				value -> Math.abs((Short) value) * Integer.signum(this.getActivePower().get()));
 
 		return new ModbusProtocol(this, //
diff --git a/io.openems.edge.ess.adstec.storaxe/test/io/openems/edge/ess/adstec/storaxe/MyConfig.java b/io.openems.edge.ess.adstec.storaxe/test/io/openems/edge/ess/adstec/storaxe/MyConfig.java
index bd1a302a7b2..a2910dbfb85 100644
--- a/io.openems.edge.ess.adstec.storaxe/test/io/openems/edge/ess/adstec/storaxe/MyConfig.java
+++ b/io.openems.edge.ess.adstec.storaxe/test/io/openems/edge/ess/adstec/storaxe/MyConfig.java
@@ -37,7 +37,7 @@ public MyConfig build() {
 
 	/**
 	 * Create a Config builder.
-	 * 
+	 *
 	 * @return a {@link Builder}
 	 */
 	public static Builder create() {

From 0a9046980ff9d752afb284f2ca9992d2c4f20d70 Mon Sep 17 00:00:00 2001
From: Stefan Feilmeier <stefan.feilmeier@fenecon.de>
Date: Tue, 8 Mar 2022 06:33:49 +0100
Subject: [PATCH 55/96] Update io.openems.edge.ess.api

---
 .../openems/edge/ess/api/AsymmetricEss.java   | 14 +--
 .../edge/ess/api/CalculateGridMode.java       | 14 +--
 .../io/openems/edge/ess/api/HybridEss.java    | 16 ++--
 .../edge/ess/api/ManagedAsymmetricEss.java    | 91 ++++++++++---------
 .../edge/ess/api/ManagedSinglePhaseEss.java   |  1 +
 .../edge/ess/api/ManagedSymmetricEss.java     | 76 ++++++++--------
 .../src/io/openems/edge/ess/api/MetaEss.java  |  2 +-
 .../openems/edge/ess/api/PowerConstraint.java |  4 +-
 .../io/openems/edge/ess/api/SinglePhase.java  |  4 +-
 .../openems/edge/ess/api/SinglePhaseEss.java  |  4 +-
 .../io/openems/edge/ess/api/SymmetricEss.java | 64 ++++++-------
 .../edge/ess/dccharger/api/EssDcCharger.java  |  9 +-
 .../edge/ess/offgrid/api/OffGridEss.java      |  4 +-
 .../edge/ess/offgrid/api/OffGridSwitch.java   | 62 ++++++-------
 .../edge/ess/power/api/Coefficient.java       |  8 +-
 .../edge/ess/power/api/Coefficients.java      |  4 +-
 .../edge/ess/power/api/Constraint.java        | 12 +--
 .../openems/edge/ess/power/api/EssType.java   |  3 +-
 .../openems/edge/ess/power/api/Inverter.java  |  7 +-
 .../edge/ess/power/api/LinearCoefficient.java |  7 +-
 .../io/openems/edge/ess/power/api/Phase.java  |  2 +-
 .../io/openems/edge/ess/power/api/Power.java  | 40 ++++----
 .../edge/ess/power/api/PowerException.java    |  2 +-
 .../io/openems/edge/ess/power/api/Pwr.java    |  2 +-
 .../ess/power/api/SinglePhaseInverter.java    |  3 +-
 .../openems/edge/ess/test/DummyHybridEss.java | 10 +-
 .../ess/test/DummyManagedSymmetricEss.java    | 16 ++--
 .../openems/edge/ess/test/DummyMetaEss.java   |  2 +-
 .../io/openems/edge/ess/test/DummyPower.java  |  8 +-
 .../ess/test/ManagedSymmetricEssTest.java     |  2 +-
 30 files changed, 245 insertions(+), 248 deletions(-)

diff --git a/io.openems.edge.ess.api/src/io/openems/edge/ess/api/AsymmetricEss.java b/io.openems.edge.ess.api/src/io/openems/edge/ess/api/AsymmetricEss.java
index ebe9fb44e48..805e0995fde 100644
--- a/io.openems.edge.ess.api/src/io/openems/edge/ess/api/AsymmetricEss.java
+++ b/io.openems.edge.ess.api/src/io/openems/edge/ess/api/AsymmetricEss.java
@@ -21,7 +21,7 @@ public interface AsymmetricEss extends SymmetricEss {
 	public enum ChannelId implements io.openems.edge.common.channel.ChannelId {
 		/**
 		 * Active Power L1
-		 * 
+		 *
 		 * <ul>
 		 * <li>Interface: Ess Asymmetric
 		 * <li>Type: Integer
@@ -37,7 +37,7 @@ public enum ChannelId implements io.openems.edge.common.channel.ChannelId {
 						+ "Negative values for charge; positive for discharge")),
 		/**
 		 * Active Power L2
-		 * 
+		 *
 		 * <ul>
 		 * <li>Interface: Ess Asymmetric
 		 * <li>Type: Integer
@@ -53,7 +53,7 @@ public enum ChannelId implements io.openems.edge.common.channel.ChannelId {
 						+ "Negative values for charge; positive for discharge")),
 		/**
 		 * Active Power L3
-		 * 
+		 *
 		 * <ul>
 		 * <li>Interface: Ess Asymmetric
 		 * <li>Type: Integer
@@ -69,7 +69,7 @@ public enum ChannelId implements io.openems.edge.common.channel.ChannelId {
 						+ "Negative values for charge; positive for discharge")),
 		/**
 		 * Reactive Power L1
-		 * 
+		 *
 		 * <ul>
 		 * <li>Interface: Ess Asymmetric
 		 * <li>Type: Integer
@@ -82,7 +82,7 @@ public enum ChannelId implements io.openems.edge.common.channel.ChannelId {
 				.persistencePriority(PersistencePriority.HIGH)), //
 		/**
 		 * Reactive Power L2
-		 * 
+		 *
 		 * <ul>
 		 * <li>Interface: Ess Asymmetric
 		 * <li>Type: Integer
@@ -95,7 +95,7 @@ public enum ChannelId implements io.openems.edge.common.channel.ChannelId {
 				.persistencePriority(PersistencePriority.HIGH)), //
 		/**
 		 * Reactive Power L3
-		 * 
+		 *
 		 * <ul>
 		 * <li>Interface: Ess Asymmetric
 		 * <li>Type: Integer
@@ -365,7 +365,7 @@ public default void _setReactivePowerL3(int value) {
 	/**
 	 * Initializes Channel listeners to set the Active- and Reactive-Power Channel
 	 * value as the sum of L1 + L2 + L3.
-	 * 
+	 *
 	 * @param ess
 	 */
 	public static void initializePowerSumChannels(AsymmetricEss ess) {
diff --git a/io.openems.edge.ess.api/src/io/openems/edge/ess/api/CalculateGridMode.java b/io.openems.edge.ess.api/src/io/openems/edge/ess/api/CalculateGridMode.java
index abd95105d76..2579651b1c4 100644
--- a/io.openems.edge.ess.api/src/io/openems/edge/ess/api/CalculateGridMode.java
+++ b/io.openems.edge.ess.api/src/io/openems/edge/ess/api/CalculateGridMode.java
@@ -15,7 +15,7 @@ public class CalculateGridMode {
 
 	/**
 	 * Adds a Channel-Value.
-	 * 
+	 *
 	 * @param channel
 	 */
 	public void addValue(Channel<GridMode> channel) {
@@ -25,16 +25,16 @@ public void addValue(Channel<GridMode> channel) {
 
 	/**
 	 * Finds the effective Grid-Mode.
-	 * 
+	 *
 	 * @return
 	 */
 	public GridMode calculate() {
-		if(this.values.isEmpty()) {
+		if (this.values.isEmpty()) {
 			return GridMode.UNDEFINED;
 		}
-		
-		int onGrids = 0;
-		int offGrids = 0;
+
+		var onGrids = 0;
+		var offGrids = 0;
 		for (GridMode gridMode : this.values) {
 			switch (gridMode) {
 			case OFF_GRID:
@@ -48,7 +48,7 @@ public GridMode calculate() {
 			}
 		}
 
-		GridMode result = GridMode.UNDEFINED;
+		var result = GridMode.UNDEFINED;
 		if (this.values.size() == onGrids) {
 			result = GridMode.ON_GRID;
 		}
diff --git a/io.openems.edge.ess.api/src/io/openems/edge/ess/api/HybridEss.java b/io.openems.edge.ess.api/src/io/openems/edge/ess/api/HybridEss.java
index 4e3f1dbcc2e..7de16c37288 100644
--- a/io.openems.edge.ess.api/src/io/openems/edge/ess/api/HybridEss.java
+++ b/io.openems.edge.ess.api/src/io/openems/edge/ess/api/HybridEss.java
@@ -21,7 +21,7 @@ public interface HybridEss extends SymmetricEss {
 	public enum ChannelId implements io.openems.edge.common.channel.ChannelId {
 		/**
 		 * DC Discharge Power.
-		 * 
+		 *
 		 * <ul>
 		 * <li>Interface: HybridEss
 		 * <li>Type: Integer
@@ -40,7 +40,7 @@ public enum ChannelId implements io.openems.edge.common.channel.ChannelId {
 						+ "Negative values for charge; positive for discharge")),
 		/**
 		 * DC Charge Energy.
-		 * 
+		 *
 		 * <ul>
 		 * <li>Interface: HybridEss
 		 * <li>Type: Long
@@ -52,7 +52,7 @@ public enum ChannelId implements io.openems.edge.common.channel.ChannelId {
 				.persistencePriority(PersistencePriority.HIGH)), //
 		/**
 		 * DC Discharge Energy.
-		 * 
+		 *
 		 * <ul>
 		 * <li>Interface: HybridEss
 		 * <li>Type: Long
@@ -79,20 +79,20 @@ public Doc doc() {
 	/**
 	 * Gets the Surplus Power of the {@link EssDcCharger}s of this
 	 * {@link HybridEss}.
-	 * 
+	 *
 	 * <p>
 	 * This value is usually calculated from the
 	 * {@link EssDcCharger#getActualPower()} when the battery is full. It is used by
 	 * the Ess.Hybrid.Surplus-Feed-To-Grid Controller to feed the surplus power to
 	 * grid.
-	 * 
+	 *
 	 * @return the surplus power, or 'null' if there is no surplus power
 	 */
 	public Integer getSurplusPower();
 
 	/**
 	 * Gets the Channel for {@link ChannelId#DC_DISCHARGE_POWER}.
-	 * 
+	 *
 	 * @return the Channel
 	 */
 	public default IntegerReadChannel getDcDischargePowerChannel() {
@@ -102,7 +102,7 @@ public default IntegerReadChannel getDcDischargePowerChannel() {
 	/**
 	 * Gets the DC Discharge Power in [W]. Negative values for Charge; positive for
 	 * Discharge. See {@link ChannelId#DC_DISCHARGE_POWER}.
-	 * 
+	 *
 	 * @return the Channel {@link Value}
 	 */
 	public default Value<Integer> getDcDischargePower() {
@@ -112,7 +112,7 @@ public default Value<Integer> getDcDischargePower() {
 	/**
 	 * Internal method to set the 'nextValue' on
 	 * {@link ChannelId#DC_DISCHARGE_POWER} Channel.
-	 * 
+	 *
 	 * @param value the next value
 	 */
 	public default void _setDcDischargePower(Integer value) {
diff --git a/io.openems.edge.ess.api/src/io/openems/edge/ess/api/ManagedAsymmetricEss.java b/io.openems.edge.ess.api/src/io/openems/edge/ess/api/ManagedAsymmetricEss.java
index 971cc7655eb..84c45191057 100644
--- a/io.openems.edge.ess.api/src/io/openems/edge/ess/api/ManagedAsymmetricEss.java
+++ b/io.openems.edge.ess.api/src/io/openems/edge/ess/api/ManagedAsymmetricEss.java
@@ -24,7 +24,7 @@ public interface ManagedAsymmetricEss extends ManagedSymmetricEss, AsymmetricEss
 	public enum ChannelId implements io.openems.edge.common.channel.ChannelId {
 		/**
 		 * Sets a fixed Active Power on L1.
-		 * 
+		 *
 		 * <ul>
 		 * <li>Interface: Managed Asymmetric Ess
 		 * <li>Type: Integer
@@ -38,7 +38,7 @@ public enum ChannelId implements io.openems.edge.common.channel.ChannelId {
 				.onInit(new PowerConstraint("SetActivePowerL1Equals", Phase.L1, Pwr.ACTIVE, Relationship.EQUALS))), //
 		/**
 		 * Sets a fixed Active Power on L2.
-		 * 
+		 *
 		 * <ul>
 		 * <li>Interface: Managed Asymmetric Ess
 		 * <li>Type: Integer
@@ -52,7 +52,7 @@ public enum ChannelId implements io.openems.edge.common.channel.ChannelId {
 				.onInit(new PowerConstraint("SetActivePowerL2Equals", Phase.L2, Pwr.ACTIVE, Relationship.EQUALS))), //
 		/**
 		 * Sets a fixed Active Power on L3.
-		 * 
+		 *
 		 * <ul>
 		 * <li>Interface: Managed Asymmetric Ess
 		 * <li>Type: Integer
@@ -66,7 +66,7 @@ public enum ChannelId implements io.openems.edge.common.channel.ChannelId {
 				.onInit(new PowerConstraint("SetActivePowerL3Equals", Phase.L3, Pwr.ACTIVE, Relationship.EQUALS))), //
 		/**
 		 * Sets a fixed Reactive Power on L1.
-		 * 
+		 *
 		 * <ul>
 		 * <li>Interface: Managed Asymmetric Ess
 		 * <li>Type: Integer
@@ -80,7 +80,7 @@ public enum ChannelId implements io.openems.edge.common.channel.ChannelId {
 				.onInit(new PowerConstraint("SetReactivePowerL1Equals", Phase.L1, Pwr.REACTIVE, Relationship.EQUALS))), //
 		/**
 		 * Sets a fixed Reactive Power on L2.
-		 * 
+		 *
 		 * <ul>
 		 * <li>Interface: Managed Asymmetric Ess
 		 * <li>Type: Integer
@@ -94,7 +94,7 @@ public enum ChannelId implements io.openems.edge.common.channel.ChannelId {
 				.onInit(new PowerConstraint("SetReactivePowerL2Equals", Phase.L2, Pwr.REACTIVE, Relationship.EQUALS))), //
 		/**
 		 * Sets a fixed Reactive Power on L3.
-		 * 
+		 *
 		 * <ul>
 		 * <li>Interface: Managed Asymmetric Ess
 		 * <li>Type: Integer
@@ -108,7 +108,7 @@ public enum ChannelId implements io.openems.edge.common.channel.ChannelId {
 				.onInit(new PowerConstraint("SetReactivePowerL2Equals", Phase.L3, Pwr.REACTIVE, Relationship.EQUALS))), //
 		/**
 		 * Sets a fixed maximum Active Power on L1.
-		 * 
+		 *
 		 * <ul>
 		 * <li>Interface: Managed Asymmetric Ess
 		 * <li>Type: Integer
@@ -123,7 +123,7 @@ public enum ChannelId implements io.openems.edge.common.channel.ChannelId {
 						Relationship.LESS_OR_EQUALS))), //
 		/**
 		 * Sets a fixed maximum Active Power on L2.
-		 * 
+		 *
 		 * <ul>
 		 * <li>Interface: Managed Asymmetric Ess
 		 * <li>Type: Integer
@@ -138,7 +138,7 @@ public enum ChannelId implements io.openems.edge.common.channel.ChannelId {
 						Relationship.LESS_OR_EQUALS))), //
 		/**
 		 * Sets a fixed maximum Active Power on L3.
-		 * 
+		 *
 		 * <ul>
 		 * <li>Interface: Managed Asymmetric Ess
 		 * <li>Type: Integer
@@ -153,7 +153,7 @@ public enum ChannelId implements io.openems.edge.common.channel.ChannelId {
 						Relationship.LESS_OR_EQUALS))), //
 		/**
 		 * Sets a fixed minimum Active Power on L1.
-		 * 
+		 *
 		 * <ul>
 		 * <li>Interface: Managed Asymmetric Ess
 		 * <li>Type: Integer
@@ -168,7 +168,7 @@ public enum ChannelId implements io.openems.edge.common.channel.ChannelId {
 						Relationship.GREATER_OR_EQUALS))), //
 		/**
 		 * Sets a fixed minimum Active Power on L2.
-		 * 
+		 *
 		 * <ul>
 		 * <li>Interface: Managed Asymmetric Ess
 		 * <li>Type: Integer
@@ -183,7 +183,7 @@ public enum ChannelId implements io.openems.edge.common.channel.ChannelId {
 						Relationship.GREATER_OR_EQUALS))), //
 		/**
 		 * Sets a fixed minimum Active Power on L3.
-		 * 
+		 *
 		 * <ul>
 		 * <li>Interface: Managed Asymmetric Ess
 		 * <li>Type: Integer
@@ -198,7 +198,7 @@ public enum ChannelId implements io.openems.edge.common.channel.ChannelId {
 						Relationship.GREATER_OR_EQUALS))), //
 		/**
 		 * Sets a fixed maximum Reactive Power on L1.
-		 * 
+		 *
 		 * <ul>
 		 * <li>Interface: Managed Asymmetric Ess
 		 * <li>Type: Integer
@@ -213,7 +213,7 @@ public enum ChannelId implements io.openems.edge.common.channel.ChannelId {
 						Relationship.LESS_OR_EQUALS))), //
 		/**
 		 * Sets a fixed maximum Reactive Power on L2.
-		 * 
+		 *
 		 * <ul>
 		 * <li>Interface: Managed Asymmetric Ess
 		 * <li>Type: Integer
@@ -228,7 +228,7 @@ public enum ChannelId implements io.openems.edge.common.channel.ChannelId {
 						Relationship.LESS_OR_EQUALS))), //
 		/**
 		 * Sets a fixed maximum Reactive Power on L3.
-		 * 
+		 *
 		 * <ul>
 		 * <li>Interface: Managed Asymmetric Ess
 		 * <li>Type: Integer
@@ -243,7 +243,7 @@ public enum ChannelId implements io.openems.edge.common.channel.ChannelId {
 						Relationship.LESS_OR_EQUALS))), //
 		/**
 		 * Sets a fixed minimum Reactive Power on L1.
-		 * 
+		 *
 		 * <ul>
 		 * <li>Interface: Managed Asymmetric Ess
 		 * <li>Type: Integer
@@ -258,7 +258,7 @@ public enum ChannelId implements io.openems.edge.common.channel.ChannelId {
 						Relationship.GREATER_OR_EQUALS))), //
 		/**
 		 * Sets a fixed minimum Reactive Power on L2.
-		 * 
+		 *
 		 * <ul>
 		 * <li>Interface: Managed Asymmetric Ess
 		 * <li>Type: Integer
@@ -273,7 +273,7 @@ public enum ChannelId implements io.openems.edge.common.channel.ChannelId {
 						Relationship.GREATER_OR_EQUALS))), //
 		/**
 		 * Sets a fixed minimum Reactive Power on L3.
-		 * 
+		 *
 		 * <ul>
 		 * <li>Interface: Managed Asymmetric Ess
 		 * <li>Type: Integer
@@ -288,7 +288,7 @@ public enum ChannelId implements io.openems.edge.common.channel.ChannelId {
 						Relationship.GREATER_OR_EQUALS))), //
 		/**
 		 * Holds settings of Active Power L1 for debugging
-		 * 
+		 *
 		 * <ul>
 		 * <li>Interface: Managed Asymmetric Ess
 		 * <li>Type: Integer
@@ -304,7 +304,7 @@ public enum ChannelId implements io.openems.edge.common.channel.ChannelId {
 				.persistencePriority(PersistencePriority.HIGH)), //
 		/**
 		 * Holds settings of Reactive Power for debugging
-		 * 
+		 *
 		 * <ul>
 		 * <li>Interface: Managed Asymmetric Ess
 		 * <li>Type: Integer
@@ -320,7 +320,7 @@ public enum ChannelId implements io.openems.edge.common.channel.ChannelId {
 				.persistencePriority(PersistencePriority.HIGH)), //
 		/**
 		 * Holds settings of Active Power L2 for debugging
-		 * 
+		 *
 		 * <ul>
 		 * <li>Interface: Managed Asymmetric Ess
 		 * <li>Type: Integer
@@ -336,7 +336,7 @@ public enum ChannelId implements io.openems.edge.common.channel.ChannelId {
 				.persistencePriority(PersistencePriority.HIGH)), //
 		/**
 		 * Holds settings of Reactive Power for debugging
-		 * 
+		 *
 		 * <ul>
 		 * <li>Interface: Managed Asymmetric Ess
 		 * <li>Type: Integer
@@ -352,7 +352,7 @@ public enum ChannelId implements io.openems.edge.common.channel.ChannelId {
 				.persistencePriority(PersistencePriority.HIGH)), //
 		/**
 		 * Holds settings of Active Power L1 for debugging
-		 * 
+		 *
 		 * <ul>
 		 * <li>Interface: Managed Asymmetric Ess
 		 * <li>Type: Integer
@@ -368,7 +368,7 @@ public enum ChannelId implements io.openems.edge.common.channel.ChannelId {
 				.persistencePriority(PersistencePriority.HIGH)), //
 		/**
 		 * Holds settings of Reactive Power for debugging
-		 * 
+		 *
 		 * <ul>
 		 * <li>Interface: Managed Asymmetric Ess
 		 * <li>Type: Integer
@@ -389,6 +389,7 @@ private ChannelId(Doc doc) {
 			this.doc = doc;
 		}
 
+		@Override
 		public Doc doc() {
 			return this.doc;
 		}
@@ -419,15 +420,15 @@ public static ModbusSlaveNatureTable getModbusSlaveNatureTable(AccessMode access
 
 	@Override
 	default void applyPower(int activePower, int reactivePower) throws OpenemsNamedException {
-		int activePowerBy3 = activePower / 3;
-		int reactivePowerBy3 = reactivePower / 3;
+		var activePowerBy3 = activePower / 3;
+		var reactivePowerBy3 = reactivePower / 3;
 		this.applyPower(activePowerBy3, reactivePowerBy3, activePowerBy3, reactivePowerBy3, activePowerBy3,
 				reactivePowerBy3);
 	}
 
 	/**
 	 * Apply the calculated Power
-	 * 
+	 *
 	 * @param activePowerL1
 	 * @param activePowerL2
 	 * @param activePowerL3
@@ -451,7 +452,7 @@ public default IntegerWriteChannel getSetActivePowerL1EqualsChannel() {
 	 * Sets an Active Power Equals setpoint on L1 in [W]. Negative values for
 	 * Charge; positive for Discharge. See
 	 * {@link ChannelId#SET_ACTIVE_POWER_L1_EQUALS}.
-	 * 
+	 *
 	 * @param value the next write value
 	 * @throws OpenemsNamedException on error
 	 */
@@ -472,7 +473,7 @@ public default IntegerWriteChannel getSetActivePowerL2EqualsChannel() {
 	 * Sets an Active Power Equals setpoint on L2 in [W]. Negative values for
 	 * Charge; positive for Discharge. See
 	 * {@link ChannelId#SET_ACTIVE_POWER_L2_EQUALS}.
-	 * 
+	 *
 	 * @param value the next write value
 	 * @throws OpenemsNamedException on error
 	 */
@@ -493,7 +494,7 @@ public default IntegerWriteChannel getSetActivePowerL3EqualsChannel() {
 	 * Sets a Reactive Power Equals setpoint on L3 in [W]. Negative values for
 	 * Charge; positive for Discharge. See
 	 * {@link ChannelId#SET_ACTIVE_POWER_L3_EQUALS}.
-	 * 
+	 *
 	 * @param value the next write value
 	 * @throws OpenemsNamedException on error
 	 */
@@ -513,7 +514,7 @@ public default IntegerWriteChannel getSetReactivePowerL1EqualsChannel() {
 	/**
 	 * Sets a Reactive Power Equals setpoint on L1 in [var]. See
 	 * {@link ChannelId#SET_REACTIVE_POWER_L1_EQUALS}.
-	 * 
+	 *
 	 * @param value the next write value
 	 * @throws OpenemsNamedException on error
 	 */
@@ -533,7 +534,7 @@ public default IntegerWriteChannel getSetReactivePowerL2EqualsChannel() {
 	/**
 	 * Sets a Reactive Power Equals setpoint on L2 in [var]. See
 	 * {@link ChannelId#SET_REACTIVE_POWER_L2_EQUALS}.
-	 * 
+	 *
 	 * @param value the next write value
 	 * @throws OpenemsNamedException on error
 	 */
@@ -553,7 +554,7 @@ public default IntegerWriteChannel getSetReactivePowerL3EqualsChannel() {
 	/**
 	 * Sets a Reactive Power Equals setpoint on L3 in [var]. See
 	 * {@link ChannelId#SET_REACTIVE_POWER_L3_EQUALS}.
-	 * 
+	 *
 	 * @param value the next write value
 	 * @throws OpenemsNamedException on error
 	 */
@@ -574,7 +575,7 @@ public default IntegerWriteChannel getSetActivePowerL1LessOrEqualsChannel() {
 	 * Sets an Active Power Less Or Equals setpoint on L1 in [W]. Negative values
 	 * for Charge; positive for Discharge. See
 	 * {@link ChannelId#SET_ACTIVE_POWER_L1_LESS_OR_EQUALS}.
-	 * 
+	 *
 	 * @param value the next write value
 	 * @throws OpenemsNamedException on error
 	 */
@@ -595,7 +596,7 @@ public default IntegerWriteChannel getSetActivePowerL2LessOrEqualsChannel() {
 	 * Sets an Active Power Less Or Equals setpoint on L2 in [W]. Negative values
 	 * for Charge; positive for Discharge. See
 	 * {@link ChannelId#SET_ACTIVE_POWER_L2_LESS_OR_EQUALS}.
-	 * 
+	 *
 	 * @param value the next write value
 	 * @throws OpenemsNamedException on error
 	 */
@@ -616,7 +617,7 @@ public default IntegerWriteChannel getSetActivePowerL3LessOrEqualsChannel() {
 	 * Sets an Active Power Less Or Equals setpoint on L3 in [W]. Negative values
 	 * for Charge; positive for Discharge. See
 	 * {@link ChannelId#SET_ACTIVE_POWER_L3_LESS_OR_EQUALS}.
-	 * 
+	 *
 	 * @param value the next write value
 	 * @throws OpenemsNamedException on error
 	 */
@@ -637,7 +638,7 @@ public default IntegerWriteChannel getSetActivePowerL1GreaterOrEqualsChannel() {
 	 * Sets an Active Power Greater Or Equals setpoint on L1 in [W]. Negative values
 	 * for Charge; positive for Discharge. See
 	 * {@link ChannelId#SET_ACTIVE_POWER_L1_GREATER_OR_EQUALS}.
-	 * 
+	 *
 	 * @param value the next write value
 	 * @throws OpenemsNamedException on error
 	 */
@@ -658,7 +659,7 @@ public default IntegerWriteChannel getSetActivePowerL2GreaterOrEqualsChannel() {
 	 * Sets an Active Power Greater Or Equals setpoint on L2 in [W]. Negative values
 	 * for Charge; positive for Discharge. See
 	 * {@link ChannelId#SET_ACTIVE_POWER_L2_GREATER_OR_EQUALS}.
-	 * 
+	 *
 	 * @param value the next write value
 	 * @throws OpenemsNamedException on error
 	 */
@@ -679,7 +680,7 @@ public default IntegerWriteChannel getSetActivePowerL3GreaterOrEqualsChannel() {
 	 * Sets an Active Power Greater Or Equals setpoint on L3 in [W]. Negative values
 	 * for Charge; positive for Discharge. See
 	 * {@link ChannelId#SET_ACTIVE_POWER_L3_GREATER_OR_EQUALS}.
-	 * 
+	 *
 	 * @param value the next write value
 	 * @throws OpenemsNamedException on error
 	 */
@@ -699,7 +700,7 @@ public default IntegerWriteChannel getSetReactivePowerL1LessOrEqualsChannel() {
 	/**
 	 * Sets a Reactive Power Less Or Equals setpoint on L1 in [var]. See
 	 * {@link ChannelId#SET_REACTIVE_POWER_L1_LESS_OR_EQUALS}.
-	 * 
+	 *
 	 * @param value the next write value
 	 * @throws OpenemsNamedException on error
 	 */
@@ -719,7 +720,7 @@ public default IntegerWriteChannel getSetReactivePowerL2LessOrEqualsChannel() {
 	/**
 	 * Sets a Reactive Power Less Or Equals setpoint on L2 in [var]. See
 	 * {@link ChannelId#SET_REACTIVE_POWER_L2_LESS_OR_EQUALS}.
-	 * 
+	 *
 	 * @param value the next write value
 	 * @throws OpenemsNamedException on error
 	 */
@@ -739,7 +740,7 @@ public default IntegerWriteChannel getSetReactivePowerL3LessOrEqualsChannel() {
 	/**
 	 * Sets a Reactive Power Less Or Equals setpoint on L3 in [var]. See
 	 * {@link ChannelId#SET_REACTIVE_POWER_L3_LESS_OR_EQUALS}.
-	 * 
+	 *
 	 * @param value the next write value
 	 * @throws OpenemsNamedException on error
 	 */
@@ -760,7 +761,7 @@ public default IntegerWriteChannel getSetReactivePowerL1GreaterOrEqualsChannel()
 	/**
 	 * Sets a Reactive Power Greater Or Equals setpoint on L1 in [var]. See
 	 * {@link ChannelId#SET_REACTIVE_POWER_L1_GREATER_OR_EQUALS}.
-	 * 
+	 *
 	 * @param value the next write value
 	 * @throws OpenemsNamedException on error
 	 */
@@ -781,7 +782,7 @@ public default IntegerWriteChannel getSetReactivePowerL2GreaterOrEqualsChannel()
 	/**
 	 * Sets a Reactive Power Greater Or Equals setpoint on L2 in [var]. See
 	 * {@link ChannelId#SET_REACTIVE_POWER_L2_GREATER_OR_EQUALS}.
-	 * 
+	 *
 	 * @param value the next write value
 	 * @throws OpenemsNamedException on error
 	 */
@@ -802,7 +803,7 @@ public default IntegerWriteChannel getSetReactivePowerL3GreaterOrEqualsChannel()
 	/**
 	 * Sets a Reactive Power Greater Or Equals setpoint on L3 in [var]. See
 	 * {@link ChannelId#SET_REACTIVE_POWER_L3_GREATER_OR_EQUALS}.
-	 * 
+	 *
 	 * @param value the next write value
 	 * @throws OpenemsNamedException on error
 	 */
diff --git a/io.openems.edge.ess.api/src/io/openems/edge/ess/api/ManagedSinglePhaseEss.java b/io.openems.edge.ess.api/src/io/openems/edge/ess/api/ManagedSinglePhaseEss.java
index a5245abf76d..bee4ccd4f1e 100644
--- a/io.openems.edge.ess.api/src/io/openems/edge/ess/api/ManagedSinglePhaseEss.java
+++ b/io.openems.edge.ess.api/src/io/openems/edge/ess/api/ManagedSinglePhaseEss.java
@@ -20,6 +20,7 @@ private ChannelId(Doc doc) {
 			this.doc = doc;
 		}
 
+		@Override
 		public Doc doc() {
 			return this.doc;
 		}
diff --git a/io.openems.edge.ess.api/src/io/openems/edge/ess/api/ManagedSymmetricEss.java b/io.openems.edge.ess.api/src/io/openems/edge/ess/api/ManagedSymmetricEss.java
index 677c0219f1b..b1d10ee9bb5 100644
--- a/io.openems.edge.ess.api/src/io/openems/edge/ess/api/ManagedSymmetricEss.java
+++ b/io.openems.edge.ess.api/src/io/openems/edge/ess/api/ManagedSymmetricEss.java
@@ -16,7 +16,6 @@
 import io.openems.edge.common.channel.IntegerWriteChannel;
 import io.openems.edge.common.channel.StateChannel;
 import io.openems.edge.common.channel.value.Value;
-import io.openems.edge.common.filter.PidFilter;
 import io.openems.edge.common.modbusslave.ModbusSlaveNatureTable;
 import io.openems.edge.common.modbusslave.ModbusType;
 import io.openems.edge.ess.power.api.Constraint;
@@ -32,7 +31,7 @@ public enum ChannelId implements io.openems.edge.common.channel.ChannelId {
 		/**
 		 * Holds the currently maximum allowed charge power. This value is commonly
 		 * defined by current battery limitations.
-		 * 
+		 *
 		 * <ul>
 		 * <li>Interface: Managed Symmetric Ess
 		 * <li>Type: Integer
@@ -46,7 +45,7 @@ public enum ChannelId implements io.openems.edge.common.channel.ChannelId {
 		/**
 		 * Holds the currently maximum allowed discharge power. This value is commonly
 		 * defined by current battery limitations.
-		 * 
+		 *
 		 * <ul>
 		 * <li>Interface: Managed Symmetric Ess
 		 * <li>Type: Integer
@@ -59,7 +58,7 @@ public enum ChannelId implements io.openems.edge.common.channel.ChannelId {
 				.persistencePriority(PersistencePriority.HIGH)), //
 		/**
 		 * Sets a fixed Active Power.
-		 * 
+		 *
 		 * <ul>
 		 * <li>Interface: Managed Symmetric Ess
 		 * <li>Type: Integer
@@ -73,7 +72,7 @@ public enum ChannelId implements io.openems.edge.common.channel.ChannelId {
 				.onInit(new PowerConstraint("SetActivePowerEquals", Phase.ALL, Pwr.ACTIVE, Relationship.EQUALS))), //
 		/**
 		 * Applies the PID filter and then sets a fixed Active Power.
-		 * 
+		 *
 		 * <ul>
 		 * <li>Interface: Managed Symmetric Ess
 		 * <li>Type: Integer
@@ -89,20 +88,20 @@ public enum ChannelId implements io.openems.edge.common.channel.ChannelId {
 					public void accept(Channel<Integer> channel) {
 						((IntegerWriteChannel) channel).onSetNextWrite(value -> {
 							if (value != null) {
-								ManagedSymmetricEss ess = (ManagedSymmetricEss) channel.getComponent();
-								Power power = ess.getPower();
-								PidFilter pidFilter = power.getPidFilter();
+								var ess = (ManagedSymmetricEss) channel.getComponent();
+								var power = ess.getPower();
+								var pidFilter = power.getPidFilter();
 
 								// configure PID filter
-								int minPower = power.getMinPower(ess, Phase.ALL, Pwr.ACTIVE);
-								int maxPower = power.getMaxPower(ess, Phase.ALL, Pwr.ACTIVE);
+								var minPower = power.getMinPower(ess, Phase.ALL, Pwr.ACTIVE);
+								var maxPower = power.getMaxPower(ess, Phase.ALL, Pwr.ACTIVE);
 								if (maxPower < minPower) {
 									maxPower = minPower; // avoid rounding error
 								}
 								pidFilter.setLimits(minPower, maxPower);
 
 								int currentActivePower = ess.getActivePower().orElse(0);
-								int pidOutput = pidFilter.applyPidFilter(currentActivePower, value);
+								var pidOutput = pidFilter.applyPidFilter(currentActivePower, value);
 
 								ess.setActivePowerEquals(pidOutput);
 							}
@@ -111,7 +110,7 @@ public void accept(Channel<Integer> channel) {
 				})), //
 		/**
 		 * Sets a fixed Reactive Power.
-		 * 
+		 *
 		 * <ul>
 		 * <li>Interface: Managed Symmetric Ess
 		 * <li>Type: Integer
@@ -125,7 +124,7 @@ public void accept(Channel<Integer> channel) {
 				.onInit(new PowerConstraint("SetReactivePowerEquals", Phase.ALL, Pwr.REACTIVE, Relationship.EQUALS))), //
 		/**
 		 * Sets a fixed maximum Active Power.
-		 * 
+		 *
 		 * <ul>
 		 * <li>Interface: Managed Symmetric Ess
 		 * <li>Type: Integer
@@ -140,7 +139,7 @@ public void accept(Channel<Integer> channel) {
 						Relationship.LESS_OR_EQUALS))), //
 		/**
 		 * Sets a fixed minimum Active Power.
-		 * 
+		 *
 		 * <ul>
 		 * <li>Interface: Managed Symmetric Ess
 		 * <li>Type: Integer
@@ -155,7 +154,7 @@ public void accept(Channel<Integer> channel) {
 						Relationship.GREATER_OR_EQUALS))), //
 		/**
 		 * Sets a fixed maximum Reactive Power.
-		 * 
+		 *
 		 * <ul>
 		 * <li>Interface: Managed Symmetric Ess
 		 * <li>Type: Integer
@@ -170,7 +169,7 @@ public void accept(Channel<Integer> channel) {
 						Relationship.LESS_OR_EQUALS))), //
 		/**
 		 * Sets a fixed minimum Reactive Power.
-		 * 
+		 *
 		 * <ul>
 		 * <li>Interface: Managed Symmetric Ess
 		 * <li>Type: Integer
@@ -185,7 +184,7 @@ public void accept(Channel<Integer> channel) {
 						Relationship.GREATER_OR_EQUALS))), //
 		/**
 		 * Holds settings of Active Power for debugging.
-		 * 
+		 *
 		 * <ul>
 		 * <li>Interface: Managed Symmetric Ess
 		 * <li>Type: Integer
@@ -200,7 +199,7 @@ public void accept(Channel<Integer> channel) {
 				.persistencePriority(PersistencePriority.HIGH)), //
 		/**
 		 * Holds settings of Reactive Power for debugging.
-		 * 
+		 *
 		 * <ul>
 		 * <li>Interface: Managed Symmetric Ess
 		 * <li>Type: Integer
@@ -215,7 +214,7 @@ public void accept(Channel<Integer> channel) {
 				.persistencePriority(PersistencePriority.HIGH)), //
 		/**
 		 * StateChannel is set when calling applyPower() failed.
-		 * 
+		 *
 		 * <ul>
 		 * <li>Interface: Managed Symmetric Ess
 		 * <li>Type: StateChannel
@@ -234,6 +233,7 @@ private ChannelId(Doc doc) {
 			this.doc = doc;
 		}
 
+		@Override
 		public Doc doc() {
 			return this.doc;
 		}
@@ -254,10 +254,10 @@ public static ModbusSlaveNatureTable getModbusSlaveNatureTable(AccessMode access
 
 	/**
 	 * Gets a boolean if the ess is managed or not.
-	 * 
+	 *
 	 * <p>
 	 * Returns false if the ess itself is not managed or in a read only mode.
-	 * 
+	 *
 	 * @return is managed or not
 	 */
 	public default boolean isManaged() {
@@ -267,7 +267,7 @@ public default boolean isManaged() {
 	/**
 	 * Gets an instance of the 'Power' class, which allows to set limitations to
 	 * Active and Reactive Power.
-	 * 
+	 *
 	 * @return the Power instance
 	 */
 	public Power getPower();
@@ -362,7 +362,7 @@ public default IntegerWriteChannel getSetActivePowerEqualsChannel() {
 	/**
 	 * Sets an Active Power Equals setpoint in [W]. Negative values for Charge;
 	 * positive for Discharge. See {@link ChannelId#SET_ACTIVE_POWER_EQUALS}.
-	 * 
+	 *
 	 * @param value the next write value
 	 * @throws OpenemsNamedException on error
 	 */
@@ -383,7 +383,7 @@ public default IntegerWriteChannel getSetActivePowerEqualsWithPidChannel() {
 	 * Sets an Active Power Equals setpoint in [W] with applied PID filter. Negative
 	 * values for Charge; positive for Discharge. See
 	 * {@link ChannelId#SET_ACTIVE_POWER_EQUALS_WITH_PID}.
-	 * 
+	 *
 	 * @param value the next write value
 	 * @throws OpenemsNamedException on error
 	 */
@@ -403,7 +403,7 @@ public default IntegerWriteChannel getSetReactivePowerEqualsChannel() {
 	/**
 	 * Sets a Reactive Power Equals setpoint in [var]. See
 	 * {@link ChannelId#SET_REACTIVE_POWER_EQUALS}.
-	 * 
+	 *
 	 * @param value the next write value
 	 * @throws OpenemsNamedException on error
 	 */
@@ -424,7 +424,7 @@ public default IntegerWriteChannel getSetActivePowerLessOrEqualsChannel() {
 	 * Sets an Active Power Less Or Equals setpoint in [W]. Negative values for
 	 * Charge; positive for Discharge. See
 	 * {@link ChannelId#SET_ACTIVE_POWER_LESS_OR_EQUALS}.
-	 * 
+	 *
 	 * @param value the next write value
 	 * @throws OpenemsNamedException on error
 	 */
@@ -445,7 +445,7 @@ public default IntegerWriteChannel getSetActivePowerGreaterOrEqualsChannel() {
 	 * Sets an Active Power Greater Or Equals setpoint in [W]. Negative values for
 	 * Charge; positive for Discharge. See
 	 * {@link ChannelId#SET_ACTIVE_POWER_GREATER_OR_EQUALS}.
-	 * 
+	 *
 	 * @param value the next write value
 	 * @throws OpenemsNamedException on error
 	 */
@@ -465,7 +465,7 @@ public default IntegerWriteChannel getSetReactivePowerLessOrEqualsChannel() {
 	/**
 	 * Sets a Reactive Power Less Or Equals setpoint in [var]. See
 	 * {@link ChannelId#SET_REACTIVE_POWER_LESS_OR_EQUALS}.
-	 * 
+	 *
 	 * @param value the next write value
 	 * @throws OpenemsNamedException on error
 	 */
@@ -485,7 +485,7 @@ public default IntegerWriteChannel getSetReactivePowerGreaterOrEqualsChannel() {
 	/**
 	 * Sets a Reactive Power Greater Or Equals setpoint in [var]. See
 	 * {@link ChannelId#SET_REACTIVE_POWER_GREATER_OR_EQUALS}.
-	 * 
+	 *
 	 * @param value the next write value
 	 * @throws OpenemsNamedException on error
 	 */
@@ -601,13 +601,13 @@ public default void _setApplyPowerFailed(boolean value) {
 
 	/**
 	 * Apply the calculated Power.
-	 * 
+	 *
 	 * <p>
 	 * Careful: do not adjust activePower and reactivePower in this method, e.g.
 	 * setting it to zero on error. The purpose of this method is solely to apply
 	 * the calculated power to the ESS. If you need to constrain the allowed power,
 	 * add Constraints using the {@link #getStaticConstraints()} method.
-	 * 
+	 *
 	 * @param activePower   the active power in [W]
 	 * @param reactivePower the reactive power in [var]
 	 * @throws OpenemsNamedException on error; causes activation of
@@ -623,7 +623,7 @@ public default void _setApplyPowerFailed(boolean value) {
 	 * <li>KACO blueplanet gridsave 50 allows setting of power in 0.1 % of 52 VA. It
 	 * should return 52 (= 52000 * 0.001)
 	 * </ul>
-	 * 
+	 *
 	 * @return the power precision
 	 */
 	public int getPowerPrecision();
@@ -631,7 +631,7 @@ public default void _setApplyPowerFailed(boolean value) {
 	/**
 	 * Gets static Constraints for this Ess. Override this method to provide
 	 * specific Constraints for this Ess on every Cycle.
-	 * 
+	 *
 	 * @return the Constraints
 	 * @throws OpenemsException on error
 	 */
@@ -641,7 +641,7 @@ public default Constraint[] getStaticConstraints() throws OpenemsNamedException
 
 	/**
 	 * Creates a Power Constraint.
-	 * 
+	 *
 	 * @param description  a description for the Constraint
 	 * @param phase        the affected power phase
 	 * @param pwr          Active or Reactive power
@@ -657,10 +657,10 @@ public default Constraint createPowerConstraint(String description, Phase phase,
 
 	/**
 	 * Adds a Power Constraint for the current Cycle.
-	 * 
+	 *
 	 * <p>
 	 * To add a Constraint on every Cycle, use getStaticConstraints()
-	 * 
+	 *
 	 * @param description  a description for the Constraint
 	 * @param phase        the affected power phase
 	 * @param pwr          Active or Reactive power
@@ -676,10 +676,10 @@ public default Constraint addPowerConstraint(String description, Phase phase, Pw
 
 	/**
 	 * Adds a Power Constraint for the current Cycle.
-	 * 
+	 *
 	 * <p>
 	 * To add a Constraint on every Cycle, use getStaticConstraints()
-	 * 
+	 *
 	 * @param description  a description for the Constraint
 	 * @param phase        the affected power phase
 	 * @param pwr          Active or Reactive power
diff --git a/io.openems.edge.ess.api/src/io/openems/edge/ess/api/MetaEss.java b/io.openems.edge.ess.api/src/io/openems/edge/ess/api/MetaEss.java
index c9e6aca4877..66b51a6b5a8 100644
--- a/io.openems.edge.ess.api/src/io/openems/edge/ess/api/MetaEss.java
+++ b/io.openems.edge.ess.api/src/io/openems/edge/ess/api/MetaEss.java
@@ -10,7 +10,7 @@ public interface MetaEss extends SymmetricEss {
 	/**
 	 * Get the Component-IDs of energy storage systems that are handled by this
 	 * MetaEss.
-	 * 
+	 *
 	 * @return an array of Component-IDs
 	 */
 	public String[] getEssIds();
diff --git a/io.openems.edge.ess.api/src/io/openems/edge/ess/api/PowerConstraint.java b/io.openems.edge.ess.api/src/io/openems/edge/ess/api/PowerConstraint.java
index 445800f0f39..e83203fbe15 100644
--- a/io.openems.edge.ess.api/src/io/openems/edge/ess/api/PowerConstraint.java
+++ b/io.openems.edge.ess.api/src/io/openems/edge/ess/api/PowerConstraint.java
@@ -32,10 +32,10 @@ public PowerConstraint(String channelId, Phase phase, Pwr pwr, Relationship rela
 	public void accept(Channel<Integer> channel) {
 		((IntegerWriteChannel) channel).onSetNextWrite(value -> {
 			if (value != null) {
-				ManagedSymmetricEss ess = (ManagedSymmetricEss) channel.getComponent();
+				var ess = (ManagedSymmetricEss) channel.getComponent();
 
 				// adjust value so that it fits into Min/MaxActivePower
-				switch (relationship) {
+				switch (this.relationship) {
 				case EQUALS:
 					value = ess.getPower().fitValueIntoMinMaxPower(this.channelId, ess, this.phase, this.pwr, value);
 					break;
diff --git a/io.openems.edge.ess.api/src/io/openems/edge/ess/api/SinglePhase.java b/io.openems.edge.ess.api/src/io/openems/edge/ess/api/SinglePhase.java
index 0ef80c312ba..c471a9998f0 100644
--- a/io.openems.edge.ess.api/src/io/openems/edge/ess/api/SinglePhase.java
+++ b/io.openems.edge.ess.api/src/io/openems/edge/ess/api/SinglePhase.java
@@ -16,11 +16,11 @@ private SinglePhase(String symbol, Phase powerApiPhase) {
 	}
 
 	public String getSymbol() {
-		return symbol;
+		return this.symbol;
 	}
 
 	public Phase getPowerApiPhase() {
-		return powerApiPhase;
+		return this.powerApiPhase;
 	}
 
 }
diff --git a/io.openems.edge.ess.api/src/io/openems/edge/ess/api/SinglePhaseEss.java b/io.openems.edge.ess.api/src/io/openems/edge/ess/api/SinglePhaseEss.java
index 2caad6b2b13..afe48fdc1cd 100644
--- a/io.openems.edge.ess.api/src/io/openems/edge/ess/api/SinglePhaseEss.java
+++ b/io.openems.edge.ess.api/src/io/openems/edge/ess/api/SinglePhaseEss.java
@@ -24,7 +24,7 @@ public Doc doc() {
 
 	/**
 	 * Gets the Phase this ESS is connected to.
-	 * 
+	 *
 	 * @return
 	 */
 	public SinglePhase getPhase();
@@ -32,7 +32,7 @@ public Doc doc() {
 	/**
 	 * Initializes Channel listeners. Copies the Active-Power Phase-Channel value to
 	 * Active-Power Channel.
-	 * 
+	 *
 	 * @param ess
 	 * @param phase
 	 */
diff --git a/io.openems.edge.ess.api/src/io/openems/edge/ess/api/SymmetricEss.java b/io.openems.edge.ess.api/src/io/openems/edge/ess/api/SymmetricEss.java
index 9fff4b57d4f..9c9d91c1377 100644
--- a/io.openems.edge.ess.api/src/io/openems/edge/ess/api/SymmetricEss.java
+++ b/io.openems.edge.ess.api/src/io/openems/edge/ess/api/SymmetricEss.java
@@ -22,7 +22,7 @@ public interface SymmetricEss extends OpenemsComponent {
 	public enum ChannelId implements io.openems.edge.common.channel.ChannelId {
 		/**
 		 * State of Charge.
-		 * 
+		 *
 		 * <ul>
 		 * <li>Interface: Ess
 		 * <li>Type: Integer
@@ -35,13 +35,13 @@ public enum ChannelId implements io.openems.edge.common.channel.ChannelId {
 				.persistencePriority(PersistencePriority.HIGH)),
 		/**
 		 * Capacity.
-		 * 
+		 *
 		 * <ul>
 		 * <li>Interface: Ess
 		 * <li>Type: Integer
 		 * <li>Unit: Wh
 		 * </ul>
-		 * 
+		 *
 		 * @since 2019.5.0
 		 */
 		CAPACITY(Doc.of(OpenemsType.INTEGER) //
@@ -49,7 +49,7 @@ public enum ChannelId implements io.openems.edge.common.channel.ChannelId {
 				.persistencePriority(PersistencePriority.HIGH)),
 		/**
 		 * Grid-Mode.
-		 * 
+		 *
 		 * <ul>
 		 * <li>Interface: Ess
 		 * <li>Type: Integer/Enum
@@ -60,7 +60,7 @@ public enum ChannelId implements io.openems.edge.common.channel.ChannelId {
 				.persistencePriority(PersistencePriority.HIGH)),
 		/**
 		 * Active Power.
-		 * 
+		 *
 		 * <ul>
 		 * <li>Interface: Ess Symmetric
 		 * <li>Type: Integer
@@ -75,7 +75,7 @@ public enum ChannelId implements io.openems.edge.common.channel.ChannelId {
 		),
 		/**
 		 * Reactive Power.
-		 * 
+		 *
 		 * <ul>
 		 * <li>Interface: Ess Symmetric
 		 * <li>Type: Integer
@@ -89,7 +89,7 @@ public enum ChannelId implements io.openems.edge.common.channel.ChannelId {
 		/**
 		 * Holds the currently maximum possible apparent power. This value is commonly
 		 * defined by the inverter limitations.
-		 * 
+		 *
 		 * <ul>
 		 * <li>Interface: Managed Symmetric Ess
 		 * <li>Type: Integer
@@ -102,7 +102,7 @@ public enum ChannelId implements io.openems.edge.common.channel.ChannelId {
 				.persistencePriority(PersistencePriority.HIGH)),
 		/**
 		 * Active Charge Energy.
-		 * 
+		 *
 		 * <ul>
 		 * <li>Interface: Ess Symmetric
 		 * <li>Type: Integer
@@ -114,7 +114,7 @@ public enum ChannelId implements io.openems.edge.common.channel.ChannelId {
 				.persistencePriority(PersistencePriority.HIGH)),
 		/**
 		 * Active Discharge Energy.
-		 * 
+		 *
 		 * <ul>
 		 * <li>Interface: Ess Symmetric
 		 * <li>Type: Integer
@@ -126,14 +126,14 @@ public enum ChannelId implements io.openems.edge.common.channel.ChannelId {
 				.persistencePriority(PersistencePriority.HIGH)),
 		/**
 		 * Min Cell Voltage.
-		 * 
+		 *
 		 * <ul>
 		 * <li>Interface: Ess Symmetric
 		 * <li>Type: Integer
 		 * <li>Unit: mV
 		 * <li>Range: > 0
 		 * </ul>
-		 * 
+		 *
 		 * @since 2019.12.0
 		 */
 		MIN_CELL_VOLTAGE(Doc.of(OpenemsType.INTEGER) //
@@ -141,14 +141,14 @@ public enum ChannelId implements io.openems.edge.common.channel.ChannelId {
 				.persistencePriority(PersistencePriority.HIGH)),
 		/**
 		 * Max Cell Voltage.
-		 * 
+		 *
 		 * <ul>
 		 * <li>Interface: Ess Symmetric
 		 * <li>Type: Integer
 		 * <li>Unit: mV
 		 * <li>Range: > 0
 		 * </ul>
-		 * 
+		 *
 		 * @since 2019.17.0
 		 */
 		MAX_CELL_VOLTAGE(Doc.of(OpenemsType.INTEGER) //
@@ -156,14 +156,14 @@ public enum ChannelId implements io.openems.edge.common.channel.ChannelId {
 				.persistencePriority(PersistencePriority.HIGH)),
 		/**
 		 * Min Cell Temperature.
-		 * 
+		 *
 		 * <ul>
 		 * <li>Interface: Ess Symmetric
 		 * <li>Type: Integer
 		 * <li>Unit: °C
 		 * <li>Range: -273 to positive infinity
 		 * </ul>
-		 * 
+		 *
 		 * @since 2019.17.0
 		 */
 		MIN_CELL_TEMPERATURE(Doc.of(OpenemsType.INTEGER) //
@@ -171,14 +171,14 @@ public enum ChannelId implements io.openems.edge.common.channel.ChannelId {
 				.persistencePriority(PersistencePriority.HIGH)),
 		/**
 		 * Max Cell Temperature.
-		 * 
+		 *
 		 * <ul>
 		 * <li>Interface: Ess Symmetric
 		 * <li>Type: Integer
 		 * <li>Unit: °C
 		 * <li>Range: -273 to positive infinity
 		 * </ul>
-		 * 
+		 *
 		 * @since 2019.17.0
 		 */
 		MAX_CELL_TEMPERATURE(Doc.of(OpenemsType.INTEGER) //
@@ -281,7 +281,7 @@ public default void _setCapacity(int value) {
 
 	/**
 	 * Gets the Channel for {@link ChannelId#GRID_MODE}.
-	 * 
+	 *
 	 * @return the Channel
 	 */
 	public default Channel<GridMode> getGridModeChannel() {
@@ -290,7 +290,7 @@ public default Channel<GridMode> getGridModeChannel() {
 
 	/**
 	 * Is the Energy Storage System On-Grid? See {@link ChannelId#GRID_MODE}.
-	 * 
+	 *
 	 * @return the Channel {@link Value}
 	 */
 	public default GridMode getGridMode() {
@@ -300,7 +300,7 @@ public default GridMode getGridMode() {
 	/**
 	 * Internal method to set the 'nextValue' on {@link ChannelId#GRID_MODE}
 	 * Channel.
-	 * 
+	 *
 	 * @param value the next value
 	 */
 	public default void _setGridMode(GridMode value) {
@@ -309,7 +309,7 @@ public default void _setGridMode(GridMode value) {
 
 	/**
 	 * Gets the Channel for {@link ChannelId#ACTIVE_POWER}.
-	 * 
+	 *
 	 * @return the Channel
 	 */
 	public default IntegerReadChannel getActivePowerChannel() {
@@ -319,7 +319,7 @@ public default IntegerReadChannel getActivePowerChannel() {
 	/**
 	 * Gets the Active Power in [W]. Negative values for Charge; positive for
 	 * Discharge. See {@link ChannelId#ACTIVE_POWER}.
-	 * 
+	 *
 	 * @return the Channel {@link Value}
 	 */
 	public default Value<Integer> getActivePower() {
@@ -329,7 +329,7 @@ public default Value<Integer> getActivePower() {
 	/**
 	 * Internal method to set the 'nextValue' on {@link ChannelId#ACTIVE_POWER}
 	 * Channel.
-	 * 
+	 *
 	 * @param value the next value
 	 */
 	public default void _setActivePower(Integer value) {
@@ -339,7 +339,7 @@ public default void _setActivePower(Integer value) {
 	/**
 	 * Internal method to set the 'nextValue' on {@link ChannelId#ACTIVE_POWER}
 	 * Channel.
-	 * 
+	 *
 	 * @param value the next value
 	 */
 	public default void _setActivePower(int value) {
@@ -348,7 +348,7 @@ public default void _setActivePower(int value) {
 
 	/**
 	 * Gets the Channel for {@link ChannelId#REACTIVE_POWER}.
-	 * 
+	 *
 	 * @return the Channel
 	 */
 	public default IntegerReadChannel getReactivePowerChannel() {
@@ -357,7 +357,7 @@ public default IntegerReadChannel getReactivePowerChannel() {
 
 	/**
 	 * Gets the Reactive Power in [var]. See {@link ChannelId#REACTIVE_POWER}.
-	 * 
+	 *
 	 * @return the Channel {@link Value}
 	 */
 	public default Value<Integer> getReactivePower() {
@@ -367,7 +367,7 @@ public default Value<Integer> getReactivePower() {
 	/**
 	 * Internal method to set the 'nextValue' on {@link ChannelId#REACTIVE_POWER}
 	 * Channel.
-	 * 
+	 *
 	 * @param value the next value
 	 */
 	public default void _setReactivePower(Integer value) {
@@ -377,7 +377,7 @@ public default void _setReactivePower(Integer value) {
 	/**
 	 * Internal method to set the 'nextValue' on {@link ChannelId#REACTIVE_POWER}
 	 * Channel.
-	 * 
+	 *
 	 * @param value the next value
 	 */
 	public default void _setReactivePower(int value) {
@@ -386,7 +386,7 @@ public default void _setReactivePower(int value) {
 
 	/**
 	 * Gets the Channel for {@link ChannelId#MAX_APPARENT_POWER}.
-	 * 
+	 *
 	 * @return the Channel
 	 */
 	public default IntegerReadChannel getMaxApparentPowerChannel() {
@@ -396,7 +396,7 @@ public default IntegerReadChannel getMaxApparentPowerChannel() {
 	/**
 	 * Gets the Maximum Apparent Power in [VA], range "&gt;= 0". See
 	 * {@link ChannelId#MAX_APPARENT_POWER}.
-	 * 
+	 *
 	 * @return the Channel {@link Value}
 	 */
 	public default Value<Integer> getMaxApparentPower() {
@@ -406,7 +406,7 @@ public default Value<Integer> getMaxApparentPower() {
 	/**
 	 * Internal method to set the 'nextValue' on
 	 * {@link ChannelId#MAX_APPARENT_POWER} Channel.
-	 * 
+	 *
 	 * @param value the next value
 	 */
 	public default void _setMaxApparentPower(Integer value) {
@@ -416,7 +416,7 @@ public default void _setMaxApparentPower(Integer value) {
 	/**
 	 * Internal method to set the 'nextValue' on
 	 * {@link ChannelId#MAX_APPARENT_POWER} Channel.
-	 * 
+	 *
 	 * @param value the next value
 	 */
 	public default void _setMaxApparentPower(int value) {
diff --git a/io.openems.edge.ess.api/src/io/openems/edge/ess/dccharger/api/EssDcCharger.java b/io.openems.edge.ess.api/src/io/openems/edge/ess/dccharger/api/EssDcCharger.java
index cb3b6d1cde8..d687fb3f615 100644
--- a/io.openems.edge.ess.api/src/io/openems/edge/ess/dccharger/api/EssDcCharger.java
+++ b/io.openems.edge.ess.api/src/io/openems/edge/ess/dccharger/api/EssDcCharger.java
@@ -24,7 +24,7 @@ public interface EssDcCharger extends OpenemsComponent {
 	public enum ChannelId implements io.openems.edge.common.channel.ChannelId {
 		/**
 		 * Maximum Ever Actual Power
-		 * 
+		 *
 		 * <ul>
 		 * <li>Interface: Ess DC Charger
 		 * <li>Type: Integer
@@ -38,7 +38,7 @@ public enum ChannelId implements io.openems.edge.common.channel.ChannelId {
 				.persistencePriority(PersistencePriority.HIGH)), //
 		/**
 		 * Actual Power
-		 * 
+		 *
 		 * <ul>
 		 * <li>Interface: Ess DC Charger
 		 * <li>Type: Integer
@@ -55,7 +55,7 @@ public enum ChannelId implements io.openems.edge.common.channel.ChannelId {
 						 * Fill Max Actual Power channel
 						 */
 						if (value.asOptional().isPresent()) {
-							int newValue = (int) (Integer) value.get();
+							int newValue = (Integer) value.get();
 							Channel<Integer> maxActualPowerChannel = channel.getComponent()
 									.channel(ChannelId.MAX_ACTUAL_POWER);
 							int maxActualPower = maxActualPowerChannel.value().orElse(0);
@@ -70,7 +70,7 @@ public enum ChannelId implements io.openems.edge.common.channel.ChannelId {
 				})),
 		/**
 		 * Actual Energy
-		 * 
+		 *
 		 * <ul>
 		 * <li>Interface: Ess Symmetric
 		 * <li>Type: Integer
@@ -87,6 +87,7 @@ private ChannelId(Doc doc) {
 			this.doc = doc;
 		}
 
+		@Override
 		public Doc doc() {
 			return this.doc;
 		}
diff --git a/io.openems.edge.ess.api/src/io/openems/edge/ess/offgrid/api/OffGridEss.java b/io.openems.edge.ess.api/src/io/openems/edge/ess/offgrid/api/OffGridEss.java
index ab5d4ad21cb..86c857677ce 100644
--- a/io.openems.edge.ess.api/src/io/openems/edge/ess/offgrid/api/OffGridEss.java
+++ b/io.openems.edge.ess.api/src/io/openems/edge/ess/offgrid/api/OffGridEss.java
@@ -9,10 +9,10 @@ public interface OffGridEss extends ManagedSymmetricEss {
 
 	/**
 	 * Gets a boolean if the ess is able to build a micro-grid in off-grid.
-	 * 
+	 *
 	 * <p>
 	 * Returns false if the ess is not able to build a micro-grid.
-	 * 
+	 *
 	 * @return is managed or not
 	 */
 	public boolean isOffGridPossible();
diff --git a/io.openems.edge.ess.api/src/io/openems/edge/ess/offgrid/api/OffGridSwitch.java b/io.openems.edge.ess.api/src/io/openems/edge/ess/offgrid/api/OffGridSwitch.java
index 91dea0b975a..dffb5e6bac0 100644
--- a/io.openems.edge.ess.api/src/io/openems/edge/ess/offgrid/api/OffGridSwitch.java
+++ b/io.openems.edge.ess.api/src/io/openems/edge/ess/offgrid/api/OffGridSwitch.java
@@ -20,7 +20,7 @@ public interface OffGridSwitch extends OpenemsComponent {
 	public enum ChannelId implements io.openems.edge.common.channel.ChannelId {
 		/**
 		 * Main-Contactor connects the inverter to the public grid.
-		 * 
+		 *
 		 * <ul>
 		 * <li>Interface: {@link OffGridSwitch}
 		 * <li>Type: Boolean
@@ -32,7 +32,7 @@ public enum ChannelId implements io.openems.edge.common.channel.ChannelId {
 
 		/**
 		 * Grounding-Contactor connects the inverter grounding in off-grid to neutral.
-		 * 
+		 *
 		 * <ul>
 		 * <li>Interface: {@link OffGridSwitch}
 		 * <li>Type: Boolean
@@ -44,7 +44,7 @@ public enum ChannelId implements io.openems.edge.common.channel.ChannelId {
 
 		/**
 		 * Grid Mode.
-		 * 
+		 *
 		 * <ul>
 		 * <li>Interface: {@link OffGridSwitch}
 		 * <li>Type: {@link GridMode}
@@ -68,7 +68,7 @@ public Doc doc() {
 
 	/**
 	 * Gets the Channel for {@link ChannelId#MAIN_CONTACTOR}.
-	 * 
+	 *
 	 * @return the Channel
 	 */
 	public default Channel<Boolean> getMainContactorChannel() {
@@ -78,26 +78,25 @@ public default Channel<Boolean> getMainContactorChannel() {
 	/**
 	 * Gets the Main Contactor relay state. It is Normally-Closed.
 	 * {@link ChannelId#MAIN_CONTACTOR}.
-	 * 
+	 *
 	 * @return the Channel {@link Value}
 	 */
 	public default Optional<Contactor> getMainContactor() {
-		Value<Boolean> value = this.getMainContactorChannel().value();
-		if (value.isDefined()) {
-			if (value.get()) {
-				return Optional.of(Contactor.OPEN);
-			} else {
-				return Optional.of(Contactor.CLOSE);
-			}
-		} else {
+		var value = this.getMainContactorChannel().value();
+		if (!value.isDefined()) {
 			return Optional.empty();
 		}
+		if (value.get()) {
+			return Optional.of(Contactor.OPEN);
+		} else {
+			return Optional.of(Contactor.CLOSE);
+		}
 	}
 
 	/**
 	 * Internal method to set the 'nextValue' on {@link ChannelId#MAIN_CONTACTOR}
 	 * Channel.
-	 * 
+	 *
 	 * @param value the next value
 	 */
 	public default void _setMainContactor(Boolean value) {
@@ -106,7 +105,7 @@ public default void _setMainContactor(Boolean value) {
 
 	/**
 	 * Gets the Channel for {@link ChannelId#GROUNDING_CONTACTOR}.
-	 * 
+	 *
 	 * @return the Channel
 	 */
 	public default Channel<Boolean> getGroundingContactorChannel() {
@@ -116,26 +115,25 @@ public default Channel<Boolean> getGroundingContactorChannel() {
 	/**
 	 * Gets the Grounding Contactor relay state. It is Normally-Open.
 	 * {@link ChannelId#GROUNDING_CONTACTOR}.
-	 * 
+	 *
 	 * @return the Channel {@link Value}
 	 */
 	public default Optional<Contactor> getGroundingContactor() {
-		Value<Boolean> value = this.getGroundingContactorChannel().value();
-		if (value.isDefined()) {
-			if (value.get()) {
-				return Optional.of(Contactor.CLOSE);
-			} else {
-				return Optional.of(Contactor.OPEN);
-			}
-		} else {
+		var value = this.getGroundingContactorChannel().value();
+		if (!value.isDefined()) {
 			return Optional.empty();
 		}
+		if (value.get()) {
+			return Optional.of(Contactor.CLOSE);
+		} else {
+			return Optional.of(Contactor.OPEN);
+		}
 	}
 
 	/**
 	 * Internal method to set the 'nextValue' on
 	 * {@link ChannelId#GROUNDING_CONTACTOR} Channel.
-	 * 
+	 *
 	 * @param value the next value
 	 */
 	public default void _setGroundingContactor(Boolean value) {
@@ -144,7 +142,7 @@ public default void _setGroundingContactor(Boolean value) {
 
 	/**
 	 * Gets the Channel for {@link ChannelId#GRID_MODE}.
-	 * 
+	 *
 	 * @return the Channel
 	 */
 	public default Channel<GridMode> getGridModeChannel() {
@@ -153,7 +151,7 @@ public default Channel<GridMode> getGridModeChannel() {
 
 	/**
 	 * {@link ChannelId#GRID_MODE}.
-	 * 
+	 *
 	 * @return the Channel {@link Value}
 	 */
 	public default GridMode getGridMode() {
@@ -163,7 +161,7 @@ public default GridMode getGridMode() {
 	/**
 	 * Internal method to set the 'nextValue' on {@link ChannelId#GRID_MODE}
 	 * Channel.
-	 * 
+	 *
 	 * @param value the next value
 	 */
 	public default void _setGridMode(GridMode value) {
@@ -189,12 +187,12 @@ public static enum Contactor {
 
 	/**
 	 * Set the Main-Contactor, which connects the inverter to the public grid.
-	 * 
+	 *
 	 * <ul>
 	 * <li>OPEN: disconnect inverter from public grid
 	 * <li>CLOSE: connect inverter to public grid
 	 * </ul>
-	 * 
+	 *
 	 * @param operation {@link Contactor} operation
 	 * @throws IllegalArgumentException on error
 	 * @throws OpenemsNamedException    on error
@@ -204,12 +202,12 @@ public static enum Contactor {
 	/**
 	 * Sets the Grounding-Contactor, which connects the inverter grounding in
 	 * off-grid to neutral.
-	 * 
+	 *
 	 * <ul>
 	 * <li>OPEN: disconnects inverter grounding from neutral
 	 * <li>CLOSE: connects in inverter grounding to neutral
 	 * </ul>
-	 * 
+	 *
 	 * @param operation {@link Contactor} operation
 	 * @throws IllegalArgumentException on error
 	 * @throws OpenemsNamedException    on error
diff --git a/io.openems.edge.ess.api/src/io/openems/edge/ess/power/api/Coefficient.java b/io.openems.edge.ess.api/src/io/openems/edge/ess/power/api/Coefficient.java
index 10d744c63b6..decffb5fd3e 100644
--- a/io.openems.edge.ess.api/src/io/openems/edge/ess/power/api/Coefficient.java
+++ b/io.openems.edge.ess.api/src/io/openems/edge/ess/power/api/Coefficient.java
@@ -20,18 +20,18 @@ public String toString() {
 	}
 
 	public int getIndex() {
-		return index;
+		return this.index;
 	}
 
 	public String getEssId() {
-		return essId;
+		return this.essId;
 	}
 
 	public Phase getPhase() {
-		return phase;
+		return this.phase;
 	}
 
 	public Pwr getPwr() {
-		return pwr;
+		return this.pwr;
 	}
 }
diff --git a/io.openems.edge.ess.api/src/io/openems/edge/ess/power/api/Coefficients.java b/io.openems.edge.ess.api/src/io/openems/edge/ess/power/api/Coefficients.java
index 716c091cac1..d78109d75ed 100644
--- a/io.openems.edge.ess.api/src/io/openems/edge/ess/power/api/Coefficients.java
+++ b/io.openems.edge.ess.api/src/io/openems/edge/ess/power/api/Coefficients.java
@@ -17,7 +17,7 @@ public class Coefficients {
 
 	/**
 	 * Initialize the Coefficients for the linear equation system.
-	 * 
+	 *
 	 * @param symmetricMode if activated, Coefficients are only added for Sum of all
 	 *                      Phases. Otherwise Coefficients for Sum and each Phase
 	 *                      are added.
@@ -26,7 +26,7 @@ public class Coefficients {
 	public synchronized void initialize(boolean symmetricMode, Set<String> essIds) {
 		this.coefficients.clear();
 		this.symmetricMode = symmetricMode;
-		int index = 0;
+		var index = 0;
 		for (String essId : essIds) {
 			if (symmetricMode) {
 				// Symmetric Mode
diff --git a/io.openems.edge.ess.api/src/io/openems/edge/ess/power/api/Constraint.java b/io.openems.edge.ess.api/src/io/openems/edge/ess/power/api/Constraint.java
index 0c0d261a284..a1077d033d6 100644
--- a/io.openems.edge.ess.api/src/io/openems/edge/ess/power/api/Constraint.java
+++ b/io.openems.edge.ess.api/src/io/openems/edge/ess/power/api/Constraint.java
@@ -10,7 +10,7 @@
  * <li>Relationship (EQ, GEQ, LEQ) as given in constructor
  * <li>Value as given in constructor
  * <li>Setting each coefficient, i.e.
- * 
+ *
  * <pre>
  * y = 1*p1 + 0*q1 * + 1*p2 + 0*q1 +...
  * </pre>
@@ -37,7 +37,7 @@ public Constraint(String description, List<LinearCoefficient> coefficients, Rela
 
 	/**
 	 * Creates an initially disabled Constraint
-	 * 
+	 *
 	 * @param coefficients
 	 * @param relationship
 	 */
@@ -60,12 +60,12 @@ public Constraint(String description, List<LinearCoefficient> coefficients, Rela
 
 	@Override
 	public String toString() {
-		StringBuilder b = new StringBuilder();
+		var b = new StringBuilder();
 		b.append(String.format("%-30s", this.description));
 		for (LinearCoefficient c : this.coefficients) {
 			b.append(c.toString());
 		}
-		b.append(" " + relationship.toString() + " ");
+		b.append(" " + this.relationship.toString() + " ");
 		if (this.value.isPresent()) {
 			b.append(VALUE_FORMAT.format(this.value.get()));
 		} else {
@@ -79,11 +79,11 @@ public String getDescription() {
 	}
 
 	public LinearCoefficient[] getCoefficients() {
-		return coefficients;
+		return this.coefficients;
 	}
 
 	public Relationship getRelationship() {
-		return relationship;
+		return this.relationship;
 	}
 
 	public Optional<Double> getValue() {
diff --git a/io.openems.edge.ess.api/src/io/openems/edge/ess/power/api/EssType.java b/io.openems.edge.ess.api/src/io/openems/edge/ess/power/api/EssType.java
index 4ecf0a6370a..5d8abfecf68 100644
--- a/io.openems.edge.ess.api/src/io/openems/edge/ess/power/api/EssType.java
+++ b/io.openems.edge.ess.api/src/io/openems/edge/ess/power/api/EssType.java
@@ -12,7 +12,8 @@ public enum EssType {
 	public static EssType getEssType(ManagedSymmetricEss ess) {
 		if (ess instanceof MetaEss) {
 			return META;
-		} else if (ess instanceof ManagedSinglePhaseEss) {
+		}
+		if (ess instanceof ManagedSinglePhaseEss) {
 			return EssType.SINGLE_PHASE;
 		} else if (ess instanceof ManagedAsymmetricEss) {
 			return EssType.ASYMMETRIC;
diff --git a/io.openems.edge.ess.api/src/io/openems/edge/ess/power/api/Inverter.java b/io.openems.edge.ess.api/src/io/openems/edge/ess/power/api/Inverter.java
index 54cb55596bf..84e376f5747 100644
--- a/io.openems.edge.ess.api/src/io/openems/edge/ess/power/api/Inverter.java
+++ b/io.openems.edge.ess.api/src/io/openems/edge/ess/power/api/Inverter.java
@@ -9,7 +9,7 @@ public abstract class Inverter {
 	 * Factory
 	 */
 	public static Inverter[] of(boolean symmetricMode, ManagedSymmetricEss ess, EssType essType) {
-		String essId = ess.id();
+		var essId = ess.id();
 		if (symmetricMode) {
 			// Symmetric Mode -> always return a symmetric ThreePhaseInverter
 			switch (essType) {
@@ -25,7 +25,7 @@ public static Inverter[] of(boolean symmetricMode, ManagedSymmetricEss ess, EssT
 			// Asymmetric Mode
 			switch (essType) {
 			case SINGLE_PHASE:
-				Phase phase = ((ManagedSinglePhaseEss) ess).getPhase().getPowerApiPhase();
+				var phase = ((ManagedSinglePhaseEss) ess).getPhase().getPowerApiPhase();
 				return new Inverter[] { //
 						phase == Phase.L1 ? new SinglePhaseInverter(essId, Phase.L1)
 								: new DummyInverter(essId, Phase.L1),
@@ -100,9 +100,10 @@ public final void setLastActivePower(int activePower) {
 	}
 
 	public int getLastActivePower() {
-		return lastActivePower;
+		return this.lastActivePower;
 	}
 
+	@Override
 	public String toString() {
 		return this.essId + this.phase.getSymbol();
 	}
diff --git a/io.openems.edge.ess.api/src/io/openems/edge/ess/power/api/LinearCoefficient.java b/io.openems.edge.ess.api/src/io/openems/edge/ess/power/api/LinearCoefficient.java
index 3598e945959..bd69f488a72 100644
--- a/io.openems.edge.ess.api/src/io/openems/edge/ess/power/api/LinearCoefficient.java
+++ b/io.openems.edge.ess.api/src/io/openems/edge/ess/power/api/LinearCoefficient.java
@@ -15,18 +15,19 @@ public LinearCoefficient(Coefficient coefficient, double value) {
 	}
 
 	public Coefficient getCoefficient() {
-		return coefficient;
+		return this.coefficient;
 	}
 
 	public double getValue() {
-		return value;
+		return this.value;
 	}
 
 	@Override
 	public String toString() {
 		if (this.value == 1) {
 			return "+" + this.coefficient.toString();
-		} else if (this.value == -1) {
+		}
+		if (this.value == -1) {
 			return "-" + this.coefficient.toString();
 		} else {
 			return VALUE_FORMAT.format(this.value) + "*" + this.coefficient.toString();
diff --git a/io.openems.edge.ess.api/src/io/openems/edge/ess/power/api/Phase.java b/io.openems.edge.ess.api/src/io/openems/edge/ess/power/api/Phase.java
index 51dd38070c3..a185637529a 100644
--- a/io.openems.edge.ess.api/src/io/openems/edge/ess/power/api/Phase.java
+++ b/io.openems.edge.ess.api/src/io/openems/edge/ess/power/api/Phase.java
@@ -10,6 +10,6 @@ private Phase(String symbol) {
 	}
 
 	public String getSymbol() {
-		return symbol;
+		return this.symbol;
 	}
 }
diff --git a/io.openems.edge.ess.api/src/io/openems/edge/ess/power/api/Power.java b/io.openems.edge.ess.api/src/io/openems/edge/ess/power/api/Power.java
index 537096aa175..6a03de25130 100644
--- a/io.openems.edge.ess.api/src/io/openems/edge/ess/power/api/Power.java
+++ b/io.openems.edge.ess.api/src/io/openems/edge/ess/power/api/Power.java
@@ -11,18 +11,18 @@ public interface Power {
 
 	public final static Logger log = LoggerFactory.getLogger(Power.class);
 
-	public static Constraint[] NO_CONSTRAINTS = new Constraint[] {};
+	public static Constraint[] NO_CONSTRAINTS = {};
 
 	/**
 	 * Adds a Constraint.
-	 * 
+	 *
 	 * @param constraint
 	 */
 	public Constraint addConstraint(Constraint constraint);
 
 	/**
 	 * Adds a Constraint if the problem is still solvable afterwards.
-	 * 
+	 *
 	 * @param constraint
 	 * @throws PowerException
 	 * @throws OpenemsException
@@ -31,7 +31,7 @@ public interface Power {
 
 	/**
 	 * Creates a simple constraint
-	 * 
+	 *
 	 * @param description
 	 * @param ess
 	 * @param phase
@@ -46,7 +46,7 @@ public Constraint createSimpleConstraint(String description, ManagedSymmetricEss
 
 	/**
 	 * Removes a Constraint.
-	 * 
+	 *
 	 * @param constraint
 	 */
 	public void removeConstraint(Constraint constraint);
@@ -64,7 +64,7 @@ public Constraint createSimpleConstraint(String description, ManagedSymmetricEss
 	/**
 	 * Gets the Coefficient singleton for a specific combination of ess, phase and
 	 * pwr
-	 * 
+	 *
 	 * @param ess
 	 * @param phase
 	 * @param pwr
@@ -75,7 +75,7 @@ public Constraint createSimpleConstraint(String description, ManagedSymmetricEss
 
 	/**
 	 * Adjusts the given value so that it fits into Min/MaxPower.
-	 * 
+	 *
 	 * @param componentId Component-ID of the calling component for the log message
 	 * @param value       the target value
 	 * @return a value that fits into Min/MaxPower
@@ -88,65 +88,57 @@ public default int fitValueIntoMinMaxPower(String componentId, ManagedSymmetricE
 		// fit into max possible discharge power
 		value = this.fitValueToMaxPower(componentId, ess, phase, pwr, value);
 
-		/*
-		 * Charge
-		 */
-		// fit into max possible charge power
-		value = this.fitValueToMinPower(componentId, ess, phase, pwr, value);
-
-		return value;
+		return this.fitValueToMinPower(componentId, ess, phase, pwr, value);
 	}
 
 	/**
 	 * Adjusts the given value so that it does not break an existing
 	 * Max-Power-Constraint.
-	 * 
+	 *
 	 * @param componentId Component-ID of the calling component for the log message
 	 * @param value       the target value
 	 * @return a value that is compared to existing Max-Power
 	 */
 	public default int fitValueToMaxPower(String componentId, ManagedSymmetricEss ess, Phase phase, Pwr pwr,
 			int value) {
-		int maxPower = this.getMaxPower(ess, phase, pwr);
+		var maxPower = this.getMaxPower(ess, phase, pwr);
 		if (value > maxPower) {
 			Power.log.info("[" + componentId + "] reducing requested [" + value + " W] to maximum power [" + maxPower
 					+ " W] for [" + ess.id() + pwr.getSymbol() + phase.getSymbol() + "]");
 			return maxPower;
-		} else {
-			return value;
 		}
+		return value;
 	}
 
 	/**
 	 * Adjusts the given value so that it does not break an existing
 	 * Min-Power-Constraint.
-	 * 
+	 *
 	 * @param componentId Component-ID of the calling component for the log message
 	 * @param value       the target value
 	 * @return a value that is compared to existing Min-Power
 	 */
 	public default int fitValueToMinPower(String componentId, ManagedSymmetricEss ess, Phase phase, Pwr pwr,
 			int value) {
-		int minPower = this.getMinPower(ess, phase, pwr);
+		var minPower = this.getMinPower(ess, phase, pwr);
 		if (value < minPower) {
 			Power.log.info("[" + componentId + "] increasing requested [" + value + " W] to minimum power [" + minPower
 					+ " W] for [" + ess.id() + pwr.getSymbol() + phase.getSymbol() + "]");
 			return minPower;
-		} else {
-			return value;
 		}
+		return value;
 	}
 
 	/**
 	 * Gets the PidFilter instance with the configured P, I and D variables.
-	 * 
+	 *
 	 * @return an instance of {@link PidFilter}
 	 */
 	public PidFilter getPidFilter();
 
 	/**
 	 * Check if PidFilter is enabled.
-	 * 
+	 *
 	 * @return true if PidFilter is enable, otherwise false
 	 */
 	public boolean isPidEnabled();
diff --git a/io.openems.edge.ess.api/src/io/openems/edge/ess/power/api/PowerException.java b/io.openems.edge.ess.api/src/io/openems/edge/ess/power/api/PowerException.java
index 270f23f2b06..24f9b59473a 100644
--- a/io.openems.edge.ess.api/src/io/openems/edge/ess/power/api/PowerException.java
+++ b/io.openems.edge.ess.api/src/io/openems/edge/ess/power/api/PowerException.java
@@ -20,7 +20,7 @@ public PowerException(Type type) {
 	}
 
 	public Type getType() {
-		return type;
+		return this.type;
 	}
 
 	public void setReason(Constraint reason) {
diff --git a/io.openems.edge.ess.api/src/io/openems/edge/ess/power/api/Pwr.java b/io.openems.edge.ess.api/src/io/openems/edge/ess/power/api/Pwr.java
index 12d0d3c1dc3..d9bd6a7640d 100644
--- a/io.openems.edge.ess.api/src/io/openems/edge/ess/power/api/Pwr.java
+++ b/io.openems.edge.ess.api/src/io/openems/edge/ess/power/api/Pwr.java
@@ -10,6 +10,6 @@ public enum Pwr {
 	}
 
 	public String getSymbol() {
-		return symbol;
+		return this.symbol;
 	}
 }
diff --git a/io.openems.edge.ess.api/src/io/openems/edge/ess/power/api/SinglePhaseInverter.java b/io.openems.edge.ess.api/src/io/openems/edge/ess/power/api/SinglePhaseInverter.java
index d94e1c64a8c..c5fc61284c1 100644
--- a/io.openems.edge.ess.api/src/io/openems/edge/ess/power/api/SinglePhaseInverter.java
+++ b/io.openems.edge.ess.api/src/io/openems/edge/ess/power/api/SinglePhaseInverter.java
@@ -1,7 +1,8 @@
 package io.openems.edge.ess.power.api;
 
 /**
- * Represents a Single-Phase Inverter, e.g. a single-phase Ess or part of a three-phase Ess.
+ * Represents a Single-Phase Inverter, e.g. a single-phase Ess or part of a
+ * three-phase Ess.
  */
 public class SinglePhaseInverter extends Inverter {
 
diff --git a/io.openems.edge.ess.api/src/io/openems/edge/ess/test/DummyHybridEss.java b/io.openems.edge.ess.api/src/io/openems/edge/ess/test/DummyHybridEss.java
index afbc5ad22af..86c95a5a46f 100644
--- a/io.openems.edge.ess.api/src/io/openems/edge/ess/test/DummyHybridEss.java
+++ b/io.openems.edge.ess.api/src/io/openems/edge/ess/test/DummyHybridEss.java
@@ -77,7 +77,7 @@ public int getPowerPrecision() {
 
 	/**
 	 * Set {@link ChannelId#SURPLUS_POWER} of this {@link DummyHybridEss}.
-	 * 
+	 *
 	 * @param value the surplus power
 	 * @return myself
 	 */
@@ -90,7 +90,7 @@ public DummyHybridEss withSurplusPower(Integer value) {
 	/**
 	 * Set {@link SymmetricEss.ChannelId#MAX_APPARENT_POWER} of this
 	 * {@link DummyHybridEss}.
-	 * 
+	 *
 	 * @param value the max apparent power
 	 * @return myself
 	 */
@@ -105,7 +105,7 @@ public DummyHybridEss withMaxApparentPower(int value) {
 
 	/**
 	 * Gets the Channel for {@link ChannelId#SURPLUS_POWER}.
-	 * 
+	 *
 	 * @return the Channel
 	 */
 	private IntegerReadChannel getSurplusPowerChannel() {
@@ -115,7 +115,7 @@ private IntegerReadChannel getSurplusPowerChannel() {
 	/**
 	 * Internal method to set the 'nextValue' on {@link ChannelId#SURPLUS_POWER}
 	 * Channel.
-	 * 
+	 *
 	 * @param value the next value
 	 */
 	private void _setSurplusPower(Integer value) {
@@ -124,7 +124,7 @@ private void _setSurplusPower(Integer value) {
 
 	/**
 	 * Gets the Dummy Surplus Power in [W]. See {@link ChannelId#SURPLUS_POWER}.
-	 * 
+	 *
 	 * @return the Channel {@link Value} or null
 	 */
 	@Override
diff --git a/io.openems.edge.ess.api/src/io/openems/edge/ess/test/DummyManagedSymmetricEss.java b/io.openems.edge.ess.api/src/io/openems/edge/ess/test/DummyManagedSymmetricEss.java
index 15de730b4ea..e53f6be8791 100644
--- a/io.openems.edge.ess.api/src/io/openems/edge/ess/test/DummyManagedSymmetricEss.java
+++ b/io.openems.edge.ess.api/src/io/openems/edge/ess/test/DummyManagedSymmetricEss.java
@@ -78,7 +78,7 @@ public int getPowerPrecision() {
 	/**
 	 * Set {@link SymmetricEss.ChannelId#SOC} of this
 	 * {@link DummyManagedSymmetricEss}.
-	 * 
+	 *
 	 * @param value the state-of-charge
 	 * @return myself
 	 */
@@ -91,7 +91,7 @@ public DummyManagedSymmetricEss withSoc(int value) {
 	/**
 	 * Set {@link SymmetricEss.ChannelId#CAPACITY} of this
 	 * {@link DummyManagedSymmetricEss}. *
-	 * 
+	 *
 	 * @param value the capacity
 	 * @return myself
 	 */
@@ -104,7 +104,7 @@ public DummyManagedSymmetricEss withCapacity(int value) {
 	/**
 	 * Set {@link SymmetricEss.ChannelId#GRID_MODE} of this
 	 * {@link DummyManagedSymmetricEss}. *
-	 * 
+	 *
 	 * @param value the {@link GridMode}
 	 * @return myself
 	 */
@@ -117,7 +117,7 @@ public DummyManagedSymmetricEss withGridMode(GridMode value) {
 	/**
 	 * Set {@link SymmetricEss.ChannelId#MAX_APPARENT_POWER} of this
 	 * {@link DummyManagedSymmetricEss}. *
-	 * 
+	 *
 	 * @param value the max apparent power
 	 * @return myself
 	 */
@@ -130,7 +130,7 @@ public DummyManagedSymmetricEss withMaxApparentPower(int value) {
 	/**
 	 * Set {@link ManagedSymmetricEss.ChannelId#ALLOWED_CHARGE_POWER} of this
 	 * {@link DummyManagedSymmetricEss}. *
-	 * 
+	 *
 	 * @param value the allowed charge power
 	 * @return myself
 	 */
@@ -143,7 +143,7 @@ public DummyManagedSymmetricEss withAllowedChargePower(int value) {
 	/**
 	 * Set {@link ManagedSymmetricEss.ChannelId#ALLOWED_DISCHARGE_POWER} of this
 	 * {@link DummyManagedSymmetricEss}. *
-	 * 
+	 *
 	 * @param value the allowed discharge power
 	 * @return myself
 	 */
@@ -155,7 +155,7 @@ public DummyManagedSymmetricEss withAllowedDischargePower(int value) {
 
 	/**
 	 * Set Power Precision of this {@link DummyManagedSymmetricEss}.
-	 * 
+	 *
 	 * @param value the power precision
 	 * @return myself
 	 */
@@ -166,7 +166,7 @@ public DummyManagedSymmetricEss withPowerPrecision(int value) {
 
 	/**
 	 * Set callback for applyPower() of this {@link DummyManagedSymmetricEss}.
-	 * 
+	 *
 	 * @param callback the callback
 	 * @return myself
 	 */
diff --git a/io.openems.edge.ess.api/src/io/openems/edge/ess/test/DummyMetaEss.java b/io.openems.edge.ess.api/src/io/openems/edge/ess/test/DummyMetaEss.java
index 4fbbb0bbfc6..7c2aad566ca 100644
--- a/io.openems.edge.ess.api/src/io/openems/edge/ess/test/DummyMetaEss.java
+++ b/io.openems.edge.ess.api/src/io/openems/edge/ess/test/DummyMetaEss.java
@@ -34,7 +34,7 @@ public DummyMetaEss(String id, Power power, SymmetricEss... esss) {
 		}
 		super.activate(null, id, "", true);
 		// Add all ManagedSymmetricEss devices to this.essIds
-		this.essIds = Arrays.stream(esss).map(e -> e.id()).toArray(String[]::new);
+		this.essIds = Arrays.stream(esss).map(SymmetricEss::id).toArray(String[]::new);
 	}
 
 	public DummyMetaEss(String id, SymmetricEss... esss) {
diff --git a/io.openems.edge.ess.api/src/io/openems/edge/ess/test/DummyPower.java b/io.openems.edge.ess.api/src/io/openems/edge/ess/test/DummyPower.java
index 5e1f9a0b976..d553764f6f2 100644
--- a/io.openems.edge.ess.api/src/io/openems/edge/ess/test/DummyPower.java
+++ b/io.openems.edge.ess.api/src/io/openems/edge/ess/test/DummyPower.java
@@ -18,7 +18,7 @@
 public class DummyPower implements Power {
 
 	private final PidFilter pidFilter;
-	private List<ManagedSymmetricEss> esss = new ArrayList<>();
+	private final List<ManagedSymmetricEss> esss = new ArrayList<>();
 
 	private int maxApparentPower;
 
@@ -33,7 +33,7 @@ public DummyPower() {
 	/**
 	 * Creates a {@link DummyPower} with given MaxApparentPower and disabled PID
 	 * filter.
-	 * 
+	 *
 	 * @param maxApparentPower the MaxApparentPower
 	 */
 	public DummyPower(int maxApparentPower) {
@@ -92,7 +92,7 @@ public void setMaxApparentPower(int maxApparentPower) {
 
 	@Override
 	public int getMaxPower(ManagedSymmetricEss ess, Phase phase, Pwr pwr) {
-		int result = this.maxApparentPower;
+		var result = this.maxApparentPower;
 		for (ManagedSymmetricEss e : this.esss) {
 			result = TypeUtils.min(result, e.getMaxApparentPower().get(), e.getAllowedDischargePower().get());
 		}
@@ -101,7 +101,7 @@ public int getMaxPower(ManagedSymmetricEss ess, Phase phase, Pwr pwr) {
 
 	@Override
 	public int getMinPower(ManagedSymmetricEss ess, Phase phase, Pwr pwr) {
-		int result = this.maxApparentPower;
+		var result = this.maxApparentPower;
 		for (ManagedSymmetricEss e : this.esss) {
 			result = TypeUtils.min(result, e.getMaxApparentPower().get(),
 					TypeUtils.multiply(e.getAllowedChargePower().get(), -1));
diff --git a/io.openems.edge.ess.api/src/io/openems/edge/ess/test/ManagedSymmetricEssTest.java b/io.openems.edge.ess.api/src/io/openems/edge/ess/test/ManagedSymmetricEssTest.java
index 4e56dbf99de..dab8dbae5a9 100644
--- a/io.openems.edge.ess.api/src/io/openems/edge/ess/test/ManagedSymmetricEssTest.java
+++ b/io.openems.edge.ess.api/src/io/openems/edge/ess/test/ManagedSymmetricEssTest.java
@@ -16,7 +16,7 @@ public ManagedSymmetricEssTest(ManagedSymmetricEss sut) throws OpenemsException
 
 	@Override
 	protected void onBeforeWrite() throws OpenemsNamedException {
-		ManagedSymmetricEss ess = this.getSut();
+		var ess = this.getSut();
 		int activePower = ess.getSetActivePowerEqualsChannel().getNextWriteValueAndReset().orElse(0);
 		int reactivePower = ess.getSetReactivePowerEqualsChannel().getNextWriteValueAndReset().orElse(0);
 

From 05709ee0746db2979cd4d04a7f1d95af792b96f6 Mon Sep 17 00:00:00 2001
From: Stefan Feilmeier <stefan.feilmeier@fenecon.de>
Date: Tue, 8 Mar 2022 11:12:15 +0100
Subject: [PATCH 56/96] Update io.openems.edge.ess.byd.container

---
 .../byd/container/BatteryStringWorkState.java |  4 +--
 .../byd/container/EssFeneconBydContainer.java |  6 +++--
 .../ess/byd/container/SetSystemWorkstate.java | 12 ++++-----
 .../ess/byd/container/SystemWorkmode.java     | 10 +++----
 .../ess/byd/container/SystemWorkstate.java    | 22 +++++++--------
 .../watchdog/BydContainerWatchdog.java        | 27 +++++++++----------
 .../edge/ess/byd/container/MyConfig.java      |  2 +-
 .../watchdog/BydContainerWatchdogTest.java    |  2 +-
 .../byd/container/watchdog/MyEssConfig.java   |  2 +-
 .../container/watchdog/MyWatchdogConfig.java  |  2 +-
 10 files changed, 44 insertions(+), 45 deletions(-)

diff --git a/io.openems.edge.ess.byd.container/src/io/openems/edge/ess/byd/container/BatteryStringWorkState.java b/io.openems.edge.ess.byd.container/src/io/openems/edge/ess/byd/container/BatteryStringWorkState.java
index 4b576f27131..f509faa2c80 100644
--- a/io.openems.edge.ess.byd.container/src/io/openems/edge/ess/byd/container/BatteryStringWorkState.java
+++ b/io.openems.edge.ess.byd.container/src/io/openems/edge/ess/byd/container/BatteryStringWorkState.java
@@ -20,12 +20,12 @@ private BatteryStringWorkState(int value, String name) {
 
 	@Override
 	public int getValue() {
-		return value;
+		return this.value;
 	}
 
 	@Override
 	public String getName() {
-		return name;
+		return this.name;
 	}
 
 	@Override
diff --git a/io.openems.edge.ess.byd.container/src/io/openems/edge/ess/byd/container/EssFeneconBydContainer.java b/io.openems.edge.ess.byd.container/src/io/openems/edge/ess/byd/container/EssFeneconBydContainer.java
index 2097a63e0e6..03672cc9cdb 100644
--- a/io.openems.edge.ess.byd.container/src/io/openems/edge/ess/byd/container/EssFeneconBydContainer.java
+++ b/io.openems.edge.ess.byd.container/src/io/openems/edge/ess/byd/container/EssFeneconBydContainer.java
@@ -75,6 +75,7 @@ public EssFeneconBydContainer() {
 		this._setGridMode(GridMode.ON_GRID);
 	}
 
+	@Override
 	@Reference(policy = ReferencePolicy.STATIC, policyOption = ReferencePolicyOption.GREEDY, cardinality = ReferenceCardinality.MANDATORY)
 	protected void setModbus(BridgeModbus modbus) {
 		super.setModbus(modbus);
@@ -94,7 +95,7 @@ void activate(ComponentContext context, Config config) throws OpenemsException {
 		}
 
 		// Configure Modbus 1
-		if (OpenemsComponent.updateReferenceFilter(cm, this.servicePid(), "modbus1", config.modbus_id1())) {
+		if (OpenemsComponent.updateReferenceFilter(this.cm, this.servicePid(), "modbus1", config.modbus_id1())) {
 			return;
 		}
 		if (this.isEnabled() && this.modbus1 != null) {
@@ -102,7 +103,7 @@ void activate(ComponentContext context, Config config) throws OpenemsException {
 		}
 
 		// Configure Modbus 2
-		if (OpenemsComponent.updateReferenceFilter(cm, this.servicePid(), "modbus2", config.modbus_id2())) {
+		if (OpenemsComponent.updateReferenceFilter(this.cm, this.servicePid(), "modbus2", config.modbus_id2())) {
 			return;
 		}
 		if (this.isEnabled() && this.modbus2 != null) {
@@ -114,6 +115,7 @@ void activate(ComponentContext context, Config config) throws OpenemsException {
 		this.channel(ChannelId.READ_ONLY_MODE).setNextValue(config.readonly());
 	}
 
+	@Override
 	@Deactivate
 	protected void deactivate() {
 		if (this.modbus1 != null) {
diff --git a/io.openems.edge.ess.byd.container/src/io/openems/edge/ess/byd/container/SetSystemWorkstate.java b/io.openems.edge.ess.byd.container/src/io/openems/edge/ess/byd/container/SetSystemWorkstate.java
index 043b0769d4e..01c165ba882 100644
--- a/io.openems.edge.ess.byd.container/src/io/openems/edge/ess/byd/container/SetSystemWorkstate.java
+++ b/io.openems.edge.ess.byd.container/src/io/openems/edge/ess/byd/container/SetSystemWorkstate.java
@@ -3,10 +3,10 @@
 import io.openems.common.types.OptionsEnum;
 
 public enum SetSystemWorkstate implements OptionsEnum {
-	UNDEFINED(-1, "Undefined"), 
-	STOP(2, "Stop"),
+	UNDEFINED(-1, "Undefined"), //
+	STOP(2, "Stop"), //
 	RUN(6, "Run");
-	
+
 	private final int value;
 	private final String name;
 
@@ -17,14 +17,14 @@ private SetSystemWorkstate(int value, String name) {
 
 	@Override
 	public int getValue() {
-		return value;
+		return this.value;
 	}
 
 	@Override
 	public String getName() {
-		return name;
+		return this.name;
 	}
-	
+
 	@Override
 	public OptionsEnum getUndefined() {
 		return UNDEFINED;
diff --git a/io.openems.edge.ess.byd.container/src/io/openems/edge/ess/byd/container/SystemWorkmode.java b/io.openems.edge.ess.byd.container/src/io/openems/edge/ess/byd/container/SystemWorkmode.java
index fec4a7a34c7..4eaed03a08d 100644
--- a/io.openems.edge.ess.byd.container/src/io/openems/edge/ess/byd/container/SystemWorkmode.java
+++ b/io.openems.edge.ess.byd.container/src/io/openems/edge/ess/byd/container/SystemWorkmode.java
@@ -3,9 +3,9 @@
 import io.openems.common.types.OptionsEnum;
 
 public enum SystemWorkmode implements OptionsEnum {
-	UNDEFINED(-1, "Undefined"), 
+	UNDEFINED(-1, "Undefined"), //
 	PQ_MODE(2, "PQ-mode");
-	
+
 	private final int value;
 	private final String name;
 
@@ -16,14 +16,14 @@ private SystemWorkmode(int value, String name) {
 
 	@Override
 	public int getValue() {
-		return value;
+		return this.value;
 	}
 
 	@Override
 	public String getName() {
-		return name;
+		return this.name;
 	}
-	
+
 	@Override
 	public OptionsEnum getUndefined() {
 		return UNDEFINED;
diff --git a/io.openems.edge.ess.byd.container/src/io/openems/edge/ess/byd/container/SystemWorkstate.java b/io.openems.edge.ess.byd.container/src/io/openems/edge/ess/byd/container/SystemWorkstate.java
index 31521f4344d..b2b21143de1 100644
--- a/io.openems.edge.ess.byd.container/src/io/openems/edge/ess/byd/container/SystemWorkstate.java
+++ b/io.openems.edge.ess.byd.container/src/io/openems/edge/ess/byd/container/SystemWorkstate.java
@@ -3,14 +3,14 @@
 import io.openems.common.types.OptionsEnum;
 
 public enum SystemWorkstate implements OptionsEnum {
-	UNDEFINED(-1, "Undefined"), 
-	INITIAL(0, "Initial"), 
-	FAULT(1, "Fault"), 
-	STOP(2, "Stop"), 
-	STANDBY(3, "Standby"),
-	GRID_MONITORING(4, "Grid-Monitoring"), 
-	READY(5, "Ready"),
-	RUNNING(6, "Running"),
+	UNDEFINED(-1, "Undefined"), //
+	INITIAL(0, "Initial"), //
+	FAULT(1, "Fault"), //
+	STOP(2, "Stop"), //
+	STANDBY(3, "Standby"), //
+	GRID_MONITORING(4, "Grid-Monitoring"), //
+	READY(5, "Ready"), //
+	RUNNING(6, "Running"), //
 	DEBUG(7, "Debug");
 
 	private final int value;
@@ -23,14 +23,14 @@ private SystemWorkstate(int value, String name) {
 
 	@Override
 	public int getValue() {
-		return value;
+		return this.value;
 	}
 
 	@Override
 	public String getName() {
-		return name;
+		return this.name;
 	}
-	
+
 	@Override
 	public OptionsEnum getUndefined() {
 		return UNDEFINED;
diff --git a/io.openems.edge.ess.byd.container/src/io/openems/edge/ess/byd/container/watchdog/BydContainerWatchdog.java b/io.openems.edge.ess.byd.container/src/io/openems/edge/ess/byd/container/watchdog/BydContainerWatchdog.java
index 89efe62b410..80fac2f139f 100644
--- a/io.openems.edge.ess.byd.container/src/io/openems/edge/ess/byd/container/watchdog/BydContainerWatchdog.java
+++ b/io.openems.edge.ess.byd.container/src/io/openems/edge/ess/byd/container/watchdog/BydContainerWatchdog.java
@@ -1,7 +1,5 @@
 package io.openems.edge.ess.byd.container.watchdog;
 
-import java.util.Optional;
-
 import org.osgi.service.cm.ConfigurationAdmin;
 import org.osgi.service.component.ComponentContext;
 import org.osgi.service.component.annotations.Activate;
@@ -72,6 +70,7 @@ void activate(ComponentContext context, Config config) throws OpenemsNamedExcept
 		this.config = config;
 	}
 
+	@Override
 	@Deactivate
 	protected void deactivate() {
 		super.deactivate();
@@ -81,9 +80,9 @@ protected void deactivate() {
 	public void run() throws IllegalArgumentException, OpenemsNamedException {
 		// Get ESS
 		EssFeneconBydContainer ess = this.componentManager.getComponent(this.config.ess_id());
-		boolean isReadonly = (boolean) ess.getComponentContext().getProperties().get("readonly");
 		IntegerWriteChannel channel = this.channel(ChannelId.WATCHDOG);
-		Optional<Integer> value = channel.getNextWriteValueAndReset();
+		var isReadonly = (boolean) ess.getComponentContext().getProperties().get("readonly");
+		var value = channel.getNextWriteValueAndReset();
 
 		// Check if Watchdog has been triggered in time.
 		// Timeout is configured in Modbus-TCP-Api Controller.
@@ -94,18 +93,16 @@ public void run() throws IllegalArgumentException, OpenemsNamedException {
 				// if readonly is already set to true --> do nothing
 			} else {
 				// Set to read-only mode
-				setConfig(true, ess.servicePid());
+				this.setConfig(true, ess.servicePid());
 			}
-		} else {
-			if (isReadonly) {
-				// Timeout happened, Set readonly flag to false once.
-				setConfig(false, ess.servicePid());
+		} else if (isReadonly) {
+			// Timeout happened, Set readonly flag to false once.
+			this.setConfig(false, ess.servicePid());
 
-			} else {
-				// setting the active and reactive power to zero
-				ess.setActivePowerEquals(0);
-				ess.setReactivePowerEquals(0);
-			}
+		} else {
+			// setting the active and reactive power to zero
+			ess.setActivePowerEquals(0);
+			ess.setReactivePowerEquals(0);
 		}
 	}
 
@@ -125,7 +122,7 @@ public ModbusSlaveTable getModbusSlaveTable(AccessMode accessMode) {
 	 *              off;
 	 * @param pid   pid of the Ess
 	 * @throws OpenemsNamedException on error
-	 * 
+	 *
 	 */
 	private void setConfig(Boolean value, String pid) throws OpenemsNamedException {
 		OpenemsComponent.updateConfigurationProperty(this.cm, pid, "readonly", value);
diff --git a/io.openems.edge.ess.byd.container/test/io/openems/edge/ess/byd/container/MyConfig.java b/io.openems.edge.ess.byd.container/test/io/openems/edge/ess/byd/container/MyConfig.java
index 1347387f584..10e0a64c17b 100644
--- a/io.openems.edge.ess.byd.container/test/io/openems/edge/ess/byd/container/MyConfig.java
+++ b/io.openems.edge.ess.byd.container/test/io/openems/edge/ess/byd/container/MyConfig.java
@@ -49,7 +49,7 @@ public MyConfig build() {
 
 	/**
 	 * Create a Config builder.
-	 * 
+	 *
 	 * @return a {@link Builder}
 	 */
 	public static Builder create() {
diff --git a/io.openems.edge.ess.byd.container/test/io/openems/edge/ess/byd/container/watchdog/BydContainerWatchdogTest.java b/io.openems.edge.ess.byd.container/test/io/openems/edge/ess/byd/container/watchdog/BydContainerWatchdogTest.java
index 8f3f3af2f5a..7e7769fbc01 100644
--- a/io.openems.edge.ess.byd.container/test/io/openems/edge/ess/byd/container/watchdog/BydContainerWatchdogTest.java
+++ b/io.openems.edge.ess.byd.container/test/io/openems/edge/ess/byd/container/watchdog/BydContainerWatchdogTest.java
@@ -29,7 +29,7 @@ public class BydContainerWatchdogTest {
 	// TODO requires fix by Pooran Chandrashekaraiah
 	// @Test
 	protected void test() throws Exception {
-		EssFeneconBydContainer ess = new EssFeneconBydContainer();
+		var ess = new EssFeneconBydContainer();
 		new ComponentTest(ess) //
 				.addReference("cm", new DummyConfigurationAdmin()) //
 				.addReference("power", new DummyPower()) //
diff --git a/io.openems.edge.ess.byd.container/test/io/openems/edge/ess/byd/container/watchdog/MyEssConfig.java b/io.openems.edge.ess.byd.container/test/io/openems/edge/ess/byd/container/watchdog/MyEssConfig.java
index 6596d4936b6..843e6dd8c18 100644
--- a/io.openems.edge.ess.byd.container/test/io/openems/edge/ess/byd/container/watchdog/MyEssConfig.java
+++ b/io.openems.edge.ess.byd.container/test/io/openems/edge/ess/byd/container/watchdog/MyEssConfig.java
@@ -49,7 +49,7 @@ public MyEssConfig build() {
 
 	/**
 	 * Create a Config builder.
-	 * 
+	 *
 	 * @return a {@link Builder}
 	 */
 	public static Builder create() {
diff --git a/io.openems.edge.ess.byd.container/test/io/openems/edge/ess/byd/container/watchdog/MyWatchdogConfig.java b/io.openems.edge.ess.byd.container/test/io/openems/edge/ess/byd/container/watchdog/MyWatchdogConfig.java
index 3d92d877caf..e8c4546c8af 100644
--- a/io.openems.edge.ess.byd.container/test/io/openems/edge/ess/byd/container/watchdog/MyWatchdogConfig.java
+++ b/io.openems.edge.ess.byd.container/test/io/openems/edge/ess/byd/container/watchdog/MyWatchdogConfig.java
@@ -29,7 +29,7 @@ public MyWatchdogConfig build() {
 
 	/**
 	 * Create a Config builder.
-	 * 
+	 *
 	 * @return a {@link Builder}
 	 */
 	public static Builder create() {

From 9bcb6f0b1989fadf3aec52e3ddebf3b9892a63ab Mon Sep 17 00:00:00 2001
From: Stefan Feilmeier <stefan.feilmeier@fenecon.de>
Date: Tue, 8 Mar 2022 11:14:15 +0100
Subject: [PATCH 57/96] Update io.openems.edge.ess.cluster

---
 .../edge/ess/cluster/ChannelManager.java      | 46 ++++++++-----------
 .../edge/ess/cluster/EssClusterImpl.java      |  1 +
 .../io/openems/edge/ess/cluster/MyConfig.java |  2 +-
 3 files changed, 20 insertions(+), 29 deletions(-)

diff --git a/io.openems.edge.ess.cluster/src/io/openems/edge/ess/cluster/ChannelManager.java b/io.openems.edge.ess.cluster/src/io/openems/edge/ess/cluster/ChannelManager.java
index 4636330784b..466491c31af 100644
--- a/io.openems.edge.ess.cluster/src/io/openems/edge/ess/cluster/ChannelManager.java
+++ b/io.openems.edge.ess.cluster/src/io/openems/edge/ess/cluster/ChannelManager.java
@@ -24,7 +24,7 @@ public ChannelManager(EssClusterImpl parent) {
 
 	/**
 	 * Called on Component activate().
-	 * 
+	 *
 	 * @param esss the List of {@link SymmetricEss}
 	 */
 	protected void activate(List<SymmetricEss> esss) {
@@ -65,13 +65,13 @@ protected void activate(List<SymmetricEss> esss) {
 
 	/**
 	 * Calculate effective Grid-Mode of {@link SymmetricEss}.
-	 * 
+	 *
 	 * @param esss the List of {@link SymmetricEss}
 	 */
 	private void calculateGridMode(List<SymmetricEss> esss) {
 		final BiConsumer<Value<Integer>, Value<Integer>> callback = (oldValue, newValue) -> {
-			int onGrids = 0;
-			int offGrids = 0;
+			var onGrids = 0;
+			var offGrids = 0;
 			for (SymmetricEss ess : esss) {
 				switch (ess.getGridMode()) {
 				case OFF_GRID:
@@ -103,7 +103,7 @@ private void calculateGridMode(List<SymmetricEss> esss) {
 
 	/**
 	 * Calculate weighted State-Of-Charge of {@link SymmetricEss}.
-	 * 
+	 *
 	 * @param esss the List of {@link SymmetricEss}
 	 */
 	private void calculateSoc(List<SymmetricEss> esss) {
@@ -111,8 +111,8 @@ private void calculateSoc(List<SymmetricEss> esss) {
 			Integer socCapacity = null;
 			Integer totalCapacity = null;
 			for (SymmetricEss ess : esss) {
-				Value<Integer> capacity = ess.getCapacity();
-				Value<Integer> soc = ess.getSoc();
+				var capacity = ess.getCapacity();
+				var soc = ess.getSoc();
 				if (!capacity.isDefined() || !soc.isDefined()) {
 					continue;
 				}
@@ -131,28 +131,18 @@ private void calculateSoc(List<SymmetricEss> esss) {
 		}
 	}
 
-	private final static Function<Integer, Integer> DIVIDE_BY_THREE = (value) -> {
-		return TypeUtils.divide(value, 3);
-	};
-	private final static BiFunction<Integer, Integer, Integer> INTEGER_MIN = (result, value) -> {
-		return TypeUtils.min(result, value);
-	};
+	private final static Function<Integer, Integer> DIVIDE_BY_THREE = value -> TypeUtils.divide(value, 3);
+	private final static BiFunction<Integer, Integer, Integer> INTEGER_MIN = TypeUtils::min;
 
-	private final static BiFunction<Integer, Integer, Integer> INTEGER_MAX = (result, value) -> {
-		return TypeUtils.max(result, value);
-	};
+	private final static BiFunction<Integer, Integer, Integer> INTEGER_MAX = TypeUtils::max;
 
-	private final static BiFunction<Integer, Integer, Integer> INTEGER_SUM = (result, value) -> {
-		return TypeUtils.sum(result, value);
-	};
+	private final static BiFunction<Integer, Integer, Integer> INTEGER_SUM = TypeUtils::sum;
 
-	private final static BiFunction<Long, Long, Long> LONG_SUM = (result, value) -> {
-		return TypeUtils.sum(result, value);
-	};
+	private final static BiFunction<Long, Long, Long> LONG_SUM = TypeUtils::sum;
 
 	/**
 	 * Aggregate Channels of {@link SymmetricEss}s.
-	 * 
+	 *
 	 * @param aggregator the aggregator function
 	 * @param esss       the List of {@link SymmetricEss}
 	 * @param channelId  the SymmetricEss.ChannelId
@@ -177,7 +167,7 @@ private <T> void calculate(BiFunction<T, T, T> aggregator, List<SymmetricEss> es
 
 	/**
 	 * Aggregate Channels of {@link ManagedSymmetricEss}s.
-	 * 
+	 *
 	 * @param aggregator the aggregator function
 	 * @param esss       the List of {@link SymmetricEss}
 	 * @param channelId  the SymmetricEss.ChannelId
@@ -206,7 +196,7 @@ private <T> void calculate(BiFunction<T, T, T> aggregator, List<SymmetricEss> es
 
 	/**
 	 * Aggregate Channels of {@link AsymmetricEss}s.
-	 * 
+	 *
 	 * @param aggregator          the aggregator function
 	 * @param esss                the List of {@link SymmetricEss}
 	 * @param asymmetricChannelId the AsymmetricEss.ChannelId
@@ -243,7 +233,7 @@ private <T> void calculate(BiFunction<T, T, T> aggregator, List<SymmetricEss> es
 	}
 //	/**
 //	 * Aggregate Channels of {@link AsymmetricEss}s.
-//	 * 
+//	 *
 //	 * @param aggregator          the aggregator function
 //	 * @param esss                the List of {@link SymmetricEss}
 //	 * @param asymmetricChannelId the AsymmetricEss.ChannelId
@@ -264,11 +254,11 @@ private <T> void calculate(BiFunction<T, T, T> aggregator, List<SymmetricEss> es
 //					result = aggregator.apply(result, TypeUtils.divide(channel.getNextValue().get(), 3));
 //				}
 //			}
-//			
+//
 //			Channel<Integer> channel = this.parent.channel(asymmetricChannelId);
 //			channel.setNextValue(result);
 //		};
-//		
+//
 //		for (SymmetricEss ess : esss) {
 //			if (ess instanceof AsymmetricEss) {
 //				this.addOnChangeListener((AsymmetricEss) ess, asymmetricChannelId, callback);
diff --git a/io.openems.edge.ess.cluster/src/io/openems/edge/ess/cluster/EssClusterImpl.java b/io.openems.edge.ess.cluster/src/io/openems/edge/ess/cluster/EssClusterImpl.java
index f84f3c240e4..dba985abafa 100644
--- a/io.openems.edge.ess.cluster/src/io/openems/edge/ess/cluster/EssClusterImpl.java
+++ b/io.openems.edge.ess.cluster/src/io/openems/edge/ess/cluster/EssClusterImpl.java
@@ -88,6 +88,7 @@ private void activate(ComponentContext context, Config config) throws OpenemsExc
 		this.channelManager.activate(this.esss);
 	}
 
+	@Override
 	@Deactivate
 	protected void deactivate() {
 		this.channelManager.deactivate();
diff --git a/io.openems.edge.ess.cluster/test/io/openems/edge/ess/cluster/MyConfig.java b/io.openems.edge.ess.cluster/test/io/openems/edge/ess/cluster/MyConfig.java
index cdb65aafc1a..9f77e682b8c 100644
--- a/io.openems.edge.ess.cluster/test/io/openems/edge/ess/cluster/MyConfig.java
+++ b/io.openems.edge.ess.cluster/test/io/openems/edge/ess/cluster/MyConfig.java
@@ -31,7 +31,7 @@ public MyConfig build() {
 
 	/**
 	 * Create a Config builder.
-	 * 
+	 *
 	 * @return a {@link Builder}
 	 */
 	public static Builder create() {

From ec51a8b39fe0af2db7f40ef398fccaf7ea88b042 Mon Sep 17 00:00:00 2001
From: Stefan Feilmeier <stefan.feilmeier@fenecon.de>
Date: Tue, 8 Mar 2022 11:17:25 +0100
Subject: [PATCH 58/96] Update io.openems.edge.ess.core

---
 .../io/openems/edge/ess/core/power/Data.java  | 26 +++----
 .../edge/ess/core/power/PowerComponent.java   | 25 +++---
 .../ess/core/power/PowerComponentImpl.java    | 24 +++---
 .../openems/edge/ess/core/power/Solver.java   | 45 ++++++-----
 .../data/ApparentPowerConstraintUtil.java     | 18 ++---
 .../ess/core/power/data/ConstraintUtil.java   | 35 ++++-----
 .../core/power/data/InverterPrecision.java    | 19 +++--
 .../ess/core/power/data/LinearSolverUtil.java | 15 ++--
 .../edge/ess/core/power/data/LogUtil.java     |  2 +-
 .../ess/core/power/data/TargetDirection.java  | 14 ++--
 .../edge/ess/core/power/data/WeightsUtil.java | 22 +++---
 ...intsForNotStrictlyDefinedCoefficients.java | 36 ++++-----
 .../core/power/optimizers/KeepAllEqual.java   |  8 +-
 ...KeepTargetDirectionAndMaximizeInOrder.java | 12 +--
 .../power/optimizers/MoveTowardsTarget.java   | 21 +++--
 .../ReduceNumberOfUsedInverters.java          | 26 +++----
 .../power/solver/CalculatePowerExtrema.java   | 16 ++--
 .../core/power/solver/ConstraintSolver.java   |  6 +-
 .../power/solver/LinearConstraintsSolver.java |  8 +-
 .../ess/core/power/solver/PowerTuple.java     |  6 +-
 .../openems/edge/ess/core/power/DataTest.java |  6 +-
 .../openems/edge/ess/core/power/MyConfig.java |  2 +-
 .../ess/core/power/PowerComponentTest.java    | 78 +++++++++----------
 .../ReduceNumberOfUsedInvertersTest.java      | 22 +++---
 24 files changed, 236 insertions(+), 256 deletions(-)

diff --git a/io.openems.edge.ess.core/src/io/openems/edge/ess/core/power/Data.java b/io.openems.edge.ess.core/src/io/openems/edge/ess/core/power/Data.java
index 1d027a52518..2963e428607 100644
--- a/io.openems.edge.ess.core/src/io/openems/edge/ess/core/power/Data.java
+++ b/io.openems.edge.ess.core/src/io/openems/edge/ess/core/power/Data.java
@@ -45,7 +45,7 @@ public class Data {
 
 	/**
 	 * Adds a callback for onStaticConstraintsFailed event.
-	 * 
+	 *
 	 * @param onStaticConstraintsFailed the Callback
 	 */
 	public void onStaticConstraintsFailed(Consumer<Boolean> onStaticConstraintsFailed) {
@@ -54,7 +54,7 @@ public void onStaticConstraintsFailed(Consumer<Boolean> onStaticConstraintsFaile
 
 	/**
 	 * Adds a {@link ManagedSymmetricEss}. Called by {@link PowerComponentImpl}.
-	 * 
+	 *
 	 * @param ess the {@link ManagedSymmetricEss}
 	 */
 	protected synchronized void addEss(ManagedSymmetricEss ess) {
@@ -64,7 +64,7 @@ protected synchronized void addEss(ManagedSymmetricEss ess) {
 
 	/**
 	 * Removes a {@link ManagedSymmetricEss}. Called by {@link PowerComponentImpl}.
-	 * 
+	 *
 	 * @param ess the {@link ManagedSymmetricEss}
 	 */
 	protected synchronized void removeEss(ManagedSymmetricEss ess) {
@@ -74,7 +74,7 @@ protected synchronized void removeEss(ManagedSymmetricEss ess) {
 
 	/**
 	 * Activates Symmetric-Mode.
-	 * 
+	 *
 	 * @param symmetricMode Symmetric-Mode enabled?
 	 */
 	public synchronized void setSymmetricMode(boolean symmetricMode) {
@@ -90,10 +90,8 @@ private synchronized void updateInverters() {
 
 		// Create inverters and add them to list
 		for (ManagedSymmetricEss ess : this.esss) {
-			EssType essType = EssType.getEssType(ess);
-			for (Inverter inverter : Inverter.of(this.symmetricMode, ess, essType)) {
-				this.inverters.add(inverter);
-			}
+			var essType = EssType.getEssType(ess);
+			Collections.addAll(this.inverters, Inverter.of(this.symmetricMode, ess, essType));
 		}
 
 		// Re-Initialize Coefficients
@@ -134,7 +132,7 @@ protected void removeConstraint(Constraint constraint) {
 
 	/**
 	 * Adds a simple Constraint with only one Coefficient.
-	 * 
+	 *
 	 * @param description  a description for the Constraint
 	 * @param essId        the component Id of a {@link ManagedSymmetricEss}
 	 * @param phase        the {@link Phase}
@@ -156,7 +154,7 @@ public void addSimpleConstraint(String description, String essId, Phase phase, P
 
 	/**
 	 * Get the Coefficients of the linear solver.
-	 * 
+	 *
 	 * @return the {@link Coefficients}
 	 */
 	public Coefficients getCoefficients() {
@@ -165,7 +163,7 @@ public Coefficients getCoefficients() {
 
 	/**
 	 * Get the Coefficient of the linear solver for the given parameters.
-	 * 
+	 *
 	 * @param essId the Component-ID of a {@link ManagedSymmetricEss}
 	 * @param phase the {@link Phase}
 	 * @param pwr   the {@link Pwr}
@@ -177,7 +175,7 @@ public Coefficient getCoefficient(String essId, Phase phase, Pwr pwr) throws Ope
 
 	/**
 	 * Gets Constraints for all Inverters.
-	 * 
+	 *
 	 * @return List of Constraints
 	 * @throws OpenemsException on error
 	 */
@@ -187,7 +185,7 @@ public List<Constraint> getConstraintsForAllInverters() throws OpenemsException
 
 	/**
 	 * Gets Constraints with the 'enabledInverters' only.
-	 * 
+	 *
 	 * @param enabledInverters Collection of enabled {@link Inverter}s
 	 * @return List of {@link Constraint}s
 	 * @throws OpenemsException on error
@@ -200,7 +198,7 @@ public List<Constraint> getConstraintsForInverters(Collection<Inverter> enabledI
 
 	/**
 	 * Gets Constraints without the 'disabledInverters'.
-	 * 
+	 *
 	 * @param disabledInverters Collection of disabled inverters
 	 * @return List of Constraints
 	 * @throws OpenemsException on error
diff --git a/io.openems.edge.ess.core/src/io/openems/edge/ess/core/power/PowerComponent.java b/io.openems.edge.ess.core/src/io/openems/edge/ess/core/power/PowerComponent.java
index d2c0401124c..7be22d94a19 100644
--- a/io.openems.edge.ess.core/src/io/openems/edge/ess/core/power/PowerComponent.java
+++ b/io.openems.edge.ess.core/src/io/openems/edge/ess/core/power/PowerComponent.java
@@ -25,7 +25,7 @@ public interface PowerComponent extends OpenemsComponent, EventHandler, Power {
 	public enum ChannelId implements io.openems.edge.common.channel.ChannelId {
 		/**
 		 * The duration needed for solving the Power.
-		 * 
+		 *
 		 * <ul>
 		 * <li>Interface: PowerComponent
 		 * <li>Type: Integer
@@ -37,7 +37,7 @@ public enum ChannelId implements io.openems.edge.common.channel.ChannelId {
 				.unit(Unit.MILLISECONDS)),
 		/**
 		 * The eventually used solving strategy.
-		 * 
+		 *
 		 * <ul>
 		 * <li>Interface: PowerComponent
 		 * <li>Type: Integer
@@ -48,7 +48,7 @@ public enum ChannelId implements io.openems.edge.common.channel.ChannelId {
 		SOLVE_STRATEGY(Doc.of(SolverStrategy.values())),
 		/**
 		 * Whether the Power problem could be solved.
-		 * 
+		 *
 		 * <ul>
 		 * <li>Interface: PowerComponent
 		 * <li>Type: Boolean
@@ -57,7 +57,7 @@ public enum ChannelId implements io.openems.edge.common.channel.ChannelId {
 		NOT_SOLVED(Doc.of(Level.WARNING)),
 		/**
 		 * Gets set, when setting static Constraints failed.
-		 * 
+		 *
 		 * <ul>
 		 * <li>Interface: PowerComponent
 		 * <li>Type: Boolean
@@ -71,6 +71,7 @@ private ChannelId(Doc doc) {
 			this.doc = doc;
 		}
 
+		@Override
 		public Doc doc() {
 			return this.doc;
 		}
@@ -78,7 +79,7 @@ public Doc doc() {
 
 	/**
 	 * Gets the Channel for {@link ChannelId#NOT_SOLVED}.
-	 * 
+	 *
 	 * @return the Channel
 	 */
 	public default StateChannel getNotSolvedChannel() {
@@ -88,7 +89,7 @@ public default StateChannel getNotSolvedChannel() {
 	/**
 	 * Internal method to set the 'nextValue' on {@link ChannelId#NOT_SOLVED}
 	 * Channel.
-	 * 
+	 *
 	 * @param value the next value
 	 */
 	public default void _setNotSolved(boolean value) {
@@ -97,7 +98,7 @@ public default void _setNotSolved(boolean value) {
 
 	/**
 	 * Gets the Channel for {@link ChannelId#SOLVE_DURATION}.
-	 * 
+	 *
 	 * @return the Channel
 	 */
 	public default IntegerReadChannel getSolveDurationChannel() {
@@ -107,7 +108,7 @@ public default IntegerReadChannel getSolveDurationChannel() {
 	/**
 	 * Internal method to set the 'nextValue' on {@link ChannelId#SOLVE_DURATION}
 	 * Channel.
-	 * 
+	 *
 	 * @param value the next value
 	 */
 	public default void _setSolveDuration(int value) {
@@ -116,7 +117,7 @@ public default void _setSolveDuration(int value) {
 
 	/**
 	 * Gets the Channel for {@link ChannelId#SOLVE_STRATEGY}.
-	 * 
+	 *
 	 * @return the Channel
 	 */
 	public default EnumReadChannel getSolveStrategyChannel() {
@@ -126,7 +127,7 @@ public default EnumReadChannel getSolveStrategyChannel() {
 	/**
 	 * Internal method to set the 'nextValue' on {@link ChannelId#SOLVE_STRATEGY}
 	 * Channel.
-	 * 
+	 *
 	 * @param value the next value
 	 */
 	public default void _setSolveStrategy(SolverStrategy value) {
@@ -135,7 +136,7 @@ public default void _setSolveStrategy(SolverStrategy value) {
 
 	/**
 	 * Gets the Channel for {@link ChannelId#STATIC_CONSTRAINTS_FAILED}.
-	 * 
+	 *
 	 * @return the Channel
 	 */
 	public default StateChannel getStaticConstraintsFailedChannel() {
@@ -145,7 +146,7 @@ public default StateChannel getStaticConstraintsFailedChannel() {
 	/**
 	 * Internal method to set the 'nextValue' on
 	 * {@link ChannelId#STATIC_CONSTRAINTS_FAILED} Channel.
-	 * 
+	 *
 	 * @param value the next value
 	 */
 	public default void _setStaticConstraintsFailed(boolean value) {
diff --git a/io.openems.edge.ess.core/src/io/openems/edge/ess/core/power/PowerComponentImpl.java b/io.openems.edge.ess.core/src/io/openems/edge/ess/core/power/PowerComponentImpl.java
index 6e4793d3488..c794e36f51c 100644
--- a/io.openems.edge.ess.core/src/io/openems/edge/ess/core/power/PowerComponentImpl.java
+++ b/io.openems.edge.ess.core/src/io/openems/edge/ess/core/power/PowerComponentImpl.java
@@ -72,7 +72,7 @@ public PowerComponentImpl() {
 				PowerComponent.ChannelId.values() //
 		);
 		this.data = new Data();
-		this.data.onStaticConstraintsFailed(value -> this._setStaticConstraintsFailed(value));
+		this.data.onStaticConstraintsFailed(this::_setStaticConstraintsFailed);
 
 		this.solver = new Solver(this.data);
 		this.solver.onSolved((isSolved, duration, strategy) -> {
@@ -91,6 +91,7 @@ void activate(ComponentContext context, Config config) {
 		this.updateConfig(config);
 	}
 
+	@Override
 	@Deactivate
 	protected void deactivate() {
 		super.deactivate();
@@ -148,7 +149,7 @@ public synchronized Constraint addConstraintAndValidate(Constraint constraint) t
 		} catch (OpenemsException e) {
 			this.data.removeConstraint(constraint);
 			if (this.debugMode) {
-				List<Constraint> allConstraints = this.data.getConstraintsForAllInverters();
+				var allConstraints = this.data.getConstraintsForAllInverters();
 				LogUtil.debugLogConstraints(this.log, "Unable to validate with following constraints:", allConstraints);
 				this.logWarn(this.log, "Failed to add Constraint: " + constraint);
 			}
@@ -198,19 +199,16 @@ private int getActivePowerExtrema(ManagedSymmetricEss ess, Phase phase, Pwr pwr,
 			this.logError(this.log, "Unable to get Constraints " + e.getMessage());
 			return 0;
 		}
-		double power = CalculatePowerExtrema.from(this.data.getCoefficients(), allConstraints, ess.id(), phase, pwr,
-				goal);
-		if (power > Integer.MIN_VALUE && power < Integer.MAX_VALUE) {
-			if (goal == GoalType.MAXIMIZE) {
-				return (int) Math.floor(power);
-			} else {
-				return (int) Math.ceil(power);
-			}
-		} else {
+		var power = CalculatePowerExtrema.from(this.data.getCoefficients(), allConstraints, ess.id(), phase, pwr, goal);
+		if (power <= Integer.MIN_VALUE || power >= Integer.MAX_VALUE) {
 			this.logError(this.log, goal.name() + " Power for [" + ess.toString() + "," + phase.toString() + ","
 					+ pwr.toString() + "=" + power + "] is out of bounds. Returning '0'");
 			return 0;
 		}
+		if (goal == GoalType.MAXIMIZE) {
+			return (int) Math.floor(power);
+		}
+		return (int) Math.ceil(power);
 	}
 
 	@Override
@@ -227,7 +225,7 @@ public void handleEvent(Event event) {
 
 	/**
 	 * Gets the Ess component with the given ID.
-	 * 
+	 *
 	 * @param essId the component ID of Ess
 	 * @return an Ess instance
 	 */
@@ -247,7 +245,7 @@ public PidFilter getPidFilter() {
 
 	/**
 	 * Is Debug-Mode activated?.
-	 * 
+	 *
 	 * @return true if is activated
 	 */
 	public boolean isDebugMode() {
diff --git a/io.openems.edge.ess.core/src/io/openems/edge/ess/core/power/Solver.java b/io.openems.edge.ess.core/src/io/openems/edge/ess/core/power/Solver.java
index b80f32088b3..9792ba4109f 100644
--- a/io.openems.edge.ess.core/src/io/openems/edge/ess/core/power/Solver.java
+++ b/io.openems.edge.ess.core/src/io/openems/edge/ess/core/power/Solver.java
@@ -55,22 +55,22 @@ public Solver(Data data) {
 
 		/**
 		 * Solves the problem, while setting all DisabledInverters to EQUALS zero.
-		 * 
+		 *
 		 * @param disabledInverters a list of disabled inverters
 		 * @return a solution
 		 * @throws NoFeasibleSolutionException if not solvable
 		 * @throws UnboundedSolutionException  if not solvable
 		 * @throws OpenemsException
 		 */
-		this.solveWithDisabledInverters = (disabledInverters) -> {
-			List<Constraint> constraints = this.data.getConstraintsWithoutDisabledInverters(disabledInverters);
+		this.solveWithDisabledInverters = disabledInverters -> {
+			var constraints = this.data.getConstraintsWithoutDisabledInverters(disabledInverters);
 			return ConstraintSolver.solve(this.data.getCoefficients(), constraints);
 		};
 	}
 
 	/**
 	 * Adds a callback for onSolved event.
-	 * 
+	 *
 	 * @param onSolvedCallback the Callback
 	 */
 	public void onSolved(OnSolved onSolvedCallback) {
@@ -79,7 +79,7 @@ public void onSolved(OnSolved onSolvedCallback) {
 
 	/**
 	 * Tests whether the Problem is solvable under the current Constraints.
-	 * 
+	 *
 	 * @throws OpenemsException on error
 	 */
 	public void isSolvableOrError() throws OpenemsException {
@@ -94,7 +94,7 @@ public void isSolvableOrError() throws OpenemsException {
 
 	/**
 	 * Tests whether the Problem is solvable under the current Constraints.
-	 * 
+	 *
 	 * @return true if the problem is solvable
 	 */
 	public boolean isSolvable() {
@@ -108,25 +108,25 @@ public boolean isSolvable() {
 
 	/**
 	 * Solve and optimize the equation system.
-	 * 
+	 *
 	 * <p>
 	 * When finished, this method calls the applyPower() methods of
 	 * {@link ManagedSymmetricEss} or {@link ManagedAsymmetricEss}.
-	 * 
+	 *
 	 * @param strategy the {@link SolverStrategy} to follow
 	 */
 	public void solve(SolverStrategy strategy) {
 		// measure duration
-		final long startTime = System.nanoTime();
+		final var startTime = System.nanoTime();
 
 		// No Inverters -> nothing to do
 		if (this.data.getInverters().isEmpty()) {
 			this.onSolvedCallback.accept(true, 0, SolverStrategy.NONE);
 			return;
 		}
-		List<Inverter> allInverters = this.data.getInverters();
+		var allInverters = this.data.getInverters();
 
-		SolveSolution solution = new SolveSolution(SolverStrategy.NONE, null);
+		var solution = new SolveSolution(SolverStrategy.NONE, null);
 
 		List<Constraint> allConstraints = new ArrayList<>();
 		TargetDirection targetDirection = null;
@@ -157,8 +157,8 @@ public void solve(SolverStrategy strategy) {
 
 			// Gets the target-Inverters, i.e. the Inverters that are minimally required to
 			// solve the Problem.
-			List<Inverter> targetInverters = this.optimizers.reduceNumberOfUsedInverters.apply(allInverters,
-					targetDirection, this.solveWithDisabledInverters);
+			var targetInverters = this.optimizers.reduceNumberOfUsedInverters.apply(allInverters, targetDirection,
+					this.solveWithDisabledInverters);
 
 			switch (strategy) {
 			case UNDEFINED:
@@ -199,10 +199,10 @@ public void solve(SolverStrategy strategy) {
 		}
 
 		// finish time measure (in milliseconds)
-		int duration = (int) (System.nanoTime() - startTime) / 1_000_000;
+		var duration = (int) (System.nanoTime() - startTime) / 1_000_000;
 
 		// announce success/failure
-		boolean isSolved = solution.getPoints() != null;
+		var isSolved = solution.getPoints() != null;
 		this.onSolvedCallback.accept(isSolved, duration, solution.getSolvedBy());
 
 		// Apply final Solution to Inverters
@@ -225,7 +225,7 @@ public void solve(SolverStrategy strategy) {
 	/**
 	 * Tries different solving strategies in order. 'ALL_CONSTRAINTS' is always
 	 * tried last if everything else failed. Returns as soon as a result is found.
-	 * 
+	 *
 	 * @param targetDirection the target direction
 	 * @param allInverters    a list of all inverters
 	 * @param targetInverters a list of target inverters
@@ -267,15 +267,14 @@ private SolveSolution tryStrategies(TargetDirection targetDirection, List<Invert
 		solution = ConstraintSolver.solve(this.data.getCoefficients(), allConstraints);
 		if (solution != null) {
 			return new SolveSolution(SolverStrategy.ALL_CONSTRAINTS, solution);
-		} else {
-			return new SolveSolution(SolverStrategy.NONE, null);
 		}
+		return new SolveSolution(SolverStrategy.NONE, null);
 	}
 
 	private Map<Inverter, PowerTuple> getZeroSolution(List<Inverter> allInverters) {
 		Map<Inverter, PowerTuple> result = new HashMap<>();
 		for (Inverter inv : allInverters) {
-			PowerTuple powerTuple = new PowerTuple();
+			var powerTuple = new PowerTuple();
 			for (Pwr pwr : Pwr.values()) {
 				powerTuple.setValue(pwr, 0);
 			}
@@ -286,7 +285,7 @@ private Map<Inverter, PowerTuple> getZeroSolution(List<Inverter> allInverters) {
 
 	/**
 	 * Send the final solution to each Inverter.
-	 * 
+	 *
 	 * @param finalSolution  a map of inverters to PowerTuples
 	 * @param allConstraints all Constraints
 	 */
@@ -307,9 +306,9 @@ private void applySolution(Map<Inverter, PowerTuple> finalSolution) {
 			PowerTuple invL2 = null;
 			PowerTuple invL3 = null;
 			for (Entry<Inverter, PowerTuple> entry : finalSolution.entrySet()) {
-				Inverter i = entry.getKey();
+				var i = entry.getKey();
 				if (Objects.equals(ess.id(), i.getEssId())) {
-					PowerTuple pt = entry.getValue();
+					var pt = entry.getValue();
 					switch (i.getPhase()) {
 					case ALL:
 						inv = pt;
@@ -342,7 +341,7 @@ private void applySolution(Map<Inverter, PowerTuple> finalSolution) {
 					invL3 = new PowerTuple();
 				}
 
-				ManagedAsymmetricEss e = (ManagedAsymmetricEss) ess;
+				var e = (ManagedAsymmetricEss) ess;
 				// set debug channels on Ess
 				e._setDebugSetActivePower(invL1.getActivePower() + invL2.getActivePower() + invL3.getActivePower());
 				e._setDebugSetReactivePower(
diff --git a/io.openems.edge.ess.core/src/io/openems/edge/ess/core/power/data/ApparentPowerConstraintUtil.java b/io.openems.edge.ess.core/src/io/openems/edge/ess/core/power/data/ApparentPowerConstraintUtil.java
index 114709d6b69..f9b581e1a34 100644
--- a/io.openems.edge.ess.core/src/io/openems/edge/ess/core/power/data/ApparentPowerConstraintUtil.java
+++ b/io.openems.edge.ess.core/src/io/openems/edge/ess/core/power/data/ApparentPowerConstraintUtil.java
@@ -36,7 +36,7 @@ private ApparentPowerConstraintUtil() {
 
 	/**
 	 * Generate Constraints for ApparentPower.
-	 * 
+	 *
 	 * @param coefficients  the {@link Coefficients}
 	 * @param essId         the Id of the {@link ManagedSymmetricEss}
 	 * @param phase         the {@link Phase}
@@ -50,11 +50,11 @@ public static List<Constraint> generateConstraints(Coefficients coefficients, St
 
 		if (apparentPower > 0) {
 			// Calculate 'Apparent-Power Circle'
-			double degreeDelta = 90.0 / CIRCLE_SECTIONS_PER_QUARTER;
-			Point p1 = getPointOnCircle(apparentPower, 0);
+			var degreeDelta = 90.0 / CIRCLE_SECTIONS_PER_QUARTER;
+			var p1 = getPointOnCircle(apparentPower, 0);
 
-			for (double degree = degreeDelta; Math.floor(degree) <= 360; degree += degreeDelta) {
-				Point p2 = getPointOnCircle(apparentPower, degree);
+			for (var degree = degreeDelta; Math.floor(degree) <= 360; degree += degreeDelta) {
+				var p2 = getPointOnCircle(apparentPower, degree);
 
 				Relationship relationship;
 				if (Math.floor(degree) <= 180) {
@@ -63,7 +63,7 @@ public static List<Constraint> generateConstraints(Coefficients coefficients, St
 					relationship = Relationship.LESS_OR_EQUALS;
 				}
 
-				Constraint constraint = getConstraintThroughPoints(coefficients, essId, phase, p1, p2, relationship);
+				var constraint = getConstraintThroughPoints(coefficients, essId, phase, p1, p2, relationship);
 				result.add(constraint);
 
 				// set p2 -> p1 for next loop
@@ -89,14 +89,14 @@ private static Constraint getConstraintThroughPoints(Coefficients coefficients,
 			Point p2, Relationship relationship) throws OpenemsException {
 		/**
 		 * Build the LinearConstraint.
-		 * 
+		 *
 		 * <pre>
 		 *  We use the formula:
 		 *  y = ((y2-y1)/(x2-x1)) * x + ((x2*y1-x1*y2)/(x2-x1))
 		 * </pre>
 		 */
-		double constraintValue = -1 * (p1.y * p2.x - p2.y * p1.x) / (p2.x - p1.x);
-		double coefficient1 = (p2.y - p1.y) / (p2.x - p1.x);
+		var constraintValue = -1 * (p1.y * p2.x - p2.y * p1.x) / (p2.x - p1.x);
+		var coefficient1 = (p2.y - p1.y) / (p2.x - p1.x);
 		double coefficient2 = -1;
 
 		return new Constraint(essId + ": Max Apparent Power", new LinearCoefficient[] { //
diff --git a/io.openems.edge.ess.core/src/io/openems/edge/ess/core/power/data/ConstraintUtil.java b/io.openems.edge.ess.core/src/io/openems/edge/ess/core/power/data/ConstraintUtil.java
index 3277675b391..be9e9da6869 100644
--- a/io.openems.edge.ess.core/src/io/openems/edge/ess/core/power/data/ConstraintUtil.java
+++ b/io.openems.edge.ess.core/src/io/openems/edge/ess/core/power/data/ConstraintUtil.java
@@ -2,6 +2,7 @@
 
 import java.util.ArrayList;
 import java.util.Collection;
+import java.util.Collections;
 import java.util.List;
 import java.util.function.Consumer;
 
@@ -34,7 +35,7 @@ private ConstraintUtil() {
 
 	/**
 	 * Creates a simple Constraint with only one Coefficient.
-	 * 
+	 *
 	 * @param coefficients the {@link Coefficients}
 	 * @param description  a description for the Constraint
 	 * @param essId        the component Id of a {@link ManagedSymmetricEss}
@@ -56,7 +57,7 @@ public static Constraint createSimpleConstraint(Coefficients coefficients, Strin
 
 	/**
 	 * Creates for each disabled inverter an EQUALS ZERO constraint.
-	 * 
+	 *
 	 * @param coefficients the {@link Coefficients}
 	 * @param inverters    Collection of {@link Inverter}s
 	 * @return List of {@link Constraint}s
@@ -66,8 +67,8 @@ public static List<Constraint> createDisableConstraintsForInactiveInverters(Coef
 			Collection<Inverter> inverters) throws OpenemsException {
 		List<Constraint> result = new ArrayList<>();
 		for (Inverter inv : inverters) {
-			String essId = inv.getEssId();
-			Phase phase = inv.getPhase();
+			var essId = inv.getEssId();
+			var phase = inv.getPhase();
 			for (Pwr pwr : Pwr.values()) {
 				result.add(ConstraintUtil.createSimpleConstraint(coefficients, //
 						essId + ": Disable " + pwr.getSymbol() + phase.getSymbol(), //
@@ -110,7 +111,7 @@ public static List<Constraint> createGenericEssConstraints(Coefficients coeffici
 			// Max Apparent Power
 			int maxApparentPower = ess.getMaxApparentPower().orElse(0);
 			if (ess instanceof ManagedAsymmetricEss && !symmetricMode && !(ess instanceof ManagedSinglePhaseEss)) {
-				double maxApparentPowerPerPhase = maxApparentPower / 3d;
+				var maxApparentPowerPerPhase = maxApparentPower / 3d;
 				for (Phase phase : Phase.values()) {
 					if (phase == Phase.ALL) {
 						continue; // do not add Max Apparent Power Constraint for ALL phases
@@ -128,7 +129,7 @@ public static List<Constraint> createGenericEssConstraints(Coefficients coeffici
 
 	/**
 	 * Asks each Ess if it has any static Constraints and adds them.
-	 * 
+	 *
 	 * @param esss                      list of {@link ManagedSymmetricEss}s
 	 * @param onStaticConstraintsFailed callback for
 	 *                                  {@link ChannelId#STATIC_CONSTRAINTS_FAILED}
@@ -138,12 +139,10 @@ public static List<Constraint> createGenericEssConstraints(Coefficients coeffici
 	public static List<Constraint> createStaticEssConstraints(List<ManagedSymmetricEss> esss,
 			Consumer<Boolean> onStaticConstraintsFailed) {
 		List<Constraint> result = new ArrayList<>();
-		boolean isFailed = false;
+		var isFailed = false;
 		for (ManagedSymmetricEss ess : esss) {
 			try {
-				for (Constraint c : ess.getStaticConstraints()) {
-					result.add(c);
-				}
+				Collections.addAll(result, ess.getStaticConstraints());
 			} catch (OpenemsNamedException e) {
 				LOG.error("Setting static constraints for Ess [" + ess.id() + "] failed: " + e.getMessage());
 				isFailed = true;
@@ -157,7 +156,7 @@ public static List<Constraint> createStaticEssConstraints(List<ManagedSymmetricE
 
 	/**
 	 * Creates Constraints for Three-Phased Ess: P = L1 + L2 + L3.
-	 * 
+	 *
 	 * <p>
 	 * If symmetricMode is activated, an empty list is returned.
 	 *
@@ -194,7 +193,7 @@ public static List<Constraint> createSumOfPhasesConstraints(Coefficients coeffic
 
 	/**
 	 * Creates Constraints for SymmetricEss, e.g. L1 = L2 = L3.
-	 * 
+	 *
 	 * @param coefficients  the {@link Coefficients}
 	 * @param esss          a list of {@link ManagedSymmetricEss}
 	 * @param symmetricMode Symmetric-Mode activated?
@@ -205,7 +204,7 @@ public static List<Constraint> createSymmetricEssConstraints(Coefficients coeffi
 			List<ManagedSymmetricEss> esss, boolean symmetricMode) throws OpenemsException {
 		List<Constraint> result = new ArrayList<>();
 		for (ManagedSymmetricEss ess : esss) {
-			EssType essType = EssType.getEssType(ess);
+			var essType = EssType.getEssType(ess);
 			if (!symmetricMode && essType == EssType.SYMMETRIC) {
 				/*
 				 * Symmetric-Mode is deactivated and this is a Symmetric ESS: Add Symmetric
@@ -232,10 +231,10 @@ public static List<Constraint> createSymmetricEssConstraints(Coefficients coeffi
 	/**
 	 * For Single-Phase-ESS: Creates an EQUALS ZERO constraint for the not-connected
 	 * phases.
-	 * 
+	 *
 	 * <p>
 	 * If symmetricMode is activated, an empty list is returned.
-	 * 
+	 *
 	 * @param coefficients  the {@link Coefficients}
 	 * @param inverters     a list of {@link Inverter}s
 	 * @param symmetricMode Symmetric-Mode activated?
@@ -265,7 +264,7 @@ public static List<Constraint> createSinglePhaseEssConstraints(Coefficients coef
 	/**
 	 * Creates Constraints for {@link MetaEss}, e.g. ClusterL1 = ess1_L1 + ess2_L1 +
 	 * ...
-	 * 
+	 *
 	 * @param coefficients  the {@link Coefficients}
 	 * @param esss          list of {@link ManagedSymmetricEss}s
 	 * @param symmetricMode Symmetric-Mode enabled?
@@ -277,7 +276,7 @@ public static List<Constraint> createMetaEssConstraints(Coefficients coefficient
 		List<Constraint> result = new ArrayList<>();
 		for (ManagedSymmetricEss ess : esss) {
 			if (ess instanceof MetaEss) {
-				MetaEss e = (MetaEss) ess;
+				var e = (MetaEss) ess;
 				if (symmetricMode) {
 					// Symmetric Mode
 					for (Pwr pwr : Pwr.values()) {
@@ -298,7 +297,7 @@ public static List<Constraint> createMetaEssConstraints(Coefficients coefficient
 
 	/**
 	 * Creates a constraint of the form: 1*sumL1 - 1*ess1_L1 - 1*ess2_L1 = 0.
-	 * 
+	 *
 	 * @param coefficients the {@link Coefficients}
 	 * @param e            the {@link MetaEss} Cluster
 	 * @param phase        the {@link Phase}
diff --git a/io.openems.edge.ess.core/src/io/openems/edge/ess/core/power/data/InverterPrecision.java b/io.openems.edge.ess.core/src/io/openems/edge/ess/core/power/data/InverterPrecision.java
index ce74d5528c0..2a832ee2987 100644
--- a/io.openems.edge.ess.core/src/io/openems/edge/ess/core/power/data/InverterPrecision.java
+++ b/io.openems.edge.ess.core/src/io/openems/edge/ess/core/power/data/InverterPrecision.java
@@ -11,7 +11,6 @@
 import io.openems.common.utils.IntUtils.Round;
 import io.openems.edge.ess.api.ManagedSymmetricEss;
 import io.openems.edge.ess.core.power.solver.PowerTuple;
-import io.openems.edge.ess.power.api.Coefficient;
 import io.openems.edge.ess.power.api.Coefficients;
 import io.openems.edge.ess.power.api.Inverter;
 import io.openems.edge.ess.power.api.Pwr;
@@ -51,21 +50,21 @@ public static Map<Inverter, PowerTuple> apply(Coefficients coefficients, List<In
 			List<ManagedSymmetricEss> esss, PointValuePair solution, TargetDirection targetDirection)
 			throws OpenemsException {
 		Map<Inverter, PowerTuple> result = new HashMap<>();
-		double[] point = solution.getPoint();
+		var point = solution.getPoint();
 		for (Inverter inv : allInverters) {
-			Round round = Round.TOWARDS_ZERO;
-			String essId = inv.getEssId();
-			ManagedSymmetricEss ess = getEss(esss, essId);
+			var round = Round.TOWARDS_ZERO;
+			var essId = inv.getEssId();
+			var ess = getEss(esss, essId);
 			int soc = ess.getSoc().orElse(0);
-			int precision = ess.getPowerPrecision();
-			PowerTuple powerTuple = new PowerTuple();
+			var precision = ess.getPowerPrecision();
+			var powerTuple = new PowerTuple();
 			for (Pwr pwr : Pwr.values()) {
-				Coefficient c = coefficients.of(essId, inv.getPhase(), pwr);
-				double value = point[c.getIndex()];
+				var c = coefficients.of(essId, inv.getPhase(), pwr);
+				var value = point[c.getIndex()];
 				if (value > 0 && soc > 50 || value < 0 && soc < 50) {
 					round = Round.AWAY_FROM_ZERO;
 				}
-				int roundedValue = IntUtils.roundToPrecision((float) value, round, precision);
+				var roundedValue = IntUtils.roundToPrecision((float) value, round, precision);
 				if (roundedValue == -1 || roundedValue == 1) {
 					roundedValue = 0; // avoid unnecessary power settings on rounding 0.xxx to 1
 				}
diff --git a/io.openems.edge.ess.core/src/io/openems/edge/ess/core/power/data/LinearSolverUtil.java b/io.openems.edge.ess.core/src/io/openems/edge/ess/core/power/data/LinearSolverUtil.java
index 354d846182b..3bc672205eb 100644
--- a/io.openems.edge.ess.core/src/io/openems/edge/ess/core/power/data/LinearSolverUtil.java
+++ b/io.openems.edge.ess.core/src/io/openems/edge/ess/core/power/data/LinearSolverUtil.java
@@ -1,6 +1,7 @@
 package io.openems.edge.ess.core.power.data;
 
 import java.util.ArrayList;
+import java.util.Arrays;
 import java.util.List;
 
 import org.apache.commons.math3.optim.linear.LinearConstraint;
@@ -14,7 +15,7 @@ public class LinearSolverUtil {
 
 	/**
 	 * Gets all Constraints converted to Linear Constraints.
-	 * 
+	 *
 	 * @param coefficients the data object
 	 * @param constraints  a list of Constraints
 	 * @return a list of LinearConstraints
@@ -24,7 +25,7 @@ public static List<LinearConstraint> convertToLinearConstraints(Coefficients coe
 		List<LinearConstraint> result = new ArrayList<>();
 		for (Constraint c : constraints) {
 			if (c.getValue().isPresent()) {
-				double[] cos = generateEmptyCoefficientsArray(coefficients.getNoOfCoefficients());
+				var cos = generateEmptyCoefficientsArray(coefficients.getNoOfCoefficients());
 				for (LinearCoefficient co : c.getCoefficients()) {
 					// TODO verify, that ESS is enabled
 					cos[co.getCoefficient().getIndex()] = co.getValue();
@@ -49,7 +50,7 @@ public static List<LinearConstraint> convertToLinearConstraints(Coefficients coe
 
 	/**
 	 * Gets an empty coefficients array required for linear solver.
-	 * 
+	 *
 	 * @param length the length of the array
 	 * @return an array of '0' coefficients
 	 */
@@ -59,15 +60,13 @@ public static double[] generateEmptyCoefficientsArray(int length) {
 
 	/**
 	 * Gets the linear objective function in the form 1*a + 1*b + 1*c + ...
-	 * 
+	 *
 	 * @param noOfCoefficients the number of coefficients of the objective function
 	 * @return a {@link LinearObjectiveFunction}
 	 */
 	public static LinearObjectiveFunction getDefaultObjectiveFunction(int noOfCoefficients) {
-		double[] cos = LinearSolverUtil.generateEmptyCoefficientsArray(noOfCoefficients);
-		for (int i = 0; i < cos.length; i++) {
-			cos[i] = 1;
-		}
+		var cos = LinearSolverUtil.generateEmptyCoefficientsArray(noOfCoefficients);
+		Arrays.fill(cos, 1);
 		return new LinearObjectiveFunction(cos, 0);
 	}
 }
diff --git a/io.openems.edge.ess.core/src/io/openems/edge/ess/core/power/data/LogUtil.java b/io.openems.edge.ess.core/src/io/openems/edge/ess/core/power/data/LogUtil.java
index aa53f766898..7182a164b2d 100644
--- a/io.openems.edge.ess.core/src/io/openems/edge/ess/core/power/data/LogUtil.java
+++ b/io.openems.edge.ess.core/src/io/openems/edge/ess/core/power/data/LogUtil.java
@@ -10,7 +10,7 @@ public class LogUtil {
 
 	/**
 	 * Prints all Constraints to the system log.
-	 * 
+	 *
 	 * @param log         a logger instance
 	 * @param title       the log title
 	 * @param constraints a list of Constraints
diff --git a/io.openems.edge.ess.core/src/io/openems/edge/ess/core/power/data/TargetDirection.java b/io.openems.edge.ess.core/src/io/openems/edge/ess/core/power/data/TargetDirection.java
index 5ef95a8c5f4..93977b83e3d 100644
--- a/io.openems.edge.ess.core/src/io/openems/edge/ess/core/power/data/TargetDirection.java
+++ b/io.openems.edge.ess.core/src/io/openems/edge/ess/core/power/data/TargetDirection.java
@@ -21,7 +21,7 @@ public enum TargetDirection {
 	/**
 	 * Gets the TargetDirection of the Problem, i.e. whether it is a DISCHARGE or
 	 * CHARGE problem.
-	 * 
+	 *
 	 * @param inverters                  list of {@link Inverter}s
 	 * @param coefficients               the {@link Coefficients}
 	 * @param constraintsForAllInverters {@link Constraint}s for all
@@ -31,24 +31,22 @@ public enum TargetDirection {
 	 */
 	public static TargetDirection from(List<Inverter> inverters, Coefficients coefficients,
 			List<Constraint> constraintsForAllInverters) throws OpenemsException {
-		List<Constraint> constraints = constraintsForAllInverters;
-		Constraint equals0 = createSumOfPConstraint(inverters, coefficients, Relationship.EQUALS, 0);
+		var constraints = constraintsForAllInverters;
+		var equals0 = createSumOfPConstraint(inverters, coefficients, Relationship.EQUALS, 0);
 		constraints.add(equals0);
 		try {
 			ConstraintSolver.solve(coefficients, constraints);
 			return TargetDirection.KEEP_ZERO;
 		} catch (MathIllegalStateException e) {
 			constraints.remove(equals0);
-			Constraint greaterOrEquals0 = createSumOfPConstraint(inverters, coefficients,
-					Relationship.GREATER_OR_EQUALS, 0);
+			var greaterOrEquals0 = createSumOfPConstraint(inverters, coefficients, Relationship.GREATER_OR_EQUALS, 0);
 			constraints.add(greaterOrEquals0);
 			try {
 				ConstraintSolver.solve(coefficients, constraints);
 				return TargetDirection.DISCHARGE;
 			} catch (MathIllegalStateException e2) {
 				constraints.remove(greaterOrEquals0);
-				Constraint lessOrEquals0 = createSumOfPConstraint(inverters, coefficients, Relationship.LESS_OR_EQUALS,
-						0);
+				var lessOrEquals0 = createSumOfPConstraint(inverters, coefficients, Relationship.LESS_OR_EQUALS, 0);
 				constraints.add(lessOrEquals0);
 				ConstraintSolver.solve(coefficients, constraints);
 				return TargetDirection.CHARGE;
@@ -58,7 +56,7 @@ public static TargetDirection from(List<Inverter> inverters, Coefficients coeffi
 
 	/**
 	 * Creates Constraints for Sum of P.
-	 * 
+	 *
 	 * @param coefficients the {@link Coefficients}
 	 * @param inverters    list of {@link Inverter}s
 	 * @param relationship the {@link Relationship} between P and value
diff --git a/io.openems.edge.ess.core/src/io/openems/edge/ess/core/power/data/WeightsUtil.java b/io.openems.edge.ess.core/src/io/openems/edge/ess/core/power/data/WeightsUtil.java
index 8d334ff542a..69cff35cefc 100644
--- a/io.openems.edge.ess.core/src/io/openems/edge/ess/core/power/data/WeightsUtil.java
+++ b/io.openems.edge.ess.core/src/io/openems/edge/ess/core/power/data/WeightsUtil.java
@@ -13,13 +13,13 @@ public class WeightsUtil {
 
 	/**
 	 * Sets the weight of each Inverter according to the SoC of its ESS.
-	 * 
+	 *
 	 * @param inverters a List of inverters
 	 * @param esss      list of {@link ManagedSymmetricEss}s
 	 */
 	public static void updateWeightsFromSoc(List<Inverter> inverters, List<ManagedSymmetricEss> esss) {
 		for (Inverter inv : inverters) {
-			int weight = DEFAULT_WEIGHT;
+			var weight = DEFAULT_WEIGHT;
 			for (ManagedSymmetricEss ess : esss) {
 				if (inv.getEssId().equals(ess.id())) {
 					weight = ess.getSoc().orElse(DEFAULT_WEIGHT);
@@ -32,13 +32,13 @@ public static void updateWeightsFromSoc(List<Inverter> inverters, List<ManagedSy
 
 	/**
 	 * Sorts the list of Inverters by their weights descending.
-	 * 
+	 *
 	 * @param inverters a List of inverters
 	 */
 	public static void sortByWeights(List<Inverter> inverters) {
 		Collections.sort(inverters, (e1, e2) -> {
 			// first: sort by weight
-			int weightCompare = Integer.compare(e2.getWeight(), e1.getWeight());
+			var weightCompare = Integer.compare(e2.getWeight(), e1.getWeight());
 			if (weightCompare != 0) {
 				return weightCompare;
 			}
@@ -49,20 +49,20 @@ public static void sortByWeights(List<Inverter> inverters) {
 
 	/**
 	 * Adjust the sorting of Inverters by weights.
-	 * 
+	 *
 	 * <p>
 	 * This is different to 'invertersSortByWeights()' in that it tries to avoid
 	 * resorting the entire list all the time. Instead it only adjusts the list
 	 * slightly.
-	 * 
+	 *
 	 * @param inverters a List of inverters
 	 */
 	public static void adjustSortingByWeights(List<Inverter> inverters) {
-		for (int i = 1; i < inverters.size(); i++) {
-			for (int j = 0; j < inverters.size() - i; j++) {
-				int weight1 = inverters.get(j).getWeight();
-				int weight2 = inverters.get(j + 1).getWeight();
-				int threshold = (int) (Math.min(weight1, weight2) * SORT_FACTOR);
+		for (var i = 1; i < inverters.size(); i++) {
+			for (var j = 0; j < inverters.size() - i; j++) {
+				var weight1 = inverters.get(j).getWeight();
+				var weight2 = inverters.get(j + 1).getWeight();
+				var threshold = (int) (Math.min(weight1, weight2) * SORT_FACTOR);
 				if (weight1 < weight2 - threshold) {
 					Collections.swap(inverters, j, j + 1);
 				}
diff --git a/io.openems.edge.ess.core/src/io/openems/edge/ess/core/power/optimizers/AddConstraintsForNotStrictlyDefinedCoefficients.java b/io.openems.edge.ess.core/src/io/openems/edge/ess/core/power/optimizers/AddConstraintsForNotStrictlyDefinedCoefficients.java
index f2c9fcfa699..5c9ff713125 100644
--- a/io.openems.edge.ess.core/src/io/openems/edge/ess/core/power/optimizers/AddConstraintsForNotStrictlyDefinedCoefficients.java
+++ b/io.openems.edge.ess.core/src/io/openems/edge/ess/core/power/optimizers/AddConstraintsForNotStrictlyDefinedCoefficients.java
@@ -3,7 +3,6 @@
 import java.util.LinkedList;
 import java.util.List;
 
-import org.apache.commons.math3.optim.PointValuePair;
 import org.apache.commons.math3.optim.linear.LinearConstraintSet;
 import org.apache.commons.math3.optim.linear.LinearObjectiveFunction;
 import org.apache.commons.math3.optim.linear.NoFeasibleSolutionException;
@@ -15,7 +14,6 @@
 import io.openems.common.exceptions.OpenemsException;
 import io.openems.edge.ess.core.power.data.LinearSolverUtil;
 import io.openems.edge.ess.core.power.solver.ConstraintSolver;
-import io.openems.edge.ess.power.api.Coefficient;
 import io.openems.edge.ess.power.api.Coefficients;
 import io.openems.edge.ess.power.api.Constraint;
 import io.openems.edge.ess.power.api.Inverter;
@@ -28,7 +26,7 @@ public class AddConstraintsForNotStrictlyDefinedCoefficients {
 	/**
 	 * Adds Constraints for not strictly defined Coefficients, e.g. if only a P <= X
 	 * is defined, but no P = X.
-	 * 
+	 *
 	 * @param allInverters   a list of all {@link Inverter}s
 	 * @param coefficients   the {@link Coefficients}
 	 * @param allConstraints a list of all {@link Constraint}s
@@ -36,30 +34,30 @@ public class AddConstraintsForNotStrictlyDefinedCoefficients {
 	 */
 	public static void apply(List<Inverter> allInverters, Coefficients coefficients, List<Constraint> allConstraints)
 			throws OpenemsException {
-		LinearConstraintSet constraints = new LinearConstraintSet(
+		var constraints = new LinearConstraintSet(
 				LinearSolverUtil.convertToLinearConstraints(coefficients, allConstraints));
 
 		for (Pwr pwr : Pwr.values()) {
 			// prepare objective function
-			double[] cos = LinearSolverUtil.generateEmptyCoefficientsArray(coefficients.getNoOfCoefficients());
+			var cos = LinearSolverUtil.generateEmptyCoefficientsArray(coefficients.getNoOfCoefficients());
 			for (Inverter inv : allInverters) {
-				Coefficient c = coefficients.of(inv.getEssId(), inv.getPhase(), pwr);
+				var c = coefficients.of(inv.getEssId(), inv.getPhase(), pwr);
 				cos[c.getIndex()] = 1;
 			}
-			LinearObjectiveFunction objectiveFunction = new LinearObjectiveFunction(cos, 0);
+			var objectiveFunction = new LinearObjectiveFunction(cos, 0);
 
 			// get Max value over all relevant Coefficients
 			double max;
 			try {
-				SimplexSolver solver = new SimplexSolver();
-				PointValuePair solution = solver.optimize(//
+				var solver = new SimplexSolver();
+				var solution = solver.optimize(//
 						objectiveFunction, //
 						constraints, //
 						GoalType.MAXIMIZE, //
 						PivotSelectionRule.BLAND);
 				max = 0d;
 				for (Inverter inv : allInverters) {
-					Coefficient c = coefficients.of(inv.getEssId(), inv.getPhase(), pwr);
+					var c = coefficients.of(inv.getEssId(), inv.getPhase(), pwr);
 					max += solution.getPoint()[c.getIndex()];
 				}
 			} catch (NoFeasibleSolutionException | UnboundedSolutionException e) {
@@ -68,15 +66,15 @@ public static void apply(List<Inverter> allInverters, Coefficients coefficients,
 			// get Min value over all relevant Coefficients
 			double min;
 			try {
-				SimplexSolver solver = new SimplexSolver();
-				PointValuePair solution = solver.optimize(//
+				var solver = new SimplexSolver();
+				var solution = solver.optimize(//
 						objectiveFunction, //
 						constraints, //
 						GoalType.MINIMIZE, //
 						PivotSelectionRule.BLAND);
 				min = 0d;
 				for (Inverter inv : allInverters) {
-					Coefficient c = coefficients.of(inv.getEssId(), inv.getPhase(), pwr);
+					var c = coefficients.of(inv.getEssId(), inv.getPhase(), pwr);
 					min += solution.getPoint()[c.getIndex()];
 				}
 			} catch (NoFeasibleSolutionException | UnboundedSolutionException e) {
@@ -103,19 +101,19 @@ public static void apply(List<Inverter> allInverters, Coefficients coefficients,
 
 			// Constraint for sum of inverter power
 			{
-				LinearCoefficient[] lcs = new LinearCoefficient[allInverters.size()];
-				for (int i = 0; i < allInverters.size(); i++) {
-					Inverter inv = allInverters.get(i);
-					Coefficient c = coefficients.of(inv.getEssId(), inv.getPhase(), pwr);
+				var lcs = new LinearCoefficient[allInverters.size()];
+				for (var i = 0; i < allInverters.size(); i++) {
+					var inv = allInverters.get(i);
+					var c = coefficients.of(inv.getEssId(), inv.getPhase(), pwr);
 					lcs[i] = new LinearCoefficient(c, 1);
 				}
 				allConstraints.add(new Constraint("Strictly define " + pwr.name(), lcs, Relationship.EQUALS, target));
 			}
 
 			// Constraint for each inverter
-			LinkedList<Constraint> newConstraints = new LinkedList<Constraint>();
+			var newConstraints = new LinkedList<Constraint>();
 			for (Inverter inv : allInverters) {
-				Coefficient c = coefficients.of(inv.getEssId(), inv.getPhase(), pwr);
+				var c = coefficients.of(inv.getEssId(), inv.getPhase(), pwr);
 				newConstraints.add(new Constraint("Strictly define " + inv.toString() + " " + pwr.name(), //
 						new LinearCoefficient[] { //
 								new LinearCoefficient(c, 1) },
diff --git a/io.openems.edge.ess.core/src/io/openems/edge/ess/core/power/optimizers/KeepAllEqual.java b/io.openems.edge.ess.core/src/io/openems/edge/ess/core/power/optimizers/KeepAllEqual.java
index 79259bf0f9a..eeb814b10e6 100644
--- a/io.openems.edge.ess.core/src/io/openems/edge/ess/core/power/optimizers/KeepAllEqual.java
+++ b/io.openems.edge.ess.core/src/io/openems/edge/ess/core/power/optimizers/KeepAllEqual.java
@@ -20,7 +20,7 @@ public class KeepAllEqual {
 
 	/**
 	 * Tries to distribute power equally between inverters.
-	 * 
+	 *
 	 * @param coefficients   the {@link Coefficients}
 	 * @param allInverters   all {@link Inverter}s
 	 * @param allConstraints all active {@link Constraint}s
@@ -31,9 +31,9 @@ public static PointValuePair apply(Coefficients coefficients, List<Inverter> all
 		try {
 			List<Constraint> constraints = new ArrayList<>(allConstraints);
 			// Create weighted Constraint between first inverter and every other inverter
-			Inverter invA = allInverters.get(0);
-			for (int j = 1; j < allInverters.size(); j++) {
-				Inverter invB = allInverters.get(j);
+			var invA = allInverters.get(0);
+			for (var j = 1; j < allInverters.size(); j++) {
+				var invB = allInverters.get(j);
 				constraints.add(new Constraint(
 						invA.toString() + "|" + invB.toString() + ": distribute ActivePower equally",
 						new LinearCoefficient[] {
diff --git a/io.openems.edge.ess.core/src/io/openems/edge/ess/core/power/optimizers/KeepTargetDirectionAndMaximizeInOrder.java b/io.openems.edge.ess.core/src/io/openems/edge/ess/core/power/optimizers/KeepTargetDirectionAndMaximizeInOrder.java
index 358644131f0..cece7eb2643 100644
--- a/io.openems.edge.ess.core/src/io/openems/edge/ess/core/power/optimizers/KeepTargetDirectionAndMaximizeInOrder.java
+++ b/io.openems.edge.ess.core/src/io/openems/edge/ess/core/power/optimizers/KeepTargetDirectionAndMaximizeInOrder.java
@@ -24,7 +24,7 @@ public class KeepTargetDirectionAndMaximizeInOrder {
 	/**
 	 * Tries to keep all Target Inverters in the right TargetDirection; then
 	 * maximizes them in order.
-	 * 
+	 *
 	 * @param coefficients    the {@link Coefficients}
 	 * @param allInverters    all {@link Inverter}s
 	 * @param targetInverters the target {@link Inverter}s
@@ -50,9 +50,9 @@ public static PointValuePair apply(Coefficients coefficients, List<Inverter> all
 			}
 		}
 
-		PointValuePair result = ConstraintSolver.solve(coefficients, constraints);
+		var result = ConstraintSolver.solve(coefficients, constraints);
 
-		Relationship relationship = Relationship.EQUALS;
+		var relationship = Relationship.EQUALS;
 		switch (targetDirection) {
 		case CHARGE:
 			relationship = Relationship.LESS_OR_EQUALS;
@@ -91,14 +91,14 @@ public static PointValuePair apply(Coefficients coefficients, List<Inverter> all
 				goal = GoalType.MAXIMIZE;
 			}
 
-			double activePowerTarget = CalculatePowerExtrema.from(coefficients, allConstraints, inv.getEssId(),
+			var activePowerTarget = CalculatePowerExtrema.from(coefficients, allConstraints, inv.getEssId(),
 					inv.getPhase(), Pwr.ACTIVE, goal);
 			result = addContraintIfProblemStillSolves(result, constraints, coefficients,
 					ConstraintUtil.createSimpleConstraint(coefficients, //
 							inv.toString() + ": Set ActivePower " + goal.name() + " value", //
 							inv.getEssId(), inv.getPhase(), Pwr.ACTIVE, Relationship.EQUALS, activePowerTarget));
 
-			double reactivePowerTarget = CalculatePowerExtrema.from(coefficients, allConstraints, inv.getEssId(),
+			var reactivePowerTarget = CalculatePowerExtrema.from(coefficients, allConstraints, inv.getEssId(),
 					inv.getPhase(), Pwr.REACTIVE, goal);
 			result = addContraintIfProblemStillSolves(result, constraints, coefficients,
 					ConstraintUtil.createSimpleConstraint(coefficients, //
@@ -111,7 +111,7 @@ public static PointValuePair apply(Coefficients coefficients, List<Inverter> all
 
 	/**
 	 * Add Constraint only if the problem still solves with the Constraint.
-	 * 
+	 *
 	 * @param lastResult   the last result
 	 * @param constraints  the list of {@link Constraint}s
 	 * @param coefficients the {@link Coefficients}
diff --git a/io.openems.edge.ess.core/src/io/openems/edge/ess/core/power/optimizers/MoveTowardsTarget.java b/io.openems.edge.ess.core/src/io/openems/edge/ess/core/power/optimizers/MoveTowardsTarget.java
index 05d9448067a..ecbec40557e 100644
--- a/io.openems.edge.ess.core/src/io/openems/edge/ess/core/power/optimizers/MoveTowardsTarget.java
+++ b/io.openems.edge.ess.core/src/io/openems/edge/ess/core/power/optimizers/MoveTowardsTarget.java
@@ -42,8 +42,8 @@ public static PointValuePair apply(Coefficients coefficients, TargetDirection ta
 			List<Inverter> allInverters, List<Inverter> targetInverters, List<Constraint> allConstraints)
 			throws OpenemsException {
 		// find maxLastActive + maxWeight
-		int maxLastActivePower = 0;
-		int sumWeights = 0;
+		var maxLastActivePower = 0;
+		var sumWeights = 0;
 		for (Inverter inv : allInverters) {
 			maxLastActivePower = Math.max(Math.abs(inv.getLastActivePower()), maxLastActivePower);
 			sumWeights += Math.abs(inv.getWeight());
@@ -62,7 +62,7 @@ public static PointValuePair apply(Coefficients coefficients, TargetDirection ta
 			}
 		} else {
 			// at least one weight is != zero -> start normal weighting
-			double normalizeFactor = 100d / maxLastActivePower;
+			var normalizeFactor = 100d / maxLastActivePower;
 			for (Inverter inv : allInverters) {
 				lastWeights.put(inv, Math.abs(inv.getLastActivePower() * normalizeFactor));
 			}
@@ -77,7 +77,7 @@ public static PointValuePair apply(Coefficients coefficients, TargetDirection ta
 				case KEEP_ZERO:
 					// Invert weights for CHARGE, i.e. give higher weight to low state-of-charge
 					// inverters
-					targetWeights.put(inv, (100 - (inv.getWeight() * 100 / sumWeights)));
+					targetWeights.put(inv, 100 - inv.getWeight() * 100 / sumWeights);
 					break;
 				case DISCHARGE:
 					targetWeights.put(inv, inv.getWeight() * 100 / sumWeights);
@@ -101,7 +101,7 @@ public static PointValuePair apply(Coefficients coefficients, TargetDirection ta
 		}
 
 		// adjust towards target weight till Problem solves
-		for (double i = 0; i < 1 - LEARNING_RATE; i += LEARNING_RATE) {
+		for (var i = 0D; i < 1 - LEARNING_RATE; i += LEARNING_RATE) {
 			List<Constraint> constraints = new ArrayList<>(allConstraints);
 			List<Inverter> inverters = new ArrayList<>(allInverters);
 
@@ -109,7 +109,7 @@ public static PointValuePair apply(Coefficients coefficients, TargetDirection ta
 			// inverters
 			for (Entry<Inverter, Double> entry : nextWeights.entrySet()) {
 				if (entry.getValue() == 0) { // might fail... compare double to zero
-					Inverter inv = entry.getKey();
+					var inv = entry.getKey();
 					constraints.add(ConstraintUtil.createSimpleConstraint(coefficients, //
 							inv.toString() + ": ActivePower next weight = 0", //
 							inv.getEssId(), inv.getPhase(), Pwr.ACTIVE, Relationship.EQUALS, 0));
@@ -126,9 +126,9 @@ public static PointValuePair apply(Coefficients coefficients, TargetDirection ta
 			}
 
 			// Create weighted Constraint between first inverter and every other inverter
-			Inverter invA = inverters.get(0);
-			for (int j = 1; j < inverters.size(); j++) {
-				Inverter invB = inverters.get(j);
+			var invA = inverters.get(0);
+			for (var j = 1; j < inverters.size(); j++) {
+				var invB = inverters.get(j);
 				constraints.add(new Constraint(invA.toString() + "|" + invB.toString() + ": ActivePower Weight",
 						new LinearCoefficient[] {
 								new LinearCoefficient(coefficients.of(invA.getEssId(), invA.getPhase(), Pwr.ACTIVE),
@@ -146,8 +146,7 @@ public static PointValuePair apply(Coefficients coefficients, TargetDirection ta
 			}
 
 			try {
-				PointValuePair solution = ConstraintSolver.solve(coefficients, constraints);
-				return solution;
+				return ConstraintSolver.solve(coefficients, constraints);
 			} catch (NoFeasibleSolutionException | UnboundedSolutionException e) {
 				// Adjust next weights
 				for (Entry<Inverter, Double> entry : nextWeights.entrySet()) {
diff --git a/io.openems.edge.ess.core/src/io/openems/edge/ess/core/power/optimizers/ReduceNumberOfUsedInverters.java b/io.openems.edge.ess.core/src/io/openems/edge/ess/core/power/optimizers/ReduceNumberOfUsedInverters.java
index f6b7ccecd9a..e3f1a592e74 100644
--- a/io.openems.edge.ess.core/src/io/openems/edge/ess/core/power/optimizers/ReduceNumberOfUsedInverters.java
+++ b/io.openems.edge.ess.core/src/io/openems/edge/ess/core/power/optimizers/ReduceNumberOfUsedInverters.java
@@ -19,12 +19,12 @@ public class ReduceNumberOfUsedInverters {
 
 	/**
 	 * Finds the Inverters that are minimally required to fulfill all Constraints.
-	 * 
+	 *
 	 * <p>
 	 * This method removes inverters till it finds a minimum setup. It uses an
 	 * algorithm similarly to binary tree search to find the minimum required number
 	 * of inverters.
-	 * 
+	 *
 	 * @param allInverters     a list of all inverters
 	 * @param targetDirection  the target direction
 	 * @param validateFunction a function that can tell if a setup is solvable with
@@ -61,26 +61,26 @@ public List<Inverter> apply(List<Inverter> allInverters, TargetDirection targetD
 
 		/**
 		 * Keeps tested solutions for enabled inverters:
-		 * 
+		 *
 		 * <ul>
 		 * <li>null -> still needs to be tried
 		 * <li>false -> this solution is not feasible
 		 * <li>true -> this solution is feasible
 		 * </ul>
 		 */
-		Boolean[] testedSolutions = new Boolean[sortedInverters.size()];
+		var testedSolutions = new Boolean[sortedInverters.size()];
 
 		while (true) {
 			// find first and last untested index
-			int firstUntestedIndex = -1;
-			for (int i = 0; i < testedSolutions.length; i++) {
+			var firstUntestedIndex = -1;
+			for (var i = 0; i < testedSolutions.length; i++) {
 				if (testedSolutions[i] == null) {
 					firstUntestedIndex = i;
 					break;
 				}
 			}
-			int lastUntestedIndex = -1;
-			for (int i = testedSolutions.length - 1; i > -1; i--) {
+			var lastUntestedIndex = -1;
+			for (var i = testedSolutions.length - 1; i > -1; i--) {
 				if (testedSolutions[i] == null) {
 					lastUntestedIndex = i;
 					break;
@@ -106,14 +106,14 @@ public List<Inverter> apply(List<Inverter> allInverters, TargetDirection targetD
 				validateFunction.apply(getDisabledInverters(sortedInverters, testIndex));
 
 				// solved successfully
-				for (int i = lastUntestedIndex; i >= testIndex; i--) {
+				for (var i = lastUntestedIndex; i >= testIndex; i--) {
 					testedSolutions[i] = true;
 				}
 
 			} catch (Exception e) {
 
 				// solved unsuccessfully
-				for (int i = firstUntestedIndex; i <= testIndex; i++) {
+				for (var i = firstUntestedIndex; i <= testIndex; i++) {
 					testedSolutions[i] = false;
 				}
 
@@ -121,8 +121,8 @@ public List<Inverter> apply(List<Inverter> allInverters, TargetDirection targetD
 		}
 
 		// lowestTrueIndex is the optimal solution
-		int lowestTrueIndex = -1;
-		for (int i = 0; i < testedSolutions.length; i++) {
+		var lowestTrueIndex = -1;
+		for (var i = 0; i < testedSolutions.length; i++) {
 			if (testedSolutions[i] == Boolean.TRUE) {
 				lowestTrueIndex = i;
 				break;
@@ -135,7 +135,7 @@ public List<Inverter> apply(List<Inverter> allInverters, TargetDirection targetD
 		if (lowestTrueIndex == -1) {
 			// no solution -> do not disable any Inverters
 		} else {
-			List<Inverter> disabledInverters = getDisabledInverters(sortedInverters, lowestTrueIndex);
+			var disabledInverters = getDisabledInverters(sortedInverters, lowestTrueIndex);
 			for (Inverter disabledInverter : disabledInverters) {
 				result.remove(disabledInverter);
 			}
diff --git a/io.openems.edge.ess.core/src/io/openems/edge/ess/core/power/solver/CalculatePowerExtrema.java b/io.openems.edge.ess.core/src/io/openems/edge/ess/core/power/solver/CalculatePowerExtrema.java
index c6b26c42a44..caf25358cc4 100644
--- a/io.openems.edge.ess.core/src/io/openems/edge/ess/core/power/solver/CalculatePowerExtrema.java
+++ b/io.openems.edge.ess.core/src/io/openems/edge/ess/core/power/solver/CalculatePowerExtrema.java
@@ -2,7 +2,6 @@
 
 import java.util.List;
 
-import org.apache.commons.math3.optim.PointValuePair;
 import org.apache.commons.math3.optim.linear.LinearConstraintSet;
 import org.apache.commons.math3.optim.linear.LinearObjectiveFunction;
 import org.apache.commons.math3.optim.linear.NoFeasibleSolutionException;
@@ -28,7 +27,7 @@ public class CalculatePowerExtrema {
 	/**
 	 * Calculates the extrema under the current constraints for the given
 	 * parameters.
-	 * 
+	 *
 	 * @param coefficients   the {@link Coefficients}
 	 * @param allConstraints all active {@link Constraint}s
 	 * @param essId          the ID of the {@link ManagedSymmetricEss}
@@ -47,16 +46,16 @@ public static double from(Coefficients coefficients, List<Constraint> allConstra
 			LOG.error(e.getMessage());
 			return 0d;
 		}
-		double[] cos = LinearSolverUtil.generateEmptyCoefficientsArray(coefficients.getNoOfCoefficients());
+		var cos = LinearSolverUtil.generateEmptyCoefficientsArray(coefficients.getNoOfCoefficients());
 		cos[index] = 1;
-		LinearObjectiveFunction objectiveFunction = new LinearObjectiveFunction(cos, 0);
+		var objectiveFunction = new LinearObjectiveFunction(cos, 0);
 
-		LinearConstraintSet constraints = new LinearConstraintSet(
+		var constraints = new LinearConstraintSet(
 				LinearSolverUtil.convertToLinearConstraints(coefficients, allConstraints));
 
-		SimplexSolver solver = new SimplexSolver();
+		var solver = new SimplexSolver();
 		try {
-			PointValuePair solution = solver.optimize(//
+			var solution = solver.optimize(//
 					objectiveFunction, //
 					constraints, //
 					goal, //
@@ -67,9 +66,8 @@ public static double from(Coefficients coefficients, List<Constraint> allConstra
 			LOG.warn("No Constraints for " + goal.name() + " [" + essId + "] phase [" + phase + "] pwr [" + pwr + "].");
 			if (goal == GoalType.MAXIMIZE) {
 				return Integer.MAX_VALUE;
-			} else {
-				return Integer.MIN_VALUE;
 			}
+			return Integer.MIN_VALUE;
 
 		} catch (NoFeasibleSolutionException e) {
 			LOG.warn("Unable to " + goal.name() + " [" + essId + "] phase [" + phase + "] pwr [" + pwr
diff --git a/io.openems.edge.ess.core/src/io/openems/edge/ess/core/power/solver/ConstraintSolver.java b/io.openems.edge.ess.core/src/io/openems/edge/ess/core/power/solver/ConstraintSolver.java
index 261fe55698c..3e33c26992a 100644
--- a/io.openems.edge.ess.core/src/io/openems/edge/ess/core/power/solver/ConstraintSolver.java
+++ b/io.openems.edge.ess.core/src/io/openems/edge/ess/core/power/solver/ConstraintSolver.java
@@ -3,7 +3,6 @@
 import java.util.List;
 
 import org.apache.commons.math3.optim.PointValuePair;
-import org.apache.commons.math3.optim.linear.LinearConstraint;
 import org.apache.commons.math3.optim.linear.NoFeasibleSolutionException;
 import org.apache.commons.math3.optim.linear.UnboundedSolutionException;
 
@@ -15,7 +14,7 @@ public class ConstraintSolver {
 
 	/**
 	 * Solves the problem with the given list of Constraints.
-	 * 
+	 *
 	 * @param coefficients the {@link Coefficients}
 	 * @param constraints  a list of Constraints
 	 * @return a solution
@@ -24,8 +23,7 @@ public class ConstraintSolver {
 	 */
 	public static PointValuePair solve(Coefficients coefficients, List<Constraint> constraints)
 			throws NoFeasibleSolutionException, UnboundedSolutionException {
-		List<LinearConstraint> linearConstraints = LinearSolverUtil.convertToLinearConstraints(coefficients,
-				constraints);
+		var linearConstraints = LinearSolverUtil.convertToLinearConstraints(coefficients, constraints);
 		return LinearConstraintsSolver.solve(coefficients, linearConstraints);
 	}
 
diff --git a/io.openems.edge.ess.core/src/io/openems/edge/ess/core/power/solver/LinearConstraintsSolver.java b/io.openems.edge.ess.core/src/io/openems/edge/ess/core/power/solver/LinearConstraintsSolver.java
index 4a56f7ce1d2..bfc2f5a24a5 100644
--- a/io.openems.edge.ess.core/src/io/openems/edge/ess/core/power/solver/LinearConstraintsSolver.java
+++ b/io.openems.edge.ess.core/src/io/openems/edge/ess/core/power/solver/LinearConstraintsSolver.java
@@ -6,7 +6,6 @@
 import org.apache.commons.math3.optim.PointValuePair;
 import org.apache.commons.math3.optim.linear.LinearConstraint;
 import org.apache.commons.math3.optim.linear.LinearConstraintSet;
-import org.apache.commons.math3.optim.linear.LinearObjectiveFunction;
 import org.apache.commons.math3.optim.linear.PivotSelectionRule;
 import org.apache.commons.math3.optim.linear.SimplexSolver;
 import org.apache.commons.math3.optim.nonlinear.scalar.GoalType;
@@ -18,7 +17,7 @@ public class LinearConstraintsSolver {
 
 	/**
 	 * Solves the problem with the given list of LinearConstraints.
-	 * 
+	 *
 	 * @param coefficients the {@link Coefficients}
 	 * @param constraints  a list of LinearConstraints
 	 * @return a solution as {@link PointValuePair}
@@ -26,10 +25,9 @@ public class LinearConstraintsSolver {
 	 */
 	public static PointValuePair solve(Coefficients coefficients, List<LinearConstraint> constraints)
 			throws MathIllegalStateException {
-		LinearObjectiveFunction objectiveFunction = LinearSolverUtil
-				.getDefaultObjectiveFunction(coefficients.getNoOfCoefficients());
+		var objectiveFunction = LinearSolverUtil.getDefaultObjectiveFunction(coefficients.getNoOfCoefficients());
 
-		SimplexSolver solver = new SimplexSolver();
+		var solver = new SimplexSolver();
 		return solver.optimize(//
 				objectiveFunction, //
 				new LinearConstraintSet(constraints), //
diff --git a/io.openems.edge.ess.core/src/io/openems/edge/ess/core/power/solver/PowerTuple.java b/io.openems.edge.ess.core/src/io/openems/edge/ess/core/power/solver/PowerTuple.java
index bc537472450..7f699afa3ec 100644
--- a/io.openems.edge.ess.core/src/io/openems/edge/ess/core/power/solver/PowerTuple.java
+++ b/io.openems.edge.ess.core/src/io/openems/edge/ess/core/power/solver/PowerTuple.java
@@ -9,7 +9,7 @@ public class PowerTuple {
 
 	/**
 	 * Set a value.
-	 * 
+	 *
 	 * @param pwr   the {@link Pwr}
 	 * @param value the value
 	 */
@@ -26,7 +26,7 @@ public void setValue(Pwr pwr, int value) {
 
 	/**
 	 * Get the Active-Power value.
-	 * 
+	 *
 	 * @return value for {@link Pwr#ACTIVE}.
 	 */
 	public int getActivePower() {
@@ -35,7 +35,7 @@ public int getActivePower() {
 
 	/**
 	 * Get the Reactive-Power value.
-	 * 
+	 *
 	 * @return value for {@link Pwr#REACTIVE}.
 	 */
 	public int getReactivePower() {
diff --git a/io.openems.edge.ess.core/test/io/openems/edge/ess/core/power/DataTest.java b/io.openems.edge.ess.core/test/io/openems/edge/ess/core/power/DataTest.java
index cba1e328c4c..4cf4c09e60c 100644
--- a/io.openems.edge.ess.core/test/io/openems/edge/ess/core/power/DataTest.java
+++ b/io.openems.edge.ess.core/test/io/openems/edge/ess/core/power/DataTest.java
@@ -21,17 +21,17 @@ public class DataTest {
 	@Before
 	public void before() {
 		PowerComponent powerComponent = new PowerComponentImpl();
-		DummyManagedSymmetricEss ess1 = new DummyManagedSymmetricEss("ess1", powerComponent) //
+		var ess1 = new DummyManagedSymmetricEss("ess1", powerComponent) //
 				.withAllowedChargePower(-50000) //
 				.withAllowedDischargePower(50000) //
 				.withMaxApparentPower(12000) //
 				.withSoc(30);
-		DummyManagedSymmetricEss ess2 = new DummyManagedSymmetricEss("ess2", powerComponent) //
+		var ess2 = new DummyManagedSymmetricEss("ess2", powerComponent) //
 				.withAllowedChargePower(-50000) //
 				.withAllowedDischargePower(50000) //
 				.withMaxApparentPower(12000) //
 				.withSoc(60);
-		DummyMetaEss ess0 = new DummyMetaEss("ess0", powerComponent, ess1, ess2); //
+		var ess0 = new DummyMetaEss("ess0", powerComponent, ess1, ess2); //
 		esss = Lists.newArrayList(ess0, ess1, ess2);
 
 		data = new Data();
diff --git a/io.openems.edge.ess.core/test/io/openems/edge/ess/core/power/MyConfig.java b/io.openems.edge.ess.core/test/io/openems/edge/ess/core/power/MyConfig.java
index 211dea05d3e..535da5d64b0 100644
--- a/io.openems.edge.ess.core/test/io/openems/edge/ess/core/power/MyConfig.java
+++ b/io.openems.edge.ess.core/test/io/openems/edge/ess/core/power/MyConfig.java
@@ -61,7 +61,7 @@ public MyConfig build() {
 
 	/**
 	 * Create the Config-Builder.
-	 * 
+	 *
 	 * @return the {@link Builder}.
 	 */
 	public static Builder create() {
diff --git a/io.openems.edge.ess.core/test/io/openems/edge/ess/core/power/PowerComponentTest.java b/io.openems.edge.ess.core/test/io/openems/edge/ess/core/power/PowerComponentTest.java
index 22fc8613a85..d727483b925 100644
--- a/io.openems.edge.ess.core/test/io/openems/edge/ess/core/power/PowerComponentTest.java
+++ b/io.openems.edge.ess.core/test/io/openems/edge/ess/core/power/PowerComponentTest.java
@@ -36,16 +36,16 @@ public void after() {
 	@Test
 	public void testSymmetricEss() throws Exception {
 		PowerComponent powerComponent = new PowerComponentImpl();
-		DummyManagedSymmetricEss ess0 = new DummyManagedSymmetricEss("ess0", powerComponent) //
+		var ess0 = new DummyManagedSymmetricEss("ess0", powerComponent) //
 				.withAllowedChargePower(-50000) //
 				.withAllowedDischargePower(50000) //
 				.withMaxApparentPower(12000) //
 				.withSoc(30);
 
-		final DummyConfigurationAdmin cm = new DummyConfigurationAdmin();
+		final var cm = new DummyConfigurationAdmin();
 		cm.getOrCreateEmptyConfiguration(PowerComponent.SINGLETON_SERVICE_PID);
 
-		ComponentTest componentTest = new ComponentTest(powerComponent) //
+		var componentTest = new ComponentTest(powerComponent) //
 				.addReference("cm", cm) //
 				.addReference("addEss", ess0) //
 				.activate(MyConfig.create() //
@@ -64,17 +64,17 @@ public void testSymmetricEss() throws Exception {
 	@Test
 	public void testAsymmetricEss() throws Exception {
 		PowerComponent powerComponent = new PowerComponentImpl();
-		DummyManagedAsymmetricEss ess0 = new DummyManagedAsymmetricEss("ess0", powerComponent); //
+		var ess0 = new DummyManagedAsymmetricEss("ess0", powerComponent); //
 		ess0 //
 				.withAllowedChargePower(-50000) //
 				.withAllowedDischargePower(50000) //
 				.withMaxApparentPower(30000) //
 				.withSoc(30);
 
-		final DummyConfigurationAdmin cm = new DummyConfigurationAdmin();
+		final var cm = new DummyConfigurationAdmin();
 		cm.getOrCreateEmptyConfiguration(PowerComponent.SINGLETON_SERVICE_PID);
 
-		final ComponentTest componentTest = new ComponentTest(powerComponent) //
+		final var componentTest = new ComponentTest(powerComponent) //
 				.addReference("cm", cm) //
 				.addReference("addEss", ess0) //
 				.activate(MyConfig.create() //
@@ -97,17 +97,17 @@ public void testAsymmetricEss() throws Exception {
 	@Test
 	public void testAsymmetricEssAllEqual() throws Exception {
 		PowerComponent powerComponent = new PowerComponentImpl();
-		DummyManagedAsymmetricEss ess0 = new DummyManagedAsymmetricEss("ess0", powerComponent); //
+		var ess0 = new DummyManagedAsymmetricEss("ess0", powerComponent); //
 		ess0 //
 				.withAllowedChargePower(-50000) //
 				.withAllowedDischargePower(50000) //
 				.withMaxApparentPower(30000) //
 				.withSoc(30);
 
-		final DummyConfigurationAdmin cm = new DummyConfigurationAdmin();
+		final var cm = new DummyConfigurationAdmin();
 		cm.getOrCreateEmptyConfiguration(PowerComponent.SINGLETON_SERVICE_PID);
 
-		ComponentTest componentTest = new ComponentTest(powerComponent) //
+		var componentTest = new ComponentTest(powerComponent) //
 				.addReference("cm", cm) //
 				.addReference("addEss", ess0) //
 				.activate(MyConfig.create() //
@@ -126,22 +126,22 @@ public void testAsymmetricEssAllEqual() throws Exception {
 	@Test
 	public void testCluster() throws Exception {
 		PowerComponent powerComponent = new PowerComponentImpl();
-		DummyManagedSymmetricEss ess1 = new DummyManagedSymmetricEss("ess1", powerComponent) //
+		var ess1 = new DummyManagedSymmetricEss("ess1", powerComponent) //
 				.withAllowedChargePower(-50000) //
 				.withAllowedDischargePower(50000) //
 				.withMaxApparentPower(12000) //
 				.withSoc(30);
-		DummyManagedSymmetricEss ess2 = new DummyManagedSymmetricEss("ess2", powerComponent) //
+		var ess2 = new DummyManagedSymmetricEss("ess2", powerComponent) //
 				.withAllowedChargePower(-50000) //
 				.withAllowedDischargePower(50000) //
 				.withMaxApparentPower(12000) //
 				.withSoc(60);
-		DummyMetaEss ess0 = new DummyMetaEss("ess0", powerComponent, ess1, ess2); //
+		var ess0 = new DummyMetaEss("ess0", powerComponent, ess1, ess2); //
 
-		final DummyConfigurationAdmin cm = new DummyConfigurationAdmin();
+		final var cm = new DummyConfigurationAdmin();
 		cm.getOrCreateEmptyConfiguration(PowerComponent.SINGLETON_SERVICE_PID);
 
-		final ComponentTest componentTest = new ComponentTest(powerComponent) //
+		final var componentTest = new ComponentTest(powerComponent) //
 				.addReference("cm", cm) //
 				.addReference("addEss", ess0) //
 				.addReference("addEss", ess1) //
@@ -248,42 +248,42 @@ public void testCluster() throws Exception {
 	@Test
 	public void testStrSctr() throws Exception {
 		PowerComponent powerComponent = new PowerComponentImpl();
-		DummyManagedSymmetricEss ess1 = new DummyManagedSymmetricEss("ess1", powerComponent) //
+		var ess1 = new DummyManagedSymmetricEss("ess1", powerComponent) //
 				.withAllowedChargePower(-50000) //
 				.withAllowedDischargePower(50000) //
 				.withMaxApparentPower(12000) //
 				.withSoc(30);
-		DummyManagedSymmetricEss ess2 = new DummyManagedSymmetricEss("ess2", powerComponent) //
+		var ess2 = new DummyManagedSymmetricEss("ess2", powerComponent) //
 				.withAllowedChargePower(-50000) //
 				.withAllowedDischargePower(50000) //
 				.withMaxApparentPower(12000) //
 				.withSoc(60);
-		DummyManagedSymmetricEss ess3 = new DummyManagedSymmetricEss("ess3", powerComponent) //
+		var ess3 = new DummyManagedSymmetricEss("ess3", powerComponent) //
 				.withAllowedChargePower(-50000) //
 				.withAllowedDischargePower(50000) //
 				.withMaxApparentPower(12000) //
 				.withSoc(50);
-		DummyManagedSymmetricEss ess4 = new DummyManagedSymmetricEss("ess4", powerComponent) //
+		var ess4 = new DummyManagedSymmetricEss("ess4", powerComponent) //
 				.withAllowedChargePower(-50000) //
 				.withAllowedDischargePower(50000) //
 				.withMaxApparentPower(12000) //
 				.withSoc(10);
-		DummyManagedSymmetricEss ess5 = new DummyManagedSymmetricEss("ess5", powerComponent) //
+		var ess5 = new DummyManagedSymmetricEss("ess5", powerComponent) //
 				.withAllowedChargePower(-50000) //
 				.withAllowedDischargePower(50000) //
 				.withMaxApparentPower(12000) //
 				.withSoc(90);
-		DummyManagedSymmetricEss ess6 = new DummyManagedSymmetricEss("ess6", powerComponent) //
+		var ess6 = new DummyManagedSymmetricEss("ess6", powerComponent) //
 				.withAllowedChargePower(-50000) //
 				.withAllowedDischargePower(50000) //
 				.withMaxApparentPower(12000) //
 				.withSoc(70);
-		DummyMetaEss ess0 = new DummyMetaEss("ess0", powerComponent, ess1, ess2, ess3, ess4, ess5, ess6); //
+		var ess0 = new DummyMetaEss("ess0", powerComponent, ess1, ess2, ess3, ess4, ess5, ess6); //
 
-		final DummyConfigurationAdmin cm = new DummyConfigurationAdmin();
+		final var cm = new DummyConfigurationAdmin();
 		cm.getOrCreateEmptyConfiguration(PowerComponent.SINGLETON_SERVICE_PID);
 
-		final ComponentTest componentTest = new ComponentTest(powerComponent) //
+		final var componentTest = new ComponentTest(powerComponent) //
 				.addReference("cm", cm) //
 				.addReference("addEss", ess0) //
 				.addReference("addEss", ess1) //
@@ -357,20 +357,20 @@ public void testStrSctr() throws Exception {
 	@Test
 	public void testCommercial40Cluster() throws Exception {
 		PowerComponent powerComponent = new PowerComponentImpl();
-		DummyManagedSymmetricEss ess1 = new DummyManagedSymmetricEss("ess1", powerComponent) //
+		var ess1 = new DummyManagedSymmetricEss("ess1", powerComponent) //
 				.withMaxApparentPower(40000) //
 				.withSoc(1) //
 				.withPowerPrecision(100);
-		DummyManagedSymmetricEss ess2 = new DummyManagedSymmetricEss("ess2", powerComponent) //
+		var ess2 = new DummyManagedSymmetricEss("ess2", powerComponent) //
 				.withMaxApparentPower(40000) //
 				.withSoc(97) //
 				.withPowerPrecision(100);
-		DummyMetaEss ess0 = new DummyMetaEss("ess0", powerComponent, ess1, ess2); //
+		var ess0 = new DummyMetaEss("ess0", powerComponent, ess1, ess2); //
 
-		final DummyConfigurationAdmin cm = new DummyConfigurationAdmin();
+		final var cm = new DummyConfigurationAdmin();
 		cm.getOrCreateEmptyConfiguration(PowerComponent.SINGLETON_SERVICE_PID);
 
-		final ComponentTest componentTest = new ComponentTest(powerComponent) //
+		final var componentTest = new ComponentTest(powerComponent) //
 				.addReference("cm", cm) //
 				.addReference("addEss", ess0) //
 				.addReference("addEss", ess1) //
@@ -450,34 +450,34 @@ public void testCommercial40Cluster() throws Exception {
 	@Test
 	public void testMultilayerCluster() throws Exception {
 		PowerComponent powerComponent = new PowerComponentImpl();
-		DummyManagedSymmetricEss ess11 = new DummyManagedSymmetricEss("ess11", powerComponent) //
+		var ess11 = new DummyManagedSymmetricEss("ess11", powerComponent) //
 				.withAllowedChargePower(-70000) //
 				.withAllowedDischargePower(70000) //
 				.withMaxApparentPower(50000) //
 				.withSoc(30);
-		DummyManagedSymmetricEss ess12 = new DummyManagedSymmetricEss("ess12", powerComponent) //
+		var ess12 = new DummyManagedSymmetricEss("ess12", powerComponent) //
 				.withAllowedChargePower(-70000) //
 				.withAllowedDischargePower(70000) //
 				.withMaxApparentPower(50000) //
 				.withSoc(60);
-		DummyMetaEss ess10 = new DummyMetaEss("ess10", powerComponent, ess11, ess12); //
-		DummyManagedSymmetricEss ess21 = new DummyManagedSymmetricEss("ess21", powerComponent) //
+		var ess10 = new DummyMetaEss("ess10", powerComponent, ess11, ess12); //
+		var ess21 = new DummyManagedSymmetricEss("ess21", powerComponent) //
 				.withAllowedChargePower(-70000) //
 				.withAllowedDischargePower(70000) //
 				.withMaxApparentPower(50000) //
 				.withSoc(30);
-		DummyManagedSymmetricEss ess22 = new DummyManagedSymmetricEss("ess22", powerComponent) //
+		var ess22 = new DummyManagedSymmetricEss("ess22", powerComponent) //
 				.withAllowedChargePower(-70000) //
 				.withAllowedDischargePower(70000) //
 				.withMaxApparentPower(50000) //
 				.withSoc(60);
-		DummyMetaEss ess20 = new DummyMetaEss("ess20", powerComponent, ess21, ess22); //
-		DummyMetaEss ess0 = new DummyMetaEss("ess0", powerComponent, ess10, ess20); //
+		var ess20 = new DummyMetaEss("ess20", powerComponent, ess21, ess22); //
+		var ess0 = new DummyMetaEss("ess0", powerComponent, ess10, ess20); //
 
-		final DummyConfigurationAdmin cm = new DummyConfigurationAdmin();
+		final var cm = new DummyConfigurationAdmin();
 		cm.getOrCreateEmptyConfiguration(PowerComponent.SINGLETON_SERVICE_PID);
 
-		final ComponentTest componentTest = new ComponentTest(powerComponent) //
+		final var componentTest = new ComponentTest(powerComponent) //
 				.addReference("cm", cm) //
 				.addReference("addEss", ess0) //
 				.addReference("addEss", ess10) //
@@ -505,7 +505,7 @@ public void testMultilayerCluster() throws Exception {
 
 	private static void expect(String description, DummyManagedSymmetricEss ess, int p, int q) {
 		openCallbacks.incrementAndGet();
-		ess.withSymmetricApplyPowerCallback((record) -> {
+		ess.withSymmetricApplyPowerCallback(record -> {
 			openCallbacks.decrementAndGet();
 			// System.out.println(description + " for " + ess.id() + ": " + activePower);
 			assertEquals(description + " for " + ess.id(), p, record.activePower);
@@ -516,7 +516,7 @@ private static void expect(String description, DummyManagedSymmetricEss ess, int
 	private static void expect(String description, DummyManagedAsymmetricEss ess, int pL1, int qL1, int pL2, int qL2,
 			int pL3, int qL3) {
 		openCallbacks.incrementAndGet();
-		ess.withAsymmetricApplyPowerCallback((record) -> {
+		ess.withAsymmetricApplyPowerCallback(record -> {
 			openCallbacks.decrementAndGet();
 			assertEquals(description + " for " + ess.id(), pL1, record.activePowerL1);
 			assertEquals(description + " for " + ess.id(), qL1, record.reactivePowerL1);
diff --git a/io.openems.edge.ess.core/test/io/openems/edge/ess/core/power/optimizers/ReduceNumberOfUsedInvertersTest.java b/io.openems.edge.ess.core/test/io/openems/edge/ess/core/power/optimizers/ReduceNumberOfUsedInvertersTest.java
index cb4dd113176..16a2fc27a06 100644
--- a/io.openems.edge.ess.core/test/io/openems/edge/ess/core/power/optimizers/ReduceNumberOfUsedInvertersTest.java
+++ b/io.openems.edge.ess.core/test/io/openems/edge/ess/core/power/optimizers/ReduceNumberOfUsedInvertersTest.java
@@ -3,7 +3,6 @@
 import static org.junit.Assert.assertEquals;
 
 import java.util.Arrays;
-import java.util.Iterator;
 import java.util.List;
 
 import org.apache.commons.math3.optim.PointValuePair;
@@ -56,10 +55,10 @@ public void before() {
 
 	@Test
 	public void testNumberOfUsedInverters() {
-		int requiredNumberOfInverters = 3;
+		var requiredNumberOfInverters = 3;
 
-		ValidateFunction validateFunction = new ValidateFunction(allInverters, requiredNumberOfInverters);
-		List<Inverter> inverters = sut.apply(allInverters, TargetDirection.DISCHARGE, validateFunction);
+		var validateFunction = new ValidateFunction(allInverters, requiredNumberOfInverters);
+		var inverters = sut.apply(allInverters, TargetDirection.DISCHARGE, validateFunction);
 
 		if (requiredNumberOfInverters > allInverters.size() || requiredNumberOfInverters <= 0) {
 			// no solution possible; keep all Inverters
@@ -71,10 +70,10 @@ public void testNumberOfUsedInverters() {
 
 	@Test
 	public void testActualInvertersOnDischarge() {
-		ValidateFunction validateFunction = new ValidateFunction(allInverters, 2);
-		List<Inverter> inverters = sut.apply(allInverters, TargetDirection.DISCHARGE, validateFunction);
+		var validateFunction = new ValidateFunction(allInverters, 2);
+		var inverters = sut.apply(allInverters, TargetDirection.DISCHARGE, validateFunction);
 
-		Iterator<Inverter> iter = inverters.iterator();
+		var iter = inverters.iterator();
 		Inverter inv;
 
 		inv = iter.next();
@@ -86,10 +85,10 @@ public void testActualInvertersOnDischarge() {
 
 	@Test
 	public void testActualInvertersOnCharge() {
-		ValidateFunction validateFunction = new ValidateFunction(allInverters, 3);
-		List<Inverter> inverters = sut.apply(allInverters, TargetDirection.CHARGE, validateFunction);
+		var validateFunction = new ValidateFunction(allInverters, 3);
+		var inverters = sut.apply(allInverters, TargetDirection.CHARGE, validateFunction);
 
-		Iterator<Inverter> iter = inverters.iterator();
+		var iter = inverters.iterator();
 		Inverter inv;
 
 		inv = iter.next();
@@ -120,9 +119,8 @@ protected ValidateFunction(List<Inverter> allInverters, int requiredNumberOfInve
 		public PointValuePair apply(List<Inverter> disabledInverters) throws Exception {
 			if (this.allInverters.size() - disabledInverters.size() < this.requiredNumberOfInverters) {
 				throw new Exception("Not solved");
-			} else {
-				return null; // ignored
 			}
+			return null; // ignored
 		}
 
 	}

From 11d55643dec04a197b2669403727a60f197a658b Mon Sep 17 00:00:00 2001
From: Stefan Feilmeier <stefan.feilmeier@fenecon.de>
Date: Tue, 8 Mar 2022 11:21:36 +0100
Subject: [PATCH 59/96] Update io.openems.edge.ess.fenecon.commercial40

---
 .../commercial40/EssFeneconCommercial40.java  | 18 +++++-------
 .../EssFeneconCommercial40Impl.java           | 14 +++++----
 .../commercial40/SurplusFeedInHandler.java    | 29 +++++++++----------
 ...stractEssDcChargerFeneconCommercial40.java |  6 ++--
 .../EssDcChargerFeneconCommercial40.java      |  1 +
 ...ssDcChargerFeneconCommercial40Pv1Impl.java |  3 +-
 ...ssDcChargerFeneconCommercial40Pv2Impl.java |  3 +-
 .../ess/fenecon/commercial40/MyConfig.java    |  2 +-
 ...sDcChargerFeneconCommercial40ImplTest.java |  2 +-
 .../commercial40/charger/MyConfigPV1.java     |  2 +-
 10 files changed, 41 insertions(+), 39 deletions(-)

diff --git a/io.openems.edge.ess.fenecon.commercial40/src/io/openems/edge/ess/fenecon/commercial40/EssFeneconCommercial40.java b/io.openems.edge.ess.fenecon.commercial40/src/io/openems/edge/ess/fenecon/commercial40/EssFeneconCommercial40.java
index ef7416d1504..52448706d3d 100644
--- a/io.openems.edge.ess.fenecon.commercial40/src/io/openems/edge/ess/fenecon/commercial40/EssFeneconCommercial40.java
+++ b/io.openems.edge.ess.fenecon.commercial40/src/io/openems/edge/ess/fenecon/commercial40/EssFeneconCommercial40.java
@@ -1,7 +1,5 @@
 package io.openems.edge.ess.fenecon.commercial40;
 
-import java.util.Optional;
-
 import org.osgi.service.event.EventHandler;
 
 import io.openems.common.channel.AccessMode;
@@ -24,28 +22,28 @@ public interface EssFeneconCommercial40
 
 	/**
 	 * Gets the Modbus Unit-ID.
-	 * 
+	 *
 	 * @return the Unit-ID
 	 */
 	public Integer getUnitId();
 
 	/**
 	 * Gets the Modbus-Bridge Component-ID, i.e. "modbus0".
-	 * 
+	 *
 	 * @return the Component-ID
 	 */
 	public String getModbusBridgeId();
 
 	/**
 	 * Registers a Charger with this ESS.
-	 * 
+	 *
 	 * @param charger the Charger
 	 */
 	public void addCharger(EssDcChargerFeneconCommercial40 charger);
 
 	/**
 	 * Unregisters a Charger from this ESS.
-	 * 
+	 *
 	 * @param charger the Charger
 	 */
 	public void removeCharger(EssDcChargerFeneconCommercial40 charger);
@@ -89,8 +87,8 @@ public enum ChannelId implements io.openems.edge.common.channel.ChannelId {
 					channel.onUpdate(newValue -> {
 						IntegerReadChannel currentValueChannel = channel.getComponent()
 								.channel(ManagedSymmetricEss.ChannelId.ALLOWED_CHARGE_POWER);
-						Optional<Integer> originalValue = newValue.asOptional();
-						Optional<Integer> currentValue = currentValueChannel.value().asOptional();
+						var originalValue = newValue.asOptional();
+						var currentValue = currentValueChannel.value().asOptional();
 						int value;
 						if (!originalValue.isPresent() && !currentValue.isPresent()) {
 							value = 0;
@@ -112,8 +110,8 @@ public enum ChannelId implements io.openems.edge.common.channel.ChannelId {
 					channel.onUpdate(newValue -> {
 						IntegerReadChannel currentValueChannel = channel.getComponent()
 								.channel(ManagedSymmetricEss.ChannelId.ALLOWED_DISCHARGE_POWER);
-						Optional<Integer> originalValue = newValue.asOptional();
-						Optional<Integer> currentValue = currentValueChannel.value().asOptional();
+						var originalValue = newValue.asOptional();
+						var currentValue = currentValueChannel.value().asOptional();
 						int value;
 						if (!originalValue.isPresent() && !currentValue.isPresent()) {
 							value = 0;
diff --git a/io.openems.edge.ess.fenecon.commercial40/src/io/openems/edge/ess/fenecon/commercial40/EssFeneconCommercial40Impl.java b/io.openems.edge.ess.fenecon.commercial40/src/io/openems/edge/ess/fenecon/commercial40/EssFeneconCommercial40Impl.java
index 42c8d13cf88..cf9ebb01ad5 100644
--- a/io.openems.edge.ess.fenecon.commercial40/src/io/openems/edge/ess/fenecon/commercial40/EssFeneconCommercial40Impl.java
+++ b/io.openems.edge.ess.fenecon.commercial40/src/io/openems/edge/ess/fenecon/commercial40/EssFeneconCommercial40Impl.java
@@ -136,6 +136,7 @@ public void applyPower(int activePower, int reactivePower) throws OpenemsNamedEx
 		setReactivePowerChannel.setNextWriteValue(reactivePower);
 	}
 
+	@Override
 	@Reference(policy = ReferencePolicy.STATIC, policyOption = ReferencePolicyOption.GREEDY, cardinality = ReferenceCardinality.MANDATORY)
 	protected void setModbus(BridgeModbus modbus) {
 		super.setModbus(modbus);
@@ -150,6 +151,7 @@ void activate(ComponentContext context, Config config) throws OpenemsException {
 		this.config = config;
 	}
 
+	@Override
 	@Deactivate
 	protected void deactivate() {
 		super.deactivate();
@@ -170,8 +172,8 @@ protected ModbusProtocol defineModbusProtocol() throws OpenemsException {
 						m(EssFeneconCommercial40.ChannelId.BATTERY_MAINTENANCE_STATE, new UnsignedWordElement(0x0104)),
 						m(EssFeneconCommercial40.ChannelId.INVERTER_STATE, new UnsignedWordElement(0x0105)),
 						m(SymmetricEss.ChannelId.GRID_MODE, new UnsignedWordElement(0x0106), //
-								new ElementToChannelConverter((value) -> {
-									Integer intValue = TypeUtils.<Integer>getAsType(OpenemsType.INTEGER, value);
+								new ElementToChannelConverter(value -> {
+									var intValue = TypeUtils.<Integer>getAsType(OpenemsType.INTEGER, value);
 									if (intValue != null) {
 										switch (intValue) {
 										case 1:
@@ -748,14 +750,14 @@ private void defineWorkState() {
 		 */
 		// TODO this should be smarter: set in energy saving mode if there was no output
 		// power for a while and we don't need emergency power.
-		LocalDateTime now = LocalDateTime.now();
+		var now = LocalDateTime.now();
 		if (this.lastDefineWorkState == null || now.minusMinutes(1).isAfter(this.lastDefineWorkState)) {
 			this.lastDefineWorkState = now;
 			EnumWriteChannel setWorkStateChannel = this.channel(EssFeneconCommercial40.ChannelId.SET_WORK_STATE);
 			try {
 				setWorkStateChannel.setNextWriteValue(SetWorkState.START);
 			} catch (OpenemsNamedException e) {
-				logError(this.log, "Unable to start: " + e.getMessage());
+				this.logError(this.log, "Unable to start: " + e.getMessage());
 			}
 		}
 	}
@@ -869,7 +871,7 @@ private void calculateEnergy() {
 		/*
 		 * Calculate AC Energy
 		 */
-		Integer acActivePower = this.getActivePowerChannel().getNextValue().get();
+		var acActivePower = this.getActivePowerChannel().getNextValue().get();
 		if (acActivePower == null) {
 			// Not available
 			this.calculateAcChargeEnergy.update(null);
@@ -886,7 +888,7 @@ private void calculateEnergy() {
 		/*
 		 * Calculate DC Power and Energy
 		 */
-		Integer dcDischargePower = acActivePower;
+		var dcDischargePower = acActivePower;
 		for (EssDcChargerFeneconCommercial40 charger : this.chargers) {
 			dcDischargePower = TypeUtils.subtract(dcDischargePower,
 					charger.getActualPowerChannel().getNextValue().get());
diff --git a/io.openems.edge.ess.fenecon.commercial40/src/io/openems/edge/ess/fenecon/commercial40/SurplusFeedInHandler.java b/io.openems.edge.ess.fenecon.commercial40/src/io/openems/edge/ess/fenecon/commercial40/SurplusFeedInHandler.java
index 772c8817e11..76b29b50ea6 100644
--- a/io.openems.edge.ess.fenecon.commercial40/src/io/openems/edge/ess/fenecon/commercial40/SurplusFeedInHandler.java
+++ b/io.openems.edge.ess.fenecon.commercial40/src/io/openems/edge/ess/fenecon/commercial40/SurplusFeedInHandler.java
@@ -13,7 +13,6 @@
 import io.openems.edge.common.channel.IntegerReadChannel;
 import io.openems.edge.common.channel.IntegerWriteChannel;
 import io.openems.edge.common.channel.StateChannel;
-import io.openems.edge.common.channel.value.Value;
 import io.openems.edge.common.component.ComponentManager;
 import io.openems.edge.ess.dccharger.api.EssDcCharger;
 import io.openems.edge.ess.fenecon.commercial40.charger.EssDcChargerFeneconCommercial40;
@@ -39,9 +38,9 @@ public SurplusFeedInHandler(EssFeneconCommercial40Impl parent) {
 
 	protected Integer run(List<EssDcChargerFeneconCommercial40> chargers, Config config,
 			ComponentManager componentManager) {
-		LocalTime offTime = LocalTime.parse(config.surplusFeedInOffTime());
+		var offTime = LocalTime.parse(config.surplusFeedInOffTime());
 
-		boolean areSurplusConditionsMet = this.areSurplusConditionsMet(this.parent, chargers, config);
+		var areSurplusConditionsMet = this.areSurplusConditionsMet(this.parent, chargers, config);
 
 		if (chargers.isEmpty()) {
 			// Is no Charger set (i.e. is this not a Commercial 40-40 "DC")
@@ -73,20 +72,20 @@ protected Integer run(List<EssDcChargerFeneconCommercial40> chargers, Config con
 				this.setState(SurplusFeedInStateMachine.GOING_DEACTIVATED);
 				this.startedGoingDeactivated = LocalDateTime.now();
 			}
-			int pvPower = this.getPvPower(chargers);
-			int power = pvPower + this.getIncreasePower(config, pvPower);
+			var pvPower = this.getPvPower(chargers);
+			var power = pvPower + this.getIncreasePower(config, pvPower);
 			this.applyPvPowerLimit(chargers, config, true);
 			return power;
 		}
 
 		case GOING_DEACTIVATED: {
-			long goingDeactivatedSinceMinutes = Duration.between(this.startedGoingDeactivated, LocalDateTime.now())
+			var goingDeactivatedSinceMinutes = Duration.between(this.startedGoingDeactivated, LocalDateTime.now())
 					.toMinutes();
 			// slowly reduce the surplus-feed-in-power from 100 to 0 %
-			int pvPower = this.getPvPower(chargers);
-			double factor = DoubleUtils.normalize(goingDeactivatedSinceMinutes, 0, GOING_DEACTIVATED_MINUTES, 0, 1,
+			var pvPower = this.getPvPower(chargers);
+			var factor = DoubleUtils.normalize(goingDeactivatedSinceMinutes, 0, GOING_DEACTIVATED_MINUTES, 0, 1,
 					true);
-			int power = Math.max((int) ((pvPower + this.getIncreasePower(config, pvPower)) * factor),
+			var power = Math.max((int) ((pvPower + this.getIncreasePower(config, pvPower)) * factor),
 					this.getIncreasePower(config, pvPower));
 			if (goingDeactivatedSinceMinutes > GOING_DEACTIVATED_MINUTES) {
 				this.setState(SurplusFeedInStateMachine.PASSED_OFF_TIME);
@@ -109,12 +108,12 @@ protected Integer run(List<EssDcChargerFeneconCommercial40> chargers, Config con
 
 	/**
 	 * Gets the PV-Power. Zero if not available.
-	 * 
+	 *
 	 * @param chargers the DC Chargers
 	 * @return pv power
 	 */
 	private int getPvPower(List<EssDcChargerFeneconCommercial40> chargers) {
-		int pvPower = 0;
+		var pvPower = 0;
 		for (EssDcCharger charger : chargers) {
 			pvPower += charger.getActualPower().orElse(0);
 		}
@@ -140,7 +139,7 @@ private boolean areSurplusConditionsMet(EssFeneconCommercial40Impl ess,
 			return false;
 		}
 
-		int maxVoltage = 0;
+		var maxVoltage = 0;
 		for (EssDcChargerFeneconCommercial40 charger : chargers) {
 			int thisVoltage = ((IntegerReadChannel) charger
 					.channel(EssDcChargerFeneconCommercial40.ChannelId.PV_DCDC_INPUT_VOLTAGE)).value().orElse(0);
@@ -161,7 +160,7 @@ private void applyPvPowerLimit(List<EssDcChargerFeneconCommercial40> chargers, C
 		/*
 		 * Limit PV production power
 		 */
-		int pvPowerLimit = NO_PV_LIMIT;
+		var pvPowerLimit = NO_PV_LIMIT;
 		if (limitPv) {
 			// Limit PV-Power to maximum apparent power of inverter
 			// this avoids filling the battery faster than we can empty it
@@ -174,7 +173,7 @@ private void applyPvPowerLimit(List<EssDcChargerFeneconCommercial40> chargers, C
 			} else {
 				// Otherwise reduce to MAX_APPARENT_POWER multiplied with PV_LIMIT_FACTOR;
 				// minimally MIN_PV_LIMIT
-				Value<Integer> maxApparentPower = this.parent.getMaxApparentPower();
+				var maxApparentPower = this.parent.getMaxApparentPower();
 				if (maxApparentPower.isDefined()) {
 					pvPowerLimit = Math.max(Math.round(maxApparentPower.get() * PV_LIMIT_FACTOR), MIN_PV_LIMIT);
 				}
@@ -212,7 +211,7 @@ private int getIncreasePower(Config config, int pvPower) {
 		}
 		// increase power is PV-Power + 10 % (INCREASE_POWER_FACTOR); limited by
 		// MAX_INCREASE_POWER
-		int increasePower = (int) (pvPower * config.surplusFeedInIncreasePowerFactor());
+		var increasePower = (int) (pvPower * config.surplusFeedInIncreasePowerFactor());
 		return Math.min(increasePower, config.surplusFeedInMaxIncreasePowerFactor());
 	}
 }
diff --git a/io.openems.edge.ess.fenecon.commercial40/src/io/openems/edge/ess/fenecon/commercial40/charger/AbstractEssDcChargerFeneconCommercial40.java b/io.openems.edge.ess.fenecon.commercial40/src/io/openems/edge/ess/fenecon/commercial40/charger/AbstractEssDcChargerFeneconCommercial40.java
index 5a456a037b5..6abb55c701c 100644
--- a/io.openems.edge.ess.fenecon.commercial40/src/io/openems/edge/ess/fenecon/commercial40/charger/AbstractEssDcChargerFeneconCommercial40.java
+++ b/io.openems.edge.ess.fenecon.commercial40/src/io/openems/edge/ess/fenecon/commercial40/charger/AbstractEssDcChargerFeneconCommercial40.java
@@ -35,7 +35,7 @@ public abstract class AbstractEssDcChargerFeneconCommercial40 extends AbstractOp
 
 	/**
 	 * Is this PV1 or PV2 charger?.
-	 * 
+	 *
 	 * @return true for PV1, false for PV2
 	 */
 	protected abstract boolean isPV1();
@@ -52,7 +52,7 @@ public AbstractEssDcChargerFeneconCommercial40() {
 
 	@Override
 	protected ModbusProtocol defineModbusProtocol() throws OpenemsException {
-		ModbusProtocol protocol = new ModbusProtocol(this, //
+		var protocol = new ModbusProtocol(this, //
 				new FC16WriteRegistersTask(0x0503, //
 						m(EssDcChargerFeneconCommercial40.ChannelId.SET_PV_POWER_LIMIT, new UnsignedWordElement(0x0503),
 								ElementToChannelConverter.SCALE_FACTOR_2))); //
@@ -225,7 +225,7 @@ public void handleEvent(Event event) {
 	 * Calculate the Energy values from ActivePower.
 	 */
 	private void calculateEnergy() {
-		Integer actualPower = this.getActualPower().get();
+		var actualPower = this.getActualPower().get();
 		if (actualPower == null) {
 			// Not available
 			this.calculateActualEnergy.update(null);
diff --git a/io.openems.edge.ess.fenecon.commercial40/src/io/openems/edge/ess/fenecon/commercial40/charger/EssDcChargerFeneconCommercial40.java b/io.openems.edge.ess.fenecon.commercial40/src/io/openems/edge/ess/fenecon/commercial40/charger/EssDcChargerFeneconCommercial40.java
index efa1ec3694a..dc295526c11 100644
--- a/io.openems.edge.ess.fenecon.commercial40/src/io/openems/edge/ess/fenecon/commercial40/charger/EssDcChargerFeneconCommercial40.java
+++ b/io.openems.edge.ess.fenecon.commercial40/src/io/openems/edge/ess/fenecon/commercial40/charger/EssDcChargerFeneconCommercial40.java
@@ -90,6 +90,7 @@ private ChannelId(Doc doc) {
 			this.doc = doc;
 		}
 
+		@Override
 		public Doc doc() {
 			return this.doc;
 		}
diff --git a/io.openems.edge.ess.fenecon.commercial40/src/io/openems/edge/ess/fenecon/commercial40/charger/EssDcChargerFeneconCommercial40Pv1Impl.java b/io.openems.edge.ess.fenecon.commercial40/src/io/openems/edge/ess/fenecon/commercial40/charger/EssDcChargerFeneconCommercial40Pv1Impl.java
index a44df8bbf64..7237086e2fe 100644
--- a/io.openems.edge.ess.fenecon.commercial40/src/io/openems/edge/ess/fenecon/commercial40/charger/EssDcChargerFeneconCommercial40Pv1Impl.java
+++ b/io.openems.edge.ess.fenecon.commercial40/src/io/openems/edge/ess/fenecon/commercial40/charger/EssDcChargerFeneconCommercial40Pv1Impl.java
@@ -43,9 +43,9 @@ public class EssDcChargerFeneconCommercial40Pv1Impl extends AbstractEssDcCharger
 	private volatile Timedata timedata = null;
 
 	public EssDcChargerFeneconCommercial40Pv1Impl() {
-		super();
 	}
 
+	@Override
 	@Reference(policy = ReferencePolicy.STATIC, policyOption = ReferencePolicyOption.GREEDY, cardinality = ReferenceCardinality.MANDATORY)
 	protected void setModbus(BridgeModbus modbus) {
 		super.setModbus(modbus);
@@ -69,6 +69,7 @@ void activate(ComponentContext context, ConfigPV1 config) throws OpenemsExceptio
 		this.ess.addCharger(this);
 	}
 
+	@Override
 	@Deactivate
 	protected void deactivate() {
 		this.ess.removeCharger(this);
diff --git a/io.openems.edge.ess.fenecon.commercial40/src/io/openems/edge/ess/fenecon/commercial40/charger/EssDcChargerFeneconCommercial40Pv2Impl.java b/io.openems.edge.ess.fenecon.commercial40/src/io/openems/edge/ess/fenecon/commercial40/charger/EssDcChargerFeneconCommercial40Pv2Impl.java
index f066c322156..c66b8bf7766 100644
--- a/io.openems.edge.ess.fenecon.commercial40/src/io/openems/edge/ess/fenecon/commercial40/charger/EssDcChargerFeneconCommercial40Pv2Impl.java
+++ b/io.openems.edge.ess.fenecon.commercial40/src/io/openems/edge/ess/fenecon/commercial40/charger/EssDcChargerFeneconCommercial40Pv2Impl.java
@@ -43,9 +43,9 @@ public class EssDcChargerFeneconCommercial40Pv2Impl extends AbstractEssDcCharger
 	private volatile Timedata timedata = null;
 
 	public EssDcChargerFeneconCommercial40Pv2Impl() {
-		super();
 	}
 
+	@Override
 	@Reference(policy = ReferencePolicy.STATIC, policyOption = ReferencePolicyOption.GREEDY, cardinality = ReferenceCardinality.MANDATORY)
 	protected void setModbus(BridgeModbus modbus) {
 		super.setModbus(modbus);
@@ -69,6 +69,7 @@ void activate(ComponentContext context, ConfigPV1 config) throws OpenemsExceptio
 		this.ess.addCharger(this);
 	}
 
+	@Override
 	@Deactivate
 	protected void deactivate() {
 		if (this.ess != null) {
diff --git a/io.openems.edge.ess.fenecon.commercial40/test/io/openems/edge/ess/fenecon/commercial40/MyConfig.java b/io.openems.edge.ess.fenecon.commercial40/test/io/openems/edge/ess/fenecon/commercial40/MyConfig.java
index 35c2ab6204f..86c0aa786bc 100644
--- a/io.openems.edge.ess.fenecon.commercial40/test/io/openems/edge/ess/fenecon/commercial40/MyConfig.java
+++ b/io.openems.edge.ess.fenecon.commercial40/test/io/openems/edge/ess/fenecon/commercial40/MyConfig.java
@@ -81,7 +81,7 @@ public MyConfig build() {
 
 	/**
 	 * Create a Config builder.
-	 * 
+	 *
 	 * @return a {@link Builder}
 	 */
 	public static Builder create() {
diff --git a/io.openems.edge.ess.fenecon.commercial40/test/io/openems/edge/ess/fenecon/commercial40/charger/EssDcChargerFeneconCommercial40ImplTest.java b/io.openems.edge.ess.fenecon.commercial40/test/io/openems/edge/ess/fenecon/commercial40/charger/EssDcChargerFeneconCommercial40ImplTest.java
index d015c026446..f350f54449c 100644
--- a/io.openems.edge.ess.fenecon.commercial40/test/io/openems/edge/ess/fenecon/commercial40/charger/EssDcChargerFeneconCommercial40ImplTest.java
+++ b/io.openems.edge.ess.fenecon.commercial40/test/io/openems/edge/ess/fenecon/commercial40/charger/EssDcChargerFeneconCommercial40ImplTest.java
@@ -16,7 +16,7 @@ public class EssDcChargerFeneconCommercial40ImplTest {
 
 	@Test
 	public void test() throws Exception {
-		EssFeneconCommercial40Impl ess = new EssFeneconCommercial40Impl();
+		var ess = new EssFeneconCommercial40Impl();
 		new ManagedSymmetricEssTest(ess) //
 				.addReference("cm", new DummyConfigurationAdmin()) //
 				.addReference("setModbus", new DummyModbusBridge(MODBUS_ID)) //
diff --git a/io.openems.edge.ess.fenecon.commercial40/test/io/openems/edge/ess/fenecon/commercial40/charger/MyConfigPV1.java b/io.openems.edge.ess.fenecon.commercial40/test/io/openems/edge/ess/fenecon/commercial40/charger/MyConfigPV1.java
index c79e744b9c9..1cc10843d17 100644
--- a/io.openems.edge.ess.fenecon.commercial40/test/io/openems/edge/ess/fenecon/commercial40/charger/MyConfigPV1.java
+++ b/io.openems.edge.ess.fenecon.commercial40/test/io/openems/edge/ess/fenecon/commercial40/charger/MyConfigPV1.java
@@ -42,7 +42,7 @@ public MyConfigPV1 build() {
 
 	/**
 	 * Create a Config builder.
-	 * 
+	 *
 	 * @return a {@link Builder}
 	 */
 	public static Builder create() {

From df9464c7cebe7e81a5477978350da0da64629b01 Mon Sep 17 00:00:00 2001
From: Stefan Feilmeier <stefan.feilmeier@fenecon.de>
Date: Tue, 8 Mar 2022 11:24:14 +0100
Subject: [PATCH 60/96] Update io.openems.edge.ess.generic

---
 ...AbstractAllowedChargeDischargeHandler.java | 19 ++++----
 .../common/AbstractChannelManager.java        | 14 +++---
 .../common/AbstractGenericManagedEss.java     | 34 +++++++-------
 .../ess/generic/common/GenericManagedEss.java | 26 +++++------
 .../offgrid/GenericOffGridEssImpl.java        |  4 +-
 .../offgrid/statemachine/ErrorHandler.java    |  3 +-
 .../statemachine/GridSwitchHandler.java       |  9 ++--
 .../StartBatteryInOffGridHandler.java         | 41 ++++++++---------
 .../StartBatteryInOnGridHandler.java          | 39 +++++++---------
 .../StartBatteryInverterInOffGridHandler.java | 44 +++++++++----------
 .../StartBatteryInverterInOnGridHandler.java  | 44 +++++++++----------
 .../statemachine/StartedInOffGridHandler.java | 17 +++----
 .../statemachine/StartedInOnGridHandler.java  | 12 ++---
 .../statemachine/StopBatteryHandler.java      | 40 ++++++++---------
 ...topBatteryInverterBeforeSwitchHandler.java | 38 +++++++---------
 .../StopBatteryInverterHandler.java           | 41 ++++++++---------
 .../offgrid/statemachine/StoppedHandler.java  |  3 +-
 .../statemachine/UndefinedHandler.java        |  5 +--
 .../AllowedChargeDischargeHandler.java        |  6 +--
 .../GenericManagedSymmetricEssImpl.java       |  6 +--
 .../symmetric/statemachine/ErrorHandler.java  |  3 +-
 .../statemachine/StartBatteryHandler.java     | 38 +++++++---------
 .../StartBatteryInverterHandler.java          | 38 +++++++---------
 .../statemachine/StartedHandler.java          |  3 +-
 .../statemachine/StopBatteryHandler.java      | 38 +++++++---------
 .../StopBatteryInverterHandler.java           | 38 +++++++---------
 .../statemachine/StoppedHandler.java          |  3 +-
 .../statemachine/UndefinedHandler.java        |  3 +-
 .../AllowedChargeDischargeHandlerTest.java    |  8 ++--
 .../offgrid/GenericOffGridEssTest.java        |  2 +-
 .../edge/ess/generic/offgrid/MyConfig.java    |  2 +-
 .../GenericManagedSymmetricEssTest.java       |  2 +-
 .../edge/ess/generic/symmetric/MyConfig.java  |  3 +-
 33 files changed, 280 insertions(+), 346 deletions(-)

diff --git a/io.openems.edge.ess.generic/src/io/openems/edge/ess/generic/common/AbstractAllowedChargeDischargeHandler.java b/io.openems.edge.ess.generic/src/io/openems/edge/ess/generic/common/AbstractAllowedChargeDischargeHandler.java
index e405905fc09..9a096506d43 100644
--- a/io.openems.edge.ess.generic/src/io/openems/edge/ess/generic/common/AbstractAllowedChargeDischargeHandler.java
+++ b/io.openems.edge.ess.generic/src/io/openems/edge/ess/generic/common/AbstractAllowedChargeDischargeHandler.java
@@ -8,6 +8,7 @@
 import io.openems.edge.common.component.ClockProvider;
 import io.openems.edge.common.startstop.StartStoppable;
 import io.openems.edge.ess.api.SymmetricEss;
+import io.openems.edge.ess.generic.symmetric.ChannelManager;
 
 /**
  * Helper class to handle calculation of Allowed-Charge-Power and
@@ -21,7 +22,7 @@ public abstract class AbstractAllowedChargeDischargeHandler<ESS extends Symmetri
 
 	/**
 	 * Allow a maximum increase per second.
-	 * 
+	 *
 	 * <p>
 	 * 5 % of possible allowed charge/discharge power
 	 */
@@ -44,14 +45,14 @@ public AbstractAllowedChargeDischargeHandler(ESS parent) {
 	 * Calculates Allowed-Charge-Power and Allowed-Discharge Power from the given
 	 * parameters. Result is stored in 'lastBatteryAllowedChargePower' and
 	 * 'lastBatteryAllowedDischargePower' variables - both as positive values!
-	 * 
+	 *
 	 * @param clockProvider the {@link ClockProvider}
 	 * @param battery       the {@link Battery}
 	 */
 	protected void calculateAllowedChargeDischargePower(ClockProvider clockProvider, Battery battery) {
-		Integer chargeMaxCurrent = battery.getChargeMaxCurrentChannel().getNextValue().get();
-		Integer dischargeMaxCurrent = battery.getDischargeMaxCurrentChannel().getNextValue().get();
-		Integer voltage = battery.getVoltageChannel().getNextValue().get();
+		var chargeMaxCurrent = battery.getChargeMaxCurrentChannel().getNextValue().get();
+		var dischargeMaxCurrent = battery.getDischargeMaxCurrentChannel().getNextValue().get();
+		var voltage = battery.getVoltageChannel().getNextValue().get();
 
 		// Is the ESS started?
 		final boolean isStarted;
@@ -69,7 +70,7 @@ protected void calculateAllowedChargeDischargePower(ClockProvider clockProvider,
 	 * Calculates Allowed-Charge-Power and Allowed-Discharge Power from the given
 	 * parameters. Result is stored in 'allowedChargePower' and
 	 * 'allowedDischargePower' variables - both as positive values!
-	 * 
+	 *
 	 * @param clockProvider       the {@link ClockProvider}
 	 * @param isStarted           is the ESS started?
 	 * @param chargeMaxCurrent    the {@link Battery.ChannelId#CHARGE_MAX_CURRENT}
@@ -78,7 +79,7 @@ protected void calculateAllowedChargeDischargePower(ClockProvider clockProvider,
 	 */
 	protected void calculateAllowedChargeDischargePower(ClockProvider clockProvider, boolean isStarted,
 			Integer chargeMaxCurrent, Integer dischargeMaxCurrent, Integer voltage) {
-		final Instant now = Instant.now(clockProvider.getClock());
+		final var now = Instant.now(clockProvider.getClock());
 		float charge;
 		float discharge;
 
@@ -141,7 +142,7 @@ protected void calculateAllowedChargeDischargePower(ClockProvider clockProvider,
 
 	/**
 	 * Applies the max increase ramp, built from MAX_INCREASE_PERCENTAGE.
-	 * 
+	 *
 	 * @param lastValue   the result value in [W] of previous run
 	 * @param thisValue   the current value [W]
 	 * @param lastInstant the timestamp of the previous run
@@ -158,6 +159,6 @@ private static float applyMaxIncrease(float lastValue, float thisValue, Instant
 			millis = Duration.between(lastInstant, thisInstant).toMillis();
 		}
 		return Math.min(thisValue, //
-				lastValue + (thisValue * millis * MAX_INCREASE_PERCENTAGE) / 1000.F /* convert [mW] to [W] */);
+				lastValue + thisValue * millis * MAX_INCREASE_PERCENTAGE / 1000.F /* convert [mW] to [W] */);
 	}
 }
\ No newline at end of file
diff --git a/io.openems.edge.ess.generic/src/io/openems/edge/ess/generic/common/AbstractChannelManager.java b/io.openems.edge.ess.generic/src/io/openems/edge/ess/generic/common/AbstractChannelManager.java
index 886621953c0..aaa5f271dd9 100644
--- a/io.openems.edge.ess.generic/src/io/openems/edge/ess/generic/common/AbstractChannelManager.java
+++ b/io.openems.edge.ess.generic/src/io/openems/edge/ess/generic/common/AbstractChannelManager.java
@@ -31,7 +31,7 @@ public AbstractChannelManager(ESS parent,
 
 	/**
 	 * Called on Component activate().
-	 * 
+	 *
 	 * @param clockProvider   the {@link ClockProvider}
 	 * @param battery         the {@link Battery}
 	 * @param batteryInverter the {@link ManagedSymmetricBatteryInverter}
@@ -94,13 +94,13 @@ private void addBatteryListener(ClockProvider clockProvider, Battery battery) {
 		 * Battery
 		 */
 		this.addOnSetNextValueListener(battery, Battery.ChannelId.DISCHARGE_MIN_VOLTAGE,
-				(ignored) -> this.allowedChargeDischargeHandler.accept(clockProvider, battery));
+				ignored -> this.allowedChargeDischargeHandler.accept(clockProvider, battery));
 		this.addOnSetNextValueListener(battery, Battery.ChannelId.DISCHARGE_MAX_CURRENT,
-				(ignored) -> this.allowedChargeDischargeHandler.accept(clockProvider, battery));
+				ignored -> this.allowedChargeDischargeHandler.accept(clockProvider, battery));
 		this.addOnSetNextValueListener(battery, Battery.ChannelId.CHARGE_MAX_VOLTAGE,
-				(ignored) -> this.allowedChargeDischargeHandler.accept(clockProvider, battery));
+				ignored -> this.allowedChargeDischargeHandler.accept(clockProvider, battery));
 		this.addOnSetNextValueListener(battery, Battery.ChannelId.CHARGE_MAX_CURRENT,
-				(ignored) -> this.allowedChargeDischargeHandler.accept(clockProvider, battery));
+				ignored -> this.allowedChargeDischargeHandler.accept(clockProvider, battery));
 		this.addCopyListener(battery, //
 				Battery.ChannelId.CAPACITY, //
 				SymmetricEss.ChannelId.CAPACITY);
@@ -112,7 +112,7 @@ private void addBatteryListener(ClockProvider clockProvider, Battery battery) {
 	/**
 	 * Adds a Copy-Listener. It listens on setNextValue() and copies the value to
 	 * the target channel.
-	 * 
+	 *
 	 * @param <T>             the Channel-Type
 	 * @param sourceComponent the source component - Battery or BatteryInverter
 	 * @param sourceChannelId the source ChannelId
@@ -120,7 +120,7 @@ private void addBatteryListener(ClockProvider clockProvider, Battery battery) {
 	 */
 	protected <T> void addCopyListener(OpenemsComponent sourceComponent, ChannelId sourceChannelId,
 			ChannelId targetChannelId) {
-		this.<T>addOnSetNextValueListener(sourceComponent, sourceChannelId, (value) -> {
+		this.<T>addOnSetNextValueListener(sourceComponent, sourceChannelId, value -> {
 			Channel<T> targetChannel = this.parent.channel(targetChannelId);
 			targetChannel.setNextValue(value);
 		});
diff --git a/io.openems.edge.ess.generic/src/io/openems/edge/ess/generic/common/AbstractGenericManagedEss.java b/io.openems.edge.ess.generic/src/io/openems/edge/ess/generic/common/AbstractGenericManagedEss.java
index 49a9d4751d3..549025f2606 100644
--- a/io.openems.edge.ess.generic/src/io/openems/edge/ess/generic/common/AbstractGenericManagedEss.java
+++ b/io.openems.edge.ess.generic/src/io/openems/edge/ess/generic/common/AbstractGenericManagedEss.java
@@ -47,7 +47,7 @@ public abstract class AbstractGenericManagedEss<ESS extends SymmetricEss, BATTER
 
 	/**
 	 * Helper wrapping class to handle everything related to Channels.
-	 * 
+	 *
 	 * @return the {@link ChannelManager}
 	 */
 	protected abstract AbstractChannelManager<ESS, BATTERY, BATTERY_INVERTER> getChannelManager();
@@ -88,6 +88,7 @@ protected void activate(ComponentContext context, String id, String alias, boole
 		this.getChannelManager().activate(this.getComponentManager(), this.getBattery(), this.getBatteryInverter());
 	}
 
+	@Override
 	protected void deactivate() {
 		this.getChannelManager().deactivate();
 		super.deactivate();
@@ -114,18 +115,18 @@ public void handleEvent(Event event) {
 	protected StringBuilder genericDebugLog() {
 		// Get DC-PV-Power for Hybrid ESS
 		Integer dcPvPower = null;
-		BATTERY_INVERTER batteryInverter = this.getBatteryInverter();
+		var batteryInverter = this.getBatteryInverter();
 		if (batteryInverter instanceof HybridManagedSymmetricBatteryInverter) {
 			dcPvPower = ((HybridManagedSymmetricBatteryInverter) batteryInverter).getDcPvPower();
 		}
 
-		StringBuilder result = new StringBuilder() //
+		var result = new StringBuilder() //
 				.append("SoC:").append(this.getSoc().asString()) //
 				.append("|L:").append(this.getActivePower().asString());
 
 		// For HybridEss show actual Battery charge power and PV production power
 		if (dcPvPower != null) {
-			HybridEss me = (HybridEss) this;
+			HybridEss me = this;
 			result //
 					.append("|Battery:").append(me.getDcDischargePower().asString()) //
 					.append("|PV:").append(dcPvPower);
@@ -146,7 +147,7 @@ protected StringBuilder genericDebugLog() {
 
 	/**
 	 * Forwards the power request to the {@link SymmetricBatteryInverter}.
-	 * 
+	 *
 	 * {@inheritDoc}
 	 */
 	@Override
@@ -156,7 +157,7 @@ public void applyPower(int activePower, int reactivePower) throws OpenemsNamedEx
 
 	/**
 	 * Retrieves PowerPrecision from {@link SymmetricBatteryInverter}.
-	 * 
+	 *
 	 * {@inheritDoc}
 	 */
 	@Override
@@ -166,19 +167,18 @@ public int getPowerPrecision() {
 
 	/**
 	 * Retrieves StaticConstraints from {@link SymmetricBatteryInverter}.
-	 * 
+	 *
 	 * {@inheritDoc}
 	 */
 	@Override
 	public Constraint[] getStaticConstraints() throws OpenemsNamedException {
 
-		List<Constraint> result = new ArrayList<Constraint>();
+		List<Constraint> result = new ArrayList<>();
 
 		// Get BatteryInverterConstraints
-		BatteryInverterConstraint[] constraints = this.getBatteryInverter().getStaticConstraints();
+		var constraints = this.getBatteryInverter().getStaticConstraints();
 
-		for (int i = 0; i < constraints.length; i++) {
-			BatteryInverterConstraint c = constraints[i];
+		for (BatteryInverterConstraint c : constraints) {
 			result.add(this.getPower().createSimpleConstraint(c.description, this, c.phase, c.pwr, c.relationship,
 					c.value));
 		}
@@ -195,12 +195,11 @@ public Constraint[] getStaticConstraints() throws OpenemsNamedException {
 
 	@Override
 	public Integer getSurplusPower() {
-		BATTERY_INVERTER batteryInverter = this.getBatteryInverter();
+		var batteryInverter = this.getBatteryInverter();
 		if (batteryInverter instanceof HybridManagedSymmetricBatteryInverter) {
 			return ((HybridManagedSymmetricBatteryInverter) batteryInverter).getSurplusPower();
-		} else {
-			return null;
 		}
+		return null;
 	}
 
 	@Override
@@ -214,15 +213,14 @@ public ModbusSlaveTable getModbusSlaveTable(AccessMode accessMode) {
 
 	@Override
 	public boolean isOffGridPossible() {
-		BATTERY_INVERTER batteryInverter = this.getBatteryInverter();
+		var batteryInverter = this.getBatteryInverter();
 		if (batteryInverter instanceof OffGridBatteryInverter) {
 			return batteryInverter.isOffGridPossible();
-		} else {
-			return false;
 		}
+		return false;
 	}
 
-	protected final AtomicReference<StartStop> startStopTarget = new AtomicReference<StartStop>(StartStop.UNDEFINED);
+	protected final AtomicReference<StartStop> startStopTarget = new AtomicReference<>(StartStop.UNDEFINED);
 
 	@Override
 	public StartStop getStartStopTarget() {
diff --git a/io.openems.edge.ess.generic/src/io/openems/edge/ess/generic/common/GenericManagedEss.java b/io.openems.edge.ess.generic/src/io/openems/edge/ess/generic/common/GenericManagedEss.java
index 620c32fe51d..83035585f53 100644
--- a/io.openems.edge.ess.generic/src/io/openems/edge/ess/generic/common/GenericManagedEss.java
+++ b/io.openems.edge.ess.generic/src/io/openems/edge/ess/generic/common/GenericManagedEss.java
@@ -53,14 +53,14 @@ public Doc doc() {
 
 	/**
 	 * Gets the target Start/Stop mode from config or StartStop-Channel.
-	 * 
+	 *
 	 * @return {@link StartStop}
 	 */
 	public StartStop getStartStopTarget();
 
 	/**
 	 * Gets the Channel for {@link ChannelId#MAX_BATTERY_START_ATTEMPTS_FAULT}.
-	 * 
+	 *
 	 * @return the Channel
 	 */
 	public default StateChannel getMaxBatteryStartAttemptsFaultChannel() {
@@ -70,7 +70,7 @@ public default StateChannel getMaxBatteryStartAttemptsFaultChannel() {
 	/**
 	 * Gets the {@link StateChannel} for
 	 * {@link ChannelId#MAX_BATTERY_START_ATTEMPTS_FAULT}.
-	 * 
+	 *
 	 * @return the Channel {@link Value}
 	 */
 	public default Value<Boolean> getMaxBatteryStartAttemptsFault() {
@@ -80,7 +80,7 @@ public default Value<Boolean> getMaxBatteryStartAttemptsFault() {
 	/**
 	 * Internal method to set the 'nextValue' on
 	 * {@link ChannelId#MAX_BATTERY_START_ATTEMPTS_FAULT} Channel.
-	 * 
+	 *
 	 * @param value the next value
 	 */
 	public default void _setMaxBatteryStartAttemptsFault(boolean value) {
@@ -89,7 +89,7 @@ public default void _setMaxBatteryStartAttemptsFault(boolean value) {
 
 	/**
 	 * Gets the Channel for {@link ChannelId#MAX_BATTERY_STOP_ATTEMPTS_FAULT}.
-	 * 
+	 *
 	 * @return the Channel
 	 */
 	public default StateChannel getMaxBatteryStopAttemptsFaultChannel() {
@@ -99,7 +99,7 @@ public default StateChannel getMaxBatteryStopAttemptsFaultChannel() {
 	/**
 	 * Gets the {@link StateChannel} for
 	 * {@link ChannelId#MAX_BATTERY_STOP_ATTEMPTS_FAULT}.
-	 * 
+	 *
 	 * @return the Channel {@link Value}
 	 */
 	public default Value<Boolean> getMaxBatteryStopAttemptsFault() {
@@ -109,7 +109,7 @@ public default Value<Boolean> getMaxBatteryStopAttemptsFault() {
 	/**
 	 * Internal method to set the 'nextValue' on
 	 * {@link ChannelId#MAX_BATTERY_STOP_ATTEMPTS_FAULT} Channel.
-	 * 
+	 *
 	 * @param value the next value
 	 */
 	public default void _setMaxBatteryStopAttemptsFault(boolean value) {
@@ -119,7 +119,7 @@ public default void _setMaxBatteryStopAttemptsFault(boolean value) {
 	/**
 	 * Gets the Channel for
 	 * {@link ChannelId#MAX_BATTERY_INVERTER_START_ATTEMPTS_FAULT}.
-	 * 
+	 *
 	 * @return the Channel
 	 */
 	public default StateChannel getMaxBatteryInverterStartAttemptsFaultChannel() {
@@ -129,7 +129,7 @@ public default StateChannel getMaxBatteryInverterStartAttemptsFaultChannel() {
 	/**
 	 * Gets the {@link StateChannel} for
 	 * {@link ChannelId#MAX_BATTERY_INVERTER_START_ATTEMPTS_FAULT}.
-	 * 
+	 *
 	 * @return the Channel {@link Value}
 	 */
 	public default Value<Boolean> getMaxBatteryInverterStartAttemptsFault() {
@@ -139,7 +139,7 @@ public default Value<Boolean> getMaxBatteryInverterStartAttemptsFault() {
 	/**
 	 * Internal method to set the 'nextValue' on
 	 * {@link ChannelId#MAX_BATTERY_INVERTER_START_ATTEMPTS_FAULT} Channel.
-	 * 
+	 *
 	 * @param value the next value
 	 */
 	public default void _setMaxBatteryInverterStartAttemptsFault(boolean value) {
@@ -149,7 +149,7 @@ public default void _setMaxBatteryInverterStartAttemptsFault(boolean value) {
 	/**
 	 * Gets the Channel for
 	 * {@link ChannelId#MAX_BATTERY_INVERTER_STOP_ATTEMPTS_FAULT}.
-	 * 
+	 *
 	 * @return the Channel
 	 */
 	public default StateChannel getMaxBatteryInverterStopAttemptsFaultChannel() {
@@ -159,7 +159,7 @@ public default StateChannel getMaxBatteryInverterStopAttemptsFaultChannel() {
 	/**
 	 * Gets the {@link StateChannel} for
 	 * {@link ChannelId#MAX_BATTERY_INVERTER_STOP_ATTEMPTS_FAULT}.
-	 * 
+	 *
 	 * @return the Channel {@link Value}
 	 */
 	public default Value<Boolean> getMaxBatteryInverterStopAttemptsFault() {
@@ -169,7 +169,7 @@ public default Value<Boolean> getMaxBatteryInverterStopAttemptsFault() {
 	/**
 	 * Internal method to set the 'nextValue' on
 	 * {@link ChannelId#MAX_BATTERY_INVERTER_STOP_ATTEMPTS_FAULT} Channel.
-	 * 
+	 *
 	 * @param value the next value
 	 */
 	public default void _setMaxBatteryInverterStopAttemptsFault(boolean value) {
diff --git a/io.openems.edge.ess.generic/src/io/openems/edge/ess/generic/offgrid/GenericOffGridEssImpl.java b/io.openems.edge.ess.generic/src/io/openems/edge/ess/generic/offgrid/GenericOffGridEssImpl.java
index a464b1d60e3..a167fb90184 100644
--- a/io.openems.edge.ess.generic/src/io/openems/edge/ess/generic/offgrid/GenericOffGridEssImpl.java
+++ b/io.openems.edge.ess.generic/src/io/openems/edge/ess/generic/offgrid/GenericOffGridEssImpl.java
@@ -103,10 +103,10 @@ private void activate(ComponentContext context, Config config) {
 		// update filter for 'Off Grid Switch'
 		if (OpenemsComponent.updateReferenceFilter(this.cm, this.servicePid(), "offGridSwitch",
 				config.offGridSwitch_id())) {
-			return;
 		}
 	}
 
+	@Override
 	@Deactivate
 	protected void deactivate() {
 		this.getChannelManager().deactivate();
@@ -126,7 +126,7 @@ protected void handleStateMachine() {
 		// that is currently in StartedInOffGrid
 
 		// Prepare Context
-		Context context = new Context(this, this.getBattery(), this.getBatteryInverter(), this.getOffGridSwitch(),
+		var context = new Context(this, this.getBattery(), this.getBatteryInverter(), this.getOffGridSwitch(),
 				this.componentManager);
 
 		// Call the StateMachine
diff --git a/io.openems.edge.ess.generic/src/io/openems/edge/ess/generic/offgrid/statemachine/ErrorHandler.java b/io.openems.edge.ess.generic/src/io/openems/edge/ess/generic/offgrid/statemachine/ErrorHandler.java
index 63662e897c0..f80c62eedea 100644
--- a/io.openems.edge.ess.generic/src/io/openems/edge/ess/generic/offgrid/statemachine/ErrorHandler.java
+++ b/io.openems.edge.ess.generic/src/io/openems/edge/ess/generic/offgrid/statemachine/ErrorHandler.java
@@ -6,7 +6,6 @@
 import io.openems.common.exceptions.OpenemsError.OpenemsNamedException;
 import io.openems.edge.common.startstop.StartStop;
 import io.openems.edge.common.statemachine.StateHandler;
-import io.openems.edge.ess.generic.common.GenericManagedEss;
 import io.openems.edge.ess.generic.offgrid.statemachine.StateMachine.OffGridState;
 
 public class ErrorHandler extends StateHandler<OffGridState, Context> {
@@ -24,7 +23,7 @@ protected void onEntry(Context context) throws OpenemsNamedException {
 
 	@Override
 	protected void onExit(Context context) throws OpenemsNamedException {
-		GenericManagedEss ess = context.getParent();
+		var ess = context.getParent();
 
 		ess._setMaxBatteryStartAttemptsFault(false);
 		ess._setMaxBatteryStopAttemptsFault(false);
diff --git a/io.openems.edge.ess.generic/src/io/openems/edge/ess/generic/offgrid/statemachine/GridSwitchHandler.java b/io.openems.edge.ess.generic/src/io/openems/edge/ess/generic/offgrid/statemachine/GridSwitchHandler.java
index 8fae3b0a451..b814dcd0a9f 100644
--- a/io.openems.edge.ess.generic/src/io/openems/edge/ess/generic/offgrid/statemachine/GridSwitchHandler.java
+++ b/io.openems.edge.ess.generic/src/io/openems/edge/ess/generic/offgrid/statemachine/GridSwitchHandler.java
@@ -3,12 +3,11 @@
 import io.openems.common.exceptions.OpenemsError.OpenemsNamedException;
 import io.openems.edge.common.statemachine.StateHandler;
 import io.openems.edge.ess.generic.offgrid.statemachine.StateMachine.OffGridState;
-import io.openems.edge.ess.offgrid.api.OffGridSwitch;
 import io.openems.edge.ess.offgrid.api.OffGridSwitch.Contactor;
 
 /**
  * Reads the State of the Grid-Switch relays.
- * 
+ *
  * <ul>
  * <li>If system is currently connected to grid: START_BATTERY_IN_ON_GRID
  * <li>If system is currently disconnected from grid: START_BATTERY_IN_OFF_GRID
@@ -18,15 +17,15 @@ public class GridSwitchHandler extends StateHandler<OffGridState, Context> {
 
 	@Override
 	protected OffGridState runAndGetNextState(Context context) throws OpenemsNamedException {
-		final OffGridSwitch offGridSwitch = context.offGridSwitch;
+		final var offGridSwitch = context.offGridSwitch;
 
 		if (!offGridSwitch.getMainContactor().isPresent() || !offGridSwitch.getGroundingContactor().isPresent()) {
 			// Wait till MainContactor and GroundingContactor are defined.
 			return OffGridState.GRID_SWITCH;
 		}
 
-		Contactor mainContactor = offGridSwitch.getMainContactor().get();
-		Contactor groundingContactor = offGridSwitch.getGroundingContactor().get();
+		var mainContactor = offGridSwitch.getMainContactor().get();
+		var groundingContactor = offGridSwitch.getGroundingContactor().get();
 		switch (offGridSwitch.getGridMode()) {
 		case UNDEFINED:
 			// Wait till GridStatus is defined.
diff --git a/io.openems.edge.ess.generic/src/io/openems/edge/ess/generic/offgrid/statemachine/StartBatteryInOffGridHandler.java b/io.openems.edge.ess.generic/src/io/openems/edge/ess/generic/offgrid/statemachine/StartBatteryInOffGridHandler.java
index 8a41cf4ded2..1ee52272f7d 100644
--- a/io.openems.edge.ess.generic/src/io/openems/edge/ess/generic/offgrid/statemachine/StartBatteryInOffGridHandler.java
+++ b/io.openems.edge.ess.generic/src/io/openems/edge/ess/generic/offgrid/statemachine/StartBatteryInOffGridHandler.java
@@ -4,7 +4,6 @@
 import java.time.Instant;
 
 import io.openems.common.exceptions.OpenemsError.OpenemsNamedException;
-import io.openems.edge.battery.api.Battery;
 import io.openems.edge.common.statemachine.StateHandler;
 import io.openems.edge.ess.generic.common.GenericManagedEss;
 import io.openems.edge.ess.generic.offgrid.statemachine.StateMachine.OffGridState;
@@ -18,42 +17,38 @@ public class StartBatteryInOffGridHandler extends StateHandler<OffGridState, Con
 	protected void onEntry(Context context) throws OpenemsNamedException {
 		this.lastAttempt = Instant.MIN;
 		this.attemptCounter = 0;
-		GenericManagedEss ess = context.getParent();
+		var ess = context.getParent();
 		ess._setMaxBatteryStartAttemptsFault(false);
 	}
 
 	@Override
 	public OffGridState runAndGetNextState(Context context) throws OpenemsNamedException {
-		final GenericManagedEss ess = context.getParent();
-		final Battery battery = context.battery;
+		final var ess = context.getParent();
+		final var battery = context.battery;
 
 		if (battery.isStarted()) {
 			return OffGridState.START_BATTERY_INVERTER_IN_OFF_GRID;
 		}
 
-		boolean isMaxStartTimePassed = Duration.between(this.lastAttempt, Instant.now())
+		var isMaxStartTimePassed = Duration.between(this.lastAttempt, Instant.now())
 				.getSeconds() > GenericManagedEss.RETRY_COMMAND_SECONDS;
-		if (isMaxStartTimePassed) {
-			// First try - or waited long enough for next try
-
-			if (this.attemptCounter > GenericManagedEss.RETRY_COMMAND_MAX_ATTEMPTS) {
-				// Too many tries
-				ess._setMaxBatteryStartAttemptsFault(true);
-				return OffGridState.UNDEFINED;
-
-			} else {
-				// Trying to start Battery
-				battery.start();
-
-				this.lastAttempt = Instant.now();
-				this.attemptCounter++;
-				return OffGridState.START_BATTERY_IN_OFF_GRID;
-
-			}
+		if (!isMaxStartTimePassed) {
+			// Still waiting...
+			return OffGridState.START_BATTERY_IN_OFF_GRID;
+		}
+		if (this.attemptCounter > GenericManagedEss.RETRY_COMMAND_MAX_ATTEMPTS) {
+			// Too many tries
+			ess._setMaxBatteryStartAttemptsFault(true);
+			return OffGridState.UNDEFINED;
 
 		} else {
-			// Still waiting...
+			// Trying to start Battery
+			battery.start();
+
+			this.lastAttempt = Instant.now();
+			this.attemptCounter++;
 			return OffGridState.START_BATTERY_IN_OFF_GRID;
+
 		}
 	}
 
diff --git a/io.openems.edge.ess.generic/src/io/openems/edge/ess/generic/offgrid/statemachine/StartBatteryInOnGridHandler.java b/io.openems.edge.ess.generic/src/io/openems/edge/ess/generic/offgrid/statemachine/StartBatteryInOnGridHandler.java
index 8b1c044244c..51960632319 100644
--- a/io.openems.edge.ess.generic/src/io/openems/edge/ess/generic/offgrid/statemachine/StartBatteryInOnGridHandler.java
+++ b/io.openems.edge.ess.generic/src/io/openems/edge/ess/generic/offgrid/statemachine/StartBatteryInOnGridHandler.java
@@ -4,7 +4,6 @@
 import java.time.Instant;
 
 import io.openems.common.exceptions.OpenemsError.OpenemsNamedException;
-import io.openems.edge.battery.api.Battery;
 import io.openems.edge.common.statemachine.StateHandler;
 import io.openems.edge.ess.generic.common.GenericManagedEss;
 import io.openems.edge.ess.generic.offgrid.statemachine.StateMachine.OffGridState;
@@ -18,40 +17,36 @@ public class StartBatteryInOnGridHandler extends StateHandler<OffGridState, Cont
 	protected void onEntry(Context context) throws OpenemsNamedException {
 		this.lastAttempt = Instant.MIN;
 		this.attemptCounter = 0;
-		GenericManagedEss ess = context.getParent();
+		var ess = context.getParent();
 		ess._setMaxBatteryStartAttemptsFault(false);
 	}
 
 	@Override
 	public OffGridState runAndGetNextState(Context context) throws OpenemsNamedException {
-		final GenericManagedEss ess = context.getParent();
-		final Battery battery = context.battery;
+		final var ess = context.getParent();
+		final var battery = context.battery;
 
 		if (battery.isStarted()) {
 			return OffGridState.START_BATTERY_INVERTER_IN_ON_GRID;
 		}
 
-		boolean isMaxStartTimePassed = Duration.between(this.lastAttempt, Instant.now())
+		var isMaxStartTimePassed = Duration.between(this.lastAttempt, Instant.now())
 				.getSeconds() > GenericManagedEss.RETRY_COMMAND_SECONDS;
-		if (isMaxStartTimePassed) {
-			// First try - or waited long enough for next try
-
-			if (this.attemptCounter > GenericManagedEss.RETRY_COMMAND_MAX_ATTEMPTS) {
-				// Too many tries
-				ess._setMaxBatteryStartAttemptsFault(true);
-				return OffGridState.UNDEFINED;
-
-			} else {
-				// Trying to start Battery
-				battery.start();
-
-				this.lastAttempt = Instant.now();
-				this.attemptCounter++;
-				return OffGridState.START_BATTERY_IN_ON_GRID;
-			}
+		if (!isMaxStartTimePassed) {
+			// Still waiting...
+			return OffGridState.START_BATTERY_IN_ON_GRID;
+		}
+		if (this.attemptCounter > GenericManagedEss.RETRY_COMMAND_MAX_ATTEMPTS) {
+			// Too many tries
+			ess._setMaxBatteryStartAttemptsFault(true);
+			return OffGridState.UNDEFINED;
 
 		} else {
-			// Still waiting...
+			// Trying to start Battery
+			battery.start();
+
+			this.lastAttempt = Instant.now();
+			this.attemptCounter++;
 			return OffGridState.START_BATTERY_IN_ON_GRID;
 		}
 	}
diff --git a/io.openems.edge.ess.generic/src/io/openems/edge/ess/generic/offgrid/statemachine/StartBatteryInverterInOffGridHandler.java b/io.openems.edge.ess.generic/src/io/openems/edge/ess/generic/offgrid/statemachine/StartBatteryInverterInOffGridHandler.java
index 171d9baed19..87a4b8b2139 100644
--- a/io.openems.edge.ess.generic/src/io/openems/edge/ess/generic/offgrid/statemachine/StartBatteryInverterInOffGridHandler.java
+++ b/io.openems.edge.ess.generic/src/io/openems/edge/ess/generic/offgrid/statemachine/StartBatteryInverterInOffGridHandler.java
@@ -4,7 +4,6 @@
 import java.time.Instant;
 
 import io.openems.common.exceptions.OpenemsError.OpenemsNamedException;
-import io.openems.edge.batteryinverter.api.OffGridBatteryInverter;
 import io.openems.edge.batteryinverter.api.OffGridBatteryInverter.TargetGridMode;
 import io.openems.edge.common.statemachine.StateHandler;
 import io.openems.edge.common.sum.GridMode;
@@ -21,43 +20,40 @@ public class StartBatteryInverterInOffGridHandler extends StateHandler<OffGridSt
 	protected void onEntry(Context context) throws OpenemsNamedException {
 		this.lastAttempt = Instant.MIN;
 		this.attemptCounter = 0;
-		GenericManagedEss ess = context.getParent();
+		var ess = context.getParent();
 		ess._setMaxBatteryInverterStartAttemptsFault(false);
 	}
 
 	@Override
 	public OffGridState runAndGetNextState(Context context) throws OpenemsNamedException {
-		final GenericManagedEss ess = context.getParent();
-		final OffGridBatteryInverter inverter = context.batteryInverter;
+		final var ess = context.getParent();
+		final var inverter = context.batteryInverter;
 
 		// Inverter is on
 		if (context.batteryInverter.isStarted()) {
 			return OffGridState.STARTED_IN_OFF_GRID;
 		}
 
-		boolean isMaxStartTimePassed = Duration.between(this.lastAttempt, Instant.now())
+		var isMaxStartTimePassed = Duration.between(this.lastAttempt, Instant.now())
 				.getSeconds() > GenericManagedEss.RETRY_COMMAND_SECONDS;
-		if (isMaxStartTimePassed) {
-			// First try - or waited long enough for next try
-
-			if (this.attemptCounter > GenericManagedEss.RETRY_COMMAND_MAX_ATTEMPTS) {
-				// Too many tries
-				ess._setMaxBatteryInverterStartAttemptsFault(true);
-				return OffGridState.UNDEFINED;
-
-			} else {
-				// Trying to start Battery
-				inverter.setTargetGridMode(TargetGridMode.GO_OFF_GRID);
-				inverter.setTargetOffGridFrequency(TARGET_OFF_GRID_FREQUENCY);
-				inverter.start();
-				ess._setGridMode(GridMode.OFF_GRID);
+		if (!isMaxStartTimePassed) {
+			// Still waiting...
+			return OffGridState.START_BATTERY_INVERTER_IN_OFF_GRID;
+		}
+		if (this.attemptCounter > GenericManagedEss.RETRY_COMMAND_MAX_ATTEMPTS) {
+			// Too many tries
+			ess._setMaxBatteryInverterStartAttemptsFault(true);
+			return OffGridState.UNDEFINED;
 
-				this.lastAttempt = Instant.now();
-				this.attemptCounter++;
-				return OffGridState.START_BATTERY_INVERTER_IN_OFF_GRID;
-			}
 		} else {
-			// Still waiting...
+			// Trying to start Battery
+			inverter.setTargetGridMode(TargetGridMode.GO_OFF_GRID);
+			inverter.setTargetOffGridFrequency(TARGET_OFF_GRID_FREQUENCY);
+			inverter.start();
+			ess._setGridMode(GridMode.OFF_GRID);
+
+			this.lastAttempt = Instant.now();
+			this.attemptCounter++;
 			return OffGridState.START_BATTERY_INVERTER_IN_OFF_GRID;
 		}
 	}
diff --git a/io.openems.edge.ess.generic/src/io/openems/edge/ess/generic/offgrid/statemachine/StartBatteryInverterInOnGridHandler.java b/io.openems.edge.ess.generic/src/io/openems/edge/ess/generic/offgrid/statemachine/StartBatteryInverterInOnGridHandler.java
index 0ffd3b53f79..2e7762d078c 100644
--- a/io.openems.edge.ess.generic/src/io/openems/edge/ess/generic/offgrid/statemachine/StartBatteryInverterInOnGridHandler.java
+++ b/io.openems.edge.ess.generic/src/io/openems/edge/ess/generic/offgrid/statemachine/StartBatteryInverterInOnGridHandler.java
@@ -4,7 +4,6 @@
 import java.time.Instant;
 
 import io.openems.common.exceptions.OpenemsError.OpenemsNamedException;
-import io.openems.edge.batteryinverter.api.OffGridBatteryInverter;
 import io.openems.edge.batteryinverter.api.OffGridBatteryInverter.TargetGridMode;
 import io.openems.edge.common.statemachine.StateHandler;
 import io.openems.edge.common.sum.GridMode;
@@ -20,42 +19,39 @@ public class StartBatteryInverterInOnGridHandler extends StateHandler<OffGridSta
 	protected void onEntry(Context context) throws OpenemsNamedException {
 		this.lastAttempt = Instant.MIN;
 		this.attemptCounter = 0;
-		GenericManagedEss ess = context.getParent();
+		var ess = context.getParent();
 		ess._setMaxBatteryInverterStartAttemptsFault(false);
 	}
 
 	@Override
 	public OffGridState runAndGetNextState(Context context) throws OpenemsNamedException {
-		final GenericManagedEss ess = context.getParent();
-		final OffGridBatteryInverter inverter = context.batteryInverter;
+		final var ess = context.getParent();
+		final var inverter = context.batteryInverter;
 
 		if (context.batteryInverter.isStarted()) {
 			return OffGridState.STARTED_IN_ON_GRID;
 		}
 
-		boolean isMaxStartTimePassed = Duration.between(this.lastAttempt, Instant.now())
+		var isMaxStartTimePassed = Duration.between(this.lastAttempt, Instant.now())
 				.getSeconds() > GenericManagedEss.RETRY_COMMAND_SECONDS;
-		if (isMaxStartTimePassed) {
-			// First try - or waited long enough for next try
-
-			if (this.attemptCounter > GenericManagedEss.RETRY_COMMAND_MAX_ATTEMPTS) {
-				// Too many tries
-				ess._setMaxBatteryInverterStartAttemptsFault(true);
-				return OffGridState.UNDEFINED;
-
-			} else {
-				// Trying to start Battery
-				inverter.setTargetGridMode(TargetGridMode.GO_ON_GRID);
-				inverter.start();
-				ess._setGridMode(GridMode.ON_GRID);
-
-				this.lastAttempt = Instant.now();
-				this.attemptCounter++;
-				return OffGridState.START_BATTERY_INVERTER_IN_ON_GRID;
-			}
-		} else {
+		if (!isMaxStartTimePassed) {
 			// Still waiting...
 			return OffGridState.START_BATTERY_INVERTER_IN_ON_GRID;
 		}
+		if (this.attemptCounter > GenericManagedEss.RETRY_COMMAND_MAX_ATTEMPTS) {
+			// Too many tries
+			ess._setMaxBatteryInverterStartAttemptsFault(true);
+			return OffGridState.UNDEFINED;
+
+		} else {
+			// Trying to start Battery
+			inverter.setTargetGridMode(TargetGridMode.GO_ON_GRID);
+			inverter.start();
+			ess._setGridMode(GridMode.ON_GRID);
+
+			this.lastAttempt = Instant.now();
+			this.attemptCounter++;
+			return OffGridState.START_BATTERY_INVERTER_IN_ON_GRID;
+		}
 	}
 }
diff --git a/io.openems.edge.ess.generic/src/io/openems/edge/ess/generic/offgrid/statemachine/StartedInOffGridHandler.java b/io.openems.edge.ess.generic/src/io/openems/edge/ess/generic/offgrid/statemachine/StartedInOffGridHandler.java
index 4f3a7d7927a..4dcecd73cf8 100644
--- a/io.openems.edge.ess.generic/src/io/openems/edge/ess/generic/offgrid/statemachine/StartedInOffGridHandler.java
+++ b/io.openems.edge.ess.generic/src/io/openems/edge/ess/generic/offgrid/statemachine/StartedInOffGridHandler.java
@@ -4,15 +4,11 @@
 import java.time.LocalTime;
 
 import io.openems.common.exceptions.OpenemsError.OpenemsNamedException;
-import io.openems.edge.battery.api.Battery;
-import io.openems.edge.batteryinverter.api.OffGridBatteryInverter;
 import io.openems.edge.batteryinverter.api.OffGridBatteryInverter.TargetGridMode;
 import io.openems.edge.common.startstop.StartStop;
 import io.openems.edge.common.statemachine.StateHandler;
 import io.openems.edge.common.sum.GridMode;
-import io.openems.edge.ess.generic.common.GenericManagedEss;
 import io.openems.edge.ess.generic.offgrid.statemachine.StateMachine.OffGridState;
-import io.openems.edge.ess.offgrid.api.OffGridSwitch;
 import io.openems.edge.ess.offgrid.api.OffGridSwitch.Contactor;
 
 public class StartedInOffGridHandler extends StateHandler<OffGridState, Context> {
@@ -23,10 +19,10 @@ public class StartedInOffGridHandler extends StateHandler<OffGridState, Context>
 
 	@Override
 	public OffGridState runAndGetNextState(Context context) throws OpenemsNamedException {
-		final GenericManagedEss ess = context.getParent();
-		final Battery battery = context.battery;
-		final OffGridBatteryInverter inverter = context.batteryInverter;
-		final OffGridSwitch offGridSwitch = context.offGridSwitch;
+		final var ess = context.getParent();
+		final var battery = context.battery;
+		final var inverter = context.batteryInverter;
+		final var offGridSwitch = context.offGridSwitch;
 
 		if (ess.hasFaults()) {
 			return OffGridState.UNDEFINED;
@@ -54,10 +50,9 @@ public OffGridState runAndGetNextState(Context context) throws OpenemsNamedExcep
 				// contactors in desired position
 				inverter.setTargetGridMode(TargetGridMode.GO_ON_GRID);
 				return OffGridState.STOP_BATTERY_INVERTER_BEFORE_SWITCH;
-			} else {
-				ess._setGridMode(GridMode.UNDEFINED);
-				return OffGridState.STARTED_IN_OFF_GRID;
 			}
+			ess._setGridMode(GridMode.UNDEFINED);
+			return OffGridState.STARTED_IN_OFF_GRID;
 		} else if (offGridSwitch.getGridMode() == GridMode.OFF_GRID && this.isLastChangeChecked) {
 			this.isLastChangeChecked = false;
 		}
diff --git a/io.openems.edge.ess.generic/src/io/openems/edge/ess/generic/offgrid/statemachine/StartedInOnGridHandler.java b/io.openems.edge.ess.generic/src/io/openems/edge/ess/generic/offgrid/statemachine/StartedInOnGridHandler.java
index 88afc5a66a3..f12334ff76f 100644
--- a/io.openems.edge.ess.generic/src/io/openems/edge/ess/generic/offgrid/statemachine/StartedInOnGridHandler.java
+++ b/io.openems.edge.ess.generic/src/io/openems/edge/ess/generic/offgrid/statemachine/StartedInOnGridHandler.java
@@ -1,24 +1,20 @@
 package io.openems.edge.ess.generic.offgrid.statemachine;
 
 import io.openems.common.exceptions.OpenemsError.OpenemsNamedException;
-import io.openems.edge.battery.api.Battery;
-import io.openems.edge.batteryinverter.api.OffGridBatteryInverter;
 import io.openems.edge.batteryinverter.api.OffGridBatteryInverter.TargetGridMode;
 import io.openems.edge.common.startstop.StartStop;
 import io.openems.edge.common.statemachine.StateHandler;
 import io.openems.edge.common.sum.GridMode;
-import io.openems.edge.ess.generic.common.GenericManagedEss;
 import io.openems.edge.ess.generic.offgrid.statemachine.StateMachine.OffGridState;
-import io.openems.edge.ess.offgrid.api.OffGridSwitch;
 
 public class StartedInOnGridHandler extends StateHandler<OffGridState, Context> {
 
 	@Override
 	public OffGridState runAndGetNextState(Context context) throws OpenemsNamedException {
-		final GenericManagedEss ess = context.getParent();
-		final Battery battery = context.battery;
-		final OffGridBatteryInverter inverter = context.batteryInverter;
-		final OffGridSwitch offGridSwitch = context.offGridSwitch;
+		final var ess = context.getParent();
+		final var battery = context.battery;
+		final var inverter = context.batteryInverter;
+		final var offGridSwitch = context.offGridSwitch;
 
 		if (ess.hasFaults()) {
 			return OffGridState.UNDEFINED;
diff --git a/io.openems.edge.ess.generic/src/io/openems/edge/ess/generic/offgrid/statemachine/StopBatteryHandler.java b/io.openems.edge.ess.generic/src/io/openems/edge/ess/generic/offgrid/statemachine/StopBatteryHandler.java
index 93ff6135dc2..2141dfdc184 100644
--- a/io.openems.edge.ess.generic/src/io/openems/edge/ess/generic/offgrid/statemachine/StopBatteryHandler.java
+++ b/io.openems.edge.ess.generic/src/io/openems/edge/ess/generic/offgrid/statemachine/StopBatteryHandler.java
@@ -4,7 +4,6 @@
 import java.time.Instant;
 
 import io.openems.common.exceptions.OpenemsError.OpenemsNamedException;
-import io.openems.edge.battery.api.Battery;
 import io.openems.edge.common.statemachine.StateHandler;
 import io.openems.edge.ess.generic.common.GenericManagedEss;
 import io.openems.edge.ess.generic.offgrid.statemachine.StateMachine.OffGridState;
@@ -18,40 +17,37 @@ public class StopBatteryHandler extends StateHandler<OffGridState, Context> {
 	protected void onEntry(Context context) throws OpenemsNamedException {
 		this.lastAttempt = Instant.MIN;
 		this.attemptCounter = 0;
-		GenericManagedEss ess = context.getParent();
+		var ess = context.getParent();
 		ess._setMaxBatteryStopAttemptsFault(false);
 	}
 
 	@Override
 	public OffGridState runAndGetNextState(Context context) throws OpenemsNamedException {
-		final GenericManagedEss ess = context.getParent();
-		final Battery battery = context.battery;
+		final var ess = context.getParent();
+		final var battery = context.battery;
 
 		if (battery.isStopped()) {
 			return OffGridState.STOPPED;
 		}
 
-		boolean isMaxStartTimePassed = Duration.between(this.lastAttempt, Instant.now())
+		var isMaxStartTimePassed = Duration.between(this.lastAttempt, Instant.now())
 				.getSeconds() > GenericManagedEss.RETRY_COMMAND_SECONDS;
-		if (isMaxStartTimePassed) {
-			// First try - or waited long enough for next try
-
-			if (this.attemptCounter > GenericManagedEss.RETRY_COMMAND_MAX_ATTEMPTS) {
-				// Too many tries
-				ess._setMaxBatteryStopAttemptsFault(true);
-				return OffGridState.UNDEFINED;
-
-			} else {
-				// Trying to stop Battery
-				battery.stop();
-
-				this.lastAttempt = Instant.now();
-				this.attemptCounter++;
-				return OffGridState.STOP_BATTERY;
-			}
-		} else {
+		if (!isMaxStartTimePassed) {
 			// Still waiting...
 			return OffGridState.STOP_BATTERY;
 		}
+		if (this.attemptCounter > GenericManagedEss.RETRY_COMMAND_MAX_ATTEMPTS) {
+			// Too many tries
+			ess._setMaxBatteryStopAttemptsFault(true);
+			return OffGridState.UNDEFINED;
+
+		} else {
+			// Trying to stop Battery
+			battery.stop();
+
+			this.lastAttempt = Instant.now();
+			this.attemptCounter++;
+			return OffGridState.STOP_BATTERY;
+		}
 	}
 }
diff --git a/io.openems.edge.ess.generic/src/io/openems/edge/ess/generic/offgrid/statemachine/StopBatteryInverterBeforeSwitchHandler.java b/io.openems.edge.ess.generic/src/io/openems/edge/ess/generic/offgrid/statemachine/StopBatteryInverterBeforeSwitchHandler.java
index ef9bcee4aee..bab76359e5a 100644
--- a/io.openems.edge.ess.generic/src/io/openems/edge/ess/generic/offgrid/statemachine/StopBatteryInverterBeforeSwitchHandler.java
+++ b/io.openems.edge.ess.generic/src/io/openems/edge/ess/generic/offgrid/statemachine/StopBatteryInverterBeforeSwitchHandler.java
@@ -18,41 +18,37 @@ public class StopBatteryInverterBeforeSwitchHandler extends StateHandler<OffGrid
 	protected void onEntry(Context context) throws OpenemsNamedException {
 		this.lastAttempt = Instant.MIN;
 		this.attemptCounter = 0;
-		GenericManagedEss ess = context.getParent();
+		var ess = context.getParent();
 		ess._setMaxBatteryInverterStopAttemptsFault(false);
 	}
 
 	@Override
 	public OffGridState runAndGetNextState(Context context) throws OpenemsNamedException {
-		GenericManagedEss ess = context.getParent();
+		var ess = context.getParent();
 
 		if (context.batteryInverter.isStopped()) {
 			return OffGridState.UNDEFINED;
 		}
 
-		boolean isMaxStartTimePassed = Duration.between(this.lastAttempt, Instant.now())
+		var isMaxStartTimePassed = Duration.between(this.lastAttempt, Instant.now())
 				.getSeconds() > GenericManagedEss.RETRY_COMMAND_SECONDS;
-		if (isMaxStartTimePassed) {
-			// First try - or waited long enough for next try
-
-			if (this.attemptCounter > GenericManagedEss.RETRY_COMMAND_MAX_ATTEMPTS) {
-				// Too many tries
-				ess._setMaxBatteryInverterStopAttemptsFault(true);
-				return OffGridState.UNDEFINED;
-
-			} else {
-				// Trying to stop Battery Inverter before switching the relays
-				context.batteryInverter.stop();
-
-				this.lastAttempt = Instant.now();
-				this.attemptCounter++;
-				return OffGridState.STOP_BATTERY_INVERTER_BEFORE_SWITCH;
-
-			}
+		if (!isMaxStartTimePassed) {
+			// Still waiting...
+			return OffGridState.STOP_BATTERY_INVERTER_BEFORE_SWITCH;
+		}
+		if (this.attemptCounter > GenericManagedEss.RETRY_COMMAND_MAX_ATTEMPTS) {
+			// Too many tries
+			ess._setMaxBatteryInverterStopAttemptsFault(true);
+			return OffGridState.UNDEFINED;
 
 		} else {
-			// Still waiting...
+			// Trying to stop Battery Inverter before switching the relays
+			context.batteryInverter.stop();
+
+			this.lastAttempt = Instant.now();
+			this.attemptCounter++;
 			return OffGridState.STOP_BATTERY_INVERTER_BEFORE_SWITCH;
+
 		}
 	}
 
diff --git a/io.openems.edge.ess.generic/src/io/openems/edge/ess/generic/offgrid/statemachine/StopBatteryInverterHandler.java b/io.openems.edge.ess.generic/src/io/openems/edge/ess/generic/offgrid/statemachine/StopBatteryInverterHandler.java
index dae21a81a30..abb04bab77b 100644
--- a/io.openems.edge.ess.generic/src/io/openems/edge/ess/generic/offgrid/statemachine/StopBatteryInverterHandler.java
+++ b/io.openems.edge.ess.generic/src/io/openems/edge/ess/generic/offgrid/statemachine/StopBatteryInverterHandler.java
@@ -4,7 +4,6 @@
 import java.time.Instant;
 
 import io.openems.common.exceptions.OpenemsError.OpenemsNamedException;
-import io.openems.edge.batteryinverter.api.OffGridBatteryInverter;
 import io.openems.edge.common.statemachine.StateHandler;
 import io.openems.edge.ess.generic.common.GenericManagedEss;
 import io.openems.edge.ess.generic.offgrid.statemachine.StateMachine.OffGridState;
@@ -18,42 +17,38 @@ public class StopBatteryInverterHandler extends StateHandler<OffGridState, Conte
 	protected void onEntry(Context context) throws OpenemsNamedException {
 		this.lastAttempt = Instant.MIN;
 		this.attemptCounter = 0;
-		GenericManagedEss ess = context.getParent();
+		var ess = context.getParent();
 		ess._setMaxBatteryInverterStopAttemptsFault(false);
 	}
 
 	@Override
 	public OffGridState runAndGetNextState(Context context) throws OpenemsNamedException {
-		final GenericManagedEss ess = context.getParent();
-		final OffGridBatteryInverter inverter = context.batteryInverter;
+		final var ess = context.getParent();
+		final var inverter = context.batteryInverter;
 
 		if (inverter.isStopped()) {
 			return OffGridState.STOP_BATTERY;
 		}
 
-		boolean isMaxStartTimePassed = Duration.between(this.lastAttempt, Instant.now())
+		var isMaxStartTimePassed = Duration.between(this.lastAttempt, Instant.now())
 				.getSeconds() > GenericManagedEss.RETRY_COMMAND_SECONDS;
-		if (isMaxStartTimePassed) {
-			// First try - or waited long enough for next try
-
-			if (this.attemptCounter > GenericManagedEss.RETRY_COMMAND_MAX_ATTEMPTS) {
-				// Too many tries
-				ess._setMaxBatteryInverterStopAttemptsFault(true);
-				return OffGridState.UNDEFINED;
-
-			} else {
-				// Trying to stop Battery Inverter
-				inverter.stop();
-
-				this.lastAttempt = Instant.now();
-				this.attemptCounter++;
-				return OffGridState.STOP_BATTERY_INVERTER;
-
-			}
+		if (!isMaxStartTimePassed) {
+			// Still waiting...
+			return OffGridState.STOP_BATTERY_INVERTER;
+		}
+		if (this.attemptCounter > GenericManagedEss.RETRY_COMMAND_MAX_ATTEMPTS) {
+			// Too many tries
+			ess._setMaxBatteryInverterStopAttemptsFault(true);
+			return OffGridState.UNDEFINED;
 
 		} else {
-			// Still waiting...
+			// Trying to stop Battery Inverter
+			inverter.stop();
+
+			this.lastAttempt = Instant.now();
+			this.attemptCounter++;
 			return OffGridState.STOP_BATTERY_INVERTER;
+
 		}
 	}
 
diff --git a/io.openems.edge.ess.generic/src/io/openems/edge/ess/generic/offgrid/statemachine/StoppedHandler.java b/io.openems.edge.ess.generic/src/io/openems/edge/ess/generic/offgrid/statemachine/StoppedHandler.java
index 96390a0b00c..981b48914c3 100644
--- a/io.openems.edge.ess.generic/src/io/openems/edge/ess/generic/offgrid/statemachine/StoppedHandler.java
+++ b/io.openems.edge.ess.generic/src/io/openems/edge/ess/generic/offgrid/statemachine/StoppedHandler.java
@@ -2,14 +2,13 @@
 
 import io.openems.edge.common.startstop.StartStop;
 import io.openems.edge.common.statemachine.StateHandler;
-import io.openems.edge.ess.generic.common.GenericManagedEss;
 import io.openems.edge.ess.generic.offgrid.statemachine.StateMachine.OffGridState;
 
 public class StoppedHandler extends StateHandler<OffGridState, Context> {
 
 	@Override
 	public OffGridState runAndGetNextState(Context context) {
-		final GenericManagedEss ess = context.getParent();
+		final var ess = context.getParent();
 
 		// Mark as stopped
 		ess._setStartStop(StartStop.STOP);
diff --git a/io.openems.edge.ess.generic/src/io/openems/edge/ess/generic/offgrid/statemachine/UndefinedHandler.java b/io.openems.edge.ess.generic/src/io/openems/edge/ess/generic/offgrid/statemachine/UndefinedHandler.java
index 701a24ac5bc..4f8b5f54b81 100644
--- a/io.openems.edge.ess.generic/src/io/openems/edge/ess/generic/offgrid/statemachine/UndefinedHandler.java
+++ b/io.openems.edge.ess.generic/src/io/openems/edge/ess/generic/offgrid/statemachine/UndefinedHandler.java
@@ -1,15 +1,14 @@
 package io.openems.edge.ess.generic.offgrid.statemachine;
 
 import io.openems.edge.common.statemachine.StateHandler;
-import io.openems.edge.ess.generic.common.GenericManagedEss;
 import io.openems.edge.ess.generic.offgrid.statemachine.StateMachine.OffGridState;
 
 public class UndefinedHandler extends StateHandler<OffGridState, Context> {
 
 	@Override
 	public OffGridState runAndGetNextState(Context context) {
-		GenericManagedEss ess = context.getParent();
-		
+		var ess = context.getParent();
+
 		switch (ess.getStartStopTarget()) {
 		case UNDEFINED:
 			// Stuck in UNDEFINED State
diff --git a/io.openems.edge.ess.generic/src/io/openems/edge/ess/generic/symmetric/AllowedChargeDischargeHandler.java b/io.openems.edge.ess.generic/src/io/openems/edge/ess/generic/symmetric/AllowedChargeDischargeHandler.java
index f58916b4a6b..56ef81788cf 100644
--- a/io.openems.edge.ess.generic/src/io/openems/edge/ess/generic/symmetric/AllowedChargeDischargeHandler.java
+++ b/io.openems.edge.ess.generic/src/io/openems/edge/ess/generic/symmetric/AllowedChargeDischargeHandler.java
@@ -16,11 +16,11 @@ public void accept(ClockProvider clockProvider, Battery battery) {
 		this.calculateAllowedChargeDischargePower(clockProvider, battery);
 
 		// Battery limits
-		int batteryAllowedChargePower = Math.round(this.lastBatteryAllowedChargePower);
-		int batteryAllowedDischargePower = Math.round(this.lastBatteryAllowedDischargePower);
+		var batteryAllowedChargePower = Math.round(this.lastBatteryAllowedChargePower);
+		var batteryAllowedDischargePower = Math.round(this.lastBatteryAllowedDischargePower);
 
 		// PV-Production (for HybridEss)
-		int pvProduction = Math.max(//
+		var pvProduction = Math.max(//
 				TypeUtils.orElse(//
 						TypeUtils.subtract(this.parent.getActivePower().get(), this.parent.getDcDischargePower().get()), //
 						0),
diff --git a/io.openems.edge.ess.generic/src/io/openems/edge/ess/generic/symmetric/GenericManagedSymmetricEssImpl.java b/io.openems.edge.ess.generic/src/io/openems/edge/ess/generic/symmetric/GenericManagedSymmetricEssImpl.java
index 12da9e96092..6454fe8a94e 100644
--- a/io.openems.edge.ess.generic/src/io/openems/edge/ess/generic/symmetric/GenericManagedSymmetricEssImpl.java
+++ b/io.openems.edge.ess.generic/src/io/openems/edge/ess/generic/symmetric/GenericManagedSymmetricEssImpl.java
@@ -94,6 +94,7 @@ void activate(ComponentContext context, Config config) {
 				config.battery_id(), config.startStop());
 	}
 
+	@Override
 	@Deactivate
 	protected void deactivate() {
 		super.deactivate();
@@ -109,7 +110,7 @@ protected void handleStateMachine() {
 		this._setStartStop(StartStop.UNDEFINED);
 
 		// Prepare Context
-		Context context = new Context(this, this.getBattery(), this.getBatteryInverter());
+		var context = new Context(this, this.getBattery(), this.getBatteryInverter());
 
 		// Call the StateMachine
 		try {
@@ -160,9 +161,8 @@ protected ManagedSymmetricBatteryInverter getBatteryInverter() {
 	public Integer getSurplusPower() {
 		if (this.batteryInverter instanceof HybridManagedSymmetricBatteryInverter) {
 			return ((HybridManagedSymmetricBatteryInverter) this.batteryInverter).getSurplusPower();
-		} else {
-			return null;
 		}
+		return null;
 	}
 
 	@Override
diff --git a/io.openems.edge.ess.generic/src/io/openems/edge/ess/generic/symmetric/statemachine/ErrorHandler.java b/io.openems.edge.ess.generic/src/io/openems/edge/ess/generic/symmetric/statemachine/ErrorHandler.java
index a30b85e096a..98deadce1f0 100644
--- a/io.openems.edge.ess.generic/src/io/openems/edge/ess/generic/symmetric/statemachine/ErrorHandler.java
+++ b/io.openems.edge.ess.generic/src/io/openems/edge/ess/generic/symmetric/statemachine/ErrorHandler.java
@@ -6,7 +6,6 @@
 import io.openems.common.exceptions.OpenemsError.OpenemsNamedException;
 import io.openems.edge.common.startstop.StartStop;
 import io.openems.edge.common.statemachine.StateHandler;
-import io.openems.edge.ess.generic.common.GenericManagedEss;
 import io.openems.edge.ess.generic.symmetric.statemachine.StateMachine.State;
 
 public class ErrorHandler extends StateHandler<State, Context> {
@@ -24,7 +23,7 @@ protected void onEntry(Context context) throws OpenemsNamedException {
 
 	@Override
 	protected void onExit(Context context) throws OpenemsNamedException {
-		GenericManagedEss ess = context.getParent();
+		var ess = context.getParent();
 
 		ess._setMaxBatteryStartAttemptsFault(false);
 		ess._setMaxBatteryStopAttemptsFault(false);
diff --git a/io.openems.edge.ess.generic/src/io/openems/edge/ess/generic/symmetric/statemachine/StartBatteryHandler.java b/io.openems.edge.ess.generic/src/io/openems/edge/ess/generic/symmetric/statemachine/StartBatteryHandler.java
index 47e5029fe13..f1f881f1163 100644
--- a/io.openems.edge.ess.generic/src/io/openems/edge/ess/generic/symmetric/statemachine/StartBatteryHandler.java
+++ b/io.openems.edge.ess.generic/src/io/openems/edge/ess/generic/symmetric/statemachine/StartBatteryHandler.java
@@ -17,41 +17,37 @@ public class StartBatteryHandler extends StateHandler<State, Context> {
 	protected void onEntry(Context context) throws OpenemsNamedException {
 		this.lastAttempt = Instant.MIN;
 		this.attemptCounter = 0;
-		GenericManagedEss ess = context.getParent();
+		var ess = context.getParent();
 		ess._setMaxBatteryStartAttemptsFault(false);
 	}
 
 	@Override
 	public State runAndGetNextState(Context context) throws OpenemsNamedException {
-		GenericManagedEss ess = context.getParent();
+		var ess = context.getParent();
 
 		if (context.battery.isStarted()) {
 			return State.START_BATTERY_INVERTER;
 		}
 
-		boolean isMaxStartTimePassed = Duration.between(this.lastAttempt, Instant.now())
+		var isMaxStartTimePassed = Duration.between(this.lastAttempt, Instant.now())
 				.getSeconds() > GenericManagedEss.RETRY_COMMAND_SECONDS;
-		if (isMaxStartTimePassed) {
-			// First try - or waited long enough for next try
-
-			if (this.attemptCounter > GenericManagedEss.RETRY_COMMAND_MAX_ATTEMPTS) {
-				// Too many tries
-				ess._setMaxBatteryStartAttemptsFault(true);
-				return State.UNDEFINED;
-
-			} else {
-				// Trying to start Battery
-				context.battery.start();
-
-				this.lastAttempt = Instant.now();
-				this.attemptCounter++;
-				return State.START_BATTERY;
-
-			}
+		if (!isMaxStartTimePassed) {
+			// Still waiting...
+			return State.START_BATTERY;
+		}
+		if (this.attemptCounter > GenericManagedEss.RETRY_COMMAND_MAX_ATTEMPTS) {
+			// Too many tries
+			ess._setMaxBatteryStartAttemptsFault(true);
+			return State.UNDEFINED;
 
 		} else {
-			// Still waiting...
+			// Trying to start Battery
+			context.battery.start();
+
+			this.lastAttempt = Instant.now();
+			this.attemptCounter++;
 			return State.START_BATTERY;
+
 		}
 	}
 
diff --git a/io.openems.edge.ess.generic/src/io/openems/edge/ess/generic/symmetric/statemachine/StartBatteryInverterHandler.java b/io.openems.edge.ess.generic/src/io/openems/edge/ess/generic/symmetric/statemachine/StartBatteryInverterHandler.java
index 99fd6f9fab1..5b394a9f5de 100644
--- a/io.openems.edge.ess.generic/src/io/openems/edge/ess/generic/symmetric/statemachine/StartBatteryInverterHandler.java
+++ b/io.openems.edge.ess.generic/src/io/openems/edge/ess/generic/symmetric/statemachine/StartBatteryInverterHandler.java
@@ -17,41 +17,37 @@ public class StartBatteryInverterHandler extends StateHandler<State, Context> {
 	protected void onEntry(Context context) throws OpenemsNamedException {
 		this.lastAttempt = Instant.MIN;
 		this.attemptCounter = 0;
-		GenericManagedEss ess = context.getParent();
+		var ess = context.getParent();
 		ess._setMaxBatteryInverterStartAttemptsFault(false);
 	}
 
 	@Override
 	public State runAndGetNextState(Context context) throws OpenemsNamedException {
-		GenericManagedEss ess = context.getParent();
+		var ess = context.getParent();
 
 		if (context.batteryInverter.isStarted()) {
 			return State.STARTED;
 		}
 
-		boolean isMaxStartTimePassed = Duration.between(this.lastAttempt, Instant.now())
+		var isMaxStartTimePassed = Duration.between(this.lastAttempt, Instant.now())
 				.getSeconds() > GenericManagedEss.RETRY_COMMAND_SECONDS;
-		if (isMaxStartTimePassed) {
-			// First try - or waited long enough for next try
-
-			if (this.attemptCounter > GenericManagedEss.RETRY_COMMAND_MAX_ATTEMPTS) {
-				// Too many tries
-				ess._setMaxBatteryInverterStartAttemptsFault(true);
-				return State.UNDEFINED;
-
-			} else {
-				// Trying to start Battery
-				context.batteryInverter.start();
-
-				this.lastAttempt = Instant.now();
-				this.attemptCounter++;
-				return State.START_BATTERY_INVERTER;
-
-			}
+		if (!isMaxStartTimePassed) {
+			// Still waiting...
+			return State.START_BATTERY_INVERTER;
+		}
+		if (this.attemptCounter > GenericManagedEss.RETRY_COMMAND_MAX_ATTEMPTS) {
+			// Too many tries
+			ess._setMaxBatteryInverterStartAttemptsFault(true);
+			return State.UNDEFINED;
 
 		} else {
-			// Still waiting...
+			// Trying to start Battery
+			context.batteryInverter.start();
+
+			this.lastAttempt = Instant.now();
+			this.attemptCounter++;
 			return State.START_BATTERY_INVERTER;
+
 		}
 	}
 
diff --git a/io.openems.edge.ess.generic/src/io/openems/edge/ess/generic/symmetric/statemachine/StartedHandler.java b/io.openems.edge.ess.generic/src/io/openems/edge/ess/generic/symmetric/statemachine/StartedHandler.java
index f793e867280..57ee53a0f41 100644
--- a/io.openems.edge.ess.generic/src/io/openems/edge/ess/generic/symmetric/statemachine/StartedHandler.java
+++ b/io.openems.edge.ess.generic/src/io/openems/edge/ess/generic/symmetric/statemachine/StartedHandler.java
@@ -2,14 +2,13 @@
 
 import io.openems.edge.common.startstop.StartStop;
 import io.openems.edge.common.statemachine.StateHandler;
-import io.openems.edge.ess.generic.common.GenericManagedEss;
 import io.openems.edge.ess.generic.symmetric.statemachine.StateMachine.State;
 
 public class StartedHandler extends StateHandler<State, Context> {
 
 	@Override
 	public State runAndGetNextState(Context context) {
-		GenericManagedEss ess = context.getParent();
+		var ess = context.getParent();
 
 		if (ess.hasFaults()) {
 			return State.UNDEFINED;
diff --git a/io.openems.edge.ess.generic/src/io/openems/edge/ess/generic/symmetric/statemachine/StopBatteryHandler.java b/io.openems.edge.ess.generic/src/io/openems/edge/ess/generic/symmetric/statemachine/StopBatteryHandler.java
index 1b94e47d5a4..4dc84ac8898 100644
--- a/io.openems.edge.ess.generic/src/io/openems/edge/ess/generic/symmetric/statemachine/StopBatteryHandler.java
+++ b/io.openems.edge.ess.generic/src/io/openems/edge/ess/generic/symmetric/statemachine/StopBatteryHandler.java
@@ -17,41 +17,37 @@ public class StopBatteryHandler extends StateHandler<State, Context> {
 	protected void onEntry(Context context) throws OpenemsNamedException {
 		this.lastAttempt = Instant.MIN;
 		this.attemptCounter = 0;
-		GenericManagedEss ess = context.getParent();
+		var ess = context.getParent();
 		ess._setMaxBatteryStopAttemptsFault(false);
 	}
 
 	@Override
 	public State runAndGetNextState(Context context) throws OpenemsNamedException {
-		GenericManagedEss ess = context.getParent();
+		var ess = context.getParent();
 
 		if (context.battery.isStopped()) {
 			return State.STOPPED;
 		}
 
-		boolean isMaxStartTimePassed = Duration.between(this.lastAttempt, Instant.now())
+		var isMaxStartTimePassed = Duration.between(this.lastAttempt, Instant.now())
 				.getSeconds() > GenericManagedEss.RETRY_COMMAND_SECONDS;
-		if (isMaxStartTimePassed) {
-			// First try - or waited long enough for next try
-
-			if (this.attemptCounter > GenericManagedEss.RETRY_COMMAND_MAX_ATTEMPTS) {
-				// Too many tries
-				ess._setMaxBatteryStopAttemptsFault(true);
-				return State.UNDEFINED;
-
-			} else {
-				// Trying to stop Battery
-				context.battery.stop();
-
-				this.lastAttempt = Instant.now();
-				this.attemptCounter++;
-				return State.STOP_BATTERY;
-
-			}
+		if (!isMaxStartTimePassed) {
+			// Still waiting...
+			return State.STOP_BATTERY;
+		}
+		if (this.attemptCounter > GenericManagedEss.RETRY_COMMAND_MAX_ATTEMPTS) {
+			// Too many tries
+			ess._setMaxBatteryStopAttemptsFault(true);
+			return State.UNDEFINED;
 
 		} else {
-			// Still waiting...
+			// Trying to stop Battery
+			context.battery.stop();
+
+			this.lastAttempt = Instant.now();
+			this.attemptCounter++;
 			return State.STOP_BATTERY;
+
 		}
 	}
 
diff --git a/io.openems.edge.ess.generic/src/io/openems/edge/ess/generic/symmetric/statemachine/StopBatteryInverterHandler.java b/io.openems.edge.ess.generic/src/io/openems/edge/ess/generic/symmetric/statemachine/StopBatteryInverterHandler.java
index a709b3b21c1..b6747fc14b6 100644
--- a/io.openems.edge.ess.generic/src/io/openems/edge/ess/generic/symmetric/statemachine/StopBatteryInverterHandler.java
+++ b/io.openems.edge.ess.generic/src/io/openems/edge/ess/generic/symmetric/statemachine/StopBatteryInverterHandler.java
@@ -17,41 +17,37 @@ public class StopBatteryInverterHandler extends StateHandler<State, Context> {
 	protected void onEntry(Context context) throws OpenemsNamedException {
 		this.lastAttempt = Instant.MIN;
 		this.attemptCounter = 0;
-		GenericManagedEss ess = context.getParent();
+		var ess = context.getParent();
 		ess._setMaxBatteryInverterStopAttemptsFault(false);
 	}
 
 	@Override
 	public State runAndGetNextState(Context context) throws OpenemsNamedException {
-		GenericManagedEss ess = context.getParent();
+		var ess = context.getParent();
 
 		if (context.batteryInverter.isStopped()) {
 			return State.STOP_BATTERY;
 		}
 
-		boolean isMaxStartTimePassed = Duration.between(this.lastAttempt, Instant.now())
+		var isMaxStartTimePassed = Duration.between(this.lastAttempt, Instant.now())
 				.getSeconds() > GenericManagedEss.RETRY_COMMAND_SECONDS;
-		if (isMaxStartTimePassed) {
-			// First try - or waited long enough for next try
-
-			if (this.attemptCounter > GenericManagedEss.RETRY_COMMAND_MAX_ATTEMPTS) {
-				// Too many tries
-				ess._setMaxBatteryInverterStopAttemptsFault(true);
-				return State.UNDEFINED;
-
-			} else {
-				// Trying to stop Battery Inverter
-				context.batteryInverter.stop();
-
-				this.lastAttempt = Instant.now();
-				this.attemptCounter++;
-				return State.STOP_BATTERY_INVERTER;
-
-			}
+		if (!isMaxStartTimePassed) {
+			// Still waiting...
+			return State.STOP_BATTERY_INVERTER;
+		}
+		if (this.attemptCounter > GenericManagedEss.RETRY_COMMAND_MAX_ATTEMPTS) {
+			// Too many tries
+			ess._setMaxBatteryInverterStopAttemptsFault(true);
+			return State.UNDEFINED;
 
 		} else {
-			// Still waiting...
+			// Trying to stop Battery Inverter
+			context.batteryInverter.stop();
+
+			this.lastAttempt = Instant.now();
+			this.attemptCounter++;
 			return State.STOP_BATTERY_INVERTER;
+
 		}
 	}
 
diff --git a/io.openems.edge.ess.generic/src/io/openems/edge/ess/generic/symmetric/statemachine/StoppedHandler.java b/io.openems.edge.ess.generic/src/io/openems/edge/ess/generic/symmetric/statemachine/StoppedHandler.java
index f556228c867..f098749f006 100644
--- a/io.openems.edge.ess.generic/src/io/openems/edge/ess/generic/symmetric/statemachine/StoppedHandler.java
+++ b/io.openems.edge.ess.generic/src/io/openems/edge/ess/generic/symmetric/statemachine/StoppedHandler.java
@@ -2,14 +2,13 @@
 
 import io.openems.edge.common.startstop.StartStop;
 import io.openems.edge.common.statemachine.StateHandler;
-import io.openems.edge.ess.generic.common.GenericManagedEss;
 import io.openems.edge.ess.generic.symmetric.statemachine.StateMachine.State;
 
 public class StoppedHandler extends StateHandler<State, Context> {
 
 	@Override
 	public State runAndGetNextState(Context context) {
-		GenericManagedEss ess = context.getParent();
+		var ess = context.getParent();
 
 		if (ess.hasFaults()) {
 			return State.UNDEFINED;
diff --git a/io.openems.edge.ess.generic/src/io/openems/edge/ess/generic/symmetric/statemachine/UndefinedHandler.java b/io.openems.edge.ess.generic/src/io/openems/edge/ess/generic/symmetric/statemachine/UndefinedHandler.java
index 15476443d41..2075544f3ed 100644
--- a/io.openems.edge.ess.generic/src/io/openems/edge/ess/generic/symmetric/statemachine/UndefinedHandler.java
+++ b/io.openems.edge.ess.generic/src/io/openems/edge/ess/generic/symmetric/statemachine/UndefinedHandler.java
@@ -1,14 +1,13 @@
 package io.openems.edge.ess.generic.symmetric.statemachine;
 
 import io.openems.edge.common.statemachine.StateHandler;
-import io.openems.edge.ess.generic.common.GenericManagedEss;
 import io.openems.edge.ess.generic.symmetric.statemachine.StateMachine.State;
 
 public class UndefinedHandler extends StateHandler<State, Context> {
 
 	@Override
 	public State runAndGetNextState(Context context) {
-		GenericManagedEss ess = context.getParent();
+		var ess = context.getParent();
 		switch (ess.getStartStopTarget()) {
 		case UNDEFINED:
 			// Stuck in UNDEFINED State
diff --git a/io.openems.edge.ess.generic/test/io/openems/edge/ess/generic/common/AllowedChargeDischargeHandlerTest.java b/io.openems.edge.ess.generic/test/io/openems/edge/ess/generic/common/AllowedChargeDischargeHandlerTest.java
index fb298700cde..70a8c2e59cf 100644
--- a/io.openems.edge.ess.generic/test/io/openems/edge/ess/generic/common/AllowedChargeDischargeHandlerTest.java
+++ b/io.openems.edge.ess.generic/test/io/openems/edge/ess/generic/common/AllowedChargeDischargeHandlerTest.java
@@ -19,13 +19,13 @@ public class AllowedChargeDischargeHandlerTest {
 
 	@Test
 	public void testStart() throws Exception {
-		final GenericManagedSymmetricEssImpl ess = new GenericManagedSymmetricEssImpl();
-		final TimeLeapClock clock = new TimeLeapClock(Instant.parse("2020-01-01T01:00:00.00Z"), ZoneOffset.UTC);
+		final var ess = new GenericManagedSymmetricEssImpl();
+		final var clock = new TimeLeapClock(Instant.parse("2020-01-01T01:00:00.00Z"), ZoneOffset.UTC);
 		final ClockProvider clockProvider = new DummyComponentManager(clock);
 		new ComponentTest(ess) //
 				.addReference("componentManager", clockProvider); //
 
-		AllowedChargeDischargeHandler sut = new AllowedChargeDischargeHandler(ess);
+		var sut = new AllowedChargeDischargeHandler(ess);
 
 		sut.calculateAllowedChargeDischargePower(clockProvider, false, null, null, null);
 		assertEquals(0, sut.lastBatteryAllowedChargePower, 0.001);
@@ -58,7 +58,7 @@ public void testStart() throws Exception {
 		assertEquals(675, sut.lastBatteryAllowedChargePower, 0.001);
 		assertEquals(0, sut.lastBatteryAllowedDischargePower, 0.001);
 
-		for (int i = 0; i < 15; i++) {
+		for (var i = 0; i < 15; i++) {
 			clock.leap(1, ChronoUnit.SECONDS);
 			sut.calculateAllowedChargeDischargePower(clockProvider, true, 9, 1, 500);
 		}
diff --git a/io.openems.edge.ess.generic/test/io/openems/edge/ess/generic/offgrid/GenericOffGridEssTest.java b/io.openems.edge.ess.generic/test/io/openems/edge/ess/generic/offgrid/GenericOffGridEssTest.java
index 30f48425a75..04285c137d4 100644
--- a/io.openems.edge.ess.generic/test/io/openems/edge/ess/generic/offgrid/GenericOffGridEssTest.java
+++ b/io.openems.edge.ess.generic/test/io/openems/edge/ess/generic/offgrid/GenericOffGridEssTest.java
@@ -23,7 +23,7 @@ public class GenericOffGridEssTest {
 
 	@Test
 	public void testStart() throws Exception {
-		final TimeLeapClock clock = new TimeLeapClock(Instant.parse("2020-01-01T01:00:00.00Z"), ZoneOffset.UTC);
+		final var clock = new TimeLeapClock(Instant.parse("2020-01-01T01:00:00.00Z"), ZoneOffset.UTC);
 		new ComponentTest(new GenericOffGridEssImpl()) //
 				.addReference("cm", new DummyConfigurationAdmin()) //
 				.addReference("componentManager", new DummyComponentManager(clock)) //
diff --git a/io.openems.edge.ess.generic/test/io/openems/edge/ess/generic/offgrid/MyConfig.java b/io.openems.edge.ess.generic/test/io/openems/edge/ess/generic/offgrid/MyConfig.java
index 44a266ad6fd..d3022016b34 100644
--- a/io.openems.edge.ess.generic/test/io/openems/edge/ess/generic/offgrid/MyConfig.java
+++ b/io.openems.edge.ess.generic/test/io/openems/edge/ess/generic/offgrid/MyConfig.java
@@ -50,7 +50,7 @@ public MyConfig build() {
 
 	/**
 	 * Create a Config builder.
-	 * 
+	 *
 	 * @return a {@link Builder}
 	 */
 	public static Builder create() {
diff --git a/io.openems.edge.ess.generic/test/io/openems/edge/ess/generic/symmetric/GenericManagedSymmetricEssTest.java b/io.openems.edge.ess.generic/test/io/openems/edge/ess/generic/symmetric/GenericManagedSymmetricEssTest.java
index f419880d0ee..e4a085ce102 100644
--- a/io.openems.edge.ess.generic/test/io/openems/edge/ess/generic/symmetric/GenericManagedSymmetricEssTest.java
+++ b/io.openems.edge.ess.generic/test/io/openems/edge/ess/generic/symmetric/GenericManagedSymmetricEssTest.java
@@ -42,7 +42,7 @@ public class GenericManagedSymmetricEssTest {
 
 	@Test
 	public void testStart() throws Exception {
-		final TimeLeapClock clock = new TimeLeapClock(Instant.parse("2020-01-01T01:00:00.00Z"), ZoneOffset.UTC);
+		final var clock = new TimeLeapClock(Instant.parse("2020-01-01T01:00:00.00Z"), ZoneOffset.UTC);
 		new ComponentTest(new GenericManagedSymmetricEssImpl()) //
 				.addReference("cm", new DummyConfigurationAdmin()) //
 				.addReference("componentManager", new DummyComponentManager(clock)) //
diff --git a/io.openems.edge.ess.generic/test/io/openems/edge/ess/generic/symmetric/MyConfig.java b/io.openems.edge.ess.generic/test/io/openems/edge/ess/generic/symmetric/MyConfig.java
index 5ad9cbf5a85..3dc844275b8 100644
--- a/io.openems.edge.ess.generic/test/io/openems/edge/ess/generic/symmetric/MyConfig.java
+++ b/io.openems.edge.ess.generic/test/io/openems/edge/ess/generic/symmetric/MyConfig.java
@@ -3,7 +3,6 @@
 import io.openems.common.utils.ConfigUtils;
 import io.openems.edge.common.startstop.StartStopConfig;
 import io.openems.edge.common.test.AbstractComponentConfig;
-import io.openems.edge.ess.generic.symmetric.Config;
 
 @SuppressWarnings("all")
 public class MyConfig extends AbstractComponentConfig implements Config {
@@ -45,7 +44,7 @@ public MyConfig build() {
 
 	/**
 	 * Create a Config builder.
-	 * 
+	 *
 	 * @return a {@link Builder}
 	 */
 	public static Builder create() {

From 138c87e2e5cd560eacafe15f823096cf4d4bc292 Mon Sep 17 00:00:00 2001
From: Stefan Feilmeier <stefan.feilmeier@fenecon.de>
Date: Tue, 8 Mar 2022 11:26:48 +0100
Subject: [PATCH 61/96] Update io.openems.edge.ess.sma

---
 .../src/io/openems/edge/sma/SunnyIsland6Ess.java          | 8 ++++----
 .../io/openems/edge/sma/enums/AbsorptionPhaseActive.java  | 4 ++--
 .../edge/sma/enums/AcknowledgeGeneratorErrors.java        | 4 ++--
 .../openems/edge/sma/enums/ActiveBatteryChargingMode.java | 4 ++--
 .../edge/sma/enums/AutomaticFrequencySynchronization.java | 4 ++--
 .../openems/edge/sma/enums/AutomaticGeneratorStart.java   | 6 +++---
 .../src/io/openems/edge/sma/enums/BMSOperatingMode.java   | 4 ++--
 .../src/io/openems/edge/sma/enums/BatteryType.java        | 4 ++--
 .../edge/sma/enums/ConfigurationOfTheCosphiEndPoint.java  | 4 ++--
 .../sma/enums/ConfigurationOfTheCosphiStartingPoint.java  | 4 ++--
 ...ControlOfBatteryChargingViaCommunicationAvailable.java | 4 ++--
 .../sma/enums/DataTransferRateOfNetworkTerminalA.java     | 8 ++++----
 .../edge/sma/enums/DuplexModeOfNetworkTerminalA.java      | 4 ++--
 .../src/io/openems/edge/sma/enums/GeneratorStatus.java    | 4 ++--
 .../io/openems/edge/sma/enums/GridCreatingGenerator.java  | 4 ++--
 .../edge/sma/enums/GridRequestViPowerSwitchOn.java        | 6 +++---
 .../openems/edge/sma/enums/GridRequestViaChargeType.java  | 4 ++--
 .../edge/sma/enums/ManualControlOfNetworkConnection.java  | 4 ++--
 .../openems/edge/sma/enums/ManualEqualizationCharge.java  | 4 ++--
 .../io/openems/edge/sma/enums/ManualGeneratorStart.java   | 4 ++--
 .../src/io/openems/edge/sma/enums/MemoryCardStatus.java   | 4 ++--
 .../src/io/openems/edge/sma/enums/MeterSetting.java       | 4 ++--
 .../openems/edge/sma/enums/MultifunctionRelayStatus.java  | 4 ++--
 .../sma/enums/OperatingModeForActivePowerLimitation.java  | 4 ++--
 ...eratingModeOfActivePowerLimitationAtOverFrequency.java | 4 ++--
 .../edge/sma/enums/PowerFeedbackToPublicGridAllowed.java  | 6 +++---
 .../src/io/openems/edge/sma/enums/PowerSupplyStatus.java  | 4 ++--
 .../src/io/openems/edge/sma/enums/PvMainsConnection.java  | 4 ++--
 .../openems/edge/sma/enums/ReasonForGeneratorRequest.java | 4 ++--
 .../sma/enums/RepetitionCycleOfTheControlledInverter.java | 4 ++--
 ...etitionCycleOfTheTimeControlledGeneratorOperation.java | 4 ++--
 .../edge/sma/enums/RiseInSelfConsumptionSwitchedOn.java   | 4 ++--
 .../src/io/openems/edge/sma/enums/SetControlMode.java     | 4 ++--
 .../SpeedWireConnectionStatusOfNetworkTerminalA.java      | 4 ++--
 .../edge/sma/enums/StatusBatteryApplicationArea.java      | 4 ++--
 .../src/io/openems/edge/sma/enums/StatusDigitalInput.java | 4 ++--
 .../io/openems/edge/sma/enums/StatusOfUtilityGrid.java    | 4 ++--
 .../src/io/openems/edge/sma/enums/SystemState.java        | 4 ++--
 .../edge/sma/enums/TimeControlledGeneratorOperation.java  | 4 ++--
 .../edge/sma/enums/TimeControlledInverterOperation.java   | 6 +++---
 .../openems/edge/sma/enums/TypeOfACSubdistribution.java   | 4 ++--
 .../test/io/openems/edge/sma/MyConfig.java                | 4 ++--
 42 files changed, 92 insertions(+), 92 deletions(-)

diff --git a/io.openems.edge.ess.sma/src/io/openems/edge/sma/SunnyIsland6Ess.java b/io.openems.edge.ess.sma/src/io/openems/edge/sma/SunnyIsland6Ess.java
index e187f24115e..0956fa82548 100644
--- a/io.openems.edge.ess.sma/src/io/openems/edge/sma/SunnyIsland6Ess.java
+++ b/io.openems.edge.ess.sma/src/io/openems/edge/sma/SunnyIsland6Ess.java
@@ -71,6 +71,7 @@ public SunnyIsland6Ess() {
 		this._setMaxApparentPower(SunnyIsland6Ess.MAX_APPARENT_POWER);
 	}
 
+	@Override
 	@Reference(policy = ReferencePolicy.STATIC, policyOption = ReferencePolicyOption.GREEDY, cardinality = ReferenceCardinality.MANDATORY)
 	protected void setModbus(BridgeModbus modbus) {
 		super.setModbus(modbus);
@@ -86,6 +87,7 @@ void activate(ComponentContext context, Config config) throws OpenemsException {
 		SinglePhaseEss.initializeCopyPhaseChannel(this, this.phase);
 	}
 
+	@Override
 	@Deactivate
 	protected void deactivate() {
 		super.deactivate();
@@ -111,7 +113,7 @@ public void applyPower(int activePowerL1, int reactivePowerL1, int activePowerL2
 
 	@Override
 	protected ModbusProtocol defineModbusProtocol() throws OpenemsException {
-		ModbusProtocol protocol = new ModbusProtocol(this, //
+		return new ModbusProtocol(this, //
 				new FC3ReadRegistersTask(30051, Priority.ONCE, //
 						m(SiChannelId.DEVICE_CLASS, new UnsignedDoublewordElement(30051)), //
 						m(SiChannelId.DEVICE_TYPE, new UnsignedDoublewordElement(30053)).debug(), //
@@ -997,9 +999,7 @@ protected ModbusProtocol defineModbusProtocol() throws OpenemsException {
 				new FC16WriteRegistersTask(43090, //
 						m(SiChannelId.GRID_GUARD_CODE, new UnsignedDoublewordElement(43090))), //
 				new FC16WriteRegistersTask(40705, m(SiChannelId.MIN_SOC_POWER_ON, new UnsignedDoublewordElement(40705)), //
-						m(SiChannelId.MIN_SOC_POWER_OFF, new UnsignedDoublewordElement(40707)))); //
-
-		return protocol;
+						m(SiChannelId.MIN_SOC_POWER_OFF, new UnsignedDoublewordElement(40707))));
 	}
 
 	@Override
diff --git a/io.openems.edge.ess.sma/src/io/openems/edge/sma/enums/AbsorptionPhaseActive.java b/io.openems.edge.ess.sma/src/io/openems/edge/sma/enums/AbsorptionPhaseActive.java
index 5ba6b596ae2..a2de78c28ff 100644
--- a/io.openems.edge.ess.sma/src/io/openems/edge/sma/enums/AbsorptionPhaseActive.java
+++ b/io.openems.edge.ess.sma/src/io/openems/edge/sma/enums/AbsorptionPhaseActive.java
@@ -17,12 +17,12 @@ private AbsorptionPhaseActive(int value, String name) {
 
 	@Override
 	public int getValue() {
-		return value;
+		return this.value;
 	}
 
 	@Override
 	public String getName() {
-		return name;
+		return this.name;
 	}
 
 	@Override
diff --git a/io.openems.edge.ess.sma/src/io/openems/edge/sma/enums/AcknowledgeGeneratorErrors.java b/io.openems.edge.ess.sma/src/io/openems/edge/sma/enums/AcknowledgeGeneratorErrors.java
index ede35941c12..6f040224b8f 100644
--- a/io.openems.edge.ess.sma/src/io/openems/edge/sma/enums/AcknowledgeGeneratorErrors.java
+++ b/io.openems.edge.ess.sma/src/io/openems/edge/sma/enums/AcknowledgeGeneratorErrors.java
@@ -16,12 +16,12 @@ private AcknowledgeGeneratorErrors(int value, String name) {
 
 	@Override
 	public int getValue() {
-		return value;
+		return this.value;
 	}
 
 	@Override
 	public String getName() {
-		return name;
+		return this.name;
 	}
 
 	@Override
diff --git a/io.openems.edge.ess.sma/src/io/openems/edge/sma/enums/ActiveBatteryChargingMode.java b/io.openems.edge.ess.sma/src/io/openems/edge/sma/enums/ActiveBatteryChargingMode.java
index a37a3a4274c..457b33af533 100644
--- a/io.openems.edge.ess.sma/src/io/openems/edge/sma/enums/ActiveBatteryChargingMode.java
+++ b/io.openems.edge.ess.sma/src/io/openems/edge/sma/enums/ActiveBatteryChargingMode.java
@@ -19,12 +19,12 @@ private ActiveBatteryChargingMode(int value, String name) {
 
 	@Override
 	public int getValue() {
-		return value;
+		return this.value;
 	}
 
 	@Override
 	public String getName() {
-		return name;
+		return this.name;
 	}
 
 	@Override
diff --git a/io.openems.edge.ess.sma/src/io/openems/edge/sma/enums/AutomaticFrequencySynchronization.java b/io.openems.edge.ess.sma/src/io/openems/edge/sma/enums/AutomaticFrequencySynchronization.java
index 57d99c7531f..1ad54eeba89 100644
--- a/io.openems.edge.ess.sma/src/io/openems/edge/sma/enums/AutomaticFrequencySynchronization.java
+++ b/io.openems.edge.ess.sma/src/io/openems/edge/sma/enums/AutomaticFrequencySynchronization.java
@@ -17,12 +17,12 @@ private AutomaticFrequencySynchronization(int value, String name) {
 
 	@Override
 	public int getValue() {
-		return value;
+		return this.value;
 	}
 
 	@Override
 	public String getName() {
-		return name;
+		return this.name;
 	}
 
 	@Override
diff --git a/io.openems.edge.ess.sma/src/io/openems/edge/sma/enums/AutomaticGeneratorStart.java b/io.openems.edge.ess.sma/src/io/openems/edge/sma/enums/AutomaticGeneratorStart.java
index 0c201ae4e74..d5f11460409 100644
--- a/io.openems.edge.ess.sma/src/io/openems/edge/sma/enums/AutomaticGeneratorStart.java
+++ b/io.openems.edge.ess.sma/src/io/openems/edge/sma/enums/AutomaticGeneratorStart.java
@@ -6,7 +6,7 @@ public enum AutomaticGeneratorStart implements OptionsEnum {
 	UNDEFINED(-1, "Undefined"), //
 	YES(1129, "Yes"), //
 	NO(1130, "No");
-	
+
 	private final int value;
 	private final String name;
 
@@ -17,12 +17,12 @@ private AutomaticGeneratorStart(int value, String name) {
 
 	@Override
 	public int getValue() {
-		return value;
+		return this.value;
 	}
 
 	@Override
 	public String getName() {
-		return name;
+		return this.name;
 	}
 
 	@Override
diff --git a/io.openems.edge.ess.sma/src/io/openems/edge/sma/enums/BMSOperatingMode.java b/io.openems.edge.ess.sma/src/io/openems/edge/sma/enums/BMSOperatingMode.java
index a404b74e5ef..9ad41fd822b 100644
--- a/io.openems.edge.ess.sma/src/io/openems/edge/sma/enums/BMSOperatingMode.java
+++ b/io.openems.edge.ess.sma/src/io/openems/edge/sma/enums/BMSOperatingMode.java
@@ -20,12 +20,12 @@ private BMSOperatingMode(int value, String name) {
 
 	@Override
 	public int getValue() {
-		return value;
+		return this.value;
 	}
 
 	@Override
 	public String getName() {
-		return name;
+		return this.name;
 	}
 
 	@Override
diff --git a/io.openems.edge.ess.sma/src/io/openems/edge/sma/enums/BatteryType.java b/io.openems.edge.ess.sma/src/io/openems/edge/sma/enums/BatteryType.java
index 62a76897d52..b28b54cd34d 100644
--- a/io.openems.edge.ess.sma/src/io/openems/edge/sma/enums/BatteryType.java
+++ b/io.openems.edge.ess.sma/src/io/openems/edge/sma/enums/BatteryType.java
@@ -19,12 +19,12 @@ private BatteryType(int value, String name) {
 
 	@Override
 	public int getValue() {
-		return value;
+		return this.value;
 	}
 
 	@Override
 	public String getName() {
-		return name;
+		return this.name;
 	}
 
 	@Override
diff --git a/io.openems.edge.ess.sma/src/io/openems/edge/sma/enums/ConfigurationOfTheCosphiEndPoint.java b/io.openems.edge.ess.sma/src/io/openems/edge/sma/enums/ConfigurationOfTheCosphiEndPoint.java
index 584844b086d..82e1429bc59 100644
--- a/io.openems.edge.ess.sma/src/io/openems/edge/sma/enums/ConfigurationOfTheCosphiEndPoint.java
+++ b/io.openems.edge.ess.sma/src/io/openems/edge/sma/enums/ConfigurationOfTheCosphiEndPoint.java
@@ -17,12 +17,12 @@ private ConfigurationOfTheCosphiEndPoint(int value, String name) {
 
 	@Override
 	public int getValue() {
-		return value;
+		return this.value;
 	}
 
 	@Override
 	public String getName() {
-		return name;
+		return this.name;
 	}
 
 	@Override
diff --git a/io.openems.edge.ess.sma/src/io/openems/edge/sma/enums/ConfigurationOfTheCosphiStartingPoint.java b/io.openems.edge.ess.sma/src/io/openems/edge/sma/enums/ConfigurationOfTheCosphiStartingPoint.java
index 43a451bada9..e668f0dc0bf 100644
--- a/io.openems.edge.ess.sma/src/io/openems/edge/sma/enums/ConfigurationOfTheCosphiStartingPoint.java
+++ b/io.openems.edge.ess.sma/src/io/openems/edge/sma/enums/ConfigurationOfTheCosphiStartingPoint.java
@@ -17,12 +17,12 @@ private ConfigurationOfTheCosphiStartingPoint(int value, String name) {
 
 	@Override
 	public int getValue() {
-		return value;
+		return this.value;
 	}
 
 	@Override
 	public String getName() {
-		return name;
+		return this.name;
 	}
 
 	@Override
diff --git a/io.openems.edge.ess.sma/src/io/openems/edge/sma/enums/ControlOfBatteryChargingViaCommunicationAvailable.java b/io.openems.edge.ess.sma/src/io/openems/edge/sma/enums/ControlOfBatteryChargingViaCommunicationAvailable.java
index 6e8d8f04309..0ec0603d01d 100644
--- a/io.openems.edge.ess.sma/src/io/openems/edge/sma/enums/ControlOfBatteryChargingViaCommunicationAvailable.java
+++ b/io.openems.edge.ess.sma/src/io/openems/edge/sma/enums/ControlOfBatteryChargingViaCommunicationAvailable.java
@@ -17,12 +17,12 @@ private ControlOfBatteryChargingViaCommunicationAvailable(int value, String name
 
 	@Override
 	public int getValue() {
-		return value;
+		return this.value;
 	}
 
 	@Override
 	public String getName() {
-		return name;
+		return this.name;
 	}
 
 	@Override
diff --git a/io.openems.edge.ess.sma/src/io/openems/edge/sma/enums/DataTransferRateOfNetworkTerminalA.java b/io.openems.edge.ess.sma/src/io/openems/edge/sma/enums/DataTransferRateOfNetworkTerminalA.java
index f0d17388f26..d11536520d8 100644
--- a/io.openems.edge.ess.sma/src/io/openems/edge/sma/enums/DataTransferRateOfNetworkTerminalA.java
+++ b/io.openems.edge.ess.sma/src/io/openems/edge/sma/enums/DataTransferRateOfNetworkTerminalA.java
@@ -4,8 +4,8 @@
 
 public enum DataTransferRateOfNetworkTerminalA implements OptionsEnum {
 	UNDEFINED(-1, "Undefined"), //
-	TEN_MBIT(1720,"10 MBit"),//
-	HUNDRED_MBIT(1721, "100 MBit"),//
+	TEN_MBIT(1720, "10 MBit"), //
+	HUNDRED_MBIT(1721, "100 MBit"), //
 	NOT_CONNECTED(1725, "Not Connected");
 
 	private final int value;
@@ -18,12 +18,12 @@ private DataTransferRateOfNetworkTerminalA(int value, String name) {
 
 	@Override
 	public int getValue() {
-		return value;
+		return this.value;
 	}
 
 	@Override
 	public String getName() {
-		return name;
+		return this.name;
 	}
 
 	@Override
diff --git a/io.openems.edge.ess.sma/src/io/openems/edge/sma/enums/DuplexModeOfNetworkTerminalA.java b/io.openems.edge.ess.sma/src/io/openems/edge/sma/enums/DuplexModeOfNetworkTerminalA.java
index 4ceb05dda7d..ca3525eb77c 100644
--- a/io.openems.edge.ess.sma/src/io/openems/edge/sma/enums/DuplexModeOfNetworkTerminalA.java
+++ b/io.openems.edge.ess.sma/src/io/openems/edge/sma/enums/DuplexModeOfNetworkTerminalA.java
@@ -18,12 +18,12 @@ private DuplexModeOfNetworkTerminalA(int value, String name) {
 
 	@Override
 	public int getValue() {
-		return value;
+		return this.value;
 	}
 
 	@Override
 	public String getName() {
-		return name;
+		return this.name;
 	}
 
 	@Override
diff --git a/io.openems.edge.ess.sma/src/io/openems/edge/sma/enums/GeneratorStatus.java b/io.openems.edge.ess.sma/src/io/openems/edge/sma/enums/GeneratorStatus.java
index 201ca22a7ae..a4d704e1c09 100644
--- a/io.openems.edge.ess.sma/src/io/openems/edge/sma/enums/GeneratorStatus.java
+++ b/io.openems.edge.ess.sma/src/io/openems/edge/sma/enums/GeneratorStatus.java
@@ -27,12 +27,12 @@ private GeneratorStatus(int value, String name) {
 
 	@Override
 	public int getValue() {
-		return value;
+		return this.value;
 	}
 
 	@Override
 	public String getName() {
-		return name;
+		return this.name;
 	}
 
 	@Override
diff --git a/io.openems.edge.ess.sma/src/io/openems/edge/sma/enums/GridCreatingGenerator.java b/io.openems.edge.ess.sma/src/io/openems/edge/sma/enums/GridCreatingGenerator.java
index a8058e78765..90e102037c2 100644
--- a/io.openems.edge.ess.sma/src/io/openems/edge/sma/enums/GridCreatingGenerator.java
+++ b/io.openems.edge.ess.sma/src/io/openems/edge/sma/enums/GridCreatingGenerator.java
@@ -19,12 +19,12 @@ private GridCreatingGenerator(int value, String name) {
 
 	@Override
 	public int getValue() {
-		return value;
+		return this.value;
 	}
 
 	@Override
 	public String getName() {
-		return name;
+		return this.name;
 	}
 
 	@Override
diff --git a/io.openems.edge.ess.sma/src/io/openems/edge/sma/enums/GridRequestViPowerSwitchOn.java b/io.openems.edge.ess.sma/src/io/openems/edge/sma/enums/GridRequestViPowerSwitchOn.java
index 802ec383dc4..09f01fbe2ae 100644
--- a/io.openems.edge.ess.sma/src/io/openems/edge/sma/enums/GridRequestViPowerSwitchOn.java
+++ b/io.openems.edge.ess.sma/src/io/openems/edge/sma/enums/GridRequestViPowerSwitchOn.java
@@ -6,7 +6,7 @@ public enum GridRequestViPowerSwitchOn implements OptionsEnum {
 	UNDEFINED(-1, "Undefined"), //
 	YES(1129, "Yes"), //
 	NO(1130, "No");
-	
+
 	private final int value;
 	private final String name;
 
@@ -17,12 +17,12 @@ private GridRequestViPowerSwitchOn(int value, String name) {
 
 	@Override
 	public int getValue() {
-		return value;
+		return this.value;
 	}
 
 	@Override
 	public String getName() {
-		return name;
+		return this.name;
 	}
 
 	@Override
diff --git a/io.openems.edge.ess.sma/src/io/openems/edge/sma/enums/GridRequestViaChargeType.java b/io.openems.edge.ess.sma/src/io/openems/edge/sma/enums/GridRequestViaChargeType.java
index 29fb1262142..c17173987f4 100644
--- a/io.openems.edge.ess.sma/src/io/openems/edge/sma/enums/GridRequestViaChargeType.java
+++ b/io.openems.edge.ess.sma/src/io/openems/edge/sma/enums/GridRequestViaChargeType.java
@@ -19,12 +19,12 @@ private GridRequestViaChargeType(int value, String name) {
 
 	@Override
 	public int getValue() {
-		return value;
+		return this.value;
 	}
 
 	@Override
 	public String getName() {
-		return name;
+		return this.name;
 	}
 
 	@Override
diff --git a/io.openems.edge.ess.sma/src/io/openems/edge/sma/enums/ManualControlOfNetworkConnection.java b/io.openems.edge.ess.sma/src/io/openems/edge/sma/enums/ManualControlOfNetworkConnection.java
index 09056974953..15b65e43dae 100644
--- a/io.openems.edge.ess.sma/src/io/openems/edge/sma/enums/ManualControlOfNetworkConnection.java
+++ b/io.openems.edge.ess.sma/src/io/openems/edge/sma/enums/ManualControlOfNetworkConnection.java
@@ -18,12 +18,12 @@ private ManualControlOfNetworkConnection(int value, String name) {
 
 	@Override
 	public int getValue() {
-		return value;
+		return this.value;
 	}
 
 	@Override
 	public String getName() {
-		return name;
+		return this.name;
 	}
 
 	@Override
diff --git a/io.openems.edge.ess.sma/src/io/openems/edge/sma/enums/ManualEqualizationCharge.java b/io.openems.edge.ess.sma/src/io/openems/edge/sma/enums/ManualEqualizationCharge.java
index eadc7f28349..130ed6b9849 100644
--- a/io.openems.edge.ess.sma/src/io/openems/edge/sma/enums/ManualEqualizationCharge.java
+++ b/io.openems.edge.ess.sma/src/io/openems/edge/sma/enums/ManualEqualizationCharge.java
@@ -18,12 +18,12 @@ private ManualEqualizationCharge(int value, String name) {
 
 	@Override
 	public int getValue() {
-		return value;
+		return this.value;
 	}
 
 	@Override
 	public String getName() {
-		return name;
+		return this.name;
 	}
 
 	@Override
diff --git a/io.openems.edge.ess.sma/src/io/openems/edge/sma/enums/ManualGeneratorStart.java b/io.openems.edge.ess.sma/src/io/openems/edge/sma/enums/ManualGeneratorStart.java
index bfd00e1bcbb..a3044761b6b 100644
--- a/io.openems.edge.ess.sma/src/io/openems/edge/sma/enums/ManualGeneratorStart.java
+++ b/io.openems.edge.ess.sma/src/io/openems/edge/sma/enums/ManualGeneratorStart.java
@@ -17,12 +17,12 @@ private ManualGeneratorStart(int value, String name) {
 
 	@Override
 	public int getValue() {
-		return value;
+		return this.value;
 	}
 
 	@Override
 	public String getName() {
-		return name;
+		return this.name;
 	}
 
 	@Override
diff --git a/io.openems.edge.ess.sma/src/io/openems/edge/sma/enums/MemoryCardStatus.java b/io.openems.edge.ess.sma/src/io/openems/edge/sma/enums/MemoryCardStatus.java
index 3eeb6d4da24..10c2b6393de 100644
--- a/io.openems.edge.ess.sma/src/io/openems/edge/sma/enums/MemoryCardStatus.java
+++ b/io.openems.edge.ess.sma/src/io/openems/edge/sma/enums/MemoryCardStatus.java
@@ -24,12 +24,12 @@ private MemoryCardStatus(int value, String name) {
 
 	@Override
 	public int getValue() {
-		return value;
+		return this.value;
 	}
 
 	@Override
 	public String getName() {
-		return name;
+		return this.name;
 	}
 
 	@Override
diff --git a/io.openems.edge.ess.sma/src/io/openems/edge/sma/enums/MeterSetting.java b/io.openems.edge.ess.sma/src/io/openems/edge/sma/enums/MeterSetting.java
index ca216ff77f8..7ebde17815d 100644
--- a/io.openems.edge.ess.sma/src/io/openems/edge/sma/enums/MeterSetting.java
+++ b/io.openems.edge.ess.sma/src/io/openems/edge/sma/enums/MeterSetting.java
@@ -17,12 +17,12 @@ private MeterSetting(int value, String name) {
 
 	@Override
 	public int getValue() {
-		return value;
+		return this.value;
 	}
 
 	@Override
 	public String getName() {
-		return name;
+		return this.name;
 	}
 
 	@Override
diff --git a/io.openems.edge.ess.sma/src/io/openems/edge/sma/enums/MultifunctionRelayStatus.java b/io.openems.edge.ess.sma/src/io/openems/edge/sma/enums/MultifunctionRelayStatus.java
index 9cb0abce02d..f18dddb4bc3 100644
--- a/io.openems.edge.ess.sma/src/io/openems/edge/sma/enums/MultifunctionRelayStatus.java
+++ b/io.openems.edge.ess.sma/src/io/openems/edge/sma/enums/MultifunctionRelayStatus.java
@@ -17,12 +17,12 @@ private MultifunctionRelayStatus(int value, String name) {
 
 	@Override
 	public int getValue() {
-		return value;
+		return this.value;
 	}
 
 	@Override
 	public String getName() {
-		return name;
+		return this.name;
 	}
 
 	@Override
diff --git a/io.openems.edge.ess.sma/src/io/openems/edge/sma/enums/OperatingModeForActivePowerLimitation.java b/io.openems.edge.ess.sma/src/io/openems/edge/sma/enums/OperatingModeForActivePowerLimitation.java
index d1dd9e2a776..f74ad344b00 100644
--- a/io.openems.edge.ess.sma/src/io/openems/edge/sma/enums/OperatingModeForActivePowerLimitation.java
+++ b/io.openems.edge.ess.sma/src/io/openems/edge/sma/enums/OperatingModeForActivePowerLimitation.java
@@ -21,12 +21,12 @@ private OperatingModeForActivePowerLimitation(int value, String name) {
 
 	@Override
 	public int getValue() {
-		return value;
+		return this.value;
 	}
 
 	@Override
 	public String getName() {
-		return name;
+		return this.name;
 	}
 
 	@Override
diff --git a/io.openems.edge.ess.sma/src/io/openems/edge/sma/enums/OperatingModeOfActivePowerLimitationAtOverFrequency.java b/io.openems.edge.ess.sma/src/io/openems/edge/sma/enums/OperatingModeOfActivePowerLimitationAtOverFrequency.java
index 658d0f735c3..439ea9b031b 100644
--- a/io.openems.edge.ess.sma/src/io/openems/edge/sma/enums/OperatingModeOfActivePowerLimitationAtOverFrequency.java
+++ b/io.openems.edge.ess.sma/src/io/openems/edge/sma/enums/OperatingModeOfActivePowerLimitationAtOverFrequency.java
@@ -17,12 +17,12 @@ private OperatingModeOfActivePowerLimitationAtOverFrequency(int value, String na
 
 	@Override
 	public int getValue() {
-		return value;
+		return this.value;
 	}
 
 	@Override
 	public String getName() {
-		return name;
+		return this.name;
 	}
 
 	@Override
diff --git a/io.openems.edge.ess.sma/src/io/openems/edge/sma/enums/PowerFeedbackToPublicGridAllowed.java b/io.openems.edge.ess.sma/src/io/openems/edge/sma/enums/PowerFeedbackToPublicGridAllowed.java
index 794ad37473b..b2243ea629f 100644
--- a/io.openems.edge.ess.sma/src/io/openems/edge/sma/enums/PowerFeedbackToPublicGridAllowed.java
+++ b/io.openems.edge.ess.sma/src/io/openems/edge/sma/enums/PowerFeedbackToPublicGridAllowed.java
@@ -6,7 +6,7 @@ public enum PowerFeedbackToPublicGridAllowed implements OptionsEnum {
 	UNDEFINED(-1, "Undefined"), //
 	YES(1129, "Yes"), //
 	NO(1130, "No");
-	
+
 	private final int value;
 	private final String name;
 
@@ -17,12 +17,12 @@ private PowerFeedbackToPublicGridAllowed(int value, String name) {
 
 	@Override
 	public int getValue() {
-		return value;
+		return this.value;
 	}
 
 	@Override
 	public String getName() {
-		return name;
+		return this.name;
 	}
 
 	@Override
diff --git a/io.openems.edge.ess.sma/src/io/openems/edge/sma/enums/PowerSupplyStatus.java b/io.openems.edge.ess.sma/src/io/openems/edge/sma/enums/PowerSupplyStatus.java
index a663359caaa..23580335438 100644
--- a/io.openems.edge.ess.sma/src/io/openems/edge/sma/enums/PowerSupplyStatus.java
+++ b/io.openems.edge.ess.sma/src/io/openems/edge/sma/enums/PowerSupplyStatus.java
@@ -19,12 +19,12 @@ private PowerSupplyStatus(int value, String name) {
 
 	@Override
 	public int getValue() {
-		return value;
+		return this.value;
 	}
 
 	@Override
 	public String getName() {
-		return name;
+		return this.name;
 	}
 
 	@Override
diff --git a/io.openems.edge.ess.sma/src/io/openems/edge/sma/enums/PvMainsConnection.java b/io.openems.edge.ess.sma/src/io/openems/edge/sma/enums/PvMainsConnection.java
index 3b001978f7f..c821c6555f9 100644
--- a/io.openems.edge.ess.sma/src/io/openems/edge/sma/enums/PvMainsConnection.java
+++ b/io.openems.edge.ess.sma/src/io/openems/edge/sma/enums/PvMainsConnection.java
@@ -18,12 +18,12 @@ private PvMainsConnection(int value, String name) {
 
 	@Override
 	public int getValue() {
-		return value;
+		return this.value;
 	}
 
 	@Override
 	public String getName() {
-		return name;
+		return this.name;
 	}
 
 	@Override
diff --git a/io.openems.edge.ess.sma/src/io/openems/edge/sma/enums/ReasonForGeneratorRequest.java b/io.openems.edge.ess.sma/src/io/openems/edge/sma/enums/ReasonForGeneratorRequest.java
index 29941c25ded..890a2ab78f5 100644
--- a/io.openems.edge.ess.sma/src/io/openems/edge/sma/enums/ReasonForGeneratorRequest.java
+++ b/io.openems.edge.ess.sma/src/io/openems/edge/sma/enums/ReasonForGeneratorRequest.java
@@ -21,12 +21,12 @@ private ReasonForGeneratorRequest(int value, String name) {
 
 	@Override
 	public int getValue() {
-		return value;
+		return this.value;
 	}
 
 	@Override
 	public String getName() {
-		return name;
+		return this.name;
 	}
 
 	@Override
diff --git a/io.openems.edge.ess.sma/src/io/openems/edge/sma/enums/RepetitionCycleOfTheControlledInverter.java b/io.openems.edge.ess.sma/src/io/openems/edge/sma/enums/RepetitionCycleOfTheControlledInverter.java
index 5eaf067c063..f48b8329887 100644
--- a/io.openems.edge.ess.sma/src/io/openems/edge/sma/enums/RepetitionCycleOfTheControlledInverter.java
+++ b/io.openems.edge.ess.sma/src/io/openems/edge/sma/enums/RepetitionCycleOfTheControlledInverter.java
@@ -18,12 +18,12 @@ private RepetitionCycleOfTheControlledInverter(int value, String name) {
 
 	@Override
 	public int getValue() {
-		return value;
+		return this.value;
 	}
 
 	@Override
 	public String getName() {
-		return name;
+		return this.name;
 	}
 
 	@Override
diff --git a/io.openems.edge.ess.sma/src/io/openems/edge/sma/enums/RepetitionCycleOfTheTimeControlledGeneratorOperation.java b/io.openems.edge.ess.sma/src/io/openems/edge/sma/enums/RepetitionCycleOfTheTimeControlledGeneratorOperation.java
index 182b5343058..391f9be4ef0 100644
--- a/io.openems.edge.ess.sma/src/io/openems/edge/sma/enums/RepetitionCycleOfTheTimeControlledGeneratorOperation.java
+++ b/io.openems.edge.ess.sma/src/io/openems/edge/sma/enums/RepetitionCycleOfTheTimeControlledGeneratorOperation.java
@@ -18,12 +18,12 @@ private RepetitionCycleOfTheTimeControlledGeneratorOperation(int value, String n
 
 	@Override
 	public int getValue() {
-		return value;
+		return this.value;
 	}
 
 	@Override
 	public String getName() {
-		return name;
+		return this.name;
 	}
 
 	@Override
diff --git a/io.openems.edge.ess.sma/src/io/openems/edge/sma/enums/RiseInSelfConsumptionSwitchedOn.java b/io.openems.edge.ess.sma/src/io/openems/edge/sma/enums/RiseInSelfConsumptionSwitchedOn.java
index 7a8cd711384..25d833f1a32 100644
--- a/io.openems.edge.ess.sma/src/io/openems/edge/sma/enums/RiseInSelfConsumptionSwitchedOn.java
+++ b/io.openems.edge.ess.sma/src/io/openems/edge/sma/enums/RiseInSelfConsumptionSwitchedOn.java
@@ -17,12 +17,12 @@ private RiseInSelfConsumptionSwitchedOn(int value, String name) {
 
 	@Override
 	public int getValue() {
-		return value;
+		return this.value;
 	}
 
 	@Override
 	public String getName() {
-		return name;
+		return this.name;
 	}
 
 	@Override
diff --git a/io.openems.edge.ess.sma/src/io/openems/edge/sma/enums/SetControlMode.java b/io.openems.edge.ess.sma/src/io/openems/edge/sma/enums/SetControlMode.java
index 00b3f6393b6..bb610541f8b 100644
--- a/io.openems.edge.ess.sma/src/io/openems/edge/sma/enums/SetControlMode.java
+++ b/io.openems.edge.ess.sma/src/io/openems/edge/sma/enums/SetControlMode.java
@@ -17,12 +17,12 @@ private SetControlMode(int value, String name) {
 
 	@Override
 	public int getValue() {
-		return value;
+		return this.value;
 	}
 
 	@Override
 	public String getName() {
-		return name;
+		return this.name;
 	}
 
 	@Override
diff --git a/io.openems.edge.ess.sma/src/io/openems/edge/sma/enums/SpeedWireConnectionStatusOfNetworkTerminalA.java b/io.openems.edge.ess.sma/src/io/openems/edge/sma/enums/SpeedWireConnectionStatusOfNetworkTerminalA.java
index 7b97a2d594a..17ea4fa0325 100644
--- a/io.openems.edge.ess.sma/src/io/openems/edge/sma/enums/SpeedWireConnectionStatusOfNetworkTerminalA.java
+++ b/io.openems.edge.ess.sma/src/io/openems/edge/sma/enums/SpeedWireConnectionStatusOfNetworkTerminalA.java
@@ -19,12 +19,12 @@ private SpeedWireConnectionStatusOfNetworkTerminalA(int value, String name) {
 
 	@Override
 	public int getValue() {
-		return value;
+		return this.value;
 	}
 
 	@Override
 	public String getName() {
-		return name;
+		return this.name;
 	}
 
 	@Override
diff --git a/io.openems.edge.ess.sma/src/io/openems/edge/sma/enums/StatusBatteryApplicationArea.java b/io.openems.edge.ess.sma/src/io/openems/edge/sma/enums/StatusBatteryApplicationArea.java
index f6fd227e63f..bd2c21604fb 100644
--- a/io.openems.edge.ess.sma/src/io/openems/edge/sma/enums/StatusBatteryApplicationArea.java
+++ b/io.openems.edge.ess.sma/src/io/openems/edge/sma/enums/StatusBatteryApplicationArea.java
@@ -20,12 +20,12 @@ private StatusBatteryApplicationArea(int value, String name) {
 
 	@Override
 	public int getValue() {
-		return value;
+		return this.value;
 	}
 
 	@Override
 	public String getName() {
-		return name;
+		return this.name;
 	}
 
 	@Override
diff --git a/io.openems.edge.ess.sma/src/io/openems/edge/sma/enums/StatusDigitalInput.java b/io.openems.edge.ess.sma/src/io/openems/edge/sma/enums/StatusDigitalInput.java
index 58c7bbd7c56..761b3e3b5b4 100644
--- a/io.openems.edge.ess.sma/src/io/openems/edge/sma/enums/StatusDigitalInput.java
+++ b/io.openems.edge.ess.sma/src/io/openems/edge/sma/enums/StatusDigitalInput.java
@@ -17,12 +17,12 @@ private StatusDigitalInput(int value, String name) {
 
 	@Override
 	public int getValue() {
-		return value;
+		return this.value;
 	}
 
 	@Override
 	public String getName() {
-		return name;
+		return this.name;
 	}
 
 	@Override
diff --git a/io.openems.edge.ess.sma/src/io/openems/edge/sma/enums/StatusOfUtilityGrid.java b/io.openems.edge.ess.sma/src/io/openems/edge/sma/enums/StatusOfUtilityGrid.java
index b192a3b2eae..a29ecb7bb37 100644
--- a/io.openems.edge.ess.sma/src/io/openems/edge/sma/enums/StatusOfUtilityGrid.java
+++ b/io.openems.edge.ess.sma/src/io/openems/edge/sma/enums/StatusOfUtilityGrid.java
@@ -24,12 +24,12 @@ private StatusOfUtilityGrid(int value, String name) {
 
 	@Override
 	public int getValue() {
-		return value;
+		return this.value;
 	}
 
 	@Override
 	public String getName() {
-		return name;
+		return this.name;
 	}
 
 	@Override
diff --git a/io.openems.edge.ess.sma/src/io/openems/edge/sma/enums/SystemState.java b/io.openems.edge.ess.sma/src/io/openems/edge/sma/enums/SystemState.java
index ce0456150e4..8c17e16a111 100644
--- a/io.openems.edge.ess.sma/src/io/openems/edge/sma/enums/SystemState.java
+++ b/io.openems.edge.ess.sma/src/io/openems/edge/sma/enums/SystemState.java
@@ -19,12 +19,12 @@ private SystemState(int value, String name) {
 
 	@Override
 	public int getValue() {
-		return value;
+		return this.value;
 	}
 
 	@Override
 	public String getName() {
-		return name;
+		return this.name;
 	}
 
 	@Override
diff --git a/io.openems.edge.ess.sma/src/io/openems/edge/sma/enums/TimeControlledGeneratorOperation.java b/io.openems.edge.ess.sma/src/io/openems/edge/sma/enums/TimeControlledGeneratorOperation.java
index 27109544b59..8b51280c09c 100644
--- a/io.openems.edge.ess.sma/src/io/openems/edge/sma/enums/TimeControlledGeneratorOperation.java
+++ b/io.openems.edge.ess.sma/src/io/openems/edge/sma/enums/TimeControlledGeneratorOperation.java
@@ -17,12 +17,12 @@ private TimeControlledGeneratorOperation(int value, String name) {
 
 	@Override
 	public int getValue() {
-		return value;
+		return this.value;
 	}
 
 	@Override
 	public String getName() {
-		return name;
+		return this.name;
 	}
 
 	@Override
diff --git a/io.openems.edge.ess.sma/src/io/openems/edge/sma/enums/TimeControlledInverterOperation.java b/io.openems.edge.ess.sma/src/io/openems/edge/sma/enums/TimeControlledInverterOperation.java
index b094cc50f84..44c33a52977 100644
--- a/io.openems.edge.ess.sma/src/io/openems/edge/sma/enums/TimeControlledInverterOperation.java
+++ b/io.openems.edge.ess.sma/src/io/openems/edge/sma/enums/TimeControlledInverterOperation.java
@@ -6,7 +6,7 @@ public enum TimeControlledInverterOperation implements OptionsEnum {
 	UNDEFINED(-1, "Undefined"), //
 	YES(1129, "Yes"), //
 	NO(1130, "No");
-	
+
 	private final int value;
 	private final String name;
 
@@ -17,12 +17,12 @@ private TimeControlledInverterOperation(int value, String name) {
 
 	@Override
 	public int getValue() {
-		return value;
+		return this.value;
 	}
 
 	@Override
 	public String getName() {
-		return name;
+		return this.name;
 	}
 
 	@Override
diff --git a/io.openems.edge.ess.sma/src/io/openems/edge/sma/enums/TypeOfACSubdistribution.java b/io.openems.edge.ess.sma/src/io/openems/edge/sma/enums/TypeOfACSubdistribution.java
index 37e37874b80..ae722444dd4 100644
--- a/io.openems.edge.ess.sma/src/io/openems/edge/sma/enums/TypeOfACSubdistribution.java
+++ b/io.openems.edge.ess.sma/src/io/openems/edge/sma/enums/TypeOfACSubdistribution.java
@@ -19,12 +19,12 @@ private TypeOfACSubdistribution(int value, String name) {
 
 	@Override
 	public int getValue() {
-		return value;
+		return this.value;
 	}
 
 	@Override
 	public String getName() {
-		return name;
+		return this.name;
 	}
 
 	@Override
diff --git a/io.openems.edge.ess.sma/test/io/openems/edge/sma/MyConfig.java b/io.openems.edge.ess.sma/test/io/openems/edge/sma/MyConfig.java
index a15c0b27c54..34d0af86833 100644
--- a/io.openems.edge.ess.sma/test/io/openems/edge/sma/MyConfig.java
+++ b/io.openems.edge.ess.sma/test/io/openems/edge/sma/MyConfig.java
@@ -30,7 +30,7 @@ public Builder setPhase(SinglePhase phase) {
 			this.phase = phase;
 			return this;
 		}
-		
+
 		public MyConfig build() {
 			return new MyConfig(this);
 		}
@@ -38,7 +38,7 @@ public MyConfig build() {
 
 	/**
 	 * Create a Config builder.
-	 * 
+	 *
 	 * @return a {@link Builder}
 	 */
 	public static Builder create() {

From 9e0b425939666eb0bb348cf45be2f261d3990f43 Mon Sep 17 00:00:00 2001
From: Stefan Feilmeier <stefan.feilmeier@fenecon.de>
Date: Tue, 8 Mar 2022 11:28:06 +0100
Subject: [PATCH 62/96] Update io.openems.edge.evcs.api

---
 .../openems/edge/evcs/api/ChargingType.java   |  4 +-
 .../src/io/openems/edge/evcs/api/Evcs.java    | 32 ++++----
 .../io/openems/edge/evcs/api/EvcsPower.java   |  4 +-
 .../io/openems/edge/evcs/api/ManagedEvcs.java | 41 +++++-----
 .../openems/edge/evcs/api/MeasuringEvcs.java  | 80 +++++++++----------
 .../src/io/openems/edge/evcs/api/SocEvcs.java |  6 +-
 .../src/io/openems/edge/evcs/api/Status.java  |  4 +-
 .../edge/evcs/test/DummyManagedEvcs.java      |  2 +-
 8 files changed, 86 insertions(+), 87 deletions(-)

diff --git a/io.openems.edge.evcs.api/src/io/openems/edge/evcs/api/ChargingType.java b/io.openems.edge.evcs.api/src/io/openems/edge/evcs/api/ChargingType.java
index 83ad8c8a4f8..093c0ef2e54 100644
--- a/io.openems.edge.evcs.api/src/io/openems/edge/evcs/api/ChargingType.java
+++ b/io.openems.edge.evcs.api/src/io/openems/edge/evcs/api/ChargingType.java
@@ -16,12 +16,12 @@ private ChargingType(int value, String name) {
 
 	@Override
 	public int getValue() {
-		return value;
+		return this.value;
 	}
 
 	@Override
 	public String getName() {
-		return name;
+		return this.name;
 	}
 
 	@Override
diff --git a/io.openems.edge.evcs.api/src/io/openems/edge/evcs/api/Evcs.java b/io.openems.edge.evcs.api/src/io/openems/edge/evcs/api/Evcs.java
index cceac73e5cc..35624242a09 100644
--- a/io.openems.edge.evcs.api/src/io/openems/edge/evcs/api/Evcs.java
+++ b/io.openems.edge.evcs.api/src/io/openems/edge/evcs/api/Evcs.java
@@ -21,10 +21,10 @@ public enum ChannelId implements io.openems.edge.common.channel.ChannelId {
 
 		/**
 		 * Status.
-		 * 
+		 *
 		 * <p>
 		 * The Status of the EVCS charging station.
-		 * 
+		 *
 		 * <ul>
 		 * <li>Interface: Evcs
 		 * <li>Readable
@@ -37,7 +37,7 @@ public enum ChannelId implements io.openems.edge.common.channel.ChannelId {
 
 		/**
 		 * Charge Power.
-		 * 
+		 *
 		 * <ul>
 		 * <li>Interface: Evcs
 		 * <li>Readable
@@ -51,10 +51,10 @@ public enum ChannelId implements io.openems.edge.common.channel.ChannelId {
 
 		/**
 		 * Charging Type.
-		 * 
+		 *
 		 * <p>
 		 * Type of charging.
-		 * 
+		 *
 		 * <ul>
 		 * <li>Interface: Evcs
 		 * <li>Readable
@@ -67,11 +67,11 @@ public enum ChannelId implements io.openems.edge.common.channel.ChannelId {
 
 		/**
 		 * Count of phases, the EV is charging with.
-		 * 
+		 *
 		 * <p>
 		 * This value is derived from the charging station or calculated during the
 		 * charging.
-		 * 
+		 *
 		 * <ul>
 		 * <li>Interface: Evcs
 		 * <li>Readable
@@ -84,11 +84,11 @@ public enum ChannelId implements io.openems.edge.common.channel.ChannelId {
 
 		/**
 		 * Minimum Power valid by the hardware.
-		 * 
+		 *
 		 * <p>
 		 * In the cases that the EVCS can't be controlled, the Minimum will be the
 		 * maximum too.
-		 * 
+		 *
 		 * <ul>
 		 * <li>Interface: Evcs
 		 * <li>Readable
@@ -103,7 +103,7 @@ public enum ChannelId implements io.openems.edge.common.channel.ChannelId {
 
 		/**
 		 * Maximum Power valid by the hardware.
-		 * 
+		 *
 		 * <ul>
 		 * <li>Interface: Evcs
 		 * <li>Readable
@@ -118,7 +118,7 @@ public enum ChannelId implements io.openems.edge.common.channel.ChannelId {
 
 		/**
 		 * Maximum Power defined by software.
-		 * 
+		 *
 		 * <ul>
 		 * <li>Interface: Evcs
 		 * <li>Readable
@@ -133,7 +133,7 @@ public enum ChannelId implements io.openems.edge.common.channel.ChannelId {
 
 		/**
 		 * Minimum Power defined by software.
-		 * 
+		 *
 		 * <ul>
 		 * <li>Interface: Evcs
 		 * <li>Readable
@@ -148,7 +148,7 @@ public enum ChannelId implements io.openems.edge.common.channel.ChannelId {
 
 		/**
 		 * Energy that was charged during the current or last Session.
-		 * 
+		 *
 		 * <ul>
 		 * <li>Interface: Evcs
 		 * <li>Readable
@@ -163,7 +163,7 @@ public enum ChannelId implements io.openems.edge.common.channel.ChannelId {
 
 		/**
 		 * Active Consumption Energy.
-		 * 
+		 *
 		 * <ul>
 		 * <li>Interface: Evcs
 		 * <li>Type: Integer
@@ -177,7 +177,7 @@ public enum ChannelId implements io.openems.edge.common.channel.ChannelId {
 
 		/**
 		 * Failed state channel for a failed communication to the EVCS.
-		 * 
+		 *
 		 * <ul>
 		 * <li>Interface: Evcs
 		 * <li>Readable
@@ -595,7 +595,7 @@ public default void _setChargingstationCommunicationFailed(boolean value) {
 
 	/**
 	 * Returns the modbus table for this nature.
-	 * 
+	 *
 	 * @param accessMode accessMode
 	 * @return nature table
 	 */
diff --git a/io.openems.edge.evcs.api/src/io/openems/edge/evcs/api/EvcsPower.java b/io.openems.edge.evcs.api/src/io/openems/edge/evcs/api/EvcsPower.java
index aaa4efd1353..f6b0cb10157 100644
--- a/io.openems.edge.evcs.api/src/io/openems/edge/evcs/api/EvcsPower.java
+++ b/io.openems.edge.evcs.api/src/io/openems/edge/evcs/api/EvcsPower.java
@@ -6,14 +6,14 @@ public interface EvcsPower {
 
 	/**
 	 * Gets the RampFilter instance with the configured variables.
-	 * 
+	 *
 	 * @return an instance of {@link RampFilter}
 	 */
 	public RampFilter getRampFilter();
 
 	/**
 	 * Gets the current increase rate.
-	 * 
+	 *
 	 * @return increase rate
 	 */
 	public float getIncreaseRate();
diff --git a/io.openems.edge.evcs.api/src/io/openems/edge/evcs/api/ManagedEvcs.java b/io.openems.edge.evcs.api/src/io/openems/edge/evcs/api/ManagedEvcs.java
index eb1db5061cd..fc83337d063 100644
--- a/io.openems.edge.evcs.api/src/io/openems/edge/evcs/api/ManagedEvcs.java
+++ b/io.openems.edge.evcs.api/src/io/openems/edge/evcs/api/ManagedEvcs.java
@@ -14,7 +14,6 @@
 import io.openems.edge.common.channel.IntegerWriteChannel;
 import io.openems.edge.common.channel.StringWriteChannel;
 import io.openems.edge.common.channel.value.Value;
-import io.openems.edge.common.filter.RampFilter;
 import io.openems.edge.common.modbusslave.ModbusSlaveNatureTable;
 import io.openems.edge.common.modbusslave.ModbusType;
 import io.openems.edge.common.type.TypeUtils;
@@ -28,7 +27,7 @@ public enum ChannelId implements io.openems.edge.common.channel.ChannelId {
 
 		/**
 		 * Gets the smallest power steps that can be set (given in W).
-		 * 
+		 *
 		 * <p>
 		 * Example:
 		 * <ul>
@@ -36,7 +35,7 @@ public enum ChannelId implements io.openems.edge.common.channel.ChannelId {
 		 * (0.001A * 230V).
 		 * <li>Hardy Barth allows setting in Ampere. It should return 230 W (1A * 230V).
 		 * </ul>
-		 * 
+		 *
 		 * <p>
 		 * <ul>
 		 * <li>Interface: ManagedEvcs
@@ -52,7 +51,7 @@ public enum ChannelId implements io.openems.edge.common.channel.ChannelId {
 
 		/**
 		 * Sets the charge power limit of the EVCS in [W].
-		 * 
+		 *
 		 * <p>
 		 * Actual charge power depends on
 		 * <ul>
@@ -62,7 +61,7 @@ public enum ChannelId implements io.openems.edge.common.channel.ChannelId {
 		 * <li>limit of power line
 		 * <li>...
 		 * </ul>
-		 * 
+		 *
 		 * <p>
 		 * Function:
 		 * <ul>
@@ -70,7 +69,7 @@ public enum ChannelId implements io.openems.edge.common.channel.ChannelId {
 		 * <li>Read value should contain the currently valid loading target that was
 		 * sent
 		 * </ul>
-		 * 
+		 *
 		 * <ul>
 		 * <li>Interface: ManagedEvcs
 		 * <li>Writable
@@ -86,7 +85,7 @@ public enum ChannelId implements io.openems.edge.common.channel.ChannelId {
 		/**
 		 * Applies the configured filter in {@link EvcsPowerComponent} and sets a the
 		 * charge power limit.
-		 * 
+		 *
 		 * <ul>
 		 * <li>Interface: ManagedEvcs
 		 * <li>Writable
@@ -100,15 +99,15 @@ public enum ChannelId implements io.openems.edge.common.channel.ChannelId {
 					((IntegerWriteChannel) channel).onSetNextWrite(value -> {
 
 						if (value != null) {
-							ManagedEvcs evcs = (ManagedEvcs) channel.getComponent();
+							var evcs = (ManagedEvcs) channel.getComponent();
 
-							RampFilter rampFilter = evcs.getEvcsPower().getRampFilter();
+							var rampFilter = evcs.getEvcsPower().getRampFilter();
 
 							value = TypeUtils.fitWithin(evcs.getMinimumHardwarePower().orElse(0),
 									evcs.getMaximumHardwarePower().orElse(0), value);
 
 							int currentPower = evcs.getChargePower().orElse(0);
-							float increaseRate = evcs.getEvcsPower().getIncreaseRate();
+							var increaseRate = evcs.getEvcsPower().getIncreaseRate();
 							int result = rampFilter.getFilteredValueAsInteger(currentPower, value.floatValue(),
 									evcs.getMaximumHardwarePower().orElse(22080), increaseRate);
 
@@ -119,7 +118,7 @@ public enum ChannelId implements io.openems.edge.common.channel.ChannelId {
 
 		/**
 		 * Is true if the EVCS is in a EVCS-Cluster.
-		 * 
+		 *
 		 * <ul>
 		 * <li>Interface: ManagedEvcs
 		 * <li>Readable
@@ -132,11 +131,11 @@ public enum ChannelId implements io.openems.edge.common.channel.ChannelId {
 
 		/**
 		 * Sets a Text that is shown on the display of the EVCS.
-		 * 
+		 *
 		 * <p>
 		 * Be aware that the EVCS might not have a display or the text might be
 		 * restricted.
-		 * 
+		 *
 		 * <ul>
 		 * <li>Interface: ManagedEvcs
 		 * <li>Writable
@@ -149,7 +148,7 @@ public enum ChannelId implements io.openems.edge.common.channel.ChannelId {
 		/**
 		 * Sets a request for a charge power. The limit is not directly activated by
 		 * this call.
-		 * 
+		 *
 		 * <ul>
 		 * <li>Interface: ManagedEvcs
 		 * <li>Writable
@@ -163,7 +162,7 @@ public enum ChannelId implements io.openems.edge.common.channel.ChannelId {
 
 		/**
 		 * Sets the energy limit for the current or next session in [Wh].
-		 * 
+		 *
 		 * <ul>
 		 * <li>Interface: ManagedEvcs
 		 * <li>Writable
@@ -268,7 +267,7 @@ public default void _setSetChargePowerLimit(int value) {
 	/**
 	 * Sets the charge power limit of the EVCS in [W]. See
 	 * {@link ChannelId#SET_CHARGE_POWER_LIMIT}.
-	 * 
+	 *
 	 * @param value the next write value
 	 * @throws OpenemsNamedException on error
 	 */
@@ -318,7 +317,7 @@ public default void _setSetChargePowerLimitWithFilter(int value) {
 	/**
 	 * Sets the charge power limit of the EVCS in [W] with applied filter. See
 	 * {@link ChannelId#SET_CHARGE_POWER_LIMIT_WITH_FILTER}.
-	 * 
+	 *
 	 * @param value the next write value
 	 * @throws OpenemsNamedException on error
 	 */
@@ -387,7 +386,7 @@ public default void _setSetDisplayText(String value) {
 	/**
 	 * Sets a Text that is shown on the display of the EVCS. See
 	 * {@link ChannelId#SET_DISPLAY_TEXT}.
-	 * 
+	 *
 	 * @param value the next write value
 	 * @throws OpenemsNamedException on error
 	 */
@@ -437,7 +436,7 @@ public default void _setSetChargePowerRequest(int value) {
 	/**
 	 * Sets the request for a charge power in [W]. The limit is not directly
 	 * activated by this call. See {@link ChannelId#SET_CHARGE_POWER_REQUEST}.
-	 * 
+	 *
 	 * @param value the next write value
 	 * @throws OpenemsNamedException on error
 	 */
@@ -487,7 +486,7 @@ public default void _setSetEnergyLimit(int value) {
 	/**
 	 * Sets the energy limit for the current or next session in [Wh]. See
 	 * {@link ChannelId#SET_ENERGY_LIMIT}.
-	 * 
+	 *
 	 * @param value the next write value
 	 * @throws OpenemsNamedException on error
 	 */
@@ -497,7 +496,7 @@ public default void setEnergyLimit(Integer value) throws OpenemsNamedException {
 
 	/**
 	 * Returns the modbus table for this nature.
-	 * 
+	 *
 	 * @param accessMode accessMode
 	 * @return nature table
 	 */
diff --git a/io.openems.edge.evcs.api/src/io/openems/edge/evcs/api/MeasuringEvcs.java b/io.openems.edge.evcs.api/src/io/openems/edge/evcs/api/MeasuringEvcs.java
index 4715ed0eb5a..6c9386ee4c2 100644
--- a/io.openems.edge.evcs.api/src/io/openems/edge/evcs/api/MeasuringEvcs.java
+++ b/io.openems.edge.evcs.api/src/io/openems/edge/evcs/api/MeasuringEvcs.java
@@ -12,10 +12,10 @@ public enum ChannelId implements io.openems.edge.common.channel.ChannelId {
 
 		/**
 		 * Current to grid (export).
-		 * 
+		 *
 		 * <p>
 		 * Instantaneous current flow from EV
-		 * 
+		 *
 		 * <ul>
 		 * <li>Interface: MeasuringEvcs
 		 * <li>Readable
@@ -31,10 +31,10 @@ public enum ChannelId implements io.openems.edge.common.channel.ChannelId {
 
 		/**
 		 * Current to ev (import).
-		 * 
+		 *
 		 * <p>
 		 * Instantaneous current flow to EV
-		 * 
+		 *
 		 * <ul>
 		 * <li>Interface: MeasuringEvcs
 		 * <li>Readable
@@ -50,10 +50,10 @@ public enum ChannelId implements io.openems.edge.common.channel.ChannelId {
 
 		/**
 		 * Current offered.
-		 * 
+		 *
 		 * <p>
 		 * Maximum current offered to EV
-		 * 
+		 *
 		 * <ul>
 		 * <li>Interface: MeasuringEvcs
 		 * <li>Readable
@@ -69,12 +69,12 @@ public enum ChannelId implements io.openems.edge.common.channel.ChannelId {
 
 		/**
 		 * Active energy to grid (export).
-		 * 
+		 *
 		 * <p>
 		 * Numerical value read from the "active electrical energy" (Wh) register of the
 		 * (most authoritative) electrical meter measuring the total energy exported (to
 		 * the grid).
-		 * 
+		 *
 		 * <ul>
 		 * <li>Interface: MeasuringEvcs
 		 * <li>Readable
@@ -90,12 +90,12 @@ public enum ChannelId implements io.openems.edge.common.channel.ChannelId {
 
 		/**
 		 * Active energy to ev (import).
-		 * 
+		 *
 		 * <p>
 		 * Numerical value read from the "active electrical energy" (Wh) register of the
 		 * (most authoritative) electrical meter measuring the total energy imported
 		 * (from the grid supply).
-		 * 
+		 *
 		 * <ul>
 		 * <li>Interface: MeasuringEvcs
 		 * <li>Readable
@@ -111,12 +111,12 @@ public enum ChannelId implements io.openems.edge.common.channel.ChannelId {
 
 		/**
 		 * Reactive energy to grid (export).
-		 * 
+		 *
 		 * <p>
 		 * Numerical value read from the "reactive electrical energy" (VARh or kVARh)
 		 * register of the (most authoritative) electrical meter measuring energy
 		 * exported (to the grid).
-		 * 
+		 *
 		 * <ul>
 		 * <li>Interface: MeasuringEvcs
 		 * <li>Readable
@@ -132,12 +132,12 @@ public enum ChannelId implements io.openems.edge.common.channel.ChannelId {
 
 		/**
 		 * Reactive energy to EV (import).
-		 * 
+		 *
 		 * <p>
 		 * Numerical value read from the "reactive electrical energy" (VARh or kVARh)
 		 * register of the (most authoritative) electrical meter measuring energy
 		 * imported (from the grid supply).
-		 * 
+		 *
 		 * <ul>
 		 * <li>Interface: MeasuringEvcs
 		 * <li>Readable
@@ -153,13 +153,13 @@ public enum ChannelId implements io.openems.edge.common.channel.ChannelId {
 
 		/**
 		 * Active energy to grid (export) in an interval.
-		 * 
+		 *
 		 * <p>
 		 * Absolute amount of "active electrical energy" (Wh or kWh) exported (to the
 		 * grid) during an associated time "interval", specified by a Metervalues
 		 * ReadingContext, and applicable interval duration configuration values (in
 		 * seconds) for "ClockAlignedDataInterval" and "MeterValueSampleInterval".
-		 * 
+		 *
 		 * <ul>
 		 * <li>Interface: MeasuringEvcs
 		 * <li>Readable
@@ -175,13 +175,13 @@ public enum ChannelId implements io.openems.edge.common.channel.ChannelId {
 
 		/**
 		 * Active energy to EV (import) in an interval.
-		 * 
+		 *
 		 * <p>
 		 * Absolute amount of "active electrical energy" (Wh or kWh) imported (from the
 		 * grid supply) during an associated time "interval", specified by a Metervalues
 		 * ReadingContext, and applicable interval duration configuration values (in
 		 * seconds) for "ClockAlignedDataInterval" and "MeterValueSampleInterval".
-		 * 
+		 *
 		 * <ul>
 		 * <li>Interface: MeasuringEvcs
 		 * <li>Readable
@@ -197,13 +197,13 @@ public enum ChannelId implements io.openems.edge.common.channel.ChannelId {
 
 		/**
 		 * Reactive energy to grid (export) in an interval.
-		 * 
+		 *
 		 * <p>
 		 * Absolute amount of "reactive electrical energy" (VARh or kVARh) exported (to
 		 * the grid) during an associated time "interval", specified by a Metervalues
 		 * ReadingContext, and applicable interval duration configuration values (in
 		 * seconds) for "ClockAlignedDataInterval" and "MeterValueSampleInterval".
-		 * 
+		 *
 		 * <ul>
 		 * <li>Interface: MeasuringEvcs
 		 * <li>Readable
@@ -219,14 +219,14 @@ public enum ChannelId implements io.openems.edge.common.channel.ChannelId {
 
 		/**
 		 * Reactive energy to EV (import) in an interval.
-		 * 
+		 *
 		 * <p>
 		 * Absolute amount of "reactive electrical energy" (VARh or kVARh) imported
 		 * (from the grid supply) during an associated time "interval", specified by a
 		 * Metervalues ReadingContext, and applicable interval duration configuration
 		 * values (in seconds) for "ClockAlignedDataInterval" and
 		 * "MeterValueSampleInterval".
-		 * 
+		 *
 		 * <ul>
 		 * <li>Interface: MeasuringEvcs
 		 * <li>Readable
@@ -242,12 +242,12 @@ public enum ChannelId implements io.openems.edge.common.channel.ChannelId {
 
 		/**
 		 * Frequency.
-		 * 
+		 *
 		 * <p>
 		 * Instantaneous reading of powerline frequency. NOTE: OCPP 1.6 does not have a
 		 * UnitOfMeasure for frequency, the UnitOfMeasure for any SampledValue with
 		 * measurand: Frequency is Hertz.
-		 * 
+		 *
 		 * <ul>
 		 * <li>Interface: MeasuringEvcs
 		 * <li>Readable
@@ -263,10 +263,10 @@ public enum ChannelId implements io.openems.edge.common.channel.ChannelId {
 
 		/**
 		 * Active power to grid (export)
-		 * 
+		 *
 		 * <p>
 		 * Instantaneous active power exported by EV. (W or kW)
-		 * 
+		 *
 		 * <ul>
 		 * <li>Interface: MeasuringEvcs
 		 * <li>Readable
@@ -282,10 +282,10 @@ public enum ChannelId implements io.openems.edge.common.channel.ChannelId {
 
 		/**
 		 * Power factor.
-		 * 
+		 *
 		 * <p>
 		 * Instantaneous power factor of total energy flow
-		 * 
+		 *
 		 * <ul>
 		 * <li>Interface: MeasuringEvcs
 		 * <li>Readable
@@ -299,10 +299,10 @@ public enum ChannelId implements io.openems.edge.common.channel.ChannelId {
 
 		/**
 		 * Power offered.
-		 * 
+		 *
 		 * <p>
 		 * Maximum power offered to EV
-		 * 
+		 *
 		 * <ul>
 		 * <li>Interface: MeasuringEvcs
 		 * <li>Readable
@@ -318,10 +318,10 @@ public enum ChannelId implements io.openems.edge.common.channel.ChannelId {
 
 		/**
 		 * Reactive power to grid (export).
-		 * 
+		 *
 		 * <p>
 		 * Instantaneous reactive power exported by EV. (var or kvar)
-		 * 
+		 *
 		 * <ul>
 		 * <li>Interface: MeasuringEvcs
 		 * <li>Readable
@@ -337,10 +337,10 @@ public enum ChannelId implements io.openems.edge.common.channel.ChannelId {
 
 		/**
 		 * Reactive power to EV (import).
-		 * 
+		 *
 		 * <p>
 		 * Instantaneous reactive power imported by EV. (var or kvar)
-		 * 
+		 *
 		 * <ul>
 		 * <li>Interface: MeasuringEvcs
 		 * <li>Readable
@@ -356,10 +356,10 @@ public enum ChannelId implements io.openems.edge.common.channel.ChannelId {
 
 		/**
 		 * Fan speed.
-		 * 
+		 *
 		 * <p>
 		 * Fan speed in RPM
-		 * 
+		 *
 		 * <ul>
 		 * <li>Interface: MeasuringEvcs
 		 * <li>Readable
@@ -373,10 +373,10 @@ public enum ChannelId implements io.openems.edge.common.channel.ChannelId {
 
 		/**
 		 * Voltage.
-		 * 
+		 *
 		 * <p>
 		 * Instantaneous AC RMS supply voltage.
-		 * 
+		 *
 		 * <ul>
 		 * <li>Interface: MeasuringEvcs
 		 * <li>Readable
@@ -390,10 +390,10 @@ public enum ChannelId implements io.openems.edge.common.channel.ChannelId {
 
 		/**
 		 * Temperature.
-		 * 
+		 *
 		 * <p>
 		 * Temperature reading inside Charge Point.
-		 * 
+		 *
 		 * <ul>
 		 * <li>Interface: MeasuringEvcs
 		 * <li>Readable
diff --git a/io.openems.edge.evcs.api/src/io/openems/edge/evcs/api/SocEvcs.java b/io.openems.edge.evcs.api/src/io/openems/edge/evcs/api/SocEvcs.java
index 267506071b8..1a2970e8e11 100644
--- a/io.openems.edge.evcs.api/src/io/openems/edge/evcs/api/SocEvcs.java
+++ b/io.openems.edge.evcs.api/src/io/openems/edge/evcs/api/SocEvcs.java
@@ -16,10 +16,10 @@ public enum ChannelId implements io.openems.edge.common.channel.ChannelId {
 
 		/**
 		 * Current SoC.
-		 * 
+		 *
 		 * <p>
 		 * The current state of charge of the car
-		 * 
+		 *
 		 * <ul>
 		 * <li>Interface: SocEvcs
 		 * <li>Readable
@@ -85,7 +85,7 @@ public default void _setSoc(int value) {
 
 	/**
 	 * Returns the modbus table for this nature.
-	 * 
+	 *
 	 * @param accessMode accessMode
 	 * @return nature table
 	 */
diff --git a/io.openems.edge.evcs.api/src/io/openems/edge/evcs/api/Status.java b/io.openems.edge.evcs.api/src/io/openems/edge/evcs/api/Status.java
index 558cb1806e3..25b03312e5e 100644
--- a/io.openems.edge.evcs.api/src/io/openems/edge/evcs/api/Status.java
+++ b/io.openems.edge.evcs.api/src/io/openems/edge/evcs/api/Status.java
@@ -29,12 +29,12 @@ private Status(int value, String name) {
 
 	@Override
 	public int getValue() {
-		return value;
+		return this.value;
 	}
 
 	@Override
 	public String getName() {
-		return name;
+		return this.name;
 	}
 
 	@Override
diff --git a/io.openems.edge.evcs.api/src/io/openems/edge/evcs/test/DummyManagedEvcs.java b/io.openems.edge.evcs.api/src/io/openems/edge/evcs/test/DummyManagedEvcs.java
index 1276a132ae4..4068d077259 100644
--- a/io.openems.edge.evcs.api/src/io/openems/edge/evcs/test/DummyManagedEvcs.java
+++ b/io.openems.edge.evcs.api/src/io/openems/edge/evcs/test/DummyManagedEvcs.java
@@ -13,7 +13,7 @@ public class DummyManagedEvcs extends AbstractOpenemsComponent implements Evcs,
 
 	/**
 	 * Constructor.
-	 * 
+	 *
 	 * @param id id
 	 */
 	public DummyManagedEvcs(String id, EvcsPower evcsPower) {

From 27786575ef9d8642e3d2c6ca5eaa247ff80ca76f Mon Sep 17 00:00:00 2001
From: Stefan Feilmeier <stefan.feilmeier@fenecon.de>
Date: Tue, 8 Mar 2022 11:32:04 +0100
Subject: [PATCH 63/96] Update io.openems.edge.evcs.cluster

---
 .../evcs/cluster/AbstractEvcsCluster.java     | 46 +++++++-------
 .../edge/evcs/cluster/ConfigPeakShaving.java  |  8 +--
 .../evcs/cluster/EvcsClusterPeakShaving.java  | 61 +++++++++----------
 .../cluster/EvcsClusterSelfConsumption.java   | 35 +++++------
 .../edge/evcs/cluster/EvcsClusterTest.java    | 26 ++++----
 .../evcs/cluster/MyConfigPeakShaving.java     | 16 -----
 6 files changed, 85 insertions(+), 107 deletions(-)

diff --git a/io.openems.edge.evcs.cluster/src/io/openems/edge/evcs/cluster/AbstractEvcsCluster.java b/io.openems.edge.evcs.cluster/src/io/openems/edge/evcs/cluster/AbstractEvcsCluster.java
index af221802aea..3b3da458427 100644
--- a/io.openems.edge.evcs.cluster/src/io/openems/edge/evcs/cluster/AbstractEvcsCluster.java
+++ b/io.openems.edge.evcs.cluster/src/io/openems/edge/evcs/cluster/AbstractEvcsCluster.java
@@ -2,7 +2,6 @@
 
 import java.util.ArrayList;
 import java.util.List;
-import java.util.Optional;
 
 import org.osgi.service.component.ComponentContext;
 import org.osgi.service.event.Event;
@@ -20,7 +19,6 @@
 import io.openems.edge.common.event.EdgeEventConstants;
 import io.openems.edge.evcs.api.Evcs;
 import io.openems.edge.evcs.api.ManagedEvcs;
-import io.openems.edge.evcs.api.Status;
 
 public abstract class AbstractEvcsCluster extends AbstractOpenemsComponent
 		implements OpenemsComponent, EventHandler, Evcs {
@@ -89,10 +87,10 @@ public void handleEvent(Event event) {
 	 * values of this clustered EVCS.
 	 */
 	private void calculateChannelValues() {
-		final CalculateIntegerSum chargePower = new CalculateIntegerSum();
-		final CalculateIntegerSum minHardwarePower = new CalculateIntegerSum();
-		final CalculateIntegerSum maxHardwarePowerOfAll = new CalculateIntegerSum();
-		final CalculateIntegerSum minPower = new CalculateIntegerSum();
+		final var chargePower = new CalculateIntegerSum();
+		final var minHardwarePower = new CalculateIntegerSum();
+		final var maxHardwarePowerOfAll = new CalculateIntegerSum();
+		final var minPower = new CalculateIntegerSum();
 
 		for (Evcs evcs : this.getSortedEvcss()) {
 			chargePower.addValue(evcs.getChargePowerChannel());
@@ -103,7 +101,7 @@ private void calculateChannelValues() {
 
 		this._setChargePower(chargePower.calculate());
 		this._setMinimumHardwarePower(minHardwarePower.calculate());
-		Integer maximalUsedHardwarePower = maxHardwarePowerOfAll.calculate();
+		var maximalUsedHardwarePower = maxHardwarePowerOfAll.calculate();
 		if (maximalUsedHardwarePower == null) {
 			maximalUsedHardwarePower = this.getMaximumPowerToDistribute();
 		}
@@ -118,7 +116,7 @@ private void calculateChannelValues() {
 	 */
 	protected void limitEvcss() {
 		try {
-			int totalPowerLimit = this.getMaximumPowerToDistribute();
+			var totalPowerLimit = this.getMaximumPowerToDistribute();
 			this.channel(ChannelId.MAXIMUM_POWER_TO_DISTRIBUTE).setNextValue(totalPowerLimit);
 
 			/*
@@ -134,7 +132,7 @@ protected void limitEvcss() {
 			this.logInfoInDebugmode(this.log, "Maximum total power to distribute: " + totalPowerLimit);
 
 			// Total Power that can be distributed to EVCSs minus the guaranteed power.
-			int totalPowerLeftMinusGuarantee = totalPowerLimit;
+			var totalPowerLeftMinusGuarantee = totalPowerLimit;
 
 			/*
 			 * Defines the active charging stations that are charging.
@@ -142,7 +140,7 @@ protected void limitEvcss() {
 			List<ManagedEvcs> activeEvcss = new ArrayList<>();
 			for (Evcs evcs : this.getSortedEvcss()) {
 				if (evcs instanceof ManagedEvcs) {
-					ManagedEvcs managedEvcs = (ManagedEvcs) evcs;
+					var managedEvcs = (ManagedEvcs) evcs;
 					int requestedPower = managedEvcs.getSetChargePowerRequestChannel().getNextWriteValue().orElse(0);
 
 					if (requestedPower <= 0) {
@@ -150,8 +148,8 @@ protected void limitEvcss() {
 						continue;
 					}
 
-					int guaranteedPower = getGuaranteedPower(managedEvcs);
-					Status status = managedEvcs.getStatus();
+					var guaranteedPower = this.getGuaranteedPower(managedEvcs);
+					var status = managedEvcs.getStatus();
 					switch (status) {
 					case CHARGING_FINISHED:
 						managedEvcs.setChargePowerLimit(requestedPower);
@@ -201,12 +199,12 @@ protected void limitEvcss() {
 				int guaranteedPower = evcs.getMinimumPowerChannel().getNextValue().orElse(0);
 
 				// Power left for the this EVCS including its guaranteed power
-				final int powerLeft = totalPowerLeftMinusGuarantee + guaranteedPower;
+				final var powerLeft = totalPowerLeftMinusGuarantee + guaranteedPower;
 
 				int maximumHardwareLimit = evcs.getMaximumHardwarePower().orElse(DEFAULT_HARDWARE_LIMIT);
 
 				int nextChargePower;
-				Optional<Integer> requestedPower = evcs.getSetChargePowerRequestChannel().getNextWriteValue();
+				var requestedPower = evcs.getSetChargePowerRequestChannel().getNextWriteValue();
 
 				// Power requested by the controller
 				if (requestedPower.isPresent()) {
@@ -249,12 +247,12 @@ protected void limitEvcss() {
 
 	/**
 	 * Results the power that should be guaranteed for one EVCS.
-	 * 
+	 *
 	 * @param evcs EVCS whose limits should be used.
 	 * @return Guaranteed power that should/can be used.
 	 */
 	private int getGuaranteedPower(Evcs evcs) {
-		int minGuarantee = this.getMinimumChargePowerGuarantee();
+		var minGuarantee = this.getMinimumChargePowerGuarantee();
 		int minHW = evcs.getMinimumHardwarePower().orElse(minGuarantee);
 		int evcsMaxPower = evcs.getMaximumPower().orElse(evcs.getMaximumHardwarePower().orElse(DEFAULT_HARDWARE_LIMIT));
 		minGuarantee = evcsMaxPower > minGuarantee ? minGuarantee : evcsMaxPower;
@@ -263,44 +261,44 @@ private int getGuaranteedPower(Evcs evcs) {
 
 	/**
 	 * Sorted list of the EVCSs in the cluster.
-	 * 
+	 *
 	 * <p>
 	 * List of EVCSs that should be considered in the cluster sorted by
 	 * prioritisation.
-	 * 
+	 *
 	 * @return Sorted EVCS list
 	 */
 	public abstract List<Evcs> getSortedEvcss();
 
 	/**
 	 * Maximum power to distribute.
-	 * 
+	 *
 	 * <p>
 	 * Calculate the maximum power to distribute, like excess power or excess power
 	 * + storage.
-	 * 
+	 *
 	 * @return Maximum Power in Watt
 	 */
 	public abstract int getMaximumPowerToDistribute();
 
 	/**
 	 * Guaranteed minimum charge power.
-	 * 
+	 *
 	 * <p>
 	 * Minimum charge power that will be used by every EV that is able to charge
 	 * with that minimum.
-	 * 
+	 *
 	 * @return Minimum guaranteed power in Watt
 	 */
 	public abstract int getMinimumChargePowerGuarantee();
 
 	/**
 	 * Debug mode.
-	 * 
+	 *
 	 * <p>
 	 * Logging a few important situations if this returns true. This value should be
 	 * given by the configuration by runtime.
-	 * 
+	 *
 	 * @return Debug mode or not
 	 */
 	public abstract boolean isDebugMode();
diff --git a/io.openems.edge.evcs.cluster/src/io/openems/edge/evcs/cluster/ConfigPeakShaving.java b/io.openems.edge.evcs.cluster/src/io/openems/edge/evcs/cluster/ConfigPeakShaving.java
index a3569309497..c19c8b6f0ea 100644
--- a/io.openems.edge.evcs.cluster/src/io/openems/edge/evcs/cluster/ConfigPeakShaving.java
+++ b/io.openems.edge.evcs.cluster/src/io/openems/edge/evcs/cluster/ConfigPeakShaving.java
@@ -33,16 +33,16 @@
 
 	@AttributeDefinition(name = "Ess-ID", description = "ID of Ess device.")
 	String ess_id() default "ess0";
-	
+
 	@AttributeDefinition(name = "Secure ess discharge enabled?", description = "Is secure ess discharge enabled?")
 	boolean enable_secure_ess_discharge() default true;
-	
+
 	@AttributeDefinition(name = "Start secure discharge SoC", description = "The allowed discharge power will be reduced softly under this SoC")
 	int ess_secure_discharge_soc() default 25;
-	
+
 	@AttributeDefinition(name = "Secure discharge minimum SoC", description = "The allowed discharge power will be reduced till this SoC")
 	int ess_secure_discharge_min_soc() default 15;
-	
+
 	@AttributeDefinition(name = "Grid-Meter-ID", description = "ID of the Grid-Meter.")
 	String meter_id() default "meter0";
 
diff --git a/io.openems.edge.evcs.cluster/src/io/openems/edge/evcs/cluster/EvcsClusterPeakShaving.java b/io.openems.edge.evcs.cluster/src/io/openems/edge/evcs/cluster/EvcsClusterPeakShaving.java
index 98925e7c334..74faa4c5ba8 100644
--- a/io.openems.edge.evcs.cluster/src/io/openems/edge/evcs/cluster/EvcsClusterPeakShaving.java
+++ b/io.openems.edge.evcs.cluster/src/io/openems/edge/evcs/cluster/EvcsClusterPeakShaving.java
@@ -51,9 +51,9 @@ public class EvcsClusterPeakShaving extends AbstractEvcsCluster implements Opene
 	private final Logger log = LoggerFactory.getLogger(EvcsClusterPeakShaving.class);
 
 	// Used EVCSs
-	private String[] evcsIds = new String[0];
+	private String[] evcsIds = {};
 	private final List<Evcs> sortedEvcss = new ArrayList<>();
-	private Map<String, Evcs> evcss = new ConcurrentHashMap<>();
+	private final Map<String, Evcs> evcss = new ConcurrentHashMap<>();
 
 	private ConfigPeakShaving config;
 
@@ -101,7 +101,7 @@ protected void removeEvcs(Evcs evcs) {
 	@Activate
 	void activate(ComponentContext context, ConfigPeakShaving config) throws OpenemsNamedException {
 		this.evcsIds = config.evcs_ids();
-		updateSortedEvcss();
+		this.updateSortedEvcss();
 		super.activate(context, config.id(), config.alias(), config.enabled());
 
 		this.config = config;
@@ -110,14 +110,14 @@ void activate(ComponentContext context, ConfigPeakShaving config) throws Openems
 		if (OpenemsComponent.updateReferenceFilter(this.cm, this.servicePid(), "Evcs", config.evcs_ids())) {
 			return;
 		}
-		if (OpenemsComponent.updateReferenceFilter(cm, this.servicePid(), "ess", config.ess_id())) {
+		if (OpenemsComponent.updateReferenceFilter(this.cm, this.servicePid(), "ess", config.ess_id())) {
 			return;
 		}
-		if (OpenemsComponent.updateReferenceFilter(cm, this.servicePid(), "meter", config.meter_id())) {
-			return;
+		if (OpenemsComponent.updateReferenceFilter(this.cm, this.servicePid(), "meter", config.meter_id())) {
 		}
 	}
 
+	@Override
 	@Deactivate
 	protected void deactivate() {
 		for (Evcs evcs : this.sortedEvcss) {
@@ -133,7 +133,7 @@ protected void deactivate() {
 	private synchronized void updateSortedEvcss() {
 		this.sortedEvcss.clear();
 		for (String id : this.evcsIds) {
-			Evcs evcs = this.evcss.get(id);
+			var evcs = this.evcss.get(id);
 			if (evcs == null) {
 				this.logWarn(this.log, "Required Evcs [" + id + "] is not available.");
 			} else {
@@ -144,7 +144,7 @@ private synchronized void updateSortedEvcss() {
 
 	/**
 	 * Sets the cluster channel to false and resets all depending channels.
-	 * 
+	 *
 	 * @param evcs Electric Vehicle Charging Station
 	 */
 	private void resetClusteredState(Evcs evcs) {
@@ -157,7 +157,7 @@ private void resetClusteredState(Evcs evcs) {
 
 	/**
 	 * Sets the cluster channel to true.
-	 * 
+	 *
 	 * @param evcs Electric Vehicle Charging Station
 	 */
 	private void setClusteredState(Evcs evcs) {
@@ -179,25 +179,25 @@ public List<Evcs> getSortedEvcss() {
 	@Override
 	public int getMaximumPowerToDistribute() {
 
-		int allowedChargePower = 0;
-		int maxEssDischarge = 0;
-		long maxAvailableStoragePower = 0;
+		var allowedChargePower = 0;
+		var maxEssDischarge = 0;
+		var maxAvailableStoragePower = 0L;
 
-		if(this.ess instanceof ManagedSymmetricEss) {
-			maxEssDischarge = ((ManagedSymmetricEss)this.ess).getAllowedDischargePower().orElse(0);
+		if (this.ess instanceof ManagedSymmetricEss) {
+			maxEssDischarge = ((ManagedSymmetricEss) this.ess).getAllowedDischargePower().orElse(0);
 			// TODO: Use PowerComponent
 		} else {
 			maxEssDischarge = this.ess.getMaxApparentPower().orElse(0);
 		}
-		
+
 		if (this.config.enable_secure_ess_discharge()) {
 			maxEssDischarge = this.getSecureEssDischargePower(maxEssDischarge);
 			this.channel(AbstractEvcsCluster.ChannelId.USED_ESS_MAXIMUM_DISCHARGE_POWER).setNextValue(maxEssDischarge);
 		}
-		
+
 		// TODO: Calculate the available ESS charge power, depending on a specific ESS
 		// component (e.g. If there is a ESS cluster)
-		
+
 		// Calculate maximum ess power
 		long essDischargePower = this.sum.getEssActivePower().orElse(0);
 		int essActivePowerDC = this.sum.getProductionDcActualPower().orElse(0);
@@ -205,35 +205,34 @@ public int getMaximumPowerToDistribute() {
 		this.channel(AbstractEvcsCluster.ChannelId.MAXIMUM_AVAILABLE_ESS_POWER).setNextValue(maxAvailableStoragePower);
 
 		// Calculate maximum grid power
-		int gridPower = getGridPower();
-		int maxAvailableGridPower = (this.config.hardwarePowerLimitPerPhase() * DEFAULT_PHASES) - gridPower;
+		var gridPower = this.getGridPower();
+		var maxAvailableGridPower = this.config.hardwarePowerLimitPerPhase() * DEFAULT_PHASES - gridPower;
 		this.channel(AbstractEvcsCluster.ChannelId.MAXIMUM_AVAILABLE_GRID_POWER).setNextValue(maxAvailableGridPower);
-		
+
 		// Current evcs charge power
 		int evcsCharge = this.getChargePower().orElse(0);
 
 		allowedChargePower = (int) (evcsCharge + maxAvailableStoragePower + maxAvailableGridPower);
 
-		this.logInfoInDebugmode(log, "Calculation of the maximum charge Power: EVCS Charge [" + evcsCharge
+		this.logInfoInDebugmode(this.log, "Calculation of the maximum charge Power: EVCS Charge [" + evcsCharge
 				+ "]  +  Max. available storage power [" + maxAvailableStoragePower
 				+ "]  +  ( Configured Hardware Limit * 3 [" + this.config.hardwarePowerLimitPerPhase() * DEFAULT_PHASES
 				+ "]  -  Maximum of all three phases * 3 [" + gridPower + "]");
 
-		allowedChargePower = allowedChargePower > 0 ? allowedChargePower : 0;
-		return allowedChargePower;
+		return allowedChargePower > 0 ? allowedChargePower : 0;
 	}
 
 	/**
 	 * Calculate the reduced maximum discharge power.
-	 * 
+	 *
 	 * @param maxEssDischarge original maximum ess discharge power
 	 * @return reduced ess discharge power
 	 */
 	private int getSecureEssDischargePower(int maxEssDischarge) {
 		int soc = this.ess.getSoc().orElse(0);
-		int startSoc = this.config.ess_secure_discharge_soc();
-		int minSoc = this.config.ess_secure_discharge_min_soc();
-		double factor = 1.0 / (startSoc - minSoc);
+		var startSoc = this.config.ess_secure_discharge_soc();
+		var minSoc = this.config.ess_secure_discharge_min_soc();
+		var factor = 1.0 / (startSoc - minSoc);
 
 		if (soc >= startSoc) {
 			return maxEssDischarge;
@@ -242,25 +241,25 @@ private int getSecureEssDischargePower(int maxEssDischarge) {
 			return (int) (maxEssDischarge * factor);
 		}
 		factor = factor * (startSoc - soc);
-		return (int) (maxEssDischarge - (maxEssDischarge * factor));
+		return (int) (maxEssDischarge - maxEssDischarge * factor);
 	}
 
 	/**
 	 * Calculates the current grid power depending on the phases if possible.
-	 * 
+	 *
 	 * @return calculated grid power
 	 */
 	private int getGridPower() {
 		int gridPower = this.meter.getActivePower().orElse(0);
 
 		if (this.meter instanceof AsymmetricMeter) {
-			AsymmetricMeter asymmetricMeter = (AsymmetricMeter) this.meter;
+			var asymmetricMeter = (AsymmetricMeter) this.meter;
 
 			int gridPowerL1 = asymmetricMeter.getActivePowerL1().orElse(0);
 			int gridPowerL2 = asymmetricMeter.getActivePowerL2().orElse(0);
 			int gridPowerL3 = asymmetricMeter.getActivePowerL3().orElse(0);
 
-			int maxPowerOnPhase = Math.max(Math.max(gridPowerL1, gridPowerL2), gridPowerL3);
+			var maxPowerOnPhase = Math.max(Math.max(gridPowerL1, gridPowerL2), gridPowerL3);
 			gridPower = maxPowerOnPhase * 3;
 		}
 		return gridPower;
diff --git a/io.openems.edge.evcs.cluster/src/io/openems/edge/evcs/cluster/EvcsClusterSelfConsumption.java b/io.openems.edge.evcs.cluster/src/io/openems/edge/evcs/cluster/EvcsClusterSelfConsumption.java
index bdf92e8e478..5468b1a4f17 100644
--- a/io.openems.edge.evcs.cluster/src/io/openems/edge/evcs/cluster/EvcsClusterSelfConsumption.java
+++ b/io.openems.edge.evcs.cluster/src/io/openems/edge/evcs/cluster/EvcsClusterSelfConsumption.java
@@ -1,11 +1,5 @@
 package io.openems.edge.evcs.cluster;
 
-import io.openems.common.exceptions.OpenemsError.OpenemsNamedException;
-import io.openems.edge.common.component.OpenemsComponent;
-import io.openems.edge.common.event.EdgeEventConstants;
-import io.openems.edge.common.sum.Sum;
-import io.openems.edge.evcs.api.Evcs;
-import io.openems.edge.evcs.api.ManagedEvcs;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Map;
@@ -28,6 +22,13 @@
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
+import io.openems.common.exceptions.OpenemsError.OpenemsNamedException;
+import io.openems.edge.common.component.OpenemsComponent;
+import io.openems.edge.common.event.EdgeEventConstants;
+import io.openems.edge.common.sum.Sum;
+import io.openems.edge.evcs.api.Evcs;
+import io.openems.edge.evcs.api.ManagedEvcs;
+
 @Designate(ocd = ConfigSelfConsumption.class, factory = true)
 @Component(//
 		name = "Evcs.Cluster.SelfConsumption", //
@@ -38,14 +39,14 @@
 				EventConstants.EVENT_TOPIC + "=" + EdgeEventConstants.TOPIC_CYCLE_AFTER_CONTROLLERS, //
 				EventConstants.EVENT_TOPIC + "=" + EdgeEventConstants.TOPIC_CYCLE_BEFORE_PROCESS_IMAGE //
 		})
-public class EvcsClusterSelfConsumption extends AbstractEvcsCluster implements OpenemsComponent, Evcs, EventHandler  {
+public class EvcsClusterSelfConsumption extends AbstractEvcsCluster implements OpenemsComponent, Evcs, EventHandler {
 
 	private final Logger log = LoggerFactory.getLogger(EvcsClusterSelfConsumption.class);
 
 	// Used EVCSs
-	private String[] evcsIds = new String[0];
+	private String[] evcsIds = {};
 	private final List<Evcs> sortedEvcss = new ArrayList<>();
-	private Map<String, Evcs> evcss = new ConcurrentHashMap<>();
+	private final Map<String, Evcs> evcss = new ConcurrentHashMap<>();
 
 	private ConfigSelfConsumption config;
 
@@ -84,17 +85,17 @@ protected void removeEvcs(Evcs evcs) {
 	@Activate
 	void activate(ComponentContext context, ConfigSelfConsumption config) throws OpenemsNamedException {
 		this.evcsIds = config.evcs_ids();
-		updateSortedEvcss();
+		this.updateSortedEvcss();
 		super.activate(context, config.id(), config.alias(), config.enabled());
 
 		this.config = config;
 
 		// update filter for 'evcs' component
 		if (OpenemsComponent.updateReferenceFilter(this.cm, this.servicePid(), "Evcs", config.evcs_ids())) {
-			return;
 		}
 	}
 
+	@Override
 	@Deactivate
 	protected void deactivate() {
 		for (Evcs evcs : this.sortedEvcss) {
@@ -110,7 +111,7 @@ protected void deactivate() {
 	private synchronized void updateSortedEvcss() {
 		this.sortedEvcss.clear();
 		for (String id : this.evcsIds) {
-			Evcs evcs = this.evcss.get(id);
+			var evcs = this.evcss.get(id);
 			if (evcs == null) {
 				this.logWarn(this.log, "Required Evcs [" + id + "] is not available.");
 			} else {
@@ -121,7 +122,7 @@ private synchronized void updateSortedEvcss() {
 
 	/**
 	 * Sets the cluster channel to false and resets all depending channels.
-	 * 
+	 *
 	 * @param evcs Electric Vehicle Charging Station
 	 */
 	private void resetClusteredState(Evcs evcs) {
@@ -134,7 +135,7 @@ private void resetClusteredState(Evcs evcs) {
 
 	/**
 	 * Sets the cluster channel to true.
-	 * 
+	 *
 	 * @param evcs Electric Vehicle Charging Station
 	 */
 	private void setClusteredState(Evcs evcs) {
@@ -155,16 +156,12 @@ public List<Evcs> getSortedEvcss() {
 
 	@Override
 	public int getMaximumPowerToDistribute() {
-		int excessPower = 0;
-
 		int buyFromGrid = this.sum.getGridActivePower().orElse(0);
 		int essDischarge = this.sum.getEssActivePower().orElse(0);
 		int essActivePowerDC = this.sum.getProductionDcActualPower().orElse(0);
 		int evcsCharge = this.getChargePower().orElse(0);
 
-		excessPower = evcsCharge - buyFromGrid - (essDischarge - essActivePowerDC);
-
-		return excessPower;
+		return evcsCharge - buyFromGrid - (essDischarge - essActivePowerDC);
 	}
 
 	@Override
diff --git a/io.openems.edge.evcs.cluster/test/io/openems/edge/evcs/cluster/EvcsClusterTest.java b/io.openems.edge.evcs.cluster/test/io/openems/edge/evcs/cluster/EvcsClusterTest.java
index 915352a5491..0d05699037d 100644
--- a/io.openems.edge.evcs.cluster/test/io/openems/edge/evcs/cluster/EvcsClusterTest.java
+++ b/io.openems.edge.evcs.cluster/test/io/openems/edge/evcs/cluster/EvcsClusterTest.java
@@ -70,7 +70,7 @@ public class EvcsClusterTest {
 	@Test
 	public void clusterMaximum_essActivePowerTest() throws Exception {
 		String[] EVCS_IDS = { "evcs0", "evcs1" };
-		EVCS_TARGET = getEvcsTarget(EVCS_IDS);
+		EVCS_TARGET = this.getEvcsTarget(EVCS_IDS);
 
 		new ComponentTest(new EvcsClusterPeakShaving()) //
 				.addReference("cm", new DummyConfigurationAdmin()) //
@@ -110,7 +110,7 @@ public void clusterMaximum_essActivePowerTest() throws Exception {
 	@Test
 	public void clusterMaximum_symmetricGridPowerTest() throws Exception {
 		String[] EVCS_IDS = { "evcs0", "evcs1" };
-		EVCS_TARGET = getEvcsTarget(EVCS_IDS);
+		EVCS_TARGET = this.getEvcsTarget(EVCS_IDS);
 
 		new ComponentTest(new EvcsClusterPeakShaving()) //
 				.addReference("cm", new DummyConfigurationAdmin()) //
@@ -150,7 +150,7 @@ public void clusterMaximum_symmetricGridPowerTest() throws Exception {
 	@Test
 	public void clusterMaximum_assymmetricGridPowerTest() throws Exception {
 		String[] EVCS_IDS = { "evcs0", "evcs1" };
-		EVCS_TARGET = getEvcsTarget(EVCS_IDS);
+		EVCS_TARGET = this.getEvcsTarget(EVCS_IDS);
 
 		new ComponentTest(new EvcsClusterPeakShaving()) //
 				.addReference("cm", new DummyConfigurationAdmin()) //
@@ -190,7 +190,7 @@ public void clusterMaximum_assymmetricGridPowerTest() throws Exception {
 	@Test
 	public void clusterMaximum_symmetricGridPower_essActivePowerTest() throws Exception {
 		String[] EVCS_IDS = { "evcs0", "evcs1" };
-		EVCS_TARGET = getEvcsTarget(EVCS_IDS);
+		EVCS_TARGET = this.getEvcsTarget(EVCS_IDS);
 
 		new ComponentTest(new EvcsClusterPeakShaving()) //
 				.addReference("cm", new DummyConfigurationAdmin()) //
@@ -232,7 +232,7 @@ public void clusterMaximum_symmetricGridPower_essActivePowerTest() throws Except
 	@Test
 	public void clusterMaximum_essAllowedDischargePowerTest() throws Exception {
 		String[] EVCS_IDS = { "evcs0", "evcs1" };
-		EVCS_TARGET = getEvcsTarget(EVCS_IDS);
+		EVCS_TARGET = this.getEvcsTarget(EVCS_IDS);
 
 		new ComponentTest(new EvcsClusterPeakShaving()) //
 				.addReference("cm", new DummyConfigurationAdmin()) //
@@ -274,7 +274,7 @@ public void clusterMaximum_essAllowedDischargePowerTest() throws Exception {
 	@Test
 	public void clusterDistribution_nothingToChargeTest() throws Exception {
 		String[] EVCS_IDS = { "evcs0", "evcs1" };
-		EVCS_TARGET = getEvcsTarget(EVCS_IDS);
+		EVCS_TARGET = this.getEvcsTarget(EVCS_IDS);
 
 		new ComponentTest(new EvcsClusterPeakShaving()) //
 				.addReference("cm", new DummyConfigurationAdmin()) //
@@ -339,7 +339,7 @@ public void clusterDistribution_nothingToChargeTest() throws Exception {
 	@Test
 	public void clusterDistribution_chargeTest() throws Exception {
 		String[] EVCS_IDS = { "evcs0", "evcs1", "evcs2", "evcs3", "evcs4" };
-		EVCS_TARGET = getEvcsTarget(EVCS_IDS);
+		EVCS_TARGET = this.getEvcsTarget(EVCS_IDS);
 
 		new ComponentTest(new EvcsClusterPeakShaving()) //
 				.addReference("cm", new DummyConfigurationAdmin()) //
@@ -395,7 +395,7 @@ public void clusterDistribution_chargeTest() throws Exception {
 	@Test
 	public void clusterDistribution_chargeTest2() throws Exception {
 		String[] EVCS_IDS = { "evcs0", "evcs1" };
-		EVCS_TARGET = getEvcsTarget(EVCS_IDS);
+		EVCS_TARGET = this.getEvcsTarget(EVCS_IDS);
 
 		new ComponentTest(new EvcsClusterPeakShaving()) //
 				.addReference("cm", new DummyConfigurationAdmin()) //
@@ -444,7 +444,7 @@ public void clusterDistribution_chargeTest2() throws Exception {
 	@Test
 	public void clusterDistribution_chargeTest_maximumHardwarePowerTest() throws Exception {
 		String[] EVCS_IDS = { "evcs0", "evcs1" };
-		EVCS_TARGET = getEvcsTarget(EVCS_IDS);
+		EVCS_TARGET = this.getEvcsTarget(EVCS_IDS);
 
 		new ComponentTest(new EvcsClusterPeakShaving()) //
 				.addReference("cm", new DummyConfigurationAdmin()) //
@@ -491,7 +491,7 @@ public void clusterDistribution_chargeTest_maximumHardwarePowerTest() throws Exc
 	@Test
 	public void clusterDistribution_chargeTest_maximumPowerTest() throws Exception {
 		String[] EVCS_IDS = { "evcs0", "evcs1" };
-		EVCS_TARGET = getEvcsTarget(EVCS_IDS);
+		EVCS_TARGET = this.getEvcsTarget(EVCS_IDS);
 
 		new ComponentTest(new EvcsClusterPeakShaving()) //
 				.addReference("cm", new DummyConfigurationAdmin()) //
@@ -538,7 +538,7 @@ public void clusterDistribution_chargeTest_maximumPowerTest() throws Exception {
 	@Test
 	public void clusterDistribution_chargeTest_minimumPowerTest() throws Exception {
 		String[] EVCS_IDS = { "evcs0", "evcs1" };
-		EVCS_TARGET = getEvcsTarget(EVCS_IDS);
+		EVCS_TARGET = this.getEvcsTarget(EVCS_IDS);
 
 		new ComponentTest(new EvcsClusterPeakShaving()) //
 				.addReference("cm", new DummyConfigurationAdmin()) //
@@ -592,7 +592,7 @@ public void clusterDistribution_chargeTest_minimumPowerTest() throws Exception {
 	@Test
 	public void clusterMaximum_secureEssDischargeTest() throws Exception {
 		String[] EVCS_IDS = { "evcs0", "evcs1" };
-		EVCS_TARGET = getEvcsTarget(EVCS_IDS);
+		EVCS_TARGET = this.getEvcsTarget(EVCS_IDS);
 
 		new ComponentTest(new EvcsClusterPeakShaving()) //
 				.addReference("cm", new DummyConfigurationAdmin()) //
@@ -673,7 +673,7 @@ public void clusterMaximum_secureEssDischargeTest() throws Exception {
 	}
 
 	private String getEvcsTarget(String[] evcs_ids) {
-		StringBuilder stringBuilder = new StringBuilder();
+		var stringBuilder = new StringBuilder();
 		for (String evcs_id : evcs_ids) {
 			stringBuilder.append("(id=" + evcs_id + ")");
 		}
diff --git a/io.openems.edge.evcs.cluster/test/io/openems/edge/evcs/cluster/MyConfigPeakShaving.java b/io.openems.edge.evcs.cluster/test/io/openems/edge/evcs/cluster/MyConfigPeakShaving.java
index f9a02f0f8bf..b574ee0625e 100644
--- a/io.openems.edge.evcs.cluster/test/io/openems/edge/evcs/cluster/MyConfigPeakShaving.java
+++ b/io.openems.edge.evcs.cluster/test/io/openems/edge/evcs/cluster/MyConfigPeakShaving.java
@@ -1,9 +1,5 @@
 package io.openems.edge.evcs.cluster;
 
-import java.lang.annotation.Annotation;
-import java.util.Arrays;
-
-import io.openems.edge.common.startstop.StartStopConfig;
 import io.openems.edge.common.test.AbstractComponentConfig;
 
 @SuppressWarnings("all")
@@ -12,8 +8,6 @@ public class MyConfigPeakShaving extends AbstractComponentConfig implements Conf
 	protected static class Builder {
 
 		private String id = "evcsCluster0";
-		private String alias = "Evcs Cluster";
-		private boolean enabled = true;
 		private boolean debugMode = false;
 		private int hardwarePowerLimitPerPhase = 7000;
 		private String[] evcs_ids = { "evcs0", "evcs1" };
@@ -32,16 +26,6 @@ public Builder setId(String id) {
 			return this;
 		}
 
-		public Builder setAlias(String alias) {
-			this.alias = alias;
-			return this;
-		}
-
-		public Builder setEnabled(boolean enabled) {
-			this.enabled = enabled;
-			return this;
-		}
-
 		public Builder setDebugMode(boolean debugMode) {
 			this.debugMode = debugMode;
 			return this;

From aeefb9e8646e5aeb2b943002d91fc85d775cc579 Mon Sep 17 00:00:00 2001
From: Stefan Feilmeier <stefan.feilmeier@fenecon.de>
Date: Tue, 8 Mar 2022 11:35:45 +0100
Subject: [PATCH 64/96] Update io.openems.edge.evcs.goe.chargerhome

---
 .../edge/evcs/core/EvcsPowerComponent.java    |  3 +-
 .../edge/evcs/goe/chargerhome/GoeApi.java     | 84 +++++++++----------
 .../goe/chargerhome/GoeChargerHomeImpl.java   | 44 +++++-----
 .../edge/evcs/goe/chargerhome/Report.java     |  2 +-
 4 files changed, 63 insertions(+), 70 deletions(-)

diff --git a/io.openems.edge.evcs.core/src/io/openems/edge/evcs/core/EvcsPowerComponent.java b/io.openems.edge.evcs.core/src/io/openems/edge/evcs/core/EvcsPowerComponent.java
index 2f8bde89f4e..dc192416ae5 100644
--- a/io.openems.edge.evcs.core/src/io/openems/edge/evcs/core/EvcsPowerComponent.java
+++ b/io.openems.edge.evcs.core/src/io/openems/edge/evcs/core/EvcsPowerComponent.java
@@ -57,6 +57,7 @@ void activate(ComponentContext context, Map<String, Object> properties, Config c
 		this.updateConfig(config);
 	}
 
+	@Override
 	@Deactivate
 	protected void deactivate() {
 		super.deactivate();
@@ -84,7 +85,7 @@ private void updateConfig(Config config) {
 	public RampFilter getRampFilter() {
 		return this.rampFilter;
 	}
-	
+
 	@Override
 	public float getIncreaseRate() {
 		return this.increaseRate;
diff --git a/io.openems.edge.evcs.goe.chargerhome/src/io/openems/edge/evcs/goe/chargerhome/GoeApi.java b/io.openems.edge.evcs.goe.chargerhome/src/io/openems/edge/evcs/goe/chargerhome/GoeApi.java
index 49ee83078b1..ebe7e76e3ed 100644
--- a/io.openems.edge.evcs.goe.chargerhome/src/io/openems/edge/evcs/goe/chargerhome/GoeApi.java
+++ b/io.openems.edge.evcs.goe.chargerhome/src/io/openems/edge/evcs/goe/chargerhome/GoeApi.java
@@ -1,21 +1,23 @@
 package io.openems.edge.evcs.goe.chargerhome;
 
-import com.google.gson.JsonObject;
-import io.openems.common.exceptions.OpenemsError.OpenemsNamedException;
-import io.openems.common.exceptions.OpenemsException;
-import io.openems.common.utils.JsonUtils;
 import java.io.BufferedReader;
 import java.io.IOException;
 import java.io.InputStreamReader;
 import java.net.HttpURLConnection;
 import java.net.URL;
 
+import com.google.gson.JsonObject;
+
+import io.openems.common.exceptions.OpenemsError.OpenemsNamedException;
+import io.openems.common.exceptions.OpenemsException;
+import io.openems.common.utils.JsonUtils;
+
 public class GoeApi {
 	private final String ipAddress;
 	private final int executeEveryCycle = 10;
 	private int cycle;
 	private JsonObject jsonStatus;
-	private GoeChargerHomeImpl parent;
+	private final GoeChargerHomeImpl parent;
 
 	public GoeApi(GoeChargerHomeImpl p) {
 		this.ipAddress = p.config.ip();
@@ -35,17 +37,16 @@ public JsonObject getStatus() {
 		try {
 			// Execute every x-Cycle
 			if (this.cycle == 0 || this.cycle % this.executeEveryCycle == 0) {
-				JsonObject json = new JsonObject();
-				String url = "http://" + this.ipAddress + "/status";
+				var json = new JsonObject();
+				var url = "http://" + this.ipAddress + "/status";
 				json = this.sendRequest(url, "GET");
 
 				this.cycle = 1;
 				this.jsonStatus = json;
 				return json;
-			} else {
-				this.cycle++;
-				return this.jsonStatus;
 			}
+			this.cycle++;
+			return this.jsonStatus;
 
 		} catch (Exception e) {
 			e.printStackTrace();
@@ -55,30 +56,29 @@ public JsonObject getStatus() {
 
 	/**
 	 * Sets the activation status for go-e.
-	 * 
+	 *
 	 * <p>
 	 * See https://github.com/goecharger.
-	 * 
+	 *
 	 * @param active boolean if the charger should be set to active
 	 * @return JsonObject with new settings
 	 */
 	public JsonObject setActive(boolean active) {
 
 		try {
-			if (active != this.parent.isActive) {
-				JsonObject json = new JsonObject();
-				Integer status = 0;
-				if (active) {
-					status = 1;
-				}
-				String url = "http://" + this.ipAddress + "/mqtt?payload=alw=" + Integer.toString(status);
-				json = this.sendRequest(url, "PUT");
-				this.parent.isActive = active;
-				this.jsonStatus = json;
-				return json;
-			} else {
+			if (active == this.parent.isActive) {
 				return this.jsonStatus;
 			}
+			var json = new JsonObject();
+			Integer status = 0;
+			if (active) {
+				status = 1;
+			}
+			var url = "http://" + this.ipAddress + "/mqtt?payload=alw=" + Integer.toString(status);
+			json = this.sendRequest(url, "PUT");
+			this.parent.isActive = active;
+			this.jsonStatus = json;
+			return json;
 
 		} catch (Exception e) {
 			e.printStackTrace();
@@ -97,15 +97,14 @@ public JsonObject setCurrent(int current) {
 		try {
 			Integer currentAmpere = current / 1000;
 			if (currentAmpere != this.parent.activeCurrent / 1000) {
-				JsonObject json = new JsonObject();
-				String url = "http://" + this.ipAddress + "/mqtt?payload=amp=" + Integer.toString(currentAmpere);
+				var json = new JsonObject();
+				var url = "http://" + this.ipAddress + "/mqtt?payload=amp=" + Integer.toString(currentAmpere);
 				json = this.sendRequest(url, "PUT");
 				this.parent.activeCurrent = currentAmpere * 1000;
 				this.jsonStatus = json;
 				return json;
-			} else {
-				return this.jsonStatus;
 			}
+			return this.jsonStatus;
 
 		} catch (Exception e) {
 			e.printStackTrace();
@@ -122,19 +121,18 @@ public JsonObject setCurrent(int current) {
 	public boolean limitMaxEnergy(boolean limit) {
 
 		try {
-			JsonObject json = new JsonObject();
-			int stp = 0;
+			var json = new JsonObject();
+			var stp = 0;
 			if (limit) {
 				stp = 2;
 			}
-			String url = "http://" + this.ipAddress + "/mqtt?payload=stp=" + Integer.toString(stp);
+			var url = "http://" + this.ipAddress + "/mqtt?payload=stp=" + Integer.toString(stp);
 			json = this.sendRequest(url, "PUT");
 			if (json != null) {
 				this.jsonStatus = json;
 				return true;
-			} else {
-				return false;
 			}
+			return false;
 		} catch (Exception e) {
 			e.printStackTrace();
 			return false;
@@ -150,20 +148,19 @@ public boolean limitMaxEnergy(boolean limit) {
 	public boolean setMaxEnergy(int maxEnergy) {
 
 		try {
-			JsonObject json = new JsonObject();
+			var json = new JsonObject();
 			if (maxEnergy > 0) {
 				this.limitMaxEnergy(true);
 			} else {
 				this.limitMaxEnergy(false);
 			}
-			String url = "http://" + this.ipAddress + "/mqtt?payload=dwo=" + Integer.toString(maxEnergy);
+			var url = "http://" + this.ipAddress + "/mqtt?payload=dwo=" + Integer.toString(maxEnergy);
 			json = this.sendRequest(url, "PUT");
 			if (json != null) {
 				this.jsonStatus = json;
 				return true;
-			} else {
-				return false;
 			}
+			return false;
 		} catch (Exception e) {
 			e.printStackTrace();
 			return false;
@@ -180,16 +177,16 @@ public boolean setMaxEnergy(int maxEnergy) {
 	 */
 	private JsonObject sendRequest(String urlString, String requestMethod) throws OpenemsNamedException {
 		try {
-			URL url = new URL(urlString);
-			HttpURLConnection con = (HttpURLConnection) url.openConnection();
+			var url = new URL(urlString);
+			var con = (HttpURLConnection) url.openConnection();
 			con.setRequestMethod(requestMethod);
 			con.setConnectTimeout(5000);
 			con.setReadTimeout(5000);
-			int status = con.getResponseCode();
+			var status = con.getResponseCode();
 			String body;
-			try (BufferedReader in = new BufferedReader(new InputStreamReader(con.getInputStream()))) {
+			try (var in = new BufferedReader(new InputStreamReader(con.getInputStream()))) {
 				// Read HTTP response
-				StringBuilder content = new StringBuilder();
+				var content = new StringBuilder();
 				String line;
 				while ((line = in.readLine()) != null) {
 					content.append(line);
@@ -200,9 +197,8 @@ private JsonObject sendRequest(String urlString, String requestMethod) throws Op
 			if (status < 300) {
 				// Parse response to JSON
 				return JsonUtils.parseToJsonObject(body);
-			} else {
-				throw new OpenemsException("Error while reading from go-e API. Response code: " + status + ". " + body);
 			}
+			throw new OpenemsException("Error while reading from go-e API. Response code: " + status + ". " + body);
 		} catch (OpenemsNamedException | IOException e) {
 			throw new OpenemsException(
 					"Unable to read from go-e API. " + e.getClass().getSimpleName() + ": " + e.getMessage());
diff --git a/io.openems.edge.evcs.goe.chargerhome/src/io/openems/edge/evcs/goe/chargerhome/GoeChargerHomeImpl.java b/io.openems.edge.evcs.goe.chargerhome/src/io/openems/edge/evcs/goe/chargerhome/GoeChargerHomeImpl.java
index 5cbf85f2fc5..1cb07f16fa8 100644
--- a/io.openems.edge.evcs.goe.chargerhome/src/io/openems/edge/evcs/goe/chargerhome/GoeChargerHomeImpl.java
+++ b/io.openems.edge.evcs.goe.chargerhome/src/io/openems/edge/evcs/goe/chargerhome/GoeChargerHomeImpl.java
@@ -1,7 +1,6 @@
 package io.openems.edge.evcs.goe.chargerhome;
 
 import java.net.UnknownHostException;
-import java.util.Optional;
 
 import org.osgi.service.component.ComponentContext;
 import org.osgi.service.component.annotations.Activate;
@@ -16,14 +15,10 @@
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-import com.google.gson.JsonArray;
-import com.google.gson.JsonObject;
-
 import io.openems.common.exceptions.OpenemsError.OpenemsNamedException;
 import io.openems.common.utils.JsonUtils;
 import io.openems.edge.common.channel.Channel;
 import io.openems.edge.common.channel.WriteChannel;
-import io.openems.edge.common.channel.value.Value;
 import io.openems.edge.common.component.AbstractOpenemsComponent;
 import io.openems.edge.common.component.OpenemsComponent;
 import io.openems.edge.common.event.EdgeEventConstants;
@@ -91,6 +86,7 @@ void activate(ComponentContext context, Config config) throws UnknownHostExcepti
 		this.goeapi = new GoeApi(this);
 	}
 
+	@Override
 	@Deactivate
 	protected void deactivate() {
 		super.deactivate();
@@ -105,14 +101,14 @@ public void handleEvent(Event event) {
 		case EdgeEventConstants.TOPIC_CYCLE_BEFORE_PROCESS_IMAGE:
 
 			// handle writes
-			JsonObject json = this.goeapi.getStatus();
+			var json = this.goeapi.getStatus();
 			if (json == null) {
 				this.channel(Evcs.ChannelId.CHARGINGSTATION_COMMUNICATION_FAILED).setNextValue(true);
 
 			} else {
 				try {
 					// Is Active
-					int alw = JsonUtils.getAsInt(json, "alw");
+					var alw = JsonUtils.getAsInt(json, "alw");
 					if (alw == 1) {
 						this.isActive = true;
 					} else {
@@ -124,7 +120,7 @@ public void handleEvent(Event event) {
 					this.channel(GoeChannelId.FIRMWARE).setNextValue(JsonUtils.getAsString(json, "fwv"));
 
 					// Current status
-					int status = JsonUtils.getAsInt(json, "car");
+					var status = JsonUtils.getAsInt(json, "car");
 					this.channel(GoeChannelId.STATUS_GOE).setNextValue(status);
 					this.channel(Evcs.ChannelId.STATUS).setNextValue(this.convertGoeStatus(status));
 
@@ -132,22 +128,22 @@ public void handleEvent(Event event) {
 					this.activeCurrent = JsonUtils.getAsInt(json, "amp") * 1000;
 					this.channel(GoeChannelId.CURR_USER).setNextValue(this.activeCurrent);
 
-					JsonArray nrg = JsonUtils.getAsJsonArray(json, "nrg");
+					var nrg = JsonUtils.getAsJsonArray(json, "nrg");
 					this.channel(GoeChannelId.VOLTAGE_L1).setNextValue(JsonUtils.getAsInt(nrg, 0));
 					this.channel(GoeChannelId.VOLTAGE_L2).setNextValue(JsonUtils.getAsInt(nrg, 1));
 					this.channel(GoeChannelId.VOLTAGE_L3).setNextValue(JsonUtils.getAsInt(nrg, 2));
 					this.channel(GoeChannelId.CURRENT_L1).setNextValue(JsonUtils.getAsInt(nrg, 4) * 100);
 					this.channel(GoeChannelId.CURRENT_L2).setNextValue(JsonUtils.getAsInt(nrg, 5) * 100);
 					this.channel(GoeChannelId.CURRENT_L3).setNextValue(JsonUtils.getAsInt(nrg, 6) * 100);
-					int power = JsonUtils.getAsInt(nrg, 11);
+					var power = JsonUtils.getAsInt(nrg, 11);
 					this.channel(GoeChannelId.ACTUAL_POWER).setNextValue(power * 10);
 					this.channel(Evcs.ChannelId.CHARGE_POWER).setNextValue(power * 10);
 
-					int phases = this.convertGoePhase(JsonUtils.getAsInt(json, "pha"));
+					var phases = this.convertGoePhase(JsonUtils.getAsInt(json, "pha"));
 					this.channel(Evcs.ChannelId.PHASES).setNextValue(phases);
 
 					// Hardware limits
-					int cableCurrent = JsonUtils.getAsInt(json, "cbl") * 1000;
+					var cableCurrent = JsonUtils.getAsInt(json, "cbl") * 1000;
 					this.maxCurrent = cableCurrent > 0 && cableCurrent < this.config.maxHwCurrent() //
 							? cableCurrent //
 							: this.config.maxHwCurrent();
@@ -195,12 +191,12 @@ private Status convertGoeStatus(int status) {
 
 	/**
 	 * Converts the binary input into the amount of phases that are used to charge.
-	 * 
+	 *
 	 * @param phase binary phase input
 	 * @return amount of phases
 	 */
 	private int convertGoePhase(int phase) {
-		int phasen = (byte) phase & 0b00111000;
+		var phasen = (byte) phase & 0b00111000;
 		switch (phasen) {
 		case 8: // 0b00001000: Phase 1 is active
 			return 1;
@@ -215,7 +211,7 @@ private int convertGoePhase(int phase) {
 
 	/**
 	 * Sets the current from SET_CHARGE_POWER channel.
-	 * 
+	 *
 	 * <p>
 	 * Possible charge currents are between MinCurrent and MaxCurrent. Values below
 	 * are set to zero and values above are set to the maximum.
@@ -226,9 +222,9 @@ private void setPower() {
 		// Check energy limit
 		if (energyLimit == 0 || energyLimit > this.getEnergySession().orElse(0)) {
 			WriteChannel<Integer> channel = this.channel(ManagedEvcs.ChannelId.SET_CHARGE_POWER_LIMIT);
-			Optional<Integer> valueOpt = channel.getNextWriteValueAndReset();
+			var valueOpt = channel.getNextWriteValueAndReset();
 			if (valueOpt.isPresent()) {
-				Integer power = valueOpt.get();
+				var power = valueOpt.get();
 				Channel<Integer> minimumHardwarePowerChannel = this.channel(Evcs.ChannelId.MINIMUM_HARDWARE_POWER);
 
 				// Charging under MINIMUM_HARDWARE_POWER isn't possible
@@ -238,7 +234,7 @@ private void setPower() {
 				} else {
 					this.goeapi.setActive(true);
 				}
-				Value<Integer> phases = this.getPhases();
+				var phases = this.getPhases();
 				Integer current = power * 1000 / phases.orElse(3) /* e.g. 3 phases */ / 230; /* voltage */
 
 				/*
@@ -251,7 +247,7 @@ private void setPower() {
 				if (current < this.minCurrent) {
 					current = this.minCurrent;
 				}
-				JsonObject result = this.goeapi.setCurrent(current);
+				var result = this.goeapi.setCurrent(current);
 				if (result.isJsonObject()) {
 					this._setSetChargePowerLimit(power);
 					this.debugLog(result.toString());
@@ -266,16 +262,16 @@ private void setPower() {
 
 	/**
 	 * Sets the Energy Limit for this session from SET_ENERGY_SESSION channel.
-	 * 
+	 *
 	 * <p>
 	 * Allowed values for the command setenergy are 0; 1-65535 the value of the
 	 * command is 0.1 Wh. The charging station will charge till this limit.
 	 */
 	private void setEnergySession() {
 		WriteChannel<Integer> channel = this.channel(ManagedEvcs.ChannelId.SET_ENERGY_LIMIT);
-		Optional<Integer> valueOpt = channel.getNextWriteValueAndReset();
+		var valueOpt = channel.getNextWriteValueAndReset();
 		if (valueOpt.isPresent()) {
-			Integer energyTarget = valueOpt.get();
+			var energyTarget = valueOpt.get();
 			if (energyTarget < 0) {
 				return;
 			}
@@ -307,10 +303,10 @@ public EvcsPower getEvcsPower() {
 
 	/**
 	 * Debug Log.
-	 * 
+	 *
 	 * <p>
 	 * Logging only if the debug mode is enabled
-	 * 
+	 *
 	 * @param message text that should be logged
 	 */
 	public void debugLog(String message) {
diff --git a/io.openems.edge.evcs.goe.chargerhome/src/io/openems/edge/evcs/goe/chargerhome/Report.java b/io.openems.edge.evcs.goe.chargerhome/src/io/openems/edge/evcs/goe/chargerhome/Report.java
index 0acf0dc25ce..02e257f3016 100644
--- a/io.openems.edge.evcs.goe.chargerhome/src/io/openems/edge/evcs/goe/chargerhome/Report.java
+++ b/io.openems.edge.evcs.goe.chargerhome/src/io/openems/edge/evcs/goe/chargerhome/Report.java
@@ -11,7 +11,7 @@ private Report(int requestSeconds) {
 
 	/**
 	 * Get requested seconds.
-	 * 
+	 *
 	 * @return seconds
 	 */
 	public int getRequestSeconds() {

From 02805d807fe416bac7379407cd9747800080f8ea Mon Sep 17 00:00:00 2001
From: Stefan Feilmeier <stefan.feilmeier@fenecon.de>
Date: Tue, 8 Mar 2022 11:40:00 +0100
Subject: [PATCH 65/96] Update io.openems.edge.evcs.hardybarth

---
 .../openems/edge/evcs/hardybarth/Config.java  |   2 +-
 .../edge/evcs/hardybarth/HardyBarth.java      |  16 +-
 .../edge/evcs/hardybarth/HardyBarthApi.java   |  48 +++--
 .../edge/evcs/hardybarth/HardyBarthImpl.java  |   7 +-
 .../evcs/hardybarth/HardyBarthReadWorker.java | 172 +++++++++---------
 .../hardybarth/HardyBarthWriteHandler.java    |  30 ++-
 .../edge/evcs/hardybarth/MyConfig.java        |   2 +-
 7 files changed, 134 insertions(+), 143 deletions(-)

diff --git a/io.openems.edge.evcs.hardybarth/src/io/openems/edge/evcs/hardybarth/Config.java b/io.openems.edge.evcs.hardybarth/src/io/openems/edge/evcs/hardybarth/Config.java
index 32e35968062..86633930c91 100644
--- a/io.openems.edge.evcs.hardybarth/src/io/openems/edge/evcs/hardybarth/Config.java
+++ b/io.openems.edge.evcs.hardybarth/src/io/openems/edge/evcs/hardybarth/Config.java
@@ -28,7 +28,7 @@
 
 	@AttributeDefinition(name = "Maximum hardware current", description = "Maximum current of the Charger in mA.", required = true)
 	int maxHwCurrent() default 32000;
-	
+
 	String webconsole_configurationFactory_nameHint() default "EVCS Hardy Barth [{id}]";
 
 }
\ No newline at end of file
diff --git a/io.openems.edge.evcs.hardybarth/src/io/openems/edge/evcs/hardybarth/HardyBarth.java b/io.openems.edge.evcs.hardybarth/src/io/openems/edge/evcs/hardybarth/HardyBarth.java
index a3dd6349081..ab6b1621e44 100644
--- a/io.openems.edge.evcs.hardybarth/src/io/openems/edge/evcs/hardybarth/HardyBarth.java
+++ b/io.openems.edge.evcs.hardybarth/src/io/openems/edge/evcs/hardybarth/HardyBarth.java
@@ -28,7 +28,7 @@ public enum ChannelId implements io.openems.edge.common.channel.ChannelId {
 		RAW_CHARGE_STATUS_PWM(Doc.of(OpenemsType.STRING), "secc", "port0", "ci", "charge", "pwm", "status"), //
 		/**
 		 * States of the Hardy Barth.
-		 * 
+		 *
 		 * <p>
 		 * <ul>
 		 * <li>A = Free (no EV connected)
@@ -70,24 +70,24 @@ public enum ChannelId implements io.openems.edge.common.channel.ChannelId {
 				.text("No meter values available. The communication cable of the internal meter may be loose.")), //
 		RAW_METER_AVAILABLE(Doc.of(OpenemsType.BOOLEAN).onInit(channel -> {
 			((BooleanReadChannel) channel).onSetNextValue(value -> {
-				HardyBarthImpl hardyBarth = (HardyBarthImpl) channel.getComponent();
-				Boolean notAvailable = value.get() == null ? null : !value.get();
+				var hardyBarth = (HardyBarthImpl) channel.getComponent();
+				var notAvailable = value.get() == null ? null : !value.get();
 				hardyBarth.channel(HardyBarth.ChannelId.METER_NOT_AVAILABLE).setNextValue(notAvailable);
 			});
 		}), "secc", "port0", "metering", "meter", "available"), //
 
 		// METERING - POWER
-		RAW_ACTIVE_POWER_L1(Doc.of(OpenemsType.LONG).unit(Unit.WATT), (value) -> {
+		RAW_ACTIVE_POWER_L1(Doc.of(OpenemsType.LONG).unit(Unit.WATT), value -> {
 			Double doubleValue = TypeUtils.getAsType(OpenemsType.DOUBLE, value);
 			return TypeUtils.getAsType(OpenemsType.LONG, TypeUtils.multiply(doubleValue, SCALE_FACTOR_MINUS_1));
 		}, "secc", "port0", "metering", "power", "active", "ac", "l1", "actual"), //
 
-		RAW_ACTIVE_POWER_L2(Doc.of(OpenemsType.LONG).unit(Unit.WATT), (value) -> {
+		RAW_ACTIVE_POWER_L2(Doc.of(OpenemsType.LONG).unit(Unit.WATT), value -> {
 			Double doubleValue = TypeUtils.getAsType(OpenemsType.DOUBLE, value);
 			return TypeUtils.getAsType(OpenemsType.LONG, TypeUtils.multiply(doubleValue, SCALE_FACTOR_MINUS_1));
 		}, "secc", "port0", "metering", "power", "active", "ac", "l2", "actual"), //
 
-		RAW_ACTIVE_POWER_L3(Doc.of(OpenemsType.LONG).unit(Unit.WATT), (value) -> {
+		RAW_ACTIVE_POWER_L3(Doc.of(OpenemsType.LONG).unit(Unit.WATT), value -> {
 			Double doubleValue = TypeUtils.getAsType(OpenemsType.DOUBLE, value);
 			return TypeUtils.getAsType(OpenemsType.LONG, TypeUtils.multiply(doubleValue, SCALE_FACTOR_MINUS_1));
 		}, "secc", "port0", "metering", "power", "active", "ac", "l2", "actual"), //
@@ -165,7 +165,7 @@ public enum ChannelId implements io.openems.edge.common.channel.ChannelId {
 		protected final Function<Object, Object> converter;
 
 		private ChannelId(Doc doc, String... jsonPaths) {
-			this(doc, (value) -> value, jsonPaths);
+			this(doc, value -> value, jsonPaths);
 		}
 
 		private ChannelId(Doc doc, Function<Object, Object> converter, String... jsonPaths) {
@@ -181,7 +181,7 @@ public Doc doc() {
 
 		/**
 		 * Get the whole JSON path.
-		 * 
+		 *
 		 * @return Whole path.
 		 */
 		public String[] getJsonPaths() {
diff --git a/io.openems.edge.evcs.hardybarth/src/io/openems/edge/evcs/hardybarth/HardyBarthApi.java b/io.openems.edge.evcs.hardybarth/src/io/openems/edge/evcs/hardybarth/HardyBarthApi.java
index cfdd3142daf..ef18a7d7b9c 100644
--- a/io.openems.edge.evcs.hardybarth/src/io/openems/edge/evcs/hardybarth/HardyBarthApi.java
+++ b/io.openems.edge.evcs.hardybarth/src/io/openems/edge/evcs/hardybarth/HardyBarthApi.java
@@ -16,7 +16,7 @@
 
 /**
  * Implements the Hardy Barth Api.
- * 
+ *
  */
 public class HardyBarthApi {
 
@@ -34,21 +34,21 @@ public HardyBarthApi(String ip, HardyBarthImpl hardyBarthImpl) {
 
 	/**
 	 * Sends a get request to the Hardy Barth.
-	 * 
+	 *
 	 * @param endpoint the REST Api endpoint
 	 * @return a JsonObject or JsonArray
 	 * @throws OpenemsNamedException on error
 	 */
 	public JsonElement sendGetRequest(String endpoint) throws OpenemsNamedException {
-		boolean putRequestFailed = false;
+		var putRequestFailed = false;
 		JsonObject result = null;
 
 		try {
 			// Create URL like "http://192.168.8.101/api/"
-			URL url = new URL(this.baseUrl + endpoint);
+			var url = new URL(this.baseUrl + endpoint);
 
 			// Open http url connection
-			HttpURLConnection con = (HttpURLConnection) url.openConnection();
+			var con = (HttpURLConnection) url.openConnection();
 
 			// Set general information
 			con.setRequestProperty("Authorization", this.authorizationHeader);
@@ -58,10 +58,10 @@ public JsonElement sendGetRequest(String endpoint) throws OpenemsNamedException
 
 			// Read response
 			String body;
-			try (BufferedReader in = new BufferedReader(new InputStreamReader(con.getInputStream()))) {
+			try (var in = new BufferedReader(new InputStreamReader(con.getInputStream()))) {
 
 				// Read HTTP response
-				StringBuilder content = new StringBuilder();
+				var content = new StringBuilder();
 				String line;
 				while ((line = in.readLine()) != null) {
 					content.append(line);
@@ -71,16 +71,15 @@ public JsonElement sendGetRequest(String endpoint) throws OpenemsNamedException
 			}
 
 			// Get response code
-			int status = con.getResponseCode();
-			if (status < 300) {
-				putRequestFailed = false;
-				// Parse response to JSON
-				result = JsonUtils.parseToJsonObject(body);
-			} else {
+			var status = con.getResponseCode();
+			if (status >= 300) {
 				putRequestFailed = true;
 				throw new OpenemsException(
 						"Error while reading from Hardy Barth API. Response code: " + status + ". " + body);
 			}
+			putRequestFailed = false;
+			// Parse response to JSON
+			result = JsonUtils.parseToJsonObject(body);
 		} catch (OpenemsNamedException | IOException e) {
 			putRequestFailed = true;
 		}
@@ -92,7 +91,7 @@ public JsonElement sendGetRequest(String endpoint) throws OpenemsNamedException
 
 	/**
 	 * Sends a get request to the Hardy Barth.
-	 * 
+	 *
 	 * @param endpoint the REST Api endpoint @return a JsonObject or
 	 *                 JsonArray @throws OpenemsNamedException on error @throws
 	 * @param key      The key in the properties
@@ -101,15 +100,15 @@ public JsonElement sendGetRequest(String endpoint) throws OpenemsNamedException
 	 * @throws OpenemsNamedException on error
 	 */
 	public JsonObject sendPutRequest(String endpoint, String key, String value) throws OpenemsNamedException {
-		boolean putRequestFailed = false;
+		var putRequestFailed = false;
 		JsonObject result = null;
 
 		try {
 			// Create URL like "http://192.168.8.101/api/"
-			URL url = new URL(this.baseUrl + endpoint);
+			var url = new URL(this.baseUrl + endpoint);
 
 			// Open http url connection
-			HttpURLConnection connection = (HttpURLConnection) url.openConnection();
+			var connection = (HttpURLConnection) url.openConnection();
 
 			// Set general information
 			connection.setRequestProperty("Authorization", this.authorizationHeader);
@@ -119,16 +118,16 @@ public JsonObject sendPutRequest(String endpoint, String key, String value) thro
 			connection.setReadTimeout(5000);
 
 			// Write "topic" and "value" on request properties
-			OutputStreamWriter osw = new OutputStreamWriter(connection.getOutputStream());
+			var osw = new OutputStreamWriter(connection.getOutputStream());
 			osw.write("{\"" + key + "\":\"" + value + "\"}");
 			osw.flush();
 			osw.close();
 
 			String body;
-			try (BufferedReader in = new BufferedReader(new InputStreamReader(connection.getInputStream()))) {
+			try (var in = new BufferedReader(new InputStreamReader(connection.getInputStream()))) {
 
 				// Read HTTP response
-				StringBuilder content = new StringBuilder();
+				var content = new StringBuilder();
 				String line;
 				while ((line = in.readLine()) != null) {
 					content.append(line);
@@ -138,16 +137,15 @@ public JsonObject sendPutRequest(String endpoint, String key, String value) thro
 			}
 
 			// Get response code
-			int status = connection.getResponseCode();
-			if (status < 300 || status < 0) {
-				// Result OK
-				result = JsonUtils.parseToJsonObject(body);
-			} else {
+			var status = connection.getResponseCode();
+			if ((status >= 300) && (status >= 0)) {
 				// Respond error status-code
 				putRequestFailed = true;
 				throw new OpenemsException(
 						"Error while reading from Hardy Barth API. Response code: " + status + ". " + body);
 			}
+			// Result OK
+			result = JsonUtils.parseToJsonObject(body);
 		} catch (IOException e) {
 			putRequestFailed = true;
 		}
diff --git a/io.openems.edge.evcs.hardybarth/src/io/openems/edge/evcs/hardybarth/HardyBarthImpl.java b/io.openems.edge.evcs.hardybarth/src/io/openems/edge/evcs/hardybarth/HardyBarthImpl.java
index a15e2c42408..270dc5db523 100644
--- a/io.openems.edge.evcs.hardybarth/src/io/openems/edge/evcs/hardybarth/HardyBarthImpl.java
+++ b/io.openems.edge.evcs.hardybarth/src/io/openems/edge/evcs/hardybarth/HardyBarthImpl.java
@@ -69,13 +69,14 @@ void activate(ComponentContext context, Config config) {
 
 		if (config.enabled()) {
 			this.api = new HardyBarthApi(config.ip(), this);
-			
+
 			// Reading the given values
 			this.readWorker.activate(config.id());
 			this.readWorker.triggerNextRun();
 		}
 	}
 
+	@Override
 	@Deactivate
 	protected void deactivate() {
 		super.deactivate();
@@ -105,10 +106,10 @@ public void handleEvent(Event event) {
 
 	/**
 	 * Debug Log.
-	 * 
+	 *
 	 * <p>
 	 * Logging only if the debug mode is enabled
-	 * 
+	 *
 	 * @param message text that should be logged
 	 */
 	public void debugLog(String message) {
diff --git a/io.openems.edge.evcs.hardybarth/src/io/openems/edge/evcs/hardybarth/HardyBarthReadWorker.java b/io.openems.edge.evcs.hardybarth/src/io/openems/edge/evcs/hardybarth/HardyBarthReadWorker.java
index fe4f9a9015e..0f471da19a6 100644
--- a/io.openems.edge.evcs.hardybarth/src/io/openems/edge/evcs/hardybarth/HardyBarthReadWorker.java
+++ b/io.openems.edge.evcs.hardybarth/src/io/openems/edge/evcs/hardybarth/HardyBarthReadWorker.java
@@ -32,15 +32,15 @@ protected void forever() throws OpenemsNamedException {
 		// - rfidtags -> this.api.sendGetRequest("/rfidtags.json");
 		// - chargelogs -> this.api.sendGetRequest("/chargelogs.json");
 
-		JsonElement json = this.parent.api.sendGetRequest("/api");
+		var json = this.parent.api.sendGetRequest("/api");
 		if (json == null) {
 			return;
 		}
 
 		// Set value for every HardyBarth.ChannelId
 		for (HardyBarth.ChannelId channelId : HardyBarth.ChannelId.values()) {
-			String[] jsonPaths = channelId.getJsonPaths();
-			Object value = this.getValueFromJson(channelId, json, channelId.converter, jsonPaths);
+			var jsonPaths = channelId.getJsonPaths();
+			var value = this.getValueFromJson(channelId, json, channelId.converter, jsonPaths);
 
 			// Set the channel-value
 			this.parent.channel(channelId).setNextValue(value);
@@ -56,31 +56,30 @@ protected void forever() throws OpenemsNamedException {
 
 	/**
 	 * Set the value for every Evcs.ChannelId.
-	 * 
+	 *
 	 * @param json Given raw data in JSON
 	 */
 	private void setEvcsChannelIds(JsonElement json) {
 
 		// ENERGY_SESSION
-		Double energy = (Double) this.getValueFromJson(Evcs.ChannelId.ENERGY_SESSION, OpenemsType.STRING, json,
-				(value) -> {
-					if (value == null) {
-						return null;
-					}
-					Double rawEnergy = null;
-					String[] chargedata = value.toString().split("\\|");
-					if (chargedata.length == 3) {
-						Double doubleValue = TypeUtils.getAsType(OpenemsType.DOUBLE, chargedata[2]);
-						rawEnergy = doubleValue * 1000;
-					}
-					return rawEnergy;
+		var energy = (Double) this.getValueFromJson(Evcs.ChannelId.ENERGY_SESSION, OpenemsType.STRING, json, value -> {
+			if (value == null) {
+				return null;
+			}
+			Double rawEnergy = null;
+			String[] chargedata = value.toString().split("\\|");
+			if (chargedata.length == 3) {
+				Double doubleValue = TypeUtils.getAsType(OpenemsType.DOUBLE, chargedata[2]);
+				rawEnergy = doubleValue * 1000;
+			}
+			return rawEnergy;
 
-				}, "secc", "port0", "salia", "chargedata");
+		}, "secc", "port0", "salia", "chargedata");
 		this.parent._setEnergySession(energy == null ? null : (int) Math.round(energy));
 
 		// ACTIVE_CONSUMPTION_ENERGY
-		Long activeConsumptionEnergy = (Long) this.getValueFromJson(Evcs.ChannelId.ACTIVE_CONSUMPTION_ENERGY, json,
-				(value) -> {
+		var activeConsumptionEnergy = (Long) this.getValueFromJson(Evcs.ChannelId.ACTIVE_CONSUMPTION_ENERGY, json,
+				value -> {
 					Double doubleValue = TypeUtils.getAsType(OpenemsType.DOUBLE, value);
 					return TypeUtils.getAsType(OpenemsType.LONG, doubleValue);
 
@@ -88,14 +87,14 @@ private void setEvcsChannelIds(JsonElement json) {
 		this.parent._setActiveConsumptionEnergy(activeConsumptionEnergy);
 
 		// PHASES
-		Long powerL1 = (Long) this.getValueForChannel(HardyBarth.ChannelId.RAW_ACTIVE_POWER_L1, json);
-		Long powerL2 = (Long) this.getValueForChannel(HardyBarth.ChannelId.RAW_ACTIVE_POWER_L2, json);
-		Long powerL3 = (Long) this.getValueForChannel(HardyBarth.ChannelId.RAW_ACTIVE_POWER_L3, json);
+		var powerL1 = (Long) this.getValueForChannel(HardyBarth.ChannelId.RAW_ACTIVE_POWER_L1, json);
+		var powerL2 = (Long) this.getValueForChannel(HardyBarth.ChannelId.RAW_ACTIVE_POWER_L2, json);
+		var powerL3 = (Long) this.getValueForChannel(HardyBarth.ChannelId.RAW_ACTIVE_POWER_L3, json);
 
 		Integer phases = null;
 		if (powerL1 != null && powerL2 != null && powerL3 != null) {
 
-			Long sum = powerL1 + powerL2 + powerL3;
+			var sum = powerL1 + powerL2 + powerL3;
 
 			if (sum > 900) {
 				phases = 0;
@@ -120,7 +119,7 @@ private void setEvcsChannelIds(JsonElement json) {
 		this.parent._setMaximumHardwarePower(this.parent.config.maxHwCurrent() / 1000 * 3 * 230);
 
 		// CHARGE_POWER
-		Long chargePowerLong = (Long) this.getValueFromJson(Evcs.ChannelId.CHARGE_POWER, json, (value) -> {
+		var chargePowerLong = (Long) this.getValueFromJson(Evcs.ChannelId.CHARGE_POWER, json, value -> {
 			Integer integerValue = TypeUtils.getAsType(OpenemsType.INTEGER, value);
 			if (integerValue == null) {
 				return null;
@@ -136,64 +135,63 @@ private void setEvcsChannelIds(JsonElement json) {
 		this.parent._setChargePower(chargePowerLong == null ? null : chargePowerLong.intValue());
 
 		// STATUS
-		Status status = (Status) this.getValueFromJson(HardyBarth.ChannelId.RAW_CHARGE_STATUS_CHARGEPOINT, json,
-				(value) -> {
-					String stringValue = TypeUtils.getAsType(OpenemsType.STRING, value);
-					if (stringValue == null) {
-						return Status.UNDEFINED;
-					}
+		var status = (Status) this.getValueFromJson(HardyBarth.ChannelId.RAW_CHARGE_STATUS_CHARGEPOINT, json, value -> {
+			String stringValue = TypeUtils.getAsType(OpenemsType.STRING, value);
+			if (stringValue == null) {
+				return Status.UNDEFINED;
+			}
 
-					Status rawStatus = Status.UNDEFINED;
-					switch (stringValue) {
-					case "A":
-						rawStatus = Status.NOT_READY_FOR_CHARGING;
-						break;
-					case "B":
-						rawStatus = Status.READY_FOR_CHARGING;
-
-						// Detect if the car is full
-						int chargePower = chargePowerLong == null ? 0 : chargePowerLong.intValue();
-						if (this.parent.getSetChargePowerLimit().orElse(0) >= this.parent.getMinimumHardwarePower()
-								.orElse(0) && chargePower <= 0) {
-
-							if (this.chargingFinishedCounter >= 90) {
-								rawStatus = Status.CHARGING_FINISHED;
-							} else {
-								this.chargingFinishedCounter++;
-							}
-						} else {
-							this.chargingFinishedCounter = 0;
-
-							// Charging rejected because we are forcing to pause charging
-							if (this.parent.getSetChargePowerLimit().orElse(0) == 0) {
-								rawStatus = Status.CHARGING_REJECTED;
-							}
-						}
-						break;
-					case "C":
-					case "D":
-						rawStatus = Status.CHARGING;
-						break;
-					case "E":
-					case "F":
-						rawStatus = Status.ERROR;
-						break;
-					default:
-						rawStatus = Status.UNDEFINED;
-						break;
+			Status rawStatus = Status.UNDEFINED;
+			switch (stringValue) {
+			case "A":
+				rawStatus = Status.NOT_READY_FOR_CHARGING;
+				break;
+			case "B":
+				rawStatus = Status.READY_FOR_CHARGING;
+
+				// Detect if the car is full
+				int chargePower = chargePowerLong == null ? 0 : chargePowerLong.intValue();
+				if (this.parent.getSetChargePowerLimit().orElse(0) >= this.parent.getMinimumHardwarePower().orElse(0)
+						&& chargePower <= 0) {
+
+					if (this.chargingFinishedCounter >= 90) {
+						rawStatus = Status.CHARGING_FINISHED;
+					} else {
+						this.chargingFinishedCounter++;
 					}
-					if (stringValue.equals("B")) {
-						this.chargingFinishedCounter = 0;
+				} else {
+					this.chargingFinishedCounter = 0;
+
+					// Charging rejected because we are forcing to pause charging
+					if (this.parent.getSetChargePowerLimit().orElse(0) == 0) {
+						rawStatus = Status.CHARGING_REJECTED;
 					}
-					return rawStatus;
-				}, "secc", "port0", "ci", "charge", "cp", "status");
+				}
+				break;
+			case "C":
+			case "D":
+				rawStatus = Status.CHARGING;
+				break;
+			case "E":
+			case "F":
+				rawStatus = Status.ERROR;
+				break;
+			default:
+				rawStatus = Status.UNDEFINED;
+				break;
+			}
+			if (stringValue.equals("B")) {
+				this.chargingFinishedCounter = 0;
+			}
+			return rawStatus;
+		}, "secc", "port0", "ci", "charge", "cp", "status");
 
 		this.parent._setStatus(status);
 	}
 
 	/**
 	 * Call the getValueFromJson with the detailed information of the channel.
-	 * 
+	 *
 	 * @param channelId Channel that value will be detect.
 	 * @param json      Whole JSON path, where the JsonElement for the given channel
 	 *                  is located.
@@ -206,7 +204,7 @@ private Object getValueForChannel(HardyBarth.ChannelId channelId, JsonElement js
 
 	/**
 	 * Call the getValueFromJson without a divergent type in the raw json.
-	 * 
+	 *
 	 * @param channelId Channel that value will be detect.
 	 * @param json      Raw JsonElement.
 	 * @param converter Converter, to convert the raw JSON value into a proper
@@ -224,7 +222,7 @@ private Object getValueFromJson(ChannelId channelId, JsonElement json, Function<
 	/**
 	 * Get the last JSON element and it's value, by running through the given
 	 * jsonPath.
-	 * 
+	 *
 	 * @param channelId              Channel that value will be detect.
 	 * @param divergentTypeInRawJson Divergent type of the value in the depending
 	 *                               JsonElement.
@@ -239,29 +237,25 @@ private Object getValueFromJson(ChannelId channelId, JsonElement json, Function<
 	private Object getValueFromJson(ChannelId channelId, OpenemsType divergentTypeInRawJson, JsonElement json,
 			Function<Object, Object> converter, String... jsonPaths) {
 
-		JsonElement currentJsonElement = json;
+		var currentJsonElement = json;
 		// Go through the whole jsonPath of the current channelId
-		for (int i = 0; i < jsonPaths.length; i++) {
-			String currentPathMember = jsonPaths[i];
+		for (var i = 0; i < jsonPaths.length; i++) {
+			var currentPathMember = jsonPaths[i];
 			// System.out.println(currentPathMember);
 			try {
-				if (i != jsonPaths.length - 1) {
-					// Not last path element
-					currentJsonElement = JsonUtils.getAsJsonObject(currentJsonElement, currentPathMember);
-				} else {
+				if (i == jsonPaths.length - 1) {
 					//
-					OpenemsType openemsType = divergentTypeInRawJson == null ? channelId.doc().getType()
+					var openemsType = divergentTypeInRawJson == null ? channelId.doc().getType()
 							: divergentTypeInRawJson;
 
 					// Last path element
-					Object value = this.getJsonElementValue(currentJsonElement, openemsType, jsonPaths[i]);
-
-					// Apply value converter
-					value = converter.apply(value);
+					var value = this.getJsonElementValue(currentJsonElement, openemsType, jsonPaths[i]);
 
 					// Return the converted value
-					return value;
+					return converter.apply(value);
 				}
+				// Not last path element
+				currentJsonElement = JsonUtils.getAsJsonObject(currentJsonElement, currentPathMember);
 			} catch (OpenemsNamedException e) {
 				return null;
 			}
@@ -271,7 +265,7 @@ private Object getValueFromJson(ChannelId channelId, OpenemsType divergentTypeIn
 
 	/**
 	 * Get Value of the given JsonElement in the required type.
-	 * 
+	 *
 	 * @param jsonElement Element as JSON.
 	 * @param openemsType Required type.
 	 * @param memberName  Member name of the JSON Element.
diff --git a/io.openems.edge.evcs.hardybarth/src/io/openems/edge/evcs/hardybarth/HardyBarthWriteHandler.java b/io.openems.edge.evcs.hardybarth/src/io/openems/edge/evcs/hardybarth/HardyBarthWriteHandler.java
index 1099e364bab..d26f17a5f76 100644
--- a/io.openems.edge.evcs.hardybarth/src/io/openems/edge/evcs/hardybarth/HardyBarthWriteHandler.java
+++ b/io.openems.edge.evcs.hardybarth/src/io/openems/edge/evcs/hardybarth/HardyBarthWriteHandler.java
@@ -1,14 +1,12 @@
 package io.openems.edge.evcs.hardybarth;
 
 import java.time.LocalDateTime;
-import java.util.Optional;
 
 import com.google.gson.JsonElement;
 
 import io.openems.common.exceptions.OpenemsError.OpenemsNamedException;
 import io.openems.edge.common.channel.StringReadChannel;
 import io.openems.edge.common.channel.WriteChannel;
-import io.openems.edge.common.channel.value.Value;
 import io.openems.edge.evcs.api.ManagedEvcs;
 import io.openems.edge.evcs.api.Status;
 
@@ -46,13 +44,13 @@ public void run() {
 
 	/**
 	 * Set manual mode.
-	 * 
+	 *
 	 * <p>
 	 * Sets the chargemode to manual if not set.
 	 */
 	private void setManualMode() {
 		StringReadChannel channelChargeMode = this.parent.channel(HardyBarth.ChannelId.RAW_SALIA_CHARGE_MODE);
-		Optional<String> valueOpt = channelChargeMode.value().asOptional();
+		var valueOpt = channelChargeMode.value().asOptional();
 		if (valueOpt.isPresent()) {
 			if (!valueOpt.get().equals("manual")) {
 				// Set to manual mode
@@ -69,7 +67,7 @@ private void setManualMode() {
 
 	/**
 	 * Set heartbeat.
-	 * 
+	 *
 	 * <p>
 	 * Sets the heartbeat to on or off.
 	 */
@@ -90,7 +88,7 @@ private void setHeartbeat() {
 
 	/**
 	 * Enable external meter.
-	 * 
+	 *
 	 * <p>
 	 * Enables the external meter if not set.
 	 */
@@ -102,7 +100,7 @@ private void setHeartbeat() {
 	// be called every cycle
 	/*
 	 * private void enableExternalMeter() {
-	 * 
+	 *
 	 * BooleanReadChannel channelChargeMode =
 	 * this.parent.channel(HardyBarth.ChannelId.RAW_SALIA_CHANGE_METER);
 	 * Optional<Boolean> valueOpt = channelChargeMode.value().asOptional(); if
@@ -113,7 +111,7 @@ private void setHeartbeat() {
 	 * this.parent.api.sendPutRequest("/api/secc", "salia/changemeter",
 	 * "enable | /dev/ttymxc0 | klefr | 9600 | none | 1");
 	 * this.parent.debugLog(result.toString());
-	 * 
+	 *
 	 * if (result.toString().equals("{\"result\":\"ok\"}")) { // Reboot the charger
 	 * this.parent.debugLog("Reboot of HardyBarth " + this.parent.id()); JsonElement
 	 * resultReboot = this.parent.api.sendPutRequest("/api/secc",
@@ -123,7 +121,7 @@ private void setHeartbeat() {
 
 	/**
 	 * Sets the current from SET_CHARGE_POWER channel.
-	 * 
+	 *
 	 * <p>
 	 * Allowed loading current are between 6A and 32A. Invalid values are discarded.
 	 * The value is also depending on the configured min and max current of the
@@ -138,18 +136,18 @@ private void setPower() {
 
 			// Check current set_charge_power_limit write value
 			WriteChannel<Integer> channel = this.parent.channel(ManagedEvcs.ChannelId.SET_CHARGE_POWER_LIMIT);
-			Optional<Integer> valueOpt = channel.getNextWriteValueAndReset();
+			var valueOpt = channel.getNextWriteValueAndReset();
 			if (valueOpt.isPresent()) {
 
 				int power = valueOpt.get();
 
 				// Convert it to ampere and apply hard limits
-				Value<Integer> phases = this.parent.getPhases();
+				var phases = this.parent.getPhases();
 				Integer current = (int) Math.round(power / (double) phases.orElse(3) / 230.0);
 
 				// TODO: Read separate saliaconf.json and set minimum and maximum dynamically
-				int maximum = this.parent.config.maxHwCurrent() / 1000;
-				int minimum = this.parent.config.minHwCurrent() / 1000;
+				var maximum = this.parent.config.maxHwCurrent() / 1000;
+				var minimum = this.parent.config.minHwCurrent() / 1000;
 				if (current > maximum) {
 					current = maximum;
 				}
@@ -178,7 +176,7 @@ private void setPower() {
 
 	/**
 	 * Set current target to the charger.
-	 * 
+	 *
 	 * @param current current target in A
 	 * @param power   current target in W
 	 */
@@ -218,9 +216,9 @@ private void setTarget(int current, int power) {
 	 */
 	private void setEnergyLimit() {
 		WriteChannel<Integer> channel = this.parent.channel(ManagedEvcs.ChannelId.SET_ENERGY_LIMIT);
-		Optional<Integer> valueOpt = channel.getNextWriteValueAndReset();
+		var valueOpt = channel.getNextWriteValueAndReset();
 		if (valueOpt.isPresent()) {
-			Integer energyLimit = valueOpt.get();
+			var energyLimit = valueOpt.get();
 
 			// Set if the energy target to set changed
 			if (!energyLimit.equals(this.lastEnergySession)) {
diff --git a/io.openems.edge.evcs.hardybarth/test/io/openems/edge/evcs/hardybarth/MyConfig.java b/io.openems.edge.evcs.hardybarth/test/io/openems/edge/evcs/hardybarth/MyConfig.java
index bc329466bd5..14301494aa9 100644
--- a/io.openems.edge.evcs.hardybarth/test/io/openems/edge/evcs/hardybarth/MyConfig.java
+++ b/io.openems.edge.evcs.hardybarth/test/io/openems/edge/evcs/hardybarth/MyConfig.java
@@ -41,7 +41,7 @@ public MyConfig build() {
 
 	/**
 	 * Create a Config builder.
-	 * 
+	 *
 	 * @return a {@link Builder}
 	 */
 	public static Builder create() {

From 8d22116228030705da83b8e7e803010f45adf3a4 Mon Sep 17 00:00:00 2001
From: Stefan Feilmeier <stefan.feilmeier@fenecon.de>
Date: Tue, 8 Mar 2022 11:44:52 +0100
Subject: [PATCH 66/96] Update io.openems.edge.keba.kecontact

---
 .../evcs/keba/kecontact/KebaChannelId.java    |   5 +-
 .../evcs/keba/kecontact/KebaKeContact.java    |  34 ++-
 .../edge/evcs/keba/kecontact/Plug.java        |   4 +-
 .../edge/evcs/keba/kecontact/ReadHandler.java | 206 +++++++++---------
 .../edge/evcs/keba/kecontact/ReadWorker.java  |  21 +-
 .../edge/evcs/keba/kecontact/Report.java      |   2 +-
 .../evcs/keba/kecontact/WriteHandler.java     |  32 ++-
 .../kecontact/core/KebaKeContactCore.java     |   2 +-
 .../kecontact/core/KebaKeContactCoreImpl.java |  23 +-
 9 files changed, 163 insertions(+), 166 deletions(-)

diff --git a/io.openems.edge.evcs.keba.kecontact/src/io/openems/edge/evcs/keba/kecontact/KebaChannelId.java b/io.openems.edge.evcs.keba.kecontact/src/io/openems/edge/evcs/keba/kecontact/KebaChannelId.java
index 9ce7700422f..e52c0b80059 100644
--- a/io.openems.edge.evcs.keba.kecontact/src/io/openems/edge/evcs/keba/kecontact/KebaChannelId.java
+++ b/io.openems.edge.evcs.keba.kecontact/src/io/openems/edge/evcs/keba/kecontact/KebaChannelId.java
@@ -19,8 +19,9 @@ public enum KebaChannelId implements io.openems.edge.common.channel.ChannelId {
 	COM_MODULE(Doc.of(OpenemsType.STRING).text("Communication module is installed; KeContact P30 only")),
 	DIP_SWITCH_1(Doc.of(OpenemsType.STRING).text("The first eight dip switch settings as binary")),
 	DIP_SWITCH_2(Doc.of(OpenemsType.STRING).text("The second eight dip switch settings as binary")),
-	DIP_SWITCH_MAX_HW(Doc.of(OpenemsType.INTEGER).unit(Unit.AMPERE).text("The raw maximum limit configured by the dip switches")),
-	
+	DIP_SWITCH_MAX_HW(
+			Doc.of(OpenemsType.INTEGER).unit(Unit.AMPERE).text("The raw maximum limit configured by the dip switches")),
+
 	/*
 	 * Report 2
 	 */
diff --git a/io.openems.edge.evcs.keba.kecontact/src/io/openems/edge/evcs/keba/kecontact/KebaKeContact.java b/io.openems.edge.evcs.keba.kecontact/src/io/openems/edge/evcs/keba/kecontact/KebaKeContact.java
index 456f26c3689..de792655c3f 100644
--- a/io.openems.edge.evcs.keba.kecontact/src/io/openems/edge/evcs/keba/kecontact/KebaKeContact.java
+++ b/io.openems.edge.evcs.keba.kecontact/src/io/openems/edge/evcs/keba/kecontact/KebaKeContact.java
@@ -3,7 +3,6 @@
 import java.io.IOException;
 import java.net.DatagramPacket;
 import java.net.DatagramSocket;
-import java.net.Inet4Address;
 import java.net.InetAddress;
 import java.net.SocketException;
 import java.net.UnknownHostException;
@@ -81,7 +80,7 @@ void activate(ComponentContext context, Config config) throws UnknownHostExcepti
 
 		this.channel(KebaChannelId.ALIAS).setNextValue(config.alias());
 
-		this.ip = Inet4Address.getByName(config.ip().trim());
+		this.ip = InetAddress.getByName(config.ip().trim());
 
 		this.config = config;
 		this._setPowerPrecision(0.23);
@@ -101,6 +100,7 @@ void activate(ComponentContext context, Config config) throws UnknownHostExcepti
 
 	}
 
+	@Override
 	@Deactivate
 	protected void deactivate() {
 		super.deactivate();
@@ -117,12 +117,12 @@ public void handleEvent(Event event) {
 
 			// Clear channels if the connection to the Charging Station has been lost
 			Channel<Boolean> connectionLostChannel = this.channel(Evcs.ChannelId.CHARGINGSTATION_COMMUNICATION_FAILED);
-			Boolean connectionLost = connectionLostChannel.value().orElse(lastConnectionLostState);
-			if (connectionLost != lastConnectionLostState) {
+			var connectionLost = connectionLostChannel.value().orElse(this.lastConnectionLostState);
+			if (connectionLost != this.lastConnectionLostState) {
 				if (connectionLost) {
-					resetChannelValues();
+					this.resetChannelValues();
 				}
-				lastConnectionLostState = connectionLost;
+				this.lastConnectionLostState = connectionLost;
 			}
 
 			// handle writes
@@ -138,23 +138,17 @@ public void handleEvent(Event event) {
 	 * @return true if sent
 	 */
 	protected boolean send(String s) {
-		byte[] raw = s.getBytes();
-		DatagramPacket packet = new DatagramPacket(raw, raw.length, ip, KebaKeContact.UDP_PORT);
-		DatagramSocket datagrammSocket = null;
-		try {
-			datagrammSocket = new DatagramSocket();
+		var raw = s.getBytes();
+		var packet = new DatagramPacket(raw, raw.length, this.ip, KebaKeContact.UDP_PORT);
+		try (DatagramSocket datagrammSocket = new DatagramSocket()) {
 			datagrammSocket.send(packet);
 			return true;
 		} catch (SocketException e) {
-			this.logError(this.log, "Unable to open UDP socket for sending [" + s + "] to [" + ip.getHostAddress()
+			this.logError(this.log, "Unable to open UDP socket for sending [" + s + "] to [" + this.ip.getHostAddress()
 					+ "]: " + e.getMessage());
 		} catch (IOException e) {
 			this.logError(this.log,
-					"Unable to send [" + s + "] UDP message to [" + ip.getHostAddress() + "]: " + e.getMessage());
-		} finally {
-			if (datagrammSocket != null) {
-				datagrammSocket.close();
-			}
+					"Unable to send [" + s + "] UDP message to [" + this.ip.getHostAddress() + "]: " + e.getMessage());
 		}
 		return false;
 	}
@@ -173,7 +167,7 @@ public String debugLog() {
 
 	/**
 	 * Logs are displayed if the debug mode is configured
-	 * 
+	 *
 	 * @param log    Logger
 	 * @param string Text to display
 	 */
@@ -184,11 +178,11 @@ protected void logInfoInDebugmode(Logger log, String string) {
 	}
 
 	public ReadWorker getReadWorker() {
-		return readWorker;
+		return this.readWorker;
 	}
 
 	public ReadHandler getReadHandler() {
-		return readHandler;
+		return this.readHandler;
 	}
 
 	/**
diff --git a/io.openems.edge.evcs.keba.kecontact/src/io/openems/edge/evcs/keba/kecontact/Plug.java b/io.openems.edge.evcs.keba.kecontact/src/io/openems/edge/evcs/keba/kecontact/Plug.java
index 34d70c21d74..1ca34e1c7a6 100644
--- a/io.openems.edge.evcs.keba.kecontact/src/io/openems/edge/evcs/keba/kecontact/Plug.java
+++ b/io.openems.edge.evcs.keba.kecontact/src/io/openems/edge/evcs/keba/kecontact/Plug.java
@@ -20,12 +20,12 @@ private Plug(int value, String name) {
 
 	@Override
 	public int getValue() {
-		return value;
+		return this.value;
 	}
 
 	@Override
 	public String getName() {
-		return name;
+		return this.name;
 	}
 
 	@Override
diff --git a/io.openems.edge.evcs.keba.kecontact/src/io/openems/edge/evcs/keba/kecontact/ReadHandler.java b/io.openems.edge.evcs.keba.kecontact/src/io/openems/edge/evcs/keba/kecontact/ReadHandler.java
index 1ec930cd9ea..ddc667b8428 100644
--- a/io.openems.edge.evcs.keba.kecontact/src/io/openems/edge/evcs/keba/kecontact/ReadHandler.java
+++ b/io.openems.edge.evcs.keba.kecontact/src/io/openems/edge/evcs/keba/kecontact/ReadHandler.java
@@ -1,7 +1,6 @@
 package io.openems.edge.evcs.keba.kecontact;
 
 import java.math.BigInteger;
-import java.util.Optional;
 import java.util.function.Consumer;
 
 import org.slf4j.Logger;
@@ -35,11 +34,11 @@ public ReadHandler(KebaKeContact parent) {
 	public void accept(String message) {
 
 		if (message.startsWith("TCH-OK")) {
-			log.debug("KEBA confirmed reception of command: TCH-OK");
+			this.log.debug("KEBA confirmed reception of command: TCH-OK");
 			this.parent.triggerQuery();
 
 		} else if (message.startsWith("TCH-ERR")) {
-			log.warn("KEBA reported command error: TCH-ERR");
+			this.log.warn("KEBA reported command error: TCH-ERR");
 			this.parent.triggerQuery();
 
 		} else {
@@ -47,36 +46,36 @@ public void accept(String message) {
 			try {
 				jsonMessageElement = JsonUtils.parse(message);
 			} catch (OpenemsNamedException e) {
-				log.error("Error while parsing KEBA message: " + e.getMessage());
+				this.log.error("Error while parsing KEBA message: " + e.getMessage());
 				return;
 			}
-			this.parent.logInfoInDebugmode(log, message);
+			this.parent.logInfoInDebugmode(this.log, message);
 
-			JsonObject jsonMessage = jsonMessageElement.getAsJsonObject();
+			var jsonMessage = jsonMessageElement.getAsJsonObject();
 			// JsonUtils.prettyPrint(jMessage);
-			Optional<String> idOpt = JsonUtils.getAsOptionalString(jsonMessage, "ID");
+			var idOpt = JsonUtils.getAsOptionalString(jsonMessage, "ID");
 			if (idOpt.isPresent()) {
 				// message with ID
-				String id = idOpt.get();
+				var id = idOpt.get();
 				if (id.equals("1")) {
 					/*
 					 * Reply to report 1
 					 */
-					receiveReport1 = true;
-					setString(KebaChannelId.SERIAL, jsonMessage, "Serial");
-					setString(KebaChannelId.FIRMWARE, jsonMessage, "Firmware");
-					setInt(KebaChannelId.COM_MODULE, jsonMessage, "COM-module");
+					this.receiveReport1 = true;
+					this.setString(KebaChannelId.SERIAL, jsonMessage, "Serial");
+					this.setString(KebaChannelId.FIRMWARE, jsonMessage, "Firmware");
+					this.setInt(KebaChannelId.COM_MODULE, jsonMessage, "COM-module");
 
 					// Dip-Switches
-					Optional<String> dipSwitch1 = JsonUtils.getAsOptionalString(jsonMessage, "DIP-Sw1");
-					Optional<String> dipSwitch2 = JsonUtils.getAsOptionalString(jsonMessage, "DIP-Sw2");
+					var dipSwitch1 = JsonUtils.getAsOptionalString(jsonMessage, "DIP-Sw1");
+					var dipSwitch2 = JsonUtils.getAsOptionalString(jsonMessage, "DIP-Sw2");
 
 					if (dipSwitch1.isPresent() && dipSwitch2.isPresent()) {
 						this.checkDipSwitchSettings(dipSwitch1.get(), dipSwitch2.get());
 					}
 
 					// Product information
-					Optional<String> product = JsonUtils.getAsOptionalString(jsonMessage, "Product");
+					var product = JsonUtils.getAsOptionalString(jsonMessage, "Product");
 					if (product.isPresent()) {
 						this.parent.channel(KebaChannelId.PRODUCT).setNextValue(product.get());
 						this.checkProductInformation(product.get());
@@ -86,8 +85,8 @@ public void accept(String message) {
 					/*
 					 * Reply to report 2
 					 */
-					receiveReport2 = true;
-					setInt(KebaChannelId.STATUS_KEBA, jsonMessage, "State");
+					this.receiveReport2 = true;
+					this.setInt(KebaChannelId.STATUS_KEBA, jsonMessage, "State");
 
 					// Value "setenergy" not used, because it is reset by the currtime 0 1 command
 
@@ -107,7 +106,7 @@ public void accept(String message) {
 
 						// Charging is Finished if 'Plug' is connected, State was charging or already
 						// finished and the EVCS is still ready for charging.
-						Status evcsStatus = parent.getStatus();
+						var evcsStatus = this.parent.getStatus();
 						switch (evcsStatus) {
 						case CHARGING_REJECTED:
 						case ENERGY_LIMIT_REACHED:
@@ -120,11 +119,11 @@ public void accept(String message) {
 						case CHARGING:
 						case CHARGING_FINISHED:
 							if (status.equals(Status.READY_FOR_CHARGING)
-									&& parent.getSetChargePowerLimit().orElse(0) > 0) {
+									&& this.parent.getSetChargePowerLimit().orElse(0) > 0) {
 								status = Status.CHARGING_FINISHED;
 							}
 						}
-						
+
 						/*
 						 * Check if the maximum energy limit is reached, informs the user and sets the
 						 * status
@@ -145,52 +144,53 @@ public void accept(String message) {
 					}
 
 					this.parent._setStatus(status);
-					boolean errorState = status == Status.ERROR ? true : false;
+					var errorState = status == Status.ERROR == true;
 					this.parent.channel(KebaChannelId.CHARGINGSTATION_STATE_ERROR).setNextValue(errorState);
 
-					setInt(KebaChannelId.ERROR_1, jsonMessage, "Error1");
-					setInt(KebaChannelId.ERROR_2, jsonMessage, "Error2");
-					setInt(KebaChannelId.PLUG, jsonMessage, "Plug");
-					setBoolean(KebaChannelId.ENABLE_SYS, jsonMessage, "Enable sys");
-					setBoolean(KebaChannelId.ENABLE_USER, jsonMessage, "Enable user");
-					setInt(KebaChannelId.MAX_CURR_PERCENT, jsonMessage, "Max curr %");
-					setInt(KebaChannelId.CURR_FAILSAFE, jsonMessage, "Curr FS");
-					setInt(KebaChannelId.TIMEOUT_FAILSAFE, jsonMessage, "Tmo FS");
-					setInt(KebaChannelId.CURR_TIMER, jsonMessage, "Curr timer");
-					setInt(KebaChannelId.TIMEOUT_CT, jsonMessage, "Tmo CT");
-					setBoolean(KebaChannelId.OUTPUT, jsonMessage, "Output");
-					setBoolean(KebaChannelId.INPUT, jsonMessage, "Input");
-					setInt(KebaChannelId.MAX_CURR, jsonMessage, "Curr HW");
-					setInt(KebaChannelId.CURR_USER, jsonMessage, "Curr user");
+					this.setInt(KebaChannelId.ERROR_1, jsonMessage, "Error1");
+					this.setInt(KebaChannelId.ERROR_2, jsonMessage, "Error2");
+					this.setInt(KebaChannelId.PLUG, jsonMessage, "Plug");
+					this.setBoolean(KebaChannelId.ENABLE_SYS, jsonMessage, "Enable sys");
+					this.setBoolean(KebaChannelId.ENABLE_USER, jsonMessage, "Enable user");
+					this.setInt(KebaChannelId.MAX_CURR_PERCENT, jsonMessage, "Max curr %");
+					this.setInt(KebaChannelId.CURR_FAILSAFE, jsonMessage, "Curr FS");
+					this.setInt(KebaChannelId.TIMEOUT_FAILSAFE, jsonMessage, "Tmo FS");
+					this.setInt(KebaChannelId.CURR_TIMER, jsonMessage, "Curr timer");
+					this.setInt(KebaChannelId.TIMEOUT_CT, jsonMessage, "Tmo CT");
+					this.setBoolean(KebaChannelId.OUTPUT, jsonMessage, "Output");
+					this.setBoolean(KebaChannelId.INPUT, jsonMessage, "Input");
+					this.setInt(KebaChannelId.MAX_CURR, jsonMessage, "Curr HW");
+					this.setInt(KebaChannelId.CURR_USER, jsonMessage, "Curr user");
 
 				} else if (id.equals("3")) {
 					/*
 					 * Reply to report 3
 					 */
-					receiveReport3 = true;
-					setInt(KebaChannelId.VOLTAGE_L1, jsonMessage, "U1");
-					setInt(KebaChannelId.VOLTAGE_L2, jsonMessage, "U2");
-					setInt(KebaChannelId.VOLTAGE_L3, jsonMessage, "U3");
-					setInt(KebaChannelId.CURRENT_L1, jsonMessage, "I1");
-					setInt(KebaChannelId.CURRENT_L2, jsonMessage, "I2");
-					setInt(KebaChannelId.CURRENT_L3, jsonMessage, "I3");
-					setInt(KebaChannelId.ACTUAL_POWER, jsonMessage, "P");
-					setInt(KebaChannelId.COS_PHI, jsonMessage, "PF");
-
-					long totalEnergy = Math.round((JsonUtils.getAsOptionalLong(jsonMessage, "E total").orElse(0L)) * 0.1F);
+					this.receiveReport3 = true;
+					this.setInt(KebaChannelId.VOLTAGE_L1, jsonMessage, "U1");
+					this.setInt(KebaChannelId.VOLTAGE_L2, jsonMessage, "U2");
+					this.setInt(KebaChannelId.VOLTAGE_L3, jsonMessage, "U3");
+					this.setInt(KebaChannelId.CURRENT_L1, jsonMessage, "I1");
+					this.setInt(KebaChannelId.CURRENT_L2, jsonMessage, "I2");
+					this.setInt(KebaChannelId.CURRENT_L3, jsonMessage, "I3");
+					this.setInt(KebaChannelId.ACTUAL_POWER, jsonMessage, "P");
+					this.setInt(KebaChannelId.COS_PHI, jsonMessage, "PF");
+
+					long totalEnergy = Math
+							.round(JsonUtils.getAsOptionalLong(jsonMessage, "E total").orElse(0L) * 0.1F);
 					this.parent.channel(KebaChannelId.ENERGY_TOTAL).setNextValue(totalEnergy);
 					this.parent._setActiveConsumptionEnergy(totalEnergy);
 
 					// Set the count of the Phases that are currently used
-					Channel<Integer> currentL1 = parent.channel(KebaChannelId.CURRENT_L1);
-					Channel<Integer> currentL2 = parent.channel(KebaChannelId.CURRENT_L2);
-					Channel<Integer> currentL3 = parent.channel(KebaChannelId.CURRENT_L3);
-					int currentSum = currentL1.value().orElse(0) + currentL2.value().orElse(0)
+					Channel<Integer> currentL1 = this.parent.channel(KebaChannelId.CURRENT_L1);
+					Channel<Integer> currentL2 = this.parent.channel(KebaChannelId.CURRENT_L2);
+					Channel<Integer> currentL3 = this.parent.channel(KebaChannelId.CURRENT_L3);
+					var currentSum = currentL1.value().orElse(0) + currentL2.value().orElse(0)
 							+ currentL3.value().orElse(0);
 
 					if (currentSum > 300) {
 
-						int phases = 0;
+						var phases = 0;
 
 						if (currentL1.value().orElse(0) >= 100) {
 							phases += 1;
@@ -203,7 +203,7 @@ public void accept(String message) {
 						}
 						this.parent._setPhases(phases);
 
-						this.parent.logInfoInDebugmode(log, "Used phases: " + this.parent.getPhases().orElse(3));
+						this.parent.logInfoInDebugmode(this.log, "Used phases: " + this.parent.getPhases().orElse(3));
 					}
 
 					/*
@@ -217,14 +217,14 @@ public void accept(String message) {
 					/*
 					 * Set default MINIMUM_HARDWARE_POWER of Evcs
 					 */
-					int minHwCurrent = this.parent.config.minHwCurrent() / 1000;
+					var minHwCurrent = this.parent.config.minHwCurrent() / 1000;
 					this.parent.channel(Evcs.ChannelId.MINIMUM_HARDWARE_POWER)
 							.setNextValue(230 /* Spannung */ * minHwCurrent /* min Strom */ * phases);
 
 					/*
 					 * Set CHARGE_POWER of Evcs
 					 */
-					Optional<Integer> powerMw = JsonUtils.getAsOptionalInt(jsonMessage, "P"); // in [mW]
+					var powerMw = JsonUtils.getAsOptionalInt(jsonMessage, "P"); // in [mW]
 					Integer power = null;
 					if (powerMw.isPresent()) {
 						power = powerMw.get() / 1000; // convert to [W]
@@ -235,7 +235,7 @@ public void accept(String message) {
 					 * Set ENERGY_SESSION of Evcs
 					 */
 					this.parent.channel(Evcs.ChannelId.ENERGY_SESSION)
-							.setNextValue((JsonUtils.getAsOptionalInt(jsonMessage, "E pres").orElse(0)) * 0.1);
+							.setNextValue(JsonUtils.getAsOptionalInt(jsonMessage, "E pres").orElse(0) * 0.1);
 				}
 
 			} else {
@@ -243,20 +243,20 @@ public void accept(String message) {
 				 * message without ID -> UDP broadcast
 				 */
 				if (jsonMessage.has("State")) {
-					setInt(KebaChannelId.STATUS_KEBA, jsonMessage, "State");
+					this.setInt(KebaChannelId.STATUS_KEBA, jsonMessage, "State");
 				}
 				if (jsonMessage.has("Plug")) {
-					setInt(KebaChannelId.PLUG, jsonMessage, "Plug");
+					this.setInt(KebaChannelId.PLUG, jsonMessage, "Plug");
 				}
 				if (jsonMessage.has("Input")) {
-					setBoolean(KebaChannelId.INPUT, jsonMessage, "Input");
+					this.setBoolean(KebaChannelId.INPUT, jsonMessage, "Input");
 				}
 				if (jsonMessage.has("Enable sys")) {
-					setBoolean(KebaChannelId.ENABLE_SYS, jsonMessage, "Enable sys");
+					this.setBoolean(KebaChannelId.ENABLE_SYS, jsonMessage, "Enable sys");
 				}
 				if (jsonMessage.has("E pres")) {
 					this.parent.channel(Evcs.ChannelId.ENERGY_SESSION)
-							.setNextValue((JsonUtils.getAsOptionalInt(jsonMessage, "E pres").orElse(0)) * 0.1);
+							.setNextValue(JsonUtils.getAsOptionalInt(jsonMessage, "E pres").orElse(0) * 0.1);
 				}
 			}
 		}
@@ -264,50 +264,50 @@ public void accept(String message) {
 
 	/**
 	 * Sets the associated channels depending on the dip-switches.
-	 * 
+	 *
 	 * @param dipSwitch1 Block one with eight dip-switches
 	 * @param dipSwitch2 Block two with eight dip-switches
 	 */
 	private void checkDipSwitchSettings(String dipSwitch1, String dipSwitch2) {
-		dipSwitch1 = hexStringToBinaryString(dipSwitch1);
-		dipSwitch2 = hexStringToBinaryString(dipSwitch2);
+		dipSwitch1 = this.hexStringToBinaryString(dipSwitch1);
+		dipSwitch2 = this.hexStringToBinaryString(dipSwitch2);
 
 		this.parent.channel(KebaChannelId.DIP_SWITCH_1).setNextValue(dipSwitch1);
 		this.parent.channel(KebaChannelId.DIP_SWITCH_2).setNextValue(dipSwitch2);
 
-		boolean setState = false;
-		boolean hasStaticIp = false;
+		var setState = false;
+		var hasStaticIp = false;
 
 		// Set Channel for the communication
-		setState = dipSwitch1.charAt(2) == '1' ? false : true;
-		setnextStateChannelValue(KebaChannelId.DIP_SWITCH_ERROR_1_3_NOT_SET_FOR_COMM, setState);
+		setState = dipSwitch1.charAt(2) == '1' == false;
+		this.setnextStateChannelValue(KebaChannelId.DIP_SWITCH_ERROR_1_3_NOT_SET_FOR_COMM, setState);
 
 		// Is IP static or dynamic
-		int staticIpSum = Integer.parseInt(dipSwitch2.substring(0, 4));
-		hasStaticIp = staticIpSum > 0 ? true : false;
+		var staticIpSum = Integer.parseInt(dipSwitch2.substring(0, 4));
+		hasStaticIp = staticIpSum > 0 == true;
 
 		if (hasStaticIp) {
 			// Set Channel for "static IP dip-switch not set"
-			setState = dipSwitch2.charAt(5) == '1' ? false : true;
-			setnextStateChannelValue(KebaChannelId.DIP_SWITCH_ERROR_2_6_NOT_SET_FOR_STATIC_IP, setState);
+			setState = dipSwitch2.charAt(5) == '1' == false;
+			this.setnextStateChannelValue(KebaChannelId.DIP_SWITCH_ERROR_2_6_NOT_SET_FOR_STATIC_IP, setState);
 
 		} else {
 			// Set Channel for "static IP dip-switch wrongly set"
-			setState = dipSwitch2.charAt(5) == '1' ? true : false;
-			setnextStateChannelValue(KebaChannelId.DIP_SWITCH_ERROR_2_6_SET_FOR_DYNAMIC_IP, setState);
+			setState = dipSwitch2.charAt(5) == '1' == true;
+			this.setnextStateChannelValue(KebaChannelId.DIP_SWITCH_ERROR_2_6_SET_FOR_DYNAMIC_IP, setState);
 		}
 
 		// Set Channel for "Master-Slave communication set"
-		setState = dipSwitch2.charAt(4) == '1' ? true : false;
-		setnextStateChannelValue(KebaChannelId.DIP_SWITCH_INFO_2_5_SET_FOR_MASTER_SLAVE_COMM, setState);
+		setState = dipSwitch2.charAt(4) == '1' == true;
+		this.setnextStateChannelValue(KebaChannelId.DIP_SWITCH_INFO_2_5_SET_FOR_MASTER_SLAVE_COMM, setState);
 
 		// Set Channel for "installation mode set"
-		setState = dipSwitch2.charAt(7) == '1' ? true : false;
-		setnextStateChannelValue(KebaChannelId.DIP_SWITCH_INFO_2_8_SET_FOR_INSTALLATION, setState);
+		setState = dipSwitch2.charAt(7) == '1' == true;
+		this.setnextStateChannelValue(KebaChannelId.DIP_SWITCH_INFO_2_8_SET_FOR_INSTALLATION, setState);
 
 		// Set Channel for the configured maximum limit in mA
 		Integer hwLimit = null;
-		String hwLimitDips = dipSwitch1.substring(5);
+		var hwLimitDips = dipSwitch1.substring(5);
 
 		switch (hwLimitDips) {
 		case "000":
@@ -329,26 +329,26 @@ private void checkDipSwitchSettings(String dipSwitch1, String dipSwitch2) {
 
 	/**
 	 * Sets the associated channels depending on the product information.
-	 * 
+	 *
 	 * @param product Detailed product information as string
 	 */
 	private void checkProductInformation(String product) {
-		String[] blocks = product.split("-");
+		var blocks = product.split("-");
 
 		// e- and b-series cannot be controlled
-		char series = blocks[2].charAt(6);
-		boolean oldSeries = series == '0' || series == '1' ? true : false;
-		setnextStateChannelValue(KebaChannelId.PRODUCT_SERIES_IS_NOT_COMPATIBLE, oldSeries);
+		var series = blocks[2].charAt(6);
+		var oldSeries = series == '0' || series == '1' == true;
+		this.setnextStateChannelValue(KebaChannelId.PRODUCT_SERIES_IS_NOT_COMPATIBLE, oldSeries);
 
 		// Energy cannot be measured if there is no meter installed
-		char meter = blocks[3].charAt(0);
-		boolean noMeter = meter == '0' ? true : false;
-		setnextStateChannelValue(KebaChannelId.NO_ENERGY_METER_INSTALLED, noMeter);
+		var meter = blocks[3].charAt(0);
+		var noMeter = meter == '0' == true;
+		this.setnextStateChannelValue(KebaChannelId.NO_ENERGY_METER_INSTALLED, noMeter);
 	}
 
 	/**
 	 * Set the next value of a KebaChannelId state channel.
-	 * 
+	 *
 	 * @param channel Channel that needs to be set
 	 * @param bool    Value that will be set
 	 */
@@ -358,9 +358,9 @@ private void setnextStateChannelValue(KebaChannelId channel, boolean bool) {
 
 	public String hexStringToBinaryString(String dipSwitches) {
 		dipSwitches = dipSwitches.replace("0x", "");
-		String binaryString = new BigInteger(dipSwitches, 16).toString(2);
-		int length = binaryString.length();
-		for (int i = 0; i < 8 - length; i++) {
+		var binaryString = new BigInteger(dipSwitches, 16).toString(2);
+		var length = binaryString.length();
+		for (var i = 0; i < 8 - length; i++) {
 			binaryString = "0" + binaryString;
 		}
 		return binaryString;
@@ -371,44 +371,44 @@ private void set(KebaChannelId channelId, Object value) {
 	}
 
 	private void setString(KebaChannelId channelId, JsonObject jMessage, String name) {
-		set(channelId, JsonUtils.getAsOptionalString(jMessage, name).orElse(null));
+		this.set(channelId, JsonUtils.getAsOptionalString(jMessage, name).orElse(null));
 	}
 
 	private void setInt(KebaChannelId channelId, JsonObject jMessage, String name) {
-		set(channelId, JsonUtils.getAsOptionalInt(jMessage, name).orElse(null));
+		this.set(channelId, JsonUtils.getAsOptionalInt(jMessage, name).orElse(null));
 	}
 
 	private void setBoolean(KebaChannelId channelId, JsonObject jMessage, String name) {
-		Optional<Integer> enableSysOpt = JsonUtils.getAsOptionalInt(jMessage, name);
+		var enableSysOpt = JsonUtils.getAsOptionalInt(jMessage, name);
 		if (enableSysOpt.isPresent()) {
-			set(channelId, enableSysOpt.get() == 1);
+			this.set(channelId, enableSysOpt.get() == 1);
 		} else {
-			set(channelId, null);
+			this.set(channelId, null);
 		}
 	}
 
 	/**
 	 * returns true or false, if the requested report answered or not and set that
 	 * value to false.
-	 * 
+	 *
 	 * @param report requested Report
 	 * @return boolean
 	 */
 	public boolean hasResultandReset(Report report) {
 
-		boolean result = false;
+		var result = false;
 		switch (report) {
 		case REPORT1:
-			result = receiveReport1;
-			receiveReport1 = false;
+			result = this.receiveReport1;
+			this.receiveReport1 = false;
 			break;
 		case REPORT2:
-			result = receiveReport2;
-			receiveReport2 = false;
+			result = this.receiveReport2;
+			this.receiveReport2 = false;
 			break;
 		case REPORT3:
-			result = receiveReport3;
-			receiveReport3 = false;
+			result = this.receiveReport3;
+			this.receiveReport3 = false;
 			break;
 		}
 		return result;
diff --git a/io.openems.edge.evcs.keba.kecontact/src/io/openems/edge/evcs/keba/kecontact/ReadWorker.java b/io.openems.edge.evcs.keba.kecontact/src/io/openems/edge/evcs/keba/kecontact/ReadWorker.java
index 38135bb643a..4ab3d44924c 100644
--- a/io.openems.edge.evcs.keba.kecontact/src/io/openems/edge/evcs/keba/kecontact/ReadWorker.java
+++ b/io.openems.edge.evcs.keba.kecontact/src/io/openems/edge/evcs/keba/kecontact/ReadWorker.java
@@ -62,16 +62,16 @@ protected void forever() throws InterruptedException {
 		// RESULTS
 		// Sets the state of the component if the report doesn't answer in a few seconds
 		if (this.validateReport1 && this.lastReport1.isBefore(LocalDateTime.now().minusSeconds(MAX_TIME_TILL_REPLY))) {
-			currentCommunication(this.parent.getReadHandler().hasResultandReset(Report.REPORT1));
+			this.currentCommunication(this.parent.getReadHandler().hasResultandReset(Report.REPORT1));
 			this.validateReport1 = false;
 		}
 		if (this.validateReport2 && this.lastReport2.isBefore(LocalDateTime.now().minusSeconds(MAX_TIME_TILL_REPLY))) {
-			currentCommunication(this.parent.getReadHandler().hasResultandReset(Report.REPORT2));
+			this.currentCommunication(this.parent.getReadHandler().hasResultandReset(Report.REPORT2));
 			this.validateReport2 = false;
 		}
 
 		if (this.validateReport3 && this.lastReport3.isBefore(LocalDateTime.now().minusSeconds(MAX_TIME_TILL_REPLY))) {
-			currentCommunication(this.parent.getReadHandler().hasResultandReset(Report.REPORT3));
+			this.currentCommunication(this.parent.getReadHandler().hasResultandReset(Report.REPORT3));
 			this.validateReport3 = false;
 		}
 	}
@@ -79,22 +79,23 @@ protected void forever() throws InterruptedException {
 	@Override
 	protected int getCycleTime() {
 		// get minimum required time till next report
-		LocalDateTime now = LocalDateTime.now();
+		var now = LocalDateTime.now();
 		if (this.lastReport1.isBefore(now.minusSeconds(Report.REPORT1.getRequestSeconds()))
 				|| this.lastReport2.isBefore(now.minusSeconds(Report.REPORT2.getRequestSeconds()))
 				|| this.lastReport3.isBefore(now.minusSeconds(Report.REPORT3.getRequestSeconds()))) {
 			return 0;
 		}
-		long tillReport1 = ChronoUnit.MILLIS.between(now.minusSeconds(Report.REPORT1.getRequestSeconds()),
+		var tillReport1 = ChronoUnit.MILLIS.between(now.minusSeconds(Report.REPORT1.getRequestSeconds()),
 				this.lastReport1);
-		long tillReport2 = ChronoUnit.MILLIS.between(now.minusSeconds(Report.REPORT2.getRequestSeconds()),
+		var tillReport2 = ChronoUnit.MILLIS.between(now.minusSeconds(Report.REPORT2.getRequestSeconds()),
 				this.lastReport2);
-		long tillReport3 = ChronoUnit.MILLIS.between(now.minusSeconds(Report.REPORT3.getRequestSeconds()),
+		var tillReport3 = ChronoUnit.MILLIS.between(now.minusSeconds(Report.REPORT3.getRequestSeconds()),
 				this.lastReport3);
-		long min = Math.min(Math.min(tillReport1, tillReport2), tillReport3);
+		var min = Math.min(Math.min(tillReport1, tillReport2), tillReport3);
 		if (min < 0) {
 			return 0;
-		} else if (min > Integer.MAX_VALUE) {
+		}
+		if (min > Integer.MAX_VALUE) {
 			return Integer.MAX_VALUE;
 		} else {
 			return (int) min;
@@ -114,7 +115,7 @@ public void triggerNextRun() {
 
 	/**
 	 * Set the current fail state of the EVCS to true or false.
-	 * 
+	 *
 	 * @param receivedAMessage return value from the ReadHandler
 	 */
 	private void currentCommunication(boolean receivedAMessage) {
diff --git a/io.openems.edge.evcs.keba.kecontact/src/io/openems/edge/evcs/keba/kecontact/Report.java b/io.openems.edge.evcs.keba.kecontact/src/io/openems/edge/evcs/keba/kecontact/Report.java
index f730f2064ef..a1eb5ba996e 100644
--- a/io.openems.edge.evcs.keba.kecontact/src/io/openems/edge/evcs/keba/kecontact/Report.java
+++ b/io.openems.edge.evcs.keba.kecontact/src/io/openems/edge/evcs/keba/kecontact/Report.java
@@ -10,7 +10,7 @@ private Report(int requestSeconds) {
 	}
 
 	public int getRequestSeconds() {
-		return requestSeconds;
+		return this.requestSeconds;
 	}
 
 	public void setRequestSeconds(int requestSeconds) {
diff --git a/io.openems.edge.evcs.keba.kecontact/src/io/openems/edge/evcs/keba/kecontact/WriteHandler.java b/io.openems.edge.evcs.keba.kecontact/src/io/openems/edge/evcs/keba/kecontact/WriteHandler.java
index f011dd7bbbf..1001cbcd81b 100644
--- a/io.openems.edge.evcs.keba.kecontact/src/io/openems/edge/evcs/keba/kecontact/WriteHandler.java
+++ b/io.openems.edge.evcs.keba.kecontact/src/io/openems/edge/evcs/keba/kecontact/WriteHandler.java
@@ -1,7 +1,6 @@
 package io.openems.edge.evcs.keba.kecontact;
 
 import java.time.LocalDateTime;
-import java.util.Optional;
 
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -9,7 +8,6 @@
 import io.openems.common.exceptions.OpenemsError.OpenemsNamedException;
 import io.openems.edge.common.channel.Channel;
 import io.openems.edge.common.channel.WriteChannel;
-import io.openems.edge.common.channel.value.Value;
 import io.openems.edge.evcs.api.Evcs;
 import io.openems.edge.evcs.api.ManagedEvcs;
 import io.openems.edge.evcs.api.Status;
@@ -51,7 +49,7 @@ public void run() {
 
 	/**
 	 * Sets the display text from SET_DISPLAY channel.
-	 * 
+	 *
 	 * <p>
 	 * Note:
 	 * <ul>
@@ -62,9 +60,9 @@ public void run() {
 	 */
 	private void setDisplay() {
 		WriteChannel<String> channel = this.parent.channel(ManagedEvcs.ChannelId.SET_DISPLAY_TEXT);
-		Optional<String> valueOpt = channel.getNextWriteValueAndReset();
+		var valueOpt = channel.getNextWriteValueAndReset();
 		if (valueOpt.isPresent()) {
-			String display = valueOpt.get();
+			var display = valueOpt.get();
 			if (display.length() > 23) {
 				display = display.substring(0, 23);
 			}
@@ -73,7 +71,7 @@ private void setDisplay() {
 
 				this.parent.logInfoInDebugmode(this.log, "Setting KEBA KeContact display text to [" + display + "]");
 
-				boolean sentSuccessfully = parent.send("display 0 0 0 0 " + display);
+				var sentSuccessfully = this.parent.send("display 0 0 0 0 " + display);
 				if (sentSuccessfully) {
 					this.nextDisplayWrite = LocalDateTime.now().plusSeconds(WRITE_DISPLAY_INTERVAL_SECONDS);
 					this.lastDisplay = display;
@@ -87,7 +85,7 @@ private void setDisplay() {
 
 	/**
 	 * Sets the current from SET_CHARGE_POWER channel.
-	 * 
+	 *
 	 * <p>
 	 * Allowed loading current are between 6000mA and 63000mA. Invalid values are
 	 * discarded. The value is also depending on the DIP-switch settings and the
@@ -103,11 +101,11 @@ private void setPower() {
 
 			// Check current set_charge_power_limit write value
 			WriteChannel<Integer> channel = this.parent.channel(ManagedEvcs.ChannelId.SET_CHARGE_POWER_LIMIT);
-			Optional<Integer> valueOpt = channel.getNextWriteValueAndReset();
+			var valueOpt = channel.getNextWriteValueAndReset();
 			if (valueOpt.isPresent()) {
 
-				Integer power = valueOpt.get();
-				Value<Integer> phases = this.parent.getPhases();
+				var power = valueOpt.get();
+				var phases = this.parent.getPhases();
 				Integer current = power * 1000 / phases.orElse(3) /* e.g. 3 phases */ / 230; /* voltage */
 				// limits the charging value because KEBA knows only values between 6000 and
 				// 63000
@@ -120,7 +118,7 @@ private void setPower() {
 
 				if (!current.equals(this.lastCurrent) || this.nextCurrentWrite.isBefore(LocalDateTime.now())) {
 
-					this.parent.logInfoInDebugmode(log, "Setting KEBA " + this.parent.alias() + " current to ["
+					this.parent.logInfoInDebugmode(this.log, "Setting KEBA " + this.parent.alias() + " current to ["
 							+ current + " A] - calculated from [" + power + " W] by " + phases.orElse(3) + " Phase");
 
 					this.setTarget(current, power);
@@ -132,7 +130,7 @@ private void setPower() {
 			} catch (OpenemsNamedException e) {
 				e.printStackTrace();
 			}
-			this.parent.logInfoInDebugmode(log, "Maximum energy limit reached");
+			this.parent.logInfoInDebugmode(this.log, "Maximum energy limit reached");
 			this.parent._setStatus(Status.ENERGY_LIMIT_REACHED);
 
 			if (!this.lastCurrent.equals(0) || this.parent.getChargePower().orElse(0) != 0) {
@@ -143,19 +141,19 @@ private void setPower() {
 
 	/**
 	 * Set current target to the charger.
-	 * 
+	 *
 	 * @param current current target in mA
 	 * @param power   current target in W
 	 */
 	private void setTarget(int current, int power) {
 		try {
 			Channel<Integer> currPower = this.parent.channel(KebaChannelId.ACTUAL_POWER);
-			this.parent.setDisplayText((currPower.value().orElse(0) / 1000) + "W");
+			this.parent.setDisplayText(currPower.value().orElse(0) / 1000 + "W");
 		} catch (OpenemsNamedException e) {
 			e.printStackTrace();
 		}
 
-		boolean sentSuccessfully = parent.send("currtime " + current + " 1");
+		var sentSuccessfully = this.parent.send("currtime " + current + " 1");
 		if (sentSuccessfully) {
 			this.nextCurrentWrite = LocalDateTime.now().plusSeconds(WRITE_INTERVAL_SECONDS);
 			this.lastCurrent = current;
@@ -172,10 +170,10 @@ private void setEnergySession() {
 
 		WriteChannel<Integer> channel = this.parent.channel(ManagedEvcs.ChannelId.SET_ENERGY_LIMIT);
 
-		Optional<Integer> valueOpt = channel.getNextWriteValueAndReset();
+		var valueOpt = channel.getNextWriteValueAndReset();
 
 		if (valueOpt.isPresent()) {
-			Integer energyLimit = valueOpt.get();
+			var energyLimit = valueOpt.get();
 
 			// Set if the energy target to set changed
 			if (!energyLimit.equals(this.lastEnergySession)) {
diff --git a/io.openems.edge.evcs.keba.kecontact/src/io/openems/edge/evcs/keba/kecontact/core/KebaKeContactCore.java b/io.openems.edge.evcs.keba.kecontact/src/io/openems/edge/evcs/keba/kecontact/core/KebaKeContactCore.java
index 049ac474489..4c087584e98 100644
--- a/io.openems.edge.evcs.keba.kecontact/src/io/openems/edge/evcs/keba/kecontact/core/KebaKeContactCore.java
+++ b/io.openems.edge.evcs.keba.kecontact/src/io/openems/edge/evcs/keba/kecontact/core/KebaKeContactCore.java
@@ -8,7 +8,7 @@ public interface KebaKeContactCore {
 	/**
 	 * Callback on receive of a message. InetAddress is the address of the sending
 	 * EVCS, String is the message.
-	 * 
+	 *
 	 * @param callback Callback
 	 */
 	public void onReceive(BiConsumer<InetAddress, String> callback);
diff --git a/io.openems.edge.evcs.keba.kecontact/src/io/openems/edge/evcs/keba/kecontact/core/KebaKeContactCoreImpl.java b/io.openems.edge.evcs.keba.kecontact/src/io/openems/edge/evcs/keba/kecontact/core/KebaKeContactCoreImpl.java
index 30491ad5d21..25b8080437d 100644
--- a/io.openems.edge.evcs.keba.kecontact/src/io/openems/edge/evcs/keba/kecontact/core/KebaKeContactCoreImpl.java
+++ b/io.openems.edge.evcs.keba.kecontact/src/io/openems/edge/evcs/keba/kecontact/core/KebaKeContactCoreImpl.java
@@ -62,34 +62,37 @@ private ReceiveWorker(int port) throws OpenemsException {
 		@Override
 		public void activate(String name) {
 			super.activate(name);
-			log.info("Started Evcs.Keba.KeContact.Core listener on port [" + KebaKeContact.UDP_PORT + "]");
+			KebaKeContactCoreImpl.this.log
+					.info("Started Evcs.Keba.KeContact.Core listener on port [" + KebaKeContact.UDP_PORT + "]");
 		}
 
 		@Override
 		public void deactivate() {
 			this.socket.close();
 			super.deactivate();
-			log.info("Stopped Evcs.Keba.KeContact.Core listener on port [" + KebaKeContact.UDP_PORT + "]");
+			KebaKeContactCoreImpl.this.log
+					.info("Stopped Evcs.Keba.KeContact.Core listener on port [" + KebaKeContact.UDP_PORT + "]");
 		}
 
 		@Override
 		protected void forever() {
 			// Wait for message
-			DatagramPacket packet = new DatagramPacket(new byte[512], 512);
+			var packet = new DatagramPacket(new byte[512], 512);
 			try {
-				socket.receive(packet);
+				this.socket.receive(packet);
 			} catch (IOException e) {
-				log.error("Error while receiving data from KEBA KeContact: " + e.getMessage());
+				KebaKeContactCoreImpl.this.log
+						.error("Error while receiving data from KEBA KeContact: " + e.getMessage());
 			}
 
 			// Read message
-			InetAddress ip = packet.getAddress();
-			int len = packet.getLength();
-			byte[] data = packet.getData();
-			String message = new String(data, 0, len);
+			var ip = packet.getAddress();
+			var len = packet.getLength();
+			var data = packet.getData();
+			var message = new String(data, 0, len);
 
 			// call callbacks
-			onReceiveCallbacks.forEach(consumer -> consumer.accept(ip, message));
+			KebaKeContactCoreImpl.this.onReceiveCallbacks.forEach(consumer -> consumer.accept(ip, message));
 		}
 	}
 

From 40c8c562be6c4c1a49155da61938bb364aeed87c Mon Sep 17 00:00:00 2001
From: Stefan Feilmeier <stefan.feilmeier@fenecon.de>
Date: Tue, 8 Mar 2022 11:45:50 +0100
Subject: [PATCH 67/96] Update io.openems.edge.evcs.ocpp.abl

---
 .../io/openems/edge/evcs/ocpp/abl/Abl.java    | 38 +++++++++----------
 1 file changed, 17 insertions(+), 21 deletions(-)

diff --git a/io.openems.edge.evcs.ocpp.abl/src/io/openems/edge/evcs/ocpp/abl/Abl.java b/io.openems.edge.evcs.ocpp.abl/src/io/openems/edge/evcs/ocpp/abl/Abl.java
index 00e334b3701..819477d911f 100644
--- a/io.openems.edge.evcs.ocpp.abl/src/io/openems/edge/evcs/ocpp/abl/Abl.java
+++ b/io.openems.edge.evcs.ocpp.abl/src/io/openems/edge/evcs/ocpp/abl/Abl.java
@@ -59,7 +59,7 @@ public class Abl extends AbstractOcppEvcsComponent
 	 * all of them, but in particular it is not supporting the information of the
 	 * current power.
 	 */
-	private static final HashSet<OcppInformations> MEASUREMENTS = new HashSet<OcppInformations>( //
+	private static final HashSet<OcppInformations> MEASUREMENTS = new HashSet<>( //
 			Arrays.asList( //
 					OcppInformations.values()) //
 	);
@@ -127,36 +127,32 @@ public void handleEvent(Event event) {
 	public OcppStandardRequests getStandardRequests() {
 		AbstractOcppEvcsComponent evcs = this;
 
-		return new OcppStandardRequests() {
+		return chargePower -> {
 
-			@Override
-			public Request setChargePowerLimit(int chargePower) {
+			var request = new DataTransferRequest("ABL");
 
-				DataTransferRequest request = new DataTransferRequest("ABL");
+			int phases = evcs.getPhases().orElse(3);
 
-				int phases = evcs.getPhases().orElse(3);
+			var target = Math.round(chargePower / phases / 230.0) /* voltage */ ;
 
-				long target = Math.round(chargePower / phases / 230.0) /* voltage */ ;
+			var maxCurrent = evcs.getMaximumHardwarePower().orElse(DEFAULT_HARDWARE_LIMIT) / phases / 230;
+			target = target > maxCurrent ? maxCurrent : target;
 
-				int maxCurrent = evcs.getMaximumHardwarePower().orElse(DEFAULT_HARDWARE_LIMIT) / phases / 230;
-				target = target > maxCurrent ? maxCurrent : target;
-
-				request.setMessageId("SetLimit");
-				request.setData("logicalid=" + config.limitId() + ";value=" + String.valueOf(target));
-				return request;
-			}
+			request.setMessageId("SetLimit");
+			request.setData("logicalid=" + Abl.this.config.limitId() + ";value=" + String.valueOf(target));
+			return request;
 		};
 	}
 
 	@Override
 	public List<Request> getRequiredRequestsAfterConnection() {
-		List<Request> requests = new ArrayList<Request>();
+		List<Request> requests = new ArrayList<>();
 
-		ChangeConfigurationRequest setMeterValueSampleInterval = new ChangeConfigurationRequest(
+		var setMeterValueSampleInterval = new ChangeConfigurationRequest(
 				"MeterValueSampleInterval", "10");
 		requests.add(setMeterValueSampleInterval);
 
-		ChangeConfigurationRequest setMeterValueSampledData = new ChangeConfigurationRequest("MeterValuesSampledData",
+		var setMeterValueSampledData = new ChangeConfigurationRequest("MeterValuesSampledData",
 				"Energy.Active.Import.Register,Current.Import,Voltage,Power.Active.Import,Temperature");
 		requests.add(setMeterValueSampledData);
 
@@ -165,17 +161,17 @@ public List<Request> getRequiredRequestsAfterConnection() {
 
 	@Override
 	public List<Request> getRequiredRequestsDuringConnection() {
-		List<Request> requests = new ArrayList<Request>();
+		List<Request> requests = new ArrayList<>();
 
-		TriggerMessageRequest requestMeterValues = new TriggerMessageRequest(TriggerMessageRequestType.MeterValues);
+		var requestMeterValues = new TriggerMessageRequest(TriggerMessageRequestType.MeterValues);
 		requestMeterValues.setConnectorId(this.getConfiguredConnectorId());
 		requests.add(requestMeterValues);
 
-		TriggerMessageRequest requestStatus = new TriggerMessageRequest(TriggerMessageRequestType.StatusNotification);
+		var requestStatus = new TriggerMessageRequest(TriggerMessageRequestType.StatusNotification);
 		requestStatus.setConnectorId(this.getConfiguredConnectorId());
 		requests.add(requestStatus);
 
-		ChangeConfigurationRequest setMeterValueSampledData = new ChangeConfigurationRequest("MeterValuesSampledData",
+		var setMeterValueSampledData = new ChangeConfigurationRequest("MeterValuesSampledData",
 				"Energy.Active.Import.Register,Current.Import,Voltage,Power.Active.Import,Temperature");
 		requests.add(setMeterValueSampledData);
 

From 793c79f322d5e1d5aa2b92a0023b8dac17f65478 Mon Sep 17 00:00:00 2001
From: Stefan Feilmeier <stefan.feilmeier@fenecon.de>
Date: Tue, 8 Mar 2022 11:50:02 +0100
Subject: [PATCH 68/96] Update io.openems.edge.evcs.ocpp.common

---
 .../common/AbstractOcppEvcsComponent.java     | 65 +++++++++----------
 .../evcs/ocpp/common/ChargeSessionStamp.java  | 14 ++--
 .../evcs/ocpp/common/ChargingProperty.java    |  8 +--
 .../evcs/ocpp/common/OcppInformations.java    |  2 +-
 .../edge/evcs/ocpp/common/OcppServer.java     |  6 +-
 .../ocpp/common/OcppStandardRequests.java     |  4 +-
 .../edge/evcs/ocpp/common/WriteHandler.java   | 35 +++++-----
 7 files changed, 66 insertions(+), 68 deletions(-)

diff --git a/io.openems.edge.evcs.ocpp.common/src/io/openems/edge/evcs/ocpp/common/AbstractOcppEvcsComponent.java b/io.openems.edge.evcs.ocpp.common/src/io/openems/edge/evcs/ocpp/common/AbstractOcppEvcsComponent.java
index 537a8275080..06976279d34 100644
--- a/io.openems.edge.evcs.ocpp.common/src/io/openems/edge/evcs/ocpp/common/AbstractOcppEvcsComponent.java
+++ b/io.openems.edge.evcs.ocpp.common/src/io/openems/edge/evcs/ocpp/common/AbstractOcppEvcsComponent.java
@@ -43,10 +43,10 @@ public abstract class AbstractOcppEvcsComponent extends AbstractOpenemsComponent
 
 	protected UUID sessionId = null;
 
-	private ChargeSessionStamp sessionStart = new ChargeSessionStamp();
+	private final ChargeSessionStamp sessionStart = new ChargeSessionStamp();
+
+	private final ChargeSessionStamp sessionEnd = new ChargeSessionStamp();
 
-	private ChargeSessionStamp sessionEnd = new ChargeSessionStamp();
-	
 	@Reference(policy = ReferencePolicy.DYNAMIC, policyOption = ReferencePolicyOption.GREEDY, cardinality = ReferenceCardinality.OPTIONAL)
 	private volatile Timedata timedata = null;
 
@@ -55,7 +55,7 @@ protected AbstractOcppEvcsComponent(OcppProfileType[] profileTypes,
 			io.openems.edge.common.channel.ChannelId[]... furtherInitialChannelIds) {
 		super(firstInitialChannelIds, furtherInitialChannelIds);
 
-		this.profileTypes = new HashSet<OcppProfileType>(Arrays.asList(profileTypes));
+		this.profileTypes = new HashSet<>(Arrays.asList(profileTypes));
 	}
 
 	public enum ChannelId implements io.openems.edge.common.channel.ChannelId {
@@ -76,8 +76,8 @@ public Doc doc() {
 	protected void activate(ComponentContext context, String id, String alias, boolean enabled) {
 		super.activate(context, id, alias, enabled);
 
-		this.channel(Evcs.ChannelId.MAXIMUM_HARDWARE_POWER).setNextValue(getConfiguredMaximumHardwarePower());
-		this.channel(Evcs.ChannelId.MINIMUM_HARDWARE_POWER).setNextValue(getConfiguredMinimumHardwarePower());
+		this.channel(Evcs.ChannelId.MAXIMUM_HARDWARE_POWER).setNextValue(this.getConfiguredMaximumHardwarePower());
+		this.channel(Evcs.ChannelId.MINIMUM_HARDWARE_POWER).setNextValue(this.getConfiguredMinimumHardwarePower());
 	}
 
 	@Override
@@ -89,7 +89,7 @@ public void handleEvent(Event event) {
 
 		case EdgeEventConstants.TOPIC_CYCLE_EXECUTE_WRITE:
 			if (this.sessionId == null) {
-				lostSession();
+				this.lostSession();
 				return;
 			}
 
@@ -104,32 +104,31 @@ public void handleEvent(Event event) {
 	 * set.
 	 */
 	private void setInitialTotalEnergyFromTimedata() {
-		Long totalEnergy = this.getActiveConsumptionEnergy().orElse(null);
-		
+		var totalEnergy = this.getActiveConsumptionEnergy().orElse(null);
+
 		// Total energy already set
 		if (totalEnergy != null) {
 			return;
 		}
-		
-		Timedata timedata = this.getTimedata();
-		String componentId = this.id();
+
+		var timedata = this.getTimedata();
+		var componentId = this.id();
 		if (timedata == null || componentId == null) {
-			return;
-		} else {
-			timedata.getLatestValue(new ChannelAddress(componentId, "ActiveConstumptionEnergy"))
-					.thenAccept(totalEnergyOpt -> {
-						
-						if (totalEnergyOpt.isPresent()) {
-							try {
-								this._setActiveConsumptionEnergy(TypeUtils.getAsType(OpenemsType.LONG, totalEnergyOpt.get()));
-							} catch (IllegalArgumentException e) {
-								this._setActiveConsumptionEnergy(TypeUtils.getAsType(OpenemsType.LONG, 0L));
-							}
-						} else {
+		}
+		timedata.getLatestValue(new ChannelAddress(componentId, "ActiveConstumptionEnergy"))
+				.thenAccept(totalEnergyOpt -> {
+
+					if (totalEnergyOpt.isPresent()) {
+						try {
+							this._setActiveConsumptionEnergy(
+									TypeUtils.getAsType(OpenemsType.LONG, totalEnergyOpt.get()));
+						} catch (IllegalArgumentException e) {
 							this._setActiveConsumptionEnergy(TypeUtils.getAsType(OpenemsType.LONG, 0L));
 						}
-					});
-		}
+					} else {
+						this._setActiveConsumptionEnergy(TypeUtils.getAsType(OpenemsType.LONG, 0L));
+					}
+				});
 	}
 
 	@Override
@@ -165,28 +164,28 @@ public void lostSession() {
 
 	/**
 	 * Required requests that should be sent after a connection was established.
-	 * 
+	 *
 	 * @return List of requests
 	 */
 	public abstract List<Request> getRequiredRequestsAfterConnection();
 
 	/**
 	 * Required requests that should be sent permanently during a session.
-	 * 
+	 *
 	 * @return List of requests
 	 */
 	public abstract List<Request> getRequiredRequestsDuringConnection();
 
 	/**
 	 * Default requests that every OCPP EVCS should have.
-	 * 
+	 *
 	 * @return OcppRequests
 	 */
 	public abstract OcppStandardRequests getStandardRequests();
 
 	public UUID getSessionId() {
 		return this.sessionId;
-	};
+	}
 
 	/**
 	 * Reset the measured channel values and the charge power.
@@ -203,7 +202,7 @@ private void resetMeasuredChannelValues() {
 	 * Check the current state and resets the measured values.
 	 */
 	private void checkCurrentState() {
-		Status state = this.getStatus();
+		var state = this.getStatus();
 		switch (state) {
 		case CHARGING:
 			break;
@@ -231,11 +230,11 @@ public void setLastChargingProperty(ChargingProperty chargingProperty) {
 	}
 
 	public ChargeSessionStamp getSessionStart() {
-		return sessionStart;
+		return this.sessionStart;
 	}
 
 	public ChargeSessionStamp getSessionEnd() {
-		return sessionEnd;
+		return this.sessionEnd;
 	}
 
 	@Override
diff --git a/io.openems.edge.evcs.ocpp.common/src/io/openems/edge/evcs/ocpp/common/ChargeSessionStamp.java b/io.openems.edge.evcs.ocpp.common/src/io/openems/edge/evcs/ocpp/common/ChargeSessionStamp.java
index 5729f944255..5fbef4063ff 100644
--- a/io.openems.edge.evcs.ocpp.common/src/io/openems/edge/evcs/ocpp/common/ChargeSessionStamp.java
+++ b/io.openems.edge.evcs.ocpp.common/src/io/openems/edge/evcs/ocpp/common/ChargeSessionStamp.java
@@ -41,7 +41,7 @@ public ChargeSessionStamp() {
 	}
 
 	public Instant getTime() {
-		return time;
+		return this.time;
 	}
 
 	public void setTime(Instant time) {
@@ -49,7 +49,7 @@ public void setTime(Instant time) {
 	}
 
 	public long getEnergy() {
-		return energy;
+		return this.energy;
 	}
 
 	public void setEnergy(long energy) {
@@ -59,23 +59,23 @@ public void setEnergy(long energy) {
 	public boolean isChargeSessionStampPresent() {
 		return this.time != null;
 	}
-	
+
 	public void setChargeSessionStamp(Instant time, long energy) {
 		this.time = time;
 		this.energy = energy;
 	}
-	
+
 	public void resetChargeSessionStamp() {
 		this.time = null;
 		this.energy = 0;
 	}
-	
+
 	public void setChargeSessionStampIfNotPresent(Instant time, long energy) {
 		this.setChargeSessionStamp(time, energy);
 	}
-	
+
 	public void resetChargeSessionStampIfPresent() {
-		if(isChargeSessionStampPresent()) {
+		if (this.isChargeSessionStampPresent()) {
 			this.resetChargeSessionStamp();
 		}
 	}
diff --git a/io.openems.edge.evcs.ocpp.common/src/io/openems/edge/evcs/ocpp/common/ChargingProperty.java b/io.openems.edge.evcs.ocpp.common/src/io/openems/edge/evcs/ocpp/common/ChargingProperty.java
index 05d5aab7531..291890055f1 100644
--- a/io.openems.edge.evcs.ocpp.common/src/io/openems/edge/evcs/ocpp/common/ChargingProperty.java
+++ b/io.openems.edge.evcs.ocpp.common/src/io/openems/edge/evcs/ocpp/common/ChargingProperty.java
@@ -4,7 +4,7 @@
 
 /**
  * Charging Property.
- * 
+ *
  * <p>
  * This class provides the charge power and the total energy of the meter of a
  * certain time stamp.
@@ -22,7 +22,7 @@ public ChargingProperty(int chargePower, double totalMeterEnergy, ZonedDateTime
 	}
 
 	public int getChargePower() {
-		return chargePower;
+		return this.chargePower;
 	}
 
 	public void setChargePower(int chargePower) {
@@ -30,7 +30,7 @@ public void setChargePower(int chargePower) {
 	}
 
 	public double getTotalMeterEnergy() {
-		return totalMeterEnergy;
+		return this.totalMeterEnergy;
 	}
 
 	public void setTotalMeterEnergy(double totalMeterEnergy) {
@@ -38,7 +38,7 @@ public void setTotalMeterEnergy(double totalMeterEnergy) {
 	}
 
 	public ZonedDateTime getTimestamp() {
-		return timestamp;
+		return this.timestamp;
 	}
 
 	public void setTimestamp(ZonedDateTime timestamp) {
diff --git a/io.openems.edge.evcs.ocpp.common/src/io/openems/edge/evcs/ocpp/common/OcppInformations.java b/io.openems.edge.evcs.ocpp.common/src/io/openems/edge/evcs/ocpp/common/OcppInformations.java
index aa2443d4e50..06ecc52421b 100644
--- a/io.openems.edge.evcs.ocpp.common/src/io/openems/edge/evcs/ocpp/common/OcppInformations.java
+++ b/io.openems.edge.evcs.ocpp.common/src/io/openems/edge/evcs/ocpp/common/OcppInformations.java
@@ -161,6 +161,6 @@ public String getOcppValue() {
 	}
 
 	public ChannelId getChannelId() {
-		return channelId;
+		return this.channelId;
 	}
 }
diff --git a/io.openems.edge.evcs.ocpp.common/src/io/openems/edge/evcs/ocpp/common/OcppServer.java b/io.openems.edge.evcs.ocpp.common/src/io/openems/edge/evcs/ocpp/common/OcppServer.java
index 82c217d5dd9..8b5a7d93b28 100644
--- a/io.openems.edge.evcs.ocpp.common/src/io/openems/edge/evcs/ocpp/common/OcppServer.java
+++ b/io.openems.edge.evcs.ocpp.common/src/io/openems/edge/evcs/ocpp/common/OcppServer.java
@@ -13,16 +13,16 @@ public interface OcppServer {
 
 	/**
 	 * Send message to EVCS.
-	 * 
+	 *
 	 * <p>
 	 * Example: <blockquote>
-	 * 
+	 *
 	 * <pre>
 	 * send(session, request).whenComplete((confirmation, throwable) -&gt; {
 	 * 	this.logInfo(log, confirmation.toString());
 	 * });
 	 * </pre>
-	 * 
+	 *
 	 * </blockquote>
 	 *
 	 * @param session Current session
diff --git a/io.openems.edge.evcs.ocpp.common/src/io/openems/edge/evcs/ocpp/common/OcppStandardRequests.java b/io.openems.edge.evcs.ocpp.common/src/io/openems/edge/evcs/ocpp/common/OcppStandardRequests.java
index 4e44cf41d30..b8c20170297 100644
--- a/io.openems.edge.evcs.ocpp.common/src/io/openems/edge/evcs/ocpp/common/OcppStandardRequests.java
+++ b/io.openems.edge.evcs.ocpp.common/src/io/openems/edge/evcs/ocpp/common/OcppStandardRequests.java
@@ -7,11 +7,11 @@ public interface OcppStandardRequests {
 	/**
 	 * Should return an OCPP request that would set the charge power to the defined
 	 * value.
-	 * 
+	 *
 	 * <p>
 	 * Attention: The given power is given in watt. EVCS with the charging type AC
 	 * mostly send their limit values as amps.
-	 * 
+	 *
 	 * @param chargePower power that should be charged in watt.
 	 * @return Valid request that can be sent to the EVCS.
 	 */
diff --git a/io.openems.edge.evcs.ocpp.common/src/io/openems/edge/evcs/ocpp/common/WriteHandler.java b/io.openems.edge.evcs.ocpp.common/src/io/openems/edge/evcs/ocpp/common/WriteHandler.java
index 5750ebe2e3d..a1dd07abc1f 100644
--- a/io.openems.edge.evcs.ocpp.common/src/io/openems/edge/evcs/ocpp/common/WriteHandler.java
+++ b/io.openems.edge.evcs.ocpp.common/src/io/openems/edge/evcs/ocpp/common/WriteHandler.java
@@ -1,7 +1,6 @@
 package io.openems.edge.evcs.ocpp.common;
 
 import java.time.LocalDateTime;
-import java.util.Optional;
 
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -9,7 +8,6 @@
 import eu.chargetime.ocpp.NotConnectedException;
 import eu.chargetime.ocpp.OccurenceConstraintException;
 import eu.chargetime.ocpp.UnsupportedFeatureException;
-import eu.chargetime.ocpp.model.Request;
 import io.openems.edge.common.channel.Channel;
 import io.openems.edge.common.channel.WriteChannel;
 import io.openems.edge.evcs.api.Evcs;
@@ -38,7 +36,7 @@ public WriteHandler(AbstractOcppEvcsComponent parent) {
 	/**
 	 * Sends commands to the loading station depending on which profiles it
 	 * implements.
-	 * 
+	 *
 	 * <p>
 	 * It is not sending an command, if the communication failed or the write
 	 * channel is not set.
@@ -79,7 +77,7 @@ public void run() {
 
 	/**
 	 * Sets the current or power from SET_CHARGE_POWER channel.
-	 * 
+	 *
 	 * <p>
 	 * Depending on the charging type it will send different commands with different
 	 * units. Invalid values are discarded. If the energy limit is reached it will
@@ -91,27 +89,27 @@ private void setPower() {
 
 		if (energyLimit == 0 || energyLimit > this.parent.getEnergySession().orElse(0)) {
 			WriteChannel<Integer> channel = this.parent.channel(ManagedEvcs.ChannelId.SET_CHARGE_POWER_LIMIT);
-			Optional<Integer> valueOpt = channel.getNextWriteValueAndReset();
+			var valueOpt = channel.getNextWriteValueAndReset();
 
-			OcppStandardRequests requests = this.parent.getStandardRequests();
+			var requests = this.parent.getStandardRequests();
 
 			if (valueOpt.isPresent()) {
 
 				int maxPower = this.parent.getMaximumHardwarePower().orElse(DEFAULT_HARDWARE_LIMIT);
-				Integer power = valueOpt.get();
+				var power = valueOpt.get();
 
 				Integer target = power > maxPower ? maxPower : power;
-				Request request = requests.setChargePowerLimit(target);
+				var request = requests.setChargePowerLimit(target);
 
 				/*
 				 * Only if the target has changed or a time has passed.
 				 */
-				if (!target.equals(lastTarget) || this.nextPowerWrite.isBefore(LocalDateTime.now())) {
+				if (!target.equals(this.lastTarget) || this.nextPowerWrite.isBefore(LocalDateTime.now())) {
 
 					try {
 						this.parent.ocppServer.send(this.parent.sessionId, request)
 								.whenComplete((confirmation, throwable) -> {
-									this.parent.logInfo(log, confirmation.toString());
+									this.parent.logInfo(this.log, confirmation.toString());
 								});
 
 						this.parent.logInfo(this.log,
@@ -122,11 +120,11 @@ private void setPower() {
 						this.lastTarget = target;
 
 					} catch (OccurenceConstraintException e) {
-						this.parent.logWarn(log, "The request is not a valid OCPP request.");
+						this.parent.logWarn(this.log, "The request is not a valid OCPP request.");
 					} catch (UnsupportedFeatureException e) {
-						this.parent.logWarn(log, "This feature is not implemented by the charging station.");
+						this.parent.logWarn(this.log, "This feature is not implemented by the charging station.");
 					} catch (NotConnectedException e) {
-						this.parent.logWarn(log, "The server is not connected.");
+						this.parent.logWarn(this.log, "The server is not connected.");
 					}
 				}
 			}
@@ -144,20 +142,21 @@ private void setPower() {
 	 */
 	private void setEnergyLimit() {
 		WriteChannel<Integer> channel = this.parent.channel(ManagedEvcs.ChannelId.SET_ENERGY_LIMIT);
-		Optional<Integer> valueOpt = channel.getNextWriteValueAndReset();
+		var valueOpt = channel.getNextWriteValueAndReset();
 		if (valueOpt.isPresent()) {
-			Integer energyLimit = valueOpt.get();
+			var energyLimit = valueOpt.get();
 
 			/*
 			 * Only if the target has changed or a time has passed.
 			 */
-			if (!energyLimit.equals(lastEnergySession) || this.nextEnergySessionWrite.isBefore(LocalDateTime.now())) {
+			if (!energyLimit.equals(this.lastEnergySession)
+					|| this.nextEnergySessionWrite.isBefore(LocalDateTime.now())) {
 
 				this.parent.channel(ManagedEvcs.ChannelId.SET_ENERGY_LIMIT).setNextValue(energyLimit);
 				this.parent.logInfo(this.log, "Setting OCPP EVCS " + this.parent.alias()
 						+ " Energy Limit in this Session to [" + energyLimit + " Wh]");
-				lastEnergySession = energyLimit;
-				nextEnergySessionWrite = LocalDateTime.now().plusSeconds(WRITE_INTERVAL_SECONDS);
+				this.lastEnergySession = energyLimit;
+				this.nextEnergySessionWrite = LocalDateTime.now().plusSeconds(WRITE_INTERVAL_SECONDS);
 			}
 		}
 	}

From bb8cdd3e29789a46395fcbdbc27bb3a89dc10cf3 Mon Sep 17 00:00:00 2001
From: Stefan Feilmeier <stefan.feilmeier@fenecon.de>
Date: Tue, 8 Mar 2022 11:51:09 +0100
Subject: [PATCH 69/96] Update io.openems.edge.ocpp.ies.keywatt.singlecss

---
 .../keywatt/singleccs/IesKeywattSingleCcs.java | 18 ++++++------------
 1 file changed, 6 insertions(+), 12 deletions(-)

diff --git a/io.openems.edge.evcs.ocpp.ies.keywatt.singleccs/src/io/openems/edge/evcs/ocpp/ies/keywatt/singleccs/IesKeywattSingleCcs.java b/io.openems.edge.evcs.ocpp.ies.keywatt.singleccs/src/io/openems/edge/evcs/ocpp/ies/keywatt/singleccs/IesKeywattSingleCcs.java
index 8ab8eb7a8de..13dc07bf3a4 100644
--- a/io.openems.edge.evcs.ocpp.ies.keywatt.singleccs/src/io/openems/edge/evcs/ocpp/ies/keywatt/singleccs/IesKeywattSingleCcs.java
+++ b/io.openems.edge.evcs.ocpp.ies.keywatt.singleccs/src/io/openems/edge/evcs/ocpp/ies/keywatt/singleccs/IesKeywattSingleCcs.java
@@ -53,7 +53,7 @@ public class IesKeywattSingleCcs extends AbstractOcppEvcsComponent
 	};
 
 	// Values that a Ies KeyWatt is supporting
-	private static final HashSet<OcppInformations> MEASUREMENTS = new HashSet<OcppInformations>(
+	private static final HashSet<OcppInformations> MEASUREMENTS = new HashSet<>(
 			Arrays.asList(OcppInformations.values()));
 
 	private Config config;
@@ -117,25 +117,19 @@ public void handleEvent(Event event) {
 
 	@Override
 	public OcppStandardRequests getStandardRequests() {
-		return new OcppStandardRequests() {
-
-			@Override
-			public Request setChargePowerLimit(int chargePower) {
-				return new ChangeConfigurationRequest("PowerLimit", String.valueOf(chargePower));
-			}
-		};
+		return chargePower -> new ChangeConfigurationRequest("PowerLimit", String.valueOf(chargePower));
 	}
 
 	@Override
 	public List<Request> getRequiredRequestsAfterConnection() {
 
-		ArrayList<Request> requests = new ArrayList<>();
+		var requests = new ArrayList<Request>();
 
-		ChangeConfigurationRequest setMeterValueSampleInterval = new ChangeConfigurationRequest(
+		var setMeterValueSampleInterval = new ChangeConfigurationRequest(
 				"MeterValueSampleInterval", "10");
 		requests.add(setMeterValueSampleInterval);
 
-		TriggerMessageRequest requestStatus = new TriggerMessageRequest(TriggerMessageRequestType.StatusNotification);
+		var requestStatus = new TriggerMessageRequest(TriggerMessageRequestType.StatusNotification);
 		requests.add(requestStatus);
 
 		return requests;
@@ -143,7 +137,7 @@ public List<Request> getRequiredRequestsAfterConnection() {
 
 	@Override
 	public List<Request> getRequiredRequestsDuringConnection() {
-		return new ArrayList<Request>();
+		return new ArrayList<>();
 	}
 
 	@Override

From a13b02be161d88d4a0607b46d016cfe787e1c706 Mon Sep 17 00:00:00 2001
From: Stefan Feilmeier <stefan.feilmeier@fenecon.de>
Date: Tue, 8 Mar 2022 11:51:59 +0100
Subject: [PATCH 70/96] Update io.openems.edge.evcs.ocpp.server

---
 .../ocpp/server/CoreEventHandlerImpl.java     | 101 ++++++++----------
 .../edge/evcs/ocpp/server/MyJsonServer.java   |  42 ++++----
 .../edge/evcs/ocpp/server/OcppServerImpl.java |  20 ++--
 3 files changed, 78 insertions(+), 85 deletions(-)

diff --git a/io.openems.edge.evcs.ocpp.server/src/io/openems/edge/evcs/ocpp/server/CoreEventHandlerImpl.java b/io.openems.edge.evcs.ocpp.server/src/io/openems/edge/evcs/ocpp/server/CoreEventHandlerImpl.java
index 1254cd7df48..2f84c33b5c0 100644
--- a/io.openems.edge.evcs.ocpp.server/src/io/openems/edge/evcs/ocpp/server/CoreEventHandlerImpl.java
+++ b/io.openems.edge.evcs.ocpp.server/src/io/openems/edge/evcs/ocpp/server/CoreEventHandlerImpl.java
@@ -6,7 +6,6 @@
 import java.time.ZonedDateTime;
 import java.util.ArrayList;
 import java.util.List;
-import java.util.Optional;
 import java.util.UUID;
 
 import org.slf4j.Logger;
@@ -58,8 +57,8 @@ public BootNotificationConfirmation handleBootNotificationRequest(UUID sessionIn
 
 		this.logDebug("Handle BootNotificationRequest: " + request);
 
-		BootNotificationConfirmation response = new BootNotificationConfirmation(Instant.now().atZone(ZoneOffset.UTC),
-				100, RegistrationStatus.Accepted);
+		var response = new BootNotificationConfirmation(Instant.now().atZone(ZoneOffset.UTC), 100,
+				RegistrationStatus.Accepted);
 		this.logDebug("Send BootNotificationConfirmation: " + response.toString());
 
 		return response;
@@ -70,19 +69,16 @@ public AuthorizeConfirmation handleAuthorizeRequest(UUID sessionIndex, Authorize
 
 		this.logDebug("Handle AuthorizeRequest: " + request);
 
-		IdTagInfo tag = new IdTagInfo(AuthorizationStatus.Accepted);
+		var tag = new IdTagInfo(AuthorizationStatus.Accepted);
 		tag.setParentIdTag(request.getIdTag());
-		AuthorizeConfirmation response = new AuthorizeConfirmation(tag);
-		return response;
+		return new AuthorizeConfirmation(tag);
 	}
 
 	@Override
 	public DataTransferConfirmation handleDataTransferRequest(UUID sessionIndex, DataTransferRequest request) {
 
 		this.logDebug("Handle DataTransferRequest: " + request);
-		DataTransferConfirmation response = new DataTransferConfirmation(DataTransferStatus.Accepted);
-
-		return response;
+		return new DataTransferConfirmation(DataTransferStatus.Accepted);
 	}
 
 	@Override
@@ -96,7 +92,7 @@ public HeartbeatConfirmation handleHeartbeatRequest(UUID sessionIndex, Heartbeat
 	public MeterValuesConfirmation handleMeterValuesRequest(UUID sessionIndex, MeterValuesRequest request) {
 		this.logDebug("Handle MeterValuesRequest: " + request);
 
-		AbstractOcppEvcsComponent evcs = this.getEvcsBySessionIndexAndConnector(sessionIndex, request.getConnectorId());
+		var evcs = this.getEvcsBySessionIndexAndConnector(sessionIndex, request.getConnectorId());
 		if (evcs == null) {
 			return new MeterValuesConfirmation();
 		}
@@ -104,18 +100,18 @@ public MeterValuesConfirmation handleMeterValuesRequest(UUID sessionIndex, Meter
 		/*
 		 * Set the channels depending on the meter values
 		 */
-		MeterValue[] meterValueArr = request.getMeterValue();
+		var meterValueArr = request.getMeterValue();
 		for (MeterValue meterValue : meterValueArr) {
 
-			SampledValue[] sampledValues = meterValue.getSampledValue();
+			var sampledValues = meterValue.getSampledValue();
 			for (SampledValue value : sampledValues) {
 
 				// value.getLocation(); Not needed
-				String phases = value.getPhase();
-				String unitString = value.getUnit();
-				Unit unit = Unit.valueOf(unitString.toUpperCase());
-				String val = value.getValue();
-				String measurandString = value.getMeasurand();
+				var phases = value.getPhase();
+				var unitString = value.getUnit();
+				var unit = Unit.valueOf(unitString.toUpperCase());
+				var val = value.getValue();
+				var measurandString = value.getMeasurand();
 
 				if (val != null) {
 
@@ -123,12 +119,12 @@ public MeterValuesConfirmation handleMeterValuesRequest(UUID sessionIndex, Meter
 					 * Value is formatted in RAW data (integer/decimal) or in SignedData (binary
 					 * data block, encoded as hex data)
 					 */
-					ValueFormat format = value.getFormat();
+					var format = value.getFormat();
 					if (format.equals(ValueFormat.SignedData)) {
 						val = this.fromHexToDezString(val);
 					}
 
-					OcppInformations measurand = OcppInformations
+					var measurand = OcppInformations
 							.valueOf("CORE_METER_VALUES_" + measurandString.replace(".", "_").toUpperCase());
 
 					this.logDebug(measurandString + ": " + val + " " + unitString + " Phases: " + phases);
@@ -164,13 +160,13 @@ public MeterValuesConfirmation handleMeterValuesRequest(UUID sessionIndex, Meter
 								// TODO: Currently not working with session energy values
 							}
 
-							long energy = (long) Math.round((Double) correctValue);
+							var energy = Math.round((Double) correctValue);
 							if (!evcs.getSessionStart().isChargeSessionStampPresent()) {
 								break;
 							}
 
-							int sessionEnergy = 0;
-							long totalEnergy = 0;
+							var sessionEnergy = 0;
+							var totalEnergy = 0L;
 
 							/*
 							 * Calculating the energy in this session and in total for the given energy
@@ -203,19 +199,19 @@ public MeterValuesConfirmation handleMeterValuesRequest(UUID sessionIndex, Meter
 							if (unit.equals(Unit.KW)) {
 								val = this.multipliedByThousand(val);
 							}
-							correctValue = (int) Math.round(Double.valueOf(val));
+							correctValue = (int) Math.round(Double.parseDouble(val));
 
 							/*
 							 * Sets the start and end session stamp depending on the the current power.
 							 */
-							Instant now = Instant.now(this.parent.componentManager.getClock());
+							var now = Instant.now(this.parent.componentManager.getClock());
 
 							if ((int) correctValue > 0) {
 								evcs._setStatus(Status.CHARGING);
 							}
 
 							// Has to provide a not null energy value
-							Optional<Long> currEnergy = evcs.getActiveConsumptionEnergy().asOptional();
+							var currEnergy = evcs.getActiveConsumptionEnergy().asOptional();
 							if (currEnergy.isPresent()) {
 								if ((int) correctValue > 0) {
 									evcs.getSessionStart().setChargeSessionStampIfNotPresent(now, currEnergy.get());
@@ -232,12 +228,12 @@ public MeterValuesConfirmation handleMeterValuesRequest(UUID sessionIndex, Meter
 							if (unit.equals(Unit.KVAR)) {
 								val = this.multipliedByThousand(val);
 							}
-							correctValue = (int) Math.round(Double.valueOf(val));
+							correctValue = (int) Math.round(Double.parseDouble(val));
 							break;
 
 						case CORE_METER_VALUES_VOLTAGE:
 						case CORE_METER_VALUES_SOC:
-							correctValue = (int) Math.round(Double.valueOf(val));
+							correctValue = (int) Math.round(Double.parseDouble(val));
 							break;
 
 						case CORE_METER_VALUES_RPM:
@@ -259,7 +255,7 @@ public StatusNotificationConfirmation handleStatusNotificationRequest(UUID sessi
 			StatusNotificationRequest request) {
 
 		this.logDebug("Handle StatusNotificationRequest: " + request);
-		AbstractOcppEvcsComponent evcs = this.getEvcsBySessionIndexAndConnector(sessionIndex, request.getConnectorId());
+		var evcs = this.getEvcsBySessionIndexAndConnector(sessionIndex, request.getConnectorId());
 		if (evcs == null) {
 			return new StatusNotificationConfirmation();
 		}
@@ -268,7 +264,7 @@ public StatusNotificationConfirmation handleStatusNotificationRequest(UUID sessi
 		 * Set the EVCS status based on the status from the StatusNotificationRequest
 		 */
 		Status evcsStatus = null;
-		ChargePointStatus ocppStatus = request.getStatus();
+		var ocppStatus = request.getStatus();
 		switch (ocppStatus) {
 		case Available:
 			evcs._setChargingstationCommunicationFailed(false);
@@ -331,11 +327,10 @@ public StartTransactionConfirmation handleStartTransactionRequest(UUID sessionIn
 
 		this.logDebug("Handle StartTransactionRequest: " + request);
 
-		IdTagInfo idTagInfo = new IdTagInfo(AuthorizationStatus.Accepted);
+		var idTagInfo = new IdTagInfo(AuthorizationStatus.Accepted);
 		idTagInfo.setParentIdTag(request.getIdTag());
-		
-		StartTransactionConfirmation response = new StartTransactionConfirmation(idTagInfo, request.getConnectorId());
-		return response;
+
+		return new StartTransactionConfirmation(idTagInfo, request.getConnectorId());
 	}
 
 	@Override
@@ -343,11 +338,11 @@ public StopTransactionConfirmation handleStopTransactionRequest(UUID sessionInde
 
 		this.logDebug("Handle StopTransactionRequest: " + request);
 
-		IdTagInfo tag = new IdTagInfo(AuthorizationStatus.Accepted);
+		var tag = new IdTagInfo(AuthorizationStatus.Accepted);
 		tag.setParentIdTag(request.getIdTag());
 		tag.validate();
 		AbstractOcppEvcsComponent evcs;
-		List<AbstractOcppEvcsComponent> evcss = this.getEvcssBySessionIndex(sessionIndex);
+		var evcss = this.getEvcssBySessionIndex(sessionIndex);
 		if (evcss.size() == 1) {
 			evcs = evcss.get(0);
 		} else {
@@ -355,7 +350,7 @@ public StopTransactionConfirmation handleStopTransactionRequest(UUID sessionInde
 		}
 		evcs._setStatus(Status.CHARGING_FINISHED);
 
-		StopTransactionConfirmation response = new StopTransactionConfirmation();
+		var response = new StopTransactionConfirmation();
 		response.setIdTagInfo(tag);
 		response.validate();
 		return response;
@@ -363,35 +358,33 @@ public StopTransactionConfirmation handleStopTransactionRequest(UUID sessionInde
 
 	/**
 	 * Get the EVCSs that are in this session.
-	 * 
+	 *
 	 * <p>
 	 * One charging station has one session but can have more connectors. Every
 	 * connector is one EVCS in our System because each can be managed and monitored
 	 * by itself.
-	 * 
+	 *
 	 * @param sessionIndex given session
 	 * @return List of AbstractOcppEvcsComponent
 	 */
 	private List<AbstractOcppEvcsComponent> getEvcssBySessionIndex(UUID sessionIndex) {
-		List<AbstractOcppEvcsComponent> evcss = this.parent.activeEvcsSessions.getOrDefault(sessionIndex,
-				new ArrayList<AbstractOcppEvcsComponent>());
-		return evcss;
+		return this.parent.activeEvcsSessions.getOrDefault(sessionIndex, new ArrayList<AbstractOcppEvcsComponent>());
 	}
 
 	/**
 	 * Get the EVCS that are in this session and with the given connector id.
-	 * 
+	 *
 	 * <p>
 	 * One charging station has one session but can have more connectors. Every
 	 * connector is one EVCS in our System because each can be managed and monitored
 	 * by itself.
-	 * 
+	 *
 	 * @param sessionIndex given session
 	 * @param connectorId  given connector id
 	 * @return EVCS Component with the given session and connectorId.
 	 */
 	private AbstractOcppEvcsComponent getEvcsBySessionIndexAndConnector(UUID sessionIndex, int connectorId) {
-		List<AbstractOcppEvcsComponent> evcss = this.getEvcssBySessionIndex(sessionIndex);
+		var evcss = this.getEvcssBySessionIndex(sessionIndex);
 		if (evcss != null) {
 			for (AbstractOcppEvcsComponent ocppEvcs : evcss) {
 				if (ocppEvcs.getConfiguredConnectorId().equals(connectorId)) {
@@ -405,18 +398,18 @@ private AbstractOcppEvcsComponent getEvcsBySessionIndexAndConnector(UUID session
 
 	/**
 	 * Return the decimal value of the given Hexadecimal value.
-	 * 
+	 *
 	 * @param hex given value in hex
 	 * @return Decimal value as String
 	 */
 	public String fromHexToDezString(String hex) {
-		int dezValue = Integer.parseInt(hex, 16);
+		var dezValue = Integer.parseInt(hex, 16);
 		return String.valueOf(dezValue);
 	}
 
 	/**
 	 * Divide the given String value by thousand.
-	 * 
+	 *
 	 * @param val value
 	 * @return Value / 1000 as String
 	 */
@@ -424,12 +417,12 @@ private String multipliedByThousand(String val) {
 		if (val.isEmpty()) {
 			return val;
 		}
-		return String.valueOf((Double.parseDouble(val) * 1000.0));
+		return String.valueOf(Double.parseDouble(val) * 1000.0);
 	}
 
 	/**
 	 * Sets the calculated power to the given EVCS.
-	 * 
+	 *
 	 * @param evcs          Corresponding EVCS component.
 	 * @param currentEnergy Current measured Energy.
 	 * @param timestamp     Time when the current Energy was measured.
@@ -437,8 +430,8 @@ private String multipliedByThousand(String val) {
 	private void setPowerDependingOnEnergy(AbstractOcppEvcsComponent evcs, Double currentEnergy,
 			ZonedDateTime timestamp) {
 
-		ChargingProperty lastChargingProperty = evcs.getLastChargingProperty();
-		int power = 0;
+		var lastChargingProperty = evcs.getLastChargingProperty();
+		var power = 0;
 		if (lastChargingProperty != null) {
 
 			power = this.calculateChargePower(lastChargingProperty, currentEnergy, timestamp);
@@ -449,7 +442,7 @@ private void setPowerDependingOnEnergy(AbstractOcppEvcsComponent evcs, Double cu
 
 	/**
 	 * Calculates the power depending on the last and current measured Energy.
-	 * 
+	 *
 	 * @param meterValueOld Last measured meter values.
 	 * @param currentEnergy Current measured Energy.
 	 * @param timestamp     Time when the current Energy was measured.
@@ -459,9 +452,9 @@ private int calculateChargePower(ChargingProperty lastMeterValue, double current
 
 		double diffseconds = Duration.between(timestamp, lastMeterValue.getTimestamp()).getSeconds();
 
-		double lastEnergy = lastMeterValue.getTotalMeterEnergy();
+		var lastEnergy = lastMeterValue.getTotalMeterEnergy();
 
-		int power = (int) (Math.round((currentEnergy - lastEnergy) / (diffseconds / 3600.0)));
+		var power = (int) Math.round((currentEnergy - lastEnergy) / (diffseconds / 3600.0));
 
 		this.logDebug("Last: " + String.valueOf(lastEnergy) + "Wh, Current: " + String.valueOf(currentEnergy)
 				+ "Wh. Calculated Power: " + power + "; Sekunden differenz: " + diffseconds);
diff --git a/io.openems.edge.evcs.ocpp.server/src/io/openems/edge/evcs/ocpp/server/MyJsonServer.java b/io.openems.edge.evcs.ocpp.server/src/io/openems/edge/evcs/ocpp/server/MyJsonServer.java
index 5ae2c7d611c..ad9fb79d60f 100644
--- a/io.openems.edge.evcs.ocpp.server/src/io/openems/edge/evcs/ocpp/server/MyJsonServer.java
+++ b/io.openems.edge.evcs.ocpp.server/src/io/openems/edge/evcs/ocpp/server/MyJsonServer.java
@@ -41,7 +41,7 @@ public class MyJsonServer {
 
 	/**
 	 * The JSON OCPP server.
-	 * 
+	 *
 	 * <p>
 	 * Responsible for sending and receiving OCPP JSON commands.
 	 */
@@ -61,7 +61,7 @@ public MyJsonServer(OcppServerImpl parent) {
 		this.coreProfile = new ServerCoreProfile(new CoreEventHandlerImpl(parent));
 		this.firmwareProfile = new ServerFirmwareManagementProfile(new FirmwareManagementEventHandlerImpl(parent));
 
-		JSONServer server = new JSONServer(this.coreProfile);
+		var server = new JSONServer(this.coreProfile);
 		server.addFeatureProfile(this.firmwareProfile);
 		server.addFeatureProfile(this.localAuthListProfile);
 		server.addFeatureProfile(this.remoteTriggerProfile);
@@ -84,11 +84,11 @@ public void newSession(UUID sessionIndex, SessionInformation information) {
 						+ "Chargepoint [" + information.getIdentifier() + "] " //
 						+ "IP: " + information.getAddress());
 
-				String ocppIdentifier = information.getIdentifier().replace("/", "");
+				var ocppIdentifier = information.getIdentifier().replace("/", "");
 
 				MyJsonServer.this.parent.ocppSessions.put(ocppIdentifier, sessionIndex);
 
-				List<AbstractOcppEvcsComponent> presentEvcss = MyJsonServer.this.parent.ocppEvcss.get(ocppIdentifier);
+				var presentEvcss = MyJsonServer.this.parent.ocppEvcss.get(ocppIdentifier);
 
 				if (presentEvcss == null) {
 					return;
@@ -105,7 +105,7 @@ public void newSession(UUID sessionIndex, SessionInformation information) {
 			public void lostSession(UUID sessionIndex) {
 				MyJsonServer.this.logDebug("Session " + sessionIndex + " lost connection");
 
-				List<AbstractOcppEvcsComponent> sessionEvcss = MyJsonServer.this.parent.activeEvcsSessions
+				var sessionEvcss = MyJsonServer.this.parent.activeEvcsSessions
 						.getOrDefault(sessionIndex, new ArrayList<>());
 
 				if (sessionEvcss != null) {
@@ -114,7 +114,7 @@ public void lostSession(UUID sessionIndex) {
 					}
 				}
 
-				String ocppId = "";
+				var ocppId = "";
 				for (Entry<String, UUID> session : MyJsonServer.this.parent.ocppSessions.entrySet()) {
 					if (session.getValue().equals(sessionIndex)) {
 						ocppId = session.getKey();
@@ -133,7 +133,7 @@ public void deactivate() {
 
 	/**
 	 * Send a request to an Evcs using the server.
-	 * 
+	 *
 	 * @param session unique session id referring to the corresponding Evcs
 	 * @param request given request that needs to be sent
 	 * @return CompletitionStage
@@ -148,7 +148,7 @@ public CompletionStage<Confirmation> send(UUID session, Request request)
 
 	/**
 	 * Default implementation of the send method.
-	 * 
+	 *
 	 * @param session given session
 	 * @param request given request
 	 */
@@ -168,29 +168,29 @@ public void sendDefault(UUID session, Request request) {
 
 	/**
 	 * Sending initially all required requests to the EVCS.
-	 * 
+	 *
 	 * @param sessionIndex given session
 	 * @param ocppEvcs     given evcs
 	 */
 	protected void sendInitialRequests(UUID sessionIndex, AbstractOcppEvcsComponent ocppEvcs) {
 		// Setting the Evcss of this session id to available
-		ChangeAvailabilityRequest changeAvailabilityRequest = new ChangeAvailabilityRequest(
+		var changeAvailabilityRequest = new ChangeAvailabilityRequest(
 				ocppEvcs.getConfiguredConnectorId(), AvailabilityType.Operative);
 		this.sendDefault(sessionIndex, changeAvailabilityRequest);
 
 		// Sending all required requests defined for each EVCS
-		List<Request> requiredRequests = ocppEvcs.getRequiredRequestsAfterConnection();
+		var requiredRequests = ocppEvcs.getRequiredRequestsAfterConnection();
 		for (Request request : requiredRequests) {
 			this.sendDefault(sessionIndex, request);
 		}
 
-		HashMap<String, String> configuration = this.getConfiguration(sessionIndex);
+		var configuration = this.getConfiguration(sessionIndex);
 		this.logDebug(configuration.toString());
 	}
 
 	/**
 	 * Sending all permanently required requests to the EVCS.
-	 * 
+	 *
 	 * @param evcss given evcss
 	 */
 	protected void sendPermanentRequests(List<AbstractOcppEvcsComponent> evcss) {
@@ -198,7 +198,7 @@ protected void sendPermanentRequests(List<AbstractOcppEvcsComponent> evcss) {
 			return;
 		}
 		for (AbstractOcppEvcsComponent ocppEvcs : evcss) {
-			List<Request> requiredRequests = ocppEvcs.getRequiredRequestsDuringConnection();
+			var requiredRequests = ocppEvcs.getRequiredRequestsDuringConnection();
 			for (Request request : requiredRequests) {
 				this.sendDefault(ocppEvcs.getSessionId(), request);
 			}
@@ -206,16 +206,16 @@ protected void sendPermanentRequests(List<AbstractOcppEvcsComponent> evcss) {
 	}
 
 	private HashMap<String, String> getConfiguration(UUID sessionIndex) {
-		HashMap<String, String> hash = new HashMap<>();
-		GetConfigurationRequest request = new GetConfigurationRequest();
+		var hash = new HashMap<String, String>();
+		var request = new GetConfigurationRequest();
 		try {
-			CompletionStage<Confirmation> resp = this.send(sessionIndex, request);
+			var resp = this.send(sessionIndex, request);
 
-			GetConfigurationConfirmation get = (GetConfigurationConfirmation) resp.toCompletableFuture().get(2,
+			var get = (GetConfigurationConfirmation) resp.toCompletableFuture().get(2,
 					TimeUnit.SECONDS);
-			KeyValueType[] das = get.getConfigurationKey();
-			for (int i = 0; i < das.length; i++) {
-				hash.put(das[i].getKey(), das[i].getValue());
+			var das = get.getConfigurationKey();
+			for (KeyValueType element : das) {
+				hash.put(element.getKey(), element.getValue());
 			}
 		} catch (OccurenceConstraintException | UnsupportedFeatureException | NotConnectedException
 				| InterruptedException | ExecutionException | java.util.concurrent.TimeoutException ex) {
diff --git a/io.openems.edge.evcs.ocpp.server/src/io/openems/edge/evcs/ocpp/server/OcppServerImpl.java b/io.openems.edge.evcs.ocpp.server/src/io/openems/edge/evcs/ocpp/server/OcppServerImpl.java
index 594c9419fc1..bda944f4acb 100644
--- a/io.openems.edge.evcs.ocpp.server/src/io/openems/edge/evcs/ocpp/server/OcppServerImpl.java
+++ b/io.openems.edge.evcs.ocpp.server/src/io/openems/edge/evcs/ocpp/server/OcppServerImpl.java
@@ -53,7 +53,7 @@ public class OcppServerImpl extends AbstractOpenemsComponent implements OpenemsC
 
 	/**
 	 * The JSON server.
-	 * 
+	 *
 	 * <p>
 	 * Responsible for the OCPP communication.
 	 */
@@ -80,7 +80,7 @@ public class OcppServerImpl extends AbstractOpenemsComponent implements OpenemsC
 	/**
 	 * Adds each Evcs component to a list and checks whether there is a matching
 	 * session.
-	 * 
+	 *
 	 * @param evcs new Evcs
 	 */
 	@Reference(policy = ReferencePolicy.DYNAMIC, policyOption = ReferencePolicyOption.GREEDY, cardinality = ReferenceCardinality.MULTIPLE)
@@ -88,18 +88,18 @@ protected void addEvcs(Evcs evcs) {
 		if (!(evcs instanceof AbstractOcppEvcsComponent) || evcs == null) {
 			return;
 		}
-		AbstractOcppEvcsComponent ocppEvcs = (AbstractOcppEvcsComponent) evcs;
-		List<AbstractOcppEvcsComponent> presentEvcss = ocppEvcss.get(ocppEvcs.getConfiguredOcppId());
+		var ocppEvcs = (AbstractOcppEvcsComponent) evcs;
+		var presentEvcss = this.ocppEvcss.get(ocppEvcs.getConfiguredOcppId());
 
 		if (presentEvcss == null) {
-			List<AbstractOcppEvcsComponent> initEvcssArr = new ArrayList<AbstractOcppEvcsComponent>();
+			List<AbstractOcppEvcsComponent> initEvcssArr = new ArrayList<>();
 			initEvcssArr.add(ocppEvcs);
-			ocppEvcss.put(ocppEvcs.getConfiguredOcppId(), initEvcssArr);
+			this.ocppEvcss.put(ocppEvcs.getConfiguredOcppId(), initEvcssArr);
 		} else {
 			presentEvcss.add(ocppEvcs);
 		}
 
-		UUID sessionId = this.ocppSessions.get(ocppEvcs.getConfiguredOcppId());
+		var sessionId = this.ocppSessions.get(ocppEvcs.getConfiguredOcppId());
 		if (sessionId == null) {
 			return;
 		}
@@ -111,15 +111,15 @@ protected void addEvcs(Evcs evcs) {
 	/**
 	 * Removes the given Evcs component from the list and checks whether there is a
 	 * present session that should be removed.
-	 * 
+	 *
 	 * @param evcs Evcs that should be removed
 	 */
 	protected void removeEvcs(Evcs evcs) {
 		if (!(evcs instanceof AbstractOcppEvcsComponent) || evcs == null) {
 			return;
 		}
-		AbstractOcppEvcsComponent ocppEvcs = (AbstractOcppEvcsComponent) evcs;
-		List<AbstractOcppEvcsComponent> evcss = this.activeEvcsSessions.get(ocppEvcs.getSessionId());
+		var ocppEvcs = (AbstractOcppEvcsComponent) evcs;
+		var evcss = this.activeEvcsSessions.get(ocppEvcs.getSessionId());
 		if (evcss != null) {
 			if (evcss.size() < 2) {
 				this.activeEvcsSessions.remove(ocppEvcs.getSessionId());

From 86b6cef3ec346e23f92431bce0dd359ca9701ce1 Mon Sep 17 00:00:00 2001
From: Stefan Feilmeier <stefan.feilmeier@fenecon.de>
Date: Tue, 8 Mar 2022 11:54:10 +0100
Subject: [PATCH 71/96] Update io.openems.edge.fenecon.dess

---
 .../dess/charger/AbstractFeneconDessCharger.java    |  4 ++--
 .../fenecon/dess/charger/FeneconDessCharger1.java   |  3 ++-
 .../fenecon/dess/charger/FeneconDessCharger2.java   |  3 ++-
 .../edge/fenecon/dess/ess/FeneconDessEss.java       | 13 ++++++-------
 .../edge/fenecon/dess/ess/FeneconDessEssImpl.java   |  7 ++++---
 .../dess/gridmeter/FeneconDessGridMeterImpl.java    |  5 +++--
 .../dess/pvmeter/FeneconDessPvMeterImpl.java        |  7 ++++---
 .../dess/charger/FeneconDessCharger1Test.java       |  2 +-
 .../dess/charger/FeneconDessCharger2Test.java       |  2 +-
 .../edge/fenecon/dess/charger/MyChargerConfig.java  |  2 +-
 .../openems/edge/fenecon/dess/ess/MyEssConfig.java  |  2 +-
 .../edge/fenecon/dess/gridmeter/MyConfig.java       |  2 +-
 .../openems/edge/fenecon/dess/pvmeter/MyConfig.java |  2 +-
 13 files changed, 29 insertions(+), 25 deletions(-)

diff --git a/io.openems.edge.fenecon.dess/src/io/openems/edge/fenecon/dess/charger/AbstractFeneconDessCharger.java b/io.openems.edge.fenecon.dess/src/io/openems/edge/fenecon/dess/charger/AbstractFeneconDessCharger.java
index 8a3d4fe0a7a..f1f3d159232 100644
--- a/io.openems.edge.fenecon.dess/src/io/openems/edge/fenecon/dess/charger/AbstractFeneconDessCharger.java
+++ b/io.openems.edge.fenecon.dess/src/io/openems/edge/fenecon/dess/charger/AbstractFeneconDessCharger.java
@@ -41,7 +41,7 @@ public AbstractFeneconDessCharger() {
 
 	@Override
 	protected ModbusProtocol defineModbusProtocol() throws OpenemsException {
-		final int offset = this.getOffset();
+		final var offset = this.getOffset();
 		return new ModbusProtocol(this, //
 				new FC3ReadRegistersTask(offset + 2, Priority.LOW, //
 						m(EssDcCharger.ChannelId.ACTUAL_POWER, new UnsignedWordElement(offset + 2)), //
@@ -72,7 +72,7 @@ public void handleEvent(Event event) {
 	 * Calculate the Energy values from ActivePower.
 	 */
 	private void calculateEnergy() {
-		Integer actualPower = this.getActualPower().get();
+		var actualPower = this.getActualPower().get();
 		if (actualPower == null) {
 			// Not available
 			this.calculateActualEnergy.update(null);
diff --git a/io.openems.edge.fenecon.dess/src/io/openems/edge/fenecon/dess/charger/FeneconDessCharger1.java b/io.openems.edge.fenecon.dess/src/io/openems/edge/fenecon/dess/charger/FeneconDessCharger1.java
index e5f5dd3c920..17e0da208dc 100644
--- a/io.openems.edge.fenecon.dess/src/io/openems/edge/fenecon/dess/charger/FeneconDessCharger1.java
+++ b/io.openems.edge.fenecon.dess/src/io/openems/edge/fenecon/dess/charger/FeneconDessCharger1.java
@@ -41,6 +41,7 @@ public class FeneconDessCharger1 extends AbstractFeneconDessCharger
 	@Reference(policy = ReferencePolicy.DYNAMIC, policyOption = ReferencePolicyOption.GREEDY, cardinality = ReferenceCardinality.OPTIONAL)
 	private volatile Timedata timedata = null;
 
+	@Override
 	@Reference(policy = ReferencePolicy.STATIC, policyOption = ReferencePolicyOption.GREEDY, cardinality = ReferenceCardinality.MANDATORY)
 	protected void setModbus(BridgeModbus modbus) {
 		super.setModbus(modbus);
@@ -50,7 +51,6 @@ protected void setModbus(BridgeModbus modbus) {
 	private FeneconDessEss ess;
 
 	public FeneconDessCharger1() {
-		super();
 	}
 
 	@Activate
@@ -68,6 +68,7 @@ void activate(ComponentContext context, Config1 config) throws OpenemsException
 		this.ess.addCharger(this);
 	}
 
+	@Override
 	@Deactivate
 	protected void deactivate() {
 		this.ess.removeCharger(this);
diff --git a/io.openems.edge.fenecon.dess/src/io/openems/edge/fenecon/dess/charger/FeneconDessCharger2.java b/io.openems.edge.fenecon.dess/src/io/openems/edge/fenecon/dess/charger/FeneconDessCharger2.java
index 1c63af62504..5d2d1811ebd 100644
--- a/io.openems.edge.fenecon.dess/src/io/openems/edge/fenecon/dess/charger/FeneconDessCharger2.java
+++ b/io.openems.edge.fenecon.dess/src/io/openems/edge/fenecon/dess/charger/FeneconDessCharger2.java
@@ -41,6 +41,7 @@ public class FeneconDessCharger2 extends AbstractFeneconDessCharger
 	@Reference(policy = ReferencePolicy.DYNAMIC, policyOption = ReferencePolicyOption.GREEDY, cardinality = ReferenceCardinality.OPTIONAL)
 	private volatile Timedata timedata = null;
 
+	@Override
 	@Reference(policy = ReferencePolicy.STATIC, policyOption = ReferencePolicyOption.GREEDY, cardinality = ReferenceCardinality.MANDATORY)
 	protected void setModbus(BridgeModbus modbus) {
 		super.setModbus(modbus);
@@ -50,7 +51,6 @@ protected void setModbus(BridgeModbus modbus) {
 	private FeneconDessEss ess;
 
 	public FeneconDessCharger2() {
-		super();
 	}
 
 	@Activate
@@ -68,6 +68,7 @@ void activate(ComponentContext context, Config2 config) throws OpenemsException
 		this.ess.addCharger(this);
 	}
 
+	@Override
 	@Deactivate
 	protected void deactivate() {
 		this.ess.removeCharger(this);
diff --git a/io.openems.edge.fenecon.dess/src/io/openems/edge/fenecon/dess/ess/FeneconDessEss.java b/io.openems.edge.fenecon.dess/src/io/openems/edge/fenecon/dess/ess/FeneconDessEss.java
index c661d7353d9..2e673729dec 100644
--- a/io.openems.edge.fenecon.dess/src/io/openems/edge/fenecon/dess/ess/FeneconDessEss.java
+++ b/io.openems.edge.fenecon.dess/src/io/openems/edge/fenecon/dess/ess/FeneconDessEss.java
@@ -2,7 +2,6 @@
 
 import io.openems.common.channel.Unit;
 import io.openems.common.types.OpenemsType;
-import io.openems.edge.common.channel.Channel;
 import io.openems.edge.common.channel.Doc;
 import io.openems.edge.common.component.OpenemsComponent;
 import io.openems.edge.common.sum.GridMode;
@@ -17,28 +16,28 @@ public interface FeneconDessEss extends AsymmetricEss, SymmetricEss, OpenemsComp
 
 	/**
 	 * Gets the Modbus Unit-ID.
-	 * 
+	 *
 	 * @return the Unit-ID
 	 */
 	public Integer getUnitId();
 
 	/**
 	 * Gets the Modbus-Bridge Component-ID, i.e. "modbus0".
-	 * 
+	 *
 	 * @return the Component-ID
 	 */
 	public String getModbusBridgeId();
 
 	/**
 	 * Registers a Charger with this ESS.
-	 * 
+	 *
 	 * @param charger the Charger
 	 */
 	public void addCharger(AbstractFeneconDessCharger charger);
 
 	/**
 	 * Unregisters a Charger from this ESS.
-	 * 
+	 *
 	 * @param charger the Charger
 	 */
 	public void removeCharger(AbstractFeneconDessCharger charger);
@@ -52,9 +51,9 @@ public enum ChannelId implements io.openems.edge.common.channel.ChannelId {
 		BSMU_WORK_STATE(Doc.of(BsmuWorkState.values()) //
 				.onInit(channel -> { //
 					// on each update set Grid-Mode channel
-					((Channel<Integer>) channel).onChange((oldValue, newValue) -> {
+					channel.onChange((oldValue, newValue) -> {
 						BsmuWorkState state = newValue.asEnum();
-						SymmetricEss parent = (SymmetricEss) channel.getComponent();
+						var parent = (SymmetricEss) channel.getComponent();
 						switch (state) {
 						case ON_GRID:
 							parent._setGridMode(GridMode.ON_GRID);
diff --git a/io.openems.edge.fenecon.dess/src/io/openems/edge/fenecon/dess/ess/FeneconDessEssImpl.java b/io.openems.edge.fenecon.dess/src/io/openems/edge/fenecon/dess/ess/FeneconDessEssImpl.java
index 934d7049212..a0aad280e11 100644
--- a/io.openems.edge.fenecon.dess/src/io/openems/edge/fenecon/dess/ess/FeneconDessEssImpl.java
+++ b/io.openems.edge.fenecon.dess/src/io/openems/edge/fenecon/dess/ess/FeneconDessEssImpl.java
@@ -70,6 +70,7 @@ public class FeneconDessEssImpl extends AbstractOpenemsModbusComponent implement
 	@Reference
 	protected ConfigurationAdmin cm;
 
+	@Override
 	@Reference(policy = ReferencePolicy.STATIC, policyOption = ReferencePolicyOption.GREEDY, cardinality = ReferenceCardinality.MANDATORY)
 	protected void setModbus(BridgeModbus modbus) {
 		super.setModbus(modbus);
@@ -100,10 +101,10 @@ void activate(ComponentContext context, Config config) throws OpenemsException {
 		this.config = config;
 		if (super.activate(context, config.id(), config.alias(), config.enabled(), FeneconDessConstants.UNIT_ID,
 				this.cm, "Modbus", config.modbus_id())) {
-			return;
 		}
 	}
 
+	@Override
 	@Deactivate
 	protected void deactivate() {
 		super.deactivate();
@@ -195,7 +196,7 @@ private void calculateEnergy() {
 		/*
 		 * Calculate AC Energy
 		 */
-		Integer acActivePower = this.getActivePowerChannel().getNextValue().get();
+		var acActivePower = this.getActivePowerChannel().getNextValue().get();
 		if (acActivePower == null) {
 			// Not available
 			this.calculateAcChargeEnergy.update(null);
@@ -212,7 +213,7 @@ private void calculateEnergy() {
 		/*
 		 * Calculate DC Power and Energy
 		 */
-		Integer dcDischargePower = acActivePower;
+		var dcDischargePower = acActivePower;
 		for (EssDcCharger charger : this.chargers) {
 			dcDischargePower = TypeUtils.subtract(dcDischargePower,
 					charger.getActualPowerChannel().getNextValue().get());
diff --git a/io.openems.edge.fenecon.dess/src/io/openems/edge/fenecon/dess/gridmeter/FeneconDessGridMeterImpl.java b/io.openems.edge.fenecon.dess/src/io/openems/edge/fenecon/dess/gridmeter/FeneconDessGridMeterImpl.java
index ee510cda8d3..af4744cc02f 100644
--- a/io.openems.edge.fenecon.dess/src/io/openems/edge/fenecon/dess/gridmeter/FeneconDessGridMeterImpl.java
+++ b/io.openems.edge.fenecon.dess/src/io/openems/edge/fenecon/dess/gridmeter/FeneconDessGridMeterImpl.java
@@ -59,6 +59,7 @@ public class FeneconDessGridMeterImpl extends AbstractOpenemsModbusComponent imp
 	@Reference(policy = ReferencePolicy.DYNAMIC, policyOption = ReferencePolicyOption.GREEDY, cardinality = ReferenceCardinality.OPTIONAL)
 	private volatile Timedata timedata = null;
 
+	@Override
 	@Reference(policy = ReferencePolicy.STATIC, policyOption = ReferencePolicyOption.GREEDY, cardinality = ReferenceCardinality.MANDATORY)
 	protected void setModbus(BridgeModbus modbus) {
 		super.setModbus(modbus);
@@ -81,10 +82,10 @@ public FeneconDessGridMeterImpl() {
 	void activate(ComponentContext context, Config config) throws OpenemsException {
 		if (super.activate(context, config.id(), config.alias(), config.enabled(), FeneconDessConstants.UNIT_ID,
 				this.cm, "Modbus", config.modbus_id())) {
-			return;
 		}
 	}
 
+	@Override
 	@Deactivate
 	protected void deactivate() {
 		super.deactivate();
@@ -164,7 +165,7 @@ public void handleEvent(Event event) {
 	 */
 	private void calculateEnergy() {
 		// Calculate Energy
-		Integer activePower = this.getActivePower().get();
+		var activePower = this.getActivePower().get();
 		if (activePower == null) {
 			// Not available
 			this.calculateProductionEnergy.update(null);
diff --git a/io.openems.edge.fenecon.dess/src/io/openems/edge/fenecon/dess/pvmeter/FeneconDessPvMeterImpl.java b/io.openems.edge.fenecon.dess/src/io/openems/edge/fenecon/dess/pvmeter/FeneconDessPvMeterImpl.java
index 4669c9b756d..e0f7ec9b496 100644
--- a/io.openems.edge.fenecon.dess/src/io/openems/edge/fenecon/dess/pvmeter/FeneconDessPvMeterImpl.java
+++ b/io.openems.edge.fenecon.dess/src/io/openems/edge/fenecon/dess/pvmeter/FeneconDessPvMeterImpl.java
@@ -55,6 +55,7 @@ public class FeneconDessPvMeterImpl extends AbstractOpenemsModbusComponent imple
 	@Reference(policy = ReferencePolicy.DYNAMIC, policyOption = ReferencePolicyOption.GREEDY, cardinality = ReferenceCardinality.OPTIONAL)
 	private volatile Timedata timedata = null;
 
+	@Override
 	@Reference(policy = ReferencePolicy.STATIC, policyOption = ReferencePolicyOption.GREEDY, cardinality = ReferenceCardinality.MANDATORY)
 	protected void setModbus(BridgeModbus modbus) {
 		super.setModbus(modbus);
@@ -77,10 +78,10 @@ public FeneconDessPvMeterImpl() {
 	void activate(ComponentContext context, Config config) throws OpenemsException {
 		if (super.activate(context, config.id(), config.alias(), config.enabled(), FeneconDessConstants.UNIT_ID,
 				this.cm, "Modbus", config.modbus_id())) {
-			return;
 		}
 	}
 
+	@Override
 	@Deactivate
 	protected void deactivate() {
 		super.deactivate();
@@ -118,7 +119,7 @@ public String debugLog() {
 				if (intValue == 0) {
 					return 0; // ignore '0'
 				}
-				return (intValue - 10_000); // apply delta of 10_000
+				return intValue - 10_000; // apply delta of 10_000
 			}, //
 
 			// channel -> element
@@ -138,7 +139,7 @@ public void handleEvent(Event event) {
 	 */
 	private void calculateEnergy() {
 		// Calculate Energy
-		Integer activePower = this.getActivePower().get();
+		var activePower = this.getActivePower().get();
 		if (activePower == null) {
 			// Not available
 			this.calculateProductionEnergy.update(null);
diff --git a/io.openems.edge.fenecon.dess/test/io/openems/edge/fenecon/dess/charger/FeneconDessCharger1Test.java b/io.openems.edge.fenecon.dess/test/io/openems/edge/fenecon/dess/charger/FeneconDessCharger1Test.java
index d4d5b04cd49..20325ec4cbf 100644
--- a/io.openems.edge.fenecon.dess/test/io/openems/edge/fenecon/dess/charger/FeneconDessCharger1Test.java
+++ b/io.openems.edge.fenecon.dess/test/io/openems/edge/fenecon/dess/charger/FeneconDessCharger1Test.java
@@ -16,7 +16,7 @@ public class FeneconDessCharger1Test {
 
 	@Test
 	public void test() throws Exception {
-		FeneconDessEssImpl ess = new FeneconDessEssImpl();
+		var ess = new FeneconDessEssImpl();
 		new ComponentTest(ess) //
 				.addReference("cm", new DummyConfigurationAdmin()) //
 				.addReference("setModbus", new DummyModbusBridge(MODBUS_ID)) //
diff --git a/io.openems.edge.fenecon.dess/test/io/openems/edge/fenecon/dess/charger/FeneconDessCharger2Test.java b/io.openems.edge.fenecon.dess/test/io/openems/edge/fenecon/dess/charger/FeneconDessCharger2Test.java
index c636c62d52a..879abb0d8fe 100644
--- a/io.openems.edge.fenecon.dess/test/io/openems/edge/fenecon/dess/charger/FeneconDessCharger2Test.java
+++ b/io.openems.edge.fenecon.dess/test/io/openems/edge/fenecon/dess/charger/FeneconDessCharger2Test.java
@@ -16,7 +16,7 @@ public class FeneconDessCharger2Test {
 
 	@Test
 	public void test() throws Exception {
-		FeneconDessEssImpl ess = new FeneconDessEssImpl();
+		var ess = new FeneconDessEssImpl();
 		new ComponentTest(ess) //
 				.addReference("cm", new DummyConfigurationAdmin()) //
 				.addReference("setModbus", new DummyModbusBridge(MODBUS_ID)) //
diff --git a/io.openems.edge.fenecon.dess/test/io/openems/edge/fenecon/dess/charger/MyChargerConfig.java b/io.openems.edge.fenecon.dess/test/io/openems/edge/fenecon/dess/charger/MyChargerConfig.java
index 406dddee8f2..4889d759a72 100644
--- a/io.openems.edge.fenecon.dess/test/io/openems/edge/fenecon/dess/charger/MyChargerConfig.java
+++ b/io.openems.edge.fenecon.dess/test/io/openems/edge/fenecon/dess/charger/MyChargerConfig.java
@@ -36,7 +36,7 @@ public MyChargerConfig build() {
 
 	/**
 	 * Create a Config builder.
-	 * 
+	 *
 	 * @return a {@link Builder}
 	 */
 	public static Builder create() {
diff --git a/io.openems.edge.fenecon.dess/test/io/openems/edge/fenecon/dess/ess/MyEssConfig.java b/io.openems.edge.fenecon.dess/test/io/openems/edge/fenecon/dess/ess/MyEssConfig.java
index a9493ace1b6..6b87f31fc0b 100644
--- a/io.openems.edge.fenecon.dess/test/io/openems/edge/fenecon/dess/ess/MyEssConfig.java
+++ b/io.openems.edge.fenecon.dess/test/io/openems/edge/fenecon/dess/ess/MyEssConfig.java
@@ -30,7 +30,7 @@ public MyEssConfig build() {
 
 	/**
 	 * Create a Config builder.
-	 * 
+	 *
 	 * @return a {@link Builder}
 	 */
 	public static Builder create() {
diff --git a/io.openems.edge.fenecon.dess/test/io/openems/edge/fenecon/dess/gridmeter/MyConfig.java b/io.openems.edge.fenecon.dess/test/io/openems/edge/fenecon/dess/gridmeter/MyConfig.java
index 403b9f1a90e..fd24d31b26b 100644
--- a/io.openems.edge.fenecon.dess/test/io/openems/edge/fenecon/dess/gridmeter/MyConfig.java
+++ b/io.openems.edge.fenecon.dess/test/io/openems/edge/fenecon/dess/gridmeter/MyConfig.java
@@ -30,7 +30,7 @@ public MyConfig build() {
 
 	/**
 	 * Create a Config builder.
-	 * 
+	 *
 	 * @return a {@link Builder}
 	 */
 	public static Builder create() {
diff --git a/io.openems.edge.fenecon.dess/test/io/openems/edge/fenecon/dess/pvmeter/MyConfig.java b/io.openems.edge.fenecon.dess/test/io/openems/edge/fenecon/dess/pvmeter/MyConfig.java
index a3950c59e44..f6092247767 100644
--- a/io.openems.edge.fenecon.dess/test/io/openems/edge/fenecon/dess/pvmeter/MyConfig.java
+++ b/io.openems.edge.fenecon.dess/test/io/openems/edge/fenecon/dess/pvmeter/MyConfig.java
@@ -30,7 +30,7 @@ public MyConfig build() {
 
 	/**
 	 * Create a Config builder.
-	 * 
+	 *
 	 * @return a {@link Builder}
 	 */
 	public static Builder create() {

From 26edc1b33f85d93a2ff1d2911d0a8616b8a5c9f0 Mon Sep 17 00:00:00 2001
From: Stefan Feilmeier <stefan.feilmeier@fenecon.de>
Date: Tue, 8 Mar 2022 11:55:13 +0100
Subject: [PATCH 72/96] Update io.openems.edge.fenecon.mini

---
 .../fenecon/mini/ess/FeneconMiniEssImpl.java  | 253 +++++++++---------
 .../mini/ess/MaxApparentPowerHandler.java     |   8 +-
 .../ActivateDebugMode1Handler.java            |   5 +-
 .../ActivateDebugMode2Handler.java            |   3 +-
 .../ActivateDebugMode3Handler.java            |   3 +-
 .../ActivateDebugMode4Handler.java            |   3 +-
 .../ActivateEconomicMode1Handler.java         |   3 +-
 .../ActivateEconomicMode2Handler.java         |   3 +-
 .../ActivateEconomicMode3Handler.java         |   3 +-
 .../ActivateEconomicMode4Handler.java         |   3 +-
 .../ess/statemachine/GoWriteModeHandler.java  |   3 +-
 .../ess/statemachine/UndefinedHandler.java    |   6 +-
 .../ess/statemachine/WriteModeHandler.java    |  18 +-
 .../gridmeter/FeneconMiniGridMeterImpl.java   |   9 +-
 .../mini/pvmeter/FeneconMiniPvMeterImpl.java  |   7 +-
 .../mini/ess/FeneconMiniEssImplTest.java      |   8 +-
 .../edge/fenecon/mini/ess/MyConfig.java       |   2 +-
 .../edge/fenecon/mini/gridmeter/MyConfig.java |   2 +-
 .../edge/fenecon/mini/pvmeter/MyConfig.java   |   2 +-
 19 files changed, 168 insertions(+), 176 deletions(-)

diff --git a/io.openems.edge.fenecon.mini/src/io/openems/edge/fenecon/mini/ess/FeneconMiniEssImpl.java b/io.openems.edge.fenecon.mini/src/io/openems/edge/fenecon/mini/ess/FeneconMiniEssImpl.java
index b39786a5b16..4eb42d56583 100644
--- a/io.openems.edge.fenecon.mini/src/io/openems/edge/fenecon/mini/ess/FeneconMiniEssImpl.java
+++ b/io.openems.edge.fenecon.mini/src/io/openems/edge/fenecon/mini/ess/FeneconMiniEssImpl.java
@@ -86,6 +86,7 @@ public class FeneconMiniEssImpl extends AbstractOpenemsModbusComponent
 	@Reference(policy = ReferencePolicy.DYNAMIC, policyOption = ReferencePolicyOption.GREEDY, cardinality = ReferenceCardinality.OPTIONAL)
 	private volatile Timedata timedata = null;
 
+	@Override
 	@Reference(policy = ReferencePolicy.STATIC, policyOption = ReferencePolicyOption.GREEDY, cardinality = ReferenceCardinality.MANDATORY)
 	protected void setModbus(BridgeModbus modbus) {
 		super.setModbus(modbus);
@@ -134,10 +135,10 @@ void activate(ComponentContext context, Config config) throws OpenemsException {
 		SinglePhaseEss.initializeCopyPhaseChannel(this, config.phase());
 
 		// Calculate Allowed Charge and Discharge Power
-		final Consumer<Value<Integer>> calculateAllowedChargeDischargePower = (ignore) -> {
-			Value<Integer> voltage = this.getBecu1TotalVoltageChannel().getNextValue();
-			Value<Integer> chargeCurrent = this.getBecu1AllowedChargeCurrentChannel().getNextValue();
-			Value<Integer> dischargeCurrent = this.getBecu1AllowedDischargeCurrentChannel().getNextValue();
+		final Consumer<Value<Integer>> calculateAllowedChargeDischargePower = ignore -> {
+			var voltage = this.getBecu1TotalVoltageChannel().getNextValue();
+			var chargeCurrent = this.getBecu1AllowedChargeCurrentChannel().getNextValue();
+			var dischargeCurrent = this.getBecu1AllowedDischargeCurrentChannel().getNextValue();
 			final Integer allowedCharge;
 			final Integer allowedDischarge;
 			if (voltage.isDefined() && chargeCurrent.isDefined() && dischargeCurrent.isDefined()) {
@@ -158,6 +159,7 @@ void activate(ComponentContext context, Config config) throws OpenemsException {
 		this.getBecu1AllowedDischargeCurrentChannel().onSetNextValue(calculateAllowedChargeDischargePower);
 	}
 
+	@Override
 	@Deactivate
 	protected void deactivate() {
 		super.deactivate();
@@ -172,33 +174,33 @@ public SinglePhase getPhase() {
 	protected ModbusProtocol defineModbusProtocol() throws OpenemsException {
 		return new ModbusProtocol(this, //
 				new FC3ReadRegistersTask(100, Priority.LOW, //
-						m(FeneconMiniEss.ChannelId.SYSTEM_STATE, new UnsignedWordElement(100)), //
-						m(FeneconMiniEss.ChannelId.CONTROL_MODE, new UnsignedWordElement(101)), //
+						this.m(FeneconMiniEss.ChannelId.SYSTEM_STATE, new UnsignedWordElement(100)), //
+						this.m(FeneconMiniEss.ChannelId.CONTROL_MODE, new UnsignedWordElement(101)), //
 						new DummyRegisterElement(102, 107), //
-						m(FeneconMiniEss.ChannelId.BATTERY_GROUP_STATE, new UnsignedWordElement(108)), //
+						this.m(FeneconMiniEss.ChannelId.BATTERY_GROUP_STATE, new UnsignedWordElement(108)), //
 						new DummyRegisterElement(109), //
-						m(FeneconMiniEss.ChannelId.BATTERY_VOLTAGE, new UnsignedWordElement(110)), //
-						m(FeneconMiniEss.ChannelId.BATTERY_CURRENT, new SignedWordElement(111)), //
-						m(FeneconMiniEss.ChannelId.BATTERY_POWER, new SignedWordElement(112))), //
+						this.m(FeneconMiniEss.ChannelId.BATTERY_VOLTAGE, new UnsignedWordElement(110)), //
+						this.m(FeneconMiniEss.ChannelId.BATTERY_CURRENT, new SignedWordElement(111)), //
+						this.m(FeneconMiniEss.ChannelId.BATTERY_POWER, new SignedWordElement(112))), //
 				new FC3ReadRegistersTask(2007, Priority.HIGH, //
-						m(AsymmetricEss.ChannelId.ACTIVE_POWER_L1, new UnsignedWordElement(2007),
+						this.m(AsymmetricEss.ChannelId.ACTIVE_POWER_L1, new UnsignedWordElement(2007),
 								UNSIGNED_POWER_CONVERTER)), //
 				new FC3ReadRegistersTask(2107, Priority.HIGH, //
-						m(AsymmetricEss.ChannelId.ACTIVE_POWER_L2, new UnsignedWordElement(2107),
+						this.m(AsymmetricEss.ChannelId.ACTIVE_POWER_L2, new UnsignedWordElement(2107),
 								UNSIGNED_POWER_CONVERTER)), //
 				new FC3ReadRegistersTask(2207, Priority.HIGH, //
-						m(AsymmetricEss.ChannelId.ACTIVE_POWER_L3, new UnsignedWordElement(2207),
+						this.m(AsymmetricEss.ChannelId.ACTIVE_POWER_L3, new UnsignedWordElement(2207),
 								UNSIGNED_POWER_CONVERTER)), //
 				new FC3ReadRegistersTask(3000, Priority.LOW, //
-						m(FeneconMiniEss.ChannelId.BECU1_ALLOWED_CHARGE_CURRENT, new UnsignedWordElement(3000),
+						this.m(FeneconMiniEss.ChannelId.BECU1_ALLOWED_CHARGE_CURRENT, new UnsignedWordElement(3000),
 								ElementToChannelConverter.SCALE_FACTOR_2), //
-						m(FeneconMiniEss.ChannelId.BECU1_ALLOWED_DISCHARGE_CURRENT, new UnsignedWordElement(3001),
+						this.m(FeneconMiniEss.ChannelId.BECU1_ALLOWED_DISCHARGE_CURRENT, new UnsignedWordElement(3001),
 								ElementToChannelConverter.SCALE_FACTOR_2), //
-						m(FeneconMiniEss.ChannelId.BECU1_TOTAL_VOLTAGE, new UnsignedWordElement(3002),
+						this.m(FeneconMiniEss.ChannelId.BECU1_TOTAL_VOLTAGE, new UnsignedWordElement(3002),
 								ElementToChannelConverter.SCALE_FACTOR_2), //
-						m(FeneconMiniEss.ChannelId.BECU1_TOTAL_CURRENT, new UnsignedWordElement(3003)), //
-						m(FeneconMiniEss.ChannelId.BECU1_SOC, new UnsignedWordElement(3004)), //
-						m(new BitsWordElement(3005, this) //
+						this.m(FeneconMiniEss.ChannelId.BECU1_TOTAL_CURRENT, new UnsignedWordElement(3003)), //
+						this.m(FeneconMiniEss.ChannelId.BECU1_SOC, new UnsignedWordElement(3004)), //
+						this.m(new BitsWordElement(3005, this) //
 								.bit(0, FeneconMiniEss.ChannelId.STATE_1) //
 								.bit(1, FeneconMiniEss.ChannelId.STATE_2) //
 								.bit(2, FeneconMiniEss.ChannelId.STATE_3) //
@@ -215,7 +217,7 @@ protected ModbusProtocol defineModbusProtocol() throws OpenemsException {
 								.bit(13, FeneconMiniEss.ServiceInfoChannelId.STATE_14) //
 								.bit(14, FeneconMiniEss.ServiceInfoChannelId.STATE_15) //
 								.bit(15, FeneconMiniEss.ChannelId.STATE_16)), //
-						m(new BitsWordElement(3006, this) //
+						this.m(new BitsWordElement(3006, this) //
 								.bit(0, FeneconMiniEss.ChannelId.STATE_17) //
 								.bit(1, FeneconMiniEss.ChannelId.STATE_18) //
 								.bit(2, FeneconMiniEss.ChannelId.STATE_19) //
@@ -231,7 +233,7 @@ protected ModbusProtocol defineModbusProtocol() throws OpenemsException {
 								.bit(13, FeneconMiniEss.ServiceInfoChannelId.STATE_29) //
 								.bit(14, FeneconMiniEss.ServiceInfoChannelId.STATE_30) //
 								.bit(15, FeneconMiniEss.ServiceInfoChannelId.STATE_31)), //
-						m(new BitsWordElement(3007, this) //
+						this.m(new BitsWordElement(3007, this) //
 								.bit(0, FeneconMiniEss.ServiceInfoChannelId.STATE_32) //
 								.bit(1, FeneconMiniEss.ServiceInfoChannelId.STATE_33) //
 								.bit(2, FeneconMiniEss.SystemErrorChannelId.STATE_34) //
@@ -246,7 +248,7 @@ protected ModbusProtocol defineModbusProtocol() throws OpenemsException {
 								.bit(13, FeneconMiniEss.ServiceInfoChannelId.STATE_43) //
 								.bit(14, FeneconMiniEss.ChannelId.STATE_44) //
 								.bit(15, FeneconMiniEss.ChannelId.STATE_45)), //
-						m(new BitsWordElement(3008, this) //
+						this.m(new BitsWordElement(3008, this) //
 								.bit(0, FeneconMiniEss.ChannelId.STATE_46) //
 								.bit(1, FeneconMiniEss.ChannelId.STATE_47) //
 								.bit(2, FeneconMiniEss.ServiceInfoChannelId.STATE_48) //
@@ -254,60 +256,60 @@ protected ModbusProtocol defineModbusProtocol() throws OpenemsException {
 								.bit(10, FeneconMiniEss.ServiceInfoChannelId.STATE_50) //
 								.bit(12, FeneconMiniEss.ServiceInfoChannelId.STATE_51) //
 								.bit(13, FeneconMiniEss.ServiceInfoChannelId.STATE_52)), //
-						m(FeneconMiniEss.ChannelId.BECU1_VERSION, new UnsignedWordElement(3009)), //
-						m(FeneconMiniEss.ChannelId.BECU1_NOMINAL_CAPACITY, new UnsignedWordElement(3010)), //
-						m(FeneconMiniEss.ChannelId.BECU1_CURRENT_CAPACITY, new UnsignedWordElement(3011)), //
-						m(FeneconMiniEss.ChannelId.BECU1_MINIMUM_VOLTAGE_NO, new UnsignedWordElement(3012)), //
-						m(FeneconMiniEss.ChannelId.BECU1_MINIMUM_VOLTAGE, new UnsignedWordElement(3013)), //
-						m(FeneconMiniEss.ChannelId.BECU1_MAXIMUM_VOLTAGE_NO, new UnsignedWordElement(3014)), //
-						m(FeneconMiniEss.ChannelId.BECU1_MAXIMUM_VOLTAGE, new UnsignedWordElement(3015)), // ^
-						m(FeneconMiniEss.ChannelId.BECU1_MINIMUM_TEMPERATURE_NO, new UnsignedWordElement(3016)), //
-						m(FeneconMiniEss.ChannelId.BECU1_MINIMUM_TEMPERATURE, new UnsignedWordElement(3017),
+						this.m(FeneconMiniEss.ChannelId.BECU1_VERSION, new UnsignedWordElement(3009)), //
+						this.m(FeneconMiniEss.ChannelId.BECU1_NOMINAL_CAPACITY, new UnsignedWordElement(3010)), //
+						this.m(FeneconMiniEss.ChannelId.BECU1_CURRENT_CAPACITY, new UnsignedWordElement(3011)), //
+						this.m(FeneconMiniEss.ChannelId.BECU1_MINIMUM_VOLTAGE_NO, new UnsignedWordElement(3012)), //
+						this.m(FeneconMiniEss.ChannelId.BECU1_MINIMUM_VOLTAGE, new UnsignedWordElement(3013)), //
+						this.m(FeneconMiniEss.ChannelId.BECU1_MAXIMUM_VOLTAGE_NO, new UnsignedWordElement(3014)), //
+						this.m(FeneconMiniEss.ChannelId.BECU1_MAXIMUM_VOLTAGE, new UnsignedWordElement(3015)), // ^
+						this.m(FeneconMiniEss.ChannelId.BECU1_MINIMUM_TEMPERATURE_NO, new UnsignedWordElement(3016)), //
+						this.m(FeneconMiniEss.ChannelId.BECU1_MINIMUM_TEMPERATURE, new UnsignedWordElement(3017),
 								new ElementToChannelOffsetConverter(-40)), //
-						m(FeneconMiniEss.ChannelId.BECU1_MAXIMUM_TEMPERATURE_NO, new UnsignedWordElement(3018)), //
-						m(FeneconMiniEss.ChannelId.BECU1_MAXIMUM_TEMPERATURE, new UnsignedWordElement(
+						this.m(FeneconMiniEss.ChannelId.BECU1_MAXIMUM_TEMPERATURE_NO, new UnsignedWordElement(3018)), //
+						this.m(FeneconMiniEss.ChannelId.BECU1_MAXIMUM_TEMPERATURE, new UnsignedWordElement(
 								3019), new ElementToChannelOffsetConverter(-40))),
 				new FC3ReadRegistersTask(3020, Priority.LOW, //
-						m(FeneconMiniEss.ChannelId.BATTERY_VOLTAGE_SECTION_1, new UnsignedWordElement(3020)), //
-						m(FeneconMiniEss.ChannelId.BATTERY_VOLTAGE_SECTION_2, new UnsignedWordElement(3021)), //
-						m(FeneconMiniEss.ChannelId.BATTERY_VOLTAGE_SECTION_3, new UnsignedWordElement(3022)), //
-						m(FeneconMiniEss.ChannelId.BATTERY_VOLTAGE_SECTION_4, new UnsignedWordElement(3023)), //
-						m(FeneconMiniEss.ChannelId.BATTERY_VOLTAGE_SECTION_5, new UnsignedWordElement(3024)), //
-						m(FeneconMiniEss.ChannelId.BATTERY_VOLTAGE_SECTION_6, new UnsignedWordElement(3025)), //
-						m(FeneconMiniEss.ChannelId.BATTERY_VOLTAGE_SECTION_7, new UnsignedWordElement(3026)), //
-						m(FeneconMiniEss.ChannelId.BATTERY_VOLTAGE_SECTION_8, new UnsignedWordElement(3027)), //
-						m(FeneconMiniEss.ChannelId.BATTERY_VOLTAGE_SECTION_9, new UnsignedWordElement(3028)), //
-						m(FeneconMiniEss.ChannelId.BATTERY_VOLTAGE_SECTION_10, new UnsignedWordElement(3029)), //
-						m(FeneconMiniEss.ChannelId.BATTERY_VOLTAGE_SECTION_11, new UnsignedWordElement(3030)), //
-						m(FeneconMiniEss.ChannelId.BATTERY_VOLTAGE_SECTION_12, new UnsignedWordElement(3031)), //
-						m(FeneconMiniEss.ChannelId.BATTERY_VOLTAGE_SECTION_13, new UnsignedWordElement(3032)), //
-						m(FeneconMiniEss.ChannelId.BATTERY_VOLTAGE_SECTION_14, new UnsignedWordElement(3033)), //
-						m(FeneconMiniEss.ChannelId.BATTERY_VOLTAGE_SECTION_15, new UnsignedWordElement(3034)), //
-						m(FeneconMiniEss.ChannelId.BATTERY_VOLTAGE_SECTION_16, new UnsignedWordElement(3035)), //
-						m(FeneconMiniEss.ChannelId.BATTERY_TEMPERATURE_SECTION_1, new UnsignedWordElement(3036)), //
-						m(FeneconMiniEss.ChannelId.BATTERY_TEMPERATURE_SECTION_2, new UnsignedWordElement(3037)), //
-						m(FeneconMiniEss.ChannelId.BATTERY_TEMPERATURE_SECTION_3, new UnsignedWordElement(3038)), //
-						m(FeneconMiniEss.ChannelId.BATTERY_TEMPERATURE_SECTION_4, new UnsignedWordElement(3039)), //
-						m(FeneconMiniEss.ChannelId.BATTERY_TEMPERATURE_SECTION_5, new UnsignedWordElement(3040)), //
-						m(FeneconMiniEss.ChannelId.BATTERY_TEMPERATURE_SECTION_6, new UnsignedWordElement(3041)), //
-						m(FeneconMiniEss.ChannelId.BATTERY_TEMPERATURE_SECTION_7, new UnsignedWordElement(3042)), //
-						m(FeneconMiniEss.ChannelId.BATTERY_TEMPERATURE_SECTION_8, new UnsignedWordElement(3043)), //
-						m(FeneconMiniEss.ChannelId.BATTERY_TEMPERATURE_SECTION_9, new UnsignedWordElement(3044)), //
-						m(FeneconMiniEss.ChannelId.BATTERY_TEMPERATURE_SECTION_10, new UnsignedWordElement(3045)), //
-						m(FeneconMiniEss.ChannelId.BATTERY_TEMPERATURE_SECTION_11, new UnsignedWordElement(3046)), //
-						m(FeneconMiniEss.ChannelId.BATTERY_TEMPERATURE_SECTION_12, new UnsignedWordElement(3047)), //
-						m(FeneconMiniEss.ChannelId.BATTERY_TEMPERATURE_SECTION_13, new UnsignedWordElement(3048)), //
-						m(FeneconMiniEss.ChannelId.BATTERY_TEMPERATURE_SECTION_14, new UnsignedWordElement(3049)), //
-						m(FeneconMiniEss.ChannelId.BATTERY_TEMPERATURE_SECTION_15, new UnsignedWordElement(3050)), //
-						m(FeneconMiniEss.ChannelId.BATTERY_TEMPERATURE_SECTION_16, new UnsignedWordElement(3051))), //
+						this.m(FeneconMiniEss.ChannelId.BATTERY_VOLTAGE_SECTION_1, new UnsignedWordElement(3020)), //
+						this.m(FeneconMiniEss.ChannelId.BATTERY_VOLTAGE_SECTION_2, new UnsignedWordElement(3021)), //
+						this.m(FeneconMiniEss.ChannelId.BATTERY_VOLTAGE_SECTION_3, new UnsignedWordElement(3022)), //
+						this.m(FeneconMiniEss.ChannelId.BATTERY_VOLTAGE_SECTION_4, new UnsignedWordElement(3023)), //
+						this.m(FeneconMiniEss.ChannelId.BATTERY_VOLTAGE_SECTION_5, new UnsignedWordElement(3024)), //
+						this.m(FeneconMiniEss.ChannelId.BATTERY_VOLTAGE_SECTION_6, new UnsignedWordElement(3025)), //
+						this.m(FeneconMiniEss.ChannelId.BATTERY_VOLTAGE_SECTION_7, new UnsignedWordElement(3026)), //
+						this.m(FeneconMiniEss.ChannelId.BATTERY_VOLTAGE_SECTION_8, new UnsignedWordElement(3027)), //
+						this.m(FeneconMiniEss.ChannelId.BATTERY_VOLTAGE_SECTION_9, new UnsignedWordElement(3028)), //
+						this.m(FeneconMiniEss.ChannelId.BATTERY_VOLTAGE_SECTION_10, new UnsignedWordElement(3029)), //
+						this.m(FeneconMiniEss.ChannelId.BATTERY_VOLTAGE_SECTION_11, new UnsignedWordElement(3030)), //
+						this.m(FeneconMiniEss.ChannelId.BATTERY_VOLTAGE_SECTION_12, new UnsignedWordElement(3031)), //
+						this.m(FeneconMiniEss.ChannelId.BATTERY_VOLTAGE_SECTION_13, new UnsignedWordElement(3032)), //
+						this.m(FeneconMiniEss.ChannelId.BATTERY_VOLTAGE_SECTION_14, new UnsignedWordElement(3033)), //
+						this.m(FeneconMiniEss.ChannelId.BATTERY_VOLTAGE_SECTION_15, new UnsignedWordElement(3034)), //
+						this.m(FeneconMiniEss.ChannelId.BATTERY_VOLTAGE_SECTION_16, new UnsignedWordElement(3035)), //
+						this.m(FeneconMiniEss.ChannelId.BATTERY_TEMPERATURE_SECTION_1, new UnsignedWordElement(3036)), //
+						this.m(FeneconMiniEss.ChannelId.BATTERY_TEMPERATURE_SECTION_2, new UnsignedWordElement(3037)), //
+						this.m(FeneconMiniEss.ChannelId.BATTERY_TEMPERATURE_SECTION_3, new UnsignedWordElement(3038)), //
+						this.m(FeneconMiniEss.ChannelId.BATTERY_TEMPERATURE_SECTION_4, new UnsignedWordElement(3039)), //
+						this.m(FeneconMiniEss.ChannelId.BATTERY_TEMPERATURE_SECTION_5, new UnsignedWordElement(3040)), //
+						this.m(FeneconMiniEss.ChannelId.BATTERY_TEMPERATURE_SECTION_6, new UnsignedWordElement(3041)), //
+						this.m(FeneconMiniEss.ChannelId.BATTERY_TEMPERATURE_SECTION_7, new UnsignedWordElement(3042)), //
+						this.m(FeneconMiniEss.ChannelId.BATTERY_TEMPERATURE_SECTION_8, new UnsignedWordElement(3043)), //
+						this.m(FeneconMiniEss.ChannelId.BATTERY_TEMPERATURE_SECTION_9, new UnsignedWordElement(3044)), //
+						this.m(FeneconMiniEss.ChannelId.BATTERY_TEMPERATURE_SECTION_10, new UnsignedWordElement(3045)), //
+						this.m(FeneconMiniEss.ChannelId.BATTERY_TEMPERATURE_SECTION_11, new UnsignedWordElement(3046)), //
+						this.m(FeneconMiniEss.ChannelId.BATTERY_TEMPERATURE_SECTION_12, new UnsignedWordElement(3047)), //
+						this.m(FeneconMiniEss.ChannelId.BATTERY_TEMPERATURE_SECTION_13, new UnsignedWordElement(3048)), //
+						this.m(FeneconMiniEss.ChannelId.BATTERY_TEMPERATURE_SECTION_14, new UnsignedWordElement(3049)), //
+						this.m(FeneconMiniEss.ChannelId.BATTERY_TEMPERATURE_SECTION_15, new UnsignedWordElement(3050)), //
+						this.m(FeneconMiniEss.ChannelId.BATTERY_TEMPERATURE_SECTION_16, new UnsignedWordElement(3051))), //
 				new FC3ReadRegistersTask(3200, Priority.LOW, //
-						m(FeneconMiniEss.ChannelId.BECU2_CHARGE_CURRENT, new UnsignedWordElement(3200)), //
-						m(FeneconMiniEss.ChannelId.BECU2_DISCHARGE_CURRENT, new UnsignedWordElement(3201)), //
-						m(FeneconMiniEss.ChannelId.BECU2_VOLT, new UnsignedWordElement(3202)), //
-						m(FeneconMiniEss.ChannelId.BECU2_CURRENT, new UnsignedWordElement(3203)), //
-						m(FeneconMiniEss.ChannelId.BECU2_SOC, new UnsignedWordElement(3204))), //
+						this.m(FeneconMiniEss.ChannelId.BECU2_CHARGE_CURRENT, new UnsignedWordElement(3200)), //
+						this.m(FeneconMiniEss.ChannelId.BECU2_DISCHARGE_CURRENT, new UnsignedWordElement(3201)), //
+						this.m(FeneconMiniEss.ChannelId.BECU2_VOLT, new UnsignedWordElement(3202)), //
+						this.m(FeneconMiniEss.ChannelId.BECU2_CURRENT, new UnsignedWordElement(3203)), //
+						this.m(FeneconMiniEss.ChannelId.BECU2_SOC, new UnsignedWordElement(3204))), //
 				new FC3ReadRegistersTask(3205, Priority.LOW, //
-						m(new BitsWordElement(3205, this) //
+						this.m(new BitsWordElement(3205, this) //
 								.bit(0, FeneconMiniEss.ServiceInfoChannelId.STATE_53) //
 								.bit(1, FeneconMiniEss.ServiceInfoChannelId.STATE_54) //
 								.bit(2, FeneconMiniEss.ServiceInfoChannelId.STATE_55) //
@@ -324,7 +326,7 @@ protected ModbusProtocol defineModbusProtocol() throws OpenemsException {
 								.bit(13, FeneconMiniEss.ServiceInfoChannelId.STATE_66) //
 								.bit(14, FeneconMiniEss.ServiceInfoChannelId.STATE_67) //
 								.bit(15, FeneconMiniEss.ServiceInfoChannelId.STATE_68)), //
-						m(new BitsWordElement(3206, this) //
+						this.m(new BitsWordElement(3206, this) //
 								.bit(0, FeneconMiniEss.ServiceInfoChannelId.STATE_69) //
 								.bit(1, FeneconMiniEss.ServiceInfoChannelId.STATE_70) //
 								.bit(2, FeneconMiniEss.ServiceInfoChannelId.STATE_71) //
@@ -340,7 +342,7 @@ protected ModbusProtocol defineModbusProtocol() throws OpenemsException {
 								.bit(13, FeneconMiniEss.ServiceInfoChannelId.STATE_81) //
 								.bit(14, FeneconMiniEss.ServiceInfoChannelId.STATE_82) //
 								.bit(15, FeneconMiniEss.ServiceInfoChannelId.STATE_83)),
-						m(new BitsWordElement(3207, this) //
+						this.m(new BitsWordElement(3207, this) //
 								.bit(0, FeneconMiniEss.ServiceInfoChannelId.STATE_84) //
 								.bit(1, FeneconMiniEss.ServiceInfoChannelId.STATE_85) //
 								.bit(2, FeneconMiniEss.ServiceInfoChannelId.STATE_86) //
@@ -355,7 +357,7 @@ protected ModbusProtocol defineModbusProtocol() throws OpenemsException {
 								.bit(13, FeneconMiniEss.ServiceInfoChannelId.STATE_95) //
 								.bit(14, FeneconMiniEss.ChannelId.STATE_96) //
 								.bit(15, FeneconMiniEss.ChannelId.STATE_97)), //
-						m(new BitsWordElement(3208, this) //
+						this.m(new BitsWordElement(3208, this) //
 								.bit(0, FeneconMiniEss.ChannelId.STATE_98) //
 								.bit(1, FeneconMiniEss.ChannelId.STATE_99) //
 								.bit(2, FeneconMiniEss.ServiceInfoChannelId.STATE_100) //
@@ -363,44 +365,44 @@ protected ModbusProtocol defineModbusProtocol() throws OpenemsException {
 								.bit(10, FeneconMiniEss.ServiceInfoChannelId.STATE_102) //
 								.bit(12, FeneconMiniEss.ServiceInfoChannelId.STATE_103) //
 								.bit(13, FeneconMiniEss.ServiceInfoChannelId.STATE_104)),
-						m(FeneconMiniEss.ChannelId.BECU2_VERSION, new UnsignedWordElement(3209)), //
+						this.m(FeneconMiniEss.ChannelId.BECU2_VERSION, new UnsignedWordElement(3209)), //
 						new DummyRegisterElement(3210, 3211), //
-						m(FeneconMiniEss.ChannelId.BECU2_MIN_VOLT_NO, new UnsignedWordElement(3212)), //
-						m(FeneconMiniEss.ChannelId.BECU2_MIN_VOLT, new UnsignedWordElement(3213)), //
-						m(FeneconMiniEss.ChannelId.BECU2_MAX_VOLT_NO, new UnsignedWordElement(3214)), //
-						m(FeneconMiniEss.ChannelId.BECU2_MAX_VOLT, new UnsignedWordElement(3215)), // ^
-						m(FeneconMiniEss.ChannelId.BECU2_MIN_TEMP_NO, new UnsignedWordElement(3216)), //
-						m(FeneconMiniEss.ChannelId.BECU2_MIN_TEMP, new UnsignedWordElement(3217)), //
-						m(FeneconMiniEss.ChannelId.BECU2_MAX_TEMP_NO, new UnsignedWordElement(3218)), //
-						m(FeneconMiniEss.ChannelId.BECU2_MAX_TEMP, new UnsignedWordElement(3219))), //
+						this.m(FeneconMiniEss.ChannelId.BECU2_MIN_VOLT_NO, new UnsignedWordElement(3212)), //
+						this.m(FeneconMiniEss.ChannelId.BECU2_MIN_VOLT, new UnsignedWordElement(3213)), //
+						this.m(FeneconMiniEss.ChannelId.BECU2_MAX_VOLT_NO, new UnsignedWordElement(3214)), //
+						this.m(FeneconMiniEss.ChannelId.BECU2_MAX_VOLT, new UnsignedWordElement(3215)), // ^
+						this.m(FeneconMiniEss.ChannelId.BECU2_MIN_TEMP_NO, new UnsignedWordElement(3216)), //
+						this.m(FeneconMiniEss.ChannelId.BECU2_MIN_TEMP, new UnsignedWordElement(3217)), //
+						this.m(FeneconMiniEss.ChannelId.BECU2_MAX_TEMP_NO, new UnsignedWordElement(3218)), //
+						this.m(FeneconMiniEss.ChannelId.BECU2_MAX_TEMP, new UnsignedWordElement(3219))), //
 				new FC3ReadRegistersTask(4000, Priority.LOW, //
-						m(FeneconMiniEss.ChannelId.SYSTEM_WORK_STATE, new UnsignedDoublewordElement(4000)), //
-						m(FeneconMiniEss.ChannelId.SYSTEM_WORK_MODE_STATE, new UnsignedDoublewordElement(4002))), //
+						this.m(FeneconMiniEss.ChannelId.SYSTEM_WORK_STATE, new UnsignedDoublewordElement(4000)), //
+						this.m(FeneconMiniEss.ChannelId.SYSTEM_WORK_MODE_STATE, new UnsignedDoublewordElement(4002))), //
 				new FC3ReadRegistersTask(4800, Priority.LOW, //
-						m(FeneconMiniEss.ChannelId.BECU_NUM, new UnsignedWordElement(4800)), //
+						this.m(FeneconMiniEss.ChannelId.BECU_NUM, new UnsignedWordElement(4800)), //
 						// TODO BECU_WORK_STATE has been implemented with both registers(4801 and 4807)
-						m(FeneconMiniEss.ChannelId.BECU_WORK_STATE, new UnsignedWordElement(4801)), //
+						this.m(FeneconMiniEss.ChannelId.BECU_WORK_STATE, new UnsignedWordElement(4801)), //
 						new DummyRegisterElement(4802), //
-						m(FeneconMiniEss.ChannelId.BECU_CHARGE_CURRENT, new UnsignedWordElement(4803)), //
-						m(FeneconMiniEss.ChannelId.BECU_DISCHARGE_CURRENT, new UnsignedWordElement(4804)), //
-						m(FeneconMiniEss.ChannelId.BECU_VOLT, new UnsignedWordElement(4805)), //
-						m(FeneconMiniEss.ChannelId.BECU_CURRENT, new UnsignedWordElement(4806))), //
+						this.m(FeneconMiniEss.ChannelId.BECU_CHARGE_CURRENT, new UnsignedWordElement(4803)), //
+						this.m(FeneconMiniEss.ChannelId.BECU_DISCHARGE_CURRENT, new UnsignedWordElement(4804)), //
+						this.m(FeneconMiniEss.ChannelId.BECU_VOLT, new UnsignedWordElement(4805)), //
+						this.m(FeneconMiniEss.ChannelId.BECU_CURRENT, new UnsignedWordElement(4806))), //
 				new FC16WriteRegistersTask(4809, //
-						m(new BitsWordElement(4809, this) //
+						this.m(new BitsWordElement(4809, this) //
 								.bit(0, FeneconMiniEss.ServiceInfoChannelId.STATE_111) //
 								.bit(1, FeneconMiniEss.ServiceInfoChannelId.STATE_112))), //
 				new FC3ReadRegistersTask(4808, Priority.LOW, //
-						m(new BitsWordElement(4808, this) //
+						this.m(new BitsWordElement(4808, this) //
 								.bit(0, FeneconMiniEss.SystemErrorChannelId.STATE_105) //
 								.bit(1, FeneconMiniEss.ServiceInfoChannelId.STATE_106) //
 								.bit(2, FeneconMiniEss.ServiceInfoChannelId.STATE_107) //
 								.bit(3, FeneconMiniEss.ServiceInfoChannelId.STATE_108) //
 								.bit(4, FeneconMiniEss.ServiceInfoChannelId.STATE_109) //
 								.bit(9, FeneconMiniEss.ServiceInfoChannelId.STATE_110)), //
-						m(new BitsWordElement(4809, this) //
+						this.m(new BitsWordElement(4809, this) //
 								.bit(0, FeneconMiniEss.ServiceInfoChannelId.STATE_111) //
 								.bit(1, FeneconMiniEss.ServiceInfoChannelId.STATE_112)), //
-						m(new BitsWordElement(4810, this) //
+						this.m(new BitsWordElement(4810, this) //
 								.bit(0, FeneconMiniEss.ServiceInfoChannelId.STATE_113) //
 								.bit(1, FeneconMiniEss.ServiceInfoChannelId.STATE_114) //
 								.bit(2, FeneconMiniEss.ServiceInfoChannelId.STATE_115) //
@@ -417,7 +419,7 @@ protected ModbusProtocol defineModbusProtocol() throws OpenemsException {
 								.bit(13, FeneconMiniEss.ServiceInfoChannelId.STATE_126) //
 								.bit(14, FeneconMiniEss.ServiceInfoChannelId.STATE_127) //
 								.bit(15, FeneconMiniEss.ServiceInfoChannelId.STATE_128)), //
-						m(new BitsWordElement(4811, this) //
+						this.m(new BitsWordElement(4811, this) //
 								.bit(0, FeneconMiniEss.ServiceInfoChannelId.STATE_129) //
 								.bit(1, FeneconMiniEss.ServiceInfoChannelId.STATE_130) //
 								.bit(2, FeneconMiniEss.ServiceInfoChannelId.STATE_131) //
@@ -432,7 +434,7 @@ protected ModbusProtocol defineModbusProtocol() throws OpenemsException {
 								.bit(11, FeneconMiniEss.ServiceInfoChannelId.STATE_140) //
 								.bit(12, FeneconMiniEss.ServiceInfoChannelId.STATE_141) //
 								.bit(14, FeneconMiniEss.ChannelId.STATE_143)),
-						m(SymmetricEss.ChannelId.SOC, new UnsignedWordElement(4812),
+						this.m(SymmetricEss.ChannelId.SOC, new UnsignedWordElement(4812),
 								new ElementToChannelConverter(value -> {
 									// Set SoC to 100 % if battery is full and AllowedCharge is zero
 									if (value == null) {
@@ -442,52 +444,51 @@ protected ModbusProtocol defineModbusProtocol() throws OpenemsException {
 									if (soc > 95 && this.getAllowedChargePower().orElse(-1) == 0
 											&& this.getAllowedDischargePower().orElse(0) != 0) {
 										return 100;
-									} else {
-										return value;
 									}
+									return value;
 								}, //
 										value -> value)) //
 				), //
 
 				new FC16WriteRegistersTask(9014, //
-						m(FeneconMiniEss.ChannelId.RTC_YEAR, new UnsignedWordElement(9014)), //
-						m(FeneconMiniEss.ChannelId.RTC_MONTH, new UnsignedWordElement(9015)), //
-						m(FeneconMiniEss.ChannelId.RTC_DAY, new UnsignedWordElement(9016)), //
-						m(FeneconMiniEss.ChannelId.RTC_HOUR, new UnsignedWordElement(9017)), //
-						m(FeneconMiniEss.ChannelId.RTC_MINUTE, new UnsignedWordElement(9018)), //
-						m(FeneconMiniEss.ChannelId.RTC_SECOND, new UnsignedWordElement(9019))), //
+						this.m(FeneconMiniEss.ChannelId.RTC_YEAR, new UnsignedWordElement(9014)), //
+						this.m(FeneconMiniEss.ChannelId.RTC_MONTH, new UnsignedWordElement(9015)), //
+						this.m(FeneconMiniEss.ChannelId.RTC_DAY, new UnsignedWordElement(9016)), //
+						this.m(FeneconMiniEss.ChannelId.RTC_HOUR, new UnsignedWordElement(9017)), //
+						this.m(FeneconMiniEss.ChannelId.RTC_MINUTE, new UnsignedWordElement(9018)), //
+						this.m(FeneconMiniEss.ChannelId.RTC_SECOND, new UnsignedWordElement(9019))), //
 				new FC16WriteRegistersTask(30526, //
-						m(FeneconMiniEss.ChannelId.GRID_MAX_CHARGE_CURRENT, new UnsignedWordElement(30526),
+						this.m(FeneconMiniEss.ChannelId.GRID_MAX_CHARGE_CURRENT, new UnsignedWordElement(30526),
 								ElementToChannelConverter.SCALE_FACTOR_2,
 								new ChannelMetaInfoReadAndWrite(30126, 30526)), //
-						m(FeneconMiniEss.ChannelId.GRID_MAX_DISCHARGE_CURRENT, new UnsignedWordElement(30527),
+						this.m(FeneconMiniEss.ChannelId.GRID_MAX_DISCHARGE_CURRENT, new UnsignedWordElement(30527),
 								ElementToChannelConverter.SCALE_FACTOR_2,
 								new ChannelMetaInfoReadAndWrite(30127, 30527))), //
 				new FC16WriteRegistersTask(30558, //
-						m(FeneconMiniEss.ChannelId.SETUP_MODE, new UnsignedWordElement(30558),
+						this.m(FeneconMiniEss.ChannelId.SETUP_MODE, new UnsignedWordElement(30558),
 								new ChannelMetaInfoReadAndWrite(30157, 30558))), //
 				new FC16WriteRegistersTask(30559, //
-						m(FeneconMiniEss.ChannelId.PCS_MODE, new UnsignedWordElement(30559),
+						this.m(FeneconMiniEss.ChannelId.PCS_MODE, new UnsignedWordElement(30559),
 								new ChannelMetaInfoReadAndWrite(30158, 30559))), //
 
 				new FC3ReadRegistersTask(30126, Priority.LOW, //
-						m(FeneconMiniEss.ChannelId.GRID_MAX_CHARGE_CURRENT, new UnsignedWordElement(30126),
+						this.m(FeneconMiniEss.ChannelId.GRID_MAX_CHARGE_CURRENT, new UnsignedWordElement(30126),
 								ElementToChannelConverter.SCALE_FACTOR_2,
 								new ChannelMetaInfoReadAndWrite(30126, 30526)), //
-						m(FeneconMiniEss.ChannelId.GRID_MAX_DISCHARGE_CURRENT, new UnsignedWordElement(30127),
+						this.m(FeneconMiniEss.ChannelId.GRID_MAX_DISCHARGE_CURRENT, new UnsignedWordElement(30127),
 								ElementToChannelConverter.SCALE_FACTOR_2,
 								new ChannelMetaInfoReadAndWrite(30127, 30527)), //
 						new DummyRegisterElement(30128, 30156), //
-						m(FeneconMiniEss.ChannelId.SETUP_MODE, new UnsignedWordElement(30157),
+						this.m(FeneconMiniEss.ChannelId.SETUP_MODE, new UnsignedWordElement(30157),
 								new ChannelMetaInfoReadAndWrite(30157, 30558)), //
-						m(FeneconMiniEss.ChannelId.PCS_MODE, new UnsignedWordElement(30158),
+						this.m(FeneconMiniEss.ChannelId.PCS_MODE, new UnsignedWordElement(30158),
 								new ChannelMetaInfoReadAndWrite(30158, 30559)), //
 						new DummyRegisterElement(30159, 30165), //
-						m(SymmetricEss.ChannelId.GRID_MODE, new UnsignedWordElement(30166),
+						this.m(SymmetricEss.ChannelId.GRID_MODE, new UnsignedWordElement(30166),
 								new ElementToChannelConverter(
 										// element -> channel
 										value -> {
-											Integer intValue = TypeUtils.<Integer>getAsType(OpenemsType.INTEGER, value);
+											var intValue = TypeUtils.<Integer>getAsType(OpenemsType.INTEGER, value);
 											if (intValue != null) {
 												switch (intValue) {
 												case 0:
@@ -503,9 +504,9 @@ protected ModbusProtocol defineModbusProtocol() throws OpenemsException {
 										value -> value))), //
 
 				new FC3ReadRegistersTask(2992, Priority.LOW, //
-						m(FeneconMiniEss.ChannelId.DEBUG_RUN_STATE, new UnsignedWordElement(2992))), //
+						this.m(FeneconMiniEss.ChannelId.DEBUG_RUN_STATE, new UnsignedWordElement(2992))), //
 				new FC16WriteRegistersTask(2992, //
-						m(FeneconMiniEss.ChannelId.DEBUG_RUN_STATE, new UnsignedWordElement(2992))) //
+						this.m(FeneconMiniEss.ChannelId.DEBUG_RUN_STATE, new UnsignedWordElement(2992))) //
 		);//
 	}
 
@@ -514,13 +515,12 @@ public String debugLog() {
 		if (this.config == null || this.config.readonly()) {
 			return "SoC:" + this.getSoc().asString() //
 					+ "|L:" + this.getActivePower().asString(); //
-		} else {
-			return "SoC:" + this.getSoc().asString() //
-					+ "|L:" + this.getActivePower().asString() //
-					+ "|Allowed:" + this.getAllowedChargePower().asStringWithoutUnit() + ";"
-					+ this.getAllowedDischargePower().asString() //
-					+ "|" + this.channel(FeneconMiniEss.ChannelId.STATE_MACHINE).value().asEnum().asCamelCase();
 		}
+		return "SoC:" + this.getSoc().asString() //
+				+ "|L:" + this.getActivePower().asString() //
+				+ "|Allowed:" + this.getAllowedChargePower().asStringWithoutUnit() + ";"
+				+ this.getAllowedDischargePower().asString() //
+				+ "|" + this.channel(FeneconMiniEss.ChannelId.STATE_MACHINE).value().asEnum().asCamelCase();
 	}
 
 	@Override
@@ -562,7 +562,7 @@ public void applyPower(int activePower, int reactivePower) throws OpenemsNamedEx
 		this.channel(FeneconMiniEss.ChannelId.STATE_MACHINE).setNextValue(this.stateMachine.getCurrentState());
 
 		// Prepare Context
-		Context context = new Context(this, this.config, activePower, reactivePower);
+		var context = new Context(this, this.config, activePower, reactivePower);
 
 		// Call the StateMachine
 		try {
@@ -589,7 +589,8 @@ public Constraint[] getStaticConstraints() throws OpenemsNamedException {
 					this.createPowerConstraint("Read-Only-Mode", Phase.ALL, Pwr.REACTIVE, Relationship.EQUALS, 0) //
 			};
 
-		} else if (this.stateMachine.getCurrentState() == State.WRITE_MODE) {
+		}
+		if (this.stateMachine.getCurrentState() == State.WRITE_MODE) {
 			return new Constraint[] { //
 					this.createPowerConstraint("No reactive power", Phase.ALL, Pwr.REACTIVE, Relationship.EQUALS, 0) //
 			};
@@ -622,7 +623,7 @@ public void handleEvent(Event event) {
 	 */
 	private void calculateEnergy() {
 		// Calculate Energy
-		Integer activePower = this.getActivePower().get();
+		var activePower = this.getActivePower().get();
 		if (activePower == null) {
 			// Not available
 			this.calculateChargeEnergy.update(null);
diff --git a/io.openems.edge.fenecon.mini/src/io/openems/edge/fenecon/mini/ess/MaxApparentPowerHandler.java b/io.openems.edge.fenecon.mini/src/io/openems/edge/fenecon/mini/ess/MaxApparentPowerHandler.java
index a5999891a29..946bb91f2ca 100644
--- a/io.openems.edge.fenecon.mini/src/io/openems/edge/fenecon/mini/ess/MaxApparentPowerHandler.java
+++ b/io.openems.edge.fenecon.mini/src/io/openems/edge/fenecon/mini/ess/MaxApparentPowerHandler.java
@@ -19,8 +19,8 @@ public MaxApparentPowerHandler(FeneconMiniEssImpl parent) {
 	}
 
 	public void calculateMaxApparentPower() {
-		Integer setPower = this.parent.getDebugSetActivePower().get();
-		Integer power = this.parent.getActivePower().get();
+		var setPower = this.parent.getDebugSetActivePower().get();
+		var power = this.parent.getActivePower().get();
 		int oldMaxApparentPower = this.parent.getMaxApparentPower().orElse(FeneconMiniEss.MAX_APPARENT_POWER);
 
 		if (setPower == null || power == null) {
@@ -32,8 +32,8 @@ public void calculateMaxApparentPower() {
 		/*
 		 * Evaluate if power and setPower are within delta.
 		 */
-		if (/* Discharge */ (setPower > 0 && setPower - MAX_DELTA > power) //
-				|| /* Charge */ (setPower < 0 && setPower + MAX_DELTA < power)) {
+		if (/* Discharge */ setPower > 0 && setPower - MAX_DELTA > power //
+				|| /* Charge */ setPower < 0 && setPower + MAX_DELTA < power) {
 			// Exceeded MaxDelta
 			this.exceededCounter++;
 			this.withinCounter = 0;
diff --git a/io.openems.edge.fenecon.mini/src/io/openems/edge/fenecon/mini/ess/statemachine/ActivateDebugMode1Handler.java b/io.openems.edge.fenecon.mini/src/io/openems/edge/fenecon/mini/ess/statemachine/ActivateDebugMode1Handler.java
index af87f510e13..b9a58854d86 100644
--- a/io.openems.edge.fenecon.mini/src/io/openems/edge/fenecon/mini/ess/statemachine/ActivateDebugMode1Handler.java
+++ b/io.openems.edge.fenecon.mini/src/io/openems/edge/fenecon/mini/ess/statemachine/ActivateDebugMode1Handler.java
@@ -5,7 +5,6 @@
 
 import io.openems.common.exceptions.OpenemsError.OpenemsNamedException;
 import io.openems.edge.common.statemachine.StateHandler;
-import io.openems.edge.fenecon.mini.ess.FeneconMiniEss;
 import io.openems.edge.fenecon.mini.ess.SetupMode;
 import io.openems.edge.fenecon.mini.ess.statemachine.StateMachine.State;
 
@@ -15,8 +14,8 @@ public class ActivateDebugMode1Handler extends StateHandler<State, Context> {
 
 	@Override
 	public State runAndGetNextState(Context context) throws OpenemsNamedException {
-		FeneconMiniEss ess = context.getParent();
-		
+		var ess = context.getParent();
+
 		if (ess.getSetupMode() != SetupMode.ON) {
 			context.logInfo(this.log, "Activate Readonly-Mode: Set Setup-Mode ON");
 			ess.setSetupMode(SetupMode.ON);
diff --git a/io.openems.edge.fenecon.mini/src/io/openems/edge/fenecon/mini/ess/statemachine/ActivateDebugMode2Handler.java b/io.openems.edge.fenecon.mini/src/io/openems/edge/fenecon/mini/ess/statemachine/ActivateDebugMode2Handler.java
index 7e0f79b8a26..60e0aa51d1e 100644
--- a/io.openems.edge.fenecon.mini/src/io/openems/edge/fenecon/mini/ess/statemachine/ActivateDebugMode2Handler.java
+++ b/io.openems.edge.fenecon.mini/src/io/openems/edge/fenecon/mini/ess/statemachine/ActivateDebugMode2Handler.java
@@ -5,7 +5,6 @@
 
 import io.openems.common.exceptions.OpenemsError.OpenemsNamedException;
 import io.openems.edge.common.statemachine.StateHandler;
-import io.openems.edge.fenecon.mini.ess.FeneconMiniEss;
 import io.openems.edge.fenecon.mini.ess.PcsMode;
 import io.openems.edge.fenecon.mini.ess.SetupMode;
 import io.openems.edge.fenecon.mini.ess.statemachine.StateMachine.State;
@@ -16,7 +15,7 @@ public class ActivateDebugMode2Handler extends StateHandler<State, Context> {
 
 	@Override
 	public State runAndGetNextState(Context context) throws OpenemsNamedException {
-		FeneconMiniEss ess = context.getParent();
+		var ess = context.getParent();
 
 		if (ess.getSetupMode() != SetupMode.ON) {
 			context.logInfo(this.log, "Wait for Setup-Mode ON");
diff --git a/io.openems.edge.fenecon.mini/src/io/openems/edge/fenecon/mini/ess/statemachine/ActivateDebugMode3Handler.java b/io.openems.edge.fenecon.mini/src/io/openems/edge/fenecon/mini/ess/statemachine/ActivateDebugMode3Handler.java
index 2995e5eaa81..71bafa6927a 100644
--- a/io.openems.edge.fenecon.mini/src/io/openems/edge/fenecon/mini/ess/statemachine/ActivateDebugMode3Handler.java
+++ b/io.openems.edge.fenecon.mini/src/io/openems/edge/fenecon/mini/ess/statemachine/ActivateDebugMode3Handler.java
@@ -5,7 +5,6 @@
 
 import io.openems.common.exceptions.OpenemsError.OpenemsNamedException;
 import io.openems.edge.common.statemachine.StateHandler;
-import io.openems.edge.fenecon.mini.ess.FeneconMiniEss;
 import io.openems.edge.fenecon.mini.ess.PcsMode;
 import io.openems.edge.fenecon.mini.ess.SetupMode;
 import io.openems.edge.fenecon.mini.ess.statemachine.StateMachine.State;
@@ -16,7 +15,7 @@ public class ActivateDebugMode3Handler extends StateHandler<State, Context> {
 
 	@Override
 	public State runAndGetNextState(Context context) throws OpenemsNamedException {
-		FeneconMiniEss ess = context.getParent();
+		var ess = context.getParent();
 
 		if (ess.getPcsMode() != PcsMode.DEBUG) {
 			context.logInfo(this.log, "Wait for PCS-Mode DEBUG");
diff --git a/io.openems.edge.fenecon.mini/src/io/openems/edge/fenecon/mini/ess/statemachine/ActivateDebugMode4Handler.java b/io.openems.edge.fenecon.mini/src/io/openems/edge/fenecon/mini/ess/statemachine/ActivateDebugMode4Handler.java
index 4f35c339e66..751b10d12eb 100644
--- a/io.openems.edge.fenecon.mini/src/io/openems/edge/fenecon/mini/ess/statemachine/ActivateDebugMode4Handler.java
+++ b/io.openems.edge.fenecon.mini/src/io/openems/edge/fenecon/mini/ess/statemachine/ActivateDebugMode4Handler.java
@@ -5,7 +5,6 @@
 
 import io.openems.common.exceptions.OpenemsError.OpenemsNamedException;
 import io.openems.edge.common.statemachine.StateHandler;
-import io.openems.edge.fenecon.mini.ess.FeneconMiniEss;
 import io.openems.edge.fenecon.mini.ess.SetupMode;
 import io.openems.edge.fenecon.mini.ess.statemachine.StateMachine.State;
 
@@ -15,7 +14,7 @@ public class ActivateDebugMode4Handler extends StateHandler<State, Context> {
 
 	@Override
 	public State runAndGetNextState(Context context) throws OpenemsNamedException {
-		FeneconMiniEss ess = context.getParent();
+		var ess = context.getParent();
 
 		if (ess.getSetupMode() != SetupMode.OFF) {
 			context.logInfo(this.log, "Wait for Setup-Mode OFF");
diff --git a/io.openems.edge.fenecon.mini/src/io/openems/edge/fenecon/mini/ess/statemachine/ActivateEconomicMode1Handler.java b/io.openems.edge.fenecon.mini/src/io/openems/edge/fenecon/mini/ess/statemachine/ActivateEconomicMode1Handler.java
index cd415525539..380098f4292 100644
--- a/io.openems.edge.fenecon.mini/src/io/openems/edge/fenecon/mini/ess/statemachine/ActivateEconomicMode1Handler.java
+++ b/io.openems.edge.fenecon.mini/src/io/openems/edge/fenecon/mini/ess/statemachine/ActivateEconomicMode1Handler.java
@@ -5,7 +5,6 @@
 
 import io.openems.common.exceptions.OpenemsError.OpenemsNamedException;
 import io.openems.edge.common.statemachine.StateHandler;
-import io.openems.edge.fenecon.mini.ess.FeneconMiniEss;
 import io.openems.edge.fenecon.mini.ess.SetupMode;
 import io.openems.edge.fenecon.mini.ess.statemachine.StateMachine.State;
 
@@ -15,7 +14,7 @@ public class ActivateEconomicMode1Handler extends StateHandler<State, Context> {
 
 	@Override
 	public State runAndGetNextState(Context context) throws OpenemsNamedException {
-		FeneconMiniEss ess = context.getParent();
+		var ess = context.getParent();
 
 		if (ess.getSetupMode() != SetupMode.ON) {
 			context.logInfo(this.log, "Activate Debug-Mode: Set Setup-Mode ON");
diff --git a/io.openems.edge.fenecon.mini/src/io/openems/edge/fenecon/mini/ess/statemachine/ActivateEconomicMode2Handler.java b/io.openems.edge.fenecon.mini/src/io/openems/edge/fenecon/mini/ess/statemachine/ActivateEconomicMode2Handler.java
index 8c7aff0e477..ce2ca69c73c 100644
--- a/io.openems.edge.fenecon.mini/src/io/openems/edge/fenecon/mini/ess/statemachine/ActivateEconomicMode2Handler.java
+++ b/io.openems.edge.fenecon.mini/src/io/openems/edge/fenecon/mini/ess/statemachine/ActivateEconomicMode2Handler.java
@@ -5,7 +5,6 @@
 
 import io.openems.common.exceptions.OpenemsError.OpenemsNamedException;
 import io.openems.edge.common.statemachine.StateHandler;
-import io.openems.edge.fenecon.mini.ess.FeneconMiniEss;
 import io.openems.edge.fenecon.mini.ess.PcsMode;
 import io.openems.edge.fenecon.mini.ess.SetupMode;
 import io.openems.edge.fenecon.mini.ess.statemachine.StateMachine.State;
@@ -16,7 +15,7 @@ public class ActivateEconomicMode2Handler extends StateHandler<State, Context> {
 
 	@Override
 	public State runAndGetNextState(Context context) throws OpenemsNamedException {
-		FeneconMiniEss ess = context.getParent();
+		var ess = context.getParent();
 
 		if (ess.getSetupMode() != SetupMode.ON) {
 			context.logInfo(this.log, "Wait for Setup-Mode ON");
diff --git a/io.openems.edge.fenecon.mini/src/io/openems/edge/fenecon/mini/ess/statemachine/ActivateEconomicMode3Handler.java b/io.openems.edge.fenecon.mini/src/io/openems/edge/fenecon/mini/ess/statemachine/ActivateEconomicMode3Handler.java
index 1ecfbe43e5d..7397d0ed1f6 100644
--- a/io.openems.edge.fenecon.mini/src/io/openems/edge/fenecon/mini/ess/statemachine/ActivateEconomicMode3Handler.java
+++ b/io.openems.edge.fenecon.mini/src/io/openems/edge/fenecon/mini/ess/statemachine/ActivateEconomicMode3Handler.java
@@ -5,7 +5,6 @@
 
 import io.openems.common.exceptions.OpenemsError.OpenemsNamedException;
 import io.openems.edge.common.statemachine.StateHandler;
-import io.openems.edge.fenecon.mini.ess.FeneconMiniEss;
 import io.openems.edge.fenecon.mini.ess.PcsMode;
 import io.openems.edge.fenecon.mini.ess.SetupMode;
 import io.openems.edge.fenecon.mini.ess.statemachine.StateMachine.State;
@@ -16,7 +15,7 @@ public class ActivateEconomicMode3Handler extends StateHandler<State, Context> {
 
 	@Override
 	public State runAndGetNextState(Context context) throws OpenemsNamedException {
-		FeneconMiniEss ess = context.getParent();
+		var ess = context.getParent();
 
 		if (ess.getPcsMode() != PcsMode.ECONOMIC) {
 			context.logInfo(this.log, "Wait for PCS-Mode ECONOMIC");
diff --git a/io.openems.edge.fenecon.mini/src/io/openems/edge/fenecon/mini/ess/statemachine/ActivateEconomicMode4Handler.java b/io.openems.edge.fenecon.mini/src/io/openems/edge/fenecon/mini/ess/statemachine/ActivateEconomicMode4Handler.java
index 6fe885d5b64..338cbf3048a 100644
--- a/io.openems.edge.fenecon.mini/src/io/openems/edge/fenecon/mini/ess/statemachine/ActivateEconomicMode4Handler.java
+++ b/io.openems.edge.fenecon.mini/src/io/openems/edge/fenecon/mini/ess/statemachine/ActivateEconomicMode4Handler.java
@@ -5,7 +5,6 @@
 
 import io.openems.common.exceptions.OpenemsError.OpenemsNamedException;
 import io.openems.edge.common.statemachine.StateHandler;
-import io.openems.edge.fenecon.mini.ess.FeneconMiniEss;
 import io.openems.edge.fenecon.mini.ess.SetupMode;
 import io.openems.edge.fenecon.mini.ess.statemachine.StateMachine.State;
 
@@ -15,7 +14,7 @@ public class ActivateEconomicMode4Handler extends StateHandler<State, Context> {
 
 	@Override
 	public State runAndGetNextState(Context context) throws OpenemsNamedException {
-		FeneconMiniEss ess = context.getParent();
+		var ess = context.getParent();
 
 		if (ess.getSetupMode() != SetupMode.OFF) {
 			context.logInfo(this.log, "Wait for Setup-Mode OFF");
diff --git a/io.openems.edge.fenecon.mini/src/io/openems/edge/fenecon/mini/ess/statemachine/GoWriteModeHandler.java b/io.openems.edge.fenecon.mini/src/io/openems/edge/fenecon/mini/ess/statemachine/GoWriteModeHandler.java
index b6a65949b48..62a202477fb 100644
--- a/io.openems.edge.fenecon.mini/src/io/openems/edge/fenecon/mini/ess/statemachine/GoWriteModeHandler.java
+++ b/io.openems.edge.fenecon.mini/src/io/openems/edge/fenecon/mini/ess/statemachine/GoWriteModeHandler.java
@@ -5,7 +5,6 @@
 
 import io.openems.common.exceptions.OpenemsError.OpenemsNamedException;
 import io.openems.edge.common.statemachine.StateHandler;
-import io.openems.edge.fenecon.mini.ess.FeneconMiniEss;
 import io.openems.edge.fenecon.mini.ess.PcsMode;
 import io.openems.edge.fenecon.mini.ess.SetupMode;
 import io.openems.edge.fenecon.mini.ess.statemachine.StateMachine.State;
@@ -16,7 +15,7 @@ public class GoWriteModeHandler extends StateHandler<State, Context> {
 
 	@Override
 	public State runAndGetNextState(Context context) throws OpenemsNamedException {
-		FeneconMiniEss ess = context.getParent();
+		var ess = context.getParent();
 
 		if (ess.getPcsMode() == PcsMode.UNDEFINED) {
 			context.logInfo(this.log, "Wait for PCS Mode to be defined");
diff --git a/io.openems.edge.fenecon.mini/src/io/openems/edge/fenecon/mini/ess/statemachine/UndefinedHandler.java b/io.openems.edge.fenecon.mini/src/io/openems/edge/fenecon/mini/ess/statemachine/UndefinedHandler.java
index 2e55a83de27..4f04aaa3baa 100644
--- a/io.openems.edge.fenecon.mini/src/io/openems/edge/fenecon/mini/ess/statemachine/UndefinedHandler.java
+++ b/io.openems.edge.fenecon.mini/src/io/openems/edge/fenecon/mini/ess/statemachine/UndefinedHandler.java
@@ -4,7 +4,6 @@
 import org.slf4j.LoggerFactory;
 
 import io.openems.edge.common.statemachine.StateHandler;
-import io.openems.edge.fenecon.mini.ess.FeneconMiniEss;
 import io.openems.edge.fenecon.mini.ess.PcsMode;
 import io.openems.edge.fenecon.mini.ess.SetupMode;
 import io.openems.edge.fenecon.mini.ess.statemachine.StateMachine.State;
@@ -15,7 +14,7 @@ public class UndefinedHandler extends StateHandler<State, Context> {
 
 	@Override
 	public State runAndGetNextState(Context context) {
-		FeneconMiniEss ess = context.getParent();
+		var ess = context.getParent();
 
 		if (ess.getPcsMode() == PcsMode.UNDEFINED) {
 			context.logInfo(this.log, "Wait for PCS Mode to be defined");
@@ -28,9 +27,8 @@ public State runAndGetNextState(Context context) {
 
 		if (context.config.readonly()) {
 			return State.GO_READONLY_MODE;
-		} else {
-			return State.GO_WRITE_MODE;
 		}
+		return State.GO_WRITE_MODE;
 	}
 
 }
diff --git a/io.openems.edge.fenecon.mini/src/io/openems/edge/fenecon/mini/ess/statemachine/WriteModeHandler.java b/io.openems.edge.fenecon.mini/src/io/openems/edge/fenecon/mini/ess/statemachine/WriteModeHandler.java
index bace6ed22d5..cdd946690df 100644
--- a/io.openems.edge.fenecon.mini/src/io/openems/edge/fenecon/mini/ess/statemachine/WriteModeHandler.java
+++ b/io.openems.edge.fenecon.mini/src/io/openems/edge/fenecon/mini/ess/statemachine/WriteModeHandler.java
@@ -3,7 +3,6 @@
 import io.openems.common.exceptions.OpenemsError.OpenemsNamedException;
 import io.openems.edge.common.statemachine.StateHandler;
 import io.openems.edge.fenecon.mini.ess.DebugRunState;
-import io.openems.edge.fenecon.mini.ess.FeneconMiniEss;
 import io.openems.edge.fenecon.mini.ess.statemachine.StateMachine.State;
 
 public class WriteModeHandler extends StateHandler<State, Context> {
@@ -18,15 +17,15 @@ public State runAndGetNextState(Context context) throws OpenemsNamedException {
 
 	/**
 	 * Applies the Active and Reactive Power Set-Points.
-	 * 
+	 *
 	 * @param context the {@link Context}
 	 * @throws OpenemsNamedException on error
 	 */
 	private void applyPower(Context context) throws OpenemsNamedException {
-		FeneconMiniEss ess = context.getParent();
+		var ess = context.getParent();
 
 		// Set correct Debug Run State
-		DebugRunState runState = ess.getDebugRunState();
+		var runState = ess.getDebugRunState();
 		if (context.setActivePower > 0 && runState != DebugRunState.DISCHARGE) {
 			ess.setDebugRunState(DebugRunState.DISCHARGE);
 		} else if (context.setActivePower < 0 && runState != DebugRunState.CHARGE) {
@@ -34,9 +33,9 @@ private void applyPower(Context context) throws OpenemsNamedException {
 		}
 
 		// Adjust Active Power
-		int power = WriteModeHandler.adjustActivePower(context.setActivePower);
+		var power = WriteModeHandler.adjustActivePower(context.setActivePower);
 
-		int current = Math.round((power / 230F) * 1000); // [mA]
+		var current = Math.round(power / 230F * 1000); // [mA]
 
 		if (context.setActivePower >= 0) {
 			// Set Discharge & no Charge
@@ -60,14 +59,15 @@ private void applyPower(Context context) throws OpenemsNamedException {
 	/**
 	 * Converts the ActivePower Set-Point to a value found by experimenting with the
 	 * system.
-	 * 
+	 *
 	 * @param p the Set-Point (negative for charge; positive for discharge)
 	 * @return the adjusted Set-Point (always positive)
 	 */
 	private static int adjustActivePower(int p) {
 		if (p == 0) {
 			return 0;
-		} else if (p > 0) {
+		}
+		if (p > 0) {
 			// discharge
 			if (p < 70) {
 				return 90;
@@ -87,7 +87,7 @@ private static int adjustActivePower(int p) {
 				return 200;
 			} else {
 				float m = 75 / 2800;
-				float t = 125;
+				var t = 125F;
 				return Math.round(p + m * p + t);
 			}
 		}
diff --git a/io.openems.edge.fenecon.mini/src/io/openems/edge/fenecon/mini/gridmeter/FeneconMiniGridMeterImpl.java b/io.openems.edge.fenecon.mini/src/io/openems/edge/fenecon/mini/gridmeter/FeneconMiniGridMeterImpl.java
index 735c208a435..61ed290c40d 100644
--- a/io.openems.edge.fenecon.mini/src/io/openems/edge/fenecon/mini/gridmeter/FeneconMiniGridMeterImpl.java
+++ b/io.openems.edge.fenecon.mini/src/io/openems/edge/fenecon/mini/gridmeter/FeneconMiniGridMeterImpl.java
@@ -57,6 +57,7 @@ public class FeneconMiniGridMeterImpl extends AbstractOpenemsModbusComponent imp
 	private final CalculateEnergyFromPower calculateConsumptionEnergy = new CalculateEnergyFromPower(this,
 			SymmetricMeter.ChannelId.ACTIVE_CONSUMPTION_ENERGY);
 
+	@Override
 	@Reference(policy = ReferencePolicy.STATIC, policyOption = ReferencePolicyOption.GREEDY, cardinality = ReferenceCardinality.MANDATORY)
 	protected void setModbus(BridgeModbus modbus) {
 		super.setModbus(modbus);
@@ -75,10 +76,10 @@ public FeneconMiniGridMeterImpl() {
 	void activate(ComponentContext context, Config config) throws OpenemsException {
 		if (super.activate(context, config.id(), config.alias(), config.enabled(), FeneconMiniConstants.UNIT_ID,
 				this.cm, "Modbus", config.modbus_id())) {
-			return;
 		}
 	}
 
+	@Override
 	@Deactivate
 	protected void deactivate() {
 		super.deactivate();
@@ -88,10 +89,10 @@ protected void deactivate() {
 	protected ModbusProtocol defineModbusProtocol() throws OpenemsException {
 		return new ModbusProtocol(this, //
 				new FC3ReadRegistersTask(4004, Priority.HIGH, //
-						m(SymmetricMeter.ChannelId.ACTIVE_POWER, new SignedWordElement(4004),
+						this.m(SymmetricMeter.ChannelId.ACTIVE_POWER, new SignedWordElement(4004),
 								SIGNED_POWER_CONVERTER_AND_INVERT)), //
 				new FC3ReadRegistersTask(4811, Priority.LOW, //
-						m(new BitsWordElement(4811, this) //
+						this.m(new BitsWordElement(4811, this) //
 								.bit(13, FeneconMiniGridMeter.ChannelId.COMMUNICATION_BREAK))) //
 		);
 	}
@@ -133,7 +134,7 @@ public void handleEvent(Event event) {
 	 */
 	private void calculateEnergy() {
 		// Calculate Energy
-		Integer activePower = this.getActivePower().get();
+		var activePower = this.getActivePower().get();
 		if (activePower == null) {
 			// Not available
 			this.calculateProductionEnergy.update(null);
diff --git a/io.openems.edge.fenecon.mini/src/io/openems/edge/fenecon/mini/pvmeter/FeneconMiniPvMeterImpl.java b/io.openems.edge.fenecon.mini/src/io/openems/edge/fenecon/mini/pvmeter/FeneconMiniPvMeterImpl.java
index e39b5265818..40c2f514af0 100644
--- a/io.openems.edge.fenecon.mini/src/io/openems/edge/fenecon/mini/pvmeter/FeneconMiniPvMeterImpl.java
+++ b/io.openems.edge.fenecon.mini/src/io/openems/edge/fenecon/mini/pvmeter/FeneconMiniPvMeterImpl.java
@@ -47,6 +47,7 @@ public class FeneconMiniPvMeterImpl extends AbstractOpenemsModbusComponent imple
 	@Reference
 	protected ConfigurationAdmin cm;
 
+	@Override
 	@Reference(policy = ReferencePolicy.STATIC, policyOption = ReferencePolicyOption.GREEDY, cardinality = ReferenceCardinality.MANDATORY)
 	protected void setModbus(BridgeModbus modbus) {
 		super.setModbus(modbus);
@@ -71,10 +72,10 @@ public FeneconMiniPvMeterImpl() {
 	void activate(ComponentContext context, Config config) throws OpenemsException {
 		if (super.activate(context, config.id(), config.alias(), config.enabled(), FeneconMiniConstants.UNIT_ID,
 				this.cm, "Modbus", config.modbus_id())) {
-			return;
 		}
 	}
 
+	@Override
 	@Deactivate
 	protected void deactivate() {
 		super.deactivate();
@@ -84,7 +85,7 @@ protected void deactivate() {
 	protected ModbusProtocol defineModbusProtocol() throws OpenemsException {
 		return new ModbusProtocol(this, //
 				new FC3ReadRegistersTask(4006, Priority.HIGH, //
-						m(SymmetricMeter.ChannelId.ACTIVE_POWER, new UnsignedWordElement(4006))));
+						this.m(SymmetricMeter.ChannelId.ACTIVE_POWER, new UnsignedWordElement(4006))));
 	}
 
 	@Override
@@ -111,7 +112,7 @@ public void handleEvent(Event event) {
 	 */
 	private void calculateEnergy() {
 		// Calculate Energy
-		Integer activePower = this.getActivePower().get();
+		var activePower = this.getActivePower().get();
 		if (activePower == null) {
 			// Not available
 			this.calculateProductionEnergy.update(null);
diff --git a/io.openems.edge.fenecon.mini/test/io/openems/edge/fenecon/mini/ess/FeneconMiniEssImplTest.java b/io.openems.edge.fenecon.mini/test/io/openems/edge/fenecon/mini/ess/FeneconMiniEssImplTest.java
index 5e56a0c884c..7535b25a0c3 100644
--- a/io.openems.edge.fenecon.mini/test/io/openems/edge/fenecon/mini/ess/FeneconMiniEssImplTest.java
+++ b/io.openems.edge.fenecon.mini/test/io/openems/edge/fenecon/mini/ess/FeneconMiniEssImplTest.java
@@ -23,7 +23,7 @@ public class FeneconMiniEssImplTest {
 
 	/**
 	 * Tests activating write-mode when it was not activated before.
-	 * 
+	 *
 	 * @throws Exception on error
 	 */
 	@Test
@@ -64,7 +64,7 @@ public void testWriteModeSet() throws Exception {
 
 	/**
 	 * Tests restarting with activated write-mode.
-	 * 
+	 *
 	 * @throws Exception on error
 	 */
 	@Test
@@ -92,7 +92,7 @@ public void testWriteModeAlreadySet() throws Exception {
 
 	/**
 	 * Tests activating readonly-mode when it was not activated before.
-	 * 
+	 *
 	 * @throws Exception on error
 	 */
 	@Test
@@ -133,7 +133,7 @@ public void testReadonlyModeSet() throws Exception {
 
 	/**
 	 * Tests restarting with activated readonly-mode.
-	 * 
+	 *
 	 * @throws Exception on error
 	 */
 	@Test
diff --git a/io.openems.edge.fenecon.mini/test/io/openems/edge/fenecon/mini/ess/MyConfig.java b/io.openems.edge.fenecon.mini/test/io/openems/edge/fenecon/mini/ess/MyConfig.java
index e609216d38b..064bd8d228d 100644
--- a/io.openems.edge.fenecon.mini/test/io/openems/edge/fenecon/mini/ess/MyConfig.java
+++ b/io.openems.edge.fenecon.mini/test/io/openems/edge/fenecon/mini/ess/MyConfig.java
@@ -44,7 +44,7 @@ public MyConfig build() {
 
 	/**
 	 * Create a Config builder.
-	 * 
+	 *
 	 * @return a {@link Builder}
 	 */
 	public static Builder create() {
diff --git a/io.openems.edge.fenecon.mini/test/io/openems/edge/fenecon/mini/gridmeter/MyConfig.java b/io.openems.edge.fenecon.mini/test/io/openems/edge/fenecon/mini/gridmeter/MyConfig.java
index 34af9175968..e2dac3d2701 100644
--- a/io.openems.edge.fenecon.mini/test/io/openems/edge/fenecon/mini/gridmeter/MyConfig.java
+++ b/io.openems.edge.fenecon.mini/test/io/openems/edge/fenecon/mini/gridmeter/MyConfig.java
@@ -30,7 +30,7 @@ public MyConfig build() {
 
 	/**
 	 * Create a Config builder.
-	 * 
+	 *
 	 * @return a {@link Builder}
 	 */
 	public static Builder create() {
diff --git a/io.openems.edge.fenecon.mini/test/io/openems/edge/fenecon/mini/pvmeter/MyConfig.java b/io.openems.edge.fenecon.mini/test/io/openems/edge/fenecon/mini/pvmeter/MyConfig.java
index 63ff2e53052..4761b01ed41 100644
--- a/io.openems.edge.fenecon.mini/test/io/openems/edge/fenecon/mini/pvmeter/MyConfig.java
+++ b/io.openems.edge.fenecon.mini/test/io/openems/edge/fenecon/mini/pvmeter/MyConfig.java
@@ -30,7 +30,7 @@ public MyConfig build() {
 
 	/**
 	 * Create a Config builder.
-	 * 
+	 *
 	 * @return a {@link Builder}
 	 */
 	public static Builder create() {

From fdd584054c7afd655b429c0245131a413df43b07 Mon Sep 17 00:00:00 2001
From: Stefan Feilmeier <stefan.feilmeier@fenecon.de>
Date: Tue, 8 Mar 2022 12:42:04 +0100
Subject: [PATCH 73/96] Update io.openems.edge.fenecon.pro

---
 .../fenecon/pro/ess/BatteryGroupState.java    |  2 +-
 .../edge/fenecon/pro/ess/FeneconProEss.java   | 17 ++++++++--------
 .../pro/ess/MaxApparentPowerHandler.java      |  8 ++++----
 .../edge/fenecon/pro/ess/ProChannelId.java    |  2 +-
 .../edge/fenecon/pro/ess/SetWorkState.java    |  2 +-
 .../edge/fenecon/pro/ess/SystemState.java     |  2 +-
 .../pro/pvmeter/FeneconProPvMeter.java        | 20 ++++++++++---------
 .../edge/fenecon/pro/ess/MyConfig.java        |  2 +-
 .../edge/fenecon/pro/pvmeter/MyConfig.java    |  2 +-
 9 files changed, 29 insertions(+), 28 deletions(-)

diff --git a/io.openems.edge.fenecon.pro/src/io/openems/edge/fenecon/pro/ess/BatteryGroupState.java b/io.openems.edge.fenecon.pro/src/io/openems/edge/fenecon/pro/ess/BatteryGroupState.java
index 044ad0ad008..f66bf216602 100644
--- a/io.openems.edge.fenecon.pro/src/io/openems/edge/fenecon/pro/ess/BatteryGroupState.java
+++ b/io.openems.edge.fenecon.pro/src/io/openems/edge/fenecon/pro/ess/BatteryGroupState.java
@@ -10,7 +10,7 @@ public enum BatteryGroupState implements OptionsEnum {
 	RUNNING(3, "Running"), //
 	STOPPING(4, "Stopping"), //
 	FAIL(5, "Fail");
-	
+
 	private final int value;
 	private final String name;
 
diff --git a/io.openems.edge.fenecon.pro/src/io/openems/edge/fenecon/pro/ess/FeneconProEss.java b/io.openems.edge.fenecon.pro/src/io/openems/edge/fenecon/pro/ess/FeneconProEss.java
index 29ca60a3cc0..d4a94112e05 100644
--- a/io.openems.edge.fenecon.pro/src/io/openems/edge/fenecon/pro/ess/FeneconProEss.java
+++ b/io.openems.edge.fenecon.pro/src/io/openems/edge/fenecon/pro/ess/FeneconProEss.java
@@ -103,6 +103,7 @@ public void applyPower(int activePowerL1, int reactivePowerL1, int activePowerL2
 		this.getSetReactivePowerL3Channel().setNextWriteValue(reactivePowerL3);
 	}
 
+	@Override
 	@Reference(policy = ReferencePolicy.STATIC, policyOption = ReferencePolicyOption.GREEDY, cardinality = ReferenceCardinality.MANDATORY)
 	protected void setModbus(BridgeModbus modbus) {
 		super.setModbus(modbus);
@@ -117,6 +118,7 @@ void activate(ComponentContext context, Config config) throws OpenemsException {
 		this.modbusBridgeId = config.modbus_id();
 	}
 
+	@Override
 	@Deactivate
 	protected void deactivate() {
 		super.deactivate();
@@ -152,9 +154,8 @@ protected ModbusProtocol defineModbusProtocol() throws OpenemsException {
 									if (soc > 95 && allowedCharge.value().orElse(-1) == 0
 											&& allowedDischarge.value().orElse(0) != 0) {
 										return 100;
-									} else {
-										return value;
 									}
+									return value;
 								}, // channel -> element
 								value -> value)), //
 						m(ProChannelId.BATTERY_VOLTAGE, new UnsignedWordElement(110),
@@ -557,13 +558,11 @@ private void activateRemoteMode() {
 					this.logInfo(this.log, "Setting PCS-Mode to 'Remote'");
 					this.getPcsModeChannel().setNextWriteValue(PcsMode.REMOTE);
 				}
-			} else {
-				// If Mode is "Remote" and SetupMode is active
-				if (this.getSetupMode() == SetupMode.ON) {
-					// Deactivate SetupMode
-					this.logInfo(this.log, "Deactivating Setup-Mode");
-					this.getSetupModeChannel().setNextWriteValue(SetupMode.OFF);
-				}
+			} else // If Mode is "Remote" and SetupMode is active
+			if (this.getSetupMode() == SetupMode.ON) {
+				// Deactivate SetupMode
+				this.logInfo(this.log, "Deactivating Setup-Mode");
+				this.getSetupModeChannel().setNextWriteValue(SetupMode.OFF);
 			}
 		} catch (OpenemsNamedException e) {
 			this.logError(this.log, "Unable to activate Remote-Mode: " + e.getMessage());
diff --git a/io.openems.edge.fenecon.pro/src/io/openems/edge/fenecon/pro/ess/MaxApparentPowerHandler.java b/io.openems.edge.fenecon.pro/src/io/openems/edge/fenecon/pro/ess/MaxApparentPowerHandler.java
index 5ed528147c8..36f66210789 100644
--- a/io.openems.edge.fenecon.pro/src/io/openems/edge/fenecon/pro/ess/MaxApparentPowerHandler.java
+++ b/io.openems.edge.fenecon.pro/src/io/openems/edge/fenecon/pro/ess/MaxApparentPowerHandler.java
@@ -19,8 +19,8 @@ public MaxApparentPowerHandler(FeneconProEss parent) {
 	}
 
 	public void calculateMaxApparentPower() {
-		Integer setPower = this.parent.getDebugSetActivePower().get();
-		Integer power = this.parent.getActivePower().get();
+		var setPower = this.parent.getDebugSetActivePower().get();
+		var power = this.parent.getActivePower().get();
 		int oldMaxApparentPower = this.parent.getMaxApparentPower().orElse(FeneconProEss.MAX_APPARENT_POWER);
 
 		if (setPower == null || power == null) {
@@ -32,8 +32,8 @@ public void calculateMaxApparentPower() {
 		/*
 		 * Evaluate if power and setPower are within delta.
 		 */
-		if (/* Discharge */ (setPower > 0 && setPower - MAX_DELTA > power) //
-				|| /* Charge */ (setPower < 0 && setPower + MAX_DELTA < power)) {
+		if (/* Discharge */ setPower > 0 && setPower - MAX_DELTA > power //
+				|| /* Charge */ setPower < 0 && setPower + MAX_DELTA < power) {
 			// Exceeded MaxDelta
 			this.exceededCounter++;
 			this.withinCounter = 0;
diff --git a/io.openems.edge.fenecon.pro/src/io/openems/edge/fenecon/pro/ess/ProChannelId.java b/io.openems.edge.fenecon.pro/src/io/openems/edge/fenecon/pro/ess/ProChannelId.java
index 7431de514db..d5b725a971d 100644
--- a/io.openems.edge.fenecon.pro/src/io/openems/edge/fenecon/pro/ess/ProChannelId.java
+++ b/io.openems.edge.fenecon.pro/src/io/openems/edge/fenecon/pro/ess/ProChannelId.java
@@ -16,7 +16,7 @@ public enum ProChannelId implements io.openems.edge.common.channel.ChannelId {
 				// on each update set Grid-Mode channel
 				channel.onChange((oldValue, newValue) -> {
 					SystemState systemState = newValue.asEnum();
-					SymmetricEss parent = (SymmetricEss) channel.getComponent();
+					var parent = (SymmetricEss) channel.getComponent();
 					switch (systemState) {
 					case STANDBY:
 					case START:
diff --git a/io.openems.edge.fenecon.pro/src/io/openems/edge/fenecon/pro/ess/SetWorkState.java b/io.openems.edge.fenecon.pro/src/io/openems/edge/fenecon/pro/ess/SetWorkState.java
index 873408e8b77..77ba8b468d5 100644
--- a/io.openems.edge.fenecon.pro/src/io/openems/edge/fenecon/pro/ess/SetWorkState.java
+++ b/io.openems.edge.fenecon.pro/src/io/openems/edge/fenecon/pro/ess/SetWorkState.java
@@ -9,7 +9,7 @@ public enum SetWorkState implements OptionsEnum {
 	REMOTE_CONTROL_OFF_GRID_STARTING(2, "Remote Control off Grid Starting"), //
 	STOP(3, "Stop"), //
 	EMERGENCY_STOP(4, "Emergency Stop"); //
-	
+
 	private final int value;
 	private final String name;
 
diff --git a/io.openems.edge.fenecon.pro/src/io/openems/edge/fenecon/pro/ess/SystemState.java b/io.openems.edge.fenecon.pro/src/io/openems/edge/fenecon/pro/ess/SystemState.java
index 6cc929b8a99..50eccebb83a 100644
--- a/io.openems.edge.fenecon.pro/src/io/openems/edge/fenecon/pro/ess/SystemState.java
+++ b/io.openems.edge.fenecon.pro/src/io/openems/edge/fenecon/pro/ess/SystemState.java
@@ -9,7 +9,7 @@ public enum SystemState implements OptionsEnum {
 	START(2, "START"), //
 	FAULT(3, "FAULT"), //
 	OFF_GRID_PV(4, "Off-Grid PV");
-	
+
 	private final int value;
 	private final String name;
 
diff --git a/io.openems.edge.fenecon.pro/src/io/openems/edge/fenecon/pro/pvmeter/FeneconProPvMeter.java b/io.openems.edge.fenecon.pro/src/io/openems/edge/fenecon/pro/pvmeter/FeneconProPvMeter.java
index b147e1ee02d..3b840dc34a7 100644
--- a/io.openems.edge.fenecon.pro/src/io/openems/edge/fenecon/pro/pvmeter/FeneconProPvMeter.java
+++ b/io.openems.edge.fenecon.pro/src/io/openems/edge/fenecon/pro/pvmeter/FeneconProPvMeter.java
@@ -89,6 +89,7 @@ public FeneconProPvMeter() {
 		this.getActiveProductionEnergyL3Channel().onSetNextValue(activeEnergySum);
 	}
 
+	@Override
 	@Reference(policy = ReferencePolicy.STATIC, policyOption = ReferencePolicyOption.GREEDY, cardinality = ReferenceCardinality.MANDATORY)
 	protected void setModbus(BridgeModbus modbus) {
 		super.setModbus(modbus);
@@ -103,6 +104,7 @@ void activate(ComponentContext context, Config config) throws OpenemsException {
 		this.modbusBridgeId = config.modbus_id();
 	}
 
+	@Override
 	@Deactivate
 	protected void deactivate() {
 		super.deactivate();
@@ -116,30 +118,30 @@ public String getModbusBridgeId() {
 	protected ModbusProtocol defineModbusProtocol() throws OpenemsException {
 		return new ModbusProtocol(this, //
 				new FC3ReadRegistersTask(121, Priority.LOW, //
-						m(AsymmetricMeter.ChannelId.VOLTAGE_L1, new UnsignedWordElement(121),
+						this.m(AsymmetricMeter.ChannelId.VOLTAGE_L1, new UnsignedWordElement(121),
 								ElementToChannelConverter.SCALE_FACTOR_2), //
-						m(AsymmetricMeter.ChannelId.VOLTAGE_L2, new UnsignedWordElement(122),
+						this.m(AsymmetricMeter.ChannelId.VOLTAGE_L2, new UnsignedWordElement(122),
 								ElementToChannelConverter.SCALE_FACTOR_2), //
-						m(AsymmetricMeter.ChannelId.VOLTAGE_L3, new UnsignedWordElement(123),
+						this.m(AsymmetricMeter.ChannelId.VOLTAGE_L3, new UnsignedWordElement(123),
 								ElementToChannelConverter.SCALE_FACTOR_2)), //
 
 				new FC3ReadRegistersTask(2035, Priority.LOW, // //
-						m(FeneconProPvMeter.ChannelId.ACTIVE_ENERGY_L1, new UnsignedDoublewordElement(2035),
+						this.m(FeneconProPvMeter.ChannelId.ACTIVE_ENERGY_L1, new UnsignedDoublewordElement(2035),
 								ElementToChannelConverter.SCALE_FACTOR_2), //
 						new DummyRegisterElement(2037, 2065), //
-						m(AsymmetricMeter.ChannelId.ACTIVE_POWER_L1, new UnsignedWordElement(2066),
+						this.m(AsymmetricMeter.ChannelId.ACTIVE_POWER_L1, new UnsignedWordElement(2066),
 								MINUS_10000_CONVERTER)), //
 				new FC3ReadRegistersTask(2135, Priority.LOW, // //
-						m(FeneconProPvMeter.ChannelId.ACTIVE_ENERGY_L2, new UnsignedDoublewordElement(2135),
+						this.m(FeneconProPvMeter.ChannelId.ACTIVE_ENERGY_L2, new UnsignedDoublewordElement(2135),
 								ElementToChannelConverter.SCALE_FACTOR_2), //
 						new DummyRegisterElement(2137, 2165), //
-						m(AsymmetricMeter.ChannelId.ACTIVE_POWER_L2, new UnsignedWordElement(2166),
+						this.m(AsymmetricMeter.ChannelId.ACTIVE_POWER_L2, new UnsignedWordElement(2166),
 								MINUS_10000_CONVERTER)), //
 				new FC3ReadRegistersTask(2235, Priority.LOW, // //
-						m(FeneconProPvMeter.ChannelId.ACTIVE_ENERGY_L3, new UnsignedDoublewordElement(2235),
+						this.m(FeneconProPvMeter.ChannelId.ACTIVE_ENERGY_L3, new UnsignedDoublewordElement(2235),
 								ElementToChannelConverter.SCALE_FACTOR_2), //
 						new DummyRegisterElement(2237, 2265), //
-						m(AsymmetricMeter.ChannelId.ACTIVE_POWER_L3, new UnsignedWordElement(2266),
+						this.m(AsymmetricMeter.ChannelId.ACTIVE_POWER_L3, new UnsignedWordElement(2266),
 								MINUS_10000_CONVERTER))//
 
 		);
diff --git a/io.openems.edge.fenecon.pro/test/io/openems/edge/fenecon/pro/ess/MyConfig.java b/io.openems.edge.fenecon.pro/test/io/openems/edge/fenecon/pro/ess/MyConfig.java
index d4e4403c956..c972e3f29bb 100644
--- a/io.openems.edge.fenecon.pro/test/io/openems/edge/fenecon/pro/ess/MyConfig.java
+++ b/io.openems.edge.fenecon.pro/test/io/openems/edge/fenecon/pro/ess/MyConfig.java
@@ -31,7 +31,7 @@ public MyConfig build() {
 
 	/**
 	 * Create a Config builder.
-	 * 
+	 *
 	 * @return a {@link Builder}
 	 */
 	public static Builder create() {
diff --git a/io.openems.edge.fenecon.pro/test/io/openems/edge/fenecon/pro/pvmeter/MyConfig.java b/io.openems.edge.fenecon.pro/test/io/openems/edge/fenecon/pro/pvmeter/MyConfig.java
index 1cc2d6867eb..e348359f971 100644
--- a/io.openems.edge.fenecon.pro/test/io/openems/edge/fenecon/pro/pvmeter/MyConfig.java
+++ b/io.openems.edge.fenecon.pro/test/io/openems/edge/fenecon/pro/pvmeter/MyConfig.java
@@ -30,7 +30,7 @@ public MyConfig build() {
 
 	/**
 	 * Create a Config builder.
-	 * 
+	 *
 	 * @return a {@link Builder}
 	 */
 	public static Builder create() {

From 08e71084bc68d636e49253216e5ecf263587bd81 Mon Sep 17 00:00:00 2001
From: Stefan Feilmeier <stefan.feilmeier@fenecon.de>
Date: Tue, 8 Mar 2022 14:51:29 +0100
Subject: [PATCH 74/96] Update io.openems.edge.goodwe

---
 .../GoodWeBatteryInverterImpl.java            |   53 +-
 .../charger/AbstractGoodWeEtCharger.java      |   12 +-
 .../edge/goodwe/charger/GoodWeEtCharger.java  |    6 +-
 .../edge/goodwe/charger/GoodWeEtCharger1.java |    3 +-
 .../edge/goodwe/charger/GoodWeEtCharger2.java |    3 +-
 .../edge/goodwe/common/AbstractGoodWe.java    | 1707 +++++++++--------
 .../edge/goodwe/common/ApplyPowerHandler.java |   49 +-
 .../io/openems/edge/goodwe/common/GoodWe.java |   26 +-
 .../goodwe/common/enums/EmsPowerMode.java     |   86 +-
 .../edge/goodwe/common/enums/GoodweType.java  |    2 +-
 .../GoodWeEmergencyPowerMeterImpl.java        |   29 +-
 .../ess/AllowedChargeDischargeHandler.java    |   14 +-
 .../edge/goodwe/ess/GoodWeEssImpl.java        |    4 +-
 .../goodwe/gridmeter/GoodWeGridMeterImpl.java |   35 +-
 .../GoodWeBatteryInverterImplTest.java        |   24 +-
 .../edge/goodwe/batteryinverter/MyConfig.java |    2 +-
 .../openems/edge/goodwe/charger/MyConfig.java |    4 +-
 .../goodwe/emergencypowermeter/MyConfig.java  |    2 +-
 .../edge/goodwe/ess/GoodWeEssImplTest.java    |   10 +-
 .../io/openems/edge/goodwe/ess/MyConfig.java  |    3 +-
 .../edge/goodwe/gridmeter/MyConfig.java       |    2 +-
 21 files changed, 1051 insertions(+), 1025 deletions(-)

diff --git a/io.openems.edge.goodwe/src/io/openems/edge/goodwe/batteryinverter/GoodWeBatteryInverterImpl.java b/io.openems.edge.goodwe/src/io/openems/edge/goodwe/batteryinverter/GoodWeBatteryInverterImpl.java
index 6c59dd25ff2..231f8c1e15b 100644
--- a/io.openems.edge.goodwe/src/io/openems/edge/goodwe/batteryinverter/GoodWeBatteryInverterImpl.java
+++ b/io.openems.edge.goodwe/src/io/openems/edge/goodwe/batteryinverter/GoodWeBatteryInverterImpl.java
@@ -48,7 +48,6 @@
 import io.openems.edge.goodwe.common.enums.ControlMode;
 import io.openems.edge.goodwe.common.enums.EnableCurve;
 import io.openems.edge.goodwe.common.enums.EnableDisable;
-import io.openems.edge.goodwe.common.enums.FeedInPowerSettings;
 import io.openems.edge.timedata.api.Timedata;
 
 @Designate(ocd = Config.class, factory = true)
@@ -91,6 +90,7 @@ public class GoodWeBatteryInverterImpl extends AbstractGoodWe
 
 	private Config config;
 
+	@Override
 	@Reference(policy = ReferencePolicy.STATIC, policyOption = ReferencePolicyOption.GREEDY, cardinality = ReferenceCardinality.MANDATORY)
 	protected void setModbus(BridgeModbus modbus) {
 		super.setModbus(modbus);
@@ -114,6 +114,7 @@ private void modified(ComponentContext context, Config config) throws OpenemsNam
 		this.applyConfig(config);
 	}
 
+	@Override
 	@Deactivate
 	protected void deactivate() {
 		super.deactivate();
@@ -143,12 +144,12 @@ public GoodWeBatteryInverterImpl() throws OpenemsNamedException {
 
 	/**
 	 * Apply the configuration on Activate and Modified.
-	 * 
+	 *
 	 * <p>
 	 * Feed In Power Setting consist of: Installed inverter country, feeding method:
 	 * whether according to the power factor or power and frequency. In addition, it
 	 * consist backup power availability.
-	 * 
+	 *
 	 * @param config Configuration parameters.
 	 * @throws OpenemsNamedException on error
 	 */
@@ -182,7 +183,7 @@ private void applyConfig(Config config) throws OpenemsNamedException {
 		this.writeToChannel(GoodWe.ChannelId.ENABLE_CURVE_PU, EnableCurve.DISABLE);
 
 		// Feed-in settings
-		FeedInPowerSettings setFeedInPowerSettings = config.setfeedInPowerSettings();
+		var setFeedInPowerSettings = config.setfeedInPowerSettings();
 		switch (setFeedInPowerSettings) {
 		case UNDEFINED:
 			break;
@@ -250,17 +251,15 @@ private void applyConfig(Config config) throws OpenemsNamedException {
 			if (setFeedInPowerSettings.fixedPowerFactor == null) {
 				throw new IllegalArgumentException(
 						"Feed-In-Power-Setting [" + setFeedInPowerSettings + "] has no fixed power factor");
-			} else {
-				this.writeToChannel(GoodWe.ChannelId.FIXED_POWER_FACTOR,
-						config.setfeedInPowerSettings().fixedPowerFactor);
 			}
+			this.writeToChannel(GoodWe.ChannelId.FIXED_POWER_FACTOR, config.setfeedInPowerSettings().fixedPowerFactor);
 			break;
 		}
 	}
 
 	/**
 	 * Sets the Battery Limits.
-	 * 
+	 *
 	 * @param battery linked {@link Battery}.
 	 * @throws OpenemsNamedException on error
 	 */
@@ -270,29 +269,29 @@ private void setBatteryLimits(Battery battery) throws OpenemsNamedException {
 		 * Make sure PV-Master registers are correct, because they define the overall
 		 * min/max limits.
 		 */
-		Value<Integer> bmsChargeMaxCurrent = this.getBmsChargeMaxCurrent();
-		Value<Integer> bmsDischargeMaxCurrent = this.getBmsDischargeMaxCurrent();
-		Value<Integer> bmsChargeMaxVoltage = this.getBmsChargeMaxVoltage();
-		Value<Integer> bmsDischargeMinVoltage = this.getBmsDischargeMinVoltage();
+		var bmsChargeMaxCurrent = this.getBmsChargeMaxCurrent();
+		var bmsDischargeMaxCurrent = this.getBmsDischargeMaxCurrent();
+		var bmsChargeMaxVoltage = this.getBmsChargeMaxVoltage();
+		var bmsDischargeMinVoltage = this.getBmsDischargeMinVoltage();
 
 		Channel<Integer> bmsSocUnderMinChannel = this.channel(GoodWe.ChannelId.BMS_SOC_UNDER_MIN);
-		Value<Integer> bmsSocUnderMin = bmsSocUnderMinChannel.value();
+		var bmsSocUnderMin = bmsSocUnderMinChannel.value();
 		Channel<Integer> bmsOfflineSocUnderMinChannel = this.channel(GoodWe.ChannelId.BMS_OFFLINE_SOC_UNDER_MIN);
-		Value<Integer> bmsOfflineSocUnderMin = bmsOfflineSocUnderMinChannel.value();
+		var bmsOfflineSocUnderMin = bmsOfflineSocUnderMinChannel.value();
 
-		Integer setBatteryStrings = TypeUtils.divide(battery.getDischargeMinVoltage().get(), MODULE_MIN_VOLTAGE);
+		var setBatteryStrings = TypeUtils.divide(battery.getDischargeMinVoltage().get(), MODULE_MIN_VOLTAGE);
 		Integer setChargeMaxCurrent = MAX_DC_CURRENT;
 		Integer setDischargeMaxCurrent = MAX_DC_CURRENT;
-		Integer setChargeMaxVoltage = battery.getChargeMaxVoltage().orElse(0);
-		Integer setDischargeMinVoltage = battery.getDischargeMinVoltage().orElse(0);
+		var setChargeMaxVoltage = battery.getChargeMaxVoltage().orElse(0);
+		var setDischargeMinVoltage = battery.getDischargeMinVoltage().orElse(0);
 		Integer setSocUnderMin = 0; // [0-100]; 0 MinSoc = 100 DoD
 		Integer setOfflineSocUnderMin = 0; // [0-100]; 0 MinSoc = 100 DoD
-		if ((bmsChargeMaxCurrent.isDefined() && !Objects.equals(bmsChargeMaxCurrent.get(), setChargeMaxCurrent))
-				|| (bmsDischargeMaxCurrent.isDefined()
-						&& !Objects.equals(bmsDischargeMaxCurrent.get(), setDischargeMaxCurrent))
-				|| (bmsSocUnderMin.isDefined() && !Objects.equals(bmsSocUnderMin.get(), setSocUnderMin))
-				|| (bmsOfflineSocUnderMin.isDefined()
-						&& !Objects.equals(bmsOfflineSocUnderMin.get(), setOfflineSocUnderMin))) {
+		if (bmsChargeMaxCurrent.isDefined() && !Objects.equals(bmsChargeMaxCurrent.get(), setChargeMaxCurrent)
+				|| bmsDischargeMaxCurrent.isDefined()
+						&& !Objects.equals(bmsDischargeMaxCurrent.get(), setDischargeMaxCurrent)
+				|| bmsSocUnderMin.isDefined() && !Objects.equals(bmsSocUnderMin.get(), setSocUnderMin)
+				|| bmsOfflineSocUnderMin.isDefined()
+						&& !Objects.equals(bmsOfflineSocUnderMin.get(), setOfflineSocUnderMin)) {
 			// Update is required
 			this.logInfo(this.log, "Update for PV-Master BMS Registers is required." //
 					+ " Voltages" //
@@ -402,18 +401,18 @@ public Integer getSurplusPower() {
 		}
 
 		// Is DC PV Production available?
-		Integer productionPower = this.calculatePvProduction();
+		var productionPower = this.calculatePvProduction();
 		if (productionPower == null || productionPower <= 0) {
 			return null;
 		}
 
 		// Reduce PV Production power by DC max charge power
 		IntegerReadChannel wbmsVoltageChannel = this.channel(GoodWe.ChannelId.WBMS_VOLTAGE);
-		int surplusPower = productionPower //
+		var surplusPower = productionPower //
 				/* Charge-Max-Current */ - this.getBmsChargeMaxCurrent().orElse(0) //
 						/* Battery Voltage */ * wbmsVoltageChannel.value().orElse(0);
-		
-		if(surplusPower <= 0) {
+
+		if (surplusPower <= 0) {
 			// PV Production is less than the maximum charge power -> no surplus power
 			return null;
 		}
diff --git a/io.openems.edge.goodwe/src/io/openems/edge/goodwe/charger/AbstractGoodWeEtCharger.java b/io.openems.edge.goodwe/src/io/openems/edge/goodwe/charger/AbstractGoodWeEtCharger.java
index a24f288621f..25d61143680 100644
--- a/io.openems.edge.goodwe/src/io/openems/edge/goodwe/charger/AbstractGoodWeEtCharger.java
+++ b/io.openems.edge.goodwe/src/io/openems/edge/goodwe/charger/AbstractGoodWeEtCharger.java
@@ -42,14 +42,14 @@ protected AbstractGoodWeEtCharger() {
 
 	@Override
 	protected ModbusProtocol defineModbusProtocol() throws OpenemsException {
-		final int startAddress = this.getStartAddress();
+		final var startAddress = this.getStartAddress();
 		return new ModbusProtocol(this, //
 				new FC3ReadRegistersTask(startAddress, Priority.HIGH, //
-						m(GoodWeEtCharger.ChannelId.V, new UnsignedWordElement(startAddress), //
+						this.m(GoodWeEtCharger.ChannelId.V, new UnsignedWordElement(startAddress), //
 								ElementToChannelConverter.SCALE_FACTOR_MINUS_1), //
-						m(GoodWeEtCharger.ChannelId.I, new UnsignedWordElement(startAddress + 1),
+						this.m(GoodWeEtCharger.ChannelId.I, new UnsignedWordElement(startAddress + 1),
 								ElementToChannelConverter.SCALE_FACTOR_MINUS_1),
-						m(EssDcCharger.ChannelId.ACTUAL_POWER, new UnsignedDoublewordElement(startAddress + 2))));
+						this.m(EssDcCharger.ChannelId.ACTUAL_POWER, new UnsignedDoublewordElement(startAddress + 2))));
 	}
 
 	@Override
@@ -66,7 +66,7 @@ public void handleEvent(Event event) {
 	 * Calculate the Energy values from ActivePower.
 	 */
 	private void calculateEnergy() {
-		Integer actualPower = this.getActualPower().get();
+		var actualPower = this.getActualPower().get();
 		if (actualPower == null) {
 			// Not available
 			this.calculateActualEnergy.update(null);
@@ -81,7 +81,7 @@ private void calculateEnergy() {
 	 * Updates the 'Has-No-DC-PV' State Channel.
 	 */
 	private void updateState() {
-		GoodWe goodWe = this.getEssOrBatteryInverter();
+		var goodWe = this.getEssOrBatteryInverter();
 		Boolean hasNoDcPv = null;
 		if (goodWe != null) {
 			switch (goodWe.getGoodweType().getSeries()) {
diff --git a/io.openems.edge.goodwe/src/io/openems/edge/goodwe/charger/GoodWeEtCharger.java b/io.openems.edge.goodwe/src/io/openems/edge/goodwe/charger/GoodWeEtCharger.java
index 724c6b6207c..bd0c5afd94d 100644
--- a/io.openems.edge.goodwe/src/io/openems/edge/goodwe/charger/GoodWeEtCharger.java
+++ b/io.openems.edge.goodwe/src/io/openems/edge/goodwe/charger/GoodWeEtCharger.java
@@ -35,7 +35,7 @@ public Doc doc() {
 
 	/**
 	 * Gets the Channel for {@link ChannelId#HAS_NO_DC_PV}.
-	 * 
+	 *
 	 * @return the Channel
 	 */
 	public default StateChannel getHasNoDcPvChannel() {
@@ -44,7 +44,7 @@ public default StateChannel getHasNoDcPvChannel() {
 
 	/**
 	 * Gets the Has-No-DC-PV State. See {@link ChannelId#HAS_NO_DC_PV}.
-	 * 
+	 *
 	 * @return the Channel {@link Value}
 	 */
 	public default Value<Boolean> getHasNoDcPv() {
@@ -54,7 +54,7 @@ public default Value<Boolean> getHasNoDcPv() {
 	/**
 	 * Internal method to set the 'nextValue' on {@link ChannelId#HAS_NO_DC_PV}
 	 * Channel.
-	 * 
+	 *
 	 * @param value the next value
 	 */
 	public default void _setHasNoDcPv(Boolean value) {
diff --git a/io.openems.edge.goodwe/src/io/openems/edge/goodwe/charger/GoodWeEtCharger1.java b/io.openems.edge.goodwe/src/io/openems/edge/goodwe/charger/GoodWeEtCharger1.java
index d5dd44c0be0..b5c4f291a66 100644
--- a/io.openems.edge.goodwe/src/io/openems/edge/goodwe/charger/GoodWeEtCharger1.java
+++ b/io.openems.edge.goodwe/src/io/openems/edge/goodwe/charger/GoodWeEtCharger1.java
@@ -44,13 +44,13 @@ public class GoodWeEtCharger1 extends AbstractGoodWeEtCharger
 	@Reference(policy = ReferencePolicy.DYNAMIC, policyOption = ReferencePolicyOption.GREEDY, cardinality = ReferenceCardinality.OPTIONAL)
 	private volatile Timedata timedata = null;
 
+	@Override
 	@Reference(policy = ReferencePolicy.STATIC, policyOption = ReferencePolicyOption.GREEDY, cardinality = ReferenceCardinality.MANDATORY)
 	protected void setModbus(BridgeModbus modbus) {
 		super.setModbus(modbus);
 	}
 
 	public GoodWeEtCharger1() {
-		super();
 	}
 
 	@Activate
@@ -71,6 +71,7 @@ void activate(ComponentContext context, ConfigPV1 config) throws OpenemsExceptio
 		}
 	}
 
+	@Override
 	@Deactivate
 	protected void deactivate() {
 		if (this.essOrBatteryInverter != null) {
diff --git a/io.openems.edge.goodwe/src/io/openems/edge/goodwe/charger/GoodWeEtCharger2.java b/io.openems.edge.goodwe/src/io/openems/edge/goodwe/charger/GoodWeEtCharger2.java
index dbf9644221d..9542c45fc34 100644
--- a/io.openems.edge.goodwe/src/io/openems/edge/goodwe/charger/GoodWeEtCharger2.java
+++ b/io.openems.edge.goodwe/src/io/openems/edge/goodwe/charger/GoodWeEtCharger2.java
@@ -44,13 +44,13 @@ public class GoodWeEtCharger2 extends AbstractGoodWeEtCharger
 	@Reference(policy = ReferencePolicy.DYNAMIC, policyOption = ReferencePolicyOption.GREEDY, cardinality = ReferenceCardinality.OPTIONAL)
 	private volatile Timedata timedata = null;
 
+	@Override
 	@Reference(policy = ReferencePolicy.STATIC, policyOption = ReferencePolicyOption.GREEDY, cardinality = ReferenceCardinality.MANDATORY)
 	protected void setModbus(BridgeModbus modbus) {
 		super.setModbus(modbus);
 	}
 
 	public GoodWeEtCharger2() {
-		super();
 	}
 
 	@Activate
@@ -71,6 +71,7 @@ void activate(ComponentContext context, ConfigPV2 config) throws OpenemsExceptio
 		}
 	}
 
+	@Override
 	@Deactivate
 	protected void deactivate() {
 		if (this.essOrBatteryInverter != null) {
diff --git a/io.openems.edge.goodwe/src/io/openems/edge/goodwe/common/AbstractGoodWe.java b/io.openems.edge.goodwe/src/io/openems/edge/goodwe/common/AbstractGoodWe.java
index a575e281b9a..2b23f1bc9c7 100644
--- a/io.openems.edge.goodwe/src/io/openems/edge/goodwe/common/AbstractGoodWe.java
+++ b/io.openems.edge.goodwe/src/io/openems/edge/goodwe/common/AbstractGoodWe.java
@@ -28,8 +28,6 @@
 import io.openems.edge.bridge.modbus.api.task.FC16WriteRegistersTask;
 import io.openems.edge.bridge.modbus.api.task.FC3ReadRegistersTask;
 import io.openems.edge.common.channel.Channel;
-import io.openems.edge.common.channel.EnumReadChannel;
-import io.openems.edge.common.channel.IntegerReadChannel;
 import io.openems.edge.common.component.OpenemsComponent;
 import io.openems.edge.common.sum.GridMode;
 import io.openems.edge.common.taskmanager.Priority;
@@ -79,101 +77,104 @@ protected AbstractGoodWe(//
 
 	@Override
 	protected final ModbusProtocol defineModbusProtocol() throws OpenemsException {
-		ModbusProtocol protocol = new ModbusProtocol(this, //
+		var protocol = new ModbusProtocol(this, //
 
 				new FC3ReadRegistersTask(35001, Priority.LOW, //
-						m(SymmetricEss.ChannelId.MAX_APPARENT_POWER, new UnsignedWordElement(35001)), //
+						this.m(SymmetricEss.ChannelId.MAX_APPARENT_POWER, new UnsignedWordElement(35001)), //
 						new DummyRegisterElement(35002), //
-						m(GoodWe.ChannelId.SERIAL_NUMBER, new StringWordElement(35003, 8)), //
-						m(GoodWe.ChannelId.GOODWE_TYPE, new StringWordElement(35011, 5), new ElementToChannelConverter(
-								// element -> channel
-								value -> {
-									// Evaluate GoodweType
-									final GoodweType result;
-									if (value == null) {
-										result = GoodweType.UNDEFINED;
-									} else {
-										String stringValue = TypeUtils.<String>getAsType(OpenemsType.STRING, value);
-										switch (stringValue) {
-										// TODO add identification for FENECON branded inverter
-										case "GW10K-BT":
-											result = GoodweType.GOODWE_10K_BT;
-											break;
-										case "GW8K-BT":
-											result = GoodweType.GOODWE_8K_BT;
-											break;
-										case "GW5K-BT":
-											result = GoodweType.GOODWE_5K_BT;
-											break;
-										case "GW10K-ET":
-											result = GoodweType.GOODWE_10K_ET;
-											break;
-										case "GW8K-ET":
-											result = GoodweType.GOODWE_8K_ET;
-											break;
-										case "GW5K-ET":
-											result = GoodweType.GOODWE_5K_ET;
-											break;
-										case "FHI-10-DAH":
-											result = GoodweType.FENECON_FHI_10_DAH;
-											break;
-										default:
-											this.logInfo(this.log, "Unable to identify GoodWe by name [" + value + "]");
-											result = GoodweType.UNDEFINED;
-											break;
-										}
-									}
-									// Log on first occurrence
-									if (result != this.getGoodweType()) {
-										switch (result) {
-										case GOODWE_10K_BT:
-										case GOODWE_8K_BT:
-										case GOODWE_5K_BT:
-										case GOODWE_10K_ET:
-										case GOODWE_8K_ET:
-										case GOODWE_5K_ET:
-										case FENECON_FHI_10_DAH:
-											this.logInfo(this.log, "Identified " + result.getName());
-											break;
-										case UNDEFINED:
-											break;
-										}
-									}
-									return result;
-								}, //
-
-								// channel -> element
-								value -> value))
+						this.m(GoodWe.ChannelId.SERIAL_NUMBER, new StringWordElement(35003, 8)), //
+						this.m(GoodWe.ChannelId.GOODWE_TYPE, new StringWordElement(35011, 5),
+								new ElementToChannelConverter(
+										// element -> channel
+										value -> {
+											// Evaluate GoodweType
+											final GoodweType result;
+											if (value == null) {
+												result = GoodweType.UNDEFINED;
+											} else {
+												String stringValue = TypeUtils.<String>getAsType(OpenemsType.STRING,
+														value);
+												switch (stringValue) {
+												// TODO add identification for FENECON branded inverter
+												case "GW10K-BT":
+													result = GoodweType.GOODWE_10K_BT;
+													break;
+												case "GW8K-BT":
+													result = GoodweType.GOODWE_8K_BT;
+													break;
+												case "GW5K-BT":
+													result = GoodweType.GOODWE_5K_BT;
+													break;
+												case "GW10K-ET":
+													result = GoodweType.GOODWE_10K_ET;
+													break;
+												case "GW8K-ET":
+													result = GoodweType.GOODWE_8K_ET;
+													break;
+												case "GW5K-ET":
+													result = GoodweType.GOODWE_5K_ET;
+													break;
+												case "FHI-10-DAH":
+													result = GoodweType.FENECON_FHI_10_DAH;
+													break;
+												default:
+													this.logInfo(this.log,
+															"Unable to identify GoodWe by name [" + value + "]");
+													result = GoodweType.UNDEFINED;
+													break;
+												}
+											}
+											// Log on first occurrence
+											if (result != this.getGoodweType()) {
+												switch (result) {
+												case GOODWE_10K_BT:
+												case GOODWE_8K_BT:
+												case GOODWE_5K_BT:
+												case GOODWE_10K_ET:
+												case GOODWE_8K_ET:
+												case GOODWE_5K_ET:
+												case FENECON_FHI_10_DAH:
+													this.logInfo(this.log, "Identified " + result.getName());
+													break;
+												case UNDEFINED:
+													break;
+												}
+											}
+											return result;
+										}, //
+
+										// channel -> element
+										value -> value))
 
 				), //
 
 				new FC3ReadRegistersTask(35016, Priority.LOW, //
-						m(GoodWe.ChannelId.DSP_FM_VERSION_MASTER, new UnsignedWordElement(35016)), //
-						m(GoodWe.ChannelId.DSP_FM_VERSION_SLAVE, new UnsignedWordElement(35017)), //
-						m(GoodWe.ChannelId.DSP_BETA_VERSION, new UnsignedWordElement(35018)), //
-						m(GoodWe.ChannelId.ARM_FM_VERSION, new UnsignedWordElement(35019)), //
-						m(GoodWe.ChannelId.ARM_BETA_VERSION, new UnsignedWordElement(35020)) //
+						this.m(GoodWe.ChannelId.DSP_FM_VERSION_MASTER, new UnsignedWordElement(35016)), //
+						this.m(GoodWe.ChannelId.DSP_FM_VERSION_SLAVE, new UnsignedWordElement(35017)), //
+						this.m(GoodWe.ChannelId.DSP_BETA_VERSION, new UnsignedWordElement(35018)), //
+						this.m(GoodWe.ChannelId.ARM_FM_VERSION, new UnsignedWordElement(35019)), //
+						this.m(GoodWe.ChannelId.ARM_BETA_VERSION, new UnsignedWordElement(35020)) //
 				), //
 
 				new FC3ReadRegistersTask(35111, Priority.LOW, //
 						// Registers for PV1 and PV2 (35103 to 35110) are read via DC-Charger
 						// implementation
-						m(GoodWe.ChannelId.V_PV3, new UnsignedWordElement(35111),
+						this.m(GoodWe.ChannelId.V_PV3, new UnsignedWordElement(35111),
 								ElementToChannelConverter.SCALE_FACTOR_MINUS_1), //
-						m(GoodWe.ChannelId.I_PV3, new UnsignedWordElement(35112),
+						this.m(GoodWe.ChannelId.I_PV3, new UnsignedWordElement(35112),
 								ElementToChannelConverter.SCALE_FACTOR_MINUS_1), //
-						m(GoodWe.ChannelId.P_PV3, new UnsignedDoublewordElement(35113)), //
-						m(GoodWe.ChannelId.V_PV4, new UnsignedWordElement(35115),
+						this.m(GoodWe.ChannelId.P_PV3, new UnsignedDoublewordElement(35113)), //
+						this.m(GoodWe.ChannelId.V_PV4, new UnsignedWordElement(35115),
 								ElementToChannelConverter.SCALE_FACTOR_MINUS_1), //
-						m(GoodWe.ChannelId.I_PV4, new UnsignedWordElement(35116),
+						this.m(GoodWe.ChannelId.I_PV4, new UnsignedWordElement(35116),
 								ElementToChannelConverter.SCALE_FACTOR_MINUS_1), //
-						m(GoodWe.ChannelId.P_PV4, new UnsignedDoublewordElement(35117)), //
-						m(GoodWe.ChannelId.PV_MODE, new UnsignedDoublewordElement(35119)), //
+						this.m(GoodWe.ChannelId.P_PV4, new UnsignedDoublewordElement(35117)), //
+						this.m(GoodWe.ChannelId.PV_MODE, new UnsignedDoublewordElement(35119)), //
 						// Registers for Grid Smart-Meter (35121 to 35135) are read via GridMeter
 						// implementation
 						new DummyRegisterElement(35121, 35135),
-						m(SymmetricEss.ChannelId.GRID_MODE, new UnsignedWordElement(35136), //
-								new ElementToChannelConverter((value) -> {
+						this.m(SymmetricEss.ChannelId.GRID_MODE, new UnsignedWordElement(35136), //
+								new ElementToChannelConverter(value -> {
 									Integer intValue = TypeUtils.<Integer>getAsType(OpenemsType.INTEGER, value);
 									if (intValue != null) {
 										switch (intValue) {
@@ -189,54 +190,54 @@ protected final ModbusProtocol defineModbusProtocol() throws OpenemsException {
 								}))), //
 
 				new FC3ReadRegistersTask(35137, Priority.LOW, //
-						m(GoodWe.ChannelId.TOTAL_INV_POWER, new SignedDoublewordElement(35137)), //
-						m(GoodWe.ChannelId.AC_ACTIVE_POWER, new SignedDoublewordElement(35139), //
+						this.m(GoodWe.ChannelId.TOTAL_INV_POWER, new SignedDoublewordElement(35137)), //
+						this.m(GoodWe.ChannelId.AC_ACTIVE_POWER, new SignedDoublewordElement(35139), //
 								ElementToChannelConverter.INVERT), //
-						m(this.reactivePowerChannelId, new SignedDoublewordElement(35141), //
+						this.m(this.reactivePowerChannelId, new SignedDoublewordElement(35141), //
 								ElementToChannelConverter.INVERT), //
-						m(GoodWe.ChannelId.AC_APPARENT_POWER, new SignedDoublewordElement(35143), //
+						this.m(GoodWe.ChannelId.AC_APPARENT_POWER, new SignedDoublewordElement(35143), //
 								ElementToChannelConverter.INVERT), //
 						new DummyRegisterElement(35145, 35147), //
-						m(GoodWe.ChannelId.LOAD_MODE_R, new UnsignedWordElement(35148)), //
+						this.m(GoodWe.ChannelId.LOAD_MODE_R, new UnsignedWordElement(35148)), //
 						new DummyRegisterElement(35149, 35153), //
-						m(GoodWe.ChannelId.LOAD_MODE_S, new UnsignedWordElement(35154)), //
+						this.m(GoodWe.ChannelId.LOAD_MODE_S, new UnsignedWordElement(35154)), //
 						new DummyRegisterElement(35155, 35159), //
-						m(GoodWe.ChannelId.LOAD_MODE_T, new UnsignedWordElement(35160)), //
+						this.m(GoodWe.ChannelId.LOAD_MODE_T, new UnsignedWordElement(35160)), //
 						new DummyRegisterElement(35161, 35162), //
-						m(GoodWe.ChannelId.P_LOAD_R, new SignedDoublewordElement(35163)), //
-						m(GoodWe.ChannelId.P_LOAD_S, new SignedDoublewordElement(35165)), //
-						m(GoodWe.ChannelId.P_LOAD_T, new SignedDoublewordElement(35167)), //
-						m(GoodWe.ChannelId.TOTAL_BACK_UP_LOAD_POWER, new SignedDoublewordElement(35169)), //
-						m(GoodWe.ChannelId.TOTAL_LOAD_POWER, new SignedDoublewordElement(35171)), //
-						m(GoodWe.ChannelId.UPS_LOAD_PERCENT, new UnsignedWordElement(35173),
+						this.m(GoodWe.ChannelId.P_LOAD_R, new SignedDoublewordElement(35163)), //
+						this.m(GoodWe.ChannelId.P_LOAD_S, new SignedDoublewordElement(35165)), //
+						this.m(GoodWe.ChannelId.P_LOAD_T, new SignedDoublewordElement(35167)), //
+						this.m(GoodWe.ChannelId.TOTAL_BACK_UP_LOAD_POWER, new SignedDoublewordElement(35169)), //
+						this.m(GoodWe.ChannelId.TOTAL_LOAD_POWER, new SignedDoublewordElement(35171)), //
+						this.m(GoodWe.ChannelId.UPS_LOAD_PERCENT, new UnsignedWordElement(35173),
 								ElementToChannelConverter.SCALE_FACTOR_MINUS_2), //
-						m(GoodWe.ChannelId.AIR_TEMPERATURE, new SignedWordElement(35174),
+						this.m(GoodWe.ChannelId.AIR_TEMPERATURE, new SignedWordElement(35174),
 								ElementToChannelConverter.SCALE_FACTOR_MINUS_1), //
-						m(GoodWe.ChannelId.MODULE_TEMPERATURE, new SignedWordElement(35175),
+						this.m(GoodWe.ChannelId.MODULE_TEMPERATURE, new SignedWordElement(35175),
 								ElementToChannelConverter.SCALE_FACTOR_MINUS_1), //
-						m(GoodWe.ChannelId.RADIATOR_TEMPERATURE, new SignedWordElement(35176),
+						this.m(GoodWe.ChannelId.RADIATOR_TEMPERATURE, new SignedWordElement(35176),
 								ElementToChannelConverter.SCALE_FACTOR_MINUS_1), //
-						m(GoodWe.ChannelId.FUNCTION_BIT_VALUE, new UnsignedWordElement(35177)), //
-						m(GoodWe.ChannelId.BUS_VOLTAGE, new UnsignedWordElement(35178),
+						this.m(GoodWe.ChannelId.FUNCTION_BIT_VALUE, new UnsignedWordElement(35177)), //
+						this.m(GoodWe.ChannelId.BUS_VOLTAGE, new UnsignedWordElement(35178),
 								ElementToChannelConverter.SCALE_FACTOR_MINUS_1), //
-						m(GoodWe.ChannelId.NBUS_VOLTAGE, new UnsignedWordElement(35179),
+						this.m(GoodWe.ChannelId.NBUS_VOLTAGE, new UnsignedWordElement(35179),
 								ElementToChannelConverter.SCALE_FACTOR_MINUS_1)), //
 
 				new FC3ReadRegistersTask(35180, Priority.HIGH, //
-						m(GoodWe.ChannelId.V_BATTERY1, new UnsignedWordElement(35180),
+						this.m(GoodWe.ChannelId.V_BATTERY1, new UnsignedWordElement(35180),
 								ElementToChannelConverter.SCALE_FACTOR_MINUS_1), //
-						m(GoodWe.ChannelId.I_BATTERY1, new SignedWordElement(35181),
+						this.m(GoodWe.ChannelId.I_BATTERY1, new SignedWordElement(35181),
 								ElementToChannelConverter.SCALE_FACTOR_MINUS_1), //
 						// Required for calculation of ActivePower; wrongly documented in official
 						// Modbus protocol v1.9 as being Unsigned.
-						m(GoodWe.ChannelId.P_BATTERY1, new SignedDoublewordElement(35182)),
-						m(GoodWe.ChannelId.BATTERY_MODE, new UnsignedWordElement(35184))), //
+						this.m(GoodWe.ChannelId.P_BATTERY1, new SignedDoublewordElement(35182)),
+						this.m(GoodWe.ChannelId.BATTERY_MODE, new UnsignedWordElement(35184))), //
 
 				new FC3ReadRegistersTask(35186, Priority.LOW, //
-						m(GoodWe.ChannelId.SAFETY_COUNTRY, new UnsignedWordElement(35186)), //
-						m(GoodWe.ChannelId.WORK_MODE, new UnsignedWordElement(35187)), //
+						this.m(GoodWe.ChannelId.SAFETY_COUNTRY, new UnsignedWordElement(35186)), //
+						this.m(GoodWe.ChannelId.WORK_MODE, new UnsignedWordElement(35187)), //
 						new DummyRegisterElement(35188), //
-						m(new BitsWordElement(35189, this) //
+						this.m(new BitsWordElement(35189, this) //
 								.bit(0, GoodWe.ChannelId.STATE_0) //
 								.bit(1, GoodWe.ChannelId.STATE_1) //
 								.bit(2, GoodWe.ChannelId.STATE_2) //
@@ -254,7 +255,7 @@ protected final ModbusProtocol defineModbusProtocol() throws OpenemsException {
 								.bit(14, GoodWe.ChannelId.STATE_14)//
 								.bit(15, GoodWe.ChannelId.STATE_15)//
 						), //
-						m(new BitsWordElement(35190, this) //
+						this.m(new BitsWordElement(35190, this) //
 								.bit(0, GoodWe.ChannelId.STATE_16) //
 								.bit(1, GoodWe.ChannelId.STATE_17) //
 								.bit(2, GoodWe.ChannelId.STATE_18) //
@@ -274,42 +275,42 @@ protected final ModbusProtocol defineModbusProtocol() throws OpenemsException {
 						), //
 
 						// The total PV production energy from installation
-						m(GoodWe.ChannelId.PV_E_TOTAL, new UnsignedDoublewordElement(35191),
+						this.m(GoodWe.ChannelId.PV_E_TOTAL, new UnsignedDoublewordElement(35191),
 								ElementToChannelConverter.SCALE_FACTOR_MINUS_1), //
-						m(GoodWe.ChannelId.PV_E_DAY, new UnsignedDoublewordElement(35193),
+						this.m(GoodWe.ChannelId.PV_E_DAY, new UnsignedDoublewordElement(35193),
 								ElementToChannelConverter.SCALE_FACTOR_MINUS_1), //
 						new DummyRegisterElement(35195, 35196), //
-						m(GoodWe.ChannelId.H_TOTAL, new UnsignedDoublewordElement(35197)), //
-						m(GoodWe.ChannelId.E_DAY_SELL, new UnsignedWordElement(35199),
+						this.m(GoodWe.ChannelId.H_TOTAL, new UnsignedDoublewordElement(35197)), //
+						this.m(GoodWe.ChannelId.E_DAY_SELL, new UnsignedWordElement(35199),
 								ElementToChannelConverter.SCALE_FACTOR_MINUS_1), //
-						m(GoodWe.ChannelId.E_TOTAL_BUY, new UnsignedDoublewordElement(35200),
+						this.m(GoodWe.ChannelId.E_TOTAL_BUY, new UnsignedDoublewordElement(35200),
 								ElementToChannelConverter.SCALE_FACTOR_MINUS_1), //
-						m(GoodWe.ChannelId.E_DAY_BUY, new UnsignedWordElement(35202),
+						this.m(GoodWe.ChannelId.E_DAY_BUY, new UnsignedWordElement(35202),
 								ElementToChannelConverter.SCALE_FACTOR_MINUS_1), //
-						m(GoodWe.ChannelId.E_TOTAL_LOAD, new UnsignedDoublewordElement(35203),
+						this.m(GoodWe.ChannelId.E_TOTAL_LOAD, new UnsignedDoublewordElement(35203),
 								ElementToChannelConverter.SCALE_FACTOR_MINUS_1), //
-						m(GoodWe.ChannelId.E_LOAD_DAY, new UnsignedWordElement(35205),
+						this.m(GoodWe.ChannelId.E_LOAD_DAY, new UnsignedWordElement(35205),
 								ElementToChannelConverter.SCALE_FACTOR_MINUS_1), //
-						m(GoodWe.ChannelId.E_BATTERY_CHARGE, new UnsignedDoublewordElement(35206), //
+						this.m(GoodWe.ChannelId.E_BATTERY_CHARGE, new UnsignedDoublewordElement(35206), //
 								ElementToChannelConverter.SCALE_FACTOR_2), //
-						m(GoodWe.ChannelId.E_CHARGE_DAY, new UnsignedWordElement(35208),
+						this.m(GoodWe.ChannelId.E_CHARGE_DAY, new UnsignedWordElement(35208),
 								ElementToChannelConverter.SCALE_FACTOR_MINUS_1), //
-						m(GoodWe.ChannelId.E_BATTERY_DISCHARGE, new UnsignedDoublewordElement(35209),
+						this.m(GoodWe.ChannelId.E_BATTERY_DISCHARGE, new UnsignedDoublewordElement(35209),
 								ElementToChannelConverter.SCALE_FACTOR_2), //
-						m(GoodWe.ChannelId.E_DISCHARGE_DAY, new UnsignedWordElement(35211),
+						this.m(GoodWe.ChannelId.E_DISCHARGE_DAY, new UnsignedWordElement(35211),
 								ElementToChannelConverter.SCALE_FACTOR_MINUS_1), //
-						m(GoodWe.ChannelId.BATTERY_STRINGS, new UnsignedWordElement(35212)), //
-						m(GoodWe.ChannelId.CPLD_WARNING_CODE, new UnsignedWordElement(35213)), //
+						this.m(GoodWe.ChannelId.BATTERY_STRINGS, new UnsignedWordElement(35212)), //
+						this.m(GoodWe.ChannelId.CPLD_WARNING_CODE, new UnsignedWordElement(35213)), //
 						new DummyRegisterElement(35214, 35217), //
-						m(GoodWe.ChannelId.DIAG_STATUS_H, new UnsignedDoublewordElement(35218)), //
-						m(GoodWe.ChannelId.DIAG_STATUS_L, new UnsignedDoublewordElement(35220)), //
+						this.m(GoodWe.ChannelId.DIAG_STATUS_H, new UnsignedDoublewordElement(35218)), //
+						this.m(GoodWe.ChannelId.DIAG_STATUS_L, new UnsignedDoublewordElement(35220)), //
 						new DummyRegisterElement(35222, 35224), //
-						m(GoodWe.ChannelId.EH_BATTERY_FUNCTION_ACTIVE, new UnsignedWordElement(35225)), //
-						m(GoodWe.ChannelId.ARC_SELF_CHECK_STATUS, new UnsignedWordElement(35226)) //
+						this.m(GoodWe.ChannelId.EH_BATTERY_FUNCTION_ACTIVE, new UnsignedWordElement(35225)), //
+						this.m(GoodWe.ChannelId.ARC_SELF_CHECK_STATUS, new UnsignedWordElement(35226)) //
 				),
 
 				new FC3ReadRegistersTask(35250, Priority.LOW, //
-						m(new BitsWordElement(35250, this) //
+						this.m(new BitsWordElement(35250, this) //
 								.bit(0, GoodWe.ChannelId.STATE_70) //
 								.bit(1, GoodWe.ChannelId.STATE_71) //
 								.bit(2, GoodWe.ChannelId.STATE_72) //
@@ -326,7 +327,7 @@ protected final ModbusProtocol defineModbusProtocol() throws OpenemsException {
 								.bit(13, GoodWe.ChannelId.STATE_83) //
 								.bit(14, GoodWe.ChannelId.STATE_84) //
 								.bit(15, GoodWe.ChannelId.STATE_85)), //
-						m(new BitsWordElement(35251, this) //
+						this.m(new BitsWordElement(35251, this) //
 								.bit(0, GoodWe.ChannelId.STATE_86) //
 								.bit(1, GoodWe.ChannelId.STATE_87) //
 								.bit(2, GoodWe.ChannelId.STATE_88) //
@@ -337,7 +338,7 @@ protected final ModbusProtocol defineModbusProtocol() throws OpenemsException {
 								.bit(7, GoodWe.ChannelId.STATE_93) //
 						), //
 						new DummyRegisterElement(35252, 35253), //
-						m(new BitsWordElement(35254, this) //
+						this.m(new BitsWordElement(35254, this) //
 								.bit(0, GoodWe.ChannelId.STATE_94) //
 								.bit(1, GoodWe.ChannelId.STATE_95) //
 								.bit(2, GoodWe.ChannelId.STATE_96) //
@@ -354,7 +355,7 @@ protected final ModbusProtocol defineModbusProtocol() throws OpenemsException {
 								.bit(13, GoodWe.ChannelId.STATE_107) //
 								.bit(14, GoodWe.ChannelId.STATE_108) //
 								.bit(15, GoodWe.ChannelId.STATE_109)), //
-						m(new BitsWordElement(35255, this) //
+						this.m(new BitsWordElement(35255, this) //
 								.bit(0, GoodWe.ChannelId.STATE_110) //
 								.bit(1, GoodWe.ChannelId.STATE_111) //
 								.bit(2, GoodWe.ChannelId.STATE_112) //
@@ -364,7 +365,7 @@ protected final ModbusProtocol defineModbusProtocol() throws OpenemsException {
 								.bit(6, GoodWe.ChannelId.STATE_116) //
 						), //
 						new DummyRegisterElement(35256, 35257), //
-						m(new BitsWordElement(35258, this) //
+						this.m(new BitsWordElement(35258, this) //
 								.bit(0, GoodWe.ChannelId.STATE_117) //
 								.bit(1, GoodWe.ChannelId.STATE_118) //
 								.bit(2, GoodWe.ChannelId.STATE_119) //
@@ -381,7 +382,7 @@ protected final ModbusProtocol defineModbusProtocol() throws OpenemsException {
 								.bit(13, GoodWe.ChannelId.STATE_130) //
 								.bit(14, GoodWe.ChannelId.STATE_131) //
 								.bit(15, GoodWe.ChannelId.STATE_132)), //
-						m(new BitsWordElement(35259, this) //
+						this.m(new BitsWordElement(35259, this) //
 								.bit(0, GoodWe.ChannelId.STATE_133) //
 								.bit(1, GoodWe.ChannelId.STATE_134) //
 								.bit(2, GoodWe.ChannelId.STATE_135) //
@@ -389,38 +390,41 @@ protected final ModbusProtocol defineModbusProtocol() throws OpenemsException {
 								.bit(4, GoodWe.ChannelId.STATE_137) //
 						), //
 						new DummyRegisterElement(35260, 35267), //
-						m(GoodWe.ChannelId.MAX_GRID_FREQ_WITHIN_1_MINUTE, new UnsignedWordElement(35268),
+						this.m(GoodWe.ChannelId.MAX_GRID_FREQ_WITHIN_1_MINUTE, new UnsignedWordElement(35268),
 								ElementToChannelConverter.SCALE_FACTOR_MINUS_2), //
-						m(GoodWe.ChannelId.MIN_GRID_FREQ_WITHIN_1_MINUTE, new UnsignedWordElement(35269),
+						this.m(GoodWe.ChannelId.MIN_GRID_FREQ_WITHIN_1_MINUTE, new UnsignedWordElement(35269),
 								ElementToChannelConverter.SCALE_FACTOR_MINUS_2), //
-						m(GoodWe.ChannelId.MAX_GRID_VOLTAGE_WITHIN_1_MINUTE_R, new UnsignedWordElement(35270),
+						this.m(GoodWe.ChannelId.MAX_GRID_VOLTAGE_WITHIN_1_MINUTE_R, new UnsignedWordElement(35270),
 								ElementToChannelConverter.SCALE_FACTOR_MINUS_1), //
-						m(GoodWe.ChannelId.MIN_GRID_VOLTAGE_WITHIN_1_MINUTE_R, new UnsignedWordElement(35271),
+						this.m(GoodWe.ChannelId.MIN_GRID_VOLTAGE_WITHIN_1_MINUTE_R, new UnsignedWordElement(35271),
 								ElementToChannelConverter.SCALE_FACTOR_MINUS_1), //
-						m(GoodWe.ChannelId.MAX_GRID_VOLTAGE_WITHIN_1_MINUTE_S, new UnsignedWordElement(35272),
+						this.m(GoodWe.ChannelId.MAX_GRID_VOLTAGE_WITHIN_1_MINUTE_S, new UnsignedWordElement(35272),
 								ElementToChannelConverter.SCALE_FACTOR_MINUS_1), //
-						m(GoodWe.ChannelId.MIN_GRID_VOLTAGE_WITHIN_1_MINUTE_S, new UnsignedWordElement(35273),
+						this.m(GoodWe.ChannelId.MIN_GRID_VOLTAGE_WITHIN_1_MINUTE_S, new UnsignedWordElement(35273),
 								ElementToChannelConverter.SCALE_FACTOR_MINUS_1), //
-						m(GoodWe.ChannelId.MAX_GRID_VOLTAGE_WITHIN_1_MINUTE_T, new UnsignedWordElement(35274),
+						this.m(GoodWe.ChannelId.MAX_GRID_VOLTAGE_WITHIN_1_MINUTE_T, new UnsignedWordElement(35274),
 								ElementToChannelConverter.SCALE_FACTOR_MINUS_1), //
-						m(GoodWe.ChannelId.MIN_GRID_VOLTAGE_WITHIN_1_MINUTE_T, new UnsignedWordElement(35275),
+						this.m(GoodWe.ChannelId.MIN_GRID_VOLTAGE_WITHIN_1_MINUTE_T, new UnsignedWordElement(35275),
 								ElementToChannelConverter.SCALE_FACTOR_MINUS_1), //
-						m(GoodWe.ChannelId.MAX_BACKUP_POWER_WITHIN_1_MINUTE_R, new UnsignedDoublewordElement(35276)), //
-						m(GoodWe.ChannelId.MAX_BACKUP_POWER_WITHIN_1_MINUTE_S, new UnsignedDoublewordElement(35278)), //
-						m(GoodWe.ChannelId.MAX_BACKUP_POWER_WITHIN_1_MINUTE_T, new UnsignedDoublewordElement(35280)), //
-						m(GoodWe.ChannelId.MAX_BACKUP_POWER_WITHIN_1_MINUTE_TOTAL,
+						this.m(GoodWe.ChannelId.MAX_BACKUP_POWER_WITHIN_1_MINUTE_R,
+								new UnsignedDoublewordElement(35276)), //
+						this.m(GoodWe.ChannelId.MAX_BACKUP_POWER_WITHIN_1_MINUTE_S,
+								new UnsignedDoublewordElement(35278)), //
+						this.m(GoodWe.ChannelId.MAX_BACKUP_POWER_WITHIN_1_MINUTE_T,
+								new UnsignedDoublewordElement(35280)), //
+						this.m(GoodWe.ChannelId.MAX_BACKUP_POWER_WITHIN_1_MINUTE_TOTAL,
 								new UnsignedDoublewordElement(35282)), //
-						m(GoodWe.ChannelId.GRID_HVRT_EVENT_TIMES, new UnsignedWordElement(35284)), //
-						m(GoodWe.ChannelId.GRID_LVRT_EVENT_TIMES, new UnsignedWordElement(35285)), //
-						m(GoodWe.ChannelId.INV_ERROR_MSG_RECORD_FOR_EMS, new UnsignedDoublewordElement(35286)), //
-						m(GoodWe.ChannelId.INV_WARNING_CODE_RECORD_FOR_EMS, new UnsignedDoublewordElement(35288)), //
-						m(GoodWe.ChannelId.INV_CPLD_WARNING_RECORD_FOR_EMS, new UnsignedDoublewordElement(35290)) //
+						this.m(GoodWe.ChannelId.GRID_HVRT_EVENT_TIMES, new UnsignedWordElement(35284)), //
+						this.m(GoodWe.ChannelId.GRID_LVRT_EVENT_TIMES, new UnsignedWordElement(35285)), //
+						this.m(GoodWe.ChannelId.INV_ERROR_MSG_RECORD_FOR_EMS, new UnsignedDoublewordElement(35286)), //
+						this.m(GoodWe.ChannelId.INV_WARNING_CODE_RECORD_FOR_EMS, new UnsignedDoublewordElement(35288)), //
+						this.m(GoodWe.ChannelId.INV_CPLD_WARNING_RECORD_FOR_EMS, new UnsignedDoublewordElement(35290)) //
 				),
 
 				// Registers 36066 to 36120 throw "Illegal Data Address"
 
 				new FC3ReadRegistersTask(37000, Priority.LOW, //
-						m(new BitsWordElement(37000, this) //
+						this.m(new BitsWordElement(37000, this) //
 								.bit(0, GoodWe.ChannelId.DRM0)//
 								.bit(1, GoodWe.ChannelId.DRM1)//
 								.bit(2, GoodWe.ChannelId.DRM2)//
@@ -432,13 +436,13 @@ protected final ModbusProtocol defineModbusProtocol() throws OpenemsException {
 								.bit(8, GoodWe.ChannelId.DRM8)//
 								.bit(15, GoodWe.ChannelId.DRED_CONNECT)//
 						), //
-						m(GoodWe.ChannelId.BATTERY_TYPE_INDEX, new UnsignedWordElement(37001)), //
-						m(GoodWe.ChannelId.BMS_STATUS, new UnsignedWordElement(37002)), //
-						m(GoodWe.ChannelId.BMS_PACK_TEMPERATURE, new UnsignedWordElement(37003),
+						this.m(GoodWe.ChannelId.BATTERY_TYPE_INDEX, new UnsignedWordElement(37001)), //
+						this.m(GoodWe.ChannelId.BMS_STATUS, new UnsignedWordElement(37002)), //
+						this.m(GoodWe.ChannelId.BMS_PACK_TEMPERATURE, new UnsignedWordElement(37003),
 								ElementToChannelConverter.SCALE_FACTOR_MINUS_1), //
-						m(GoodWe.ChannelId.BMS_CHARGE_IMAX, new UnsignedWordElement(37004)), //
-						m(GoodWe.ChannelId.BMS_DISCHARGE_IMAX, new UnsignedWordElement(37005)), //
-						m(new BitsWordElement(37006, this) //
+						this.m(GoodWe.ChannelId.BMS_CHARGE_IMAX, new UnsignedWordElement(37004)), //
+						this.m(GoodWe.ChannelId.BMS_DISCHARGE_IMAX, new UnsignedWordElement(37005)), //
+						this.m(new BitsWordElement(37006, this) //
 								.bit(0, GoodWe.ChannelId.STATE_42)//
 								.bit(1, GoodWe.ChannelId.STATE_43)//
 								.bit(2, GoodWe.ChannelId.STATE_44)//
@@ -457,9 +461,9 @@ protected final ModbusProtocol defineModbusProtocol() throws OpenemsException {
 								.bit(15, GoodWe.ChannelId.STATE_57)//
 						), //
 						this.getSocModbusElement(37007), //
-						m(GoodWe.ChannelId.BMS_SOH, new UnsignedWordElement(37008)), //
-						m(GoodWe.ChannelId.BMS_BATTERY_STRINGS, new UnsignedWordElement(37009)), //
-						m(new BitsWordElement(37010, this) //
+						this.m(GoodWe.ChannelId.BMS_SOH, new UnsignedWordElement(37008)), //
+						this.m(GoodWe.ChannelId.BMS_BATTERY_STRINGS, new UnsignedWordElement(37009)), //
+						this.m(new BitsWordElement(37010, this) //
 								.bit(0, GoodWe.ChannelId.STATE_58)//
 								.bit(1, GoodWe.ChannelId.STATE_59)//
 								.bit(2, GoodWe.ChannelId.STATE_60)//
@@ -473,389 +477,390 @@ protected final ModbusProtocol defineModbusProtocol() throws OpenemsException {
 								.bit(10, GoodWe.ChannelId.STATE_68)//
 								.bit(11, GoodWe.ChannelId.STATE_69)//
 						), //
-						m(GoodWe.ChannelId.BATTERY_PROTOCOL, new UnsignedWordElement(37011)), //
+						this.m(GoodWe.ChannelId.BATTERY_PROTOCOL, new UnsignedWordElement(37011)), //
 						// TODO BMS_ERROR_CODE_H register 37012 Table 8-7 BMS Alarm Code bits Bit16-31
 						// are reserved
 						// TODO Same for BMS_WARNING_CODE_H Table 8-8
 						new DummyRegisterElement(37012, 37013), //
-						m(GoodWe.ChannelId.BMS_SOFTWARE_VERSION, new UnsignedWordElement(37014)), //
-						m(GoodWe.ChannelId.BATTERY_HARDWARE_VERSION, new UnsignedWordElement(37015)), //
-						m(GoodWe.ChannelId.MAXIMUM_CELL_TEMPERATURE_ID, new UnsignedWordElement(37016)), //
-						m(GoodWe.ChannelId.MINIMUM_CELL_TEMPERATURE_ID, new UnsignedWordElement(37017)), //
-						m(GoodWe.ChannelId.MAXIMUM_CELL_VOLTAGE_ID, new UnsignedWordElement(37018)), //
-						m(GoodWe.ChannelId.MINIMUM_CELL_VOLTAGE_ID, new UnsignedWordElement(37019)), //
-						m(GoodWe.ChannelId.MAXIMUM_CELL_TEMPERATURE, new UnsignedWordElement(37020),
-								ElementToChannelConverter.SCALE_FACTOR_MINUS_1), //
-						m(GoodWe.ChannelId.MINIMUM_CELL_TEMPERATURE, new UnsignedWordElement(37021),
-								ElementToChannelConverter.SCALE_FACTOR_MINUS_1), //
-						m(GoodWe.ChannelId.MAXIMUM_CELL_VOLTAGE, new UnsignedWordElement(37022)), //
-						m(GoodWe.ChannelId.MINIMUM_CELL_VOLTAGE, new UnsignedWordElement(37023)), //
-						m(GoodWe.ChannelId.PASS_INFORMATION_1, new UnsignedWordElement(37024)), //
-						m(GoodWe.ChannelId.PASS_INFORMATION_2, new UnsignedWordElement(37025)), //
-						m(GoodWe.ChannelId.PASS_INFORMATION_3, new UnsignedWordElement(37026)), //
-						m(GoodWe.ChannelId.PASS_INFORMATION_4, new UnsignedWordElement(37027)), //
-						m(GoodWe.ChannelId.PASS_INFORMATION_5, new UnsignedWordElement(37028)), //
-						m(GoodWe.ChannelId.PASS_INFORMATION_6, new UnsignedWordElement(37029)), //
-						m(GoodWe.ChannelId.PASS_INFORMATION_7, new UnsignedWordElement(37030)), //
-						m(GoodWe.ChannelId.PASS_INFORMATION_8, new UnsignedWordElement(37031)), //
-						m(GoodWe.ChannelId.PASS_INFORMATION_9, new UnsignedWordElement(37032)), //
-						m(GoodWe.ChannelId.PASS_INFORMATION_10, new UnsignedWordElement(37033)), //
-						m(GoodWe.ChannelId.PASS_INFORMATION_11, new UnsignedWordElement(37034)), //
-						m(GoodWe.ChannelId.PASS_INFORMATION_12, new UnsignedWordElement(37035)), //
-						m(GoodWe.ChannelId.PASS_INFORMATION_13, new UnsignedWordElement(37036)), //
-						m(GoodWe.ChannelId.PASS_INFORMATION_14, new UnsignedWordElement(37037)), //
-						m(GoodWe.ChannelId.PASS_INFORMATION_15, new UnsignedWordElement(37038)), //
-						m(GoodWe.ChannelId.PASS_INFORMATION_16, new UnsignedWordElement(37039)), //
-						m(GoodWe.ChannelId.PASS_INFORMATION_17, new UnsignedWordElement(37040)), //
-						m(GoodWe.ChannelId.PASS_INFORMATION_18, new UnsignedWordElement(37041)), //
-						m(GoodWe.ChannelId.PASS_INFORMATION_19, new UnsignedWordElement(37042)), //
-						m(GoodWe.ChannelId.PASS_INFORMATION_20, new UnsignedWordElement(37043)), //
-						m(GoodWe.ChannelId.PASS_INFORMATION_21, new UnsignedWordElement(37044)), //
-						m(GoodWe.ChannelId.PASS_INFORMATION_22, new UnsignedWordElement(37045)), //
-						m(GoodWe.ChannelId.PASS_INFORMATION_23, new UnsignedWordElement(37046)), //
-						m(GoodWe.ChannelId.PASS_INFORMATION_24, new UnsignedWordElement(37047)), //
-						m(GoodWe.ChannelId.PASS_INFORMATION_25, new UnsignedWordElement(37048)), //
-						m(GoodWe.ChannelId.PASS_INFORMATION_26, new UnsignedWordElement(37049)), //
-						m(GoodWe.ChannelId.PASS_INFORMATION_27, new UnsignedWordElement(37050)), //
-						m(GoodWe.ChannelId.PASS_INFORMATION_28, new UnsignedWordElement(37051)), //
-						m(GoodWe.ChannelId.PASS_INFORMATION_29, new UnsignedWordElement(37052)), //
-						m(GoodWe.ChannelId.PASS_INFORMATION_30, new UnsignedWordElement(37053)), //
-						m(GoodWe.ChannelId.PASS_INFORMATION_31, new UnsignedWordElement(37054)), //
-						m(GoodWe.ChannelId.PASS_INFORMATION_32, new UnsignedWordElement(37055))), //
+						this.m(GoodWe.ChannelId.BMS_SOFTWARE_VERSION, new UnsignedWordElement(37014)), //
+						this.m(GoodWe.ChannelId.BATTERY_HARDWARE_VERSION, new UnsignedWordElement(37015)), //
+						this.m(GoodWe.ChannelId.MAXIMUM_CELL_TEMPERATURE_ID, new UnsignedWordElement(37016)), //
+						this.m(GoodWe.ChannelId.MINIMUM_CELL_TEMPERATURE_ID, new UnsignedWordElement(37017)), //
+						this.m(GoodWe.ChannelId.MAXIMUM_CELL_VOLTAGE_ID, new UnsignedWordElement(37018)), //
+						this.m(GoodWe.ChannelId.MINIMUM_CELL_VOLTAGE_ID, new UnsignedWordElement(37019)), //
+						this.m(GoodWe.ChannelId.MAXIMUM_CELL_TEMPERATURE, new UnsignedWordElement(37020),
+								ElementToChannelConverter.SCALE_FACTOR_MINUS_1), //
+						this.m(GoodWe.ChannelId.MINIMUM_CELL_TEMPERATURE, new UnsignedWordElement(37021),
+								ElementToChannelConverter.SCALE_FACTOR_MINUS_1), //
+						this.m(GoodWe.ChannelId.MAXIMUM_CELL_VOLTAGE, new UnsignedWordElement(37022)), //
+						this.m(GoodWe.ChannelId.MINIMUM_CELL_VOLTAGE, new UnsignedWordElement(37023)), //
+						this.m(GoodWe.ChannelId.PASS_INFORMATION_1, new UnsignedWordElement(37024)), //
+						this.m(GoodWe.ChannelId.PASS_INFORMATION_2, new UnsignedWordElement(37025)), //
+						this.m(GoodWe.ChannelId.PASS_INFORMATION_3, new UnsignedWordElement(37026)), //
+						this.m(GoodWe.ChannelId.PASS_INFORMATION_4, new UnsignedWordElement(37027)), //
+						this.m(GoodWe.ChannelId.PASS_INFORMATION_5, new UnsignedWordElement(37028)), //
+						this.m(GoodWe.ChannelId.PASS_INFORMATION_6, new UnsignedWordElement(37029)), //
+						this.m(GoodWe.ChannelId.PASS_INFORMATION_7, new UnsignedWordElement(37030)), //
+						this.m(GoodWe.ChannelId.PASS_INFORMATION_8, new UnsignedWordElement(37031)), //
+						this.m(GoodWe.ChannelId.PASS_INFORMATION_9, new UnsignedWordElement(37032)), //
+						this.m(GoodWe.ChannelId.PASS_INFORMATION_10, new UnsignedWordElement(37033)), //
+						this.m(GoodWe.ChannelId.PASS_INFORMATION_11, new UnsignedWordElement(37034)), //
+						this.m(GoodWe.ChannelId.PASS_INFORMATION_12, new UnsignedWordElement(37035)), //
+						this.m(GoodWe.ChannelId.PASS_INFORMATION_13, new UnsignedWordElement(37036)), //
+						this.m(GoodWe.ChannelId.PASS_INFORMATION_14, new UnsignedWordElement(37037)), //
+						this.m(GoodWe.ChannelId.PASS_INFORMATION_15, new UnsignedWordElement(37038)), //
+						this.m(GoodWe.ChannelId.PASS_INFORMATION_16, new UnsignedWordElement(37039)), //
+						this.m(GoodWe.ChannelId.PASS_INFORMATION_17, new UnsignedWordElement(37040)), //
+						this.m(GoodWe.ChannelId.PASS_INFORMATION_18, new UnsignedWordElement(37041)), //
+						this.m(GoodWe.ChannelId.PASS_INFORMATION_19, new UnsignedWordElement(37042)), //
+						this.m(GoodWe.ChannelId.PASS_INFORMATION_20, new UnsignedWordElement(37043)), //
+						this.m(GoodWe.ChannelId.PASS_INFORMATION_21, new UnsignedWordElement(37044)), //
+						this.m(GoodWe.ChannelId.PASS_INFORMATION_22, new UnsignedWordElement(37045)), //
+						this.m(GoodWe.ChannelId.PASS_INFORMATION_23, new UnsignedWordElement(37046)), //
+						this.m(GoodWe.ChannelId.PASS_INFORMATION_24, new UnsignedWordElement(37047)), //
+						this.m(GoodWe.ChannelId.PASS_INFORMATION_25, new UnsignedWordElement(37048)), //
+						this.m(GoodWe.ChannelId.PASS_INFORMATION_26, new UnsignedWordElement(37049)), //
+						this.m(GoodWe.ChannelId.PASS_INFORMATION_27, new UnsignedWordElement(37050)), //
+						this.m(GoodWe.ChannelId.PASS_INFORMATION_28, new UnsignedWordElement(37051)), //
+						this.m(GoodWe.ChannelId.PASS_INFORMATION_29, new UnsignedWordElement(37052)), //
+						this.m(GoodWe.ChannelId.PASS_INFORMATION_30, new UnsignedWordElement(37053)), //
+						this.m(GoodWe.ChannelId.PASS_INFORMATION_31, new UnsignedWordElement(37054)), //
+						this.m(GoodWe.ChannelId.PASS_INFORMATION_32, new UnsignedWordElement(37055))), //
 
 				// Registers 40000 to 42011 for BTC and ETC throw "Illegal Data Address"
 
 				// Setting and Controlling Data Registers
 				new FC3ReadRegistersTask(45127, Priority.ONCE, //
-						m(GoodWe.ChannelId.INVERTER_UNIT_ID, new UnsignedWordElement(45127)), //
+						this.m(GoodWe.ChannelId.INVERTER_UNIT_ID, new UnsignedWordElement(45127)), //
 						new DummyRegisterElement(45128, 45131), //
-						m(GoodWe.ChannelId.MODBUS_BAUDRATE, new UnsignedDoublewordElement(45132))), //
+						this.m(GoodWe.ChannelId.MODBUS_BAUDRATE, new UnsignedDoublewordElement(45132))), //
 
 				new FC3ReadRegistersTask(45222, Priority.LOW, //
 						// to read or write the accumulated energy battery discharged, of the day Not
 						// from BMS
-						m(GoodWe.ChannelId.PV_E_TOTAL_2, new UnsignedDoublewordElement(45222),
+						this.m(GoodWe.ChannelId.PV_E_TOTAL_2, new UnsignedDoublewordElement(45222),
 								ElementToChannelConverter.SCALE_FACTOR_MINUS_1), //
-						m(GoodWe.ChannelId.PV_E_DAY_2, new UnsignedDoublewordElement(45224),
+						this.m(GoodWe.ChannelId.PV_E_DAY_2, new UnsignedDoublewordElement(45224),
 								ElementToChannelConverter.SCALE_FACTOR_MINUS_1), //
-						m(GoodWe.ChannelId.E_TOTAL_SELL_2, new UnsignedDoublewordElement(45226),
+						this.m(GoodWe.ChannelId.E_TOTAL_SELL_2, new UnsignedDoublewordElement(45226),
 								ElementToChannelConverter.SCALE_FACTOR_MINUS_1), //
-						m(GoodWe.ChannelId.H_TOTAL_2, new UnsignedDoublewordElement(45228)), //
-						m(GoodWe.ChannelId.E_DAY_SELL_2, new UnsignedWordElement(45230),
+						this.m(GoodWe.ChannelId.H_TOTAL_2, new UnsignedDoublewordElement(45228)), //
+						this.m(GoodWe.ChannelId.E_DAY_SELL_2, new UnsignedWordElement(45230),
 								ElementToChannelConverter.SCALE_FACTOR_MINUS_1), //
-						m(GoodWe.ChannelId.E_TOTAL_BUY_2, new UnsignedDoublewordElement(45231),
+						this.m(GoodWe.ChannelId.E_TOTAL_BUY_2, new UnsignedDoublewordElement(45231),
 								ElementToChannelConverter.SCALE_FACTOR_MINUS_1), //
-						m(GoodWe.ChannelId.E_DAY_BUY_2, new UnsignedWordElement(45233),
+						this.m(GoodWe.ChannelId.E_DAY_BUY_2, new UnsignedWordElement(45233),
 								ElementToChannelConverter.SCALE_FACTOR_MINUS_1), //
-						m(GoodWe.ChannelId.E_TOTAL_LOAD_2, new UnsignedDoublewordElement(45234),
+						this.m(GoodWe.ChannelId.E_TOTAL_LOAD_2, new UnsignedDoublewordElement(45234),
 								ElementToChannelConverter.SCALE_FACTOR_MINUS_1), //
-						m(GoodWe.ChannelId.E_LOAD_DAY_2, new UnsignedWordElement(45236),
+						this.m(GoodWe.ChannelId.E_LOAD_DAY_2, new UnsignedWordElement(45236),
 								ElementToChannelConverter.SCALE_FACTOR_MINUS_1), //
-						m(GoodWe.ChannelId.E_BATTERY_CHARGE_2, new UnsignedDoublewordElement(45237),
+						this.m(GoodWe.ChannelId.E_BATTERY_CHARGE_2, new UnsignedDoublewordElement(45237),
 								ElementToChannelConverter.SCALE_FACTOR_MINUS_1), //
-						m(GoodWe.ChannelId.E_CHARGE_DAY_2, new UnsignedWordElement(45239),
+						this.m(GoodWe.ChannelId.E_CHARGE_DAY_2, new UnsignedWordElement(45239),
 								ElementToChannelConverter.SCALE_FACTOR_MINUS_1), //
-						m(GoodWe.ChannelId.E_BATTERY_DISCHARGE_2, new UnsignedDoublewordElement(45240),
+						this.m(GoodWe.ChannelId.E_BATTERY_DISCHARGE_2, new UnsignedDoublewordElement(45240),
 								ElementToChannelConverter.SCALE_FACTOR_MINUS_1), //
-						m(GoodWe.ChannelId.E_DISCHARGE_DAY_2, new UnsignedWordElement(45242),
+						this.m(GoodWe.ChannelId.E_DISCHARGE_DAY_2, new UnsignedWordElement(45242),
 								ElementToChannelConverter.SCALE_FACTOR_MINUS_1), //
 						new DummyRegisterElement(45243), //
 						// to set safety code for inverter or read the preset safety code for the
 						// inverter
-						m(GoodWe.ChannelId.SAFETY_COUNTRY_CODE, new UnsignedWordElement(45244)), //
-						m(GoodWe.ChannelId.ISO_LIMIT, new UnsignedWordElement(45245)), //
-						m(GoodWe.ChannelId.LVRT_HVRT, new UnsignedWordElement(45246))), //
+						this.m(GoodWe.ChannelId.SAFETY_COUNTRY_CODE, new UnsignedWordElement(45244)), //
+						this.m(GoodWe.ChannelId.ISO_LIMIT, new UnsignedWordElement(45245)), //
+						this.m(GoodWe.ChannelId.LVRT_HVRT, new UnsignedWordElement(45246))), //
 
 				new FC3ReadRegistersTask(45250, Priority.LOW, //
-						m(GoodWe.ChannelId.PV_START_VOLTAGE, new UnsignedWordElement(45250),
+						this.m(GoodWe.ChannelId.PV_START_VOLTAGE, new UnsignedWordElement(45250),
 								ElementToChannelConverter.SCALE_FACTOR_MINUS_1), //
-						m(GoodWe.ChannelId.MPPT_FOR_SHADOW_ENABLE, new UnsignedWordElement(45251)), //
-						m(GoodWe.ChannelId.BACK_UP_ENABLE, new UnsignedWordElement(45252)), //
-						m(GoodWe.ChannelId.AUTO_START_BACKUP, new UnsignedWordElement(45253)), //
-						m(GoodWe.ChannelId.GRID_WAVE_CHECK_LEVEL, new UnsignedWordElement(45254)), //
+						this.m(GoodWe.ChannelId.MPPT_FOR_SHADOW_ENABLE, new UnsignedWordElement(45251)), //
+						this.m(GoodWe.ChannelId.BACK_UP_ENABLE, new UnsignedWordElement(45252)), //
+						this.m(GoodWe.ChannelId.AUTO_START_BACKUP, new UnsignedWordElement(45253)), //
+						this.m(GoodWe.ChannelId.GRID_WAVE_CHECK_LEVEL, new UnsignedWordElement(45254)), //
 						new DummyRegisterElement(45255), //
-						m(GoodWe.ChannelId.BACKUP_START_DLY, new UnsignedWordElement(45256)), //
-						m(GoodWe.ChannelId.UPS_STD_VOLT_TYPE, new UnsignedWordElement(45257)), //
+						this.m(GoodWe.ChannelId.BACKUP_START_DLY, new UnsignedWordElement(45256)), //
+						this.m(GoodWe.ChannelId.UPS_STD_VOLT_TYPE, new UnsignedWordElement(45257)), //
 						new DummyRegisterElement(45258, 45262), //
 						// Only can set 70, only for German
-						m(GoodWe.ChannelId.DERATE_RATE_VDE, new UnsignedWordElement(45263)), //
+						this.m(GoodWe.ChannelId.DERATE_RATE_VDE, new UnsignedWordElement(45263)), //
 						// this function is deactivated as default, set "1" to activate. After
 						// activated, All power needs to be turned off and restarted
-						m(GoodWe.ChannelId.THREE_PHASE_UNBALANCED_OUTPUT, new UnsignedWordElement(45264)), //
+						this.m(GoodWe.ChannelId.THREE_PHASE_UNBALANCED_OUTPUT, new UnsignedWordElement(45264)), //
 						new DummyRegisterElement(45265), //
 						// For weak grid area
-						m(GoodWe.ChannelId.HIGH_IMP_MODE, new UnsignedWordElement(45266)), //
+						this.m(GoodWe.ChannelId.HIGH_IMP_MODE, new UnsignedWordElement(45266)), //
 						new DummyRegisterElement(45267, 45274), //
 						// 0:Normal mode 1: cancel ISO test when offgrid to ongrid
-						m(GoodWe.ChannelId.ISO_CHECK_MODE, new UnsignedWordElement(45275)), //
+						this.m(GoodWe.ChannelId.ISO_CHECK_MODE, new UnsignedWordElement(45275)), //
 						// The delay time when grid is available
-						m(GoodWe.ChannelId.OFF_GRID_TO_ON_GRID_DELAY, new UnsignedWordElement(45276)), //
+						this.m(GoodWe.ChannelId.OFF_GRID_TO_ON_GRID_DELAY, new UnsignedWordElement(45276)), //
 						// If set 80%, when offgrid output voltage less than 230*80%=184V, inverter will
 						// have the error.
-						m(GoodWe.ChannelId.OFF_GRID_UNDER_VOLTAGE_PROTECT_COEFFICIENT, new UnsignedWordElement(45277)), //
+						this.m(GoodWe.ChannelId.OFF_GRID_UNDER_VOLTAGE_PROTECT_COEFFICIENT,
+								new UnsignedWordElement(45277)), //
 						// When offgrid and the battery SOC is low, PV charge the battery
-						m(GoodWe.ChannelId.BATTERY_MODE_PV_CHARGE_ENABLE, new UnsignedWordElement(45278)), //
+						this.m(GoodWe.ChannelId.BATTERY_MODE_PV_CHARGE_ENABLE, new UnsignedWordElement(45278)), //
 						// Default fisresttt.ing is 1
-						m(GoodWe.ChannelId.DCV_CHECK_OFF, new UnsignedWordElement(45279))//
+						this.m(GoodWe.ChannelId.DCV_CHECK_OFF, new UnsignedWordElement(45279))//
 
 				), //
 
 				// Registers 45333 to 45339 for License throw "Illegal Data Address"
 
 				new FC3ReadRegistersTask(45352, Priority.LOW, //
-						m(GoodWe.ChannelId.BMS_CHARGE_MAX_VOLTAGE, new UnsignedWordElement(45352),
+						this.m(GoodWe.ChannelId.BMS_CHARGE_MAX_VOLTAGE, new UnsignedWordElement(45352),
 								ElementToChannelConverter.SCALE_FACTOR_MINUS_1), // [500*N,600*N]
-						m(GoodWe.ChannelId.BMS_CHARGE_MAX_CURRENT, new UnsignedWordElement(45353),
+						this.m(GoodWe.ChannelId.BMS_CHARGE_MAX_CURRENT, new UnsignedWordElement(45353),
 								ElementToChannelConverter.SCALE_FACTOR_MINUS_1), // [0,1000]
-						m(GoodWe.ChannelId.BMS_DISCHARGE_MIN_VOLTAGE, new UnsignedWordElement(45354),
+						this.m(GoodWe.ChannelId.BMS_DISCHARGE_MIN_VOLTAGE, new UnsignedWordElement(45354),
 								ElementToChannelConverter.SCALE_FACTOR_MINUS_1), // [400*N,480*N]
-						m(GoodWe.ChannelId.BMS_DISCHARGE_MAX_CURRENT, new UnsignedWordElement(45355),
+						this.m(GoodWe.ChannelId.BMS_DISCHARGE_MAX_CURRENT, new UnsignedWordElement(45355),
 								ElementToChannelConverter.SCALE_FACTOR_MINUS_1), // [0,1000]
-						m(GoodWe.ChannelId.BMS_SOC_UNDER_MIN, new UnsignedWordElement(45356)), // [0,100]
-						m(GoodWe.ChannelId.BMS_OFFLINE_DISCHARGE_MIN_VOLTAGE, new UnsignedWordElement(45357),
+						this.m(GoodWe.ChannelId.BMS_SOC_UNDER_MIN, new UnsignedWordElement(45356)), // [0,100]
+						this.m(GoodWe.ChannelId.BMS_OFFLINE_DISCHARGE_MIN_VOLTAGE, new UnsignedWordElement(45357),
 								ElementToChannelConverter.SCALE_FACTOR_MINUS_1), // ), //
-						m(GoodWe.ChannelId.BMS_OFFLINE_SOC_UNDER_MIN, new UnsignedWordElement(45358))), //
+						this.m(GoodWe.ChannelId.BMS_OFFLINE_SOC_UNDER_MIN, new UnsignedWordElement(45358))), //
 
 				// Safety
 				new FC3ReadRegistersTask(45400, Priority.LOW, //
-						m(GoodWe.ChannelId.GRID_VOLT_HIGH_S1, new UnsignedWordElement(45400),
+						this.m(GoodWe.ChannelId.GRID_VOLT_HIGH_S1, new UnsignedWordElement(45400),
 								ElementToChannelConverter.SCALE_FACTOR_MINUS_1), //
-						m(GoodWe.ChannelId.GRID_VOLT_HIGH_S1_TIME, new UnsignedWordElement(45401)), //
-						m(GoodWe.ChannelId.GRID_VOLT_LOW_S1, new UnsignedWordElement(45402),
+						this.m(GoodWe.ChannelId.GRID_VOLT_HIGH_S1_TIME, new UnsignedWordElement(45401)), //
+						this.m(GoodWe.ChannelId.GRID_VOLT_LOW_S1, new UnsignedWordElement(45402),
 								ElementToChannelConverter.SCALE_FACTOR_MINUS_1), //
-						m(GoodWe.ChannelId.GRID_VOLT_LOW_S1_TIME, new UnsignedWordElement(45403)), //
-						m(GoodWe.ChannelId.GRID_VOLT_HIGH_S2, new UnsignedWordElement(45404),
+						this.m(GoodWe.ChannelId.GRID_VOLT_LOW_S1_TIME, new UnsignedWordElement(45403)), //
+						this.m(GoodWe.ChannelId.GRID_VOLT_HIGH_S2, new UnsignedWordElement(45404),
 								ElementToChannelConverter.SCALE_FACTOR_MINUS_1), //
-						m(GoodWe.ChannelId.GRID_VOLT_HIGH_S2_TIME, new UnsignedWordElement(45405)), //
-						m(GoodWe.ChannelId.GRID_VOLT_LOW_S2, new UnsignedWordElement(45406),
+						this.m(GoodWe.ChannelId.GRID_VOLT_HIGH_S2_TIME, new UnsignedWordElement(45405)), //
+						this.m(GoodWe.ChannelId.GRID_VOLT_LOW_S2, new UnsignedWordElement(45406),
 								ElementToChannelConverter.SCALE_FACTOR_MINUS_1), //
-						m(GoodWe.ChannelId.GRID_VOLT_LOW_S2_TIME, new UnsignedWordElement(45407)), //
-						m(GoodWe.ChannelId.GRID_VOLT_QUALITY, new UnsignedWordElement(45408),
+						this.m(GoodWe.ChannelId.GRID_VOLT_LOW_S2_TIME, new UnsignedWordElement(45407)), //
+						this.m(GoodWe.ChannelId.GRID_VOLT_QUALITY, new UnsignedWordElement(45408),
 								ElementToChannelConverter.SCALE_FACTOR_MINUS_1), //
-						m(GoodWe.ChannelId.GRID_FREQ_HIGH_S1, new UnsignedWordElement(45409),
+						this.m(GoodWe.ChannelId.GRID_FREQ_HIGH_S1, new UnsignedWordElement(45409),
 								ElementToChannelConverter.SCALE_FACTOR_MINUS_2), //
-						m(GoodWe.ChannelId.GRID_FREQ_HIGH_S1_TIME, new UnsignedWordElement(45410)), //
-						m(GoodWe.ChannelId.GRID_FREQ_LOW_S1, new UnsignedWordElement(45411),
+						this.m(GoodWe.ChannelId.GRID_FREQ_HIGH_S1_TIME, new UnsignedWordElement(45410)), //
+						this.m(GoodWe.ChannelId.GRID_FREQ_LOW_S1, new UnsignedWordElement(45411),
 								ElementToChannelConverter.SCALE_FACTOR_MINUS_2), //
-						m(GoodWe.ChannelId.GRID_FREQ_LOW_S1_TIME, new UnsignedWordElement(45412)), //
-						m(GoodWe.ChannelId.GRID_FREQ_HIGH_S2, new UnsignedWordElement(45413),
+						this.m(GoodWe.ChannelId.GRID_FREQ_LOW_S1_TIME, new UnsignedWordElement(45412)), //
+						this.m(GoodWe.ChannelId.GRID_FREQ_HIGH_S2, new UnsignedWordElement(45413),
 								ElementToChannelConverter.SCALE_FACTOR_MINUS_2), //
-						m(GoodWe.ChannelId.GRID_FREQ_HIGH_S2_TIME, new UnsignedWordElement(45414)), //
-						m(GoodWe.ChannelId.GRID_FREQ_LOW_S2, new UnsignedWordElement(45415),
+						this.m(GoodWe.ChannelId.GRID_FREQ_HIGH_S2_TIME, new UnsignedWordElement(45414)), //
+						this.m(GoodWe.ChannelId.GRID_FREQ_LOW_S2, new UnsignedWordElement(45415),
 								ElementToChannelConverter.SCALE_FACTOR_MINUS_2), //
-						m(GoodWe.ChannelId.GRID_FREQ_LOW_S2_TIME, new UnsignedWordElement(45416)), //
-						m(GoodWe.ChannelId.GRID_VOLT_HIGH, new UnsignedWordElement(45417),
+						this.m(GoodWe.ChannelId.GRID_FREQ_LOW_S2_TIME, new UnsignedWordElement(45416)), //
+						this.m(GoodWe.ChannelId.GRID_VOLT_HIGH, new UnsignedWordElement(45417),
 								ElementToChannelConverter.SCALE_FACTOR_MINUS_1), //
-						m(GoodWe.ChannelId.GRID_VOLT_LOW, new UnsignedWordElement(45418),
+						this.m(GoodWe.ChannelId.GRID_VOLT_LOW, new UnsignedWordElement(45418),
 								ElementToChannelConverter.SCALE_FACTOR_MINUS_1), //
-						m(GoodWe.ChannelId.GRID_FREQ_HIGH, new UnsignedWordElement(45419),
+						this.m(GoodWe.ChannelId.GRID_FREQ_HIGH, new UnsignedWordElement(45419),
 								ElementToChannelConverter.SCALE_FACTOR_MINUS_2), //
-						m(GoodWe.ChannelId.GRID_FREQ_LOW, new UnsignedWordElement(45420),
+						this.m(GoodWe.ChannelId.GRID_FREQ_LOW, new UnsignedWordElement(45420),
 								ElementToChannelConverter.SCALE_FACTOR_MINUS_2), //
-						m(GoodWe.ChannelId.GRID_RECOVER_TIME, new UnsignedWordElement(45421)), //
-						m(GoodWe.ChannelId.GRID_VOLT_RECOVER_HIGH, new UnsignedWordElement(45422),
+						this.m(GoodWe.ChannelId.GRID_RECOVER_TIME, new UnsignedWordElement(45421)), //
+						this.m(GoodWe.ChannelId.GRID_VOLT_RECOVER_HIGH, new UnsignedWordElement(45422),
 								ElementToChannelConverter.SCALE_FACTOR_MINUS_1), //
-						m(GoodWe.ChannelId.GRID_VOLT_RECOVER_LOW, new UnsignedWordElement(45423),
+						this.m(GoodWe.ChannelId.GRID_VOLT_RECOVER_LOW, new UnsignedWordElement(45423),
 								ElementToChannelConverter.SCALE_FACTOR_MINUS_1), //
-						m(GoodWe.ChannelId.GRID_FREQ_RECOVER_HIGH, new UnsignedWordElement(45424),
+						this.m(GoodWe.ChannelId.GRID_FREQ_RECOVER_HIGH, new UnsignedWordElement(45424),
 								ElementToChannelConverter.SCALE_FACTOR_MINUS_2), //
-						m(GoodWe.ChannelId.GRID_FREQ_RECOVER_LOW, new UnsignedWordElement(45425),
+						this.m(GoodWe.ChannelId.GRID_FREQ_RECOVER_LOW, new UnsignedWordElement(45425),
 								ElementToChannelConverter.SCALE_FACTOR_MINUS_2), //
-						m(GoodWe.ChannelId.GRID_VOLT_RECOVER_TIME, new UnsignedWordElement(45426)), //
-						m(GoodWe.ChannelId.GRID_FREQ_RECOVER_TIME, new UnsignedWordElement(45427)), //
-						m(GoodWe.ChannelId.POWER_RATE_LIMIT_GENERATE, new UnsignedWordElement(45428)), //
-						m(GoodWe.ChannelId.POWER_RATE_LIMIT_RECONNECT, new UnsignedWordElement(45429)), //
-						m(GoodWe.ChannelId.POWER_RATE_LIMIT_REDUCTION, new UnsignedWordElement(45430)), //
-						m(GoodWe.ChannelId.GRID_PROTECT, new UnsignedWordElement(45431)) //
+						this.m(GoodWe.ChannelId.GRID_VOLT_RECOVER_TIME, new UnsignedWordElement(45426)), //
+						this.m(GoodWe.ChannelId.GRID_FREQ_RECOVER_TIME, new UnsignedWordElement(45427)), //
+						this.m(GoodWe.ChannelId.POWER_RATE_LIMIT_GENERATE, new UnsignedWordElement(45428)), //
+						this.m(GoodWe.ChannelId.POWER_RATE_LIMIT_RECONNECT, new UnsignedWordElement(45429)), //
+						this.m(GoodWe.ChannelId.POWER_RATE_LIMIT_REDUCTION, new UnsignedWordElement(45430)), //
+						this.m(GoodWe.ChannelId.GRID_PROTECT, new UnsignedWordElement(45431)) //
 				), //
 
 				new FC3ReadRegistersTask(45428, Priority.LOW, //
-						m(GoodWe.ChannelId.POWER_RATE_LIMIT_GENERATE, new UnsignedWordElement(45428),
+						this.m(GoodWe.ChannelId.POWER_RATE_LIMIT_GENERATE, new UnsignedWordElement(45428),
 								ElementToChannelConverter.SCALE_FACTOR_MINUS_2), //
-						m(GoodWe.ChannelId.POWER_RATE_LIMIT_RECONNECT, new UnsignedWordElement(45429),
+						this.m(GoodWe.ChannelId.POWER_RATE_LIMIT_RECONNECT, new UnsignedWordElement(45429),
 								ElementToChannelConverter.SCALE_FACTOR_MINUS_2), //
-						m(GoodWe.ChannelId.POWER_RATE_LIMIT_REDUCTION, new UnsignedWordElement(45430),
+						this.m(GoodWe.ChannelId.POWER_RATE_LIMIT_REDUCTION, new UnsignedWordElement(45430),
 								ElementToChannelConverter.SCALE_FACTOR_MINUS_2), //
-						m(GoodWe.ChannelId.GRID_PROTECT, new UnsignedWordElement(45431))), //
+						this.m(GoodWe.ChannelId.GRID_PROTECT, new UnsignedWordElement(45431))), //
 
 				// Cos Phi Curve
 				new FC3ReadRegistersTask(45432, Priority.LOW, //
-						m(GoodWe.ChannelId.POWER_SLOPE_ENABLE, new UnsignedWordElement(45432)), //
-						m(GoodWe.ChannelId.ENABLE_CURVE_PU, new UnsignedWordElement(45433)), //
-						m(GoodWe.ChannelId.A_POINT_POWER, new SignedWordElement(45434)), //
-						m(GoodWe.ChannelId.A_POINT_COS_PHI, new SignedWordElement(45435),
+						this.m(GoodWe.ChannelId.POWER_SLOPE_ENABLE, new UnsignedWordElement(45432)), //
+						this.m(GoodWe.ChannelId.ENABLE_CURVE_PU, new UnsignedWordElement(45433)), //
+						this.m(GoodWe.ChannelId.A_POINT_POWER, new SignedWordElement(45434)), //
+						this.m(GoodWe.ChannelId.A_POINT_COS_PHI, new SignedWordElement(45435),
 								ElementToChannelConverter.SCALE_FACTOR_MINUS_2), //
-						m(GoodWe.ChannelId.B_POINT_POWER, new SignedWordElement(45436)), //
-						m(GoodWe.ChannelId.B_POINT_COS_PHI, new SignedWordElement(45437),
+						this.m(GoodWe.ChannelId.B_POINT_POWER, new SignedWordElement(45436)), //
+						this.m(GoodWe.ChannelId.B_POINT_COS_PHI, new SignedWordElement(45437),
 								ElementToChannelConverter.SCALE_FACTOR_MINUS_2), //
-						m(GoodWe.ChannelId.C_POINT_POWER, new SignedWordElement(45438)), //
-						m(GoodWe.ChannelId.C_POINT_COS_PHI, new SignedWordElement(45439)),
-						m(GoodWe.ChannelId.LOCK_IN_VOLTAGE, new UnsignedWordElement(45440),
+						this.m(GoodWe.ChannelId.C_POINT_POWER, new SignedWordElement(45438)), //
+						this.m(GoodWe.ChannelId.C_POINT_COS_PHI, new SignedWordElement(45439)),
+						this.m(GoodWe.ChannelId.LOCK_IN_VOLTAGE, new UnsignedWordElement(45440),
 								ElementToChannelConverter.SCALE_FACTOR_MINUS_1), //
-						m(GoodWe.ChannelId.LOCK_OUT_VOLTAGE, new UnsignedWordElement(45441),
+						this.m(GoodWe.ChannelId.LOCK_OUT_VOLTAGE, new UnsignedWordElement(45441),
 								ElementToChannelConverter.SCALE_FACTOR_MINUS_1), //
-						m(GoodWe.ChannelId.LOCK_OUT_POWER, new SignedWordElement(45442)), //
+						this.m(GoodWe.ChannelId.LOCK_OUT_POWER, new SignedWordElement(45442)), //
 
 						// Power and frequency curve
-						m(new BitsWordElement(45443, this)//
+						this.m(new BitsWordElement(45443, this)//
 								.bit(0, GoodWe.ChannelId.POWER_FREQUENCY_ENABLED)//
 								.bit(1, GoodWe.ChannelId.POWER_FREQUENCY_RESPONSE_MODE)//
 						), //
-						m(GoodWe.ChannelId.FFROZEN_DCH, new UnsignedWordElement(45444),
+						this.m(GoodWe.ChannelId.FFROZEN_DCH, new UnsignedWordElement(45444),
 								ElementToChannelConverter.SCALE_FACTOR_MINUS_2), //
-						m(GoodWe.ChannelId.FFROZEN_CH, new UnsignedWordElement(45445),
+						this.m(GoodWe.ChannelId.FFROZEN_CH, new UnsignedWordElement(45445),
 								ElementToChannelConverter.SCALE_FACTOR_MINUS_2), //
-						m(GoodWe.ChannelId.FSTOP_DCH, new UnsignedWordElement(45446),
+						this.m(GoodWe.ChannelId.FSTOP_DCH, new UnsignedWordElement(45446),
 								ElementToChannelConverter.SCALE_FACTOR_MINUS_2), //
-						m(GoodWe.ChannelId.FSTOP_CH, new UnsignedWordElement(45447),
+						this.m(GoodWe.ChannelId.FSTOP_CH, new UnsignedWordElement(45447),
 								ElementToChannelConverter.SCALE_FACTOR_MINUS_2), //
-						m(GoodWe.ChannelId.OF_RECOVERY_WAITING_TIME, new UnsignedWordElement(45448),
+						this.m(GoodWe.ChannelId.OF_RECOVERY_WAITING_TIME, new UnsignedWordElement(45448),
 								ElementToChannelConverter.SCALE_FACTOR_MINUS_2), //
-						m(GoodWe.ChannelId.RECOVERY_FREQURNCY1, new UnsignedWordElement(45449),
+						this.m(GoodWe.ChannelId.RECOVERY_FREQURNCY1, new UnsignedWordElement(45449),
 								ElementToChannelConverter.SCALE_FACTOR_MINUS_2), //
-						m(GoodWe.ChannelId.RECOVERY_FREQUENCY2, new UnsignedWordElement(45450),
+						this.m(GoodWe.ChannelId.RECOVERY_FREQUENCY2, new UnsignedWordElement(45450),
 								ElementToChannelConverter.SCALE_FACTOR_MINUS_2), //
-						m(GoodWe.ChannelId.OF_RECOVERY_SLOPE, new UnsignedWordElement(45451), //
+						this.m(GoodWe.ChannelId.OF_RECOVERY_SLOPE, new UnsignedWordElement(45451), //
 								new ChannelMetaInfoReadAndWrite(45451, 45452)), //
-						m(GoodWe.ChannelId.CFP_SETTINGS, new UnsignedWordElement(45452), //
+						this.m(GoodWe.ChannelId.CFP_SETTINGS, new UnsignedWordElement(45452), //
 								new ChannelMetaInfoReadAndWrite(45452, 45451)), //
-						m(GoodWe.ChannelId.CFP_OF_SLOPE_PERCENT, new UnsignedWordElement(45453),
+						this.m(GoodWe.ChannelId.CFP_OF_SLOPE_PERCENT, new UnsignedWordElement(45453),
 								ElementToChannelConverter.SCALE_FACTOR_MINUS_2), //
-						m(GoodWe.ChannelId.CFP_UF_SLOPE_PERCENT, new UnsignedWordElement(45454),
+						this.m(GoodWe.ChannelId.CFP_UF_SLOPE_PERCENT, new UnsignedWordElement(45454),
 								ElementToChannelConverter.SCALE_FACTOR_MINUS_2), //
-						m(GoodWe.ChannelId.CFP_OF_RECOVER_POWER_PERCENT, new UnsignedWordElement(45455))), //
+						this.m(GoodWe.ChannelId.CFP_OF_RECOVER_POWER_PERCENT, new UnsignedWordElement(45455))), //
 
 				// QU Curve
 				new FC3ReadRegistersTask(45456, Priority.LOW, //
-						m(GoodWe.ChannelId.QU_CURVE, new UnsignedWordElement(45456)), //
-						m(GoodWe.ChannelId.LOCK_IN_POWER_QU, new SignedWordElement(45457)), //
-						m(GoodWe.ChannelId.LOCK_OUT_POWER_QU, new SignedWordElement(45458)), //
-						m(GoodWe.ChannelId.V1_VOLTAGE, new UnsignedWordElement(45459),
+						this.m(GoodWe.ChannelId.QU_CURVE, new UnsignedWordElement(45456)), //
+						this.m(GoodWe.ChannelId.LOCK_IN_POWER_QU, new SignedWordElement(45457)), //
+						this.m(GoodWe.ChannelId.LOCK_OUT_POWER_QU, new SignedWordElement(45458)), //
+						this.m(GoodWe.ChannelId.V1_VOLTAGE, new UnsignedWordElement(45459),
 								ElementToChannelConverter.SCALE_FACTOR_MINUS_1), // ), //
-						m(GoodWe.ChannelId.V1_VALUE, new SignedWordElement(45460)), //
-						m(GoodWe.ChannelId.V2_VOLTAGE, new UnsignedWordElement(45461),
+						this.m(GoodWe.ChannelId.V1_VALUE, new SignedWordElement(45460)), //
+						this.m(GoodWe.ChannelId.V2_VOLTAGE, new UnsignedWordElement(45461),
 								ElementToChannelConverter.SCALE_FACTOR_MINUS_1), //
-						m(GoodWe.ChannelId.V2_VALUE, new SignedWordElement(45462)), //
-						m(GoodWe.ChannelId.V3_VOLTAGE, new UnsignedWordElement(45463),
+						this.m(GoodWe.ChannelId.V2_VALUE, new SignedWordElement(45462)), //
+						this.m(GoodWe.ChannelId.V3_VOLTAGE, new UnsignedWordElement(45463),
 								ElementToChannelConverter.SCALE_FACTOR_MINUS_1), //
-						m(GoodWe.ChannelId.V3_VALUE, new SignedWordElement(45464)), //
-						m(GoodWe.ChannelId.V4_VOLTAGE, new UnsignedWordElement(45465),
+						this.m(GoodWe.ChannelId.V3_VALUE, new SignedWordElement(45464)), //
+						this.m(GoodWe.ChannelId.V4_VOLTAGE, new UnsignedWordElement(45465),
 								ElementToChannelConverter.SCALE_FACTOR_MINUS_1), //
-						m(GoodWe.ChannelId.V4_VALUE, new SignedWordElement(45466)), //
-						m(GoodWe.ChannelId.K_VALUE, new UnsignedWordElement(45467)), //
-						m(GoodWe.ChannelId.TIME_CONSTANT, new UnsignedWordElement(45468)), //
-						m(GoodWe.ChannelId.MISCELLANEA, new UnsignedWordElement(45469))), //
+						this.m(GoodWe.ChannelId.V4_VALUE, new SignedWordElement(45466)), //
+						this.m(GoodWe.ChannelId.K_VALUE, new UnsignedWordElement(45467)), //
+						this.m(GoodWe.ChannelId.TIME_CONSTANT, new UnsignedWordElement(45468)), //
+						this.m(GoodWe.ChannelId.MISCELLANEA, new UnsignedWordElement(45469))), //
 
 				// PU Curve
 				new FC3ReadRegistersTask(45472, Priority.LOW, //
-						m(GoodWe.ChannelId.PU_CURVE, new UnsignedWordElement(45472)), //
-						m(GoodWe.ChannelId.POWER_CHANGE_RATE, new UnsignedWordElement(45473)), //
-						m(GoodWe.ChannelId.V1_VOLTAGE_PU, new UnsignedWordElement(45474),
+						this.m(GoodWe.ChannelId.PU_CURVE, new UnsignedWordElement(45472)), //
+						this.m(GoodWe.ChannelId.POWER_CHANGE_RATE, new UnsignedWordElement(45473)), //
+						this.m(GoodWe.ChannelId.V1_VOLTAGE_PU, new UnsignedWordElement(45474),
 								ElementToChannelConverter.SCALE_FACTOR_MINUS_1), //
-						m(GoodWe.ChannelId.V1_VALUE_PU, new SignedWordElement(45475),
+						this.m(GoodWe.ChannelId.V1_VALUE_PU, new SignedWordElement(45475),
 								ElementToChannelConverter.SCALE_FACTOR_MINUS_1), //
-						m(GoodWe.ChannelId.V2_VOLTAGE_PU, new UnsignedWordElement(45476),
+						this.m(GoodWe.ChannelId.V2_VOLTAGE_PU, new UnsignedWordElement(45476),
 								ElementToChannelConverter.SCALE_FACTOR_MINUS_1), //
-						m(GoodWe.ChannelId.V2_VALUE_PU, new SignedWordElement(45477),
+						this.m(GoodWe.ChannelId.V2_VALUE_PU, new SignedWordElement(45477),
 								ElementToChannelConverter.SCALE_FACTOR_MINUS_1), //
-						m(GoodWe.ChannelId.V3_VOLTAGE_PU, new UnsignedWordElement(45478),
+						this.m(GoodWe.ChannelId.V3_VOLTAGE_PU, new UnsignedWordElement(45478),
 								ElementToChannelConverter.SCALE_FACTOR_MINUS_1), //
-						m(GoodWe.ChannelId.V3_VALUE_PU, new SignedWordElement(45479),
+						this.m(GoodWe.ChannelId.V3_VALUE_PU, new SignedWordElement(45479),
 								ElementToChannelConverter.SCALE_FACTOR_MINUS_1), //
-						m(GoodWe.ChannelId.V4_VOLTAGE_PU, new UnsignedWordElement(45480),
+						this.m(GoodWe.ChannelId.V4_VOLTAGE_PU, new UnsignedWordElement(45480),
 								ElementToChannelConverter.SCALE_FACTOR_MINUS_1), //
-						m(GoodWe.ChannelId.V4_VALUE_PU, new SignedWordElement(45481),
+						this.m(GoodWe.ChannelId.V4_VALUE_PU, new SignedWordElement(45481),
 								ElementToChannelConverter.SCALE_FACTOR_MINUS_1), //
 						// 80=Pf 0.8, 20= -0.8Pf
-						m(GoodWe.ChannelId.FIXED_POWER_FACTOR, new UnsignedWordElement(45482),
+						this.m(GoodWe.ChannelId.FIXED_POWER_FACTOR, new UnsignedWordElement(45482),
 								ElementToChannelConverter.SCALE_FACTOR_MINUS_2), //
 						// Set the percentage of rated power of the inverter
-						m(GoodWe.ChannelId.FIXED_REACTIVE_POWER, new SignedWordElement(45483),
+						this.m(GoodWe.ChannelId.FIXED_REACTIVE_POWER, new SignedWordElement(45483),
 								ElementToChannelConverter.SCALE_FACTOR_MINUS_1), //
-						m(GoodWe.ChannelId.FIXED_ACTIVE_POWER, new UnsignedWordElement(45484),
+						this.m(GoodWe.ChannelId.FIXED_ACTIVE_POWER, new UnsignedWordElement(45484),
 								ElementToChannelConverter.SCALE_FACTOR_MINUS_1)), //
 
 				new FC3ReadRegistersTask(45488, Priority.LOW, //
-						m(GoodWe.ChannelId.AUTO_TEST_ENABLE, new UnsignedWordElement(45488)), //
-						m(GoodWe.ChannelId.AUTO_TEST_STEP, new UnsignedWordElement(45489)), //
-						m(GoodWe.ChannelId.UW_ITALY_FREQ_MODE, new UnsignedWordElement(45490)), //
+						this.m(GoodWe.ChannelId.AUTO_TEST_ENABLE, new UnsignedWordElement(45488)), //
+						this.m(GoodWe.ChannelId.AUTO_TEST_STEP, new UnsignedWordElement(45489)), //
+						this.m(GoodWe.ChannelId.UW_ITALY_FREQ_MODE, new UnsignedWordElement(45490)), //
 						// this must be turned off to do Meter test . "1" means Off
-						m(GoodWe.ChannelId.ALL_POWER_CURVE_DISABLE, new UnsignedWordElement(45491)), //
-						m(GoodWe.ChannelId.R_PHASE_FIXED_ACTIVE_POWER, new UnsignedWordElement(45492)), //
-						m(GoodWe.ChannelId.S_PHASE_FIXED_ACTIVE_POWER, new UnsignedWordElement(45493)), //
-						m(GoodWe.ChannelId.T_PHASE_FIXED_ACTIVE_POWER, new UnsignedWordElement(45494)), //
-						m(GoodWe.ChannelId.GRID_VOLT_HIGH_S3, new UnsignedWordElement(45495),
+						this.m(GoodWe.ChannelId.ALL_POWER_CURVE_DISABLE, new UnsignedWordElement(45491)), //
+						this.m(GoodWe.ChannelId.R_PHASE_FIXED_ACTIVE_POWER, new UnsignedWordElement(45492)), //
+						this.m(GoodWe.ChannelId.S_PHASE_FIXED_ACTIVE_POWER, new UnsignedWordElement(45493)), //
+						this.m(GoodWe.ChannelId.T_PHASE_FIXED_ACTIVE_POWER, new UnsignedWordElement(45494)), //
+						this.m(GoodWe.ChannelId.GRID_VOLT_HIGH_S3, new UnsignedWordElement(45495),
 								ElementToChannelConverter.SCALE_FACTOR_MINUS_1), //
-						m(GoodWe.ChannelId.GRID_VOLT_HIGH_S3_TIME, new UnsignedWordElement(45496)), //
-						m(GoodWe.ChannelId.GRID_VOLT_LOW_S3, new UnsignedWordElement(45497),
+						this.m(GoodWe.ChannelId.GRID_VOLT_HIGH_S3_TIME, new UnsignedWordElement(45496)), //
+						this.m(GoodWe.ChannelId.GRID_VOLT_LOW_S3, new UnsignedWordElement(45497),
 								ElementToChannelConverter.SCALE_FACTOR_MINUS_1), //
-						m(GoodWe.ChannelId.GRID_VOLT_LOW_S3_TIME, new UnsignedWordElement(45498)), //
-						m(GoodWe.ChannelId.ZVRT_CONFIG, new UnsignedWordElement(45499)), //
-						m(GoodWe.ChannelId.LVRT_START_VOLT, new UnsignedWordElement(45500),
+						this.m(GoodWe.ChannelId.GRID_VOLT_LOW_S3_TIME, new UnsignedWordElement(45498)), //
+						this.m(GoodWe.ChannelId.ZVRT_CONFIG, new UnsignedWordElement(45499)), //
+						this.m(GoodWe.ChannelId.LVRT_START_VOLT, new UnsignedWordElement(45500),
 								ElementToChannelConverter.SCALE_FACTOR_MINUS_1), //
-						m(GoodWe.ChannelId.LVRT_END_VOLT, new UnsignedWordElement(45501),
+						this.m(GoodWe.ChannelId.LVRT_END_VOLT, new UnsignedWordElement(45501),
 								ElementToChannelConverter.SCALE_FACTOR_MINUS_1), //
-						m(GoodWe.ChannelId.LVRT_START_TRIP_TIME, new UnsignedWordElement(45502)), //
-						m(GoodWe.ChannelId.LVRT_END_TRIP_TIME, new UnsignedWordElement(45503)), //
-						m(GoodWe.ChannelId.LVRT_TRIP_LIMIT_VOLT, new UnsignedWordElement(45504),
+						this.m(GoodWe.ChannelId.LVRT_START_TRIP_TIME, new UnsignedWordElement(45502)), //
+						this.m(GoodWe.ChannelId.LVRT_END_TRIP_TIME, new UnsignedWordElement(45503)), //
+						this.m(GoodWe.ChannelId.LVRT_TRIP_LIMIT_VOLT, new UnsignedWordElement(45504),
 								ElementToChannelConverter.SCALE_FACTOR_MINUS_1), //
-						m(GoodWe.ChannelId.HVRT_START_VOLT, new UnsignedWordElement(45505),
+						this.m(GoodWe.ChannelId.HVRT_START_VOLT, new UnsignedWordElement(45505),
 								ElementToChannelConverter.SCALE_FACTOR_MINUS_1), //
-						m(GoodWe.ChannelId.HVRT_END_VOLT, new UnsignedWordElement(45506),
+						this.m(GoodWe.ChannelId.HVRT_END_VOLT, new UnsignedWordElement(45506),
 								ElementToChannelConverter.SCALE_FACTOR_MINUS_1), //
-						m(GoodWe.ChannelId.HVRT_START_TRIP_TIME, new UnsignedWordElement(45507)), //
-						m(GoodWe.ChannelId.HVRT_END_TRIP_TIME, new UnsignedWordElement(45508)), //
-						m(GoodWe.ChannelId.HVRT_TRIP_LIMIT_VOLT, new UnsignedWordElement(45509),
+						this.m(GoodWe.ChannelId.HVRT_START_TRIP_TIME, new UnsignedWordElement(45507)), //
+						this.m(GoodWe.ChannelId.HVRT_END_TRIP_TIME, new UnsignedWordElement(45508)), //
+						this.m(GoodWe.ChannelId.HVRT_TRIP_LIMIT_VOLT, new UnsignedWordElement(45509),
 								ElementToChannelConverter.SCALE_FACTOR_MINUS_1)//
 				), //
 
 				// Additional settings for PF/PU/UF
 				new FC3ReadRegistersTask(45510, Priority.LOW, //
-						m(GoodWe.ChannelId.PF_TIME_CONSTANT, new UnsignedWordElement(45510)), //
-						m(GoodWe.ChannelId.POWER_FREQ_TIME_CONSTANT, new UnsignedWordElement(45511)), //
+						this.m(GoodWe.ChannelId.PF_TIME_CONSTANT, new UnsignedWordElement(45510)), //
+						this.m(GoodWe.ChannelId.POWER_FREQ_TIME_CONSTANT, new UnsignedWordElement(45511)), //
 						// Additional settings for P(U) Curve
-						m(GoodWe.ChannelId.PU_TIME_CONSTANT, new UnsignedWordElement(45512)), //
-						m(GoodWe.ChannelId.D_POINT_POWER, new SignedWordElement(45513)), //
-						m(GoodWe.ChannelId.D_POINT_COS_PHI, new SignedWordElement(45514)), //
+						this.m(GoodWe.ChannelId.PU_TIME_CONSTANT, new UnsignedWordElement(45512)), //
+						this.m(GoodWe.ChannelId.D_POINT_POWER, new SignedWordElement(45513)), //
+						this.m(GoodWe.ChannelId.D_POINT_COS_PHI, new SignedWordElement(45514)), //
 						// Additional settings for UF Curve
-						m(GoodWe.ChannelId.UF_RECOVERY_WAITING_TIME, new UnsignedWordElement(45515),
+						this.m(GoodWe.ChannelId.UF_RECOVERY_WAITING_TIME, new UnsignedWordElement(45515),
 								ElementToChannelConverter.SCALE_FACTOR_MINUS_2), //
-						m(GoodWe.ChannelId.UF_RECOVER_SLOPE, new UnsignedWordElement(45516)), //
-						m(GoodWe.ChannelId.CFP_UF_RECOVER_POWER_PERCENT, new UnsignedWordElement(45517)), //
-						m(GoodWe.ChannelId.POWER_CHARGE_LIMIT, new UnsignedWordElement(45518),
+						this.m(GoodWe.ChannelId.UF_RECOVER_SLOPE, new UnsignedWordElement(45516)), //
+						this.m(GoodWe.ChannelId.CFP_UF_RECOVER_POWER_PERCENT, new UnsignedWordElement(45517)), //
+						this.m(GoodWe.ChannelId.POWER_CHARGE_LIMIT, new UnsignedWordElement(45518),
 								ElementToChannelConverter.SCALE_FACTOR_MINUS_2), //
-						m(GoodWe.ChannelId.POWER_CHARGE_LIMIT_RECONNECT, new UnsignedWordElement(45519),
+						this.m(GoodWe.ChannelId.POWER_CHARGE_LIMIT_RECONNECT, new UnsignedWordElement(45519),
 								ElementToChannelConverter.SCALE_FACTOR_MINUS_2), //
-						m(GoodWe.ChannelId.C_EXT_UF_CHARGE_STOP, new UnsignedWordElement(45520),
+						this.m(GoodWe.ChannelId.C_EXT_UF_CHARGE_STOP, new UnsignedWordElement(45520),
 								ElementToChannelConverter.SCALE_FACTOR_MINUS_2), //
-						m(GoodWe.ChannelId.C_EXT_OF_DISCHARGE_STOP, new UnsignedWordElement(45521),
+						this.m(GoodWe.ChannelId.C_EXT_OF_DISCHARGE_STOP, new UnsignedWordElement(45521),
 								ElementToChannelConverter.SCALE_FACTOR_MINUS_2), //
-						m(GoodWe.ChannelId.C_EXT_TWOSSTEPF_FLG, new UnsignedWordElement(45522))//
+						this.m(GoodWe.ChannelId.C_EXT_TWOSSTEPF_FLG, new UnsignedWordElement(45522))//
 				), //
 
 				new FC3ReadRegistersTask(47500, Priority.LOW, //
-						m(GoodWe.ChannelId.STOP_SOC_PROTECT, new UnsignedWordElement(47500)), //
-						m(GoodWe.ChannelId.BMS_FLOAT_VOLT, new UnsignedWordElement(47501),
-								ElementToChannelConverter.SCALE_FACTOR_MINUS_1), //
-						m(GoodWe.ChannelId.BMS_FLOAT_CURRENT, new UnsignedWordElement(47502)), //
-						m(GoodWe.ChannelId.BMS_FLOAT_TIME, new UnsignedWordElement(47503)), //
-						m(GoodWe.ChannelId.BMS_TYPE_INDEX_ARM, new UnsignedWordElement(47504)), //
-						m(GoodWe.ChannelId.MANUFACTURE_CODE, new UnsignedWordElement(47505)), //
-						m(GoodWe.ChannelId.DC_VOLT_OUTPUT, new UnsignedWordElement(47506)), //
-						m(GoodWe.ChannelId.BMS_AVG_CHG_VOLT, new UnsignedWordElement(47507),
-								ElementToChannelConverter.SCALE_FACTOR_MINUS_1), //
-						m(GoodWe.ChannelId.BMS_AVG_CHG_HOURS, new UnsignedWordElement(47508)), //
-						m(GoodWe.ChannelId.FEED_POWER_ENABLE, new UnsignedWordElement(47509)), //
-						m(GoodWe.ChannelId.FEED_POWER_PARA_SET, new UnsignedWordElement(47510)), //
-						m(GoodWe.ChannelId.EMS_POWER_MODE, new UnsignedWordElement(47511)), //
-						m(GoodWe.ChannelId.EMS_POWER_SET, new UnsignedWordElement(47512)), //
-						m(GoodWe.ChannelId.BMS_CURR_LMT_COFF, new UnsignedWordElement(47513)), //
-						m(GoodWe.ChannelId.BATTERY_PROTOCOL_ARM, new UnsignedWordElement(47514)), //
-
-						m(GoodWe.ChannelId.WORK_WEEK_1_START_TIME, new UnsignedWordElement(47515)), //
-						m(GoodWe.ChannelId.WORK_WEEK_1_END_TIME, new UnsignedWordElement(47516)), //
-						m(GoodWe.ChannelId.WORK_WEEK_1_BAT_POWER_PERCENT, new UnsignedWordElement(47517)), //
-						m(new BitsWordElement(47518, this)//
+						this.m(GoodWe.ChannelId.STOP_SOC_PROTECT, new UnsignedWordElement(47500)), //
+						this.m(GoodWe.ChannelId.BMS_FLOAT_VOLT, new UnsignedWordElement(47501),
+								ElementToChannelConverter.SCALE_FACTOR_MINUS_1), //
+						this.m(GoodWe.ChannelId.BMS_FLOAT_CURRENT, new UnsignedWordElement(47502)), //
+						this.m(GoodWe.ChannelId.BMS_FLOAT_TIME, new UnsignedWordElement(47503)), //
+						this.m(GoodWe.ChannelId.BMS_TYPE_INDEX_ARM, new UnsignedWordElement(47504)), //
+						this.m(GoodWe.ChannelId.MANUFACTURE_CODE, new UnsignedWordElement(47505)), //
+						this.m(GoodWe.ChannelId.DC_VOLT_OUTPUT, new UnsignedWordElement(47506)), //
+						this.m(GoodWe.ChannelId.BMS_AVG_CHG_VOLT, new UnsignedWordElement(47507),
+								ElementToChannelConverter.SCALE_FACTOR_MINUS_1), //
+						this.m(GoodWe.ChannelId.BMS_AVG_CHG_HOURS, new UnsignedWordElement(47508)), //
+						this.m(GoodWe.ChannelId.FEED_POWER_ENABLE, new UnsignedWordElement(47509)), //
+						this.m(GoodWe.ChannelId.FEED_POWER_PARA_SET, new UnsignedWordElement(47510)), //
+						this.m(GoodWe.ChannelId.EMS_POWER_MODE, new UnsignedWordElement(47511)), //
+						this.m(GoodWe.ChannelId.EMS_POWER_SET, new UnsignedWordElement(47512)), //
+						this.m(GoodWe.ChannelId.BMS_CURR_LMT_COFF, new UnsignedWordElement(47513)), //
+						this.m(GoodWe.ChannelId.BATTERY_PROTOCOL_ARM, new UnsignedWordElement(47514)), //
+
+						this.m(GoodWe.ChannelId.WORK_WEEK_1_START_TIME, new UnsignedWordElement(47515)), //
+						this.m(GoodWe.ChannelId.WORK_WEEK_1_END_TIME, new UnsignedWordElement(47516)), //
+						this.m(GoodWe.ChannelId.WORK_WEEK_1_BAT_POWER_PERCENT, new UnsignedWordElement(47517)), //
+						this.m(new BitsWordElement(47518, this)//
 								.bit(0, GoodWe.ChannelId.WORK_WEEK_1_SUNDAY)//
 								.bit(1, GoodWe.ChannelId.WORK_WEEK_1_MONDAY)//
 								.bit(2, GoodWe.ChannelId.WORK_WEEK_1_TUESDAY)//
@@ -869,115 +874,116 @@ protected final ModbusProtocol defineModbusProtocol() throws OpenemsException {
 
 				new FC16WriteRegistersTask(45216, //
 						// Choose "Warehouse" safety code first and then Set "1" to factory settings
-						m(GoodWe.ChannelId.FACTORY_SETTING, new UnsignedWordElement(45216)), //
+						this.m(GoodWe.ChannelId.FACTORY_SETTING, new UnsignedWordElement(45216)), //
 						// Reset inverter accumulated data like E-total, E-day, error log running data
 						// etc
-						m(GoodWe.ChannelId.CLEAR_DATA, new UnsignedWordElement(45217)), //
+						this.m(GoodWe.ChannelId.CLEAR_DATA, new UnsignedWordElement(45217)), //
 						new DummyRegisterElement(45218, 45219), //
 						// Inverter will re-check and reconnect to utility again. Inverter does not
 						// shutdown
-						m(GoodWe.ChannelId.RESTART, new UnsignedWordElement(45220)), //
+						this.m(GoodWe.ChannelId.RESTART, new UnsignedWordElement(45220)), //
 						// inverter will total shutdown and wake up again
-						m(GoodWe.ChannelId.RESET_SPS, new UnsignedWordElement(45221)), //
-						m(GoodWe.ChannelId.PV_E_TOTAL_2, new UnsignedDoublewordElement(45222),
+						this.m(GoodWe.ChannelId.RESET_SPS, new UnsignedWordElement(45221)), //
+						this.m(GoodWe.ChannelId.PV_E_TOTAL_2, new UnsignedDoublewordElement(45222),
 								ElementToChannelConverter.SCALE_FACTOR_MINUS_1), //
 						// to read or write the total PV production energy of the day
-						m(GoodWe.ChannelId.PV_E_DAY_2, new UnsignedDoublewordElement(45224),
+						this.m(GoodWe.ChannelId.PV_E_DAY_2, new UnsignedDoublewordElement(45224),
 								ElementToChannelConverter.SCALE_FACTOR_MINUS_1), //
 						// to read or write the accumulated exporting energy to grid from the
 						// installation date
-						m(GoodWe.ChannelId.E_TOTAL_SELL_2, new UnsignedDoublewordElement(45226),
+						this.m(GoodWe.ChannelId.E_TOTAL_SELL_2, new UnsignedDoublewordElement(45226),
 								ElementToChannelConverter.SCALE_FACTOR_MINUS_1), //
 						// to read or write the accumulated operation hours from the installation date
-						m(GoodWe.ChannelId.H_TOTAL_2, new UnsignedDoublewordElement(45228)), //
+						this.m(GoodWe.ChannelId.H_TOTAL_2, new UnsignedDoublewordElement(45228)), //
 						// to read or write the accumulated exporting energy to grid of the day
-						m(GoodWe.ChannelId.E_DAY_SELL_2, new UnsignedWordElement(45230),
+						this.m(GoodWe.ChannelId.E_DAY_SELL_2, new UnsignedWordElement(45230),
 								ElementToChannelConverter.SCALE_FACTOR_MINUS_1), //
 						// to read or write the accumulated energy imported from grid from the
 						// installation date
-						m(GoodWe.ChannelId.E_TOTAL_BUY_2, new UnsignedDoublewordElement(45231),
+						this.m(GoodWe.ChannelId.E_TOTAL_BUY_2, new UnsignedDoublewordElement(45231),
 								ElementToChannelConverter.SCALE_FACTOR_MINUS_1), //
 						// to read or write the accumulated energy imported from grid of the day
-						m(GoodWe.ChannelId.E_DAY_BUY_2, new UnsignedWordElement(45233),
+						this.m(GoodWe.ChannelId.E_DAY_BUY_2, new UnsignedWordElement(45233),
 								ElementToChannelConverter.SCALE_FACTOR_MINUS_1), //
 						// to read or write the accumulated load consumption energy from the
 						// installation date, not include backup load.
-						m(GoodWe.ChannelId.E_TOTAL_LOAD_2, new UnsignedDoublewordElement(45234),
+						this.m(GoodWe.ChannelId.E_TOTAL_LOAD_2, new UnsignedDoublewordElement(45234),
 								ElementToChannelConverter.SCALE_FACTOR_MINUS_1), //
 						// to read or write the accumulated load consumption energy of the day Not
 						// include backup loads
-						m(GoodWe.ChannelId.E_LOAD_DAY_2, new UnsignedWordElement(45236),
+						this.m(GoodWe.ChannelId.E_LOAD_DAY_2, new UnsignedWordElement(45236),
 								ElementToChannelConverter.SCALE_FACTOR_MINUS_1), //
 						// to read or write the accumulated energy charged to battery from the
 						// installation date Not from BMS
-						m(GoodWe.ChannelId.E_BATTERY_CHARGE_2, new UnsignedDoublewordElement(45237),
+						this.m(GoodWe.ChannelId.E_BATTERY_CHARGE_2, new UnsignedDoublewordElement(45237),
 								ElementToChannelConverter.SCALE_FACTOR_MINUS_1), //
 						// to read or write the accumulated energy charged to battery of the day Not
 						// from BMS
-						m(GoodWe.ChannelId.E_CHARGE_DAY_2, new UnsignedWordElement(45239),
+						this.m(GoodWe.ChannelId.E_CHARGE_DAY_2, new UnsignedWordElement(45239),
 								ElementToChannelConverter.SCALE_FACTOR_MINUS_1), //
 						// to read or write the accumulated energy battery discharged, from the
 						// installation date Not from BMS
-						m(GoodWe.ChannelId.E_BATTERY_DISCHARGE_2, new UnsignedDoublewordElement(45240),
+						this.m(GoodWe.ChannelId.E_BATTERY_DISCHARGE_2, new UnsignedDoublewordElement(45240),
 								ElementToChannelConverter.SCALE_FACTOR_MINUS_1), //
 						// to read or write the accumulated energy battery discharged, of the day Not
 						// from BMS
-						m(GoodWe.ChannelId.E_DISCHARGE_DAY_2, new UnsignedWordElement(45242),
+						this.m(GoodWe.ChannelId.E_DISCHARGE_DAY_2, new UnsignedWordElement(45242),
 								ElementToChannelConverter.SCALE_FACTOR_MINUS_1), //
 						new DummyRegisterElement(45243), //
 						// to set safety code for inverter or read the preset safety code for the
 						// inverter
-						m(GoodWe.ChannelId.SAFETY_COUNTRY_CODE, new UnsignedWordElement(45244)), //
+						this.m(GoodWe.ChannelId.SAFETY_COUNTRY_CODE, new UnsignedWordElement(45244)), //
 						// default 100 kilo Ohm, to read or set Isolation protection threshold for the
 						// inverter
-						m(GoodWe.ChannelId.ISO_LIMIT, new UnsignedWordElement(45245)), //
+						this.m(GoodWe.ChannelId.ISO_LIMIT, new UnsignedWordElement(45245)), //
 						// as default is deactivated, set "1" to activate LVRT function, Set "2" to
 						// activate HVRT, The same as 45499
-						m(GoodWe.ChannelId.LVRT_HVRT, new UnsignedWordElement(45246))), //
+						this.m(GoodWe.ChannelId.LVRT_HVRT, new UnsignedWordElement(45246))), //
 				new FC16WriteRegistersTask(45250, //
 						// to write or read the start up PV voltage of the inverter.Please refer to the
 						// user manual
-						m(GoodWe.ChannelId.PV_START_VOLTAGE, new UnsignedWordElement(45250),
+						this.m(GoodWe.ChannelId.PV_START_VOLTAGE, new UnsignedWordElement(45250),
 								ElementToChannelConverter.SCALE_FACTOR_MINUS_1), //
 						// as default is deactivated, set "1" to activate "Shadow Scan" function
-						m(GoodWe.ChannelId.MPPT_FOR_SHADOW_ENABLE, new UnsignedWordElement(45251)), //
+						this.m(GoodWe.ChannelId.MPPT_FOR_SHADOW_ENABLE, new UnsignedWordElement(45251)), //
 						// as default is deactivated, set "1" to activate "Shadow Scan" function
-						m(GoodWe.ChannelId.BACK_UP_ENABLE, new UnsignedWordElement(45252)), //
+						this.m(GoodWe.ChannelId.BACK_UP_ENABLE, new UnsignedWordElement(45252)), //
 						// Off-Grid Auto startup, as default is deactivated, set "1" to activate "Shadow
 						// Scan" function
-						m(GoodWe.ChannelId.AUTO_START_BACKUP, new UnsignedWordElement(45253)), //
+						this.m(GoodWe.ChannelId.AUTO_START_BACKUP, new UnsignedWordElement(45253)), //
 						// As default is "0"
-						m(GoodWe.ChannelId.GRID_WAVE_CHECK_LEVEL, new UnsignedWordElement(45254)), //
+						this.m(GoodWe.ChannelId.GRID_WAVE_CHECK_LEVEL, new UnsignedWordElement(45254)), //
 						new DummyRegisterElement(45255), //
 						// Default is 1500 (30s)
-						m(GoodWe.ChannelId.BACKUP_START_DLY, new UnsignedWordElement(45256)), //
-						m(GoodWe.ChannelId.UPS_STD_VOLT_TYPE, new UnsignedWordElement(45257)), //
+						this.m(GoodWe.ChannelId.BACKUP_START_DLY, new UnsignedWordElement(45256)), //
+						this.m(GoodWe.ChannelId.UPS_STD_VOLT_TYPE, new UnsignedWordElement(45257)), //
 						new DummyRegisterElement(45258, 45262), //
 						// Only can set 70, only for German
-						m(GoodWe.ChannelId.DERATE_RATE_VDE, new UnsignedWordElement(45263)), //
+						this.m(GoodWe.ChannelId.DERATE_RATE_VDE, new UnsignedWordElement(45263)), //
 						// This function is deactivated as default, set "1" to activate. After
 						// activated, All power needs to be turned off and restarted
-						m(GoodWe.ChannelId.THREE_PHASE_UNBALANCED_OUTPUT, new UnsignedWordElement(45264)), //
+						this.m(GoodWe.ChannelId.THREE_PHASE_UNBALANCED_OUTPUT, new UnsignedWordElement(45264)), //
 						new DummyRegisterElement(45265), //
 						// For weak grid area
-						m(GoodWe.ChannelId.HIGH_IMP_MODE, new UnsignedWordElement(45266)), //
+						this.m(GoodWe.ChannelId.HIGH_IMP_MODE, new UnsignedWordElement(45266)), //
 						new DummyRegisterElement(45267, 45270), //
 						// only for inverters with AFCI function
-						m(GoodWe.ChannelId.ARC_SELF_CHECK, new UnsignedWordElement(45271)), //
+						this.m(GoodWe.ChannelId.ARC_SELF_CHECK, new UnsignedWordElement(45271)), //
 						// only for inverters with AFCI function
-						m(GoodWe.ChannelId.ARC_FAULT_REMOVE, new UnsignedWordElement(45272)), //
+						this.m(GoodWe.ChannelId.ARC_FAULT_REMOVE, new UnsignedWordElement(45272)), //
 						new DummyRegisterElement(45273, 45274), //
 						// 0:Normal mode 1: cancel ISO test when offgrid to ongrid
-						m(GoodWe.ChannelId.ISO_CHECK_MODE, new UnsignedWordElement(45275)), //
+						this.m(GoodWe.ChannelId.ISO_CHECK_MODE, new UnsignedWordElement(45275)), //
 						// The delay time when grid is available
-						m(GoodWe.ChannelId.OFF_GRID_TO_ON_GRID_DELAY, new UnsignedWordElement(45276)), //
+						this.m(GoodWe.ChannelId.OFF_GRID_TO_ON_GRID_DELAY, new UnsignedWordElement(45276)), //
 						// If set 80%, when offgrid output voltage less than 230*80%=184V, inverter will
 						// have the error.Default setting is
-						m(GoodWe.ChannelId.OFF_GRID_UNDER_VOLTAGE_PROTECT_COEFFICIENT, new UnsignedWordElement(45277)), //
+						this.m(GoodWe.ChannelId.OFF_GRID_UNDER_VOLTAGE_PROTECT_COEFFICIENT,
+								new UnsignedWordElement(45277)), //
 						// When offgrid and the battery SOC is low, PV charge the battery
-						m(GoodWe.ChannelId.BATTERY_MODE_PV_CHARGE_ENABLE, new UnsignedWordElement(45278)), //
+						this.m(GoodWe.ChannelId.BATTERY_MODE_PV_CHARGE_ENABLE, new UnsignedWordElement(45278)), //
 						// Default setting 1, [1,20]
-						m(GoodWe.ChannelId.DCV_CHECK_OFF, new UnsignedWordElement(45279))), //
+						this.m(GoodWe.ChannelId.DCV_CHECK_OFF, new UnsignedWordElement(45279))), //
 
 				// These registers is to set the protection parameters on battery
 				// charge/discharge operation ON INVERTER SIDE. The real
@@ -987,95 +993,95 @@ protected final ModbusProtocol defineModbusProtocol() throws OpenemsException {
 				// charge at max 20A. but if battery BMS limit max charge current as 50A,then
 				// the real charge current of the battery will exceed 25A.
 				new FC16WriteRegistersTask(45352, //
-						m(GoodWe.ChannelId.BMS_CHARGE_MAX_VOLTAGE, new UnsignedWordElement(45352),
+						this.m(GoodWe.ChannelId.BMS_CHARGE_MAX_VOLTAGE, new UnsignedWordElement(45352),
 								ElementToChannelConverter.SCALE_FACTOR_MINUS_1), // [500*N,600*N]
-						m(GoodWe.ChannelId.BMS_CHARGE_MAX_CURRENT, new UnsignedWordElement(45353),
+						this.m(GoodWe.ChannelId.BMS_CHARGE_MAX_CURRENT, new UnsignedWordElement(45353),
 								ElementToChannelConverter.SCALE_FACTOR_MINUS_1), // [0,1000]
-						m(GoodWe.ChannelId.BMS_DISCHARGE_MIN_VOLTAGE, new UnsignedWordElement(45354),
+						this.m(GoodWe.ChannelId.BMS_DISCHARGE_MIN_VOLTAGE, new UnsignedWordElement(45354),
 								ElementToChannelConverter.SCALE_FACTOR_MINUS_1), // [400*N,480*N]
-						m(GoodWe.ChannelId.BMS_DISCHARGE_MAX_CURRENT, new UnsignedWordElement(45355),
+						this.m(GoodWe.ChannelId.BMS_DISCHARGE_MAX_CURRENT, new UnsignedWordElement(45355),
 								ElementToChannelConverter.SCALE_FACTOR_MINUS_1), // [0,1000]
-						m(GoodWe.ChannelId.BMS_SOC_UNDER_MIN, new UnsignedWordElement(45356)), // [0,100]
-						m(GoodWe.ChannelId.BMS_OFFLINE_DISCHARGE_MIN_VOLTAGE, new UnsignedWordElement(45357),
+						this.m(GoodWe.ChannelId.BMS_SOC_UNDER_MIN, new UnsignedWordElement(45356)), // [0,100]
+						this.m(GoodWe.ChannelId.BMS_OFFLINE_DISCHARGE_MIN_VOLTAGE, new UnsignedWordElement(45357),
 								ElementToChannelConverter.SCALE_FACTOR_MINUS_1), // ), //
-						m(GoodWe.ChannelId.BMS_OFFLINE_SOC_UNDER_MIN, new UnsignedWordElement(45358))), //
+						this.m(GoodWe.ChannelId.BMS_OFFLINE_SOC_UNDER_MIN, new UnsignedWordElement(45358))), //
 
 				// Safety Parameters
 				new FC16WriteRegistersTask(45400, //
-						m(GoodWe.ChannelId.GRID_VOLT_HIGH_S1, new UnsignedWordElement(45400),
+						this.m(GoodWe.ChannelId.GRID_VOLT_HIGH_S1, new UnsignedWordElement(45400),
 								ElementToChannelConverter.SCALE_FACTOR_MINUS_1), //
-						m(GoodWe.ChannelId.GRID_VOLT_HIGH_S1_TIME, new UnsignedWordElement(45401)), //
-						m(GoodWe.ChannelId.GRID_VOLT_LOW_S1, new UnsignedWordElement(45402),
+						this.m(GoodWe.ChannelId.GRID_VOLT_HIGH_S1_TIME, new UnsignedWordElement(45401)), //
+						this.m(GoodWe.ChannelId.GRID_VOLT_LOW_S1, new UnsignedWordElement(45402),
 								ElementToChannelConverter.SCALE_FACTOR_MINUS_1), //
-						m(GoodWe.ChannelId.GRID_VOLT_LOW_S1_TIME, new UnsignedWordElement(45403)), //
-						m(GoodWe.ChannelId.GRID_VOLT_HIGH_S2, new UnsignedWordElement(45404),
+						this.m(GoodWe.ChannelId.GRID_VOLT_LOW_S1_TIME, new UnsignedWordElement(45403)), //
+						this.m(GoodWe.ChannelId.GRID_VOLT_HIGH_S2, new UnsignedWordElement(45404),
 								ElementToChannelConverter.SCALE_FACTOR_MINUS_1), //
-						m(GoodWe.ChannelId.GRID_VOLT_HIGH_S2_TIME, new UnsignedWordElement(45405)), //
-						m(GoodWe.ChannelId.GRID_VOLT_LOW_S2, new UnsignedWordElement(45406),
+						this.m(GoodWe.ChannelId.GRID_VOLT_HIGH_S2_TIME, new UnsignedWordElement(45405)), //
+						this.m(GoodWe.ChannelId.GRID_VOLT_LOW_S2, new UnsignedWordElement(45406),
 								ElementToChannelConverter.SCALE_FACTOR_MINUS_1), //
-						m(GoodWe.ChannelId.GRID_VOLT_LOW_S2_TIME, new UnsignedWordElement(45407)), //
-						m(GoodWe.ChannelId.GRID_VOLT_QUALITY, new UnsignedWordElement(45408),
+						this.m(GoodWe.ChannelId.GRID_VOLT_LOW_S2_TIME, new UnsignedWordElement(45407)), //
+						this.m(GoodWe.ChannelId.GRID_VOLT_QUALITY, new UnsignedWordElement(45408),
 								ElementToChannelConverter.SCALE_FACTOR_MINUS_1), //
-						m(GoodWe.ChannelId.GRID_FREQ_HIGH_S1, new UnsignedWordElement(45409),
+						this.m(GoodWe.ChannelId.GRID_FREQ_HIGH_S1, new UnsignedWordElement(45409),
 								ElementToChannelConverter.SCALE_FACTOR_MINUS_2), //
-						m(GoodWe.ChannelId.GRID_FREQ_HIGH_S1_TIME, new UnsignedWordElement(45410)), //
-						m(GoodWe.ChannelId.GRID_FREQ_LOW_S1, new UnsignedWordElement(45411),
+						this.m(GoodWe.ChannelId.GRID_FREQ_HIGH_S1_TIME, new UnsignedWordElement(45410)), //
+						this.m(GoodWe.ChannelId.GRID_FREQ_LOW_S1, new UnsignedWordElement(45411),
 								ElementToChannelConverter.SCALE_FACTOR_MINUS_2), //
-						m(GoodWe.ChannelId.GRID_FREQ_LOW_S1_TIME, new UnsignedWordElement(45412)), //
-						m(GoodWe.ChannelId.GRID_FREQ_HIGH_S2, new UnsignedWordElement(45413),
+						this.m(GoodWe.ChannelId.GRID_FREQ_LOW_S1_TIME, new UnsignedWordElement(45412)), //
+						this.m(GoodWe.ChannelId.GRID_FREQ_HIGH_S2, new UnsignedWordElement(45413),
 								ElementToChannelConverter.SCALE_FACTOR_MINUS_2), //
-						m(GoodWe.ChannelId.GRID_FREQ_HIGH_S2_TIME, new UnsignedWordElement(45414)), //
-						m(GoodWe.ChannelId.GRID_FREQ_LOW_S2, new UnsignedWordElement(45415),
+						this.m(GoodWe.ChannelId.GRID_FREQ_HIGH_S2_TIME, new UnsignedWordElement(45414)), //
+						this.m(GoodWe.ChannelId.GRID_FREQ_LOW_S2, new UnsignedWordElement(45415),
 								ElementToChannelConverter.SCALE_FACTOR_MINUS_2), //
-						m(GoodWe.ChannelId.GRID_FREQ_LOW_S2_TIME, new UnsignedWordElement(45416)), //
+						this.m(GoodWe.ChannelId.GRID_FREQ_LOW_S2_TIME, new UnsignedWordElement(45416)), //
 						// Connect voltage
-						m(GoodWe.ChannelId.GRID_VOLT_HIGH, new UnsignedWordElement(45417),
+						this.m(GoodWe.ChannelId.GRID_VOLT_HIGH, new UnsignedWordElement(45417),
 								ElementToChannelConverter.SCALE_FACTOR_MINUS_1), //
-						m(GoodWe.ChannelId.GRID_VOLT_LOW, new UnsignedWordElement(45418),
+						this.m(GoodWe.ChannelId.GRID_VOLT_LOW, new UnsignedWordElement(45418),
 								ElementToChannelConverter.SCALE_FACTOR_MINUS_1), //
-						m(GoodWe.ChannelId.GRID_FREQ_HIGH, new UnsignedWordElement(45419),
+						this.m(GoodWe.ChannelId.GRID_FREQ_HIGH, new UnsignedWordElement(45419),
 								ElementToChannelConverter.SCALE_FACTOR_MINUS_2), //
-						m(GoodWe.ChannelId.GRID_FREQ_LOW, new UnsignedWordElement(45420),
+						this.m(GoodWe.ChannelId.GRID_FREQ_LOW, new UnsignedWordElement(45420),
 								ElementToChannelConverter.SCALE_FACTOR_MINUS_2), //
-						m(GoodWe.ChannelId.GRID_RECOVER_TIME, new UnsignedWordElement(45421)), //
+						this.m(GoodWe.ChannelId.GRID_RECOVER_TIME, new UnsignedWordElement(45421)), //
 						// Reconnect voltage
-						m(GoodWe.ChannelId.GRID_VOLT_RECOVER_HIGH, new UnsignedWordElement(45422),
+						this.m(GoodWe.ChannelId.GRID_VOLT_RECOVER_HIGH, new UnsignedWordElement(45422),
 								ElementToChannelConverter.SCALE_FACTOR_MINUS_1), //
-						m(GoodWe.ChannelId.GRID_VOLT_RECOVER_LOW, new UnsignedWordElement(45423),
+						this.m(GoodWe.ChannelId.GRID_VOLT_RECOVER_LOW, new UnsignedWordElement(45423),
 								ElementToChannelConverter.SCALE_FACTOR_MINUS_1), //
-						m(GoodWe.ChannelId.GRID_FREQ_RECOVER_HIGH, new UnsignedWordElement(45424),
+						this.m(GoodWe.ChannelId.GRID_FREQ_RECOVER_HIGH, new UnsignedWordElement(45424),
 								ElementToChannelConverter.SCALE_FACTOR_MINUS_2), //
-						m(GoodWe.ChannelId.GRID_FREQ_RECOVER_LOW, new UnsignedWordElement(45425),
+						this.m(GoodWe.ChannelId.GRID_FREQ_RECOVER_LOW, new UnsignedWordElement(45425),
 								ElementToChannelConverter.SCALE_FACTOR_MINUS_2), //
-						m(GoodWe.ChannelId.GRID_VOLT_RECOVER_TIME, new UnsignedWordElement(45426)), //
-						m(GoodWe.ChannelId.GRID_FREQ_RECOVER_TIME, new UnsignedWordElement(45427)), //
+						this.m(GoodWe.ChannelId.GRID_VOLT_RECOVER_TIME, new UnsignedWordElement(45426)), //
+						this.m(GoodWe.ChannelId.GRID_FREQ_RECOVER_TIME, new UnsignedWordElement(45427)), //
 						// Power rate limit
-						m(GoodWe.ChannelId.POWER_RATE_LIMIT_GENERATE, new UnsignedWordElement(45428),
+						this.m(GoodWe.ChannelId.POWER_RATE_LIMIT_GENERATE, new UnsignedWordElement(45428),
 								ElementToChannelConverter.SCALE_FACTOR_MINUS_2), //
-						m(GoodWe.ChannelId.POWER_RATE_LIMIT_RECONNECT, new UnsignedWordElement(45429),
+						this.m(GoodWe.ChannelId.POWER_RATE_LIMIT_RECONNECT, new UnsignedWordElement(45429),
 								ElementToChannelConverter.SCALE_FACTOR_MINUS_2), //
-						m(GoodWe.ChannelId.POWER_RATE_LIMIT_REDUCTION, new UnsignedWordElement(45430),
+						this.m(GoodWe.ChannelId.POWER_RATE_LIMIT_REDUCTION, new UnsignedWordElement(45430),
 								ElementToChannelConverter.SCALE_FACTOR_MINUS_2), //
-						m(GoodWe.ChannelId.GRID_PROTECT, new UnsignedWordElement(45431)), //
-						m(GoodWe.ChannelId.POWER_SLOPE_ENABLE, new UnsignedWordElement(45432))), //
+						this.m(GoodWe.ChannelId.GRID_PROTECT, new UnsignedWordElement(45431)), //
+						this.m(GoodWe.ChannelId.POWER_SLOPE_ENABLE, new UnsignedWordElement(45432))), //
 
 				// Cos Phi Curve
 				new FC16WriteRegistersTask(45433, //
-						m(GoodWe.ChannelId.ENABLE_CURVE_PU, new UnsignedWordElement(45433)), //
-						m(GoodWe.ChannelId.A_POINT_POWER, new SignedWordElement(45434)), //
-						m(GoodWe.ChannelId.A_POINT_COS_PHI, new SignedWordElement(45435),
+						this.m(GoodWe.ChannelId.ENABLE_CURVE_PU, new UnsignedWordElement(45433)), //
+						this.m(GoodWe.ChannelId.A_POINT_POWER, new SignedWordElement(45434)), //
+						this.m(GoodWe.ChannelId.A_POINT_COS_PHI, new SignedWordElement(45435),
 								ElementToChannelConverter.SCALE_FACTOR_MINUS_2), //
-						m(GoodWe.ChannelId.B_POINT_POWER, new SignedWordElement(45436)), //
-						m(GoodWe.ChannelId.B_POINT_COS_PHI, new SignedWordElement(45437),
+						this.m(GoodWe.ChannelId.B_POINT_POWER, new SignedWordElement(45436)), //
+						this.m(GoodWe.ChannelId.B_POINT_COS_PHI, new SignedWordElement(45437),
 								ElementToChannelConverter.SCALE_FACTOR_MINUS_2), //
-						m(GoodWe.ChannelId.C_POINT_POWER, new SignedWordElement(45438)), //
-						m(GoodWe.ChannelId.C_POINT_COS_PHI, new SignedWordElement(45439),
+						this.m(GoodWe.ChannelId.C_POINT_POWER, new SignedWordElement(45438)), //
+						this.m(GoodWe.ChannelId.C_POINT_COS_PHI, new SignedWordElement(45439),
 								ElementToChannelConverter.SCALE_FACTOR_MINUS_2), // ), //
-						m(GoodWe.ChannelId.LOCK_IN_VOLTAGE, new UnsignedWordElement(45440),
+						this.m(GoodWe.ChannelId.LOCK_IN_VOLTAGE, new UnsignedWordElement(45440),
 								ElementToChannelConverter.SCALE_FACTOR_MINUS_1), //
-						m(GoodWe.ChannelId.LOCK_OUT_VOLTAGE, new UnsignedWordElement(45441),
+						this.m(GoodWe.ChannelId.LOCK_OUT_VOLTAGE, new UnsignedWordElement(45441),
 								ElementToChannelConverter.SCALE_FACTOR_MINUS_1), //
-						m(GoodWe.ChannelId.LOCK_OUT_POWER, new SignedWordElement(45442))), //
+						this.m(GoodWe.ChannelId.LOCK_OUT_POWER, new SignedWordElement(45442))), //
 
 				// Power and frequency curve
 				// m(new BitsWordElement(45443, this)//
@@ -1084,173 +1090,173 @@ protected final ModbusProtocol defineModbusProtocol() throws OpenemsException {
 
 				// Power and frequency curve
 				new FC16WriteRegistersTask(45444, //
-						m(GoodWe.ChannelId.FFROZEN_DCH, new UnsignedWordElement(45444),
+						this.m(GoodWe.ChannelId.FFROZEN_DCH, new UnsignedWordElement(45444),
 								ElementToChannelConverter.SCALE_FACTOR_MINUS_2), //
-						m(GoodWe.ChannelId.FFROZEN_CH, new UnsignedWordElement(45445),
+						this.m(GoodWe.ChannelId.FFROZEN_CH, new UnsignedWordElement(45445),
 								ElementToChannelConverter.SCALE_FACTOR_MINUS_2), //
-						m(GoodWe.ChannelId.FSTOP_DCH, new UnsignedWordElement(45446),
+						this.m(GoodWe.ChannelId.FSTOP_DCH, new UnsignedWordElement(45446),
 								ElementToChannelConverter.SCALE_FACTOR_MINUS_2), //
-						m(GoodWe.ChannelId.FSTOP_CH, new UnsignedWordElement(45447),
+						this.m(GoodWe.ChannelId.FSTOP_CH, new UnsignedWordElement(45447),
 								ElementToChannelConverter.SCALE_FACTOR_MINUS_2), //
-						m(GoodWe.ChannelId.RECOVERY_WAITING_TIME, new UnsignedWordElement(45448)), //
-						m(GoodWe.ChannelId.RECOVERY_FREQURNCY1, new UnsignedWordElement(45449),
+						this.m(GoodWe.ChannelId.RECOVERY_WAITING_TIME, new UnsignedWordElement(45448)), //
+						this.m(GoodWe.ChannelId.RECOVERY_FREQURNCY1, new UnsignedWordElement(45449),
 								ElementToChannelConverter.SCALE_FACTOR_MINUS_2), //
-						m(GoodWe.ChannelId.RECOVERY_FREQUENCY2, new UnsignedWordElement(45450),
+						this.m(GoodWe.ChannelId.RECOVERY_FREQUENCY2, new UnsignedWordElement(45450),
 								ElementToChannelConverter.SCALE_FACTOR_MINUS_2), //
-						m(GoodWe.ChannelId.CFP_SETTINGS, new UnsignedWordElement(45451), //
+						this.m(GoodWe.ChannelId.CFP_SETTINGS, new UnsignedWordElement(45451), //
 								new ChannelMetaInfoReadAndWrite(45452, 45451)), //
-						m(GoodWe.ChannelId.OF_RECOVERY_SLOPE, new UnsignedWordElement(45452), //
+						this.m(GoodWe.ChannelId.OF_RECOVERY_SLOPE, new UnsignedWordElement(45452), //
 								new ChannelMetaInfoReadAndWrite(45451, 45452)), //
-						m(GoodWe.ChannelId.CFP_OF_SLOPE_PERCENT, new UnsignedWordElement(45453),
+						this.m(GoodWe.ChannelId.CFP_OF_SLOPE_PERCENT, new UnsignedWordElement(45453),
 								ElementToChannelConverter.SCALE_FACTOR_MINUS_2), //
-						m(GoodWe.ChannelId.CFP_UF_SLOPE_PERCENT, new UnsignedWordElement(45454),
+						this.m(GoodWe.ChannelId.CFP_UF_SLOPE_PERCENT, new UnsignedWordElement(45454),
 								ElementToChannelConverter.SCALE_FACTOR_MINUS_2), //
-						m(GoodWe.ChannelId.CFP_OF_RECOVER_POWER_PERCENT, new UnsignedWordElement(45455)), //
+						this.m(GoodWe.ChannelId.CFP_OF_RECOVER_POWER_PERCENT, new UnsignedWordElement(45455)), //
 
 						// QU Curve
-						m(GoodWe.ChannelId.QU_CURVE, new UnsignedWordElement(45456)), //
-						m(GoodWe.ChannelId.LOCK_IN_POWER_QU, new SignedWordElement(45457)), //
-						m(GoodWe.ChannelId.LOCK_OUT_POWER_QU, new SignedWordElement(45458)), //
-						m(GoodWe.ChannelId.V1_VOLTAGE, new UnsignedWordElement(45459),
+						this.m(GoodWe.ChannelId.QU_CURVE, new UnsignedWordElement(45456)), //
+						this.m(GoodWe.ChannelId.LOCK_IN_POWER_QU, new SignedWordElement(45457)), //
+						this.m(GoodWe.ChannelId.LOCK_OUT_POWER_QU, new SignedWordElement(45458)), //
+						this.m(GoodWe.ChannelId.V1_VOLTAGE, new UnsignedWordElement(45459),
 								ElementToChannelConverter.SCALE_FACTOR_MINUS_1), // ), //
-						m(GoodWe.ChannelId.V1_VALUE, new UnsignedWordElement(45460)), //
-						m(GoodWe.ChannelId.V2_VOLTAGE, new UnsignedWordElement(45461),
+						this.m(GoodWe.ChannelId.V1_VALUE, new UnsignedWordElement(45460)), //
+						this.m(GoodWe.ChannelId.V2_VOLTAGE, new UnsignedWordElement(45461),
 								ElementToChannelConverter.SCALE_FACTOR_MINUS_1), //
-						m(GoodWe.ChannelId.V2_VALUE, new UnsignedWordElement(45462)), //
-						m(GoodWe.ChannelId.V3_VOLTAGE, new UnsignedWordElement(45463),
+						this.m(GoodWe.ChannelId.V2_VALUE, new UnsignedWordElement(45462)), //
+						this.m(GoodWe.ChannelId.V3_VOLTAGE, new UnsignedWordElement(45463),
 								ElementToChannelConverter.SCALE_FACTOR_MINUS_1), //
-						m(GoodWe.ChannelId.V3_VALUE, new UnsignedWordElement(45464)), //
-						m(GoodWe.ChannelId.V4_VOLTAGE, new UnsignedWordElement(45465),
+						this.m(GoodWe.ChannelId.V3_VALUE, new UnsignedWordElement(45464)), //
+						this.m(GoodWe.ChannelId.V4_VOLTAGE, new UnsignedWordElement(45465),
 								ElementToChannelConverter.SCALE_FACTOR_MINUS_1), //
-						m(GoodWe.ChannelId.V4_VALUE, new SignedWordElement(45466)), //
-						m(GoodWe.ChannelId.K_VALUE, new UnsignedWordElement(45467)), //
-						m(GoodWe.ChannelId.TIME_CONSTANT, new UnsignedWordElement(45468)), //
-						m(GoodWe.ChannelId.MISCELLANEA, new UnsignedWordElement(45469))), //
+						this.m(GoodWe.ChannelId.V4_VALUE, new SignedWordElement(45466)), //
+						this.m(GoodWe.ChannelId.K_VALUE, new UnsignedWordElement(45467)), //
+						this.m(GoodWe.ChannelId.TIME_CONSTANT, new UnsignedWordElement(45468)), //
+						this.m(GoodWe.ChannelId.MISCELLANEA, new UnsignedWordElement(45469))), //
 
 				// PU Curve
 				new FC16WriteRegistersTask(45472, //
-						m(GoodWe.ChannelId.PU_CURVE, new UnsignedWordElement(45472)), //
-						m(GoodWe.ChannelId.POWER_CHANGE_RATE, new UnsignedWordElement(45473),
+						this.m(GoodWe.ChannelId.PU_CURVE, new UnsignedWordElement(45472)), //
+						this.m(GoodWe.ChannelId.POWER_CHANGE_RATE, new UnsignedWordElement(45473),
 								ElementToChannelConverter.SCALE_FACTOR_MINUS_2), //
-						m(GoodWe.ChannelId.V1_VOLTAGE_PU, new UnsignedWordElement(45474),
+						this.m(GoodWe.ChannelId.V1_VOLTAGE_PU, new UnsignedWordElement(45474),
 								ElementToChannelConverter.SCALE_FACTOR_MINUS_1), //
-						m(GoodWe.ChannelId.V1_VALUE_PU, new SignedWordElement(45475)), //
-						m(GoodWe.ChannelId.V2_VOLTAGE_PU, new UnsignedWordElement(45476),
+						this.m(GoodWe.ChannelId.V1_VALUE_PU, new SignedWordElement(45475)), //
+						this.m(GoodWe.ChannelId.V2_VOLTAGE_PU, new UnsignedWordElement(45476),
 								ElementToChannelConverter.SCALE_FACTOR_MINUS_1), //
-						m(GoodWe.ChannelId.V2_VALUE_PU, new SignedWordElement(45477)), //
-						m(GoodWe.ChannelId.V3_VOLTAGE_PU, new UnsignedWordElement(45478),
+						this.m(GoodWe.ChannelId.V2_VALUE_PU, new SignedWordElement(45477)), //
+						this.m(GoodWe.ChannelId.V3_VOLTAGE_PU, new UnsignedWordElement(45478),
 								ElementToChannelConverter.SCALE_FACTOR_MINUS_1), //
-						m(GoodWe.ChannelId.V3_VALUE_PU, new SignedWordElement(45479)), //
-						m(GoodWe.ChannelId.V4_VOLTAGE_PU, new UnsignedWordElement(45480),
+						this.m(GoodWe.ChannelId.V3_VALUE_PU, new SignedWordElement(45479)), //
+						this.m(GoodWe.ChannelId.V4_VOLTAGE_PU, new UnsignedWordElement(45480),
 								ElementToChannelConverter.SCALE_FACTOR_MINUS_1), //
-						m(GoodWe.ChannelId.V4_VALUE_PU, new SignedWordElement(45481)), //
+						this.m(GoodWe.ChannelId.V4_VALUE_PU, new SignedWordElement(45481)), //
 						// 80=Pf 0.8, 20= -0.8Pf
-						m(GoodWe.ChannelId.FIXED_POWER_FACTOR, new UnsignedWordElement(45482)), // [0,20]||[80,100]
+						this.m(GoodWe.ChannelId.FIXED_POWER_FACTOR, new UnsignedWordElement(45482)), // [0,20]||[80,100]
 						// Set the percentage of rated power of the inverter
-						m(GoodWe.ChannelId.FIXED_REACTIVE_POWER, new SignedWordElement(45483)), // [-600,600]
-						m(GoodWe.ChannelId.FIXED_ACTIVE_POWER, new UnsignedWordElement(45484)), // [0,1000]
+						this.m(GoodWe.ChannelId.FIXED_REACTIVE_POWER, new SignedWordElement(45483)), // [-600,600]
+						this.m(GoodWe.ChannelId.FIXED_ACTIVE_POWER, new UnsignedWordElement(45484)), // [0,1000]
 						new DummyRegisterElement(45485, 45490), //
 						// This must be turned off to do Meter test . "1" means Off
-						m(GoodWe.ChannelId.ALL_POWER_CURVE_DISABLE, new UnsignedWordElement(45491)), //
+						this.m(GoodWe.ChannelId.ALL_POWER_CURVE_DISABLE, new UnsignedWordElement(45491)), //
 						// if it is 1-phase inverter, then use only R phase. Unbalance output function
 						// must be turned on to set different values for R/S/T phases
-						m(GoodWe.ChannelId.R_PHASE_FIXED_ACTIVE_POWER, new UnsignedWordElement(45492)), //
-						m(GoodWe.ChannelId.S_PHASE_FIXED_ACTIVE_POWER, new UnsignedWordElement(45493)), //
-						m(GoodWe.ChannelId.T_PHASE_FIXED_ACTIVE_POWER, new UnsignedWordElement(45494)), //
+						this.m(GoodWe.ChannelId.R_PHASE_FIXED_ACTIVE_POWER, new UnsignedWordElement(45492)), //
+						this.m(GoodWe.ChannelId.S_PHASE_FIXED_ACTIVE_POWER, new UnsignedWordElement(45493)), //
+						this.m(GoodWe.ChannelId.T_PHASE_FIXED_ACTIVE_POWER, new UnsignedWordElement(45494)), //
 						// only for countries where it needs 3-stage grid voltage
 						// protection, Eg. Czech Republic
-						m(GoodWe.ChannelId.GRID_VOLT_HIGH_S3, new UnsignedWordElement(45495),
+						this.m(GoodWe.ChannelId.GRID_VOLT_HIGH_S3, new UnsignedWordElement(45495),
 								ElementToChannelConverter.SCALE_FACTOR_MINUS_1), //
-						m(GoodWe.ChannelId.GRID_VOLT_HIGH_S3_TIME, new UnsignedWordElement(45496)), //
-						m(GoodWe.ChannelId.GRID_VOLT_LOW_S3, new UnsignedWordElement(45497),
+						this.m(GoodWe.ChannelId.GRID_VOLT_HIGH_S3_TIME, new UnsignedWordElement(45496)), //
+						this.m(GoodWe.ChannelId.GRID_VOLT_LOW_S3, new UnsignedWordElement(45497),
 								ElementToChannelConverter.SCALE_FACTOR_MINUS_1), //
-						m(GoodWe.ChannelId.GRID_VOLT_LOW_S3_TIME, new UnsignedWordElement(45498)), //
+						this.m(GoodWe.ChannelId.GRID_VOLT_LOW_S3_TIME, new UnsignedWordElement(45498)), //
 
 						// For ZVRT, LVRT, HVRT
-						m(GoodWe.ChannelId.ZVRT_CONFIG, new UnsignedWordElement(45499)), //
-						m(GoodWe.ChannelId.LVRT_START_VOLT, new UnsignedWordElement(45500),
+						this.m(GoodWe.ChannelId.ZVRT_CONFIG, new UnsignedWordElement(45499)), //
+						this.m(GoodWe.ChannelId.LVRT_START_VOLT, new UnsignedWordElement(45500),
 								ElementToChannelConverter.SCALE_FACTOR_MINUS_1), //
-						m(GoodWe.ChannelId.LVRT_END_VOLT, new UnsignedWordElement(45501),
+						this.m(GoodWe.ChannelId.LVRT_END_VOLT, new UnsignedWordElement(45501),
 								ElementToChannelConverter.SCALE_FACTOR_MINUS_1), //
-						m(GoodWe.ChannelId.LVRT_START_TRIP_TIME, new UnsignedWordElement(45502)), //
-						m(GoodWe.ChannelId.LVRT_END_TRIP_TIME, new UnsignedWordElement(45503)), //
-						m(GoodWe.ChannelId.LVRT_TRIP_LIMIT_VOLT, new UnsignedWordElement(45504),
+						this.m(GoodWe.ChannelId.LVRT_START_TRIP_TIME, new UnsignedWordElement(45502)), //
+						this.m(GoodWe.ChannelId.LVRT_END_TRIP_TIME, new UnsignedWordElement(45503)), //
+						this.m(GoodWe.ChannelId.LVRT_TRIP_LIMIT_VOLT, new UnsignedWordElement(45504),
 								ElementToChannelConverter.SCALE_FACTOR_MINUS_1), //
-						m(GoodWe.ChannelId.HVRT_START_VOLT, new UnsignedWordElement(45505),
+						this.m(GoodWe.ChannelId.HVRT_START_VOLT, new UnsignedWordElement(45505),
 								ElementToChannelConverter.SCALE_FACTOR_MINUS_1), //
-						m(GoodWe.ChannelId.HVRT_END_VOLT, new UnsignedWordElement(45506),
+						this.m(GoodWe.ChannelId.HVRT_END_VOLT, new UnsignedWordElement(45506),
 								ElementToChannelConverter.SCALE_FACTOR_MINUS_1), //
-						m(GoodWe.ChannelId.HVRT_START_TRIP_TIME, new UnsignedWordElement(45507)), //
-						m(GoodWe.ChannelId.HVRT_END_TRIP_TIME, new UnsignedWordElement(45508)), //
-						m(GoodWe.ChannelId.HVRT_TRIP_LIMIT_VOLT, new UnsignedWordElement(45509),
+						this.m(GoodWe.ChannelId.HVRT_START_TRIP_TIME, new UnsignedWordElement(45507)), //
+						this.m(GoodWe.ChannelId.HVRT_END_TRIP_TIME, new UnsignedWordElement(45508)), //
+						this.m(GoodWe.ChannelId.HVRT_TRIP_LIMIT_VOLT, new UnsignedWordElement(45509),
 								ElementToChannelConverter.SCALE_FACTOR_MINUS_1)//
 				), //
 
 				// Additional settings for PF/PU/UF
 				new FC16WriteRegistersTask(45510, //
-						m(GoodWe.ChannelId.PF_TIME_CONSTANT, new UnsignedWordElement(45510)), //
-						m(GoodWe.ChannelId.POWER_FREQ_TIME_CONSTANT, new UnsignedWordElement(45511)), //
+						this.m(GoodWe.ChannelId.PF_TIME_CONSTANT, new UnsignedWordElement(45510)), //
+						this.m(GoodWe.ChannelId.POWER_FREQ_TIME_CONSTANT, new UnsignedWordElement(45511)), //
 						// Additional settings for P(U) Curve
-						m(GoodWe.ChannelId.PU_TIME_CONSTANT, new UnsignedWordElement(45512)), //
-						m(GoodWe.ChannelId.D_POINT_POWER, new SignedWordElement(45513)), //
-						m(GoodWe.ChannelId.D_POINT_COS_PHI, new SignedWordElement(45514)), //
+						this.m(GoodWe.ChannelId.PU_TIME_CONSTANT, new UnsignedWordElement(45512)), //
+						this.m(GoodWe.ChannelId.D_POINT_POWER, new SignedWordElement(45513)), //
+						this.m(GoodWe.ChannelId.D_POINT_COS_PHI, new SignedWordElement(45514)), //
 						// Additional settings for UF Curve
-						m(GoodWe.ChannelId.UF_RECOVERY_WAITING_TIME, new UnsignedWordElement(45515),
+						this.m(GoodWe.ChannelId.UF_RECOVERY_WAITING_TIME, new UnsignedWordElement(45515),
 								ElementToChannelConverter.SCALE_FACTOR_MINUS_2), //
-						m(GoodWe.ChannelId.UF_RECOVER_SLOPE, new UnsignedWordElement(45516)), //
-						m(GoodWe.ChannelId.CFP_UF_RECOVER_POWER_PERCENT, new UnsignedWordElement(45517)), //
-						m(GoodWe.ChannelId.POWER_CHARGE_LIMIT, new UnsignedWordElement(45518),
+						this.m(GoodWe.ChannelId.UF_RECOVER_SLOPE, new UnsignedWordElement(45516)), //
+						this.m(GoodWe.ChannelId.CFP_UF_RECOVER_POWER_PERCENT, new UnsignedWordElement(45517)), //
+						this.m(GoodWe.ChannelId.POWER_CHARGE_LIMIT, new UnsignedWordElement(45518),
 								ElementToChannelConverter.SCALE_FACTOR_MINUS_2), //
-						m(GoodWe.ChannelId.POWER_CHARGE_LIMIT_RECONNECT, new UnsignedWordElement(45519),
+						this.m(GoodWe.ChannelId.POWER_CHARGE_LIMIT_RECONNECT, new UnsignedWordElement(45519),
 								ElementToChannelConverter.SCALE_FACTOR_MINUS_2), //
-						m(GoodWe.ChannelId.C_EXT_UF_CHARGE_STOP, new UnsignedWordElement(45520),
+						this.m(GoodWe.ChannelId.C_EXT_UF_CHARGE_STOP, new UnsignedWordElement(45520),
 								ElementToChannelConverter.SCALE_FACTOR_MINUS_2), //
-						m(GoodWe.ChannelId.C_EXT_OF_DISCHARGE_STOP, new UnsignedWordElement(45521),
+						this.m(GoodWe.ChannelId.C_EXT_OF_DISCHARGE_STOP, new UnsignedWordElement(45521),
 								ElementToChannelConverter.SCALE_FACTOR_MINUS_2), //
-						m(GoodWe.ChannelId.C_EXT_TWOSSTEPF_FLG, new UnsignedWordElement(45522))//
+						this.m(GoodWe.ChannelId.C_EXT_TWOSSTEPF_FLG, new UnsignedWordElement(45522))//
 				), //
 
 				new FC16WriteRegistersTask(47505, //
 						// If using EMS, must set to "2"
-						m(GoodWe.ChannelId.MANUFACTURE_CODE, new UnsignedWordElement(47505)), //
+						this.m(GoodWe.ChannelId.MANUFACTURE_CODE, new UnsignedWordElement(47505)), //
 						new DummyRegisterElement(47506, 47508), //
-						m(GoodWe.ChannelId.FEED_POWER_ENABLE, new UnsignedWordElement(47509)), //
-						m(GoodWe.ChannelId.FEED_POWER_PARA_SET, new SignedWordElement(47510)), //
-						m(GoodWe.ChannelId.EMS_POWER_MODE, new UnsignedWordElement(47511)), //
-						m(GoodWe.ChannelId.EMS_POWER_SET, new UnsignedWordElement(47512)), //
+						this.m(GoodWe.ChannelId.FEED_POWER_ENABLE, new UnsignedWordElement(47509)), //
+						this.m(GoodWe.ChannelId.FEED_POWER_PARA_SET, new SignedWordElement(47510)), //
+						this.m(GoodWe.ChannelId.EMS_POWER_MODE, new UnsignedWordElement(47511)), //
+						this.m(GoodWe.ChannelId.EMS_POWER_SET, new UnsignedWordElement(47512)), //
 						new DummyRegisterElement(47513), //
-						m(GoodWe.ChannelId.BATTERY_PROTOCOL_ARM, new UnsignedWordElement(47514)), //
-						m(GoodWe.ChannelId.WORK_WEEK_1_START_TIME, new UnsignedWordElement(47515)), //
-						m(GoodWe.ChannelId.WORK_WEEK_1_END_TIME, new UnsignedWordElement(47516)), //
-						m(GoodWe.ChannelId.WORK_WEEK_1_BAT_POWER_PERCENT, new SignedWordElement(47517)), //
-						m(GoodWe.ChannelId.WORK_WEEK_1, new UnsignedWordElement(47518)) //
+						this.m(GoodWe.ChannelId.BATTERY_PROTOCOL_ARM, new UnsignedWordElement(47514)), //
+						this.m(GoodWe.ChannelId.WORK_WEEK_1_START_TIME, new UnsignedWordElement(47515)), //
+						this.m(GoodWe.ChannelId.WORK_WEEK_1_END_TIME, new UnsignedWordElement(47516)), //
+						this.m(GoodWe.ChannelId.WORK_WEEK_1_BAT_POWER_PERCENT, new SignedWordElement(47517)), //
+						this.m(GoodWe.ChannelId.WORK_WEEK_1, new UnsignedWordElement(47518)) //
 				// TODO .debug()
 				), //
 
 				// Real-Time BMS Data for EMS Control (the data directly from BMS. Please refer
 				// to the comments on registers 45352~45358)
 				new FC16WriteRegistersTask(47900, //
-						m(GoodWe.ChannelId.WBMS_VERSION, new UnsignedWordElement(47900)), //
-						m(GoodWe.ChannelId.WBMS_STRINGS, new UnsignedWordElement(47901)), //
-						m(GoodWe.ChannelId.WBMS_CHARGE_MAX_VOLTAGE, new UnsignedWordElement(47902),
+						this.m(GoodWe.ChannelId.WBMS_VERSION, new UnsignedWordElement(47900)), //
+						this.m(GoodWe.ChannelId.WBMS_STRINGS, new UnsignedWordElement(47901)), //
+						this.m(GoodWe.ChannelId.WBMS_CHARGE_MAX_VOLTAGE, new UnsignedWordElement(47902),
 								ElementToChannelConverter.SCALE_FACTOR_MINUS_1), //
-						m(GoodWe.ChannelId.WBMS_CHARGE_MAX_CURRENT, new UnsignedWordElement(47903),
+						this.m(GoodWe.ChannelId.WBMS_CHARGE_MAX_CURRENT, new UnsignedWordElement(47903),
 								ElementToChannelConverter.SCALE_FACTOR_MINUS_1), //
-						m(GoodWe.ChannelId.WBMS_DISCHARGE_MIN_VOLTAGE, new UnsignedWordElement(47904),
+						this.m(GoodWe.ChannelId.WBMS_DISCHARGE_MIN_VOLTAGE, new UnsignedWordElement(47904),
 								ElementToChannelConverter.SCALE_FACTOR_MINUS_1), //
-						m(GoodWe.ChannelId.WBMS_DISCHARGE_MAX_CURRENT, new UnsignedWordElement(47905),
+						this.m(GoodWe.ChannelId.WBMS_DISCHARGE_MAX_CURRENT, new UnsignedWordElement(47905),
 								ElementToChannelConverter.SCALE_FACTOR_MINUS_1), //
-						m(GoodWe.ChannelId.WBMS_VOLTAGE, new UnsignedWordElement(47906),
+						this.m(GoodWe.ChannelId.WBMS_VOLTAGE, new UnsignedWordElement(47906),
 								ElementToChannelConverter.SCALE_FACTOR_MINUS_1), //
-						m(GoodWe.ChannelId.WBMS_CURRENT, new UnsignedWordElement(47907),
+						this.m(GoodWe.ChannelId.WBMS_CURRENT, new UnsignedWordElement(47907),
 								ElementToChannelConverter.SCALE_FACTOR_MINUS_1), //
-						m(GoodWe.ChannelId.WBMS_SOC, new UnsignedWordElement(47908)), //
-						m(GoodWe.ChannelId.WBMS_SOH, new UnsignedWordElement(47909)), //
-						m(GoodWe.ChannelId.WBMS_TEMPERATURE, new SignedWordElement(47910),
+						this.m(GoodWe.ChannelId.WBMS_SOC, new UnsignedWordElement(47908)), //
+						this.m(GoodWe.ChannelId.WBMS_SOH, new UnsignedWordElement(47909)), //
+						this.m(GoodWe.ChannelId.WBMS_TEMPERATURE, new SignedWordElement(47910),
 								ElementToChannelConverter.SCALE_FACTOR_MINUS_1), //
 						/**
 						 * Warning Codes (table 8-8).
-						 * 
+						 *
 						 * <ul>
 						 * <li>Bit 12-31 Reserved
 						 * <li>Bit 11: System High Temperature
@@ -1267,10 +1273,10 @@ protected final ModbusProtocol defineModbusProtocol() throws OpenemsException {
 						 * <li>Bit 00: Charge Over-Voltage
 						 * </ul>
 						 */
-						m(GoodWe.ChannelId.WBMS_WARNING_CODE, new UnsignedDoublewordElement(47911)), //
+						this.m(GoodWe.ChannelId.WBMS_WARNING_CODE, new UnsignedDoublewordElement(47911)), //
 						/**
 						 * Alarm Codes (table 8-7).
-						 * 
+						 *
 						 * <ul>
 						 * <li>Bit 16-31 Reserved
 						 * <li>Bit 15: Charge Over-Voltage Fault
@@ -1291,43 +1297,43 @@ protected final ModbusProtocol defineModbusProtocol() throws OpenemsException {
 						 * <li>Bit 00: Charge Over-Voltage
 						 * </ul>
 						 */
-						m(GoodWe.ChannelId.WBMS_ALARM_CODE, new UnsignedDoublewordElement(47913)), //
+						this.m(GoodWe.ChannelId.WBMS_ALARM_CODE, new UnsignedDoublewordElement(47913)), //
 						/**
 						 * BMS Status
-						 * 
+						 *
 						 * <ul>
 						 * <li>Bit 2: Stop Discharge
 						 * <li>Bit 1: Stop Charge
 						 * <li>Bit 0: Force Charge
 						 * </ul>
 						 */
-						m(GoodWe.ChannelId.WBMS_STATUS, new UnsignedWordElement(47915)), //
-						m(GoodWe.ChannelId.WBMS_DISABLE_TIMEOUT_DETECTION, new UnsignedWordElement(47916))), //
+						this.m(GoodWe.ChannelId.WBMS_STATUS, new UnsignedWordElement(47915)), //
+						this.m(GoodWe.ChannelId.WBMS_DISABLE_TIMEOUT_DETECTION, new UnsignedWordElement(47916))), //
 
 				new FC3ReadRegistersTask(47900, Priority.LOW, //
-						m(GoodWe.ChannelId.WBMS_VERSION, new UnsignedWordElement(47900)), //
-						m(GoodWe.ChannelId.WBMS_STRINGS, new UnsignedWordElement(47901)), //
-						m(GoodWe.ChannelId.WBMS_CHARGE_MAX_VOLTAGE, new UnsignedWordElement(47902),
+						this.m(GoodWe.ChannelId.WBMS_VERSION, new UnsignedWordElement(47900)), //
+						this.m(GoodWe.ChannelId.WBMS_STRINGS, new UnsignedWordElement(47901)), //
+						this.m(GoodWe.ChannelId.WBMS_CHARGE_MAX_VOLTAGE, new UnsignedWordElement(47902),
 								ElementToChannelConverter.SCALE_FACTOR_MINUS_1), //
-						m(GoodWe.ChannelId.WBMS_CHARGE_MAX_CURRENT, new UnsignedWordElement(47903),
+						this.m(GoodWe.ChannelId.WBMS_CHARGE_MAX_CURRENT, new UnsignedWordElement(47903),
 								ElementToChannelConverter.SCALE_FACTOR_MINUS_1), //
-						m(GoodWe.ChannelId.WBMS_DISCHARGE_MIN_VOLTAGE, new UnsignedWordElement(47904),
+						this.m(GoodWe.ChannelId.WBMS_DISCHARGE_MIN_VOLTAGE, new UnsignedWordElement(47904),
 								ElementToChannelConverter.SCALE_FACTOR_MINUS_1), //
-						m(GoodWe.ChannelId.WBMS_DISCHARGE_MAX_CURRENT, new UnsignedWordElement(47905),
+						this.m(GoodWe.ChannelId.WBMS_DISCHARGE_MAX_CURRENT, new UnsignedWordElement(47905),
 								ElementToChannelConverter.SCALE_FACTOR_MINUS_1), //
-						m(GoodWe.ChannelId.WBMS_VOLTAGE, new UnsignedWordElement(47906),
+						this.m(GoodWe.ChannelId.WBMS_VOLTAGE, new UnsignedWordElement(47906),
 								ElementToChannelConverter.SCALE_FACTOR_MINUS_1), //
-						m(GoodWe.ChannelId.WBMS_CURRENT, new UnsignedWordElement(47907)), //
-						m(GoodWe.ChannelId.WBMS_SOC, new UnsignedWordElement(47908)), //
-						m(GoodWe.ChannelId.WBMS_SOH, new UnsignedWordElement(47909)), //
-						m(GoodWe.ChannelId.WBMS_TEMPERATURE, new SignedWordElement(47910),
+						this.m(GoodWe.ChannelId.WBMS_CURRENT, new UnsignedWordElement(47907)), //
+						this.m(GoodWe.ChannelId.WBMS_SOC, new UnsignedWordElement(47908)), //
+						this.m(GoodWe.ChannelId.WBMS_SOH, new UnsignedWordElement(47909)), //
+						this.m(GoodWe.ChannelId.WBMS_TEMPERATURE, new SignedWordElement(47910),
 								ElementToChannelConverter.SCALE_FACTOR_MINUS_1), //
-						m(GoodWe.ChannelId.WBMS_WARNING_CODE, new UnsignedDoublewordElement(47911)), //
-						m(GoodWe.ChannelId.WBMS_ALARM_CODE, new UnsignedDoublewordElement(47913)), //
+						this.m(GoodWe.ChannelId.WBMS_WARNING_CODE, new UnsignedDoublewordElement(47911)), //
+						this.m(GoodWe.ChannelId.WBMS_ALARM_CODE, new UnsignedDoublewordElement(47913)), //
 						// TODO reset to individual states
 
-						m(GoodWe.ChannelId.WBMS_STATUS, new UnsignedWordElement(47915)), //
-						m(GoodWe.ChannelId.WBMS_DISABLE_TIMEOUT_DETECTION, new UnsignedWordElement(47916))) //
+						this.m(GoodWe.ChannelId.WBMS_STATUS, new UnsignedWordElement(47915)), //
+						this.m(GoodWe.ChannelId.WBMS_DISABLE_TIMEOUT_DETECTION, new UnsignedWordElement(47916))) //
 		);
 
 		// Handles different DSP versions
@@ -1354,10 +1360,10 @@ protected final ModbusProtocol defineModbusProtocol() throws OpenemsException {
 	private void handleDspVersion7(ModbusProtocol protocol) throws OpenemsException {
 		protocol.addTask(//
 				new FC3ReadRegistersTask(47519, Priority.LOW, //
-						m(GoodWe.ChannelId.WORK_WEEK_2_START_TIME, new UnsignedWordElement(47519)), //
-						m(GoodWe.ChannelId.WORK_WEEK_2_END_TIME, new UnsignedWordElement(47520)), //
-						m(GoodWe.ChannelId.WORK_WEEK_2_BAT_POWER_PERCENT, new UnsignedWordElement(47521)), //
-						m(new BitsWordElement(47522, this)//
+						this.m(GoodWe.ChannelId.WORK_WEEK_2_START_TIME, new UnsignedWordElement(47519)), //
+						this.m(GoodWe.ChannelId.WORK_WEEK_2_END_TIME, new UnsignedWordElement(47520)), //
+						this.m(GoodWe.ChannelId.WORK_WEEK_2_BAT_POWER_PERCENT, new UnsignedWordElement(47521)), //
+						this.m(new BitsWordElement(47522, this)//
 								.bit(0, GoodWe.ChannelId.WORK_WEEK_2_SUNDAY)//
 								.bit(1, GoodWe.ChannelId.WORK_WEEK_2_MONDAY)//
 								.bit(2, GoodWe.ChannelId.WORK_WEEK_2_TUESDAY)//
@@ -1367,10 +1373,10 @@ private void handleDspVersion7(ModbusProtocol protocol) throws OpenemsException
 								.bit(6, GoodWe.ChannelId.WORK_WEEK_2_SATURDAY)//
 								.bit(7, GoodWe.ChannelId.WORK_WEEK_2_NA)//
 								.bit(8, GoodWe.ChannelId.WORK_WEEK_2_ENABLED)), //
-						m(GoodWe.ChannelId.WORK_WEEK_3_START_TIME, new UnsignedWordElement(47523)), //
-						m(GoodWe.ChannelId.WORK_WEEK_3_END_TIME, new UnsignedWordElement(47524)), //
-						m(GoodWe.ChannelId.WORK_WEEK_3_BAT_POWER_PERCENT, new UnsignedWordElement(47525)), //
-						m(new BitsWordElement(47526, this)//
+						this.m(GoodWe.ChannelId.WORK_WEEK_3_START_TIME, new UnsignedWordElement(47523)), //
+						this.m(GoodWe.ChannelId.WORK_WEEK_3_END_TIME, new UnsignedWordElement(47524)), //
+						this.m(GoodWe.ChannelId.WORK_WEEK_3_BAT_POWER_PERCENT, new UnsignedWordElement(47525)), //
+						this.m(new BitsWordElement(47526, this)//
 								.bit(0, GoodWe.ChannelId.WORK_WEEK_3_SUNDAY)//
 								.bit(1, GoodWe.ChannelId.WORK_WEEK_3_MONDAY)//
 								.bit(2, GoodWe.ChannelId.WORK_WEEK_3_TUESDAY)//
@@ -1380,10 +1386,10 @@ private void handleDspVersion7(ModbusProtocol protocol) throws OpenemsException
 								.bit(6, GoodWe.ChannelId.WORK_WEEK_3_SATURDAY)//
 								.bit(7, GoodWe.ChannelId.WORK_WEEK_3_NA)//
 								.bit(8, GoodWe.ChannelId.WORK_WEEK_3_ENABLED)), //
-						m(GoodWe.ChannelId.WORK_WEEK_4_START_TIME, new UnsignedWordElement(47527)), //
-						m(GoodWe.ChannelId.WORK_WEEK_4_END_TIME, new UnsignedWordElement(47528)), //
-						m(GoodWe.ChannelId.WORK_WEEK_4_BMS_POWER_PERCENT, new UnsignedWordElement(47529)), //
-						m(new BitsWordElement(47530, this)//
+						this.m(GoodWe.ChannelId.WORK_WEEK_4_START_TIME, new UnsignedWordElement(47527)), //
+						this.m(GoodWe.ChannelId.WORK_WEEK_4_END_TIME, new UnsignedWordElement(47528)), //
+						this.m(GoodWe.ChannelId.WORK_WEEK_4_BMS_POWER_PERCENT, new UnsignedWordElement(47529)), //
+						this.m(new BitsWordElement(47530, this)//
 								.bit(0, GoodWe.ChannelId.WORK_WEEK_4_SUNDAY)//
 								.bit(1, GoodWe.ChannelId.WORK_WEEK_4_MONDAY)//
 								.bit(2, GoodWe.ChannelId.WORK_WEEK_4_TUESDAY)//
@@ -1393,32 +1399,32 @@ private void handleDspVersion7(ModbusProtocol protocol) throws OpenemsException
 								.bit(6, GoodWe.ChannelId.WORK_WEEK_4_SATURDAY)//
 								.bit(7, GoodWe.ChannelId.WORK_WEEK_4_NA)//
 								.bit(8, GoodWe.ChannelId.WORK_WEEK_4_ENABLED)), //
-						m(GoodWe.ChannelId.SOC_START_TO_FORCE_CHARGE, new UnsignedWordElement(47531)), //
-						m(GoodWe.ChannelId.SOC_STOP_TO_FORCE_CHARGE, new UnsignedWordElement(47532)), //
+						this.m(GoodWe.ChannelId.SOC_START_TO_FORCE_CHARGE, new UnsignedWordElement(47531)), //
+						this.m(GoodWe.ChannelId.SOC_STOP_TO_FORCE_CHARGE, new UnsignedWordElement(47532)), //
 						new DummyRegisterElement(47533, 47541), //
-						m(GoodWe.ChannelId.PEAK_SHAVING_POWER_LIMIT, new UnsignedWordElement(47542)), //
+						this.m(GoodWe.ChannelId.PEAK_SHAVING_POWER_LIMIT, new UnsignedWordElement(47542)), //
 						new DummyRegisterElement(47543), //
-						m(GoodWe.ChannelId.PEAK_SHAVING_SOC, new UnsignedWordElement(47544)), //
-						m(GoodWe.ChannelId.FAST_CHARGE_ENABLE, new UnsignedWordElement(47545)), // [0,1]
-						m(GoodWe.ChannelId.FAST_CHARGE_STOP_SOC, new UnsignedWordElement(47546))) // [0,100]
+						this.m(GoodWe.ChannelId.PEAK_SHAVING_SOC, new UnsignedWordElement(47544)), //
+						this.m(GoodWe.ChannelId.FAST_CHARGE_ENABLE, new UnsignedWordElement(47545)), // [0,1]
+						this.m(GoodWe.ChannelId.FAST_CHARGE_STOP_SOC, new UnsignedWordElement(47546))) // [0,100]
 		);
 
 		protocol.addTask(//
 				new FC16WriteRegistersTask(47519, //
-						m(GoodWe.ChannelId.WORK_WEEK_2_START_TIME, new UnsignedWordElement(47519)), //
-						m(GoodWe.ChannelId.WORK_WEEK_2_END_TIME, new UnsignedWordElement(47520)), //
-						m(GoodWe.ChannelId.WORK_WEEK_2_BAT_POWER_PERCENT, new SignedWordElement(47521)), //
-						m(GoodWe.ChannelId.WORK_WEEK_2, new UnsignedWordElement(47522)), //
+						this.m(GoodWe.ChannelId.WORK_WEEK_2_START_TIME, new UnsignedWordElement(47519)), //
+						this.m(GoodWe.ChannelId.WORK_WEEK_2_END_TIME, new UnsignedWordElement(47520)), //
+						this.m(GoodWe.ChannelId.WORK_WEEK_2_BAT_POWER_PERCENT, new SignedWordElement(47521)), //
+						this.m(GoodWe.ChannelId.WORK_WEEK_2, new UnsignedWordElement(47522)), //
 
-						m(GoodWe.ChannelId.WORK_WEEK_3_START_TIME, new UnsignedWordElement(47523)), //
-						m(GoodWe.ChannelId.WORK_WEEK_3_END_TIME, new UnsignedWordElement(47524)), //
-						m(GoodWe.ChannelId.WORK_WEEK_3_BAT_POWER_PERCENT, new SignedWordElement(47525)), //
-						m(GoodWe.ChannelId.WORK_WEEK_3, new UnsignedWordElement(47526)), //
+						this.m(GoodWe.ChannelId.WORK_WEEK_3_START_TIME, new UnsignedWordElement(47523)), //
+						this.m(GoodWe.ChannelId.WORK_WEEK_3_END_TIME, new UnsignedWordElement(47524)), //
+						this.m(GoodWe.ChannelId.WORK_WEEK_3_BAT_POWER_PERCENT, new SignedWordElement(47525)), //
+						this.m(GoodWe.ChannelId.WORK_WEEK_3, new UnsignedWordElement(47526)), //
 
-						m(GoodWe.ChannelId.WORK_WEEK_4_START_TIME, new UnsignedWordElement(47527)), //
-						m(GoodWe.ChannelId.WORK_WEEK_4_END_TIME, new UnsignedWordElement(47528)), //
-						m(GoodWe.ChannelId.WORK_WEEK_4_BMS_POWER_PERCENT, new SignedWordElement(47529)), //
-						m(GoodWe.ChannelId.WORK_WEEK_4, new UnsignedWordElement(47530)), //
+						this.m(GoodWe.ChannelId.WORK_WEEK_4_START_TIME, new UnsignedWordElement(47527)), //
+						this.m(GoodWe.ChannelId.WORK_WEEK_4_END_TIME, new UnsignedWordElement(47528)), //
+						this.m(GoodWe.ChannelId.WORK_WEEK_4_BMS_POWER_PERCENT, new SignedWordElement(47529)), //
+						this.m(GoodWe.ChannelId.WORK_WEEK_4, new UnsignedWordElement(47530)), //
 
 						// To set the SOC level to start/stop battery force charge.(this is not the
 						// command from BMS, but the protection on inverter side. Eg. StartchgSOC
@@ -1430,251 +1436,267 @@ private void handleDspVersion7(ModbusProtocol protocol) throws OpenemsException
 						// 5% SOC. ) Note: the default setting is 5% SOC to start and 10% to stop.
 						// force
 						// charge power is 1000W from PV or Grid as well
-						m(GoodWe.ChannelId.SOC_START_TO_FORCE_CHARGE, new UnsignedWordElement(47531),
+						this.m(GoodWe.ChannelId.SOC_START_TO_FORCE_CHARGE, new UnsignedWordElement(47531),
 								ElementToChannelConverter.SCALE_FACTOR_MINUS_1), //
-						m(GoodWe.ChannelId.SOC_STOP_TO_FORCE_CHARGE, new UnsignedWordElement(47532),
+						this.m(GoodWe.ChannelId.SOC_STOP_TO_FORCE_CHARGE, new UnsignedWordElement(47532),
 								ElementToChannelConverter.SCALE_FACTOR_MINUS_1), //
 						// to clear all economical mode settings (47515-47530) enter self Use Mode
-						m(GoodWe.ChannelId.CLEAR_ALL_ECONOMIC_MODE, new UnsignedWordElement(47533)), //
+						this.m(GoodWe.ChannelId.CLEAR_ALL_ECONOMIC_MODE, new UnsignedWordElement(47533)), //
 						new DummyRegisterElement(47534, 47538), //
-						m(GoodWe.ChannelId.WIFI_RESET, new UnsignedWordElement(47539)), //
+						this.m(GoodWe.ChannelId.WIFI_RESET, new UnsignedWordElement(47539)), //
 						new DummyRegisterElement(47540), //
-						m(GoodWe.ChannelId.WIFI_RELOAD, new UnsignedWordElement(47541)), //
+						this.m(GoodWe.ChannelId.WIFI_RELOAD, new UnsignedWordElement(47541)), //
 						// to set the threshold of importing power, where peak-shaving acts. Eg. If
 						// set
 						// peak-shaving power as 20kW, then battery will only discharge when
 						// imported
 						// power from grid exceed 20kW to make sure the importing power keeps below
 						// 20kW
-						m(GoodWe.ChannelId.PEAK_SHAVING_POWER_LIMIT, new UnsignedDoublewordElement(47542)), //
-						m(GoodWe.ChannelId.PEAK_SHAVING_SOC, new UnsignedWordElement(47544)), //
+						this.m(GoodWe.ChannelId.PEAK_SHAVING_POWER_LIMIT, new UnsignedDoublewordElement(47542)), //
+						this.m(GoodWe.ChannelId.PEAK_SHAVING_SOC, new UnsignedWordElement(47544)), //
 						// 0: Disable 1:Enable
-						m(GoodWe.ChannelId.FAST_CHARGE_ENABLE, new UnsignedWordElement(47545)), //
-						m(GoodWe.ChannelId.FAST_CHARGE_STOP_SOC, new UnsignedWordElement(47546))) //
+						this.m(GoodWe.ChannelId.FAST_CHARGE_ENABLE, new UnsignedWordElement(47545)), //
+						this.m(GoodWe.ChannelId.FAST_CHARGE_STOP_SOC, new UnsignedWordElement(47546))) //
 		);
 
 		protocol.addTask(//
 				// Economic mode setting for ARM version => 18
 				new FC3ReadRegistersTask(47547, Priority.LOW, //
-						m(GoodWe.ChannelId.WORK_WEEK_1_START_TIME_ECO_MODE_FOR_ARM_18_AND_GREATER,
+						this.m(GoodWe.ChannelId.WORK_WEEK_1_START_TIME_ECO_MODE_FOR_ARM_18_AND_GREATER,
 								new UnsignedWordElement(47547)), //
-						m(GoodWe.ChannelId.WORK_WEEK_1_END_TIME_ECO_MODE_FOR_ARM_18_AND_GREATER,
+						this.m(GoodWe.ChannelId.WORK_WEEK_1_END_TIME_ECO_MODE_FOR_ARM_18_AND_GREATER,
 								new UnsignedWordElement(47548)), //
-						m(GoodWe.ChannelId.WORK_WEEK_1_ECO_MODE_FOR_ARM_18_AND_GREATER, new UnsignedWordElement(47549)), //
-						m(GoodWe.ChannelId.WORK_WEEK_1_PARAMETER1_1_ECO_MODE_FOR_ARM_18_AND_GREATER,
+						this.m(GoodWe.ChannelId.WORK_WEEK_1_ECO_MODE_FOR_ARM_18_AND_GREATER,
+								new UnsignedWordElement(47549)), //
+						this.m(GoodWe.ChannelId.WORK_WEEK_1_PARAMETER1_1_ECO_MODE_FOR_ARM_18_AND_GREATER,
 								new UnsignedWordElement(47550)), //
-						m(GoodWe.ChannelId.WORK_WEEK_1_PARAMETER1_2_ECO_MODE_FOR_ARM_18_AND_GREATER,
+						this.m(GoodWe.ChannelId.WORK_WEEK_1_PARAMETER1_2_ECO_MODE_FOR_ARM_18_AND_GREATER,
 								new UnsignedWordElement(47551)), //
-						m(GoodWe.ChannelId.WORK_WEEK_1_PARAMETER1_3_ECO_MODE_FOR_ARM_18_AND_GREATER,
+						this.m(GoodWe.ChannelId.WORK_WEEK_1_PARAMETER1_3_ECO_MODE_FOR_ARM_18_AND_GREATER,
 								new UnsignedWordElement(47552)), //
 
-						m(GoodWe.ChannelId.WORK_WEEK_2_START_TIME_ECO_MODE_FOR_ARM_18_AND_GREATER,
+						this.m(GoodWe.ChannelId.WORK_WEEK_2_START_TIME_ECO_MODE_FOR_ARM_18_AND_GREATER,
 								new UnsignedWordElement(47553)), //
-						m(GoodWe.ChannelId.WORK_WEEK_2_END_TIME_ECO_MODE_FOR_ARM_18_AND_GREATER,
+						this.m(GoodWe.ChannelId.WORK_WEEK_2_END_TIME_ECO_MODE_FOR_ARM_18_AND_GREATER,
 								new UnsignedWordElement(47554)), //
-						m(GoodWe.ChannelId.WORK_WEEK_2_ECO_MODE_FOR_ARM_18_AND_GREATER, new UnsignedWordElement(47555)), //
-						m(GoodWe.ChannelId.WORK_WEEK_2_PARAMETER2_1_ECO_MODE_FOR_ARM_18_AND_GREATER,
+						this.m(GoodWe.ChannelId.WORK_WEEK_2_ECO_MODE_FOR_ARM_18_AND_GREATER,
+								new UnsignedWordElement(47555)), //
+						this.m(GoodWe.ChannelId.WORK_WEEK_2_PARAMETER2_1_ECO_MODE_FOR_ARM_18_AND_GREATER,
 								new UnsignedWordElement(47556)), //
-						m(GoodWe.ChannelId.WORK_WEEK_2_PARAMETER2_2_ECO_MODE_FOR_ARM_18_AND_GREATER,
+						this.m(GoodWe.ChannelId.WORK_WEEK_2_PARAMETER2_2_ECO_MODE_FOR_ARM_18_AND_GREATER,
 								new UnsignedWordElement(47557)), //
-						m(GoodWe.ChannelId.WORK_WEEK_2_PARAMETER2_3_ECO_MODE_FOR_ARM_18_AND_GREATER,
+						this.m(GoodWe.ChannelId.WORK_WEEK_2_PARAMETER2_3_ECO_MODE_FOR_ARM_18_AND_GREATER,
 								new UnsignedWordElement(47558)), //
 
-						m(GoodWe.ChannelId.WORK_WEEK_3_START_TIME_ECO_MODE_FOR_ARM_18_AND_GREATER,
+						this.m(GoodWe.ChannelId.WORK_WEEK_3_START_TIME_ECO_MODE_FOR_ARM_18_AND_GREATER,
 								new UnsignedWordElement(47559)), //
-						m(GoodWe.ChannelId.WORK_WEEK_3_END_TIME_ECO_MODE_FOR_ARM_18_AND_GREATER,
+						this.m(GoodWe.ChannelId.WORK_WEEK_3_END_TIME_ECO_MODE_FOR_ARM_18_AND_GREATER,
 								new UnsignedWordElement(47560)), //
-						m(GoodWe.ChannelId.WORK_WEEK_3_ECO_MODE_FOR_ARM_18_AND_GREATER, new UnsignedWordElement(47561)), //
-						m(GoodWe.ChannelId.WORK_WEEK_3_PARAMETER3_1_ECO_MODE_FOR_ARM_18_AND_GREATER,
+						this.m(GoodWe.ChannelId.WORK_WEEK_3_ECO_MODE_FOR_ARM_18_AND_GREATER,
+								new UnsignedWordElement(47561)), //
+						this.m(GoodWe.ChannelId.WORK_WEEK_3_PARAMETER3_1_ECO_MODE_FOR_ARM_18_AND_GREATER,
 								new UnsignedWordElement(47562)), //
-						m(GoodWe.ChannelId.WORK_WEEK_3_PARAMETER3_2_ECO_MODE_FOR_ARM_18_AND_GREATER,
+						this.m(GoodWe.ChannelId.WORK_WEEK_3_PARAMETER3_2_ECO_MODE_FOR_ARM_18_AND_GREATER,
 								new UnsignedWordElement(47563)), //
-						m(GoodWe.ChannelId.WORK_WEEK_3_PARAMETER3_3_ECO_MODE_FOR_ARM_18_AND_GREATER,
+						this.m(GoodWe.ChannelId.WORK_WEEK_3_PARAMETER3_3_ECO_MODE_FOR_ARM_18_AND_GREATER,
 								new UnsignedWordElement(47564)), //
 
-						m(GoodWe.ChannelId.WORK_WEEK_4_START_TIME_ECO_MODE_FOR_ARM_18_AND_GREATER,
+						this.m(GoodWe.ChannelId.WORK_WEEK_4_START_TIME_ECO_MODE_FOR_ARM_18_AND_GREATER,
 								new UnsignedWordElement(47565)), //
-						m(GoodWe.ChannelId.WORK_WEEK_4_END_TIME_ECO_MODE_FOR_ARM_18_AND_GREATER,
+						this.m(GoodWe.ChannelId.WORK_WEEK_4_END_TIME_ECO_MODE_FOR_ARM_18_AND_GREATER,
 								new UnsignedWordElement(47566)), //
-						m(GoodWe.ChannelId.WORK_WEEK_4_ECO_MODE_FOR_ARM_18_AND_GREATER, new UnsignedWordElement(47567)), //
-						m(GoodWe.ChannelId.WORK_WEEK_4_PARAMETER4_1_ECO_MODE_FOR_ARM_18_AND_GREATER,
+						this.m(GoodWe.ChannelId.WORK_WEEK_4_ECO_MODE_FOR_ARM_18_AND_GREATER,
+								new UnsignedWordElement(47567)), //
+						this.m(GoodWe.ChannelId.WORK_WEEK_4_PARAMETER4_1_ECO_MODE_FOR_ARM_18_AND_GREATER,
 								new UnsignedWordElement(47568)), //
-						m(GoodWe.ChannelId.WORK_WEEK_4_PARAMETER4_2_ECO_MODE_FOR_ARM_18_AND_GREATER,
+						this.m(GoodWe.ChannelId.WORK_WEEK_4_PARAMETER4_2_ECO_MODE_FOR_ARM_18_AND_GREATER,
 								new UnsignedWordElement(47569)), //
-						m(GoodWe.ChannelId.WORK_WEEK_4_PARAMETER4_3_ECO_MODE_FOR_ARM_18_AND_GREATER,
+						this.m(GoodWe.ChannelId.WORK_WEEK_4_PARAMETER4_3_ECO_MODE_FOR_ARM_18_AND_GREATER,
 								new UnsignedWordElement(47570)), //
 
-						m(GoodWe.ChannelId.WORK_WEEK_5_START_TIME_ECO_MODE_FOR_ARM_18_AND_GREATER,
+						this.m(GoodWe.ChannelId.WORK_WEEK_5_START_TIME_ECO_MODE_FOR_ARM_18_AND_GREATER,
 								new UnsignedWordElement(47571)), //
-						m(GoodWe.ChannelId.WORK_WEEK_5_END_TIME_ECO_MODE_FOR_ARM_18_AND_GREATER,
+						this.m(GoodWe.ChannelId.WORK_WEEK_5_END_TIME_ECO_MODE_FOR_ARM_18_AND_GREATER,
 								new UnsignedWordElement(47572)), //
-						m(GoodWe.ChannelId.WORK_WEEK_5_ECO_MODE_FOR_ARM_18_AND_GREATER, new UnsignedWordElement(47573)), //
-						m(GoodWe.ChannelId.WORK_WEEK_5_PARAMETER5_1_ECO_MODE_FOR_ARM_18_AND_GREATER,
+						this.m(GoodWe.ChannelId.WORK_WEEK_5_ECO_MODE_FOR_ARM_18_AND_GREATER,
+								new UnsignedWordElement(47573)), //
+						this.m(GoodWe.ChannelId.WORK_WEEK_5_PARAMETER5_1_ECO_MODE_FOR_ARM_18_AND_GREATER,
 								new UnsignedWordElement(47574)), //
-						m(GoodWe.ChannelId.WORK_WEEK_5_PARAMETER5_2_ECO_MODE_FOR_ARM_18_AND_GREATER,
+						this.m(GoodWe.ChannelId.WORK_WEEK_5_PARAMETER5_2_ECO_MODE_FOR_ARM_18_AND_GREATER,
 								new UnsignedWordElement(47575)), //
-						m(GoodWe.ChannelId.WORK_WEEK_5_PARAMETER5_3_ECO_MODE_FOR_ARM_18_AND_GREATER,
+						this.m(GoodWe.ChannelId.WORK_WEEK_5_PARAMETER5_3_ECO_MODE_FOR_ARM_18_AND_GREATER,
 								new UnsignedWordElement(47576)), //
 
-						m(GoodWe.ChannelId.WORK_WEEK_6_START_TIME_ECO_MODE_FOR_ARM_18_AND_GREATER,
+						this.m(GoodWe.ChannelId.WORK_WEEK_6_START_TIME_ECO_MODE_FOR_ARM_18_AND_GREATER,
 								new UnsignedWordElement(47577)), //
-						m(GoodWe.ChannelId.WORK_WEEK_6_END_TIME_ECO_MODE_FOR_ARM_18_AND_GREATER,
+						this.m(GoodWe.ChannelId.WORK_WEEK_6_END_TIME_ECO_MODE_FOR_ARM_18_AND_GREATER,
 								new UnsignedWordElement(47578)), //
-						m(GoodWe.ChannelId.WORK_WEEK_6_ECO_MODE_FOR_ARM_18_AND_GREATER, new UnsignedWordElement(47579)), //
-						m(GoodWe.ChannelId.WORK_WEEK_6_PARAMETER6_1_ECO_MODE_FOR_ARM_18_AND_GREATER,
+						this.m(GoodWe.ChannelId.WORK_WEEK_6_ECO_MODE_FOR_ARM_18_AND_GREATER,
+								new UnsignedWordElement(47579)), //
+						this.m(GoodWe.ChannelId.WORK_WEEK_6_PARAMETER6_1_ECO_MODE_FOR_ARM_18_AND_GREATER,
 								new UnsignedWordElement(47580)), //
-						m(GoodWe.ChannelId.WORK_WEEK_6_PARAMETER6_2_ECO_MODE_FOR_ARM_18_AND_GREATER,
+						this.m(GoodWe.ChannelId.WORK_WEEK_6_PARAMETER6_2_ECO_MODE_FOR_ARM_18_AND_GREATER,
 								new UnsignedWordElement(47581)), //
-						m(GoodWe.ChannelId.WORK_WEEK_6_PARAMETER6_3_ECO_MODE_FOR_ARM_18_AND_GREATER,
+						this.m(GoodWe.ChannelId.WORK_WEEK_6_PARAMETER6_3_ECO_MODE_FOR_ARM_18_AND_GREATER,
 								new UnsignedWordElement(47582)), //
 
-						m(GoodWe.ChannelId.WORK_WEEK_7_START_TIME_ECO_MODE_FOR_ARM_18_AND_GREATER,
+						this.m(GoodWe.ChannelId.WORK_WEEK_7_START_TIME_ECO_MODE_FOR_ARM_18_AND_GREATER,
 								new UnsignedWordElement(47583)), //
-						m(GoodWe.ChannelId.WORK_WEEK_7_END_TIME_ECO_MODE_FOR_ARM_18_AND_GREATER,
+						this.m(GoodWe.ChannelId.WORK_WEEK_7_END_TIME_ECO_MODE_FOR_ARM_18_AND_GREATER,
 								new UnsignedWordElement(47584)), //
-						m(GoodWe.ChannelId.WORK_WEEK_7_ECO_MODE_FOR_ARM_18_AND_GREATER, new UnsignedWordElement(47585)), //
-						m(GoodWe.ChannelId.WORK_WEEK_7_PARAMETER7_1_ECO_MODE_FOR_ARM_18_AND_GREATER,
+						this.m(GoodWe.ChannelId.WORK_WEEK_7_ECO_MODE_FOR_ARM_18_AND_GREATER,
+								new UnsignedWordElement(47585)), //
+						this.m(GoodWe.ChannelId.WORK_WEEK_7_PARAMETER7_1_ECO_MODE_FOR_ARM_18_AND_GREATER,
 								new UnsignedWordElement(47586)), //
-						m(GoodWe.ChannelId.WORK_WEEK_7_PARAMETER7_2_ECO_MODE_FOR_ARM_18_AND_GREATER,
+						this.m(GoodWe.ChannelId.WORK_WEEK_7_PARAMETER7_2_ECO_MODE_FOR_ARM_18_AND_GREATER,
 								new UnsignedWordElement(47587)), //
-						m(GoodWe.ChannelId.WORK_WEEK_7_PARAMETER7_3_ECO_MODE_FOR_ARM_18_AND_GREATER,
+						this.m(GoodWe.ChannelId.WORK_WEEK_7_PARAMETER7_3_ECO_MODE_FOR_ARM_18_AND_GREATER,
 								new UnsignedWordElement(47588)), //
 
-						m(GoodWe.ChannelId.WORK_WEEK_8_START_TIME_ECO_MODE_FOR_ARM_18_AND_GREATER,
+						this.m(GoodWe.ChannelId.WORK_WEEK_8_START_TIME_ECO_MODE_FOR_ARM_18_AND_GREATER,
 								new UnsignedWordElement(47589)), //
-						m(GoodWe.ChannelId.WORK_WEEK_8_END_TIME_ECO_MODE_FOR_ARM_18_AND_GREATER,
+						this.m(GoodWe.ChannelId.WORK_WEEK_8_END_TIME_ECO_MODE_FOR_ARM_18_AND_GREATER,
 								new UnsignedWordElement(47590)), //
-						m(GoodWe.ChannelId.WORK_WEEK_8_ECO_MODE_FOR_ARM_18_AND_GREATER, new UnsignedWordElement(47591)), //
-						m(GoodWe.ChannelId.WORK_WEEK_8_PARAMETER8_1_ECO_MODE_FOR_ARM_18_AND_GREATER,
+						this.m(GoodWe.ChannelId.WORK_WEEK_8_ECO_MODE_FOR_ARM_18_AND_GREATER,
+								new UnsignedWordElement(47591)), //
+						this.m(GoodWe.ChannelId.WORK_WEEK_8_PARAMETER8_1_ECO_MODE_FOR_ARM_18_AND_GREATER,
 								new UnsignedWordElement(47592)), //
-						m(GoodWe.ChannelId.WORK_WEEK_8_PARAMETER8_2_ECO_MODE_FOR_ARM_18_AND_GREATER,
+						this.m(GoodWe.ChannelId.WORK_WEEK_8_PARAMETER8_2_ECO_MODE_FOR_ARM_18_AND_GREATER,
 								new UnsignedWordElement(47593)), //
-						m(GoodWe.ChannelId.WORK_WEEK_8_PARAMETER8_3_ECO_MODE_FOR_ARM_18_AND_GREATER,
+						this.m(GoodWe.ChannelId.WORK_WEEK_8_PARAMETER8_3_ECO_MODE_FOR_ARM_18_AND_GREATER,
 								new UnsignedWordElement(47594)), //
 						// 0,Disable 1,switching mode 2,Time manage mode
 						// Only for inverter with ARM version equal or greater 18 To select Load
 						// control
 						// mode
-						m(GoodWe.ChannelId.LOAD_REGULATION_INDEX, new UnsignedWordElement(47595)), //
-						m(GoodWe.ChannelId.LOAD_SWITCH_STATUS, new UnsignedWordElement(47596)), //
+						this.m(GoodWe.ChannelId.LOAD_REGULATION_INDEX, new UnsignedWordElement(47595)), //
+						this.m(GoodWe.ChannelId.LOAD_SWITCH_STATUS, new UnsignedWordElement(47596)), //
 						// For load control function, if the controlled load on Backup side, use
 						// this to
 						// switch the load off when battery reaches the SOC set
-						m(GoodWe.ChannelId.BACKUP_SWITCH_SOC_MIN, new UnsignedWordElement(47597)), //
+						this.m(GoodWe.ChannelId.BACKUP_SWITCH_SOC_MIN, new UnsignedWordElement(47597)), //
 						new DummyRegisterElement(47598), //
-						m(GoodWe.ChannelId.HARDWARE_FEED_POWER, new UnsignedWordElement(47599))) //
+						this.m(GoodWe.ChannelId.HARDWARE_FEED_POWER, new UnsignedWordElement(47599))) //
 		);
 
 		protocol.addTask(//
 				new FC16WriteRegistersTask(47547, //
 						// Economic mode setting for ARM version => 18
-						m(GoodWe.ChannelId.WORK_WEEK_1_START_TIME_ECO_MODE_FOR_ARM_18_AND_GREATER,
+						this.m(GoodWe.ChannelId.WORK_WEEK_1_START_TIME_ECO_MODE_FOR_ARM_18_AND_GREATER,
 								new UnsignedWordElement(47547)), //
-						m(GoodWe.ChannelId.WORK_WEEK_1_END_TIME_ECO_MODE_FOR_ARM_18_AND_GREATER,
+						this.m(GoodWe.ChannelId.WORK_WEEK_1_END_TIME_ECO_MODE_FOR_ARM_18_AND_GREATER,
 								new UnsignedWordElement(47548)), //
-						m(GoodWe.ChannelId.WORK_WEEK_1_ECO_MODE_FOR_ARM_18_AND_GREATER, new UnsignedWordElement(47549)), //
-						m(GoodWe.ChannelId.WORK_WEEK_1_PARAMETER1_1_ECO_MODE_FOR_ARM_18_AND_GREATER,
+						this.m(GoodWe.ChannelId.WORK_WEEK_1_ECO_MODE_FOR_ARM_18_AND_GREATER,
+								new UnsignedWordElement(47549)), //
+						this.m(GoodWe.ChannelId.WORK_WEEK_1_PARAMETER1_1_ECO_MODE_FOR_ARM_18_AND_GREATER,
 								new UnsignedWordElement(47550)), //
-						m(GoodWe.ChannelId.WORK_WEEK_1_PARAMETER1_2_ECO_MODE_FOR_ARM_18_AND_GREATER,
+						this.m(GoodWe.ChannelId.WORK_WEEK_1_PARAMETER1_2_ECO_MODE_FOR_ARM_18_AND_GREATER,
 								new UnsignedWordElement(47551)), //
-						m(GoodWe.ChannelId.WORK_WEEK_1_PARAMETER1_3_ECO_MODE_FOR_ARM_18_AND_GREATER,
+						this.m(GoodWe.ChannelId.WORK_WEEK_1_PARAMETER1_3_ECO_MODE_FOR_ARM_18_AND_GREATER,
 								new UnsignedWordElement(47552)), //
 
-						m(GoodWe.ChannelId.WORK_WEEK_2_START_TIME_ECO_MODE_FOR_ARM_18_AND_GREATER,
+						this.m(GoodWe.ChannelId.WORK_WEEK_2_START_TIME_ECO_MODE_FOR_ARM_18_AND_GREATER,
 								new UnsignedWordElement(47553)), //
-						m(GoodWe.ChannelId.WORK_WEEK_2_END_TIME_ECO_MODE_FOR_ARM_18_AND_GREATER,
+						this.m(GoodWe.ChannelId.WORK_WEEK_2_END_TIME_ECO_MODE_FOR_ARM_18_AND_GREATER,
 								new UnsignedWordElement(47554)), //
-						m(GoodWe.ChannelId.WORK_WEEK_2_ECO_MODE_FOR_ARM_18_AND_GREATER, new UnsignedWordElement(47555)), //
-						m(GoodWe.ChannelId.WORK_WEEK_2_PARAMETER2_1_ECO_MODE_FOR_ARM_18_AND_GREATER,
+						this.m(GoodWe.ChannelId.WORK_WEEK_2_ECO_MODE_FOR_ARM_18_AND_GREATER,
+								new UnsignedWordElement(47555)), //
+						this.m(GoodWe.ChannelId.WORK_WEEK_2_PARAMETER2_1_ECO_MODE_FOR_ARM_18_AND_GREATER,
 								new UnsignedWordElement(47556)), //
-						m(GoodWe.ChannelId.WORK_WEEK_2_PARAMETER2_2_ECO_MODE_FOR_ARM_18_AND_GREATER,
+						this.m(GoodWe.ChannelId.WORK_WEEK_2_PARAMETER2_2_ECO_MODE_FOR_ARM_18_AND_GREATER,
 								new UnsignedWordElement(47557)), //
-						m(GoodWe.ChannelId.WORK_WEEK_2_PARAMETER2_3_ECO_MODE_FOR_ARM_18_AND_GREATER,
+						this.m(GoodWe.ChannelId.WORK_WEEK_2_PARAMETER2_3_ECO_MODE_FOR_ARM_18_AND_GREATER,
 								new UnsignedWordElement(47558)), //
 
-						m(GoodWe.ChannelId.WORK_WEEK_3_START_TIME_ECO_MODE_FOR_ARM_18_AND_GREATER,
+						this.m(GoodWe.ChannelId.WORK_WEEK_3_START_TIME_ECO_MODE_FOR_ARM_18_AND_GREATER,
 								new UnsignedWordElement(47559)), //
-						m(GoodWe.ChannelId.WORK_WEEK_3_END_TIME_ECO_MODE_FOR_ARM_18_AND_GREATER,
+						this.m(GoodWe.ChannelId.WORK_WEEK_3_END_TIME_ECO_MODE_FOR_ARM_18_AND_GREATER,
 								new UnsignedWordElement(47560)), //
-						m(GoodWe.ChannelId.WORK_WEEK_3_ECO_MODE_FOR_ARM_18_AND_GREATER, new UnsignedWordElement(47561)), //
-						m(GoodWe.ChannelId.WORK_WEEK_3_PARAMETER3_1_ECO_MODE_FOR_ARM_18_AND_GREATER,
+						this.m(GoodWe.ChannelId.WORK_WEEK_3_ECO_MODE_FOR_ARM_18_AND_GREATER,
+								new UnsignedWordElement(47561)), //
+						this.m(GoodWe.ChannelId.WORK_WEEK_3_PARAMETER3_1_ECO_MODE_FOR_ARM_18_AND_GREATER,
 								new UnsignedWordElement(47562)), //
-						m(GoodWe.ChannelId.WORK_WEEK_3_PARAMETER3_2_ECO_MODE_FOR_ARM_18_AND_GREATER,
+						this.m(GoodWe.ChannelId.WORK_WEEK_3_PARAMETER3_2_ECO_MODE_FOR_ARM_18_AND_GREATER,
 								new UnsignedWordElement(47563)), //
-						m(GoodWe.ChannelId.WORK_WEEK_3_PARAMETER3_3_ECO_MODE_FOR_ARM_18_AND_GREATER,
+						this.m(GoodWe.ChannelId.WORK_WEEK_3_PARAMETER3_3_ECO_MODE_FOR_ARM_18_AND_GREATER,
 								new UnsignedWordElement(47564)), //
 
-						m(GoodWe.ChannelId.WORK_WEEK_4_START_TIME_ECO_MODE_FOR_ARM_18_AND_GREATER,
+						this.m(GoodWe.ChannelId.WORK_WEEK_4_START_TIME_ECO_MODE_FOR_ARM_18_AND_GREATER,
 								new UnsignedWordElement(47565)), //
-						m(GoodWe.ChannelId.WORK_WEEK_4_END_TIME_ECO_MODE_FOR_ARM_18_AND_GREATER,
+						this.m(GoodWe.ChannelId.WORK_WEEK_4_END_TIME_ECO_MODE_FOR_ARM_18_AND_GREATER,
 								new UnsignedWordElement(47566)), //
-						m(GoodWe.ChannelId.WORK_WEEK_4_ECO_MODE_FOR_ARM_18_AND_GREATER, new UnsignedWordElement(47567)), //
-						m(GoodWe.ChannelId.WORK_WEEK_4_PARAMETER4_1_ECO_MODE_FOR_ARM_18_AND_GREATER,
+						this.m(GoodWe.ChannelId.WORK_WEEK_4_ECO_MODE_FOR_ARM_18_AND_GREATER,
+								new UnsignedWordElement(47567)), //
+						this.m(GoodWe.ChannelId.WORK_WEEK_4_PARAMETER4_1_ECO_MODE_FOR_ARM_18_AND_GREATER,
 								new UnsignedWordElement(47568)), //
-						m(GoodWe.ChannelId.WORK_WEEK_4_PARAMETER4_2_ECO_MODE_FOR_ARM_18_AND_GREATER,
+						this.m(GoodWe.ChannelId.WORK_WEEK_4_PARAMETER4_2_ECO_MODE_FOR_ARM_18_AND_GREATER,
 								new UnsignedWordElement(47569)), //
-						m(GoodWe.ChannelId.WORK_WEEK_4_PARAMETER4_3_ECO_MODE_FOR_ARM_18_AND_GREATER,
+						this.m(GoodWe.ChannelId.WORK_WEEK_4_PARAMETER4_3_ECO_MODE_FOR_ARM_18_AND_GREATER,
 								new UnsignedWordElement(47570)), //
 
-						m(GoodWe.ChannelId.WORK_WEEK_5_START_TIME_ECO_MODE_FOR_ARM_18_AND_GREATER,
+						this.m(GoodWe.ChannelId.WORK_WEEK_5_START_TIME_ECO_MODE_FOR_ARM_18_AND_GREATER,
 								new UnsignedWordElement(47571)), //
-						m(GoodWe.ChannelId.WORK_WEEK_5_END_TIME_ECO_MODE_FOR_ARM_18_AND_GREATER,
+						this.m(GoodWe.ChannelId.WORK_WEEK_5_END_TIME_ECO_MODE_FOR_ARM_18_AND_GREATER,
 								new UnsignedWordElement(47572)), //
-						m(GoodWe.ChannelId.WORK_WEEK_5_ECO_MODE_FOR_ARM_18_AND_GREATER, new UnsignedWordElement(47573)), //
-						m(GoodWe.ChannelId.WORK_WEEK_5_PARAMETER5_1_ECO_MODE_FOR_ARM_18_AND_GREATER,
+						this.m(GoodWe.ChannelId.WORK_WEEK_5_ECO_MODE_FOR_ARM_18_AND_GREATER,
+								new UnsignedWordElement(47573)), //
+						this.m(GoodWe.ChannelId.WORK_WEEK_5_PARAMETER5_1_ECO_MODE_FOR_ARM_18_AND_GREATER,
 								new UnsignedWordElement(47574)), //
-						m(GoodWe.ChannelId.WORK_WEEK_5_PARAMETER5_2_ECO_MODE_FOR_ARM_18_AND_GREATER,
+						this.m(GoodWe.ChannelId.WORK_WEEK_5_PARAMETER5_2_ECO_MODE_FOR_ARM_18_AND_GREATER,
 								new UnsignedWordElement(47575)), //
-						m(GoodWe.ChannelId.WORK_WEEK_5_PARAMETER5_3_ECO_MODE_FOR_ARM_18_AND_GREATER,
+						this.m(GoodWe.ChannelId.WORK_WEEK_5_PARAMETER5_3_ECO_MODE_FOR_ARM_18_AND_GREATER,
 								new UnsignedWordElement(47576)), //
 
-						m(GoodWe.ChannelId.WORK_WEEK_6_START_TIME_ECO_MODE_FOR_ARM_18_AND_GREATER,
+						this.m(GoodWe.ChannelId.WORK_WEEK_6_START_TIME_ECO_MODE_FOR_ARM_18_AND_GREATER,
 								new UnsignedWordElement(47577)), //
-						m(GoodWe.ChannelId.WORK_WEEK_6_END_TIME_ECO_MODE_FOR_ARM_18_AND_GREATER,
+						this.m(GoodWe.ChannelId.WORK_WEEK_6_END_TIME_ECO_MODE_FOR_ARM_18_AND_GREATER,
 								new UnsignedWordElement(47578)), //
-						m(GoodWe.ChannelId.WORK_WEEK_6_ECO_MODE_FOR_ARM_18_AND_GREATER, new UnsignedWordElement(47579)), //
-						m(GoodWe.ChannelId.WORK_WEEK_6_PARAMETER6_1_ECO_MODE_FOR_ARM_18_AND_GREATER,
+						this.m(GoodWe.ChannelId.WORK_WEEK_6_ECO_MODE_FOR_ARM_18_AND_GREATER,
+								new UnsignedWordElement(47579)), //
+						this.m(GoodWe.ChannelId.WORK_WEEK_6_PARAMETER6_1_ECO_MODE_FOR_ARM_18_AND_GREATER,
 								new UnsignedWordElement(47580)), //
-						m(GoodWe.ChannelId.WORK_WEEK_6_PARAMETER6_2_ECO_MODE_FOR_ARM_18_AND_GREATER,
+						this.m(GoodWe.ChannelId.WORK_WEEK_6_PARAMETER6_2_ECO_MODE_FOR_ARM_18_AND_GREATER,
 								new UnsignedWordElement(47581)), //
-						m(GoodWe.ChannelId.WORK_WEEK_6_PARAMETER6_3_ECO_MODE_FOR_ARM_18_AND_GREATER,
+						this.m(GoodWe.ChannelId.WORK_WEEK_6_PARAMETER6_3_ECO_MODE_FOR_ARM_18_AND_GREATER,
 								new UnsignedWordElement(47582)), //
 
-						m(GoodWe.ChannelId.WORK_WEEK_7_START_TIME_ECO_MODE_FOR_ARM_18_AND_GREATER,
+						this.m(GoodWe.ChannelId.WORK_WEEK_7_START_TIME_ECO_MODE_FOR_ARM_18_AND_GREATER,
 								new UnsignedWordElement(47583)), //
-						m(GoodWe.ChannelId.WORK_WEEK_7_END_TIME_ECO_MODE_FOR_ARM_18_AND_GREATER,
+						this.m(GoodWe.ChannelId.WORK_WEEK_7_END_TIME_ECO_MODE_FOR_ARM_18_AND_GREATER,
 								new UnsignedWordElement(47584)), //
-						m(GoodWe.ChannelId.WORK_WEEK_7_ECO_MODE_FOR_ARM_18_AND_GREATER, new UnsignedWordElement(47585)), //
-						m(GoodWe.ChannelId.WORK_WEEK_7_PARAMETER7_1_ECO_MODE_FOR_ARM_18_AND_GREATER,
+						this.m(GoodWe.ChannelId.WORK_WEEK_7_ECO_MODE_FOR_ARM_18_AND_GREATER,
+								new UnsignedWordElement(47585)), //
+						this.m(GoodWe.ChannelId.WORK_WEEK_7_PARAMETER7_1_ECO_MODE_FOR_ARM_18_AND_GREATER,
 								new UnsignedWordElement(47586)), //
-						m(GoodWe.ChannelId.WORK_WEEK_7_PARAMETER7_2_ECO_MODE_FOR_ARM_18_AND_GREATER,
+						this.m(GoodWe.ChannelId.WORK_WEEK_7_PARAMETER7_2_ECO_MODE_FOR_ARM_18_AND_GREATER,
 								new UnsignedWordElement(47587)), //
-						m(GoodWe.ChannelId.WORK_WEEK_7_PARAMETER7_3_ECO_MODE_FOR_ARM_18_AND_GREATER,
+						this.m(GoodWe.ChannelId.WORK_WEEK_7_PARAMETER7_3_ECO_MODE_FOR_ARM_18_AND_GREATER,
 								new UnsignedWordElement(47588)), //
 
-						m(GoodWe.ChannelId.WORK_WEEK_8_START_TIME_ECO_MODE_FOR_ARM_18_AND_GREATER,
+						this.m(GoodWe.ChannelId.WORK_WEEK_8_START_TIME_ECO_MODE_FOR_ARM_18_AND_GREATER,
 								new UnsignedWordElement(47589)), //
-						m(GoodWe.ChannelId.WORK_WEEK_8_END_TIME_ECO_MODE_FOR_ARM_18_AND_GREATER,
+						this.m(GoodWe.ChannelId.WORK_WEEK_8_END_TIME_ECO_MODE_FOR_ARM_18_AND_GREATER,
 								new UnsignedWordElement(47590)), //
-						m(GoodWe.ChannelId.WORK_WEEK_8_ECO_MODE_FOR_ARM_18_AND_GREATER, new UnsignedWordElement(47591)), //
-						m(GoodWe.ChannelId.WORK_WEEK_8_PARAMETER8_1_ECO_MODE_FOR_ARM_18_AND_GREATER,
+						this.m(GoodWe.ChannelId.WORK_WEEK_8_ECO_MODE_FOR_ARM_18_AND_GREATER,
+								new UnsignedWordElement(47591)), //
+						this.m(GoodWe.ChannelId.WORK_WEEK_8_PARAMETER8_1_ECO_MODE_FOR_ARM_18_AND_GREATER,
 								new UnsignedWordElement(47592)), //
-						m(GoodWe.ChannelId.WORK_WEEK_8_PARAMETER8_2_ECO_MODE_FOR_ARM_18_AND_GREATER,
+						this.m(GoodWe.ChannelId.WORK_WEEK_8_PARAMETER8_2_ECO_MODE_FOR_ARM_18_AND_GREATER,
 								new UnsignedWordElement(47593)), //
-						m(GoodWe.ChannelId.WORK_WEEK_8_PARAMETER8_3_ECO_MODE_FOR_ARM_18_AND_GREATER,
+						this.m(GoodWe.ChannelId.WORK_WEEK_8_PARAMETER8_3_ECO_MODE_FOR_ARM_18_AND_GREATER,
 								new UnsignedWordElement(47594)), //
 						// 0,Disable 1,switching mode 2,Time manage mode
 						// Only for inverter with ARM version equal or greater 18 To select Load
 						// control
 						// mode
-						m(GoodWe.ChannelId.LOAD_REGULATION_INDEX, new UnsignedWordElement(47595)), //
-						m(GoodWe.ChannelId.LOAD_SWITCH_STATUS, new UnsignedWordElement(47596)), //
+						this.m(GoodWe.ChannelId.LOAD_REGULATION_INDEX, new UnsignedWordElement(47595)), //
+						this.m(GoodWe.ChannelId.LOAD_SWITCH_STATUS, new UnsignedWordElement(47596)), //
 						// For load control function, if the controlled load on Backup side, use
 						// this to
 						// switch the load off when battery reaches the SOC set
-						m(GoodWe.ChannelId.BACKUP_SWITCH_SOC_MIN, new UnsignedWordElement(47597)), //
+						this.m(GoodWe.ChannelId.BACKUP_SWITCH_SOC_MIN, new UnsignedWordElement(47597)), //
 						new DummyRegisterElement(47598), //
-						m(GoodWe.ChannelId.HARDWARE_FEED_POWER, new UnsignedWordElement(47599)))//
+						this.m(GoodWe.ChannelId.HARDWARE_FEED_POWER, new UnsignedWordElement(47599)))//
 		);
 	}
 
@@ -1684,120 +1706,120 @@ private void handleDspVersion6(ModbusProtocol protocol) throws OpenemsException
 		protocol.addTask(//
 				new FC3ReadRegistersTask(36001, Priority.LOW, //
 						// External Communication Data(ARM)
-						m(GoodWe.ChannelId.RSSI, new UnsignedWordElement(36001)), //
+						this.m(GoodWe.ChannelId.RSSI, new UnsignedWordElement(36001)), //
 						new DummyRegisterElement(36002), //
-						m(GoodWe.ChannelId.B_METER_COMMUNICATE_STATUS, new UnsignedWordElement(36003)), //
-						m(GoodWe.ChannelId.METER_COMMUNICATE_STATUS, new UnsignedWordElement(36004)), //
+						this.m(GoodWe.ChannelId.B_METER_COMMUNICATE_STATUS, new UnsignedWordElement(36003)), //
+						this.m(GoodWe.ChannelId.METER_COMMUNICATE_STATUS, new UnsignedWordElement(36004)), //
 						// Registers for Grid Smart-Meter (36005 to 36014) are read via GridMeter
 						// implementation
 						new DummyRegisterElement(36005, 36014),
-						m(GoodWe.ChannelId.E_TOTAL_SELL, new FloatDoublewordElement(36015),
-								ElementToChannelConverter.SCALE_FACTOR_MINUS_1), //
-						m(GoodWe.ChannelId.E_TOTAL_BUY_F, new FloatDoublewordElement(36017),
-								ElementToChannelConverter.SCALE_FACTOR_MINUS_1), //
-						m(GoodWe.ChannelId.METER_ACTIVE_POWER_R, new SignedDoublewordElement(36019)), //
-						m(GoodWe.ChannelId.METER_ACTIVE_POWER_S, new SignedDoublewordElement(36021)), //
-						m(GoodWe.ChannelId.METER_ACTIVE_POWER_T, new SignedDoublewordElement(36023)), //
-						m(GoodWe.ChannelId.METER_TOTAL_ACTIVE_POWER, new SignedDoublewordElement(36025)), //
-						m(GoodWe.ChannelId.METER_REACTIVE_POWER_R, new SignedDoublewordElement(36027)), //
-						m(GoodWe.ChannelId.METER_REACTIVE_POWER_S, new SignedDoublewordElement(36029)), //
-						m(GoodWe.ChannelId.METER_REACTIVE_POWER_T, new SignedDoublewordElement(36031)), //
-						m(GoodWe.ChannelId.METER_TOTAL_REACTIVE_POWER, new SignedDoublewordElement(36033)), //
-						m(GoodWe.ChannelId.METER_APPARENT_POWER_R, new SignedDoublewordElement(36035)), //
-						m(GoodWe.ChannelId.METER_APPARENT_POWER_S, new SignedDoublewordElement(36037)), //
-						m(GoodWe.ChannelId.METER_APPARENT_POWER_T, new SignedDoublewordElement(36039)), //
-						m(GoodWe.ChannelId.METER_TOTAL_APPARENT_POWER, new SignedDoublewordElement(36041)), //
+						this.m(GoodWe.ChannelId.E_TOTAL_SELL, new FloatDoublewordElement(36015),
+								ElementToChannelConverter.SCALE_FACTOR_MINUS_1), //
+						this.m(GoodWe.ChannelId.E_TOTAL_BUY_F, new FloatDoublewordElement(36017),
+								ElementToChannelConverter.SCALE_FACTOR_MINUS_1), //
+						this.m(GoodWe.ChannelId.METER_ACTIVE_POWER_R, new SignedDoublewordElement(36019)), //
+						this.m(GoodWe.ChannelId.METER_ACTIVE_POWER_S, new SignedDoublewordElement(36021)), //
+						this.m(GoodWe.ChannelId.METER_ACTIVE_POWER_T, new SignedDoublewordElement(36023)), //
+						this.m(GoodWe.ChannelId.METER_TOTAL_ACTIVE_POWER, new SignedDoublewordElement(36025)), //
+						this.m(GoodWe.ChannelId.METER_REACTIVE_POWER_R, new SignedDoublewordElement(36027)), //
+						this.m(GoodWe.ChannelId.METER_REACTIVE_POWER_S, new SignedDoublewordElement(36029)), //
+						this.m(GoodWe.ChannelId.METER_REACTIVE_POWER_T, new SignedDoublewordElement(36031)), //
+						this.m(GoodWe.ChannelId.METER_TOTAL_REACTIVE_POWER, new SignedDoublewordElement(36033)), //
+						this.m(GoodWe.ChannelId.METER_APPARENT_POWER_R, new SignedDoublewordElement(36035)), //
+						this.m(GoodWe.ChannelId.METER_APPARENT_POWER_S, new SignedDoublewordElement(36037)), //
+						this.m(GoodWe.ChannelId.METER_APPARENT_POWER_T, new SignedDoublewordElement(36039)), //
+						this.m(GoodWe.ChannelId.METER_TOTAL_APPARENT_POWER, new SignedDoublewordElement(36041)), //
 						// Only for GoodWe smart meter
-						m(GoodWe.ChannelId.METER_TYPE, new UnsignedWordElement(36043)), //
-						m(GoodWe.ChannelId.METER_SOFTWARE_VERSION, new UnsignedWordElement(36044)), //
+						this.m(GoodWe.ChannelId.METER_TYPE, new UnsignedWordElement(36043)), //
+						this.m(GoodWe.ChannelId.METER_SOFTWARE_VERSION, new UnsignedWordElement(36044)), //
 						// Only for AC coupled inverter. Detect Pv Meter
-						m(GoodWe.ChannelId.METER_CT2_ACTIVE_POWER, new SignedDoublewordElement(36045)), //
-						m(GoodWe.ChannelId.CT2_E_TOTAL_SELL, new UnsignedDoublewordElement(36047),
+						this.m(GoodWe.ChannelId.METER_CT2_ACTIVE_POWER, new SignedDoublewordElement(36045)), //
+						this.m(GoodWe.ChannelId.CT2_E_TOTAL_SELL, new UnsignedDoublewordElement(36047),
 								ElementToChannelConverter.SCALE_FACTOR_MINUS_2), //
-						m(GoodWe.ChannelId.CT2_E_TOTAL_BUY, new UnsignedDoublewordElement(36049),
+						this.m(GoodWe.ChannelId.CT2_E_TOTAL_BUY, new UnsignedDoublewordElement(36049),
 								ElementToChannelConverter.SCALE_FACTOR_MINUS_2), //
-						m(GoodWe.ChannelId.METER_CT2_STATUS, new UnsignedWordElement(36051))) //
+						this.m(GoodWe.ChannelId.METER_CT2_STATUS, new UnsignedWordElement(36051))) //
 		);
 
 		protocol.addTask(//
 				new FC3ReadRegistersTask(47000, Priority.LOW, //
-						m(GoodWe.ChannelId.SELECT_WORK_MODE, new UnsignedWordElement(47000)), //
+						this.m(GoodWe.ChannelId.SELECT_WORK_MODE, new UnsignedWordElement(47000)), //
 						new DummyRegisterElement(47001), //
-						m(GoodWe.ChannelId.WMETER_CONNECT_CHECK_FLAG, new UnsignedWordElement(47002)), //
+						this.m(GoodWe.ChannelId.WMETER_CONNECT_CHECK_FLAG, new UnsignedWordElement(47002)), //
 						new DummyRegisterElement(47003, 47004), //
-						m(GoodWe.ChannelId.LOG_DATA_ENABLE, new UnsignedWordElement(47005)), //
-						m(GoodWe.ChannelId.DATA_SEND_INTERVAL, new UnsignedWordElement(47006)), //
-						m(GoodWe.ChannelId.DRED_CMD, new UnsignedWordElement(47007)), //
+						this.m(GoodWe.ChannelId.LOG_DATA_ENABLE, new UnsignedWordElement(47005)), //
+						this.m(GoodWe.ChannelId.DATA_SEND_INTERVAL, new UnsignedWordElement(47006)), //
+						this.m(GoodWe.ChannelId.DRED_CMD, new UnsignedWordElement(47007)), //
 						new DummyRegisterElement(47008), //
-						m(GoodWe.ChannelId.WIFI_OR_LAN_SWITCH, new UnsignedWordElement(47009)), //
+						this.m(GoodWe.ChannelId.WIFI_OR_LAN_SWITCH, new UnsignedWordElement(47009)), //
 						new DummyRegisterElement(47010, 47011), //
-						m(GoodWe.ChannelId.LED_BLINK_TIME, new UnsignedWordElement(47012)), //
-						m(GoodWe.ChannelId.WIFI_LED_STATE, new UnsignedWordElement(47013)), //
-						m(GoodWe.ChannelId.COM_LED_STATE, new UnsignedWordElement(47014)), //
-						m(GoodWe.ChannelId.METER_CT1_REVERSE_ENABLE, new UnsignedWordElement(47015)), //
-						m(GoodWe.ChannelId.ERROR_LOG_READ_PAGE, new UnsignedWordElement(47016)), //
+						this.m(GoodWe.ChannelId.LED_BLINK_TIME, new UnsignedWordElement(47012)), //
+						this.m(GoodWe.ChannelId.WIFI_LED_STATE, new UnsignedWordElement(47013)), //
+						this.m(GoodWe.ChannelId.COM_LED_STATE, new UnsignedWordElement(47014)), //
+						this.m(GoodWe.ChannelId.METER_CT1_REVERSE_ENABLE, new UnsignedWordElement(47015)), //
+						this.m(GoodWe.ChannelId.ERROR_LOG_READ_PAGE, new UnsignedWordElement(47016)), //
 						// 1:on 0:off If not connect to Internet, please set 1
-						m(GoodWe.ChannelId.MODBUS_TCP_WITHOUT_INTERNET, new UnsignedWordElement(47017)), //
+						this.m(GoodWe.ChannelId.MODBUS_TCP_WITHOUT_INTERNET, new UnsignedWordElement(47017)), //
 						// 1: off, 2: on, 3: flash 1x, 4: flash 2x, 5: flash 4x
-						m(GoodWe.ChannelId.BACKUP_LED, new UnsignedWordElement(47018)), // [1,5]
-						m(GoodWe.ChannelId.GRID_LED, new UnsignedWordElement(47019)), // [1,5]
-						m(GoodWe.ChannelId.SOC_LED_1, new UnsignedWordElement(47020)), // [1,5]
-						m(GoodWe.ChannelId.SOC_LED_2, new UnsignedWordElement(47021)), // [1,5]
-						m(GoodWe.ChannelId.SOC_LED_3, new UnsignedWordElement(47022)), // [1,5]
-						m(GoodWe.ChannelId.SOC_LED_4, new UnsignedWordElement(47023)), // [1,5]
-						m(GoodWe.ChannelId.BATTERY_LED, new UnsignedWordElement(47024)), // [1,5]
-						m(GoodWe.ChannelId.SYSTEM_LED, new UnsignedWordElement(47025)), // [1,5]
-						m(GoodWe.ChannelId.FAULT_LED, new UnsignedWordElement(47026)), // [1,5]
-						m(GoodWe.ChannelId.ENERGY_LED, new UnsignedWordElement(47027)), // [1,5]
-						m(GoodWe.ChannelId.LED_EXTERNAL_CONTROL, new UnsignedWordElement(47028)), // [42343]
+						this.m(GoodWe.ChannelId.BACKUP_LED, new UnsignedWordElement(47018)), // [1,5]
+						this.m(GoodWe.ChannelId.GRID_LED, new UnsignedWordElement(47019)), // [1,5]
+						this.m(GoodWe.ChannelId.SOC_LED_1, new UnsignedWordElement(47020)), // [1,5]
+						this.m(GoodWe.ChannelId.SOC_LED_2, new UnsignedWordElement(47021)), // [1,5]
+						this.m(GoodWe.ChannelId.SOC_LED_3, new UnsignedWordElement(47022)), // [1,5]
+						this.m(GoodWe.ChannelId.SOC_LED_4, new UnsignedWordElement(47023)), // [1,5]
+						this.m(GoodWe.ChannelId.BATTERY_LED, new UnsignedWordElement(47024)), // [1,5]
+						this.m(GoodWe.ChannelId.SYSTEM_LED, new UnsignedWordElement(47025)), // [1,5]
+						this.m(GoodWe.ChannelId.FAULT_LED, new UnsignedWordElement(47026)), // [1,5]
+						this.m(GoodWe.ChannelId.ENERGY_LED, new UnsignedWordElement(47027)), // [1,5]
+						this.m(GoodWe.ChannelId.LED_EXTERNAL_CONTROL, new UnsignedWordElement(47028)), // [42343]
 						new DummyRegisterElement(47029, 47037), //
 						// 1 Enable, After restart the inverter, setting saved
-						m(GoodWe.ChannelId.STOP_MODE_SAVE_ENABLE, new UnsignedWordElement(47038))) //
+						this.m(GoodWe.ChannelId.STOP_MODE_SAVE_ENABLE, new UnsignedWordElement(47038))) //
 		);
 
 		protocol.addTask(//
 				// The same function as that for Operation Mode on PV Master App
 				new FC16WriteRegistersTask(47000, //
-						m(GoodWe.ChannelId.SELECT_WORK_MODE, new UnsignedWordElement(47000)), //
+						this.m(GoodWe.ChannelId.SELECT_WORK_MODE, new UnsignedWordElement(47000)), //
 						new DummyRegisterElement(47001), //
-						m(GoodWe.ChannelId.WMETER_CONNECT_CHECK_FLAG, new UnsignedWordElement(47002)), //
+						this.m(GoodWe.ChannelId.WMETER_CONNECT_CHECK_FLAG, new UnsignedWordElement(47002)), //
 						new DummyRegisterElement(47003, 47004), //
 						// Breakpoint Resume for Data transferring. Activated as default, time
 						// interval 5
 						// minutes
-						m(GoodWe.ChannelId.LOG_DATA_ENABLE, new UnsignedWordElement(47005)), //
+						this.m(GoodWe.ChannelId.LOG_DATA_ENABLE, new UnsignedWordElement(47005)), //
 						// Time interval for data send to cloud or EMS,default is 1 minute
-						m(GoodWe.ChannelId.DATA_SEND_INTERVAL, new UnsignedWordElement(47006)), //
+						this.m(GoodWe.ChannelId.DATA_SEND_INTERVAL, new UnsignedWordElement(47006)), //
 						// Only for Australia, Refer to Table 8-22
-						m(GoodWe.ChannelId.DRED_CMD, new UnsignedWordElement(47007)), //
+						this.m(GoodWe.ChannelId.DRED_CMD, new UnsignedWordElement(47007)), //
 						new DummyRegisterElement(47008), //
 						// For wifi+Lan module, to switch to LAN or WiFi communicaiton
-						m(GoodWe.ChannelId.WIFI_OR_LAN_SWITCH, new UnsignedWordElement(47009)), //
+						this.m(GoodWe.ChannelId.WIFI_OR_LAN_SWITCH, new UnsignedWordElement(47009)), //
 						new DummyRegisterElement(47010, 47011), //
-						m(GoodWe.ChannelId.LED_BLINK_TIME, new UnsignedWordElement(47012)), //
+						this.m(GoodWe.ChannelId.LED_BLINK_TIME, new UnsignedWordElement(47012)), //
 						// 1: off, 2: on, 3: flash 1x, 4: flash 2x, 5: flash 4x
-						m(GoodWe.ChannelId.WIFI_LED_STATE, new UnsignedWordElement(47013)), //
-						m(GoodWe.ChannelId.COM_LED_STATE, new UnsignedWordElement(47014)), //
+						this.m(GoodWe.ChannelId.WIFI_LED_STATE, new UnsignedWordElement(47013)), //
+						this.m(GoodWe.ChannelId.COM_LED_STATE, new UnsignedWordElement(47014)), //
 						// 1:on 0:off only for single phase Smart meter
-						m(GoodWe.ChannelId.METER_CT1_REVERSE_ENABLE, new UnsignedWordElement(47015)), //
-						m(GoodWe.ChannelId.ERROR_LOG_READ_PAGE, new UnsignedWordElement(47016)), //
+						this.m(GoodWe.ChannelId.METER_CT1_REVERSE_ENABLE, new UnsignedWordElement(47015)), //
+						this.m(GoodWe.ChannelId.ERROR_LOG_READ_PAGE, new UnsignedWordElement(47016)), //
 						// 1:on 0:off If not connect to Internet, please set 1
-						m(GoodWe.ChannelId.MODBUS_TCP_WITHOUT_INTERNET, new UnsignedWordElement(47017)), //
+						this.m(GoodWe.ChannelId.MODBUS_TCP_WITHOUT_INTERNET, new UnsignedWordElement(47017)), //
 						// 1: off, 2: on, 3: flash 1x, 4: flash 2x, 5: flash 4x
-						m(GoodWe.ChannelId.BACKUP_LED, new UnsignedWordElement(47018)), // [1,5]
-						m(GoodWe.ChannelId.GRID_LED, new UnsignedWordElement(47019)), // [1,5]
-						m(GoodWe.ChannelId.SOC_LED_1, new UnsignedWordElement(47020)), // [1,5]
-						m(GoodWe.ChannelId.SOC_LED_2, new UnsignedWordElement(47021)), // [1,5]
-						m(GoodWe.ChannelId.SOC_LED_3, new UnsignedWordElement(47022)), // [1,5]
-						m(GoodWe.ChannelId.SOC_LED_4, new UnsignedWordElement(47023)), // [1,5]
-						m(GoodWe.ChannelId.BATTERY_LED, new UnsignedWordElement(47024)), // [1,5]
-						m(GoodWe.ChannelId.SYSTEM_LED, new UnsignedWordElement(47025)), // [1,5]
-						m(GoodWe.ChannelId.FAULT_LED, new UnsignedWordElement(47026)), // [1,5]
-						m(GoodWe.ChannelId.ENERGY_LED, new UnsignedWordElement(47027)), // [1,5]
-						m(GoodWe.ChannelId.LED_EXTERNAL_CONTROL, new UnsignedWordElement(47028)), // [42343]
+						this.m(GoodWe.ChannelId.BACKUP_LED, new UnsignedWordElement(47018)), // [1,5]
+						this.m(GoodWe.ChannelId.GRID_LED, new UnsignedWordElement(47019)), // [1,5]
+						this.m(GoodWe.ChannelId.SOC_LED_1, new UnsignedWordElement(47020)), // [1,5]
+						this.m(GoodWe.ChannelId.SOC_LED_2, new UnsignedWordElement(47021)), // [1,5]
+						this.m(GoodWe.ChannelId.SOC_LED_3, new UnsignedWordElement(47022)), // [1,5]
+						this.m(GoodWe.ChannelId.SOC_LED_4, new UnsignedWordElement(47023)), // [1,5]
+						this.m(GoodWe.ChannelId.BATTERY_LED, new UnsignedWordElement(47024)), // [1,5]
+						this.m(GoodWe.ChannelId.SYSTEM_LED, new UnsignedWordElement(47025)), // [1,5]
+						this.m(GoodWe.ChannelId.FAULT_LED, new UnsignedWordElement(47026)), // [1,5]
+						this.m(GoodWe.ChannelId.ENERGY_LED, new UnsignedWordElement(47027)), // [1,5]
+						this.m(GoodWe.ChannelId.LED_EXTERNAL_CONTROL, new UnsignedWordElement(47028)), // [42343]
 						new DummyRegisterElement(47029, 47037), //
 						// 1 Enable, After restart the inverter, setting saved
-						m(GoodWe.ChannelId.STOP_MODE_SAVE_ENABLE, new UnsignedWordElement(47038)))//
+						this.m(GoodWe.ChannelId.STOP_MODE_SAVE_ENABLE, new UnsignedWordElement(47038)))//
 		);
 	}
 
@@ -1806,50 +1828,50 @@ private void handleDspVersion5(ModbusProtocol protocol) throws OpenemsException
 
 		protocol.addTask(//
 				new FC3ReadRegistersTask(36001, Priority.LOW, //
-						m(GoodWe.ChannelId.RSSI, new UnsignedWordElement(36001)), //
+						this.m(GoodWe.ChannelId.RSSI, new UnsignedWordElement(36001)), //
 						new DummyRegisterElement(36002), //
-						m(GoodWe.ChannelId.B_METER_COMMUNICATE_STATUS, new UnsignedWordElement(36003)), //
-						m(GoodWe.ChannelId.METER_COMMUNICATE_STATUS, new UnsignedWordElement(36004)), //
+						this.m(GoodWe.ChannelId.B_METER_COMMUNICATE_STATUS, new UnsignedWordElement(36003)), //
+						this.m(GoodWe.ChannelId.METER_COMMUNICATE_STATUS, new UnsignedWordElement(36004)), //
 						// Registers for Grid Smart-Meter (36005 to 36014) are read via GridMeter
 						// implementation
 						new DummyRegisterElement(36005, 36014),
-						m(GoodWe.ChannelId.E_TOTAL_SELL, new FloatDoublewordElement(36015),
-								ElementToChannelConverter.SCALE_FACTOR_MINUS_1), //
-						m(GoodWe.ChannelId.E_TOTAL_BUY_F, new FloatDoublewordElement(36017),
-								ElementToChannelConverter.SCALE_FACTOR_MINUS_1), //
-						m(GoodWe.ChannelId.METER_ACTIVE_POWER_R, new SignedDoublewordElement(36019)), //
-						m(GoodWe.ChannelId.METER_ACTIVE_POWER_S, new SignedDoublewordElement(36021)), //
-						m(GoodWe.ChannelId.METER_ACTIVE_POWER_T, new SignedDoublewordElement(36023)), //
-						m(GoodWe.ChannelId.METER_TOTAL_ACTIVE_POWER, new SignedDoublewordElement(36025)), //
-						m(GoodWe.ChannelId.METER_REACTIVE_POWER_R, new SignedDoublewordElement(36027)), //
-						m(GoodWe.ChannelId.METER_REACTIVE_POWER_S, new SignedDoublewordElement(36029)), //
-						m(GoodWe.ChannelId.METER_REACTIVE_POWER_T, new SignedDoublewordElement(36031)), //
-						m(GoodWe.ChannelId.METER_TOTAL_REACTIVE_POWER, new SignedDoublewordElement(36033)), //
-						m(GoodWe.ChannelId.METER_APPARENT_POWER_R, new SignedDoublewordElement(36035)), //
-						m(GoodWe.ChannelId.METER_APPARENT_POWER_S, new SignedDoublewordElement(36037)), //
-						m(GoodWe.ChannelId.METER_APPARENT_POWER_T, new SignedDoublewordElement(36039)), //
-						m(GoodWe.ChannelId.METER_TOTAL_APPARENT_POWER, new SignedDoublewordElement(36041)), //
+						this.m(GoodWe.ChannelId.E_TOTAL_SELL, new FloatDoublewordElement(36015),
+								ElementToChannelConverter.SCALE_FACTOR_MINUS_1), //
+						this.m(GoodWe.ChannelId.E_TOTAL_BUY_F, new FloatDoublewordElement(36017),
+								ElementToChannelConverter.SCALE_FACTOR_MINUS_1), //
+						this.m(GoodWe.ChannelId.METER_ACTIVE_POWER_R, new SignedDoublewordElement(36019)), //
+						this.m(GoodWe.ChannelId.METER_ACTIVE_POWER_S, new SignedDoublewordElement(36021)), //
+						this.m(GoodWe.ChannelId.METER_ACTIVE_POWER_T, new SignedDoublewordElement(36023)), //
+						this.m(GoodWe.ChannelId.METER_TOTAL_ACTIVE_POWER, new SignedDoublewordElement(36025)), //
+						this.m(GoodWe.ChannelId.METER_REACTIVE_POWER_R, new SignedDoublewordElement(36027)), //
+						this.m(GoodWe.ChannelId.METER_REACTIVE_POWER_S, new SignedDoublewordElement(36029)), //
+						this.m(GoodWe.ChannelId.METER_REACTIVE_POWER_T, new SignedDoublewordElement(36031)), //
+						this.m(GoodWe.ChannelId.METER_TOTAL_REACTIVE_POWER, new SignedDoublewordElement(36033)), //
+						this.m(GoodWe.ChannelId.METER_APPARENT_POWER_R, new SignedDoublewordElement(36035)), //
+						this.m(GoodWe.ChannelId.METER_APPARENT_POWER_S, new SignedDoublewordElement(36037)), //
+						this.m(GoodWe.ChannelId.METER_APPARENT_POWER_T, new SignedDoublewordElement(36039)), //
+						this.m(GoodWe.ChannelId.METER_TOTAL_APPARENT_POWER, new SignedDoublewordElement(36041)), //
 						// Only for GoodWe smart meter
-						m(GoodWe.ChannelId.METER_TYPE, new UnsignedWordElement(36043)), //
-						m(GoodWe.ChannelId.METER_SOFTWARE_VERSION, new UnsignedWordElement(36044)), //
+						this.m(GoodWe.ChannelId.METER_TYPE, new UnsignedWordElement(36043)), //
+						this.m(GoodWe.ChannelId.METER_SOFTWARE_VERSION, new UnsignedWordElement(36044)), //
 						// Only for AC coupled inverter. Detect Pv Meter
-						m(GoodWe.ChannelId.METER_CT2_ACTIVE_POWER, new SignedDoublewordElement(36045)), //
-						m(GoodWe.ChannelId.CT2_E_TOTAL_SELL, new UnsignedDoublewordElement(36047),
+						this.m(GoodWe.ChannelId.METER_CT2_ACTIVE_POWER, new SignedDoublewordElement(36045)), //
+						this.m(GoodWe.ChannelId.CT2_E_TOTAL_SELL, new UnsignedDoublewordElement(36047),
 								ElementToChannelConverter.SCALE_FACTOR_MINUS_2), //
-						m(GoodWe.ChannelId.CT2_E_TOTAL_BUY, new UnsignedDoublewordElement(36049),
+						this.m(GoodWe.ChannelId.CT2_E_TOTAL_BUY, new UnsignedDoublewordElement(36049),
 								ElementToChannelConverter.SCALE_FACTOR_MINUS_2), //
-						m(GoodWe.ChannelId.METER_CT2_STATUS, new UnsignedWordElement(36051))) //
+						this.m(GoodWe.ChannelId.METER_CT2_STATUS, new UnsignedWordElement(36051))) //
 		);
 	}
 
 	protected AbstractModbusElement<?> getSocModbusElement(int address) throws NotImplementedException {
 		if (this instanceof HybridEss) {
-			return m(SymmetricEss.ChannelId.SOC, new UnsignedWordElement(address), new ElementToChannelConverter(
+			return this.m(SymmetricEss.ChannelId.SOC, new UnsignedWordElement(address), new ElementToChannelConverter(
 					// element -> channel
 					value -> {
 						// Set SoC to undefined if there is No Battery
-						EnumReadChannel batteryModeChannel = this.channel(GoodWe.ChannelId.BATTERY_MODE);
-						BatteryMode batteryMode = batteryModeChannel.value().asEnum();
+						var batteryModeChannel = this.channel(GoodWe.ChannelId.BATTERY_MODE);
+						var batteryMode = batteryModeChannel.value().asEnum();
 						if (batteryMode == BatteryMode.NO_BATTERY || batteryMode == BatteryMode.UNDEFINED) {
 							return null;
 						} else {
@@ -1858,7 +1880,8 @@ protected AbstractModbusElement<?> getSocModbusElement(int address) throws NotIm
 					},
 					// channel -> element
 					value -> value));
-		} else if (this instanceof HybridManagedSymmetricBatteryInverter) {
+		}
+		if (this instanceof HybridManagedSymmetricBatteryInverter) {
 			return new DummyRegisterElement(address);
 		} else {
 			throw new NotImplementedException("Wrong implementation of AbstractGoodWe");
@@ -1878,7 +1901,7 @@ public final void removeCharger(AbstractGoodWeEtCharger charger) {
 	/**
 	 * Gets the PV production from chargers ACTUAL_POWER. Returns null if the PV
 	 * production is not available.
-	 * 
+	 *
 	 * @return production power
 	 */
 	protected final Integer calculatePvProduction() {
@@ -1890,15 +1913,15 @@ protected final Integer calculatePvProduction() {
 	}
 
 	protected void updatePowerAndEnergyChannels() {
-		Integer productionPower = this.calculatePvProduction();
+		var productionPower = this.calculatePvProduction();
 		final Channel<Integer> pBattery1Channel = this.channel(GoodWe.ChannelId.P_BATTERY1);
-		Integer dcDischargePower = pBattery1Channel.value().get();
-		Integer acActivePower = TypeUtils.sum(productionPower, dcDischargePower);
+		var dcDischargePower = pBattery1Channel.value().get();
+		var acActivePower = TypeUtils.sum(productionPower, dcDischargePower);
 
 		/*
 		 * Update AC Active Power
 		 */
-		IntegerReadChannel activePowerChannel = this.channel(this.activePowerChannelId);
+		var activePowerChannel = this.channel(this.activePowerChannelId);
 		activePowerChannel.setNextValue(acActivePower);
 
 		/*
@@ -1921,7 +1944,7 @@ protected void updatePowerAndEnergyChannels() {
 		/*
 		 * Update DC Discharge Power
 		 */
-		IntegerReadChannel dcDischargePowerChannel = this.channel(this.dcDischargePowerChannelId);
+		var dcDischargePowerChannel = this.channel(this.dcDischargePowerChannelId);
 		dcDischargePowerChannel.setNextValue(dcDischargePower);
 
 		/*
@@ -1944,22 +1967,22 @@ protected void updatePowerAndEnergyChannels() {
 
 	/**
 	 * Calculate and store Max-AC-Export and -Import channels.
-	 * 
+	 *
 	 * @param maxApparentPower the max apparent power
 	 */
 	protected void calculateMaxAcPower(int maxApparentPower) {
 		// Calculate and store Max-AC-Export and -Import for use in
 		// getStaticConstraints()
-		Integer maxDcChargePower = /* can be negative for force-discharge */
+		var maxDcChargePower = /* can be negative for force-discharge */
 				TypeUtils.multiply(//
 						/* Inverter Charge-Max-Current */ this.getWbmsChargeMaxCurrent().get(), //
 						/* Voltage */ this.getWbmsVoltage().orElse(0));
 		int pvProduction = TypeUtils.max(0, this.calculatePvProduction());
 
 		// Calculates Max-AC-Import and Max-AC-Export as positive numbers
-		Integer maxAcImport = TypeUtils.subtract(maxDcChargePower,
+		var maxAcImport = TypeUtils.subtract(maxDcChargePower,
 				TypeUtils.min(maxDcChargePower /* avoid negative number for `subtract` */, pvProduction));
-		Integer maxAcExport = TypeUtils.sum(//
+		var maxAcExport = TypeUtils.sum(//
 				/* Max DC-Discharge-Power */ TypeUtils.multiply(//
 						/* Inverter Discharge-Max-Current */ this.getWbmsDischargeMaxCurrent().get(), //
 						/* Voltage */ this.getWbmsVoltage().orElse(0)),
@@ -1976,7 +1999,7 @@ protected void calculateMaxAcPower(int maxApparentPower) {
 
 	/**
 	 * Gets Surplus Power.
-	 * 
+	 *
 	 * @return {@link Integer}
 	 */
 	public abstract Integer getSurplusPower();
diff --git a/io.openems.edge.goodwe/src/io/openems/edge/goodwe/common/ApplyPowerHandler.java b/io.openems.edge.goodwe/src/io/openems/edge/goodwe/common/ApplyPowerHandler.java
index dfbd6459cff..36e50338b94 100644
--- a/io.openems.edge.goodwe/src/io/openems/edge/goodwe/common/ApplyPowerHandler.java
+++ b/io.openems.edge.goodwe/src/io/openems/edge/goodwe/common/ApplyPowerHandler.java
@@ -15,7 +15,7 @@ public class ApplyPowerHandler {
 	/**
 	 * Apply the desired Active-Power Set-Point by setting the appropriate
 	 * EMS_POWER_SET and EMS_POWER_MODE settings.
-	 * 
+	 *
 	 * @param goodWe          the GoodWe - either Battery-Inverter or ESS
 	 * @param setActivePower  the Active-Power Set-Point
 	 * @param controlMode     the {@link ControlMode} to handle the different
@@ -91,11 +91,11 @@ private static Result handleSmartMode(AbstractGoodWe goodWe, int activePowerSetP
 			int gridActivePower, int essActivePower, int maxAcImport, int maxAcExport) throws OpenemsNamedException {
 
 		// Is Balancing to zero active?
-		int diffBalancing = activePowerSetPoint - (gridActivePower + essActivePower);
+		var diffBalancing = activePowerSetPoint - (gridActivePower + essActivePower);
 
 		// Is Surplus-Feed-In active?
-		final Integer surplusPower = goodWe.getSurplusPower();
-		int diffSurplus = Integer.MAX_VALUE;
+		final var surplusPower = goodWe.getSurplusPower();
+		var diffSurplus = Integer.MAX_VALUE;
 		if (surplusPower != null && surplusPower > 0 && activePowerSetPoint != 0) {
 			diffSurplus = activePowerSetPoint - surplusPower;
 		}
@@ -104,16 +104,16 @@ private static Result handleSmartMode(AbstractGoodWe goodWe, int activePowerSetP
 		// PV = 10.000
 		// Max AC import = 3.000
 		// ActivePowerSetPoint = 3.000
-		int diffMaxAcImport = activePowerSetPoint - maxAcImport;
+		var diffMaxAcImport = activePowerSetPoint - maxAcImport;
 
 		// Is discharging from AC at maximum?
 		// PV = 0
 		// Max AC import = 8.000
 		// ActivePowerSetPoint = 8.000
-		int diffMaxAcExport = activePowerSetPoint - maxAcExport;
+		var diffMaxAcExport = activePowerSetPoint - maxAcExport;
 
-		if ((diffBalancing > -1 && diffBalancing < 1) || (diffSurplus > -1 && diffSurplus < 1)
-				|| (diffMaxAcImport > -1 && diffMaxAcImport < 1) || (diffMaxAcExport > -1 && diffMaxAcExport < 1)) {
+		if (diffBalancing > -1 && diffBalancing < 1 || diffSurplus > -1 && diffSurplus < 1
+				|| diffMaxAcImport > -1 && diffMaxAcImport < 1 || diffMaxAcExport > -1 && diffMaxAcExport < 1) {
 			// avoid rounding errors
 			return handleInternalMode();
 		}
@@ -124,21 +124,20 @@ private static Result handleSmartMode(AbstractGoodWe goodWe, int activePowerSetP
 	private static Result handleRemoteMode(int activePowerSetPoint, int pvProduction) {
 		// TODO PV curtail: (surplus power == setpoint && battery soc == 100% => PV
 		// curtail)
-		if (activePowerSetPoint >= 0) {
-			if (pvProduction >= activePowerSetPoint) {
-				// Set-Point is positive && less than PV-Production -> feed PV partly to grid +
-				// charge battery
-				// On Surplus Feed-In PV == Set-Point => CHARGE_BAT 0
-				return new Result(EmsPowerMode.CHARGE_BAT, pvProduction - activePowerSetPoint);
-
-			} else {
-				// Set-Point is positive && bigger than PV-Production -> feed all PV to grid +
-				// discharge battery
-				return new Result(EmsPowerMode.DISCHARGE_BAT, activePowerSetPoint - pvProduction);
+		if (activePowerSetPoint < 0) {
+			return new Result(EmsPowerMode.CHARGE_BAT, activePowerSetPoint * -1 + pvProduction);
+		}
+		if (pvProduction >= activePowerSetPoint) {
+			// Set-Point is positive && less than PV-Production -> feed PV partly to grid +
+			// charge battery
+			// On Surplus Feed-In PV == Set-Point => CHARGE_BAT 0
+			return new Result(EmsPowerMode.CHARGE_BAT, pvProduction - activePowerSetPoint);
 
-			}
 		} else {
-			return new Result(EmsPowerMode.CHARGE_BAT, activePowerSetPoint * -1 + pvProduction);
+			// Set-Point is positive && bigger than PV-Production -> feed all PV to grid +
+			// discharge battery
+			return new Result(EmsPowerMode.DISCHARGE_BAT, activePowerSetPoint - pvProduction);
+
 		}
 	}
 
@@ -146,13 +145,13 @@ private static Result handleRemoteMode(int activePowerSetPoint, int pvProduction
 	 * Check current {@link ControlMode} is set to SMART and PID filter is enabled.
 	 * If true warning channel SMART_MODE_NOT_WORKING_WITH_PID_FILTER set to true,
 	 * otherwise to false.
-	 * 
+	 *
 	 * @param goodWe      the GoodWe - either Battery-Inverter or ESS
 	 * @param controlMode the {@link ControlMode} to check SMART mode
 	 * @param pidEnabled  if PID filter is enabled
 	 */
 	private void checkControlModeWithActivePid(AbstractGoodWe goodWe, ControlMode controlMode, boolean isPidEnabled) {
-		boolean enableWarning = false;
+		var enableWarning = false;
 		if (controlMode.equals(ControlMode.SMART) && isPidEnabled) {
 			enableWarning = true;
 		}
@@ -163,7 +162,7 @@ private void checkControlModeWithActivePid(AbstractGoodWe goodWe, ControlMode co
 	/**
 	 * Check if configured {@link ControlMode} is possible - depending on if a
 	 * GoodWe Smart Meter is connected or not.
-	 * 
+	 *
 	 * @param goodWe      the GoodWe - either Battery-Inverter or ESS
 	 * @param controlMode the {@link ControlMode} to check SMART mode
 	 */
@@ -171,7 +170,7 @@ private void checkControlModeRequiresSmartMeter(AbstractGoodWe goodWe, ControlMo
 		EnumReadChannel meterCommunicateStatusChannel = goodWe.channel(GoodWe.ChannelId.METER_COMMUNICATE_STATUS);
 		MeterCommunicateStatus meterCommunicateStatus = meterCommunicateStatusChannel.value().asEnum();
 
-		boolean enableWarning = false;
+		var enableWarning = false;
 		switch (meterCommunicateStatus) {
 		case UNDEFINED:
 			// We don't know if GoodWe Smart Meter is connected. Either not read yet (on
diff --git a/io.openems.edge.goodwe/src/io/openems/edge/goodwe/common/GoodWe.java b/io.openems.edge.goodwe/src/io/openems/edge/goodwe/common/GoodWe.java
index 5d6ec9093e8..a36863aee33 100644
--- a/io.openems.edge.goodwe/src/io/openems/edge/goodwe/common/GoodWe.java
+++ b/io.openems.edge.goodwe/src/io/openems/edge/goodwe/common/GoodWe.java
@@ -57,14 +57,14 @@ public interface GoodWe extends OpenemsComponent {
 
 	/**
 	 * Registers a GoodWe Charger.
-	 * 
+	 *
 	 * @param charger either {@link GoodWeEtCharger1} or {@link GoodWeEtCharger2}
 	 */
 	public void addCharger(AbstractGoodWeEtCharger charger);
 
 	/**
 	 * Unregisters a GoodWe Charger.
-	 * 
+	 *
 	 * @param charger either {@link GoodWeEtCharger1} or {@link GoodWeEtCharger2}
 	 */
 	public void removeCharger(AbstractGoodWeEtCharger charger);
@@ -103,7 +103,7 @@ public static enum ChannelId implements io.openems.edge.common.channel.ChannelId
 
 		/**
 		 * Total Active Power Of Inverter.
-		 * 
+		 *
 		 * <p>
 		 * (If meter connection ok, it is meter power.If meter connection fail, it is
 		 * inverter on-grid port power)
@@ -1359,7 +1359,7 @@ public default void _setBmsChargeMaxCurrent(Integer value) {
 	/**
 	 * Gets the BMS Charge-Max-Current in [A]. See
 	 * {@link ChannelId#BMS_CHARGE_MAX_CURRENT}.
-	 * 
+	 *
 	 * @param value the next write value
 	 * @throws OpenemsNamedException on error
 	 */
@@ -1399,7 +1399,7 @@ public default void _setBmsDischargeMaxCurrent(Integer value) {
 	/**
 	 * Gets the BMS Discharge-Max-Current in [A]. See
 	 * {@link ChannelId#BMS_DISCHARGE_MAX_CURRENT}.
-	 * 
+	 *
 	 * @param value the next write value
 	 * @throws OpenemsNamedException on error
 	 */
@@ -1439,7 +1439,7 @@ public default void _setBmsChargeMaxVoltage(Integer value) {
 	/**
 	 * Gets the BMS Charge-Max-Voltage in [V]. See
 	 * {@link ChannelId#BMS_CHARGE_MAX_VOLTAGE}.
-	 * 
+	 *
 	 * @param value the next write value
 	 * @throws OpenemsNamedException on error
 	 */
@@ -1479,7 +1479,7 @@ public default void _setBmsDischargeMinVoltage(Integer value) {
 	/**
 	 * Gets the BMS Discharge-Min-Voltage in [V]. See
 	 * {@link ChannelId#BMS_DISCHARGE_MIN_VOLTAGE}.
-	 * 
+	 *
 	 * @param value the next write value
 	 * @throws OpenemsNamedException on error
 	 */
@@ -1545,7 +1545,7 @@ public default Value<Integer> getWbmsVoltage() {
 
 	/**
 	 * Gets the Channel for {@link ChannelId#MAX_AC_EXPORT}.
-	 * 
+	 *
 	 * @return the Channel
 	 */
 	public default IntegerReadChannel getMaxAcExportChannel() {
@@ -1555,7 +1555,7 @@ public default IntegerReadChannel getMaxAcExportChannel() {
 	/**
 	 * Gets the Max AC-Export Power in [W]. Positive Values. See
 	 * {@link ChannelId#MAX_AC_EXPORT}.
-	 * 
+	 *
 	 * @return the Channel {@link Value}
 	 */
 	public default Value<Integer> getMaxAcExport() {
@@ -1565,7 +1565,7 @@ public default Value<Integer> getMaxAcExport() {
 	/**
 	 * Internal method to set the 'nextValue' on {@link ChannelId#MAX_AC_EXPORT}
 	 * Channel.
-	 * 
+	 *
 	 * @param value the next value
 	 */
 	public default void _setMaxAcExport(Integer value) {
@@ -1574,7 +1574,7 @@ public default void _setMaxAcExport(Integer value) {
 
 	/**
 	 * Gets the Channel for {@link ChannelId#MAX_AC_IMPORT}.
-	 * 
+	 *
 	 * @return the Channel
 	 */
 	public default IntegerReadChannel getMaxAcImportChannel() {
@@ -1584,7 +1584,7 @@ public default IntegerReadChannel getMaxAcImportChannel() {
 	/**
 	 * Gets the Max AC-Import Power in [W]. Negative Values. See
 	 * {@link ChannelId#MAX_AC_IMPORT}.
-	 * 
+	 *
 	 * @return the Channel {@link Value}
 	 */
 	public default Value<Integer> getMaxAcImport() {
@@ -1594,7 +1594,7 @@ public default Value<Integer> getMaxAcImport() {
 	/**
 	 * Internal method to set the 'nextValue' on {@link ChannelId#MAX_AC_IMPORT}
 	 * Channel.
-	 * 
+	 *
 	 * @param value the next value
 	 */
 	public default void _setMaxAcImport(Integer value) {
diff --git a/io.openems.edge.goodwe/src/io/openems/edge/goodwe/common/enums/EmsPowerMode.java b/io.openems.edge.goodwe/src/io/openems/edge/goodwe/common/enums/EmsPowerMode.java
index 99bec37ed13..4540903feed 100644
--- a/io.openems.edge.goodwe/src/io/openems/edge/goodwe/common/enums/EmsPowerMode.java
+++ b/io.openems.edge.goodwe/src/io/openems/edge/goodwe/common/enums/EmsPowerMode.java
@@ -4,10 +4,10 @@
 
 /**
  * See table 8-16 EMS Power Mode.
- * 
+ *
  * <p>
  * Note:
- * 
+ *
  * <ul>
  * <li>for low-priority energy sources, when the battery charging power is
  * limited or the rated output power of the inverter is limited, the load shall
@@ -24,7 +24,7 @@ public enum EmsPowerMode implements OptionsEnum {
 
 	/**
 	 * Scenario: System shutdown.
-	 * 
+	 *
 	 * <p>
 	 * Stop working and turn to wait mode
 	 */
@@ -32,10 +32,10 @@ public enum EmsPowerMode implements OptionsEnum {
 
 	/**
 	 * Scenario: Self-use.
-	 * 
+	 *
 	 * <p>
 	 * PBattery = PInv - Pmeter - Ppv (Discharge/Charge)
-	 * 
+	 *
 	 * <p>
 	 * The battery power is controlled by the meter power when the meter
 	 * communication is normal.
@@ -44,20 +44,20 @@ public enum EmsPowerMode implements OptionsEnum {
 
 	/**
 	 * Scenario: Control the battery to keep charging.
-	 * 
+	 *
 	 * <p>
 	 * PBattery = Xmax + PV (Charge)
-	 * 
+	 *
 	 * <p>
 	 * Xmax is to allow the power to be taken from the grid, and PV power is
 	 * preferred. When set to 0, only PV power is used. Charging power will be
 	 * limited by charging current limit.
-	 * 
+	 *
 	 * <p>
 	 * Interpretation: Charge Battery from PV (high priority) or Grid (low
 	 * priority); EmsPowerSet = negative ESS ActivePower (if possible because of
 	 * PV).
-	 * 
+	 *
 	 * <ul>
 	 * <li>Grid: low priority
 	 * <li>PV: high priority
@@ -69,18 +69,18 @@ public enum EmsPowerMode implements OptionsEnum {
 
 	/**
 	 * Scenario: Control the battery to keep discharging.
-	 * 
+	 *
 	 * <p>
 	 * PBattery = Xmax (Discharge)
-	 * 
+	 *
 	 * <p>
 	 * Xmax is the allowable discharge power of the battery. When the power fed into
 	 * the grid is limited, PV power will be used first.
-	 * 
+	 *
 	 * <p>
 	 * Interpretation: ESS ActivePower = PV power + EmsPowerSet (i.e. battery
 	 * discharge); useful for surplus feed-to-grid.
-	 * 
+	 *
 	 * <ul>
 	 * <li>PV: high priority
 	 * <li>Battery: low priority
@@ -92,21 +92,21 @@ public enum EmsPowerMode implements OptionsEnum {
 
 	/**
 	 * Scenario: The inverter is used as a unit for power grid energy scheduling.
-	 * 
+	 *
 	 * <p>
 	 * PBattery = Xset + PV (Charge)
-	 * 
+	 *
 	 * <p>
 	 * Xset refers to the power purchased from the power grid. The power purchased
 	 * from the grid is preferred. If the PV power is too large, the MPPT power will
 	 * be limited. (grid side load is not considered)
-	 * 
+	 *
 	 * <p>
 	 * Interpretation: Charge Battery from Grid (high priority) or PV (low
 	 * priority); EmsPowerSet = negative ESS ActivePower; as long as
 	 * BMS_CHARGE_MAX_CURRENT is > 0, no AC-Power is exported; when
 	 * BMS_CHARGE_MAX_CURRENT == 0, PV surplus feed in starts!
-	 * 
+	 *
 	 * <ul>
 	 * <li>Grid: high priority
 	 * <li>PV: low priority
@@ -118,19 +118,19 @@ public enum EmsPowerMode implements OptionsEnum {
 
 	/**
 	 * Scenario: The inverter is used as a unit for power grid energy scheduling.
-	 * 
+	 *
 	 * <p>
 	 * PBattery = Xset (Discharge)
-	 * 
+	 *
 	 * <p>
 	 * Xset is to sell power to the grid. PV power is preferred. When PV energy is
 	 * insufficient, the battery will discharge. PV power will be limited by x.
 	 * (grid side load is not considered)
-	 * 
+	 *
 	 * <p>
 	 * Interpretation: EmsPowerSet = positive ESS ActivePower. But PV will be
 	 * limited, i.e. remaining power is not used to charge battery.
-	 * 
+	 *
 	 * <ul>
 	 * <li>PV: high priority
 	 * <li>Battery: low priority
@@ -142,10 +142,10 @@ public enum EmsPowerMode implements OptionsEnum {
 
 	/**
 	 * Scenario: Off-grid reservation mode.
-	 * 
+	 *
 	 * <p>
 	 * PBattery = PV (Charge)
-	 * 
+	 *
 	 * <p>
 	 * In on-grid mode, the battery is continuously charged, and only PV power (AC
 	 * Couple model takes 10% of the rated power of the power grid) is used. The
@@ -155,10 +155,10 @@ public enum EmsPowerMode implements OptionsEnum {
 
 	/**
 	 * Scenario: Off-Grid Mode.
-	 * 
+	 *
 	 * <p>
 	 * PBattery = Pbackup - Ppv (Charge/Discharge)
-	 * 
+	 *
 	 * <p>
 	 * Forced off-grid operation.
 	 */
@@ -166,10 +166,10 @@ public enum EmsPowerMode implements OptionsEnum {
 
 	/**
 	 * Scenario: The inverter is used as a unit for power grid energy scheduling.
-	 * 
+	 *
 	 * <p>
 	 * PBattery = 0 (Standby)
-	 * 
+	 *
 	 * <p>
 	 * The battery does not charge and discharge
 	 */
@@ -177,18 +177,18 @@ public enum EmsPowerMode implements OptionsEnum {
 
 	/**
 	 * Scenario: Regional energy management.
-	 * 
+	 *
 	 * <p>
 	 * PBattery = PInv - (Pmeter + Xset) - Ppv (Charge/Discharge)
-	 * 
+	 *
 	 * <p>
 	 * When the meter communication is normal, the power purchased from the power
 	 * grid is controlled as Xset. When the PV power is too large, the MPPT power
 	 * will be limited. When the load is too large, the battery will discharge.
-	 * 
+	 *
 	 * <p>
 	 * Interpretation: Control power at the point of common coupling.
-	 * 
+	 *
 	 * <ul>
 	 * <li>Grid: high priority
 	 * <li>PV: low priority
@@ -200,18 +200,18 @@ public enum EmsPowerMode implements OptionsEnum {
 
 	/**
 	 * Scenario: Regional energy management.
-	 * 
+	 *
 	 * <p>
 	 * PBattery = PInv - (Pmeter - Xset) - Ppv (Charge/Discharge)
-	 * 
+	 *
 	 * <p>
 	 * When the communication of electricity meter is normal, the power sold from
 	 * the power grid is controlled as Xset, PV power is preferred, and the battery
 	 * discharges when PV energy is insufficient.PV power will be limited by Xset.
-	 * 
+	 *
 	 * <p>
 	 * Interpretation: Control power at the point of common coupling.
-	 * 
+	 *
 	 * <ul>
 	 * <li>PV: high priority
 	 * <li>Battery: low priority
@@ -223,19 +223,19 @@ public enum EmsPowerMode implements OptionsEnum {
 
 	/**
 	 * Scenario: Force the battery to work at set power value.
-	 * 
+	 *
 	 * <p>
 	 * PBattery = Xset (Charge)
-	 * 
+	 *
 	 * <p>
 	 * Xset is the charging power of the battery. PV power is preferred. When PV
 	 * power is insufficient, it will buy power from the power grid. The charging
 	 * power is also affected by the charging current limit.
-	 * 
+	 *
 	 * <p>
 	 * Interpretation: Charge Battery from PV (high priority) or Grid (low
 	 * priority); priorities are inverted compared to IMPORT_AC.
-	 * 
+	 *
 	 * <ul>
 	 * <li>PV: high priority
 	 * <li>Grid: low priority
@@ -247,18 +247,18 @@ public enum EmsPowerMode implements OptionsEnum {
 
 	/**
 	 * Scenario: Force the battery to work at set power value.
-	 * 
+	 *
 	 * <p>
 	 * PBattery = Xset (Discharge)
-	 * 
+	 *
 	 * <p>
 	 * Xset is the discharge power of the battery, and the battery discharge has
 	 * priority. If the PV power is too large, MPPT will be limited. Discharge power
 	 * is also affected by discharge current limit.
-	 * 
+	 *
 	 * <p>
 	 * Interpretation: ???
-	 * 
+	 *
 	 * <ul>
 	 * <li>PV: low priority
 	 * <li>Battery: high priority
diff --git a/io.openems.edge.goodwe/src/io/openems/edge/goodwe/common/enums/GoodweType.java b/io.openems.edge.goodwe/src/io/openems/edge/goodwe/common/enums/GoodweType.java
index 83b89767b92..9943b764f35 100644
--- a/io.openems.edge.goodwe/src/io/openems/edge/goodwe/common/enums/GoodweType.java
+++ b/io.openems.edge.goodwe/src/io/openems/edge/goodwe/common/enums/GoodweType.java
@@ -38,7 +38,7 @@ public String getName() {
 
 	/**
 	 * Is this GoodWe a ET-Series or BT-Series.
-	 * 
+	 *
 	 * @return the Series or UNDEFINED if unknown
 	 */
 	public Series getSeries() {
diff --git a/io.openems.edge.goodwe/src/io/openems/edge/goodwe/emergencypowermeter/GoodWeEmergencyPowerMeterImpl.java b/io.openems.edge.goodwe/src/io/openems/edge/goodwe/emergencypowermeter/GoodWeEmergencyPowerMeterImpl.java
index be0de1cfbbb..c4ebf08d85d 100644
--- a/io.openems.edge.goodwe/src/io/openems/edge/goodwe/emergencypowermeter/GoodWeEmergencyPowerMeterImpl.java
+++ b/io.openems.edge.goodwe/src/io/openems/edge/goodwe/emergencypowermeter/GoodWeEmergencyPowerMeterImpl.java
@@ -50,6 +50,7 @@ public class GoodWeEmergencyPowerMeterImpl extends AbstractOpenemsModbusComponen
 	@Reference
 	protected ConfigurationAdmin cm;
 
+	@Override
 	@Reference(policy = ReferencePolicy.STATIC, policyOption = ReferencePolicyOption.GREEDY, cardinality = ReferenceCardinality.MANDATORY)
 	protected void setModbus(BridgeModbus modbus) {
 		super.setModbus(modbus);
@@ -78,10 +79,10 @@ public GoodWeEmergencyPowerMeterImpl() {
 	private void activate(ComponentContext context, Config config) throws OpenemsException {
 		if (super.activate(context, config.id(), config.alias(), config.enabled(), config.modbusUnitId(), this.cm,
 				"Modbus", config.modbus_id())) {
-			return;
 		}
 	}
 
+	@Override
 	@Deactivate
 	protected void deactivate() {
 		super.deactivate();
@@ -93,32 +94,32 @@ protected ModbusProtocol defineModbusProtocol() throws OpenemsException {
 
 				// Power of each backup up phase
 				new FC3ReadRegistersTask(35145, Priority.LOW, //
-						m(AsymmetricMeter.ChannelId.VOLTAGE_L1, new UnsignedWordElement(35145), //
+						this.m(AsymmetricMeter.ChannelId.VOLTAGE_L1, new UnsignedWordElement(35145), //
 								ElementToChannelConverter.SCALE_FACTOR_MINUS_1), //
-						m(AsymmetricMeter.ChannelId.CURRENT_L1, new UnsignedWordElement(35146), //
+						this.m(AsymmetricMeter.ChannelId.CURRENT_L1, new UnsignedWordElement(35146), //
 								ElementToChannelConverter.SCALE_FACTOR_MINUS_1), //
-						m(GoodWeEmergencyPowerMeter.ChannelId.FREQUENCY_L1, new UnsignedWordElement(35147), //
+						this.m(GoodWeEmergencyPowerMeter.ChannelId.FREQUENCY_L1, new UnsignedWordElement(35147), //
 								ElementToChannelConverter.SCALE_FACTOR_MINUS_2), //
 						new DummyRegisterElement(35148), //
-						m(AsymmetricMeter.ChannelId.ACTIVE_POWER_L1, new SignedDoublewordElement(35149)), //
+						this.m(AsymmetricMeter.ChannelId.ACTIVE_POWER_L1, new SignedDoublewordElement(35149)), //
 
-						m(AsymmetricMeter.ChannelId.VOLTAGE_L2, new UnsignedWordElement(35151), //
+						this.m(AsymmetricMeter.ChannelId.VOLTAGE_L2, new UnsignedWordElement(35151), //
 								ElementToChannelConverter.SCALE_FACTOR_MINUS_1), //
-						m(AsymmetricMeter.ChannelId.CURRENT_L2, new UnsignedWordElement(35152), //
+						this.m(AsymmetricMeter.ChannelId.CURRENT_L2, new UnsignedWordElement(35152), //
 								ElementToChannelConverter.SCALE_FACTOR_MINUS_1), //
-						m(GoodWeEmergencyPowerMeter.ChannelId.FREQUENCY_L2, new UnsignedWordElement(35153), //
+						this.m(GoodWeEmergencyPowerMeter.ChannelId.FREQUENCY_L2, new UnsignedWordElement(35153), //
 								ElementToChannelConverter.SCALE_FACTOR_MINUS_2), //
 						new DummyRegisterElement(35154), //
-						m(AsymmetricMeter.ChannelId.ACTIVE_POWER_L2, new SignedDoublewordElement(35155)), //
+						this.m(AsymmetricMeter.ChannelId.ACTIVE_POWER_L2, new SignedDoublewordElement(35155)), //
 
-						m(AsymmetricMeter.ChannelId.VOLTAGE_L3, new UnsignedWordElement(35157), //
+						this.m(AsymmetricMeter.ChannelId.VOLTAGE_L3, new UnsignedWordElement(35157), //
 								ElementToChannelConverter.SCALE_FACTOR_MINUS_1), //
-						m(AsymmetricMeter.ChannelId.CURRENT_L3, new UnsignedWordElement(35158), //
+						this.m(AsymmetricMeter.ChannelId.CURRENT_L3, new UnsignedWordElement(35158), //
 								ElementToChannelConverter.SCALE_FACTOR_MINUS_1), //
-						m(GoodWeEmergencyPowerMeter.ChannelId.FREQUENCY_L3, new UnsignedWordElement(35159), //
+						this.m(GoodWeEmergencyPowerMeter.ChannelId.FREQUENCY_L3, new UnsignedWordElement(35159), //
 								ElementToChannelConverter.SCALE_FACTOR_MINUS_2), //
 						new DummyRegisterElement(35160), //
-						m(AsymmetricMeter.ChannelId.ACTIVE_POWER_L3, new SignedDoublewordElement(35161))));
+						this.m(AsymmetricMeter.ChannelId.ACTIVE_POWER_L3, new SignedDoublewordElement(35161))));
 	}
 
 	@Override
@@ -145,7 +146,7 @@ public void handleEvent(Event event) {
 	 */
 	private void calculateEnergy() {
 		// Calculate Energy
-		Integer activePower = this.getActivePower().get();
+		var activePower = this.getActivePower().get();
 		if (activePower == null) {
 			// Not available
 			this.calculateProductionEnergy.update(null);
diff --git a/io.openems.edge.goodwe/src/io/openems/edge/goodwe/ess/AllowedChargeDischargeHandler.java b/io.openems.edge.goodwe/src/io/openems/edge/goodwe/ess/AllowedChargeDischargeHandler.java
index f6a66bb20a1..886b164c33e 100644
--- a/io.openems.edge.goodwe/src/io/openems/edge/goodwe/ess/AllowedChargeDischargeHandler.java
+++ b/io.openems.edge.goodwe/src/io/openems/edge/goodwe/ess/AllowedChargeDischargeHandler.java
@@ -21,24 +21,24 @@ public void accept(ClockProvider clockProvider, Battery battery) {
 	/**
 	 * Calculates AllowedChargePower and AllowedDischargePower and sets the
 	 * Channels.
-	 * 
+	 *
 	 * @param clockProvider a {@link ClockProvider}
 	 */
 	public void accept(ClockProvider clockProvider) {
 		IntegerReadChannel bmsChargeImaxChannel = parent.channel(GoodWe.ChannelId.BMS_CHARGE_IMAX);
-		Integer bmsChargeImax = bmsChargeImaxChannel.value().get();
+		var bmsChargeImax = bmsChargeImaxChannel.value().get();
 		IntegerReadChannel bmsDischargeImaxChannel = parent.channel(GoodWe.ChannelId.BMS_DISCHARGE_IMAX);
-		Integer bmsDischargeImax = bmsDischargeImaxChannel.value().get();
+		var bmsDischargeImax = bmsDischargeImaxChannel.value().get();
 		IntegerReadChannel wbmsVoltageChannel = parent.channel(GoodWe.ChannelId.WBMS_VOLTAGE);
-		Integer wbmsVoltage = wbmsVoltageChannel.value().get();
+		var wbmsVoltage = wbmsVoltageChannel.value().get();
 		this.calculateAllowedChargeDischargePower(clockProvider, true, bmsChargeImax, bmsDischargeImax, wbmsVoltage);
 
 		// Battery limits
-		int batteryAllowedChargePower = Math.round(this.lastBatteryAllowedChargePower);
-		int batteryAllowedDischargePower = Math.round(this.lastBatteryAllowedDischargePower);
+		var batteryAllowedChargePower = Math.round(this.lastBatteryAllowedChargePower);
+		var batteryAllowedDischargePower = Math.round(this.lastBatteryAllowedDischargePower);
 
 		// PV-Production
-		int pvProduction = Math.max(//
+		var pvProduction = Math.max(//
 				TypeUtils.orElse(//
 						TypeUtils.subtract(this.parent.getActivePower().get(), this.parent.getDcDischargePower().get()), //
 						0),
diff --git a/io.openems.edge.goodwe/src/io/openems/edge/goodwe/ess/GoodWeEssImpl.java b/io.openems.edge.goodwe/src/io/openems/edge/goodwe/ess/GoodWeEssImpl.java
index 67feca11b3e..bcbe33e9f1d 100644
--- a/io.openems.edge.goodwe/src/io/openems/edge/goodwe/ess/GoodWeEssImpl.java
+++ b/io.openems.edge.goodwe/src/io/openems/edge/goodwe/ess/GoodWeEssImpl.java
@@ -65,6 +65,7 @@ public class GoodWeEssImpl extends AbstractGoodWe implements GoodWeEss, GoodWe,
 	@Reference
 	private ComponentManager componentManager;
 
+	@Override
 	@Reference(policy = ReferencePolicy.STATIC, policyOption = ReferencePolicyOption.GREEDY, cardinality = ReferenceCardinality.MANDATORY)
 	protected void setModbus(BridgeModbus modbus) {
 		super.setModbus(modbus);
@@ -80,6 +81,7 @@ void activate(ComponentContext context, Config config) throws OpenemsNamedExcept
 		this._setCapacity(this.config.capacity());
 	}
 
+	@Override
 	@Deactivate
 	protected void deactivate() {
 		super.deactivate();
@@ -159,7 +161,7 @@ public Integer getSurplusPower() {
 		if (this.getSoc().orElse(0) < 99) {
 			return null;
 		}
-		Integer productionPower = this.calculatePvProduction();
+		var productionPower = this.calculatePvProduction();
 		if (productionPower == null || productionPower < 100) {
 			return null;
 		}
diff --git a/io.openems.edge.goodwe/src/io/openems/edge/goodwe/gridmeter/GoodWeGridMeterImpl.java b/io.openems.edge.goodwe/src/io/openems/edge/goodwe/gridmeter/GoodWeGridMeterImpl.java
index 3a4fad6a828..90d2a5173a8 100644
--- a/io.openems.edge.goodwe/src/io/openems/edge/goodwe/gridmeter/GoodWeGridMeterImpl.java
+++ b/io.openems.edge.goodwe/src/io/openems/edge/goodwe/gridmeter/GoodWeGridMeterImpl.java
@@ -51,6 +51,7 @@ public class GoodWeGridMeterImpl extends AbstractOpenemsModbusComponent implemen
 	@Reference
 	protected ConfigurationAdmin cm;
 
+	@Override
 	@Reference(policy = ReferencePolicy.STATIC, policyOption = ReferencePolicyOption.GREEDY, cardinality = ReferenceCardinality.MANDATORY)
 	protected void setModbus(BridgeModbus modbus) {
 		super.setModbus(modbus);
@@ -79,10 +80,10 @@ public GoodWeGridMeterImpl() {
 	void activate(ComponentContext context, Config config) throws OpenemsException {
 		if (super.activate(context, config.id(), config.alias(), config.enabled(), config.modbusUnitId(), this.cm,
 				"Modbus", config.modbus_id())) {
-			return;
 		}
 	}
 
+	@Override
 	@Deactivate
 	protected void deactivate() {
 		super.deactivate();
@@ -94,41 +95,41 @@ protected ModbusProtocol defineModbusProtocol() throws OpenemsException {
 
 				// Active and reactive power, Power factor and frequency
 				new FC3ReadRegistersTask(36005, Priority.HIGH, //
-						m(AsymmetricMeter.ChannelId.ACTIVE_POWER_L1, new SignedWordElement(36005),
+						this.m(AsymmetricMeter.ChannelId.ACTIVE_POWER_L1, new SignedWordElement(36005),
 								ElementToChannelConverter.INVERT), //
-						m(AsymmetricMeter.ChannelId.ACTIVE_POWER_L2, new SignedWordElement(36006),
+						this.m(AsymmetricMeter.ChannelId.ACTIVE_POWER_L2, new SignedWordElement(36006),
 								ElementToChannelConverter.INVERT), //
-						m(AsymmetricMeter.ChannelId.ACTIVE_POWER_L3, new SignedWordElement(36007),
+						this.m(AsymmetricMeter.ChannelId.ACTIVE_POWER_L3, new SignedWordElement(36007),
 								ElementToChannelConverter.INVERT), //
 						new DummyRegisterElement(36008, 36012), //
-						m(GoodWeGridMeter.ChannelId.METER_POWER_FACTOR, new UnsignedWordElement(36013),
+						this.m(GoodWeGridMeter.ChannelId.METER_POWER_FACTOR, new UnsignedWordElement(36013),
 								ElementToChannelConverter.SCALE_FACTOR_MINUS_2), //
-						m(SymmetricMeter.ChannelId.FREQUENCY, new UnsignedWordElement(36014),
+						this.m(SymmetricMeter.ChannelId.FREQUENCY, new UnsignedWordElement(36014),
 								ElementToChannelConverter.SCALE_FACTOR_MINUS_2)), //
 
 				// Voltage, current and Grid Frequency of each phase
 				new FC3ReadRegistersTask(35121, Priority.LOW, //
-						m(AsymmetricMeter.ChannelId.VOLTAGE_L1, new UnsignedWordElement(35121),
+						this.m(AsymmetricMeter.ChannelId.VOLTAGE_L1, new UnsignedWordElement(35121),
 								ElementToChannelConverter.SCALE_FACTOR_MINUS_1), //
-						m(AsymmetricMeter.ChannelId.CURRENT_L1, new UnsignedWordElement(35122),
+						this.m(AsymmetricMeter.ChannelId.CURRENT_L1, new UnsignedWordElement(35122),
 								ElementToChannelConverter.SCALE_FACTOR_MINUS_1), //
-						m(GoodWeGridMeter.ChannelId.F_GRID_R, new UnsignedWordElement(35123),
+						this.m(GoodWeGridMeter.ChannelId.F_GRID_R, new UnsignedWordElement(35123),
 								ElementToChannelConverter.SCALE_FACTOR_MINUS_2), //
 						new DummyRegisterElement(35124, 35125), //
-						m(AsymmetricMeter.ChannelId.VOLTAGE_L2, new UnsignedWordElement(35126),
+						this.m(AsymmetricMeter.ChannelId.VOLTAGE_L2, new UnsignedWordElement(35126),
 								ElementToChannelConverter.SCALE_FACTOR_MINUS_1), //
-						m(AsymmetricMeter.ChannelId.CURRENT_L2, new UnsignedWordElement(35127),
+						this.m(AsymmetricMeter.ChannelId.CURRENT_L2, new UnsignedWordElement(35127),
 								ElementToChannelConverter.SCALE_FACTOR_MINUS_1), //
-						m(GoodWeGridMeter.ChannelId.F_GRID_S, new UnsignedWordElement(35128),
+						this.m(GoodWeGridMeter.ChannelId.F_GRID_S, new UnsignedWordElement(35128),
 								ElementToChannelConverter.SCALE_FACTOR_MINUS_2), //
 						new DummyRegisterElement(35129, 35130), //
-						m(AsymmetricMeter.ChannelId.VOLTAGE_L3, new UnsignedWordElement(35131),
+						this.m(AsymmetricMeter.ChannelId.VOLTAGE_L3, new UnsignedWordElement(35131),
 								ElementToChannelConverter.SCALE_FACTOR_MINUS_1), //
-						m(AsymmetricMeter.ChannelId.CURRENT_L3, new UnsignedWordElement(35132),
+						this.m(AsymmetricMeter.ChannelId.CURRENT_L3, new UnsignedWordElement(35132),
 								ElementToChannelConverter.SCALE_FACTOR_MINUS_1), //
-						m(GoodWeGridMeter.ChannelId.F_GRID_T, new UnsignedWordElement(35133),
+						this.m(GoodWeGridMeter.ChannelId.F_GRID_T, new UnsignedWordElement(35133),
 								ElementToChannelConverter.SCALE_FACTOR_MINUS_2), //
-						m(GoodWeGridMeter.ChannelId.P_GRID_T, new SignedDoublewordElement(35134),
+						this.m(GoodWeGridMeter.ChannelId.P_GRID_T, new SignedDoublewordElement(35134),
 								ElementToChannelConverter.SCALE_FACTOR_MINUS_2))); //
 	}
 
@@ -146,7 +147,7 @@ public void handleEvent(Event event) {
 	 */
 	private void calculateEnergy() {
 		// Calculate Energy
-		Integer activePower = this.getActivePower().get();
+		var activePower = this.getActivePower().get();
 		if (activePower == null) {
 			// Not available
 			this.calculateProductionEnergy.update(null);
diff --git a/io.openems.edge.goodwe/test/io/openems/edge/goodwe/batteryinverter/GoodWeBatteryInverterImplTest.java b/io.openems.edge.goodwe/test/io/openems/edge/goodwe/batteryinverter/GoodWeBatteryInverterImplTest.java
index b106c0ea30a..fbc4cfe57e6 100644
--- a/io.openems.edge.goodwe/test/io/openems/edge/goodwe/batteryinverter/GoodWeBatteryInverterImplTest.java
+++ b/io.openems.edge.goodwe/test/io/openems/edge/goodwe/batteryinverter/GoodWeBatteryInverterImplTest.java
@@ -48,7 +48,7 @@ public class GoodWeBatteryInverterImplTest {
 
 	@Test
 	public void testEt() throws Exception {
-		GoodWeEtCharger1 charger = new GoodWeEtCharger1();
+		var charger = new GoodWeEtCharger1();
 		new ComponentTest(charger) //
 				.addReference("cm", new DummyConfigurationAdmin()) //
 				.addReference("setModbus", new DummyModbusBridge(MODBUS_ID)) //
@@ -59,7 +59,7 @@ public void testEt() throws Exception {
 						.setModbusUnitId(GoodWeConstants.DEFAULT_UNIT_ID) //
 						.build());
 
-		GoodWeBatteryInverterImpl ess = new GoodWeBatteryInverterImpl();
+		var ess = new GoodWeBatteryInverterImpl();
 		ess.addCharger(charger);
 		new ComponentTest(ess) //
 				.addReference("power", new DummyPower()) //
@@ -94,7 +94,7 @@ public void testEt() throws Exception {
 
 	@Test
 	public void testNegativSetActivePoint() throws Exception {
-		GoodWeBatteryInverterImpl ess = new GoodWeBatteryInverterImpl();
+		var ess = new GoodWeBatteryInverterImpl();
 		new ComponentTest(ess) //
 				.addReference("power", new DummyPower()) //
 				.addReference("cm", new DummyConfigurationAdmin()) //
@@ -126,7 +126,7 @@ public void testNegativSetActivePoint() throws Exception {
 
 	@Test
 	public void testDischargeBattery() throws Exception {
-		GoodWeBatteryInverterImpl ess = new GoodWeBatteryInverterImpl();
+		var ess = new GoodWeBatteryInverterImpl();
 		new ComponentTest(ess) //
 				.addReference("power", new DummyPower()) //
 				.addReference("cm", new DummyConfigurationAdmin()) //
@@ -158,7 +158,7 @@ public void testDischargeBattery() throws Exception {
 
 	@Test
 	public void testEmsPowerModeAutoWithBalancing() throws Exception {
-		GoodWeBatteryInverterImpl ess = new GoodWeBatteryInverterImpl();
+		var ess = new GoodWeBatteryInverterImpl();
 		new ComponentTest(ess) //
 				.addReference("power", new DummyPower()) //
 				.addReference("cm", new DummyConfigurationAdmin()) //
@@ -189,7 +189,7 @@ public void testEmsPowerModeAutoWithBalancing() throws Exception {
 
 	@Test
 	public void testEmsPowerModeAutoWithSurplus() throws Exception {
-		GoodWeEtCharger1 charger = new GoodWeEtCharger1();
+		var charger = new GoodWeEtCharger1();
 		new ComponentTest(charger) //
 				.addReference("cm", new DummyConfigurationAdmin()) //
 				.addReference("setModbus", new DummyModbusBridge(MODBUS_ID)) //
@@ -200,7 +200,7 @@ public void testEmsPowerModeAutoWithSurplus() throws Exception {
 						.setModbusUnitId(GoodWeConstants.DEFAULT_UNIT_ID) //
 						.build());
 
-		GoodWeBatteryInverterImpl ess = new GoodWeBatteryInverterImpl();
+		var ess = new GoodWeBatteryInverterImpl();
 		ess.addCharger(charger);
 		new ComponentTest(ess) //
 				.addReference("power", new DummyPower()) //
@@ -233,7 +233,7 @@ public void testEmsPowerModeAutoWithSurplus() throws Exception {
 
 	@Test
 	public void testEmsPowerModeAutoWithMaxAcImport() throws Exception {
-		GoodWeBatteryInverterImpl ess = new GoodWeBatteryInverterImpl();
+		var ess = new GoodWeBatteryInverterImpl();
 		new ComponentTest(ess) //
 				.addReference("power", new DummyPower()) //
 				.addReference("cm", new DummyConfigurationAdmin()) //
@@ -263,7 +263,7 @@ public void testEmsPowerModeAutoWithMaxAcImport() throws Exception {
 
 	@Test
 	public void testEmsPowerModeAutoWithMaxAcExport() throws Exception {
-		GoodWeBatteryInverterImpl ess = new GoodWeBatteryInverterImpl();
+		var ess = new GoodWeBatteryInverterImpl();
 		new ComponentTest(ess) //
 				.addReference("power", new DummyPower()) //
 				.addReference("cm", new DummyConfigurationAdmin()) //
@@ -293,7 +293,7 @@ public void testEmsPowerModeAutoWithMaxAcExport() throws Exception {
 
 	@Test
 	public void testBatteryIsFull() throws Exception {
-		GoodWeBatteryInverterImpl ess = new GoodWeBatteryInverterImpl();
+		var ess = new GoodWeBatteryInverterImpl();
 		new ComponentTest(ess) //
 				.addReference("power", new DummyPower()) //
 				.addReference("cm", new DummyConfigurationAdmin()) //
@@ -323,7 +323,7 @@ public void testBatteryIsFull() throws Exception {
 
 	@Test
 	public void testBatteryIsEmpty() throws Exception {
-		GoodWeBatteryInverterImpl ess = new GoodWeBatteryInverterImpl();
+		var ess = new GoodWeBatteryInverterImpl();
 		new ComponentTest(ess) //
 				.addReference("power", new DummyPower()) //
 				.addReference("cm", new DummyConfigurationAdmin()) //
@@ -353,7 +353,7 @@ public void testBatteryIsEmpty() throws Exception {
 
 	@Test
 	public void testAcCalculation() throws Exception {
-		GoodWeBatteryInverterImpl ess = new GoodWeBatteryInverterImpl();
+		var ess = new GoodWeBatteryInverterImpl();
 		new ComponentTest(ess) //
 				.addReference("power", new DummyPower()) //
 				.addReference("cm", new DummyConfigurationAdmin()) //
diff --git a/io.openems.edge.goodwe/test/io/openems/edge/goodwe/batteryinverter/MyConfig.java b/io.openems.edge.goodwe/test/io/openems/edge/goodwe/batteryinverter/MyConfig.java
index c96031c346a..4cc31ff4ae7 100644
--- a/io.openems.edge.goodwe/test/io/openems/edge/goodwe/batteryinverter/MyConfig.java
+++ b/io.openems.edge.goodwe/test/io/openems/edge/goodwe/batteryinverter/MyConfig.java
@@ -83,7 +83,7 @@ public MyConfig build() {
 
 	/**
 	 * Create a Config builder.
-	 * 
+	 *
 	 * @return a {@link Builder}
 	 */
 	public static Builder create() {
diff --git a/io.openems.edge.goodwe/test/io/openems/edge/goodwe/charger/MyConfig.java b/io.openems.edge.goodwe/test/io/openems/edge/goodwe/charger/MyConfig.java
index 7d54857a00d..01d224234ea 100644
--- a/io.openems.edge.goodwe/test/io/openems/edge/goodwe/charger/MyConfig.java
+++ b/io.openems.edge.goodwe/test/io/openems/edge/goodwe/charger/MyConfig.java
@@ -38,7 +38,7 @@ public Builder setModbusUnitId(int modbusUnitId) {
 
 		/**
 		 * Builds the Config.
-		 * 
+		 *
 		 * @return the Config
 		 */
 		public MyConfig build() {
@@ -48,7 +48,7 @@ public MyConfig build() {
 
 	/**
 	 * Create a Config builder.
-	 * 
+	 *
 	 * @return a {@link Builder}
 	 */
 	public static Builder create() {
diff --git a/io.openems.edge.goodwe/test/io/openems/edge/goodwe/emergencypowermeter/MyConfig.java b/io.openems.edge.goodwe/test/io/openems/edge/goodwe/emergencypowermeter/MyConfig.java
index b748d0f63ee..e885252a2c5 100644
--- a/io.openems.edge.goodwe/test/io/openems/edge/goodwe/emergencypowermeter/MyConfig.java
+++ b/io.openems.edge.goodwe/test/io/openems/edge/goodwe/emergencypowermeter/MyConfig.java
@@ -37,7 +37,7 @@ protected MyConfig build() {
 
 	/**
 	 * Create a Config builder.
-	 * 
+	 *
 	 * @return a {@link Builder}
 	 */
 	public static Builder create() {
diff --git a/io.openems.edge.goodwe/test/io/openems/edge/goodwe/ess/GoodWeEssImplTest.java b/io.openems.edge.goodwe/test/io/openems/edge/goodwe/ess/GoodWeEssImplTest.java
index 546144f4454..377c5278fb7 100644
--- a/io.openems.edge.goodwe/test/io/openems/edge/goodwe/ess/GoodWeEssImplTest.java
+++ b/io.openems.edge.goodwe/test/io/openems/edge/goodwe/ess/GoodWeEssImplTest.java
@@ -19,7 +19,7 @@ public class GoodWeEssImplTest {
 
 	@Test
 	public void testEt() throws Exception {
-		GoodWeEtCharger1 charger = new GoodWeEtCharger1();
+		var charger = new GoodWeEtCharger1();
 		new ComponentTest(charger) //
 				.addReference("cm", new DummyConfigurationAdmin()) //
 				.addReference("setModbus", new DummyModbusBridge(MODBUS_ID)) //
@@ -30,7 +30,7 @@ public void testEt() throws Exception {
 						.setModbusUnitId(GoodWeConstants.DEFAULT_UNIT_ID) //
 						.build());
 
-		GoodWeEssImpl ess = new GoodWeEssImpl();
+		var ess = new GoodWeEssImpl();
 		ess.addCharger(charger);
 		new ManagedSymmetricEssTest(ess) //
 				.addReference("power", new DummyPower()) //
@@ -43,14 +43,14 @@ public void testEt() throws Exception {
 						.setModbusUnitId(GoodWeConstants.DEFAULT_UNIT_ID) //
 						.setCapacity(9_000) //
 						.setMaxBatteryPower(5_200) //
-						.setControlMode(ControlMode.SMART)
+						.setControlMode(ControlMode.SMART) //
 						.build()) //
 		;
 	}
 
 	@Test
 	public void testBt() throws Exception {
-		GoodWeEssImpl ess = new GoodWeEssImpl();
+		var ess = new GoodWeEssImpl();
 		new ManagedSymmetricEssTest(ess) //
 				.addReference("power", new DummyPower()) //
 				.addReference("cm", new DummyConfigurationAdmin()) //
@@ -61,7 +61,7 @@ public void testBt() throws Exception {
 						.setModbusUnitId(GoodWeConstants.DEFAULT_UNIT_ID) //
 						.setCapacity(9_000) //
 						.setMaxBatteryPower(5_200) //
-						.setControlMode(ControlMode.SMART)
+						.setControlMode(ControlMode.SMART) //
 						.build()) //
 		;
 	}
diff --git a/io.openems.edge.goodwe/test/io/openems/edge/goodwe/ess/MyConfig.java b/io.openems.edge.goodwe/test/io/openems/edge/goodwe/ess/MyConfig.java
index 431827514e5..baa3e00d369 100644
--- a/io.openems.edge.goodwe/test/io/openems/edge/goodwe/ess/MyConfig.java
+++ b/io.openems.edge.goodwe/test/io/openems/edge/goodwe/ess/MyConfig.java
@@ -3,7 +3,6 @@
 import io.openems.common.utils.ConfigUtils;
 import io.openems.edge.common.test.AbstractComponentConfig;
 import io.openems.edge.goodwe.common.enums.ControlMode;
-import io.openems.edge.goodwe.ess.MyConfig.Builder;
 
 @SuppressWarnings("all")
 public class MyConfig extends AbstractComponentConfig implements Config {
@@ -57,7 +56,7 @@ public MyConfig build() {
 
 	/**
 	 * Create a Config builder.
-	 * 
+	 *
 	 * @return a {@link Builder}
 	 */
 	public static Builder create() {
diff --git a/io.openems.edge.goodwe/test/io/openems/edge/goodwe/gridmeter/MyConfig.java b/io.openems.edge.goodwe/test/io/openems/edge/goodwe/gridmeter/MyConfig.java
index d0c920e9023..e21d7dcc4bd 100644
--- a/io.openems.edge.goodwe/test/io/openems/edge/goodwe/gridmeter/MyConfig.java
+++ b/io.openems.edge.goodwe/test/io/openems/edge/goodwe/gridmeter/MyConfig.java
@@ -37,7 +37,7 @@ protected MyConfig build() {
 
 	/**
 	 * Create a Config builder.
-	 * 
+	 *
 	 * @return a {@link Builder}
 	 */
 	public static Builder create() {

From 40e7e64569316ad8776657da048f199ba34fe075 Mon Sep 17 00:00:00 2001
From: Stefan Feilmeier <stefan.feilmeier@fenecon.de>
Date: Tue, 8 Mar 2022 14:54:32 +0100
Subject: [PATCH 75/96] Update io.openems.edge.io.api

---
 .../src/io/openems/edge/io/api/DigitalInput.java               | 1 +
 .../src/io/openems/edge/io/api/DigitalOutput.java              | 3 ++-
 .../src/io/openems/edge/io/test/DummyInputOutput.java          | 1 +
 3 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/io.openems.edge.io.api/src/io/openems/edge/io/api/DigitalInput.java b/io.openems.edge.io.api/src/io/openems/edge/io/api/DigitalInput.java
index 66ac9ad6899..01b3b376f4a 100644
--- a/io.openems.edge.io.api/src/io/openems/edge/io/api/DigitalInput.java
+++ b/io.openems.edge.io.api/src/io/openems/edge/io/api/DigitalInput.java
@@ -17,6 +17,7 @@ private ChannelId(Doc doc) {
 			this.doc = doc;
 		}
 
+		@Override
 		public Doc doc() {
 			return this.doc;
 		}
diff --git a/io.openems.edge.io.api/src/io/openems/edge/io/api/DigitalOutput.java b/io.openems.edge.io.api/src/io/openems/edge/io/api/DigitalOutput.java
index 0341804982f..f1ae8ca98a7 100644
--- a/io.openems.edge.io.api/src/io/openems/edge/io/api/DigitalOutput.java
+++ b/io.openems.edge.io.api/src/io/openems/edge/io/api/DigitalOutput.java
@@ -17,6 +17,7 @@ private ChannelId(Doc doc) {
 			this.doc = doc;
 		}
 
+		@Override
 		public Doc doc() {
 			return this.doc;
 		}
@@ -24,7 +25,7 @@ public Doc doc() {
 
 	/**
 	 * Gets all Output Channels.
-	 * 
+	 *
 	 * @return an array of Channels
 	 */
 	public BooleanWriteChannel[] digitalOutputChannels();
diff --git a/io.openems.edge.io.api/src/io/openems/edge/io/test/DummyInputOutput.java b/io.openems.edge.io.api/src/io/openems/edge/io/test/DummyInputOutput.java
index 3148da58d36..8a349f3b343 100644
--- a/io.openems.edge.io.api/src/io/openems/edge/io/test/DummyInputOutput.java
+++ b/io.openems.edge.io.api/src/io/openems/edge/io/test/DummyInputOutput.java
@@ -47,6 +47,7 @@ private ChannelId(Doc doc) {
 			this.doc = doc;
 		}
 
+		@Override
 		public Doc doc() {
 			return this.doc;
 		}

From 9a7767f652e849f7b5a19834abbe1d9f5903fc22 Mon Sep 17 00:00:00 2001
From: Stefan Feilmeier <stefan.feilmeier@fenecon.de>
Date: Tue, 8 Mar 2022 14:59:26 +0100
Subject: [PATCH 76/96] Update io.openems.edge.io.*

---
 .../io/kmtronic/AbstractKmtronicRelay.java    |  10 +-
 .../io/kmtronic/eight/KmtronicRelay8Port.java |  33 +++---
 .../eight/KmtronicRelay8PortImpl.java         |  35 +++---
 .../io/kmtronic/four/KmtronicRelay4Port.java  |  17 +--
 .../kmtronic/four/KmtronicRelay4PortImpl.java |  19 +--
 .../edge/io/kmtronic/eight/MyConfig.java      |   3 +-
 .../edge/io/kmtronic/four/MyConfig.java       |   2 +-
 .../edge/iooffgridswitch/IoOffGridSwitch.java |   5 +-
 .../iooffgridswitch/IoOffGridSwitchTest.java  |   2 +-
 .../edge/iooffgridswitch/MyConfig.java        |   2 +-
 .../src/io/openems/edge/io/revpi/Config.java  |   2 +-
 .../edge/io/revpi/RevPiDigitalIoDevice.java   |  27 ++---
 .../edge/io/revpi/RevPiDioChannelId.java      |  85 +++++++-------
 .../edge/io/shelly/common/ShellyApi.java      |  30 +++--
 .../edge/io/shelly/shelly25/Shelly25.java     |  21 ++--
 .../edge/io/shelly/shelly25/Shelly25Impl.java |  23 ++--
 .../edge/io/shelly/shellyplug/ShellyPlug.java |  25 ++--
 .../io/shelly/shellyplug/ShellyPlugImpl.java  |  23 ++--
 .../io/openems/edge/wago/Fieldbus4xxDI.java   |  15 ++-
 .../openems/edge/wago/Fieldbus523RO1Ch.java   |   8 +-
 .../io/openems/edge/wago/Fieldbus5xxDO.java   |  13 +--
 .../io/openems/edge/wago/FieldbusModule.java  |  10 +-
 .../edge/wago/FieldbusModuleFactory.java      |   4 +-
 .../src/io/openems/edge/wago/Wago.java        | 108 ++++++++----------
 .../test/io/openems/edge/wago/MyConfig.java   |   6 +-
 .../test/io/openems/edge/wago/WagoTest.java   |  12 +-
 26 files changed, 264 insertions(+), 276 deletions(-)

diff --git a/io.openems.edge.io.kmtronic/src/io/openems/edge/io/kmtronic/AbstractKmtronicRelay.java b/io.openems.edge.io.kmtronic/src/io/openems/edge/io/kmtronic/AbstractKmtronicRelay.java
index 3e719ae0131..a19a6b27558 100644
--- a/io.openems.edge.io.kmtronic/src/io/openems/edge/io/kmtronic/AbstractKmtronicRelay.java
+++ b/io.openems.edge.io.kmtronic/src/io/openems/edge/io/kmtronic/AbstractKmtronicRelay.java
@@ -1,6 +1,5 @@
 package io.openems.edge.io.kmtronic;
 
-import java.util.Optional;
 import java.util.stream.Stream;
 
 import org.osgi.service.cm.ConfigurationAdmin;
@@ -25,6 +24,7 @@ public abstract class AbstractKmtronicRelay extends AbstractOpenemsModbusCompone
 	@Reference
 	protected ConfigurationAdmin cm;
 
+	@Override
 	@Reference(policy = ReferencePolicy.STATIC, policyOption = ReferencePolicyOption.GREEDY, cardinality = ReferenceCardinality.MANDATORY)
 	protected void setModbus(BridgeModbus modbus) {
 		super.setModbus(modbus);
@@ -41,7 +41,7 @@ protected AbstractKmtronicRelay(io.openems.edge.common.channel.ChannelId[] kmtro
 		);
 		this.digitalOutputChannels = Stream.of(kmtronicChannelIds) //
 				.filter(channelId -> channelId.doc().getAccessMode() == AccessMode.READ_WRITE) //
-				.map(channelId -> this.channel(channelId)) //
+				.map(this::channel) //
 				.toArray(BooleanWriteChannel[]::new);
 	}
 
@@ -52,11 +52,11 @@ public BooleanWriteChannel[] digitalOutputChannels() {
 
 	@Override
 	public String debugLog() {
-		StringBuilder b = new StringBuilder();
-		int i = 1;
+		var b = new StringBuilder();
+		var i = 1;
 		for (WriteChannel<Boolean> channel : this.digitalOutputChannels) {
 			String valueText;
-			Optional<Boolean> valueOpt = channel.value().asOptional();
+			var valueOpt = channel.value().asOptional();
 			if (valueOpt.isPresent()) {
 				valueText = valueOpt.get() ? "x" : "-";
 			} else {
diff --git a/io.openems.edge.io.kmtronic/src/io/openems/edge/io/kmtronic/eight/KmtronicRelay8Port.java b/io.openems.edge.io.kmtronic/src/io/openems/edge/io/kmtronic/eight/KmtronicRelay8Port.java
index ab8efdbe963..d142f492c15 100644
--- a/io.openems.edge.io.kmtronic/src/io/openems/edge/io/kmtronic/eight/KmtronicRelay8Port.java
+++ b/io.openems.edge.io.kmtronic/src/io/openems/edge/io/kmtronic/eight/KmtronicRelay8Port.java
@@ -15,7 +15,7 @@ public interface KmtronicRelay8Port extends DigitalOutput, OpenemsComponent, Mod
 	public enum ChannelId implements io.openems.edge.common.channel.ChannelId {
 		/**
 		 * Holds writes to Relay Output 1 for debugging
-		 * 
+		 *
 		 * <ul>
 		 * <li>Interface: KmtronicRelayOutput
 		 * <li>Type: Boolean
@@ -25,7 +25,7 @@ public enum ChannelId implements io.openems.edge.common.channel.ChannelId {
 		DEBUG_RELAY_1(Doc.of(OpenemsType.BOOLEAN)), //
 		/**
 		 * Relay Output 1
-		 * 
+		 *
 		 * <ul>
 		 * <li>Interface: KmtronicRelayOutput
 		 * <li>Type: Boolean
@@ -38,7 +38,7 @@ public enum ChannelId implements io.openems.edge.common.channel.ChannelId {
 				.onInit(new BooleanWriteChannel.MirrorToDebugChannel(ChannelId.DEBUG_RELAY_1))), //
 		/**
 		 * Holds writes to Relay Output 2 for debugging
-		 * 
+		 *
 		 * <ul>
 		 * <li>Interface: KmtronicRelayOutput
 		 * <li>Type: Boolean
@@ -49,7 +49,7 @@ public enum ChannelId implements io.openems.edge.common.channel.ChannelId {
 				.persistencePriority(PersistencePriority.MEDIUM)), //
 		/**
 		 * Relay Output 2
-		 * 
+		 *
 		 * <ul>
 		 * <li>Interface: KmtronicRelayOutput
 		 * <li>Type: Boolean
@@ -62,7 +62,7 @@ public enum ChannelId implements io.openems.edge.common.channel.ChannelId {
 				.onInit(new BooleanWriteChannel.MirrorToDebugChannel(ChannelId.DEBUG_RELAY_2))), //
 		/**
 		 * Holds writes to Relay Output 3 for debugging
-		 * 
+		 *
 		 * <ul>
 		 * <li>Interface: KmtronicRelayOutput
 		 * <li>Type: Boolean
@@ -73,7 +73,7 @@ public enum ChannelId implements io.openems.edge.common.channel.ChannelId {
 				.persistencePriority(PersistencePriority.MEDIUM)), //
 		/**
 		 * Relay Output 3
-		 * 
+		 *
 		 * <ul>
 		 * <li>Interface: KmtronicRelayOutput
 		 * <li>Type: Boolean
@@ -86,7 +86,7 @@ public enum ChannelId implements io.openems.edge.common.channel.ChannelId {
 				.onInit(new BooleanWriteChannel.MirrorToDebugChannel(ChannelId.DEBUG_RELAY_3))), //
 		/**
 		 * Holds writes to Relay Output 4 for debugging
-		 * 
+		 *
 		 * <ul>
 		 * <li>Interface: KmtronicRelayOutput
 		 * <li>Type: Boolean
@@ -97,7 +97,7 @@ public enum ChannelId implements io.openems.edge.common.channel.ChannelId {
 				.persistencePriority(PersistencePriority.MEDIUM)), //
 		/**
 		 * Relay Output 4
-		 * 
+		 *
 		 * <ul>
 		 * <li>Interface: KmtronicRelayOutput
 		 * <li>Type: Boolean
@@ -110,7 +110,7 @@ public enum ChannelId implements io.openems.edge.common.channel.ChannelId {
 				.onInit(new BooleanWriteChannel.MirrorToDebugChannel(ChannelId.DEBUG_RELAY_4))), //
 		/**
 		 * Holds writes to Relay Output 5 for debugging
-		 * 
+		 *
 		 * <ul>
 		 * <li>Interface: KmtronicRelayOutput
 		 * <li>Type: Boolean
@@ -121,7 +121,7 @@ public enum ChannelId implements io.openems.edge.common.channel.ChannelId {
 				.persistencePriority(PersistencePriority.MEDIUM)), //
 		/**
 		 * Relay Output 5
-		 * 
+		 *
 		 * <ul>
 		 * <li>Interface: KmtronicRelayOutput
 		 * <li>Type: Boolean
@@ -134,7 +134,7 @@ public enum ChannelId implements io.openems.edge.common.channel.ChannelId {
 				.onInit(new BooleanWriteChannel.MirrorToDebugChannel(ChannelId.DEBUG_RELAY_5))), //
 		/**
 		 * Holds writes to Relay Output 6 for debugging
-		 * 
+		 *
 		 * <ul>
 		 * <li>Interface: KmtronicRelayOutput
 		 * <li>Type: Boolean
@@ -145,7 +145,7 @@ public enum ChannelId implements io.openems.edge.common.channel.ChannelId {
 				.persistencePriority(PersistencePriority.MEDIUM)), //
 		/**
 		 * Relay Output 6
-		 * 
+		 *
 		 * <ul>
 		 * <li>Interface: KmtronicRelayOutput
 		 * <li>Type: Boolean
@@ -158,7 +158,7 @@ public enum ChannelId implements io.openems.edge.common.channel.ChannelId {
 				.onInit(new BooleanWriteChannel.MirrorToDebugChannel(ChannelId.DEBUG_RELAY_6))), //
 		/**
 		 * Holds writes to Relay Output 7 for debugging
-		 * 
+		 *
 		 * <ul>
 		 * <li>Interface: KmtronicRelayOutput
 		 * <li>Type: Boolean
@@ -169,7 +169,7 @@ public enum ChannelId implements io.openems.edge.common.channel.ChannelId {
 				.persistencePriority(PersistencePriority.MEDIUM)), //
 		/**
 		 * Relay Output 7
-		 * 
+		 *
 		 * <ul>
 		 * <li>Interface: KmtronicRelayOutput
 		 * <li>Type: Boolean
@@ -182,7 +182,7 @@ public enum ChannelId implements io.openems.edge.common.channel.ChannelId {
 				.onInit(new BooleanWriteChannel.MirrorToDebugChannel(ChannelId.DEBUG_RELAY_7))), //
 		/**
 		 * Holds writes to Relay Output 8 for debugging
-		 * 
+		 *
 		 * <ul>
 		 * <li>Interface: KmtronicRelayOutput
 		 * <li>Type: Boolean
@@ -193,7 +193,7 @@ public enum ChannelId implements io.openems.edge.common.channel.ChannelId {
 				.persistencePriority(PersistencePriority.MEDIUM)), //
 		/**
 		 * Relay Output 8
-		 * 
+		 *
 		 * <ul>
 		 * <li>Interface: KmtronicRelayOutput
 		 * <li>Type: Boolean
@@ -211,6 +211,7 @@ private ChannelId(Doc doc) {
 			this.doc = doc;
 		}
 
+		@Override
 		public Doc doc() {
 			return this.doc;
 		}
diff --git a/io.openems.edge.io.kmtronic/src/io/openems/edge/io/kmtronic/eight/KmtronicRelay8PortImpl.java b/io.openems.edge.io.kmtronic/src/io/openems/edge/io/kmtronic/eight/KmtronicRelay8PortImpl.java
index 2cc23883856..2f6d32c793d 100644
--- a/io.openems.edge.io.kmtronic/src/io/openems/edge/io/kmtronic/eight/KmtronicRelay8PortImpl.java
+++ b/io.openems.edge.io.kmtronic/src/io/openems/edge/io/kmtronic/eight/KmtronicRelay8PortImpl.java
@@ -41,6 +41,7 @@ public class KmtronicRelay8PortImpl extends AbstractKmtronicRelay
 	@Reference
 	protected ConfigurationAdmin cm;
 
+	@Override
 	@Reference(policy = ReferencePolicy.STATIC, policyOption = ReferencePolicyOption.GREEDY, cardinality = ReferenceCardinality.MANDATORY)
 	protected void setModbus(BridgeModbus modbus) {
 		super.setModbus(modbus);
@@ -54,10 +55,10 @@ public KmtronicRelay8PortImpl() {
 	void activate(ComponentContext context, Config config) throws OpenemsException {
 		if (super.activate(context, config.id(), config.alias(), config.enabled(), config.modbusUnitId(), this.cm,
 				"Modbus", config.modbus_id())) {
-			return;
 		}
 	}
 
+	@Override
 	@Deactivate
 	protected void deactivate() {
 		super.deactivate();
@@ -70,26 +71,26 @@ protected ModbusProtocol defineModbusProtocol() throws OpenemsException {
 				 * For Read: Read Coils
 				 */
 				new FC1ReadCoilsTask(0, Priority.LOW, //
-						m(KmtronicRelay8Port.ChannelId.RELAY_1, new CoilElement(0)), //
-						m(KmtronicRelay8Port.ChannelId.RELAY_2, new CoilElement(1)), //
-						m(KmtronicRelay8Port.ChannelId.RELAY_3, new CoilElement(2)), //
-						m(KmtronicRelay8Port.ChannelId.RELAY_4, new CoilElement(3)), //
-						m(KmtronicRelay8Port.ChannelId.RELAY_5, new CoilElement(4)), //
-						m(KmtronicRelay8Port.ChannelId.RELAY_6, new CoilElement(5)), //
-						m(KmtronicRelay8Port.ChannelId.RELAY_7, new CoilElement(6)), //
-						m(KmtronicRelay8Port.ChannelId.RELAY_8, new CoilElement(7)) //
+						this.m(KmtronicRelay8Port.ChannelId.RELAY_1, new CoilElement(0)), //
+						this.m(KmtronicRelay8Port.ChannelId.RELAY_2, new CoilElement(1)), //
+						this.m(KmtronicRelay8Port.ChannelId.RELAY_3, new CoilElement(2)), //
+						this.m(KmtronicRelay8Port.ChannelId.RELAY_4, new CoilElement(3)), //
+						this.m(KmtronicRelay8Port.ChannelId.RELAY_5, new CoilElement(4)), //
+						this.m(KmtronicRelay8Port.ChannelId.RELAY_6, new CoilElement(5)), //
+						this.m(KmtronicRelay8Port.ChannelId.RELAY_7, new CoilElement(6)), //
+						this.m(KmtronicRelay8Port.ChannelId.RELAY_8, new CoilElement(7)) //
 				),
 				/*
 				 * For Write: Write Single Coil
 				 */
-				new FC5WriteCoilTask(0, m(KmtronicRelay8Port.ChannelId.RELAY_1, new CoilElement(0))), //
-				new FC5WriteCoilTask(1, m(KmtronicRelay8Port.ChannelId.RELAY_2, new CoilElement(1))), //
-				new FC5WriteCoilTask(2, m(KmtronicRelay8Port.ChannelId.RELAY_3, new CoilElement(2))), //
-				new FC5WriteCoilTask(3, m(KmtronicRelay8Port.ChannelId.RELAY_4, new CoilElement(3))), //
-				new FC5WriteCoilTask(4, m(KmtronicRelay8Port.ChannelId.RELAY_5, new CoilElement(4))), //
-				new FC5WriteCoilTask(5, m(KmtronicRelay8Port.ChannelId.RELAY_6, new CoilElement(5))), //
-				new FC5WriteCoilTask(6, m(KmtronicRelay8Port.ChannelId.RELAY_7, new CoilElement(6))), //
-				new FC5WriteCoilTask(7, m(KmtronicRelay8Port.ChannelId.RELAY_8, new CoilElement(7))) //
+				new FC5WriteCoilTask(0, this.m(KmtronicRelay8Port.ChannelId.RELAY_1, new CoilElement(0))), //
+				new FC5WriteCoilTask(1, this.m(KmtronicRelay8Port.ChannelId.RELAY_2, new CoilElement(1))), //
+				new FC5WriteCoilTask(2, this.m(KmtronicRelay8Port.ChannelId.RELAY_3, new CoilElement(2))), //
+				new FC5WriteCoilTask(3, this.m(KmtronicRelay8Port.ChannelId.RELAY_4, new CoilElement(3))), //
+				new FC5WriteCoilTask(4, this.m(KmtronicRelay8Port.ChannelId.RELAY_5, new CoilElement(4))), //
+				new FC5WriteCoilTask(5, this.m(KmtronicRelay8Port.ChannelId.RELAY_6, new CoilElement(5))), //
+				new FC5WriteCoilTask(6, this.m(KmtronicRelay8Port.ChannelId.RELAY_7, new CoilElement(6))), //
+				new FC5WriteCoilTask(7, this.m(KmtronicRelay8Port.ChannelId.RELAY_8, new CoilElement(7))) //
 		);
 	}
 
diff --git a/io.openems.edge.io.kmtronic/src/io/openems/edge/io/kmtronic/four/KmtronicRelay4Port.java b/io.openems.edge.io.kmtronic/src/io/openems/edge/io/kmtronic/four/KmtronicRelay4Port.java
index ef205dcf5be..0ce4b900df0 100644
--- a/io.openems.edge.io.kmtronic/src/io/openems/edge/io/kmtronic/four/KmtronicRelay4Port.java
+++ b/io.openems.edge.io.kmtronic/src/io/openems/edge/io/kmtronic/four/KmtronicRelay4Port.java
@@ -15,7 +15,7 @@ public interface KmtronicRelay4Port extends DigitalOutput, OpenemsComponent, Mod
 	public enum ChannelId implements io.openems.edge.common.channel.ChannelId {
 		/**
 		 * Holds writes to Relay Output 1 for debugging
-		 * 
+		 *
 		 * <ul>
 		 * <li>Interface: KmtronicRelayOutput
 		 * <li>Type: Boolean
@@ -25,7 +25,7 @@ public enum ChannelId implements io.openems.edge.common.channel.ChannelId {
 		DEBUG_RELAY_1(Doc.of(OpenemsType.BOOLEAN)), //
 		/**
 		 * Relay Output 1
-		 * 
+		 *
 		 * <ul>
 		 * <li>Interface: KmtronicRelayOutput
 		 * <li>Type: Boolean
@@ -38,7 +38,7 @@ public enum ChannelId implements io.openems.edge.common.channel.ChannelId {
 				.onInit(new BooleanWriteChannel.MirrorToDebugChannel(ChannelId.DEBUG_RELAY_1))), //
 		/**
 		 * Holds writes to Relay Output 2 for debugging
-		 * 
+		 *
 		 * <ul>
 		 * <li>Interface: KmtronicRelayOutput
 		 * <li>Type: Boolean
@@ -49,7 +49,7 @@ public enum ChannelId implements io.openems.edge.common.channel.ChannelId {
 				.persistencePriority(PersistencePriority.MEDIUM)), //
 		/**
 		 * Relay Output 2
-		 * 
+		 *
 		 * <ul>
 		 * <li>Interface: KmtronicRelayOutput
 		 * <li>Type: Boolean
@@ -62,7 +62,7 @@ public enum ChannelId implements io.openems.edge.common.channel.ChannelId {
 				.onInit(new BooleanWriteChannel.MirrorToDebugChannel(ChannelId.DEBUG_RELAY_2))), //
 		/**
 		 * Holds writes to Relay Output 3 for debugging
-		 * 
+		 *
 		 * <ul>
 		 * <li>Interface: KmtronicRelayOutput
 		 * <li>Type: Boolean
@@ -73,7 +73,7 @@ public enum ChannelId implements io.openems.edge.common.channel.ChannelId {
 				.persistencePriority(PersistencePriority.MEDIUM)), //
 		/**
 		 * Relay Output 3
-		 * 
+		 *
 		 * <ul>
 		 * <li>Interface: KmtronicRelayOutput
 		 * <li>Type: Boolean
@@ -86,7 +86,7 @@ public enum ChannelId implements io.openems.edge.common.channel.ChannelId {
 				.onInit(new BooleanWriteChannel.MirrorToDebugChannel(ChannelId.DEBUG_RELAY_3))), //
 		/**
 		 * Holds writes to Relay Output 4 for debugging
-		 * 
+		 *
 		 * <ul>
 		 * <li>Interface: KmtronicRelayOutput
 		 * <li>Type: Boolean
@@ -97,7 +97,7 @@ public enum ChannelId implements io.openems.edge.common.channel.ChannelId {
 				.persistencePriority(PersistencePriority.MEDIUM)), //
 		/**
 		 * Relay Output 4
-		 * 
+		 *
 		 * <ul>
 		 * <li>Interface: KmtronicRelayOutput
 		 * <li>Type: Boolean
@@ -115,6 +115,7 @@ private ChannelId(Doc doc) {
 			this.doc = doc;
 		}
 
+		@Override
 		public Doc doc() {
 			return this.doc;
 		}
diff --git a/io.openems.edge.io.kmtronic/src/io/openems/edge/io/kmtronic/four/KmtronicRelay4PortImpl.java b/io.openems.edge.io.kmtronic/src/io/openems/edge/io/kmtronic/four/KmtronicRelay4PortImpl.java
index 7c51772dabb..54890102096 100644
--- a/io.openems.edge.io.kmtronic/src/io/openems/edge/io/kmtronic/four/KmtronicRelay4PortImpl.java
+++ b/io.openems.edge.io.kmtronic/src/io/openems/edge/io/kmtronic/four/KmtronicRelay4PortImpl.java
@@ -41,6 +41,7 @@ public class KmtronicRelay4PortImpl extends AbstractKmtronicRelay
 	@Reference
 	protected ConfigurationAdmin cm;
 
+	@Override
 	@Reference(policy = ReferencePolicy.STATIC, policyOption = ReferencePolicyOption.GREEDY, cardinality = ReferenceCardinality.MANDATORY)
 	protected void setModbus(BridgeModbus modbus) {
 		super.setModbus(modbus);
@@ -54,10 +55,10 @@ public KmtronicRelay4PortImpl() {
 	void activate(ComponentContext context, Config config) throws OpenemsException {
 		if (super.activate(context, config.id(), config.alias(), config.enabled(), config.modbusUnitId(), this.cm,
 				"Modbus", config.modbus_id())) {
-			return;
 		}
 	}
 
+	@Override
 	@Deactivate
 	protected void deactivate() {
 		super.deactivate();
@@ -70,18 +71,18 @@ protected ModbusProtocol defineModbusProtocol() throws OpenemsException {
 				 * For Read: Read Coils
 				 */
 				new FC1ReadCoilsTask(0, Priority.LOW, //
-						m(KmtronicRelay4Port.ChannelId.RELAY_1, new CoilElement(0)), //
-						m(KmtronicRelay4Port.ChannelId.RELAY_2, new CoilElement(1)), //
-						m(KmtronicRelay4Port.ChannelId.RELAY_3, new CoilElement(2)), //
-						m(KmtronicRelay4Port.ChannelId.RELAY_4, new CoilElement(3)) //
+						this.m(KmtronicRelay4Port.ChannelId.RELAY_1, new CoilElement(0)), //
+						this.m(KmtronicRelay4Port.ChannelId.RELAY_2, new CoilElement(1)), //
+						this.m(KmtronicRelay4Port.ChannelId.RELAY_3, new CoilElement(2)), //
+						this.m(KmtronicRelay4Port.ChannelId.RELAY_4, new CoilElement(3)) //
 				),
 				/*
 				 * For Write: Write Single Coil
 				 */
-				new FC5WriteCoilTask(0, m(KmtronicRelay4Port.ChannelId.RELAY_1, new CoilElement(0))), //
-				new FC5WriteCoilTask(1, m(KmtronicRelay4Port.ChannelId.RELAY_2, new CoilElement(1))), //
-				new FC5WriteCoilTask(2, m(KmtronicRelay4Port.ChannelId.RELAY_3, new CoilElement(2))), //
-				new FC5WriteCoilTask(3, m(KmtronicRelay4Port.ChannelId.RELAY_4, new CoilElement(3))) //
+				new FC5WriteCoilTask(0, this.m(KmtronicRelay4Port.ChannelId.RELAY_1, new CoilElement(0))), //
+				new FC5WriteCoilTask(1, this.m(KmtronicRelay4Port.ChannelId.RELAY_2, new CoilElement(1))), //
+				new FC5WriteCoilTask(2, this.m(KmtronicRelay4Port.ChannelId.RELAY_3, new CoilElement(2))), //
+				new FC5WriteCoilTask(3, this.m(KmtronicRelay4Port.ChannelId.RELAY_4, new CoilElement(3))) //
 		);
 	}
 
diff --git a/io.openems.edge.io.kmtronic/test/io/openems/edge/io/kmtronic/eight/MyConfig.java b/io.openems.edge.io.kmtronic/test/io/openems/edge/io/kmtronic/eight/MyConfig.java
index 61ca9092c2c..2c02475df51 100644
--- a/io.openems.edge.io.kmtronic/test/io/openems/edge/io/kmtronic/eight/MyConfig.java
+++ b/io.openems.edge.io.kmtronic/test/io/openems/edge/io/kmtronic/eight/MyConfig.java
@@ -2,7 +2,6 @@
 
 import io.openems.common.utils.ConfigUtils;
 import io.openems.edge.common.test.AbstractComponentConfig;
-import io.openems.edge.io.kmtronic.eight.Config;
 
 @SuppressWarnings("all")
 public class MyConfig extends AbstractComponentConfig implements Config {
@@ -32,7 +31,7 @@ public MyConfig build() {
 
 	/**
 	 * Create a Config builder.
-	 * 
+	 *
 	 * @return a {@link Builder}
 	 */
 	public static Builder create() {
diff --git a/io.openems.edge.io.kmtronic/test/io/openems/edge/io/kmtronic/four/MyConfig.java b/io.openems.edge.io.kmtronic/test/io/openems/edge/io/kmtronic/four/MyConfig.java
index 4d95e0cceb9..4ccc1a4a17a 100644
--- a/io.openems.edge.io.kmtronic/test/io/openems/edge/io/kmtronic/four/MyConfig.java
+++ b/io.openems.edge.io.kmtronic/test/io/openems/edge/io/kmtronic/four/MyConfig.java
@@ -31,7 +31,7 @@ public MyConfig build() {
 
 	/**
 	 * Create a Config builder.
-	 * 
+	 *
 	 * @return a {@link Builder}
 	 */
 	public static Builder create() {
diff --git a/io.openems.edge.io.offgridswitch/src/io/openems/edge/iooffgridswitch/IoOffGridSwitch.java b/io.openems.edge.io.offgridswitch/src/io/openems/edge/iooffgridswitch/IoOffGridSwitch.java
index 0dc157a6fd1..440ce6fe68f 100644
--- a/io.openems.edge.io.offgridswitch/src/io/openems/edge/iooffgridswitch/IoOffGridSwitch.java
+++ b/io.openems.edge.io.offgridswitch/src/io/openems/edge/iooffgridswitch/IoOffGridSwitch.java
@@ -63,6 +63,7 @@ void activate(ComponentContext context, Config config) throws OpenemsNamedExcept
 		this.outputGroundingContactorChannelAddr = ChannelAddress.fromString(config.outputGroundingContactor());
 	}
 
+	@Override
 	@Deactivate
 	protected void deactivate() {
 		super.deactivate();
@@ -86,7 +87,7 @@ public void handleEvent(Event event) {
 	private void handleInput() {
 		this._setMainContactor(this.getInputChannel(this.inputMainContactorChannelAddr));
 
-		Boolean inputGridStatus = this.getInputChannel(this.inputGridStatusChannelAddr);
+		var inputGridStatus = this.getInputChannel(this.inputGridStatusChannelAddr);
 		if (inputGridStatus == null) {
 			this._setGridMode(GridMode.UNDEFINED);
 		} else if (inputGridStatus) {
@@ -100,7 +101,7 @@ private void handleInput() {
 
 	/**
 	 * Read a Digital Input.
-	 * 
+	 *
 	 * @param channelAddress the {@link ChannelAddress}
 	 * @return true, false or null
 	 */
diff --git a/io.openems.edge.io.offgridswitch/test/io/openems/edge/iooffgridswitch/IoOffGridSwitchTest.java b/io.openems.edge.io.offgridswitch/test/io/openems/edge/iooffgridswitch/IoOffGridSwitchTest.java
index 2cc6903ff5b..0b0d6b0cb0a 100644
--- a/io.openems.edge.io.offgridswitch/test/io/openems/edge/iooffgridswitch/IoOffGridSwitchTest.java
+++ b/io.openems.edge.io.offgridswitch/test/io/openems/edge/iooffgridswitch/IoOffGridSwitchTest.java
@@ -21,7 +21,7 @@ public class IoOffGridSwitchTest {
 
 	@Test
 	public void test() throws Exception {
-		DummyInputOutput io0 = new DummyInputOutput(IO_ID);
+		var io0 = new DummyInputOutput(IO_ID);
 
 		new ComponentTest(new IoOffGridSwitch()) //
 				.addReference("componentManager", new DummyComponentManager()) //
diff --git a/io.openems.edge.io.offgridswitch/test/io/openems/edge/iooffgridswitch/MyConfig.java b/io.openems.edge.io.offgridswitch/test/io/openems/edge/iooffgridswitch/MyConfig.java
index bf5787bdd76..26a825fe685 100644
--- a/io.openems.edge.io.offgridswitch/test/io/openems/edge/iooffgridswitch/MyConfig.java
+++ b/io.openems.edge.io.offgridswitch/test/io/openems/edge/iooffgridswitch/MyConfig.java
@@ -53,7 +53,7 @@ public MyConfig build() {
 
 	/**
 	 * Create a Config builder.
-	 * 
+	 *
 	 * @return a {@link Builder}
 	 */
 	public static Builder create() {
diff --git a/io.openems.edge.io.revpi/src/io/openems/edge/io/revpi/Config.java b/io.openems.edge.io.revpi/src/io/openems/edge/io/revpi/Config.java
index 6a4d0bac16a..8f359b36a28 100644
--- a/io.openems.edge.io.revpi/src/io/openems/edge/io/revpi/Config.java
+++ b/io.openems.edge.io.revpi/src/io/openems/edge/io/revpi/Config.java
@@ -16,7 +16,7 @@
 
 	@AttributeDefinition(name = "Is enabled?", description = "Is this Component enabled?")
 	boolean enabled() default true;
-	
+
 	@AttributeDefinition(name = "Read DataOut Initially", description = "Init Outputs with state from hardware initially")
 	boolean initOutputFromHardware() default true;
 
diff --git a/io.openems.edge.io.revpi/src/io/openems/edge/io/revpi/RevPiDigitalIoDevice.java b/io.openems.edge.io.revpi/src/io/openems/edge/io/revpi/RevPiDigitalIoDevice.java
index fe0b8d7e6bc..563db19da72 100644
--- a/io.openems.edge.io.revpi/src/io/openems/edge/io/revpi/RevPiDigitalIoDevice.java
+++ b/io.openems.edge.io.revpi/src/io/openems/edge/io/revpi/RevPiDigitalIoDevice.java
@@ -120,9 +120,9 @@ private void setAllOutput(boolean setOn) {
 	private void readOutputFromHardwareOnce() {
 		// read all digital out pins also, because pins have already been initialized
 		// from outside
-		for (int idx = 0; idx < this.channelOut.length; idx++) {
+		for (var idx = 0; idx < this.channelOut.length; idx++) {
 			try {
-				boolean in = this.revPiHardware.getDataOut(idx + 1);
+				var in = this.revPiHardware.getDataOut(idx + 1);
 				this.channelOut[idx].setNextWriteValue(in);
 			} catch (Exception e) {
 				this.logError(this.log, "Unable to update channel values ex: " + e.getMessage());
@@ -133,9 +133,9 @@ private void readOutputFromHardwareOnce() {
 
 	private void updateDataInChannels() {
 		// read all digital in pins
-		for (int i = 0; i < this.channelIn.length; i++) {
+		for (var i = 0; i < this.channelIn.length; i++) {
 			try {
-				boolean in = getData(i);
+				var in = this.getData(i);
 				Optional<Boolean> inOpt = Optional.ofNullable(in);
 
 				if (this.channelIn[i].value().asOptional().equals(inOpt)) {
@@ -156,10 +156,10 @@ private void updateDataInChannels() {
 	private void updateDataOutChannels() {
 
 		// write new state to digital out pins
-		for (int idx = 0; idx < this.channelOut.length; idx++) {
+		for (var idx = 0; idx < this.channelOut.length; idx++) {
 			try {
-				Optional<Boolean> readValue = this.channelOut[idx].value().asOptional();
-				Optional<Boolean> writeValue = this.channelOut[idx].getNextWriteValueAndReset();
+				var readValue = this.channelOut[idx].value().asOptional();
+				var writeValue = this.channelOut[idx].getNextWriteValueAndReset();
 				if (!writeValue.isPresent()) {
 					// no write value
 					continue;
@@ -195,6 +195,7 @@ void activate(ComponentContext context, Config config) {
 		}
 	}
 
+	@Override
 	@Deactivate
 	protected void deactivate() {
 		this.setAllOutput(false);
@@ -258,13 +259,13 @@ private void appendBool(StringBuilder b, Optional<Boolean> val) {
 
 	@Override
 	public String debugLog() {
-		StringBuilder b = new StringBuilder();
-		int i = 0;
+		var b = new StringBuilder();
+		var i = 0;
 		b.append("IN:");
 		for (BooleanReadChannel channel : this.channelIn) {
-			Optional<Boolean> valueOpt = channel.value().asOptional();
+			var valueOpt = channel.value().asOptional();
 			this.appendBool(b, valueOpt);
-			if ((i++) % 4 == 3) {
+			if (i++ % 4 == 3) {
 				b.append(" ");
 			}
 		}
@@ -274,9 +275,9 @@ public String debugLog() {
 		this.channel(RevPiDioChannelId.DEBUG_OUT1);
 
 		for (BooleanReadChannel channel : this.channelOutDbg) {
-			Optional<Boolean> valueOpt = channel.value().asOptional();
+			var valueOpt = channel.value().asOptional();
 			this.appendBool(b, valueOpt);
-			if ((i++) % 4 == 3) {
+			if (i++ % 4 == 3) {
 				b.append(" ");
 			}
 		}
diff --git a/io.openems.edge.io.revpi/src/io/openems/edge/io/revpi/RevPiDioChannelId.java b/io.openems.edge.io.revpi/src/io/openems/edge/io/revpi/RevPiDioChannelId.java
index 06aabc9956c..b0ab94592ec 100644
--- a/io.openems.edge.io.revpi/src/io/openems/edge/io/revpi/RevPiDioChannelId.java
+++ b/io.openems.edge.io.revpi/src/io/openems/edge/io/revpi/RevPiDioChannelId.java
@@ -12,7 +12,7 @@ public enum RevPiDioChannelId implements ChannelId {
 
 	/**
 	 * Holds writes to ioX/Out1 for debugging.
-	 * 
+	 *
 	 * <ul>
 	 * <li>Interface: KunbusRevPiDataIOModule
 	 * <li>Type: Boolean
@@ -22,7 +22,7 @@ public enum RevPiDioChannelId implements ChannelId {
 	DEBUG_OUT1(Doc.of(OpenemsType.BOOLEAN)), //
 	/**
 	 * ioX/Out1.
-	 * 
+	 *
 	 * <ul>
 	 * <li>Interface: KunbusRevPiDataIOModule
 	 * <li>Type: Boolean
@@ -34,7 +34,7 @@ public enum RevPiDioChannelId implements ChannelId {
 			.onInit(new BooleanWriteChannel.MirrorToDebugChannel(RevPiDioChannelId.DEBUG_OUT1))), //
 	/**
 	 * Holds writes to ioX/Out2 for debugging.
-	 * 
+	 *
 	 * <ul>
 	 * <li>Interface: KunbusRevPiDataIOModule
 	 * <li>Type: Boolean
@@ -44,7 +44,7 @@ public enum RevPiDioChannelId implements ChannelId {
 	DEBUG_OUT2(Doc.of(OpenemsType.BOOLEAN)), //
 	/**
 	 * ioX/Out2.
-	 * 
+	 *
 	 * <ul>
 	 * <li>Interface: KunbusRevPiDataIOModule
 	 * <li>Type: Boolean
@@ -56,7 +56,7 @@ public enum RevPiDioChannelId implements ChannelId {
 			.onInit(new BooleanWriteChannel.MirrorToDebugChannel(RevPiDioChannelId.DEBUG_OUT2))), //
 	/**
 	 * Holds writes to ioX/Out3 for debugging.
-	 * 
+	 *
 	 * <ul>
 	 * <li>Interface: KunbusRevPiDataIOModule
 	 * <li>Type: Boolean
@@ -66,7 +66,7 @@ public enum RevPiDioChannelId implements ChannelId {
 	DEBUG_OUT3(Doc.of(OpenemsType.BOOLEAN)), //
 	/**
 	 * ioX/Out3.
-	 * 
+	 *
 	 * <ul>
 	 * <li>Interface: KunbusRevPiDataIOModule
 	 * <li>Type: Boolean
@@ -78,7 +78,7 @@ public enum RevPiDioChannelId implements ChannelId {
 			.onInit(new BooleanWriteChannel.MirrorToDebugChannel(RevPiDioChannelId.DEBUG_OUT3))), //
 	/**
 	 * Holds writes to ioX/Out4 for debugging.
-	 * 
+	 *
 	 * <ul>
 	 * <li>Interface: KunbusRevPiDataIOModule
 	 * <li>Type: Boolean
@@ -88,7 +88,7 @@ public enum RevPiDioChannelId implements ChannelId {
 	DEBUG_OUT4(Doc.of(OpenemsType.BOOLEAN)),
 	/**
 	 * ioX/Out4.
-	 * 
+	 *
 	 * <ul>
 	 * <li>Interface: KunbusRevPiDataIOModule
 	 * <li>Type: Boolean
@@ -100,7 +100,7 @@ public enum RevPiDioChannelId implements ChannelId {
 			.onInit(new BooleanWriteChannel.MirrorToDebugChannel(RevPiDioChannelId.DEBUG_OUT4))), //
 	/**
 	 * Holds writes to ioX/Out5 for debugging.
-	 * 
+	 *
 	 * <ul>
 	 * <li>Interface: KunbusRevPiDataIOModule
 	 * <li>Type: Boolean
@@ -110,7 +110,7 @@ public enum RevPiDioChannelId implements ChannelId {
 	DEBUG_OUT5(Doc.of(OpenemsType.BOOLEAN)), //
 	/**
 	 * ioX/Out5.
-	 * 
+	 *
 	 * <ul>
 	 * <li>Interface: KunbusRevPiDataIOModule
 	 * <li>Type: Boolean
@@ -122,7 +122,7 @@ public enum RevPiDioChannelId implements ChannelId {
 			.onInit(new BooleanWriteChannel.MirrorToDebugChannel(RevPiDioChannelId.DEBUG_OUT5))), //
 	/**
 	 * Holds writes to ioX/Out6 for debugging.
-	 * 
+	 *
 	 * <ul>
 	 * <li>Interface: KunbusRevPiDataIOModule
 	 * <li>Type: Boolean
@@ -132,7 +132,7 @@ public enum RevPiDioChannelId implements ChannelId {
 	DEBUG_OUT6(Doc.of(OpenemsType.BOOLEAN)), //
 	/**
 	 * ioX/Out6.
-	 * 
+	 *
 	 * <ul>
 	 * <li>Interface: KunbusRevPiDataIOModule
 	 * <li>Type: Boolean
@@ -144,7 +144,7 @@ public enum RevPiDioChannelId implements ChannelId {
 			.onInit(new BooleanWriteChannel.MirrorToDebugChannel(RevPiDioChannelId.DEBUG_OUT6))), //
 	/**
 	 * Holds writes to ioX/Out7 for debugging.
-	 * 
+	 *
 	 * <ul>
 	 * <li>Interface: KunbusRevPiDataIOModule
 	 * <li>Type: Boolean
@@ -154,7 +154,7 @@ public enum RevPiDioChannelId implements ChannelId {
 	DEBUG_OUT7(Doc.of(OpenemsType.BOOLEAN)), //
 	/**
 	 * ioX/Out7.
-	 * 
+	 *
 	 * <ul>
 	 * <li>Interface: KunbusRevPiDataIOModule
 	 * <li>Type: Boolean
@@ -166,7 +166,7 @@ public enum RevPiDioChannelId implements ChannelId {
 			.onInit(new BooleanWriteChannel.MirrorToDebugChannel(RevPiDioChannelId.DEBUG_OUT7))), //
 	/**
 	 * Holds writes to ioX/Out8 for debugging.
-	 * 
+	 *
 	 * <ul>
 	 * <li>Interface: KunbusRevPiDataIOModule
 	 * <li>Type: Boolean
@@ -176,7 +176,7 @@ public enum RevPiDioChannelId implements ChannelId {
 	DEBUG_OUT8(Doc.of(OpenemsType.BOOLEAN)), //
 	/**
 	 * ioX/Out8.
-	 * 
+	 *
 	 * <ul>
 	 * <li>Interface: KunbusRevPiDataIOModule
 	 * <li>Type: Boolean
@@ -188,7 +188,7 @@ public enum RevPiDioChannelId implements ChannelId {
 			.onInit(new BooleanWriteChannel.MirrorToDebugChannel(RevPiDioChannelId.DEBUG_OUT8))), //
 	/**
 	 * Holds writes to ioX/Out9 for debugging.
-	 * 
+	 *
 	 * <ul>
 	 * <li>Interface: KunbusRevPiDataIOModule
 	 * <li>Type: Boolean
@@ -198,7 +198,7 @@ public enum RevPiDioChannelId implements ChannelId {
 	DEBUG_OUT9(Doc.of(OpenemsType.BOOLEAN)), //
 	/**
 	 * ioX/Out9.
-	 * 
+	 *
 	 * <ul>
 	 * <li>Interface: KunbusRevPiDataIOModule
 	 * <li>Type: Boolean
@@ -210,7 +210,7 @@ public enum RevPiDioChannelId implements ChannelId {
 			.onInit(new BooleanWriteChannel.MirrorToDebugChannel(RevPiDioChannelId.DEBUG_OUT9))), //
 	/**
 	 * Holds writes to ioX/Out10 for debugging.
-	 * 
+	 *
 	 * <ul>
 	 * <li>Interface: KunbusRevPiDataIOModule
 	 * <li>Type: Boolean
@@ -220,7 +220,7 @@ public enum RevPiDioChannelId implements ChannelId {
 	DEBUG_OUT10(Doc.of(OpenemsType.BOOLEAN)), //
 	/**
 	 * ioX/Out10.
-	 * 
+	 *
 	 * <ul>
 	 * <li>Interface: KunbusRevPiDataIOModule
 	 * <li>Type: Boolean
@@ -232,7 +232,7 @@ public enum RevPiDioChannelId implements ChannelId {
 			.onInit(new BooleanWriteChannel.MirrorToDebugChannel(RevPiDioChannelId.DEBUG_OUT10))), //
 	/**
 	 * Holds writes to ioX/Out11 for debugging.
-	 * 
+	 *
 	 * <ul>
 	 * <li>Interface: KunbusRevPiDataIOModule
 	 * <li>Type: Boolean
@@ -242,7 +242,7 @@ public enum RevPiDioChannelId implements ChannelId {
 	DEBUG_OUT11(Doc.of(OpenemsType.BOOLEAN)), //
 	/**
 	 * ioX/Out11.
-	 * 
+	 *
 	 * <ul>
 	 * <li>Interface: KunbusRevPiDataIOModule
 	 * <li>Type: Boolean
@@ -254,7 +254,7 @@ public enum RevPiDioChannelId implements ChannelId {
 			.onInit(new BooleanWriteChannel.MirrorToDebugChannel(RevPiDioChannelId.DEBUG_OUT11))), //
 	/**
 	 * Holds writes to ioX/Out12 for debugging.
-	 * 
+	 *
 	 * <ul>
 	 * <li>Interface: KunbusRevPiDataIOModule
 	 * <li>Type: Boolean
@@ -264,7 +264,7 @@ public enum RevPiDioChannelId implements ChannelId {
 	DEBUG_OUT12(Doc.of(OpenemsType.BOOLEAN)), //
 	/**
 	 * ioX/Out12.
-	 * 
+	 *
 	 * <ul>
 	 * <li>Interface: KunbusRevPiDataIOModule
 	 * <li>Type: Boolean
@@ -276,7 +276,7 @@ public enum RevPiDioChannelId implements ChannelId {
 			.onInit(new BooleanWriteChannel.MirrorToDebugChannel(RevPiDioChannelId.DEBUG_OUT12))), //
 	/**
 	 * Holds writes to ioX/Out13 for debugging.
-	 * 
+	 *
 	 * <ul>
 	 * <li>Interface: KunbusRevPiDataIOModule
 	 * <li>Type: Boolean
@@ -286,7 +286,7 @@ public enum RevPiDioChannelId implements ChannelId {
 	DEBUG_OUT13(Doc.of(OpenemsType.BOOLEAN)), //
 	/**
 	 * ioX/Out13.
-	 * 
+	 *
 	 * <ul>
 	 * <li>Interface: KunbusRevPiDataIOModule
 	 * <li>Type: Boolean
@@ -298,7 +298,7 @@ public enum RevPiDioChannelId implements ChannelId {
 			.onInit(new BooleanWriteChannel.MirrorToDebugChannel(RevPiDioChannelId.DEBUG_OUT13))), //
 	/**
 	 * Holds writes to ioX/Out14 for debugging.
-	 * 
+	 *
 	 * <ul>
 	 * <li>Interface: KunbusRevPiDataIOModule
 	 * <li>Type: Boolean
@@ -308,7 +308,7 @@ public enum RevPiDioChannelId implements ChannelId {
 	DEBUG_OUT14(Doc.of(OpenemsType.BOOLEAN)), //
 	/**
 	 * ioX/Out14.
-	 * 
+	 *
 	 * <ul>
 	 * <li>Interface: KunbusRevPiDataIOModule
 	 * <li>Type: Boolean
@@ -321,7 +321,7 @@ public enum RevPiDioChannelId implements ChannelId {
 
 	/**
 	 * ioX/In1.
-	 * 
+	 *
 	 * <ul>
 	 * <li>Interface: KunbusRevPiDataIOModule
 	 * <li>Type: Boolean
@@ -334,7 +334,7 @@ public enum RevPiDioChannelId implements ChannelId {
 
 	/**
 	 * ioX/In2.
-	 * 
+	 *
 	 * <ul>
 	 * <li>Interface: KunbusRevPiDataIOModule
 	 * <li>Type: Boolean
@@ -347,7 +347,7 @@ public enum RevPiDioChannelId implements ChannelId {
 
 	/**
 	 * ioX/In3.
-	 * 
+	 *
 	 * <ul>
 	 * <li>Interface: KunbusRevPiDataIOModule
 	 * <li>Type: Boolean
@@ -360,7 +360,7 @@ public enum RevPiDioChannelId implements ChannelId {
 
 	/**
 	 * ioX/In4.
-	 * 
+	 *
 	 * <ul>
 	 * <li>Interface: KunbusRevPiDataIOModule
 	 * <li>Type: Boolean
@@ -373,7 +373,7 @@ public enum RevPiDioChannelId implements ChannelId {
 
 	/**
 	 * ioX/In5.
-	 * 
+	 *
 	 * <ul>
 	 * <li>Interface: KunbusRevPiDataIOModule
 	 * <li>Type: Boolean
@@ -386,7 +386,7 @@ public enum RevPiDioChannelId implements ChannelId {
 
 	/**
 	 * ioX/In6.
-	 * 
+	 *
 	 * <ul>
 	 * <li>Interface: KunbusRevPiDataIOModule
 	 * <li>Type: Boolean
@@ -399,7 +399,7 @@ public enum RevPiDioChannelId implements ChannelId {
 
 	/**
 	 * ioX/In7.
-	 * 
+	 *
 	 * <ul>
 	 * <li>Interface: KunbusRevPiDataIOModule
 	 * <li>Type: Boolean
@@ -412,7 +412,7 @@ public enum RevPiDioChannelId implements ChannelId {
 
 	/**
 	 * ioX/In8.
-	 * 
+	 *
 	 * <ul>
 	 * <li>Interface: KunbusRevPiDataIOModule
 	 * <li>Type: Boolean
@@ -425,7 +425,7 @@ public enum RevPiDioChannelId implements ChannelId {
 
 	/**
 	 * ioX/In9.
-	 * 
+	 *
 	 * <ul>
 	 * <li>Interface: KunbusRevPiDataIOModule
 	 * <li>Type: Boolean
@@ -438,7 +438,7 @@ public enum RevPiDioChannelId implements ChannelId {
 
 	/**
 	 * ioX/In10.
-	 * 
+	 *
 	 * <ul>
 	 * <li>Interface: KunbusRevPiDataIOModule
 	 * <li>Type: Boolean
@@ -451,7 +451,7 @@ public enum RevPiDioChannelId implements ChannelId {
 
 	/**
 	 * ioX/In11.
-	 * 
+	 *
 	 * <ul>
 	 * <li>Interface: KunbusRevPiDataIOModule
 	 * <li>Type: Boolean
@@ -464,7 +464,7 @@ public enum RevPiDioChannelId implements ChannelId {
 
 	/**
 	 * ioX/In12.
-	 * 
+	 *
 	 * <ul>
 	 * <li>Interface: KunbusRevPiDataIOModule
 	 * <li>Type: Boolean
@@ -477,7 +477,7 @@ public enum RevPiDioChannelId implements ChannelId {
 
 	/**
 	 * ioX/In13.
-	 * 
+	 *
 	 * <ul>
 	 * <li>Interface: KunbusRevPiDataIOModule
 	 * <li>Type: Boolean
@@ -490,7 +490,7 @@ public enum RevPiDioChannelId implements ChannelId {
 
 	/**
 	 * ioX/In14.
-	 * 
+	 *
 	 * <ul>
 	 * <li>Interface: KunbusRevPiDataIOModule
 	 * <li>Type: Boolean
@@ -508,6 +508,7 @@ private RevPiDioChannelId(Doc doc) {
 		this.doc = doc;
 	}
 
+	@Override
 	public Doc doc() {
 		return this.doc;
 	}
diff --git a/io.openems.edge.io.shelly/src/io/openems/edge/io/shelly/common/ShellyApi.java b/io.openems.edge.io.shelly/src/io/openems/edge/io/shelly/common/ShellyApi.java
index 5b6f5484d81..0f853fda611 100644
--- a/io.openems.edge.io.shelly/src/io/openems/edge/io/shelly/common/ShellyApi.java
+++ b/io.openems.edge.io.shelly/src/io/openems/edge/io/shelly/common/ShellyApi.java
@@ -15,7 +15,7 @@
 
 /**
  * Implements the local Shelly REST Api.
- * 
+ *
  * <p>
  * See https://shelly-api-docs.shelly.cloud
  */
@@ -29,10 +29,10 @@ public ShellyApi(String ip) {
 
 	/**
 	 * Gets the status of the device.
-	 * 
+	 *
 	 * <p>
 	 * See https://shelly-api-docs.shelly.cloud/#shelly2-5-status
-	 * 
+	 *
 	 * @param index the index of the relay
 	 * @return the status as JsonObject according to Shelly docs
 	 * @throws OpenemsNamedException on error
@@ -43,22 +43,22 @@ public JsonObject getStatus() throws OpenemsNamedException {
 
 	/**
 	 * Gets the "ison" state of the relay with the given index.
-	 * 
+	 *
 	 * <p>
 	 * See https://shelly-api-docs.shelly.cloud/#shelly2-5-relay-index
-	 * 
+	 *
 	 * @param index the index of the relay
 	 * @return the boolean value
 	 * @throws OpenemsNamedException on error
 	 */
 	public boolean getRelayIson(int index) throws OpenemsNamedException {
-		JsonElement json = this.sendGetRequest("/relay/" + index);
+		var json = this.sendGetRequest("/relay/" + index);
 		return JsonUtils.getAsBoolean(json, "ison");
 	}
 
 	/**
 	 * Turns the relay with the given index on or off.
-	 * 
+	 *
 	 * @param index the index of the relay
 	 * @param value true to turn on; false to turn off
 	 * @throws OpenemsNamedException on error
@@ -69,23 +69,23 @@ public void setRelayTurn(int index, boolean value) throws OpenemsNamedException
 
 	/**
 	 * Sends a get request to the Shelly API.
-	 * 
+	 *
 	 * @param endpoint the REST Api endpoint
 	 * @return a JsonObject or JsonArray
 	 * @throws OpenemsNamedException on error
 	 */
 	private JsonElement sendGetRequest(String endpoint) throws OpenemsNamedException {
 		try {
-			URL url = new URL(this.baseUrl + endpoint);
-			HttpURLConnection con = (HttpURLConnection) url.openConnection();
+			var url = new URL(this.baseUrl + endpoint);
+			var con = (HttpURLConnection) url.openConnection();
 			con.setRequestMethod("GET");
 			con.setConnectTimeout(5000);
 			con.setReadTimeout(5000);
-			int status = con.getResponseCode();
+			var status = con.getResponseCode();
 			String body;
-			try (BufferedReader in = new BufferedReader(new InputStreamReader(con.getInputStream()))) {
+			try (var in = new BufferedReader(new InputStreamReader(con.getInputStream()))) {
 				// Read HTTP response
-				StringBuilder content = new StringBuilder();
+				var content = new StringBuilder();
 				String line;
 				while ((line = in.readLine()) != null) {
 					content.append(line);
@@ -96,10 +96,8 @@ private JsonElement sendGetRequest(String endpoint) throws OpenemsNamedException
 			if (status < 300) {
 				// Parse response to JSON
 				return JsonUtils.parseToJsonObject(body);
-			} else {
-				throw new OpenemsException(
-						"Error while reading from Shelly API. Response code: " + status + ". " + body);
 			}
+			throw new OpenemsException("Error while reading from Shelly API. Response code: " + status + ". " + body);
 		} catch (OpenemsNamedException | IOException e) {
 			throw new OpenemsException(
 					"Unable to read from Shelly API. " + e.getClass().getSimpleName() + ": " + e.getMessage());
diff --git a/io.openems.edge.io.shelly/src/io/openems/edge/io/shelly/shelly25/Shelly25.java b/io.openems.edge.io.shelly/src/io/openems/edge/io/shelly/shelly25/Shelly25.java
index 0c39e635de4..a0a9ec3b934 100644
--- a/io.openems.edge.io.shelly/src/io/openems/edge/io/shelly/shelly25/Shelly25.java
+++ b/io.openems.edge.io.shelly/src/io/openems/edge/io/shelly/shelly25/Shelly25.java
@@ -19,7 +19,7 @@ public interface Shelly25 extends DigitalOutput, OpenemsComponent, EventHandler
 	public static enum ChannelId implements io.openems.edge.common.channel.ChannelId {
 		/**
 		 * Holds writes to Relay Output 1 for debugging.
-		 * 
+		 *
 		 * <ul>
 		 * <li>Interface: Shelly25
 		 * <li>Type: Boolean
@@ -29,7 +29,7 @@ public static enum ChannelId implements io.openems.edge.common.channel.ChannelId
 		DEBUG_RELAY_1(Doc.of(OpenemsType.BOOLEAN)), //
 		/**
 		 * Relay Output 1.
-		 * 
+		 *
 		 * <ul>
 		 * <li>Interface: Shelly25
 		 * <li>Type: Boolean
@@ -41,7 +41,7 @@ public static enum ChannelId implements io.openems.edge.common.channel.ChannelId
 				.onInit(new BooleanWriteChannel.MirrorToDebugChannel(ChannelId.DEBUG_RELAY_1))), //
 		/**
 		 * Holds writes to Relay Output 2 for debugging.
-		 * 
+		 *
 		 * <ul>
 		 * <li>Interface: Shelly25
 		 * <li>Type: Boolean
@@ -51,7 +51,7 @@ public static enum ChannelId implements io.openems.edge.common.channel.ChannelId
 		DEBUG_RELAY_2(Doc.of(OpenemsType.BOOLEAN)), //
 		/**
 		 * Relay Output 2.
-		 * 
+		 *
 		 * <ul>
 		 * <li>Interface: Shelly25
 		 * <li>Type: Boolean
@@ -63,7 +63,7 @@ public static enum ChannelId implements io.openems.edge.common.channel.ChannelId
 				.onInit(new BooleanWriteChannel.MirrorToDebugChannel(ChannelId.DEBUG_RELAY_2))), //
 		/**
 		 * Slave Communication Failed Fault.
-		 * 
+		 *
 		 * <ul>
 		 * <li>Interface: Shelly25
 		 * <li>Type: State
@@ -77,6 +77,7 @@ private ChannelId(Doc doc) {
 			this.doc = doc;
 		}
 
+		@Override
 		public Doc doc() {
 			return this.doc;
 		}
@@ -111,7 +112,7 @@ public default void _setRelay1(boolean value) {
 
 	/**
 	 * Sets the Relay Output 1. See {@link ChannelId#RELAY_1}.
-	 * 
+	 *
 	 * @param value the next write value
 	 * @throws OpenemsNamedException on error
 	 */
@@ -148,7 +149,7 @@ public default void _setRelay2(boolean value) {
 
 	/**
 	 * Sets the Relay Output 2. See {@link ChannelId#RELAY_2}.
-	 * 
+	 *
 	 * @param value the next write value
 	 * @throws OpenemsNamedException on error
 	 */
@@ -158,7 +159,7 @@ public default void setRelay2(boolean value) throws OpenemsNamedException {
 
 	/**
 	 * Gets the Channel for {@link ChannelId#SLAVE_COMMUNICATION_FAILED}.
-	 * 
+	 *
 	 * @return the Channel
 	 */
 	public default StateChannel getSlaveCommunicationFailedChannel() {
@@ -168,7 +169,7 @@ public default StateChannel getSlaveCommunicationFailedChannel() {
 	/**
 	 * Gets the Slave Communication Failed State. See
 	 * {@link ChannelId#SLAVE_COMMUNICATION_FAILED}.
-	 * 
+	 *
 	 * @return the Channel {@link Value}
 	 */
 	public default Value<Boolean> getSlaveCommunicationFailed() {
@@ -178,7 +179,7 @@ public default Value<Boolean> getSlaveCommunicationFailed() {
 	/**
 	 * Internal method to set the 'nextValue' on
 	 * {@link ChannelId#SLAVE_COMMUNICATION_FAILED} Channel.
-	 * 
+	 *
 	 * @param value the next value
 	 */
 	public default void _setSlaveCommunicationFailed(boolean value) {
diff --git a/io.openems.edge.io.shelly/src/io/openems/edge/io/shelly/shelly25/Shelly25Impl.java b/io.openems.edge.io.shelly/src/io/openems/edge/io/shelly/shelly25/Shelly25Impl.java
index 4c00219dea3..4d2225eea06 100644
--- a/io.openems.edge.io.shelly/src/io/openems/edge/io/shelly/shelly25/Shelly25Impl.java
+++ b/io.openems.edge.io.shelly/src/io/openems/edge/io/shelly/shelly25/Shelly25Impl.java
@@ -1,7 +1,6 @@
 package io.openems.edge.io.shelly.shelly25;
 
 import java.util.Objects;
-import java.util.Optional;
 
 import org.osgi.service.component.ComponentContext;
 import org.osgi.service.component.annotations.Activate;
@@ -15,9 +14,6 @@
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-import com.google.gson.JsonArray;
-import com.google.gson.JsonObject;
-
 import io.openems.common.exceptions.OpenemsError.OpenemsNamedException;
 import io.openems.common.utils.JsonUtils;
 import io.openems.edge.common.channel.BooleanWriteChannel;
@@ -62,6 +58,7 @@ void activate(ComponentContext context, Config config) {
 		this.shellyApi = new ShellyApi(config.ip());
 	}
 
+	@Override
 	@Deactivate
 	protected void deactivate() {
 		super.deactivate();
@@ -74,11 +71,11 @@ public BooleanWriteChannel[] digitalOutputChannels() {
 
 	@Override
 	public String debugLog() {
-		StringBuilder b = new StringBuilder();
-		int i = 1;
+		var b = new StringBuilder();
+		var i = 1;
 		for (WriteChannel<Boolean> channel : this.digitalOutputChannels) {
 			String valueText;
-			Optional<Boolean> valueOpt = channel.value().asOptional();
+			var valueOpt = channel.value().asOptional();
 			if (valueOpt.isPresent()) {
 				valueText = valueOpt.get() ? "x" : "-";
 			} else {
@@ -118,11 +115,11 @@ private void eventBeforeProcessImage() {
 		Boolean relay1IsOn;
 		Boolean relay2IsOn;
 		try {
-			JsonObject json = this.shellyApi.getStatus();
-			JsonArray relays = JsonUtils.getAsJsonArray(json, "relays");
-			JsonObject relay1 = JsonUtils.getAsJsonObject(relays.get(0));
+			var json = this.shellyApi.getStatus();
+			var relays = JsonUtils.getAsJsonArray(json, "relays");
+			var relay1 = JsonUtils.getAsJsonObject(relays.get(0));
 			relay1IsOn = JsonUtils.getAsBoolean(relay1, "ison");
-			JsonObject relay2 = JsonUtils.getAsJsonObject(relays.get(1));
+			var relay2 = JsonUtils.getAsJsonObject(relays.get(1));
 			relay2IsOn = JsonUtils.getAsBoolean(relay2, "ison");
 
 			this._setSlaveCommunicationFailed(false);
@@ -152,8 +149,8 @@ private void eventExecuteWrite() {
 	}
 
 	private void executeWrite(BooleanWriteChannel channel, int index) throws OpenemsNamedException {
-		Boolean readValue = channel.value().get();
-		Optional<Boolean> writeValue = channel.getNextWriteValueAndReset();
+		var readValue = channel.value().get();
+		var writeValue = channel.getNextWriteValueAndReset();
 		if (!writeValue.isPresent()) {
 			// no write value
 			return;
diff --git a/io.openems.edge.io.shelly/src/io/openems/edge/io/shelly/shellyplug/ShellyPlug.java b/io.openems.edge.io.shelly/src/io/openems/edge/io/shelly/shellyplug/ShellyPlug.java
index ac9d3b20247..6bdb25ddb9f 100644
--- a/io.openems.edge.io.shelly/src/io/openems/edge/io/shelly/shellyplug/ShellyPlug.java
+++ b/io.openems.edge.io.shelly/src/io/openems/edge/io/shelly/shellyplug/ShellyPlug.java
@@ -21,7 +21,7 @@ public interface ShellyPlug extends DigitalOutput, OpenemsComponent, EventHandle
 	public static enum ChannelId implements io.openems.edge.common.channel.ChannelId {
 		/**
 		 * Holds writes to Relay Output for debugging.
-		 * 
+		 *
 		 * <ul>
 		 * <li>Interface: ShellyPlug
 		 * <li>Type: Boolean
@@ -31,7 +31,7 @@ public static enum ChannelId implements io.openems.edge.common.channel.ChannelId
 		DEBUG_RELAY(Doc.of(OpenemsType.BOOLEAN)), //
 		/**
 		 * Relay Output.
-		 * 
+		 *
 		 * <ul>
 		 * <li>Interface: ShellyPlug
 		 * <li>Type: Boolean
@@ -43,7 +43,7 @@ public static enum ChannelId implements io.openems.edge.common.channel.ChannelId
 				.onInit(new BooleanWriteChannel.MirrorToDebugChannel(ChannelId.DEBUG_RELAY))), //
 		/**
 		 * Active Power.
-		 * 
+		 *
 		 * <ul>
 		 * <li>Interface: ShellyPlug
 		 * <li>Type: Integer
@@ -54,7 +54,7 @@ public static enum ChannelId implements io.openems.edge.common.channel.ChannelId
 				.unit(Unit.WATT)),
 		/**
 		 * Slave Communication Failed Fault.
-		 * 
+		 *
 		 * <ul>
 		 * <li>Interface: ShellyPlug
 		 * <li>Type: State
@@ -68,6 +68,7 @@ private ChannelId(Doc doc) {
 			this.doc = doc;
 		}
 
+		@Override
 		public Doc doc() {
 			return this.doc;
 		}
@@ -102,7 +103,7 @@ public default void _setRelay(boolean value) {
 
 	/**
 	 * Sets the Relay Output. See {@link ChannelId#RELAY}.
-	 * 
+	 *
 	 * @param value the next write value
 	 * @throws OpenemsNamedException on error
 	 */
@@ -112,7 +113,7 @@ public default void setRelay(boolean value) throws OpenemsNamedException {
 
 	/**
 	 * Gets the Channel for {@link ChannelId#ACTIVE_POWER}.
-	 * 
+	 *
 	 * @return the Channel
 	 */
 	public default IntegerReadChannel getActivePowerChannel() {
@@ -122,7 +123,7 @@ public default IntegerReadChannel getActivePowerChannel() {
 	/**
 	 * Gets the Active Power in [W]. Negative values for Charge; positive for
 	 * Discharge. See {@link ChannelId#ACTIVE_POWER}.
-	 * 
+	 *
 	 * @return the Channel {@link Value}
 	 */
 	public default Value<Integer> getActivePower() {
@@ -132,7 +133,7 @@ public default Value<Integer> getActivePower() {
 	/**
 	 * Internal method to set the 'nextValue' on {@link ChannelId#ACTIVE_POWER}
 	 * Channel.
-	 * 
+	 *
 	 * @param value the next value
 	 */
 	public default void _setActivePower(Integer value) {
@@ -142,7 +143,7 @@ public default void _setActivePower(Integer value) {
 	/**
 	 * Internal method to set the 'nextValue' on {@link ChannelId#ACTIVE_POWER}
 	 * Channel.
-	 * 
+	 *
 	 * @param value the next value
 	 */
 	public default void _setActivePower(int value) {
@@ -151,7 +152,7 @@ public default void _setActivePower(int value) {
 
 	/**
 	 * Gets the Channel for {@link ChannelId#SLAVE_COMMUNICATION_FAILED}.
-	 * 
+	 *
 	 * @return the Channel
 	 */
 	public default StateChannel getSlaveCommunicationFailedChannel() {
@@ -161,7 +162,7 @@ public default StateChannel getSlaveCommunicationFailedChannel() {
 	/**
 	 * Gets the Slave Communication Failed State. See
 	 * {@link ChannelId#SLAVE_COMMUNICATION_FAILED}.
-	 * 
+	 *
 	 * @return the Channel {@link Value}
 	 */
 	public default Value<Boolean> getSlaveCommunicationFailed() {
@@ -171,7 +172,7 @@ public default Value<Boolean> getSlaveCommunicationFailed() {
 	/**
 	 * Internal method to set the 'nextValue' on
 	 * {@link ChannelId#SLAVE_COMMUNICATION_FAILED} Channel.
-	 * 
+	 *
 	 * @param value the next value
 	 */
 	public default void _setSlaveCommunicationFailed(boolean value) {
diff --git a/io.openems.edge.io.shelly/src/io/openems/edge/io/shelly/shellyplug/ShellyPlugImpl.java b/io.openems.edge.io.shelly/src/io/openems/edge/io/shelly/shellyplug/ShellyPlugImpl.java
index 8847999d826..d8d29189580 100644
--- a/io.openems.edge.io.shelly/src/io/openems/edge/io/shelly/shellyplug/ShellyPlugImpl.java
+++ b/io.openems.edge.io.shelly/src/io/openems/edge/io/shelly/shellyplug/ShellyPlugImpl.java
@@ -1,7 +1,6 @@
 package io.openems.edge.io.shelly.shellyplug;
 
 import java.util.Objects;
-import java.util.Optional;
 
 import org.osgi.service.component.ComponentContext;
 import org.osgi.service.component.annotations.Activate;
@@ -15,9 +14,6 @@
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-import com.google.gson.JsonArray;
-import com.google.gson.JsonObject;
-
 import io.openems.common.exceptions.OpenemsError.OpenemsNamedException;
 import io.openems.common.utils.JsonUtils;
 import io.openems.edge.common.channel.BooleanWriteChannel;
@@ -60,6 +56,7 @@ void activate(ComponentContext context, Config config) {
 		this.shellyApi = new ShellyApi(config.ip());
 	}
 
+	@Override
 	@Deactivate
 	protected void deactivate() {
 		super.deactivate();
@@ -72,8 +69,8 @@ public BooleanWriteChannel[] digitalOutputChannels() {
 
 	@Override
 	public String debugLog() {
-		StringBuilder b = new StringBuilder();
-		Optional<Boolean> valueOpt = this.getRelayChannel().value().asOptional();
+		var b = new StringBuilder();
+		var valueOpt = this.getRelayChannel().value().asOptional();
 		if (valueOpt.isPresent()) {
 			b.append(valueOpt.get() ? "On" : "Off");
 		} else {
@@ -108,12 +105,12 @@ private void eventBeforeProcessImage() {
 		Boolean relayIson = null;
 		Integer power = null;
 		try {
-			JsonObject json = this.shellyApi.getStatus();
-			JsonArray relays = JsonUtils.getAsJsonArray(json, "relays");
-			JsonObject relay1 = JsonUtils.getAsJsonObject(relays.get(0));
+			var json = this.shellyApi.getStatus();
+			var relays = JsonUtils.getAsJsonArray(json, "relays");
+			var relay1 = JsonUtils.getAsJsonObject(relays.get(0));
 			relayIson = JsonUtils.getAsBoolean(relay1, "ison");
-			JsonArray meters = JsonUtils.getAsJsonArray(json, "meters");
-			JsonObject meter1 = JsonUtils.getAsJsonObject(meters.get(0));
+			var meters = JsonUtils.getAsJsonArray(json, "meters");
+			var meter1 = JsonUtils.getAsJsonObject(meters.get(0));
 			power = Math.round(JsonUtils.getAsFloat(meter1, "power"));
 
 			this._setSlaveCommunicationFailed(false);
@@ -140,8 +137,8 @@ private void eventExecuteWrite() {
 	}
 
 	private void executeWrite(BooleanWriteChannel channel, int index) throws OpenemsNamedException {
-		Boolean readValue = channel.value().get();
-		Optional<Boolean> writeValue = channel.getNextWriteValueAndReset();
+		var readValue = channel.value().get();
+		var writeValue = channel.getNextWriteValueAndReset();
 		if (!writeValue.isPresent()) {
 			// no write value
 			return;
diff --git a/io.openems.edge.io.wago/src/io/openems/edge/wago/Fieldbus4xxDI.java b/io.openems.edge.io.wago/src/io/openems/edge/wago/Fieldbus4xxDI.java
index ab1a6f049cd..4ea60b320a6 100644
--- a/io.openems.edge.io.wago/src/io/openems/edge/wago/Fieldbus4xxDI.java
+++ b/io.openems.edge.io.wago/src/io/openems/edge/wago/Fieldbus4xxDI.java
@@ -1,7 +1,6 @@
 package io.openems.edge.wago;
 
 import io.openems.common.channel.PersistencePriority;
-import io.openems.edge.bridge.modbus.api.element.CoilElement;
 import io.openems.edge.bridge.modbus.api.element.ModbusCoilElement;
 import io.openems.edge.common.channel.BooleanDoc;
 import io.openems.edge.common.channel.BooleanReadChannel;
@@ -11,23 +10,23 @@ public class Fieldbus4xxDI extends FieldbusModule {
 	private static final String ID_TEMPLATE = "DIGITAL_INPUT_M";
 
 	private final ModbusCoilElement[] inputCoil0Elements;
-	private final ModbusCoilElement[] inputCoil512Elements = new ModbusCoilElement[] {};
-	private final ModbusCoilElement[] outputCoil512Elements = new ModbusCoilElement[] {};
+	private final ModbusCoilElement[] inputCoil512Elements = {};
+	private final ModbusCoilElement[] outputCoil512Elements = {};
 	private final BooleanReadChannel[] readChannels;
 
 	public Fieldbus4xxDI(Wago parent, int moduleCount, int coilOffset0, int channelsCount) {
-		String id = ID_TEMPLATE + moduleCount;
+		var id = ID_TEMPLATE + moduleCount;
 
 		this.readChannels = new BooleanReadChannel[channelsCount];
 		this.inputCoil0Elements = new ModbusCoilElement[channelsCount];
-		for (int i = 0; i < channelsCount; i++) {
-			BooleanDoc doc = new BooleanDoc();
+		for (var i = 0; i < channelsCount; i++) {
+			var doc = new BooleanDoc();
 			doc.persistencePriority(PersistencePriority.MEDIUM);
-			FieldbusChannelId channelId = new FieldbusChannelId(id + "_C" + (i + 1), doc);
+			var channelId = new FieldbusChannelId(id + "_C" + (i + 1), doc);
 			BooleanReadChannel channel = parent.addChannel(channelId);
 			this.readChannels[i] = channel;
 
-			CoilElement element = parent.createModbusCoilElement(channel.channelId(), coilOffset0 + i);
+			var element = parent.createModbusCoilElement(channel.channelId(), coilOffset0 + i);
 			this.inputCoil0Elements[i] = element;
 		}
 	}
diff --git a/io.openems.edge.io.wago/src/io/openems/edge/wago/Fieldbus523RO1Ch.java b/io.openems.edge.io.wago/src/io/openems/edge/wago/Fieldbus523RO1Ch.java
index b499b1899ae..c2ebef9640c 100644
--- a/io.openems.edge.io.wago/src/io/openems/edge/wago/Fieldbus523RO1Ch.java
+++ b/io.openems.edge.io.wago/src/io/openems/edge/wago/Fieldbus523RO1Ch.java
@@ -19,20 +19,20 @@ public class Fieldbus523RO1Ch extends FieldbusModule {
 	private final BooleanReadChannel[] readChannels;
 
 	public Fieldbus523RO1Ch(Wago parent, int moduleCount, int coilOffset0, int coilOffset512) {
-		String id = ID_TEMPLATE + moduleCount;
+		var id = ID_TEMPLATE + moduleCount;
 
 		BooleanWriteChannel channel1;
 		{
-			OpenemsTypeDoc<Boolean> doc = new BooleanDoc() //
+			var doc = new BooleanDoc() //
 					.accessMode(AccessMode.READ_WRITE);
 			doc.persistencePriority(PersistencePriority.MEDIUM);
-			FieldbusChannelId channelId = new FieldbusChannelId(id, doc);
+			var channelId = new FieldbusChannelId(id, doc);
 			channel1 = (BooleanWriteChannel) parent.addChannel(channelId);
 		}
 		BooleanReadChannel channel2;
 		{
 			OpenemsTypeDoc<Boolean> doc = new BooleanDoc();
-			FieldbusChannelId channelId = new FieldbusChannelId(id + "_HAND", doc);
+			var channelId = new FieldbusChannelId(id + "_HAND", doc);
 			channel2 = parent.addChannel(channelId);
 		}
 		this.readChannels = new BooleanReadChannel[] { channel1, channel2 };
diff --git a/io.openems.edge.io.wago/src/io/openems/edge/wago/Fieldbus5xxDO.java b/io.openems.edge.io.wago/src/io/openems/edge/wago/Fieldbus5xxDO.java
index e5198331ae5..99106054b09 100644
--- a/io.openems.edge.io.wago/src/io/openems/edge/wago/Fieldbus5xxDO.java
+++ b/io.openems.edge.io.wago/src/io/openems/edge/wago/Fieldbus5xxDO.java
@@ -6,30 +6,29 @@
 import io.openems.edge.common.channel.BooleanDoc;
 import io.openems.edge.common.channel.BooleanReadChannel;
 import io.openems.edge.common.channel.BooleanWriteChannel;
-import io.openems.edge.common.channel.internal.OpenemsTypeDoc;
 
 public class Fieldbus5xxDO extends FieldbusModule {
 
 	private static final String ID_TEMPLATE = "DIGITAL_OUTPUT_M";
 
-	private final ModbusCoilElement[] inputCoil0Elements = new ModbusCoilElement[] {};
+	private final ModbusCoilElement[] inputCoil0Elements = {};
 	private final ModbusCoilElement[] inputCoil512Elements;
 	private final ModbusCoilElement[] outputCoil512Elements;
 	private final BooleanReadChannel[] readChannels;
 
 	public Fieldbus5xxDO(Wago parent, int moduleCount, int coilOffset512, int channelsCount) {
-		String id = ID_TEMPLATE + moduleCount;
+		var id = ID_TEMPLATE + moduleCount;
 
 		this.readChannels = new BooleanReadChannel[channelsCount];
 		this.inputCoil512Elements = new ModbusCoilElement[channelsCount];
 		this.outputCoil512Elements = new ModbusCoilElement[channelsCount];
 
-		for (int i = 0; i < channelsCount; i++) {
-			OpenemsTypeDoc<Boolean> doc = new BooleanDoc() //
+		for (var i = 0; i < channelsCount; i++) {
+			var doc = new BooleanDoc() //
 					.accessMode(AccessMode.READ_WRITE);
 			doc.persistencePriority(PersistencePriority.MEDIUM);
-			FieldbusChannelId channelId = new FieldbusChannelId(id + "_C" + (i + 1), doc);
-			BooleanWriteChannel channel = (BooleanWriteChannel) parent.addChannel(channelId);
+			var channelId = new FieldbusChannelId(id + "_C" + (i + 1), doc);
+			var channel = (BooleanWriteChannel) parent.addChannel(channelId);
 
 			this.readChannels[i] = channel;
 
diff --git a/io.openems.edge.io.wago/src/io/openems/edge/wago/FieldbusModule.java b/io.openems.edge.io.wago/src/io/openems/edge/wago/FieldbusModule.java
index 06b6075b13c..64386066ec9 100644
--- a/io.openems.edge.io.wago/src/io/openems/edge/wago/FieldbusModule.java
+++ b/io.openems.edge.io.wago/src/io/openems/edge/wago/FieldbusModule.java
@@ -8,14 +8,14 @@ public abstract class FieldbusModule {
 
 	/**
 	 * Gets the Name of the {@link FieldbusModule}.
-	 * 
+	 *
 	 * @return the name
 	 */
 	public abstract String getName();
 
 	/**
 	 * Gets the {@link ModbusCoilElement} for the input coils starting at address 0.
-	 * 
+	 *
 	 * @return the array; empty for no input coils
 	 */
 	public abstract ModbusCoilElement[] getInputCoil0Elements();
@@ -23,7 +23,7 @@ public abstract class FieldbusModule {
 	/**
 	 * Gets the {@link ModbusCoilElement} for the input coils starting at address
 	 * 512.
-	 * 
+	 *
 	 * @return the array; empty for no input coils
 	 */
 	public abstract ModbusCoilElement[] getInputCoil512Elements();
@@ -31,14 +31,14 @@ public abstract class FieldbusModule {
 	/**
 	 * Gets the {@link ModbusCoilElement} for the output coils starting at address
 	 * 512.
-	 * 
+	 *
 	 * @return the array; empty for no output coils
 	 */
 	public abstract ModbusCoilElement[] getOutputCoil512Elements();
 
 	/**
 	 * Gets the Channels of the {@link FieldbusModule}.
-	 * 
+	 *
 	 * @return the {@link Channel}
 	 */
 	public abstract BooleanReadChannel[] getChannels();
diff --git a/io.openems.edge.io.wago/src/io/openems/edge/wago/FieldbusModuleFactory.java b/io.openems.edge.io.wago/src/io/openems/edge/wago/FieldbusModuleFactory.java
index 66e6e6b201c..52d701f9d50 100644
--- a/io.openems.edge.io.wago/src/io/openems/edge/wago/FieldbusModuleFactory.java
+++ b/io.openems.edge.io.wago/src/io/openems/edge/wago/FieldbusModuleFactory.java
@@ -9,7 +9,7 @@ public class FieldbusModuleFactory {
 	/**
 	 * Builds a WAGO {@link FieldbusModule} instance, defined by the XML
 	 * specification.
-	 * 
+	 *
 	 * @param parent          the {@link Wago} parent component
 	 * @param moduleArtikelnr the XML 'Artikelnr'
 	 * @param moduleType      the XML 'Type'
@@ -20,7 +20,7 @@ public class FieldbusModuleFactory {
 	 */
 	public FieldbusModule of(Wago parent, String moduleArtikelnr, String moduleType, FieldbusModuleKanal[] kanals,
 			int coilOffset0, int coilOffset512) {
-		final int channelsCount = kanals.length;
+		final var channelsCount = kanals.length;
 		switch (moduleArtikelnr) {
 		case "750-4xx":
 			switch (moduleType) {
diff --git a/io.openems.edge.io.wago/src/io/openems/edge/wago/Wago.java b/io.openems.edge.io.wago/src/io/openems/edge/wago/Wago.java
index 858594f41a4..d435afa2146 100644
--- a/io.openems.edge.io.wago/src/io/openems/edge/wago/Wago.java
+++ b/io.openems.edge.io.wago/src/io/openems/edge/wago/Wago.java
@@ -8,8 +8,8 @@
 import java.net.URL;
 import java.util.ArrayList;
 import java.util.Base64;
+import java.util.Collections;
 import java.util.List;
-import java.util.Optional;
 import java.util.concurrent.CopyOnWriteArrayList;
 import java.util.concurrent.Executors;
 import java.util.concurrent.ScheduledExecutorService;
@@ -18,7 +18,6 @@
 import java.util.stream.Collectors;
 import java.util.stream.Stream;
 
-import javax.xml.parsers.DocumentBuilder;
 import javax.xml.parsers.DocumentBuilderFactory;
 import javax.xml.parsers.ParserConfigurationException;
 
@@ -37,9 +36,7 @@
 import org.slf4j.LoggerFactory;
 import org.w3c.dom.Document;
 import org.w3c.dom.Element;
-import org.w3c.dom.NamedNodeMap;
 import org.w3c.dom.Node;
-import org.w3c.dom.NodeList;
 import org.xml.sax.SAXException;
 
 import io.openems.common.exceptions.OpenemsException;
@@ -75,7 +72,7 @@ public class Wago extends AbstractOpenemsModbusComponent
 
 	private InetAddress ipAddress = null;
 	protected ModbusProtocol protocol = null;
-	private CopyOnWriteArrayList<FieldbusModule> modules = new CopyOnWriteArrayList<FieldbusModule>();
+	private final CopyOnWriteArrayList<FieldbusModule> modules = new CopyOnWriteArrayList<>();
 
 	public enum ThisChannelId implements io.openems.edge.common.channel.ChannelId {
 		;
@@ -122,7 +119,7 @@ void activate(ComponentContext context, Config config) throws OpenemsException {
 		 */
 		this.configFuture = this.configExecutor.schedule(() -> {
 			try {
-				Document doc = Wago.downloadConfigXml(this.ipAddress, config.username(), config.password());
+				var doc = Wago.downloadConfigXml(this.ipAddress, config.username(), config.password());
 				this.modules.addAll(this.parseXml(doc));
 				this.createProtocolFromModules(this.modules);
 
@@ -145,7 +142,7 @@ void activate(ComponentContext context, Config config) throws OpenemsException {
 	/**
 	 * Downloads the config xml file from WAGO fieldbus coupler. Tries old
 	 * ('ea-config.xml') and new ('io_config.xml') filenames.
-	 * 
+	 *
 	 * @param ip       the IP address
 	 * @param username the login username
 	 * @param password the login password
@@ -165,68 +162,68 @@ private static Document downloadConfigXml(InetAddress ip, String username, Strin
 
 	private static Document downloadConfigXml(InetAddress ip, String filename, String username, String password)
 			throws ParserConfigurationException, SAXException, IOException {
-		URL url = new URL(String.format("http://%s/etc/%s", ip.getHostAddress(), filename));
-		String authStr = String.format("%s:%s", username, password);
-		byte[] bytesEncoded = Base64.getEncoder().encode(authStr.getBytes());
-		String authEncoded = new String(bytesEncoded);
-		HttpURLConnection connection = (HttpURLConnection) url.openConnection();
+		var url = new URL(String.format("http://%s/etc/%s", ip.getHostAddress(), filename));
+		var authStr = String.format("%s:%s", username, password);
+		var bytesEncoded = Base64.getEncoder().encode(authStr.getBytes());
+		var authEncoded = new String(bytesEncoded);
+		var connection = (HttpURLConnection) url.openConnection();
 		connection.setRequestProperty("Authorization", String.format("Basic %s", authEncoded));
 		connection.setRequestProperty("Content-Type", "text/xml");
 		connection.setRequestMethod("GET");
 		connection.connect();
-		InputStream is = connection.getInputStream();
+		var is = connection.getInputStream();
 		return parseXmlToDocument(is);
 	}
 
 	protected static Document parseXmlToDocument(InputStream is)
 			throws ParserConfigurationException, SAXException, IOException {
-		DocumentBuilderFactory dbFactory = DocumentBuilderFactory.newInstance();
-		DocumentBuilder dBuilder = dbFactory.newDocumentBuilder();
-		Document doc = dBuilder.parse(is);
+		var dbFactory = DocumentBuilderFactory.newInstance();
+		var dBuilder = dbFactory.newDocumentBuilder();
+		var doc = dBuilder.parse(is);
 		doc.getDocumentElement().normalize();
 		return doc;
 	}
 
 	/**
 	 * Parses the config xml file.
-	 * 
+	 *
 	 * @param doc the XML document
 	 * @return a list of FieldbusModules
 	 */
 	protected List<FieldbusModule> parseXml(Document doc) {
-		FieldbusModuleFactory factory = new FieldbusModuleFactory();
+		var factory = new FieldbusModuleFactory();
 		List<FieldbusModule> result = new ArrayList<>();
-		Element wagoElement = doc.getDocumentElement();
-		int offset0 = 0;
-		int offset512 = 512;
+		var wagoElement = doc.getDocumentElement();
+		var offset0 = 0;
+		var offset512 = 512;
 
 		// parse all "Module" XML elements
-		NodeList moduleNodes = wagoElement.getElementsByTagName("Module");
-		for (int i = 0; i < moduleNodes.getLength(); i++) {
-			Node moduleNode = moduleNodes.item(i);
+		var moduleNodes = wagoElement.getElementsByTagName("Module");
+		for (var i = 0; i < moduleNodes.getLength(); i++) {
+			var moduleNode = moduleNodes.item(i);
 			// get "Module" node attributes
-			NamedNodeMap moduleAttrs = moduleNode.getAttributes();
-			String moduleArtikelnr = moduleAttrs.getNamedItem("ARTIKELNR").getNodeValue();
-			String moduleType = moduleAttrs.getNamedItem("MODULETYPE").getNodeValue();
+			var moduleAttrs = moduleNode.getAttributes();
+			var moduleArtikelnr = moduleAttrs.getNamedItem("ARTIKELNR").getNodeValue();
+			var moduleType = moduleAttrs.getNamedItem("MODULETYPE").getNodeValue();
 			if (moduleNode.getNodeType() != Node.ELEMENT_NODE) {
 				continue;
 			}
-			Element moduleElement = (Element) moduleNode;
+			var moduleElement = (Element) moduleNode;
 			// parse all "Kanal" XML elements inside the "Module" element
-			NodeList kanalNodes = moduleElement.getElementsByTagName("Kanal");
-			FieldbusModuleKanal[] kanals = new FieldbusModuleKanal[kanalNodes.getLength()];
-			for (int j = 0; j < kanalNodes.getLength(); j++) {
-				Node kanalNode = kanalNodes.item(j);
+			var kanalNodes = moduleElement.getElementsByTagName("Kanal");
+			var kanals = new FieldbusModuleKanal[kanalNodes.getLength()];
+			for (var j = 0; j < kanalNodes.getLength(); j++) {
+				var kanalNode = kanalNodes.item(j);
 				if (kanalNode.getNodeType() != Node.ELEMENT_NODE) {
 					continue;
 				}
-				NamedNodeMap kanalAttrs = kanalNode.getAttributes();
-				String channelName = kanalAttrs.getNamedItem("CHANNELNAME").getNodeValue();
-				String channelType = kanalAttrs.getNamedItem("CHANNELTYPE").getNodeValue();
+				var kanalAttrs = kanalNode.getAttributes();
+				var channelName = kanalAttrs.getNamedItem("CHANNELNAME").getNodeValue();
+				var channelType = kanalAttrs.getNamedItem("CHANNELTYPE").getNodeValue();
 				kanals[j] = new FieldbusModuleKanal(channelName, channelType);
 			}
 			// Create FieldbusModule instance using factory method
-			FieldbusModule module = factory.of(this, moduleArtikelnr, moduleType, kanals, offset0, offset512);
+			var module = factory.of(this, moduleArtikelnr, moduleType, kanals, offset0, offset512);
 			assert module.getInputCoil512Elements().length == module.getOutputCoil512Elements().length;
 			offset0 += module.getInputCoil0Elements().length;
 			offset512 += module.getOutputCoil512Elements().length;
@@ -237,7 +234,7 @@ protected List<FieldbusModule> parseXml(Document doc) {
 
 	/**
 	 * Takes a list of FieldbusModules and adds Modbus tasks to the protocol.
-	 * 
+	 *
 	 * @param modules lit of {@link FieldbusModule}s
 	 * @throws OpenemsException on error
 	 */
@@ -245,14 +242,10 @@ protected void createProtocolFromModules(List<FieldbusModule> modules) throws Op
 		List<ModbusCoilElement> readCoilElements0 = new ArrayList<>();
 		List<ModbusCoilElement> readCoilElements512 = new ArrayList<>();
 		for (FieldbusModule module : modules) {
-			for (ModbusCoilElement element : module.getInputCoil0Elements()) {
-				readCoilElements0.add(element);
-			}
-			for (ModbusCoilElement element : module.getInputCoil512Elements()) {
-				readCoilElements512.add(element);
-			}
+			Collections.addAll(readCoilElements0, module.getInputCoil0Elements());
+			Collections.addAll(readCoilElements512, module.getInputCoil512Elements());
 			for (ModbusCoilElement element : module.getOutputCoil512Elements()) {
-				FC5WriteCoilTask writeCoilTask = new FC5WriteCoilTask(element.getStartAddress(), element);
+				var writeCoilTask = new FC5WriteCoilTask(element.getStartAddress(), element);
 				this.protocol.addTask(writeCoilTask);
 			}
 		}
@@ -269,13 +262,13 @@ protected void createProtocolFromModules(List<FieldbusModule> modules) throws Op
 	/**
 	 * Creates a Modbus {@link CoilElement} on the address and maps it to the given
 	 * Channel-ID.
-	 * 
+	 *
 	 * @param channelId the Channel-ID
 	 * @param address   the modbus start address of the coil
 	 * @return the modbus {@link CoilElement}
 	 */
 	protected CoilElement createModbusCoilElement(io.openems.edge.common.channel.ChannelId channelId, int address) {
-		return m(channelId, new CoilElement(address));
+		return this.m(channelId, new CoilElement(address));
 	}
 
 	@Override
@@ -286,6 +279,7 @@ protected ModbusProtocol defineModbusProtocol() throws OpenemsException {
 		return this.protocol;
 	}
 
+	@Override
 	@Deactivate
 	protected void deactivate() {
 		super.deactivate();
@@ -302,12 +296,12 @@ public String debugLog() {
 		if (this.modules.isEmpty()) {
 			return "";
 		}
-		StringBuilder b = new StringBuilder();
-		for (int i = 0; i < this.modules.size(); i++) {
+		var b = new StringBuilder();
+		for (var i = 0; i < this.modules.size(); i++) {
 			b.append("M" + i + ":");
-			BooleanReadChannel[] channels = this.modules.get(i).getChannels();
-			for (int j = 0; j < channels.length; j++) {
-				Optional<Boolean> valueOpt = channels[j].value().asOptional();
+			var channels = this.modules.get(i).getChannels();
+			for (BooleanReadChannel channel : channels) {
+				var valueOpt = channel.value().asOptional();
 				if (valueOpt.isPresent()) {
 					b.append(valueOpt.get() ? "x" : "-");
 				} else {
@@ -325,12 +319,10 @@ public String debugLog() {
 	public BooleanReadChannel[] digitalInputChannels() {
 		List<BooleanReadChannel> channels = new ArrayList<>();
 		for (FieldbusModule module : this.modules) {
-			for (BooleanReadChannel channel : module.getChannels()) {
-				channels.add(channel);
-			}
+			Collections.addAll(channels, module.getChannels());
 		}
-		BooleanReadChannel[] result = new BooleanReadChannel[channels.size()];
-		for (int i = 0; i < channels.size(); i++) {
+		var result = new BooleanReadChannel[channels.size()];
+		for (var i = 0; i < channels.size(); i++) {
 			result[i] = channels.get(i);
 		}
 		return result;
@@ -346,8 +338,8 @@ public BooleanWriteChannel[] digitalOutputChannels() {
 				}
 			}
 		}
-		BooleanWriteChannel[] result = new BooleanWriteChannel[channels.size()];
-		for (int i = 0; i < channels.size(); i++) {
+		var result = new BooleanWriteChannel[channels.size()];
+		for (var i = 0; i < channels.size(); i++) {
 			result[i] = channels.get(i);
 		}
 		return result;
diff --git a/io.openems.edge.io.wago/test/io/openems/edge/wago/MyConfig.java b/io.openems.edge.io.wago/test/io/openems/edge/wago/MyConfig.java
index 685202945bf..c8dd0012911 100644
--- a/io.openems.edge.io.wago/test/io/openems/edge/wago/MyConfig.java
+++ b/io.openems.edge.io.wago/test/io/openems/edge/wago/MyConfig.java
@@ -19,12 +19,12 @@ public Builder setId(String id) {
 			this.id = id;
 			return this;
 		}
-		
+
 		public Builder setUsername(String username) {
 			this.username = username;
 			return this;
 		}
-		
+
 		public Builder setPassword(String password) {
 			this.password = password;
 			return this;
@@ -42,7 +42,7 @@ public MyConfig build() {
 
 	/**
 	 * Create a Config builder.
-	 * 
+	 *
 	 * @return a {@link Builder}
 	 */
 	public static Builder create() {
diff --git a/io.openems.edge.io.wago/test/io/openems/edge/wago/WagoTest.java b/io.openems.edge.io.wago/test/io/openems/edge/wago/WagoTest.java
index eb8748ffcd4..11393dc0a94 100644
--- a/io.openems.edge.io.wago/test/io/openems/edge/wago/WagoTest.java
+++ b/io.openems.edge.io.wago/test/io/openems/edge/wago/WagoTest.java
@@ -4,10 +4,8 @@
 
 import java.io.ByteArrayInputStream;
 import java.io.InputStream;
-import java.util.List;
 
 import org.junit.Test;
-import org.w3c.dom.Document;
 
 import io.openems.edge.bridge.modbus.api.task.FC1ReadCoilsTask;
 import io.openems.edge.bridge.modbus.api.task.FC5WriteCoilTask;
@@ -55,7 +53,7 @@ public class WagoTest {
 
 	@Test
 	public void test() throws Exception {
-		Wago sut = new Wago();
+		var sut = new Wago();
 		new ComponentTest(sut) //
 				.addReference("cm", new DummyConfigurationAdmin()) //
 				.addReference("setModbus", new DummyModbusBridge(MODBUS_ID)) //
@@ -68,16 +66,16 @@ public void test() throws Exception {
 		;
 
 		InputStream dummyXml = new ByteArrayInputStream(EA_CONFIG.getBytes());
-		Document doc = Wago.parseXmlToDocument(dummyXml);
+		var doc = Wago.parseXmlToDocument(dummyXml);
 
-		List<FieldbusModule> modules = sut.parseXml(doc);
+		var modules = sut.parseXml(doc);
 		assertEquals(Fieldbus5xxDO.class, modules.get(0).getClass());
 		assertEquals(Fieldbus523RO1Ch.class, modules.get(1).getClass());
 
 		sut.createProtocolFromModules(modules);
 
 		{
-			List<ReadTask> readTasks = sut.protocol.getReadTasksManager().getAllTasks();
+			var readTasks = sut.protocol.getReadTasksManager().getAllTasks();
 			ReadTask t;
 			{
 				t = readTasks.get(0);
@@ -94,7 +92,7 @@ public void test() throws Exception {
 		}
 
 		{
-			List<WriteTask> writeTasks = sut.protocol.getWriteTasksManager().getAllTasks();
+			var writeTasks = sut.protocol.getWriteTasksManager().getAllTasks();
 			System.out.println(writeTasks);
 			WriteTask t;
 			{

From 064d392fcf28a34ec364823e524212410ac35e5a Mon Sep 17 00:00:00 2001
From: Stefan Feilmeier <stefan.feilmeier@fenecon.de>
Date: Tue, 8 Mar 2022 15:00:29 +0100
Subject: [PATCH 77/96] Update io.openems.edge.kostal.piko

---
 .../piko/charger/KostalPikoCharger.java       |  6 +-
 .../core/api/BatteryCurrentDirection.java     |  4 +-
 .../piko/core/impl/KostalPikoCoreImpl.java    | 11 +--
 .../edge/kostal/piko/core/impl/Protocol.java  | 79 +++++++++----------
 .../edge/kostal/piko/core/impl/ReadTask.java  | 12 +--
 .../piko/core/impl/SocketConnection.java      | 12 +--
 .../edge/kostal/piko/core/impl/Worker.java    |  4 +-
 .../edge/kostal/piko/ess/KostalPikoEss.java   |  6 +-
 .../piko/gridmeter/KostalPikoGridMeter.java   |  6 +-
 9 files changed, 69 insertions(+), 71 deletions(-)

diff --git a/io.openems.edge.kostal.piko/src/io/openems/edge/kostal/piko/charger/KostalPikoCharger.java b/io.openems.edge.kostal.piko/src/io/openems/edge/kostal/piko/charger/KostalPikoCharger.java
index 94a0d9bc6c5..1774345f242 100644
--- a/io.openems.edge.kostal.piko/src/io/openems/edge/kostal/piko/charger/KostalPikoCharger.java
+++ b/io.openems.edge.kostal.piko/src/io/openems/edge/kostal/piko/charger/KostalPikoCharger.java
@@ -38,7 +38,7 @@ public class KostalPikoCharger extends AbstractOpenemsComponent implements EssDc
 	@Reference
 	protected ConfigurationAdmin cm;
 
-	private AtomicReference<KostalPikoCore> core = new AtomicReference<>();
+	private final AtomicReference<KostalPikoCore> core = new AtomicReference<>();
 
 	@Reference(policy = ReferencePolicy.STATIC, policyOption = ReferencePolicyOption.GREEDY, cardinality = ReferenceCardinality.MANDATORY)
 	protected void setCore(KostalPikoCore core) {
@@ -77,11 +77,11 @@ public KostalPikoCharger() {
 	void activate(ComponentContext context, Config config) {
 		super.activate(context, config.id(), config.alias(), config.enabled());
 		// update filter for 'Core'
-		if (OpenemsComponent.updateReferenceFilter(cm, this.servicePid(), "Core", config.core_id())) {
-			return;
+		if (OpenemsComponent.updateReferenceFilter(this.cm, this.servicePid(), "Core", config.core_id())) {
 		}
 	}
 
+	@Override
 	@Deactivate
 	protected void deactivate() {
 		super.deactivate();
diff --git a/io.openems.edge.kostal.piko/src/io/openems/edge/kostal/piko/core/api/BatteryCurrentDirection.java b/io.openems.edge.kostal.piko/src/io/openems/edge/kostal/piko/core/api/BatteryCurrentDirection.java
index d18238c61b4..b6965a4146b 100644
--- a/io.openems.edge.kostal.piko/src/io/openems/edge/kostal/piko/core/api/BatteryCurrentDirection.java
+++ b/io.openems.edge.kostal.piko/src/io/openems/edge/kostal/piko/core/api/BatteryCurrentDirection.java
@@ -17,12 +17,12 @@ private BatteryCurrentDirection(int value, String name) {
 
 	@Override
 	public int getValue() {
-		return value;
+		return this.value;
 	}
 
 	@Override
 	public String getName() {
-		return name;
+		return this.name;
 	}
 
 	@Override
diff --git a/io.openems.edge.kostal.piko/src/io/openems/edge/kostal/piko/core/impl/KostalPikoCoreImpl.java b/io.openems.edge.kostal.piko/src/io/openems/edge/kostal/piko/core/impl/KostalPikoCoreImpl.java
index 4f022b3447b..d8a9a0585b8 100644
--- a/io.openems.edge.kostal.piko/src/io/openems/edge/kostal/piko/core/impl/KostalPikoCoreImpl.java
+++ b/io.openems.edge.kostal.piko/src/io/openems/edge/kostal/piko/core/impl/KostalPikoCoreImpl.java
@@ -94,7 +94,7 @@ public KostalPikoCoreImpl() {
 				OpenemsComponent.ChannelId.values(), //
 				KostalPikoCore.ChannelId.values() //
 		);
-		this.readTasksManager = new TasksManager<ReadTask>(//
+		this.readTasksManager = new TasksManager<>(//
 				/*
 				 * ONCE
 				 */
@@ -295,11 +295,12 @@ public KostalPikoCoreImpl() {
 	void activate(ComponentContext context, Config config) {
 		super.activate(context, config.id(), config.alias(), config.enabled());
 		this.socketConnection = new SocketConnection(config.ip(), config.port(), (byte) config.unitID());
-		Protocol protocol = new Protocol(this, socketConnection);
+		var protocol = new Protocol(this, this.socketConnection);
 		this.worker = new Worker(protocol, this.readTasksManager);
 		this.worker.activate(config.id());
 	}
 
+	@Override
 	@Deactivate
 	protected void deactivate() {
 		if (this.worker != null) {
@@ -330,13 +331,13 @@ private void calculateDerivedChannelValues() {
 			// calculate Charger ActivePower
 			Channel<Float> pvPower1 = this.channel(KostalPikoCore.ChannelId.DC_POWER_STRING_1);
 			Channel<Float> pvPower2 = this.channel(KostalPikoCore.ChannelId.DC_POWER_STRING_2);
-			float pvPower = pvPower1.value().orElse(0f) + pvPower2.value().orElse(0f);
+			var pvPower = pvPower1.value().orElse(0f) + pvPower2.value().orElse(0f);
 			this.charger._setActualPower(Math.round(pvPower));
 
 			// calculate ESS ActivePower
 			Channel<Float> gridAcPTotalChannel = this.channel(KostalPikoCore.ChannelId.GRID_AC_P_TOTAL);
 			float gridAcPTotal = gridAcPTotalChannel.value().orElse(0f);
-			float essActivPower = (pvPower - gridAcPTotal);
+			var essActivPower = pvPower - gridAcPTotal;
 			this.ess._setActivePower(Math.round(essActivPower));
 
 			// calculate Meter ActivePower
@@ -356,7 +357,7 @@ private void calculateDerivedChannelValues() {
 			float homePwL2 = homePowerL2.value().orElse(0f);
 			float homePwL3 = homePowerL3.value().orElse(0f);
 
-			float load = homeConsmBatttery + homeConsmGrid + homePwL1 + homePwL2 + homePwL3;
+			var load = homeConsmBatttery + homeConsmGrid + homePwL1 + homePwL2 + homePwL3;
 			this.meter._setActivePower(Math.round(load - gridAcPTotal));
 		}
 
diff --git a/io.openems.edge.kostal.piko/src/io/openems/edge/kostal/piko/core/impl/Protocol.java b/io.openems.edge.kostal.piko/src/io/openems/edge/kostal/piko/core/impl/Protocol.java
index 3e3ab04f6e2..7ced2bcb9fb 100644
--- a/io.openems.edge.kostal.piko/src/io/openems/edge/kostal/piko/core/impl/Protocol.java
+++ b/io.openems.edge.kostal.piko/src/io/openems/edge/kostal/piko/core/impl/Protocol.java
@@ -32,23 +32,23 @@ public void execute(List<ReadTask> nextReadTasks) {
 				Channel<?> channel = task.getComponent().channel(task.getChannelId());
 				switch (task.getFieldType()) {
 				case STRING:
-					channel.setNextValue(getStringValue(task.getAddress()));
+					channel.setNextValue(this.getStringValue(task.getAddress()));
 					break;
 				case INTEGER:
-					channel.setNextValue(getIntegerValue(task.getAddress()));
+					channel.setNextValue(this.getIntegerValue(task.getAddress()));
 					break;
 				case BOOLEAN:
-					channel.setNextValue(getBooleanValue(task.getAddress()));
+					channel.setNextValue(this.getBooleanValue(task.getAddress()));
 					break;
 				case INTEGER_UNSIGNED_BYTE:
-					channel.setNextValue(getIntegerFromUnsignedByte(task.getAddress()));
+					channel.setNextValue(this.getIntegerFromUnsignedByte(task.getAddress()));
 					break;
 				case FLOAT:
-					channel.setNextValue(getFloatValue(task.getAddress()));
+					channel.setNextValue(this.getFloatValue(task.getAddress()));
 					break;
 				}
 			} catch (OpenemsException e) {
-				log.warn("KOSTAL Protocol error. " + e.getClass().getSimpleName() + ": " + e.getMessage()
+				this.log.warn("KOSTAL Protocol error. " + e.getClass().getSimpleName() + ": " + e.getMessage()
 						+ " while executing " + task.toString());
 
 				this.parent.channel(ChannelId.UNABLE_TO_READ_DATA).setNextValue(true);
@@ -59,7 +59,7 @@ public void execute(List<ReadTask> nextReadTasks) {
 	}
 
 	protected boolean getBooleanValue(int address) throws OpenemsException {
-		byte[] bytes = sendAndReceive(address);
+		var bytes = this.sendAndReceive(address);
 		if (bytes[0] == 1) {
 			return true;
 		}
@@ -67,18 +67,18 @@ protected boolean getBooleanValue(int address) throws OpenemsException {
 	}
 
 	protected int getIntegerFromUnsignedByte(int address) throws OpenemsException {
-		byte[] bytes = sendAndReceive(address);
-		return (int) ByteBuffer.wrap(bytes).get() & (0xFF);
+		var bytes = this.sendAndReceive(address);
+		return ByteBuffer.wrap(bytes).get() & 0xFF;
 	}
 
 	protected float getFloatValue(int address) throws OpenemsException {
-		byte[] bytes = sendAndReceive(address);
+		var bytes = this.sendAndReceive(address);
 		return ByteBuffer.wrap(bytes).order(ByteOrder.LITTLE_ENDIAN).getFloat();
 	}
 
 	protected int getIntegerValue(int address) throws OpenemsException {
-		byte[] bytes = sendAndReceive(address);
-		ByteBuffer b = ByteBuffer.allocate(4).putInt(0).order(ByteOrder.LITTLE_ENDIAN);
+		var bytes = this.sendAndReceive(address);
+		var b = ByteBuffer.allocate(4).putInt(0).order(ByteOrder.LITTLE_ENDIAN);
 		b.rewind();
 		b.put(bytes);
 		b.rewind();
@@ -86,26 +86,25 @@ protected int getIntegerValue(int address) throws OpenemsException {
 	}
 
 	protected String getStringValue(int address) throws OpenemsException {
-		String stringValue = "";
-		byte[] byi = sendAndReceive(address);
+		var stringValue = new StringBuilder();
+		var byi = this.sendAndReceive(address);
 		for (byte b : byi) {
 			if (b == 0) {
 				break;
 			}
-			stringValue += (char) b;
+			stringValue.append((char) b);
 		}
-		return stringValue.trim();
+		return stringValue.toString().trim();
 	}
 
 	private byte[] addressWithByteBuffer(int address) {
-		ByteBuffer byteBuffer = ByteBuffer.allocate(4);
+		var byteBuffer = ByteBuffer.allocate(4);
 		byteBuffer.order(ByteOrder.LITTLE_ENDIAN);
-		byteBuffer.put((byte) ((address) & (0xff)));
-		byteBuffer.put((byte) (((address) >> 8) & (0xff)));
-		byteBuffer.put((byte) (((address) >> 16) & (0xff)));
-		byteBuffer.put((byte) (((address) >> 24) & (0xff)));
-		byte[] result = byteBuffer.array();
-		return result;
+		byteBuffer.put((byte) (address & 0xff));
+		byteBuffer.put((byte) (address >> 8 & 0xff));
+		byteBuffer.put((byte) (address >> 16 & 0xff));
+		byteBuffer.put((byte) (address >> 24 & 0xff));
+		return byteBuffer.array();
 	}
 
 	private byte[] sendAndReceive(int address) throws OpenemsException {
@@ -114,18 +113,18 @@ private byte[] sendAndReceive(int address) throws OpenemsException {
 		/*
 		 * convert address to byte array
 		 */
-		byte[] result = addressWithByteBuffer(address);
+		var result = this.addressWithByteBuffer(address);
 
 		/*
 		 * Calculate Checksum
 		 */
-		byte checksum = calculateChecksumFromAddress(result);
+		var checksum = this.calculateChecksumFromAddress(result);
 		/*
 		 * Build Request
 		 */
-		byte[] request = new byte[] { 0x62, (byte) this.socketConnection.getUnitID(), 0x03,
-				(byte) this.socketConnection.getUnitID(), 0x00, (byte) 0xf0, Array.getByte(result, 0),
-				Array.getByte(result, 1), Array.getByte(result, 2), Array.getByte(result, 3), checksum, 0x00 };
+		byte[] request = { 0x62, this.socketConnection.getUnitID(), 0x03, this.socketConnection.getUnitID(), 0x00,
+				(byte) 0xf0, Array.getByte(result, 0), Array.getByte(result, 1), Array.getByte(result, 2),
+				Array.getByte(result, 3), checksum, 0x00 };
 		List<Byte> datasList = new ArrayList<>();
 		try {
 			/*
@@ -138,7 +137,7 @@ private byte[] sendAndReceive(int address) throws OpenemsException {
 			 * Receive
 			 */
 			while (this.socketConnection.getIn().available() > 0) {
-				byte data = (byte) this.socketConnection.getIn().read();
+				var data = (byte) this.socketConnection.getIn().read();
 				datasList.add(data);
 			}
 		} catch (IOException | InterruptedException e) {
@@ -147,14 +146,14 @@ private byte[] sendAndReceive(int address) throws OpenemsException {
 		if (datasList.isEmpty()) {
 			throw new OpenemsException("Could not receive any data");
 		}
-		byte[] datas = new byte[datasList.size()];
-		for (int i = 0; i < datasList.size(); i++) {
+		var datas = new byte[datasList.size()];
+		for (var i = 0; i < datasList.size(); i++) {
 			datas[i] = datasList.get(i);
 		}
 		/*
 		 * Verify Checksum of Reply
 		 */
-		boolean isChecksumOk = verifyChecksumOfReply(datas);
+		var isChecksumOk = this.verifyChecksumOfReply(datas);
 		if (!isChecksumOk) {
 			throw new OpenemsException("Checksum cannot be verified");
 		}
@@ -163,7 +162,7 @@ private byte[] sendAndReceive(int address) throws OpenemsException {
 		 */
 		results = new byte[datas.length - 7];
 
-		for (int i = 5; i < datas.length - 2; i++) {
+		for (var i = 5; i < datas.length - 2; i++) {
 			results[i - 5] = datas[i];
 		}
 		/*
@@ -174,19 +173,19 @@ private byte[] sendAndReceive(int address) throws OpenemsException {
 
 	private byte calculateChecksumFromAddress(byte[] result) {
 		byte checksum = 0x00;
-		byte[] request = new byte[] { 0x62, (byte) this.socketConnection.getUnitID(), 0x03,
-				(byte) this.socketConnection.getUnitID(), Array.getByte(result, 0), 0x00, (byte) 0xf0,
-				Array.getByte(result, 1), Array.getByte(result, 2), Array.getByte(result, 3) };
-		for (int i = 0; i < request.length; i++) {
-			checksum -= request[i];
+		byte[] request = { 0x62, this.socketConnection.getUnitID(), 0x03, this.socketConnection.getUnitID(),
+				Array.getByte(result, 0), 0x00, (byte) 0xf0, Array.getByte(result, 1), Array.getByte(result, 2),
+				Array.getByte(result, 3) };
+		for (byte element : request) {
+			checksum -= element;
 		}
 		return checksum;
 	}
 
 	private boolean verifyChecksumOfReply(byte[] data) {
 		byte checksum = 0x00;
-		for (int i = 0; i < data.length; i++) {
-			checksum += data[i];
+		for (byte element : data) {
+			checksum += element;
 		}
 		return checksum == 0x00;
 	}
diff --git a/io.openems.edge.kostal.piko/src/io/openems/edge/kostal/piko/core/impl/ReadTask.java b/io.openems.edge.kostal.piko/src/io/openems/edge/kostal/piko/core/impl/ReadTask.java
index d7543e97012..5fc0614edbd 100644
--- a/io.openems.edge.kostal.piko/src/io/openems/edge/kostal/piko/core/impl/ReadTask.java
+++ b/io.openems.edge.kostal.piko/src/io/openems/edge/kostal/piko/core/impl/ReadTask.java
@@ -23,19 +23,19 @@ public ReadTask(OpenemsComponent component, ChannelId channelId, Priority priori
 	}
 
 	public OpenemsComponent getComponent() {
-		return component;
+		return this.component;
 	}
 
 	public ChannelId getChannelId() {
-		return channelId;
+		return this.channelId;
 	}
 
 	public FieldType getFieldType() {
-		return fieldType;
+		return this.fieldType;
 	}
 
 	public int getAddress() {
-		return address;
+		return this.address;
 	}
 
 	@Override
@@ -45,8 +45,8 @@ public Priority getPriority() {
 
 	@Override
 	public String toString() {
-		return "ReadTask [channelId=" + channelId + ", priority=" + priority + ", fieldType=" + fieldType + ", address="
-				+ address + "]";
+		return "ReadTask [channelId=" + this.channelId + ", priority=" + this.priority + ", fieldType=" + this.fieldType
+				+ ", address=" + this.address + "]";
 	}
 
 }
diff --git a/io.openems.edge.kostal.piko/src/io/openems/edge/kostal/piko/core/impl/SocketConnection.java b/io.openems.edge.kostal.piko/src/io/openems/edge/kostal/piko/core/impl/SocketConnection.java
index edc55a57e14..956b52b1af4 100644
--- a/io.openems.edge.kostal.piko/src/io/openems/edge/kostal/piko/core/impl/SocketConnection.java
+++ b/io.openems.edge.kostal.piko/src/io/openems/edge/kostal/piko/core/impl/SocketConnection.java
@@ -29,7 +29,7 @@ public SocketConnection(String host, int port, byte unitID) {
 	}
 
 	public byte getUnitID() {
-		return unitID;
+		return this.unitID;
 	}
 
 	public void open() throws OpenemsException {
@@ -37,7 +37,7 @@ public void open() throws OpenemsException {
 			return;
 		}
 		try {
-			Socket socket = new Socket(this.host, this.port);
+			var socket = new Socket(this.host, this.port);
 			this.out = socket.getOutputStream();
 			this.in = socket.getInputStream();
 			this.socket = socket;
@@ -47,14 +47,14 @@ public void open() throws OpenemsException {
 	}
 
 	public void close() {
-		if (in != null) {
+		if (this.in != null) {
 			try {
 				this.in.close();
 			} catch (IOException e) {
 				this.log.error("In Stream Closed: " + e.getMessage());
 			}
 		}
-		if (out != null) {
+		if (this.out != null) {
 			try {
 				this.out.close();
 			} catch (IOException e) {
@@ -71,10 +71,10 @@ public void close() {
 	}
 
 	public OutputStream getOut() {
-		return out;
+		return this.out;
 	}
 
 	public InputStream getIn() {
-		return in;
+		return this.in;
 	}
 }
diff --git a/io.openems.edge.kostal.piko/src/io/openems/edge/kostal/piko/core/impl/Worker.java b/io.openems.edge.kostal.piko/src/io/openems/edge/kostal/piko/core/impl/Worker.java
index f8abe4853ca..c06e23d69d5 100644
--- a/io.openems.edge.kostal.piko/src/io/openems/edge/kostal/piko/core/impl/Worker.java
+++ b/io.openems.edge.kostal.piko/src/io/openems/edge/kostal/piko/core/impl/Worker.java
@@ -1,7 +1,5 @@
 package io.openems.edge.kostal.piko.core.impl;
 
-import java.util.List;
-
 import io.openems.common.worker.AbstractCycleWorker;
 import io.openems.edge.common.taskmanager.TasksManager;
 
@@ -17,7 +15,7 @@ public Worker(Protocol protocol, TasksManager<ReadTask> readTasksManager) {
 
 	@Override
 	protected void forever() {
-		List<ReadTask> nextReadTasks = this.readTasksManager.getNextTasks();
+		var nextReadTasks = this.readTasksManager.getNextTasks();
 		this.protocol.execute(nextReadTasks);
 	}
 }
diff --git a/io.openems.edge.kostal.piko/src/io/openems/edge/kostal/piko/ess/KostalPikoEss.java b/io.openems.edge.kostal.piko/src/io/openems/edge/kostal/piko/ess/KostalPikoEss.java
index 2fb6c7a455c..60c0ef01398 100644
--- a/io.openems.edge.kostal.piko/src/io/openems/edge/kostal/piko/ess/KostalPikoEss.java
+++ b/io.openems.edge.kostal.piko/src/io/openems/edge/kostal/piko/ess/KostalPikoEss.java
@@ -34,7 +34,7 @@ public class KostalPikoEss extends AbstractOpenemsComponent implements Symmetric
 	@Reference
 	protected ConfigurationAdmin cm;
 
-	private AtomicReference<KostalPikoCore> core = new AtomicReference<>();
+	private final AtomicReference<KostalPikoCore> core = new AtomicReference<>();
 
 	@Reference(policy = ReferencePolicy.STATIC, policyOption = ReferencePolicyOption.GREEDY, cardinality = ReferenceCardinality.MANDATORY)
 	protected void setCore(KostalPikoCore core) {
@@ -73,11 +73,11 @@ public KostalPikoEss() {
 	void activate(ComponentContext context, Config config) {
 		super.activate(context, config.id(), config.alias(), config.enabled());
 		// update filter for 'Core'
-		if (OpenemsComponent.updateReferenceFilter(cm, this.servicePid(), "Core", config.core_id())) {
-			return;
+		if (OpenemsComponent.updateReferenceFilter(this.cm, this.servicePid(), "Core", config.core_id())) {
 		}
 	}
 
+	@Override
 	@Deactivate
 	protected void deactivate() {
 		super.deactivate();
diff --git a/io.openems.edge.kostal.piko/src/io/openems/edge/kostal/piko/gridmeter/KostalPikoGridMeter.java b/io.openems.edge.kostal.piko/src/io/openems/edge/kostal/piko/gridmeter/KostalPikoGridMeter.java
index 7d47f31c85f..3b11877cfcc 100644
--- a/io.openems.edge.kostal.piko/src/io/openems/edge/kostal/piko/gridmeter/KostalPikoGridMeter.java
+++ b/io.openems.edge.kostal.piko/src/io/openems/edge/kostal/piko/gridmeter/KostalPikoGridMeter.java
@@ -37,7 +37,7 @@ public class KostalPikoGridMeter extends AbstractOpenemsComponent implements Sym
 	@Reference
 	protected ConfigurationAdmin cm;
 
-	private AtomicReference<KostalPikoCore> core = new AtomicReference<>();
+	private final AtomicReference<KostalPikoCore> core = new AtomicReference<>();
 
 	@Reference(policy = ReferencePolicy.STATIC, policyOption = ReferencePolicyOption.GREEDY, cardinality = ReferenceCardinality.MANDATORY)
 	protected void setCore(KostalPikoCore core) {
@@ -76,11 +76,11 @@ public KostalPikoGridMeter() {
 	void activate(ComponentContext context, Config config) {
 		super.activate(context, config.id(), config.alias(), config.enabled());
 		// update filter for 'Core'
-		if (OpenemsComponent.updateReferenceFilter(cm, this.servicePid(), "Core", config.core_id())) {
-			return;
+		if (OpenemsComponent.updateReferenceFilter(this.cm, this.servicePid(), "Core", config.core_id())) {
 		}
 	}
 
+	@Override
 	@Deactivate
 	protected void deactivate() {
 		super.deactivate();

From 8e7364be31d37bb2161db0b24f1fd399e95f79f1 Mon Sep 17 00:00:00 2001
From: Stefan Feilmeier <stefan.feilmeier@fenecon.de>
Date: Tue, 8 Mar 2022 16:07:39 +0100
Subject: [PATCH 78/96] Update io.openems.edge.meter.*

---
 .../edge/meter/abb/b32/MeterAbbB23Mbus.java   |  23 ++-
 .../edge/meter/api/AsymmetricMeter.java       |  33 +--
 .../io/openems/edge/meter/api/MeterType.java  |   4 +-
 .../openems/edge/meter/api/SinglePhase.java   |   2 +-
 .../edge/meter/api/SinglePhaseMeter.java      |   4 +-
 .../edge/meter/api/SymmetricMeter.java        |  25 +--
 .../openems/edge/meter/api/VirtualMeter.java  |   4 +-
 .../meter/artemes/am2/MeterArtemesAM2.java    |  44 ++--
 .../edge/meter/artemes/am2/MyConfig.java      |   2 +-
 .../bcontrol/em300/MeterBControlEM300.java    |   1 +
 .../em300/MeterBControlEM300Impl.java         |  63 +++---
 .../edge/meter/bcontrol/em300/MyConfig.java   |   4 +-
 .../meter/carlo/gavazzi/em300/Config.java     |   2 +-
 .../gavazzi/em300/MeterCarloGavazziEm300.java |   1 +
 .../em300/MeterCarloGavazziEm300Impl.java     |  48 ++---
 .../meter/carlo/gavazzi/em300/MyConfig.java   |   2 +-
 .../meter/discovergy/DiscovergyApiClient.java |  35 ++--
 .../meter/discovergy/DiscovergyWorker.java    |  30 ++-
 .../meter/discovergy/MeterDiscovergy.java     |  21 +-
 .../discovergy/jsonrpc/DiscovergyMeter.java   |  34 +--
 .../edge/meter/discovergy/jsonrpc/Field.java  |   2 +-
 .../jsonrpc/GetFieldNamesRequest.java         |   8 +-
 .../jsonrpc/GetFieldNamesResponse.java        |   8 +-
 .../discovergy/jsonrpc/GetMetersRequest.java  |   6 +-
 .../discovergy/jsonrpc/GetMetersResponse.java |   4 +-
 .../janitza/umg511/MeterJanitzaUmg511.java    |   1 +
 .../umg511/MeterJanitzaUmg511Impl.java        |  45 ++--
 .../janitza/umg604/MeterJanitzaUmg604.java    |   1 +
 .../umg604/MeterJanitzaUmg604Impl.java        |  45 ++--
 .../umg96rme/MeterJanitzaUmg96rme.java        |  48 ++---
 .../edge/meter/janitza/umg511/MyConfig.java   |   2 +-
 .../edge/meter/janitza/umg604/MyConfig.java   |   2 +-
 .../edge/meter/janitza/umg96rme/MyConfig.java |   2 +-
 .../edge/meter/microcare/sdm630/Config.java   |   1 +
 .../sdm630/MeterMicrocareSdm630.java          |   5 +-
 .../sdm630/MeterMicrocareSdm630Impl.java      |  52 ++---
 .../edge/meter/microcare/sdm630/MyConfig.java |   2 +-
 .../meter/pqplus/umd96/MeterPqplusUmd96.java  |   1 +
 .../pqplus/umd96/MeterPqplusUmd96Impl.java    |  35 ++--
 .../meter/pqplus/umd97/MeterPqplusUmd97.java  |   1 +
 .../pqplus/umd97/MeterPqplusUmd97Impl.java    |  37 ++--
 .../edge/meter/pqplus/umd96/MyConfig.java     |   2 +-
 .../edge/meter/pqplus/umd97/MyConfig.java     |   2 +-
 .../MeterSchneiderActi9Smartlink.java         |  35 ++--
 .../schneider/acti9/smartlink/MyConfig.java   |   2 +-
 .../edge/meter/siemens/SiemensPacMeter.java   |   1 +
 .../meter/siemens/SiemensPacMeterImpl.java    |  45 ++--
 .../edge/meter/sma/shm20/MeterSmaShm20.java   |   7 +-
 .../meter/sma/shm20/MeterSmaShm20Impl.java    |  58 +++---
 .../edge/meter/sma/shm20/MyConfig.java        |   2 +-
 .../meter/socomec/AbstractSocomecMeter.java   |  18 +-
 .../edge/meter/socomec/SocomecMeter.java      |   1 +
 .../singlephase/SocomecMeterSinglephase.java  |   1 +
 .../SocomecMeterSinglephaseImpl.java          |  20 +-
 .../threephase/SocomecMeterThreephase.java    |   1 +
 .../SocomecMeterThreephaseImpl.java           | 194 +++++++++---------
 .../meter/socomec/singlephase/MyConfig.java   |   2 +-
 .../meter/socomec/threephase/MyConfig.java    |   2 +-
 .../meter/sunspec/AbstractSunSpecMeter.java   |   3 +-
 .../edge/meter/sunspec/MeterChannelId.java    |   1 +
 .../virtual/symmetric/add/VirtualAdd.java     |  23 ++-
 .../symmetric/subtract/ChannelManager.java    |   2 +-
 .../subtract/VirtualSubtractMeter.java        |   1 +
 .../virtual/symmetric/subtract/MyConfig.java  |   4 +-
 .../weidmueller/MeterWeidmueller525.java      | 126 ++++++------
 .../edge/meter/weidmueller/RotationField.java |   4 +-
 .../weidmueller/WeidmuellerChannelId.java     |   3 +-
 .../edge/meter/weidmueller/MyConfig.java      |   2 +-
 68 files changed, 651 insertions(+), 601 deletions(-)

diff --git a/io.openems.edge.meter.abb/src/io/openems/edge/meter/abb/b32/MeterAbbB23Mbus.java b/io.openems.edge.meter.abb/src/io/openems/edge/meter/abb/b32/MeterAbbB23Mbus.java
index 811316e8d0c..fce4d50f1da 100644
--- a/io.openems.edge.meter.abb/src/io/openems/edge/meter/abb/b32/MeterAbbB23Mbus.java
+++ b/io.openems.edge.meter.abb/src/io/openems/edge/meter/abb/b32/MeterAbbB23Mbus.java
@@ -17,8 +17,8 @@
 import io.openems.edge.bridge.mbus.api.AbstractOpenemsMbusComponent;
 import io.openems.edge.bridge.mbus.api.BridgeMbus;
 import io.openems.edge.bridge.mbus.api.ChannelRecord;
-import io.openems.edge.bridge.mbus.api.MbusTask;
 import io.openems.edge.bridge.mbus.api.ChannelRecord.DataType;
+import io.openems.edge.bridge.mbus.api.MbusTask;
 import io.openems.edge.common.channel.Doc;
 import io.openems.edge.common.component.OpenemsComponent;
 import io.openems.edge.meter.api.AsymmetricMeter;
@@ -55,6 +55,7 @@ private ChannelId(Doc doc) {
 			this.doc = doc;
 		}
 
+		@Override
 		public Doc doc() {
 			return this.doc;
 		}
@@ -76,6 +77,7 @@ void activate(ComponentContext context, Config config) {
 		this.mbus.addTask(config.id(), new MbusTask(this.mbus, this));
 	}
 
+	@Override
 	@Deactivate
 	protected void deactivate() {
 		super.deactivate();
@@ -88,16 +90,17 @@ public MeterType getMeterType() {
 
 	@Override
 	protected void addChannelDataRecords() {
-		this.channelDataRecordsList.add(new ChannelRecord(channel(ChannelId.TOTAL_CONSUMED_ENERGY), 0));
-		this.channelDataRecordsList.add(new ChannelRecord(channel(AsymmetricMeter.ChannelId.ACTIVE_POWER_L1), 1));
-		this.channelDataRecordsList.add(new ChannelRecord(channel(AsymmetricMeter.ChannelId.ACTIVE_POWER_L2), 2));
-		this.channelDataRecordsList.add(new ChannelRecord(channel(AsymmetricMeter.ChannelId.ACTIVE_POWER_L3), 3));
+		this.channelDataRecordsList.add(new ChannelRecord(this.channel(ChannelId.TOTAL_CONSUMED_ENERGY), 0));
+		this.channelDataRecordsList.add(new ChannelRecord(this.channel(AsymmetricMeter.ChannelId.ACTIVE_POWER_L1), 1));
+		this.channelDataRecordsList.add(new ChannelRecord(this.channel(AsymmetricMeter.ChannelId.ACTIVE_POWER_L2), 2));
+		this.channelDataRecordsList.add(new ChannelRecord(this.channel(AsymmetricMeter.ChannelId.ACTIVE_POWER_L3), 3));
 		// TODO mapping seems to be wrong; L3 is repeated
-		this.channelDataRecordsList.add(new ChannelRecord(channel(AsymmetricMeter.ChannelId.ACTIVE_POWER_L3), 4));
-		this.channelDataRecordsList.add(new ChannelRecord(channel(AsymmetricMeter.ChannelId.ACTIVE_POWER_L3), 5));
-		this.channelDataRecordsList.add(new ChannelRecord(channel(AsymmetricMeter.ChannelId.ACTIVE_POWER_L3), 6));
-		this.channelDataRecordsList.add(new ChannelRecord(channel(ChannelId.MANUFACTURER_ID), DataType.Manufacturer));
-		this.channelDataRecordsList.add(new ChannelRecord(channel(ChannelId.DEVICE_ID), DataType.DeviceId));
+		this.channelDataRecordsList.add(new ChannelRecord(this.channel(AsymmetricMeter.ChannelId.ACTIVE_POWER_L3), 4));
+		this.channelDataRecordsList.add(new ChannelRecord(this.channel(AsymmetricMeter.ChannelId.ACTIVE_POWER_L3), 5));
+		this.channelDataRecordsList.add(new ChannelRecord(this.channel(AsymmetricMeter.ChannelId.ACTIVE_POWER_L3), 6));
+		this.channelDataRecordsList
+				.add(new ChannelRecord(this.channel(ChannelId.MANUFACTURER_ID), DataType.Manufacturer));
+		this.channelDataRecordsList.add(new ChannelRecord(this.channel(ChannelId.DEVICE_ID), DataType.DeviceId));
 	}
 
 }
diff --git a/io.openems.edge.meter.api/src/io/openems/edge/meter/api/AsymmetricMeter.java b/io.openems.edge.meter.api/src/io/openems/edge/meter/api/AsymmetricMeter.java
index de07a23d05a..9b17eb56aff 100644
--- a/io.openems.edge.meter.api/src/io/openems/edge/meter/api/AsymmetricMeter.java
+++ b/io.openems.edge.meter.api/src/io/openems/edge/meter/api/AsymmetricMeter.java
@@ -15,13 +15,13 @@
 
 /**
  * Represents an Asymmetric Meter.
- * 
+ *
  * - Negative ActivePowerL1/L2/L3 and ConsumptionActivePowerL1/L2/L3 represent
  * Consumption, i.e. power that is 'leaving the system', e.g. feed-to-grid
- * 
+ *
  * - Positive ActivePowerL1/L2/L3 and ProductionActivePowerL1/L2/L3 represent
  * Production, i.e. power that is 'entering the system', e.g. buy-from-grid
- * 
+ *
  */
 public interface AsymmetricMeter extends SymmetricMeter {
 
@@ -30,7 +30,7 @@ public interface AsymmetricMeter extends SymmetricMeter {
 	public enum ChannelId implements io.openems.edge.common.channel.ChannelId {
 		/**
 		 * Active Power L1
-		 * 
+		 *
 		 * <ul>
 		 * <li>Interface: Meter Asymmetric
 		 * <li>Type: Integer
@@ -46,7 +46,7 @@ public enum ChannelId implements io.openems.edge.common.channel.ChannelId {
 				.text(POWER_DOC_TEXT)), //
 		/**
 		 * Active Power L2
-		 * 
+		 *
 		 * <ul>
 		 * <li>Interface: Meter Asymmetric
 		 * <li>Type: Integer
@@ -62,7 +62,7 @@ public enum ChannelId implements io.openems.edge.common.channel.ChannelId {
 				.text(POWER_DOC_TEXT)), //
 		/**
 		 * Active Power L3
-		 * 
+		 *
 		 * <ul>
 		 * <li>Interface: Meter Asymmetric
 		 * <li>Type: Integer
@@ -78,7 +78,7 @@ public enum ChannelId implements io.openems.edge.common.channel.ChannelId {
 				.text(POWER_DOC_TEXT)), //
 		/**
 		 * Reactive Power L1
-		 * 
+		 *
 		 * <ul>
 		 * <li>Interface: Meter Asymmetric
 		 * <li>Type: Integer
@@ -94,7 +94,7 @@ public enum ChannelId implements io.openems.edge.common.channel.ChannelId {
 				.text(POWER_DOC_TEXT)), //
 		/**
 		 * Reactive Power L2
-		 * 
+		 *
 		 * <ul>
 		 * <li>Interface: Meter Asymmetric
 		 * <li>Type: Integer
@@ -110,7 +110,7 @@ public enum ChannelId implements io.openems.edge.common.channel.ChannelId {
 				.text(POWER_DOC_TEXT)), //
 		/**
 		 * Reactive Power L3
-		 * 
+		 *
 		 * <ul>
 		 * <li>Interface: Meter Asymmetric
 		 * <li>Type: Integer
@@ -126,7 +126,7 @@ public enum ChannelId implements io.openems.edge.common.channel.ChannelId {
 				.text(POWER_DOC_TEXT)), //
 		/**
 		 * Voltage L1
-		 * 
+		 *
 		 * <ul>
 		 * <li>Interface: Meter Asymmetric
 		 * <li>Type: Integer
@@ -138,7 +138,7 @@ public enum ChannelId implements io.openems.edge.common.channel.ChannelId {
 				.persistencePriority(PersistencePriority.HIGH)), //
 		/**
 		 * Voltage L2
-		 * 
+		 *
 		 * <ul>
 		 * <li>Interface: Meter Asymmetric
 		 * <li>Type: Integer
@@ -150,7 +150,7 @@ public enum ChannelId implements io.openems.edge.common.channel.ChannelId {
 				.persistencePriority(PersistencePriority.HIGH)), //
 		/**
 		 * Voltage L3
-		 * 
+		 *
 		 * <ul>
 		 * <li>Interface: Meter Asymmetric
 		 * <li>Type: Integer
@@ -162,7 +162,7 @@ public enum ChannelId implements io.openems.edge.common.channel.ChannelId {
 				.persistencePriority(PersistencePriority.HIGH)), //
 		/**
 		 * Current L1
-		 * 
+		 *
 		 * <ul>
 		 * <li>Interface: Meter Asymmetric
 		 * <li>Type: Integer
@@ -174,7 +174,7 @@ public enum ChannelId implements io.openems.edge.common.channel.ChannelId {
 				.persistencePriority(PersistencePriority.HIGH)), //
 		/**
 		 * Current L2
-		 * 
+		 *
 		 * <ul>
 		 * <li>Interface: Meter Asymmetric
 		 * <li>Type: Integer
@@ -186,7 +186,7 @@ public enum ChannelId implements io.openems.edge.common.channel.ChannelId {
 				.persistencePriority(PersistencePriority.HIGH)), //
 		/**
 		 * Current L3
-		 * 
+		 *
 		 * <ul>
 		 * <li>Interface: Meter Asymmetric
 		 * <li>Type: Integer
@@ -203,6 +203,7 @@ private ChannelId(Doc doc) {
 			this.doc = doc;
 		}
 
+		@Override
 		public Doc doc() {
 			return this.doc;
 		}
@@ -693,7 +694,7 @@ public default void _setCurrentL3(int value) {
 	/**
 	 * Initializes Channel listeners to set the Active- and Reactive-Power Channel
 	 * value as the sum of L1 + L2 + L3.
-	 * 
+	 *
 	 * @param meter
 	 */
 	public static void initializePowerSumChannels(AsymmetricMeter meter) {
diff --git a/io.openems.edge.meter.api/src/io/openems/edge/meter/api/MeterType.java b/io.openems.edge.meter.api/src/io/openems/edge/meter/api/MeterType.java
index 5d861ce7a5a..fada215d490 100644
--- a/io.openems.edge.meter.api/src/io/openems/edge/meter/api/MeterType.java
+++ b/io.openems.edge.meter.api/src/io/openems/edge/meter/api/MeterType.java
@@ -23,7 +23,7 @@ public enum MeterType {
 	/**
 	 * Defines a Consumption-Meter that is metered, i.e. a meter that is measuring
 	 * an electric consumer like a heating-element or electric car.
-	 * 
+	 *
 	 * Note: Consumption is generally calculated using the data from Grid-Meter,
 	 * Production-Meter and charge/discharge of battery. The value of
 	 * CONSUMPTION_METERED is _not added_ to this calculated consumption as it is
@@ -33,7 +33,7 @@ public enum MeterType {
 	/**
 	 * Defines a Consumption-Meter that is NOT metered, i.e. a meter that is
 	 * measuring an electric consumer like a heating-element or electric car.
-	 * 
+	 *
 	 * Note: Consumption is generally calculated using the data from Grid-Meter,
 	 * Production-Meter and charge/discharge of battery. The value of
 	 * CONSUMPTION_NOT_METERED is _added_ to this calculated consumption as it is
diff --git a/io.openems.edge.meter.api/src/io/openems/edge/meter/api/SinglePhase.java b/io.openems.edge.meter.api/src/io/openems/edge/meter/api/SinglePhase.java
index 4ed0100f2d2..5e420e760d2 100644
--- a/io.openems.edge.meter.api/src/io/openems/edge/meter/api/SinglePhase.java
+++ b/io.openems.edge.meter.api/src/io/openems/edge/meter/api/SinglePhase.java
@@ -12,7 +12,7 @@ private SinglePhase(String symbol) {
 	}
 
 	public String getSymbol() {
-		return symbol;
+		return this.symbol;
 	}
 
 }
diff --git a/io.openems.edge.meter.api/src/io/openems/edge/meter/api/SinglePhaseMeter.java b/io.openems.edge.meter.api/src/io/openems/edge/meter/api/SinglePhaseMeter.java
index 8eae0d878d7..5e158ce5f20 100644
--- a/io.openems.edge.meter.api/src/io/openems/edge/meter/api/SinglePhaseMeter.java
+++ b/io.openems.edge.meter.api/src/io/openems/edge/meter/api/SinglePhaseMeter.java
@@ -26,7 +26,7 @@ public Doc doc() {
 
 	/**
 	 * Gets the Phase this ESS is connected to.
-	 * 
+	 *
 	 * @return the Phase
 	 */
 	public SinglePhase getPhase();
@@ -34,7 +34,7 @@ public Doc doc() {
 	/**
 	 * Initializes Channel listeners. Copies the Active-Power Phase-Channel value to
 	 * Active-Power Channel.
-	 * 
+	 *
 	 * @param meter the AsymmetricMeter
 	 * @param phase the Phase
 	 */
diff --git a/io.openems.edge.meter.api/src/io/openems/edge/meter/api/SymmetricMeter.java b/io.openems.edge.meter.api/src/io/openems/edge/meter/api/SymmetricMeter.java
index 8677d2126af..0fd17103f34 100644
--- a/io.openems.edge.meter.api/src/io/openems/edge/meter/api/SymmetricMeter.java
+++ b/io.openems.edge.meter.api/src/io/openems/edge/meter/api/SymmetricMeter.java
@@ -18,7 +18,7 @@
 
 /**
  * Represents a Symmetric Meter.
- * 
+ *
  * <p>
  * <ul>
  * <li>Negative ActivePower and ConsumptionActivePower represent Consumption,
@@ -32,7 +32,7 @@ public interface SymmetricMeter extends OpenemsComponent {
 	public enum ChannelId implements io.openems.edge.common.channel.ChannelId {
 		/**
 		 * Frequency.
-		 * 
+		 *
 		 * <ul>
 		 * <li>Interface: Meter Symmetric
 		 * <li>Type: Integer
@@ -45,7 +45,7 @@ public enum ChannelId implements io.openems.edge.common.channel.ChannelId {
 				.persistencePriority(PersistencePriority.HIGH)),
 		/**
 		 * Minimum Ever Active Power.
-		 * 
+		 *
 		 * <ul>
 		 * <li>Interface: Meter Symmetric
 		 * <li>Type: Integer
@@ -59,7 +59,7 @@ public enum ChannelId implements io.openems.edge.common.channel.ChannelId {
 				.persistencePriority(PersistencePriority.HIGH)),
 		/**
 		 * Maximum Ever Active Power.
-		 * 
+		 *
 		 * <ul>
 		 * <li>Interface: Meter Symmetric
 		 * <li>Type: Integer
@@ -73,7 +73,7 @@ public enum ChannelId implements io.openems.edge.common.channel.ChannelId {
 				.persistencePriority(PersistencePriority.HIGH)),
 		/**
 		 * Active Power.
-		 * 
+		 *
 		 * <ul>
 		 * <li>Interface: Meter Symmetric
 		 * <li>Type: Integer
@@ -121,7 +121,7 @@ public enum ChannelId implements io.openems.edge.common.channel.ChannelId {
 
 		/**
 		 * Reactive Power.
-		 * 
+		 *
 		 * <ul>
 		 * <li>Interface: Meter Symmetric
 		 * <li>Type: Integer
@@ -136,7 +136,7 @@ public enum ChannelId implements io.openems.edge.common.channel.ChannelId {
 				.persistencePriority(PersistencePriority.HIGH)), //
 		/**
 		 * Active Production Energy.
-		 * 
+		 *
 		 * <ul>
 		 * <li>Interface: Meter Symmetric
 		 * <li>Type: Integer
@@ -148,7 +148,7 @@ public enum ChannelId implements io.openems.edge.common.channel.ChannelId {
 				.persistencePriority(PersistencePriority.HIGH)),
 		/**
 		 * Active Consumption Energy.
-		 * 
+		 *
 		 * <ul>
 		 * <li>Interface: Meter Symmetric
 		 * <li>Type: Integer
@@ -160,7 +160,7 @@ public enum ChannelId implements io.openems.edge.common.channel.ChannelId {
 				.persistencePriority(PersistencePriority.HIGH)),
 		/**
 		 * Voltage.
-		 * 
+		 *
 		 * <ul>
 		 * <li>Interface: Meter Symmetric
 		 * <li>Type: Integer
@@ -172,7 +172,7 @@ public enum ChannelId implements io.openems.edge.common.channel.ChannelId {
 				.persistencePriority(PersistencePriority.HIGH)),
 		/**
 		 * Current.
-		 * 
+		 *
 		 * <ul>
 		 * <li>Interface: Meter Symmetric
 		 * <li>Type: Integer
@@ -189,6 +189,7 @@ private ChannelId(Doc doc) {
 			this.doc = doc;
 		}
 
+		@Override
 		public Doc doc() {
 			return this.doc;
 		}
@@ -196,7 +197,7 @@ public Doc doc() {
 
 	/**
 	 * Gets the type of this Meter.
-	 * 
+	 *
 	 * @return the MeterType
 	 */
 	MeterType getMeterType();
@@ -344,7 +345,7 @@ public default IntegerReadChannel getActivePowerChannel() {
 	 * Gets the Active Power in [W]. Negative values for Consumption (power that is
 	 * 'leaving the system', e.g. feed-to-grid); positive for Production (power that
 	 * is 'entering the system'). See {@link ChannelId#ACTIVE_POWER}.
-	 * 
+	 *
 	 * @return the Channel {@link Value}
 	 */
 	public default Value<Integer> getActivePower() {
diff --git a/io.openems.edge.meter.api/src/io/openems/edge/meter/api/VirtualMeter.java b/io.openems.edge.meter.api/src/io/openems/edge/meter/api/VirtualMeter.java
index 777a590876a..13dd2f522e0 100644
--- a/io.openems.edge.meter.api/src/io/openems/edge/meter/api/VirtualMeter.java
+++ b/io.openems.edge.meter.api/src/io/openems/edge/meter/api/VirtualMeter.java
@@ -7,12 +7,12 @@ public interface VirtualMeter extends SymmetricMeter {
 
 	/**
 	 * Whether or not to add the values of this meter to Sum.
-	 * 
+	 *
 	 * <p>
 	 * Use case: there are two production meters which should be joined to one
 	 * virtual meter. In this case you would not want this VirtualMeter to be added
 	 * to the total sum of Production power ("_sum/ActiveProductionPower").
-	 * 
+	 *
 	 * @return true if it should be added to sum.
 	 */
 	public boolean addToSum();
diff --git a/io.openems.edge.meter.artemes.am2/src/io/openems/edge/meter/artemes/am2/MeterArtemesAM2.java b/io.openems.edge.meter.artemes.am2/src/io/openems/edge/meter/artemes/am2/MeterArtemesAM2.java
index 9505316e31b..c365f116140 100644
--- a/io.openems.edge.meter.artemes.am2/src/io/openems/edge/meter/artemes/am2/MeterArtemesAM2.java
+++ b/io.openems.edge.meter.artemes.am2/src/io/openems/edge/meter/artemes/am2/MeterArtemesAM2.java
@@ -55,6 +55,7 @@ public MeterArtemesAM2() {
 		);
 	}
 
+	@Override
 	@Reference(policy = ReferencePolicy.STATIC, policyOption = ReferencePolicyOption.GREEDY, cardinality = ReferenceCardinality.MANDATORY)
 	protected void setModbus(BridgeModbus modbus) {
 		super.setModbus(modbus);
@@ -66,10 +67,10 @@ void activate(ComponentContext context, Config config) throws OpenemsException {
 
 		if (super.activate(context, config.id(), config.alias(), config.enabled(), config.modbusUnitId(), this.cm,
 				"Modbus", config.modbus_id())) {
-			return;
 		}
 	}
 
+	@Override
 	@Deactivate
 	protected void deactivate() {
 		super.deactivate();
@@ -83,6 +84,7 @@ private ChannelId(Doc doc) {
 			this.doc = doc;
 		}
 
+		@Override
 		public Doc doc() {
 			return this.doc;
 		}
@@ -97,40 +99,42 @@ public MeterType getMeterType() {
 	protected ModbusProtocol defineModbusProtocol() throws OpenemsException {
 		return new ModbusProtocol(this,
 				new FC4ReadInputRegistersTask(0x0000, Priority.HIGH,
-						m(AsymmetricMeter.ChannelId.VOLTAGE_L1, new UnsignedDoublewordElement(0x0000)),
-						m(AsymmetricMeter.ChannelId.VOLTAGE_L2, new UnsignedDoublewordElement(0x0002)),
-						m(AsymmetricMeter.ChannelId.VOLTAGE_L3, new UnsignedDoublewordElement(0x0004)),
+						this.m(AsymmetricMeter.ChannelId.VOLTAGE_L1, new UnsignedDoublewordElement(0x0000)),
+						this.m(AsymmetricMeter.ChannelId.VOLTAGE_L2, new UnsignedDoublewordElement(0x0002)),
+						this.m(AsymmetricMeter.ChannelId.VOLTAGE_L3, new UnsignedDoublewordElement(0x0004)),
 						new DummyRegisterElement(0x0006, 0x000B),
-						m(SymmetricMeter.ChannelId.VOLTAGE, new UnsignedDoublewordElement(0x000C)),
-						m(AsymmetricMeter.ChannelId.CURRENT_L1, new SignedDoublewordElement(0x000E)),
-						m(AsymmetricMeter.ChannelId.CURRENT_L2, new SignedDoublewordElement(0x0010)),
-						m(AsymmetricMeter.ChannelId.CURRENT_L3, new SignedDoublewordElement(0x0012)),
+						this.m(SymmetricMeter.ChannelId.VOLTAGE, new UnsignedDoublewordElement(0x000C)),
+						this.m(AsymmetricMeter.ChannelId.CURRENT_L1, new SignedDoublewordElement(0x000E)),
+						this.m(AsymmetricMeter.ChannelId.CURRENT_L2, new SignedDoublewordElement(0x0010)),
+						this.m(AsymmetricMeter.ChannelId.CURRENT_L3, new SignedDoublewordElement(0x0012)),
 						new DummyRegisterElement(0x0014, 0x0015),
-						m(SymmetricMeter.ChannelId.CURRENT, new SignedDoublewordElement(0x0016)),
-						m(AsymmetricMeter.ChannelId.ACTIVE_POWER_L1, new SignedQuadruplewordElement(0x0018),
+						this.m(SymmetricMeter.ChannelId.CURRENT, new SignedDoublewordElement(0x0016)),
+						this.m(AsymmetricMeter.ChannelId.ACTIVE_POWER_L1, new SignedQuadruplewordElement(0x0018),
 								ElementToChannelConverter.SCALE_FACTOR_MINUS_3),
-						m(AsymmetricMeter.ChannelId.ACTIVE_POWER_L2, new SignedQuadruplewordElement(0x001C),
+						this.m(AsymmetricMeter.ChannelId.ACTIVE_POWER_L2, new SignedQuadruplewordElement(0x001C),
 								ElementToChannelConverter.SCALE_FACTOR_MINUS_3),
-						m(AsymmetricMeter.ChannelId.ACTIVE_POWER_L3, new SignedQuadruplewordElement(0X0020),
+						this.m(AsymmetricMeter.ChannelId.ACTIVE_POWER_L3, new SignedQuadruplewordElement(0X0020),
 								ElementToChannelConverter.SCALE_FACTOR_MINUS_3),
-						m(SymmetricMeter.ChannelId.ACTIVE_POWER, new SignedQuadruplewordElement(0X0024),
+						this.m(SymmetricMeter.ChannelId.ACTIVE_POWER, new SignedQuadruplewordElement(0X0024),
 								ElementToChannelConverter.SCALE_FACTOR_MINUS_3),
 						new DummyRegisterElement(0x0028, 0x0037),
-						m(AsymmetricMeter.ChannelId.REACTIVE_POWER_L1, new SignedQuadruplewordElement(0x0038),
+						this.m(AsymmetricMeter.ChannelId.REACTIVE_POWER_L1, new SignedQuadruplewordElement(0x0038),
 								ElementToChannelConverter.SCALE_FACTOR_MINUS_3),
-						m(AsymmetricMeter.ChannelId.REACTIVE_POWER_L2, new SignedQuadruplewordElement(0x003C),
+						this.m(AsymmetricMeter.ChannelId.REACTIVE_POWER_L2, new SignedQuadruplewordElement(0x003C),
 								ElementToChannelConverter.SCALE_FACTOR_MINUS_3),
-						m(AsymmetricMeter.ChannelId.REACTIVE_POWER_L3, new SignedQuadruplewordElement(0x0040),
+						this.m(AsymmetricMeter.ChannelId.REACTIVE_POWER_L3, new SignedQuadruplewordElement(0x0040),
 								ElementToChannelConverter.SCALE_FACTOR_MINUS_3),
-						m(SymmetricMeter.ChannelId.REACTIVE_POWER, new SignedQuadruplewordElement(0x0044),
+						this.m(SymmetricMeter.ChannelId.REACTIVE_POWER, new SignedQuadruplewordElement(0x0044),
 								ElementToChannelConverter.SCALE_FACTOR_MINUS_3),
 						new DummyRegisterElement(0x0048, 0x0071),
-						m(SymmetricMeter.ChannelId.FREQUENCY, new UnsignedDoublewordElement(0x0072))),
+						this.m(SymmetricMeter.ChannelId.FREQUENCY, new UnsignedDoublewordElement(0x0072))),
 
 				new FC4ReadInputRegistersTask(0x0418, Priority.LOW,
-						m(SymmetricMeter.ChannelId.ACTIVE_PRODUCTION_ENERGY, new UnsignedQuadruplewordElement(0x0418),
+						this.m(SymmetricMeter.ChannelId.ACTIVE_PRODUCTION_ENERGY,
+								new UnsignedQuadruplewordElement(0x0418),
 								ElementToChannelConverter.SCALE_FACTOR_MINUS_1),
-						m(SymmetricMeter.ChannelId.ACTIVE_CONSUMPTION_ENERGY, new UnsignedQuadruplewordElement(0x0041C),
+						this.m(SymmetricMeter.ChannelId.ACTIVE_CONSUMPTION_ENERGY,
+								new UnsignedQuadruplewordElement(0x0041C),
 								ElementToChannelConverter.SCALE_FACTOR_MINUS_1)));
 	}
 
diff --git a/io.openems.edge.meter.artemes.am2/test/io/openems/edge/meter/artemes/am2/MyConfig.java b/io.openems.edge.meter.artemes.am2/test/io/openems/edge/meter/artemes/am2/MyConfig.java
index df7b5282186..a29fbf364f9 100644
--- a/io.openems.edge.meter.artemes.am2/test/io/openems/edge/meter/artemes/am2/MyConfig.java
+++ b/io.openems.edge.meter.artemes.am2/test/io/openems/edge/meter/artemes/am2/MyConfig.java
@@ -38,7 +38,7 @@ public MyConfig build() {
 
 	/**
 	 * Create a Config builder.
-	 * 
+	 *
 	 * @return a {@link Builder}
 	 */
 	public static Builder create() {
diff --git a/io.openems.edge.meter.bcontrol.em300/src/io/openems/edge/meter/bcontrol/em300/MeterBControlEM300.java b/io.openems.edge.meter.bcontrol.em300/src/io/openems/edge/meter/bcontrol/em300/MeterBControlEM300.java
index d716363e04a..8d80cea2c87 100644
--- a/io.openems.edge.meter.bcontrol.em300/src/io/openems/edge/meter/bcontrol/em300/MeterBControlEM300.java
+++ b/io.openems.edge.meter.bcontrol.em300/src/io/openems/edge/meter/bcontrol/em300/MeterBControlEM300.java
@@ -50,6 +50,7 @@ private ChannelId(Doc doc) {
 			this.doc = doc;
 		}
 
+		@Override
 		public Doc doc() {
 			return this.doc;
 		}
diff --git a/io.openems.edge.meter.bcontrol.em300/src/io/openems/edge/meter/bcontrol/em300/MeterBControlEM300Impl.java b/io.openems.edge.meter.bcontrol.em300/src/io/openems/edge/meter/bcontrol/em300/MeterBControlEM300Impl.java
index 2a007d17469..3c28bc2632d 100644
--- a/io.openems.edge.meter.bcontrol.em300/src/io/openems/edge/meter/bcontrol/em300/MeterBControlEM300Impl.java
+++ b/io.openems.edge.meter.bcontrol.em300/src/io/openems/edge/meter/bcontrol/em300/MeterBControlEM300Impl.java
@@ -61,6 +61,7 @@ public MeterBControlEM300Impl() {
 		);
 	}
 
+	@Override
 	@Reference(policy = ReferencePolicy.STATIC, policyOption = ReferencePolicyOption.GREEDY, cardinality = ReferenceCardinality.MANDATORY)
 	protected void setModbus(BridgeModbus modbus) {
 		super.setModbus(modbus);
@@ -73,10 +74,10 @@ void activate(ComponentContext context, Config config) throws OpenemsException {
 
 		if (super.activate(context, config.id(), config.alias(), config.enabled(), config.modbusUnitId(), this.cm,
 				"Modbus", config.modbus_id())) {
-			return;
 		}
 	}
 
+	@Override
 	@Deactivate
 	protected void deactivate() {
 		super.deactivate();
@@ -89,74 +90,74 @@ public MeterType getMeterType() {
 
 	@Override
 	protected ModbusProtocol defineModbusProtocol() throws OpenemsException {
-		ModbusProtocol modbusProtocol = new ModbusProtocol(this, //
+		var modbusProtocol = new ModbusProtocol(this, //
 				new FC3ReadRegistersTask(0, Priority.HIGH, //
-						m(MeterBControlEM300.ChannelId.ACTIVE_POWER_POS, new UnsignedDoublewordElement(0),
+						this.m(MeterBControlEM300.ChannelId.ACTIVE_POWER_POS, new UnsignedDoublewordElement(0),
 								ElementToChannelConverter.SCALE_FACTOR_MINUS_1),
-						m(MeterBControlEM300.ChannelId.ACTIVE_POWER_NEG, new UnsignedDoublewordElement(2),
+						this.m(MeterBControlEM300.ChannelId.ACTIVE_POWER_NEG, new UnsignedDoublewordElement(2),
 								ElementToChannelConverter.SCALE_FACTOR_MINUS_1),
-						m(MeterBControlEM300.ChannelId.REACTIVE_POWER_POS, new UnsignedDoublewordElement(4),
+						this.m(MeterBControlEM300.ChannelId.REACTIVE_POWER_POS, new UnsignedDoublewordElement(4),
 								ElementToChannelConverter.SCALE_FACTOR_MINUS_1),
-						m(MeterBControlEM300.ChannelId.REACTIVE_POWER_NEG, new UnsignedDoublewordElement(6),
+						this.m(MeterBControlEM300.ChannelId.REACTIVE_POWER_NEG, new UnsignedDoublewordElement(6),
 								ElementToChannelConverter.SCALE_FACTOR_MINUS_1)),
 
 				new FC3ReadRegistersTask(10, Priority.LOW,
-						m(SymmetricMeter.ChannelId.FREQUENCY, new UnsignedDoublewordElement(10))),
+						this.m(SymmetricMeter.ChannelId.FREQUENCY, new UnsignedDoublewordElement(10))),
 
 				new FC3ReadRegistersTask(40, Priority.HIGH,
-						m(MeterBControlEM300.ChannelId.ACTIVE_POWER_L1_POS, new UnsignedDoublewordElement(40),
+						this.m(MeterBControlEM300.ChannelId.ACTIVE_POWER_L1_POS, new UnsignedDoublewordElement(40),
 								ElementToChannelConverter.SCALE_FACTOR_MINUS_1),
-						m(MeterBControlEM300.ChannelId.ACTIVE_POWER_L1_NEG, new UnsignedDoublewordElement(42),
+						this.m(MeterBControlEM300.ChannelId.ACTIVE_POWER_L1_NEG, new UnsignedDoublewordElement(42),
 								ElementToChannelConverter.SCALE_FACTOR_MINUS_1),
-						m(MeterBControlEM300.ChannelId.REACTIVE_POWER_L1_POS, new UnsignedDoublewordElement(44),
+						this.m(MeterBControlEM300.ChannelId.REACTIVE_POWER_L1_POS, new UnsignedDoublewordElement(44),
 								ElementToChannelConverter.SCALE_FACTOR_MINUS_1),
-						m(MeterBControlEM300.ChannelId.REACTIVE_POWER_L1_NEG, new UnsignedDoublewordElement(46),
+						this.m(MeterBControlEM300.ChannelId.REACTIVE_POWER_L1_NEG, new UnsignedDoublewordElement(46),
 								ElementToChannelConverter.SCALE_FACTOR_MINUS_1)),
 
 				new FC3ReadRegistersTask(60, Priority.HIGH,
-						m(AsymmetricMeter.ChannelId.CURRENT_L1, new UnsignedDoublewordElement(60)),
-						m(AsymmetricMeter.ChannelId.VOLTAGE_L1, new UnsignedDoublewordElement(62))), //
+						this.m(AsymmetricMeter.ChannelId.CURRENT_L1, new UnsignedDoublewordElement(60)),
+						this.m(AsymmetricMeter.ChannelId.VOLTAGE_L1, new UnsignedDoublewordElement(62))), //
 
 				new FC3ReadRegistersTask(80, Priority.HIGH,
-						m(MeterBControlEM300.ChannelId.ACTIVE_POWER_L2_POS, new UnsignedDoublewordElement(80),
+						this.m(MeterBControlEM300.ChannelId.ACTIVE_POWER_L2_POS, new UnsignedDoublewordElement(80),
 								ElementToChannelConverter.SCALE_FACTOR_MINUS_1),
-						m(MeterBControlEM300.ChannelId.ACTIVE_POWER_L2_NEG, new UnsignedDoublewordElement(82),
+						this.m(MeterBControlEM300.ChannelId.ACTIVE_POWER_L2_NEG, new UnsignedDoublewordElement(82),
 								ElementToChannelConverter.SCALE_FACTOR_MINUS_1),
 
-						m(MeterBControlEM300.ChannelId.REACTIVE_POWER_L2_POS, new UnsignedDoublewordElement(84),
+						this.m(MeterBControlEM300.ChannelId.REACTIVE_POWER_L2_POS, new UnsignedDoublewordElement(84),
 								ElementToChannelConverter.SCALE_FACTOR_MINUS_1),
-						m(MeterBControlEM300.ChannelId.REACTIVE_POWER_L2_NEG, new UnsignedDoublewordElement(86),
+						this.m(MeterBControlEM300.ChannelId.REACTIVE_POWER_L2_NEG, new UnsignedDoublewordElement(86),
 								ElementToChannelConverter.SCALE_FACTOR_MINUS_1)),
 
 				new FC3ReadRegistersTask(100, Priority.HIGH,
-						m(AsymmetricMeter.ChannelId.CURRENT_L2, new UnsignedDoublewordElement(100)),
-						m(AsymmetricMeter.ChannelId.VOLTAGE_L2, new UnsignedDoublewordElement(102))),
+						this.m(AsymmetricMeter.ChannelId.CURRENT_L2, new UnsignedDoublewordElement(100)),
+						this.m(AsymmetricMeter.ChannelId.VOLTAGE_L2, new UnsignedDoublewordElement(102))),
 
 				new FC3ReadRegistersTask(120, Priority.HIGH,
-						m(MeterBControlEM300.ChannelId.ACTIVE_POWER_L3_POS, new UnsignedDoublewordElement(120),
+						this.m(MeterBControlEM300.ChannelId.ACTIVE_POWER_L3_POS, new UnsignedDoublewordElement(120),
 								ElementToChannelConverter.SCALE_FACTOR_MINUS_1),
-						m(MeterBControlEM300.ChannelId.ACTIVE_POWER_L3_NEG, new UnsignedDoublewordElement(122),
+						this.m(MeterBControlEM300.ChannelId.ACTIVE_POWER_L3_NEG, new UnsignedDoublewordElement(122),
 								ElementToChannelConverter.SCALE_FACTOR_MINUS_1),
-						m(MeterBControlEM300.ChannelId.REACTIVE_POWER_L3_POS, new UnsignedDoublewordElement(124),
+						this.m(MeterBControlEM300.ChannelId.REACTIVE_POWER_L3_POS, new UnsignedDoublewordElement(124),
 								ElementToChannelConverter.SCALE_FACTOR_MINUS_1),
-						m(MeterBControlEM300.ChannelId.REACTIVE_POWER_L3_NEG, new UnsignedDoublewordElement(126),
+						this.m(MeterBControlEM300.ChannelId.REACTIVE_POWER_L3_NEG, new UnsignedDoublewordElement(126),
 								ElementToChannelConverter.SCALE_FACTOR_MINUS_1)),
 
 				new FC3ReadRegistersTask(140, Priority.HIGH,
-						m(AsymmetricMeter.ChannelId.CURRENT_L3, new UnsignedDoublewordElement(140)),
-						m(AsymmetricMeter.ChannelId.VOLTAGE_L3, new UnsignedDoublewordElement(142))));
+						this.m(AsymmetricMeter.ChannelId.CURRENT_L3, new UnsignedDoublewordElement(140)),
+						this.m(AsymmetricMeter.ChannelId.VOLTAGE_L3, new UnsignedDoublewordElement(142))));
 
 		if (this.config.invert()) {
 			modbusProtocol.addTask(new FC3ReadRegistersTask(512, Priority.LOW, //
-					m(SymmetricMeter.ChannelId.ACTIVE_CONSUMPTION_ENERGY, new UnsignedQuadruplewordElement(512),
+					this.m(SymmetricMeter.ChannelId.ACTIVE_CONSUMPTION_ENERGY, new UnsignedQuadruplewordElement(512),
 							ElementToChannelConverter.SCALE_FACTOR_MINUS_1),
-					m(SymmetricMeter.ChannelId.ACTIVE_PRODUCTION_ENERGY, new UnsignedQuadruplewordElement(516),
+					this.m(SymmetricMeter.ChannelId.ACTIVE_PRODUCTION_ENERGY, new UnsignedQuadruplewordElement(516),
 							ElementToChannelConverter.SCALE_FACTOR_MINUS_1)));
 		} else {
 			modbusProtocol.addTask(new FC3ReadRegistersTask(512, Priority.LOW, //
-					m(SymmetricMeter.ChannelId.ACTIVE_PRODUCTION_ENERGY, new UnsignedQuadruplewordElement(512),
+					this.m(SymmetricMeter.ChannelId.ACTIVE_PRODUCTION_ENERGY, new UnsignedQuadruplewordElement(512),
 							ElementToChannelConverter.SCALE_FACTOR_MINUS_1),
-					m(SymmetricMeter.ChannelId.ACTIVE_CONSUMPTION_ENERGY, new UnsignedQuadruplewordElement(516),
+					this.m(SymmetricMeter.ChannelId.ACTIVE_CONSUMPTION_ENERGY, new UnsignedQuadruplewordElement(516),
 							ElementToChannelConverter.SCALE_FACTOR_MINUS_1)));
 		}
 
@@ -201,8 +202,8 @@ private CalculatePower(MeterBControlEM300Impl parent, io.openems.edge.common.cha
 
 		@Override
 		public void accept(Value<Integer> ignore) {
-			Value<Integer> posValue = this.posChannel.getNextValue();
-			Value<Integer> negValue = this.negChannel.getNextValue();
+			var posValue = this.posChannel.getNextValue();
+			var negValue = this.negChannel.getNextValue();
 			final Integer result;
 			if (posValue.isDefined() && negValue.isDefined()) {
 				if (this.invert) {
diff --git a/io.openems.edge.meter.bcontrol.em300/test/io/openems/edge/meter/bcontrol/em300/MyConfig.java b/io.openems.edge.meter.bcontrol.em300/test/io/openems/edge/meter/bcontrol/em300/MyConfig.java
index 77437de8cd8..86078e33347 100644
--- a/io.openems.edge.meter.bcontrol.em300/test/io/openems/edge/meter/bcontrol/em300/MyConfig.java
+++ b/io.openems.edge.meter.bcontrol.em300/test/io/openems/edge/meter/bcontrol/em300/MyConfig.java
@@ -31,7 +31,7 @@ public Builder setType(MeterType type) {
 			this.type = type;
 			return this;
 		}
-		
+
 		public Builder setInvert(boolean invert) {
 			this.invert = invert;
 			return this;
@@ -44,7 +44,7 @@ public MyConfig build() {
 
 	/**
 	 * Create a Config builder.
-	 * 
+	 *
 	 * @return a {@link Builder}
 	 */
 	public static Builder create() {
diff --git a/io.openems.edge.meter.carlo.gavazzi.em300/src/io/openems/edge/meter/carlo/gavazzi/em300/Config.java b/io.openems.edge.meter.carlo.gavazzi.em300/src/io/openems/edge/meter/carlo/gavazzi/em300/Config.java
index 3914be9b834..2f90c6c6014 100644
--- a/io.openems.edge.meter.carlo.gavazzi.em300/src/io/openems/edge/meter/carlo/gavazzi/em300/Config.java
+++ b/io.openems.edge.meter.carlo.gavazzi.em300/src/io/openems/edge/meter/carlo/gavazzi/em300/Config.java
@@ -27,7 +27,7 @@
 
 	@AttributeDefinition(name = "Modbus Unit-ID", description = "The Unit-ID of the Modbus device.")
 	int modbusUnitId();
-	
+
 	@AttributeDefinition(name = "Invert Power", description = "Inverts all Power values, inverts current values, swaps production and consumptioon energy, i.e. Power is multiplied with -1.")
 	boolean invert() default false;
 
diff --git a/io.openems.edge.meter.carlo.gavazzi.em300/src/io/openems/edge/meter/carlo/gavazzi/em300/MeterCarloGavazziEm300.java b/io.openems.edge.meter.carlo.gavazzi.em300/src/io/openems/edge/meter/carlo/gavazzi/em300/MeterCarloGavazziEm300.java
index 5f9440df2d5..49326f760e7 100644
--- a/io.openems.edge.meter.carlo.gavazzi.em300/src/io/openems/edge/meter/carlo/gavazzi/em300/MeterCarloGavazziEm300.java
+++ b/io.openems.edge.meter.carlo.gavazzi.em300/src/io/openems/edge/meter/carlo/gavazzi/em300/MeterCarloGavazziEm300.java
@@ -26,6 +26,7 @@ private ChannelId(Doc doc) {
 			this.doc = doc;
 		}
 
+		@Override
 		public Doc doc() {
 			return this.doc;
 		}
diff --git a/io.openems.edge.meter.carlo.gavazzi.em300/src/io/openems/edge/meter/carlo/gavazzi/em300/MeterCarloGavazziEm300Impl.java b/io.openems.edge.meter.carlo.gavazzi.em300/src/io/openems/edge/meter/carlo/gavazzi/em300/MeterCarloGavazziEm300Impl.java
index 1bc8ed37760..ff458d0fdef 100644
--- a/io.openems.edge.meter.carlo.gavazzi.em300/src/io/openems/edge/meter/carlo/gavazzi/em300/MeterCarloGavazziEm300Impl.java
+++ b/io.openems.edge.meter.carlo.gavazzi.em300/src/io/openems/edge/meter/carlo/gavazzi/em300/MeterCarloGavazziEm300Impl.java
@@ -54,6 +54,7 @@ public MeterCarloGavazziEm300Impl() {
 		);
 	}
 
+	@Override
 	@Reference(policy = ReferencePolicy.STATIC, policyOption = ReferencePolicyOption.GREEDY, cardinality = ReferenceCardinality.MANDATORY)
 	protected void setModbus(BridgeModbus modbus) {
 		super.setModbus(modbus);
@@ -65,10 +66,10 @@ void activate(ComponentContext context, Config config) throws OpenemsException {
 
 		if (super.activate(context, config.id(), config.alias(), config.enabled(), config.modbusUnitId(), this.cm,
 				"Modbus", config.modbus_id())) {
-			return;
 		}
 	}
 
+	@Override
 	@Deactivate
 	protected void deactivate() {
 		super.deactivate();
@@ -83,6 +84,7 @@ private ChannelId(Doc doc) {
 			this.doc = doc;
 		}
 
+		@Override
 		public Doc doc() {
 			return this.doc;
 		}
@@ -95,7 +97,7 @@ public MeterType getMeterType() {
 
 	@Override
 	protected ModbusProtocol defineModbusProtocol() throws OpenemsException {
-		final int offset = 300000 + 1;
+		final var offset = 300000 + 1;
 		/**
 		 * See Modbus definition PDF-file in doc directory and
 		 * https://www.galoz.co.il/wp-content/uploads/2014/11/EM341-Modbus.pdf
@@ -113,83 +115,83 @@ protected ModbusProtocol defineModbusProtocol() throws OpenemsException {
 
 		return new ModbusProtocol(this, //
 				new FC4ReadInputRegistersTask(300001 - offset, Priority.LOW, //
-						m(AsymmetricMeter.ChannelId.VOLTAGE_L1,
+						this.m(AsymmetricMeter.ChannelId.VOLTAGE_L1,
 								new SignedDoublewordElement(300001 - offset).wordOrder(WordOrder.LSWMSW),
 								ElementToChannelConverter.SCALE_FACTOR_2),
-						m(AsymmetricMeter.ChannelId.VOLTAGE_L2,
+						this.m(AsymmetricMeter.ChannelId.VOLTAGE_L2,
 								new SignedDoublewordElement(300003 - offset).wordOrder(WordOrder.LSWMSW),
 								ElementToChannelConverter.SCALE_FACTOR_2),
-						m(AsymmetricMeter.ChannelId.VOLTAGE_L3,
+						this.m(AsymmetricMeter.ChannelId.VOLTAGE_L3,
 								new SignedDoublewordElement(300005 - offset).wordOrder(WordOrder.LSWMSW),
 								ElementToChannelConverter.SCALE_FACTOR_2)),
 				new FC4ReadInputRegistersTask(300013 - offset, Priority.HIGH, //
-						m(AsymmetricMeter.ChannelId.CURRENT_L1,
+						this.m(AsymmetricMeter.ChannelId.CURRENT_L1,
 								new SignedDoublewordElement(300013 - offset).wordOrder(WordOrder.LSWMSW),
 								ElementToChannelConverter.SCALE_FACTOR_2_AND_INVERT_IF_TRUE(this.config.invert())),
-						m(AsymmetricMeter.ChannelId.CURRENT_L2,
+						this.m(AsymmetricMeter.ChannelId.CURRENT_L2,
 								new SignedDoublewordElement(300015 - offset).wordOrder(WordOrder.LSWMSW),
 								ElementToChannelConverter.SCALE_FACTOR_2_AND_INVERT_IF_TRUE(this.config.invert())),
-						m(AsymmetricMeter.ChannelId.CURRENT_L3,
+						this.m(AsymmetricMeter.ChannelId.CURRENT_L3,
 								new SignedDoublewordElement(300017 - offset).wordOrder(WordOrder.LSWMSW),
 								ElementToChannelConverter.SCALE_FACTOR_2_AND_INVERT_IF_TRUE(this.config.invert())),
-						m(AsymmetricMeter.ChannelId.ACTIVE_POWER_L1,
+						this.m(AsymmetricMeter.ChannelId.ACTIVE_POWER_L1,
 								new SignedDoublewordElement(300019 - offset).wordOrder(WordOrder.LSWMSW),
 								ElementToChannelConverter
 										.SCALE_FACTOR_MINUS_1_AND_INVERT_IF_TRUE(this.config.invert())),
-						m(AsymmetricMeter.ChannelId.ACTIVE_POWER_L2,
+						this.m(AsymmetricMeter.ChannelId.ACTIVE_POWER_L2,
 								new SignedDoublewordElement(300021 - offset).wordOrder(WordOrder.LSWMSW),
 								ElementToChannelConverter
 										.SCALE_FACTOR_MINUS_1_AND_INVERT_IF_TRUE(this.config.invert())),
-						m(AsymmetricMeter.ChannelId.ACTIVE_POWER_L3,
+						this.m(AsymmetricMeter.ChannelId.ACTIVE_POWER_L3,
 								new SignedDoublewordElement(300023 - offset).wordOrder(WordOrder.LSWMSW),
 								ElementToChannelConverter
 										.SCALE_FACTOR_MINUS_1_AND_INVERT_IF_TRUE(this.config.invert())),
-						m(MeterCarloGavazziEm300.ChannelId.APPARENT_POWER_L1,
+						this.m(MeterCarloGavazziEm300.ChannelId.APPARENT_POWER_L1,
 								new SignedDoublewordElement(300025 - offset).wordOrder(WordOrder.LSWMSW),
 								ElementToChannelConverter
 										.SCALE_FACTOR_MINUS_1_AND_INVERT_IF_TRUE(this.config.invert())),
-						m(MeterCarloGavazziEm300.ChannelId.APPARENT_POWER_L2,
+						this.m(MeterCarloGavazziEm300.ChannelId.APPARENT_POWER_L2,
 								new SignedDoublewordElement(300027 - offset).wordOrder(WordOrder.LSWMSW),
 								ElementToChannelConverter
 										.SCALE_FACTOR_MINUS_1_AND_INVERT_IF_TRUE(this.config.invert())),
-						m(MeterCarloGavazziEm300.ChannelId.APPARENT_POWER_L3,
+						this.m(MeterCarloGavazziEm300.ChannelId.APPARENT_POWER_L3,
 								new SignedDoublewordElement(300029 - offset).wordOrder(WordOrder.LSWMSW),
 								ElementToChannelConverter
 										.SCALE_FACTOR_MINUS_1_AND_INVERT_IF_TRUE(this.config.invert())),
-						m(AsymmetricMeter.ChannelId.REACTIVE_POWER_L1,
+						this.m(AsymmetricMeter.ChannelId.REACTIVE_POWER_L1,
 								new SignedDoublewordElement(300031 - offset).wordOrder(WordOrder.LSWMSW),
 								ElementToChannelConverter
 										.SCALE_FACTOR_MINUS_1_AND_INVERT_IF_TRUE(this.config.invert())),
-						m(AsymmetricMeter.ChannelId.REACTIVE_POWER_L2,
+						this.m(AsymmetricMeter.ChannelId.REACTIVE_POWER_L2,
 								new SignedDoublewordElement(300033 - offset).wordOrder(WordOrder.LSWMSW),
 								ElementToChannelConverter
 										.SCALE_FACTOR_MINUS_1_AND_INVERT_IF_TRUE(this.config.invert())),
-						m(AsymmetricMeter.ChannelId.REACTIVE_POWER_L3,
+						this.m(AsymmetricMeter.ChannelId.REACTIVE_POWER_L3,
 								new SignedDoublewordElement(300035 - offset).wordOrder(WordOrder.LSWMSW),
 								ElementToChannelConverter
 										.SCALE_FACTOR_MINUS_1_AND_INVERT_IF_TRUE(this.config.invert())),
 						new DummyRegisterElement(300037 - offset, 300040 - offset), //
-						m(SymmetricMeter.ChannelId.ACTIVE_POWER,
+						this.m(SymmetricMeter.ChannelId.ACTIVE_POWER,
 								new SignedDoublewordElement(300041 - offset).wordOrder(WordOrder.LSWMSW),
 								ElementToChannelConverter
 										.SCALE_FACTOR_MINUS_1_AND_INVERT_IF_TRUE(this.config.invert())),
-						m(MeterCarloGavazziEm300.ChannelId.APPARENT_POWER,
+						this.m(MeterCarloGavazziEm300.ChannelId.APPARENT_POWER,
 								new SignedDoublewordElement(300043 - offset).wordOrder(WordOrder.LSWMSW),
 								ElementToChannelConverter
 										.SCALE_FACTOR_MINUS_1_AND_INVERT_IF_TRUE(this.config.invert())),
-						m(SymmetricMeter.ChannelId.REACTIVE_POWER,
+						this.m(SymmetricMeter.ChannelId.REACTIVE_POWER,
 								new SignedDoublewordElement(300045 - offset).wordOrder(WordOrder.LSWMSW),
 								ElementToChannelConverter
 										.SCALE_FACTOR_MINUS_1_AND_INVERT_IF_TRUE(this.config.invert()))),
 
 				new FC4ReadInputRegistersTask(300052 - offset, Priority.LOW, //
-						m(SymmetricMeter.ChannelId.FREQUENCY, new UnsignedWordElement(300052 - offset),
+						this.m(SymmetricMeter.ChannelId.FREQUENCY, new UnsignedWordElement(300052 - offset),
 								ElementToChannelConverter.SCALE_FACTOR_2),
-						m(energyChannelId300053,
+						this.m(energyChannelId300053,
 								new SignedDoublewordElement(300053 - offset).wordOrder(WordOrder.LSWMSW),
 								ElementToChannelConverter.SCALE_FACTOR_2),
 						new DummyRegisterElement(300055 - offset, 300078 - offset), //
-						m(energyChannelId300079,
+						this.m(energyChannelId300079,
 								new SignedDoublewordElement(300079 - offset).wordOrder(WordOrder.LSWMSW),
 								ElementToChannelConverter.SCALE_FACTOR_2)));
 	}
diff --git a/io.openems.edge.meter.carlo.gavazzi.em300/test/io/openems/edge/meter/carlo/gavazzi/em300/MyConfig.java b/io.openems.edge.meter.carlo.gavazzi.em300/test/io/openems/edge/meter/carlo/gavazzi/em300/MyConfig.java
index a0243d1699a..4e75e177c2a 100644
--- a/io.openems.edge.meter.carlo.gavazzi.em300/test/io/openems/edge/meter/carlo/gavazzi/em300/MyConfig.java
+++ b/io.openems.edge.meter.carlo.gavazzi.em300/test/io/openems/edge/meter/carlo/gavazzi/em300/MyConfig.java
@@ -44,7 +44,7 @@ public MyConfig build() {
 
 	/**
 	 * Create a Config builder.
-	 * 
+	 *
 	 * @return a {@link Builder}
 	 */
 	public static Builder create() {
diff --git a/io.openems.edge.meter.discovergy/src/io/openems/edge/meter/discovergy/DiscovergyApiClient.java b/io.openems.edge.meter.discovergy/src/io/openems/edge/meter/discovergy/DiscovergyApiClient.java
index fc07b3b6e9a..34160ecb35a 100644
--- a/io.openems.edge.meter.discovergy/src/io/openems/edge/meter/discovergy/DiscovergyApiClient.java
+++ b/io.openems.edge.meter.discovergy/src/io/openems/edge/meter/discovergy/DiscovergyApiClient.java
@@ -36,10 +36,10 @@ public DiscovergyApiClient(String email, String password) {
 
 	/**
 	 * Returns all meters that the user has access to.
-	 * 
+	 *
 	 * <p>
 	 * See https://api.discovergy.com/docs/ for details.
-	 * 
+	 *
 	 * @return the Meters as a JsonArray.
 	 * @throws OpenemsNamedException on error
 	 */
@@ -49,36 +49,36 @@ public JsonArray getMeters() throws OpenemsNamedException {
 
 	/**
 	 * Returns the available measurement field names for the specified meter.
-	 * 
+	 *
 	 * <p>
 	 * See https://api.discovergy.com/docs/ for details.
-	 * 
+	 *
 	 * @param meterId the Discovergy Meter-ID
 	 * @return the Meters as a JsonArray.
 	 * @throws OpenemsNamedException on error
 	 */
 	public JsonArray getFieldNames(String meterId) throws OpenemsNamedException {
-		String endpoint = String.format("/field_names?meterId=%s", meterId);
+		var endpoint = String.format("/field_names?meterId=%s", meterId);
 		return JsonUtils.getAsJsonArray(//
 				this.sendGetRequest(endpoint));
 	}
 
 	/**
 	 * Returns the last measurement for the specified meter.
-	 * 
+	 *
 	 * <p>
 	 * See https://api.discovergy.com/docs/ for details.
-	 * 
+	 *
 	 * @param meterId the Discovergy Meter-ID
 	 * @param fields  the fields to be queried
 	 * @return the Meters as a JsonArray.
 	 * @throws OpenemsNamedException on error
 	 */
 	public JsonObject getLastReading(String meterId, Field... fields) throws OpenemsNamedException {
-		String endpoint = String.format("/last_reading?meterId=%s&fields=%s", //
+		var endpoint = String.format("/last_reading?meterId=%s&fields=%s", //
 				meterId, //
 				Arrays.stream(fields) //
-						.map(field -> field.n()) //
+						.map(Field::n) //
 						.collect(Collectors.joining(",")));
 		return JsonUtils.getAsJsonObject(//
 				this.sendGetRequest(endpoint));
@@ -86,24 +86,24 @@ public JsonObject getLastReading(String meterId, Field... fields) throws Openems
 
 	/**
 	 * Sends a get request to the Discovergy API.
-	 * 
+	 *
 	 * @param endpoint the REST Api endpoint
 	 * @return a JsonObject or JsonArray
 	 * @throws OpenemsNamedException on error
 	 */
 	private JsonElement sendGetRequest(String endpoint) throws OpenemsNamedException {
 		try {
-			URL url = new URL(BASE_URL + endpoint);
-			HttpURLConnection con = (HttpURLConnection) url.openConnection();
+			var url = new URL(BASE_URL + endpoint);
+			var con = (HttpURLConnection) url.openConnection();
 			con.setRequestProperty("Authorization", this.authorizationHeader);
 			con.setRequestMethod("GET");
 			con.setConnectTimeout(5000);
 			con.setReadTimeout(5000);
-			int status = con.getResponseCode();
+			var status = con.getResponseCode();
 			String body;
-			try (BufferedReader in = new BufferedReader(new InputStreamReader(con.getInputStream()))) {
+			try (var in = new BufferedReader(new InputStreamReader(con.getInputStream()))) {
 				// Read HTTP response
-				StringBuilder content = new StringBuilder();
+				var content = new StringBuilder();
 				String line;
 				while ((line = in.readLine()) != null) {
 					content.append(line);
@@ -114,10 +114,9 @@ private JsonElement sendGetRequest(String endpoint) throws OpenemsNamedException
 			if (status < 300) {
 				// Parse response to JSON
 				return JsonUtils.parse(body);
-			} else {
-				throw new OpenemsException(
-						"Error while reading from Discovergy API. Response code: " + status + ". " + body);
 			}
+			throw new OpenemsException(
+					"Error while reading from Discovergy API. Response code: " + status + ". " + body);
 		} catch (OpenemsNamedException | IOException e) {
 			throw new OpenemsException(
 					"Unable to read from Discovergy API. " + e.getClass().getSimpleName() + ": " + e.getMessage());
diff --git a/io.openems.edge.meter.discovergy/src/io/openems/edge/meter/discovergy/DiscovergyWorker.java b/io.openems.edge.meter.discovergy/src/io/openems/edge/meter/discovergy/DiscovergyWorker.java
index d95e33ed15c..96911edfbbc 100644
--- a/io.openems.edge.meter.discovergy/src/io/openems/edge/meter/discovergy/DiscovergyWorker.java
+++ b/io.openems.edge.meter.discovergy/src/io/openems/edge/meter/discovergy/DiscovergyWorker.java
@@ -6,9 +6,7 @@
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-import com.google.gson.JsonArray;
 import com.google.gson.JsonElement;
-import com.google.gson.JsonObject;
 
 import io.openems.common.exceptions.OpenemsError.OpenemsNamedException;
 import io.openems.common.exceptions.OpenemsException;
@@ -60,15 +58,15 @@ protected void forever() throws OpenemsNamedException {
 		Long rawEnergyOut1 = null;
 		Long rawEnergyOut2 = null;
 
-		boolean restApiFailed = true;
-		boolean lastReadingTooOld = false;
+		var restApiFailed = true;
+		var lastReadingTooOld = false;
 
 		try {
 			// Asserts that we have a valid MeterId
 			this.assertMeterId();
 
 			// Retrieve Channel-Values
-			JsonObject reading = this.apiClient.getLastReading(this.meterId, //
+			var reading = this.apiClient.getLastReading(this.meterId, //
 					Field.POWER, Field.POWER1, Field.POWER2, Field.POWER3, //
 					Field.VOLTAGE1, Field.VOLTAGE2, Field.VOLTAGE3, //
 					Field.ENERGY, Field.ENERGY1, Field.ENERGY2, //
@@ -77,7 +75,7 @@ protected void forever() throws OpenemsNamedException {
 			Long time = JsonUtils.getAsLong(reading, "time");
 			if (System.currentTimeMillis() / 1000 - LAST_READING_TOO_OLD_SECONDS < time) {
 				// Values are valid
-				JsonObject values = JsonUtils.getAsJsonObject(reading, "values");
+				var values = JsonUtils.getAsJsonObject(reading, "values");
 				rawPower = JsonUtils.getAsOptionalInt(values, Field.POWER.n()).orElse(null);
 				rawPower1 = JsonUtils.getAsOptionalInt(values, Field.POWER1.n()).orElse(null);
 				rawPower2 = JsonUtils.getAsOptionalInt(values, Field.POWER2.n()).orElse(null);
@@ -125,11 +123,11 @@ protected void forever() throws OpenemsNamedException {
 			this.parent.channel(ChannelId.LAST_READING_TOO_OLD).setNextValue(lastReadingTooOld);
 
 			// Nature Channels
-			Integer activePower = TypeUtils.divide(rawPower, 1_000);
-			Integer activePowerL1 = TypeUtils.divide(rawPower1, 1_000);
-			Integer activePowerL2 = TypeUtils.divide(rawPower2, 1_000);
-			Integer activePowerL3 = TypeUtils.divide(rawPower3, 1_000);
-			switch (config.type()) {
+			var activePower = TypeUtils.divide(rawPower, 1_000);
+			var activePowerL1 = TypeUtils.divide(rawPower1, 1_000);
+			var activePowerL2 = TypeUtils.divide(rawPower2, 1_000);
+			var activePowerL3 = TypeUtils.divide(rawPower3, 1_000);
+			switch (this.config.type()) {
 			case GRID:
 				this.parent._setActivePower(activePower);
 				this.parent._setActivePowerL1(activePowerL1);
@@ -160,14 +158,14 @@ protected void forever() throws OpenemsNamedException {
 
 	/**
 	 * Validates that we have valid MeterId.
-	 * 
+	 *
 	 * @throws OpenemsNamedException on invalid MeterId.
 	 */
 	private void assertMeterId() throws OpenemsNamedException {
 		if (this.meterId != null) {
 			return;
 		}
-		JsonArray jMeters = this.apiClient.getMeters();
+		var jMeters = this.apiClient.getMeters();
 		if (jMeters.size() == 0) {
 			// too few
 			throw new OpenemsException("No Meters available.");
@@ -175,7 +173,7 @@ private void assertMeterId() throws OpenemsNamedException {
 
 		List<DiscovergyMeter> meters = new ArrayList<>();
 		for (JsonElement j : jMeters) {
-			DiscovergyMeter meter = DiscovergyMeter.fromJson(j);
+			var meter = DiscovergyMeter.fromJson(j);
 			meters.add(meter);
 		}
 
@@ -204,7 +202,7 @@ private void assertMeterId() throws OpenemsNamedException {
 
 		if (meters.size() > 1) {
 			// too many
-			StringBuilder b = new StringBuilder("Unable to identify meter, because there are multiple:");
+			var b = new StringBuilder("Unable to identify meter, because there are multiple:");
 			for (DiscovergyMeter meter : meters) {
 				b.append(" ");
 				b.append(meter.toString());
@@ -213,7 +211,7 @@ private void assertMeterId() throws OpenemsNamedException {
 		}
 
 		// exactly one
-		DiscovergyMeter meter = meters.get(0);
+		var meter = meters.get(0);
 		this.meterId = meter.getMeterId();
 		this.parent.logInfo(this.log, "Updated Discovergy MeterId [" + this.meterId + "]");
 	}
diff --git a/io.openems.edge.meter.discovergy/src/io/openems/edge/meter/discovergy/MeterDiscovergy.java b/io.openems.edge.meter.discovergy/src/io/openems/edge/meter/discovergy/MeterDiscovergy.java
index a1fb6942917..7ccf7a69061 100644
--- a/io.openems.edge.meter.discovergy/src/io/openems/edge/meter/discovergy/MeterDiscovergy.java
+++ b/io.openems.edge.meter.discovergy/src/io/openems/edge/meter/discovergy/MeterDiscovergy.java
@@ -15,7 +15,6 @@
 import org.osgi.service.metatype.annotations.Designate;
 import org.slf4j.Logger;
 
-import com.google.gson.JsonArray;
 import com.google.gson.JsonElement;
 
 import io.openems.common.channel.Level;
@@ -74,12 +73,13 @@ void activate(ComponentContext context, Config config) {
 		if (config.enabled()) {
 			this.apiClient = new DiscovergyApiClient(config.email(), config.password());
 
-			this.worker = new DiscovergyWorker(this, apiClient, config);
+			this.worker = new DiscovergyWorker(this, this.apiClient, config);
 			this.worker.activate(config.id());
 			this.worker.triggerNextRun();
 		}
 	}
 
+	@Override
 	@Deactivate
 	protected void deactivate() {
 		super.deactivate();
@@ -119,6 +119,7 @@ private ChannelId(Doc doc) {
 			this.doc = doc;
 		}
 
+		@Override
 		public Doc doc() {
 			return this.doc;
 		}
@@ -176,10 +177,10 @@ public CompletableFuture<? extends JsonrpcResponseSuccess> handleJsonrpcRequest(
 
 	/**
 	 * Handles a GetMetersRequest.
-	 * 
+	 *
 	 * <p>
 	 * See {@link DiscovergyApiClient#getMeters()}
-	 * 
+	 *
 	 * @param user    the User
 	 * @param request the GetMetersRequest
 	 * @return the Future JSON-RPC Response
@@ -187,17 +188,17 @@ public CompletableFuture<? extends JsonrpcResponseSuccess> handleJsonrpcRequest(
 	 */
 	private CompletableFuture<JsonrpcResponseSuccess> handleGetMetersRequest(User user, GetMetersRequest request)
 			throws OpenemsNamedException {
-		JsonArray meters = this.apiClient.getMeters();
-		GetMetersResponse response = new GetMetersResponse(request.getId(), meters);
+		var meters = this.apiClient.getMeters();
+		var response = new GetMetersResponse(request.getId(), meters);
 		return CompletableFuture.completedFuture(response);
 	}
 
 	/**
 	 * Handles a GetFieldNamesRequest.
-	 * 
+	 *
 	 * <p>
 	 * See {@link DiscovergyApiClient#getFieldNames(String)}
-	 * 
+	 *
 	 * @param user    the User
 	 * @param request the GetFieldNamesRequest
 	 * @return the Future JSON-RPC Response
@@ -205,12 +206,12 @@ private CompletableFuture<JsonrpcResponseSuccess> handleGetMetersRequest(User us
 	 */
 	private CompletableFuture<JsonrpcResponseSuccess> handleGetFieldNamesRequest(User user,
 			GetFieldNamesRequest request) throws OpenemsNamedException {
-		JsonArray fieldNames = this.apiClient.getFieldNames(request.getMeterId());
+		var fieldNames = this.apiClient.getFieldNames(request.getMeterId());
 		Set<Field> fields = new HashSet<>();
 		for (JsonElement fieldNameElement : fieldNames) {
 			fields.add(JsonUtils.getAsEnum(Field.class, fieldNameElement));
 		}
-		GetFieldNamesResponse response = new GetFieldNamesResponse(request.getId(), fields);
+		var response = new GetFieldNamesResponse(request.getId(), fields);
 		return CompletableFuture.completedFuture(response);
 	}
 }
diff --git a/io.openems.edge.meter.discovergy/src/io/openems/edge/meter/discovergy/jsonrpc/DiscovergyMeter.java b/io.openems.edge.meter.discovergy/src/io/openems/edge/meter/discovergy/jsonrpc/DiscovergyMeter.java
index 686cd304c2b..94e8d01725c 100644
--- a/io.openems.edge.meter.discovergy/src/io/openems/edge/meter/discovergy/jsonrpc/DiscovergyMeter.java
+++ b/io.openems.edge.meter.discovergy/src/io/openems/edge/meter/discovergy/jsonrpc/DiscovergyMeter.java
@@ -9,22 +9,22 @@
 public class DiscovergyMeter {
 
 	public static DiscovergyMeter fromJson(JsonElement j) throws OpenemsNamedException {
-		String meterId = JsonUtils.getAsString(j, "meterId");
+		var meterId = JsonUtils.getAsString(j, "meterId");
 		// e.g. "ESY"
-		String manufacturerId = JsonUtils.getAsOptionalString(j, "manufacturerId").orElse("");
+		var manufacturerId = JsonUtils.getAsOptionalString(j, "manufacturerId").orElse("");
 		// e.g. "12345678"
-		String serialNumber = JsonUtils.getAsOptionalString(j, "serialNumber").orElse("");
+		var serialNumber = JsonUtils.getAsOptionalString(j, "serialNumber").orElse("");
 		// e.g. 1ESY1234567890
-		String fullSerialNumber = JsonUtils.getAsOptionalString(j, "fullSerialNumber").orElse("");
-		Location location = Location.fromJson(JsonUtils.getAsJsonObject(j, "location"));
+		var fullSerialNumber = JsonUtils.getAsOptionalString(j, "fullSerialNumber").orElse("");
+		var location = Location.fromJson(JsonUtils.getAsJsonObject(j, "location"));
 		// e.g. "DE0012345678910000000000001234567"
-		String administrationNumber = JsonUtils.getAsOptionalString(j, "administrationNumber").orElse("");
+		var administrationNumber = JsonUtils.getAsOptionalString(j, "administrationNumber").orElse("");
 		// e.g. "EASYMETER"
-		String type = JsonUtils.getAsOptionalString(j, "type").orElse("");
+		var type = JsonUtils.getAsOptionalString(j, "type").orElse("");
 		// e.g. "ELECTRICITY"
-		String measurementType = JsonUtils.getAsOptionalString(j, "measurementType").orElse("");
+		var measurementType = JsonUtils.getAsOptionalString(j, "measurementType").orElse("");
 		// e.g. "SLP"
-		String loadProfileType = JsonUtils.getAsOptionalString(j, "loadProfileType").orElse("");
+		var loadProfileType = JsonUtils.getAsOptionalString(j, "loadProfileType").orElse("");
 		// e.g. "1"
 		int scalingFactor = JsonUtils.getAsOptionalInt(j, "scalingFactor").orElse(1);
 		// e.g. "1"
@@ -45,11 +45,11 @@ public static DiscovergyMeter fromJson(JsonElement j) throws OpenemsNamedExcepti
 	public static class Location {
 
 		public static Location fromJson(JsonObject j) throws OpenemsNamedException {
-			String street = JsonUtils.getAsString(j, "street");
-			String streetNumber = JsonUtils.getAsString(j, "streetNumber");
-			String zip = JsonUtils.getAsString(j, "zip");
-			String city = JsonUtils.getAsString(j, "city");
-			String country = JsonUtils.getAsString(j, "country");
+			var street = JsonUtils.getAsString(j, "street");
+			var streetNumber = JsonUtils.getAsString(j, "streetNumber");
+			var zip = JsonUtils.getAsString(j, "zip");
+			var city = JsonUtils.getAsString(j, "city");
+			var country = JsonUtils.getAsString(j, "country");
 			return new Location(street, streetNumber, zip, city, country);
 		}
 
@@ -117,9 +117,9 @@ private DiscovergyMeter(String meterId, String manufacturerId, String serialNumb
 
 	@Override
 	public String toString() {
-		return "[meterId=" + meterId + ", manufacturerId=" + manufacturerId + ", serialNumber=" + serialNumber
-				+ ", fullSerialNumber=" + getFullSerialNumber() + ", type=" + type + ", measurementType="
-				+ measurementType + "]";
+		return "[meterId=" + this.meterId + ", manufacturerId=" + this.manufacturerId + ", serialNumber="
+				+ this.serialNumber + ", fullSerialNumber=" + this.getFullSerialNumber() + ", type=" + this.type
+				+ ", measurementType=" + this.measurementType + "]";
 	}
 
 	public JsonObject toJson() {
diff --git a/io.openems.edge.meter.discovergy/src/io/openems/edge/meter/discovergy/jsonrpc/Field.java b/io.openems.edge.meter.discovergy/src/io/openems/edge/meter/discovergy/jsonrpc/Field.java
index 9f333dadd8c..08a947afff6 100644
--- a/io.openems.edge.meter.discovergy/src/io/openems/edge/meter/discovergy/jsonrpc/Field.java
+++ b/io.openems.edge.meter.discovergy/src/io/openems/edge/meter/discovergy/jsonrpc/Field.java
@@ -23,7 +23,7 @@ private Field(String name) {
 	}
 
 	public String n() {
-		return name;
+		return this.name;
 	}
 
 }
diff --git a/io.openems.edge.meter.discovergy/src/io/openems/edge/meter/discovergy/jsonrpc/GetFieldNamesRequest.java b/io.openems.edge.meter.discovergy/src/io/openems/edge/meter/discovergy/jsonrpc/GetFieldNamesRequest.java
index 18b328dcb41..a26a9168ea7 100644
--- a/io.openems.edge.meter.discovergy/src/io/openems/edge/meter/discovergy/jsonrpc/GetFieldNamesRequest.java
+++ b/io.openems.edge.meter.discovergy/src/io/openems/edge/meter/discovergy/jsonrpc/GetFieldNamesRequest.java
@@ -8,7 +8,7 @@
 
 /**
  * Represents a JSON-RPC Request for 'getMeters'.
- * 
+ *
  * <pre>
  * {
  *   "jsonrpc": "2.0",
@@ -26,13 +26,13 @@ public class GetFieldNamesRequest extends JsonrpcRequest {
 
 	/**
 	 * Create {@link GetFieldNamesRequest} from a template {@link JsonrpcRequest}.
-	 * 
+	 *
 	 * @param r the template {@link JsonrpcRequest}
 	 * @return the {@link GetFieldNamesRequest}
 	 * @throws OpenemsNamedException on parse error
 	 */
 	public static GetFieldNamesRequest from(JsonrpcRequest r) throws OpenemsNamedException {
-		String meterId = JsonUtils.getAsString(r.getParams(), "meterId");
+		var meterId = JsonUtils.getAsString(r.getParams(), "meterId");
 		return new GetFieldNamesRequest(r, meterId);
 	}
 
@@ -50,7 +50,7 @@ private GetFieldNamesRequest(JsonrpcRequest request, String meterId) {
 
 	/**
 	 * Gets the Meter-ID.
-	 * 
+	 *
 	 * @return Meter-ID
 	 */
 	public String getMeterId() {
diff --git a/io.openems.edge.meter.discovergy/src/io/openems/edge/meter/discovergy/jsonrpc/GetFieldNamesResponse.java b/io.openems.edge.meter.discovergy/src/io/openems/edge/meter/discovergy/jsonrpc/GetFieldNamesResponse.java
index 21375bbe6a4..677542a8588 100644
--- a/io.openems.edge.meter.discovergy/src/io/openems/edge/meter/discovergy/jsonrpc/GetFieldNamesResponse.java
+++ b/io.openems.edge.meter.discovergy/src/io/openems/edge/meter/discovergy/jsonrpc/GetFieldNamesResponse.java
@@ -11,7 +11,7 @@
 
 /**
  * Represents a JSON-RPC Response for 'getFieldNames'.
- * 
+ *
  * <pre>
  * {
  *   "jsonrpc": "2.0",
@@ -19,7 +19,7 @@
  *   "result": {
  *     "fieldNames": [
  *     	 {@link Field#getName()}
- *     ]   
+ *     ]
  *   }
  * }
  * </pre>
@@ -39,7 +39,7 @@ public GetFieldNamesResponse(UUID id, Set<Field> fields) {
 
 	@Override
 	public JsonObject getResult() {
-		JsonArray fieldNames = new JsonArray();
+		var fieldNames = new JsonArray();
 		for (Field field : this.fields) {
 			fieldNames.add(field.n());
 		}
@@ -50,7 +50,7 @@ public JsonObject getResult() {
 
 	/**
 	 * Gets the {@link Field}s
-	 * 
+	 *
 	 * @return a set of Fields
 	 */
 	public Set<Field> getFields() {
diff --git a/io.openems.edge.meter.discovergy/src/io/openems/edge/meter/discovergy/jsonrpc/GetMetersRequest.java b/io.openems.edge.meter.discovergy/src/io/openems/edge/meter/discovergy/jsonrpc/GetMetersRequest.java
index c5d9857a84a..1606a32fa2e 100644
--- a/io.openems.edge.meter.discovergy/src/io/openems/edge/meter/discovergy/jsonrpc/GetMetersRequest.java
+++ b/io.openems.edge.meter.discovergy/src/io/openems/edge/meter/discovergy/jsonrpc/GetMetersRequest.java
@@ -2,13 +2,13 @@
 
 import com.google.gson.JsonObject;
 
-import io.openems.common.exceptions.OpenemsException;
 import io.openems.common.exceptions.OpenemsError.OpenemsNamedException;
+import io.openems.common.exceptions.OpenemsException;
 import io.openems.common.jsonrpc.base.JsonrpcRequest;
 
 /**
  * Represents a JSON-RPC Request for 'getMeters'.
- * 
+ *
  * <pre>
  * {
  *   "jsonrpc": "2.0",
@@ -24,7 +24,7 @@ public class GetMetersRequest extends JsonrpcRequest {
 
 	/**
 	 * Create {@link GetMetersRequest} from a template {@link JsonrpcRequest}.
-	 * 
+	 *
 	 * @param r the template {@link JsonrpcRequest}
 	 * @return the {@link GetMetersRequest}
 	 * @throws OpenemsNamedException on parse error
diff --git a/io.openems.edge.meter.discovergy/src/io/openems/edge/meter/discovergy/jsonrpc/GetMetersResponse.java b/io.openems.edge.meter.discovergy/src/io/openems/edge/meter/discovergy/jsonrpc/GetMetersResponse.java
index eafb0588e0f..f950a42b5f5 100644
--- a/io.openems.edge.meter.discovergy/src/io/openems/edge/meter/discovergy/jsonrpc/GetMetersResponse.java
+++ b/io.openems.edge.meter.discovergy/src/io/openems/edge/meter/discovergy/jsonrpc/GetMetersResponse.java
@@ -10,7 +10,7 @@
 
 /**
  * Represents a JSON-RPC Response for 'getMeters'.
- * 
+ *
  * <pre>
  * {
  *   "jsonrpc": "2.0",
@@ -18,7 +18,7 @@
  *   "result": {
  *     "meters": [
  *     	 {@link DiscovergyMeter#toJson()}
- *     ]   
+ *     ]
  *   }
  * }
  * </pre>
diff --git a/io.openems.edge.meter.janitza/src/io/openems/edge/meter/janitza/umg511/MeterJanitzaUmg511.java b/io.openems.edge.meter.janitza/src/io/openems/edge/meter/janitza/umg511/MeterJanitzaUmg511.java
index 6b043de9481..b1467982483 100644
--- a/io.openems.edge.meter.janitza/src/io/openems/edge/meter/janitza/umg511/MeterJanitzaUmg511.java
+++ b/io.openems.edge.meter.janitza/src/io/openems/edge/meter/janitza/umg511/MeterJanitzaUmg511.java
@@ -16,6 +16,7 @@ private ChannelId(Doc doc) {
 			this.doc = doc;
 		}
 
+		@Override
 		public Doc doc() {
 			return this.doc;
 		}
diff --git a/io.openems.edge.meter.janitza/src/io/openems/edge/meter/janitza/umg511/MeterJanitzaUmg511Impl.java b/io.openems.edge.meter.janitza/src/io/openems/edge/meter/janitza/umg511/MeterJanitzaUmg511Impl.java
index 7b504c8f584..955e3279cd4 100644
--- a/io.openems.edge.meter.janitza/src/io/openems/edge/meter/janitza/umg511/MeterJanitzaUmg511Impl.java
+++ b/io.openems.edge.meter.janitza/src/io/openems/edge/meter/janitza/umg511/MeterJanitzaUmg511Impl.java
@@ -32,7 +32,7 @@
 
 /**
  * Implements the Janitza UMG 511 power analyzer.
- * 
+ *
  * <p>
  * https://www.janitza.de/betriebsanleitungen.html?file=files/download/manuals/current/UMG511/Modbus/janitza-mal-umg511-en.pdf
  */
@@ -65,6 +65,7 @@ public MeterJanitzaUmg511Impl() {
 		);
 	}
 
+	@Override
 	@Reference(policy = ReferencePolicy.STATIC, policyOption = ReferencePolicyOption.GREEDY, cardinality = ReferenceCardinality.MANDATORY)
 	protected void setModbus(BridgeModbus modbus) {
 		super.setModbus(modbus);
@@ -77,10 +78,10 @@ void activate(ComponentContext context, Config config) throws OpenemsException {
 
 		if (super.activate(context, config.id(), config.alias(), config.enabled(), config.modbusUnitId(), this.cm,
 				"Modbus", config.modbus_id())) {
-			return;
 		}
 	}
 
+	@Override
 	@Deactivate
 	protected void deactivate() {
 		super.deactivate();
@@ -93,58 +94,58 @@ public MeterType getMeterType() {
 
 	@Override
 	protected ModbusProtocol defineModbusProtocol() throws OpenemsException {
-		ModbusProtocol modbusProtocol = new ModbusProtocol(this, //
+		var modbusProtocol = new ModbusProtocol(this, //
 				new FC3ReadRegistersTask(3845, Priority.HIGH, //
-						m(new FloatDoublewordElement(3845))
+						this.m(new FloatDoublewordElement(3845))
 								.m(AsymmetricMeter.ChannelId.VOLTAGE_L1, ElementToChannelConverter.SCALE_FACTOR_3)//
 								.m(SymmetricMeter.ChannelId.VOLTAGE, ElementToChannelConverter.SCALE_FACTOR_3)//
 								.build(),
-						m(AsymmetricMeter.ChannelId.VOLTAGE_L2, new FloatDoublewordElement(3847),
+						this.m(AsymmetricMeter.ChannelId.VOLTAGE_L2, new FloatDoublewordElement(3847),
 								ElementToChannelConverter.SCALE_FACTOR_3), //
-						m(AsymmetricMeter.ChannelId.VOLTAGE_L3, new FloatDoublewordElement(3849),
+						this.m(AsymmetricMeter.ChannelId.VOLTAGE_L3, new FloatDoublewordElement(3849),
 								ElementToChannelConverter.SCALE_FACTOR_3), // , //
-						new DummyRegisterElement(3851, 3852), m(new FloatDoublewordElement(3853)) //
+						new DummyRegisterElement(3851, 3852), this.m(new FloatDoublewordElement(3853)) //
 								.m(AsymmetricMeter.ChannelId.CURRENT_L1,
 										ElementToChannelConverter.SCALE_FACTOR_3_AND_INVERT_IF_TRUE(this.invert)) //
 								.m(SymmetricMeter.ChannelId.CURRENT,
 										ElementToChannelConverter.SCALE_FACTOR_3_AND_INVERT_IF_TRUE(this.invert)) //
 								.build(), //
-						m(AsymmetricMeter.ChannelId.CURRENT_L2, new FloatDoublewordElement(3855), //
+						this.m(AsymmetricMeter.ChannelId.CURRENT_L2, new FloatDoublewordElement(3855), //
 								ElementToChannelConverter.SCALE_FACTOR_3_AND_INVERT_IF_TRUE(this.invert)), //
-						m(AsymmetricMeter.ChannelId.CURRENT_L3, new FloatDoublewordElement(3857), //
+						this.m(AsymmetricMeter.ChannelId.CURRENT_L3, new FloatDoublewordElement(3857), //
 								ElementToChannelConverter.SCALE_FACTOR_3_AND_INVERT_IF_TRUE(this.invert)), //
 						new DummyRegisterElement(3859, 3860),
-						m(AsymmetricMeter.ChannelId.ACTIVE_POWER_L1, new FloatDoublewordElement(3861), //
+						this.m(AsymmetricMeter.ChannelId.ACTIVE_POWER_L1, new FloatDoublewordElement(3861), //
 								ElementToChannelConverter.INVERT_IF_TRUE(this.invert)), //
-						m(AsymmetricMeter.ChannelId.ACTIVE_POWER_L2, new FloatDoublewordElement(3863), //
+						this.m(AsymmetricMeter.ChannelId.ACTIVE_POWER_L2, new FloatDoublewordElement(3863), //
 								ElementToChannelConverter.INVERT_IF_TRUE(this.invert)), //
-						m(AsymmetricMeter.ChannelId.ACTIVE_POWER_L3, new FloatDoublewordElement(3865), //
+						this.m(AsymmetricMeter.ChannelId.ACTIVE_POWER_L3, new FloatDoublewordElement(3865), //
 								ElementToChannelConverter.INVERT_IF_TRUE(this.invert)), //
 						new DummyRegisterElement(3867, 3868),
-						m(AsymmetricMeter.ChannelId.REACTIVE_POWER_L1, new FloatDoublewordElement(3869), //
+						this.m(AsymmetricMeter.ChannelId.REACTIVE_POWER_L1, new FloatDoublewordElement(3869), //
 								ElementToChannelConverter.INVERT_IF_TRUE(this.invert)), //
-						m(AsymmetricMeter.ChannelId.REACTIVE_POWER_L2, new FloatDoublewordElement(3871), //
+						this.m(AsymmetricMeter.ChannelId.REACTIVE_POWER_L2, new FloatDoublewordElement(3871), //
 								ElementToChannelConverter.INVERT_IF_TRUE(this.invert)), //
-						m(AsymmetricMeter.ChannelId.REACTIVE_POWER_L3, new FloatDoublewordElement(3873), //
+						this.m(AsymmetricMeter.ChannelId.REACTIVE_POWER_L3, new FloatDoublewordElement(3873), //
 								ElementToChannelConverter.INVERT_IF_TRUE(this.invert))), //
 				new FC3ReadRegistersTask(3925, Priority.HIGH, //
-						m(SymmetricMeter.ChannelId.ACTIVE_POWER, new FloatDoublewordElement(3925)), //
-						m(SymmetricMeter.ChannelId.REACTIVE_POWER, new FloatDoublewordElement(3927), //
+						this.m(SymmetricMeter.ChannelId.ACTIVE_POWER, new FloatDoublewordElement(3925)), //
+						this.m(SymmetricMeter.ChannelId.REACTIVE_POWER, new FloatDoublewordElement(3927), //
 								ElementToChannelConverter.INVERT_IF_TRUE(this.invert))), //
 				new FC3ReadRegistersTask(3995, Priority.LOW, //
-						m(SymmetricMeter.ChannelId.FREQUENCY, new FloatDoublewordElement(3995), //
+						this.m(SymmetricMeter.ChannelId.FREQUENCY, new FloatDoublewordElement(3995), //
 								ElementToChannelConverter.SCALE_FACTOR_3)));
 
 		if (this.invert) {
 			modbusProtocol.addTask(new FC3ReadRegistersTask(19068, Priority.LOW, //
-					m(SymmetricMeter.ChannelId.ACTIVE_CONSUMPTION_ENERGY, new FloatDoublewordElement(19068)),
+					this.m(SymmetricMeter.ChannelId.ACTIVE_CONSUMPTION_ENERGY, new FloatDoublewordElement(19068)),
 					new DummyRegisterElement(19070, 19075),
-					m(SymmetricMeter.ChannelId.ACTIVE_PRODUCTION_ENERGY, new FloatDoublewordElement(19076))));
+					this.m(SymmetricMeter.ChannelId.ACTIVE_PRODUCTION_ENERGY, new FloatDoublewordElement(19076))));
 		} else {
 			modbusProtocol.addTask(new FC3ReadRegistersTask(19068, Priority.LOW, //
-					m(SymmetricMeter.ChannelId.ACTIVE_PRODUCTION_ENERGY, new FloatDoublewordElement(19068)),
+					this.m(SymmetricMeter.ChannelId.ACTIVE_PRODUCTION_ENERGY, new FloatDoublewordElement(19068)),
 					new DummyRegisterElement(19070, 19075),
-					m(SymmetricMeter.ChannelId.ACTIVE_CONSUMPTION_ENERGY, new FloatDoublewordElement(19076))));
+					this.m(SymmetricMeter.ChannelId.ACTIVE_CONSUMPTION_ENERGY, new FloatDoublewordElement(19076))));
 		}
 
 		return modbusProtocol;
diff --git a/io.openems.edge.meter.janitza/src/io/openems/edge/meter/janitza/umg604/MeterJanitzaUmg604.java b/io.openems.edge.meter.janitza/src/io/openems/edge/meter/janitza/umg604/MeterJanitzaUmg604.java
index 5f10646b89d..82426825de7 100644
--- a/io.openems.edge.meter.janitza/src/io/openems/edge/meter/janitza/umg604/MeterJanitzaUmg604.java
+++ b/io.openems.edge.meter.janitza/src/io/openems/edge/meter/janitza/umg604/MeterJanitzaUmg604.java
@@ -16,6 +16,7 @@ private ChannelId(Doc doc) {
 			this.doc = doc;
 		}
 
+		@Override
 		public Doc doc() {
 			return this.doc;
 		}
diff --git a/io.openems.edge.meter.janitza/src/io/openems/edge/meter/janitza/umg604/MeterJanitzaUmg604Impl.java b/io.openems.edge.meter.janitza/src/io/openems/edge/meter/janitza/umg604/MeterJanitzaUmg604Impl.java
index 647fb6a6a41..22292b764a9 100644
--- a/io.openems.edge.meter.janitza/src/io/openems/edge/meter/janitza/umg604/MeterJanitzaUmg604Impl.java
+++ b/io.openems.edge.meter.janitza/src/io/openems/edge/meter/janitza/umg604/MeterJanitzaUmg604Impl.java
@@ -32,7 +32,7 @@
 
 /**
  * Implements the Janitza UMG 604 power analyzer.
- * 
+ *
  * <p>
  * https://www.janitza.de/umg-604-pro.html
  */
@@ -65,6 +65,7 @@ public MeterJanitzaUmg604Impl() {
 		);
 	}
 
+	@Override
 	@Reference(policy = ReferencePolicy.STATIC, policyOption = ReferencePolicyOption.GREEDY, cardinality = ReferenceCardinality.MANDATORY)
 	protected void setModbus(BridgeModbus modbus) {
 		super.setModbus(modbus);
@@ -77,10 +78,10 @@ void activate(ComponentContext context, Config config) throws OpenemsException {
 
 		if (super.activate(context, config.id(), config.alias(), config.enabled(), config.modbusUnitId(), this.cm,
 				"Modbus", config.modbus_id())) {
-			return;
 		}
 	}
 
+	@Override
 	@Deactivate
 	protected void deactivate() {
 		super.deactivate();
@@ -93,60 +94,60 @@ public MeterType getMeterType() {
 
 	@Override
 	protected ModbusProtocol defineModbusProtocol() throws OpenemsException {
-		ModbusProtocol modbusProtocol = new ModbusProtocol(this, //
+		var modbusProtocol = new ModbusProtocol(this, //
 				new FC3ReadRegistersTask(1317, Priority.HIGH, //
-						m(new FloatDoublewordElement(1317))
+						this.m(new FloatDoublewordElement(1317))
 								.m(AsymmetricMeter.ChannelId.VOLTAGE_L1, ElementToChannelConverter.SCALE_FACTOR_3)//
 								.m(SymmetricMeter.ChannelId.VOLTAGE, ElementToChannelConverter.SCALE_FACTOR_3)//
 								.build(),
-						m(AsymmetricMeter.ChannelId.VOLTAGE_L2, new FloatDoublewordElement(1319), //
+						this.m(AsymmetricMeter.ChannelId.VOLTAGE_L2, new FloatDoublewordElement(1319), //
 								ElementToChannelConverter.SCALE_FACTOR_3), //
-						m(AsymmetricMeter.ChannelId.VOLTAGE_L3, new FloatDoublewordElement(1321), //
+						this.m(AsymmetricMeter.ChannelId.VOLTAGE_L3, new FloatDoublewordElement(1321), //
 								ElementToChannelConverter.SCALE_FACTOR_3), //
 						new DummyRegisterElement(1323, 1324), //
-						m(new FloatDoublewordElement(1325)) //
+						this.m(new FloatDoublewordElement(1325)) //
 								.m(AsymmetricMeter.ChannelId.CURRENT_L1,
 										ElementToChannelConverter.SCALE_FACTOR_3_AND_INVERT_IF_TRUE(this.invert)) //
 								.m(SymmetricMeter.ChannelId.CURRENT,
 										ElementToChannelConverter.SCALE_FACTOR_3_AND_INVERT_IF_TRUE(this.invert)) //
 								.build(), //
-						m(AsymmetricMeter.ChannelId.CURRENT_L2, new FloatDoublewordElement(1327), //
+						this.m(AsymmetricMeter.ChannelId.CURRENT_L2, new FloatDoublewordElement(1327), //
 								ElementToChannelConverter.SCALE_FACTOR_3_AND_INVERT_IF_TRUE(this.invert)), //
-						m(AsymmetricMeter.ChannelId.CURRENT_L3, new FloatDoublewordElement(1329), //
+						this.m(AsymmetricMeter.ChannelId.CURRENT_L3, new FloatDoublewordElement(1329), //
 								ElementToChannelConverter.SCALE_FACTOR_3_AND_INVERT_IF_TRUE(this.invert)), //
 						new DummyRegisterElement(1331, 1332), //
-						m(AsymmetricMeter.ChannelId.ACTIVE_POWER_L1, new FloatDoublewordElement(1333), //
+						this.m(AsymmetricMeter.ChannelId.ACTIVE_POWER_L1, new FloatDoublewordElement(1333), //
 								ElementToChannelConverter.INVERT_IF_TRUE(this.invert)), //
-						m(AsymmetricMeter.ChannelId.ACTIVE_POWER_L2, new FloatDoublewordElement(1335), //
+						this.m(AsymmetricMeter.ChannelId.ACTIVE_POWER_L2, new FloatDoublewordElement(1335), //
 								ElementToChannelConverter.INVERT_IF_TRUE(this.invert)), //
-						m(AsymmetricMeter.ChannelId.ACTIVE_POWER_L3, new FloatDoublewordElement(1337), //
+						this.m(AsymmetricMeter.ChannelId.ACTIVE_POWER_L3, new FloatDoublewordElement(1337), //
 								ElementToChannelConverter.INVERT_IF_TRUE(this.invert)), //
 						new DummyRegisterElement(1339, 1340), //
-						m(AsymmetricMeter.ChannelId.REACTIVE_POWER_L1, new FloatDoublewordElement(1341), //
+						this.m(AsymmetricMeter.ChannelId.REACTIVE_POWER_L1, new FloatDoublewordElement(1341), //
 								ElementToChannelConverter.INVERT_IF_TRUE(this.invert)), //
-						m(AsymmetricMeter.ChannelId.REACTIVE_POWER_L2, new FloatDoublewordElement(1343), //
+						this.m(AsymmetricMeter.ChannelId.REACTIVE_POWER_L2, new FloatDoublewordElement(1343), //
 								ElementToChannelConverter.INVERT_IF_TRUE(this.invert)), //
-						m(AsymmetricMeter.ChannelId.REACTIVE_POWER_L3, new FloatDoublewordElement(1345), //
+						this.m(AsymmetricMeter.ChannelId.REACTIVE_POWER_L3, new FloatDoublewordElement(1345), //
 								ElementToChannelConverter.INVERT_IF_TRUE(this.invert)), //
 						new DummyRegisterElement(1347, 1368), //
-						m(SymmetricMeter.ChannelId.ACTIVE_POWER, new FloatDoublewordElement(1369), //
+						this.m(SymmetricMeter.ChannelId.ACTIVE_POWER, new FloatDoublewordElement(1369), //
 								ElementToChannelConverter.INVERT_IF_TRUE(this.invert)), //
-						m(SymmetricMeter.ChannelId.REACTIVE_POWER, new FloatDoublewordElement(1371), //
+						this.m(SymmetricMeter.ChannelId.REACTIVE_POWER, new FloatDoublewordElement(1371), //
 								ElementToChannelConverter.INVERT_IF_TRUE(this.invert))), //
 				new FC3ReadRegistersTask(1439, Priority.LOW, //
-						m(SymmetricMeter.ChannelId.FREQUENCY, new FloatDoublewordElement(1439), //
+						this.m(SymmetricMeter.ChannelId.FREQUENCY, new FloatDoublewordElement(1439), //
 								ElementToChannelConverter.SCALE_FACTOR_3)));
 
 		if (this.invert) {
 			modbusProtocol.addTask(new FC3ReadRegistersTask(9851, Priority.LOW, //
-					m(SymmetricMeter.ChannelId.ACTIVE_CONSUMPTION_ENERGY, new FloatDoublewordElement(9851)),
+					this.m(SymmetricMeter.ChannelId.ACTIVE_CONSUMPTION_ENERGY, new FloatDoublewordElement(9851)),
 					new DummyRegisterElement(9853, 9862),
-					m(SymmetricMeter.ChannelId.ACTIVE_PRODUCTION_ENERGY, new FloatDoublewordElement(9863))));
+					this.m(SymmetricMeter.ChannelId.ACTIVE_PRODUCTION_ENERGY, new FloatDoublewordElement(9863))));
 		} else {
 			modbusProtocol.addTask(new FC3ReadRegistersTask(9851, Priority.LOW, //
-					m(SymmetricMeter.ChannelId.ACTIVE_PRODUCTION_ENERGY, new FloatDoublewordElement(9851)),
+					this.m(SymmetricMeter.ChannelId.ACTIVE_PRODUCTION_ENERGY, new FloatDoublewordElement(9851)),
 					new DummyRegisterElement(9853, 9862),
-					m(SymmetricMeter.ChannelId.ACTIVE_CONSUMPTION_ENERGY, new FloatDoublewordElement(9863))));
+					this.m(SymmetricMeter.ChannelId.ACTIVE_CONSUMPTION_ENERGY, new FloatDoublewordElement(9863))));
 		}
 
 		return modbusProtocol;
diff --git a/io.openems.edge.meter.janitza/src/io/openems/edge/meter/janitza/umg96rme/MeterJanitzaUmg96rme.java b/io.openems.edge.meter.janitza/src/io/openems/edge/meter/janitza/umg96rme/MeterJanitzaUmg96rme.java
index ea514880a83..fbac55afd0a 100644
--- a/io.openems.edge.meter.janitza/src/io/openems/edge/meter/janitza/umg96rme/MeterJanitzaUmg96rme.java
+++ b/io.openems.edge.meter.janitza/src/io/openems/edge/meter/janitza/umg96rme/MeterJanitzaUmg96rme.java
@@ -33,7 +33,7 @@
 
 /**
  * Implements the Janitza UMG 96RM-E power analyzer.
- * 
+ *
  * <p>
  * https://www.janitza.com/umg-96rm-e.html
  */
@@ -62,6 +62,7 @@ public MeterJanitzaUmg96rme() {
 		);
 	}
 
+	@Override
 	@Reference(policy = ReferencePolicy.STATIC, policyOption = ReferencePolicyOption.GREEDY, cardinality = ReferenceCardinality.MANDATORY)
 	protected void setModbus(BridgeModbus modbus) {
 		super.setModbus(modbus);
@@ -74,10 +75,10 @@ void activate(ComponentContext context, Config config) throws OpenemsException {
 
 		if (super.activate(context, config.id(), config.alias(), config.enabled(), config.modbusUnitId(), this.cm,
 				"Modbus", config.modbus_id())) {
-			return;
 		}
 	}
 
+	@Override
 	@Deactivate
 	protected void deactivate() {
 		super.deactivate();
@@ -91,6 +92,7 @@ private ChannelId(Doc doc) {
 			this.doc = doc;
 		}
 
+		@Override
 		public Doc doc() {
 			return this.doc;
 		}
@@ -107,55 +109,55 @@ protected ModbusProtocol defineModbusProtocol() throws OpenemsException {
 		 * We are using the FLOAT registers from the modbus table, because they are all
 		 * reachable within one ReadMultipleRegistersRequest.
 		 */
-		ModbusProtocol modbusProtocol = new ModbusProtocol(this, //
+		var modbusProtocol = new ModbusProtocol(this, //
 				new FC3ReadRegistersTask(800, Priority.HIGH, //
-						m(SymmetricMeter.ChannelId.FREQUENCY, new FloatDoublewordElement(800),
+						this.m(SymmetricMeter.ChannelId.FREQUENCY, new FloatDoublewordElement(800),
 								ElementToChannelConverter.SCALE_FACTOR_3),
 						new DummyRegisterElement(802, 807), //
-						m(new FloatDoublewordElement(808)) //
+						this.m(new FloatDoublewordElement(808)) //
 								.m(AsymmetricMeter.ChannelId.VOLTAGE_L1, ElementToChannelConverter.SCALE_FACTOR_3) //
 								.m(SymmetricMeter.ChannelId.VOLTAGE, ElementToChannelConverter.SCALE_FACTOR_3) //
 								.build(), //
-						m(AsymmetricMeter.ChannelId.VOLTAGE_L2, new FloatDoublewordElement(810),
+						this.m(AsymmetricMeter.ChannelId.VOLTAGE_L2, new FloatDoublewordElement(810),
 								ElementToChannelConverter.SCALE_FACTOR_3),
-						m(AsymmetricMeter.ChannelId.VOLTAGE_L3, new FloatDoublewordElement(812),
+						this.m(AsymmetricMeter.ChannelId.VOLTAGE_L3, new FloatDoublewordElement(812),
 								ElementToChannelConverter.SCALE_FACTOR_3),
 						new DummyRegisterElement(814, 859), //
-						m(AsymmetricMeter.ChannelId.CURRENT_L1, new FloatDoublewordElement(860),
+						this.m(AsymmetricMeter.ChannelId.CURRENT_L1, new FloatDoublewordElement(860),
 								ElementToChannelConverter.SCALE_FACTOR_3_AND_INVERT_IF_TRUE(this.invert)),
-						m(AsymmetricMeter.ChannelId.CURRENT_L2, new FloatDoublewordElement(862),
+						this.m(AsymmetricMeter.ChannelId.CURRENT_L2, new FloatDoublewordElement(862),
 								ElementToChannelConverter.SCALE_FACTOR_3_AND_INVERT_IF_TRUE(this.invert)),
-						m(AsymmetricMeter.ChannelId.CURRENT_L3, new FloatDoublewordElement(864),
+						this.m(AsymmetricMeter.ChannelId.CURRENT_L3, new FloatDoublewordElement(864),
 								ElementToChannelConverter.SCALE_FACTOR_3_AND_INVERT_IF_TRUE(this.invert)),
-						m(SymmetricMeter.ChannelId.CURRENT, new FloatDoublewordElement(866),
+						this.m(SymmetricMeter.ChannelId.CURRENT, new FloatDoublewordElement(866),
 								ElementToChannelConverter.SCALE_FACTOR_3_AND_INVERT_IF_TRUE(this.invert)),
-						m(AsymmetricMeter.ChannelId.ACTIVE_POWER_L1, new FloatDoublewordElement(868),
+						this.m(AsymmetricMeter.ChannelId.ACTIVE_POWER_L1, new FloatDoublewordElement(868),
 								ElementToChannelConverter.INVERT_IF_TRUE(this.invert)),
-						m(AsymmetricMeter.ChannelId.ACTIVE_POWER_L2, new FloatDoublewordElement(870),
+						this.m(AsymmetricMeter.ChannelId.ACTIVE_POWER_L2, new FloatDoublewordElement(870),
 								ElementToChannelConverter.INVERT_IF_TRUE(this.invert)),
-						m(AsymmetricMeter.ChannelId.ACTIVE_POWER_L3, new FloatDoublewordElement(872),
+						this.m(AsymmetricMeter.ChannelId.ACTIVE_POWER_L3, new FloatDoublewordElement(872),
 								ElementToChannelConverter.INVERT_IF_TRUE(this.invert)),
-						m(SymmetricMeter.ChannelId.ACTIVE_POWER, new FloatDoublewordElement(874),
+						this.m(SymmetricMeter.ChannelId.ACTIVE_POWER, new FloatDoublewordElement(874),
 								ElementToChannelConverter.INVERT_IF_TRUE(this.invert)),
-						m(AsymmetricMeter.ChannelId.REACTIVE_POWER_L1, new FloatDoublewordElement(876),
+						this.m(AsymmetricMeter.ChannelId.REACTIVE_POWER_L1, new FloatDoublewordElement(876),
 								ElementToChannelConverter.INVERT_IF_TRUE(this.invert)),
-						m(AsymmetricMeter.ChannelId.REACTIVE_POWER_L2, new FloatDoublewordElement(878),
+						this.m(AsymmetricMeter.ChannelId.REACTIVE_POWER_L2, new FloatDoublewordElement(878),
 								ElementToChannelConverter.INVERT_IF_TRUE(this.invert)),
-						m(AsymmetricMeter.ChannelId.REACTIVE_POWER_L3, new FloatDoublewordElement(880),
+						this.m(AsymmetricMeter.ChannelId.REACTIVE_POWER_L3, new FloatDoublewordElement(880),
 								ElementToChannelConverter.INVERT_IF_TRUE(this.invert)),
-						m(SymmetricMeter.ChannelId.REACTIVE_POWER, new FloatDoublewordElement(882),
+						this.m(SymmetricMeter.ChannelId.REACTIVE_POWER, new FloatDoublewordElement(882),
 								ElementToChannelConverter.INVERT_IF_TRUE(this.invert))));
 
 		if (this.invert) {
 			modbusProtocol.addTask(new FC3ReadRegistersTask(19068, Priority.LOW, //
-					m(SymmetricMeter.ChannelId.ACTIVE_CONSUMPTION_ENERGY, new FloatDoublewordElement(19068)),
+					this.m(SymmetricMeter.ChannelId.ACTIVE_CONSUMPTION_ENERGY, new FloatDoublewordElement(19068)),
 					new DummyRegisterElement(19070, 19075),
-					m(SymmetricMeter.ChannelId.ACTIVE_PRODUCTION_ENERGY, new FloatDoublewordElement(19076))));
+					this.m(SymmetricMeter.ChannelId.ACTIVE_PRODUCTION_ENERGY, new FloatDoublewordElement(19076))));
 		} else {
 			modbusProtocol.addTask(new FC3ReadRegistersTask(19068, Priority.LOW, //
-					m(SymmetricMeter.ChannelId.ACTIVE_PRODUCTION_ENERGY, new FloatDoublewordElement(19068)),
+					this.m(SymmetricMeter.ChannelId.ACTIVE_PRODUCTION_ENERGY, new FloatDoublewordElement(19068)),
 					new DummyRegisterElement(19070, 19075),
-					m(SymmetricMeter.ChannelId.ACTIVE_CONSUMPTION_ENERGY, new FloatDoublewordElement(19076))));
+					this.m(SymmetricMeter.ChannelId.ACTIVE_CONSUMPTION_ENERGY, new FloatDoublewordElement(19076))));
 		}
 
 		return modbusProtocol;
diff --git a/io.openems.edge.meter.janitza/test/io/openems/edge/meter/janitza/umg511/MyConfig.java b/io.openems.edge.meter.janitza/test/io/openems/edge/meter/janitza/umg511/MyConfig.java
index 1e89a3e804e..59e7f5f5c35 100644
--- a/io.openems.edge.meter.janitza/test/io/openems/edge/meter/janitza/umg511/MyConfig.java
+++ b/io.openems.edge.meter.janitza/test/io/openems/edge/meter/janitza/umg511/MyConfig.java
@@ -44,7 +44,7 @@ public MyConfig build() {
 
 	/**
 	 * Create a Config builder.
-	 * 
+	 *
 	 * @return a {@link Builder}
 	 */
 	public static Builder create() {
diff --git a/io.openems.edge.meter.janitza/test/io/openems/edge/meter/janitza/umg604/MyConfig.java b/io.openems.edge.meter.janitza/test/io/openems/edge/meter/janitza/umg604/MyConfig.java
index 6312d5262f7..7793c4ba025 100644
--- a/io.openems.edge.meter.janitza/test/io/openems/edge/meter/janitza/umg604/MyConfig.java
+++ b/io.openems.edge.meter.janitza/test/io/openems/edge/meter/janitza/umg604/MyConfig.java
@@ -44,7 +44,7 @@ public MyConfig build() {
 
 	/**
 	 * Create a Config builder.
-	 * 
+	 *
 	 * @return a {@link Builder}
 	 */
 	public static Builder create() {
diff --git a/io.openems.edge.meter.janitza/test/io/openems/edge/meter/janitza/umg96rme/MyConfig.java b/io.openems.edge.meter.janitza/test/io/openems/edge/meter/janitza/umg96rme/MyConfig.java
index f1d58a5f158..feec843bec0 100644
--- a/io.openems.edge.meter.janitza/test/io/openems/edge/meter/janitza/umg96rme/MyConfig.java
+++ b/io.openems.edge.meter.janitza/test/io/openems/edge/meter/janitza/umg96rme/MyConfig.java
@@ -44,7 +44,7 @@ public MyConfig build() {
 
 	/**
 	 * Create a Config builder.
-	 * 
+	 *
 	 * @return a {@link Builder}
 	 */
 	public static Builder create() {
diff --git a/io.openems.edge.meter.microcare.sdm630/src/io/openems/edge/meter/microcare/sdm630/Config.java b/io.openems.edge.meter.microcare.sdm630/src/io/openems/edge/meter/microcare/sdm630/Config.java
index 81e71becb0c..2d663d771b8 100644
--- a/io.openems.edge.meter.microcare.sdm630/src/io/openems/edge/meter/microcare/sdm630/Config.java
+++ b/io.openems.edge.meter.microcare.sdm630/src/io/openems/edge/meter/microcare/sdm630/Config.java
@@ -2,6 +2,7 @@
 
 import org.osgi.service.metatype.annotations.AttributeDefinition;
 import org.osgi.service.metatype.annotations.ObjectClassDefinition;
+
 import io.openems.edge.meter.api.MeterType;
 
 @ObjectClassDefinition(name = "Meter Microcare SDM 630", //
diff --git a/io.openems.edge.meter.microcare.sdm630/src/io/openems/edge/meter/microcare/sdm630/MeterMicrocareSdm630.java b/io.openems.edge.meter.microcare.sdm630/src/io/openems/edge/meter/microcare/sdm630/MeterMicrocareSdm630.java
index 330c2ea256b..542101d0c82 100644
--- a/io.openems.edge.meter.microcare.sdm630/src/io/openems/edge/meter/microcare/sdm630/MeterMicrocareSdm630.java
+++ b/io.openems.edge.meter.microcare.sdm630/src/io/openems/edge/meter/microcare/sdm630/MeterMicrocareSdm630.java
@@ -5,7 +5,7 @@
 import io.openems.edge.common.channel.Doc;
 
 public interface MeterMicrocareSdm630 {
-	
+
 	public enum ChannelId implements io.openems.edge.common.channel.ChannelId {
 		REACTIVE_PRODUCTION_ENERGY(Doc.of(OpenemsType.INTEGER) //
 				.unit(Unit.KILOWATT_HOURS)), //
@@ -19,9 +19,10 @@ private ChannelId(Doc doc) {
 			this.doc = doc;
 		}
 
+		@Override
 		public Doc doc() {
 			return this.doc;
 		}
 	}
-	
+
 }
diff --git a/io.openems.edge.meter.microcare.sdm630/src/io/openems/edge/meter/microcare/sdm630/MeterMicrocareSdm630Impl.java b/io.openems.edge.meter.microcare.sdm630/src/io/openems/edge/meter/microcare/sdm630/MeterMicrocareSdm630Impl.java
index 0f2f2a597af..59d62e20328 100644
--- a/io.openems.edge.meter.microcare.sdm630/src/io/openems/edge/meter/microcare/sdm630/MeterMicrocareSdm630Impl.java
+++ b/io.openems.edge.meter.microcare.sdm630/src/io/openems/edge/meter/microcare/sdm630/MeterMicrocareSdm630Impl.java
@@ -54,6 +54,7 @@ public MeterMicrocareSdm630Impl() {
 		);
 	}
 
+	@Override
 	@Reference(policy = ReferencePolicy.STATIC, policyOption = ReferencePolicyOption.GREEDY, cardinality = ReferenceCardinality.MANDATORY)
 	protected void setModbus(BridgeModbus modbus) {
 		super.setModbus(modbus);
@@ -64,10 +65,10 @@ void activate(ComponentContext context, Config config) throws OpenemsException {
 		this.meterType = config.type();
 		if (super.activate(context, config.id(), config.alias(), config.enabled(), config.modbusUnitId(), this.cm,
 				"Modbus", config.modbus_id())) {
-			return;
 		}
 	}
 
+	@Override
 	@Deactivate
 	protected void deactivate() {
 		super.deactivate();
@@ -80,92 +81,91 @@ public MeterType getMeterType() {
 
 	@Override
 	protected ModbusProtocol defineModbusProtocol() throws OpenemsException {
-		final int offset = 30001;
+		final var offset = 30001;
 		return new ModbusProtocol(this, //
 				new FC4ReadInputRegistersTask(30001 - offset, Priority.HIGH,
-						m(new FloatDoublewordElement(30001 - offset).wordOrder(WordOrder.MSWLSW)
+						this.m(new FloatDoublewordElement(30001 - offset).wordOrder(WordOrder.MSWLSW)
 								.byteOrder(ByteOrder.BIG_ENDIAN))
-										.m(AsymmetricMeter.ChannelId.VOLTAGE_L1,
-												ElementToChannelConverter.SCALE_FACTOR_3)//
-										.m(SymmetricMeter.ChannelId.VOLTAGE, ElementToChannelConverter.SCALE_FACTOR_3)//
-										.build(),
-						m(AsymmetricMeter.ChannelId.VOLTAGE_L2,
+								.m(AsymmetricMeter.ChannelId.VOLTAGE_L1, ElementToChannelConverter.SCALE_FACTOR_3)//
+								.m(SymmetricMeter.ChannelId.VOLTAGE, ElementToChannelConverter.SCALE_FACTOR_3)//
+								.build(),
+						this.m(AsymmetricMeter.ChannelId.VOLTAGE_L2,
 								new FloatDoublewordElement(30003 - offset).wordOrder(WordOrder.MSWLSW)
 										.byteOrder(ByteOrder.BIG_ENDIAN),
 								ElementToChannelConverter.SCALE_FACTOR_3),
-						m(AsymmetricMeter.ChannelId.VOLTAGE_L3,
+						this.m(AsymmetricMeter.ChannelId.VOLTAGE_L3,
 								new FloatDoublewordElement(30005 - offset).wordOrder(WordOrder.MSWLSW)
 										.byteOrder(ByteOrder.BIG_ENDIAN),
 								ElementToChannelConverter.SCALE_FACTOR_3),
-						m(AsymmetricMeter.ChannelId.CURRENT_L1,
+						this.m(AsymmetricMeter.ChannelId.CURRENT_L1,
 								new FloatDoublewordElement(30007 - offset).wordOrder(WordOrder.MSWLSW)
 										.byteOrder(ByteOrder.BIG_ENDIAN),
 								ElementToChannelConverter.SCALE_FACTOR_3),
-						m(AsymmetricMeter.ChannelId.CURRENT_L2,
+						this.m(AsymmetricMeter.ChannelId.CURRENT_L2,
 								new FloatDoublewordElement(30009 - offset).wordOrder(WordOrder.MSWLSW)
 										.byteOrder(ByteOrder.BIG_ENDIAN),
 								ElementToChannelConverter.SCALE_FACTOR_3),
-						m(AsymmetricMeter.ChannelId.CURRENT_L3,
+						this.m(AsymmetricMeter.ChannelId.CURRENT_L3,
 								new FloatDoublewordElement(30011 - offset).wordOrder(WordOrder.MSWLSW)
 										.byteOrder(ByteOrder.BIG_ENDIAN),
 								ElementToChannelConverter.SCALE_FACTOR_3),
-						m(AsymmetricMeter.ChannelId.ACTIVE_POWER_L1,
+						this.m(AsymmetricMeter.ChannelId.ACTIVE_POWER_L1,
 								new FloatDoublewordElement(30013 - offset).wordOrder(WordOrder.MSWLSW)
 										.byteOrder(ByteOrder.BIG_ENDIAN),
 								ElementToChannelConverter.DIRECT_1_TO_1),
-						m(AsymmetricMeter.ChannelId.ACTIVE_POWER_L2,
+						this.m(AsymmetricMeter.ChannelId.ACTIVE_POWER_L2,
 								new FloatDoublewordElement(30015 - offset).wordOrder(WordOrder.MSWLSW)
 										.byteOrder(ByteOrder.BIG_ENDIAN),
 								ElementToChannelConverter.DIRECT_1_TO_1),
-						m(AsymmetricMeter.ChannelId.ACTIVE_POWER_L3,
+						this.m(AsymmetricMeter.ChannelId.ACTIVE_POWER_L3,
 								new FloatDoublewordElement(30017 - offset).wordOrder(WordOrder.MSWLSW)
 										.byteOrder(ByteOrder.BIG_ENDIAN),
 								ElementToChannelConverter.DIRECT_1_TO_1),
-						m(AsymmetricMeter.ChannelId.REACTIVE_POWER_L1,
+						this.m(AsymmetricMeter.ChannelId.REACTIVE_POWER_L1,
 								new FloatDoublewordElement(30019 - offset).wordOrder(WordOrder.MSWLSW)
 										.byteOrder(ByteOrder.BIG_ENDIAN),
 								ElementToChannelConverter.DIRECT_1_TO_1),
-						m(AsymmetricMeter.ChannelId.REACTIVE_POWER_L2,
+						this.m(AsymmetricMeter.ChannelId.REACTIVE_POWER_L2,
 								new FloatDoublewordElement(30021 - offset).wordOrder(WordOrder.MSWLSW)
 										.byteOrder(ByteOrder.BIG_ENDIAN),
 								ElementToChannelConverter.DIRECT_1_TO_1),
-						m(AsymmetricMeter.ChannelId.REACTIVE_POWER_L3,
+						this.m(AsymmetricMeter.ChannelId.REACTIVE_POWER_L3,
 								new FloatDoublewordElement(30023 - offset).wordOrder(WordOrder.MSWLSW)
 										.byteOrder(ByteOrder.BIG_ENDIAN),
 								ElementToChannelConverter.DIRECT_1_TO_1),
 						new DummyRegisterElement(30025 - offset, 30048 - offset),
-						m(SymmetricMeter.ChannelId.CURRENT,
+						this.m(SymmetricMeter.ChannelId.CURRENT,
 								new FloatDoublewordElement(30049 - offset).wordOrder(WordOrder.MSWLSW)
 										.byteOrder(ByteOrder.BIG_ENDIAN),
 								ElementToChannelConverter.SCALE_FACTOR_3),
 						new DummyRegisterElement(30051 - offset, 30052 - offset),
-						m(SymmetricMeter.ChannelId.ACTIVE_POWER,
+						this.m(SymmetricMeter.ChannelId.ACTIVE_POWER,
 								new FloatDoublewordElement(30053 - offset).wordOrder(WordOrder.MSWLSW)
 										.byteOrder(ByteOrder.BIG_ENDIAN),
 								ElementToChannelConverter.DIRECT_1_TO_1),
 						new DummyRegisterElement(30055 - offset, 30056 - offset),
-						m(SymmetricMeter.ChannelId.REACTIVE_POWER,
+						this.m(SymmetricMeter.ChannelId.REACTIVE_POWER,
 								new FloatDoublewordElement(30057 - offset).wordOrder(WordOrder.MSWLSW)
 										.byteOrder(ByteOrder.BIG_ENDIAN),
 								ElementToChannelConverter.DIRECT_1_TO_1),
 						new DummyRegisterElement(30059 - offset, 30070 - offset),
-						m(SymmetricMeter.ChannelId.FREQUENCY,
+						this.m(SymmetricMeter.ChannelId.FREQUENCY,
 								new FloatDoublewordElement(30071 - offset).wordOrder(WordOrder.MSWLSW)
 										.byteOrder(ByteOrder.BIG_ENDIAN),
 								ElementToChannelConverter.DIRECT_1_TO_1),
-						m(SymmetricMeter.ChannelId.ACTIVE_PRODUCTION_ENERGY,
+						this.m(SymmetricMeter.ChannelId.ACTIVE_PRODUCTION_ENERGY,
 								new FloatDoublewordElement(30073 - offset).wordOrder(WordOrder.MSWLSW)
 										.byteOrder(ByteOrder.BIG_ENDIAN),
 								ElementToChannelConverter.DIRECT_1_TO_1),
-						m(SymmetricMeter.ChannelId.ACTIVE_CONSUMPTION_ENERGY,
+						this.m(SymmetricMeter.ChannelId.ACTIVE_CONSUMPTION_ENERGY,
 								new FloatDoublewordElement(30075 - offset).wordOrder(WordOrder.MSWLSW)
 										.byteOrder(ByteOrder.BIG_ENDIAN),
 								ElementToChannelConverter.DIRECT_1_TO_1),
-						m(MeterMicrocareSdm630.ChannelId.REACTIVE_PRODUCTION_ENERGY,
+						this.m(MeterMicrocareSdm630.ChannelId.REACTIVE_PRODUCTION_ENERGY,
 								new FloatDoublewordElement(30077 - offset).wordOrder(WordOrder.MSWLSW)
 										.byteOrder(ByteOrder.BIG_ENDIAN),
 								ElementToChannelConverter.DIRECT_1_TO_1),
-						m(MeterMicrocareSdm630.ChannelId.REACTIVE_CONSUMPTION_ENERGY,
+						this.m(MeterMicrocareSdm630.ChannelId.REACTIVE_CONSUMPTION_ENERGY,
 								new FloatDoublewordElement(30079 - offset).wordOrder(WordOrder.MSWLSW)
 										.byteOrder(ByteOrder.BIG_ENDIAN),
 								ElementToChannelConverter.DIRECT_1_TO_1)));
diff --git a/io.openems.edge.meter.microcare.sdm630/test/io/openems/edge/meter/microcare/sdm630/MyConfig.java b/io.openems.edge.meter.microcare.sdm630/test/io/openems/edge/meter/microcare/sdm630/MyConfig.java
index 89503fe3a6a..b532a046788 100644
--- a/io.openems.edge.meter.microcare.sdm630/test/io/openems/edge/meter/microcare/sdm630/MyConfig.java
+++ b/io.openems.edge.meter.microcare.sdm630/test/io/openems/edge/meter/microcare/sdm630/MyConfig.java
@@ -38,7 +38,7 @@ public MyConfig build() {
 
 	/**
 	 * Create a Config builder.
-	 * 
+	 *
 	 * @return a {@link Builder}
 	 */
 	public static Builder create() {
diff --git a/io.openems.edge.meter.pqplus/src/io/openems/edge/meter/pqplus/umd96/MeterPqplusUmd96.java b/io.openems.edge.meter.pqplus/src/io/openems/edge/meter/pqplus/umd96/MeterPqplusUmd96.java
index c41869fbd9a..5df8e8c06f3 100644
--- a/io.openems.edge.meter.pqplus/src/io/openems/edge/meter/pqplus/umd96/MeterPqplusUmd96.java
+++ b/io.openems.edge.meter.pqplus/src/io/openems/edge/meter/pqplus/umd96/MeterPqplusUmd96.java
@@ -16,6 +16,7 @@ private ChannelId(Doc doc) {
 			this.doc = doc;
 		}
 
+		@Override
 		public Doc doc() {
 			return this.doc;
 		}
diff --git a/io.openems.edge.meter.pqplus/src/io/openems/edge/meter/pqplus/umd96/MeterPqplusUmd96Impl.java b/io.openems.edge.meter.pqplus/src/io/openems/edge/meter/pqplus/umd96/MeterPqplusUmd96Impl.java
index 5246de7d901..80ab88473ac 100644
--- a/io.openems.edge.meter.pqplus/src/io/openems/edge/meter/pqplus/umd96/MeterPqplusUmd96Impl.java
+++ b/io.openems.edge.meter.pqplus/src/io/openems/edge/meter/pqplus/umd96/MeterPqplusUmd96Impl.java
@@ -29,7 +29,7 @@
 
 /**
  * Implements the PQ Plus UMD 96 meter.
- * 
+ *
  * <ul>
  * <li>https://www.pq-plus.de/produkte/hardwarekomponenten/umd-96/
  * <li>https://www.pq-plus.de/site/assets/files/2795/pqplus-com-protokoll-modbus_3_0.pdf
@@ -59,6 +59,7 @@ public MeterPqplusUmd96Impl() {
 		);
 	}
 
+	@Override
 	@Reference(policy = ReferencePolicy.STATIC, policyOption = ReferencePolicyOption.GREEDY, cardinality = ReferenceCardinality.MANDATORY)
 	protected void setModbus(BridgeModbus modbus) {
 		super.setModbus(modbus);
@@ -70,10 +71,10 @@ void activate(ComponentContext context, Config config) throws OpenemsException {
 
 		if (super.activate(context, config.id(), config.alias(), config.enabled(), config.modbusUnitId(), this.cm,
 				"Modbus", config.modbus_id())) {
-			return;
 		}
 	}
 
+	@Override
 	@Deactivate
 	protected void deactivate() {
 		super.deactivate();
@@ -89,40 +90,40 @@ protected ModbusProtocol defineModbusProtocol() throws OpenemsException {
 		return new ModbusProtocol(this, //
 				// Frequency
 				new FC3ReadRegistersTask(0x1004, Priority.LOW, //
-						m(SymmetricMeter.ChannelId.FREQUENCY, new FloatDoublewordElement(0x1004),
+						this.m(SymmetricMeter.ChannelId.FREQUENCY, new FloatDoublewordElement(0x1004),
 								ElementToChannelConverter.SCALE_FACTOR_3)),
 				// Voltages
 				new FC3ReadRegistersTask(0x1100, Priority.HIGH, //
-						m(new FloatDoublewordElement(0x1100)) //
+						this.m(new FloatDoublewordElement(0x1100)) //
 								.m(AsymmetricMeter.ChannelId.VOLTAGE_L1, ElementToChannelConverter.SCALE_FACTOR_3) //
 								.m(SymmetricMeter.ChannelId.VOLTAGE, ElementToChannelConverter.SCALE_FACTOR_3) //
 								.build(), //
-						m(AsymmetricMeter.ChannelId.VOLTAGE_L2, new FloatDoublewordElement(0x1102),
+						this.m(AsymmetricMeter.ChannelId.VOLTAGE_L2, new FloatDoublewordElement(0x1102),
 								ElementToChannelConverter.SCALE_FACTOR_3),
-						m(AsymmetricMeter.ChannelId.VOLTAGE_L3, new FloatDoublewordElement(0x1104),
+						this.m(AsymmetricMeter.ChannelId.VOLTAGE_L3, new FloatDoublewordElement(0x1104),
 								ElementToChannelConverter.SCALE_FACTOR_3)),
 				// Currents
 				new FC3ReadRegistersTask(0x1200, Priority.HIGH, //
-						m(new FloatDoublewordElement(0x1200))
+						this.m(new FloatDoublewordElement(0x1200))
 								.m(AsymmetricMeter.ChannelId.CURRENT_L1, ElementToChannelConverter.SCALE_FACTOR_3) //
 								.m(SymmetricMeter.ChannelId.CURRENT, ElementToChannelConverter.SCALE_FACTOR_3) //
 								.build(), //
-						m(AsymmetricMeter.ChannelId.CURRENT_L2, new FloatDoublewordElement(0x1202), //
+						this.m(AsymmetricMeter.ChannelId.CURRENT_L2, new FloatDoublewordElement(0x1202), //
 								ElementToChannelConverter.SCALE_FACTOR_3),
-						m(AsymmetricMeter.ChannelId.CURRENT_L3, new FloatDoublewordElement(0x1204), //
+						this.m(AsymmetricMeter.ChannelId.CURRENT_L3, new FloatDoublewordElement(0x1204), //
 								ElementToChannelConverter.SCALE_FACTOR_3)),
 				// Power values
 				new FC3ReadRegistersTask(0x1314, Priority.HIGH, //
-						m(SymmetricMeter.ChannelId.ACTIVE_POWER, new FloatDoublewordElement(0x1314)),
-						m(SymmetricMeter.ChannelId.REACTIVE_POWER, new FloatDoublewordElement(0x1316)), //
+						this.m(SymmetricMeter.ChannelId.ACTIVE_POWER, new FloatDoublewordElement(0x1314)),
+						this.m(SymmetricMeter.ChannelId.REACTIVE_POWER, new FloatDoublewordElement(0x1316)), //
 						new DummyRegisterElement(0x1318, 0x131F), //
-						m(AsymmetricMeter.ChannelId.ACTIVE_POWER_L1, new FloatDoublewordElement(0x1320)),
-						m(AsymmetricMeter.ChannelId.ACTIVE_POWER_L2, new FloatDoublewordElement(0x1322)),
-						m(AsymmetricMeter.ChannelId.ACTIVE_POWER_L3, new FloatDoublewordElement(0x1324)),
+						this.m(AsymmetricMeter.ChannelId.ACTIVE_POWER_L1, new FloatDoublewordElement(0x1320)),
+						this.m(AsymmetricMeter.ChannelId.ACTIVE_POWER_L2, new FloatDoublewordElement(0x1322)),
+						this.m(AsymmetricMeter.ChannelId.ACTIVE_POWER_L3, new FloatDoublewordElement(0x1324)),
 						new DummyRegisterElement(0x1326, 0x1327), //
-						m(AsymmetricMeter.ChannelId.REACTIVE_POWER_L1, new FloatDoublewordElement(0x1328)),
-						m(AsymmetricMeter.ChannelId.REACTIVE_POWER_L2, new FloatDoublewordElement(0x132A)),
-						m(AsymmetricMeter.ChannelId.REACTIVE_POWER_L3, new FloatDoublewordElement(0x132C)))//
+						this.m(AsymmetricMeter.ChannelId.REACTIVE_POWER_L1, new FloatDoublewordElement(0x1328)),
+						this.m(AsymmetricMeter.ChannelId.REACTIVE_POWER_L2, new FloatDoublewordElement(0x132A)),
+						this.m(AsymmetricMeter.ChannelId.REACTIVE_POWER_L3, new FloatDoublewordElement(0x132C)))//
 		);
 
 	}
diff --git a/io.openems.edge.meter.pqplus/src/io/openems/edge/meter/pqplus/umd97/MeterPqplusUmd97.java b/io.openems.edge.meter.pqplus/src/io/openems/edge/meter/pqplus/umd97/MeterPqplusUmd97.java
index e0efffe443f..ef12ea33765 100644
--- a/io.openems.edge.meter.pqplus/src/io/openems/edge/meter/pqplus/umd97/MeterPqplusUmd97.java
+++ b/io.openems.edge.meter.pqplus/src/io/openems/edge/meter/pqplus/umd97/MeterPqplusUmd97.java
@@ -16,6 +16,7 @@ private ChannelId(Doc doc) {
 			this.doc = doc;
 		}
 
+		@Override
 		public Doc doc() {
 			return this.doc;
 		}
diff --git a/io.openems.edge.meter.pqplus/src/io/openems/edge/meter/pqplus/umd97/MeterPqplusUmd97Impl.java b/io.openems.edge.meter.pqplus/src/io/openems/edge/meter/pqplus/umd97/MeterPqplusUmd97Impl.java
index f60d5180028..5f366821f5e 100644
--- a/io.openems.edge.meter.pqplus/src/io/openems/edge/meter/pqplus/umd97/MeterPqplusUmd97Impl.java
+++ b/io.openems.edge.meter.pqplus/src/io/openems/edge/meter/pqplus/umd97/MeterPqplusUmd97Impl.java
@@ -29,7 +29,7 @@
 
 /**
  * Implements the PQ Plus UMD 97 meter.
- * 
+ *
  * <p>
  * https://www.pq-plus.de/news/pqplus/umd-97-messgeraet.html
  */
@@ -57,6 +57,7 @@ public MeterPqplusUmd97Impl() {
 		);
 	}
 
+	@Override
 	@Reference(policy = ReferencePolicy.STATIC, policyOption = ReferencePolicyOption.GREEDY, cardinality = ReferenceCardinality.MANDATORY)
 	protected void setModbus(BridgeModbus modbus) {
 		super.setModbus(modbus);
@@ -68,10 +69,10 @@ void activate(ComponentContext context, Config config) throws OpenemsException {
 
 		if (super.activate(context, config.id(), config.alias(), config.enabled(), config.modbusUnitId(), this.cm,
 				"Modbus", config.modbus_id())) {
-			return;
 		}
 	}
 
+	@Override
 	@Deactivate
 	protected void deactivate() {
 		super.deactivate();
@@ -86,34 +87,34 @@ public MeterType getMeterType() {
 	protected ModbusProtocol defineModbusProtocol() throws OpenemsException {
 		return new ModbusProtocol(this, //
 				new FC3ReadRegistersTask(19000, Priority.HIGH, //
-						m(new FloatDoublewordElement(19000)) //
+						this.m(new FloatDoublewordElement(19000)) //
 								.m(AsymmetricMeter.ChannelId.VOLTAGE_L1, ElementToChannelConverter.SCALE_FACTOR_3) //
 								.m(SymmetricMeter.ChannelId.VOLTAGE, ElementToChannelConverter.SCALE_FACTOR_3) //
 								.build(), //
-						m(AsymmetricMeter.ChannelId.VOLTAGE_L2, new FloatDoublewordElement(19002),
+						this.m(AsymmetricMeter.ChannelId.VOLTAGE_L2, new FloatDoublewordElement(19002),
 								ElementToChannelConverter.SCALE_FACTOR_3),
-						m(AsymmetricMeter.ChannelId.VOLTAGE_L3, new FloatDoublewordElement(19004),
+						this.m(AsymmetricMeter.ChannelId.VOLTAGE_L3, new FloatDoublewordElement(19004),
 								ElementToChannelConverter.SCALE_FACTOR_3),
 						new DummyRegisterElement(19006, 19011), //
-						m(AsymmetricMeter.ChannelId.CURRENT_L1, new FloatDoublewordElement(19012),
+						this.m(AsymmetricMeter.ChannelId.CURRENT_L1, new FloatDoublewordElement(19012),
 								ElementToChannelConverter.SCALE_FACTOR_3),
-						m(AsymmetricMeter.ChannelId.CURRENT_L2, new FloatDoublewordElement(19014),
+						this.m(AsymmetricMeter.ChannelId.CURRENT_L2, new FloatDoublewordElement(19014),
 								ElementToChannelConverter.SCALE_FACTOR_3),
-						m(AsymmetricMeter.ChannelId.CURRENT_L3, new FloatDoublewordElement(19016),
+						this.m(AsymmetricMeter.ChannelId.CURRENT_L3, new FloatDoublewordElement(19016),
 								ElementToChannelConverter.SCALE_FACTOR_3),
-						m(SymmetricMeter.ChannelId.CURRENT, new FloatDoublewordElement(19018),
+						this.m(SymmetricMeter.ChannelId.CURRENT, new FloatDoublewordElement(19018),
 								ElementToChannelConverter.SCALE_FACTOR_3),
-						m(AsymmetricMeter.ChannelId.ACTIVE_POWER_L1, new FloatDoublewordElement(19020)),
-						m(AsymmetricMeter.ChannelId.ACTIVE_POWER_L2, new FloatDoublewordElement(19022)),
-						m(AsymmetricMeter.ChannelId.ACTIVE_POWER_L3, new FloatDoublewordElement(19024)),
-						m(SymmetricMeter.ChannelId.ACTIVE_POWER, new FloatDoublewordElement(19026)),
+						this.m(AsymmetricMeter.ChannelId.ACTIVE_POWER_L1, new FloatDoublewordElement(19020)),
+						this.m(AsymmetricMeter.ChannelId.ACTIVE_POWER_L2, new FloatDoublewordElement(19022)),
+						this.m(AsymmetricMeter.ChannelId.ACTIVE_POWER_L3, new FloatDoublewordElement(19024)),
+						this.m(SymmetricMeter.ChannelId.ACTIVE_POWER, new FloatDoublewordElement(19026)),
 						new DummyRegisterElement(19028, 19035), //
-						m(AsymmetricMeter.ChannelId.REACTIVE_POWER_L1, new FloatDoublewordElement(19036)),
-						m(AsymmetricMeter.ChannelId.REACTIVE_POWER_L2, new FloatDoublewordElement(19038)),
-						m(AsymmetricMeter.ChannelId.REACTIVE_POWER_L3, new FloatDoublewordElement(19040)),
-						m(SymmetricMeter.ChannelId.REACTIVE_POWER, new FloatDoublewordElement(19042)),
+						this.m(AsymmetricMeter.ChannelId.REACTIVE_POWER_L1, new FloatDoublewordElement(19036)),
+						this.m(AsymmetricMeter.ChannelId.REACTIVE_POWER_L2, new FloatDoublewordElement(19038)),
+						this.m(AsymmetricMeter.ChannelId.REACTIVE_POWER_L3, new FloatDoublewordElement(19040)),
+						this.m(SymmetricMeter.ChannelId.REACTIVE_POWER, new FloatDoublewordElement(19042)),
 						new DummyRegisterElement(19044, 19049), //
-						m(SymmetricMeter.ChannelId.FREQUENCY, new FloatDoublewordElement(19050),
+						this.m(SymmetricMeter.ChannelId.FREQUENCY, new FloatDoublewordElement(19050),
 								ElementToChannelConverter.SCALE_FACTOR_3)));
 	}
 
diff --git a/io.openems.edge.meter.pqplus/test/io/openems/edge/meter/pqplus/umd96/MyConfig.java b/io.openems.edge.meter.pqplus/test/io/openems/edge/meter/pqplus/umd96/MyConfig.java
index fa40fbc58c7..908797f1660 100644
--- a/io.openems.edge.meter.pqplus/test/io/openems/edge/meter/pqplus/umd96/MyConfig.java
+++ b/io.openems.edge.meter.pqplus/test/io/openems/edge/meter/pqplus/umd96/MyConfig.java
@@ -38,7 +38,7 @@ public MyConfig build() {
 
 	/**
 	 * Create a Config builder.
-	 * 
+	 *
 	 * @return a {@link Builder}
 	 */
 	public static Builder create() {
diff --git a/io.openems.edge.meter.pqplus/test/io/openems/edge/meter/pqplus/umd97/MyConfig.java b/io.openems.edge.meter.pqplus/test/io/openems/edge/meter/pqplus/umd97/MyConfig.java
index a5ce3774014..765607918f0 100644
--- a/io.openems.edge.meter.pqplus/test/io/openems/edge/meter/pqplus/umd97/MyConfig.java
+++ b/io.openems.edge.meter.pqplus/test/io/openems/edge/meter/pqplus/umd97/MyConfig.java
@@ -38,7 +38,7 @@ public MyConfig build() {
 
 	/**
 	 * Create a Config builder.
-	 * 
+	 *
 	 * @return a {@link Builder}
 	 */
 	public static Builder create() {
diff --git a/io.openems.edge.meter.schneider.acti9.smartlink/src/io/openems/edge/meter/schneider/acti9/smartlink/MeterSchneiderActi9Smartlink.java b/io.openems.edge.meter.schneider.acti9.smartlink/src/io/openems/edge/meter/schneider/acti9/smartlink/MeterSchneiderActi9Smartlink.java
index 8bb09c95a94..f74c216fb2a 100644
--- a/io.openems.edge.meter.schneider.acti9.smartlink/src/io/openems/edge/meter/schneider/acti9/smartlink/MeterSchneiderActi9Smartlink.java
+++ b/io.openems.edge.meter.schneider.acti9.smartlink/src/io/openems/edge/meter/schneider/acti9/smartlink/MeterSchneiderActi9Smartlink.java
@@ -52,6 +52,7 @@ public MeterSchneiderActi9Smartlink() {
 		);
 	}
 
+	@Override
 	@Reference(policy = ReferencePolicy.STATIC, policyOption = ReferencePolicyOption.GREEDY, cardinality = ReferenceCardinality.MANDATORY)
 	protected void setModbus(BridgeModbus modbus) {
 		super.setModbus(modbus);
@@ -63,10 +64,10 @@ void activate(ComponentContext context, Config config) throws OpenemsException {
 		this.inverted = config.invert();
 		if (super.activate(context, config.id(), config.alias(), config.enabled(), config.modbusUnitId(), this.cm,
 				"Modbus", config.modbus_id())) {
-			return;
 		}
 	}
 
+	@Override
 	@Deactivate
 	protected void deactivate() {
 		super.deactivate();
@@ -79,48 +80,48 @@ public MeterType getMeterType() {
 
 	@Override
 	protected ModbusProtocol defineModbusProtocol() throws OpenemsException {
-		final int offset = 1;
+		final var offset = 1;
 		/**
 		 * See Datasheet PDF-file in doc directory.
-		 * 
+		 *
 		 * Phase specific reactive Power, Single Current and Voltage figures are not
 		 * implemented by this meter.
 		 */
 		return new ModbusProtocol(this, //
 				new FC4ReadInputRegistersTask(3000 - offset, Priority.HIGH,
-						m(AsymmetricMeter.ChannelId.CURRENT_L1, new FloatDoublewordElement(3000 - offset),
+						this.m(AsymmetricMeter.ChannelId.CURRENT_L1, new FloatDoublewordElement(3000 - offset),
 								ElementToChannelConverter.SCALE_FACTOR_3_AND_INVERT_IF_TRUE(this.inverted)),
-						m(AsymmetricMeter.ChannelId.CURRENT_L2, new FloatDoublewordElement(3002 - offset),
+						this.m(AsymmetricMeter.ChannelId.CURRENT_L2, new FloatDoublewordElement(3002 - offset),
 								ElementToChannelConverter.SCALE_FACTOR_3_AND_INVERT_IF_TRUE(this.inverted)),
-						m(AsymmetricMeter.ChannelId.CURRENT_L3, new FloatDoublewordElement(3004 - offset),
+						this.m(AsymmetricMeter.ChannelId.CURRENT_L3, new FloatDoublewordElement(3004 - offset),
 								ElementToChannelConverter.SCALE_FACTOR_3_AND_INVERT_IF_TRUE(this.inverted))),
 				new FC4ReadInputRegistersTask(3028 - offset, Priority.LOW,
-						m(AsymmetricMeter.ChannelId.VOLTAGE_L1, new FloatDoublewordElement(3028 - offset),
+						this.m(AsymmetricMeter.ChannelId.VOLTAGE_L1, new FloatDoublewordElement(3028 - offset),
 								ElementToChannelConverter.SCALE_FACTOR_3),
-						m(AsymmetricMeter.ChannelId.VOLTAGE_L2, new FloatDoublewordElement(3030 - offset),
+						this.m(AsymmetricMeter.ChannelId.VOLTAGE_L2, new FloatDoublewordElement(3030 - offset),
 								ElementToChannelConverter.SCALE_FACTOR_3),
-						m(AsymmetricMeter.ChannelId.VOLTAGE_L3, new FloatDoublewordElement(3032 - offset),
+						this.m(AsymmetricMeter.ChannelId.VOLTAGE_L3, new FloatDoublewordElement(3032 - offset),
 								ElementToChannelConverter.SCALE_FACTOR_3)),
 				new FC4ReadInputRegistersTask(3054 - offset, Priority.HIGH,
-						m(AsymmetricMeter.ChannelId.ACTIVE_POWER_L1, new FloatDoublewordElement(3054 - offset),
+						this.m(AsymmetricMeter.ChannelId.ACTIVE_POWER_L1, new FloatDoublewordElement(3054 - offset),
 								ElementToChannelConverter.INVERT_IF_TRUE(this.inverted)),
-						m(AsymmetricMeter.ChannelId.ACTIVE_POWER_L2, new FloatDoublewordElement(3056 - offset),
+						this.m(AsymmetricMeter.ChannelId.ACTIVE_POWER_L2, new FloatDoublewordElement(3056 - offset),
 								ElementToChannelConverter.INVERT_IF_TRUE(this.inverted)),
-						m(AsymmetricMeter.ChannelId.ACTIVE_POWER_L3, new FloatDoublewordElement(3058 - offset),
+						this.m(AsymmetricMeter.ChannelId.ACTIVE_POWER_L3, new FloatDoublewordElement(3058 - offset),
 								ElementToChannelConverter.INVERT_IF_TRUE(this.inverted)),
-						m(SymmetricMeter.ChannelId.ACTIVE_POWER, new FloatDoublewordElement(3060 - offset),
+						this.m(SymmetricMeter.ChannelId.ACTIVE_POWER, new FloatDoublewordElement(3060 - offset),
 								ElementToChannelConverter.INVERT_IF_TRUE(this.inverted)),
 						new DummyRegisterElement(3062 - offset, 3067 - offset),
-						m(SymmetricMeter.ChannelId.REACTIVE_POWER, new FloatDoublewordElement(3068 - offset),
+						this.m(SymmetricMeter.ChannelId.REACTIVE_POWER, new FloatDoublewordElement(3068 - offset),
 								ElementToChannelConverter.INVERT_IF_TRUE(this.inverted))),
 				new FC4ReadInputRegistersTask(3110 - offset, Priority.LOW,
-						m(SymmetricMeter.ChannelId.FREQUENCY, new FloatDoublewordElement(3110 - offset),
+						this.m(SymmetricMeter.ChannelId.FREQUENCY, new FloatDoublewordElement(3110 - offset),
 								ElementToChannelConverter.SCALE_FACTOR_3)),
 				new FC4ReadInputRegistersTask(3208 - offset, Priority.LOW,
-						m(this.inverted ? SymmetricMeter.ChannelId.ACTIVE_PRODUCTION_ENERGY
+						this.m(this.inverted ? SymmetricMeter.ChannelId.ACTIVE_PRODUCTION_ENERGY
 								: SymmetricMeter.ChannelId.ACTIVE_CONSUMPTION_ENERGY,
 								new UnsignedQuadruplewordElement(3208 - offset)),
-						m(this.inverted ? SymmetricMeter.ChannelId.ACTIVE_CONSUMPTION_ENERGY
+						this.m(this.inverted ? SymmetricMeter.ChannelId.ACTIVE_CONSUMPTION_ENERGY
 								: SymmetricMeter.ChannelId.ACTIVE_PRODUCTION_ENERGY,
 								new UnsignedQuadruplewordElement(3212 - offset))));
 	}
diff --git a/io.openems.edge.meter.schneider.acti9.smartlink/test/io/openems/edge/meter/schneider/acti9/smartlink/MyConfig.java b/io.openems.edge.meter.schneider.acti9.smartlink/test/io/openems/edge/meter/schneider/acti9/smartlink/MyConfig.java
index e20b7ad489b..fe5d142c485 100644
--- a/io.openems.edge.meter.schneider.acti9.smartlink/test/io/openems/edge/meter/schneider/acti9/smartlink/MyConfig.java
+++ b/io.openems.edge.meter.schneider.acti9.smartlink/test/io/openems/edge/meter/schneider/acti9/smartlink/MyConfig.java
@@ -44,7 +44,7 @@ public MyConfig build() {
 
 	/**
 	 * Create a Config builder.
-	 * 
+	 *
 	 * @return a {@link Builder}
 	 */
 	public static Builder create() {
diff --git a/io.openems.edge.meter.siemens/src/io/openems/edge/meter/siemens/SiemensPacMeter.java b/io.openems.edge.meter.siemens/src/io/openems/edge/meter/siemens/SiemensPacMeter.java
index 3b16dd279a7..bf523217d67 100644
--- a/io.openems.edge.meter.siemens/src/io/openems/edge/meter/siemens/SiemensPacMeter.java
+++ b/io.openems.edge.meter.siemens/src/io/openems/edge/meter/siemens/SiemensPacMeter.java
@@ -18,6 +18,7 @@ private ChannelId(Doc doc) {
 			this.doc = doc;
 		}
 
+		@Override
 		public Doc doc() {
 			return this.doc;
 		}
diff --git a/io.openems.edge.meter.siemens/src/io/openems/edge/meter/siemens/SiemensPacMeterImpl.java b/io.openems.edge.meter.siemens/src/io/openems/edge/meter/siemens/SiemensPacMeterImpl.java
index 0244371b199..7924a184773 100644
--- a/io.openems.edge.meter.siemens/src/io/openems/edge/meter/siemens/SiemensPacMeterImpl.java
+++ b/io.openems.edge.meter.siemens/src/io/openems/edge/meter/siemens/SiemensPacMeterImpl.java
@@ -33,7 +33,7 @@
 
 /**
  * Implements the Siemens PAC2200/3200/4200 power meter.
- * 
+ *
  * <p>
  * https://cache.industry.siemens.com/dl/files/150/26504150/att_906558/v1/A5E01168664B-04_EN-US_122016_201612221316360495.pdf
  */
@@ -66,6 +66,7 @@ public SiemensPacMeterImpl() {
 		);
 	}
 
+	@Override
 	@Reference(policy = ReferencePolicy.STATIC, policyOption = ReferencePolicyOption.GREEDY, cardinality = ReferenceCardinality.MANDATORY)
 	protected void setModbus(BridgeModbus modbus) {
 		super.setModbus(modbus);
@@ -78,10 +79,10 @@ void activate(ComponentContext context, Config config) throws OpenemsException {
 
 		if (super.activate(context, config.id(), config.alias(), config.enabled(), config.modbusUnitId(), this.cm,
 				"Modbus", config.modbus_id())) {
-			return;
 		}
 	}
 
+	@Override
 	@Deactivate
 	protected void deactivate() {
 		super.deactivate();
@@ -95,52 +96,52 @@ public MeterType getMeterType() {
 	@Override
 	protected ModbusProtocol defineModbusProtocol() throws OpenemsException {
 
-		ModbusProtocol modbusProtocol = new ModbusProtocol(this, //
+		var modbusProtocol = new ModbusProtocol(this, //
 				new FC3ReadRegistersTask(1, Priority.HIGH, //
-						m(AsymmetricMeter.ChannelId.VOLTAGE_L1, new FloatDoublewordElement(1),
+						this.m(AsymmetricMeter.ChannelId.VOLTAGE_L1, new FloatDoublewordElement(1),
 								ElementToChannelConverter.SCALE_FACTOR_3),
-						m(AsymmetricMeter.ChannelId.VOLTAGE_L2, new FloatDoublewordElement(3),
+						this.m(AsymmetricMeter.ChannelId.VOLTAGE_L2, new FloatDoublewordElement(3),
 								ElementToChannelConverter.SCALE_FACTOR_3),
-						m(AsymmetricMeter.ChannelId.VOLTAGE_L3, new FloatDoublewordElement(5),
+						this.m(AsymmetricMeter.ChannelId.VOLTAGE_L3, new FloatDoublewordElement(5),
 								ElementToChannelConverter.SCALE_FACTOR_3),
 						new DummyRegisterElement(7, 12), //
-						m(AsymmetricMeter.ChannelId.CURRENT_L1, new FloatDoublewordElement(13),
+						this.m(AsymmetricMeter.ChannelId.CURRENT_L1, new FloatDoublewordElement(13),
 								ElementToChannelConverter.SCALE_FACTOR_3_AND_INVERT_IF_TRUE(this.invert)),
-						m(AsymmetricMeter.ChannelId.CURRENT_L2, new FloatDoublewordElement(15),
+						this.m(AsymmetricMeter.ChannelId.CURRENT_L2, new FloatDoublewordElement(15),
 								ElementToChannelConverter.SCALE_FACTOR_3_AND_INVERT_IF_TRUE(this.invert)),
-						m(AsymmetricMeter.ChannelId.CURRENT_L3, new FloatDoublewordElement(17),
+						this.m(AsymmetricMeter.ChannelId.CURRENT_L3, new FloatDoublewordElement(17),
 								ElementToChannelConverter.SCALE_FACTOR_3_AND_INVERT_IF_TRUE(this.invert)),
 						new DummyRegisterElement(19, 24), //
-						m(AsymmetricMeter.ChannelId.ACTIVE_POWER_L1, new FloatDoublewordElement(25),
+						this.m(AsymmetricMeter.ChannelId.ACTIVE_POWER_L1, new FloatDoublewordElement(25),
 								ElementToChannelConverter.INVERT_IF_TRUE(this.invert)),
-						m(AsymmetricMeter.ChannelId.ACTIVE_POWER_L2, new FloatDoublewordElement(27),
+						this.m(AsymmetricMeter.ChannelId.ACTIVE_POWER_L2, new FloatDoublewordElement(27),
 								ElementToChannelConverter.INVERT_IF_TRUE(this.invert)),
-						m(AsymmetricMeter.ChannelId.ACTIVE_POWER_L3, new FloatDoublewordElement(29),
+						this.m(AsymmetricMeter.ChannelId.ACTIVE_POWER_L3, new FloatDoublewordElement(29),
 								ElementToChannelConverter.INVERT_IF_TRUE(this.invert)),
-						m(AsymmetricMeter.ChannelId.REACTIVE_POWER_L1, new FloatDoublewordElement(31),
+						this.m(AsymmetricMeter.ChannelId.REACTIVE_POWER_L1, new FloatDoublewordElement(31),
 								ElementToChannelConverter.INVERT_IF_TRUE(this.invert)),
-						m(AsymmetricMeter.ChannelId.REACTIVE_POWER_L2, new FloatDoublewordElement(33),
+						this.m(AsymmetricMeter.ChannelId.REACTIVE_POWER_L2, new FloatDoublewordElement(33),
 								ElementToChannelConverter.INVERT_IF_TRUE(this.invert)),
-						m(AsymmetricMeter.ChannelId.REACTIVE_POWER_L3, new FloatDoublewordElement(35),
+						this.m(AsymmetricMeter.ChannelId.REACTIVE_POWER_L3, new FloatDoublewordElement(35),
 								ElementToChannelConverter.INVERT_IF_TRUE(this.invert)),
 						new DummyRegisterElement(37, 60), //
-						m(SymmetricMeter.ChannelId.CURRENT, new FloatDoublewordElement(61),
+						this.m(SymmetricMeter.ChannelId.CURRENT, new FloatDoublewordElement(61),
 								ElementToChannelConverter.SCALE_FACTOR_3_AND_INVERT_IF_TRUE(this.invert)),
 						new DummyRegisterElement(63, 64), //
-						m(SymmetricMeter.ChannelId.ACTIVE_POWER, new FloatDoublewordElement(65),
+						this.m(SymmetricMeter.ChannelId.ACTIVE_POWER, new FloatDoublewordElement(65),
 								ElementToChannelConverter.INVERT_IF_TRUE(this.invert)),
-						m(SymmetricMeter.ChannelId.REACTIVE_POWER, new FloatDoublewordElement(67),
+						this.m(SymmetricMeter.ChannelId.REACTIVE_POWER, new FloatDoublewordElement(67),
 								ElementToChannelConverter.INVERT_IF_TRUE(this.invert))));
 		if (this.invert) {
 			modbusProtocol.addTask(new FC3ReadRegistersTask(801, Priority.LOW, //
-					m(SymmetricMeter.ChannelId.ACTIVE_CONSUMPTION_ENERGY, new FloatQuadruplewordElement(801)),
+					this.m(SymmetricMeter.ChannelId.ACTIVE_CONSUMPTION_ENERGY, new FloatQuadruplewordElement(801)),
 					new DummyRegisterElement(805, 808), //
-					m(SymmetricMeter.ChannelId.ACTIVE_PRODUCTION_ENERGY, new FloatQuadruplewordElement(809))));
+					this.m(SymmetricMeter.ChannelId.ACTIVE_PRODUCTION_ENERGY, new FloatQuadruplewordElement(809))));
 		} else {
 			modbusProtocol.addTask(new FC3ReadRegistersTask(801, Priority.LOW, //
-					m(SymmetricMeter.ChannelId.ACTIVE_PRODUCTION_ENERGY, new FloatQuadruplewordElement(801)),
+					this.m(SymmetricMeter.ChannelId.ACTIVE_PRODUCTION_ENERGY, new FloatQuadruplewordElement(801)),
 					new DummyRegisterElement(805, 808), //
-					m(SymmetricMeter.ChannelId.ACTIVE_CONSUMPTION_ENERGY, new FloatQuadruplewordElement(809))));
+					this.m(SymmetricMeter.ChannelId.ACTIVE_CONSUMPTION_ENERGY, new FloatQuadruplewordElement(809))));
 		}
 
 		return modbusProtocol;
diff --git a/io.openems.edge.meter.sma.shm20/src/io/openems/edge/meter/sma/shm20/MeterSmaShm20.java b/io.openems.edge.meter.sma.shm20/src/io/openems/edge/meter/sma/shm20/MeterSmaShm20.java
index f5fd29f030d..a999d71f73b 100644
--- a/io.openems.edge.meter.sma.shm20/src/io/openems/edge/meter/sma/shm20/MeterSmaShm20.java
+++ b/io.openems.edge.meter.sma.shm20/src/io/openems/edge/meter/sma/shm20/MeterSmaShm20.java
@@ -5,7 +5,7 @@
 import io.openems.edge.common.channel.Doc;
 
 public interface MeterSmaShm20 {
-	
+
 	public enum ChannelId implements io.openems.edge.common.channel.ChannelId {
 		ACTIVE_PRODUCTION_POWER(Doc.of(OpenemsType.INTEGER) //
 				.unit(Unit.WATT)), //
@@ -22,7 +22,7 @@ public enum ChannelId implements io.openems.edge.common.channel.ChannelId {
 		ACTIVE_PRODUCTION_POWER_L2(Doc.of(OpenemsType.INTEGER) //
 				.unit(Unit.WATT)), //
 		ACTIVE_PRODUCTION_POWER_L3(Doc.of(OpenemsType.INTEGER) //
-				.unit(Unit.WATT)), //		
+				.unit(Unit.WATT)), //
 		;
 
 		private final Doc doc;
@@ -31,9 +31,10 @@ private ChannelId(Doc doc) {
 			this.doc = doc;
 		}
 
+		@Override
 		public Doc doc() {
 			return this.doc;
 		}
 	}
-	
+
 }
diff --git a/io.openems.edge.meter.sma.shm20/src/io/openems/edge/meter/sma/shm20/MeterSmaShm20Impl.java b/io.openems.edge.meter.sma.shm20/src/io/openems/edge/meter/sma/shm20/MeterSmaShm20Impl.java
index 50ce32a0c60..c6a0e3abbd9 100644
--- a/io.openems.edge.meter.sma.shm20/src/io/openems/edge/meter/sma/shm20/MeterSmaShm20Impl.java
+++ b/io.openems.edge.meter.sma.shm20/src/io/openems/edge/meter/sma/shm20/MeterSmaShm20Impl.java
@@ -56,6 +56,7 @@ public MeterSmaShm20Impl() {
 		);
 	}
 
+	@Override
 	@Reference(policy = ReferencePolicy.STATIC, policyOption = ReferencePolicyOption.GREEDY, cardinality = ReferenceCardinality.MANDATORY)
 	protected void setModbus(BridgeModbus modbus) {
 		super.setModbus(modbus);
@@ -66,10 +67,10 @@ void activate(ComponentContext context, Config config) throws OpenemsException {
 		this.meterType = config.type();
 		if (super.activate(context, config.id(), config.alias(), config.enabled(), config.modbusUnitId(), this.cm,
 				"Modbus", config.modbus_id())) {
-			return;
 		}
 	}
 
+	@Override
 	@Deactivate
 	protected void deactivate() {
 		super.deactivate();
@@ -82,41 +83,48 @@ public MeterType getMeterType() {
 
 	@Override
 	protected ModbusProtocol defineModbusProtocol() throws OpenemsException {
-		ModbusProtocol modbusProtocol = new ModbusProtocol(this,
+		var modbusProtocol = new ModbusProtocol(this,
 				// Consumption and Production Energy
 				new FC3ReadRegistersTask(30581, Priority.HIGH, //
-						m(SymmetricMeter.ChannelId.ACTIVE_PRODUCTION_ENERGY, new UnsignedDoublewordElement(30581)),
-						m(SymmetricMeter.ChannelId.ACTIVE_CONSUMPTION_ENERGY, new UnsignedDoublewordElement(30583))),
+						this.m(SymmetricMeter.ChannelId.ACTIVE_PRODUCTION_ENERGY, new UnsignedDoublewordElement(30581)),
+						this.m(SymmetricMeter.ChannelId.ACTIVE_CONSUMPTION_ENERGY,
+								new UnsignedDoublewordElement(30583))),
 				// Power Readings
 				new FC3ReadRegistersTask(30865, Priority.HIGH, //
-						m(MeterSmaShm20.ChannelId.ACTIVE_PRODUCTION_POWER, new SignedDoublewordElement(30865)),
-						m(MeterSmaShm20.ChannelId.ACTIVE_CONSUMPTION_POWER, new SignedDoublewordElement(30867))),
+						this.m(MeterSmaShm20.ChannelId.ACTIVE_PRODUCTION_POWER, new SignedDoublewordElement(30865)),
+						this.m(MeterSmaShm20.ChannelId.ACTIVE_CONSUMPTION_POWER, new SignedDoublewordElement(30867))),
 				// Voltage, Power and Reactive Power
 				new FC3ReadRegistersTask(31253, Priority.HIGH, //
-						m(AsymmetricMeter.ChannelId.VOLTAGE_L1, new UnsignedDoublewordElement(31253),
+						this.m(AsymmetricMeter.ChannelId.VOLTAGE_L1, new UnsignedDoublewordElement(31253),
 								ElementToChannelConverter.SCALE_FACTOR_1),
-						m(AsymmetricMeter.ChannelId.VOLTAGE_L2, new UnsignedDoublewordElement(31255),
+						this.m(AsymmetricMeter.ChannelId.VOLTAGE_L2, new UnsignedDoublewordElement(31255),
 								ElementToChannelConverter.SCALE_FACTOR_1),
-						m(AsymmetricMeter.ChannelId.VOLTAGE_L3, new UnsignedDoublewordElement(31257),
+						this.m(AsymmetricMeter.ChannelId.VOLTAGE_L3, new UnsignedDoublewordElement(31257),
 								ElementToChannelConverter.SCALE_FACTOR_1),
-						m(MeterSmaShm20.ChannelId.ACTIVE_CONSUMPTION_POWER_L1, new UnsignedDoublewordElement(31259)),
-						m(MeterSmaShm20.ChannelId.ACTIVE_CONSUMPTION_POWER_L2, new UnsignedDoublewordElement(31261)),
-						m(MeterSmaShm20.ChannelId.ACTIVE_CONSUMPTION_POWER_L3, new UnsignedDoublewordElement(31263)),
-						m(MeterSmaShm20.ChannelId.ACTIVE_PRODUCTION_POWER_L1, new UnsignedDoublewordElement(31265)),
-						m(MeterSmaShm20.ChannelId.ACTIVE_PRODUCTION_POWER_L2, new UnsignedDoublewordElement(31267)),
-						m(MeterSmaShm20.ChannelId.ACTIVE_PRODUCTION_POWER_L3, new UnsignedDoublewordElement(31269)),
-						m(AsymmetricMeter.ChannelId.REACTIVE_POWER_L1, new SignedDoublewordElement(31271)),
-						m(AsymmetricMeter.ChannelId.REACTIVE_POWER_L2, new SignedDoublewordElement(31273)),
-						m(AsymmetricMeter.ChannelId.REACTIVE_POWER_L3, new SignedDoublewordElement(31275)),
-						m(SymmetricMeter.ChannelId.REACTIVE_POWER, new SignedDoublewordElement(31277))),
+						this.m(MeterSmaShm20.ChannelId.ACTIVE_CONSUMPTION_POWER_L1,
+								new UnsignedDoublewordElement(31259)),
+						this.m(MeterSmaShm20.ChannelId.ACTIVE_CONSUMPTION_POWER_L2,
+								new UnsignedDoublewordElement(31261)),
+						this.m(MeterSmaShm20.ChannelId.ACTIVE_CONSUMPTION_POWER_L3,
+								new UnsignedDoublewordElement(31263)),
+						this.m(MeterSmaShm20.ChannelId.ACTIVE_PRODUCTION_POWER_L1,
+								new UnsignedDoublewordElement(31265)),
+						this.m(MeterSmaShm20.ChannelId.ACTIVE_PRODUCTION_POWER_L2,
+								new UnsignedDoublewordElement(31267)),
+						this.m(MeterSmaShm20.ChannelId.ACTIVE_PRODUCTION_POWER_L3,
+								new UnsignedDoublewordElement(31269)),
+						this.m(AsymmetricMeter.ChannelId.REACTIVE_POWER_L1, new SignedDoublewordElement(31271)),
+						this.m(AsymmetricMeter.ChannelId.REACTIVE_POWER_L2, new SignedDoublewordElement(31273)),
+						this.m(AsymmetricMeter.ChannelId.REACTIVE_POWER_L3, new SignedDoublewordElement(31275)),
+						this.m(SymmetricMeter.ChannelId.REACTIVE_POWER, new SignedDoublewordElement(31277))),
 				// Current
 				new FC3ReadRegistersTask(31435, Priority.HIGH, //
-						m(AsymmetricMeter.ChannelId.CURRENT_L1, new SignedDoublewordElement(31435)),
-						m(AsymmetricMeter.ChannelId.CURRENT_L2, new SignedDoublewordElement(31437)),
-						m(AsymmetricMeter.ChannelId.CURRENT_L3, new SignedDoublewordElement(31439))),
+						this.m(AsymmetricMeter.ChannelId.CURRENT_L1, new SignedDoublewordElement(31435)),
+						this.m(AsymmetricMeter.ChannelId.CURRENT_L2, new SignedDoublewordElement(31437)),
+						this.m(AsymmetricMeter.ChannelId.CURRENT_L3, new SignedDoublewordElement(31439))),
 				// Frequency
 				new FC3ReadRegistersTask(31447, Priority.LOW, //
-						m(SymmetricMeter.ChannelId.FREQUENCY, new UnsignedDoublewordElement(31447),
+						this.m(SymmetricMeter.ChannelId.FREQUENCY, new UnsignedDoublewordElement(31447),
 								ElementToChannelConverter.SCALE_FACTOR_1)));
 
 		// Calculates required Channels from other existing Channels.
@@ -195,8 +203,8 @@ private CalculatePower(MeterSmaShm20Impl parent, io.openems.edge.common.channel.
 
 		@Override
 		public void accept(Value<Integer> ignore) {
-			Value<Integer> prodValue = this.prodChannel.getNextValue();
-			Value<Integer> consValue = this.consChannel.getNextValue();
+			var prodValue = this.prodChannel.getNextValue();
+			var consValue = this.consChannel.getNextValue();
 			final Integer result;
 			if (prodValue.isDefined() && consValue.isDefined()) {
 				result = prodValue.get() - consValue.get();
diff --git a/io.openems.edge.meter.sma.shm20/test/io/openems/edge/meter/sma/shm20/MyConfig.java b/io.openems.edge.meter.sma.shm20/test/io/openems/edge/meter/sma/shm20/MyConfig.java
index 65c54203dfa..ecc086f17e5 100644
--- a/io.openems.edge.meter.sma.shm20/test/io/openems/edge/meter/sma/shm20/MyConfig.java
+++ b/io.openems.edge.meter.sma.shm20/test/io/openems/edge/meter/sma/shm20/MyConfig.java
@@ -38,7 +38,7 @@ public MyConfig build() {
 
 	/**
 	 * Create a Config builder.
-	 * 
+	 *
 	 * @return a {@link Builder}
 	 */
 	public static Builder create() {
diff --git a/io.openems.edge.meter.socomec/src/io/openems/edge/meter/socomec/AbstractSocomecMeter.java b/io.openems.edge.meter.socomec/src/io/openems/edge/meter/socomec/AbstractSocomecMeter.java
index 17f339be8b4..4822cf39f70 100644
--- a/io.openems.edge.meter.socomec/src/io/openems/edge/meter/socomec/AbstractSocomecMeter.java
+++ b/io.openems.edge.meter.socomec/src/io/openems/edge/meter/socomec/AbstractSocomecMeter.java
@@ -37,42 +37,42 @@ protected final ModbusProtocol defineModbusProtocol() {
 	/**
 	 * Applies the modbus protocol for Socomec Countis E23, E24, E27 and E28. All
 	 * are identical.
-	 * 
+	 *
 	 * @throws OpenemsException on error
 	 */
 	protected abstract void identifiedCountisE23_E24_E27_E28() throws OpenemsException;
 
 	/**
 	 * Applies the modbus protocol for Socomec Countis E34, E44.
-	 * 
+	 *
 	 * @throws OpenemsException on error
 	 */
 	protected abstract void identifiedCountisE34_E44() throws OpenemsException;
 
 	/**
 	 * Applies the modbus protocol for Socomec Diris A10.
-	 * 
+	 *
 	 * @throws OpenemsException on error
 	 */
 	protected abstract void identifiedDirisA10() throws OpenemsException;
 
 	/**
 	 * Applies the modbus protocol for Socomec Diris A14.
-	 * 
+	 *
 	 * @throws OpenemsException on error
 	 */
 	protected abstract void identifiedDirisA14() throws OpenemsException;
 
 	/**
 	 * Applies the modbus protocol for Socomec Diris B30.
-	 * 
+	 *
 	 * @throws OpenemsException on error
 	 */
 	protected abstract void identifiedDirisB30() throws OpenemsException;
 
 	/**
 	 * Applies the modbus protocol for Socomec Countis E14.
-	 * 
+	 *
 	 * @throws OpenemsException on error
 	 */
 	protected abstract void identifiedCountisE14() throws OpenemsException;
@@ -100,7 +100,7 @@ protected final void identifySocomecMeter() {
 				} else if (name.startsWith("countis e34")) {
 					this.logInfo(this.log, "Identified Socomec Countis E34 meter");
 					this.identifiedCountisE34_E44();
-					
+
 				} else if (name.startsWith("countis e44")) {
 					this.logInfo(this.log, "Identified Socomec Countis E44 meter");
 					this.identifiedCountisE34_E44();
@@ -137,13 +137,13 @@ protected final void identifySocomecMeter() {
 
 	/**
 	 * Gets the SOCOMEC identifier via Modbus.
-	 * 
+	 *
 	 * @return the future String; returns an empty string on error, never an
 	 *         exception;
 	 */
 	private CompletableFuture<String> getSocomecIdentifier() {
 		// Prepare result
-		final CompletableFuture<String> result = new CompletableFuture<String>();
+		final var result = new CompletableFuture<String>();
 
 		// Search for Socomec identifier register. Needs to be "SOCO".
 		try {
diff --git a/io.openems.edge.meter.socomec/src/io/openems/edge/meter/socomec/SocomecMeter.java b/io.openems.edge.meter.socomec/src/io/openems/edge/meter/socomec/SocomecMeter.java
index 0f799390b73..0696cafab47 100644
--- a/io.openems.edge.meter.socomec/src/io/openems/edge/meter/socomec/SocomecMeter.java
+++ b/io.openems.edge.meter.socomec/src/io/openems/edge/meter/socomec/SocomecMeter.java
@@ -22,6 +22,7 @@ private ChannelId(Doc doc) {
 			this.doc = doc;
 		}
 
+		@Override
 		public Doc doc() {
 			return this.doc;
 		}
diff --git a/io.openems.edge.meter.socomec/src/io/openems/edge/meter/socomec/singlephase/SocomecMeterSinglephase.java b/io.openems.edge.meter.socomec/src/io/openems/edge/meter/socomec/singlephase/SocomecMeterSinglephase.java
index 5769eedbcd2..661482a1ef4 100644
--- a/io.openems.edge.meter.socomec/src/io/openems/edge/meter/socomec/singlephase/SocomecMeterSinglephase.java
+++ b/io.openems.edge.meter.socomec/src/io/openems/edge/meter/socomec/singlephase/SocomecMeterSinglephase.java
@@ -20,6 +20,7 @@ private ChannelId(Doc doc) {
 			this.doc = doc;
 		}
 
+		@Override
 		public Doc doc() {
 			return this.doc;
 		}
diff --git a/io.openems.edge.meter.socomec/src/io/openems/edge/meter/socomec/singlephase/SocomecMeterSinglephaseImpl.java b/io.openems.edge.meter.socomec/src/io/openems/edge/meter/socomec/singlephase/SocomecMeterSinglephaseImpl.java
index 72e5573ae7b..54eb3c2f8ae 100644
--- a/io.openems.edge.meter.socomec/src/io/openems/edge/meter/socomec/singlephase/SocomecMeterSinglephaseImpl.java
+++ b/io.openems.edge.meter.socomec/src/io/openems/edge/meter/socomec/singlephase/SocomecMeterSinglephaseImpl.java
@@ -63,6 +63,7 @@ public SocomecMeterSinglephaseImpl() throws OpenemsException {
 		);
 	}
 
+	@Override
 	@Reference(policy = ReferencePolicy.STATIC, policyOption = ReferencePolicyOption.GREEDY, cardinality = ReferenceCardinality.MANDATORY)
 	protected void setModbus(BridgeModbus modbus) {
 		super.setModbus(modbus);
@@ -78,6 +79,7 @@ void activate(ComponentContext context, Config config) throws OpenemsException {
 		this.identifySocomecMeter();
 	}
 
+	@Override
 	@Deactivate
 	protected void deactivate() {
 		super.deactivate();
@@ -97,7 +99,7 @@ public MeterType getMeterType() {
 	protected void identifiedCountisE14() throws OpenemsException {
 		this.modbusProtocol.addTask(//
 				new FC3ReadRegistersTask(0xc558, Priority.HIGH, //
-						m(new UnsignedDoublewordElement(0xc558)) //
+						this.m(new UnsignedDoublewordElement(0xc558)) //
 								.m(SymmetricMeter.ChannelId.VOLTAGE, ElementToChannelConverter.SCALE_FACTOR_1) //
 								.m(AsymmetricMeter.ChannelId.VOLTAGE_L1, new ElementToChannelConverterChain(//
 										ElementToChannelConverter.SCALE_FACTOR_1, //
@@ -113,8 +115,8 @@ protected void identifiedCountisE14() throws OpenemsException {
 												.SET_ZERO_IF_TRUE(this.config.phase() != SinglePhase.L3))) //
 								.build(), //
 						new DummyRegisterElement(0xc55A, 0xc55D), //
-						m(SymmetricMeter.ChannelId.FREQUENCY, new UnsignedDoublewordElement(0xc55E)), //
-						m(new UnsignedDoublewordElement(0xc560)) //
+						this.m(SymmetricMeter.ChannelId.FREQUENCY, new UnsignedDoublewordElement(0xc55E)), //
+						this.m(new UnsignedDoublewordElement(0xc560)) //
 								.m(SymmetricMeter.ChannelId.CURRENT,
 										ElementToChannelConverter.INVERT_IF_TRUE(this.config.invert())) //
 								.m(AsymmetricMeter.ChannelId.CURRENT_L1, new ElementToChannelConverterChain(//
@@ -131,7 +133,7 @@ protected void identifiedCountisE14() throws OpenemsException {
 												.SET_ZERO_IF_TRUE(this.config.phase() != SinglePhase.L3))) //
 								.build(), //
 						new DummyRegisterElement(0xc562, 0xc567), //
-						m(new SignedDoublewordElement(0xc568)) //
+						this.m(new SignedDoublewordElement(0xc568)) //
 								.m(SymmetricMeter.ChannelId.ACTIVE_POWER,
 										ElementToChannelConverter
 												.SCALE_FACTOR_1_AND_INVERT_IF_TRUE(this.config.invert()))
@@ -154,7 +156,7 @@ protected void identifiedCountisE14() throws OpenemsException {
 												ElementToChannelConverter
 														.SET_ZERO_IF_TRUE(this.config.phase() != SinglePhase.L3))) //
 								.build(), //
-						m(new SignedDoublewordElement(0xc56A)) //
+						this.m(new SignedDoublewordElement(0xc56A)) //
 								.m(SymmetricMeter.ChannelId.REACTIVE_POWER,
 										ElementToChannelConverter
 												.SCALE_FACTOR_1_AND_INVERT_IF_TRUE(this.config.invert()))
@@ -179,18 +181,18 @@ protected void identifiedCountisE14() throws OpenemsException {
 								.build()));
 		if (this.config.invert()) {
 			this.modbusProtocol.addTask(new FC3ReadRegistersTask(0xC702, Priority.LOW, //
-					m(SymmetricMeter.ChannelId.ACTIVE_CONSUMPTION_ENERGY, new UnsignedDoublewordElement(0xC702),
+					this.m(SymmetricMeter.ChannelId.ACTIVE_CONSUMPTION_ENERGY, new UnsignedDoublewordElement(0xC702),
 							ElementToChannelConverter.SCALE_FACTOR_1), //
 					new DummyRegisterElement(0xC704, 0xC707), //
-					m(SymmetricMeter.ChannelId.ACTIVE_PRODUCTION_ENERGY, new UnsignedDoublewordElement(0xC708),
+					this.m(SymmetricMeter.ChannelId.ACTIVE_PRODUCTION_ENERGY, new UnsignedDoublewordElement(0xC708),
 							ElementToChannelConverter.SCALE_FACTOR_1) //
 			));
 		} else {
 			this.modbusProtocol.addTask(new FC3ReadRegistersTask(0xC702, Priority.LOW, //
-					m(SymmetricMeter.ChannelId.ACTIVE_PRODUCTION_ENERGY, new UnsignedDoublewordElement(0xC702),
+					this.m(SymmetricMeter.ChannelId.ACTIVE_PRODUCTION_ENERGY, new UnsignedDoublewordElement(0xC702),
 							ElementToChannelConverter.SCALE_FACTOR_1), //
 					new DummyRegisterElement(0xC704, 0xC707), //
-					m(SymmetricMeter.ChannelId.ACTIVE_CONSUMPTION_ENERGY, new UnsignedDoublewordElement(0xC708),
+					this.m(SymmetricMeter.ChannelId.ACTIVE_CONSUMPTION_ENERGY, new UnsignedDoublewordElement(0xC708),
 							ElementToChannelConverter.SCALE_FACTOR_1) //
 			));
 		}
diff --git a/io.openems.edge.meter.socomec/src/io/openems/edge/meter/socomec/threephase/SocomecMeterThreephase.java b/io.openems.edge.meter.socomec/src/io/openems/edge/meter/socomec/threephase/SocomecMeterThreephase.java
index e916647b714..906fc0add0b 100644
--- a/io.openems.edge.meter.socomec/src/io/openems/edge/meter/socomec/threephase/SocomecMeterThreephase.java
+++ b/io.openems.edge.meter.socomec/src/io/openems/edge/meter/socomec/threephase/SocomecMeterThreephase.java
@@ -20,6 +20,7 @@ private ChannelId(Doc doc) {
 			this.doc = doc;
 		}
 
+		@Override
 		public Doc doc() {
 			return this.doc;
 		}
diff --git a/io.openems.edge.meter.socomec/src/io/openems/edge/meter/socomec/threephase/SocomecMeterThreephaseImpl.java b/io.openems.edge.meter.socomec/src/io/openems/edge/meter/socomec/threephase/SocomecMeterThreephaseImpl.java
index 04766b6474b..60e3bcd1ad6 100644
--- a/io.openems.edge.meter.socomec/src/io/openems/edge/meter/socomec/threephase/SocomecMeterThreephaseImpl.java
+++ b/io.openems.edge.meter.socomec/src/io/openems/edge/meter/socomec/threephase/SocomecMeterThreephaseImpl.java
@@ -64,6 +64,7 @@ public SocomecMeterThreephaseImpl() throws OpenemsException {
 		);
 	}
 
+	@Override
 	@Reference(policy = ReferencePolicy.STATIC, policyOption = ReferencePolicyOption.GREEDY, cardinality = ReferenceCardinality.MANDATORY)
 	protected void setModbus(BridgeModbus modbus) {
 		super.setModbus(modbus);
@@ -79,6 +80,7 @@ void activate(ComponentContext context, Config config) throws OpenemsException {
 		this.identifySocomecMeter();
 	}
 
+	@Override
 	@Deactivate
 	protected void deactivate() {
 		super.deactivate();
@@ -93,56 +95,56 @@ public MeterType getMeterType() {
 	protected void identifiedCountisE23_E24_E27_E28() throws OpenemsException {
 		this.modbusProtocol.addTask(//
 				new FC3ReadRegistersTask(0xc558, Priority.HIGH, //
-						m(AsymmetricMeter.ChannelId.VOLTAGE_L1, new UnsignedDoublewordElement(0xc558),
+						this.m(AsymmetricMeter.ChannelId.VOLTAGE_L1, new UnsignedDoublewordElement(0xc558),
 								ElementToChannelConverter.SCALE_FACTOR_1), //
-						m(AsymmetricMeter.ChannelId.VOLTAGE_L2, new UnsignedDoublewordElement(0xc55A),
+						this.m(AsymmetricMeter.ChannelId.VOLTAGE_L2, new UnsignedDoublewordElement(0xc55A),
 								ElementToChannelConverter.SCALE_FACTOR_1), //
-						m(AsymmetricMeter.ChannelId.VOLTAGE_L3, new UnsignedDoublewordElement(0xc55C),
+						this.m(AsymmetricMeter.ChannelId.VOLTAGE_L3, new UnsignedDoublewordElement(0xc55C),
 								ElementToChannelConverter.SCALE_FACTOR_1), //
-						m(SymmetricMeter.ChannelId.FREQUENCY, new UnsignedDoublewordElement(0xc55E)), //
-						m(AsymmetricMeter.ChannelId.CURRENT_L1, new UnsignedDoublewordElement(0xc560), //
+						this.m(SymmetricMeter.ChannelId.FREQUENCY, new UnsignedDoublewordElement(0xc55E)), //
+						this.m(AsymmetricMeter.ChannelId.CURRENT_L1, new UnsignedDoublewordElement(0xc560), //
 								ElementToChannelConverter.INVERT_IF_TRUE(this.config.invert())), //
-						m(AsymmetricMeter.ChannelId.CURRENT_L2, new UnsignedDoublewordElement(0xc562), //
+						this.m(AsymmetricMeter.ChannelId.CURRENT_L2, new UnsignedDoublewordElement(0xc562), //
 								ElementToChannelConverter.INVERT_IF_TRUE(this.config.invert())), //
-						m(AsymmetricMeter.ChannelId.CURRENT_L3, new UnsignedDoublewordElement(0xc564), //
+						this.m(AsymmetricMeter.ChannelId.CURRENT_L3, new UnsignedDoublewordElement(0xc564), //
 								ElementToChannelConverter.INVERT_IF_TRUE(this.config.invert())), //
 						new DummyRegisterElement(0xc566, 0xc567), //
-						m(SymmetricMeter.ChannelId.ACTIVE_POWER, new SignedDoublewordElement(0xc568),
+						this.m(SymmetricMeter.ChannelId.ACTIVE_POWER, new SignedDoublewordElement(0xc568),
 								ElementToChannelConverter.SCALE_FACTOR_1_AND_INVERT_IF_TRUE(this.config.invert())), //
-						m(SymmetricMeter.ChannelId.REACTIVE_POWER, new SignedDoublewordElement(0xc56A),
+						this.m(SymmetricMeter.ChannelId.REACTIVE_POWER, new SignedDoublewordElement(0xc56A),
 								ElementToChannelConverter.SCALE_FACTOR_1_AND_INVERT_IF_TRUE(this.config.invert())), //
 						new DummyRegisterElement(0xc56C, 0xc56F), //
-						m(AsymmetricMeter.ChannelId.ACTIVE_POWER_L1, new SignedDoublewordElement(0xc570),
+						this.m(AsymmetricMeter.ChannelId.ACTIVE_POWER_L1, new SignedDoublewordElement(0xc570),
 								ElementToChannelConverter.SCALE_FACTOR_1_AND_INVERT_IF_TRUE(this.config.invert())), //
-						m(AsymmetricMeter.ChannelId.ACTIVE_POWER_L2, new SignedDoublewordElement(0xc572),
+						this.m(AsymmetricMeter.ChannelId.ACTIVE_POWER_L2, new SignedDoublewordElement(0xc572),
 								ElementToChannelConverter.SCALE_FACTOR_1_AND_INVERT_IF_TRUE(this.config.invert())), //
-						m(AsymmetricMeter.ChannelId.ACTIVE_POWER_L3, new SignedDoublewordElement(0xc574),
+						this.m(AsymmetricMeter.ChannelId.ACTIVE_POWER_L3, new SignedDoublewordElement(0xc574),
 								ElementToChannelConverter.SCALE_FACTOR_1_AND_INVERT_IF_TRUE(this.config.invert())), //
-						m(AsymmetricMeter.ChannelId.REACTIVE_POWER_L1, new SignedDoublewordElement(0xc576),
+						this.m(AsymmetricMeter.ChannelId.REACTIVE_POWER_L1, new SignedDoublewordElement(0xc576),
 								ElementToChannelConverter.SCALE_FACTOR_1_AND_INVERT_IF_TRUE(this.config.invert())), //
-						m(AsymmetricMeter.ChannelId.REACTIVE_POWER_L2, new SignedDoublewordElement(0xc578),
+						this.m(AsymmetricMeter.ChannelId.REACTIVE_POWER_L2, new SignedDoublewordElement(0xc578),
 								ElementToChannelConverter.SCALE_FACTOR_1_AND_INVERT_IF_TRUE(this.config.invert())), //
-						m(AsymmetricMeter.ChannelId.REACTIVE_POWER_L3, new SignedDoublewordElement(0xc57A),
+						this.m(AsymmetricMeter.ChannelId.REACTIVE_POWER_L3, new SignedDoublewordElement(0xc57A),
 								ElementToChannelConverter.SCALE_FACTOR_1_AND_INVERT_IF_TRUE(this.config.invert())), //
 						new DummyRegisterElement(0xC57C, 0xC587), //
-						m(SymmetricMeter.ChannelId.CURRENT, new UnsignedDoublewordElement(0xC588)), //
+						this.m(SymmetricMeter.ChannelId.CURRENT, new UnsignedDoublewordElement(0xC588)), //
 						new DummyRegisterElement(0xC58A, 0xC58B), //
-						m(SymmetricMeter.ChannelId.VOLTAGE, new UnsignedDoublewordElement(0xC58C),
+						this.m(SymmetricMeter.ChannelId.VOLTAGE, new UnsignedDoublewordElement(0xC58C),
 								ElementToChannelConverter.SCALE_FACTOR_1))); //
 		if (this.config.invert()) {
 			this.modbusProtocol.addTask(new FC3ReadRegistersTask(0xC702, Priority.LOW, //
-					m(SymmetricMeter.ChannelId.ACTIVE_CONSUMPTION_ENERGY, new UnsignedDoublewordElement(0xC702),
+					this.m(SymmetricMeter.ChannelId.ACTIVE_CONSUMPTION_ENERGY, new UnsignedDoublewordElement(0xC702),
 							ElementToChannelConverter.SCALE_FACTOR_1), //
 					new DummyRegisterElement(0xC704, 0xC707), //
-					m(SymmetricMeter.ChannelId.ACTIVE_PRODUCTION_ENERGY, new UnsignedDoublewordElement(0xC708),
+					this.m(SymmetricMeter.ChannelId.ACTIVE_PRODUCTION_ENERGY, new UnsignedDoublewordElement(0xC708),
 							ElementToChannelConverter.SCALE_FACTOR_1) //
 			));
 		} else {
 			this.modbusProtocol.addTask(new FC3ReadRegistersTask(0xC702, Priority.LOW, //
-					m(SymmetricMeter.ChannelId.ACTIVE_PRODUCTION_ENERGY, new UnsignedDoublewordElement(0xC702),
+					this.m(SymmetricMeter.ChannelId.ACTIVE_PRODUCTION_ENERGY, new UnsignedDoublewordElement(0xC702),
 							ElementToChannelConverter.SCALE_FACTOR_1), //
 					new DummyRegisterElement(0xC704, 0xC707), //
-					m(SymmetricMeter.ChannelId.ACTIVE_CONSUMPTION_ENERGY, new UnsignedDoublewordElement(0xC708),
+					this.m(SymmetricMeter.ChannelId.ACTIVE_CONSUMPTION_ENERGY, new UnsignedDoublewordElement(0xC708),
 							ElementToChannelConverter.SCALE_FACTOR_1) //
 			));
 		}
@@ -152,37 +154,37 @@ protected void identifiedCountisE23_E24_E27_E28() throws OpenemsException {
 	protected void identifiedCountisE34_E44() throws OpenemsException {
 		this.modbusProtocol.addTask(//
 				new FC3ReadRegistersTask(0xc558, Priority.HIGH, //
-						m(AsymmetricMeter.ChannelId.VOLTAGE_L1, new UnsignedDoublewordElement(0xc558),
+						this.m(AsymmetricMeter.ChannelId.VOLTAGE_L1, new UnsignedDoublewordElement(0xc558),
 								ElementToChannelConverter.SCALE_FACTOR_1), //
-						m(AsymmetricMeter.ChannelId.VOLTAGE_L2, new UnsignedDoublewordElement(0xc55A),
+						this.m(AsymmetricMeter.ChannelId.VOLTAGE_L2, new UnsignedDoublewordElement(0xc55A),
 								ElementToChannelConverter.SCALE_FACTOR_1), //
-						m(AsymmetricMeter.ChannelId.VOLTAGE_L3, new UnsignedDoublewordElement(0xc55C),
+						this.m(AsymmetricMeter.ChannelId.VOLTAGE_L3, new UnsignedDoublewordElement(0xc55C),
 								ElementToChannelConverter.SCALE_FACTOR_1), //
-						m(SymmetricMeter.ChannelId.FREQUENCY, new UnsignedDoublewordElement(0xc55E),
+						this.m(SymmetricMeter.ChannelId.FREQUENCY, new UnsignedDoublewordElement(0xc55E),
 								ElementToChannelConverter.SCALE_FACTOR_1), //
-						m(AsymmetricMeter.ChannelId.CURRENT_L1, new UnsignedDoublewordElement(0xc560), //
+						this.m(AsymmetricMeter.ChannelId.CURRENT_L1, new UnsignedDoublewordElement(0xc560), //
 								ElementToChannelConverter.INVERT_IF_TRUE(this.config.invert())), //
-						m(AsymmetricMeter.ChannelId.CURRENT_L2, new UnsignedDoublewordElement(0xc562), //
+						this.m(AsymmetricMeter.ChannelId.CURRENT_L2, new UnsignedDoublewordElement(0xc562), //
 								ElementToChannelConverter.INVERT_IF_TRUE(this.config.invert())), //
-						m(AsymmetricMeter.ChannelId.CURRENT_L3, new UnsignedDoublewordElement(0xc564), //
+						this.m(AsymmetricMeter.ChannelId.CURRENT_L3, new UnsignedDoublewordElement(0xc564), //
 								ElementToChannelConverter.INVERT_IF_TRUE(this.config.invert())), //
 						new DummyRegisterElement(0xc566, 0xc567), //
-						m(SymmetricMeter.ChannelId.ACTIVE_POWER, new SignedDoublewordElement(0xc568),
+						this.m(SymmetricMeter.ChannelId.ACTIVE_POWER, new SignedDoublewordElement(0xc568),
 								ElementToChannelConverter.SCALE_FACTOR_1_AND_INVERT_IF_TRUE(this.config.invert())), //
-						m(SymmetricMeter.ChannelId.REACTIVE_POWER, new SignedDoublewordElement(0xc56A),
+						this.m(SymmetricMeter.ChannelId.REACTIVE_POWER, new SignedDoublewordElement(0xc56A),
 								ElementToChannelConverter.SCALE_FACTOR_1_AND_INVERT_IF_TRUE(this.config.invert())), //
 						new DummyRegisterElement(0xc56C, 0xc56F), //
-						m(AsymmetricMeter.ChannelId.ACTIVE_POWER_L1, new SignedDoublewordElement(0xc570),
+						this.m(AsymmetricMeter.ChannelId.ACTIVE_POWER_L1, new SignedDoublewordElement(0xc570),
 								ElementToChannelConverter.SCALE_FACTOR_1_AND_INVERT_IF_TRUE(this.config.invert())), //
-						m(AsymmetricMeter.ChannelId.ACTIVE_POWER_L2, new SignedDoublewordElement(0xc572),
+						this.m(AsymmetricMeter.ChannelId.ACTIVE_POWER_L2, new SignedDoublewordElement(0xc572),
 								ElementToChannelConverter.SCALE_FACTOR_1_AND_INVERT_IF_TRUE(this.config.invert())), //
-						m(AsymmetricMeter.ChannelId.ACTIVE_POWER_L3, new SignedDoublewordElement(0xc574),
+						this.m(AsymmetricMeter.ChannelId.ACTIVE_POWER_L3, new SignedDoublewordElement(0xc574),
 								ElementToChannelConverter.SCALE_FACTOR_1_AND_INVERT_IF_TRUE(this.config.invert())), //
-						m(AsymmetricMeter.ChannelId.REACTIVE_POWER_L1, new SignedDoublewordElement(0xc576),
+						this.m(AsymmetricMeter.ChannelId.REACTIVE_POWER_L1, new SignedDoublewordElement(0xc576),
 								ElementToChannelConverter.SCALE_FACTOR_1_AND_INVERT_IF_TRUE(this.config.invert())), //
-						m(AsymmetricMeter.ChannelId.REACTIVE_POWER_L2, new SignedDoublewordElement(0xc578),
+						this.m(AsymmetricMeter.ChannelId.REACTIVE_POWER_L2, new SignedDoublewordElement(0xc578),
 								ElementToChannelConverter.SCALE_FACTOR_1_AND_INVERT_IF_TRUE(this.config.invert())), //
-						m(AsymmetricMeter.ChannelId.REACTIVE_POWER_L3, new SignedDoublewordElement(0xc57A),
+						this.m(AsymmetricMeter.ChannelId.REACTIVE_POWER_L3, new SignedDoublewordElement(0xc57A),
 								ElementToChannelConverter.SCALE_FACTOR_1_AND_INVERT_IF_TRUE(this.config.invert()))));
 
 		this.calculateSumCurrent();
@@ -190,18 +192,18 @@ protected void identifiedCountisE34_E44() throws OpenemsException {
 
 		if (this.config.invert()) {
 			this.modbusProtocol.addTask(new FC3ReadRegistersTask(0xC702, Priority.LOW, //
-					m(SymmetricMeter.ChannelId.ACTIVE_CONSUMPTION_ENERGY, new UnsignedDoublewordElement(0xC702),
+					this.m(SymmetricMeter.ChannelId.ACTIVE_CONSUMPTION_ENERGY, new UnsignedDoublewordElement(0xC702),
 							ElementToChannelConverter.SCALE_FACTOR_1), //
 					new DummyRegisterElement(0xC704, 0xC707), //
-					m(SymmetricMeter.ChannelId.ACTIVE_PRODUCTION_ENERGY, new UnsignedDoublewordElement(0xC708),
+					this.m(SymmetricMeter.ChannelId.ACTIVE_PRODUCTION_ENERGY, new UnsignedDoublewordElement(0xC708),
 							ElementToChannelConverter.SCALE_FACTOR_1) //
 			));
 		} else {
 			this.modbusProtocol.addTask(new FC3ReadRegistersTask(0xC702, Priority.LOW, //
-					m(SymmetricMeter.ChannelId.ACTIVE_PRODUCTION_ENERGY, new UnsignedDoublewordElement(0xC702),
+					this.m(SymmetricMeter.ChannelId.ACTIVE_PRODUCTION_ENERGY, new UnsignedDoublewordElement(0xC702),
 							ElementToChannelConverter.SCALE_FACTOR_1), //
 					new DummyRegisterElement(0xC704, 0xC707), //
-					m(SymmetricMeter.ChannelId.ACTIVE_CONSUMPTION_ENERGY, new UnsignedDoublewordElement(0xC708),
+					this.m(SymmetricMeter.ChannelId.ACTIVE_CONSUMPTION_ENERGY, new UnsignedDoublewordElement(0xC708),
 							ElementToChannelConverter.SCALE_FACTOR_1) //
 			));
 		}
@@ -211,37 +213,37 @@ protected void identifiedCountisE34_E44() throws OpenemsException {
 	protected void identifiedDirisA14() throws OpenemsException {
 		this.modbusProtocol.addTask(//
 				new FC3ReadRegistersTask(0xc558, Priority.HIGH, //
-						m(AsymmetricMeter.ChannelId.VOLTAGE_L1, new UnsignedDoublewordElement(0xc558),
+						this.m(AsymmetricMeter.ChannelId.VOLTAGE_L1, new UnsignedDoublewordElement(0xc558),
 								ElementToChannelConverter.SCALE_FACTOR_1), //
-						m(AsymmetricMeter.ChannelId.VOLTAGE_L2, new UnsignedDoublewordElement(0xc55A),
+						this.m(AsymmetricMeter.ChannelId.VOLTAGE_L2, new UnsignedDoublewordElement(0xc55A),
 								ElementToChannelConverter.SCALE_FACTOR_1), //
-						m(AsymmetricMeter.ChannelId.VOLTAGE_L3, new UnsignedDoublewordElement(0xc55C),
+						this.m(AsymmetricMeter.ChannelId.VOLTAGE_L3, new UnsignedDoublewordElement(0xc55C),
 								ElementToChannelConverter.SCALE_FACTOR_1), //
-						m(SymmetricMeter.ChannelId.FREQUENCY, new UnsignedDoublewordElement(0xc55E),
+						this.m(SymmetricMeter.ChannelId.FREQUENCY, new UnsignedDoublewordElement(0xc55E),
 								ElementToChannelConverter.SCALE_FACTOR_1), //
-						m(AsymmetricMeter.ChannelId.CURRENT_L1, new UnsignedDoublewordElement(0xc560), //
+						this.m(AsymmetricMeter.ChannelId.CURRENT_L1, new UnsignedDoublewordElement(0xc560), //
 								ElementToChannelConverter.INVERT_IF_TRUE(this.config.invert())), //
-						m(AsymmetricMeter.ChannelId.CURRENT_L2, new UnsignedDoublewordElement(0xc562), //
+						this.m(AsymmetricMeter.ChannelId.CURRENT_L2, new UnsignedDoublewordElement(0xc562), //
 								ElementToChannelConverter.INVERT_IF_TRUE(this.config.invert())), //
-						m(AsymmetricMeter.ChannelId.CURRENT_L3, new UnsignedDoublewordElement(0xc564), //
+						this.m(AsymmetricMeter.ChannelId.CURRENT_L3, new UnsignedDoublewordElement(0xc564), //
 								ElementToChannelConverter.INVERT_IF_TRUE(this.config.invert())), //
 						new DummyRegisterElement(0xc566, 0xc567), //
-						m(SymmetricMeter.ChannelId.ACTIVE_POWER, new SignedDoublewordElement(0xc568),
+						this.m(SymmetricMeter.ChannelId.ACTIVE_POWER, new SignedDoublewordElement(0xc568),
 								ElementToChannelConverter.SCALE_FACTOR_1_AND_INVERT_IF_TRUE(this.config.invert())), //
-						m(SymmetricMeter.ChannelId.REACTIVE_POWER, new SignedDoublewordElement(0xc56A),
+						this.m(SymmetricMeter.ChannelId.REACTIVE_POWER, new SignedDoublewordElement(0xc56A),
 								ElementToChannelConverter.SCALE_FACTOR_1_AND_INVERT_IF_TRUE(this.config.invert())), //
 						new DummyRegisterElement(0xc56C, 0xc56F), //
-						m(AsymmetricMeter.ChannelId.ACTIVE_POWER_L1, new SignedDoublewordElement(0xc570),
+						this.m(AsymmetricMeter.ChannelId.ACTIVE_POWER_L1, new SignedDoublewordElement(0xc570),
 								ElementToChannelConverter.SCALE_FACTOR_1_AND_INVERT_IF_TRUE(this.config.invert())), //
-						m(AsymmetricMeter.ChannelId.ACTIVE_POWER_L2, new SignedDoublewordElement(0xc572),
+						this.m(AsymmetricMeter.ChannelId.ACTIVE_POWER_L2, new SignedDoublewordElement(0xc572),
 								ElementToChannelConverter.SCALE_FACTOR_1_AND_INVERT_IF_TRUE(this.config.invert())), //
-						m(AsymmetricMeter.ChannelId.ACTIVE_POWER_L3, new SignedDoublewordElement(0xc574),
+						this.m(AsymmetricMeter.ChannelId.ACTIVE_POWER_L3, new SignedDoublewordElement(0xc574),
 								ElementToChannelConverter.SCALE_FACTOR_1_AND_INVERT_IF_TRUE(this.config.invert())), //
-						m(AsymmetricMeter.ChannelId.REACTIVE_POWER_L1, new SignedDoublewordElement(0xc576),
+						this.m(AsymmetricMeter.ChannelId.REACTIVE_POWER_L1, new SignedDoublewordElement(0xc576),
 								ElementToChannelConverter.SCALE_FACTOR_1_AND_INVERT_IF_TRUE(this.config.invert())), //
-						m(AsymmetricMeter.ChannelId.REACTIVE_POWER_L2, new SignedDoublewordElement(0xc578),
+						this.m(AsymmetricMeter.ChannelId.REACTIVE_POWER_L2, new SignedDoublewordElement(0xc578),
 								ElementToChannelConverter.SCALE_FACTOR_1_AND_INVERT_IF_TRUE(this.config.invert())), //
-						m(AsymmetricMeter.ChannelId.REACTIVE_POWER_L3, new SignedDoublewordElement(0xc57A),
+						this.m(AsymmetricMeter.ChannelId.REACTIVE_POWER_L3, new SignedDoublewordElement(0xc57A),
 								ElementToChannelConverter.SCALE_FACTOR_1_AND_INVERT_IF_TRUE(this.config.invert())))); //
 
 		this.calculateSumCurrent();
@@ -249,18 +251,18 @@ protected void identifiedDirisA14() throws OpenemsException {
 
 		if (this.config.invert()) {
 			this.modbusProtocol.addTask(new FC3ReadRegistersTask(0xC702, Priority.LOW, //
-					m(SymmetricMeter.ChannelId.ACTIVE_CONSUMPTION_ENERGY, new UnsignedDoublewordElement(0xC702),
+					this.m(SymmetricMeter.ChannelId.ACTIVE_CONSUMPTION_ENERGY, new UnsignedDoublewordElement(0xC702),
 							ElementToChannelConverter.SCALE_FACTOR_1), //
 					new DummyRegisterElement(0xC704, 0xC707), //
-					m(SymmetricMeter.ChannelId.ACTIVE_PRODUCTION_ENERGY, new UnsignedDoublewordElement(0xC708),
+					this.m(SymmetricMeter.ChannelId.ACTIVE_PRODUCTION_ENERGY, new UnsignedDoublewordElement(0xC708),
 							ElementToChannelConverter.SCALE_FACTOR_1) //
 			));
 		} else {
 			this.modbusProtocol.addTask(new FC3ReadRegistersTask(0xC702, Priority.LOW, //
-					m(SymmetricMeter.ChannelId.ACTIVE_PRODUCTION_ENERGY, new UnsignedDoublewordElement(0xC702),
+					this.m(SymmetricMeter.ChannelId.ACTIVE_PRODUCTION_ENERGY, new UnsignedDoublewordElement(0xC702),
 							ElementToChannelConverter.SCALE_FACTOR_1), //
 					new DummyRegisterElement(0xC704, 0xC707), //
-					m(SymmetricMeter.ChannelId.ACTIVE_CONSUMPTION_ENERGY, new UnsignedDoublewordElement(0xC708),
+					this.m(SymmetricMeter.ChannelId.ACTIVE_CONSUMPTION_ENERGY, new UnsignedDoublewordElement(0xC708),
 							ElementToChannelConverter.SCALE_FACTOR_1) //
 			));
 		}
@@ -270,37 +272,37 @@ protected void identifiedDirisA14() throws OpenemsException {
 	protected void identifiedDirisA10() throws OpenemsException {
 		this.modbusProtocol.addTask(//
 				new FC3ReadRegistersTask(0xc558, Priority.HIGH, //
-						m(AsymmetricMeter.ChannelId.VOLTAGE_L1, new UnsignedDoublewordElement(0xc558),
+						this.m(AsymmetricMeter.ChannelId.VOLTAGE_L1, new UnsignedDoublewordElement(0xc558),
 								ElementToChannelConverter.SCALE_FACTOR_1), //
-						m(AsymmetricMeter.ChannelId.VOLTAGE_L2, new UnsignedDoublewordElement(0xc55A),
+						this.m(AsymmetricMeter.ChannelId.VOLTAGE_L2, new UnsignedDoublewordElement(0xc55A),
 								ElementToChannelConverter.SCALE_FACTOR_1), //
-						m(AsymmetricMeter.ChannelId.VOLTAGE_L3, new UnsignedDoublewordElement(0xc55C),
+						this.m(AsymmetricMeter.ChannelId.VOLTAGE_L3, new UnsignedDoublewordElement(0xc55C),
 								ElementToChannelConverter.SCALE_FACTOR_1), //
-						m(SymmetricMeter.ChannelId.FREQUENCY, new UnsignedDoublewordElement(0xc55E),
+						this.m(SymmetricMeter.ChannelId.FREQUENCY, new UnsignedDoublewordElement(0xc55E),
 								ElementToChannelConverter.SCALE_FACTOR_1), //
-						m(AsymmetricMeter.ChannelId.CURRENT_L1, new UnsignedDoublewordElement(0xc560), //
+						this.m(AsymmetricMeter.ChannelId.CURRENT_L1, new UnsignedDoublewordElement(0xc560), //
 								ElementToChannelConverter.INVERT_IF_TRUE(this.config.invert())), //
-						m(AsymmetricMeter.ChannelId.CURRENT_L2, new UnsignedDoublewordElement(0xc562), //
+						this.m(AsymmetricMeter.ChannelId.CURRENT_L2, new UnsignedDoublewordElement(0xc562), //
 								ElementToChannelConverter.INVERT_IF_TRUE(this.config.invert())), //
-						m(AsymmetricMeter.ChannelId.CURRENT_L3, new UnsignedDoublewordElement(0xc564), //
+						this.m(AsymmetricMeter.ChannelId.CURRENT_L3, new UnsignedDoublewordElement(0xc564), //
 								ElementToChannelConverter.INVERT_IF_TRUE(this.config.invert())), //
 						new DummyRegisterElement(0xc566, 0xc567), //
-						m(SymmetricMeter.ChannelId.ACTIVE_POWER, new SignedDoublewordElement(0xc568),
+						this.m(SymmetricMeter.ChannelId.ACTIVE_POWER, new SignedDoublewordElement(0xc568),
 								ElementToChannelConverter.SCALE_FACTOR_1_AND_INVERT_IF_TRUE(this.config.invert())), //
-						m(SymmetricMeter.ChannelId.REACTIVE_POWER, new SignedDoublewordElement(0xc56A),
+						this.m(SymmetricMeter.ChannelId.REACTIVE_POWER, new SignedDoublewordElement(0xc56A),
 								ElementToChannelConverter.SCALE_FACTOR_1_AND_INVERT_IF_TRUE(this.config.invert())), //
 						new DummyRegisterElement(0xc56C, 0xc56F), //
-						m(AsymmetricMeter.ChannelId.ACTIVE_POWER_L1, new SignedDoublewordElement(0xc570),
+						this.m(AsymmetricMeter.ChannelId.ACTIVE_POWER_L1, new SignedDoublewordElement(0xc570),
 								ElementToChannelConverter.SCALE_FACTOR_1_AND_INVERT_IF_TRUE(this.config.invert())), //
-						m(AsymmetricMeter.ChannelId.ACTIVE_POWER_L2, new SignedDoublewordElement(0xc572),
+						this.m(AsymmetricMeter.ChannelId.ACTIVE_POWER_L2, new SignedDoublewordElement(0xc572),
 								ElementToChannelConverter.SCALE_FACTOR_1_AND_INVERT_IF_TRUE(this.config.invert())), //
-						m(AsymmetricMeter.ChannelId.ACTIVE_POWER_L3, new SignedDoublewordElement(0xc574),
+						this.m(AsymmetricMeter.ChannelId.ACTIVE_POWER_L3, new SignedDoublewordElement(0xc574),
 								ElementToChannelConverter.SCALE_FACTOR_1_AND_INVERT_IF_TRUE(this.config.invert())), //
-						m(AsymmetricMeter.ChannelId.REACTIVE_POWER_L1, new SignedDoublewordElement(0xc576),
+						this.m(AsymmetricMeter.ChannelId.REACTIVE_POWER_L1, new SignedDoublewordElement(0xc576),
 								ElementToChannelConverter.SCALE_FACTOR_1_AND_INVERT_IF_TRUE(this.config.invert())), //
-						m(AsymmetricMeter.ChannelId.REACTIVE_POWER_L2, new SignedDoublewordElement(0xc578),
+						this.m(AsymmetricMeter.ChannelId.REACTIVE_POWER_L2, new SignedDoublewordElement(0xc578),
 								ElementToChannelConverter.SCALE_FACTOR_1_AND_INVERT_IF_TRUE(this.config.invert())), //
-						m(AsymmetricMeter.ChannelId.REACTIVE_POWER_L3, new SignedDoublewordElement(0xc57A),
+						this.m(AsymmetricMeter.ChannelId.REACTIVE_POWER_L3, new SignedDoublewordElement(0xc57A),
 								ElementToChannelConverter.SCALE_FACTOR_1_AND_INVERT_IF_TRUE(this.config.invert())))); //
 
 		this.calculateSumCurrent();
@@ -308,18 +310,18 @@ protected void identifiedDirisA10() throws OpenemsException {
 
 		if (this.config.invert()) {
 			this.modbusProtocol.addTask(new FC3ReadRegistersTask(0xC65C, Priority.LOW, //
-					m(SymmetricMeter.ChannelId.ACTIVE_CONSUMPTION_ENERGY, new UnsignedDoublewordElement(0xC65C),
+					this.m(SymmetricMeter.ChannelId.ACTIVE_CONSUMPTION_ENERGY, new UnsignedDoublewordElement(0xC65C),
 							ElementToChannelConverter.SCALE_FACTOR_3), //
 					new DummyRegisterElement(0xC65E, 0xC661), //
-					m(SymmetricMeter.ChannelId.ACTIVE_PRODUCTION_ENERGY, new UnsignedDoublewordElement(0xC662),
+					this.m(SymmetricMeter.ChannelId.ACTIVE_PRODUCTION_ENERGY, new UnsignedDoublewordElement(0xC662),
 							ElementToChannelConverter.SCALE_FACTOR_3) //
 			));
 		} else {
 			this.modbusProtocol.addTask(new FC3ReadRegistersTask(0xC65C, Priority.LOW, //
-					m(SymmetricMeter.ChannelId.ACTIVE_PRODUCTION_ENERGY, new UnsignedDoublewordElement(0xC65C),
+					this.m(SymmetricMeter.ChannelId.ACTIVE_PRODUCTION_ENERGY, new UnsignedDoublewordElement(0xC65C),
 							ElementToChannelConverter.SCALE_FACTOR_3), //
 					new DummyRegisterElement(0xC65E, 0xC661), //
-					m(SymmetricMeter.ChannelId.ACTIVE_CONSUMPTION_ENERGY, new UnsignedDoublewordElement(0xC662),
+					this.m(SymmetricMeter.ChannelId.ACTIVE_CONSUMPTION_ENERGY, new UnsignedDoublewordElement(0xC662),
 							ElementToChannelConverter.SCALE_FACTOR_3) //
 			));
 		}
@@ -329,36 +331,36 @@ protected void identifiedDirisA10() throws OpenemsException {
 	protected void identifiedDirisB30() throws OpenemsException {
 		this.modbusProtocol.addTask(//
 				new FC3ReadRegistersTask(0x480C, Priority.HIGH, //
-						m(AsymmetricMeter.ChannelId.VOLTAGE_L1, new UnsignedDoublewordElement(0x480C),
+						this.m(AsymmetricMeter.ChannelId.VOLTAGE_L1, new UnsignedDoublewordElement(0x480C),
 								ElementToChannelConverter.SCALE_FACTOR_1), //
-						m(AsymmetricMeter.ChannelId.VOLTAGE_L2, new UnsignedDoublewordElement(0x480E),
+						this.m(AsymmetricMeter.ChannelId.VOLTAGE_L2, new UnsignedDoublewordElement(0x480E),
 								ElementToChannelConverter.SCALE_FACTOR_1), //
-						m(AsymmetricMeter.ChannelId.VOLTAGE_L3, new UnsignedDoublewordElement(0x4810),
+						this.m(AsymmetricMeter.ChannelId.VOLTAGE_L3, new UnsignedDoublewordElement(0x4810),
 								ElementToChannelConverter.SCALE_FACTOR_1), //
 						new DummyRegisterElement(0x4812, 0x4819), //
-						m(AsymmetricMeter.ChannelId.CURRENT_L1, new UnsignedDoublewordElement(0x481A), //
+						this.m(AsymmetricMeter.ChannelId.CURRENT_L1, new UnsignedDoublewordElement(0x481A), //
 								ElementToChannelConverter.INVERT_IF_TRUE(this.config.invert())), //
-						m(AsymmetricMeter.ChannelId.CURRENT_L2, new UnsignedDoublewordElement(0x481C), //
+						this.m(AsymmetricMeter.ChannelId.CURRENT_L2, new UnsignedDoublewordElement(0x481C), //
 								ElementToChannelConverter.INVERT_IF_TRUE(this.config.invert())), //
-						m(AsymmetricMeter.ChannelId.CURRENT_L3, new UnsignedDoublewordElement(0x481E), //
+						this.m(AsymmetricMeter.ChannelId.CURRENT_L3, new UnsignedDoublewordElement(0x481E), //
 								ElementToChannelConverter.INVERT_IF_TRUE(this.config.invert())), //
 						new DummyRegisterElement(0x4820, 0x482B), //
-						m(SymmetricMeter.ChannelId.ACTIVE_POWER, new SignedDoublewordElement(0x482C), //
+						this.m(SymmetricMeter.ChannelId.ACTIVE_POWER, new SignedDoublewordElement(0x482C), //
 								ElementToChannelConverter.INVERT_IF_TRUE(this.config.invert())), //
-						m(SymmetricMeter.ChannelId.REACTIVE_POWER, new SignedDoublewordElement(0x482E), //
+						this.m(SymmetricMeter.ChannelId.REACTIVE_POWER, new SignedDoublewordElement(0x482E), //
 								ElementToChannelConverter.INVERT_IF_TRUE(this.config.invert())), //
 						new DummyRegisterElement(0x4830, 0x4837), //
-						m(AsymmetricMeter.ChannelId.ACTIVE_POWER_L1, new SignedDoublewordElement(0x4838), //
+						this.m(AsymmetricMeter.ChannelId.ACTIVE_POWER_L1, new SignedDoublewordElement(0x4838), //
 								ElementToChannelConverter.INVERT_IF_TRUE(this.config.invert())), //
-						m(AsymmetricMeter.ChannelId.ACTIVE_POWER_L2, new SignedDoublewordElement(0x483A), //
+						this.m(AsymmetricMeter.ChannelId.ACTIVE_POWER_L2, new SignedDoublewordElement(0x483A), //
 								ElementToChannelConverter.INVERT_IF_TRUE(this.config.invert())), //
-						m(AsymmetricMeter.ChannelId.ACTIVE_POWER_L3, new SignedDoublewordElement(0x483C), //
+						this.m(AsymmetricMeter.ChannelId.ACTIVE_POWER_L3, new SignedDoublewordElement(0x483C), //
 								ElementToChannelConverter.INVERT_IF_TRUE(this.config.invert())), //
-						m(AsymmetricMeter.ChannelId.REACTIVE_POWER_L1, new SignedDoublewordElement(0x483E), //
+						this.m(AsymmetricMeter.ChannelId.REACTIVE_POWER_L1, new SignedDoublewordElement(0x483E), //
 								ElementToChannelConverter.INVERT_IF_TRUE(this.config.invert())), //
-						m(AsymmetricMeter.ChannelId.REACTIVE_POWER_L2, new SignedDoublewordElement(0x4840), //
+						this.m(AsymmetricMeter.ChannelId.REACTIVE_POWER_L2, new SignedDoublewordElement(0x4840), //
 								ElementToChannelConverter.INVERT_IF_TRUE(this.config.invert())), //
-						m(AsymmetricMeter.ChannelId.REACTIVE_POWER_L3, new SignedDoublewordElement(0x4842), //
+						this.m(AsymmetricMeter.ChannelId.REACTIVE_POWER_L3, new SignedDoublewordElement(0x4842), //
 								ElementToChannelConverter.INVERT_IF_TRUE(this.config.invert())) //
 				));
 
@@ -367,18 +369,18 @@ protected void identifiedDirisB30() throws OpenemsException {
 
 		if (this.config.invert()) {
 			this.modbusProtocol.addTask(new FC3ReadRegistersTask(0x4D83, Priority.LOW, //
-					m(SymmetricMeter.ChannelId.ACTIVE_CONSUMPTION_ENERGY, new UnsignedDoublewordElement(0x4D83),
+					this.m(SymmetricMeter.ChannelId.ACTIVE_CONSUMPTION_ENERGY, new UnsignedDoublewordElement(0x4D83),
 							ElementToChannelConverter.SCALE_FACTOR_3), //
 					new DummyRegisterElement(0x4D85), //
-					m(SymmetricMeter.ChannelId.ACTIVE_PRODUCTION_ENERGY, new UnsignedDoublewordElement(0x4D86),
+					this.m(SymmetricMeter.ChannelId.ACTIVE_PRODUCTION_ENERGY, new UnsignedDoublewordElement(0x4D86),
 							ElementToChannelConverter.SCALE_FACTOR_3) //
 			));
 		} else {
 			this.modbusProtocol.addTask(new FC3ReadRegistersTask(0x4D83, Priority.LOW, //
-					m(SymmetricMeter.ChannelId.ACTIVE_PRODUCTION_ENERGY, new UnsignedDoublewordElement(0x4D83),
+					this.m(SymmetricMeter.ChannelId.ACTIVE_PRODUCTION_ENERGY, new UnsignedDoublewordElement(0x4D83),
 							ElementToChannelConverter.SCALE_FACTOR_3), //
 					new DummyRegisterElement(0x4D85), //
-					m(SymmetricMeter.ChannelId.ACTIVE_CONSUMPTION_ENERGY, new UnsignedDoublewordElement(0x4D86),
+					this.m(SymmetricMeter.ChannelId.ACTIVE_CONSUMPTION_ENERGY, new UnsignedDoublewordElement(0x4D86),
 							ElementToChannelConverter.SCALE_FACTOR_3) //
 			));
 		}
diff --git a/io.openems.edge.meter.socomec/test/io/openems/edge/meter/socomec/singlephase/MyConfig.java b/io.openems.edge.meter.socomec/test/io/openems/edge/meter/socomec/singlephase/MyConfig.java
index 49adff0af74..01cf1433f4a 100644
--- a/io.openems.edge.meter.socomec/test/io/openems/edge/meter/socomec/singlephase/MyConfig.java
+++ b/io.openems.edge.meter.socomec/test/io/openems/edge/meter/socomec/singlephase/MyConfig.java
@@ -51,7 +51,7 @@ public MyConfig build() {
 
 	/**
 	 * Create a Config builder.
-	 * 
+	 *
 	 * @return a {@link Builder}
 	 */
 	public static Builder create() {
diff --git a/io.openems.edge.meter.socomec/test/io/openems/edge/meter/socomec/threephase/MyConfig.java b/io.openems.edge.meter.socomec/test/io/openems/edge/meter/socomec/threephase/MyConfig.java
index f5770974011..b73dd3a84df 100644
--- a/io.openems.edge.meter.socomec/test/io/openems/edge/meter/socomec/threephase/MyConfig.java
+++ b/io.openems.edge.meter.socomec/test/io/openems/edge/meter/socomec/threephase/MyConfig.java
@@ -44,7 +44,7 @@ public MyConfig build() {
 
 	/**
 	 * Create a Config builder.
-	 * 
+	 *
 	 * @return a {@link Builder}
 	 */
 	public static Builder create() {
diff --git a/io.openems.edge.meter.sunspec/src/io/openems/edge/meter/sunspec/AbstractSunSpecMeter.java b/io.openems.edge.meter.sunspec/src/io/openems/edge/meter/sunspec/AbstractSunSpecMeter.java
index 20c862bea39..d8ddc50eca2 100644
--- a/io.openems.edge.meter.sunspec/src/io/openems/edge/meter/sunspec/AbstractSunSpecMeter.java
+++ b/io.openems.edge.meter.sunspec/src/io/openems/edge/meter/sunspec/AbstractSunSpecMeter.java
@@ -34,7 +34,7 @@ public AbstractSunSpecMeter(Map<SunSpecModel, Priority> activeModels,
 
 	/**
 	 * Make sure to call this method from the inheriting OSGi Component.
-	 * 
+	 *
 	 * @throws OpenemsException on error
 	 */
 	@Override
@@ -48,6 +48,7 @@ protected boolean activate(ComponentContext context, String id, String alias, bo
 	/**
 	 * Make sure to call this method from the inheriting OSGi Component.
 	 */
+	@Override
 	@Deactivate
 	protected void deactivate() {
 		super.deactivate();
diff --git a/io.openems.edge.meter.sunspec/src/io/openems/edge/meter/sunspec/MeterChannelId.java b/io.openems.edge.meter.sunspec/src/io/openems/edge/meter/sunspec/MeterChannelId.java
index 475a85ced48..41d204475aa 100644
--- a/io.openems.edge.meter.sunspec/src/io/openems/edge/meter/sunspec/MeterChannelId.java
+++ b/io.openems.edge.meter.sunspec/src/io/openems/edge/meter/sunspec/MeterChannelId.java
@@ -11,6 +11,7 @@ private MeterChannelId(Doc doc) {
 		this.doc = doc;
 	}
 
+	@Override
 	public Doc doc() {
 		return this.doc;
 	}
diff --git a/io.openems.edge.meter.virtual/src/io/openems/edge/meter/virtual/symmetric/add/VirtualAdd.java b/io.openems.edge.meter.virtual/src/io/openems/edge/meter/virtual/symmetric/add/VirtualAdd.java
index b4d7c23c24d..38175cf9c15 100644
--- a/io.openems.edge.meter.virtual/src/io/openems/edge/meter/virtual/symmetric/add/VirtualAdd.java
+++ b/io.openems.edge.meter.virtual/src/io/openems/edge/meter/virtual/symmetric/add/VirtualAdd.java
@@ -70,6 +70,7 @@ void activate(ComponentContext context, Config config) throws OpenemsNamedExcept
 		this.meterType = config.type();
 	}
 
+	@Override
 	@Deactivate
 	protected void deactivate() {
 		super.deactivate();
@@ -88,7 +89,7 @@ public void handleEvent(Event event) {
 
 	private void calculateChannelValues() {
 		// Find all configured SymmetricMeters
-		List<SymmetricMeter> meters = new ArrayList<SymmetricMeter>();
+		List<SymmetricMeter> meters = new ArrayList<>();
 		try {
 			for (String meterId : this.config.meterIds()) {
 				SymmetricMeter mts = this.componentManager.getComponent(meterId);
@@ -98,15 +99,15 @@ private void calculateChannelValues() {
 			this.logError(this.log, e.getClass().getSimpleName() + ": " + e.getMessage());
 		}
 
-		final CalculateAverage meterFrequency = new CalculateAverage();
-		final CalculateIntegerSum meterMinActivePower = new CalculateIntegerSum();
-		final CalculateIntegerSum meterMaxActivePower = new CalculateIntegerSum();
-		final CalculateIntegerSum meterActivePower = new CalculateIntegerSum();
-		final CalculateIntegerSum meterReactivePower = new CalculateIntegerSum();
-		final CalculateLongSum meterActiveProductionEnergy = new CalculateLongSum();
-		final CalculateLongSum meterActiveConsumptionEnergy = new CalculateLongSum();
-		final CalculateAverage meterVoltage = new CalculateAverage();
-		final CalculateIntegerSum meterCurrent = new CalculateIntegerSum();
+		final var meterFrequency = new CalculateAverage();
+		final var meterMinActivePower = new CalculateIntegerSum();
+		final var meterMaxActivePower = new CalculateIntegerSum();
+		final var meterActivePower = new CalculateIntegerSum();
+		final var meterReactivePower = new CalculateIntegerSum();
+		final var meterActiveProductionEnergy = new CalculateLongSum();
+		final var meterActiveConsumptionEnergy = new CalculateLongSum();
+		final var meterVoltage = new CalculateAverage();
+		final var meterCurrent = new CalculateIntegerSum();
 
 		for (SymmetricMeter meter : meters) {
 			meterFrequency.addValue(meter.getFrequencyChannel());
@@ -114,7 +115,7 @@ private void calculateChannelValues() {
 			meterMaxActivePower.addValue(meter.getMaxActivePowerChannel());
 			meterActivePower.addValue(meter.getActivePowerChannel());
 			meterReactivePower.addValue(meter.getReactivePowerChannel());
-			meterActiveConsumptionEnergy.addValue(getActiveConsumptionEnergyChannel());
+			meterActiveConsumptionEnergy.addValue(this.getActiveConsumptionEnergyChannel());
 			meterActiveProductionEnergy.addValue(meter.getActiveProductionEnergyChannel());
 			meterVoltage.addValue(meter.getVoltageChannel());
 			meterCurrent.addValue(meter.getCurrentChannel());
diff --git a/io.openems.edge.meter.virtual/src/io/openems/edge/meter/virtual/symmetric/subtract/ChannelManager.java b/io.openems.edge.meter.virtual/src/io/openems/edge/meter/virtual/symmetric/subtract/ChannelManager.java
index 187454e66f8..f28acd334da 100644
--- a/io.openems.edge.meter.virtual/src/io/openems/edge/meter/virtual/symmetric/subtract/ChannelManager.java
+++ b/io.openems.edge.meter.virtual/src/io/openems/edge/meter/virtual/symmetric/subtract/ChannelManager.java
@@ -22,7 +22,7 @@ public ChannelManager(VirtualSubtractMeter parent) {
 
 	/**
 	 * Called on Component activate().
-	 * 
+	 *
 	 * @param minuend     the Minuend Component
 	 * @param subtrahends the Subtrahend Components
 	 */
diff --git a/io.openems.edge.meter.virtual/src/io/openems/edge/meter/virtual/symmetric/subtract/VirtualSubtractMeter.java b/io.openems.edge.meter.virtual/src/io/openems/edge/meter/virtual/symmetric/subtract/VirtualSubtractMeter.java
index f8be08bb65b..7972722d62d 100644
--- a/io.openems.edge.meter.virtual/src/io/openems/edge/meter/virtual/symmetric/subtract/VirtualSubtractMeter.java
+++ b/io.openems.edge.meter.virtual/src/io/openems/edge/meter/virtual/symmetric/subtract/VirtualSubtractMeter.java
@@ -71,6 +71,7 @@ void activate(ComponentContext context, Config config) throws OpenemsNamedExcept
 		this.channelManager.activate(this.minuend, this.subtrahends);
 	}
 
+	@Override
 	@Deactivate
 	protected void deactivate() {
 		this.channelManager.deactivate();
diff --git a/io.openems.edge.meter.virtual/test/io/openems/edge/meter/virtual/symmetric/subtract/MyConfig.java b/io.openems.edge.meter.virtual/test/io/openems/edge/meter/virtual/symmetric/subtract/MyConfig.java
index e5dd4c62eba..256f5ef00a8 100644
--- a/io.openems.edge.meter.virtual/test/io/openems/edge/meter/virtual/symmetric/subtract/MyConfig.java
+++ b/io.openems.edge.meter.virtual/test/io/openems/edge/meter/virtual/symmetric/subtract/MyConfig.java
@@ -26,7 +26,7 @@ public Builder setType(MeterType type) {
 			this.type = type;
 			return this;
 		}
-		
+
 		public Builder setAddToSum(boolean addToSum) {
 			this.addToSum = addToSum;
 			return this;
@@ -49,7 +49,7 @@ public MyConfig build() {
 
 	/**
 	 * Create a Config builder.
-	 * 
+	 *
 	 * @return a {@link Builder}
 	 */
 	public static Builder create() {
diff --git a/io.openems.edge.meter.weidmueller/src/io/openems/edge/meter/weidmueller/MeterWeidmueller525.java b/io.openems.edge.meter.weidmueller/src/io/openems/edge/meter/weidmueller/MeterWeidmueller525.java
index ce60980de9c..71fb10bc5bc 100644
--- a/io.openems.edge.meter.weidmueller/src/io/openems/edge/meter/weidmueller/MeterWeidmueller525.java
+++ b/io.openems.edge.meter.weidmueller/src/io/openems/edge/meter/weidmueller/MeterWeidmueller525.java
@@ -49,6 +49,7 @@ public MeterWeidmueller525() {
 		);
 	}
 
+	@Override
 	@Reference(policy = ReferencePolicy.STATIC, policyOption = ReferencePolicyOption.GREEDY, cardinality = ReferenceCardinality.MANDATORY)
 	protected void setModbus(BridgeModbus modbus) {
 		super.setModbus(modbus);
@@ -60,10 +61,10 @@ void activate(ComponentContext context, Config config) throws OpenemsException {
 
 		if (super.activate(context, config.id(), config.alias(), config.enabled(), config.modbusUnitId(), this.cm,
 				"Modbus", config.modbus_id())) {
-			return;
 		}
 	}
 
+	@Override
 	@Deactivate
 	protected void deactivate() {
 		super.deactivate();
@@ -78,70 +79,71 @@ public MeterType getMeterType() {
 	protected ModbusProtocol defineModbusProtocol() throws OpenemsException {
 		return new ModbusProtocol(this, //
 				new FC3ReadRegistersTask(19000, Priority.HIGH, //
-						m(new FloatDoublewordElement(19000)) //
+						this.m(new FloatDoublewordElement(19000)) //
 								.m(AsymmetricMeter.ChannelId.VOLTAGE_L1, ElementToChannelConverter.DIRECT_1_TO_1) //
 								.m(SymmetricMeter.ChannelId.VOLTAGE, ElementToChannelConverter.DIRECT_1_TO_1) //
 								.build(), //
-						m(AsymmetricMeter.ChannelId.VOLTAGE_L2, new FloatDoublewordElement(19002)), //
-						m(AsymmetricMeter.ChannelId.VOLTAGE_L3, new FloatDoublewordElement(19004)), //
-						m(WeidmuellerChannelId.VOLTAGE_L1_L2, new FloatDoublewordElement(19006)), //
-						m(WeidmuellerChannelId.VOLTAGE_L2_L3, new FloatDoublewordElement(19008)), //
-						m(WeidmuellerChannelId.VOLTAGE_L1_L3, new FloatDoublewordElement(19010)), //
-						m(AsymmetricMeter.ChannelId.CURRENT_L1, new FloatDoublewordElement(19012)), //
-						m(AsymmetricMeter.ChannelId.CURRENT_L2, new FloatDoublewordElement(19014)), //
-						m(AsymmetricMeter.ChannelId.CURRENT_L3, new FloatDoublewordElement(19016)), //
-						m(SymmetricMeter.ChannelId.CURRENT, new FloatDoublewordElement(19018)), //
-						m(AsymmetricMeter.ChannelId.ACTIVE_POWER_L1, new FloatDoublewordElement(19020)), //
-						m(AsymmetricMeter.ChannelId.ACTIVE_POWER_L2, new FloatDoublewordElement(19022)), //
-						m(AsymmetricMeter.ChannelId.ACTIVE_POWER_L3, new FloatDoublewordElement(19024)), //
-						m(SymmetricMeter.ChannelId.ACTIVE_POWER, new FloatDoublewordElement(19026)), //
-						m(WeidmuellerChannelId.APPARENT_POWER_S1_L1N, new FloatDoublewordElement(19028)), //
-						m(WeidmuellerChannelId.APPARENT_POWER_S2_L2N, new FloatDoublewordElement(19030)), //
-						m(WeidmuellerChannelId.APPARENT_POWER_S3_L3N, new FloatDoublewordElement(19032)), //
-						m(WeidmuellerChannelId.APPARENT_POWER_SUM, new FloatDoublewordElement(19034)), //
-						m(AsymmetricMeter.ChannelId.REACTIVE_POWER_L1, new FloatDoublewordElement(19036)), //
-						m(AsymmetricMeter.ChannelId.REACTIVE_POWER_L2, new FloatDoublewordElement(19038)), //
-						m(AsymmetricMeter.ChannelId.REACTIVE_POWER_L3, new FloatDoublewordElement(19040)), //
-						m(SymmetricMeter.ChannelId.REACTIVE_POWER, new FloatDoublewordElement(19042)), //
-						m(WeidmuellerChannelId.COSPHI_L1, new FloatDoublewordElement(19044)), //
-						m(WeidmuellerChannelId.COSPHI_L2, new FloatDoublewordElement(19046)), //
-						m(WeidmuellerChannelId.COSPHI_L3, new FloatDoublewordElement(19048)), //
-						m(SymmetricMeter.ChannelId.FREQUENCY, new FloatDoublewordElement(19050)), //
-						m(WeidmuellerChannelId.ROTATION_FIELD, new FloatDoublewordElement(19052)), //
-						m(WeidmuellerChannelId.REAL_ENERGY_L1, new FloatDoublewordElement(19054)), //
-						m(WeidmuellerChannelId.REAL_ENERGY_L2, new FloatDoublewordElement(19056)), //
-						m(WeidmuellerChannelId.REAL_ENERGY_L3, new FloatDoublewordElement(19058)), //
-						m(WeidmuellerChannelId.REAL_ENERGY_L1_L3, new FloatDoublewordElement(19060)), //
-						m(WeidmuellerChannelId.REAL_ENERGY_L1_CONSUMED, new FloatDoublewordElement(19062)), //
-						m(WeidmuellerChannelId.REAL_ENERGY_L2_CONSUMED, new FloatDoublewordElement(19064)), //
-						m(WeidmuellerChannelId.REAL_ENERGY_L3_CONSUMED, new FloatDoublewordElement(19066)), //
-						m(SymmetricMeter.ChannelId.ACTIVE_CONSUMPTION_ENERGY, new FloatDoublewordElement(19068)), //
-						m(WeidmuellerChannelId.REAL_ENERGY_L1_DELIVERED, new FloatDoublewordElement(19070)), //
-						m(WeidmuellerChannelId.REAL_ENERGY_L2_DELIVERED, new FloatDoublewordElement(19072)), //
-						m(WeidmuellerChannelId.REAL_ENERGY_L3_DELIVERED, new FloatDoublewordElement(19074)), //
-						m(SymmetricMeter.ChannelId.ACTIVE_PRODUCTION_ENERGY, new FloatDoublewordElement(19076)), //
-						m(WeidmuellerChannelId.APPARENT_ENERGY_L1, new FloatDoublewordElement(19078)), //
-						m(WeidmuellerChannelId.APPARENT_ENERGY_L2, new FloatDoublewordElement(19080)), //
-						m(WeidmuellerChannelId.APPARENT_ENERGY_L3, new FloatDoublewordElement(19082)), //
-						m(WeidmuellerChannelId.APPARENT_ENERGY_L1_L3, new FloatDoublewordElement(19084)), //
-						m(WeidmuellerChannelId.REACTIVE_ENERGY_L1, new FloatDoublewordElement(19086)), //
-						m(WeidmuellerChannelId.REACTIVE_ENERGY_L2, new FloatDoublewordElement(19088)), //
-						m(WeidmuellerChannelId.REACTIVE_ENERGY_L3, new FloatDoublewordElement(19090)), //
-						m(WeidmuellerChannelId.REACTIVE_ENERGY_L1_L3, new FloatDoublewordElement(19092)), //
-						m(WeidmuellerChannelId.REACTIVE_ENERGY_INDUCTIVE_L1, new FloatDoublewordElement(19094)), //
-						m(WeidmuellerChannelId.REACTIVE_ENERGY_INDUCTIVE_L2, new FloatDoublewordElement(19096)), //
-						m(WeidmuellerChannelId.REACTIVE_ENERGY_INDUCTIVE_L3, new FloatDoublewordElement(19098)), //
-						m(WeidmuellerChannelId.REACTIVE_ENERGY_INDUCTIVE_L1_L3, new FloatDoublewordElement(19100)), //
-						m(WeidmuellerChannelId.REACTIVE_ENERGY_CAPACITIVE_L1, new FloatDoublewordElement(19102)), //
-						m(WeidmuellerChannelId.REACTIVE_ENERGY_CAPACITIVE_L2, new FloatDoublewordElement(19104)), //
-						m(WeidmuellerChannelId.REACTIVE_ENERGY_CAPACITIVE_L3, new FloatDoublewordElement(19106)), //
-						m(WeidmuellerChannelId.REACTIVE_ENERGY_CAPACITIVE_L1_L3, new FloatDoublewordElement(19108)), //
-						m(WeidmuellerChannelId.HARMONIC_THD_VOLT_L1N, new FloatDoublewordElement(19110)), //
-						m(WeidmuellerChannelId.HARMONIC_THD_VOLT_L2N, new FloatDoublewordElement(19112)), //
-						m(WeidmuellerChannelId.HARMONIC_THD_VOLT_L3N, new FloatDoublewordElement(19114)), //
-						m(WeidmuellerChannelId.HARMONIC_THD_CURRENT_L1N, new FloatDoublewordElement(19116)), //
-						m(WeidmuellerChannelId.HARMONIC_THD_CURRENT_L2N, new FloatDoublewordElement(19118)), //
-						m(WeidmuellerChannelId.HARMONIC_THD_CURRENT_L3N, new FloatDoublewordElement(19120))));
+						this.m(AsymmetricMeter.ChannelId.VOLTAGE_L2, new FloatDoublewordElement(19002)), //
+						this.m(AsymmetricMeter.ChannelId.VOLTAGE_L3, new FloatDoublewordElement(19004)), //
+						this.m(WeidmuellerChannelId.VOLTAGE_L1_L2, new FloatDoublewordElement(19006)), //
+						this.m(WeidmuellerChannelId.VOLTAGE_L2_L3, new FloatDoublewordElement(19008)), //
+						this.m(WeidmuellerChannelId.VOLTAGE_L1_L3, new FloatDoublewordElement(19010)), //
+						this.m(AsymmetricMeter.ChannelId.CURRENT_L1, new FloatDoublewordElement(19012)), //
+						this.m(AsymmetricMeter.ChannelId.CURRENT_L2, new FloatDoublewordElement(19014)), //
+						this.m(AsymmetricMeter.ChannelId.CURRENT_L3, new FloatDoublewordElement(19016)), //
+						this.m(SymmetricMeter.ChannelId.CURRENT, new FloatDoublewordElement(19018)), //
+						this.m(AsymmetricMeter.ChannelId.ACTIVE_POWER_L1, new FloatDoublewordElement(19020)), //
+						this.m(AsymmetricMeter.ChannelId.ACTIVE_POWER_L2, new FloatDoublewordElement(19022)), //
+						this.m(AsymmetricMeter.ChannelId.ACTIVE_POWER_L3, new FloatDoublewordElement(19024)), //
+						this.m(SymmetricMeter.ChannelId.ACTIVE_POWER, new FloatDoublewordElement(19026)), //
+						this.m(WeidmuellerChannelId.APPARENT_POWER_S1_L1N, new FloatDoublewordElement(19028)), //
+						this.m(WeidmuellerChannelId.APPARENT_POWER_S2_L2N, new FloatDoublewordElement(19030)), //
+						this.m(WeidmuellerChannelId.APPARENT_POWER_S3_L3N, new FloatDoublewordElement(19032)), //
+						this.m(WeidmuellerChannelId.APPARENT_POWER_SUM, new FloatDoublewordElement(19034)), //
+						this.m(AsymmetricMeter.ChannelId.REACTIVE_POWER_L1, new FloatDoublewordElement(19036)), //
+						this.m(AsymmetricMeter.ChannelId.REACTIVE_POWER_L2, new FloatDoublewordElement(19038)), //
+						this.m(AsymmetricMeter.ChannelId.REACTIVE_POWER_L3, new FloatDoublewordElement(19040)), //
+						this.m(SymmetricMeter.ChannelId.REACTIVE_POWER, new FloatDoublewordElement(19042)), //
+						this.m(WeidmuellerChannelId.COSPHI_L1, new FloatDoublewordElement(19044)), //
+						this.m(WeidmuellerChannelId.COSPHI_L2, new FloatDoublewordElement(19046)), //
+						this.m(WeidmuellerChannelId.COSPHI_L3, new FloatDoublewordElement(19048)), //
+						this.m(SymmetricMeter.ChannelId.FREQUENCY, new FloatDoublewordElement(19050)), //
+						this.m(WeidmuellerChannelId.ROTATION_FIELD, new FloatDoublewordElement(19052)), //
+						this.m(WeidmuellerChannelId.REAL_ENERGY_L1, new FloatDoublewordElement(19054)), //
+						this.m(WeidmuellerChannelId.REAL_ENERGY_L2, new FloatDoublewordElement(19056)), //
+						this.m(WeidmuellerChannelId.REAL_ENERGY_L3, new FloatDoublewordElement(19058)), //
+						this.m(WeidmuellerChannelId.REAL_ENERGY_L1_L3, new FloatDoublewordElement(19060)), //
+						this.m(WeidmuellerChannelId.REAL_ENERGY_L1_CONSUMED, new FloatDoublewordElement(19062)), //
+						this.m(WeidmuellerChannelId.REAL_ENERGY_L2_CONSUMED, new FloatDoublewordElement(19064)), //
+						this.m(WeidmuellerChannelId.REAL_ENERGY_L3_CONSUMED, new FloatDoublewordElement(19066)), //
+						this.m(SymmetricMeter.ChannelId.ACTIVE_CONSUMPTION_ENERGY, new FloatDoublewordElement(19068)), //
+						this.m(WeidmuellerChannelId.REAL_ENERGY_L1_DELIVERED, new FloatDoublewordElement(19070)), //
+						this.m(WeidmuellerChannelId.REAL_ENERGY_L2_DELIVERED, new FloatDoublewordElement(19072)), //
+						this.m(WeidmuellerChannelId.REAL_ENERGY_L3_DELIVERED, new FloatDoublewordElement(19074)), //
+						this.m(SymmetricMeter.ChannelId.ACTIVE_PRODUCTION_ENERGY, new FloatDoublewordElement(19076)), //
+						this.m(WeidmuellerChannelId.APPARENT_ENERGY_L1, new FloatDoublewordElement(19078)), //
+						this.m(WeidmuellerChannelId.APPARENT_ENERGY_L2, new FloatDoublewordElement(19080)), //
+						this.m(WeidmuellerChannelId.APPARENT_ENERGY_L3, new FloatDoublewordElement(19082)), //
+						this.m(WeidmuellerChannelId.APPARENT_ENERGY_L1_L3, new FloatDoublewordElement(19084)), //
+						this.m(WeidmuellerChannelId.REACTIVE_ENERGY_L1, new FloatDoublewordElement(19086)), //
+						this.m(WeidmuellerChannelId.REACTIVE_ENERGY_L2, new FloatDoublewordElement(19088)), //
+						this.m(WeidmuellerChannelId.REACTIVE_ENERGY_L3, new FloatDoublewordElement(19090)), //
+						this.m(WeidmuellerChannelId.REACTIVE_ENERGY_L1_L3, new FloatDoublewordElement(19092)), //
+						this.m(WeidmuellerChannelId.REACTIVE_ENERGY_INDUCTIVE_L1, new FloatDoublewordElement(19094)), //
+						this.m(WeidmuellerChannelId.REACTIVE_ENERGY_INDUCTIVE_L2, new FloatDoublewordElement(19096)), //
+						this.m(WeidmuellerChannelId.REACTIVE_ENERGY_INDUCTIVE_L3, new FloatDoublewordElement(19098)), //
+						this.m(WeidmuellerChannelId.REACTIVE_ENERGY_INDUCTIVE_L1_L3, new FloatDoublewordElement(19100)), //
+						this.m(WeidmuellerChannelId.REACTIVE_ENERGY_CAPACITIVE_L1, new FloatDoublewordElement(19102)), //
+						this.m(WeidmuellerChannelId.REACTIVE_ENERGY_CAPACITIVE_L2, new FloatDoublewordElement(19104)), //
+						this.m(WeidmuellerChannelId.REACTIVE_ENERGY_CAPACITIVE_L3, new FloatDoublewordElement(19106)), //
+						this.m(WeidmuellerChannelId.REACTIVE_ENERGY_CAPACITIVE_L1_L3,
+								new FloatDoublewordElement(19108)), //
+						this.m(WeidmuellerChannelId.HARMONIC_THD_VOLT_L1N, new FloatDoublewordElement(19110)), //
+						this.m(WeidmuellerChannelId.HARMONIC_THD_VOLT_L2N, new FloatDoublewordElement(19112)), //
+						this.m(WeidmuellerChannelId.HARMONIC_THD_VOLT_L3N, new FloatDoublewordElement(19114)), //
+						this.m(WeidmuellerChannelId.HARMONIC_THD_CURRENT_L1N, new FloatDoublewordElement(19116)), //
+						this.m(WeidmuellerChannelId.HARMONIC_THD_CURRENT_L2N, new FloatDoublewordElement(19118)), //
+						this.m(WeidmuellerChannelId.HARMONIC_THD_CURRENT_L3N, new FloatDoublewordElement(19120))));
 	}
 
 	@Override
diff --git a/io.openems.edge.meter.weidmueller/src/io/openems/edge/meter/weidmueller/RotationField.java b/io.openems.edge.meter.weidmueller/src/io/openems/edge/meter/weidmueller/RotationField.java
index fbdd3e20386..80734139dc7 100644
--- a/io.openems.edge.meter.weidmueller/src/io/openems/edge/meter/weidmueller/RotationField.java
+++ b/io.openems.edge.meter.weidmueller/src/io/openems/edge/meter/weidmueller/RotationField.java
@@ -18,12 +18,12 @@ private RotationField(int value, String name) {
 
 	@Override
 	public int getValue() {
-		return value;
+		return this.value;
 	}
 
 	@Override
 	public String getName() {
-		return name;
+		return this.name;
 	}
 
 	@Override
diff --git a/io.openems.edge.meter.weidmueller/src/io/openems/edge/meter/weidmueller/WeidmuellerChannelId.java b/io.openems.edge.meter.weidmueller/src/io/openems/edge/meter/weidmueller/WeidmuellerChannelId.java
index baedf5d9df6..e6aabfc03dd 100644
--- a/io.openems.edge.meter.weidmueller/src/io/openems/edge/meter/weidmueller/WeidmuellerChannelId.java
+++ b/io.openems.edge.meter.weidmueller/src/io/openems/edge/meter/weidmueller/WeidmuellerChannelId.java
@@ -1,8 +1,8 @@
 package io.openems.edge.meter.weidmueller;
 
-import io.openems.edge.common.channel.Doc;
 import io.openems.common.channel.Unit;
 import io.openems.common.types.OpenemsType;
+import io.openems.edge.common.channel.Doc;
 
 public enum WeidmuellerChannelId implements io.openems.edge.common.channel.ChannelId {
 	VOLTAGE_L1_L2(Doc.of(OpenemsType.INTEGER) //
@@ -94,6 +94,7 @@ private WeidmuellerChannelId(Doc doc) {
 		this.doc = doc;
 	}
 
+	@Override
 	public Doc doc() {
 		return this.doc;
 	}
diff --git a/io.openems.edge.meter.weidmueller/test/io/openems/edge/meter/weidmueller/MyConfig.java b/io.openems.edge.meter.weidmueller/test/io/openems/edge/meter/weidmueller/MyConfig.java
index cb6ed3bc237..da56d4023e8 100644
--- a/io.openems.edge.meter.weidmueller/test/io/openems/edge/meter/weidmueller/MyConfig.java
+++ b/io.openems.edge.meter.weidmueller/test/io/openems/edge/meter/weidmueller/MyConfig.java
@@ -38,7 +38,7 @@ public MyConfig build() {
 
 	/**
 	 * Create a Config builder.
-	 * 
+	 *
 	 * @return a {@link Builder}
 	 */
 	public static Builder create() {

From ccf66f21b47b605bbb76153ac3c2f7f7c713cce9 Mon Sep 17 00:00:00 2001
From: Stefan Feilmeier <stefan.feilmeier@fenecon.de>
Date: Tue, 8 Mar 2022 16:08:13 +0100
Subject: [PATCH 79/96] Update io.openems.edge.onewire.thermometer

---
 .../edge/onewire/thermometer/OneWireThermometer.java  | 11 ++++++-----
 .../edge/onewire/thermometer/ThisChannelId.java       |  1 +
 2 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/io.openems.edge.onewire.thermometer/src/io/openems/edge/onewire/thermometer/OneWireThermometer.java b/io.openems.edge.onewire.thermometer/src/io/openems/edge/onewire/thermometer/OneWireThermometer.java
index b0cad3ff8b8..62d6ec80850 100644
--- a/io.openems.edge.onewire.thermometer/src/io/openems/edge/onewire/thermometer/OneWireThermometer.java
+++ b/io.openems.edge.onewire.thermometer/src/io/openems/edge/onewire/thermometer/OneWireThermometer.java
@@ -57,14 +57,14 @@ public OneWireThermometer() {
 		);
 	}
 
-	private Consumer<DSPortAdapter> task = (adapter) -> {
+	private final Consumer<DSPortAdapter> task = adapter -> {
 		try {
-			TemperatureContainer container = this.getDeviceContainer(adapter);
+			var container = this.getDeviceContainer(adapter);
 			if (this.state != null) {
 				container.doTemperatureConvert(this.state);
 			}
 			this.state = container.readDevice();
-			double temp = container.getTemperature(this.state);
+			var temp = container.getTemperature(this.state);
 
 			this._setTemperature((int) (temp * 10 /* convert to decidegree */));
 			this._setCommunicationFailed(false);
@@ -96,15 +96,16 @@ private TemperatureContainer getDeviceContainer(DSPortAdapter adapter) throws Op
 		if (this._container != null) {
 			return this._container;
 		}
-		OneWireContainer owc = adapter.getDeviceContainer(config.address());
+		var owc = adapter.getDeviceContainer(this.config.address());
 		if (!(owc instanceof OneWireContainer)) {
 			throw new OpenemsException("This is not a OneWire Temperature Container");
 		}
-		TemperatureContainer container = (TemperatureContainer) owc;
+		var container = (TemperatureContainer) owc;
 		this._container = container;
 		return this._container;
 	}
 
+	@Override
 	@Deactivate
 	protected void deactivate() {
 		this.bridge.removeTask(this.task);
diff --git a/io.openems.edge.onewire.thermometer/src/io/openems/edge/onewire/thermometer/ThisChannelId.java b/io.openems.edge.onewire.thermometer/src/io/openems/edge/onewire/thermometer/ThisChannelId.java
index 84874b4beca..23510c61690 100644
--- a/io.openems.edge.onewire.thermometer/src/io/openems/edge/onewire/thermometer/ThisChannelId.java
+++ b/io.openems.edge.onewire.thermometer/src/io/openems/edge/onewire/thermometer/ThisChannelId.java
@@ -12,6 +12,7 @@ private ThisChannelId(Doc doc) {
 		this.doc = doc;
 	}
 
+	@Override
 	public Doc doc() {
 		return this.doc;
 	}

From 16a8158d74fe4fc9fe115b3b2a79c4dbe4b6b1ba Mon Sep 17 00:00:00 2001
From: Stefan Feilmeier <stefan.feilmeier@fenecon.de>
Date: Tue, 8 Mar 2022 16:09:09 +0100
Subject: [PATCH 80/96] Update io.openems.edge.predictor.*

---
 .../api/manager/PredictorManager.java         |   3 +-
 .../api/oneday/AbstractPredictor24Hours.java  |  17 +-
 .../api/oneday/Prediction24Hours.java         |  20 +-
 .../api/oneday/Predictor24Hours.java          |   8 +-
 .../api/test/DummyPrediction24Hours.java      |   9 +-
 .../api/test/DummyPredictor24Hours.java       |  12 +-
 .../api/test/DummyPredictorManager.java       |   7 +-
 .../predictor/persistencemodel/Config.java    |   4 +-
 .../PersistenceModelPredictorImpl.java        |  12 +-
 .../predictor/persistencemodel/MyConfig.java  |   3 +-
 .../PersistenceModelPredictorTest.java        |  17 +-
 .../predictor/similardaymodel/Config.java     |   8 +-
 .../SimilarDayPredictorImpl.java              |  52 +--
 .../edge/predictor/similardaymodel/Data.java  | 301 ++++++++++++++----
 .../predictor/similardaymodel/MyConfig.java   |   2 +-
 .../SimilardayModelPredictorTest.java         |  23 +-
 16 files changed, 339 insertions(+), 159 deletions(-)

diff --git a/io.openems.edge.predictor.api/src/io/openems/edge/predictor/api/manager/PredictorManager.java b/io.openems.edge.predictor.api/src/io/openems/edge/predictor/api/manager/PredictorManager.java
index 9efd6459705..6f88fac2a41 100644
--- a/io.openems.edge.predictor.api/src/io/openems/edge/predictor/api/manager/PredictorManager.java
+++ b/io.openems.edge.predictor.api/src/io/openems/edge/predictor/api/manager/PredictorManager.java
@@ -19,6 +19,7 @@ private ChannelId(Doc doc) {
 			this.doc = doc;
 		}
 
+		@Override
 		public Doc doc() {
 			return this.doc;
 		}
@@ -27,7 +28,7 @@ public Doc doc() {
 	/**
 	 * Gets the {@link Prediction24Hours} by the best matching
 	 * {@link Predictor24Hours} for the given {@link ChannelAddress}.
-	 * 
+	 *
 	 * @param channelAddress the {@link ChannelAddress}
 	 * @return the {@link Prediction24Hours} - all values null if no Predictor
 	 *         matches the Channel-Address
diff --git a/io.openems.edge.predictor.api/src/io/openems/edge/predictor/api/oneday/AbstractPredictor24Hours.java b/io.openems.edge.predictor.api/src/io/openems/edge/predictor/api/oneday/AbstractPredictor24Hours.java
index 1a4ddd61c15..601f6cdc53e 100644
--- a/io.openems.edge.predictor.api/src/io/openems/edge/predictor/api/oneday/AbstractPredictor24Hours.java
+++ b/io.openems.edge.predictor.api/src/io/openems/edge/predictor/api/oneday/AbstractPredictor24Hours.java
@@ -23,7 +23,7 @@ protected static class PredictionContainer {
 	}
 
 	private final Map<ChannelAddress, PredictionContainer> predictions = new HashMap<>();
-	private ChannelAddress[] channelAddresses = new ChannelAddress[0];
+	private ChannelAddress[] channelAddresses = {};
 
 	protected abstract ClockProvider getClockProvider();
 
@@ -34,6 +34,7 @@ protected AbstractPredictor24Hours(io.openems.edge.common.channel.ChannelId[] fi
 		super(firstInitialChannelIds, furtherInitialChannelIds);
 	}
 
+	@Override
 	protected final void activate(ComponentContext context, String id, String alias, boolean enabled) {
 		throw new IllegalArgumentException("use the other activate method!");
 	}
@@ -41,8 +42,8 @@ protected final void activate(ComponentContext context, String id, String alias,
 	protected void activate(ComponentContext context, String id, String alias, boolean enabled,
 			String[] channelAddresses) throws OpenemsNamedException {
 		super.activate(context, id, alias, enabled);
-		ChannelAddress[] channelAddressesArray = new ChannelAddress[channelAddresses.length];
-		for (int i = 0; i < channelAddresses.length; i++) {
+		var channelAddressesArray = new ChannelAddress[channelAddresses.length];
+		for (var i = 0; i < channelAddresses.length; i++) {
 			channelAddressesArray[i] = ChannelAddress.fromString(channelAddresses[i]);
 		}
 		this.channelAddresses = channelAddressesArray;
@@ -55,15 +56,15 @@ public ChannelAddress[] getChannelAddresses() {
 
 	@Override
 	public Prediction24Hours get24HoursPrediction(ChannelAddress channelAddress) {
-		ZonedDateTime now = roundZonedDateTimeDownTo15Minutes(ZonedDateTime.now(this.getClockProvider().getClock()));
-		PredictionContainer container = this.predictions.get(channelAddress);
+		var now = roundZonedDateTimeDownTo15Minutes(ZonedDateTime.now(this.getClockProvider().getClock()));
+		var container = this.predictions.get(channelAddress);
 		if (container == null) {
 			container = new PredictionContainer();
 			this.predictions.put(channelAddress, container);
 		}
 		if (container.latestPredictionTimestamp == null || now.isAfter(container.latestPredictionTimestamp)) {
 			// Create new prediction
-			Prediction24Hours prediction = this.createNewPrediction(channelAddress);
+			var prediction = this.createNewPrediction(channelAddress);
 			container.latestPrediction = prediction;
 			container.latestPredictionTimestamp = now;
 		} else {
@@ -74,12 +75,12 @@ public Prediction24Hours get24HoursPrediction(ChannelAddress channelAddress) {
 
 	/**
 	 * Rounds a {@link ZonedDateTime} down to 15 minutes.
-	 * 
+	 *
 	 * @param d the {@link ZonedDateTime}
 	 * @return the rounded result
 	 */
 	private static ZonedDateTime roundZonedDateTimeDownTo15Minutes(ZonedDateTime d) {
-		int minuteOfDay = d.get(ChronoField.MINUTE_OF_DAY);
+		var minuteOfDay = d.get(ChronoField.MINUTE_OF_DAY);
 		return d.with(ChronoField.NANO_OF_DAY, 0).plus(minuteOfDay / 15 * 15, ChronoUnit.MINUTES);
 	}
 
diff --git a/io.openems.edge.predictor.api/src/io/openems/edge/predictor/api/oneday/Prediction24Hours.java b/io.openems.edge.predictor.api/src/io/openems/edge/predictor/api/oneday/Prediction24Hours.java
index bf83c626ac5..9f980ccc689 100644
--- a/io.openems.edge.predictor.api/src/io/openems/edge/predictor/api/oneday/Prediction24Hours.java
+++ b/io.openems.edge.predictor.api/src/io/openems/edge/predictor/api/oneday/Prediction24Hours.java
@@ -6,7 +6,7 @@
 
 /**
  * Holds a prediction for 24 h; one value per 15 minutes; 96 values in total.
- * 
+ *
  * <p>
  * Values have the same unit as the base Channel, i.e. if the Prediction relates
  * to _sum/ProductionGridActivePower, the value is in unit Watt and represents
@@ -21,26 +21,25 @@ public class Prediction24Hours {
 	/**
 	 * Holds a {@link Prediction24Hours} with all values null.
 	 */
-	public final static Prediction24Hours EMPTY = new Prediction24Hours(new Integer[0]);
+	public final static Prediction24Hours EMPTY = new Prediction24Hours();
 
 	/**
 	 * Sums up the given {@link Prediction24Hours}s. If any source value is null,
 	 * the result value is also null.
-	 * 
+	 *
 	 * @param predictions the given {@link Prediction24Hours}
 	 * @return a {@link Prediction24Hours} holding the sum of all predictions.
 	 */
 	public static Prediction24Hours sum(Prediction24Hours... predictions) {
-		final Integer[] sumValues = new Integer[NUMBER_OF_VALUES];
-		for (int i = 0; i < NUMBER_OF_VALUES; i++) {
+		final var sumValues = new Integer[NUMBER_OF_VALUES];
+		for (var i = 0; i < NUMBER_OF_VALUES; i++) {
 			Integer sumValue = null;
 			for (Prediction24Hours prediction : predictions) {
 				if (prediction.values[i] == null) {
 					sumValue = null;
 					break;
-				} else {
-					sumValue = TypeUtils.sum(sumValue, prediction.values[i]);
 				}
+				sumValue = TypeUtils.sum(sumValue, prediction.values[i]);
 			}
 			sumValues[i] = sumValue;
 		}
@@ -49,12 +48,11 @@ public static Prediction24Hours sum(Prediction24Hours... predictions) {
 
 	/**
 	 * Constructs a {@link Prediction24Hours}.
-	 * 
+	 *
 	 * @param values the 96 prediction values
 	 */
 	public Prediction24Hours(Integer... values) {
-		super();
-		for (int i = 0; i < NUMBER_OF_VALUES && i < values.length; i++) {
+		for (var i = 0; i < NUMBER_OF_VALUES && i < values.length; i++) {
 			this.values[i] = values[i];
 		}
 	}
@@ -65,7 +63,7 @@ public Integer[] getValues() {
 
 	@Override
 	public String toString() {
-		return "Prediction24Hours " + Arrays.toString(values);
+		return "Prediction24Hours " + Arrays.toString(this.values);
 	}
 
 }
diff --git a/io.openems.edge.predictor.api/src/io/openems/edge/predictor/api/oneday/Predictor24Hours.java b/io.openems.edge.predictor.api/src/io/openems/edge/predictor/api/oneday/Predictor24Hours.java
index 3478e4559bb..8c5a8694431 100644
--- a/io.openems.edge.predictor.api/src/io/openems/edge/predictor/api/oneday/Predictor24Hours.java
+++ b/io.openems.edge.predictor.api/src/io/openems/edge/predictor/api/oneday/Predictor24Hours.java
@@ -14,11 +14,11 @@ public interface Predictor24Hours extends OpenemsComponent {
 
 	/**
 	 * Gets the Channel-Addresses for which this Predictor can provide a prediction.
-	 * 
+	 *
 	 * <p>
 	 * The entries can contain wildcards to match multiple actual
 	 * {@link ChannelAddress}es.
-	 * 
+	 *
 	 * @return an array of {@link ChannelAddress}es
 	 */
 	public ChannelAddress[] getChannelAddresses();
@@ -26,11 +26,11 @@ public interface Predictor24Hours extends OpenemsComponent {
 	/**
 	 * Gives a prediction for the next 24 h for the given {@link ChannelAddress};
 	 * one value per 15 minutes; 96 values in total.
-	 * 
+	 *
 	 * <p>
 	 * E.g. if called at 10:05, the first value stands for 10:00 to 10:15; second
 	 * value for 10:15 to 10:30.
-	 * 
+	 *
 	 * @param channelAddress the {@link ChannelAddress}
 	 * @return the {@link Prediction24Hours}
 	 */
diff --git a/io.openems.edge.predictor.api/src/io/openems/edge/predictor/api/test/DummyPrediction24Hours.java b/io.openems.edge.predictor.api/src/io/openems/edge/predictor/api/test/DummyPrediction24Hours.java
index 4b074dbdb9b..4872fef0c96 100644
--- a/io.openems.edge.predictor.api/src/io/openems/edge/predictor/api/test/DummyPrediction24Hours.java
+++ b/io.openems.edge.predictor.api/src/io/openems/edge/predictor/api/test/DummyPrediction24Hours.java
@@ -4,7 +4,7 @@
 
 /**
  * Holds a prediction for 24 h; one value per 15 minutes; 96 values in total.
- * 
+ *
  * <p>
  * Values have the same unit as the base Channel, i.e. if the Prediction relates
  * to _sum/ProductionGridActivePower, the value is in unit Watt and represents
@@ -18,16 +18,15 @@ public class DummyPrediction24Hours extends Prediction24Hours {
 	/**
 	 * Holds a {@link DummyPrediction24Hours} with all values null.
 	 */
-	public final static DummyPrediction24Hours EMPTY = new DummyPrediction24Hours(new Integer[0]);
+	public final static DummyPrediction24Hours EMPTY = new DummyPrediction24Hours();
 
 	/**
 	 * Constructs a {@link DummyPrediction24Hours}.
-	 * 
+	 *
 	 * @param values the minimum 96 prediction values
 	 */
 	public DummyPrediction24Hours(Integer... values) {
-		super();
-		for (int i = 0; i < DUMMY_NUMBER_OF_VALUES && i < values.length; i++) {
+		for (var i = 0; i < DUMMY_NUMBER_OF_VALUES && i < values.length; i++) {
 			this.values[i] = values[i];
 		}
 	}
diff --git a/io.openems.edge.predictor.api/src/io/openems/edge/predictor/api/test/DummyPredictor24Hours.java b/io.openems.edge.predictor.api/src/io/openems/edge/predictor/api/test/DummyPredictor24Hours.java
index ac62ad7bc0f..95fc3595b14 100644
--- a/io.openems.edge.predictor.api/src/io/openems/edge/predictor/api/test/DummyPredictor24Hours.java
+++ b/io.openems.edge.predictor.api/src/io/openems/edge/predictor/api/test/DummyPredictor24Hours.java
@@ -44,12 +44,12 @@ protected ClockProvider getClockProvider() {
 	@Override
 	protected Prediction24Hours createNewPrediction(ChannelAddress channelAddress) {
 
-		ZonedDateTime now = ZonedDateTime.now(clockProvider.getClock()).withZoneSameInstant(ZoneOffset.UTC);
+		var now = ZonedDateTime.now(this.clockProvider.getClock()).withZoneSameInstant(ZoneOffset.UTC);
 		now = roundZonedDateTimeDownTo15Minutes(now);
 
-		int quarterHourIndex = now.get(ChronoField.MINUTE_OF_DAY) / 15;
-		Integer[] values = this.prediction24Hours.getValues();
-		Integer[] adjustedValues = new Integer[Prediction24Hours.NUMBER_OF_VALUES];
+		var quarterHourIndex = now.get(ChronoField.MINUTE_OF_DAY) / 15;
+		var values = this.prediction24Hours.getValues();
+		var adjustedValues = new Integer[Prediction24Hours.NUMBER_OF_VALUES];
 
 		for (int i = quarterHourIndex, y = 0; i < quarterHourIndex + Prediction24Hours.NUMBER_OF_VALUES
 				&& i < values.length; i++, y++) {
@@ -61,12 +61,12 @@ protected Prediction24Hours createNewPrediction(ChannelAddress channelAddress) {
 
 	/**
 	 * Rounds a {@link ZonedDateTime} down to 15 minutes.
-	 * 
+	 *
 	 * @param d the {@link ZonedDateTime}
 	 * @return the rounded result
 	 */
 	private static ZonedDateTime roundZonedDateTimeDownTo15Minutes(ZonedDateTime d) {
-		int minuteOfDay = d.get(ChronoField.MINUTE_OF_DAY);
+		var minuteOfDay = d.get(ChronoField.MINUTE_OF_DAY);
 		return d.with(ChronoField.NANO_OF_DAY, 0).plus(minuteOfDay / 15 * 15, ChronoUnit.MINUTES);
 	}
 }
diff --git a/io.openems.edge.predictor.api/src/io/openems/edge/predictor/api/test/DummyPredictorManager.java b/io.openems.edge.predictor.api/src/io/openems/edge/predictor/api/test/DummyPredictorManager.java
index 2c4bd980aa5..aee5a7606dd 100644
--- a/io.openems.edge.predictor.api/src/io/openems/edge/predictor/api/test/DummyPredictorManager.java
+++ b/io.openems.edge.predictor.api/src/io/openems/edge/predictor/api/test/DummyPredictorManager.java
@@ -1,6 +1,7 @@
 package io.openems.edge.predictor.api.test;
 
 import java.util.ArrayList;
+import java.util.Collections;
 import java.util.List;
 
 import io.openems.common.types.ChannelAddress;
@@ -13,7 +14,7 @@
 
 public class DummyPredictorManager extends AbstractOpenemsComponent implements PredictorManager, OpenemsComponent {
 
-	private List<Predictor24Hours> predictors = new ArrayList<>();
+	private final List<Predictor24Hours> predictors = new ArrayList<>();
 
 	public DummyPredictorManager(Predictor24Hours... predictors) {
 		super(//
@@ -23,9 +24,7 @@ public DummyPredictorManager(Predictor24Hours... predictors) {
 		for (Channel<?> channel : this.channels()) {
 			channel.nextProcessImage();
 		}
-		for (Predictor24Hours predictor : predictors) {
-			this.predictors.add(predictor);
-		}
+		Collections.addAll(this.predictors, predictors);
 		super.activate(null, PredictorManager.SINGLETON_COMPONENT_ID, PredictorManager.SINGLETON_SERVICE_PID, true);
 	}
 
diff --git a/io.openems.edge.predictor.persistencemodel/src/io/openems/edge/predictor/persistencemodel/Config.java b/io.openems.edge.predictor.persistencemodel/src/io/openems/edge/predictor/persistencemodel/Config.java
index 3221812f9dc..c8e895869cd 100644
--- a/io.openems.edge.predictor.persistencemodel/src/io/openems/edge/predictor/persistencemodel/Config.java
+++ b/io.openems.edge.predictor.persistencemodel/src/io/openems/edge/predictor/persistencemodel/Config.java
@@ -18,7 +18,9 @@
 	boolean enabled() default true;
 
 	@AttributeDefinition(name = "Channel-Addresses", description = "List of Channel-Addresses this Predictor is used for, e.g. '*/ActivePower', '*/ActualPower'")
-	// TODO "_sum/ConsumptionActivePower" holds also actively controlled consumption; replace, once we introduce a 'Sum-Non-Regulated-Consumption'-Channel
+	// TODO "_sum/ConsumptionActivePower" holds also actively controlled
+	// consumption; replace, once we introduce a
+	// 'Sum-Non-Regulated-Consumption'-Channel
 	String[] channelAddresses() default { "_sum/ProductionActivePower", "_sum/ConsumptionActivePower" };
 
 	String webconsole_configurationFactory_nameHint() default "Predictor Persistence-Model [{id}]";
diff --git a/io.openems.edge.predictor.persistencemodel/src/io/openems/edge/predictor/persistencemodel/PersistenceModelPredictorImpl.java b/io.openems.edge.predictor.persistencemodel/src/io/openems/edge/predictor/persistencemodel/PersistenceModelPredictorImpl.java
index 027e8677601..3ccc0b1bbc5 100644
--- a/io.openems.edge.predictor.persistencemodel/src/io/openems/edge/predictor/persistencemodel/PersistenceModelPredictorImpl.java
+++ b/io.openems.edge.predictor.persistencemodel/src/io/openems/edge/predictor/persistencemodel/PersistenceModelPredictorImpl.java
@@ -59,6 +59,7 @@ protected void activate(ComponentContext context, Config config) throws OpenemsN
 		super.activate(context, config.id(), config.alias(), config.enabled(), config.channelAddresses());
 	}
 
+	@Override
 	@Deactivate
 	protected void deactivate() {
 		super.deactivate();
@@ -66,8 +67,8 @@ protected void deactivate() {
 
 	@Override
 	protected Prediction24Hours createNewPrediction(ChannelAddress channelAddress) {
-		ZonedDateTime now = ZonedDateTime.now(this.componentManager.getClock());
-		ZonedDateTime fromDate = now.minus(1, ChronoUnit.DAYS);
+		var now = ZonedDateTime.now(this.componentManager.getClock());
+		var fromDate = now.minus(1, ChronoUnit.DAYS);
 
 		// Query database
 		final SortedMap<ZonedDateTime, SortedMap<ChannelAddress, JsonElement>> queryResult;
@@ -81,17 +82,16 @@ protected Prediction24Hours createNewPrediction(ChannelAddress channelAddress) {
 		}
 
 		// Extract data
-		Integer[] result = queryResult.values().stream() //
-				.map(m -> m.values()) //
+		var result = queryResult.values().stream() //
+				.map(SortedMap::values) //
 				// extract JsonElement values as flat stream
 				.flatMap(Collection::stream) //
 				// convert JsonElement to Integer
 				.map(v -> {
 					if (v.isJsonNull()) {
 						return (Integer) null;
-					} else {
-						return v.getAsInt();
 					}
+					return v.getAsInt();
 				})
 				// get as Array
 				.toArray(Integer[]::new);
diff --git a/io.openems.edge.predictor.persistencemodel/test/io/openems/edge/predictor/persistencemodel/MyConfig.java b/io.openems.edge.predictor.persistencemodel/test/io/openems/edge/predictor/persistencemodel/MyConfig.java
index 2888f8200c1..8270f8929f3 100644
--- a/io.openems.edge.predictor.persistencemodel/test/io/openems/edge/predictor/persistencemodel/MyConfig.java
+++ b/io.openems.edge.predictor.persistencemodel/test/io/openems/edge/predictor/persistencemodel/MyConfig.java
@@ -1,7 +1,6 @@
 package io.openems.edge.predictor.persistencemodel;
 
 import io.openems.edge.common.test.AbstractComponentConfig;
-import io.openems.edge.predictor.persistencemodel.Config;
 
 @SuppressWarnings("all")
 public class MyConfig extends AbstractComponentConfig implements Config {
@@ -30,7 +29,7 @@ public MyConfig build() {
 
 	/**
 	 * Create a Config builder.
-	 * 
+	 *
 	 * @return a {@link Builder}
 	 */
 	public static Builder create() {
diff --git a/io.openems.edge.predictor.persistencemodel/test/io/openems/edge/predictor/persistencemodel/PersistenceModelPredictorTest.java b/io.openems.edge.predictor.persistencemodel/test/io/openems/edge/predictor/persistencemodel/PersistenceModelPredictorTest.java
index 9415e5b41b7..33898af1a65 100644
--- a/io.openems.edge.predictor.persistencemodel/test/io/openems/edge/predictor/persistencemodel/PersistenceModelPredictorTest.java
+++ b/io.openems.edge.predictor.persistencemodel/test/io/openems/edge/predictor/persistencemodel/PersistenceModelPredictorTest.java
@@ -14,7 +14,6 @@
 import io.openems.edge.common.test.ComponentTest;
 import io.openems.edge.common.test.DummyComponentManager;
 import io.openems.edge.common.test.TimeLeapClock;
-import io.openems.edge.predictor.api.oneday.Prediction24Hours;
 import io.openems.edge.timedata.test.DummyTimedata;
 
 public class PersistenceModelPredictorTest {
@@ -26,8 +25,8 @@ public class PersistenceModelPredictorTest {
 
 	@Test
 	public void test() throws Exception {
-		final TimeLeapClock clock = new TimeLeapClock(
-				Instant.ofEpochSecond(1577836800) /* starts at 1. January 2020 00:00:00 */, ZoneOffset.UTC);
+		final var clock = new TimeLeapClock(Instant.ofEpochSecond(1577836800) /* starts at 1. January 2020 00:00:00 */,
+				ZoneOffset.UTC);
 		int[] values = {
 				// Day 1
 				0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 9, 146, 348, 636, 1192, 2092, 2882, 3181,
@@ -42,13 +41,13 @@ public void test() throws Exception {
 				477, 501, 547, 589, 1067, 13304, 17367, 14825, 13654, 12545, 8371, 10468, 9810, 8537, 6228, 3758, 4131,
 				3572, 1698, 1017, 569, 188, 14, 2, 5, 0, 0, 0, 0, 0, 0, 0, 0, 0 };
 
-		DummyTimedata timedata = new DummyTimedata(TIMEDATA_ID);
-		ZonedDateTime start = ZonedDateTime.of(2019, 12, 30, 0, 0, 0, 0, ZoneId.of("UTC"));
-		for (int i = 0; i < values.length; i++) {
+		var timedata = new DummyTimedata(TIMEDATA_ID);
+		var start = ZonedDateTime.of(2019, 12, 30, 0, 0, 0, 0, ZoneId.of("UTC"));
+		for (var i = 0; i < values.length; i++) {
 			timedata.add(start.plusMinutes(i * 15), METER1_ACTIVE_POWER, values[i]);
 		}
 
-		PersistenceModelPredictorImpl sut = new PersistenceModelPredictorImpl();
+		var sut = new PersistenceModelPredictorImpl();
 
 		new ComponentTest(sut) //
 				.addReference("timedata", timedata) //
@@ -58,8 +57,8 @@ public void test() throws Exception {
 						.setChannelAddresses(METER1_ACTIVE_POWER.toString()) //
 						.build());
 
-		Prediction24Hours prediction = sut.get24HoursPrediction(METER1_ACTIVE_POWER);
-		Integer[] p = prediction.getValues();
+		var prediction = sut.get24HoursPrediction(METER1_ACTIVE_POWER);
+		var p = prediction.getValues();
 
 		assertEquals((Integer) 0, p[0]);
 		assertEquals((Integer) 3, p[20]);
diff --git a/io.openems.edge.predictor.similardaymodel/src/io/openems/edge/predictor/similardaymodel/Config.java b/io.openems.edge.predictor.similardaymodel/src/io/openems/edge/predictor/similardaymodel/Config.java
index 420fa90f95d..2f323371893 100644
--- a/io.openems.edge.predictor.similardaymodel/src/io/openems/edge/predictor/similardaymodel/Config.java
+++ b/io.openems.edge.predictor.similardaymodel/src/io/openems/edge/predictor/similardaymodel/Config.java
@@ -7,7 +7,7 @@
 		name = "Predictor Similarday-Model", //
 		description = "Implements Similarday-Model predictor")
 @interface Config {
-	
+
 	@AttributeDefinition(name = "Component-ID", description = "Unique ID of this Component")
 	String id() default "predictor0";
 
@@ -16,13 +16,13 @@
 
 	@AttributeDefinition(name = "Is enabled?", description = "Is this Component enabled?")
 	boolean enabled() default true;
-	
+
 	@AttributeDefinition(name = "How many weeks?", description = "No of weeks the data is needed?")
 	int numOfWeeks() default 4;
-	
+
 	@AttributeDefinition(name = "Channel-Addresses", description = "List of Channel-Addresses this Predictor is used for, e.g. '*/ActivePower', '*/ActualPower'")
 	String[] channelAddresses() default { "_sum/ProductionActivePower", "_sum/ConsumptionActivePower" };
-	
+
 	String webconsole_configurationFactory_nameHint() default "Predictor Similarday-Model [{id}]";
 
 }
diff --git a/io.openems.edge.predictor.similardaymodel/src/io/openems/edge/predictor/similardaymodel/SimilarDayPredictorImpl.java b/io.openems.edge.predictor.similardaymodel/src/io/openems/edge/predictor/similardaymodel/SimilarDayPredictorImpl.java
index 54ee9f88201..a20b26f3a0d 100644
--- a/io.openems.edge.predictor.similardaymodel/src/io/openems/edge/predictor/similardaymodel/SimilarDayPredictorImpl.java
+++ b/io.openems.edge.predictor.similardaymodel/src/io/openems/edge/predictor/similardaymodel/SimilarDayPredictorImpl.java
@@ -75,6 +75,7 @@ protected void activate(ComponentContext context, Config config) throws OpenemsN
 				this.config.channelAddresses());
 	}
 
+	@Override
 	@Deactivate
 	protected void deactivate() {
 		super.deactivate();
@@ -88,9 +89,9 @@ protected ClockProvider getClockProvider() {
 	@Override
 	protected Prediction24Hours createNewPrediction(ChannelAddress channelAddress) {
 
-		ZonedDateTime now = ZonedDateTime.now(this.componentManager.getClock());
+		var now = ZonedDateTime.now(this.componentManager.getClock());
 		// From now time to Last 4 weeks
-		ZonedDateTime fromDate = now.minus(this.config.numOfWeeks(), ChronoUnit.WEEKS);
+		var fromDate = now.minus(this.config.numOfWeeks(), ChronoUnit.WEEKS);
 
 		final SortedMap<ZonedDateTime, SortedMap<ChannelAddress, JsonElement>> queryResult;
 
@@ -106,32 +107,31 @@ protected Prediction24Hours createNewPrediction(ChannelAddress channelAddress) {
 
 		// Extract data
 		List<Integer> result = queryResult.values().stream() //
-				.map(m -> m.values()) //
+				.map(SortedMap::values) //
 				// extract JsonElement values as flat stream
 				.flatMap(Collection::stream) //
 				// convert JsonElement to Integer
 				.map(v -> {
 					if (v.isJsonNull()) {
 						return (Integer) null;
-					} else {
-						return v.getAsInt();
 					}
+					return v.getAsInt();
 				})
 				// get as Array
 				.collect(Collectors.toList());
 
 		// Num of Data per day
 		// TODO change this variable based on the resolution which is 900 in query
-		int numOfDataPerDay = 96;
+		var numOfDataPerDay = 96;
 
-		List<List<Integer>> mainData = getSlicedArrayList(result, numOfDataPerDay);
+		var mainData = getSlicedArrayList(result, numOfDataPerDay);
 
 		// Getting the indexes of the last four similar days
-		List<List<Integer>> lastFourSimilarDays = getCorrectIndexes(mainData, NUM_OF_DAYS_OF_WEEK,
+		var lastFourSimilarDays = getCorrectIndexes(mainData, NUM_OF_DAYS_OF_WEEK,
 				PREDCTION_FOR_ONE_DAY);
 
 		// Getting the average predictions
-		List<Integer> nextOneDayPredictions = getAverage(lastFourSimilarDays);		
+		var nextOneDayPredictions = getAverage(lastFourSimilarDays);
 
 		return new Prediction24Hours(nextOneDayPredictions.stream().toArray(Integer[]::new));
 	}
@@ -139,14 +139,14 @@ protected Prediction24Hours createNewPrediction(ChannelAddress channelAddress) {
 	/**
 	 * This methods takes a List of integers and returns a 2dimension List of
 	 * integers, specific to correct days.
-	 * 
+	 *
 	 * @param arrlist array list of all data.
 	 * @param n       number of data per day.
 	 * @return 2dimension array list
 	 */
 	private static List<List<Integer>> getSlicedArrayList(List<Integer> arrlist, int n) {
-		List<List<Integer>> twoDimensionalArrayList = new ArrayList<List<Integer>>();
-		for (int i = 0; i < arrlist.size(); i = i + n) {
+		List<List<Integer>> twoDimensionalArrayList = new ArrayList<>();
+		for (var i = 0; i < arrlist.size(); i = i + n) {
 			twoDimensionalArrayList.add(arrlist.subList(i, i + n));
 		}
 		return twoDimensionalArrayList;
@@ -155,17 +155,17 @@ private static List<List<Integer>> getSlicedArrayList(List<Integer> arrlist, int
 
 	/**
 	 * This methods get the average of data based on the indexes.
-	 * 
+	 *
 	 * @param twoDimensionalArrayList The actual data.
 	 * @return Average values of the last four days.
 	 */
 	private static List<Integer> getAverage(List<List<Integer>> twoDimensionalArrayList) {
-		List<Integer> averageList = new ArrayList<Integer>();
-		int rows = twoDimensionalArrayList.size();
-		int cols = twoDimensionalArrayList.get(0).size();
-		for (int i = 0; i < cols; i++) {
-			int sumRow = 0;
-			for (int j = 0; j < rows; j++) {
+		List<Integer> averageList = new ArrayList<>();
+		var rows = twoDimensionalArrayList.size();
+		var cols = twoDimensionalArrayList.get(0).size();
+		for (var i = 0; i < cols; i++) {
+			var sumRow = 0;
+			for (var j = 0; j < rows; j++) {
 				if (twoDimensionalArrayList.get(j).get(i) != null) {
 					sumRow += twoDimensionalArrayList.get(j).get(i);
 				}
@@ -178,7 +178,7 @@ private static List<Integer> getAverage(List<List<Integer>> twoDimensionalArrayL
 
 	/**
 	 * Data manipulation, to get the proper indexes.
-	 * 
+	 *
 	 * @param mainData      all data points.
 	 * @param numDaysOfWeek total number of days of week.
 	 * @param whichDay      current actual day.
@@ -186,9 +186,9 @@ private static List<Integer> getAverage(List<List<Integer>> twoDimensionalArrayL
 	 */
 	private static List<List<Integer>> getCorrectIndexes(List<List<Integer>> mainData, int numDaysOfWeek,
 			int whichDay) {
-		List<Integer> indexes = new ArrayList<Integer>();
-		List<List<Integer>> days = new ArrayList<List<Integer>>();
-		for (int i = 0; i < mainData.size(); i++) {
+		List<Integer> indexes = new ArrayList<>();
+		List<List<Integer>> days = new ArrayList<>();
+		for (var i = 0; i < mainData.size(); i++) {
 			if (isMember(whichDay, numDaysOfWeek, i)) {
 				indexes.add(i);
 			}
@@ -204,7 +204,7 @@ private static List<List<Integer>> getCorrectIndexes(List<List<Integer>> mainDat
 
 	/**
 	 * Check if the day belongs to correct day.
-	 * 
+	 *
 	 * @param whichDay      current actual day.
 	 * @param numDaysOfWeek total number of days of week.
 	 * @param nthTerm       nthterm
@@ -212,9 +212,9 @@ private static List<List<Integer>> getCorrectIndexes(List<List<Integer>> mainDat
 	 */
 	private static boolean isMember(int whichDay, int numDaysOfWeek, int nthTerm) {
 		if (numDaysOfWeek == 0) {
-			return (nthTerm == whichDay);
+			return nthTerm == whichDay;
 		}
-		return ((nthTerm - whichDay) % numDaysOfWeek == 0 && (nthTerm - whichDay) / numDaysOfWeek >= 0);
+		return (nthTerm - whichDay) % numDaysOfWeek == 0 && (nthTerm - whichDay) / numDaysOfWeek >= 0;
 
 	}
 
diff --git a/io.openems.edge.predictor.similardaymodel/test/io/openems/edge/predictor/similardaymodel/Data.java b/io.openems.edge.predictor.similardaymodel/test/io/openems/edge/predictor/similardaymodel/Data.java
index 4e39b02c0e1..c4c5f217969 100644
--- a/io.openems.edge.predictor.similardaymodel/test/io/openems/edge/predictor/similardaymodel/Data.java
+++ b/io.openems.edge.predictor.similardaymodel/test/io/openems/edge/predictor/similardaymodel/Data.java
@@ -1,68 +1,249 @@
 package io.openems.edge.predictor.similardaymodel;
 
 public class Data {
-	
-	public static final Integer[] data = {
-			0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, //
 
-			 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, //
+	public static final Integer[] data = { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+			0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+			0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, //
+
+			0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+			0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+			0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, //
+
+			0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+			0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+			0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, //
+
+			0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+			0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+			0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, //
+
+			0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+			0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+			0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, //
+
+			0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+			0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+			0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, //
+
+			0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+			0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+			0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, //
+
+			0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+			0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+			0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, //
+
+			0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 19628148, 6550910, 22317828, 15206562, 9058611,
+			23406944, 9219693, 15800971, 21296530, 4527141, 22562770, 15267745, 9018811, 23595324, 8430786, 16389406,
+			21525472, 4077697, 22768848, 15157240, 9138508, 23968964, 7363085, 17083467, 21832143, 3594137, 22989236,
+			15085879, 9228392, 24124509, 6571137, 17642223, 21475288, 4499115, 22445357, 14785938, 9713856, 23915723,
+			6550867, 17656891, 20921635, 5474489, 22062513, 14542193, 10049813, 23690578, 6654455, 17689559, 20435467,
+			6028892, 21951157, 14613696, 10015734, 23385682, 7012689, 17595474, 20197424, 6435626, 21802029, 14528000,
+			10124220, 23141960, 2640169, 8624727, 15593695, 21078270, 6648533, 20702052, 16174167, 8652929, 23103674,
+			9415632, 15315525, 21073269, 6429999, 20912249, 16072814, //
+
+			8688754, 23011505, 9745347, 15174361, 21202293, 6012314, 21216329, 15949181, 8593743, 9973991, 23510081,
+			4963040, 19950775, 19491470, 5166975, 23717579, 12303753, 11982384, 23957607, 3778278, 20679632, 19257248,
+			5348607, 23838658, 12263030, 12045896, 23524143, 4315132, 20480132, 18894586, 6167012, 23353918, 11973767,
+			12412515, 23142252, 5014560, 20084238, 18574591, 6843968, 23042868, 11588716, 12864209, 22745707, 5830336,
+			19668607, 18191762, 7343509, 22899931, 11226024, 13150314, 22541918, 6444932, 19260087, 18102400, 7389853,
+			22935268, 10986745, 13260801, 22431435, 7086697, 18887108, 18044029, 7377111, 23035500, 11036566, 13216566,
+			22184679, 7455357, 18808808, 18012193, 7241047, 23093461, 11080178, 13203141, 22075695, 7330308, 19025666,
+			18174654, 6971185, 23062072, 11262408, 13158150, 22087116, 7025189, 19303211, 18293406, 6804257, 23044594,
+			11373599, 13171686, 22254260, 6480438, 19696518, 18338323, 6581887, 23151076, //
+
+			11604769, 12952137, 22589192, 5622771, 20203554, 18302906, 6441386, 23357620, 11445514, 13091251, 22956998,
+			4673724, 20807399, 18288487, 6105346, 23848082, 11367278, 13054746, 23273602, 3760297, 21381618, 18225835,
+			5981923, 24207759, 11145130, 13123652, 23265447, 3621941, 21545214, 17901138, 6758239, 23756140, 10548255,
+			13757071, 22886070, 4390518, 21041361, 17532483, 7454236, 23428798, 10129041, 14229790, 22436513, 5324878,
+			20568731, 17178127, 7998347, 23282483, 9856018, 14433316, 22268708, 5949598, 20130590, 17129247, 8022482,
+			23263787, 9602355, 14605403, 21927623, 6715756, 19772138, 16903530, 8167990, 23303579, 9620705, 14640926,
+			21673839, 6883218, 19889343, 17009546, 7990983, 23226453, 9858403, 14569637, 21493377, 6926327, 20014532,
+			17145773, 7809541, 23072085, 10109997, 14492824, 21526944, 6685882, 20217357, 17121589, 7727077, 23114353,
+			10420701, 14239556, 21705368, 6126628, 20583521, 17070504, 7684599, 23136513, //
+
+			10611913, 14154820, 22024580, 5428125, 20992158, 17062487, 7446859, 23470283, 10582385, 14141467, 22284292,
+			4557025, 21599418, 16885615, 7338373, 23841840, 10565609, 14034098, 22524607, 3819144, 22069946, 17094514,
+			7115064, 24051681, 9727720, 14636115, 22991141, 3044869, 22416925, 16925266, 7464993, 24025258, 8997311,
+			15272431, 22354895, 4227531, 21784802, 16444165, 8257695, 23734762, 8626851, 15632950, 22143188, 4954302,
+			21267194, 16244320, 8589471, 23587662, 8393340, 15865528, 21702258, 5925147, 20787704, 16105981, 8753773,
+			23559390, 8347191, 15864910, 21366536, 6330591, 20781495, 16012461, 8822725, 23382794, 8488262, 15917033,
+			20935476, 6680033, 20800007, 16061273, 8776216, 23166338, 8785728, 15844450, 20941593, 6636992, 20860341,
+			15951301, 8846804, 23106750, 9177339, 15578916, 20943560, 6438064, 21033893, 15783067, 8924339, 22983467,
+			9605892, 15331428, 21078934, 6019274, 21317309, 15728719, 8783992, 23180832, //
+
+			9713243, 15249007, 21279408, 5367330, 21768778, 15580151, 8696040, 23417895, 9887160, 15097248, 21460661,
+			4764798, 22218240, 15720414, 8487344, 23605753, 9446081, 15407128, 21751813, 4180490, 22494522, 15815748,
+			8439888, 23815168, 8522399, 16095019, 21935882, 3721703, 22741700, 15606351, 8664988, 24207759, 7370746,
+			16889912, 21944239, 3906499, 22590875, 15419180, 9032978, 23986993, 6997075, 17218623, 21527687, 4848544,
+			22031346, 15128377, 9466351, 23820788, 7001541, 17206217, 21004085, 5708207, 21741097, 14890121, 9803186,
+			23603337, 7024611, 17341331, 20510146, 6244005, 21716133, 14890115, 9786500, 23306787, 7363558, 17284785,
+			20320208, 6511591, 21608014, 14750756, 9930128, 23124925, 7913388, 16942690, 20203263, 6587292, 21624962,
+			14513392, 10113276, 22919554, 8398547, 16678506, 20181005, 6516502, 21762500, 14295383, 10193554, 22936572,
+			8698312, 16537405, 20296021, 6041988, 22100770, 14183007, 10083567, 23105447, //
+
+			8989410, 16271687, 20399219, 5615836, 22402447, 14305604, 9902154, 23119856, 8923746, 16371915, 20571323,
+			5160131, 22645294, 14358318, 9888208, 23240084, 8265843, 16909934, 20805330, 4710098, 22820691, 14360568,
+			9931777, 23539247, 7375623, 9415822, 22307506, 15560049, 8671193, 23573577, 9112068, 15751951, 21660721,
+			4082015, 22642615, 15402282, 8842632, 23818278, 8039991, 16575794, 21745508, 3806327, 22913415, 15130961,
+			9141456, 24229806, 6818899, 17440294, 21759736, 3957445, 22736323, 14901893, 9568919, 24021685, 6471824,
+			17780626, 21042461, 5155479, 22294767, 14334638, 10243117, 23786048, 6294118, 18010859, 20419313, 5826465,
+			22215726, 14341022, 10276711, 23433900, 6612880, 18009829, 19996368, 6366523, 22052626, 14094256, 10512193,
+			23152641, 7019419, 17898658, 19751155, 6615911, 22068261, 13659363, 10943383, 22892049, 7609590, 17637458,
+			19507319, 6792320, 22143856, 13279319, 11195651, 22809641, 7998949, 17453715, //
+
+			19491914, 6485574, 22473502, 12939263, 11339674, 22836780, 8388122, 17241483, 19445575, 6201345, 22766294,
+			12881923, 11373551, 22762814, 8080644, 17647664, 19537048, 5905348, 22931837, 12797754, 11564040, 22736543,
+			7535507, 18215295, 19550015, 5732163, 22978501, 12702490, 11702830, 22951044, 6636079, 18872397, 19686218,
+			5394917, 23188512, 12718043, 11684092, 23347746, 5486549, 19652009, 19587479, 5265496, 23508795, 12366861,
+			12010603, 23807618, 4155776, 20472076, 19484893, 4953684, 23976940, 12168409, 12097796, 23668636, 4048813,
+			20641313, 18826537, 6032773, 23556207, 11790335, 12600559, 23219029, 4655481, 20475133, 18392416, 6829019,
+			23237060, 11159992, 13233021, 22704457, 5504649, 20077577, 17803590, 7545229, 23082117, 10665191, 13669123,
+			22413994, 6213296, 19705135, 17678742, 7647986, 23130765, 10269325, 13953565, 22181609, 6892237, 19343592,
+			17440090, 7731004, 23264261, 10163309, 14101344, 21889465, 7023527, 19556940, //
+
+			17361822, 7695152, 23189274, 10150679, 14282087, 21611223, 6991054, 19858916, 17332204, 7643778, 23066653,
+			10275184, 14319879, 21627003, 6630320, 20202211, 17215008, 7625807, 23111607, 10505851, 14214845, 21830942,
+			5959063, 20687659, 16974341, 7694019, 23208585, 10415890, 14335779, 22019651, 5135061, 21303623, 16776551,
+			7543203, 23599951, 10487839, 14225557, 22214630, 4365688, 21876947, 16744734, 7479200, 23818705, 9988650,
+			14615526, 22463795, 3626725, 22357371, 16724667, 7538762, 24106610, 8821290, 15516785, 22500738, 3454023,
+			22466628, 16044371, 8388949, 23997234, 7947773, 16293538, 22026503, 4430789, 21968253, 15687162, 8972812,
+			23832462, 7550030, 16706012, 21471067, 5444039, 21499281, 15367490, 9361479, 23699015, 7411397, 16862884,
+			20969087, 5993594, 21507869, 15116464, 9616895, 23434183, 7508189, 17030382, 20426235, 6503849, 21547151,
+			15059192, 9671367, 23138310, 7804793, 16991347, 20251935, 6628005, 21579210, //
+
+			14656789, 9984782, 22985062, 8236105, 16782028, 20165913, 6512453, 21780210, 14212013, 10297958, 22920498,
+			8518032, 16683932, 20152224, 6152185, 22153479, 13915924, 10344687, 23061539, 8820218, 16522693, 20140536,
+			5759600, 22556871, 13838808, 10368950, 23018087, 8559741, 16890487, 20254554, 5347371, 22787393, 13751540,
+			10525072, 23064180, 7856609, 17554570, 20300641, 5118343, 22908214, 13603239, 10736493, 23356200, 6794841,
+			18308454, 20525840, 4672346, 23187248, 13609829, 10748145, 23773670, 5514352, 19145320, 20475073, 4490305,
+			23522685, 13058746, 11228823, 24110847, 4459320, 19869016, 19849358, 5115280, 23451562, 12779960, 11578253,
+			23632326, 4796332, 19842826, 19187801, 6102427, 23125288, 12634340, 11828408, 23198848, 5345817, 19700246,
+			18824251, 6737926, 22873861, 12037827, 12409570, 22814959, 6063019, 19345395, 18476572, 7197820, 22768287,
+			11529247, 12896938, 22576794, 6692266, 19042234, 18276846, 7288199, 22904648, //
+
+			11141858, 13137570, 22401204, 7292607, 18730801, 18097388, 7279018, 23100747, 11030513, 13177245, 22183872,
+			7350550, 18926763, 18097829, 7116866, 23103889, 10983888, 13362456, 21948964, 7214260, 19312614, 18045112,
+			7073893, 23037177, 11027992, 13480188, 22038919, 6691771, 19728807, 18023490, 6935789, 23135144, 11185965,
+			13392257, 22219528, 5940309, 20299028, 17790274, 6956401, 23242452, 11070140, 13566321, 22526643, 4974710,
+			20957420, 17625559, 6757956, 23692292, 10958044, 13635770, 22785082, 4046866, 21625268, 17475702, 6732056,
+			24046416, 10450486, 13963008, 23011575, 3246213, 22235904, 17422398, 6909740, 24127021, 9440164, 14839700,
+			22639874, 3890974, 21883594, 16710762, 7984298, 23793381, 8857051, 15456540, 22169292, 4854947, 21368201,
+			16397896, 8449589, 23598584, 8388962, 15876931, 21776886, 5699911, 20961300, 16036047, 8799304, 23626879,
+			8210654, 16017666, 21336027, 6214812, 20910345, 15887038, 8955933, 23411848, //
+
+			8221308, 16235322, 20814755, 6615974, 21030755, 15725976, 9093706, 23155009, 8475146, 16256652, 20658188,
+			6652752, 21126902, 15457722, 9247262, 23073144, 8825443, 16066263, 20602648, 6426678, 21430883, 15143338,
+			9482476, 22984419, 9029727, 16066843, 20644480, 5970987, 21820003, 14827391, 9507534, 23192936, 9256136,
+			15900757, 20743238, 5435837, 22278134, 14712817, 9540192, 23242194, 9098919, 16087278, 20859194, 4954511,
+			22632370, 14677293, 9611700, 23344214, 8279809, 16837444, 20966693, 4590983, 22822408, 14377899, 9953260,
+			23704513, 7075774, 17745043, 21096861, 4234971, 23070139, 14203610, 10057726, 24109993, 5693141, 18681318,
+			21025666, 4262303, 23173846, 13850170, 10487687, 24071718, 5320218, 18927447, 20363907, 5177843, 22928321,
+			13526949, 10946371, 23664238, 5483270, 19054689, 19622280, 6090506, 22748322, 13435280, 11095644, 23209325,
+			5963149, 18964576, 19224673, 6710180, 22539937, 12885926, 11644548, 22931363, //
+
+			6550727, 18691528, 19021441, 6924526, 22512365, 12333234, 12100024, 22681976, 7094395, 18461092, 18733849,
+			7047052, 22653940, 11977218, 12326272, 22637775, 7589822, 18214544, 18635699, 6919708, 22901763, 11783024,
+			12440462, 22386064, 7758725, 18322875, 18587777, 6764170, 23010928, 11711592, 12615519, 22277026, 7419076,
+			18792359, 18614537, 6595115, 23005535, 11666795, 12784985, 22366400, 6794275, 19289719, 18662622, 6387813,
+			23116233, 11766734, 12733555, 22593784, 5906160, 19958795, 18517767, 6349274, 23256681, 11679895, 12904180,
+			22978760, 4788741, 20707805, 18292821, 6174101, 23794420, 11312192, 13128047, 23215355, 3795653, 21481949,
+			18120240, 6132456, 24208590, 10852530, 13431073, 23245858, 3446308, 21713892, 17753336, 6864070, 23841354,
+			10045453, 14248223, 22698325, 4372338, 21262372, 17148096, 7774773, 23565387, 9500381, 14839456, 22277969,
+			5258493, 20837354, 16841397, 8169576, 23446618, 9012608, 15210199, 21902217, //
+
+			6093800, 20440510, 16523055, 8454472, 23499292, 8890729, 15362883, 21514259, 6481556, 20465357, 16341039,
+			8577290, 23332686, 8821754, 15592311, 21052378, 6736444, 20672449, 16239111, 8664187, 23106530, 8993414,
+			15744851, 20931383, 6644621, 8658437, 18678106, 19513676, 6577549, 22352850, 13307070, 11220911, 23058413,
+			6722916, 18356704, 19290179, 6861505, 22307151, 12956656, 11594109, 22704260, 7365840, 18044670, 19153685,
+			6939335, 22387956, 12654702, 11695187, 22763499, 7659613, 17888308, 19120689, 6661917, 22648852, 12391634,
+			11833808, 22632820, 8090628, 17726750, 18984666, 6550826, 22923766, 12305494, 11981807, 22545599, 7813823,
+			18071344, 19131109, 6206572, 22994555, 12433015, 11971871, 22564600, 7268448, 18601799, 19237693, 5935895,
+			23016018, 12334842, 12102054, 22799422, 6400726, 19215368, 19280092, 5703876, 23197162, 12396553, 12050686,
+			23194007, 5334410, 19887100, 19164018, 5576837, 23511667, 12065924, 12306782, //
+
+			23622868, 4080603, 20712579, 19081559, 5228071, 24115611, 11874820, 12368914, 23599995, 3798160, 20981386,
+			18679483, 6070552, 23690130, 11504268, 12862353, 23149031, 4501087, 20687059, 18180858, 6941855, 23316438,
+			10885051, 13483119, 22652728, 5372541, 20234862, 17655542, 7623619, 23151661, 10473286, 13878866, 22420918,
+			6098943, 19852138, 17555250, 7739421, 23197412, 10142209, 14126564, 22161262, 6786968, 19497045, 17392925,
+			7796711, 23270766, 10041770, 14184307, 21857793, 6958854, 19598870, 17308433, 7745974, 23203566, 10095393,
+			14325029, 21527484, 6963176, 19924856, 17202788, 7758382, 23077156, 10173572, 14459591, 21585809, 6671118,
+			20180439, 17166377, 7720317, 23138522, 10424859, 14292828, 21713744, 6101203, 20626549, 16979851, 7722878,
+			23157107, 10489919, 14314920, 21946507, 5324051, 21188151, 16830889, 7583891, 23527869, 10442655, 14319637,
+			22162271, 4488870, 21779424, 16635980, 7571778, 23790018, 10211336, 14448356, //
+
+			22388820, 3782216, 22272059, 16707843, 7553882, 24046779, 9025574, 15343164, 22596728, 3260710, 22599398,
+			16330045, 8055647, 24046000, 8225177, 16063547, 22174203, 4229892, 21984116, 15911054, 8715461, 23789002,
+			7784590, 16436907, 21721867, 5185669, 21530754, 15619104, 9105793, 23699385, 7652702, 16570783, 21163955,
+			5993314, 21291221, 15387257, 9396874, 23556216, 7707035, 16702941, 20742721, 6388842, 21301023, 15404540,
+			9375147, 23284104, 7939228, 16725232, 20574625, 6552148, 21332800, 15120388, 9592830, 23074682, 8318688,
+			16520514, 20347739, 6550180, 21517598, 14723604, 9901095, 22876358, 8783418, 16381588, 20385837, 6300682,
+			21787449, 14556545, 9890382, 23061978, 8876251, 16320341, 20476953, 5771963, 22223396, 14271993, 9941271,
+			23166087, 9114773, 16175465, 20439516, 5393255, 22567798, 14192929, 10075120, 23190789, 8472506, 16767177,
+			20645769, 4895467, 22797989, 14255205, 10079508, 23359944, 7604190, 17494690, //
+
+			20835887, 4568692, 22955800, 14037796, 10295790, 23733943, 6464204, 18239932, 21009725, 4130314, 23255522,
+			13997646, 10243844, 24207759, 5168454, 19039304, 20656968, 4624942, 23167800, 13426687, 9852496, 1083474,
+			14401511, 12504518, 11760470, 22876805, 6882334, 18701825, 19591030, 5553179, 23075691, 12729128, 11637580,
+			23195636, 5935042, 19295823, 19676761, 5290348, 23283992, 12795610, 11576564, 23740208, 4809831, 19909917,
+			19786417, 4858785, 23746737, 12496082, 11789655, 23946807, 4045253, 20428663, 19288874, 5502069, 23634895,
+			12464669, 11913246, 23450203, 4553808, 20282631, 18940760, 6284196, 23205745, 12059152, 12381645, 23092658,
+			5274243, 19878808, 18560891, 6918818, 22953031, 11665044, 12761457, 22710132, 6063331, 19423310, 18253005,
+			7351379, 22856544, 11399823, 12970589, 22552648, 6701483, 19037485, 18276846, 7288199, 22881013, 11194948,
+			13045473, 22437471, 7277522, 18668126, 18194881, 7223503, 23002224, 11272126, //
+
+			12980994, 22235027, 7570737, 18648389, 18199546, 7079575, 23092576, 11344158, 12950794, 22148536, 7380508,
+			18903079, 18374635, 6792264, 23036140, 11483778, 12941615, 22271619, 6982379, 19206892, 18511435, 6564548,
+			23054622, 11648403, 12844267, 22451945, 6332730, 19643018, 18571145, 6384535, 23167304, 11776199, 12759213,
+			22783475, 5467491, 20164550, 18518505, 6198329, 23459839, 11616870, 12863411, 23207627, 4412746, 20825569,
+			18551736, 5816456, 23925069, 11577616, 12768346, 23509420, 3509631, 21396465, 18479896, 5900829, 24054208,
+			11274147, 13072790, 23230871, 3883109, 21238146, 18014281, 6835378, 23588712, 10671534, 13698814, 22781058,
+			4767364, 20777898, 17639724, 7457491, 23318302, 10228797, 14105805, 22458203, 5565319, 20305145, 17287345,
+			7893967, 23234634, 9918417, 14354779, 22237385, 6273898, 19896154, 17237794, 7938721, 23265383, 9830296,
+			14422620, 21909513, 6904759, 19639056, 17060244, 8059794, 23258187, 9884250, //
+
+			14441784, 21664245, 6998144, 19794057, 17206641, 7803948, 23190880, 10132825, 14321214, 21601674, 6903723,
+			19967525, 17282574, 7672093, 23068438, 10289538, 14310632, 21648568, 6520263, 20246686, 17281895, 7593662,
+			23100491, 10639937, 14090027, 21884332, 5916088, 20659926, 17146478, 7541935, 23212881, 10609063, 14112918,
+			22137518, 5165440, 21112559, 17140767, 7262037, 23593894, 10627470, 14029963, 22449381, 4387880, 21620224,
+			17036516, 7188465, 23901148, 10511501, 14014660, 22650195, 3635721, 22129677, 17115191, 7095639, 24162604,
+			9521030, 14863812, 22852060, 3359458, 22230710, 16805215, 7694364, 23915937, 8906682, 15361011, 22338476,
+			4415153, 21636633, 16337341, 8463659, 23657957, 8619140, 15646278, 22052127, 5162130, 21158554, 16237858,
+			8629665, 23547994, 8395596, 15812515, 21657131, 6048249, 20712160, 16036762, 8843879, 23524539, 8450055,
+			15797754, 21313416, 6413058, 20689043, 16060796, 8787268, 23328585, 8686991, //
+
+			15759635, 20993045, 6725825, 20714472, 16162157, 8711698, 23131537, 9014324, 15638737, 20976081, 6673640,
+			20780032, 16087399, 8685277, 23096319, 9379459, 15378352, 21026225, 6385770, 21014008, 15944553, 8767459,
+			22985980, 9735366, 15207478, 21206809, 5878367, 21330340, 15833491, 8636802, 23238723, 9797233, 15117025,
+			21394824, 5187445, 21834285, 15672434, 8602894, 23475313, 9965772, 14986841, 21575828, 4587918, 22295084,
+			15844962, 8363823, 23635333, 9337350, 15442834, 21920695, 3963374, 22542040, 15864507, 8379274, 23906847,
+			8361422, 16203943, 21999170, 3632656, 22778624, 15630018, 8617641, 24198347, 7377978, 16845211, 21942632,
+			4046633, 22412224, 15343078, 9158513, 23920045, 7123167, 17134635, 21451973, 5069842, 21894060, 15161509,
+			9457643, 23796364, 7073572, 17134186, 7133380, 17802216, 7582668, 23030633, 10698918, 13627584, 22449998,
+			6367520, 19483090, 17734427, 7613118, 23067972, 10491469, 13734358, 22250894, //
+
+			7020022, 19162364, 17712121, 7540578, 23162818, 10578078, 13629680, 22051954, 7229406, 19166676, 17728778,
+			7437856, 23159761, 10685192, 13642402, 0, 22020842, 5485775, 20930006, 17107835, 7399238, 23432151,
+			10689871, 14031720, 22285281, 4605999, 21524237, 16915342, 7318512, 23788841, 10709114, 13897782, 22553064,
+			3853756, 22041180, 17155563, 7053101, 24064130, 9831320, 14543299, 22982963, 3064699, 22446253, 17014905,
+			7360553, 24058692, 9066570, 15191437, 22443435, 4173088, 21785026, 16523924, 8201314, 23739668, 8686494,
+			15574890, 22140380, 4949215, 21274849, 16230939, 8591944, 23592633, 8404004, 15856085, 21718829, 5887075,
+			20807869, 16123129, 8733755, 23558215, 8400923, 15822116, 21400148, 6329817, 20717703, 16067168, 8790213,
+			23412045, 8557373, 15873198, 20997005, 3278352, 5604555, 18603203, 19601020, 6519954, 22317594, 13443922,
+			11111186, 23074649, 6756632, 18240756, 19429273, 6790209, 22220665, 8437208 //
 
-			 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, //
-
-			 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, //
-
-			 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, //
-
-			 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, //
-
-			 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, //
-
-			 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, //
-
-			 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 19628148, 6550910, 22317828, 15206562, 9058611, 23406944, 9219693, 15800971, 21296530, 4527141, 22562770, 15267745, 9018811, 23595324, 8430786, 16389406, 21525472, 4077697, 22768848, 15157240, 9138508, 23968964, 7363085, 17083467, 21832143, 3594137, 22989236, 15085879, 9228392, 24124509, 6571137, 17642223, 21475288, 4499115, 22445357, 14785938, 9713856, 23915723, 6550867, 17656891, 20921635, 5474489, 22062513, 14542193, 10049813, 23690578, 6654455, 17689559, 20435467, 6028892, 21951157, 14613696, 10015734, 23385682, 7012689, 17595474, 20197424, 6435626, 21802029, 14528000, 10124220, 23141960, 2640169, 8624727, 15593695, 21078270, 6648533, 20702052, 16174167, 8652929, 23103674, 9415632, 15315525, 21073269, 6429999, 20912249, 16072814, //
-
-			 8688754, 23011505, 9745347, 15174361, 21202293, 6012314, 21216329, 15949181, 8593743, 9973991, 23510081, 4963040, 19950775, 19491470, 5166975, 23717579, 12303753, 11982384, 23957607, 3778278, 20679632, 19257248, 5348607, 23838658, 12263030, 12045896, 23524143, 4315132, 20480132, 18894586, 6167012, 23353918, 11973767, 12412515, 23142252, 5014560, 20084238, 18574591, 6843968, 23042868, 11588716, 12864209, 22745707, 5830336, 19668607, 18191762, 7343509, 22899931, 11226024, 13150314, 22541918, 6444932, 19260087, 18102400, 7389853, 22935268, 10986745, 13260801, 22431435, 7086697, 18887108, 18044029, 7377111, 23035500, 11036566, 13216566, 22184679, 7455357, 18808808, 18012193, 7241047, 23093461, 11080178, 13203141, 22075695, 7330308, 19025666, 18174654, 6971185, 23062072, 11262408, 13158150, 22087116, 7025189, 19303211, 18293406, 6804257, 23044594, 11373599, 13171686, 22254260, 6480438, 19696518, 18338323, 6581887, 23151076, //
-
-			 11604769, 12952137, 22589192, 5622771, 20203554, 18302906, 6441386, 23357620, 11445514, 13091251, 22956998, 4673724, 20807399, 18288487, 6105346, 23848082, 11367278, 13054746, 23273602, 3760297, 21381618, 18225835, 5981923, 24207759, 11145130, 13123652, 23265447, 3621941, 21545214, 17901138, 6758239, 23756140, 10548255, 13757071, 22886070, 4390518, 21041361, 17532483, 7454236, 23428798, 10129041, 14229790, 22436513, 5324878, 20568731, 17178127, 7998347, 23282483, 9856018, 14433316, 22268708, 5949598, 20130590, 17129247, 8022482, 23263787, 9602355, 14605403, 21927623, 6715756, 19772138, 16903530, 8167990, 23303579, 9620705, 14640926, 21673839, 6883218, 19889343, 17009546, 7990983, 23226453, 9858403, 14569637, 21493377, 6926327, 20014532, 17145773, 7809541, 23072085, 10109997, 14492824, 21526944, 6685882, 20217357, 17121589, 7727077, 23114353, 10420701, 14239556, 21705368, 6126628, 20583521, 17070504, 7684599, 23136513, //
-
-			 10611913, 14154820, 22024580, 5428125, 20992158, 17062487, 7446859, 23470283, 10582385, 14141467, 22284292, 4557025, 21599418, 16885615, 7338373, 23841840, 10565609, 14034098, 22524607, 3819144, 22069946, 17094514, 7115064, 24051681, 9727720, 14636115, 22991141, 3044869, 22416925, 16925266, 7464993, 24025258, 8997311, 15272431, 22354895, 4227531, 21784802, 16444165, 8257695, 23734762, 8626851, 15632950, 22143188, 4954302, 21267194, 16244320, 8589471, 23587662, 8393340, 15865528, 21702258, 5925147, 20787704, 16105981, 8753773, 23559390, 8347191, 15864910, 21366536, 6330591, 20781495, 16012461, 8822725, 23382794, 8488262, 15917033, 20935476, 6680033, 20800007, 16061273, 8776216, 23166338, 8785728, 15844450, 20941593, 6636992, 20860341, 15951301, 8846804, 23106750, 9177339, 15578916, 20943560, 6438064, 21033893, 15783067, 8924339, 22983467, 9605892, 15331428, 21078934, 6019274, 21317309, 15728719, 8783992, 23180832, //
-
-			 9713243, 15249007, 21279408, 5367330, 21768778, 15580151, 8696040, 23417895, 9887160, 15097248, 21460661, 4764798, 22218240, 15720414, 8487344, 23605753, 9446081, 15407128, 21751813, 4180490, 22494522, 15815748, 8439888, 23815168, 8522399, 16095019, 21935882, 3721703, 22741700, 15606351, 8664988, 24207759, 7370746, 16889912, 21944239, 3906499, 22590875, 15419180, 9032978, 23986993, 6997075, 17218623, 21527687, 4848544, 22031346, 15128377, 9466351, 23820788, 7001541, 17206217, 21004085, 5708207, 21741097, 14890121, 9803186, 23603337, 7024611, 17341331, 20510146, 6244005, 21716133, 14890115, 9786500, 23306787, 7363558, 17284785, 20320208, 6511591, 21608014, 14750756, 9930128, 23124925, 7913388, 16942690, 20203263, 6587292, 21624962, 14513392, 10113276, 22919554, 8398547, 16678506, 20181005, 6516502, 21762500, 14295383, 10193554, 22936572, 8698312, 16537405, 20296021, 6041988, 22100770, 14183007, 10083567, 23105447, //
-
-			 8989410, 16271687, 20399219, 5615836, 22402447, 14305604, 9902154, 23119856, 8923746, 16371915, 20571323, 5160131, 22645294, 14358318, 9888208, 23240084, 8265843, 16909934, 20805330, 4710098, 22820691, 14360568, 9931777, 23539247, 7375623, 9415822, 22307506, 15560049, 8671193, 23573577, 9112068, 15751951, 21660721, 4082015, 22642615, 15402282, 8842632, 23818278, 8039991, 16575794, 21745508, 3806327, 22913415, 15130961, 9141456, 24229806, 6818899, 17440294, 21759736, 3957445, 22736323, 14901893, 9568919, 24021685, 6471824, 17780626, 21042461, 5155479, 22294767, 14334638, 10243117, 23786048, 6294118, 18010859, 20419313, 5826465, 22215726, 14341022, 10276711, 23433900, 6612880, 18009829, 19996368, 6366523, 22052626, 14094256, 10512193, 23152641, 7019419, 17898658, 19751155, 6615911, 22068261, 13659363, 10943383, 22892049, 7609590, 17637458, 19507319, 6792320, 22143856, 13279319, 11195651, 22809641, 7998949, 17453715, //
-
-			 19491914, 6485574, 22473502, 12939263, 11339674, 22836780, 8388122, 17241483, 19445575, 6201345, 22766294, 12881923, 11373551, 22762814, 8080644, 17647664, 19537048, 5905348, 22931837, 12797754, 11564040, 22736543, 7535507, 18215295, 19550015, 5732163, 22978501, 12702490, 11702830, 22951044, 6636079, 18872397, 19686218, 5394917, 23188512, 12718043, 11684092, 23347746, 5486549, 19652009, 19587479, 5265496, 23508795, 12366861, 12010603, 23807618, 4155776, 20472076, 19484893, 4953684, 23976940, 12168409, 12097796, 23668636, 4048813, 20641313, 18826537, 6032773, 23556207, 11790335, 12600559, 23219029, 4655481, 20475133, 18392416, 6829019, 23237060, 11159992, 13233021, 22704457, 5504649, 20077577, 17803590, 7545229, 23082117, 10665191, 13669123, 22413994, 6213296, 19705135, 17678742, 7647986, 23130765, 10269325, 13953565, 22181609, 6892237, 19343592, 17440090, 7731004, 23264261, 10163309, 14101344, 21889465, 7023527, 19556940, //
-
-			 17361822, 7695152, 23189274, 10150679, 14282087, 21611223, 6991054, 19858916, 17332204, 7643778, 23066653, 10275184, 14319879, 21627003, 6630320, 20202211, 17215008, 7625807, 23111607, 10505851, 14214845, 21830942, 5959063, 20687659, 16974341, 7694019, 23208585, 10415890, 14335779, 22019651, 5135061, 21303623, 16776551, 7543203, 23599951, 10487839, 14225557, 22214630, 4365688, 21876947, 16744734, 7479200, 23818705, 9988650, 14615526, 22463795, 3626725, 22357371, 16724667, 7538762, 24106610, 8821290, 15516785, 22500738, 3454023, 22466628, 16044371, 8388949, 23997234, 7947773, 16293538, 22026503, 4430789, 21968253, 15687162, 8972812, 23832462, 7550030, 16706012, 21471067, 5444039, 21499281, 15367490, 9361479, 23699015, 7411397, 16862884, 20969087, 5993594, 21507869, 15116464, 9616895, 23434183, 7508189, 17030382, 20426235, 6503849, 21547151, 15059192, 9671367, 23138310, 7804793, 16991347, 20251935, 6628005, 21579210, //
-
-			 14656789, 9984782, 22985062, 8236105, 16782028, 20165913, 6512453, 21780210, 14212013, 10297958, 22920498, 8518032, 16683932, 20152224, 6152185, 22153479, 13915924, 10344687, 23061539, 8820218, 16522693, 20140536, 5759600, 22556871, 13838808, 10368950, 23018087, 8559741, 16890487, 20254554, 5347371, 22787393, 13751540, 10525072, 23064180, 7856609, 17554570, 20300641, 5118343, 22908214, 13603239, 10736493, 23356200, 6794841, 18308454, 20525840, 4672346, 23187248, 13609829, 10748145, 23773670, 5514352, 19145320, 20475073, 4490305, 23522685, 13058746, 11228823, 24110847, 4459320, 19869016, 19849358, 5115280, 23451562, 12779960, 11578253, 23632326, 4796332, 19842826, 19187801, 6102427, 23125288, 12634340, 11828408, 23198848, 5345817, 19700246, 18824251, 6737926, 22873861, 12037827, 12409570, 22814959, 6063019, 19345395, 18476572, 7197820, 22768287, 11529247, 12896938, 22576794, 6692266, 19042234, 18276846, 7288199, 22904648, //
-
-			 11141858, 13137570, 22401204, 7292607, 18730801, 18097388, 7279018, 23100747, 11030513, 13177245, 22183872, 7350550, 18926763, 18097829, 7116866, 23103889, 10983888, 13362456, 21948964, 7214260, 19312614, 18045112, 7073893, 23037177, 11027992, 13480188, 22038919, 6691771, 19728807, 18023490, 6935789, 23135144, 11185965, 13392257, 22219528, 5940309, 20299028, 17790274, 6956401, 23242452, 11070140, 13566321, 22526643, 4974710, 20957420, 17625559, 6757956, 23692292, 10958044, 13635770, 22785082, 4046866, 21625268, 17475702, 6732056, 24046416, 10450486, 13963008, 23011575, 3246213, 22235904, 17422398, 6909740, 24127021, 9440164, 14839700, 22639874, 3890974, 21883594, 16710762, 7984298, 23793381, 8857051, 15456540, 22169292, 4854947, 21368201, 16397896, 8449589, 23598584, 8388962, 15876931, 21776886, 5699911, 20961300, 16036047, 8799304, 23626879, 8210654, 16017666, 21336027, 6214812, 20910345, 15887038, 8955933, 23411848, //
-
-			 8221308, 16235322, 20814755, 6615974, 21030755, 15725976, 9093706, 23155009, 8475146, 16256652, 20658188, 6652752, 21126902, 15457722, 9247262, 23073144, 8825443, 16066263, 20602648, 6426678, 21430883, 15143338, 9482476, 22984419, 9029727, 16066843, 20644480, 5970987, 21820003, 14827391, 9507534, 23192936, 9256136, 15900757, 20743238, 5435837, 22278134, 14712817, 9540192, 23242194, 9098919, 16087278, 20859194, 4954511, 22632370, 14677293, 9611700, 23344214, 8279809, 16837444, 20966693, 4590983, 22822408, 14377899, 9953260, 23704513, 7075774, 17745043, 21096861, 4234971, 23070139, 14203610, 10057726, 24109993, 5693141, 18681318, 21025666, 4262303, 23173846, 13850170, 10487687, 24071718, 5320218, 18927447, 20363907, 5177843, 22928321, 13526949, 10946371, 23664238, 5483270, 19054689, 19622280, 6090506, 22748322, 13435280, 11095644, 23209325, 5963149, 18964576, 19224673, 6710180, 22539937, 12885926, 11644548, 22931363, //
-
-			 6550727, 18691528, 19021441, 6924526, 22512365, 12333234, 12100024, 22681976, 7094395, 18461092, 18733849, 7047052, 22653940, 11977218, 12326272, 22637775, 7589822, 18214544, 18635699, 6919708, 22901763, 11783024, 12440462, 22386064, 7758725, 18322875, 18587777, 6764170, 23010928, 11711592, 12615519, 22277026, 7419076, 18792359, 18614537, 6595115, 23005535, 11666795, 12784985, 22366400, 6794275, 19289719, 18662622, 6387813, 23116233, 11766734, 12733555, 22593784, 5906160, 19958795, 18517767, 6349274, 23256681, 11679895, 12904180, 22978760, 4788741, 20707805, 18292821, 6174101, 23794420, 11312192, 13128047, 23215355, 3795653, 21481949, 18120240, 6132456, 24208590, 10852530, 13431073, 23245858, 3446308, 21713892, 17753336, 6864070, 23841354, 10045453, 14248223, 22698325, 4372338, 21262372, 17148096, 7774773, 23565387, 9500381, 14839456, 22277969, 5258493, 20837354, 16841397, 8169576, 23446618, 9012608, 15210199, 21902217, //
-
-			 6093800, 20440510, 16523055, 8454472, 23499292, 8890729, 15362883, 21514259, 6481556, 20465357, 16341039, 8577290, 23332686, 8821754, 15592311, 21052378, 6736444, 20672449, 16239111, 8664187, 23106530, 8993414, 15744851, 20931383, 6644621, 8658437, 18678106, 19513676, 6577549, 22352850, 13307070, 11220911, 23058413, 6722916, 18356704, 19290179, 6861505, 22307151, 12956656, 11594109, 22704260, 7365840, 18044670, 19153685, 6939335, 22387956, 12654702, 11695187, 22763499, 7659613, 17888308, 19120689, 6661917, 22648852, 12391634, 11833808, 22632820, 8090628, 17726750, 18984666, 6550826, 22923766, 12305494, 11981807, 22545599, 7813823, 18071344, 19131109, 6206572, 22994555, 12433015, 11971871, 22564600, 7268448, 18601799, 19237693, 5935895, 23016018, 12334842, 12102054, 22799422, 6400726, 19215368, 19280092, 5703876, 23197162, 12396553, 12050686, 23194007, 5334410, 19887100, 19164018, 5576837, 23511667, 12065924, 12306782, //
-
-			 23622868, 4080603, 20712579, 19081559, 5228071, 24115611, 11874820, 12368914, 23599995, 3798160, 20981386, 18679483, 6070552, 23690130, 11504268, 12862353, 23149031, 4501087, 20687059, 18180858, 6941855, 23316438, 10885051, 13483119, 22652728, 5372541, 20234862, 17655542, 7623619, 23151661, 10473286, 13878866, 22420918, 6098943, 19852138, 17555250, 7739421, 23197412, 10142209, 14126564, 22161262, 6786968, 19497045, 17392925, 7796711, 23270766, 10041770, 14184307, 21857793, 6958854, 19598870, 17308433, 7745974, 23203566, 10095393, 14325029, 21527484, 6963176, 19924856, 17202788, 7758382, 23077156, 10173572, 14459591, 21585809, 6671118, 20180439, 17166377, 7720317, 23138522, 10424859, 14292828, 21713744, 6101203, 20626549, 16979851, 7722878, 23157107, 10489919, 14314920, 21946507, 5324051, 21188151, 16830889, 7583891, 23527869, 10442655, 14319637, 22162271, 4488870, 21779424, 16635980, 7571778, 23790018, 10211336, 14448356, //
-
-			 22388820, 3782216, 22272059, 16707843, 7553882, 24046779, 9025574, 15343164, 22596728, 3260710, 22599398, 16330045, 8055647, 24046000, 8225177, 16063547, 22174203, 4229892, 21984116, 15911054, 8715461, 23789002, 7784590, 16436907, 21721867, 5185669, 21530754, 15619104, 9105793, 23699385, 7652702, 16570783, 21163955, 5993314, 21291221, 15387257, 9396874, 23556216, 7707035, 16702941, 20742721, 6388842, 21301023, 15404540, 9375147, 23284104, 7939228, 16725232, 20574625, 6552148, 21332800, 15120388, 9592830, 23074682, 8318688, 16520514, 20347739, 6550180, 21517598, 14723604, 9901095, 22876358, 8783418, 16381588, 20385837, 6300682, 21787449, 14556545, 9890382, 23061978, 8876251, 16320341, 20476953, 5771963, 22223396, 14271993, 9941271, 23166087, 9114773, 16175465, 20439516, 5393255, 22567798, 14192929, 10075120, 23190789, 8472506, 16767177, 20645769, 4895467, 22797989, 14255205, 10079508, 23359944, 7604190, 17494690, //
-
-			 20835887, 4568692, 22955800, 14037796, 10295790, 23733943, 6464204, 18239932, 21009725, 4130314, 23255522, 13997646, 10243844, 24207759, 5168454, 19039304, 20656968, 4624942, 23167800, 13426687, 9852496, 1083474, 14401511, 12504518, 11760470, 22876805, 6882334, 18701825, 19591030, 5553179, 23075691, 12729128, 11637580, 23195636, 5935042, 19295823, 19676761, 5290348, 23283992, 12795610, 11576564, 23740208, 4809831, 19909917, 19786417, 4858785, 23746737, 12496082, 11789655, 23946807, 4045253, 20428663, 19288874, 5502069, 23634895, 12464669, 11913246, 23450203, 4553808, 20282631, 18940760, 6284196, 23205745, 12059152, 12381645, 23092658, 5274243, 19878808, 18560891, 6918818, 22953031, 11665044, 12761457, 22710132, 6063331, 19423310, 18253005, 7351379, 22856544, 11399823, 12970589, 22552648, 6701483, 19037485, 18276846, 7288199, 22881013, 11194948, 13045473, 22437471, 7277522, 18668126, 18194881, 7223503, 23002224, 11272126, //
-
-			 12980994, 22235027, 7570737, 18648389, 18199546, 7079575, 23092576, 11344158, 12950794, 22148536, 7380508, 18903079, 18374635, 6792264, 23036140, 11483778, 12941615, 22271619, 6982379, 19206892, 18511435, 6564548, 23054622, 11648403, 12844267, 22451945, 6332730, 19643018, 18571145, 6384535, 23167304, 11776199, 12759213, 22783475, 5467491, 20164550, 18518505, 6198329, 23459839, 11616870, 12863411, 23207627, 4412746, 20825569, 18551736, 5816456, 23925069, 11577616, 12768346, 23509420, 3509631, 21396465, 18479896, 5900829, 24054208, 11274147, 13072790, 23230871, 3883109, 21238146, 18014281, 6835378, 23588712, 10671534, 13698814, 22781058, 4767364, 20777898, 17639724, 7457491, 23318302, 10228797, 14105805, 22458203, 5565319, 20305145, 17287345, 7893967, 23234634, 9918417, 14354779, 22237385, 6273898, 19896154, 17237794, 7938721, 23265383, 9830296, 14422620, 21909513, 6904759, 19639056, 17060244, 8059794, 23258187, 9884250, //
-
-			 14441784, 21664245, 6998144, 19794057, 17206641, 7803948, 23190880, 10132825, 14321214, 21601674, 6903723, 19967525, 17282574, 7672093, 23068438, 10289538, 14310632, 21648568, 6520263, 20246686, 17281895, 7593662, 23100491, 10639937, 14090027, 21884332, 5916088, 20659926, 17146478, 7541935, 23212881, 10609063, 14112918, 22137518, 5165440, 21112559, 17140767, 7262037, 23593894, 10627470, 14029963, 22449381, 4387880, 21620224, 17036516, 7188465, 23901148, 10511501, 14014660, 22650195, 3635721, 22129677, 17115191, 7095639, 24162604, 9521030, 14863812, 22852060, 3359458, 22230710, 16805215, 7694364, 23915937, 8906682, 15361011, 22338476, 4415153, 21636633, 16337341, 8463659, 23657957, 8619140, 15646278, 22052127, 5162130, 21158554, 16237858, 8629665, 23547994, 8395596, 15812515, 21657131, 6048249, 20712160, 16036762, 8843879, 23524539, 8450055, 15797754, 21313416, 6413058, 20689043, 16060796, 8787268, 23328585, 8686991, //
-
-			 15759635, 20993045, 6725825, 20714472, 16162157, 8711698, 23131537, 9014324, 15638737, 20976081, 6673640, 20780032, 16087399, 8685277, 23096319, 9379459, 15378352, 21026225, 6385770, 21014008, 15944553, 8767459, 22985980, 9735366, 15207478, 21206809, 5878367, 21330340, 15833491, 8636802, 23238723, 9797233, 15117025, 21394824, 5187445, 21834285, 15672434, 8602894, 23475313, 9965772, 14986841, 21575828, 4587918, 22295084, 15844962, 8363823, 23635333, 9337350, 15442834, 21920695, 3963374, 22542040, 15864507, 8379274, 23906847, 8361422, 16203943, 21999170, 3632656, 22778624, 15630018, 8617641, 24198347, 7377978, 16845211, 21942632, 4046633, 22412224, 15343078, 9158513, 23920045, 7123167, 17134635, 21451973, 5069842, 21894060, 15161509, 9457643, 23796364, 7073572, 17134186, 7133380, 17802216, 7582668, 23030633, 10698918, 13627584, 22449998, 6367520, 19483090, 17734427, 7613118, 23067972, 10491469, 13734358, 22250894, //
-
-			 7020022, 19162364, 17712121, 7540578, 23162818, 10578078, 13629680, 22051954, 7229406, 19166676, 17728778, 7437856, 23159761, 10685192, 13642402, 0, 22020842, 5485775, 20930006, 17107835, 7399238, 23432151, 10689871, 14031720, 22285281, 4605999, 21524237, 16915342, 7318512, 23788841, 10709114, 13897782, 22553064, 3853756, 22041180, 17155563, 7053101, 24064130, 9831320, 14543299, 22982963, 3064699, 22446253, 17014905, 7360553, 24058692, 9066570, 15191437, 22443435, 4173088, 21785026, 16523924, 8201314, 23739668, 8686494, 15574890, 22140380, 4949215, 21274849, 16230939, 8591944, 23592633, 8404004, 15856085, 21718829, 5887075, 20807869, 16123129, 8733755, 23558215, 8400923, 15822116, 21400148, 6329817, 20717703, 16067168, 8790213, 23412045, 8557373, 15873198, 20997005, 3278352, 5604555, 18603203, 19601020, 6519954, 22317594, 13443922, 11111186, 23074649, 6756632, 18240756, 19429273, 6790209, 22220665, 8437208 //
-
-	};
-	
-	public static final Integer[] predictedData = {
-			8931905, 12081183, 13140283, 7890941, 14283475, 10869967, 9203245, 14450631, 8856705, 12104258, 13130344, 7731838, 14527199, 10794645, 9064588, 14608937, 8823195, 12172205, 13051236, 7545362, 14801416, 10708873, 9027609, 14723334, 8754347, 12263946, 12909274, 7489182, 14961291, 10577290, 9215333, 14666870, 8623358, 12483200, 12643272, 7623844, 14964723, 10380271, 9467619, 14572030, 8515648, 12750934, 12343975, 7781289, 15019471, 10155035, 9670343, 14638097, 8395602, 12894626, 12140855, 7848232, 15058938, 10126444, 9702186, 14646087, 8281407, 12949820, 12205576, 7800028, 15005580, 10290326, 9666610, 14525533, 8189920, 13065421, 12270269, 7888022, 14853165, 10294449, 9823395, 14312157, 8205314, 13121095, 12306997, 8021604, 14667519, 10359409, 9873441, 14147271, 8213434, 13151785, 12394432, 8070486, 14604112, 10274089, 9947941, 14142882, 8263493, 13041683, 12486538, 7995124, 14638527, 10254334, 9974679, 14108152	
 	};
 
+	public static final Integer[] predictedData = { 8931905, 12081183, 13140283, 7890941, 14283475, 10869967, 9203245,
+			14450631, 8856705, 12104258, 13130344, 7731838, 14527199, 10794645, 9064588, 14608937, 8823195, 12172205,
+			13051236, 7545362, 14801416, 10708873, 9027609, 14723334, 8754347, 12263946, 12909274, 7489182, 14961291,
+			10577290, 9215333, 14666870, 8623358, 12483200, 12643272, 7623844, 14964723, 10380271, 9467619, 14572030,
+			8515648, 12750934, 12343975, 7781289, 15019471, 10155035, 9670343, 14638097, 8395602, 12894626, 12140855,
+			7848232, 15058938, 10126444, 9702186, 14646087, 8281407, 12949820, 12205576, 7800028, 15005580, 10290326,
+			9666610, 14525533, 8189920, 13065421, 12270269, 7888022, 14853165, 10294449, 9823395, 14312157, 8205314,
+			13121095, 12306997, 8021604, 14667519, 10359409, 9873441, 14147271, 8213434, 13151785, 12394432, 8070486,
+			14604112, 10274089, 9947941, 14142882, 8263493, 13041683, 12486538, 7995124, 14638527, 10254334, 9974679,
+			14108152 };
+
 }
diff --git a/io.openems.edge.predictor.similardaymodel/test/io/openems/edge/predictor/similardaymodel/MyConfig.java b/io.openems.edge.predictor.similardaymodel/test/io/openems/edge/predictor/similardaymodel/MyConfig.java
index 31a8bf99a56..b1f991b756e 100644
--- a/io.openems.edge.predictor.similardaymodel/test/io/openems/edge/predictor/similardaymodel/MyConfig.java
+++ b/io.openems.edge.predictor.similardaymodel/test/io/openems/edge/predictor/similardaymodel/MyConfig.java
@@ -35,7 +35,7 @@ public MyConfig build() {
 
 	/**
 	 * Create a Config builder.
-	 * 
+	 *
 	 * @return a {@link Builder}
 	 */
 	public static Builder create() {
diff --git a/io.openems.edge.predictor.similardaymodel/test/io/openems/edge/predictor/similardaymodel/SimilardayModelPredictorTest.java b/io.openems.edge.predictor.similardaymodel/test/io/openems/edge/predictor/similardaymodel/SimilardayModelPredictorTest.java
index abdf8515b97..4db8c62aa42 100644
--- a/io.openems.edge.predictor.similardaymodel/test/io/openems/edge/predictor/similardaymodel/SimilardayModelPredictorTest.java
+++ b/io.openems.edge.predictor.similardaymodel/test/io/openems/edge/predictor/similardaymodel/SimilardayModelPredictorTest.java
@@ -7,12 +7,13 @@
 import java.time.ZoneOffset;
 import java.time.ZonedDateTime;
 import java.util.Arrays;
+
 import org.junit.Test;
+
 import io.openems.common.types.ChannelAddress;
 import io.openems.edge.common.test.ComponentTest;
 import io.openems.edge.common.test.DummyComponentManager;
 import io.openems.edge.common.test.TimeLeapClock;
-import io.openems.edge.predictor.api.oneday.Prediction24Hours;
 import io.openems.edge.timedata.test.DummyTimedata;
 
 public class SimilardayModelPredictorTest {
@@ -25,20 +26,20 @@ public class SimilardayModelPredictorTest {
 	@Test
 	public void test() throws Exception {
 
-		final TimeLeapClock clock = new TimeLeapClock(
-				Instant.ofEpochSecond(1577836800) /* starts at 1. January 2020 00:00:00 */, ZoneOffset.UTC);
+		final var clock = new TimeLeapClock(Instant.ofEpochSecond(1577836800) /* starts at 1. January 2020 00:00:00 */,
+				ZoneOffset.UTC);
 
-		Integer[] values = Data.data;
-		Integer[] predictedValues = Data.predictedData;
+		var values = Data.data;
+		var predictedValues = Data.predictedData;
 
-		DummyTimedata timedata = new DummyTimedata(TIMEDATA_ID);
-		ZonedDateTime start = ZonedDateTime.of(2019, 12, 1, 0, 0, 0, 0, ZoneId.of("UTC"));
+		var timedata = new DummyTimedata(TIMEDATA_ID);
+		var start = ZonedDateTime.of(2019, 12, 1, 0, 0, 0, 0, ZoneId.of("UTC"));
 
-		for (int i = 0; i < values.length; i++) {
+		for (var i = 0; i < values.length; i++) {
 			timedata.add(start.plusMinutes(i * 15), METER1_ACTIVE_POWER, values[i]);
 		}
 
-		SimilarDayPredictorImpl sut = new SimilarDayPredictorImpl();
+		var sut = new SimilarDayPredictorImpl();
 
 		new ComponentTest(sut) //
 				.addReference("timedata", timedata) //
@@ -48,8 +49,8 @@ public void test() throws Exception {
 						.setNumOfWeeks(4) //
 						.setChannelAddresses(METER1_ACTIVE_POWER.toString()).build());
 
-		Prediction24Hours prediction = sut.get24HoursPrediction(METER1_ACTIVE_POWER);
-		Integer[] p = prediction.getValues();
+		var prediction = sut.get24HoursPrediction(METER1_ACTIVE_POWER);
+		var p = prediction.getValues();
 
 		assertEquals(predictedValues[0], p[0]);
 		assertEquals(predictedValues[48], p[48]);

From 9b263cdf00f7c1b85579c0f5d1fa5abf3deded04 Mon Sep 17 00:00:00 2001
From: Stefan Feilmeier <stefan.feilmeier@fenecon.de>
Date: Tue, 8 Mar 2022 16:11:56 +0100
Subject: [PATCH 81/96] Update io.openems.edge.pvinverter.*

---
 .../api/ManagedSymmetricPvInverter.java       | 12 +++--
 .../pvinverter/cluster/PvInverterCluster.java | 38 +++++++-------
 .../kaco/blueplanet/KacoBlueplanet.java       |  3 +-
 .../edge/pvinverter/sma/SmaPvInverter.java    |  3 +-
 .../solarlog/SetPvLimitHandler.java           |  3 +-
 .../edge/pvinverter/solarlog/SolarLog.java    |  1 +
 .../pvinverter/solarlog/SolarLogImpl.java     | 49 ++++++++++---------
 .../edge/pvinverter/solarlog/MyConfig.java    |  2 +-
 .../sunspec/AbstractSunSpecPvInverter.java    |  9 ++--
 .../pvinverter/sunspec/SetPvLimitHandler.java |  8 ++-
 .../pvinverter/sunspec/SunSpecPvInverter.java |  1 +
 11 files changed, 67 insertions(+), 62 deletions(-)

diff --git a/io.openems.edge.pvinverter.api/src/io/openems/edge/pvinverter/api/ManagedSymmetricPvInverter.java b/io.openems.edge.pvinverter.api/src/io/openems/edge/pvinverter/api/ManagedSymmetricPvInverter.java
index 1eba4e434dc..0fd9a800602 100644
--- a/io.openems.edge.pvinverter.api/src/io/openems/edge/pvinverter/api/ManagedSymmetricPvInverter.java
+++ b/io.openems.edge.pvinverter.api/src/io/openems/edge/pvinverter/api/ManagedSymmetricPvInverter.java
@@ -24,7 +24,7 @@ public enum ChannelId implements io.openems.edge.common.channel.ChannelId {
 		/**
 		 * Holds the maximum possible apparent power. This value is defined by the
 		 * inverter limitations.
-		 * 
+		 *
 		 * <ul>
 		 * <li>Interface: SymmetricPvInverter
 		 * <li>Type: Integer
@@ -37,7 +37,7 @@ public enum ChannelId implements io.openems.edge.common.channel.ChannelId {
 				.persistencePriority(PersistencePriority.MEDIUM)), //
 		/**
 		 * Read/Set Active Power Limit.
-		 * 
+		 *
 		 * <ul>
 		 * <li>Interface: PV-Inverter Symmetric
 		 * <li>Type: Integer
@@ -61,6 +61,7 @@ private ChannelId(Doc doc) {
 			this.doc = doc;
 		}
 
+		@Override
 		public Doc doc() {
 			return this.doc;
 		}
@@ -68,9 +69,10 @@ public Doc doc() {
 
 	/**
 	 * Gets the type of this Meter.
-	 * 
+	 *
 	 * @return the MeterType
 	 */
+	@Override
 	default MeterType getMeterType() {
 		return MeterType.PRODUCTION;
 	}
@@ -154,7 +156,7 @@ public default void _setActivePowerLimit(int value) {
 
 	/**
 	 * Sets the Active Power Limit in [W]. See {@link ChannelId#ACTIVE_POWER_LIMIT}.
-	 * 
+	 *
 	 * @return the Channel
 	 * @throws OpenemsNamedException on error
 	 */
@@ -164,7 +166,7 @@ public default void setActivePowerLimit(Integer value) throws OpenemsNamedExcept
 
 	/**
 	 * Sets the Active Power Limit in [W]. See {@link ChannelId#ACTIVE_POWER_LIMIT}.
-	 * 
+	 *
 	 * @return the Channel
 	 * @throws OpenemsNamedException on error
 	 */
diff --git a/io.openems.edge.pvinverter.cluster/src/io/openems/edge/pvinverter/cluster/PvInverterCluster.java b/io.openems.edge.pvinverter.cluster/src/io/openems/edge/pvinverter/cluster/PvInverterCluster.java
index 6960d577f32..59177886f43 100644
--- a/io.openems.edge.pvinverter.cluster/src/io/openems/edge/pvinverter/cluster/PvInverterCluster.java
+++ b/io.openems.edge.pvinverter.cluster/src/io/openems/edge/pvinverter/cluster/PvInverterCluster.java
@@ -5,7 +5,6 @@
 import java.util.List;
 import java.util.Map;
 import java.util.Map.Entry;
-import java.util.Optional;
 
 import org.osgi.service.component.ComponentContext;
 import org.osgi.service.component.annotations.Activate;
@@ -88,6 +87,7 @@ void activate(ComponentContext context, Config config) throws OpenemsException {
 		this.config = config;
 	}
 
+	@Override
 	@Deactivate
 	protected void deactivate() {
 		super.deactivate();
@@ -121,25 +121,25 @@ public void handleEvent(Event event) {
 
 	/**
 	 * Calculates the sum-value for each Channel.
-	 * 
+	 *
 	 * @throws OpenemsNamedException on error
 	 */
 	private void calculateChannelValues() throws OpenemsNamedException {
-		List<ManagedSymmetricPvInverter> pvInverters = this.getPvInverters();
+		var pvInverters = this.getPvInverters();
 
 		// SymmetricMeter
-		final CalculateAverage frequency = new CalculateAverage();
-		final CalculateIntegerSum minActivePower = new CalculateIntegerSum();
-		final CalculateIntegerSum maxActivePower = new CalculateIntegerSum();
-		final CalculateIntegerSum activePower = new CalculateIntegerSum();
-		final CalculateIntegerSum reactivePower = new CalculateIntegerSum();
-		final CalculateLongSum activeProductionEnergy = new CalculateLongSum();
-		final CalculateLongSum activeConsumptionEnergy = new CalculateLongSum();
-		final CalculateAverage voltage = new CalculateAverage();
-		final CalculateIntegerSum current = new CalculateIntegerSum();
+		final var frequency = new CalculateAverage();
+		final var minActivePower = new CalculateIntegerSum();
+		final var maxActivePower = new CalculateIntegerSum();
+		final var activePower = new CalculateIntegerSum();
+		final var reactivePower = new CalculateIntegerSum();
+		final var activeProductionEnergy = new CalculateLongSum();
+		final var activeConsumptionEnergy = new CalculateLongSum();
+		final var voltage = new CalculateAverage();
+		final var current = new CalculateIntegerSum();
 		// SymmetricPvInverter
-		final CalculateIntegerSum maxApparentPower = new CalculateIntegerSum();
-		final CalculateIntegerSum activePowerLimit = new CalculateIntegerSum();
+		final var maxApparentPower = new CalculateIntegerSum();
+		final var activePowerLimit = new CalculateIntegerSum();
 
 		for (ManagedSymmetricPvInverter pvInverter : pvInverters) {
 			// SymmetricMeter
@@ -173,14 +173,14 @@ private void calculateChannelValues() throws OpenemsNamedException {
 	}
 
 	private void distributePvLimit() throws OpenemsNamedException {
-		List<ManagedSymmetricPvInverter> pvInverters = this.getPvInverters();
+		var pvInverters = this.getPvInverters();
 
 		if (pvInverters.isEmpty()) {
 			// No PV inverters?
 			return;
 		}
 
-		Optional<Integer> activePowerLimitOpt = this.getActivePowerLimitChannel().getNextWriteValueAndReset();
+		var activePowerLimitOpt = this.getActivePowerLimitChannel().getNextWriteValueAndReset();
 		if (!activePowerLimitOpt.isPresent()) {
 			// no value given -> set all limits to undefined.
 			for (ManagedSymmetricPvInverter pvInverter : pvInverters) {
@@ -190,12 +190,12 @@ private void distributePvLimit() throws OpenemsNamedException {
 		}
 
 		int activePowerLimit = activePowerLimitOpt.get();
-		int averageActivePowerLimit = activePowerLimit / pvInverters.size();
+		var averageActivePowerLimit = activePowerLimit / pvInverters.size();
 		Map<ManagedSymmetricPvInverter, Integer> values = new HashMap<>();
-		int toBeDistributed = 0;
+		var toBeDistributed = 0;
 		for (ManagedSymmetricPvInverter pvInverter : pvInverters) {
 			int maxPower = pvInverter.getMaxApparentPower().getOrError();
-			int power = averageActivePowerLimit;
+			var power = averageActivePowerLimit;
 			if (maxPower < power) {
 				toBeDistributed += power - maxPower;
 				power = maxPower;
diff --git a/io.openems.edge.pvinverter.kaco.blueplanet/src/io/openems/edge/pvinverter/kaco/blueplanet/KacoBlueplanet.java b/io.openems.edge.pvinverter.kaco.blueplanet/src/io/openems/edge/pvinverter/kaco/blueplanet/KacoBlueplanet.java
index 701e6b92194..f03d319258f 100644
--- a/io.openems.edge.pvinverter.kaco.blueplanet/src/io/openems/edge/pvinverter/kaco/blueplanet/KacoBlueplanet.java
+++ b/io.openems.edge.pvinverter.kaco.blueplanet/src/io/openems/edge/pvinverter/kaco/blueplanet/KacoBlueplanet.java
@@ -85,6 +85,7 @@ public KacoBlueplanet() throws OpenemsException {
 		);
 	}
 
+	@Override
 	@Reference(policy = ReferencePolicy.STATIC, policyOption = ReferencePolicyOption.GREEDY, cardinality = ReferenceCardinality.MANDATORY)
 	protected void setModbus(BridgeModbus modbus) {
 		super.setModbus(modbus);
@@ -94,10 +95,10 @@ protected void setModbus(BridgeModbus modbus) {
 	void activate(ComponentContext context, Config config) throws OpenemsException {
 		if (super.activate(context, config.id(), config.alias(), config.enabled(), UNIT_ID, this.cm, "Modbus",
 				config.modbus_id(), READ_FROM_MODBUS_BLOCK)) {
-			return;
 		}
 	}
 
+	@Override
 	@Deactivate
 	protected void deactivate() {
 		super.deactivate();
diff --git a/io.openems.edge.pvinverter.sma/src/io/openems/edge/pvinverter/sma/SmaPvInverter.java b/io.openems.edge.pvinverter.sma/src/io/openems/edge/pvinverter/sma/SmaPvInverter.java
index 1ef395dccb1..102ac1182e9 100644
--- a/io.openems.edge.pvinverter.sma/src/io/openems/edge/pvinverter/sma/SmaPvInverter.java
+++ b/io.openems.edge.pvinverter.sma/src/io/openems/edge/pvinverter/sma/SmaPvInverter.java
@@ -86,6 +86,7 @@ public SmaPvInverter() throws OpenemsException {
 		);
 	}
 
+	@Override
 	@Reference(policy = ReferencePolicy.STATIC, policyOption = ReferencePolicyOption.GREEDY, cardinality = ReferenceCardinality.MANDATORY)
 	protected void setModbus(BridgeModbus modbus) {
 		super.setModbus(modbus);
@@ -95,10 +96,10 @@ protected void setModbus(BridgeModbus modbus) {
 	void activate(ComponentContext context, Config config) throws OpenemsException {
 		if (super.activate(context, config.id(), config.alias(), config.enabled(), config.modbusUnitId(), this.cm,
 				"Modbus", config.modbus_id(), READ_FROM_MODBUS_BLOCK)) {
-			return;
 		}
 	}
 
+	@Override
 	@Deactivate
 	protected void deactivate() {
 		super.deactivate();
diff --git a/io.openems.edge.pvinverter.solarlog/src/io/openems/edge/pvinverter/solarlog/SetPvLimitHandler.java b/io.openems.edge.pvinverter.solarlog/src/io/openems/edge/pvinverter/solarlog/SetPvLimitHandler.java
index c6ed8e0ce82..fd0870a499f 100644
--- a/io.openems.edge.pvinverter.solarlog/src/io/openems/edge/pvinverter/solarlog/SetPvLimitHandler.java
+++ b/io.openems.edge.pvinverter.solarlog/src/io/openems/edge/pvinverter/solarlog/SetPvLimitHandler.java
@@ -2,7 +2,6 @@
 
 import java.time.LocalDateTime;
 import java.util.Objects;
-import java.util.Optional;
 
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -31,7 +30,7 @@ public SetPvLimitHandler(SolarLogImpl parent, ManagedSymmetricPvInverter.Channel
 	@Override
 	public void run() throws OpenemsNamedException {
 		IntegerWriteChannel channel = this.parent.channel(this.channelId);
-		Optional<Integer> powerOpt = channel.getNextWriteValueAndReset();
+		var powerOpt = channel.getNextWriteValueAndReset();
 
 		int pLimitPerc;
 		int power;
diff --git a/io.openems.edge.pvinverter.solarlog/src/io/openems/edge/pvinverter/solarlog/SolarLog.java b/io.openems.edge.pvinverter.solarlog/src/io/openems/edge/pvinverter/solarlog/SolarLog.java
index 06c15b9ba11..309b5eb3036 100644
--- a/io.openems.edge.pvinverter.solarlog/src/io/openems/edge/pvinverter/solarlog/SolarLog.java
+++ b/io.openems.edge.pvinverter.solarlog/src/io/openems/edge/pvinverter/solarlog/SolarLog.java
@@ -64,6 +64,7 @@ private ChannelId(Doc doc) {
 			this.doc = doc;
 		}
 
+		@Override
 		public Doc doc() {
 			return this.doc;
 		}
diff --git a/io.openems.edge.pvinverter.solarlog/src/io/openems/edge/pvinverter/solarlog/SolarLogImpl.java b/io.openems.edge.pvinverter.solarlog/src/io/openems/edge/pvinverter/solarlog/SolarLogImpl.java
index 5b5cb529952..f2dc8c6c245 100644
--- a/io.openems.edge.pvinverter.solarlog/src/io/openems/edge/pvinverter/solarlog/SolarLogImpl.java
+++ b/io.openems.edge.pvinverter.solarlog/src/io/openems/edge/pvinverter/solarlog/SolarLogImpl.java
@@ -72,6 +72,7 @@ public SolarLogImpl() {
 		);
 	}
 
+	@Override
 	@Reference(policy = ReferencePolicy.STATIC, policyOption = ReferencePolicyOption.GREEDY, cardinality = ReferenceCardinality.MANDATORY)
 	protected void setModbus(BridgeModbus modbus) {
 		super.setModbus(modbus);
@@ -88,10 +89,10 @@ void activate(ComponentContext context, Config config) throws OpenemsException {
 
 		// Stop if component is disabled
 		if (!config.enabled()) {
-			return;
 		}
 	}
 
+	@Override
 	@Deactivate
 	protected void deactivate() {
 		super.deactivate();
@@ -101,53 +102,53 @@ protected void deactivate() {
 	protected ModbusProtocol defineModbusProtocol() throws OpenemsException {
 		return new ModbusProtocol(this, //
 				new FC4ReadInputRegistersTask(3500, Priority.HIGH,
-						m(SolarLog.ChannelId.LAST_UPDATE_TIME,
+						this.m(SolarLog.ChannelId.LAST_UPDATE_TIME,
 								new SignedDoublewordElement(3500).wordOrder(WordOrder.LSWMSW)),
-						m(SymmetricMeter.ChannelId.ACTIVE_POWER,
+						this.m(SymmetricMeter.ChannelId.ACTIVE_POWER,
 								new SignedDoublewordElement(3502).wordOrder(WordOrder.LSWMSW)),
-						m(SolarLog.ChannelId.PDC, new SignedDoublewordElement(3504).wordOrder(WordOrder.LSWMSW)),
-						m(SymmetricMeter.ChannelId.VOLTAGE, new SignedWordElement(3506),
+						this.m(SolarLog.ChannelId.PDC, new SignedDoublewordElement(3504).wordOrder(WordOrder.LSWMSW)),
+						this.m(SymmetricMeter.ChannelId.VOLTAGE, new SignedWordElement(3506),
 								ElementToChannelConverter.SCALE_FACTOR_3),
-						m(SolarLog.ChannelId.UDC, new SignedWordElement(3507),
+						this.m(SolarLog.ChannelId.UDC, new SignedWordElement(3507),
 								ElementToChannelConverter.SCALE_FACTOR_2),
-						m(SymmetricMeter.ChannelId.ACTIVE_PRODUCTION_ENERGY,
+						this.m(SymmetricMeter.ChannelId.ACTIVE_PRODUCTION_ENERGY,
 								new SignedDoublewordElement(3508).wordOrder(WordOrder.LSWMSW)),
-						m(SolarLog.ChannelId.YESTERDAY_YIELD,
+						this.m(SolarLog.ChannelId.YESTERDAY_YIELD,
 								new SignedDoublewordElement(3510).wordOrder(WordOrder.LSWMSW)),
-						m(SolarLog.ChannelId.MONTHLY_YIELD,
+						this.m(SolarLog.ChannelId.MONTHLY_YIELD,
 								new SignedDoublewordElement(3512).wordOrder(WordOrder.LSWMSW)),
-						m(SolarLog.ChannelId.YEARLY_YIELD,
+						this.m(SolarLog.ChannelId.YEARLY_YIELD,
 								new SignedDoublewordElement(3514).wordOrder(WordOrder.LSWMSW)),
-						m(SolarLog.ChannelId.TOTAL_YIELD,
+						this.m(SolarLog.ChannelId.TOTAL_YIELD,
 								new SignedDoublewordElement(3516).wordOrder(WordOrder.LSWMSW)),
-						m(SolarLog.ChannelId.PAC_CONSUMPTION,
+						this.m(SolarLog.ChannelId.PAC_CONSUMPTION,
 								new SignedDoublewordElement(3518).wordOrder(WordOrder.LSWMSW)),
-						m(SymmetricMeter.ChannelId.ACTIVE_CONSUMPTION_ENERGY,
+						this.m(SymmetricMeter.ChannelId.ACTIVE_CONSUMPTION_ENERGY,
 								new SignedDoublewordElement(3520).wordOrder(WordOrder.LSWMSW)),
-						m(SolarLog.ChannelId.YESTERDAY_YIELD_CONS,
+						this.m(SolarLog.ChannelId.YESTERDAY_YIELD_CONS,
 								new SignedDoublewordElement(3522).wordOrder(WordOrder.LSWMSW)),
-						m(SolarLog.ChannelId.MONTHLY_YIELD_CONS,
+						this.m(SolarLog.ChannelId.MONTHLY_YIELD_CONS,
 								new SignedDoublewordElement(3524).wordOrder(WordOrder.LSWMSW)),
-						m(SolarLog.ChannelId.YEARLY_YIELD_CONS,
+						this.m(SolarLog.ChannelId.YEARLY_YIELD_CONS,
 								new SignedDoublewordElement(3526).wordOrder(WordOrder.LSWMSW)),
-						m(SolarLog.ChannelId.TOTAL_YIELD_CONS,
+						this.m(SolarLog.ChannelId.TOTAL_YIELD_CONS,
 								new SignedDoublewordElement(3528).wordOrder(WordOrder.LSWMSW)),
-						m(SolarLog.ChannelId.TOTAL_POWER,
+						this.m(SolarLog.ChannelId.TOTAL_POWER,
 								new SignedDoublewordElement(3530).wordOrder(WordOrder.LSWMSW))),
 
 				new FC16WriteRegistersTask(10400, //
-						m(SolarLog.ChannelId.P_LIMIT_TYPE, new UnsignedWordElement(10400)),
-						m(SolarLog.ChannelId.P_LIMIT_PERC, new UnsignedWordElement(10401),
+						this.m(SolarLog.ChannelId.P_LIMIT_TYPE, new UnsignedWordElement(10400)),
+						this.m(SolarLog.ChannelId.P_LIMIT_PERC, new UnsignedWordElement(10401),
 								new ChannelMetaInfoReadAndWrite(10901, 10401))),
 				new FC16WriteRegistersTask(10404,
-						m(SolarLog.ChannelId.WATCH_DOG_TAG,
+						this.m(SolarLog.ChannelId.WATCH_DOG_TAG,
 								new UnsignedDoublewordElement(10404).wordOrder(WordOrder.LSWMSW))),
 
 				new FC4ReadInputRegistersTask(10900, Priority.LOW, //
-						m(SolarLog.ChannelId.STATUS, new SignedWordElement(10900)), //
-						m(SolarLog.ChannelId.P_LIMIT_PERC, new SignedWordElement(10901),
+						this.m(SolarLog.ChannelId.STATUS, new SignedWordElement(10900)), //
+						this.m(SolarLog.ChannelId.P_LIMIT_PERC, new SignedWordElement(10901),
 								new ChannelMetaInfoReadAndWrite(10901, 10401)),
-						m(SolarLog.ChannelId.P_LIMIT, new SignedWordElement(10902))));
+						this.m(SolarLog.ChannelId.P_LIMIT, new SignedWordElement(10902))));
 	}
 
 	@Override
diff --git a/io.openems.edge.pvinverter.solarlog/test/io/openems/edge/pvinverter/solarlog/MyConfig.java b/io.openems.edge.pvinverter.solarlog/test/io/openems/edge/pvinverter/solarlog/MyConfig.java
index 8fefbf9dd7d..08af0069cfc 100644
--- a/io.openems.edge.pvinverter.solarlog/test/io/openems/edge/pvinverter/solarlog/MyConfig.java
+++ b/io.openems.edge.pvinverter.solarlog/test/io/openems/edge/pvinverter/solarlog/MyConfig.java
@@ -37,7 +37,7 @@ public MyConfig build() {
 
 	/**
 	 * Create a Config builder.
-	 * 
+	 *
 	 * @return a {@link Builder}
 	 */
 	public static Builder create() {
diff --git a/io.openems.edge.pvinverter.sunspec/src/io/openems/edge/pvinverter/sunspec/AbstractSunSpecPvInverter.java b/io.openems.edge.pvinverter.sunspec/src/io/openems/edge/pvinverter/sunspec/AbstractSunSpecPvInverter.java
index 3a30f7e2a39..9cc5d7e3e8f 100644
--- a/io.openems.edge.pvinverter.sunspec/src/io/openems/edge/pvinverter/sunspec/AbstractSunSpecPvInverter.java
+++ b/io.openems.edge.pvinverter.sunspec/src/io/openems/edge/pvinverter/sunspec/AbstractSunSpecPvInverter.java
@@ -41,7 +41,7 @@ public AbstractSunSpecPvInverter(Map<SunSpecModel, Priority> activeModels,
 
 	/**
 	 * Make sure to call this method from the inheriting OSGi Component.
-	 * 
+	 *
 	 * @throws OpenemsException on error
 	 */
 	@Override
@@ -55,6 +55,7 @@ protected boolean activate(ComponentContext context, String id, String alias, bo
 	/**
 	 * Make sure to call this method from the inheriting OSGi Component.
 	 */
+	@Override
 	@Deactivate
 	protected void deactivate() {
 		super.deactivate();
@@ -62,16 +63,16 @@ protected void deactivate() {
 
 	/**
 	 * Make sure to call this method from the inheriting OSGi Component.
-	 * 
+	 *
 	 * <p>
 	 * Requires:
-	 * 
+	 *
 	 * <pre>
 	 * property = { //
 	 *   EventConstants.EVENT_TOPIC + "=" + EdgeEventConstants.TOPIC_CYCLE_EXECUTE_WRITE //
 	 * }
 	 * </pre>
-	 * 
+	 *
 	 */
 	@Override
 	public void handleEvent(Event event) {
diff --git a/io.openems.edge.pvinverter.sunspec/src/io/openems/edge/pvinverter/sunspec/SetPvLimitHandler.java b/io.openems.edge.pvinverter.sunspec/src/io/openems/edge/pvinverter/sunspec/SetPvLimitHandler.java
index b6481c71728..5e660647f80 100644
--- a/io.openems.edge.pvinverter.sunspec/src/io/openems/edge/pvinverter/sunspec/SetPvLimitHandler.java
+++ b/io.openems.edge.pvinverter.sunspec/src/io/openems/edge/pvinverter/sunspec/SetPvLimitHandler.java
@@ -2,7 +2,6 @@
 
 import java.time.Duration;
 import java.time.Instant;
-import java.util.Optional;
 
 import io.openems.common.exceptions.OpenemsError.OpenemsNamedException;
 import io.openems.common.function.ThrowingRunnable;
@@ -32,7 +31,7 @@ public void run() throws OpenemsNamedException {
 		// Get ActivePowerLimit that should be applied
 		IntegerWriteChannel activePowerLimitChannel = this.parent
 				.channel(ManagedSymmetricPvInverter.ChannelId.ACTIVE_POWER_LIMIT);
-		Optional<Integer> activePowerLimitOpt = activePowerLimitChannel.getNextWriteValueAndReset();
+		var activePowerLimitOpt = activePowerLimitChannel.getNextWriteValueAndReset();
 
 		FloatWriteChannel wMaxLimPctChannel;
 		FloatReadChannel wRtgChannel;
@@ -53,10 +52,9 @@ public void run() throws OpenemsNamedException {
 			if (activePowerLimitOpt.isPresent()) {
 				// and power should be limited -> forward error
 				throw e;
-			} else {
-				// and no power limitation is required -> ignore error and exit
-				return;
 			}
+			// and no power limitation is required -> ignore error and exit
+			return;
 		}
 
 		float wMaxLimPct;
diff --git a/io.openems.edge.pvinverter.sunspec/src/io/openems/edge/pvinverter/sunspec/SunSpecPvInverter.java b/io.openems.edge.pvinverter.sunspec/src/io/openems/edge/pvinverter/sunspec/SunSpecPvInverter.java
index 184cea2216a..a4b6337dc63 100644
--- a/io.openems.edge.pvinverter.sunspec/src/io/openems/edge/pvinverter/sunspec/SunSpecPvInverter.java
+++ b/io.openems.edge.pvinverter.sunspec/src/io/openems/edge/pvinverter/sunspec/SunSpecPvInverter.java
@@ -15,6 +15,7 @@ private ChannelId(Doc doc) {
 			this.doc = doc;
 		}
 
+		@Override
 		public Doc doc() {
 			return this.doc;
 		}

From afb331e26a5555987f08e8196d732d8cf286ec3a Mon Sep 17 00:00:00 2001
From: Stefan Feilmeier <stefan.feilmeier@fenecon.de>
Date: Tue, 8 Mar 2022 16:14:11 +0100
Subject: [PATCH 82/96] Update io.openems.edge.scheduler.*

---
 .../AllAlphabeticallySchedulerImpl.java           |  6 ++++--
 .../scheduler/allalphabetically/MyConfig.java     |  2 +-
 .../io/openems/edge/scheduler/api/Scheduler.java  | 10 +++++-----
 .../edge/scheduler/daily/DailySchedulerImpl.java  | 15 +++++++--------
 .../scheduler/daily/DailySchedulerImplTest.java   |  2 +-
 .../io/openems/edge/scheduler/daily/MyConfig.java |  2 +-
 .../fixedorder/FixedOrderSchedulerImpl.java       |  3 ++-
 .../fixedorder/FixedOrderSchedulerImplTest.java   |  2 +-
 .../edge/scheduler/fixedorder/MyConfig.java       |  2 +-
 9 files changed, 23 insertions(+), 21 deletions(-)

diff --git a/io.openems.edge.scheduler.allalphabetically/src/io/openems/edge/scheduler/allalphabetically/AllAlphabeticallySchedulerImpl.java b/io.openems.edge.scheduler.allalphabetically/src/io/openems/edge/scheduler/allalphabetically/AllAlphabeticallySchedulerImpl.java
index e3891202075..b2e61b75dad 100644
--- a/io.openems.edge.scheduler.allalphabetically/src/io/openems/edge/scheduler/allalphabetically/AllAlphabeticallySchedulerImpl.java
+++ b/io.openems.edge.scheduler.allalphabetically/src/io/openems/edge/scheduler/allalphabetically/AllAlphabeticallySchedulerImpl.java
@@ -1,5 +1,6 @@
 package io.openems.edge.scheduler.allalphabetically;
 
+import java.util.Comparator;
 import java.util.LinkedHashSet;
 
 import org.osgi.service.component.ComponentContext;
@@ -39,6 +40,7 @@ void activate(ComponentContext context, Config config) {
 		this.config = config;
 	}
 
+	@Override
 	@Deactivate
 	protected void deactivate() {
 		super.deactivate();
@@ -54,7 +56,7 @@ public AllAlphabeticallySchedulerImpl() {
 
 	@Override
 	public LinkedHashSet<String> getControllers() {
-		LinkedHashSet<String> result = new LinkedHashSet<>();
+		var result = new LinkedHashSet<String>();
 
 		// add sorted controllers
 		for (String id : this.config.controllers_ids()) {
@@ -67,7 +69,7 @@ public LinkedHashSet<String> getControllers() {
 		// add remaining controllers
 		this.componentManager.getEnabledComponents().stream() //
 				.filter(c -> c instanceof Controller) //
-				.sorted((c1, c2) -> c1.id().compareTo(c2.id())) //
+				.sorted(Comparator.comparing(OpenemsComponent::id)) //
 				.forEach(c -> result.add(c.id()));
 
 		return result;
diff --git a/io.openems.edge.scheduler.allalphabetically/test/io/openems/edge/scheduler/allalphabetically/MyConfig.java b/io.openems.edge.scheduler.allalphabetically/test/io/openems/edge/scheduler/allalphabetically/MyConfig.java
index aad7630c572..b4926ee3abd 100644
--- a/io.openems.edge.scheduler.allalphabetically/test/io/openems/edge/scheduler/allalphabetically/MyConfig.java
+++ b/io.openems.edge.scheduler.allalphabetically/test/io/openems/edge/scheduler/allalphabetically/MyConfig.java
@@ -29,7 +29,7 @@ public MyConfig build() {
 
 	/**
 	 * Create a Config builder.
-	 * 
+	 *
 	 * @return a {@link Builder}
 	 */
 	public static Builder create() {
diff --git a/io.openems.edge.scheduler.api/src/io/openems/edge/scheduler/api/Scheduler.java b/io.openems.edge.scheduler.api/src/io/openems/edge/scheduler/api/Scheduler.java
index bd80cb1fe87..c4a49cb9981 100644
--- a/io.openems.edge.scheduler.api/src/io/openems/edge/scheduler/api/Scheduler.java
+++ b/io.openems.edge.scheduler.api/src/io/openems/edge/scheduler/api/Scheduler.java
@@ -33,7 +33,7 @@ public Doc doc() {
 
 	/**
 	 * Gets the Channel for {@link ChannelId#CONTROLLER_IS_MISSING}.
-	 * 
+	 *
 	 * @return the Channel
 	 */
 	public default StateChannel getControllerIsMissingChannel() {
@@ -42,7 +42,7 @@ public default StateChannel getControllerIsMissingChannel() {
 
 	/**
 	 * Gets the Run-Failed State. See {@link ChannelId#CONTROLLER_IS_MISSING}.
-	 * 
+	 *
 	 * @return the Channel {@link Value}
 	 */
 	public default Value<Boolean> getControllerIsMissing() {
@@ -52,7 +52,7 @@ public default Value<Boolean> getControllerIsMissing() {
 	/**
 	 * Internal method to set the 'nextValue' on
 	 * {@link ChannelId#CONTROLLER_IS_MISSING} Channel.
-	 * 
+	 *
 	 * @param value the next value
 	 */
 	public default void _setControllerIsMissing(boolean value) {
@@ -62,11 +62,11 @@ public default void _setControllerIsMissing(boolean value) {
 	/**
 	 * Returns Component-IDs of Controllers ordered by their current execution
 	 * priority.
-	 * 
+	 *
 	 * <p>
 	 * This method is called once every Cycle, i.e. once per second. The
 	 * {@link LinkedHashSet} is used, as it preserves insertion order
-	 * 
+	 *
 	 * @return a ordered set of Component-IDs of Controllers
 	 */
 	public LinkedHashSet<String> getControllers();
diff --git a/io.openems.edge.scheduler.daily/src/io/openems/edge/scheduler/daily/DailySchedulerImpl.java b/io.openems.edge.scheduler.daily/src/io/openems/edge/scheduler/daily/DailySchedulerImpl.java
index 3f4295a85f6..6b26d630971 100644
--- a/io.openems.edge.scheduler.daily/src/io/openems/edge/scheduler/daily/DailySchedulerImpl.java
+++ b/io.openems.edge.scheduler.daily/src/io/openems/edge/scheduler/daily/DailySchedulerImpl.java
@@ -2,7 +2,6 @@
 
 import java.time.LocalTime;
 import java.util.LinkedHashSet;
-import java.util.Map.Entry;
 import java.util.TreeMap;
 
 import org.osgi.service.component.ComponentContext;
@@ -58,16 +57,16 @@ void activate(ComponentContext context, Config config) throws OpenemsNamedExcept
 
 	/**
 	 * Updates the internal "controllerSchedule" map.
-	 * 
+	 *
 	 * @param schedule the configured schedule as {@link JsonArray}
 	 * @throws OpenemsNamedException on error
 	 */
 	private void updateControllerSchedule(JsonArray schedule) throws OpenemsNamedException {
 		this.controllerSchedule.clear();
 		for (JsonElement period : schedule) {
-			LocalTime time = LocalTime.parse(JsonUtils.getAsString(period, "time"));
-			JsonArray jControllerIds = JsonUtils.getAsJsonArray(period, "controllers");
-			LinkedHashSet<String> controllerIds = new LinkedHashSet<String>();
+			var time = LocalTime.parse(JsonUtils.getAsString(period, "time"));
+			var jControllerIds = JsonUtils.getAsJsonArray(period, "controllers");
+			var controllerIds = new LinkedHashSet<String>();
 			for (JsonElement controllerId : jControllerIds) {
 				controllerIds.add(JsonUtils.getAsString(controllerId));
 			}
@@ -77,7 +76,7 @@ private void updateControllerSchedule(JsonArray schedule) throws OpenemsNamedExc
 
 	@Override
 	public LinkedHashSet<String> getControllers() {
-		LinkedHashSet<String> result = new LinkedHashSet<>();
+		var result = new LinkedHashSet<String>();
 
 		// add "Always Run Before" Controllers
 		for (String controllerId : this.config.alwaysRunBeforeController_ids()) {
@@ -85,8 +84,7 @@ public LinkedHashSet<String> getControllers() {
 		}
 
 		// add "Daily Schedule" Controllers
-		Entry<LocalTime, LinkedHashSet<String>> scheduledIds = this.controllerSchedule
-				.lowerEntry(LocalTime.now(this.componentManager.getClock()));
+		var scheduledIds = this.controllerSchedule.lowerEntry(LocalTime.now(this.componentManager.getClock()));
 		if (scheduledIds == null) {
 			// No entry found -> take the one with highest time, i.e. the one before
 			// midnight.
@@ -114,6 +112,7 @@ private void addControllerById(LinkedHashSet<String> result, String controllerId
 		result.add(controllerId);
 	}
 
+	@Override
 	@Deactivate
 	protected void deactivate() {
 		super.deactivate();
diff --git a/io.openems.edge.scheduler.daily/test/io/openems/edge/scheduler/daily/DailySchedulerImplTest.java b/io.openems.edge.scheduler.daily/test/io/openems/edge/scheduler/daily/DailySchedulerImplTest.java
index a504b4f0668..0995c3b7de7 100644
--- a/io.openems.edge.scheduler.daily/test/io/openems/edge/scheduler/daily/DailySchedulerImplTest.java
+++ b/io.openems.edge.scheduler.daily/test/io/openems/edge/scheduler/daily/DailySchedulerImplTest.java
@@ -32,7 +32,7 @@ public class DailySchedulerImplTest {
 
 	@Test
 	public void test() throws Exception {
-		final TimeLeapClock clock = new TimeLeapClock(Instant.parse("2020-01-01T00:00:00.00Z"), ZoneOffset.UTC);
+		final var clock = new TimeLeapClock(Instant.parse("2020-01-01T00:00:00.00Z"), ZoneOffset.UTC);
 		final DailyScheduler sut = new DailySchedulerImpl();
 		new ComponentTest(sut) //
 				.addReference("componentManager", new DummyComponentManager(clock)) //
diff --git a/io.openems.edge.scheduler.daily/test/io/openems/edge/scheduler/daily/MyConfig.java b/io.openems.edge.scheduler.daily/test/io/openems/edge/scheduler/daily/MyConfig.java
index b26ab0d774c..454aa39980d 100644
--- a/io.openems.edge.scheduler.daily/test/io/openems/edge/scheduler/daily/MyConfig.java
+++ b/io.openems.edge.scheduler.daily/test/io/openems/edge/scheduler/daily/MyConfig.java
@@ -41,7 +41,7 @@ public MyConfig build() {
 
 	/**
 	 * Create a Config builder.
-	 * 
+	 *
 	 * @return a {@link Builder}
 	 */
 	public static Builder create() {
diff --git a/io.openems.edge.scheduler.fixedorder/src/io/openems/edge/scheduler/fixedorder/FixedOrderSchedulerImpl.java b/io.openems.edge.scheduler.fixedorder/src/io/openems/edge/scheduler/fixedorder/FixedOrderSchedulerImpl.java
index 3aa33fddd1c..60750f0eb8e 100644
--- a/io.openems.edge.scheduler.fixedorder/src/io/openems/edge/scheduler/fixedorder/FixedOrderSchedulerImpl.java
+++ b/io.openems.edge.scheduler.fixedorder/src/io/openems/edge/scheduler/fixedorder/FixedOrderSchedulerImpl.java
@@ -26,7 +26,7 @@
 )
 public class FixedOrderSchedulerImpl extends AbstractOpenemsComponent implements FixedOrderScheduler, Scheduler {
 
-	private LinkedHashSet<String> controllerIds = new LinkedHashSet<>();
+	private final LinkedHashSet<String> controllerIds = new LinkedHashSet<>();
 
 	public FixedOrderSchedulerImpl() {
 		super(//
@@ -58,6 +58,7 @@ private synchronized void applyConfig(Config config) {
 		}
 	}
 
+	@Override
 	@Deactivate
 	protected void deactivate() {
 		super.deactivate();
diff --git a/io.openems.edge.scheduler.fixedorder/test/io/openems/edge/scheduler/fixedorder/FixedOrderSchedulerImplTest.java b/io.openems.edge.scheduler.fixedorder/test/io/openems/edge/scheduler/fixedorder/FixedOrderSchedulerImplTest.java
index 1046aa4a199..ace2118cdce 100644
--- a/io.openems.edge.scheduler.fixedorder/test/io/openems/edge/scheduler/fixedorder/FixedOrderSchedulerImplTest.java
+++ b/io.openems.edge.scheduler.fixedorder/test/io/openems/edge/scheduler/fixedorder/FixedOrderSchedulerImplTest.java
@@ -27,7 +27,7 @@ public class FixedOrderSchedulerImplTest {
 	@Test
 	public void test() throws Exception {
 		final FixedOrderScheduler sut = new FixedOrderSchedulerImpl();
-		ComponentTest test = new ComponentTest(sut) //
+		var test = new ComponentTest(sut) //
 				.addComponent(new DummyController(CTRL0_ID)) //
 				.addComponent(new DummyController(CTRL1_ID)) //
 				.addComponent(new DummyController(CTRL2_ID)) //
diff --git a/io.openems.edge.scheduler.fixedorder/test/io/openems/edge/scheduler/fixedorder/MyConfig.java b/io.openems.edge.scheduler.fixedorder/test/io/openems/edge/scheduler/fixedorder/MyConfig.java
index 2a286a0e797..b57b074ee14 100644
--- a/io.openems.edge.scheduler.fixedorder/test/io/openems/edge/scheduler/fixedorder/MyConfig.java
+++ b/io.openems.edge.scheduler.fixedorder/test/io/openems/edge/scheduler/fixedorder/MyConfig.java
@@ -29,7 +29,7 @@ public MyConfig build() {
 
 	/**
 	 * Create a Config builder.
-	 * 
+	 *
 	 * @return a {@link Builder}
 	 */
 	public static Builder create() {

From 7efd42c0ca6781f4fa26e1bced9412db19b4a183 Mon Sep 17 00:00:00 2001
From: Stefan Feilmeier <stefan.feilmeier@fenecon.de>
Date: Tue, 8 Mar 2022 16:19:14 +0100
Subject: [PATCH 83/96] Update io.openems.edge.simulator

---
 .../io/openems/edge/simulator/CsvUtils.java   |  34 ++---
 .../openems/edge/simulator/DataContainer.java |  21 ++-
 .../app/ExecuteSimulationRequest.java         |  28 ++--
 .../app/ExecuteSimulationResponse.java        |  16 +--
 .../edge/simulator/app/SimulatorApp.java      | 127 +++++++++---------
 .../edge/simulator/battery/Config.java        |   2 +-
 .../datasource/api/AbstractCsvDatasource.java |   5 +-
 .../datasource/api/SimulatorDatasource.java   |   6 +-
 .../single/direct/SingleDatasourceDirect.java |   2 +-
 .../asymmetric/reacting/EssAsymmetric.java    |  12 +-
 .../singlephase/reacting/EssSinglePhase.java  |   8 +-
 .../ess/symmetric/reacting/EssSymmetric.java  |  16 ++-
 .../simulator/evcs/AsymmetricMeterEvcs.java   |  21 +--
 .../edge/simulator/evcs/SimulatedEvcs.java    |  16 +--
 .../edge/simulator/io/DigitalInputOutput.java |  19 ++-
 .../meter/grid/acting/GridMeter.java          |   8 +-
 .../meter/grid/reacting/GridMeter.java        |  14 +-
 .../simulator/meter/nrc/acting/NrcMeter.java  |   7 +-
 .../production/acting/ProductionMeter.java    |   6 +-
 .../simulator/modbus/ModbusSimulator.java     |   2 +
 .../edge/simulator/pvinverter/PvInverter.java |   7 +-
 .../thermometer/SimulatedThermometer.java     |   1 +
 .../simulator/timedata/SimulatorTimedata.java |  19 +--
 .../symmetric/reacting/EssSymmetricTest.java  |   4 +-
 .../ess/symmetric/reacting/MyConfig.java      |   2 +-
 25 files changed, 207 insertions(+), 196 deletions(-)

diff --git a/io.openems.edge.simulator/src/io/openems/edge/simulator/CsvUtils.java b/io.openems.edge.simulator/src/io/openems/edge/simulator/CsvUtils.java
index df6b6119bd9..ba6d963ac3e 100644
--- a/io.openems.edge.simulator/src/io/openems/edge/simulator/CsvUtils.java
+++ b/io.openems.edge.simulator/src/io/openems/edge/simulator/CsvUtils.java
@@ -10,7 +10,7 @@ public class CsvUtils {
 
 	/**
 	 * Reads a CSV file from a JAR file.
-	 * 
+	 *
 	 * @param clazz     a class in the same java package as the file
 	 * @param filename  the name of the file in the java package
 	 * @param csvFormat the CSV-Format
@@ -20,10 +20,10 @@ public class CsvUtils {
 	 */
 	public static DataContainer readCsvFileFromResource(Class<?> clazz, String filename, CsvFormat csvFormat,
 			float factor) throws NumberFormatException, IOException {
-		DataContainer result = new DataContainer();
-		boolean isTitleLine = true;
+		var result = new DataContainer();
+		var isTitleLine = true;
 		String line = null;
-		try (BufferedReader br = new BufferedReader(new InputStreamReader(clazz.getResourceAsStream(filename)))) {
+		try (var br = new BufferedReader(new InputStreamReader(clazz.getResourceAsStream(filename)))) {
 			while ((line = br.readLine()) != null) {
 				if (isTitleLine) {
 					// read titles
@@ -40,7 +40,7 @@ public static DataContainer readCsvFileFromResource(Class<?> clazz, String filen
 
 	/**
 	 * Reads a CSV file.
-	 * 
+	 *
 	 * @param path      the path + filename of the CSV file
 	 * @param csvFormat the CSV-Format
 	 * @param factor    a multiplication factor to apply on the read number
@@ -49,10 +49,10 @@ public static DataContainer readCsvFileFromResource(Class<?> clazz, String filen
 	 */
 	public static DataContainer readCsvFile(File path, CsvFormat csvFormat, float factor)
 			throws NumberFormatException, IOException {
-		DataContainer result = new DataContainer();
-		boolean isTitleLine = true;
+		var result = new DataContainer();
+		var isTitleLine = true;
 		String line = null;
-		try (BufferedReader br = new BufferedReader(new FileReader(path))) {
+		try (var br = new BufferedReader(new FileReader(path))) {
 			while ((line = br.readLine()) != null) {
 				if (isTitleLine) {
 					// read titles
@@ -69,7 +69,7 @@ public static DataContainer readCsvFile(File path, CsvFormat csvFormat, float fa
 
 	/**
 	 * Reads a CSV file.
-	 * 
+	 *
 	 * @param csv       the CSV content
 	 * @param csvFormat the CSV-Format
 	 * @param factor    a multiplication factor to apply on the read number
@@ -78,9 +78,9 @@ public static DataContainer readCsvFile(File path, CsvFormat csvFormat, float fa
 	 */
 	public static DataContainer parseCsv(String csv, CsvFormat csvFormat, float factor)
 			throws NumberFormatException, IOException {
-		DataContainer result = new DataContainer();
-		boolean isTitleLine = true;
-		String[] lines = csv.split("\\r?\\n");
+		var result = new DataContainer();
+		var isTitleLine = true;
+		var lines = csv.split("\\r?\\n");
 		for (String line : lines) {
 			if (isTitleLine) {
 				isTitleLine = false;
@@ -101,10 +101,10 @@ private static void readTitles(DataContainer result, CsvFormat csvFormat, String
 	}
 
 	private static void readRecord(DataContainer result, CsvFormat csvFormat, float factor, String line) {
-		String[] values = line.split(csvFormat.lineSeparator);
-		Float[] floatValues = new Float[values.length];
-		for (int i = 0; i < values.length; i++) {
-			String value = values[i];
+		var values = line.split(csvFormat.lineSeparator);
+		var floatValues = new Float[values.length];
+		for (var i = 0; i < values.length; i++) {
+			var value = values[i];
 			if (value == null || value.isEmpty()) {
 				value = null;
 			} else {
@@ -119,7 +119,7 @@ private static void readRecord(DataContainer result, CsvFormat csvFormat, float
 
 	/**
 	 * Returns true if the given value is a number.
-	 * 
+	 *
 	 * @param strNum a value to be evaluated
 	 * @return true for numbers
 	 */
diff --git a/io.openems.edge.simulator/src/io/openems/edge/simulator/DataContainer.java b/io.openems.edge.simulator/src/io/openems/edge/simulator/DataContainer.java
index 643c320bea0..b0bf32fbe4c 100644
--- a/io.openems.edge.simulator/src/io/openems/edge/simulator/DataContainer.java
+++ b/io.openems.edge.simulator/src/io/openems/edge/simulator/DataContainer.java
@@ -8,13 +8,13 @@
 
 public class DataContainer {
 
-	private HashMap<String, Integer> keys = new HashMap<>();
-	private List<Float[]> records = new ArrayList<>();
+	private final HashMap<String, Integer> keys = new HashMap<>();
+	private final List<Float[]> records = new ArrayList<>();
 	private int currentIndex = -1;
 
 	/**
 	 * Gets the available keys.
-	 * 
+	 *
 	 * @return the Channel-Id
 	 */
 	public Set<String> getKeys() {
@@ -23,18 +23,18 @@ public Set<String> getKeys() {
 
 	/**
 	 * Sets the keys.
-	 * 
+	 *
 	 * @param keys the Channel-Id
 	 */
 	public void setKeys(String[] keys) {
-		for (int i = 0; i < keys.length; i++) {
+		for (var i = 0; i < keys.length; i++) {
 			this.keys.put(keys[i], i);
 		}
 	}
 
 	/**
 	 * Adds a Record to the end.
-	 * 
+	 *
 	 * @param record the record values
 	 */
 	public void addRecord(Float[] record) {
@@ -43,7 +43,7 @@ public void addRecord(Float[] record) {
 
 	/**
 	 * Gets the current record.
-	 * 
+	 *
 	 * @return the current record
 	 */
 	public Float[] getCurrentRecord() {
@@ -56,7 +56,7 @@ public Float[] getCurrentRecord() {
 	/**
 	 * Gets the value for the key from the current record. If no keys exist, get the
 	 * first value of the record.
-	 * 
+	 *
 	 * @param key the Channel-Id
 	 * @return the record value
 	 */
@@ -72,12 +72,11 @@ public Optional<Float> getValue(String key) {
 				return Optional.empty();
 			}
 		}
-		Float[] record = this.getCurrentRecord();
+		var record = this.getCurrentRecord();
 		if (index < record.length) {
 			return Optional.ofNullable(record[index]);
-		} else {
-			return Optional.empty();
 		}
+		return Optional.empty();
 	}
 
 	/**
diff --git a/io.openems.edge.simulator/src/io/openems/edge/simulator/app/ExecuteSimulationRequest.java b/io.openems.edge.simulator/src/io/openems/edge/simulator/app/ExecuteSimulationRequest.java
index 5323f526358..af565457ee9 100644
--- a/io.openems.edge.simulator/src/io/openems/edge/simulator/app/ExecuteSimulationRequest.java
+++ b/io.openems.edge.simulator/src/io/openems/edge/simulator/app/ExecuteSimulationRequest.java
@@ -20,7 +20,7 @@
 
 /**
  * Executes a simulation.
- * 
+ *
  * <pre>
  * {
  *   "jsonrpc": "2.0",
@@ -32,7 +32,7 @@
  *     	   "factoryPid": string,
  *         "properties": [{
  *           "name": string,
- *           "value": any 
+ *           "value": any
  *         }]
  *       },
  *       "clock": {
@@ -60,15 +60,15 @@ public static class Clock {
 
 		/**
 		 * Create {@link Clock} from {@link JsonObject}.
-		 * 
+		 *
 		 * @param j the {@link JsonObject}
 		 * @return the {@link Clock}
 		 * @throws OpenemsNamedException on parse error
 		 */
 		public static Clock from(JsonObject j) throws OpenemsNamedException {
-			ZonedDateTime start = ZonedDateTime.parse(JsonUtils.getAsString(j, "start"));
-			ZonedDateTime end = ZonedDateTime.parse(JsonUtils.getAsString(j, "end"));
-			int timeleapPerCycle = JsonUtils.getAsInt(j, "timeleapPerCycle");
+			var start = ZonedDateTime.parse(JsonUtils.getAsString(j, "start"));
+			var end = ZonedDateTime.parse(JsonUtils.getAsString(j, "end"));
+			var timeleapPerCycle = JsonUtils.getAsInt(j, "timeleapPerCycle");
 			boolean executeCycleTwice = JsonUtils.getAsOptionalBoolean(j, "executeCycleTwice").orElse(false);
 			return new Clock(start, end, timeleapPerCycle, executeCycleTwice);
 		}
@@ -90,7 +90,7 @@ public static class Profile {
 
 		/**
 		 * Create {@link Profile} from {@link JsonArray}.
-		 * 
+		 *
 		 * @param j the {@link JsonArray}
 		 * @return the {@link Profile}
 		 * @throws OpenemsNamedException on parse error
@@ -115,7 +115,7 @@ private Profile(List<Integer> values) {
 
 		/**
 		 * Gets the currently active value of the {@link Profile}.
-		 * 
+		 *
 		 * @return the value
 		 */
 		public synchronized Integer getCurrentValue() {
@@ -137,26 +137,26 @@ public synchronized void selectNextValue() {
 	/**
 	 * Create {@link ExecuteSimulationRequest} from a template
 	 * {@link JsonrpcRequest}.
-	 * 
+	 *
 	 * @param r the template {@link JsonrpcRequest}
 	 * @return the {@link ExecuteSimulationRequest}
 	 * @throws OpenemsNamedException on parse error
 	 */
 	public static ExecuteSimulationRequest from(JsonrpcRequest r) throws OpenemsNamedException {
-		JsonObject p = r.getParams();
+		var p = r.getParams();
 		List<CreateComponentConfigRequest> components = new ArrayList<>();
-		JsonArray jComponents = JsonUtils.getAsJsonArray(p, "components");
+		var jComponents = JsonUtils.getAsJsonArray(p, "components");
 		for (JsonElement jComponent : jComponents) {
 			components.add(CreateComponentConfigRequest.from(JsonUtils.getAsJsonObject(jComponent)));
 		}
-		Clock clock = Clock.from(JsonUtils.getAsJsonObject(p, "clock"));
+		var clock = Clock.from(JsonUtils.getAsJsonObject(p, "clock"));
 		Map<String, Profile> profiles = new HashMap<>();
-		JsonObject jProfiles = JsonUtils.getAsJsonObject(p, "profiles");
+		var jProfiles = JsonUtils.getAsJsonObject(p, "profiles");
 		for (Entry<String, JsonElement> jProfile : jProfiles.entrySet()) {
 			profiles.put(jProfile.getKey(), Profile.from(JsonUtils.getAsJsonArray(jProfile.getValue())));
 		}
 		List<ChannelAddress> collects = new ArrayList<>();
-		JsonArray jCollects = JsonUtils.getAsJsonArray(p, "collect");
+		var jCollects = JsonUtils.getAsJsonArray(p, "collect");
 		for (JsonElement jCollect : jCollects) {
 			collects.add(ChannelAddress.fromString(JsonUtils.getAsString(jCollect)));
 		}
diff --git a/io.openems.edge.simulator/src/io/openems/edge/simulator/app/ExecuteSimulationResponse.java b/io.openems.edge.simulator/src/io/openems/edge/simulator/app/ExecuteSimulationResponse.java
index da54e91bec5..b8222a351c3 100644
--- a/io.openems.edge.simulator/src/io/openems/edge/simulator/app/ExecuteSimulationResponse.java
+++ b/io.openems.edge.simulator/src/io/openems/edge/simulator/app/ExecuteSimulationResponse.java
@@ -2,9 +2,9 @@
 
 import java.time.ZonedDateTime;
 import java.time.format.DateTimeFormatter;
+import java.util.Map.Entry;
 import java.util.SortedMap;
 import java.util.UUID;
-import java.util.Map.Entry;
 
 import com.google.gson.JsonArray;
 import com.google.gson.JsonElement;
@@ -15,7 +15,7 @@
 
 /**
  * Represents a JSON-RPC Response for 'executeSimulation'.
- * 
+ *
  * <pre>
  * {
  *   "jsonrpc": "2.0",
@@ -48,20 +48,20 @@ public ExecuteSimulationResponse(UUID id, SortedMap<ZonedDateTime, SortedMap<Cha
 
 	@Override
 	public JsonObject getResult() {
-		JsonObject result = new JsonObject();
+		var result = new JsonObject();
 
-		JsonArray timestamps = new JsonArray();
+		var timestamps = new JsonArray();
 		for (ZonedDateTime timestamp : this.data.keySet()) {
 			timestamps.add(timestamp.format(DateTimeFormatter.ISO_INSTANT));
 		}
 		result.add("timestamps", timestamps);
 
-		JsonObject data = new JsonObject();
+		var data = new JsonObject();
 		for (Entry<ZonedDateTime, SortedMap<ChannelAddress, JsonElement>> rowEntry : this.data.entrySet()) {
 			for (Entry<ChannelAddress, JsonElement> colEntry : rowEntry.getValue().entrySet()) {
-				String channelAddress = colEntry.getKey().toString();
-				JsonElement value = colEntry.getValue();
-				JsonElement channelValuesElement = data.get(channelAddress);
+				var channelAddress = colEntry.getKey().toString();
+				var value = colEntry.getValue();
+				var channelValuesElement = data.get(channelAddress);
 				JsonArray channelValues;
 				if (channelValuesElement != null) {
 					channelValues = channelValuesElement.getAsJsonArray();
diff --git a/io.openems.edge.simulator/src/io/openems/edge/simulator/app/SimulatorApp.java b/io.openems.edge.simulator/src/io/openems/edge/simulator/app/SimulatorApp.java
index 5cf79d523d1..b424f77e18e 100644
--- a/io.openems.edge.simulator/src/io/openems/edge/simulator/app/SimulatorApp.java
+++ b/io.openems.edge.simulator/src/io/openems/edge/simulator/app/SimulatorApp.java
@@ -20,7 +20,6 @@
 import java.util.concurrent.CompletableFuture;
 import java.util.stream.Collectors;
 
-import org.osgi.service.cm.Configuration;
 import org.osgi.service.cm.ConfigurationAdmin;
 import org.osgi.service.component.ComponentContext;
 import org.osgi.service.component.annotations.Activate;
@@ -106,7 +105,6 @@ private static class CurrentSimulation {
 
 		public CurrentSimulation(User user, ExecuteSimulationRequest request, TimeLeapClock clock,
 				CompletableFuture<ExecuteSimulationResponse> response) {
-			super();
 			this.user = user;
 			this.request = request;
 			this.clock = clock;
@@ -114,7 +112,7 @@ public CurrentSimulation(User user, ExecuteSimulationRequest request, TimeLeapCl
 		}
 
 		public void addData(ZonedDateTime timestamp, List<Channel<?>> channels) {
-			SortedMap<ChannelAddress, JsonElement> values = new TreeMap<ChannelAddress, JsonElement>();
+			SortedMap<ChannelAddress, JsonElement> values = new TreeMap<>();
 			for (Channel<?> channel : channels) {
 				values.put(channel.address(), channel.value().asJson());
 			}
@@ -134,6 +132,7 @@ private ChannelId(Doc doc) {
 			this.doc = doc;
 		}
 
+		@Override
 		public Doc doc() {
 			return this.doc;
 		}
@@ -150,10 +149,10 @@ public SimulatorApp() {
 	void activate(ComponentContext componentContext, Config config) throws OpenemsException {
 		super.activate(componentContext, SINGLETON_COMPONENT_ID, SINGLETON_SERVICE_PID, config.enabled());
 		if (OpenemsComponent.validateSingleton(this.cm, SINGLETON_SERVICE_PID, SINGLETON_COMPONENT_ID)) {
-			return;
 		}
 	}
 
+	@Override
 	@Deactivate
 	protected void deactivate() {
 		super.deactivate();
@@ -179,7 +178,7 @@ public CompletableFuture<? extends JsonrpcResponseSuccess> handleJsonrpcRequest(
 
 	/**
 	 * Handles a {@link ExecuteSimulationRequest}.
-	 * 
+	 *
 	 * @param user    the {@link User}
 	 * @param request the {@link ExecuteSimulationRequest}
 	 * @return the Future JSON-RPC Response
@@ -199,7 +198,7 @@ private synchronized CompletableFuture<ExecuteSimulationResponse> handleExecuteS
 				new CreateComponentConfigRequest("Ess.Power", Arrays.asList(new Property("enablePid", false))));
 
 		// Create Components
-		Set<String> simulatorComponentIds = new HashSet<String>();
+		Set<String> simulatorComponentIds = new HashSet<>();
 		for (CreateComponentConfigRequest createRequest : request.components) {
 			this.logInfo(this.log, "Create Component [" + createRequest.getComponentId() + "] from ["
 					+ createRequest.getFactoryPid() + "]");
@@ -211,10 +210,10 @@ private synchronized CompletableFuture<ExecuteSimulationResponse> handleExecuteS
 		this.logInfo(this.log, "All Simulator-Components are activated!");
 
 		// prepare response
-		CompletableFuture<ExecuteSimulationResponse> response = new CompletableFuture<ExecuteSimulationResponse>();
+		var response = new CompletableFuture<ExecuteSimulationResponse>();
 
 		// Configure Clock
-		TimeLeapClock timeLeapClock = new TimeLeapClock(//
+		var timeLeapClock = new TimeLeapClock(//
 				request.clock.start.toInstant(), ZoneId.systemDefault());
 
 		// keep simulation data for later use
@@ -244,12 +243,11 @@ public void handleEvent(Event event) {
 
 	@Override
 	public Clock getClock() {
-		CurrentSimulation currentSimulation = this.currentSimulation;
+		var currentSimulation = this.currentSimulation;
 		if (currentSimulation != null) {
 			return currentSimulation.clock;
-		} else {
-			return Clock.systemDefaultZone();
 		}
+		return Clock.systemDefaultZone();
 	}
 
 	private long lastLogMessage = 0;
@@ -258,7 +256,7 @@ public Clock getClock() {
 	 * Is executed on every Cycle After Write Event.
 	 */
 	private void simulateNextCycle() {
-		CurrentSimulation currentSimulation = this.currentSimulation;
+		var currentSimulation = this.currentSimulation;
 		if (currentSimulation == null) {
 			return;
 		}
@@ -266,7 +264,7 @@ private void simulateNextCycle() {
 		// Apply simulated Time-Leap per Cycle
 		this.applyTimeLeap(currentSimulation.clock, currentSimulation.request);
 
-		ZonedDateTime now = ZonedDateTime.now(currentSimulation.clock);
+		var now = ZonedDateTime.now(currentSimulation.clock);
 
 		if (System.currentTimeMillis() - MILLISECONDS_BETWEEN_LOGS > this.lastLogMessage) {
 			this.logInfo(this.log, "Simulating " + now.withZoneSameInstant(ZoneId.of("UTC")));
@@ -280,13 +278,13 @@ private void simulateNextCycle() {
 	}
 
 	private void collectData() {
-		CurrentSimulation currentSimulation = this.currentSimulation;
+		var currentSimulation = this.currentSimulation;
 		if (currentSimulation == null) {
 			return;
 		}
 
-		ZonedDateTime now = ZonedDateTime.now(currentSimulation.clock);
-		List<Channel<?>> channels = new ArrayList<Channel<?>>();
+		var now = ZonedDateTime.now(currentSimulation.clock);
+		List<Channel<?>> channels = new ArrayList<>();
 		for (ChannelAddress channelAddress : currentSimulation.request.collects) {
 			try {
 				channels.add(this.componentManager.getChannel(channelAddress));
@@ -299,7 +297,7 @@ private void collectData() {
 
 	/**
 	 * Apply simulated Time-Leap per Cycle.
-	 * 
+	 *
 	 * @param clock                    the {@link TimeLeapClock}
 	 * @param currentSimulationRequest the current {@link ExecuteSimulationRequest}
 	 */
@@ -328,7 +326,7 @@ private void applyTimeLeap(TimeLeapClock clock, ExecuteSimulationRequest current
 
 	/**
 	 * Delete all non-required Components.
-	 * 
+	 *
 	 * @param user the {@link User}
 	 * @throws OpenemsNamedException on error
 	 */
@@ -336,7 +334,7 @@ private void deleteAllConfigurations(User user) throws OpenemsNamedException {
 		Set<String> deletedComponents = new HashSet<>();
 		for (OpenemsComponent component : this.componentManager.getAllComponents()) {
 			deletedComponents.add(component.id());
-			String factoryPid = component.serviceFactoryPid();
+			var factoryPid = component.serviceFactoryPid();
 			if (factoryPid == null || factoryPid.trim().isEmpty()) {
 				continue;
 			}
@@ -364,7 +362,7 @@ private void deleteAllConfigurations(User user) throws OpenemsNamedException {
 	private void stopSimulation() {
 		this.logInfo(this.log, "Stopping Simulation");
 
-		CurrentSimulation currentSimulation = this.currentSimulation;
+		var currentSimulation = this.currentSimulation;
 		final User user;
 		if (currentSimulation != null) {
 			user = currentSimulation.user;
@@ -388,25 +386,25 @@ private void stopSimulation() {
 
 	/**
 	 * Deletes a Component configuration.
-	 * 
+	 *
 	 * @param user        the {@link User}
 	 * @param componentId the Component-ID
 	 * @throws OpenemsNamedException on error
 	 */
 	private void deleteComponent(User user, String componentId) throws OpenemsNamedException {
 		this.logInfo(this.log, "Delete Component [" + componentId + "]");
-		DeleteComponentConfigRequest deleteComponentConfigRequest = new DeleteComponentConfigRequest(componentId);
+		var deleteComponentConfigRequest = new DeleteComponentConfigRequest(componentId);
 		this.componentManager.handleJsonrpcRequest(user, deleteComponentConfigRequest);
 	}
 
 	/**
 	 * Sets the global OpenEMS Edge Cycle-Time.
-	 * 
+	 *
 	 * @param cycleTime the cycleTime in [ms]
 	 */
 	private void setCycleTime(int cycleTime) {
 		try {
-			Configuration config = this.configurationAdmin.getConfiguration("Core.Cycle", null);
+			var config = this.configurationAdmin.getConfiguration("Core.Cycle", null);
 			Dictionary<String, Object> properties = new Hashtable<>();
 			properties.put("cycleTime", cycleTime);
 			config.update(properties);
@@ -417,21 +415,20 @@ private void setCycleTime(int cycleTime) {
 
 	private void waitForComponentsToActivate(Set<String> simulatorComponentIds) throws OpenemsException {
 		// Wait for Components to appear
-		for (int i = 0; i < 100; i++) {
-			Set<String> allComponentIds = this.componentManager.getAllComponents().stream().map(c -> c.id())
+		for (var i = 0; i < 100; i++) {
+			Set<String> allComponentIds = this.componentManager.getAllComponents().stream().map(OpenemsComponent::id)
 					.collect(Collectors.toSet());
 			simulatorComponentIds.removeAll(allComponentIds);
 
 			if (simulatorComponentIds.isEmpty()) {
 				// finished
 				return;
-			} else {
-				this.logInfo(this.log, "Still waiting for [" + simulatorComponentIds + "] to activate");
-				try {
-					Thread.sleep(500);
-				} catch (InterruptedException e) {
-					this.log.warn(e.getClass().getSimpleName() + ": " + e.getMessage());
-				}
+			}
+			this.logInfo(this.log, "Still waiting for [" + simulatorComponentIds + "] to activate");
+			try {
+				Thread.sleep(500);
+			} catch (InterruptedException e) {
+				this.log.warn(e.getClass().getSimpleName() + ": " + e.getMessage());
 			}
 		}
 		throw new OpenemsException("Timeout while waiting for [" + simulatorComponentIds + "] to activate");
@@ -439,21 +436,20 @@ private void waitForComponentsToActivate(Set<String> simulatorComponentIds) thro
 
 	private void waitForComponentsToDeactivate(Set<String> deletedComponents) throws OpenemsException {
 		Set<String> stillExistingComponents = new HashSet<>();
-		for (int i = 0; i < 100; i++) {
-			List<OpenemsComponent> allComponents = this.componentManager.getAllComponents();
-			stillExistingComponents = allComponents.stream().map(c -> c.id()).collect(Collectors.toSet());
+		for (var i = 0; i < 100; i++) {
+			var allComponents = this.componentManager.getAllComponents();
+			stillExistingComponents = allComponents.stream().map(OpenemsComponent::id).collect(Collectors.toSet());
 			stillExistingComponents.removeAll(deletedComponents);
 
 			if (stillExistingComponents.isEmpty()) {
 				// finished
 				return;
-			} else {
-				this.log.info("Still waiting for [" + stillExistingComponents + "] to disappear");
-				try {
-					Thread.sleep(500);
-				} catch (InterruptedException e) {
-					this.log.warn(e.getClass().getSimpleName() + ": " + e.getMessage());
-				}
+			}
+			this.log.info("Still waiting for [" + stillExistingComponents + "] to disappear");
+			try {
+				Thread.sleep(500);
+			} catch (InterruptedException e) {
+				this.log.warn(e.getClass().getSimpleName() + ": " + e.getMessage());
 			}
 		}
 		throw new OpenemsException("Timeout while waiting for [" + stillExistingComponents + "] to disappear");
@@ -462,7 +458,7 @@ private void waitForComponentsToDeactivate(Set<String> deletedComponents) throws
 	@Override
 	public Set<String> getKeys() {
 		if (this.currentSimulation == null) {
-			return new HashSet<String>();
+			return new HashSet<>();
 		}
 		return this.currentSimulation.request.profiles.keySet();
 	}
@@ -478,7 +474,7 @@ public <T> T getValue(OpenemsType type, ChannelAddress channelAddress) {
 			return null;
 		}
 		// First: try full ChannelAddress
-		Profile profile = this.currentSimulation.request.profiles.get(channelAddress.toString());
+		var profile = this.currentSimulation.request.profiles.get(channelAddress.toString());
 		if (profile == null) {
 			// Not found: try Channel-ID only (without Component-ID)
 			profile = this.currentSimulation.request.profiles.get(channelAddress.getChannelId());
@@ -495,8 +491,8 @@ public SortedMap<ZonedDateTime, SortedMap<ChannelAddress, JsonElement>> queryHis
 			return new TreeMap<>();
 		}
 
-		Period fakePeriod = this.convertToSimulatedFromToDates(fromDate, toDate);
-		SortedMap<ZonedDateTime, SortedMap<ChannelAddress, JsonElement>> data = this.lastSimulation.collectedData
+		var fakePeriod = this.convertToSimulatedFromToDates(fromDate, toDate);
+		var data = this.lastSimulation.collectedData
 				.subMap(fakePeriod.fromDate, fakePeriod.toDate);
 
 		if (channels.isEmpty()) {
@@ -507,10 +503,10 @@ public SortedMap<ZonedDateTime, SortedMap<ChannelAddress, JsonElement>> queryHis
 		SortedMap<ZonedDateTime, SortedMap<ChannelAddress, JsonElement>> result = new TreeMap<>();
 		for (Entry<ZonedDateTime, SortedMap<ChannelAddress, JsonElement>> entry : this.lastSimulation.collectedData
 				.subMap(fakePeriod.fromDate, fakePeriod.toDate).entrySet()) {
-			SortedMap<ChannelAddress, JsonElement> values = entry.getValue();
-			TreeMap<ChannelAddress, JsonElement> resultPerTimestamp = new TreeMap<>();
+			var values = entry.getValue();
+			var resultPerTimestamp = new TreeMap<ChannelAddress, JsonElement>();
 			for (ChannelAddress channel : channels) {
-				JsonElement value = values.get(channel);
+				var value = values.get(channel);
 				resultPerTimestamp.put(channel, value == null ? JsonNull.INSTANCE : value);
 			}
 			result.put(entry.getKey(), resultPerTimestamp);
@@ -524,15 +520,15 @@ public SortedMap<ChannelAddress, JsonElement> queryHistoricEnergy(String edgeId,
 		if (this.lastSimulation == null || this.lastSimulation.collectedData.isEmpty()) {
 			return new TreeMap<>();
 		}
-		Period fakePeriod = this.convertToSimulatedFromToDates(fromDate, toDate);
-		SortedMap<ZonedDateTime, SortedMap<ChannelAddress, JsonElement>> partOfCollectedData = this.lastSimulation.collectedData
+		var fakePeriod = this.convertToSimulatedFromToDates(fromDate, toDate);
+		var partOfCollectedData = this.lastSimulation.collectedData
 				.subMap(fakePeriod.fromDate, fakePeriod.toDate);
-		SortedMap<ChannelAddress, JsonElement> result = new TreeMap<ChannelAddress, JsonElement>();
-		SortedMap<ChannelAddress, JsonElement> firstValues = partOfCollectedData.get(partOfCollectedData.firstKey());
-		SortedMap<ChannelAddress, JsonElement> lastValues = partOfCollectedData.get(partOfCollectedData.lastKey());
+		SortedMap<ChannelAddress, JsonElement> result = new TreeMap<>();
+		var firstValues = partOfCollectedData.get(partOfCollectedData.firstKey());
+		var lastValues = partOfCollectedData.get(partOfCollectedData.lastKey());
 		for (ChannelAddress channel : channels) {
-			Long firstValue = (Long) JsonUtils.getAsType(Long.class, firstValues.get(channel));
-			Long lastValue = (Long) JsonUtils.getAsType(Long.class, lastValues.get(channel));
+			var firstValue = (Long) JsonUtils.getAsType(Long.class, firstValues.get(channel));
+			var lastValue = (Long) JsonUtils.getAsType(Long.class, lastValues.get(channel));
 			if (firstValue != null && lastValue != null) {
 				result.put(channel, new JsonPrimitive(lastValue - firstValue));
 			} else {
@@ -555,7 +551,7 @@ public CompletableFuture<Optional<Object>> getLatestValue(ChannelAddress channel
 		if (this.lastSimulation == null || this.lastSimulation.collectedData.isEmpty()) {
 			value = JsonNull.INSTANCE;
 		} else {
-			SortedMap<ChannelAddress, JsonElement> lastValues = this.lastSimulation.collectedData
+			var lastValues = this.lastSimulation.collectedData
 					.get(this.lastSimulation.collectedData.lastKey());
 			value = lastValues.get(channelAddress);
 		}
@@ -571,7 +567,6 @@ private static class Period {
 		private final ZonedDateTime toDate;
 
 		public Period(ZonedDateTime fromDate, ZonedDateTime toDate) {
-			super();
 			this.fromDate = fromDate;
 			this.toDate = toDate;
 		}
@@ -579,12 +574,12 @@ public Period(ZonedDateTime fromDate, ZonedDateTime toDate) {
 
 	/**
 	 * Adjusts the FromDate and ToDate as if they would be current.
-	 * 
+	 *
 	 * <p>
 	 * For the simulation the fromDate and toDate do not actually matter, so very
 	 * often something like 1st January 2000 will be used. That would be
 	 * inconvenient to visualize in OpenEMS UI, so we fake the dates here.
-	 * 
+	 *
 	 * @param fromDate the original Request fromDate
 	 * @param toDate   the original Request toDate
 	 * @return a {@link Period} with faked fromDate and toDate
@@ -593,11 +588,11 @@ private Period convertToSimulatedFromToDates(ZonedDateTime fromDate, ZonedDateTi
 		if (this.lastSimulation == null) {
 			return null;
 		}
-		long durationDays = Duration.between(fromDate, toDate).toDays();
-		long toDateOffset = Duration.between(toDate, ZonedDateTime.now()).toDays();
-		ZonedDateTime lastCollected = this.lastSimulation.collectedData.lastKey();
-		ZonedDateTime newToDate = lastCollected.minusDays(toDateOffset);
-		ZonedDateTime newFromDate = newToDate.minusDays(durationDays);
+		var durationDays = Duration.between(fromDate, toDate).toDays();
+		var toDateOffset = Duration.between(toDate, ZonedDateTime.now()).toDays();
+		var lastCollected = this.lastSimulation.collectedData.lastKey();
+		var newToDate = lastCollected.minusDays(toDateOffset);
+		var newFromDate = newToDate.minusDays(durationDays);
 		return new Period(newFromDate, newToDate);
 	}
 
diff --git a/io.openems.edge.simulator/src/io/openems/edge/simulator/battery/Config.java b/io.openems.edge.simulator/src/io/openems/edge/simulator/battery/Config.java
index c24bf962e35..e11fd28046a 100644
--- a/io.openems.edge.simulator/src/io/openems/edge/simulator/battery/Config.java
+++ b/io.openems.edge.simulator/src/io/openems/edge/simulator/battery/Config.java
@@ -16,7 +16,7 @@
 
 	@AttributeDefinition(name = "Is enabled?", description = "Is this Component enabled?")
 	boolean enabled() default true;
-	
+
 	@AttributeDefinition(name = "Number of slaves", description = "The number of slaves in this battery rack (max. 20)", min = "1", max = "20")
 	int numberOfSlaves() default 10;
 
diff --git a/io.openems.edge.simulator/src/io/openems/edge/simulator/datasource/api/AbstractCsvDatasource.java b/io.openems.edge.simulator/src/io/openems/edge/simulator/datasource/api/AbstractCsvDatasource.java
index 18da7eea505..82997c7a8c2 100644
--- a/io.openems.edge.simulator/src/io/openems/edge/simulator/datasource/api/AbstractCsvDatasource.java
+++ b/io.openems.edge.simulator/src/io/openems/edge/simulator/datasource/api/AbstractCsvDatasource.java
@@ -3,7 +3,6 @@
 import java.io.IOException;
 import java.time.Duration;
 import java.time.LocalDateTime;
-import java.util.Optional;
 import java.util.Set;
 
 import org.osgi.service.component.ComponentContext;
@@ -48,7 +47,7 @@ public void handleEvent(Event event) {
 		}
 		switch (event.getTopic()) {
 		case EdgeEventConstants.TOPIC_CYCLE_AFTER_WRITE:
-			LocalDateTime now = LocalDateTime.now(this.getComponentManager().getClock());
+			var now = LocalDateTime.now(this.getComponentManager().getClock());
 			if (this.timeDelta > 0 && Duration.between(this.lastIteration, now).getSeconds() < this.timeDelta) {
 				// don't change record, if timeDetla is active and has not been passed yet
 				return;
@@ -63,7 +62,7 @@ public void handleEvent(Event event) {
 	@Override
 	public <T> T getValue(OpenemsType type, ChannelAddress channelAddress) {
 		// First: try full ChannelAddress
-		Optional<Float> valueOpt = this.data.getValue(channelAddress.toString());
+		var valueOpt = this.data.getValue(channelAddress.toString());
 		if (!valueOpt.isPresent()) {
 			// Not found: try Channel-ID only (without Component-ID)
 			valueOpt = this.data.getValue(channelAddress.getChannelId());
diff --git a/io.openems.edge.simulator/src/io/openems/edge/simulator/datasource/api/SimulatorDatasource.java b/io.openems.edge.simulator/src/io/openems/edge/simulator/datasource/api/SimulatorDatasource.java
index fc2be622d1e..cac3c09485d 100644
--- a/io.openems.edge.simulator/src/io/openems/edge/simulator/datasource/api/SimulatorDatasource.java
+++ b/io.openems.edge.simulator/src/io/openems/edge/simulator/datasource/api/SimulatorDatasource.java
@@ -9,21 +9,21 @@ public interface SimulatorDatasource {
 
 	/**
 	 * Gets the available keys.
-	 * 
+	 *
 	 * @return the Channel-Id
 	 */
 	Set<String> getKeys();
 
 	/**
 	 * Returns the delta between two values in seconds.
-	 * 
+	 *
 	 * @return the delta in seconds
 	 */
 	int getTimeDelta();
 
 	/**
 	 * Gets the value for the given key (channelId) in the given type.
-	 * 
+	 *
 	 * @param <T>            the type
 	 * @param type           the expected type
 	 * @param channelAddress the Channel-Address
diff --git a/io.openems.edge.simulator/src/io/openems/edge/simulator/datasource/single/direct/SingleDatasourceDirect.java b/io.openems.edge.simulator/src/io/openems/edge/simulator/datasource/single/direct/SingleDatasourceDirect.java
index 483b302fbcc..49295ecc44c 100644
--- a/io.openems.edge.simulator/src/io/openems/edge/simulator/datasource/single/direct/SingleDatasourceDirect.java
+++ b/io.openems.edge.simulator/src/io/openems/edge/simulator/datasource/single/direct/SingleDatasourceDirect.java
@@ -50,7 +50,7 @@ protected ComponentManager getComponentManager() {
 
 	@Override
 	protected DataContainer getData() throws NumberFormatException, IOException {
-		DataContainer result = new DataContainer();
+		var result = new DataContainer();
 		for (int value : this.config.values()) {
 			result.addRecord(new Float[] { Float.valueOf(value) });
 		}
diff --git a/io.openems.edge.simulator/src/io/openems/edge/simulator/ess/asymmetric/reacting/EssAsymmetric.java b/io.openems.edge.simulator/src/io/openems/edge/simulator/ess/asymmetric/reacting/EssAsymmetric.java
index 019aa40b1fa..ca86af54fbe 100644
--- a/io.openems.edge.simulator/src/io/openems/edge/simulator/ess/asymmetric/reacting/EssAsymmetric.java
+++ b/io.openems.edge.simulator/src/io/openems/edge/simulator/ess/asymmetric/reacting/EssAsymmetric.java
@@ -61,6 +61,7 @@ private ChannelId(Doc doc) {
 			this.doc = doc;
 		}
 
+		@Override
 		public Doc doc() {
 			return this.doc;
 		}
@@ -102,6 +103,7 @@ void activate(ComponentContext context, Config config) throws IOException {
 		this._setGridMode(config.gridMode());
 	}
 
+	@Override
 	@Deactivate
 	protected void deactivate() {
 		super.deactivate();
@@ -145,12 +147,12 @@ public Power getPower() {
 	@Override
 	public void applyPower(int activePowerL1, int reactivePowerL1, int activePowerL2, int reactivePowerL2,
 			int activePowerL3, int reactivePowerL3) throws OpenemsException {
-		int activePower = activePowerL1 + activePowerL2 + activePowerL3;
+		var activePower = activePowerL1 + activePowerL2 + activePowerL3;
 		/*
 		 * calculate State of charge
 		 */
-		float watthours = (float) activePower * this.datasource.getTimeDelta() / 3600;
-		float socChange = watthours / this.config.capacity();
+		var watthours = (float) activePower * this.datasource.getTimeDelta() / 3600;
+		var socChange = watthours / this.config.capacity();
 		this.soc -= socChange;
 		if (this.soc > 100) {
 			this.soc = 100;
@@ -166,7 +168,7 @@ public void applyPower(int activePowerL1, int reactivePowerL1, int activePowerL2
 		this._setActivePowerL3(activePowerL3);
 		this._setActivePower(activePower);
 
-		int reactivePower = reactivePowerL1 + reactivePowerL2 + reactivePowerL3;
+		var reactivePower = reactivePowerL1 + reactivePowerL2 + reactivePowerL3;
 		this._setReactivePowerL1(reactivePowerL1);
 		this._setReactivePowerL2(reactivePowerL2);
 		this._setReactivePowerL3(reactivePowerL3);
@@ -208,7 +210,7 @@ public ModbusSlaveTable getModbusSlaveTable(AccessMode accessMode) {
 	 */
 	private void calculateEnergy() {
 		// Calculate Energy
-		Integer activePower = this.getActivePower().get();
+		var activePower = this.getActivePower().get();
 		if (activePower == null) {
 			// Not available
 			this.calculateChargeEnergy.update(null);
diff --git a/io.openems.edge.simulator/src/io/openems/edge/simulator/ess/singlephase/reacting/EssSinglePhase.java b/io.openems.edge.simulator/src/io/openems/edge/simulator/ess/singlephase/reacting/EssSinglePhase.java
index 0b1de236bd9..470e0e52a2f 100644
--- a/io.openems.edge.simulator/src/io/openems/edge/simulator/ess/singlephase/reacting/EssSinglePhase.java
+++ b/io.openems.edge.simulator/src/io/openems/edge/simulator/ess/singlephase/reacting/EssSinglePhase.java
@@ -65,6 +65,7 @@ private ChannelId(Doc doc) {
 			this.doc = doc;
 		}
 
+		@Override
 		public Doc doc() {
 			return this.doc;
 		}
@@ -107,6 +108,7 @@ void activate(ComponentContext context, Config config) throws IOException {
 		this._setGridMode(config.gridMode());
 	}
 
+	@Override
 	@Deactivate
 	protected void deactivate() {
 		super.deactivate();
@@ -154,8 +156,8 @@ public void applyPower(int activePower, int reactivePower) {
 		/*
 		 * calculate State of charge
 		 */
-		float watthours = (float) activePower * this.datasource.getTimeDelta() / 3600;
-		float socChange = watthours / this.config.capacity();
+		var watthours = (float) activePower * this.datasource.getTimeDelta() / 3600;
+		var socChange = watthours / this.config.capacity();
 		this.soc -= socChange;
 		if (this.soc > 100) {
 			this.soc = 100;
@@ -249,7 +251,7 @@ public SinglePhase getPhase() {
 	 */
 	private void calculateEnergy() {
 		// Calculate Energy
-		Integer activePower = this.getActivePower().get();
+		var activePower = this.getActivePower().get();
 		if (activePower == null) {
 			// Not available
 			this.calculateChargeEnergy.update(null);
diff --git a/io.openems.edge.simulator/src/io/openems/edge/simulator/ess/symmetric/reacting/EssSymmetric.java b/io.openems.edge.simulator/src/io/openems/edge/simulator/ess/symmetric/reacting/EssSymmetric.java
index 35c9a1a3a91..99c40107d75 100644
--- a/io.openems.edge.simulator/src/io/openems/edge/simulator/ess/symmetric/reacting/EssSymmetric.java
+++ b/io.openems.edge.simulator/src/io/openems/edge/simulator/ess/symmetric/reacting/EssSymmetric.java
@@ -63,6 +63,7 @@ private ChannelId(Doc doc) {
 			this.doc = doc;
 		}
 
+		@Override
 		public Doc doc() {
 			return this.doc;
 		}
@@ -90,8 +91,8 @@ void activate(ComponentContext context, Config config) throws IOException {
 		super.activate(context, config.id(), config.alias(), config.enabled());
 
 		this.config = config;
-		this.energy = (long) (((double) config.capacity() /* [Wh] */ * 3600 /* [Wsec] */ * 1000 /* [Wmsec] */
-				/ 100 /* [%] */) * this.config.initialSoc() /* [current SoC] */);
+		this.energy = (long) ((double) config.capacity() /* [Wh] */ * 3600 /* [Wsec] */ * 1000 /* [Wmsec] */
+				/ 100 * this.config.initialSoc() /* [current SoC] */);
 		this._setSoc(config.initialSoc());
 		this._setMaxApparentPower(config.maxApparentPower());
 		this._setAllowedChargePower(config.maxApparentPower() * -1);
@@ -100,6 +101,7 @@ void activate(ComponentContext context, Config config) throws IOException {
 		this._setCapacity(config.capacity());
 	}
 
+	@Override
 	@Deactivate
 	protected void deactivate() {
 		super.deactivate();
@@ -145,7 +147,7 @@ public void applyPower(int activePower, int reactivePower) throws OpenemsExcepti
 		/*
 		 * calculate State of charge
 		 */
-		Instant now = Instant.now(this.componentManager.getClock());
+		var now = Instant.now(this.componentManager.getClock());
 		final int soc;
 		if (this.lastTimestamp == null) {
 			// initial run
@@ -153,15 +155,15 @@ public void applyPower(int activePower, int reactivePower) throws OpenemsExcepti
 
 		} else {
 			// calculate duration since last value
-			long duration /* [msec] */ = Duration.between(this.lastTimestamp, now).toMillis();
+			var duration /* [msec] */ = Duration.between(this.lastTimestamp, now).toMillis();
 
 			// calculate energy since last run in [Wh]
-			long energy /* [Wmsec] */ = this.getActivePower().orElse(0) /* [W] */ * duration /* [msec] */;
+			var energy /* [Wmsec] */ = this.getActivePower().orElse(0) /* [W] */ * duration /* [msec] */;
 
 			// Adding the energy to the initial energy.
 			this.energy -= energy;
 
-			double calculatedSoc = this.energy //
+			var calculatedSoc = this.energy //
 					/ (this.config.capacity() * 3600. /* [Wsec] */ * 1000 /* [Wmsec] */) //
 					* 100 /* [SoC] */;
 
@@ -230,7 +232,7 @@ public ModbusSlaveTable getModbusSlaveTable(AccessMode accessMode) {
 	 */
 	private void calculateEnergy() {
 		// Calculate Energy
-		Integer activePower = this.getActivePower().get();
+		var activePower = this.getActivePower().get();
 		if (activePower == null) {
 			// Not available
 			this.calculateChargeEnergy.update(null);
diff --git a/io.openems.edge.simulator/src/io/openems/edge/simulator/evcs/AsymmetricMeterEvcs.java b/io.openems.edge.simulator/src/io/openems/edge/simulator/evcs/AsymmetricMeterEvcs.java
index c86d1127cb6..e07c19abc4c 100644
--- a/io.openems.edge.simulator/src/io/openems/edge/simulator/evcs/AsymmetricMeterEvcs.java
+++ b/io.openems.edge.simulator/src/io/openems/edge/simulator/evcs/AsymmetricMeterEvcs.java
@@ -19,7 +19,7 @@ public interface AsymmetricMeterEvcs extends OpenemsComponent {
 	public enum ChannelId implements io.openems.edge.common.channel.ChannelId {
 		/**
 		 * Frequency.
-		 * 
+		 *
 		 * <ul>
 		 * <li>Interface: Meter Symmetric
 		 * <li>Type: Integer
@@ -32,7 +32,7 @@ public enum ChannelId implements io.openems.edge.common.channel.ChannelId {
 				.persistencePriority(PersistencePriority.HIGH)),
 		/**
 		 * Minimum Ever Active Power.
-		 * 
+		 *
 		 * <ul>
 		 * <li>Interface: Meter Symmetric
 		 * <li>Type: Integer
@@ -46,7 +46,7 @@ public enum ChannelId implements io.openems.edge.common.channel.ChannelId {
 				.persistencePriority(PersistencePriority.HIGH)),
 		/**
 		 * Maximum Ever Active Power.
-		 * 
+		 *
 		 * <ul>
 		 * <li>Interface: Meter Symmetric
 		 * <li>Type: Integer
@@ -60,7 +60,7 @@ public enum ChannelId implements io.openems.edge.common.channel.ChannelId {
 				.persistencePriority(PersistencePriority.HIGH)),
 		/**
 		 * Active Power.
-		 * 
+		 *
 		 * <ul>
 		 * <li>Interface: Meter Symmetric
 		 * <li>Type: Integer
@@ -108,7 +108,7 @@ public enum ChannelId implements io.openems.edge.common.channel.ChannelId {
 
 		/**
 		 * Reactive Power.
-		 * 
+		 *
 		 * <ul>
 		 * <li>Interface: Meter Symmetric
 		 * <li>Type: Integer
@@ -123,7 +123,7 @@ public enum ChannelId implements io.openems.edge.common.channel.ChannelId {
 				.persistencePriority(PersistencePriority.HIGH)), //
 		/**
 		 * Active Production Energy.
-		 * 
+		 *
 		 * <ul>
 		 * <li>Interface: Meter Symmetric
 		 * <li>Type: Integer
@@ -135,7 +135,7 @@ public enum ChannelId implements io.openems.edge.common.channel.ChannelId {
 				.persistencePriority(PersistencePriority.HIGH)),
 		/**
 		 * Voltage.
-		 * 
+		 *
 		 * <ul>
 		 * <li>Interface: Meter Symmetric
 		 * <li>Type: Integer
@@ -147,7 +147,7 @@ public enum ChannelId implements io.openems.edge.common.channel.ChannelId {
 				.persistencePriority(PersistencePriority.HIGH)),
 		/**
 		 * Current.
-		 * 
+		 *
 		 * <ul>
 		 * <li>Interface: Meter Symmetric
 		 * <li>Type: Integer
@@ -164,6 +164,7 @@ private ChannelId(Doc doc) {
 			this.doc = doc;
 		}
 
+		@Override
 		public Doc doc() {
 			return this.doc;
 		}
@@ -171,7 +172,7 @@ public Doc doc() {
 
 	/**
 	 * Gets the type of this Meter.
-	 * 
+	 *
 	 * @return the MeterType
 	 */
 	MeterType getMeterType();
@@ -305,7 +306,7 @@ public default IntegerReadChannel getActivePowerChannel() {
 	 * Gets the Active Power in [W]. Negative values for Consumption (power that is
 	 * 'leaving the system', e.g. feed-to-grid); positive for Production (power that
 	 * is 'entering the system'). See {@link ChannelId#ACTIVE_POWER}.
-	 * 
+	 *
 	 * @return the Channel {@link Value}
 	 */
 	public default Value<Integer> getActivePower() {
diff --git a/io.openems.edge.simulator/src/io/openems/edge/simulator/evcs/SimulatedEvcs.java b/io.openems.edge.simulator/src/io/openems/edge/simulator/evcs/SimulatedEvcs.java
index 6d464c5db5c..572d82f35d8 100644
--- a/io.openems.edge.simulator/src/io/openems/edge/simulator/evcs/SimulatedEvcs.java
+++ b/io.openems.edge.simulator/src/io/openems/edge/simulator/evcs/SimulatedEvcs.java
@@ -3,7 +3,6 @@
 import java.io.IOException;
 import java.time.LocalDateTime;
 import java.time.temporal.ChronoUnit;
-import java.util.Optional;
 
 import org.osgi.service.cm.ConfigurationAdmin;
 import org.osgi.service.component.ComponentContext;
@@ -54,6 +53,7 @@ private ChannelId(Doc doc) {
 			this.doc = doc;
 		}
 
+		@Override
 		public Doc doc() {
 			return this.doc;
 		}
@@ -83,6 +83,7 @@ void activate(ComponentContext context, Config config) throws IOException {
 		this._setPowerPrecision(1);
 	}
 
+	@Override
 	@Deactivate
 	protected void deactivate() {
 		super.deactivate();
@@ -99,7 +100,6 @@ public void handleEvent(Event event) {
 			break;
 		}
 	}
-	
 
 	private LocalDateTime lastUpdate = LocalDateTime.now();
 	private double exactEnergySession = 0;
@@ -107,7 +107,7 @@ public void handleEvent(Event event) {
 	private void updateChannels() {
 		int chargePowerLimit = this.getChargePower().orElse(0);
 
-		Optional<Integer> chargePowerLimitOpt = this.getSetChargePowerLimitChannel().getNextWriteValueAndReset();
+		var chargePowerLimitOpt = this.getSetChargePowerLimitChannel().getNextWriteValueAndReset();
 		if (chargePowerLimitOpt.isPresent()) {
 			chargePowerLimit = chargePowerLimitOpt.get();
 		}
@@ -123,19 +123,19 @@ private void updateChannels() {
 		int sentPower = this.getSetChargePowerLimitChannel().getNextWriteValue().orElse(0);
 		this._setSetChargePowerLimit(sentPower);
 		this._setChargePower(sentPower);
-		
+
 		/*
 		 * get and store Simulated "meter" Active Power
 		 */
 		this._setActivePower(sentPower);
 
-		Integer simulatedActivePowerByThree = TypeUtils.divide(sentPower, 3);
+		var simulatedActivePowerByThree = TypeUtils.divide(sentPower, 3);
 		this._setActivePowerL1(simulatedActivePowerByThree);
 		this._setActivePowerL2(simulatedActivePowerByThree);
 		this._setActivePowerL3(simulatedActivePowerByThree);
 
-		long timeDiff = ChronoUnit.MILLIS.between(this.lastUpdate, LocalDateTime.now());
-		double energyTransfered = (timeDiff / 1000.0 / 60.0 / 60.0) * this.getChargePower().orElse(0);
+		var timeDiff = ChronoUnit.MILLIS.between(this.lastUpdate, LocalDateTime.now());
+		var energyTransfered = timeDiff / 1000.0 / 60.0 / 60.0 * this.getChargePower().orElse(0);
 
 		this.exactEnergySession = this.exactEnergySession + energyTransfered;
 		this._setEnergySession((int) this.exactEnergySession);
@@ -157,7 +157,7 @@ public EvcsPower getEvcsPower() {
 	public Value<Long> getActiveConsumptionEnergy() {
 		return ManagedEvcs.super.getActiveConsumptionEnergy();
 	}
-	
+
 	@Override
 	public MeterType getMeterType() {
 		return MeterType.CONSUMPTION_NOT_METERED;
diff --git a/io.openems.edge.simulator/src/io/openems/edge/simulator/io/DigitalInputOutput.java b/io.openems.edge.simulator/src/io/openems/edge/simulator/io/DigitalInputOutput.java
index f1bf48a70d1..bb10380f37f 100644
--- a/io.openems.edge.simulator/src/io/openems/edge/simulator/io/DigitalInputOutput.java
+++ b/io.openems.edge.simulator/src/io/openems/edge/simulator/io/DigitalInputOutput.java
@@ -1,7 +1,5 @@
 package io.openems.edge.simulator.io;
 
-import java.util.Optional;
-
 import org.osgi.service.component.ComponentContext;
 import org.osgi.service.component.annotations.Activate;
 import org.osgi.service.component.annotations.Component;
@@ -15,7 +13,6 @@
 import io.openems.edge.common.channel.BooleanDoc;
 import io.openems.edge.common.channel.BooleanReadChannel;
 import io.openems.edge.common.channel.BooleanWriteChannel;
-import io.openems.edge.common.channel.internal.OpenemsTypeDoc;
 import io.openems.edge.common.component.AbstractOpenemsComponent;
 import io.openems.edge.common.component.OpenemsComponent;
 import io.openems.edge.common.event.EdgeEventConstants;
@@ -36,8 +33,8 @@ public class DigitalInputOutput extends AbstractOpenemsComponent
 
 	private final Logger log = LoggerFactory.getLogger(DigitalInputOutput.class);
 
-	private BooleanWriteChannel[] writeChannels = new BooleanWriteChannel[0];
-	private BooleanReadChannel[] readChannels = new BooleanReadChannel[0];
+	private BooleanWriteChannel[] writeChannels = {};
+	private BooleanReadChannel[] readChannels = {};
 
 	public DigitalInputOutput() {
 		super(//
@@ -54,11 +51,11 @@ void activate(ComponentContext context, Config config) {
 		// Generate OutputChannels
 		this.writeChannels = new BooleanWriteChannel[config.numberOfOutputs()];
 		this.readChannels = new BooleanReadChannel[config.numberOfOutputs()];
-		for (int i = 0; i < config.numberOfOutputs(); i++) {
-			String channelName = String.format(CHANNEL_NAME, i);
-			OpenemsTypeDoc<Boolean> doc = new BooleanDoc() //
+		for (var i = 0; i < config.numberOfOutputs(); i++) {
+			var channelName = String.format(CHANNEL_NAME, i);
+			var doc = new BooleanDoc() //
 					.accessMode(AccessMode.READ_WRITE);
-			BooleanWriteChannel channel = (BooleanWriteChannel) this.addChannel(new MyChannelId(channelName, doc));
+			var channel = (BooleanWriteChannel) this.addChannel(new MyChannelId(channelName, doc));
 
 			// default to OFF
 			channel.setNextValue(false);
@@ -86,9 +83,9 @@ public BooleanWriteChannel[] digitalOutputChannels() {
 
 	@Override
 	public String debugLog() {
-		StringBuilder b = new StringBuilder();
+		var b = new StringBuilder();
 		for (BooleanReadChannel channel : this.readChannels) {
-			Optional<Boolean> valueOpt = channel.value().asOptional();
+			var valueOpt = channel.value().asOptional();
 			if (valueOpt.isPresent()) {
 				b.append(valueOpt.get() ? "x" : "-");
 			} else {
diff --git a/io.openems.edge.simulator/src/io/openems/edge/simulator/meter/grid/acting/GridMeter.java b/io.openems.edge.simulator/src/io/openems/edge/simulator/meter/grid/acting/GridMeter.java
index e2aa51b500b..101e2846c45 100644
--- a/io.openems.edge.simulator/src/io/openems/edge/simulator/meter/grid/acting/GridMeter.java
+++ b/io.openems.edge.simulator/src/io/openems/edge/simulator/meter/grid/acting/GridMeter.java
@@ -58,6 +58,7 @@ private ChannelId(Doc doc) {
 			this.doc = doc;
 		}
 
+		@Override
 		public Doc doc() {
 			return this.doc;
 		}
@@ -90,6 +91,7 @@ void activate(ComponentContext context, Config config) throws IOException {
 		}
 	}
 
+	@Override
 	@Deactivate
 	protected void deactivate() {
 		super.deactivate();
@@ -135,13 +137,13 @@ private void updateChannels() {
 		/*
 		 * Calculate Active Power
 		 */
-		Integer activePower = simulatedActivePower;
+		var activePower = simulatedActivePower;
 		for (ManagedSymmetricEss ess : this.symmetricEsss) {
 			activePower = TypeUtils.subtract(activePower, ess.getActivePower().get());
 		}
 
 		this._setActivePower(activePower);
-		Integer activePowerByThree = TypeUtils.divide(activePower, 3);
+		var activePowerByThree = TypeUtils.divide(activePower, 3);
 		this._setActivePowerL1(activePowerByThree);
 		this._setActivePowerL2(activePowerByThree);
 		this._setActivePowerL3(activePowerByThree);
@@ -157,7 +159,7 @@ public String debugLog() {
 	 */
 	private void calculateEnergy() {
 		// Calculate Energy
-		Integer activePower = this.getActivePower().get();
+		var activePower = this.getActivePower().get();
 		if (activePower == null) {
 			// Not available
 			this.calculateProductionEnergy.update(null);
diff --git a/io.openems.edge.simulator/src/io/openems/edge/simulator/meter/grid/reacting/GridMeter.java b/io.openems.edge.simulator/src/io/openems/edge/simulator/meter/grid/reacting/GridMeter.java
index 5f5a63788df..52032ef5784 100644
--- a/io.openems.edge.simulator/src/io/openems/edge/simulator/meter/grid/reacting/GridMeter.java
+++ b/io.openems.edge.simulator/src/io/openems/edge/simulator/meter/grid/reacting/GridMeter.java
@@ -53,6 +53,7 @@ private ChannelId(Doc doc) {
 			this.doc = doc;
 		}
 
+		@Override
 		public Doc doc() {
 			return this.doc;
 		}
@@ -115,7 +116,7 @@ public void handleEvent(Event event) {
 		}
 	}
 
-	private final Consumer<Value<Integer>> updateChannelsCallback = (value) -> {
+	private final Consumer<Value<Integer>> updateChannelsCallback = value -> {
 		Integer sum = null;
 
 		for (ManagedSymmetricEss ess : this.symmetricEsss) {
@@ -143,7 +144,7 @@ public void handleEvent(Event event) {
 
 		this._setActivePower(sum);
 
-		Integer simulatedActivePowerByThree = TypeUtils.divide(sum, 3);
+		var simulatedActivePowerByThree = TypeUtils.divide(sum, 3);
 		this._setActivePowerL1(simulatedActivePowerByThree);
 		this._setActivePowerL2(simulatedActivePowerByThree);
 		this._setActivePowerL3(simulatedActivePowerByThree);
@@ -152,7 +153,8 @@ public void handleEvent(Event event) {
 	private static Integer add(Integer sum, Integer activePower) {
 		if (activePower == null && sum == null) {
 			return null;
-		} else if (activePower == null) {
+		}
+		if (activePower == null) {
 			return sum;
 		} else if (sum == null) {
 			return activePower;
@@ -164,7 +166,8 @@ private static Integer add(Integer sum, Integer activePower) {
 	private static Integer subtract(Integer sum, Integer activePower) {
 		if (activePower == null && sum == null) {
 			return null;
-		} else if (activePower == null) {
+		}
+		if (activePower == null) {
 			return sum;
 		} else if (sum == null) {
 			return activePower * -1;
@@ -178,6 +181,7 @@ void activate(ComponentContext context, Config config) throws IOException {
 		super.activate(context, config.id(), config.alias(), config.enabled());
 	}
 
+	@Override
 	@Deactivate
 	protected void deactivate() {
 		super.deactivate();
@@ -207,7 +211,7 @@ public String debugLog() {
 	 */
 	private void calculateEnergy() {
 		// Calculate Energy
-		Integer activePower = this.getActivePower().get();
+		var activePower = this.getActivePower().get();
 		if (activePower == null) {
 			// Not available
 			this.calculateProductionEnergy.update(null);
diff --git a/io.openems.edge.simulator/src/io/openems/edge/simulator/meter/nrc/acting/NrcMeter.java b/io.openems.edge.simulator/src/io/openems/edge/simulator/meter/nrc/acting/NrcMeter.java
index c844d9c7772..fac14d9f5c0 100644
--- a/io.openems.edge.simulator/src/io/openems/edge/simulator/meter/nrc/acting/NrcMeter.java
+++ b/io.openems.edge.simulator/src/io/openems/edge/simulator/meter/nrc/acting/NrcMeter.java
@@ -53,6 +53,7 @@ private ChannelId(Doc doc) {
 			this.doc = doc;
 		}
 
+		@Override
 		public Doc doc() {
 			return this.doc;
 		}
@@ -78,10 +79,10 @@ void activate(ComponentContext context, Config config) throws IOException {
 
 		// update filter for 'datasource'
 		if (OpenemsComponent.updateReferenceFilter(this.cm, this.servicePid(), "datasource", config.datasource_id())) {
-			return;
 		}
 	}
 
+	@Override
 	@Deactivate
 	protected void deactivate() {
 		super.deactivate();
@@ -125,7 +126,7 @@ private void updateChannels() {
 		this.channel(ChannelId.SIMULATED_ACTIVE_POWER).setNextValue(simulatedActivePower);
 		this._setActivePower(simulatedActivePower);
 
-		Integer simulatedActivePowerByThree = TypeUtils.divide(simulatedActivePower, 3);
+		var simulatedActivePowerByThree = TypeUtils.divide(simulatedActivePower, 3);
 		this._setActivePowerL1(simulatedActivePowerByThree);
 		this._setActivePowerL2(simulatedActivePowerByThree);
 		this._setActivePowerL3(simulatedActivePowerByThree);
@@ -141,7 +142,7 @@ public String debugLog() {
 	 */
 	private void calculateEnergy() {
 		// Calculate Energy
-		Integer activePower = this.getActivePower().get();
+		var activePower = this.getActivePower().get();
 		if (activePower == null) {
 			// Not available
 			this.calculateProductionEnergy.update(null);
diff --git a/io.openems.edge.simulator/src/io/openems/edge/simulator/meter/production/acting/ProductionMeter.java b/io.openems.edge.simulator/src/io/openems/edge/simulator/meter/production/acting/ProductionMeter.java
index 69fa09ebb8a..89ed1a2832f 100644
--- a/io.openems.edge.simulator/src/io/openems/edge/simulator/meter/production/acting/ProductionMeter.java
+++ b/io.openems.edge.simulator/src/io/openems/edge/simulator/meter/production/acting/ProductionMeter.java
@@ -55,6 +55,7 @@ private ChannelId(Doc doc) {
 			this.doc = doc;
 		}
 
+		@Override
 		public Doc doc() {
 			return this.doc;
 		}
@@ -84,6 +85,7 @@ void activate(ComponentContext context, Config config) throws IOException {
 		}
 	}
 
+	@Override
 	@Deactivate
 	protected void deactivate() {
 		super.deactivate();
@@ -127,7 +129,7 @@ private void updateChannels() {
 		this.channel(ChannelId.SIMULATED_ACTIVE_POWER).setNextValue(simulatedActivePower);
 		this._setActivePower(simulatedActivePower);
 
-		Integer simulatedActivePowerByThree = TypeUtils.divide(simulatedActivePower, 3);
+		var simulatedActivePowerByThree = TypeUtils.divide(simulatedActivePower, 3);
 		this._setActivePowerL1(simulatedActivePowerByThree);
 		this._setActivePowerL2(simulatedActivePowerByThree);
 		this._setActivePowerL3(simulatedActivePowerByThree);
@@ -143,7 +145,7 @@ public String debugLog() {
 	 */
 	private void calculateEnergy() {
 		// Calculate Energy
-		Integer activePower = this.getActivePower().get();
+		var activePower = this.getActivePower().get();
 		if (activePower == null) {
 			// Not available
 			this.calculateProductionEnergy.update(null);
diff --git a/io.openems.edge.simulator/src/io/openems/edge/simulator/modbus/ModbusSimulator.java b/io.openems.edge.simulator/src/io/openems/edge/simulator/modbus/ModbusSimulator.java
index 3ac67400cec..118fac1b1f7 100644
--- a/io.openems.edge.simulator/src/io/openems/edge/simulator/modbus/ModbusSimulator.java
+++ b/io.openems.edge.simulator/src/io/openems/edge/simulator/modbus/ModbusSimulator.java
@@ -36,6 +36,7 @@ private ChannelId(Doc doc) {
 			this.doc = doc;
 		}
 
+		@Override
 		public Doc doc() {
 			return this.doc;
 		}
@@ -46,6 +47,7 @@ void activate(ComponentContext context, Config config) throws IOException {
 		super.activate(context, config.id(), config.alias(), config.enabled());
 	}
 
+	@Override
 	@Deactivate
 	protected void deactivate() {
 		super.deactivate();
diff --git a/io.openems.edge.simulator/src/io/openems/edge/simulator/pvinverter/PvInverter.java b/io.openems.edge.simulator/src/io/openems/edge/simulator/pvinverter/PvInverter.java
index cd6f017eebf..8c1ecf3afbf 100644
--- a/io.openems.edge.simulator/src/io/openems/edge/simulator/pvinverter/PvInverter.java
+++ b/io.openems.edge.simulator/src/io/openems/edge/simulator/pvinverter/PvInverter.java
@@ -21,7 +21,6 @@
 import io.openems.common.types.ChannelAddress;
 import io.openems.common.types.OpenemsType;
 import io.openems.edge.common.channel.Doc;
-import io.openems.edge.common.channel.value.Value;
 import io.openems.edge.common.component.AbstractOpenemsComponent;
 import io.openems.edge.common.component.OpenemsComponent;
 import io.openems.edge.common.event.EdgeEventConstants;
@@ -54,6 +53,7 @@ private ChannelId(Doc doc) {
 			this.doc = doc;
 		}
 
+		@Override
 		public Doc doc() {
 			return this.doc;
 		}
@@ -83,6 +83,7 @@ void activate(ComponentContext context, Config config) throws IOException {
 		}
 	}
 
+	@Override
 	@Deactivate
 	protected void deactivate() {
 		super.deactivate();
@@ -124,7 +125,7 @@ private void updateChannels() {
 		this.channel(ChannelId.SIMULATED_ACTIVE_POWER).setNextValue(simulatedActivePower);
 
 		// Apply Active Power Limit
-		Value<Integer> activePowerLimitOpt = this.getActivePowerLimit();
+		var activePowerLimitOpt = this.getActivePowerLimit();
 		if (simulatedActivePower != null && activePowerLimitOpt.isDefined()) {
 			int activePowerLimit = activePowerLimitOpt.get();
 			simulatedActivePower = Math.min(simulatedActivePower, activePowerLimit);
@@ -148,7 +149,7 @@ public MeterType getMeterType() {
 	 */
 	private void calculateEnergy() {
 		// Calculate Energy
-		Integer activePower = this.getActivePower().get();
+		var activePower = this.getActivePower().get();
 		if (activePower == null) {
 			// Not available
 			this.calculateProductionEnergy.update(null);
diff --git a/io.openems.edge.simulator/src/io/openems/edge/simulator/thermometer/SimulatedThermometer.java b/io.openems.edge.simulator/src/io/openems/edge/simulator/thermometer/SimulatedThermometer.java
index c7c1cf091f2..c99b68ad246 100644
--- a/io.openems.edge.simulator/src/io/openems/edge/simulator/thermometer/SimulatedThermometer.java
+++ b/io.openems.edge.simulator/src/io/openems/edge/simulator/thermometer/SimulatedThermometer.java
@@ -14,6 +14,7 @@ private ChannelId(Doc doc) {
 			this.doc = doc;
 		}
 
+		@Override
 		public Doc doc() {
 			return this.doc;
 		}
diff --git a/io.openems.edge.simulator/src/io/openems/edge/simulator/timedata/SimulatorTimedata.java b/io.openems.edge.simulator/src/io/openems/edge/simulator/timedata/SimulatorTimedata.java
index ecda57e2f1f..4bf068757ef 100644
--- a/io.openems.edge.simulator/src/io/openems/edge/simulator/timedata/SimulatorTimedata.java
+++ b/io.openems.edge.simulator/src/io/openems/edge/simulator/timedata/SimulatorTimedata.java
@@ -23,8 +23,8 @@
 import com.google.gson.JsonNull;
 import com.google.gson.JsonPrimitive;
 
-import io.openems.common.exceptions.OpenemsError.OpenemsNamedException;
 import io.openems.common.exceptions.NotImplementedException;
+import io.openems.common.exceptions.OpenemsError.OpenemsNamedException;
 import io.openems.common.exceptions.OpenemsException;
 import io.openems.common.types.ChannelAddress;
 import io.openems.edge.common.channel.Doc;
@@ -50,6 +50,7 @@ private ChannelId(Doc doc) {
 			this.doc = doc;
 		}
 
+		@Override
 		public Doc doc() {
 			return this.doc;
 		}
@@ -66,6 +67,7 @@ void activate(ComponentContext context, Config config) throws IOException {
 		this.config = config;
 	}
 
+	@Override
 	@Deactivate
 	protected void deactivate() {
 		super.deactivate();
@@ -84,9 +86,9 @@ public SortedMap<ZonedDateTime, SortedMap<ChannelAddress, JsonElement>> queryHis
 			ZonedDateTime fromDate, ZonedDateTime toDate, Set<ChannelAddress> channels, int resolution)
 			throws OpenemsNamedException {
 		try {
-			DataContainer data = CsvUtils.readCsvFile(this.getPath(), this.config.format(), 1);
+			var data = CsvUtils.readCsvFile(this.getPath(), this.config.format(), 1);
 			SortedMap<ZonedDateTime, SortedMap<ChannelAddress, JsonElement>> result = new TreeMap<>();
-			ZonedDateTime time = fromDate;
+			var time = fromDate;
 			while (time.isBefore(toDate)) {
 				// read Channel values
 				SortedMap<ChannelAddress, JsonElement> timeMap = new TreeMap<>();
@@ -112,7 +114,7 @@ public SortedMap<ZonedDateTime, SortedMap<ChannelAddress, JsonElement>> queryHis
 	public SortedMap<ChannelAddress, JsonElement> queryHistoricEnergy(String edgeId, ZonedDateTime fromDate,
 			ZonedDateTime toDate, Set<ChannelAddress> channels) throws OpenemsNamedException {
 		try {
-			DataContainer data = CsvUtils.readCsvFile(this.getPath(), this.config.format(), 1);
+			var data = CsvUtils.readCsvFile(this.getPath(), this.config.format(), 1);
 			SortedMap<ChannelAddress, JsonElement> result = new TreeMap<>();
 			for (ChannelAddress channel : channels) {
 				result.put(channel, this.getValueAsJson(data, channel));
@@ -133,22 +135,21 @@ public SortedMap<ZonedDateTime, SortedMap<ChannelAddress, JsonElement>> queryHis
 
 	/**
 	 * Gets the value of the record for the given Channel-Address as Json.
-	 * 
+	 *
 	 * @param channel the {@link ChannelAddress}
 	 * @return the value as JsonElement
 	 */
 	private JsonElement getValueAsJson(DataContainer data, ChannelAddress channel) {
-		Optional<Float> value = data.getValue(channel.toString());
+		var value = data.getValue(channel.toString());
 		if (value.isPresent()) {
 			return new JsonPrimitive(value.get());
-		} else {
-			return JsonNull.INSTANCE;
 		}
+		return JsonNull.INSTANCE;
 	}
 
 	/**
 	 * Gets the path to the timedata CSV file.
-	 * 
+	 *
 	 * @return the absolute path
 	 */
 	private File getPath() {
diff --git a/io.openems.edge.simulator/test/io/openems/edge/simulator/ess/symmetric/reacting/EssSymmetricTest.java b/io.openems.edge.simulator/test/io/openems/edge/simulator/ess/symmetric/reacting/EssSymmetricTest.java
index a478fe9cbcf..c6feaea44c9 100644
--- a/io.openems.edge.simulator/test/io/openems/edge/simulator/ess/symmetric/reacting/EssSymmetricTest.java
+++ b/io.openems.edge.simulator/test/io/openems/edge/simulator/ess/symmetric/reacting/EssSymmetricTest.java
@@ -25,7 +25,7 @@ public class EssSymmetricTest {
 
 	@Test
 	public void test() throws Exception {
-		final TimeLeapClock clock = new TimeLeapClock(
+		final var clock = new TimeLeapClock(
 				Instant.ofEpochSecond(1577836800) /* starts at 1. January 2020 00:00:00 */, ZoneOffset.UTC);
 		new ManagedSymmetricEssTest(new EssSymmetric()) //
 				.addReference("cm", new DummyConfigurationAdmin()) //
@@ -54,7 +54,7 @@ public void test() throws Exception {
 						.timeleap(clock, 30, ChronoUnit.MINUTES) //
 						.input(ESS_SET_ACTIVE_POWER_EQUALS, 10_000) //
 						.output(ESS_SOC, 25)); //
-		;
+
 	}
 
 }
diff --git a/io.openems.edge.simulator/test/io/openems/edge/simulator/ess/symmetric/reacting/MyConfig.java b/io.openems.edge.simulator/test/io/openems/edge/simulator/ess/symmetric/reacting/MyConfig.java
index d0d97415209..af65367583a 100644
--- a/io.openems.edge.simulator/test/io/openems/edge/simulator/ess/symmetric/reacting/MyConfig.java
+++ b/io.openems.edge.simulator/test/io/openems/edge/simulator/ess/symmetric/reacting/MyConfig.java
@@ -49,7 +49,7 @@ public MyConfig build() {
 
 	/**
 	 * Create a Config builder.
-	 * 
+	 *
 	 * @return a {@link Builder}
 	 */
 	public static Builder create() {

From c93038b2b49005d31aed5865262bfdb6eaf3facf Mon Sep 17 00:00:00 2001
From: Stefan Feilmeier <stefan.feilmeier@fenecon.de>
Date: Tue, 8 Mar 2022 16:27:24 +0100
Subject: [PATCH 84/96] Update
 io.openems.edge.solaredge/tesla.powerwall2/thermometer.api

---
 .../gridmeter/SolarEdgeGridMeter.java         |  2 ++
 .../edge/solaredge/pvinverter/SolarEdge.java  |  2 ++
 .../battery/TeslaPowerwall2Battery.java       |  3 +-
 .../tesla/powerwall2/core/ReadWorker.java     | 33 ++++++++++---------
 .../powerwall2/core/TeslaPowerwall2Core.java  |  6 ++--
 .../core/TeslaPowerwall2CoreImpl.java         | 10 ++++--
 .../edge/thermometer/api/Thermometer.java     |  2 +-
 7 files changed, 34 insertions(+), 24 deletions(-)

diff --git a/io.openems.edge.solaredge/src/io/openems/edge/solaredge/gridmeter/SolarEdgeGridMeter.java b/io.openems.edge.solaredge/src/io/openems/edge/solaredge/gridmeter/SolarEdgeGridMeter.java
index 404e38db1d5..1f7f09564c8 100644
--- a/io.openems.edge.solaredge/src/io/openems/edge/solaredge/gridmeter/SolarEdgeGridMeter.java
+++ b/io.openems.edge.solaredge/src/io/openems/edge/solaredge/gridmeter/SolarEdgeGridMeter.java
@@ -68,6 +68,7 @@ public SolarEdgeGridMeter() throws OpenemsException {
 	@Reference
 	protected ConfigurationAdmin cm;
 
+	@Override
 	@Reference(policy = ReferencePolicy.STATIC, policyOption = ReferencePolicyOption.GREEDY, cardinality = ReferenceCardinality.MANDATORY)
 	protected void setModbus(BridgeModbus modbus) {
 		super.setModbus(modbus);
@@ -82,6 +83,7 @@ void activate(ComponentContext context, Config config) throws OpenemsException {
 		this.config = config;
 	}
 
+	@Override
 	@Deactivate
 	protected void deactivate() {
 		super.deactivate();
diff --git a/io.openems.edge.solaredge/src/io/openems/edge/solaredge/pvinverter/SolarEdge.java b/io.openems.edge.solaredge/src/io/openems/edge/solaredge/pvinverter/SolarEdge.java
index 4c0bac876a8..74094917967 100644
--- a/io.openems.edge.solaredge/src/io/openems/edge/solaredge/pvinverter/SolarEdge.java
+++ b/io.openems.edge.solaredge/src/io/openems/edge/solaredge/pvinverter/SolarEdge.java
@@ -80,6 +80,7 @@ public SolarEdge() throws OpenemsException {
 		);
 	}
 
+	@Override
 	@Reference(policy = ReferencePolicy.STATIC, policyOption = ReferencePolicyOption.GREEDY, cardinality = ReferenceCardinality.MANDATORY)
 	protected void setModbus(BridgeModbus modbus) {
 		super.setModbus(modbus);
@@ -93,6 +94,7 @@ void activate(ComponentContext context, Config config) throws OpenemsException {
 		}
 	}
 
+	@Override
 	@Deactivate
 	protected void deactivate() {
 		super.deactivate();
diff --git a/io.openems.edge.tesla.powerwall2/src/io/openems/edge/tesla/powerwall2/battery/TeslaPowerwall2Battery.java b/io.openems.edge.tesla.powerwall2/src/io/openems/edge/tesla/powerwall2/battery/TeslaPowerwall2Battery.java
index d64da438bf9..e22045004fc 100644
--- a/io.openems.edge.tesla.powerwall2/src/io/openems/edge/tesla/powerwall2/battery/TeslaPowerwall2Battery.java
+++ b/io.openems.edge.tesla.powerwall2/src/io/openems/edge/tesla/powerwall2/battery/TeslaPowerwall2Battery.java
@@ -35,7 +35,7 @@
 public class TeslaPowerwall2Battery extends AbstractOpenemsComponent
 		implements SymmetricEss, AsymmetricEss, SinglePhaseEss, OpenemsComponent {
 
-	private final int CAPACITY = 14_200;
+	private final static int CAPACITY = 14_200;
 
 	@Reference(policy = ReferencePolicy.STATIC, policyOption = ReferencePolicyOption.GREEDY, cardinality = ReferenceCardinality.MANDATORY)
 	private TeslaPowerwall2Core core;
@@ -68,6 +68,7 @@ void activate(ComponentContext context, Config config) throws OpenemsNamedExcept
 		this.core.setBattery(this);
 	}
 
+	@Override
 	@Deactivate
 	protected void deactivate() {
 		if (this.core != null) {
diff --git a/io.openems.edge.tesla.powerwall2/src/io/openems/edge/tesla/powerwall2/core/ReadWorker.java b/io.openems.edge.tesla.powerwall2/src/io/openems/edge/tesla/powerwall2/core/ReadWorker.java
index 295cddd8477..0844de21744 100644
--- a/io.openems.edge.tesla.powerwall2/src/io/openems/edge/tesla/powerwall2/core/ReadWorker.java
+++ b/io.openems.edge.tesla.powerwall2/src/io/openems/edge/tesla/powerwall2/core/ReadWorker.java
@@ -40,15 +40,18 @@ protected ReadWorker(TeslaPowerwall2CoreImpl parent, Inet4Address ipAddress, int
 		/*
 		 * Disable SSL certificate checking
 		 */
-		SSLContext context = SSLContext.getInstance("TLSv1.2");
-		TrustManager[] trustManager = new TrustManager[] { new X509TrustManager() {
+		var context = SSLContext.getInstance("TLSv1.2");
+		TrustManager[] trustManager = { new X509TrustManager() {
+			@Override
 			public X509Certificate[] getAcceptedIssuers() {
 				return new X509Certificate[0];
 			}
 
+			@Override
 			public void checkClientTrusted(X509Certificate[] certificate, String str) {
 			}
 
+			@Override
 			public void checkServerTrusted(X509Certificate[] certificate, String str) {
 			}
 		} };
@@ -58,19 +61,19 @@ public void checkServerTrusted(X509Certificate[] certificate, String str) {
 
 	@Override
 	protected void forever() throws Throwable {
-		final AtomicBoolean communicationError = new AtomicBoolean(false);
+		final var communicationError = new AtomicBoolean(false);
 
 		this.parent.getBattery().ifPresent(battery -> {
 
 			try {
-				JsonObject soe = this.getResponse(URL_SYSTEM_STATUS_SOE);
+				var soe = this.getResponse(this.URL_SYSTEM_STATUS_SOE);
 				battery._setSoc(Math.round(JsonUtils.getAsFloat(soe, "percentage")));
 
-				JsonObject agg = this.getResponse(URL_METERS_AGGREGATES);
-				JsonObject aggBattery = JsonUtils.getAsJsonObject(agg, "battery");
-				float essActivePower = JsonUtils.getAsFloat(aggBattery, "instant_power");
+				var agg = this.getResponse(this.URL_METERS_AGGREGATES);
+				var aggBattery = JsonUtils.getAsJsonObject(agg, "battery");
+				var essActivePower = JsonUtils.getAsFloat(aggBattery, "instant_power");
 				battery._setActivePower(Math.round(essActivePower));
-				float essReactivePower = JsonUtils.getAsFloat(aggBattery, "instant_reactive_power");
+				var essReactivePower = JsonUtils.getAsFloat(aggBattery, "instant_reactive_power");
 				battery._setReactivePower(Math.round(essReactivePower));
 				switch (battery.getPhase()) {
 				case L1:
@@ -112,20 +115,18 @@ protected void forever() throws Throwable {
 
 	/**
 	 * Gets the JSON response of a HTTPS GET Request.
-	 * 
+	 *
 	 * @param path the api path
 	 * @return the JsonObject
 	 * @throws OpenemsNamedException on error
 	 */
 	private JsonObject getResponse(String path) throws OpenemsNamedException {
 		try {
-			URL url = new URL(this.baseUrl + path);
-			HttpsURLConnection connection = (HttpsURLConnection) url.openConnection();
-			connection.setHostnameVerifier((hostname, session) -> {
-				return true;
-			});
-			try (BufferedReader reader = new BufferedReader(new InputStreamReader(connection.getInputStream()))) {
-				String content = reader.lines().collect(Collectors.joining());
+			var url = new URL(this.baseUrl + path);
+			var connection = (HttpsURLConnection) url.openConnection();
+			connection.setHostnameVerifier((hostname, session) -> true);
+			try (var reader = new BufferedReader(new InputStreamReader(connection.getInputStream()))) {
+				var content = reader.lines().collect(Collectors.joining());
 				return JsonUtils.parseToJsonObject(content);
 			}
 		} catch (IOException e) {
diff --git a/io.openems.edge.tesla.powerwall2/src/io/openems/edge/tesla/powerwall2/core/TeslaPowerwall2Core.java b/io.openems.edge.tesla.powerwall2/src/io/openems/edge/tesla/powerwall2/core/TeslaPowerwall2Core.java
index a5de7409bd3..1c09b3e687e 100644
--- a/io.openems.edge.tesla.powerwall2/src/io/openems/edge/tesla/powerwall2/core/TeslaPowerwall2Core.java
+++ b/io.openems.edge.tesla.powerwall2/src/io/openems/edge/tesla/powerwall2/core/TeslaPowerwall2Core.java
@@ -32,7 +32,7 @@ public Doc doc() {
 
 	/**
 	 * Gets the Channel for {@link ChannelId#SLAVE_COMMUNICATION_FAILED}.
-	 * 
+	 *
 	 * @return the Channel
 	 */
 	public default StateChannel getSlaveCommunicationFailedChannel() {
@@ -42,7 +42,7 @@ public default StateChannel getSlaveCommunicationFailedChannel() {
 	/**
 	 * Gets the Slave Communication Failed State. See
 	 * {@link ChannelId#SLAVE_COMMUNICATION_FAILED}.
-	 * 
+	 *
 	 * @return the Channel {@link Value}
 	 */
 	public default Value<Boolean> getSlaveCommunicationFailed() {
@@ -52,7 +52,7 @@ public default Value<Boolean> getSlaveCommunicationFailed() {
 	/**
 	 * Internal method to set the 'nextValue' on
 	 * {@link ChannelId#SLAVE_COMMUNICATION_FAILED} Channel.
-	 * 
+	 *
 	 * @param value the next value
 	 */
 	public default void _setSlaveCommunicationFailed(boolean value) {
diff --git a/io.openems.edge.tesla.powerwall2/src/io/openems/edge/tesla/powerwall2/core/TeslaPowerwall2CoreImpl.java b/io.openems.edge.tesla.powerwall2/src/io/openems/edge/tesla/powerwall2/core/TeslaPowerwall2CoreImpl.java
index 31d386569dc..9741d3e7a7c 100644
--- a/io.openems.edge.tesla.powerwall2/src/io/openems/edge/tesla/powerwall2/core/TeslaPowerwall2CoreImpl.java
+++ b/io.openems.edge.tesla.powerwall2/src/io/openems/edge/tesla/powerwall2/core/TeslaPowerwall2CoreImpl.java
@@ -1,6 +1,7 @@
 package io.openems.edge.tesla.powerwall2.core;
 
 import java.net.Inet4Address;
+import java.net.InetAddress;
 import java.net.UnknownHostException;
 import java.security.KeyManagementException;
 import java.security.NoSuchAlgorithmException;
@@ -35,7 +36,7 @@ public class TeslaPowerwall2CoreImpl extends AbstractOpenemsComponent
 
 	private ReadWorker worker = null;
 
-	private AtomicReference<TeslaPowerwall2Battery> battery = new AtomicReference<>();
+	private final AtomicReference<TeslaPowerwall2Battery> battery = new AtomicReference<>();
 
 	public TeslaPowerwall2CoreImpl() {
 		super(//
@@ -48,10 +49,11 @@ public TeslaPowerwall2CoreImpl() {
 	void activate(ComponentContext context, Config config)
 			throws UnknownHostException, KeyManagementException, NoSuchAlgorithmException {
 		super.activate(context, config.id(), config.alias(), config.enabled());
-		this.worker = new ReadWorker(this, (Inet4Address) Inet4Address.getByName(config.ipAddress()), config.port());
+		this.worker = new ReadWorker(this, (Inet4Address) InetAddress.getByName(config.ipAddress()), config.port());
 		this.worker.activate(config.id());
 	}
 
+	@Override
 	@Deactivate
 	protected void deactivate() {
 		if (this.worker != null) {
@@ -73,12 +75,14 @@ public void handleEvent(Event event) {
 		}
 	}
 
+	@Override
 	public void setBattery(TeslaPowerwall2Battery battery) {
 		this.battery.set(battery);
 	}
 
+	@Override
 	public Optional<TeslaPowerwall2Battery> getBattery() {
-		return Optional.ofNullable(battery.get());
+		return Optional.ofNullable(this.battery.get());
 	}
 
 }
diff --git a/io.openems.edge.thermometer.api/src/io/openems/edge/thermometer/api/Thermometer.java b/io.openems.edge.thermometer.api/src/io/openems/edge/thermometer/api/Thermometer.java
index 45e57c6f5ed..45961036adf 100644
--- a/io.openems.edge.thermometer.api/src/io/openems/edge/thermometer/api/Thermometer.java
+++ b/io.openems.edge.thermometer.api/src/io/openems/edge/thermometer/api/Thermometer.java
@@ -15,7 +15,7 @@ public interface Thermometer extends OpenemsComponent {
 	public enum ChannelId implements io.openems.edge.common.channel.ChannelId {
 		/**
 		 * Temperature.
-		 * 
+		 *
 		 * <ul>
 		 * <li>Interface: Thermometer
 		 * <li>Type: Integer

From e9a1c2a775be5bd298f1d8a882bc6cae51ff7cfe Mon Sep 17 00:00:00 2001
From: Stefan Feilmeier <stefan.feilmeier@fenecon.de>
Date: Tue, 8 Mar 2022 16:29:44 +0100
Subject: [PATCH 85/96] Update io.openems.edge.timedata.*

---
 .../openems/edge/timedata/api/Timedata.java   |   2 +-
 .../edge/timedata/api/TimedataProvider.java   |   2 +-
 .../api/utils/CalculateActiveTime.java        |  13 +-
 .../api/utils/CalculateEnergyFromPower.java   |  30 +--
 .../edge/timedata/test/DummyTimedata.java     |   6 +-
 .../edge/timedata/influxdb/Config.java        |   2 +-
 .../timedata/influxdb/InfluxTimedataImpl.java | 117 +++++------
 .../edge/timedata/rrd4j/RecordWorker.java     |  52 ++---
 .../edge/timedata/rrd4j/Rrd4jTimedata.java    |  12 +-
 .../timedata/rrd4j/Rrd4jTimedataImpl.java     | 197 +++++++++---------
 .../timedata/rrd4j/Rrd4jTimedataImplTest.java |  56 +++--
 11 files changed, 232 insertions(+), 257 deletions(-)

diff --git a/io.openems.edge.timedata.api/src/io/openems/edge/timedata/api/Timedata.java b/io.openems.edge.timedata.api/src/io/openems/edge/timedata/api/Timedata.java
index b4bc7737ff0..3889fdd95cd 100644
--- a/io.openems.edge.timedata.api/src/io/openems/edge/timedata/api/Timedata.java
+++ b/io.openems.edge.timedata.api/src/io/openems/edge/timedata/api/Timedata.java
@@ -29,7 +29,7 @@ public Doc doc() {
 
 	/**
 	 * Gets the latest known value for the given {@link ChannelAddress}.
-	 * 
+	 *
 	 * @param channelAddress the ChannelAddress to be queried
 	 * @return the latest known value or Empty
 	 */
diff --git a/io.openems.edge.timedata.api/src/io/openems/edge/timedata/api/TimedataProvider.java b/io.openems.edge.timedata.api/src/io/openems/edge/timedata/api/TimedataProvider.java
index 0130623b572..00dcff1fa98 100644
--- a/io.openems.edge.timedata.api/src/io/openems/edge/timedata/api/TimedataProvider.java
+++ b/io.openems.edge.timedata.api/src/io/openems/edge/timedata/api/TimedataProvider.java
@@ -9,7 +9,7 @@ public interface TimedataProvider extends OpenemsComponent {
 
 	/**
 	 * Gets the {@link Timedata} service.
-	 * 
+	 *
 	 * @return the service or null if it is not (yet) available.
 	 */
 	public Timedata getTimedata();
diff --git a/io.openems.edge.timedata.api/src/io/openems/edge/timedata/api/utils/CalculateActiveTime.java b/io.openems.edge.timedata.api/src/io/openems/edge/timedata/api/utils/CalculateActiveTime.java
index c803704f965..e9613a697b1 100644
--- a/io.openems.edge.timedata.api/src/io/openems/edge/timedata/api/utils/CalculateActiveTime.java
+++ b/io.openems.edge.timedata.api/src/io/openems/edge/timedata/api/utils/CalculateActiveTime.java
@@ -7,14 +7,13 @@
 import io.openems.common.types.OpenemsType;
 import io.openems.edge.common.channel.ChannelId;
 import io.openems.edge.common.type.TypeUtils;
-import io.openems.edge.timedata.api.Timedata;
 import io.openems.edge.timedata.api.TimedataProvider;
 
 public class CalculateActiveTime {
 
 	/**
 	 * Available States.
-	 * 
+	 *
 	 * <p>
 	 * IMPLEMENTATION NOTE: we are using a custom StateMachine here and not the
 	 * generic implementation in 'io.openems.edge.common.statemachine', because one
@@ -65,7 +64,7 @@ public CalculateActiveTime(TimedataProvider timedataProvider, ChannelId channelI
 
 	/**
 	 * Counts up the time channel if the given value is true.
-	 * 
+	 *
 	 * @param isActive boolean if the corresponding channel should be updated.
 	 */
 	public void update(boolean isActive) {
@@ -90,8 +89,8 @@ public void update(boolean isActive) {
 	}
 
 	private void initializeActiveTimeFromTimedata() {
-		Timedata timedata = this.timedataProvider.getTimedata();
-		String componentId = this.timedataProvider.id();
+		var timedata = this.timedataProvider.getTimedata();
+		var componentId = this.timedataProvider.id();
 		if (timedata == null || componentId == null) {
 			// Wait for Timedata service to appear or Component to be activated
 			this.state = State.TIMEDATA_QUERY_NOT_STARTED;
@@ -119,14 +118,14 @@ private void initializeActiveTimeFromTimedata() {
 
 	/**
 	 * Calculate the active time.
-	 * 
+	 *
 	 * @param isActive
 	 */
 	private void calculateActiveTime(boolean isActive) {
 		if (this.lastTimestamp != null && this.lastStoredActiveTime != null && this.lastIsActive && isActive) {
 
 			// Calculate duration since last value
-			long duration /* [msec] */ = Duration.between(this.lastTimestamp, Instant.now()).toMillis();
+			var duration /* [msec] */ = Duration.between(this.lastTimestamp, Instant.now()).toMillis();
 
 			// Add to continuous cumulated time
 			this.continuousTime += duration;
diff --git a/io.openems.edge.timedata.api/src/io/openems/edge/timedata/api/utils/CalculateEnergyFromPower.java b/io.openems.edge.timedata.api/src/io/openems/edge/timedata/api/utils/CalculateEnergyFromPower.java
index d526ca3bf74..3a3c063aa6b 100644
--- a/io.openems.edge.timedata.api/src/io/openems/edge/timedata/api/utils/CalculateEnergyFromPower.java
+++ b/io.openems.edge.timedata.api/src/io/openems/edge/timedata/api/utils/CalculateEnergyFromPower.java
@@ -14,40 +14,40 @@
 
 /**
  * Calculates the value for energy channels in [Wh] from Power values in [W].
- * 
+ *
  * <p>
  * This is commonly used to calculate SymmetricEss or SymmetricMeter
  * ActiveChargePower and ActiveDischargePower from ActivePower channels. To use
  * it, you have to:
- * 
+ *
  * <ol>
  * <li>Make your OpenemsComponent implement {@link TimedataProvider}:
- * 
+ *
  * <pre>
  * public class ComponentImpl extends AbstractOpenemsComponent implements
  * OpenemsComponent, TimedataProvider, EventHandler {
  * </pre>
- * 
+ *
  * <li>Add a @Reference to {@link Timedata}. It's a good idea to make this
  * reference 'dynamic', otherwise your component will not start if there is no
  * Timedata service configured.
- * 
+ *
  * <pre>
  * &#64;Reference(policy = ReferencePolicy.DYNAMIC, policyOption = ReferencePolicyOption.GREEDY, cardinality = ReferenceCardinality.OPTIONAL)
  * private volatile Timedata timedata = null;
  * </pre>
- * 
+ *
  * <li>Add a private instance of {@link CalculateEnergyFromPower} for each
  * energy channel:
- * 
+ *
  * <pre>
  * private final CalculateEnergyFromPower calculateEnergy = new CalculateEnergyFromPower(this,
  * 		SymmetricEss.ChannelId.ACTIVE_CHARGE_ENERGY);
  * </pre>
- * 
+ *
  * <li>Call the {@link #update(Integer)} method on each cycle - e.g. via an
  * {@link EventHandler}.
- * 
+ *
  * <pre>
  * this.calculateEnergy.update(power);
  * </pre>
@@ -57,7 +57,7 @@ public class CalculateEnergyFromPower {
 
 	/**
 	 * Available States.
-	 * 
+	 *
 	 * <p>
 	 * IMPLEMENTATION NOTE: we are using a custom StateMachine here and not the
 	 * generic implementation in 'io.openems.edge.common.statemachine', because one
@@ -109,7 +109,7 @@ public CalculateEnergyFromPower(TimedataProvider component, ChannelId channelId)
 
 	/**
 	 * Calculate the Energy and update the Channel.
-	 * 
+	 *
 	 * @param power the latest power value in [W]
 	 */
 	public void update(Integer power) {
@@ -136,8 +136,8 @@ public void update(Integer power) {
 	 * Initialize cumulated energy value from from Timedata service.
 	 */
 	private void initializeCumulatedEnergyFromTimedata() {
-		Timedata timedata = this.component.getTimedata();
-		String componentId = this.component.id();
+		var timedata = this.component.getTimedata();
+		var componentId = this.component.id();
 		if (timedata == null || componentId == null) {
 			// Wait for Timedata service to appear or Component to be activated
 			this.state = State.TIMEDATA_QUERY_NOT_STARTED;
@@ -173,10 +173,10 @@ private void calculateEnergy() {
 
 		} else {
 			// calculate duration since last value
-			long duration /* [msec] */ = Duration.between(this.lastTimestamp, Instant.now()).toMillis();
+			var duration /* [msec] */ = Duration.between(this.lastTimestamp, Instant.now()).toMillis();
 
 			// calculate energy since last run in [Wmsec]
-			long continuousEnergy /* [Wmsec] */ = this.lastPower /* [W] */ * duration /* [msec] */;
+			var continuousEnergy /* [Wmsec] */ = this.lastPower /* [W] */ * duration /* [msec] */;
 
 			// add to continuous cumulated energy
 			this.continuousCumulatedEnergy += continuousEnergy;
diff --git a/io.openems.edge.timedata.api/src/io/openems/edge/timedata/test/DummyTimedata.java b/io.openems.edge.timedata.api/src/io/openems/edge/timedata/test/DummyTimedata.java
index 0677c1908d3..8ac8adf8bf6 100644
--- a/io.openems.edge.timedata.api/src/io/openems/edge/timedata/test/DummyTimedata.java
+++ b/io.openems.edge.timedata.api/src/io/openems/edge/timedata/test/DummyTimedata.java
@@ -40,7 +40,7 @@ public DummyTimedata(String id) {
 
 	/**
 	 * Adds a value to the Dummy Timedata.
-	 * 
+	 *
 	 * @param timestamp      the {@link ZonedDateTime}
 	 * @param channelAddress the {@link ChannelAddress}
 	 * @param value          the value as {@link Integer}
@@ -51,13 +51,13 @@ public void add(ZonedDateTime timestamp, ChannelAddress channelAddress, Integer
 
 	/**
 	 * Adds a value to the Dummy Timedata.
-	 * 
+	 *
 	 * @param timestamp      the {@link ZonedDateTime}
 	 * @param channelAddress the {@link ChannelAddress}
 	 * @param value          the value as {@link JsonElement}
 	 */
 	public void add(ZonedDateTime timestamp, ChannelAddress channelAddress, JsonElement value) {
-		SortedMap<ChannelAddress, JsonElement> perTime = this.data.get(timestamp);
+		var perTime = this.data.get(timestamp);
 		if (perTime == null) {
 			perTime = new TreeMap<>();
 			this.data.put(timestamp, perTime);
diff --git a/io.openems.edge.timedata.influxdb/src/io/openems/edge/timedata/influxdb/Config.java b/io.openems.edge.timedata.influxdb/src/io/openems/edge/timedata/influxdb/Config.java
index b84bbf0748d..798c17268e0 100644
--- a/io.openems.edge.timedata.influxdb/src/io/openems/edge/timedata/influxdb/Config.java
+++ b/io.openems.edge.timedata.influxdb/src/io/openems/edge/timedata/influxdb/Config.java
@@ -22,7 +22,7 @@
 
 	@AttributeDefinition(name = "TCP Port", description = "TCP Port of InfluxDB server.")
 	int port() default 8086;
-	
+
 	@AttributeDefinition(name = "No of Cycles", description = "How many Cycles till data is written to InfluxDB.")
 	int noOfCycles() default 1;
 
diff --git a/io.openems.edge.timedata.influxdb/src/io/openems/edge/timedata/influxdb/InfluxTimedataImpl.java b/io.openems.edge.timedata.influxdb/src/io/openems/edge/timedata/influxdb/InfluxTimedataImpl.java
index 9bf86b0d30f..ecd2c498f08 100644
--- a/io.openems.edge.timedata.influxdb/src/io/openems/edge/timedata/influxdb/InfluxTimedataImpl.java
+++ b/io.openems.edge.timedata.influxdb/src/io/openems/edge/timedata/influxdb/InfluxTimedataImpl.java
@@ -11,7 +11,6 @@
 import java.util.stream.StreamSupport;
 
 import org.influxdb.dto.Point;
-import org.influxdb.dto.Point.Builder;
 import org.osgi.service.component.ComponentContext;
 import org.osgi.service.component.annotations.Activate;
 import org.osgi.service.component.annotations.Component;
@@ -79,14 +78,15 @@ void activate(ComponentContext context, Config config) {
 		this.influxConnector = new InfluxConnector(config.ip(), config.port(), config.username(), config.password(),
 				config.database(), config.retentionPolicy(), config.isReadOnly(), //
 				(failedPoints, throwable) -> {
-					String pointsString = StreamSupport.stream(failedPoints.spliterator(), false)
-							.map(Point::lineProtocol).collect(Collectors.joining(","));
+					var pointsString = StreamSupport.stream(failedPoints.spliterator(), false).map(Point::lineProtocol)
+							.collect(Collectors.joining(","));
 					this.logError(this.log, "Unable to write to InfluxDB: " + throwable.getMessage() + " for "
 							+ StringUtils.toShortString(pointsString, 100));
 				});
 		this.config = config;
 	}
 
+	@Override
 	@Deactivate
 	protected void deactivate() {
 		super.deactivate();
@@ -108,64 +108,65 @@ public void handleEvent(Event event) {
 	}
 
 	protected synchronized void collectAndWriteChannelValues() {
-		int cycleTime = this.cycle.getCycleTime(); // [ms]
-		long timestamp = System.currentTimeMillis() / cycleTime * cycleTime; // Round value to Cycle-Time in [ms]
+		var cycleTime = this.cycle.getCycleTime(); // [ms]
+		var timestamp = System.currentTimeMillis() / cycleTime * cycleTime; // Round value to Cycle-Time in [ms]
 
 		if (++this.cycleCount >= this.config.noOfCycles()) {
 			this.cycleCount = 0;
-			final Builder point = Point.measurement(InfluxConnector.MEASUREMENT).time(timestamp, TimeUnit.MILLISECONDS);
-			final AtomicBoolean addedAtLeastOneChannelValue = new AtomicBoolean(false);
-
-			this.componentManager.getEnabledComponents().stream().filter(c -> c.isEnabled()).forEach(component -> {
-				component.channels().forEach(channel -> {
-					switch (channel.channelDoc().getAccessMode()) {
-					case WRITE_ONLY:
-						// ignore Write-Only-Channels
-						return;
-					case READ_ONLY:
-					case READ_WRITE:
-						break;
-					}
-
-					Optional<?> valueOpt = channel.value().asOptional();
-					if (!valueOpt.isPresent()) {
-						// ignore not available channels
-						return;
-					}
-					Object value = valueOpt.get();
-					String address = channel.address().toString();
-					try {
-						switch (channel.getType()) {
-						case BOOLEAN:
-							point.addField(address, ((Boolean) value ? 1 : 0));
-							break;
-						case SHORT:
-							point.addField(address, (Short) value);
-							break;
-						case INTEGER:
-							point.addField(address, (Integer) value);
-							break;
-						case LONG:
-							point.addField(address, (Long) value);
-							break;
-						case FLOAT:
-							point.addField(address, (Float) value);
-							break;
-						case DOUBLE:
-							point.addField(address, (Double) value);
-							break;
-						case STRING:
-							point.addField(address, (String) value);
-							break;
-						}
-					} catch (IllegalArgumentException e) {
-						this.log.warn(
-								"Unable to add Channel [" + address + "] value [" + value + "]: " + e.getMessage());
-						return;
-					}
-					addedAtLeastOneChannelValue.set(true);
-				});
-			});
+			final var point = Point.measurement(InfluxConnector.MEASUREMENT).time(timestamp, TimeUnit.MILLISECONDS);
+			final var addedAtLeastOneChannelValue = new AtomicBoolean(false);
+
+			this.componentManager.getEnabledComponents().stream().filter(OpenemsComponent::isEnabled)
+					.forEach(component -> {
+						component.channels().forEach(channel -> {
+							switch (channel.channelDoc().getAccessMode()) {
+							case WRITE_ONLY:
+								// ignore Write-Only-Channels
+								return;
+							case READ_ONLY:
+							case READ_WRITE:
+								break;
+							}
+
+							Optional<?> valueOpt = channel.value().asOptional();
+							if (!valueOpt.isPresent()) {
+								// ignore not available channels
+								return;
+							}
+							Object value = valueOpt.get();
+							var address = channel.address().toString();
+							try {
+								switch (channel.getType()) {
+								case BOOLEAN:
+									point.addField(address, (Boolean) value ? 1 : 0);
+									break;
+								case SHORT:
+									point.addField(address, (Short) value);
+									break;
+								case INTEGER:
+									point.addField(address, (Integer) value);
+									break;
+								case LONG:
+									point.addField(address, (Long) value);
+									break;
+								case FLOAT:
+									point.addField(address, (Float) value);
+									break;
+								case DOUBLE:
+									point.addField(address, (Double) value);
+									break;
+								case STRING:
+									point.addField(address, (String) value);
+									break;
+								}
+							} catch (IllegalArgumentException e) {
+								this.log.warn("Unable to add Channel [" + address + "] value [" + value + "]: "
+										+ e.getMessage());
+								return;
+							}
+							addedAtLeastOneChannelValue.set(true);
+						});
+					});
 
 			if (addedAtLeastOneChannelValue.get()) {
 				try {
diff --git a/io.openems.edge.timedata.rrd4j/src/io/openems/edge/timedata/rrd4j/RecordWorker.java b/io.openems.edge.timedata.rrd4j/src/io/openems/edge/timedata/rrd4j/RecordWorker.java
index 22edc9cc19c..0a150690e68 100644
--- a/io.openems.edge.timedata.rrd4j/src/io/openems/edge/timedata/rrd4j/RecordWorker.java
+++ b/io.openems.edge.timedata.rrd4j/src/io/openems/edge/timedata/rrd4j/RecordWorker.java
@@ -12,7 +12,6 @@
 import java.util.stream.DoubleStream;
 
 import org.rrd4j.core.RrdDb;
-import org.rrd4j.core.Sample;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -22,7 +21,7 @@
 import io.openems.common.types.OpenemsType;
 import io.openems.common.worker.AbstractImmediateWorker;
 import io.openems.edge.common.channel.Channel;
-import io.openems.edge.common.channel.Doc;
+import io.openems.edge.common.channel.value.Value;
 import io.openems.edge.common.component.OpenemsComponent;
 
 public class RecordWorker extends AbstractImmediateWorker {
@@ -50,7 +49,7 @@ public Record(long timestamp, ChannelAddress address, Unit unit, double value) {
 	}
 
 	// Record queue
-	private LinkedBlockingQueue<Record> records = new LinkedBlockingQueue<>();
+	private final LinkedBlockingQueue<Record> records = new LinkedBlockingQueue<>();
 
 	// keeps the last recorded timestamp
 	private Instant lastTimestamp = Instant.MIN;
@@ -66,8 +65,8 @@ public RecordWorker(Rrd4jTimedataImpl parent) {
 	 * RRD4J.
 	 */
 	public void collectData() {
-		Instant timestamp = Instant.now().truncatedTo(ChronoUnit.SECONDS);
-		final LocalDateTime nextReadChannelValuesSince = LocalDateTime.now();
+		var timestamp = Instant.now().truncatedTo(ChronoUnit.SECONDS);
+		final var nextReadChannelValuesSince = LocalDateTime.now();
 
 		// Increase CycleCount
 		this.cycleCount += 1;
@@ -93,7 +92,7 @@ public void collectData() {
 
 		for (OpenemsComponent component : this.parent.componentManager.getEnabledComponents()) {
 			for (Channel<?> channel : component.channels()) {
-				Doc doc = channel.channelDoc();
+				var doc = channel.channelDoc();
 				if ( // Ignore Low-Priority Channels
 				doc.getPersistencePriority().isLowerThan(this.parent.persistencePriority)
 						// Ignore WRITE_ONLY Channels
@@ -103,14 +102,14 @@ public void collectData() {
 
 				ToDoubleFunction<? super Object> channelMapFunction = this
 						.getChannelMapFunction(channel.channelDoc().getType());
-				Function<DoubleStream, OptionalDouble> channelAggregateFunction = this
+				var channelAggregateFunction = this
 						.getChannelAggregateFunction(channel.channelDoc().getUnit());
 
-				OptionalDouble value = channelAggregateFunction.apply(//
+				var value = channelAggregateFunction.apply(//
 						channel.getPastValues() //
 								.tailMap(this.readChannelValuesSince, false) // new values since last recording
 								.values().stream() //
-								.map(v -> v.get()) //
+								.map(Value::get) //
 								.filter(v -> v != null) // only not-null values
 								.mapToDouble(channelMapFunction) // convert to double
 				);
@@ -136,7 +135,7 @@ public void collectData() {
 
 	@Override
 	protected void forever() throws InterruptedException {
-		Record record = this.records.take();
+		var record = this.records.take();
 		RrdDb database = null;
 
 		try {
@@ -147,7 +146,7 @@ protected void forever() throws InterruptedException {
 				// YYY. Last update time was ZZZ, at least one second step is required".
 
 				// Add Sample to RRD4J
-				Sample sample = database.createSample(record.timestamp);
+				var sample = database.createSample(record.timestamp);
 				sample.setValue(0, record.value);
 				sample.update();
 			}
@@ -170,28 +169,15 @@ protected void forever() throws InterruptedException {
 		}
 	}
 
-	private static final ToDoubleFunction<? super Object> MAP_BOOLEAN_TO_DOUBLE = (value) -> {
-		return (Boolean) value ? 1d : 0d;
-	};
-
-	private static final ToDoubleFunction<? super Object> MAP_SHORT_TO_DOUBLE = (value) -> {
-		return ((Short) value).doubleValue();
-	};
-	private static final ToDoubleFunction<? super Object> MAP_INTEGER_TO_DOUBLE = (value) -> {
-		return ((Integer) value).doubleValue();
-	};
-	private static final ToDoubleFunction<? super Object> MAP_LONG_TO_DOUBLE = (value) -> {
-		return ((Long) value).doubleValue();
-	};
-	private static final ToDoubleFunction<? super Object> MAP_FLOAT_TO_DOUBLE = (value) -> {
-		return ((Float) value).doubleValue();
-	};
-	private static final ToDoubleFunction<? super Object> MAP_DOUBLE_TO_DOUBLE = (value) -> {
-		return (Double) value;
-	};
-	private static final ToDoubleFunction<? super Object> MAP_TO_DOUBLE_NOT_SUPPORTED = (value) -> {
-		return 0d;
-	};
+	private static final ToDoubleFunction<? super Object> MAP_BOOLEAN_TO_DOUBLE = value -> ((Boolean) value ? 1d : 0d);
+
+	private static final ToDoubleFunction<? super Object> MAP_SHORT_TO_DOUBLE = value -> ((Short) value).doubleValue();
+	private static final ToDoubleFunction<? super Object> MAP_INTEGER_TO_DOUBLE = value -> ((Integer) value)
+			.doubleValue();
+	private static final ToDoubleFunction<? super Object> MAP_LONG_TO_DOUBLE = value -> ((Long) value).doubleValue();
+	private static final ToDoubleFunction<? super Object> MAP_FLOAT_TO_DOUBLE = value -> ((Float) value).doubleValue();
+	private static final ToDoubleFunction<? super Object> MAP_DOUBLE_TO_DOUBLE = value -> ((Double) value);
+	private static final ToDoubleFunction<? super Object> MAP_TO_DOUBLE_NOT_SUPPORTED = value -> 0d;
 
 	private ToDoubleFunction<? super Object> getChannelMapFunction(OpenemsType openemsType) {
 		switch (openemsType) {
diff --git a/io.openems.edge.timedata.rrd4j/src/io/openems/edge/timedata/rrd4j/Rrd4jTimedata.java b/io.openems.edge.timedata.rrd4j/src/io/openems/edge/timedata/rrd4j/Rrd4jTimedata.java
index 234f6f78ae8..da163c21121 100644
--- a/io.openems.edge.timedata.rrd4j/src/io/openems/edge/timedata/rrd4j/Rrd4jTimedata.java
+++ b/io.openems.edge.timedata.rrd4j/src/io/openems/edge/timedata/rrd4j/Rrd4jTimedata.java
@@ -27,7 +27,7 @@ public Doc doc() {
 
 	/**
 	 * Gets the Channel for {@link ChannelId#QUEUE_IS_FULL}.
-	 * 
+	 *
 	 * @return the Channel
 	 */
 	public default StateChannel getQueueIsFullChannel() {
@@ -36,7 +36,7 @@ public default StateChannel getQueueIsFullChannel() {
 
 	/**
 	 * Gets the {@link StateChannel} for {@link ChannelId#QUEUE_IS_FULL}.
-	 * 
+	 *
 	 * @return the Channel {@link Value}
 	 */
 	public default Value<Boolean> getQueueIsFull() {
@@ -46,7 +46,7 @@ public default Value<Boolean> getQueueIsFull() {
 	/**
 	 * Internal method to set the 'nextValue' on {@link ChannelId#QUEUE_IS_FULL}
 	 * Channel.
-	 * 
+	 *
 	 * @param value the next value
 	 */
 	public default void _setQueueIsFull(Boolean value) {
@@ -55,7 +55,7 @@ public default void _setQueueIsFull(Boolean value) {
 
 	/**
 	 * Gets the Channel for {@link ChannelId#UNABLE_TO_INSERT_SAMPLE}.
-	 * 
+	 *
 	 * @return the Channel
 	 */
 	public default StateChannel getUnableToInsertSampleChannel() {
@@ -64,7 +64,7 @@ public default StateChannel getUnableToInsertSampleChannel() {
 
 	/**
 	 * Gets the {@link StateChannel} for {@link ChannelId#UNABLE_TO_INSERT_SAMPLE}.
-	 * 
+	 *
 	 * @return the Channel {@link Value}
 	 */
 	public default Value<Boolean> getUnableToInsertSample() {
@@ -74,7 +74,7 @@ public default Value<Boolean> getUnableToInsertSample() {
 	/**
 	 * Internal method to set the 'nextValue' on
 	 * {@link ChannelId#UNABLE_TO_INSERT_SAMPLE} Channel.
-	 * 
+	 *
 	 * @param value the next value
 	 */
 	public default void _setUnableToInsertSample(Boolean value) {
diff --git a/io.openems.edge.timedata.rrd4j/src/io/openems/edge/timedata/rrd4j/Rrd4jTimedataImpl.java b/io.openems.edge.timedata.rrd4j/src/io/openems/edge/timedata/rrd4j/Rrd4jTimedataImpl.java
index 719e19b5d6f..cab246eca55 100644
--- a/io.openems.edge.timedata.rrd4j/src/io/openems/edge/timedata/rrd4j/Rrd4jTimedataImpl.java
+++ b/io.openems.edge.timedata.rrd4j/src/io/openems/edge/timedata/rrd4j/Rrd4jTimedataImpl.java
@@ -6,9 +6,9 @@
 import java.nio.file.Files;
 import java.nio.file.Paths;
 import java.time.Instant;
-import java.time.ZoneId;
 import java.time.ZoneOffset;
 import java.time.ZonedDateTime;
+import java.util.Arrays;
 import java.util.Optional;
 import java.util.Set;
 import java.util.SortedMap;
@@ -28,12 +28,10 @@
 import org.rrd4j.ConsolFun;
 import org.rrd4j.DsType;
 import org.rrd4j.core.DsDef;
-import org.rrd4j.core.FetchData;
 import org.rrd4j.core.FetchRequest;
 import org.rrd4j.core.RrdDb;
 import org.rrd4j.core.RrdDef;
 import org.rrd4j.core.RrdRandomAccessFileBackendFactory;
-import org.rrd4j.core.Sample;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -100,6 +98,7 @@ void activate(ComponentContext context, Config config) throws Exception {
 		}
 	}
 
+	@Override
 	@Deactivate
 	protected void deactivate() {
 		this.worker.deactivate();
@@ -110,13 +109,13 @@ protected void deactivate() {
 	public SortedMap<ZonedDateTime, SortedMap<ChannelAddress, JsonElement>> queryHistoricData(String edgeId,
 			ZonedDateTime fromDate, ZonedDateTime toDate, Set<ChannelAddress> channels, int resolution)
 			throws OpenemsNamedException {
-		ZoneId timezone = fromDate.getZone();
+		var timezone = fromDate.getZone();
 		SortedMap<ZonedDateTime, SortedMap<ChannelAddress, JsonElement>> table = new TreeMap<>();
 
 		RrdDb database = null;
 		try {
-			long fromTimestamp = fromDate.withZoneSameInstant(ZoneOffset.UTC).toEpochSecond();
-			long toTimeStamp = toDate.withZoneSameInstant(ZoneOffset.UTC).toEpochSecond();
+			var fromTimestamp = fromDate.withZoneSameInstant(ZoneOffset.UTC).toEpochSecond();
+			var toTimeStamp = toDate.withZoneSameInstant(ZoneOffset.UTC).toEpochSecond();
 
 			for (ChannelAddress channelAddress : channels) {
 				Channel<?> channel = this.componentManager.getChannel(channelAddress);
@@ -125,27 +124,27 @@ public SortedMap<ZonedDateTime, SortedMap<ChannelAddress, JsonElement>> queryHis
 					continue; // not existing -> abort
 				}
 
-				ChannelDef chDef = this.getDsDefForChannel(channel.channelDoc().getUnit());
-				FetchRequest request = database.createFetchRequest(chDef.consolFun, fromTimestamp, toTimeStamp,
+				var chDef = this.getDsDefForChannel(channel.channelDoc().getUnit());
+				var request = database.createFetchRequest(chDef.consolFun, fromTimestamp, toTimeStamp,
 						resolution);
 
 				// Post-Process data
-				double[] result = postProcessData(request, resolution);
+				var result = postProcessData(request, resolution);
 				database.close();
 
-				for (int i = 0; i < result.length; i++) {
-					long timestamp = fromTimestamp + (i * resolution);
+				for (var i = 0; i < result.length; i++) {
+					var timestamp = fromTimestamp + i * resolution;
 
 					// Prepare result table row
-					Instant timestampInstant = Instant.ofEpochSecond(timestamp);
-					ZonedDateTime dateTime = ZonedDateTime.ofInstant(timestampInstant, ZoneOffset.UTC)
+					var timestampInstant = Instant.ofEpochSecond(timestamp);
+					var dateTime = ZonedDateTime.ofInstant(timestampInstant, ZoneOffset.UTC)
 							.withZoneSameInstant(timezone);
-					SortedMap<ChannelAddress, JsonElement> tableRow = table.get(dateTime);
+					var tableRow = table.get(dateTime);
 					if (tableRow == null) {
 						tableRow = new TreeMap<>();
 					}
 
-					double value = result[i];
+					var value = result[i];
 					if (Double.isNaN(value)) {
 						tableRow.put(channelAddress, JsonNull.INSTANCE);
 					} else {
@@ -172,10 +171,10 @@ public SortedMap<ZonedDateTime, SortedMap<ChannelAddress, JsonElement>> queryHis
 
 	/**
 	 * Post-Process the received data.
-	 * 
+	 *
 	 * <p>
 	 * This mainly makes sure the data has the correct resolution.
-	 * 
+	 *
 	 * @param request    the RRD4j {@link FetchRequest}
 	 * @param resolution the resolution in seconds
 	 * @return the result array
@@ -184,15 +183,13 @@ public SortedMap<ZonedDateTime, SortedMap<ChannelAddress, JsonElement>> queryHis
 	 */
 	protected static double[] postProcessData(FetchRequest request, int resolution)
 			throws IOException, IllegalArgumentException {
-		FetchData data = request.fetchData();
-		long step = data.getStep();
-		double[] input = data.getValues()[0];
+		var data = request.fetchData();
+		var step = data.getStep();
+		var input = data.getValues()[0];
 
 		// Initialize result array
-		final double[] result = new double[(int) ((request.getFetchEnd() - request.getFetchStart()) / resolution)];
-		for (int i = 0; i < result.length; i++) {
-			result[i] = Double.NaN;
-		}
+		final var result = new double[(int) ((request.getFetchEnd() - request.getFetchStart()) / resolution)];
+		Arrays.fill(result, Double.NaN);
 
 		if (step < resolution) {
 			// Merge multiple entries to resolution
@@ -200,10 +197,10 @@ protected static double[] postProcessData(FetchRequest request, int resolution)
 				throw new IllegalArgumentException(
 						"Requested resolution [" + resolution + "] is not dividable by RRD4j Step [" + step + "]");
 			}
-			int merge = (int) (resolution / step);
-			double[] buffer = new double[merge];
-			for (int i = 1; i < input.length; i += merge) {
-				for (int j = 0; j < merge; j++) {
+			var merge = (int) (resolution / step);
+			var buffer = new double[merge];
+			for (var i = 1; i < input.length; i += merge) {
+				for (var j = 0; j < merge; j++) {
 					if (i + j < input.length) {
 						buffer[j] = input[i + j];
 					} else {
@@ -212,7 +209,7 @@ protected static double[] postProcessData(FetchRequest request, int resolution)
 				}
 
 				// put in result; avoid index rounding error
-				int resultIndex = (i - 1) / merge;
+				var resultIndex = (i - 1) / merge;
 				if (resultIndex >= result.length) {
 					break;
 				}
@@ -221,7 +218,7 @@ protected static double[] postProcessData(FetchRequest request, int resolution)
 
 		} else if (step > resolution) {
 			// Split each entry to multiple values
-			long resultTimestamp = 0;
+			var resultTimestamp = 0L;
 			for (int i = 0, inputIndex = 0; i < result.length; i++) {
 				inputIndex = Math.min(input.length - 1, (int) (resultTimestamp / step));
 				resultTimestamp += resolution;
@@ -230,7 +227,7 @@ protected static double[] postProcessData(FetchRequest request, int resolution)
 
 		} else {
 			// Data already matches resolution
-			for (int i = 1; i < result.length + 1 && i < input.length; i++) {
+			for (var i = 1; i < result.length + 1 && i < input.length; i++) {
 				result[i - 1] = input[i];
 			}
 		}
@@ -241,8 +238,8 @@ protected static double[] postProcessData(FetchRequest request, int resolution)
 	public SortedMap<ChannelAddress, JsonElement> queryHistoricEnergy(String edgeId, ZonedDateTime fromDate,
 			ZonedDateTime toDate, Set<ChannelAddress> channels) throws OpenemsNamedException {
 		SortedMap<ChannelAddress, JsonElement> table = new TreeMap<>();
-		long fromTimestamp = fromDate.withZoneSameInstant(ZoneOffset.UTC).toEpochSecond();
-		long toTimeStamp = toDate.withZoneSameInstant(ZoneOffset.UTC).toEpochSecond();
+		var fromTimestamp = fromDate.withZoneSameInstant(ZoneOffset.UTC).toEpochSecond();
+		var toTimeStamp = toDate.withZoneSameInstant(ZoneOffset.UTC).toEpochSecond();
 
 		RrdDb database = null;
 		try {
@@ -254,14 +251,14 @@ public SortedMap<ChannelAddress, JsonElement> queryHistoricEnergy(String edgeId,
 					continue; // not existing -> abort
 				}
 
-				ChannelDef chDef = this.getDsDefForChannel(channel.channelDoc().getUnit());
-				FetchRequest request = database.createFetchRequest(chDef.consolFun, fromTimestamp, toTimeStamp);
-				FetchData data = request.fetchData();
+				var chDef = this.getDsDefForChannel(channel.channelDoc().getUnit());
+				var request = database.createFetchRequest(chDef.consolFun, fromTimestamp, toTimeStamp);
+				var data = request.fetchData();
 				database.close();
 
 				// Find first and last energy value != null
-				double first = Double.NaN;
-				double last = Double.NaN;
+				var first = Double.NaN;
+				var last = Double.NaN;
 				for (Double tmp : data.getValues(0)) {
 					if (Double.isNaN(first) && !Double.isNaN(tmp)) {
 						first = tmp;
@@ -272,7 +269,7 @@ public SortedMap<ChannelAddress, JsonElement> queryHistoricEnergy(String edgeId,
 				}
 
 				// Calculate difference between last and first value
-				double value = last - first;
+				var value = last - first;
 
 				if (Double.isNaN(value)) {
 					table.put(channelAddress, JsonNull.INSTANCE);
@@ -302,25 +299,25 @@ public SortedMap<ZonedDateTime, SortedMap<ChannelAddress, JsonElement>> queryHis
 			throws OpenemsNamedException {
 		SortedMap<ZonedDateTime, SortedMap<ChannelAddress, JsonElement>> table = new TreeMap<>();
 
-		ZoneId timezone = fromDate.getZone();
+		var timezone = fromDate.getZone();
 
-		long fromTimestamp = fromDate.withZoneSameInstant(ZoneOffset.UTC).toEpochSecond();
-		long toTimeStamp = toDate.withZoneSameInstant(ZoneOffset.UTC).toEpochSecond();
+		var fromTimestamp = fromDate.withZoneSameInstant(ZoneOffset.UTC).toEpochSecond();
+		var toTimeStamp = toDate.withZoneSameInstant(ZoneOffset.UTC).toEpochSecond();
 
-		long nextStamp = fromTimestamp + resolution;
-		long timeStamp = fromTimestamp;
+		var nextStamp = fromTimestamp + resolution;
+		var timeStamp = fromTimestamp;
 
 		while (nextStamp <= toTimeStamp) {
 
-			Instant timestampInstantFrom = Instant.ofEpochSecond(timeStamp);
-			ZonedDateTime dateTimeFrom = ZonedDateTime.ofInstant(timestampInstantFrom, ZoneOffset.UTC)
+			var timestampInstantFrom = Instant.ofEpochSecond(timeStamp);
+			var dateTimeFrom = ZonedDateTime.ofInstant(timestampInstantFrom, ZoneOffset.UTC)
 					.withZoneSameInstant(timezone);
 
-			Instant timestampInstantTo = Instant.ofEpochSecond(nextStamp);
-			ZonedDateTime dateTimeTo = ZonedDateTime.ofInstant(timestampInstantTo, ZoneOffset.UTC)
+			var timestampInstantTo = Instant.ofEpochSecond(nextStamp);
+			var dateTimeTo = ZonedDateTime.ofInstant(timestampInstantTo, ZoneOffset.UTC)
 					.withZoneSameInstant(timezone);
 
-			SortedMap<ChannelAddress, JsonElement> tableRow = this.queryHistoricEnergy(null, dateTimeFrom, dateTimeTo,
+			var tableRow = this.queryHistoricEnergy(null, dateTimeFrom, dateTimeTo,
 					channels);
 
 			table.put(dateTimeFrom, tableRow);
@@ -336,10 +333,10 @@ public SortedMap<ZonedDateTime, SortedMap<ChannelAddress, JsonElement>> queryHis
 	@Override
 	public CompletableFuture<Optional<Object>> getLatestValue(ChannelAddress channelAddress) {
 		// Prepare result
-		final CompletableFuture<Optional<Object>> result = new CompletableFuture<>();
+		final var result = new CompletableFuture<Optional<Object>>();
 
 		CompletableFuture.runAsync(() -> {
-			RrdDb database = this.getExistingRrdDb(channelAddress);
+			var database = this.getExistingRrdDb(channelAddress);
 			if (database == null) {
 				result.complete(Optional.empty());
 			}
@@ -361,11 +358,11 @@ public CompletableFuture<Optional<Object>> getLatestValue(ChannelAddress channel
 
 	/**
 	 * Gets the RRD4j database for the given Channel-Address.
-	 * 
+	 *
 	 * <p>
 	 * The predefined RRD4J archives match the requirements of
 	 * {@link CommonTimedataService#calculateResolution(ZonedDateTime, ZonedDateTime)}
-	 * 
+	 *
 	 * @param channelAddress the Channel-Address
 	 * @param startTime      the starttime for newly created RrdDbs
 	 * @return the RrdDb
@@ -374,24 +371,20 @@ public CompletableFuture<Optional<Object>> getLatestValue(ChannelAddress channel
 	 */
 	protected synchronized RrdDb getRrdDb(ChannelAddress channelAddress, Unit channelUnit, long startTime)
 			throws IOException, URISyntaxException {
-		RrdDb rrdDb = this.getExistingRrdDb(channelAddress);
+		var rrdDb = this.getExistingRrdDb(channelAddress);
 		if (rrdDb != null) {
 			// Database exists
 
-			// Update database definition if required
-			rrdDb = this.updateRrdDbToLatestDefinition(rrdDb, channelAddress, channelUnit);
+			return this.updateRrdDbToLatestDefinition(rrdDb, channelAddress, channelUnit);
 
-			return rrdDb;
-
-		} else {
-			// Create new database
-			return this.createNewDb(channelAddress, channelUnit, startTime);
 		}
+		// Create new database
+		return this.createNewDb(channelAddress, channelUnit, startTime);
 	}
 
 	/**
 	 * Creates new DB
-	 * 
+	 *
 	 * @param channelAddress the {@link ChannelAddress}
 	 * @param channelUnit    the {@link Unit} of the Channel
 	 * @param startTime      the timestamp of the newly added data
@@ -399,8 +392,8 @@ protected synchronized RrdDb getRrdDb(ChannelAddress channelAddress, Unit channe
 	 */
 	private synchronized RrdDb createNewDb(ChannelAddress channelAddress, Unit channelUnit, long startTime)
 			throws IOException {
-		ChannelDef channelDef = this.getDsDefForChannel(channelUnit);
-		RrdDef rrdDef = new RrdDef(//
+		var channelDef = this.getDsDefForChannel(channelUnit);
+		var rrdDef = new RrdDef(//
 				this.getDbFile(channelAddress).toURI(), //
 				startTime, // Start-Time
 				DEFAULT_STEP_SECONDS // Step in [s], default: 300 = 5 minutes
@@ -423,14 +416,14 @@ private synchronized RrdDb createNewDb(ChannelAddress channelAddress, Unit chann
 
 	/**
 	 * Gets an existing RrdDb.
-	 * 
+	 *
 	 * @param channelAddress the ChannelAddress
 	 * @return the RrdDb or null
 	 * @throws IOException        on error
 	 * @throws URISyntaxException on error
 	 */
 	protected synchronized RrdDb getExistingRrdDb(ChannelAddress channelAddress) {
-		File file = this.getDbFile(channelAddress);
+		var file = this.getDbFile(channelAddress);
 		if (!file.exists()) {
 			return null;
 		}
@@ -447,7 +440,7 @@ protected synchronized RrdDb getExistingRrdDb(ChannelAddress channelAddress) {
 	}
 
 	private File getDbFile(ChannelAddress channelAddress) {
-		File file = Paths.get(//
+		var file = Paths.get(//
 				OpenemsConstants.getOpenemsDataDir(), //
 				RRD4J_PATH, //
 				this.id(), //
@@ -477,7 +470,7 @@ public ChannelDef(DsType dsType, double minValue, double maxValue, ConsolFun con
 	/**
 	 * Defines the datasource properties for a given Channel, i.e. min/max allowed
 	 * value and GAUGE vs. COUNTER type.
-	 * 
+	 *
 	 * @param channel the Channel
 	 * @return the {@link DsDef}
 	 */
@@ -531,7 +524,7 @@ private ChannelDef getDsDefForChannel(Unit channelUnit) {
 
 	/**
 	 * Migrates between different versions of the OpenEMS-RRD4j Definition.
-	 * 
+	 *
 	 * @param database       the {@link RrdDb} database
 	 * @param channelAddress the {@link ChannelAddress}
 	 * @param channelUnit    the {@link Unit} of the Channel
@@ -540,44 +533,42 @@ private ChannelDef getDsDefForChannel(Unit channelUnit) {
 	 */
 	private RrdDb updateRrdDbToLatestDefinition(RrdDb oldDb, ChannelAddress channelAddress, Unit channelUnit)
 			throws IOException {
-		if (oldDb.getArcCount() > 2 || oldDb.getRrdDef().getStep() == 60) {
-			/*
-			 * This is an old OpenEMS-RRD4j Definition -> migrate to latest version
-			 */
-			// Read data of last month
-			long lastTimestamp = oldDb.getLastUpdateTime();
-			long firstTimestamp = lastTimestamp - (60 /* minute */ * 60 /* hour */ * 24 /* day */ * 31 /* month */);
-			FetchRequest fetchRequest = oldDb.createFetchRequest(oldDb.getArchive(0).getConsolFun(), firstTimestamp,
-					lastTimestamp);
-			FetchData fetchData = fetchRequest.fetchData();
-			double[] values = postProcessData(fetchRequest, DEFAULT_HEARTBEAT_SECONDS);
-			if (fetchData.getTimestamps().length > 0) {
-				firstTimestamp = fetchData.getTimestamps()[0];
-			}
-			oldDb.close();
-
-			// Delete old file
-			Files.delete(Paths.get(oldDb.getCanonicalPath()));
-
-			// Create new database
-			RrdDb newDb = this.createNewDb(channelAddress, channelUnit, firstTimestamp - 1);
+		if (oldDb.getArcCount() <= 2 && oldDb.getRrdDef().getStep() != 60) {
+			// No Update required
+			return oldDb;
+		}
+		/*
+		 * This is an old OpenEMS-RRD4j Definition -> migrate to latest version
+		 */
+		// Read data of last month
+		var lastTimestamp = oldDb.getLastUpdateTime();
+		var firstTimestamp = lastTimestamp - 60 /* minute */ * 60 /* hour */ * 24 /* day */ * 31;
+		var fetchRequest = oldDb.createFetchRequest(oldDb.getArchive(0).getConsolFun(), firstTimestamp,
+				lastTimestamp);
+		var fetchData = fetchRequest.fetchData();
+		var values = postProcessData(fetchRequest, DEFAULT_HEARTBEAT_SECONDS);
+		if (fetchData.getTimestamps().length > 0) {
+			firstTimestamp = fetchData.getTimestamps()[0];
+		}
+		oldDb.close();
 
-			// Migrate data
-			Sample sample = newDb.createSample();
-			for (int i = 0; i < values.length; i++) {
-				sample.setTime(firstTimestamp + i * DEFAULT_HEARTBEAT_SECONDS);
-				sample.setValue(0, values[i]);
-				sample.update();
-			}
+		// Delete old file
+		Files.delete(Paths.get(oldDb.getCanonicalPath()));
 
-			this.logInfo(this.log,
-					"Migrate RRD4j Database [" + channelAddress.toString() + "] to latest OpenEMS Definition");
-			return newDb;
+		// Create new database
+		var newDb = this.createNewDb(channelAddress, channelUnit, firstTimestamp - 1);
 
-		} else {
-			// No Update required
-			return oldDb;
+		// Migrate data
+		var sample = newDb.createSample();
+		for (var i = 0; i < values.length; i++) {
+			sample.setTime(firstTimestamp + i * DEFAULT_HEARTBEAT_SECONDS);
+			sample.setValue(0, values[i]);
+			sample.update();
 		}
+
+		this.logInfo(this.log,
+				"Migrate RRD4j Database [" + channelAddress.toString() + "] to latest OpenEMS Definition");
+		return newDb;
 	}
 
 	@Override
diff --git a/io.openems.edge.timedata.rrd4j/test/io/openems/edge/timedata/rrd4j/Rrd4jTimedataImplTest.java b/io.openems.edge.timedata.rrd4j/test/io/openems/edge/timedata/rrd4j/Rrd4jTimedataImplTest.java
index 4bb190e4fb5..366673177e3 100644
--- a/io.openems.edge.timedata.rrd4j/test/io/openems/edge/timedata/rrd4j/Rrd4jTimedataImplTest.java
+++ b/io.openems.edge.timedata.rrd4j/test/io/openems/edge/timedata/rrd4j/Rrd4jTimedataImplTest.java
@@ -11,24 +11,22 @@
 import org.rrd4j.ConsolFun;
 import org.rrd4j.DsType;
 import org.rrd4j.core.DsDef;
-import org.rrd4j.core.FetchRequest;
 import org.rrd4j.core.RrdDb;
 import org.rrd4j.core.RrdDef;
 import org.rrd4j.core.RrdMemoryBackendFactory;
-import org.rrd4j.core.Sample;
 
 public class Rrd4jTimedataImplTest {
 
 	private final static Instant START = Instant.ofEpochSecond(1577836800L); /* starts at 1. January 2020 00:00:00 */
 
 	private static void addSample(RrdDb database, Instant instant, double value) throws IOException {
-		Sample sample = database.createSample(instant.getEpochSecond());
+		var sample = database.createSample(instant.getEpochSecond());
 		sample.setValue(0, value);
 		sample.update();
 	}
 
 	private static RrdDb createRrdDb(int step, int fiveMinutes, int oneHour) throws IOException, URISyntaxException {
-		final RrdDef rrdDef = new RrdDef("empty-path", START.getEpochSecond() - 1, step);
+		final var rrdDef = new RrdDef("empty-path", START.getEpochSecond() - 1, step);
 		rrdDef.addDatasource(//
 				new DsDef(Rrd4jTimedataImpl.DEFAULT_DATASOURCE_NAME, //
 						DsType.GAUGE, //
@@ -38,12 +36,12 @@ private static RrdDb createRrdDb(int step, int fiveMinutes, int oneHour) throws
 		rrdDef.addArchive(ConsolFun.AVERAGE, 0.5, 1, fiveMinutes); // 1 step (5 minutes), 8928 rows (31 days)
 		rrdDef.addArchive(ConsolFun.AVERAGE, 0.5, 12, oneHour); // 12 steps (60 minutes), 8016 rows (334 days)
 
-		final RrdDb database = RrdDb.getBuilder() //
+		final var database = RrdDb.getBuilder() //
 				.setBackendFactory(new RrdMemoryBackendFactory()) // in memory
 				.setRrdDef(rrdDef) //
 				.build();
 
-		for (int i = 0; i <= 60 /* minutes */ * 4 /* hours */; i++) {
+		for (var i = 0; i <= 60 /* minutes */ * 4 /* hours */; i++) {
 			addSample(database, START.plus(i, ChronoUnit.MINUTES), i);
 		}
 		return database;
@@ -51,20 +49,20 @@ private static RrdDb createRrdDb(int step, int fiveMinutes, int oneHour) throws
 
 	/**
 	 * Test RRD4j step smaller than resolution.
-	 * 
+	 *
 	 * @throws IOException        on error
 	 * @throws URISyntaxException on error
 	 */
 	@Test
 	public void testMerge() throws IOException, URISyntaxException {
-		int resolution = 900; // 15 minutes
+		var resolution = 900; // 15 minutes
 
-		RrdDb database = createRrdDb(300, 100, 100);
-		FetchRequest request = database.createFetchRequest(//
+		var database = createRrdDb(300, 100, 100);
+		var request = database.createFetchRequest(//
 				ConsolFun.AVERAGE, //
 				START.getEpochSecond(), //
 				START.plus(3, ChronoUnit.HOURS).getEpochSecond());
-		double[] result = Rrd4jTimedataImpl.postProcessData(request, resolution);
+		var result = Rrd4jTimedataImpl.postProcessData(request, resolution);
 		database.close();
 
 		assertEquals(12, result.length); // 3 hours * 4 entries/per hour (15 minutes) = 12
@@ -75,20 +73,20 @@ public void testMerge() throws IOException, URISyntaxException {
 
 	/**
 	 * Test RRD4j step equals resolution.
-	 * 
+	 *
 	 * @throws IOException        on error
 	 * @throws URISyntaxException on error
 	 */
 	@Test
 	public void testExact() throws IOException, URISyntaxException {
-		int resolution = 300; // 5 minutes
+		var resolution = 300; // 5 minutes
 
-		RrdDb database = createRrdDb(300, 100, 100);
-		FetchRequest request = database.createFetchRequest(//
+		var database = createRrdDb(300, 100, 100);
+		var request = database.createFetchRequest(//
 				ConsolFun.AVERAGE, //
 				START.getEpochSecond(), //
 				START.plus(3, ChronoUnit.HOURS).getEpochSecond());
-		double[] result = Rrd4jTimedataImpl.postProcessData(request, resolution);
+		var result = Rrd4jTimedataImpl.postProcessData(request, resolution);
 		database.close();
 
 		assertEquals(36, result.length); // 3 hours * 12 entries/per hour (5 minutes) = 36
@@ -99,50 +97,50 @@ public void testExact() throws IOException, URISyntaxException {
 
 	/**
 	 * Test RRD4j step bigger than resolution.
-	 * 
+	 *
 	 * @throws IOException        on error
 	 * @throws URISyntaxException on error
 	 */
 	@Test
 	public void testSplit() throws IOException, URISyntaxException {
-		int resolution = 60; // 1 minute
+		var resolution = 60; // 1 minute
 
-		RrdDb database = createRrdDb(300, 100, 100);
-		FetchRequest request = database.createFetchRequest(//
+		var database = createRrdDb(300, 100, 100);
+		var request = database.createFetchRequest(//
 				ConsolFun.AVERAGE, //
 				START.getEpochSecond(), //
 				START.plus(3, ChronoUnit.HOURS).getEpochSecond());
-		double[] result = Rrd4jTimedataImpl.postProcessData(request, resolution);
+		var result = Rrd4jTimedataImpl.postProcessData(request, resolution);
 		database.close();
 
 		assertEquals(180, result.length); // 3 hours * 60 entries/per hour (1 minute) = 180
-		for (int i = 0; i < 5; i++) {
+		for (var i = 0; i < 5; i++) {
 			assertEquals(0., result[i], 0.1);
 		}
-		for (int i = 5; i < 10; i++) {
+		for (var i = 5; i < 10; i++) {
 			assertEquals(3., result[i], 0.1);
 		}
-		for (int i = 10; i < 15; i++) {
+		for (var i = 10; i < 15; i++) {
 			assertEquals(8., result[i], 0.1);
 		}
 	}
 
 	/**
 	 * Test RRD4j step bigger than resolution, but resolution not divisible.
-	 * 
+	 *
 	 * @throws IOException        on error
 	 * @throws URISyntaxException on error
 	 */
 	@Test
 	public void testSplitUneven() throws IOException, URISyntaxException {
-		int resolution = 300; // 1 minute
+		var resolution = 300; // 1 minute
 
-		RrdDb database = createRrdDb(720, 100, 100);
-		FetchRequest request = database.createFetchRequest(//
+		var database = createRrdDb(720, 100, 100);
+		var request = database.createFetchRequest(//
 				ConsolFun.AVERAGE, //
 				START.getEpochSecond(), //
 				START.plus(3, ChronoUnit.HOURS).getEpochSecond());
-		double[] result = Rrd4jTimedataImpl.postProcessData(request, resolution);
+		var result = Rrd4jTimedataImpl.postProcessData(request, resolution);
 		database.close();
 
 		assertEquals(36, result.length); // 3 hours * 12 entries/per hour (5 minutes) = 36

From cd0869e31ac96e6a2587c52458a58919bd08c83f Mon Sep 17 00:00:00 2001
From: Stefan Feilmeier <stefan.feilmeier@fenecon.de>
Date: Tue, 8 Mar 2022 16:31:16 +0100
Subject: [PATCH 86/96] Update io.openems.edge.timeofusetariff.*

---
 .../timeofusetariff/api/TimeOfUsePrices.java  |  13 +-
 .../timeofusetariff/api/TimeOfUseTariff.java  |   4 +-
 .../api/utils/TimeOfUseTariffUtils.java       |  12 +-
 .../test/DummyTimeOfUseTariffProvider.java    |   6 +-
 .../timeofusetariff/awattar/AwattarImpl.java  |  34 ++--
 .../awattar/AwattarProviderTest.java          |   2 +-
 .../timeofusetariff/awattar/MyConfig.java     |   2 +-
 .../corrently/CorrentlyImpl.java              |  34 ++--
 .../corrently/CorrentlyProviderTest.java      |   2 +-
 .../timeofusetariff/corrently/MyConfig.java   |   2 +-
 .../timeofusetariff/tibber/TibberImpl.java    |  64 +++----
 .../edge/timeofusetariff/tibber/MyConfig.java |   2 +-
 .../tibber/TibberProviderTest.java            | 172 ++++++------------
 13 files changed, 135 insertions(+), 214 deletions(-)

diff --git a/io.openems.edge.timeofusetariff.api/src/io/openems/edge/timeofusetariff/api/TimeOfUsePrices.java b/io.openems.edge.timeofusetariff.api/src/io/openems/edge/timeofusetariff/api/TimeOfUsePrices.java
index fb53a7e4112..0b6fe869585 100644
--- a/io.openems.edge.timeofusetariff.api/src/io/openems/edge/timeofusetariff/api/TimeOfUsePrices.java
+++ b/io.openems.edge.timeofusetariff.api/src/io/openems/edge/timeofusetariff/api/TimeOfUsePrices.java
@@ -5,7 +5,7 @@
 /**
  * Holds time of use prices for 24 h and the time when it is retrieved; //
  * prices are one value per 15 minutes; 96 values in total.
- * 
+ *
  * <p>
  * Values have unit EUR/MWh.
  */
@@ -19,13 +19,12 @@ public class TimeOfUsePrices {
 
 	/**
 	 * Constructs a {@link TimeOfUsePrices}.
-	 * 
+	 *
 	 * @param updateTime Retrieved time of the prices.
 	 * @param values     the 96 quarterly price values[24 hours].
 	 */
 	public TimeOfUsePrices(ZonedDateTime updateTime, Float... values) {
-		super();
-		for (int i = 0; i < NUMBER_OF_VALUES && i < values.length; i++) {
+		for (var i = 0; i < NUMBER_OF_VALUES && i < values.length; i++) {
 			this.values[i] = values[i];
 		}
 		this.updateTime = updateTime;
@@ -34,11 +33,11 @@ public TimeOfUsePrices(ZonedDateTime updateTime, Float... values) {
 	/**
 	 * Gives electricity prices for the next 24 h; one value per 15 minutes; 96
 	 * values in total.
-	 * 
+	 *
 	 * <p>
 	 * E.g. if called at 10:05, the first value stands for 10:00 to 10:15; second
 	 * value for 10:15 to 10:30.
-	 * 
+	 *
 	 * @return the prices
 	 */
 	public Float[] getValues() {
@@ -47,7 +46,7 @@ public Float[] getValues() {
 
 	/**
 	 * Gets the time of the last update of prices.
-	 * 
+	 *
 	 * @return the time
 	 */
 	public ZonedDateTime getUpdateTime() {
diff --git a/io.openems.edge.timeofusetariff.api/src/io/openems/edge/timeofusetariff/api/TimeOfUseTariff.java b/io.openems.edge.timeofusetariff.api/src/io/openems/edge/timeofusetariff/api/TimeOfUseTariff.java
index 7d9b8c9dbd2..abf5a0aa78a 100644
--- a/io.openems.edge.timeofusetariff.api/src/io/openems/edge/timeofusetariff/api/TimeOfUseTariff.java
+++ b/io.openems.edge.timeofusetariff.api/src/io/openems/edge/timeofusetariff/api/TimeOfUseTariff.java
@@ -12,11 +12,11 @@ public interface TimeOfUseTariff {
 	/**
 	 * Gives electricity prices for the next 24 h; one value per 15 minutes; 96
 	 * values in total.
-	 * 
+	 *
 	 * <p>
 	 * E.g. if called at 10:05, the first value stands for 10:00 to 10:15; second
 	 * value for 10:15 to 10:30.
-	 * 
+	 *
 	 * @return the prices, or null if no prices exist
 	 */
 	public TimeOfUsePrices getPrices();
diff --git a/io.openems.edge.timeofusetariff.api/src/io/openems/edge/timeofusetariff/api/utils/TimeOfUseTariffUtils.java b/io.openems.edge.timeofusetariff.api/src/io/openems/edge/timeofusetariff/api/utils/TimeOfUseTariffUtils.java
index 719f6204d7c..39c28ec2f63 100644
--- a/io.openems.edge.timeofusetariff.api/src/io/openems/edge/timeofusetariff/api/utils/TimeOfUseTariffUtils.java
+++ b/io.openems.edge.timeofusetariff.api/src/io/openems/edge/timeofusetariff/api/utils/TimeOfUseTariffUtils.java
@@ -13,7 +13,7 @@ public class TimeOfUseTariffUtils {
 
 	/**
 	 * Returns the Array of 24 hour [96 quarterly] electricity prices in EUR/MWh.
-	 * 
+	 *
 	 * @param clock           the {@link Clock}
 	 * @param priceMap        {@link ImmutableSortedMap} with quarterly Time stamps
 	 *                        and the price.
@@ -29,24 +29,24 @@ public static TimeOfUsePrices getNext24HourPrices(Clock clock, ImmutableSortedMa
 			return new TimeOfUsePrices(updateTimeStamp);
 		}
 
-		ZonedDateTime now = getNowRoundedDownToMinutes(clock, 15);
+		var now = getNowRoundedDownToMinutes(clock, 15);
 		// Converts the map values to array.
 		// if the map size is less than 96, rest of the values will store as null.
-		final Float[] priceList = priceMap.tailMap(now).values().toArray(new Float[TimeOfUsePrices.NUMBER_OF_VALUES]);
+		final var priceList = priceMap.tailMap(now).values().toArray(new Float[TimeOfUsePrices.NUMBER_OF_VALUES]);
 
 		return new TimeOfUsePrices(updateTimeStamp, priceList);
 	}
 
 	/**
 	 * Gets 'now' from the Clock and rounds it down to required minutes.
-	 * 
+	 *
 	 * @param clock   the {@link Clock}
 	 * @param minutes the custom minutes to roundoff to.
 	 * @return the rounded result
 	 */
 	public static ZonedDateTime getNowRoundedDownToMinutes(Clock clock, int minutes) {
-		ZonedDateTime d = ZonedDateTime.now(clock);
-		int minuteOfDay = d.get(ChronoField.MINUTE_OF_DAY);
+		var d = ZonedDateTime.now(clock);
+		var minuteOfDay = d.get(ChronoField.MINUTE_OF_DAY);
 		return d.with(ChronoField.NANO_OF_DAY, 0).plus(minuteOfDay / minutes * minutes, ChronoUnit.MINUTES);
 	}
 }
diff --git a/io.openems.edge.timeofusetariff.api/src/io/openems/edge/timeofusetariff/test/DummyTimeOfUseTariffProvider.java b/io.openems.edge.timeofusetariff.api/src/io/openems/edge/timeofusetariff/test/DummyTimeOfUseTariffProvider.java
index 64a8bf89345..353dd7c1d10 100644
--- a/io.openems.edge.timeofusetariff.api/src/io/openems/edge/timeofusetariff/test/DummyTimeOfUseTariffProvider.java
+++ b/io.openems.edge.timeofusetariff.api/src/io/openems/edge/timeofusetariff/test/DummyTimeOfUseTariffProvider.java
@@ -11,16 +11,16 @@ public class DummyTimeOfUseTariffProvider implements TimeOfUseTariff {
 
 	/**
 	 * Builds a {@link DummyTimeOfUseTariffProvider} from hourly prices.
-	 * 
+	 *
 	 * @param hourlyPrices an array of hourly prices.
 	 * @param now          {@ZonedDateTime} given during test.
 	 * @return a {@link DummyTimeOfUseTariffProvider}.
 	 */
 	public static DummyTimeOfUseTariffProvider fromHourlyPrices(ZonedDateTime now, Float... hourlyPrices) {
 
-		Float[] quarterlyPrices = new Float[96];
+		var quarterlyPrices = new Float[96];
 
-		for (int i = 0; i < 24; i++) {
+		for (var i = 0; i < 24; i++) {
 			quarterlyPrices[i] = hourlyPrices[i];
 			quarterlyPrices[i + 1] = hourlyPrices[i];
 			quarterlyPrices[i + 2] = hourlyPrices[i];
diff --git a/io.openems.edge.timeofusetariff.awattar/src/io/openems/edge/timeofusetariff/awattar/AwattarImpl.java b/io.openems.edge.timeofusetariff.awattar/src/io/openems/edge/timeofusetariff/awattar/AwattarImpl.java
index c97463cb4ce..a9a66160c32 100644
--- a/io.openems.edge.timeofusetariff.awattar/src/io/openems/edge/timeofusetariff/awattar/AwattarImpl.java
+++ b/io.openems.edge.timeofusetariff.awattar/src/io/openems/edge/timeofusetariff/awattar/AwattarImpl.java
@@ -22,9 +22,7 @@
 import org.osgi.service.metatype.annotations.Designate;
 
 import com.google.common.collect.ImmutableSortedMap;
-import com.google.gson.JsonArray;
 import com.google.gson.JsonElement;
-import com.google.gson.JsonObject;
 
 import io.openems.common.exceptions.OpenemsError.OpenemsNamedException;
 import io.openems.common.utils.JsonUtils;
@@ -37,7 +35,6 @@
 import io.openems.edge.timeofusetariff.api.utils.TimeOfUseTariffUtils;
 import okhttp3.OkHttpClient;
 import okhttp3.Request;
-import okhttp3.Response;
 
 @Designate(ocd = Config.class, factory = true)
 @Component(//
@@ -51,7 +48,7 @@ public class AwattarImpl extends AbstractOpenemsComponent implements TimeOfUseTa
 
 	private final ScheduledExecutorService executor = Executors.newSingleThreadScheduledExecutor();
 
-	private final AtomicReference<ImmutableSortedMap<ZonedDateTime, Float>> prices = new AtomicReference<ImmutableSortedMap<ZonedDateTime, Float>>(
+	private final AtomicReference<ImmutableSortedMap<ZonedDateTime, Float>> prices = new AtomicReference<>(
 			ImmutableSortedMap.of());
 
 	private ZonedDateTime updateTimeStamp = null;
@@ -61,14 +58,14 @@ public class AwattarImpl extends AbstractOpenemsComponent implements TimeOfUseTa
 		/*
 		 * Update Map of prices
 		 */
-		OkHttpClient client = new OkHttpClient();
-		Request request = new Request.Builder() //
+		var client = new OkHttpClient();
+		var request = new Request.Builder() //
 				.url(AWATTAR_API_URL) //
 				// aWATTar currently does not anymore require an Apikey.
 				// .header("Authorization", Credentials.basic(apikey, "")) //
 				.build();
 		int httpStatusCode;
-		try (Response response = client.newCall(request).execute()) {
+		try (var response = client.newCall(request).execute()) {
 			httpStatusCode = response.code();
 
 			if (!response.isSuccessful()) {
@@ -92,14 +89,14 @@ public class AwattarImpl extends AbstractOpenemsComponent implements TimeOfUseTa
 		/*
 		 * Schedule next price update for 2 pm
 		 */
-		ZonedDateTime now = ZonedDateTime.now();
-		ZonedDateTime nextRun = now.withHour(14).truncatedTo(ChronoUnit.HOURS);
+		var now = ZonedDateTime.now();
+		var nextRun = now.withHour(14).truncatedTo(ChronoUnit.HOURS);
 		if (now.isAfter(nextRun)) {
 			nextRun = nextRun.plusDays(1);
 		}
 
-		Duration duration = Duration.between(now, nextRun);
-		long delay = duration.getSeconds();
+		var duration = Duration.between(now, nextRun);
+		var delay = duration.getSeconds();
 
 		this.executor.schedule(this.task, delay, TimeUnit.SECONDS);
 	};
@@ -125,6 +122,7 @@ void activate(ComponentContext context, Config config) {
 		this.executor.schedule(this.task, 0, TimeUnit.SECONDS);
 	}
 
+	@Override
 	@Deactivate
 	protected void deactivate() {
 		super.deactivate();
@@ -144,26 +142,26 @@ public TimeOfUsePrices getPrices() {
 
 	/**
 	 * Parse the aWATTar JSON to the Price Map.
-	 * 
+	 *
 	 * @param jsonData the aWATTar JSON
 	 * @return the Price Map
 	 * @throws OpenemsNamedException on error
 	 */
 	public static ImmutableSortedMap<ZonedDateTime, Float> parsePrices(String jsonData) throws OpenemsNamedException {
-		TreeMap<ZonedDateTime, Float> result = new TreeMap<>();
+		var result = new TreeMap<ZonedDateTime, Float>();
 
 		if (!jsonData.isEmpty()) {
 
-			JsonObject line = JsonUtils.parseToJsonObject(jsonData);
-			JsonArray data = JsonUtils.getAsJsonArray(line, "data");
+			var line = JsonUtils.parseToJsonObject(jsonData);
+			var data = JsonUtils.getAsJsonArray(line, "data");
 
 			for (JsonElement element : data) {
 
-				float marketPrice = JsonUtils.getAsFloat(element, "marketprice");
-				long startTimestampLong = JsonUtils.getAsLong(element, "start_timestamp");
+				var marketPrice = JsonUtils.getAsFloat(element, "marketprice");
+				var startTimestampLong = JsonUtils.getAsLong(element, "start_timestamp");
 
 				// Converting Long time stamp to ZonedDateTime.
-				ZonedDateTime startTimeStamp = ZonedDateTime //
+				var startTimeStamp = ZonedDateTime //
 						.ofInstant(Instant.ofEpochMilli(startTimestampLong), ZoneId.systemDefault())
 						.truncatedTo(ChronoUnit.HOURS);
 
diff --git a/io.openems.edge.timeofusetariff.awattar/test/io/openems/edge/timeofusetariff/awattar/AwattarProviderTest.java b/io.openems.edge.timeofusetariff.awattar/test/io/openems/edge/timeofusetariff/awattar/AwattarProviderTest.java
index 11eae41b2da..d34722cf5f4 100644
--- a/io.openems.edge.timeofusetariff.awattar/test/io/openems/edge/timeofusetariff/awattar/AwattarProviderTest.java
+++ b/io.openems.edge.timeofusetariff.awattar/test/io/openems/edge/timeofusetariff/awattar/AwattarProviderTest.java
@@ -17,7 +17,7 @@ public class AwattarProviderTest {
 
 	@Test
 	public void test() throws Exception {
-		AwattarImpl awattar = new AwattarImpl();
+		var awattar = new AwattarImpl();
 		new ComponentTest(awattar) //
 				.activate(MyConfig.create() //
 						.setId(CTRL_ID) //
diff --git a/io.openems.edge.timeofusetariff.awattar/test/io/openems/edge/timeofusetariff/awattar/MyConfig.java b/io.openems.edge.timeofusetariff.awattar/test/io/openems/edge/timeofusetariff/awattar/MyConfig.java
index a84f0ac5f0d..e855b12a6a9 100644
--- a/io.openems.edge.timeofusetariff.awattar/test/io/openems/edge/timeofusetariff/awattar/MyConfig.java
+++ b/io.openems.edge.timeofusetariff.awattar/test/io/openems/edge/timeofusetariff/awattar/MyConfig.java
@@ -24,7 +24,7 @@ public MyConfig build() {
 
 	/**
 	 * Create a Config builder.
-	 * 
+	 *
 	 * @return a {@link Builder}
 	 */
 	public static Builder create() {
diff --git a/io.openems.edge.timeofusetariff.corrently/src/io/openems/edge/timeofusetariff/corrently/CorrentlyImpl.java b/io.openems.edge.timeofusetariff.corrently/src/io/openems/edge/timeofusetariff/corrently/CorrentlyImpl.java
index bb207c01ed2..1fdc610b137 100644
--- a/io.openems.edge.timeofusetariff.corrently/src/io/openems/edge/timeofusetariff/corrently/CorrentlyImpl.java
+++ b/io.openems.edge.timeofusetariff.corrently/src/io/openems/edge/timeofusetariff/corrently/CorrentlyImpl.java
@@ -22,9 +22,7 @@
 import org.osgi.service.metatype.annotations.Designate;
 
 import com.google.common.collect.ImmutableSortedMap;
-import com.google.gson.JsonArray;
 import com.google.gson.JsonElement;
-import com.google.gson.JsonObject;
 
 import io.openems.common.exceptions.OpenemsError.OpenemsNamedException;
 import io.openems.common.utils.JsonUtils;
@@ -37,7 +35,6 @@
 import io.openems.edge.timeofusetariff.api.utils.TimeOfUseTariffUtils;
 import okhttp3.OkHttpClient;
 import okhttp3.Request;
-import okhttp3.Response;
 
 @Designate(ocd = Config.class, factory = true)
 @Component(//
@@ -53,7 +50,7 @@ public class CorrentlyImpl extends AbstractOpenemsComponent implements TimeOfUse
 
 	private Config config = null;
 
-	private final AtomicReference<ImmutableSortedMap<ZonedDateTime, Float>> prices = new AtomicReference<ImmutableSortedMap<ZonedDateTime, Float>>(
+	private final AtomicReference<ImmutableSortedMap<ZonedDateTime, Float>> prices = new AtomicReference<>(
 			ImmutableSortedMap.of());
 
 	private ZonedDateTime updateTimeStamp = null;
@@ -63,12 +60,12 @@ public class CorrentlyImpl extends AbstractOpenemsComponent implements TimeOfUse
 		/*
 		 * Update Map of prices
 		 */
-		OkHttpClient client = new OkHttpClient();
-		Request request = new Request.Builder() //
+		var client = new OkHttpClient();
+		var request = new Request.Builder() //
 				.url(CORRENTLY_API_URL + this.config.zipcode() + "&resolution=900") //
 				.build();
 		int httpStatusCode;
-		try (Response response = client.newCall(request).execute()) {
+		try (var response = client.newCall(request).execute()) {
 			httpStatusCode = response.code();
 
 			if (!response.isSuccessful()) {
@@ -91,14 +88,14 @@ public class CorrentlyImpl extends AbstractOpenemsComponent implements TimeOfUse
 		/*
 		 * Schedule next price update for 2 pm
 		 */
-		ZonedDateTime now = ZonedDateTime.now();
-		ZonedDateTime nextRun = now.withHour(14).truncatedTo(ChronoUnit.HOURS);
+		var now = ZonedDateTime.now();
+		var nextRun = now.withHour(14).truncatedTo(ChronoUnit.HOURS);
 		if (now.isAfter(nextRun)) {
 			nextRun = nextRun.plusDays(1);
 		}
 
-		Duration duration = Duration.between(now, nextRun);
-		long delay = duration.getSeconds();
+		var duration = Duration.between(now, nextRun);
+		var delay = duration.getSeconds();
 
 		this.executor.schedule(this.task, delay, TimeUnit.SECONDS);
 	};
@@ -124,6 +121,7 @@ void activate(ComponentContext context, Config config) {
 		this.executor.schedule(this.task, 0, TimeUnit.SECONDS);
 	}
 
+	@Override
 	@Deactivate
 	protected void deactivate() {
 		super.deactivate();
@@ -143,26 +141,26 @@ public TimeOfUsePrices getPrices() {
 
 	/**
 	 * Parse the Corrently JSON to the Price Map.
-	 * 
+	 *
 	 * @param jsonData the Corrently JSON
 	 * @return the Price Map
 	 * @throws OpenemsNamedException on error
 	 */
 	public static ImmutableSortedMap<ZonedDateTime, Float> parsePrices(String jsonData) throws OpenemsNamedException {
-		TreeMap<ZonedDateTime, Float> result = new TreeMap<>();
+		var result = new TreeMap<ZonedDateTime, Float>();
 
 		if (!jsonData.isEmpty()) {
 
-			JsonObject line = JsonUtils.parseToJsonObject(jsonData);
-			JsonArray data = JsonUtils.getAsJsonArray(line, "data");
+			var line = JsonUtils.parseToJsonObject(jsonData);
+			var data = JsonUtils.getAsJsonArray(line, "data");
 
 			for (JsonElement element : data) {
 
-				float marketPrice = JsonUtils.getAsFloat(element, "marketprice");
-				long startTimestampLong = JsonUtils.getAsLong(element, "start_timestamp");
+				var marketPrice = JsonUtils.getAsFloat(element, "marketprice");
+				var startTimestampLong = JsonUtils.getAsLong(element, "start_timestamp");
 
 				// Converting Long time stamp to ZonedDateTime.
-				ZonedDateTime startTimeStamp = ZonedDateTime //
+				var startTimeStamp = ZonedDateTime //
 						.ofInstant(Instant.ofEpochMilli(startTimestampLong), ZoneId.systemDefault())
 						.truncatedTo(ChronoUnit.MINUTES);
 				// Adding the values in the Map.
diff --git a/io.openems.edge.timeofusetariff.corrently/test/io/openems/edge/timeofusetariff/corrently/CorrentlyProviderTest.java b/io.openems.edge.timeofusetariff.corrently/test/io/openems/edge/timeofusetariff/corrently/CorrentlyProviderTest.java
index ab42d62971a..283b552f4f7 100644
--- a/io.openems.edge.timeofusetariff.corrently/test/io/openems/edge/timeofusetariff/corrently/CorrentlyProviderTest.java
+++ b/io.openems.edge.timeofusetariff.corrently/test/io/openems/edge/timeofusetariff/corrently/CorrentlyProviderTest.java
@@ -17,7 +17,7 @@ public class CorrentlyProviderTest {
 
 	@Test
 	public void test() throws Exception {
-		CorrentlyImpl corrently = new CorrentlyImpl();
+		var corrently = new CorrentlyImpl();
 		new ComponentTest(corrently) //
 				.activate(MyConfig.create() //
 						.setId(CTRL_ID) //
diff --git a/io.openems.edge.timeofusetariff.corrently/test/io/openems/edge/timeofusetariff/corrently/MyConfig.java b/io.openems.edge.timeofusetariff.corrently/test/io/openems/edge/timeofusetariff/corrently/MyConfig.java
index 4b1834473fe..80375eb9202 100644
--- a/io.openems.edge.timeofusetariff.corrently/test/io/openems/edge/timeofusetariff/corrently/MyConfig.java
+++ b/io.openems.edge.timeofusetariff.corrently/test/io/openems/edge/timeofusetariff/corrently/MyConfig.java
@@ -29,7 +29,7 @@ public MyConfig build() {
 
 	/**
 	 * Create a Config builder.
-	 * 
+	 *
 	 * @return a {@link Builder}
 	 */
 	public static Builder create() {
diff --git a/io.openems.edge.timeofusetariff.tibber/src/io/openems/edge/timeofusetariff/tibber/TibberImpl.java b/io.openems.edge.timeofusetariff.tibber/src/io/openems/edge/timeofusetariff/tibber/TibberImpl.java
index af6697ddda9..8dcf6484900 100644
--- a/io.openems.edge.timeofusetariff.tibber/src/io/openems/edge/timeofusetariff/tibber/TibberImpl.java
+++ b/io.openems.edge.timeofusetariff.tibber/src/io/openems/edge/timeofusetariff/tibber/TibberImpl.java
@@ -24,7 +24,6 @@
 import com.google.common.collect.ImmutableSortedMap;
 import com.google.gson.JsonArray;
 import com.google.gson.JsonElement;
-import com.google.gson.JsonObject;
 
 import io.openems.common.exceptions.OpenemsError.OpenemsNamedException;
 import io.openems.common.utils.JsonUtils;
@@ -39,7 +38,6 @@
 import okhttp3.OkHttpClient;
 import okhttp3.Request;
 import okhttp3.RequestBody;
-import okhttp3.Response;
 
 @Designate(ocd = Config.class, factory = true)
 @Component(//
@@ -55,7 +53,7 @@ public class TibberImpl extends AbstractOpenemsComponent implements TimeOfUseTar
 
 	private Config config = null;
 
-	private final AtomicReference<ImmutableSortedMap<ZonedDateTime, Float>> prices = new AtomicReference<ImmutableSortedMap<ZonedDateTime, Float>>(
+	private final AtomicReference<ImmutableSortedMap<ZonedDateTime, Float>> prices = new AtomicReference<>(
 			ImmutableSortedMap.of());
 
 	private ZonedDateTime updateTimeStamp = null;
@@ -65,35 +63,22 @@ public class TibberImpl extends AbstractOpenemsComponent implements TimeOfUseTar
 		/*
 		 * Update Map of prices
 		 */
-		OkHttpClient client = new OkHttpClient();
-		MediaType mediaType = MediaType.parse("application/json");
-		RequestBody body = RequestBody.create(mediaType, JsonUtils.buildJsonObject() //
+		var client = new OkHttpClient();
+		var mediaType = MediaType.parse("application/json");
+		var body = RequestBody.create(mediaType, JsonUtils.buildJsonObject() //
 				.addProperty("query", //
-						"{\n"
-						+ "  viewer {\n"
-						+ "    homes {\n"
-						+ "      currentSubscription{\n"
-						+ "        priceInfo{\n"
-						+ "          today {\n"
-						+ "            total\n"
-						+ "            startsAt\n"
-						+ "          }\n"
-						+ "          tomorrow {\n"
-						+ "            total\n"
-						+ "            startsAt\n"
-						+ "          }\n"
-						+ "        }\n"
-						+ "      }\n"
-						+ "    }\n"
-						+ "  }\n"
-						+ "}" + "") //
+						"{\n" + "  viewer {\n" + "    homes {\n" + "      currentSubscription{\n"
+								+ "        priceInfo{\n" + "          today {\n" + "            total\n"
+								+ "            startsAt\n" + "          }\n" + "          tomorrow {\n"
+								+ "            total\n" + "            startsAt\n" + "          }\n" + "        }\n"
+								+ "      }\n" + "    }\n" + "  }\n" + "}" + "") //
 				.build().toString());
-		Request request = new Request.Builder() //
+		var request = new Request.Builder() //
 				.url(TIBBER_API_URL) //
 				.header("Authorization", this.config.accessToken()).post(body) //
 				.build();
 		int httpStatusCode;
-		try (Response response = client.newCall(request).execute()) {
+		try (var response = client.newCall(request).execute()) {
 			httpStatusCode = response.code();
 
 			if (!response.isSuccessful()) {
@@ -116,14 +101,14 @@ public class TibberImpl extends AbstractOpenemsComponent implements TimeOfUseTar
 		/*
 		 * Schedule next price update for 2 pm
 		 */
-		ZonedDateTime now = ZonedDateTime.now();
-		ZonedDateTime nextRun = now.withHour(14).truncatedTo(ChronoUnit.HOURS);
+		var now = ZonedDateTime.now();
+		var nextRun = now.withHour(14).truncatedTo(ChronoUnit.HOURS);
 		if (now.isAfter(nextRun)) {
 			nextRun = nextRun.plusDays(1);
 		}
 
-		Duration duration = Duration.between(now, nextRun);
-		long delay = duration.getSeconds();
+		var duration = Duration.between(now, nextRun);
+		var delay = duration.getSeconds();
 
 		this.executor.schedule(this.task, delay, TimeUnit.SECONDS);
 	};
@@ -149,6 +134,7 @@ void activate(ComponentContext context, Config config) {
 		this.executor.schedule(this.task, 0, TimeUnit.SECONDS);
 	}
 
+	@Override
 	@Deactivate
 	protected void deactivate() {
 		super.deactivate();
@@ -168,29 +154,29 @@ public TimeOfUsePrices getPrices() {
 
 	/**
 	 * Parse the Tibber JSON to the Price Map.
-	 * 
+	 *
 	 * @param jsonData the Tibber JSON
 	 * @return the Price Map
 	 * @throws OpenemsNamedException on error
 	 */
 	public static ImmutableSortedMap<ZonedDateTime, Float> parsePrices(String jsonData) throws OpenemsNamedException {
-		TreeMap<ZonedDateTime, Float> result = new TreeMap<>();
+		var result = new TreeMap<ZonedDateTime, Float>();
 
 		if (!jsonData.isEmpty()) {
 
-			JsonObject line = JsonUtils.parseToJsonObject(jsonData);
-			JsonArray homes = JsonUtils.getAsJsonObject(line, "data") //
+			var line = JsonUtils.parseToJsonObject(jsonData);
+			var homes = JsonUtils.getAsJsonObject(line, "data") //
 					.getAsJsonObject("viewer") //
 					.getAsJsonArray("homes");
 
 			for (JsonElement home : homes) {
 
-				JsonObject priceInfo = JsonUtils.getAsJsonObject(home, "currentSubscription") //
+				var priceInfo = JsonUtils.getAsJsonObject(home, "currentSubscription") //
 						.getAsJsonObject("priceInfo");
 
 				// Price info for today and tomorrow.
-				JsonArray today = JsonUtils.getAsJsonArray(priceInfo, "today");
-				JsonArray tomorrow = JsonUtils.getAsJsonArray(priceInfo, "tomorrow");
+				var today = JsonUtils.getAsJsonArray(priceInfo, "today");
+				var tomorrow = JsonUtils.getAsJsonArray(priceInfo, "tomorrow");
 
 				// Adding to an array to avoid individual variables for individual for loops.
 				JsonArray[] days = { today, tomorrow };
@@ -198,8 +184,8 @@ public static ImmutableSortedMap<ZonedDateTime, Float> parsePrices(String jsonDa
 				// parse the arrays for price and time stamps.
 				for (JsonArray day : days) {
 					for (JsonElement element : day) {
-						float marketPrice = JsonUtils.getAsFloat(element, "total") * 1000;
-						ZonedDateTime startTime = ZonedDateTime
+						var marketPrice = JsonUtils.getAsFloat(element, "total") * 1000;
+						var startTime = ZonedDateTime
 								.parse(JsonUtils.getAsString(element, "startsAt"), DateTimeFormatter.ISO_DATE_TIME)
 								.withZoneSameInstant(ZoneId.systemDefault());
 						// Adding the values in the Map.
diff --git a/io.openems.edge.timeofusetariff.tibber/test/io/openems/edge/timeofusetariff/tibber/MyConfig.java b/io.openems.edge.timeofusetariff.tibber/test/io/openems/edge/timeofusetariff/tibber/MyConfig.java
index a3d159ce92f..d2790c3fa5b 100644
--- a/io.openems.edge.timeofusetariff.tibber/test/io/openems/edge/timeofusetariff/tibber/MyConfig.java
+++ b/io.openems.edge.timeofusetariff.tibber/test/io/openems/edge/timeofusetariff/tibber/MyConfig.java
@@ -29,7 +29,7 @@ public MyConfig build() {
 
 	/**
 	 * Create a Config builder.
-	 * 
+	 *
 	 * @return a {@link Builder}
 	 */
 	public static Builder create() {
diff --git a/io.openems.edge.timeofusetariff.tibber/test/io/openems/edge/timeofusetariff/tibber/TibberProviderTest.java b/io.openems.edge.timeofusetariff.tibber/test/io/openems/edge/timeofusetariff/tibber/TibberProviderTest.java
index 06ea3a91c7f..d1a1f962c51 100644
--- a/io.openems.edge.timeofusetariff.tibber/test/io/openems/edge/timeofusetariff/tibber/TibberProviderTest.java
+++ b/io.openems.edge.timeofusetariff.tibber/test/io/openems/edge/timeofusetariff/tibber/TibberProviderTest.java
@@ -17,7 +17,7 @@ public class TibberProviderTest {
 
 	@Test
 	public void test() throws Exception {
-		TibberImpl sut = new TibberImpl();
+		var sut = new TibberImpl();
 		new ComponentTest(sut) //
 				.activate(MyConfig.create() //
 						.setId(CTRL_ID) //
@@ -25,126 +25,66 @@ public void test() throws Exception {
 						.build()) //
 		;
 
-		 // Thread.sleep(5000);
-		 // System.out.println(sut.getPrices());
+		// Thread.sleep(5000);
+		// System.out.println(sut.getPrices());
 	}
 
 	@Test
 	public void nonEmptyStringTest() throws OpenemsNamedException {
 		// Parsing with custom data
-		SortedMap<ZonedDateTime, Float> prices = TibberImpl.parsePrices("{\n"
-				+ "  \"data\": {\n"
-				+ "    \"viewer\": {\n"
-				+ "      \"homes\": [\n"
-				+ "        {\n"
-				+ "          \"currentSubscription\": {\n"
-				+ "            \"priceInfo\": {\n"
-				+ "              \"today\": [\n"
-				+ "                {\n"
-				+ "                  \"total\": 0.187,\n"
-				+ "                  \"startsAt\": \"2021-11-15T00:00:00.000+01:00\"\n"
-				+ "                },\n"
-				+ "                {\n"
-				+ "                  \"total\": 0.1841,\n"
-				+ "                  \"startsAt\": \"2021-11-15T01:00:00.000+01:00\"\n"
-				+ "                },\n"
-				+ "                {\n"
-				+ "                  \"total\": 0.18,\n"
-				+ "                  \"startsAt\": \"2021-11-15T02:00:00.000+01:00\"\n"
-				+ "                },\n"
-				+ "                {\n"
-				+ "                  \"total\": 0.1747,\n"
-				+ "                  \"startsAt\": \"2021-11-15T03:00:00.000+01:00\"\n"
-				+ "                },\n"
-				+ "                {\n"
-				+ "                  \"total\": 0.179,\n"
-				+ "                  \"startsAt\": \"2021-11-15T04:00:00.000+01:00\"\n"
-				+ "                },\n"
-				+ "                {\n"
-				+ "                  \"total\": 0.1809,\n"
-				+ "                  \"startsAt\": \"2021-11-15T05:00:00.000+01:00\"\n"
-				+ "                },\n"
-				+ "                {\n"
-				+ "                  \"total\": 0.1795,\n"
-				+ "                  \"startsAt\": \"2021-11-15T06:00:00.000+01:00\"\n"
-				+ "                },\n"
-				+ "                {\n"
-				+ "                  \"total\": 0.1848,\n"
-				+ "                  \"startsAt\": \"2021-11-15T07:00:00.000+01:00\"\n"
-				+ "                },\n"
-				+ "                {\n"
-				+ "                  \"total\": 0.1868,\n"
-				+ "                  \"startsAt\": \"2021-11-15T08:00:00.000+01:00\"\n"
-				+ "                },\n"
-				+ "                {\n"
-				+ "                  \"total\": 0.1876,\n"
-				+ "                  \"startsAt\": \"2021-11-15T09:00:00.000+01:00\"\n"
-				+ "                },\n"
-				+ "                {\n"
-				+ "                  \"total\": 0.1874,\n"
-				+ "                  \"startsAt\": \"2021-11-15T10:00:00.000+01:00\"\n"
-				+ "                },\n"
-				+ "                {\n"
-				+ "                  \"total\": 0.1874,\n"
-				+ "                  \"startsAt\": \"2021-11-15T11:00:00.000+01:00\"\n"
-				+ "                },\n"
-				+ "                {\n"
-				+ "                  \"total\": 0.1875,\n"
-				+ "                  \"startsAt\": \"2021-11-15T12:00:00.000+01:00\"\n"
-				+ "                },\n"
-				+ "                {\n"
-				+ "                  \"total\": 0.1878,\n"
-				+ "                  \"startsAt\": \"2021-11-15T13:00:00.000+01:00\"\n"
-				+ "                },\n"
-				+ "                {\n"
-				+ "                  \"total\": 0.1868,\n"
-				+ "                  \"startsAt\": \"2021-11-15T14:00:00.000+01:00\"\n"
-				+ "                },\n"
-				+ "                {\n"
-				+ "                  \"total\": 0.1853,\n"
-				+ "                  \"startsAt\": \"2021-11-15T15:00:00.000+01:00\"\n"
-				+ "                },\n"
-				+ "                {\n"
-				+ "                  \"total\": 0.1848,\n"
-				+ "                  \"startsAt\": \"2021-11-15T16:00:00.000+01:00\"\n"
-				+ "                },\n"
-				+ "                {\n"
-				+ "                  \"total\": 0.1829,\n"
-				+ "                  \"startsAt\": \"2021-11-15T17:00:00.000+01:00\"\n"
-				+ "                },\n"
-				+ "                {\n"
-				+ "                  \"total\": 0.1835,\n"
-				+ "                  \"startsAt\": \"2021-11-15T18:00:00.000+01:00\"\n"
-				+ "                },\n"
-				+ "                {\n"
-				+ "                  \"total\": 0.1846,\n"
-				+ "                  \"startsAt\": \"2021-11-15T19:00:00.000+01:00\"\n"
-				+ "                },\n"
-				+ "                {\n"
-				+ "                  \"total\": 0.1851,\n"
-				+ "                  \"startsAt\": \"2021-11-15T20:00:00.000+01:00\"\n"
-				+ "                },\n"
-				+ "                {\n"
-				+ "                  \"total\": 0.1854,\n"
-				+ "                  \"startsAt\": \"2021-11-15T21:00:00.000+01:00\"\n"
-				+ "                },\n"
-				+ "                {\n"
-				+ "                  \"total\": 0.1853,\n"
-				+ "                  \"startsAt\": \"2021-11-15T22:00:00.000+01:00\"\n"
-				+ "                },\n"
-				+ "                {\n"
-				+ "                  \"total\": 0.1831,\n"
-				+ "                  \"startsAt\": \"2021-11-15T23:00:00.000+01:00\"\n"
-				+ "                }\n"
-				+ "              ],\n"
-				+ "              \"tomorrow\": []\n"
-				+ "            }\n"
-				+ "          }\n"
-				+ "        }\n"
-				+ "      ]\n"
-				+ "    }\n"
-				+ "  }\n"
-				+ "}"); //
+		SortedMap<ZonedDateTime, Float> prices = TibberImpl.parsePrices("{\n" + "  \"data\": {\n"
+				+ "    \"viewer\": {\n" + "      \"homes\": [\n" + "        {\n"
+				+ "          \"currentSubscription\": {\n" + "            \"priceInfo\": {\n"
+				+ "              \"today\": [\n" + "                {\n" + "                  \"total\": 0.187,\n"
+				+ "                  \"startsAt\": \"2021-11-15T00:00:00.000+01:00\"\n" + "                },\n"
+				+ "                {\n" + "                  \"total\": 0.1841,\n"
+				+ "                  \"startsAt\": \"2021-11-15T01:00:00.000+01:00\"\n" + "                },\n"
+				+ "                {\n" + "                  \"total\": 0.18,\n"
+				+ "                  \"startsAt\": \"2021-11-15T02:00:00.000+01:00\"\n" + "                },\n"
+				+ "                {\n" + "                  \"total\": 0.1747,\n"
+				+ "                  \"startsAt\": \"2021-11-15T03:00:00.000+01:00\"\n" + "                },\n"
+				+ "                {\n" + "                  \"total\": 0.179,\n"
+				+ "                  \"startsAt\": \"2021-11-15T04:00:00.000+01:00\"\n" + "                },\n"
+				+ "                {\n" + "                  \"total\": 0.1809,\n"
+				+ "                  \"startsAt\": \"2021-11-15T05:00:00.000+01:00\"\n" + "                },\n"
+				+ "                {\n" + "                  \"total\": 0.1795,\n"
+				+ "                  \"startsAt\": \"2021-11-15T06:00:00.000+01:00\"\n" + "                },\n"
+				+ "                {\n" + "                  \"total\": 0.1848,\n"
+				+ "                  \"startsAt\": \"2021-11-15T07:00:00.000+01:00\"\n" + "                },\n"
+				+ "                {\n" + "                  \"total\": 0.1868,\n"
+				+ "                  \"startsAt\": \"2021-11-15T08:00:00.000+01:00\"\n" + "                },\n"
+				+ "                {\n" + "                  \"total\": 0.1876,\n"
+				+ "                  \"startsAt\": \"2021-11-15T09:00:00.000+01:00\"\n" + "                },\n"
+				+ "                {\n" + "                  \"total\": 0.1874,\n"
+				+ "                  \"startsAt\": \"2021-11-15T10:00:00.000+01:00\"\n" + "                },\n"
+				+ "                {\n" + "                  \"total\": 0.1874,\n"
+				+ "                  \"startsAt\": \"2021-11-15T11:00:00.000+01:00\"\n" + "                },\n"
+				+ "                {\n" + "                  \"total\": 0.1875,\n"
+				+ "                  \"startsAt\": \"2021-11-15T12:00:00.000+01:00\"\n" + "                },\n"
+				+ "                {\n" + "                  \"total\": 0.1878,\n"
+				+ "                  \"startsAt\": \"2021-11-15T13:00:00.000+01:00\"\n" + "                },\n"
+				+ "                {\n" + "                  \"total\": 0.1868,\n"
+				+ "                  \"startsAt\": \"2021-11-15T14:00:00.000+01:00\"\n" + "                },\n"
+				+ "                {\n" + "                  \"total\": 0.1853,\n"
+				+ "                  \"startsAt\": \"2021-11-15T15:00:00.000+01:00\"\n" + "                },\n"
+				+ "                {\n" + "                  \"total\": 0.1848,\n"
+				+ "                  \"startsAt\": \"2021-11-15T16:00:00.000+01:00\"\n" + "                },\n"
+				+ "                {\n" + "                  \"total\": 0.1829,\n"
+				+ "                  \"startsAt\": \"2021-11-15T17:00:00.000+01:00\"\n" + "                },\n"
+				+ "                {\n" + "                  \"total\": 0.1835,\n"
+				+ "                  \"startsAt\": \"2021-11-15T18:00:00.000+01:00\"\n" + "                },\n"
+				+ "                {\n" + "                  \"total\": 0.1846,\n"
+				+ "                  \"startsAt\": \"2021-11-15T19:00:00.000+01:00\"\n" + "                },\n"
+				+ "                {\n" + "                  \"total\": 0.1851,\n"
+				+ "                  \"startsAt\": \"2021-11-15T20:00:00.000+01:00\"\n" + "                },\n"
+				+ "                {\n" + "                  \"total\": 0.1854,\n"
+				+ "                  \"startsAt\": \"2021-11-15T21:00:00.000+01:00\"\n" + "                },\n"
+				+ "                {\n" + "                  \"total\": 0.1853,\n"
+				+ "                  \"startsAt\": \"2021-11-15T22:00:00.000+01:00\"\n" + "                },\n"
+				+ "                {\n" + "                  \"total\": 0.1831,\n"
+				+ "                  \"startsAt\": \"2021-11-15T23:00:00.000+01:00\"\n" + "                }\n"
+				+ "              ],\n" + "              \"tomorrow\": []\n" + "            }\n" + "          }\n"
+				+ "        }\n" + "      ]\n" + "    }\n" + "  }\n" + "}"); //
 
 		// To check if the Map is not empty
 		assertFalse(prices.isEmpty());

From c9ea421f8f45a1e9d8e14fa13527a058ffbb9f8c Mon Sep 17 00:00:00 2001
From: Stefan Feilmeier <stefan.feilmeier@fenecon.de>
Date: Tue, 8 Mar 2022 17:09:13 +0100
Subject: [PATCH 87/96] Update io.openems.shared.influxdb

---
 .../shared/influxdb/InfluxConnector.java      | 103 ++++++++----------
 1 file changed, 45 insertions(+), 58 deletions(-)

diff --git a/io.openems.shared.influxdb/src/io/openems/shared/influxdb/InfluxConnector.java b/io.openems.shared.influxdb/src/io/openems/shared/influxdb/InfluxConnector.java
index d82e99d925d..986ed62c6c9 100644
--- a/io.openems.shared.influxdb/src/io/openems/shared/influxdb/InfluxConnector.java
+++ b/io.openems.shared.influxdb/src/io/openems/shared/influxdb/InfluxConnector.java
@@ -74,7 +74,7 @@ public class InfluxConnector {
 
 	/**
 	 * The Constructor.
-	 * 
+	 *
 	 * @param ip           IP-Address of the InfluxDB-Server
 	 * @param port         Port of the InfluxDB-Server
 	 * @param username     The username
@@ -88,7 +88,6 @@ public class InfluxConnector {
 	 */
 	public InfluxConnector(String ip, int port, String username, String password, String database,
 			String retentionPolicy, boolean isReadOnly, BiConsumer<Iterable<Point>, Throwable> onWriteError) {
-		super();
 		this.ip = ip;
 		this.port = port;
 		this.username = username;
@@ -98,13 +97,13 @@ public InfluxConnector(String ip, int port, String username, String password, St
 		this.isReadOnly = isReadOnly;
 		this.onWriteError = onWriteError;
 		this.debugLogExecutor.scheduleWithFixedDelay(() -> {
-			int queueSize = this.executor.getQueue().size();
+			var queueSize = this.executor.getQueue().size();
 			this.log.info(String.format("[monitor] Pool: %d, Active: %d, Pending: %d, Completed: %d %s",
 					this.executor.getPoolSize(), //
 					this.executor.getActiveCount(), //
 					this.executor.getQueue().size(), //
 					this.executor.getCompletedTaskCount(), //
-					(queueSize == EXECUTOR_QUEUE_SIZE) ? "!!!BACKPRESSURE!!!" : "")); //
+					queueSize == EXECUTOR_QUEUE_SIZE ? "!!!BACKPRESSURE!!!" : "")); //
 		}, 10, 10, TimeUnit.SECONDS);
 	}
 
@@ -116,21 +115,21 @@ public String getDatabase() {
 
 	/**
 	 * Get InfluxDB Connection.
-	 * 
+	 *
 	 * @return the {@link InfluxDB} connection
 	 */
 	private InfluxDB getConnection() {
 		if (this._influxDB == null) {
-			OkHttpClient.Builder okHttpClientBuilder = new OkHttpClient().newBuilder() //
+			var okHttpClientBuilder = new OkHttpClient().newBuilder() //
 					.connectTimeout(CONNECT_TIMEOUT, TimeUnit.SECONDS) //
 					.readTimeout(READ_TIMEOUT, TimeUnit.SECONDS) //
 					.writeTimeout(WRITE_TIMEOUT, TimeUnit.SECONDS);
-			InfluxDB influxDB = InfluxDBFactory.connect("http://" + this.ip + ":" + this.port, this.username,
+			var influxDB = InfluxDBFactory.connect("http://" + this.ip + ":" + this.port, this.username,
 					this.password, okHttpClientBuilder);
 			try {
 				influxDB.query(new Query("CREATE DATABASE " + this.database, ""));
 			} catch (InfluxDBException e) {
-				log.warn("InfluxDB-Exception: " + e.getMessage());
+				this.log.warn("InfluxDB-Exception: " + e.getMessage());
 			}
 			influxDB.setDatabase(this.database);
 			influxDB.setRetentionPolicy(this.retentionPolicy);
@@ -189,7 +188,7 @@ public String toString() {
 
 	/**
 	 * Copied from backend.timedata.influx.provider.
-	 * 
+	 *
 	 * @param query the Query
 	 * @return the {@link QueryResult}
 	 * @throws OpenemsException on error
@@ -200,7 +199,7 @@ public QueryResult executeQuery(String query) throws OpenemsException {
 					"InfluxDB read is temporarily blocked [" + this.queryLimit + "]. Query: " + query);
 		}
 
-		InfluxDB influxDB = this.getConnection();
+		var influxDB = this.getConnection();
 
 		// Parse result
 		QueryResult queryResult;
@@ -222,7 +221,7 @@ public QueryResult executeQuery(String query) throws OpenemsException {
 
 	/**
 	 * Queries historic energy.
-	 * 
+	 *
 	 * @param influxEdgeId the unique, numeric Edge-ID; or Empty to query all Edges
 	 * @param fromDate     the From-Date
 	 * @param toDate       the To-Date
@@ -239,11 +238,11 @@ public SortedMap<ChannelAddress, JsonElement> queryHistoricEnergy(Optional<Integ
 
 		// handle empty call
 		if (channels.isEmpty()) {
-			return new TreeMap<ChannelAddress, JsonElement>();
+			return new TreeMap<>();
 		}
 
 		// Prepare query string
-		StringBuilder b = new StringBuilder("SELECT ");
+		var b = new StringBuilder("SELECT ");
 		b.append(InfluxConnector.toChannelAddressStringEnergy(channels));
 		b.append(" FROM data WHERE ");
 		if (influxEdgeId.isPresent()) {
@@ -255,21 +254,17 @@ public SortedMap<ChannelAddress, JsonElement> queryHistoricEnergy(Optional<Integ
 		b.append(" AND time < ");
 		b.append(String.valueOf(toDate.toEpochSecond()));
 		b.append("s");
-		String query = b.toString();
+		var query = b.toString();
 
 		// Execute query
-		QueryResult queryResult = this.executeQuery(query);
-
-		// Prepare result
-		SortedMap<ChannelAddress, JsonElement> result = InfluxConnector.convertHistoricEnergyResult(query, queryResult,
-				fromDate.getZone());
+		var queryResult = this.executeQuery(query);
 
-		return result;
+		return InfluxConnector.convertHistoricEnergyResult(query, queryResult, fromDate.getZone());
 	}
 
 	/**
 	 * Queries historic energy per period.
-	 * 
+	 *
 	 * @param influxEdgeId the unique, numeric Edge-ID; or Empty to query all Edges
 	 * @param fromDate     the From-Date
 	 * @param toDate       the To-Date
@@ -292,7 +287,7 @@ public SortedMap<ZonedDateTime, SortedMap<ChannelAddress, JsonElement>> queryHis
 		}
 
 		// Prepare query string
-		StringBuilder b = new StringBuilder("SELECT ");
+		var b = new StringBuilder("SELECT ");
 		b.append(InfluxConnector.toChannelAddressStringNonNegativeDifferenceLast(channels));
 		b.append(" FROM data WHERE ");
 		if (influxEdgeId.isPresent()) {
@@ -307,21 +302,17 @@ public SortedMap<ZonedDateTime, SortedMap<ChannelAddress, JsonElement>> queryHis
 		b.append(" GROUP BY time(");
 		b.append(resolution);
 		b.append("s) fill(null)");
-		String query = b.toString();
+		var query = b.toString();
 
 		// Execute query
-		QueryResult queryResult = this.executeQuery(query);
+		var queryResult = this.executeQuery(query);
 
-		// Prepare result
-		SortedMap<ZonedDateTime, SortedMap<ChannelAddress, JsonElement>> result = InfluxConnector
-				.convertHistoricDataQueryResult(queryResult, fromDate.getZone());
-
-		return result;
+		return InfluxConnector.convertHistoricDataQueryResult(queryResult, fromDate.getZone());
 	}
 
 	/**
 	 * Queries historic data.
-	 * 
+	 *
 	 * @param influxEdgeId the unique, numeric Edge-ID; or Empty to query all Edges
 	 * @param fromDate     the From-Date
 	 * @param toDate       the To-Date
@@ -334,7 +325,7 @@ public SortedMap<ZonedDateTime, SortedMap<ChannelAddress, JsonElement>> queryHis
 			Optional<Integer> influxEdgeId, ZonedDateTime fromDate, ZonedDateTime toDate, Set<ChannelAddress> channels,
 			int resolution) throws OpenemsNamedException {
 		// Prepare query string
-		StringBuilder query = new StringBuilder("SELECT ");
+		var query = new StringBuilder("SELECT ");
 		query.append(InfluxConnector.toChannelAddressStringData(channels));
 		query.append(" FROM data WHERE ");
 		if (influxEdgeId.isPresent()) {
@@ -351,18 +342,14 @@ public SortedMap<ZonedDateTime, SortedMap<ChannelAddress, JsonElement>> queryHis
 		query.append("s) fill(null)");
 
 		// Execute query
-		QueryResult queryResult = this.executeQuery(query.toString());
-
-		// Prepare result
-		SortedMap<ZonedDateTime, SortedMap<ChannelAddress, JsonElement>> result = InfluxConnector
-				.convertHistoricDataQueryResult(queryResult, fromDate.getZone());
+		var queryResult = this.executeQuery(query.toString());
 
-		return result;
+		return InfluxConnector.convertHistoricDataQueryResult(queryResult, fromDate.getZone());
 	}
 
 	/**
 	 * Converts the QueryResult of a Historic-Data query to a properly typed Table.
-	 * 
+	 *
 	 * @param queryResult the Query-Result
 	 * @return the historic data as Map
 	 * @throws OpenemsException on error
@@ -371,11 +358,11 @@ private static SortedMap<ZonedDateTime, SortedMap<ChannelAddress, JsonElement>>
 			QueryResult queryResult, ZoneId timezone) throws OpenemsNamedException {
 		SortedMap<ZonedDateTime, SortedMap<ChannelAddress, JsonElement>> table = new TreeMap<>();
 		for (Result result : queryResult.getResults()) {
-			List<Series> seriess = result.getSeries();
+			var seriess = result.getSeries();
 			if (seriess != null) {
 				for (Series series : seriess) {
 					// create ChannelAddress index
-					ArrayList<ChannelAddress> addressIndex = new ArrayList<>();
+					var addressIndex = new ArrayList<ChannelAddress>();
 					for (String column : series.getColumns()) {
 						if (column.equals("time")) {
 							continue;
@@ -387,12 +374,12 @@ private static SortedMap<ZonedDateTime, SortedMap<ChannelAddress, JsonElement>>
 					for (List<Object> values : series.getValues()) {
 						SortedMap<ChannelAddress, JsonElement> tableRow = new TreeMap<>();
 						// get timestamp
-						Instant timestampInstant = Instant.ofEpochMilli((long) ((Double) values.get(0)).doubleValue());
-						ZonedDateTime timestamp = ZonedDateTime.ofInstant(timestampInstant, timezone);
-						for (int columnIndex = 0; columnIndex < addressIndex.size(); columnIndex++) {
+						var timestampInstant = Instant.ofEpochMilli((long) ((Double) values.get(0)).doubleValue());
+						var timestamp = ZonedDateTime.ofInstant(timestampInstant, timezone);
+						for (var columnIndex = 0; columnIndex < addressIndex.size(); columnIndex++) {
 							// Note: ignoring index '0' here as it is the 'timestamp'
-							ChannelAddress address = addressIndex.get(columnIndex);
-							Object valueObj = values.get(columnIndex + 1);
+							var address = addressIndex.get(columnIndex);
+							var valueObj = values.get(columnIndex + 1);
 							JsonElement value;
 							if (valueObj == null) {
 								value = JsonNull.INSTANCE;
@@ -413,7 +400,7 @@ private static SortedMap<ZonedDateTime, SortedMap<ChannelAddress, JsonElement>>
 
 	/**
 	 * Converts the QueryResult of a Historic-Energy query to a properly typed Map.
-	 * 
+	 *
 	 * @param queryResult the Query-Result
 	 * @return the historic energy as Map
 	 * @throws OpenemsException on error
@@ -422,11 +409,11 @@ private static SortedMap<ChannelAddress, JsonElement> convertHistoricEnergyResul
 			QueryResult queryResult, ZoneId timezone) throws OpenemsNamedException {
 		SortedMap<ChannelAddress, JsonElement> map = new TreeMap<>();
 		for (Result result : queryResult.getResults()) {
-			List<Series> seriess = result.getSeries();
+			var seriess = result.getSeries();
 			if (seriess != null) {
 				for (Series series : seriess) {
 					// create ChannelAddress index
-					ArrayList<ChannelAddress> addressIndex = new ArrayList<>();
+					var addressIndex = new ArrayList<ChannelAddress>();
 					for (String column : series.getColumns()) {
 						if (column.equals("time")) {
 							continue;
@@ -436,15 +423,15 @@ private static SortedMap<ChannelAddress, JsonElement> convertHistoricEnergyResul
 
 					// add all data
 					for (List<Object> values : series.getValues()) {
-						for (int columnIndex = 0; columnIndex < addressIndex.size(); columnIndex++) {
+						for (var columnIndex = 0; columnIndex < addressIndex.size(); columnIndex++) {
 							// Note: ignoring index '0' here as it is the 'timestamp'
-							ChannelAddress address = addressIndex.get(columnIndex);
-							Object valueObj = values.get(columnIndex + 1);
+							var address = addressIndex.get(columnIndex);
+							var valueObj = values.get(columnIndex + 1);
 							JsonElement value;
 							if (valueObj == null) {
 								value = JsonNull.INSTANCE;
 							} else if (valueObj instanceof Number) {
-								Number number = (Number) valueObj;
+								var number = (Number) valueObj;
 								if (number.intValue() < 0) {
 									// do not consider negative values
 									LOG.warn("Got negative Energy value [" + number + "] for query: " + query);
@@ -464,7 +451,7 @@ private static SortedMap<ChannelAddress, JsonElement> convertHistoricEnergyResul
 
 		{
 			// Check if all values are null
-			boolean areAllValuesNull = true;
+			var areAllValuesNull = true;
 			for (JsonElement value : map.values()) {
 				if (!value.isJsonNull()) {
 					areAllValuesNull = false;
@@ -480,7 +467,7 @@ private static SortedMap<ChannelAddress, JsonElement> convertHistoricEnergyResul
 	}
 
 	protected static String toChannelAddressStringData(Set<ChannelAddress> channels) throws OpenemsException {
-		ArrayList<String> channelAddresses = new ArrayList<>();
+		var channelAddresses = new ArrayList<String>();
 		for (ChannelAddress channel : channels) {
 			channelAddresses.add("MEAN(\"" + channel.toString() + "\") AS \"" + channel.toString() + "\"");
 		}
@@ -488,7 +475,7 @@ protected static String toChannelAddressStringData(Set<ChannelAddress> channels)
 	}
 
 	protected static String toChannelAddressStringEnergy(Set<ChannelAddress> channels) throws OpenemsException {
-		ArrayList<String> channelAddresses = new ArrayList<>();
+		var channelAddresses = new ArrayList<String>();
 		for (ChannelAddress channel : channels) {
 			channelAddresses.add("LAST(\"" + channel.toString() + "\") - FIRST(\"" + channel.toString() + "\") AS \""
 					+ channel.toString() + "\"");
@@ -498,7 +485,7 @@ protected static String toChannelAddressStringEnergy(Set<ChannelAddress> channel
 
 	protected static String toChannelAddressStringNonNegativeDifferenceLast(Set<ChannelAddress> channels)
 			throws OpenemsException {
-		ArrayList<String> channelAddresses = new ArrayList<>();
+		var channelAddresses = new ArrayList<String>();
 		for (ChannelAddress channel : channels) {
 			channelAddresses.add(
 					"NON_NEGATIVE_DIFFERENCE(LAST(\"" + channel.toString() + "\")) AS \"" + channel.toString() + "\"");
@@ -508,13 +495,13 @@ protected static String toChannelAddressStringNonNegativeDifferenceLast(Set<Chan
 
 	/**
 	 * Actually write the Point to InfluxDB.
-	 * 
+	 *
 	 * @param point the InfluxDB Point
 	 * @throws OpenemsException on error
 	 */
 	public void write(Point point) throws OpenemsException {
 		if (this.isReadOnly) {
-			log.info("Read-Only-Mode is activated. Not writing points: "
+			this.log.info("Read-Only-Mode is activated. Not writing points: "
 					+ StringUtils.toShortString(point.lineProtocol(), 100));
 			return;
 		}

From 6c1365a98761eb7b2541956378c3f054afb15374 Mon Sep 17 00:00:00 2001
From: Stefan Feilmeier <stefan.feilmeier@fenecon.de>
Date: Tue, 8 Mar 2022 17:11:52 +0100
Subject: [PATCH 88/96] Update ModbusProtocol special handling for `this.m(`

---
 .../modbus/BridgeModbusTcpImplTest.java       |    2 +-
 .../fenecon/mini/ess/FeneconMiniEssImpl.java  |  220 +--
 .../gridmeter/FeneconMiniGridMeterImpl.java   |    4 +-
 .../mini/pvmeter/FeneconMiniPvMeterImpl.java  |    2 +-
 .../pro/pvmeter/FeneconProPvMeter.java        |   18 +-
 .../charger/AbstractGoodWeEtCharger.java      |    6 +-
 .../edge/goodwe/common/AbstractGoodWe.java    | 1526 ++++++++---------
 .../GoodWeEmergencyPowerMeterImpl.java        |   24 +-
 .../goodwe/gridmeter/GoodWeGridMeterImpl.java |   30 +-
 .../eight/KmtronicRelay8PortImpl.java         |   32 +-
 .../kmtronic/four/KmtronicRelay4PortImpl.java |   16 +-
 .../src/io/openems/edge/wago/Wago.java        |    2 +-
 .../meter/artemes/am2/MeterArtemesAM2.java    |   38 +-
 .../em300/MeterBControlEM300Impl.java         |   54 +-
 .../em300/MeterCarloGavazziEm300Impl.java     |   42 +-
 .../umg511/MeterJanitzaUmg511Impl.java        |   38 +-
 .../umg604/MeterJanitzaUmg604Impl.java        |   38 +-
 .../umg96rme/MeterJanitzaUmg96rme.java        |   40 +-
 .../sdm630/MeterMicrocareSdm630Impl.java      |   40 +-
 .../pqplus/umd96/MeterPqplusUmd96Impl.java    |   30 +-
 .../pqplus/umd97/MeterPqplusUmd97Impl.java    |   32 +-
 .../MeterSchneiderActi9Smartlink.java         |   28 +-
 .../meter/siemens/SiemensPacMeterImpl.java    |   38 +-
 .../meter/sma/shm20/MeterSmaShm20Impl.java    |   42 +-
 .../SocomecMeterSinglephaseImpl.java          |   18 +-
 .../SocomecMeterThreephaseImpl.java           |  192 +--
 .../weidmueller/MeterWeidmueller525.java      |  122 +-
 .../pvinverter/solarlog/SolarLogImpl.java     |   46 +-
 28 files changed, 1360 insertions(+), 1360 deletions(-)

diff --git a/io.openems.edge.bridge.modbus/test/io/openems/edge/bridge/modbus/BridgeModbusTcpImplTest.java b/io.openems.edge.bridge.modbus/test/io/openems/edge/bridge/modbus/BridgeModbusTcpImplTest.java
index 6ae119eeb13..7de3fc805aa 100644
--- a/io.openems.edge.bridge.modbus/test/io/openems/edge/bridge/modbus/BridgeModbusTcpImplTest.java
+++ b/io.openems.edge.bridge.modbus/test/io/openems/edge/bridge/modbus/BridgeModbusTcpImplTest.java
@@ -136,7 +136,7 @@ public Doc doc() {
 		protected ModbusProtocol defineModbusProtocol() throws OpenemsException {
 			return new ModbusProtocol(this, //
 					new FC3ReadRegistersTask(100, Priority.HIGH, //
-							this.m(ChannelId.REGISTER_100, new UnsignedWordElement(100) //
+							m(ChannelId.REGISTER_100, new UnsignedWordElement(100) //
 							))); //
 		}
 
diff --git a/io.openems.edge.fenecon.mini/src/io/openems/edge/fenecon/mini/ess/FeneconMiniEssImpl.java b/io.openems.edge.fenecon.mini/src/io/openems/edge/fenecon/mini/ess/FeneconMiniEssImpl.java
index 4eb42d56583..b943755e07f 100644
--- a/io.openems.edge.fenecon.mini/src/io/openems/edge/fenecon/mini/ess/FeneconMiniEssImpl.java
+++ b/io.openems.edge.fenecon.mini/src/io/openems/edge/fenecon/mini/ess/FeneconMiniEssImpl.java
@@ -174,33 +174,33 @@ public SinglePhase getPhase() {
 	protected ModbusProtocol defineModbusProtocol() throws OpenemsException {
 		return new ModbusProtocol(this, //
 				new FC3ReadRegistersTask(100, Priority.LOW, //
-						this.m(FeneconMiniEss.ChannelId.SYSTEM_STATE, new UnsignedWordElement(100)), //
-						this.m(FeneconMiniEss.ChannelId.CONTROL_MODE, new UnsignedWordElement(101)), //
+						m(FeneconMiniEss.ChannelId.SYSTEM_STATE, new UnsignedWordElement(100)), //
+						m(FeneconMiniEss.ChannelId.CONTROL_MODE, new UnsignedWordElement(101)), //
 						new DummyRegisterElement(102, 107), //
-						this.m(FeneconMiniEss.ChannelId.BATTERY_GROUP_STATE, new UnsignedWordElement(108)), //
+						m(FeneconMiniEss.ChannelId.BATTERY_GROUP_STATE, new UnsignedWordElement(108)), //
 						new DummyRegisterElement(109), //
-						this.m(FeneconMiniEss.ChannelId.BATTERY_VOLTAGE, new UnsignedWordElement(110)), //
-						this.m(FeneconMiniEss.ChannelId.BATTERY_CURRENT, new SignedWordElement(111)), //
-						this.m(FeneconMiniEss.ChannelId.BATTERY_POWER, new SignedWordElement(112))), //
+						m(FeneconMiniEss.ChannelId.BATTERY_VOLTAGE, new UnsignedWordElement(110)), //
+						m(FeneconMiniEss.ChannelId.BATTERY_CURRENT, new SignedWordElement(111)), //
+						m(FeneconMiniEss.ChannelId.BATTERY_POWER, new SignedWordElement(112))), //
 				new FC3ReadRegistersTask(2007, Priority.HIGH, //
-						this.m(AsymmetricEss.ChannelId.ACTIVE_POWER_L1, new UnsignedWordElement(2007),
+						m(AsymmetricEss.ChannelId.ACTIVE_POWER_L1, new UnsignedWordElement(2007),
 								UNSIGNED_POWER_CONVERTER)), //
 				new FC3ReadRegistersTask(2107, Priority.HIGH, //
-						this.m(AsymmetricEss.ChannelId.ACTIVE_POWER_L2, new UnsignedWordElement(2107),
+						m(AsymmetricEss.ChannelId.ACTIVE_POWER_L2, new UnsignedWordElement(2107),
 								UNSIGNED_POWER_CONVERTER)), //
 				new FC3ReadRegistersTask(2207, Priority.HIGH, //
-						this.m(AsymmetricEss.ChannelId.ACTIVE_POWER_L3, new UnsignedWordElement(2207),
+						m(AsymmetricEss.ChannelId.ACTIVE_POWER_L3, new UnsignedWordElement(2207),
 								UNSIGNED_POWER_CONVERTER)), //
 				new FC3ReadRegistersTask(3000, Priority.LOW, //
-						this.m(FeneconMiniEss.ChannelId.BECU1_ALLOWED_CHARGE_CURRENT, new UnsignedWordElement(3000),
+						m(FeneconMiniEss.ChannelId.BECU1_ALLOWED_CHARGE_CURRENT, new UnsignedWordElement(3000),
 								ElementToChannelConverter.SCALE_FACTOR_2), //
-						this.m(FeneconMiniEss.ChannelId.BECU1_ALLOWED_DISCHARGE_CURRENT, new UnsignedWordElement(3001),
+						m(FeneconMiniEss.ChannelId.BECU1_ALLOWED_DISCHARGE_CURRENT, new UnsignedWordElement(3001),
 								ElementToChannelConverter.SCALE_FACTOR_2), //
-						this.m(FeneconMiniEss.ChannelId.BECU1_TOTAL_VOLTAGE, new UnsignedWordElement(3002),
+						m(FeneconMiniEss.ChannelId.BECU1_TOTAL_VOLTAGE, new UnsignedWordElement(3002),
 								ElementToChannelConverter.SCALE_FACTOR_2), //
-						this.m(FeneconMiniEss.ChannelId.BECU1_TOTAL_CURRENT, new UnsignedWordElement(3003)), //
-						this.m(FeneconMiniEss.ChannelId.BECU1_SOC, new UnsignedWordElement(3004)), //
-						this.m(new BitsWordElement(3005, this) //
+						m(FeneconMiniEss.ChannelId.BECU1_TOTAL_CURRENT, new UnsignedWordElement(3003)), //
+						m(FeneconMiniEss.ChannelId.BECU1_SOC, new UnsignedWordElement(3004)), //
+						m(new BitsWordElement(3005, this) //
 								.bit(0, FeneconMiniEss.ChannelId.STATE_1) //
 								.bit(1, FeneconMiniEss.ChannelId.STATE_2) //
 								.bit(2, FeneconMiniEss.ChannelId.STATE_3) //
@@ -217,7 +217,7 @@ protected ModbusProtocol defineModbusProtocol() throws OpenemsException {
 								.bit(13, FeneconMiniEss.ServiceInfoChannelId.STATE_14) //
 								.bit(14, FeneconMiniEss.ServiceInfoChannelId.STATE_15) //
 								.bit(15, FeneconMiniEss.ChannelId.STATE_16)), //
-						this.m(new BitsWordElement(3006, this) //
+						m(new BitsWordElement(3006, this) //
 								.bit(0, FeneconMiniEss.ChannelId.STATE_17) //
 								.bit(1, FeneconMiniEss.ChannelId.STATE_18) //
 								.bit(2, FeneconMiniEss.ChannelId.STATE_19) //
@@ -233,7 +233,7 @@ protected ModbusProtocol defineModbusProtocol() throws OpenemsException {
 								.bit(13, FeneconMiniEss.ServiceInfoChannelId.STATE_29) //
 								.bit(14, FeneconMiniEss.ServiceInfoChannelId.STATE_30) //
 								.bit(15, FeneconMiniEss.ServiceInfoChannelId.STATE_31)), //
-						this.m(new BitsWordElement(3007, this) //
+						m(new BitsWordElement(3007, this) //
 								.bit(0, FeneconMiniEss.ServiceInfoChannelId.STATE_32) //
 								.bit(1, FeneconMiniEss.ServiceInfoChannelId.STATE_33) //
 								.bit(2, FeneconMiniEss.SystemErrorChannelId.STATE_34) //
@@ -248,7 +248,7 @@ protected ModbusProtocol defineModbusProtocol() throws OpenemsException {
 								.bit(13, FeneconMiniEss.ServiceInfoChannelId.STATE_43) //
 								.bit(14, FeneconMiniEss.ChannelId.STATE_44) //
 								.bit(15, FeneconMiniEss.ChannelId.STATE_45)), //
-						this.m(new BitsWordElement(3008, this) //
+						m(new BitsWordElement(3008, this) //
 								.bit(0, FeneconMiniEss.ChannelId.STATE_46) //
 								.bit(1, FeneconMiniEss.ChannelId.STATE_47) //
 								.bit(2, FeneconMiniEss.ServiceInfoChannelId.STATE_48) //
@@ -256,60 +256,60 @@ protected ModbusProtocol defineModbusProtocol() throws OpenemsException {
 								.bit(10, FeneconMiniEss.ServiceInfoChannelId.STATE_50) //
 								.bit(12, FeneconMiniEss.ServiceInfoChannelId.STATE_51) //
 								.bit(13, FeneconMiniEss.ServiceInfoChannelId.STATE_52)), //
-						this.m(FeneconMiniEss.ChannelId.BECU1_VERSION, new UnsignedWordElement(3009)), //
-						this.m(FeneconMiniEss.ChannelId.BECU1_NOMINAL_CAPACITY, new UnsignedWordElement(3010)), //
-						this.m(FeneconMiniEss.ChannelId.BECU1_CURRENT_CAPACITY, new UnsignedWordElement(3011)), //
-						this.m(FeneconMiniEss.ChannelId.BECU1_MINIMUM_VOLTAGE_NO, new UnsignedWordElement(3012)), //
-						this.m(FeneconMiniEss.ChannelId.BECU1_MINIMUM_VOLTAGE, new UnsignedWordElement(3013)), //
-						this.m(FeneconMiniEss.ChannelId.BECU1_MAXIMUM_VOLTAGE_NO, new UnsignedWordElement(3014)), //
-						this.m(FeneconMiniEss.ChannelId.BECU1_MAXIMUM_VOLTAGE, new UnsignedWordElement(3015)), // ^
-						this.m(FeneconMiniEss.ChannelId.BECU1_MINIMUM_TEMPERATURE_NO, new UnsignedWordElement(3016)), //
-						this.m(FeneconMiniEss.ChannelId.BECU1_MINIMUM_TEMPERATURE, new UnsignedWordElement(3017),
+						m(FeneconMiniEss.ChannelId.BECU1_VERSION, new UnsignedWordElement(3009)), //
+						m(FeneconMiniEss.ChannelId.BECU1_NOMINAL_CAPACITY, new UnsignedWordElement(3010)), //
+						m(FeneconMiniEss.ChannelId.BECU1_CURRENT_CAPACITY, new UnsignedWordElement(3011)), //
+						m(FeneconMiniEss.ChannelId.BECU1_MINIMUM_VOLTAGE_NO, new UnsignedWordElement(3012)), //
+						m(FeneconMiniEss.ChannelId.BECU1_MINIMUM_VOLTAGE, new UnsignedWordElement(3013)), //
+						m(FeneconMiniEss.ChannelId.BECU1_MAXIMUM_VOLTAGE_NO, new UnsignedWordElement(3014)), //
+						m(FeneconMiniEss.ChannelId.BECU1_MAXIMUM_VOLTAGE, new UnsignedWordElement(3015)), // ^
+						m(FeneconMiniEss.ChannelId.BECU1_MINIMUM_TEMPERATURE_NO, new UnsignedWordElement(3016)), //
+						m(FeneconMiniEss.ChannelId.BECU1_MINIMUM_TEMPERATURE, new UnsignedWordElement(3017),
 								new ElementToChannelOffsetConverter(-40)), //
-						this.m(FeneconMiniEss.ChannelId.BECU1_MAXIMUM_TEMPERATURE_NO, new UnsignedWordElement(3018)), //
-						this.m(FeneconMiniEss.ChannelId.BECU1_MAXIMUM_TEMPERATURE, new UnsignedWordElement(
+						m(FeneconMiniEss.ChannelId.BECU1_MAXIMUM_TEMPERATURE_NO, new UnsignedWordElement(3018)), //
+						m(FeneconMiniEss.ChannelId.BECU1_MAXIMUM_TEMPERATURE, new UnsignedWordElement(
 								3019), new ElementToChannelOffsetConverter(-40))),
 				new FC3ReadRegistersTask(3020, Priority.LOW, //
-						this.m(FeneconMiniEss.ChannelId.BATTERY_VOLTAGE_SECTION_1, new UnsignedWordElement(3020)), //
-						this.m(FeneconMiniEss.ChannelId.BATTERY_VOLTAGE_SECTION_2, new UnsignedWordElement(3021)), //
-						this.m(FeneconMiniEss.ChannelId.BATTERY_VOLTAGE_SECTION_3, new UnsignedWordElement(3022)), //
-						this.m(FeneconMiniEss.ChannelId.BATTERY_VOLTAGE_SECTION_4, new UnsignedWordElement(3023)), //
-						this.m(FeneconMiniEss.ChannelId.BATTERY_VOLTAGE_SECTION_5, new UnsignedWordElement(3024)), //
-						this.m(FeneconMiniEss.ChannelId.BATTERY_VOLTAGE_SECTION_6, new UnsignedWordElement(3025)), //
-						this.m(FeneconMiniEss.ChannelId.BATTERY_VOLTAGE_SECTION_7, new UnsignedWordElement(3026)), //
-						this.m(FeneconMiniEss.ChannelId.BATTERY_VOLTAGE_SECTION_8, new UnsignedWordElement(3027)), //
-						this.m(FeneconMiniEss.ChannelId.BATTERY_VOLTAGE_SECTION_9, new UnsignedWordElement(3028)), //
-						this.m(FeneconMiniEss.ChannelId.BATTERY_VOLTAGE_SECTION_10, new UnsignedWordElement(3029)), //
-						this.m(FeneconMiniEss.ChannelId.BATTERY_VOLTAGE_SECTION_11, new UnsignedWordElement(3030)), //
-						this.m(FeneconMiniEss.ChannelId.BATTERY_VOLTAGE_SECTION_12, new UnsignedWordElement(3031)), //
-						this.m(FeneconMiniEss.ChannelId.BATTERY_VOLTAGE_SECTION_13, new UnsignedWordElement(3032)), //
-						this.m(FeneconMiniEss.ChannelId.BATTERY_VOLTAGE_SECTION_14, new UnsignedWordElement(3033)), //
-						this.m(FeneconMiniEss.ChannelId.BATTERY_VOLTAGE_SECTION_15, new UnsignedWordElement(3034)), //
-						this.m(FeneconMiniEss.ChannelId.BATTERY_VOLTAGE_SECTION_16, new UnsignedWordElement(3035)), //
-						this.m(FeneconMiniEss.ChannelId.BATTERY_TEMPERATURE_SECTION_1, new UnsignedWordElement(3036)), //
-						this.m(FeneconMiniEss.ChannelId.BATTERY_TEMPERATURE_SECTION_2, new UnsignedWordElement(3037)), //
-						this.m(FeneconMiniEss.ChannelId.BATTERY_TEMPERATURE_SECTION_3, new UnsignedWordElement(3038)), //
-						this.m(FeneconMiniEss.ChannelId.BATTERY_TEMPERATURE_SECTION_4, new UnsignedWordElement(3039)), //
-						this.m(FeneconMiniEss.ChannelId.BATTERY_TEMPERATURE_SECTION_5, new UnsignedWordElement(3040)), //
-						this.m(FeneconMiniEss.ChannelId.BATTERY_TEMPERATURE_SECTION_6, new UnsignedWordElement(3041)), //
-						this.m(FeneconMiniEss.ChannelId.BATTERY_TEMPERATURE_SECTION_7, new UnsignedWordElement(3042)), //
-						this.m(FeneconMiniEss.ChannelId.BATTERY_TEMPERATURE_SECTION_8, new UnsignedWordElement(3043)), //
-						this.m(FeneconMiniEss.ChannelId.BATTERY_TEMPERATURE_SECTION_9, new UnsignedWordElement(3044)), //
-						this.m(FeneconMiniEss.ChannelId.BATTERY_TEMPERATURE_SECTION_10, new UnsignedWordElement(3045)), //
-						this.m(FeneconMiniEss.ChannelId.BATTERY_TEMPERATURE_SECTION_11, new UnsignedWordElement(3046)), //
-						this.m(FeneconMiniEss.ChannelId.BATTERY_TEMPERATURE_SECTION_12, new UnsignedWordElement(3047)), //
-						this.m(FeneconMiniEss.ChannelId.BATTERY_TEMPERATURE_SECTION_13, new UnsignedWordElement(3048)), //
-						this.m(FeneconMiniEss.ChannelId.BATTERY_TEMPERATURE_SECTION_14, new UnsignedWordElement(3049)), //
-						this.m(FeneconMiniEss.ChannelId.BATTERY_TEMPERATURE_SECTION_15, new UnsignedWordElement(3050)), //
-						this.m(FeneconMiniEss.ChannelId.BATTERY_TEMPERATURE_SECTION_16, new UnsignedWordElement(3051))), //
+						m(FeneconMiniEss.ChannelId.BATTERY_VOLTAGE_SECTION_1, new UnsignedWordElement(3020)), //
+						m(FeneconMiniEss.ChannelId.BATTERY_VOLTAGE_SECTION_2, new UnsignedWordElement(3021)), //
+						m(FeneconMiniEss.ChannelId.BATTERY_VOLTAGE_SECTION_3, new UnsignedWordElement(3022)), //
+						m(FeneconMiniEss.ChannelId.BATTERY_VOLTAGE_SECTION_4, new UnsignedWordElement(3023)), //
+						m(FeneconMiniEss.ChannelId.BATTERY_VOLTAGE_SECTION_5, new UnsignedWordElement(3024)), //
+						m(FeneconMiniEss.ChannelId.BATTERY_VOLTAGE_SECTION_6, new UnsignedWordElement(3025)), //
+						m(FeneconMiniEss.ChannelId.BATTERY_VOLTAGE_SECTION_7, new UnsignedWordElement(3026)), //
+						m(FeneconMiniEss.ChannelId.BATTERY_VOLTAGE_SECTION_8, new UnsignedWordElement(3027)), //
+						m(FeneconMiniEss.ChannelId.BATTERY_VOLTAGE_SECTION_9, new UnsignedWordElement(3028)), //
+						m(FeneconMiniEss.ChannelId.BATTERY_VOLTAGE_SECTION_10, new UnsignedWordElement(3029)), //
+						m(FeneconMiniEss.ChannelId.BATTERY_VOLTAGE_SECTION_11, new UnsignedWordElement(3030)), //
+						m(FeneconMiniEss.ChannelId.BATTERY_VOLTAGE_SECTION_12, new UnsignedWordElement(3031)), //
+						m(FeneconMiniEss.ChannelId.BATTERY_VOLTAGE_SECTION_13, new UnsignedWordElement(3032)), //
+						m(FeneconMiniEss.ChannelId.BATTERY_VOLTAGE_SECTION_14, new UnsignedWordElement(3033)), //
+						m(FeneconMiniEss.ChannelId.BATTERY_VOLTAGE_SECTION_15, new UnsignedWordElement(3034)), //
+						m(FeneconMiniEss.ChannelId.BATTERY_VOLTAGE_SECTION_16, new UnsignedWordElement(3035)), //
+						m(FeneconMiniEss.ChannelId.BATTERY_TEMPERATURE_SECTION_1, new UnsignedWordElement(3036)), //
+						m(FeneconMiniEss.ChannelId.BATTERY_TEMPERATURE_SECTION_2, new UnsignedWordElement(3037)), //
+						m(FeneconMiniEss.ChannelId.BATTERY_TEMPERATURE_SECTION_3, new UnsignedWordElement(3038)), //
+						m(FeneconMiniEss.ChannelId.BATTERY_TEMPERATURE_SECTION_4, new UnsignedWordElement(3039)), //
+						m(FeneconMiniEss.ChannelId.BATTERY_TEMPERATURE_SECTION_5, new UnsignedWordElement(3040)), //
+						m(FeneconMiniEss.ChannelId.BATTERY_TEMPERATURE_SECTION_6, new UnsignedWordElement(3041)), //
+						m(FeneconMiniEss.ChannelId.BATTERY_TEMPERATURE_SECTION_7, new UnsignedWordElement(3042)), //
+						m(FeneconMiniEss.ChannelId.BATTERY_TEMPERATURE_SECTION_8, new UnsignedWordElement(3043)), //
+						m(FeneconMiniEss.ChannelId.BATTERY_TEMPERATURE_SECTION_9, new UnsignedWordElement(3044)), //
+						m(FeneconMiniEss.ChannelId.BATTERY_TEMPERATURE_SECTION_10, new UnsignedWordElement(3045)), //
+						m(FeneconMiniEss.ChannelId.BATTERY_TEMPERATURE_SECTION_11, new UnsignedWordElement(3046)), //
+						m(FeneconMiniEss.ChannelId.BATTERY_TEMPERATURE_SECTION_12, new UnsignedWordElement(3047)), //
+						m(FeneconMiniEss.ChannelId.BATTERY_TEMPERATURE_SECTION_13, new UnsignedWordElement(3048)), //
+						m(FeneconMiniEss.ChannelId.BATTERY_TEMPERATURE_SECTION_14, new UnsignedWordElement(3049)), //
+						m(FeneconMiniEss.ChannelId.BATTERY_TEMPERATURE_SECTION_15, new UnsignedWordElement(3050)), //
+						m(FeneconMiniEss.ChannelId.BATTERY_TEMPERATURE_SECTION_16, new UnsignedWordElement(3051))), //
 				new FC3ReadRegistersTask(3200, Priority.LOW, //
-						this.m(FeneconMiniEss.ChannelId.BECU2_CHARGE_CURRENT, new UnsignedWordElement(3200)), //
-						this.m(FeneconMiniEss.ChannelId.BECU2_DISCHARGE_CURRENT, new UnsignedWordElement(3201)), //
-						this.m(FeneconMiniEss.ChannelId.BECU2_VOLT, new UnsignedWordElement(3202)), //
-						this.m(FeneconMiniEss.ChannelId.BECU2_CURRENT, new UnsignedWordElement(3203)), //
-						this.m(FeneconMiniEss.ChannelId.BECU2_SOC, new UnsignedWordElement(3204))), //
+						m(FeneconMiniEss.ChannelId.BECU2_CHARGE_CURRENT, new UnsignedWordElement(3200)), //
+						m(FeneconMiniEss.ChannelId.BECU2_DISCHARGE_CURRENT, new UnsignedWordElement(3201)), //
+						m(FeneconMiniEss.ChannelId.BECU2_VOLT, new UnsignedWordElement(3202)), //
+						m(FeneconMiniEss.ChannelId.BECU2_CURRENT, new UnsignedWordElement(3203)), //
+						m(FeneconMiniEss.ChannelId.BECU2_SOC, new UnsignedWordElement(3204))), //
 				new FC3ReadRegistersTask(3205, Priority.LOW, //
-						this.m(new BitsWordElement(3205, this) //
+						m(new BitsWordElement(3205, this) //
 								.bit(0, FeneconMiniEss.ServiceInfoChannelId.STATE_53) //
 								.bit(1, FeneconMiniEss.ServiceInfoChannelId.STATE_54) //
 								.bit(2, FeneconMiniEss.ServiceInfoChannelId.STATE_55) //
@@ -326,7 +326,7 @@ protected ModbusProtocol defineModbusProtocol() throws OpenemsException {
 								.bit(13, FeneconMiniEss.ServiceInfoChannelId.STATE_66) //
 								.bit(14, FeneconMiniEss.ServiceInfoChannelId.STATE_67) //
 								.bit(15, FeneconMiniEss.ServiceInfoChannelId.STATE_68)), //
-						this.m(new BitsWordElement(3206, this) //
+						m(new BitsWordElement(3206, this) //
 								.bit(0, FeneconMiniEss.ServiceInfoChannelId.STATE_69) //
 								.bit(1, FeneconMiniEss.ServiceInfoChannelId.STATE_70) //
 								.bit(2, FeneconMiniEss.ServiceInfoChannelId.STATE_71) //
@@ -342,7 +342,7 @@ protected ModbusProtocol defineModbusProtocol() throws OpenemsException {
 								.bit(13, FeneconMiniEss.ServiceInfoChannelId.STATE_81) //
 								.bit(14, FeneconMiniEss.ServiceInfoChannelId.STATE_82) //
 								.bit(15, FeneconMiniEss.ServiceInfoChannelId.STATE_83)),
-						this.m(new BitsWordElement(3207, this) //
+						m(new BitsWordElement(3207, this) //
 								.bit(0, FeneconMiniEss.ServiceInfoChannelId.STATE_84) //
 								.bit(1, FeneconMiniEss.ServiceInfoChannelId.STATE_85) //
 								.bit(2, FeneconMiniEss.ServiceInfoChannelId.STATE_86) //
@@ -357,7 +357,7 @@ protected ModbusProtocol defineModbusProtocol() throws OpenemsException {
 								.bit(13, FeneconMiniEss.ServiceInfoChannelId.STATE_95) //
 								.bit(14, FeneconMiniEss.ChannelId.STATE_96) //
 								.bit(15, FeneconMiniEss.ChannelId.STATE_97)), //
-						this.m(new BitsWordElement(3208, this) //
+						m(new BitsWordElement(3208, this) //
 								.bit(0, FeneconMiniEss.ChannelId.STATE_98) //
 								.bit(1, FeneconMiniEss.ChannelId.STATE_99) //
 								.bit(2, FeneconMiniEss.ServiceInfoChannelId.STATE_100) //
@@ -365,44 +365,44 @@ protected ModbusProtocol defineModbusProtocol() throws OpenemsException {
 								.bit(10, FeneconMiniEss.ServiceInfoChannelId.STATE_102) //
 								.bit(12, FeneconMiniEss.ServiceInfoChannelId.STATE_103) //
 								.bit(13, FeneconMiniEss.ServiceInfoChannelId.STATE_104)),
-						this.m(FeneconMiniEss.ChannelId.BECU2_VERSION, new UnsignedWordElement(3209)), //
+						m(FeneconMiniEss.ChannelId.BECU2_VERSION, new UnsignedWordElement(3209)), //
 						new DummyRegisterElement(3210, 3211), //
-						this.m(FeneconMiniEss.ChannelId.BECU2_MIN_VOLT_NO, new UnsignedWordElement(3212)), //
-						this.m(FeneconMiniEss.ChannelId.BECU2_MIN_VOLT, new UnsignedWordElement(3213)), //
-						this.m(FeneconMiniEss.ChannelId.BECU2_MAX_VOLT_NO, new UnsignedWordElement(3214)), //
-						this.m(FeneconMiniEss.ChannelId.BECU2_MAX_VOLT, new UnsignedWordElement(3215)), // ^
-						this.m(FeneconMiniEss.ChannelId.BECU2_MIN_TEMP_NO, new UnsignedWordElement(3216)), //
-						this.m(FeneconMiniEss.ChannelId.BECU2_MIN_TEMP, new UnsignedWordElement(3217)), //
-						this.m(FeneconMiniEss.ChannelId.BECU2_MAX_TEMP_NO, new UnsignedWordElement(3218)), //
-						this.m(FeneconMiniEss.ChannelId.BECU2_MAX_TEMP, new UnsignedWordElement(3219))), //
+						m(FeneconMiniEss.ChannelId.BECU2_MIN_VOLT_NO, new UnsignedWordElement(3212)), //
+						m(FeneconMiniEss.ChannelId.BECU2_MIN_VOLT, new UnsignedWordElement(3213)), //
+						m(FeneconMiniEss.ChannelId.BECU2_MAX_VOLT_NO, new UnsignedWordElement(3214)), //
+						m(FeneconMiniEss.ChannelId.BECU2_MAX_VOLT, new UnsignedWordElement(3215)), // ^
+						m(FeneconMiniEss.ChannelId.BECU2_MIN_TEMP_NO, new UnsignedWordElement(3216)), //
+						m(FeneconMiniEss.ChannelId.BECU2_MIN_TEMP, new UnsignedWordElement(3217)), //
+						m(FeneconMiniEss.ChannelId.BECU2_MAX_TEMP_NO, new UnsignedWordElement(3218)), //
+						m(FeneconMiniEss.ChannelId.BECU2_MAX_TEMP, new UnsignedWordElement(3219))), //
 				new FC3ReadRegistersTask(4000, Priority.LOW, //
-						this.m(FeneconMiniEss.ChannelId.SYSTEM_WORK_STATE, new UnsignedDoublewordElement(4000)), //
-						this.m(FeneconMiniEss.ChannelId.SYSTEM_WORK_MODE_STATE, new UnsignedDoublewordElement(4002))), //
+						m(FeneconMiniEss.ChannelId.SYSTEM_WORK_STATE, new UnsignedDoublewordElement(4000)), //
+						m(FeneconMiniEss.ChannelId.SYSTEM_WORK_MODE_STATE, new UnsignedDoublewordElement(4002))), //
 				new FC3ReadRegistersTask(4800, Priority.LOW, //
-						this.m(FeneconMiniEss.ChannelId.BECU_NUM, new UnsignedWordElement(4800)), //
+						m(FeneconMiniEss.ChannelId.BECU_NUM, new UnsignedWordElement(4800)), //
 						// TODO BECU_WORK_STATE has been implemented with both registers(4801 and 4807)
-						this.m(FeneconMiniEss.ChannelId.BECU_WORK_STATE, new UnsignedWordElement(4801)), //
+						m(FeneconMiniEss.ChannelId.BECU_WORK_STATE, new UnsignedWordElement(4801)), //
 						new DummyRegisterElement(4802), //
-						this.m(FeneconMiniEss.ChannelId.BECU_CHARGE_CURRENT, new UnsignedWordElement(4803)), //
-						this.m(FeneconMiniEss.ChannelId.BECU_DISCHARGE_CURRENT, new UnsignedWordElement(4804)), //
-						this.m(FeneconMiniEss.ChannelId.BECU_VOLT, new UnsignedWordElement(4805)), //
-						this.m(FeneconMiniEss.ChannelId.BECU_CURRENT, new UnsignedWordElement(4806))), //
+						m(FeneconMiniEss.ChannelId.BECU_CHARGE_CURRENT, new UnsignedWordElement(4803)), //
+						m(FeneconMiniEss.ChannelId.BECU_DISCHARGE_CURRENT, new UnsignedWordElement(4804)), //
+						m(FeneconMiniEss.ChannelId.BECU_VOLT, new UnsignedWordElement(4805)), //
+						m(FeneconMiniEss.ChannelId.BECU_CURRENT, new UnsignedWordElement(4806))), //
 				new FC16WriteRegistersTask(4809, //
-						this.m(new BitsWordElement(4809, this) //
+						m(new BitsWordElement(4809, this) //
 								.bit(0, FeneconMiniEss.ServiceInfoChannelId.STATE_111) //
 								.bit(1, FeneconMiniEss.ServiceInfoChannelId.STATE_112))), //
 				new FC3ReadRegistersTask(4808, Priority.LOW, //
-						this.m(new BitsWordElement(4808, this) //
+						m(new BitsWordElement(4808, this) //
 								.bit(0, FeneconMiniEss.SystemErrorChannelId.STATE_105) //
 								.bit(1, FeneconMiniEss.ServiceInfoChannelId.STATE_106) //
 								.bit(2, FeneconMiniEss.ServiceInfoChannelId.STATE_107) //
 								.bit(3, FeneconMiniEss.ServiceInfoChannelId.STATE_108) //
 								.bit(4, FeneconMiniEss.ServiceInfoChannelId.STATE_109) //
 								.bit(9, FeneconMiniEss.ServiceInfoChannelId.STATE_110)), //
-						this.m(new BitsWordElement(4809, this) //
+						m(new BitsWordElement(4809, this) //
 								.bit(0, FeneconMiniEss.ServiceInfoChannelId.STATE_111) //
 								.bit(1, FeneconMiniEss.ServiceInfoChannelId.STATE_112)), //
-						this.m(new BitsWordElement(4810, this) //
+						m(new BitsWordElement(4810, this) //
 								.bit(0, FeneconMiniEss.ServiceInfoChannelId.STATE_113) //
 								.bit(1, FeneconMiniEss.ServiceInfoChannelId.STATE_114) //
 								.bit(2, FeneconMiniEss.ServiceInfoChannelId.STATE_115) //
@@ -419,7 +419,7 @@ protected ModbusProtocol defineModbusProtocol() throws OpenemsException {
 								.bit(13, FeneconMiniEss.ServiceInfoChannelId.STATE_126) //
 								.bit(14, FeneconMiniEss.ServiceInfoChannelId.STATE_127) //
 								.bit(15, FeneconMiniEss.ServiceInfoChannelId.STATE_128)), //
-						this.m(new BitsWordElement(4811, this) //
+						m(new BitsWordElement(4811, this) //
 								.bit(0, FeneconMiniEss.ServiceInfoChannelId.STATE_129) //
 								.bit(1, FeneconMiniEss.ServiceInfoChannelId.STATE_130) //
 								.bit(2, FeneconMiniEss.ServiceInfoChannelId.STATE_131) //
@@ -434,7 +434,7 @@ protected ModbusProtocol defineModbusProtocol() throws OpenemsException {
 								.bit(11, FeneconMiniEss.ServiceInfoChannelId.STATE_140) //
 								.bit(12, FeneconMiniEss.ServiceInfoChannelId.STATE_141) //
 								.bit(14, FeneconMiniEss.ChannelId.STATE_143)),
-						this.m(SymmetricEss.ChannelId.SOC, new UnsignedWordElement(4812),
+						m(SymmetricEss.ChannelId.SOC, new UnsignedWordElement(4812),
 								new ElementToChannelConverter(value -> {
 									// Set SoC to 100 % if battery is full and AllowedCharge is zero
 									if (value == null) {
@@ -451,40 +451,40 @@ protected ModbusProtocol defineModbusProtocol() throws OpenemsException {
 				), //
 
 				new FC16WriteRegistersTask(9014, //
-						this.m(FeneconMiniEss.ChannelId.RTC_YEAR, new UnsignedWordElement(9014)), //
-						this.m(FeneconMiniEss.ChannelId.RTC_MONTH, new UnsignedWordElement(9015)), //
-						this.m(FeneconMiniEss.ChannelId.RTC_DAY, new UnsignedWordElement(9016)), //
-						this.m(FeneconMiniEss.ChannelId.RTC_HOUR, new UnsignedWordElement(9017)), //
-						this.m(FeneconMiniEss.ChannelId.RTC_MINUTE, new UnsignedWordElement(9018)), //
-						this.m(FeneconMiniEss.ChannelId.RTC_SECOND, new UnsignedWordElement(9019))), //
+						m(FeneconMiniEss.ChannelId.RTC_YEAR, new UnsignedWordElement(9014)), //
+						m(FeneconMiniEss.ChannelId.RTC_MONTH, new UnsignedWordElement(9015)), //
+						m(FeneconMiniEss.ChannelId.RTC_DAY, new UnsignedWordElement(9016)), //
+						m(FeneconMiniEss.ChannelId.RTC_HOUR, new UnsignedWordElement(9017)), //
+						m(FeneconMiniEss.ChannelId.RTC_MINUTE, new UnsignedWordElement(9018)), //
+						m(FeneconMiniEss.ChannelId.RTC_SECOND, new UnsignedWordElement(9019))), //
 				new FC16WriteRegistersTask(30526, //
-						this.m(FeneconMiniEss.ChannelId.GRID_MAX_CHARGE_CURRENT, new UnsignedWordElement(30526),
+						m(FeneconMiniEss.ChannelId.GRID_MAX_CHARGE_CURRENT, new UnsignedWordElement(30526),
 								ElementToChannelConverter.SCALE_FACTOR_2,
 								new ChannelMetaInfoReadAndWrite(30126, 30526)), //
-						this.m(FeneconMiniEss.ChannelId.GRID_MAX_DISCHARGE_CURRENT, new UnsignedWordElement(30527),
+						m(FeneconMiniEss.ChannelId.GRID_MAX_DISCHARGE_CURRENT, new UnsignedWordElement(30527),
 								ElementToChannelConverter.SCALE_FACTOR_2,
 								new ChannelMetaInfoReadAndWrite(30127, 30527))), //
 				new FC16WriteRegistersTask(30558, //
-						this.m(FeneconMiniEss.ChannelId.SETUP_MODE, new UnsignedWordElement(30558),
+						m(FeneconMiniEss.ChannelId.SETUP_MODE, new UnsignedWordElement(30558),
 								new ChannelMetaInfoReadAndWrite(30157, 30558))), //
 				new FC16WriteRegistersTask(30559, //
-						this.m(FeneconMiniEss.ChannelId.PCS_MODE, new UnsignedWordElement(30559),
+						m(FeneconMiniEss.ChannelId.PCS_MODE, new UnsignedWordElement(30559),
 								new ChannelMetaInfoReadAndWrite(30158, 30559))), //
 
 				new FC3ReadRegistersTask(30126, Priority.LOW, //
-						this.m(FeneconMiniEss.ChannelId.GRID_MAX_CHARGE_CURRENT, new UnsignedWordElement(30126),
+						m(FeneconMiniEss.ChannelId.GRID_MAX_CHARGE_CURRENT, new UnsignedWordElement(30126),
 								ElementToChannelConverter.SCALE_FACTOR_2,
 								new ChannelMetaInfoReadAndWrite(30126, 30526)), //
-						this.m(FeneconMiniEss.ChannelId.GRID_MAX_DISCHARGE_CURRENT, new UnsignedWordElement(30127),
+						m(FeneconMiniEss.ChannelId.GRID_MAX_DISCHARGE_CURRENT, new UnsignedWordElement(30127),
 								ElementToChannelConverter.SCALE_FACTOR_2,
 								new ChannelMetaInfoReadAndWrite(30127, 30527)), //
 						new DummyRegisterElement(30128, 30156), //
-						this.m(FeneconMiniEss.ChannelId.SETUP_MODE, new UnsignedWordElement(30157),
+						m(FeneconMiniEss.ChannelId.SETUP_MODE, new UnsignedWordElement(30157),
 								new ChannelMetaInfoReadAndWrite(30157, 30558)), //
-						this.m(FeneconMiniEss.ChannelId.PCS_MODE, new UnsignedWordElement(30158),
+						m(FeneconMiniEss.ChannelId.PCS_MODE, new UnsignedWordElement(30158),
 								new ChannelMetaInfoReadAndWrite(30158, 30559)), //
 						new DummyRegisterElement(30159, 30165), //
-						this.m(SymmetricEss.ChannelId.GRID_MODE, new UnsignedWordElement(30166),
+						m(SymmetricEss.ChannelId.GRID_MODE, new UnsignedWordElement(30166),
 								new ElementToChannelConverter(
 										// element -> channel
 										value -> {
@@ -504,9 +504,9 @@ protected ModbusProtocol defineModbusProtocol() throws OpenemsException {
 										value -> value))), //
 
 				new FC3ReadRegistersTask(2992, Priority.LOW, //
-						this.m(FeneconMiniEss.ChannelId.DEBUG_RUN_STATE, new UnsignedWordElement(2992))), //
+						m(FeneconMiniEss.ChannelId.DEBUG_RUN_STATE, new UnsignedWordElement(2992))), //
 				new FC16WriteRegistersTask(2992, //
-						this.m(FeneconMiniEss.ChannelId.DEBUG_RUN_STATE, new UnsignedWordElement(2992))) //
+						m(FeneconMiniEss.ChannelId.DEBUG_RUN_STATE, new UnsignedWordElement(2992))) //
 		);//
 	}
 
diff --git a/io.openems.edge.fenecon.mini/src/io/openems/edge/fenecon/mini/gridmeter/FeneconMiniGridMeterImpl.java b/io.openems.edge.fenecon.mini/src/io/openems/edge/fenecon/mini/gridmeter/FeneconMiniGridMeterImpl.java
index 61ed290c40d..3b4ebf0c44e 100644
--- a/io.openems.edge.fenecon.mini/src/io/openems/edge/fenecon/mini/gridmeter/FeneconMiniGridMeterImpl.java
+++ b/io.openems.edge.fenecon.mini/src/io/openems/edge/fenecon/mini/gridmeter/FeneconMiniGridMeterImpl.java
@@ -89,10 +89,10 @@ protected void deactivate() {
 	protected ModbusProtocol defineModbusProtocol() throws OpenemsException {
 		return new ModbusProtocol(this, //
 				new FC3ReadRegistersTask(4004, Priority.HIGH, //
-						this.m(SymmetricMeter.ChannelId.ACTIVE_POWER, new SignedWordElement(4004),
+						m(SymmetricMeter.ChannelId.ACTIVE_POWER, new SignedWordElement(4004),
 								SIGNED_POWER_CONVERTER_AND_INVERT)), //
 				new FC3ReadRegistersTask(4811, Priority.LOW, //
-						this.m(new BitsWordElement(4811, this) //
+						m(new BitsWordElement(4811, this) //
 								.bit(13, FeneconMiniGridMeter.ChannelId.COMMUNICATION_BREAK))) //
 		);
 	}
diff --git a/io.openems.edge.fenecon.mini/src/io/openems/edge/fenecon/mini/pvmeter/FeneconMiniPvMeterImpl.java b/io.openems.edge.fenecon.mini/src/io/openems/edge/fenecon/mini/pvmeter/FeneconMiniPvMeterImpl.java
index 40c2f514af0..3f72497670e 100644
--- a/io.openems.edge.fenecon.mini/src/io/openems/edge/fenecon/mini/pvmeter/FeneconMiniPvMeterImpl.java
+++ b/io.openems.edge.fenecon.mini/src/io/openems/edge/fenecon/mini/pvmeter/FeneconMiniPvMeterImpl.java
@@ -85,7 +85,7 @@ protected void deactivate() {
 	protected ModbusProtocol defineModbusProtocol() throws OpenemsException {
 		return new ModbusProtocol(this, //
 				new FC3ReadRegistersTask(4006, Priority.HIGH, //
-						this.m(SymmetricMeter.ChannelId.ACTIVE_POWER, new UnsignedWordElement(4006))));
+						m(SymmetricMeter.ChannelId.ACTIVE_POWER, new UnsignedWordElement(4006))));
 	}
 
 	@Override
diff --git a/io.openems.edge.fenecon.pro/src/io/openems/edge/fenecon/pro/pvmeter/FeneconProPvMeter.java b/io.openems.edge.fenecon.pro/src/io/openems/edge/fenecon/pro/pvmeter/FeneconProPvMeter.java
index 3b840dc34a7..67dfd382692 100644
--- a/io.openems.edge.fenecon.pro/src/io/openems/edge/fenecon/pro/pvmeter/FeneconProPvMeter.java
+++ b/io.openems.edge.fenecon.pro/src/io/openems/edge/fenecon/pro/pvmeter/FeneconProPvMeter.java
@@ -118,30 +118,30 @@ public String getModbusBridgeId() {
 	protected ModbusProtocol defineModbusProtocol() throws OpenemsException {
 		return new ModbusProtocol(this, //
 				new FC3ReadRegistersTask(121, Priority.LOW, //
-						this.m(AsymmetricMeter.ChannelId.VOLTAGE_L1, new UnsignedWordElement(121),
+						m(AsymmetricMeter.ChannelId.VOLTAGE_L1, new UnsignedWordElement(121),
 								ElementToChannelConverter.SCALE_FACTOR_2), //
-						this.m(AsymmetricMeter.ChannelId.VOLTAGE_L2, new UnsignedWordElement(122),
+						m(AsymmetricMeter.ChannelId.VOLTAGE_L2, new UnsignedWordElement(122),
 								ElementToChannelConverter.SCALE_FACTOR_2), //
-						this.m(AsymmetricMeter.ChannelId.VOLTAGE_L3, new UnsignedWordElement(123),
+						m(AsymmetricMeter.ChannelId.VOLTAGE_L3, new UnsignedWordElement(123),
 								ElementToChannelConverter.SCALE_FACTOR_2)), //
 
 				new FC3ReadRegistersTask(2035, Priority.LOW, // //
-						this.m(FeneconProPvMeter.ChannelId.ACTIVE_ENERGY_L1, new UnsignedDoublewordElement(2035),
+						m(FeneconProPvMeter.ChannelId.ACTIVE_ENERGY_L1, new UnsignedDoublewordElement(2035),
 								ElementToChannelConverter.SCALE_FACTOR_2), //
 						new DummyRegisterElement(2037, 2065), //
-						this.m(AsymmetricMeter.ChannelId.ACTIVE_POWER_L1, new UnsignedWordElement(2066),
+						m(AsymmetricMeter.ChannelId.ACTIVE_POWER_L1, new UnsignedWordElement(2066),
 								MINUS_10000_CONVERTER)), //
 				new FC3ReadRegistersTask(2135, Priority.LOW, // //
-						this.m(FeneconProPvMeter.ChannelId.ACTIVE_ENERGY_L2, new UnsignedDoublewordElement(2135),
+						m(FeneconProPvMeter.ChannelId.ACTIVE_ENERGY_L2, new UnsignedDoublewordElement(2135),
 								ElementToChannelConverter.SCALE_FACTOR_2), //
 						new DummyRegisterElement(2137, 2165), //
-						this.m(AsymmetricMeter.ChannelId.ACTIVE_POWER_L2, new UnsignedWordElement(2166),
+						m(AsymmetricMeter.ChannelId.ACTIVE_POWER_L2, new UnsignedWordElement(2166),
 								MINUS_10000_CONVERTER)), //
 				new FC3ReadRegistersTask(2235, Priority.LOW, // //
-						this.m(FeneconProPvMeter.ChannelId.ACTIVE_ENERGY_L3, new UnsignedDoublewordElement(2235),
+						m(FeneconProPvMeter.ChannelId.ACTIVE_ENERGY_L3, new UnsignedDoublewordElement(2235),
 								ElementToChannelConverter.SCALE_FACTOR_2), //
 						new DummyRegisterElement(2237, 2265), //
-						this.m(AsymmetricMeter.ChannelId.ACTIVE_POWER_L3, new UnsignedWordElement(2266),
+						m(AsymmetricMeter.ChannelId.ACTIVE_POWER_L3, new UnsignedWordElement(2266),
 								MINUS_10000_CONVERTER))//
 
 		);
diff --git a/io.openems.edge.goodwe/src/io/openems/edge/goodwe/charger/AbstractGoodWeEtCharger.java b/io.openems.edge.goodwe/src/io/openems/edge/goodwe/charger/AbstractGoodWeEtCharger.java
index 25d61143680..af8ed9ddab7 100644
--- a/io.openems.edge.goodwe/src/io/openems/edge/goodwe/charger/AbstractGoodWeEtCharger.java
+++ b/io.openems.edge.goodwe/src/io/openems/edge/goodwe/charger/AbstractGoodWeEtCharger.java
@@ -45,11 +45,11 @@ protected ModbusProtocol defineModbusProtocol() throws OpenemsException {
 		final var startAddress = this.getStartAddress();
 		return new ModbusProtocol(this, //
 				new FC3ReadRegistersTask(startAddress, Priority.HIGH, //
-						this.m(GoodWeEtCharger.ChannelId.V, new UnsignedWordElement(startAddress), //
+						m(GoodWeEtCharger.ChannelId.V, new UnsignedWordElement(startAddress), //
 								ElementToChannelConverter.SCALE_FACTOR_MINUS_1), //
-						this.m(GoodWeEtCharger.ChannelId.I, new UnsignedWordElement(startAddress + 1),
+						m(GoodWeEtCharger.ChannelId.I, new UnsignedWordElement(startAddress + 1),
 								ElementToChannelConverter.SCALE_FACTOR_MINUS_1),
-						this.m(EssDcCharger.ChannelId.ACTUAL_POWER, new UnsignedDoublewordElement(startAddress + 2))));
+						m(EssDcCharger.ChannelId.ACTUAL_POWER, new UnsignedDoublewordElement(startAddress + 2))));
 	}
 
 	@Override
diff --git a/io.openems.edge.goodwe/src/io/openems/edge/goodwe/common/AbstractGoodWe.java b/io.openems.edge.goodwe/src/io/openems/edge/goodwe/common/AbstractGoodWe.java
index 2b23f1bc9c7..c2d19b946fb 100644
--- a/io.openems.edge.goodwe/src/io/openems/edge/goodwe/common/AbstractGoodWe.java
+++ b/io.openems.edge.goodwe/src/io/openems/edge/goodwe/common/AbstractGoodWe.java
@@ -80,10 +80,10 @@ protected final ModbusProtocol defineModbusProtocol() throws OpenemsException {
 		var protocol = new ModbusProtocol(this, //
 
 				new FC3ReadRegistersTask(35001, Priority.LOW, //
-						this.m(SymmetricEss.ChannelId.MAX_APPARENT_POWER, new UnsignedWordElement(35001)), //
+						m(SymmetricEss.ChannelId.MAX_APPARENT_POWER, new UnsignedWordElement(35001)), //
 						new DummyRegisterElement(35002), //
-						this.m(GoodWe.ChannelId.SERIAL_NUMBER, new StringWordElement(35003, 8)), //
-						this.m(GoodWe.ChannelId.GOODWE_TYPE, new StringWordElement(35011, 5),
+						m(GoodWe.ChannelId.SERIAL_NUMBER, new StringWordElement(35003, 8)), //
+						m(GoodWe.ChannelId.GOODWE_TYPE, new StringWordElement(35011, 5),
 								new ElementToChannelConverter(
 										// element -> channel
 										value -> {
@@ -149,31 +149,31 @@ protected final ModbusProtocol defineModbusProtocol() throws OpenemsException {
 				), //
 
 				new FC3ReadRegistersTask(35016, Priority.LOW, //
-						this.m(GoodWe.ChannelId.DSP_FM_VERSION_MASTER, new UnsignedWordElement(35016)), //
-						this.m(GoodWe.ChannelId.DSP_FM_VERSION_SLAVE, new UnsignedWordElement(35017)), //
-						this.m(GoodWe.ChannelId.DSP_BETA_VERSION, new UnsignedWordElement(35018)), //
-						this.m(GoodWe.ChannelId.ARM_FM_VERSION, new UnsignedWordElement(35019)), //
-						this.m(GoodWe.ChannelId.ARM_BETA_VERSION, new UnsignedWordElement(35020)) //
+						m(GoodWe.ChannelId.DSP_FM_VERSION_MASTER, new UnsignedWordElement(35016)), //
+						m(GoodWe.ChannelId.DSP_FM_VERSION_SLAVE, new UnsignedWordElement(35017)), //
+						m(GoodWe.ChannelId.DSP_BETA_VERSION, new UnsignedWordElement(35018)), //
+						m(GoodWe.ChannelId.ARM_FM_VERSION, new UnsignedWordElement(35019)), //
+						m(GoodWe.ChannelId.ARM_BETA_VERSION, new UnsignedWordElement(35020)) //
 				), //
 
 				new FC3ReadRegistersTask(35111, Priority.LOW, //
 						// Registers for PV1 and PV2 (35103 to 35110) are read via DC-Charger
 						// implementation
-						this.m(GoodWe.ChannelId.V_PV3, new UnsignedWordElement(35111),
+						m(GoodWe.ChannelId.V_PV3, new UnsignedWordElement(35111),
 								ElementToChannelConverter.SCALE_FACTOR_MINUS_1), //
-						this.m(GoodWe.ChannelId.I_PV3, new UnsignedWordElement(35112),
+						m(GoodWe.ChannelId.I_PV3, new UnsignedWordElement(35112),
 								ElementToChannelConverter.SCALE_FACTOR_MINUS_1), //
-						this.m(GoodWe.ChannelId.P_PV3, new UnsignedDoublewordElement(35113)), //
-						this.m(GoodWe.ChannelId.V_PV4, new UnsignedWordElement(35115),
+						m(GoodWe.ChannelId.P_PV3, new UnsignedDoublewordElement(35113)), //
+						m(GoodWe.ChannelId.V_PV4, new UnsignedWordElement(35115),
 								ElementToChannelConverter.SCALE_FACTOR_MINUS_1), //
-						this.m(GoodWe.ChannelId.I_PV4, new UnsignedWordElement(35116),
+						m(GoodWe.ChannelId.I_PV4, new UnsignedWordElement(35116),
 								ElementToChannelConverter.SCALE_FACTOR_MINUS_1), //
-						this.m(GoodWe.ChannelId.P_PV4, new UnsignedDoublewordElement(35117)), //
-						this.m(GoodWe.ChannelId.PV_MODE, new UnsignedDoublewordElement(35119)), //
+						m(GoodWe.ChannelId.P_PV4, new UnsignedDoublewordElement(35117)), //
+						m(GoodWe.ChannelId.PV_MODE, new UnsignedDoublewordElement(35119)), //
 						// Registers for Grid Smart-Meter (35121 to 35135) are read via GridMeter
 						// implementation
 						new DummyRegisterElement(35121, 35135),
-						this.m(SymmetricEss.ChannelId.GRID_MODE, new UnsignedWordElement(35136), //
+						m(SymmetricEss.ChannelId.GRID_MODE, new UnsignedWordElement(35136), //
 								new ElementToChannelConverter(value -> {
 									Integer intValue = TypeUtils.<Integer>getAsType(OpenemsType.INTEGER, value);
 									if (intValue != null) {
@@ -190,54 +190,54 @@ protected final ModbusProtocol defineModbusProtocol() throws OpenemsException {
 								}))), //
 
 				new FC3ReadRegistersTask(35137, Priority.LOW, //
-						this.m(GoodWe.ChannelId.TOTAL_INV_POWER, new SignedDoublewordElement(35137)), //
-						this.m(GoodWe.ChannelId.AC_ACTIVE_POWER, new SignedDoublewordElement(35139), //
+						m(GoodWe.ChannelId.TOTAL_INV_POWER, new SignedDoublewordElement(35137)), //
+						m(GoodWe.ChannelId.AC_ACTIVE_POWER, new SignedDoublewordElement(35139), //
 								ElementToChannelConverter.INVERT), //
-						this.m(this.reactivePowerChannelId, new SignedDoublewordElement(35141), //
+						m(this.reactivePowerChannelId, new SignedDoublewordElement(35141), //
 								ElementToChannelConverter.INVERT), //
-						this.m(GoodWe.ChannelId.AC_APPARENT_POWER, new SignedDoublewordElement(35143), //
+						m(GoodWe.ChannelId.AC_APPARENT_POWER, new SignedDoublewordElement(35143), //
 								ElementToChannelConverter.INVERT), //
 						new DummyRegisterElement(35145, 35147), //
-						this.m(GoodWe.ChannelId.LOAD_MODE_R, new UnsignedWordElement(35148)), //
+						m(GoodWe.ChannelId.LOAD_MODE_R, new UnsignedWordElement(35148)), //
 						new DummyRegisterElement(35149, 35153), //
-						this.m(GoodWe.ChannelId.LOAD_MODE_S, new UnsignedWordElement(35154)), //
+						m(GoodWe.ChannelId.LOAD_MODE_S, new UnsignedWordElement(35154)), //
 						new DummyRegisterElement(35155, 35159), //
-						this.m(GoodWe.ChannelId.LOAD_MODE_T, new UnsignedWordElement(35160)), //
+						m(GoodWe.ChannelId.LOAD_MODE_T, new UnsignedWordElement(35160)), //
 						new DummyRegisterElement(35161, 35162), //
-						this.m(GoodWe.ChannelId.P_LOAD_R, new SignedDoublewordElement(35163)), //
-						this.m(GoodWe.ChannelId.P_LOAD_S, new SignedDoublewordElement(35165)), //
-						this.m(GoodWe.ChannelId.P_LOAD_T, new SignedDoublewordElement(35167)), //
-						this.m(GoodWe.ChannelId.TOTAL_BACK_UP_LOAD_POWER, new SignedDoublewordElement(35169)), //
-						this.m(GoodWe.ChannelId.TOTAL_LOAD_POWER, new SignedDoublewordElement(35171)), //
-						this.m(GoodWe.ChannelId.UPS_LOAD_PERCENT, new UnsignedWordElement(35173),
+						m(GoodWe.ChannelId.P_LOAD_R, new SignedDoublewordElement(35163)), //
+						m(GoodWe.ChannelId.P_LOAD_S, new SignedDoublewordElement(35165)), //
+						m(GoodWe.ChannelId.P_LOAD_T, new SignedDoublewordElement(35167)), //
+						m(GoodWe.ChannelId.TOTAL_BACK_UP_LOAD_POWER, new SignedDoublewordElement(35169)), //
+						m(GoodWe.ChannelId.TOTAL_LOAD_POWER, new SignedDoublewordElement(35171)), //
+						m(GoodWe.ChannelId.UPS_LOAD_PERCENT, new UnsignedWordElement(35173),
 								ElementToChannelConverter.SCALE_FACTOR_MINUS_2), //
-						this.m(GoodWe.ChannelId.AIR_TEMPERATURE, new SignedWordElement(35174),
+						m(GoodWe.ChannelId.AIR_TEMPERATURE, new SignedWordElement(35174),
 								ElementToChannelConverter.SCALE_FACTOR_MINUS_1), //
-						this.m(GoodWe.ChannelId.MODULE_TEMPERATURE, new SignedWordElement(35175),
+						m(GoodWe.ChannelId.MODULE_TEMPERATURE, new SignedWordElement(35175),
 								ElementToChannelConverter.SCALE_FACTOR_MINUS_1), //
-						this.m(GoodWe.ChannelId.RADIATOR_TEMPERATURE, new SignedWordElement(35176),
+						m(GoodWe.ChannelId.RADIATOR_TEMPERATURE, new SignedWordElement(35176),
 								ElementToChannelConverter.SCALE_FACTOR_MINUS_1), //
-						this.m(GoodWe.ChannelId.FUNCTION_BIT_VALUE, new UnsignedWordElement(35177)), //
-						this.m(GoodWe.ChannelId.BUS_VOLTAGE, new UnsignedWordElement(35178),
+						m(GoodWe.ChannelId.FUNCTION_BIT_VALUE, new UnsignedWordElement(35177)), //
+						m(GoodWe.ChannelId.BUS_VOLTAGE, new UnsignedWordElement(35178),
 								ElementToChannelConverter.SCALE_FACTOR_MINUS_1), //
-						this.m(GoodWe.ChannelId.NBUS_VOLTAGE, new UnsignedWordElement(35179),
+						m(GoodWe.ChannelId.NBUS_VOLTAGE, new UnsignedWordElement(35179),
 								ElementToChannelConverter.SCALE_FACTOR_MINUS_1)), //
 
 				new FC3ReadRegistersTask(35180, Priority.HIGH, //
-						this.m(GoodWe.ChannelId.V_BATTERY1, new UnsignedWordElement(35180),
+						m(GoodWe.ChannelId.V_BATTERY1, new UnsignedWordElement(35180),
 								ElementToChannelConverter.SCALE_FACTOR_MINUS_1), //
-						this.m(GoodWe.ChannelId.I_BATTERY1, new SignedWordElement(35181),
+						m(GoodWe.ChannelId.I_BATTERY1, new SignedWordElement(35181),
 								ElementToChannelConverter.SCALE_FACTOR_MINUS_1), //
 						// Required for calculation of ActivePower; wrongly documented in official
 						// Modbus protocol v1.9 as being Unsigned.
-						this.m(GoodWe.ChannelId.P_BATTERY1, new SignedDoublewordElement(35182)),
-						this.m(GoodWe.ChannelId.BATTERY_MODE, new UnsignedWordElement(35184))), //
+						m(GoodWe.ChannelId.P_BATTERY1, new SignedDoublewordElement(35182)),
+						m(GoodWe.ChannelId.BATTERY_MODE, new UnsignedWordElement(35184))), //
 
 				new FC3ReadRegistersTask(35186, Priority.LOW, //
-						this.m(GoodWe.ChannelId.SAFETY_COUNTRY, new UnsignedWordElement(35186)), //
-						this.m(GoodWe.ChannelId.WORK_MODE, new UnsignedWordElement(35187)), //
+						m(GoodWe.ChannelId.SAFETY_COUNTRY, new UnsignedWordElement(35186)), //
+						m(GoodWe.ChannelId.WORK_MODE, new UnsignedWordElement(35187)), //
 						new DummyRegisterElement(35188), //
-						this.m(new BitsWordElement(35189, this) //
+						m(new BitsWordElement(35189, this) //
 								.bit(0, GoodWe.ChannelId.STATE_0) //
 								.bit(1, GoodWe.ChannelId.STATE_1) //
 								.bit(2, GoodWe.ChannelId.STATE_2) //
@@ -255,7 +255,7 @@ protected final ModbusProtocol defineModbusProtocol() throws OpenemsException {
 								.bit(14, GoodWe.ChannelId.STATE_14)//
 								.bit(15, GoodWe.ChannelId.STATE_15)//
 						), //
-						this.m(new BitsWordElement(35190, this) //
+						m(new BitsWordElement(35190, this) //
 								.bit(0, GoodWe.ChannelId.STATE_16) //
 								.bit(1, GoodWe.ChannelId.STATE_17) //
 								.bit(2, GoodWe.ChannelId.STATE_18) //
@@ -275,42 +275,42 @@ protected final ModbusProtocol defineModbusProtocol() throws OpenemsException {
 						), //
 
 						// The total PV production energy from installation
-						this.m(GoodWe.ChannelId.PV_E_TOTAL, new UnsignedDoublewordElement(35191),
+						m(GoodWe.ChannelId.PV_E_TOTAL, new UnsignedDoublewordElement(35191),
 								ElementToChannelConverter.SCALE_FACTOR_MINUS_1), //
-						this.m(GoodWe.ChannelId.PV_E_DAY, new UnsignedDoublewordElement(35193),
+						m(GoodWe.ChannelId.PV_E_DAY, new UnsignedDoublewordElement(35193),
 								ElementToChannelConverter.SCALE_FACTOR_MINUS_1), //
 						new DummyRegisterElement(35195, 35196), //
-						this.m(GoodWe.ChannelId.H_TOTAL, new UnsignedDoublewordElement(35197)), //
-						this.m(GoodWe.ChannelId.E_DAY_SELL, new UnsignedWordElement(35199),
+						m(GoodWe.ChannelId.H_TOTAL, new UnsignedDoublewordElement(35197)), //
+						m(GoodWe.ChannelId.E_DAY_SELL, new UnsignedWordElement(35199),
 								ElementToChannelConverter.SCALE_FACTOR_MINUS_1), //
-						this.m(GoodWe.ChannelId.E_TOTAL_BUY, new UnsignedDoublewordElement(35200),
+						m(GoodWe.ChannelId.E_TOTAL_BUY, new UnsignedDoublewordElement(35200),
 								ElementToChannelConverter.SCALE_FACTOR_MINUS_1), //
-						this.m(GoodWe.ChannelId.E_DAY_BUY, new UnsignedWordElement(35202),
+						m(GoodWe.ChannelId.E_DAY_BUY, new UnsignedWordElement(35202),
 								ElementToChannelConverter.SCALE_FACTOR_MINUS_1), //
-						this.m(GoodWe.ChannelId.E_TOTAL_LOAD, new UnsignedDoublewordElement(35203),
+						m(GoodWe.ChannelId.E_TOTAL_LOAD, new UnsignedDoublewordElement(35203),
 								ElementToChannelConverter.SCALE_FACTOR_MINUS_1), //
-						this.m(GoodWe.ChannelId.E_LOAD_DAY, new UnsignedWordElement(35205),
+						m(GoodWe.ChannelId.E_LOAD_DAY, new UnsignedWordElement(35205),
 								ElementToChannelConverter.SCALE_FACTOR_MINUS_1), //
-						this.m(GoodWe.ChannelId.E_BATTERY_CHARGE, new UnsignedDoublewordElement(35206), //
+						m(GoodWe.ChannelId.E_BATTERY_CHARGE, new UnsignedDoublewordElement(35206), //
 								ElementToChannelConverter.SCALE_FACTOR_2), //
-						this.m(GoodWe.ChannelId.E_CHARGE_DAY, new UnsignedWordElement(35208),
+						m(GoodWe.ChannelId.E_CHARGE_DAY, new UnsignedWordElement(35208),
 								ElementToChannelConverter.SCALE_FACTOR_MINUS_1), //
-						this.m(GoodWe.ChannelId.E_BATTERY_DISCHARGE, new UnsignedDoublewordElement(35209),
+						m(GoodWe.ChannelId.E_BATTERY_DISCHARGE, new UnsignedDoublewordElement(35209),
 								ElementToChannelConverter.SCALE_FACTOR_2), //
-						this.m(GoodWe.ChannelId.E_DISCHARGE_DAY, new UnsignedWordElement(35211),
+						m(GoodWe.ChannelId.E_DISCHARGE_DAY, new UnsignedWordElement(35211),
 								ElementToChannelConverter.SCALE_FACTOR_MINUS_1), //
-						this.m(GoodWe.ChannelId.BATTERY_STRINGS, new UnsignedWordElement(35212)), //
-						this.m(GoodWe.ChannelId.CPLD_WARNING_CODE, new UnsignedWordElement(35213)), //
+						m(GoodWe.ChannelId.BATTERY_STRINGS, new UnsignedWordElement(35212)), //
+						m(GoodWe.ChannelId.CPLD_WARNING_CODE, new UnsignedWordElement(35213)), //
 						new DummyRegisterElement(35214, 35217), //
-						this.m(GoodWe.ChannelId.DIAG_STATUS_H, new UnsignedDoublewordElement(35218)), //
-						this.m(GoodWe.ChannelId.DIAG_STATUS_L, new UnsignedDoublewordElement(35220)), //
+						m(GoodWe.ChannelId.DIAG_STATUS_H, new UnsignedDoublewordElement(35218)), //
+						m(GoodWe.ChannelId.DIAG_STATUS_L, new UnsignedDoublewordElement(35220)), //
 						new DummyRegisterElement(35222, 35224), //
-						this.m(GoodWe.ChannelId.EH_BATTERY_FUNCTION_ACTIVE, new UnsignedWordElement(35225)), //
-						this.m(GoodWe.ChannelId.ARC_SELF_CHECK_STATUS, new UnsignedWordElement(35226)) //
+						m(GoodWe.ChannelId.EH_BATTERY_FUNCTION_ACTIVE, new UnsignedWordElement(35225)), //
+						m(GoodWe.ChannelId.ARC_SELF_CHECK_STATUS, new UnsignedWordElement(35226)) //
 				),
 
 				new FC3ReadRegistersTask(35250, Priority.LOW, //
-						this.m(new BitsWordElement(35250, this) //
+						m(new BitsWordElement(35250, this) //
 								.bit(0, GoodWe.ChannelId.STATE_70) //
 								.bit(1, GoodWe.ChannelId.STATE_71) //
 								.bit(2, GoodWe.ChannelId.STATE_72) //
@@ -327,7 +327,7 @@ protected final ModbusProtocol defineModbusProtocol() throws OpenemsException {
 								.bit(13, GoodWe.ChannelId.STATE_83) //
 								.bit(14, GoodWe.ChannelId.STATE_84) //
 								.bit(15, GoodWe.ChannelId.STATE_85)), //
-						this.m(new BitsWordElement(35251, this) //
+						m(new BitsWordElement(35251, this) //
 								.bit(0, GoodWe.ChannelId.STATE_86) //
 								.bit(1, GoodWe.ChannelId.STATE_87) //
 								.bit(2, GoodWe.ChannelId.STATE_88) //
@@ -338,7 +338,7 @@ protected final ModbusProtocol defineModbusProtocol() throws OpenemsException {
 								.bit(7, GoodWe.ChannelId.STATE_93) //
 						), //
 						new DummyRegisterElement(35252, 35253), //
-						this.m(new BitsWordElement(35254, this) //
+						m(new BitsWordElement(35254, this) //
 								.bit(0, GoodWe.ChannelId.STATE_94) //
 								.bit(1, GoodWe.ChannelId.STATE_95) //
 								.bit(2, GoodWe.ChannelId.STATE_96) //
@@ -355,7 +355,7 @@ protected final ModbusProtocol defineModbusProtocol() throws OpenemsException {
 								.bit(13, GoodWe.ChannelId.STATE_107) //
 								.bit(14, GoodWe.ChannelId.STATE_108) //
 								.bit(15, GoodWe.ChannelId.STATE_109)), //
-						this.m(new BitsWordElement(35255, this) //
+						m(new BitsWordElement(35255, this) //
 								.bit(0, GoodWe.ChannelId.STATE_110) //
 								.bit(1, GoodWe.ChannelId.STATE_111) //
 								.bit(2, GoodWe.ChannelId.STATE_112) //
@@ -365,7 +365,7 @@ protected final ModbusProtocol defineModbusProtocol() throws OpenemsException {
 								.bit(6, GoodWe.ChannelId.STATE_116) //
 						), //
 						new DummyRegisterElement(35256, 35257), //
-						this.m(new BitsWordElement(35258, this) //
+						m(new BitsWordElement(35258, this) //
 								.bit(0, GoodWe.ChannelId.STATE_117) //
 								.bit(1, GoodWe.ChannelId.STATE_118) //
 								.bit(2, GoodWe.ChannelId.STATE_119) //
@@ -382,7 +382,7 @@ protected final ModbusProtocol defineModbusProtocol() throws OpenemsException {
 								.bit(13, GoodWe.ChannelId.STATE_130) //
 								.bit(14, GoodWe.ChannelId.STATE_131) //
 								.bit(15, GoodWe.ChannelId.STATE_132)), //
-						this.m(new BitsWordElement(35259, this) //
+						m(new BitsWordElement(35259, this) //
 								.bit(0, GoodWe.ChannelId.STATE_133) //
 								.bit(1, GoodWe.ChannelId.STATE_134) //
 								.bit(2, GoodWe.ChannelId.STATE_135) //
@@ -390,41 +390,41 @@ protected final ModbusProtocol defineModbusProtocol() throws OpenemsException {
 								.bit(4, GoodWe.ChannelId.STATE_137) //
 						), //
 						new DummyRegisterElement(35260, 35267), //
-						this.m(GoodWe.ChannelId.MAX_GRID_FREQ_WITHIN_1_MINUTE, new UnsignedWordElement(35268),
+						m(GoodWe.ChannelId.MAX_GRID_FREQ_WITHIN_1_MINUTE, new UnsignedWordElement(35268),
 								ElementToChannelConverter.SCALE_FACTOR_MINUS_2), //
-						this.m(GoodWe.ChannelId.MIN_GRID_FREQ_WITHIN_1_MINUTE, new UnsignedWordElement(35269),
+						m(GoodWe.ChannelId.MIN_GRID_FREQ_WITHIN_1_MINUTE, new UnsignedWordElement(35269),
 								ElementToChannelConverter.SCALE_FACTOR_MINUS_2), //
-						this.m(GoodWe.ChannelId.MAX_GRID_VOLTAGE_WITHIN_1_MINUTE_R, new UnsignedWordElement(35270),
+						m(GoodWe.ChannelId.MAX_GRID_VOLTAGE_WITHIN_1_MINUTE_R, new UnsignedWordElement(35270),
 								ElementToChannelConverter.SCALE_FACTOR_MINUS_1), //
-						this.m(GoodWe.ChannelId.MIN_GRID_VOLTAGE_WITHIN_1_MINUTE_R, new UnsignedWordElement(35271),
+						m(GoodWe.ChannelId.MIN_GRID_VOLTAGE_WITHIN_1_MINUTE_R, new UnsignedWordElement(35271),
 								ElementToChannelConverter.SCALE_FACTOR_MINUS_1), //
-						this.m(GoodWe.ChannelId.MAX_GRID_VOLTAGE_WITHIN_1_MINUTE_S, new UnsignedWordElement(35272),
+						m(GoodWe.ChannelId.MAX_GRID_VOLTAGE_WITHIN_1_MINUTE_S, new UnsignedWordElement(35272),
 								ElementToChannelConverter.SCALE_FACTOR_MINUS_1), //
-						this.m(GoodWe.ChannelId.MIN_GRID_VOLTAGE_WITHIN_1_MINUTE_S, new UnsignedWordElement(35273),
+						m(GoodWe.ChannelId.MIN_GRID_VOLTAGE_WITHIN_1_MINUTE_S, new UnsignedWordElement(35273),
 								ElementToChannelConverter.SCALE_FACTOR_MINUS_1), //
-						this.m(GoodWe.ChannelId.MAX_GRID_VOLTAGE_WITHIN_1_MINUTE_T, new UnsignedWordElement(35274),
+						m(GoodWe.ChannelId.MAX_GRID_VOLTAGE_WITHIN_1_MINUTE_T, new UnsignedWordElement(35274),
 								ElementToChannelConverter.SCALE_FACTOR_MINUS_1), //
-						this.m(GoodWe.ChannelId.MIN_GRID_VOLTAGE_WITHIN_1_MINUTE_T, new UnsignedWordElement(35275),
+						m(GoodWe.ChannelId.MIN_GRID_VOLTAGE_WITHIN_1_MINUTE_T, new UnsignedWordElement(35275),
 								ElementToChannelConverter.SCALE_FACTOR_MINUS_1), //
-						this.m(GoodWe.ChannelId.MAX_BACKUP_POWER_WITHIN_1_MINUTE_R,
+						m(GoodWe.ChannelId.MAX_BACKUP_POWER_WITHIN_1_MINUTE_R,
 								new UnsignedDoublewordElement(35276)), //
-						this.m(GoodWe.ChannelId.MAX_BACKUP_POWER_WITHIN_1_MINUTE_S,
+						m(GoodWe.ChannelId.MAX_BACKUP_POWER_WITHIN_1_MINUTE_S,
 								new UnsignedDoublewordElement(35278)), //
-						this.m(GoodWe.ChannelId.MAX_BACKUP_POWER_WITHIN_1_MINUTE_T,
+						m(GoodWe.ChannelId.MAX_BACKUP_POWER_WITHIN_1_MINUTE_T,
 								new UnsignedDoublewordElement(35280)), //
-						this.m(GoodWe.ChannelId.MAX_BACKUP_POWER_WITHIN_1_MINUTE_TOTAL,
+						m(GoodWe.ChannelId.MAX_BACKUP_POWER_WITHIN_1_MINUTE_TOTAL,
 								new UnsignedDoublewordElement(35282)), //
-						this.m(GoodWe.ChannelId.GRID_HVRT_EVENT_TIMES, new UnsignedWordElement(35284)), //
-						this.m(GoodWe.ChannelId.GRID_LVRT_EVENT_TIMES, new UnsignedWordElement(35285)), //
-						this.m(GoodWe.ChannelId.INV_ERROR_MSG_RECORD_FOR_EMS, new UnsignedDoublewordElement(35286)), //
-						this.m(GoodWe.ChannelId.INV_WARNING_CODE_RECORD_FOR_EMS, new UnsignedDoublewordElement(35288)), //
-						this.m(GoodWe.ChannelId.INV_CPLD_WARNING_RECORD_FOR_EMS, new UnsignedDoublewordElement(35290)) //
+						m(GoodWe.ChannelId.GRID_HVRT_EVENT_TIMES, new UnsignedWordElement(35284)), //
+						m(GoodWe.ChannelId.GRID_LVRT_EVENT_TIMES, new UnsignedWordElement(35285)), //
+						m(GoodWe.ChannelId.INV_ERROR_MSG_RECORD_FOR_EMS, new UnsignedDoublewordElement(35286)), //
+						m(GoodWe.ChannelId.INV_WARNING_CODE_RECORD_FOR_EMS, new UnsignedDoublewordElement(35288)), //
+						m(GoodWe.ChannelId.INV_CPLD_WARNING_RECORD_FOR_EMS, new UnsignedDoublewordElement(35290)) //
 				),
 
 				// Registers 36066 to 36120 throw "Illegal Data Address"
 
 				new FC3ReadRegistersTask(37000, Priority.LOW, //
-						this.m(new BitsWordElement(37000, this) //
+						m(new BitsWordElement(37000, this) //
 								.bit(0, GoodWe.ChannelId.DRM0)//
 								.bit(1, GoodWe.ChannelId.DRM1)//
 								.bit(2, GoodWe.ChannelId.DRM2)//
@@ -436,13 +436,13 @@ protected final ModbusProtocol defineModbusProtocol() throws OpenemsException {
 								.bit(8, GoodWe.ChannelId.DRM8)//
 								.bit(15, GoodWe.ChannelId.DRED_CONNECT)//
 						), //
-						this.m(GoodWe.ChannelId.BATTERY_TYPE_INDEX, new UnsignedWordElement(37001)), //
-						this.m(GoodWe.ChannelId.BMS_STATUS, new UnsignedWordElement(37002)), //
-						this.m(GoodWe.ChannelId.BMS_PACK_TEMPERATURE, new UnsignedWordElement(37003),
+						m(GoodWe.ChannelId.BATTERY_TYPE_INDEX, new UnsignedWordElement(37001)), //
+						m(GoodWe.ChannelId.BMS_STATUS, new UnsignedWordElement(37002)), //
+						m(GoodWe.ChannelId.BMS_PACK_TEMPERATURE, new UnsignedWordElement(37003),
 								ElementToChannelConverter.SCALE_FACTOR_MINUS_1), //
-						this.m(GoodWe.ChannelId.BMS_CHARGE_IMAX, new UnsignedWordElement(37004)), //
-						this.m(GoodWe.ChannelId.BMS_DISCHARGE_IMAX, new UnsignedWordElement(37005)), //
-						this.m(new BitsWordElement(37006, this) //
+						m(GoodWe.ChannelId.BMS_CHARGE_IMAX, new UnsignedWordElement(37004)), //
+						m(GoodWe.ChannelId.BMS_DISCHARGE_IMAX, new UnsignedWordElement(37005)), //
+						m(new BitsWordElement(37006, this) //
 								.bit(0, GoodWe.ChannelId.STATE_42)//
 								.bit(1, GoodWe.ChannelId.STATE_43)//
 								.bit(2, GoodWe.ChannelId.STATE_44)//
@@ -461,9 +461,9 @@ protected final ModbusProtocol defineModbusProtocol() throws OpenemsException {
 								.bit(15, GoodWe.ChannelId.STATE_57)//
 						), //
 						this.getSocModbusElement(37007), //
-						this.m(GoodWe.ChannelId.BMS_SOH, new UnsignedWordElement(37008)), //
-						this.m(GoodWe.ChannelId.BMS_BATTERY_STRINGS, new UnsignedWordElement(37009)), //
-						this.m(new BitsWordElement(37010, this) //
+						m(GoodWe.ChannelId.BMS_SOH, new UnsignedWordElement(37008)), //
+						m(GoodWe.ChannelId.BMS_BATTERY_STRINGS, new UnsignedWordElement(37009)), //
+						m(new BitsWordElement(37010, this) //
 								.bit(0, GoodWe.ChannelId.STATE_58)//
 								.bit(1, GoodWe.ChannelId.STATE_59)//
 								.bit(2, GoodWe.ChannelId.STATE_60)//
@@ -477,390 +477,390 @@ protected final ModbusProtocol defineModbusProtocol() throws OpenemsException {
 								.bit(10, GoodWe.ChannelId.STATE_68)//
 								.bit(11, GoodWe.ChannelId.STATE_69)//
 						), //
-						this.m(GoodWe.ChannelId.BATTERY_PROTOCOL, new UnsignedWordElement(37011)), //
+						m(GoodWe.ChannelId.BATTERY_PROTOCOL, new UnsignedWordElement(37011)), //
 						// TODO BMS_ERROR_CODE_H register 37012 Table 8-7 BMS Alarm Code bits Bit16-31
 						// are reserved
 						// TODO Same for BMS_WARNING_CODE_H Table 8-8
 						new DummyRegisterElement(37012, 37013), //
-						this.m(GoodWe.ChannelId.BMS_SOFTWARE_VERSION, new UnsignedWordElement(37014)), //
-						this.m(GoodWe.ChannelId.BATTERY_HARDWARE_VERSION, new UnsignedWordElement(37015)), //
-						this.m(GoodWe.ChannelId.MAXIMUM_CELL_TEMPERATURE_ID, new UnsignedWordElement(37016)), //
-						this.m(GoodWe.ChannelId.MINIMUM_CELL_TEMPERATURE_ID, new UnsignedWordElement(37017)), //
-						this.m(GoodWe.ChannelId.MAXIMUM_CELL_VOLTAGE_ID, new UnsignedWordElement(37018)), //
-						this.m(GoodWe.ChannelId.MINIMUM_CELL_VOLTAGE_ID, new UnsignedWordElement(37019)), //
-						this.m(GoodWe.ChannelId.MAXIMUM_CELL_TEMPERATURE, new UnsignedWordElement(37020),
-								ElementToChannelConverter.SCALE_FACTOR_MINUS_1), //
-						this.m(GoodWe.ChannelId.MINIMUM_CELL_TEMPERATURE, new UnsignedWordElement(37021),
-								ElementToChannelConverter.SCALE_FACTOR_MINUS_1), //
-						this.m(GoodWe.ChannelId.MAXIMUM_CELL_VOLTAGE, new UnsignedWordElement(37022)), //
-						this.m(GoodWe.ChannelId.MINIMUM_CELL_VOLTAGE, new UnsignedWordElement(37023)), //
-						this.m(GoodWe.ChannelId.PASS_INFORMATION_1, new UnsignedWordElement(37024)), //
-						this.m(GoodWe.ChannelId.PASS_INFORMATION_2, new UnsignedWordElement(37025)), //
-						this.m(GoodWe.ChannelId.PASS_INFORMATION_3, new UnsignedWordElement(37026)), //
-						this.m(GoodWe.ChannelId.PASS_INFORMATION_4, new UnsignedWordElement(37027)), //
-						this.m(GoodWe.ChannelId.PASS_INFORMATION_5, new UnsignedWordElement(37028)), //
-						this.m(GoodWe.ChannelId.PASS_INFORMATION_6, new UnsignedWordElement(37029)), //
-						this.m(GoodWe.ChannelId.PASS_INFORMATION_7, new UnsignedWordElement(37030)), //
-						this.m(GoodWe.ChannelId.PASS_INFORMATION_8, new UnsignedWordElement(37031)), //
-						this.m(GoodWe.ChannelId.PASS_INFORMATION_9, new UnsignedWordElement(37032)), //
-						this.m(GoodWe.ChannelId.PASS_INFORMATION_10, new UnsignedWordElement(37033)), //
-						this.m(GoodWe.ChannelId.PASS_INFORMATION_11, new UnsignedWordElement(37034)), //
-						this.m(GoodWe.ChannelId.PASS_INFORMATION_12, new UnsignedWordElement(37035)), //
-						this.m(GoodWe.ChannelId.PASS_INFORMATION_13, new UnsignedWordElement(37036)), //
-						this.m(GoodWe.ChannelId.PASS_INFORMATION_14, new UnsignedWordElement(37037)), //
-						this.m(GoodWe.ChannelId.PASS_INFORMATION_15, new UnsignedWordElement(37038)), //
-						this.m(GoodWe.ChannelId.PASS_INFORMATION_16, new UnsignedWordElement(37039)), //
-						this.m(GoodWe.ChannelId.PASS_INFORMATION_17, new UnsignedWordElement(37040)), //
-						this.m(GoodWe.ChannelId.PASS_INFORMATION_18, new UnsignedWordElement(37041)), //
-						this.m(GoodWe.ChannelId.PASS_INFORMATION_19, new UnsignedWordElement(37042)), //
-						this.m(GoodWe.ChannelId.PASS_INFORMATION_20, new UnsignedWordElement(37043)), //
-						this.m(GoodWe.ChannelId.PASS_INFORMATION_21, new UnsignedWordElement(37044)), //
-						this.m(GoodWe.ChannelId.PASS_INFORMATION_22, new UnsignedWordElement(37045)), //
-						this.m(GoodWe.ChannelId.PASS_INFORMATION_23, new UnsignedWordElement(37046)), //
-						this.m(GoodWe.ChannelId.PASS_INFORMATION_24, new UnsignedWordElement(37047)), //
-						this.m(GoodWe.ChannelId.PASS_INFORMATION_25, new UnsignedWordElement(37048)), //
-						this.m(GoodWe.ChannelId.PASS_INFORMATION_26, new UnsignedWordElement(37049)), //
-						this.m(GoodWe.ChannelId.PASS_INFORMATION_27, new UnsignedWordElement(37050)), //
-						this.m(GoodWe.ChannelId.PASS_INFORMATION_28, new UnsignedWordElement(37051)), //
-						this.m(GoodWe.ChannelId.PASS_INFORMATION_29, new UnsignedWordElement(37052)), //
-						this.m(GoodWe.ChannelId.PASS_INFORMATION_30, new UnsignedWordElement(37053)), //
-						this.m(GoodWe.ChannelId.PASS_INFORMATION_31, new UnsignedWordElement(37054)), //
-						this.m(GoodWe.ChannelId.PASS_INFORMATION_32, new UnsignedWordElement(37055))), //
+						m(GoodWe.ChannelId.BMS_SOFTWARE_VERSION, new UnsignedWordElement(37014)), //
+						m(GoodWe.ChannelId.BATTERY_HARDWARE_VERSION, new UnsignedWordElement(37015)), //
+						m(GoodWe.ChannelId.MAXIMUM_CELL_TEMPERATURE_ID, new UnsignedWordElement(37016)), //
+						m(GoodWe.ChannelId.MINIMUM_CELL_TEMPERATURE_ID, new UnsignedWordElement(37017)), //
+						m(GoodWe.ChannelId.MAXIMUM_CELL_VOLTAGE_ID, new UnsignedWordElement(37018)), //
+						m(GoodWe.ChannelId.MINIMUM_CELL_VOLTAGE_ID, new UnsignedWordElement(37019)), //
+						m(GoodWe.ChannelId.MAXIMUM_CELL_TEMPERATURE, new UnsignedWordElement(37020),
+								ElementToChannelConverter.SCALE_FACTOR_MINUS_1), //
+						m(GoodWe.ChannelId.MINIMUM_CELL_TEMPERATURE, new UnsignedWordElement(37021),
+								ElementToChannelConverter.SCALE_FACTOR_MINUS_1), //
+						m(GoodWe.ChannelId.MAXIMUM_CELL_VOLTAGE, new UnsignedWordElement(37022)), //
+						m(GoodWe.ChannelId.MINIMUM_CELL_VOLTAGE, new UnsignedWordElement(37023)), //
+						m(GoodWe.ChannelId.PASS_INFORMATION_1, new UnsignedWordElement(37024)), //
+						m(GoodWe.ChannelId.PASS_INFORMATION_2, new UnsignedWordElement(37025)), //
+						m(GoodWe.ChannelId.PASS_INFORMATION_3, new UnsignedWordElement(37026)), //
+						m(GoodWe.ChannelId.PASS_INFORMATION_4, new UnsignedWordElement(37027)), //
+						m(GoodWe.ChannelId.PASS_INFORMATION_5, new UnsignedWordElement(37028)), //
+						m(GoodWe.ChannelId.PASS_INFORMATION_6, new UnsignedWordElement(37029)), //
+						m(GoodWe.ChannelId.PASS_INFORMATION_7, new UnsignedWordElement(37030)), //
+						m(GoodWe.ChannelId.PASS_INFORMATION_8, new UnsignedWordElement(37031)), //
+						m(GoodWe.ChannelId.PASS_INFORMATION_9, new UnsignedWordElement(37032)), //
+						m(GoodWe.ChannelId.PASS_INFORMATION_10, new UnsignedWordElement(37033)), //
+						m(GoodWe.ChannelId.PASS_INFORMATION_11, new UnsignedWordElement(37034)), //
+						m(GoodWe.ChannelId.PASS_INFORMATION_12, new UnsignedWordElement(37035)), //
+						m(GoodWe.ChannelId.PASS_INFORMATION_13, new UnsignedWordElement(37036)), //
+						m(GoodWe.ChannelId.PASS_INFORMATION_14, new UnsignedWordElement(37037)), //
+						m(GoodWe.ChannelId.PASS_INFORMATION_15, new UnsignedWordElement(37038)), //
+						m(GoodWe.ChannelId.PASS_INFORMATION_16, new UnsignedWordElement(37039)), //
+						m(GoodWe.ChannelId.PASS_INFORMATION_17, new UnsignedWordElement(37040)), //
+						m(GoodWe.ChannelId.PASS_INFORMATION_18, new UnsignedWordElement(37041)), //
+						m(GoodWe.ChannelId.PASS_INFORMATION_19, new UnsignedWordElement(37042)), //
+						m(GoodWe.ChannelId.PASS_INFORMATION_20, new UnsignedWordElement(37043)), //
+						m(GoodWe.ChannelId.PASS_INFORMATION_21, new UnsignedWordElement(37044)), //
+						m(GoodWe.ChannelId.PASS_INFORMATION_22, new UnsignedWordElement(37045)), //
+						m(GoodWe.ChannelId.PASS_INFORMATION_23, new UnsignedWordElement(37046)), //
+						m(GoodWe.ChannelId.PASS_INFORMATION_24, new UnsignedWordElement(37047)), //
+						m(GoodWe.ChannelId.PASS_INFORMATION_25, new UnsignedWordElement(37048)), //
+						m(GoodWe.ChannelId.PASS_INFORMATION_26, new UnsignedWordElement(37049)), //
+						m(GoodWe.ChannelId.PASS_INFORMATION_27, new UnsignedWordElement(37050)), //
+						m(GoodWe.ChannelId.PASS_INFORMATION_28, new UnsignedWordElement(37051)), //
+						m(GoodWe.ChannelId.PASS_INFORMATION_29, new UnsignedWordElement(37052)), //
+						m(GoodWe.ChannelId.PASS_INFORMATION_30, new UnsignedWordElement(37053)), //
+						m(GoodWe.ChannelId.PASS_INFORMATION_31, new UnsignedWordElement(37054)), //
+						m(GoodWe.ChannelId.PASS_INFORMATION_32, new UnsignedWordElement(37055))), //
 
 				// Registers 40000 to 42011 for BTC and ETC throw "Illegal Data Address"
 
 				// Setting and Controlling Data Registers
 				new FC3ReadRegistersTask(45127, Priority.ONCE, //
-						this.m(GoodWe.ChannelId.INVERTER_UNIT_ID, new UnsignedWordElement(45127)), //
+						m(GoodWe.ChannelId.INVERTER_UNIT_ID, new UnsignedWordElement(45127)), //
 						new DummyRegisterElement(45128, 45131), //
-						this.m(GoodWe.ChannelId.MODBUS_BAUDRATE, new UnsignedDoublewordElement(45132))), //
+						m(GoodWe.ChannelId.MODBUS_BAUDRATE, new UnsignedDoublewordElement(45132))), //
 
 				new FC3ReadRegistersTask(45222, Priority.LOW, //
 						// to read or write the accumulated energy battery discharged, of the day Not
 						// from BMS
-						this.m(GoodWe.ChannelId.PV_E_TOTAL_2, new UnsignedDoublewordElement(45222),
+						m(GoodWe.ChannelId.PV_E_TOTAL_2, new UnsignedDoublewordElement(45222),
 								ElementToChannelConverter.SCALE_FACTOR_MINUS_1), //
-						this.m(GoodWe.ChannelId.PV_E_DAY_2, new UnsignedDoublewordElement(45224),
+						m(GoodWe.ChannelId.PV_E_DAY_2, new UnsignedDoublewordElement(45224),
 								ElementToChannelConverter.SCALE_FACTOR_MINUS_1), //
-						this.m(GoodWe.ChannelId.E_TOTAL_SELL_2, new UnsignedDoublewordElement(45226),
+						m(GoodWe.ChannelId.E_TOTAL_SELL_2, new UnsignedDoublewordElement(45226),
 								ElementToChannelConverter.SCALE_FACTOR_MINUS_1), //
-						this.m(GoodWe.ChannelId.H_TOTAL_2, new UnsignedDoublewordElement(45228)), //
-						this.m(GoodWe.ChannelId.E_DAY_SELL_2, new UnsignedWordElement(45230),
+						m(GoodWe.ChannelId.H_TOTAL_2, new UnsignedDoublewordElement(45228)), //
+						m(GoodWe.ChannelId.E_DAY_SELL_2, new UnsignedWordElement(45230),
 								ElementToChannelConverter.SCALE_FACTOR_MINUS_1), //
-						this.m(GoodWe.ChannelId.E_TOTAL_BUY_2, new UnsignedDoublewordElement(45231),
+						m(GoodWe.ChannelId.E_TOTAL_BUY_2, new UnsignedDoublewordElement(45231),
 								ElementToChannelConverter.SCALE_FACTOR_MINUS_1), //
-						this.m(GoodWe.ChannelId.E_DAY_BUY_2, new UnsignedWordElement(45233),
+						m(GoodWe.ChannelId.E_DAY_BUY_2, new UnsignedWordElement(45233),
 								ElementToChannelConverter.SCALE_FACTOR_MINUS_1), //
-						this.m(GoodWe.ChannelId.E_TOTAL_LOAD_2, new UnsignedDoublewordElement(45234),
+						m(GoodWe.ChannelId.E_TOTAL_LOAD_2, new UnsignedDoublewordElement(45234),
 								ElementToChannelConverter.SCALE_FACTOR_MINUS_1), //
-						this.m(GoodWe.ChannelId.E_LOAD_DAY_2, new UnsignedWordElement(45236),
+						m(GoodWe.ChannelId.E_LOAD_DAY_2, new UnsignedWordElement(45236),
 								ElementToChannelConverter.SCALE_FACTOR_MINUS_1), //
-						this.m(GoodWe.ChannelId.E_BATTERY_CHARGE_2, new UnsignedDoublewordElement(45237),
+						m(GoodWe.ChannelId.E_BATTERY_CHARGE_2, new UnsignedDoublewordElement(45237),
 								ElementToChannelConverter.SCALE_FACTOR_MINUS_1), //
-						this.m(GoodWe.ChannelId.E_CHARGE_DAY_2, new UnsignedWordElement(45239),
+						m(GoodWe.ChannelId.E_CHARGE_DAY_2, new UnsignedWordElement(45239),
 								ElementToChannelConverter.SCALE_FACTOR_MINUS_1), //
-						this.m(GoodWe.ChannelId.E_BATTERY_DISCHARGE_2, new UnsignedDoublewordElement(45240),
+						m(GoodWe.ChannelId.E_BATTERY_DISCHARGE_2, new UnsignedDoublewordElement(45240),
 								ElementToChannelConverter.SCALE_FACTOR_MINUS_1), //
-						this.m(GoodWe.ChannelId.E_DISCHARGE_DAY_2, new UnsignedWordElement(45242),
+						m(GoodWe.ChannelId.E_DISCHARGE_DAY_2, new UnsignedWordElement(45242),
 								ElementToChannelConverter.SCALE_FACTOR_MINUS_1), //
 						new DummyRegisterElement(45243), //
 						// to set safety code for inverter or read the preset safety code for the
 						// inverter
-						this.m(GoodWe.ChannelId.SAFETY_COUNTRY_CODE, new UnsignedWordElement(45244)), //
-						this.m(GoodWe.ChannelId.ISO_LIMIT, new UnsignedWordElement(45245)), //
-						this.m(GoodWe.ChannelId.LVRT_HVRT, new UnsignedWordElement(45246))), //
+						m(GoodWe.ChannelId.SAFETY_COUNTRY_CODE, new UnsignedWordElement(45244)), //
+						m(GoodWe.ChannelId.ISO_LIMIT, new UnsignedWordElement(45245)), //
+						m(GoodWe.ChannelId.LVRT_HVRT, new UnsignedWordElement(45246))), //
 
 				new FC3ReadRegistersTask(45250, Priority.LOW, //
-						this.m(GoodWe.ChannelId.PV_START_VOLTAGE, new UnsignedWordElement(45250),
+						m(GoodWe.ChannelId.PV_START_VOLTAGE, new UnsignedWordElement(45250),
 								ElementToChannelConverter.SCALE_FACTOR_MINUS_1), //
-						this.m(GoodWe.ChannelId.MPPT_FOR_SHADOW_ENABLE, new UnsignedWordElement(45251)), //
-						this.m(GoodWe.ChannelId.BACK_UP_ENABLE, new UnsignedWordElement(45252)), //
-						this.m(GoodWe.ChannelId.AUTO_START_BACKUP, new UnsignedWordElement(45253)), //
-						this.m(GoodWe.ChannelId.GRID_WAVE_CHECK_LEVEL, new UnsignedWordElement(45254)), //
+						m(GoodWe.ChannelId.MPPT_FOR_SHADOW_ENABLE, new UnsignedWordElement(45251)), //
+						m(GoodWe.ChannelId.BACK_UP_ENABLE, new UnsignedWordElement(45252)), //
+						m(GoodWe.ChannelId.AUTO_START_BACKUP, new UnsignedWordElement(45253)), //
+						m(GoodWe.ChannelId.GRID_WAVE_CHECK_LEVEL, new UnsignedWordElement(45254)), //
 						new DummyRegisterElement(45255), //
-						this.m(GoodWe.ChannelId.BACKUP_START_DLY, new UnsignedWordElement(45256)), //
-						this.m(GoodWe.ChannelId.UPS_STD_VOLT_TYPE, new UnsignedWordElement(45257)), //
+						m(GoodWe.ChannelId.BACKUP_START_DLY, new UnsignedWordElement(45256)), //
+						m(GoodWe.ChannelId.UPS_STD_VOLT_TYPE, new UnsignedWordElement(45257)), //
 						new DummyRegisterElement(45258, 45262), //
 						// Only can set 70, only for German
-						this.m(GoodWe.ChannelId.DERATE_RATE_VDE, new UnsignedWordElement(45263)), //
+						m(GoodWe.ChannelId.DERATE_RATE_VDE, new UnsignedWordElement(45263)), //
 						// this function is deactivated as default, set "1" to activate. After
 						// activated, All power needs to be turned off and restarted
-						this.m(GoodWe.ChannelId.THREE_PHASE_UNBALANCED_OUTPUT, new UnsignedWordElement(45264)), //
+						m(GoodWe.ChannelId.THREE_PHASE_UNBALANCED_OUTPUT, new UnsignedWordElement(45264)), //
 						new DummyRegisterElement(45265), //
 						// For weak grid area
-						this.m(GoodWe.ChannelId.HIGH_IMP_MODE, new UnsignedWordElement(45266)), //
+						m(GoodWe.ChannelId.HIGH_IMP_MODE, new UnsignedWordElement(45266)), //
 						new DummyRegisterElement(45267, 45274), //
 						// 0:Normal mode 1: cancel ISO test when offgrid to ongrid
-						this.m(GoodWe.ChannelId.ISO_CHECK_MODE, new UnsignedWordElement(45275)), //
+						m(GoodWe.ChannelId.ISO_CHECK_MODE, new UnsignedWordElement(45275)), //
 						// The delay time when grid is available
-						this.m(GoodWe.ChannelId.OFF_GRID_TO_ON_GRID_DELAY, new UnsignedWordElement(45276)), //
+						m(GoodWe.ChannelId.OFF_GRID_TO_ON_GRID_DELAY, new UnsignedWordElement(45276)), //
 						// If set 80%, when offgrid output voltage less than 230*80%=184V, inverter will
 						// have the error.
-						this.m(GoodWe.ChannelId.OFF_GRID_UNDER_VOLTAGE_PROTECT_COEFFICIENT,
+						m(GoodWe.ChannelId.OFF_GRID_UNDER_VOLTAGE_PROTECT_COEFFICIENT,
 								new UnsignedWordElement(45277)), //
 						// When offgrid and the battery SOC is low, PV charge the battery
-						this.m(GoodWe.ChannelId.BATTERY_MODE_PV_CHARGE_ENABLE, new UnsignedWordElement(45278)), //
+						m(GoodWe.ChannelId.BATTERY_MODE_PV_CHARGE_ENABLE, new UnsignedWordElement(45278)), //
 						// Default fisresttt.ing is 1
-						this.m(GoodWe.ChannelId.DCV_CHECK_OFF, new UnsignedWordElement(45279))//
+						m(GoodWe.ChannelId.DCV_CHECK_OFF, new UnsignedWordElement(45279))//
 
 				), //
 
 				// Registers 45333 to 45339 for License throw "Illegal Data Address"
 
 				new FC3ReadRegistersTask(45352, Priority.LOW, //
-						this.m(GoodWe.ChannelId.BMS_CHARGE_MAX_VOLTAGE, new UnsignedWordElement(45352),
+						m(GoodWe.ChannelId.BMS_CHARGE_MAX_VOLTAGE, new UnsignedWordElement(45352),
 								ElementToChannelConverter.SCALE_FACTOR_MINUS_1), // [500*N,600*N]
-						this.m(GoodWe.ChannelId.BMS_CHARGE_MAX_CURRENT, new UnsignedWordElement(45353),
+						m(GoodWe.ChannelId.BMS_CHARGE_MAX_CURRENT, new UnsignedWordElement(45353),
 								ElementToChannelConverter.SCALE_FACTOR_MINUS_1), // [0,1000]
-						this.m(GoodWe.ChannelId.BMS_DISCHARGE_MIN_VOLTAGE, new UnsignedWordElement(45354),
+						m(GoodWe.ChannelId.BMS_DISCHARGE_MIN_VOLTAGE, new UnsignedWordElement(45354),
 								ElementToChannelConverter.SCALE_FACTOR_MINUS_1), // [400*N,480*N]
-						this.m(GoodWe.ChannelId.BMS_DISCHARGE_MAX_CURRENT, new UnsignedWordElement(45355),
+						m(GoodWe.ChannelId.BMS_DISCHARGE_MAX_CURRENT, new UnsignedWordElement(45355),
 								ElementToChannelConverter.SCALE_FACTOR_MINUS_1), // [0,1000]
-						this.m(GoodWe.ChannelId.BMS_SOC_UNDER_MIN, new UnsignedWordElement(45356)), // [0,100]
-						this.m(GoodWe.ChannelId.BMS_OFFLINE_DISCHARGE_MIN_VOLTAGE, new UnsignedWordElement(45357),
+						m(GoodWe.ChannelId.BMS_SOC_UNDER_MIN, new UnsignedWordElement(45356)), // [0,100]
+						m(GoodWe.ChannelId.BMS_OFFLINE_DISCHARGE_MIN_VOLTAGE, new UnsignedWordElement(45357),
 								ElementToChannelConverter.SCALE_FACTOR_MINUS_1), // ), //
-						this.m(GoodWe.ChannelId.BMS_OFFLINE_SOC_UNDER_MIN, new UnsignedWordElement(45358))), //
+						m(GoodWe.ChannelId.BMS_OFFLINE_SOC_UNDER_MIN, new UnsignedWordElement(45358))), //
 
 				// Safety
 				new FC3ReadRegistersTask(45400, Priority.LOW, //
-						this.m(GoodWe.ChannelId.GRID_VOLT_HIGH_S1, new UnsignedWordElement(45400),
+						m(GoodWe.ChannelId.GRID_VOLT_HIGH_S1, new UnsignedWordElement(45400),
 								ElementToChannelConverter.SCALE_FACTOR_MINUS_1), //
-						this.m(GoodWe.ChannelId.GRID_VOLT_HIGH_S1_TIME, new UnsignedWordElement(45401)), //
-						this.m(GoodWe.ChannelId.GRID_VOLT_LOW_S1, new UnsignedWordElement(45402),
+						m(GoodWe.ChannelId.GRID_VOLT_HIGH_S1_TIME, new UnsignedWordElement(45401)), //
+						m(GoodWe.ChannelId.GRID_VOLT_LOW_S1, new UnsignedWordElement(45402),
 								ElementToChannelConverter.SCALE_FACTOR_MINUS_1), //
-						this.m(GoodWe.ChannelId.GRID_VOLT_LOW_S1_TIME, new UnsignedWordElement(45403)), //
-						this.m(GoodWe.ChannelId.GRID_VOLT_HIGH_S2, new UnsignedWordElement(45404),
+						m(GoodWe.ChannelId.GRID_VOLT_LOW_S1_TIME, new UnsignedWordElement(45403)), //
+						m(GoodWe.ChannelId.GRID_VOLT_HIGH_S2, new UnsignedWordElement(45404),
 								ElementToChannelConverter.SCALE_FACTOR_MINUS_1), //
-						this.m(GoodWe.ChannelId.GRID_VOLT_HIGH_S2_TIME, new UnsignedWordElement(45405)), //
-						this.m(GoodWe.ChannelId.GRID_VOLT_LOW_S2, new UnsignedWordElement(45406),
+						m(GoodWe.ChannelId.GRID_VOLT_HIGH_S2_TIME, new UnsignedWordElement(45405)), //
+						m(GoodWe.ChannelId.GRID_VOLT_LOW_S2, new UnsignedWordElement(45406),
 								ElementToChannelConverter.SCALE_FACTOR_MINUS_1), //
-						this.m(GoodWe.ChannelId.GRID_VOLT_LOW_S2_TIME, new UnsignedWordElement(45407)), //
-						this.m(GoodWe.ChannelId.GRID_VOLT_QUALITY, new UnsignedWordElement(45408),
+						m(GoodWe.ChannelId.GRID_VOLT_LOW_S2_TIME, new UnsignedWordElement(45407)), //
+						m(GoodWe.ChannelId.GRID_VOLT_QUALITY, new UnsignedWordElement(45408),
 								ElementToChannelConverter.SCALE_FACTOR_MINUS_1), //
-						this.m(GoodWe.ChannelId.GRID_FREQ_HIGH_S1, new UnsignedWordElement(45409),
+						m(GoodWe.ChannelId.GRID_FREQ_HIGH_S1, new UnsignedWordElement(45409),
 								ElementToChannelConverter.SCALE_FACTOR_MINUS_2), //
-						this.m(GoodWe.ChannelId.GRID_FREQ_HIGH_S1_TIME, new UnsignedWordElement(45410)), //
-						this.m(GoodWe.ChannelId.GRID_FREQ_LOW_S1, new UnsignedWordElement(45411),
+						m(GoodWe.ChannelId.GRID_FREQ_HIGH_S1_TIME, new UnsignedWordElement(45410)), //
+						m(GoodWe.ChannelId.GRID_FREQ_LOW_S1, new UnsignedWordElement(45411),
 								ElementToChannelConverter.SCALE_FACTOR_MINUS_2), //
-						this.m(GoodWe.ChannelId.GRID_FREQ_LOW_S1_TIME, new UnsignedWordElement(45412)), //
-						this.m(GoodWe.ChannelId.GRID_FREQ_HIGH_S2, new UnsignedWordElement(45413),
+						m(GoodWe.ChannelId.GRID_FREQ_LOW_S1_TIME, new UnsignedWordElement(45412)), //
+						m(GoodWe.ChannelId.GRID_FREQ_HIGH_S2, new UnsignedWordElement(45413),
 								ElementToChannelConverter.SCALE_FACTOR_MINUS_2), //
-						this.m(GoodWe.ChannelId.GRID_FREQ_HIGH_S2_TIME, new UnsignedWordElement(45414)), //
-						this.m(GoodWe.ChannelId.GRID_FREQ_LOW_S2, new UnsignedWordElement(45415),
+						m(GoodWe.ChannelId.GRID_FREQ_HIGH_S2_TIME, new UnsignedWordElement(45414)), //
+						m(GoodWe.ChannelId.GRID_FREQ_LOW_S2, new UnsignedWordElement(45415),
 								ElementToChannelConverter.SCALE_FACTOR_MINUS_2), //
-						this.m(GoodWe.ChannelId.GRID_FREQ_LOW_S2_TIME, new UnsignedWordElement(45416)), //
-						this.m(GoodWe.ChannelId.GRID_VOLT_HIGH, new UnsignedWordElement(45417),
+						m(GoodWe.ChannelId.GRID_FREQ_LOW_S2_TIME, new UnsignedWordElement(45416)), //
+						m(GoodWe.ChannelId.GRID_VOLT_HIGH, new UnsignedWordElement(45417),
 								ElementToChannelConverter.SCALE_FACTOR_MINUS_1), //
-						this.m(GoodWe.ChannelId.GRID_VOLT_LOW, new UnsignedWordElement(45418),
+						m(GoodWe.ChannelId.GRID_VOLT_LOW, new UnsignedWordElement(45418),
 								ElementToChannelConverter.SCALE_FACTOR_MINUS_1), //
-						this.m(GoodWe.ChannelId.GRID_FREQ_HIGH, new UnsignedWordElement(45419),
+						m(GoodWe.ChannelId.GRID_FREQ_HIGH, new UnsignedWordElement(45419),
 								ElementToChannelConverter.SCALE_FACTOR_MINUS_2), //
-						this.m(GoodWe.ChannelId.GRID_FREQ_LOW, new UnsignedWordElement(45420),
+						m(GoodWe.ChannelId.GRID_FREQ_LOW, new UnsignedWordElement(45420),
 								ElementToChannelConverter.SCALE_FACTOR_MINUS_2), //
-						this.m(GoodWe.ChannelId.GRID_RECOVER_TIME, new UnsignedWordElement(45421)), //
-						this.m(GoodWe.ChannelId.GRID_VOLT_RECOVER_HIGH, new UnsignedWordElement(45422),
+						m(GoodWe.ChannelId.GRID_RECOVER_TIME, new UnsignedWordElement(45421)), //
+						m(GoodWe.ChannelId.GRID_VOLT_RECOVER_HIGH, new UnsignedWordElement(45422),
 								ElementToChannelConverter.SCALE_FACTOR_MINUS_1), //
-						this.m(GoodWe.ChannelId.GRID_VOLT_RECOVER_LOW, new UnsignedWordElement(45423),
+						m(GoodWe.ChannelId.GRID_VOLT_RECOVER_LOW, new UnsignedWordElement(45423),
 								ElementToChannelConverter.SCALE_FACTOR_MINUS_1), //
-						this.m(GoodWe.ChannelId.GRID_FREQ_RECOVER_HIGH, new UnsignedWordElement(45424),
+						m(GoodWe.ChannelId.GRID_FREQ_RECOVER_HIGH, new UnsignedWordElement(45424),
 								ElementToChannelConverter.SCALE_FACTOR_MINUS_2), //
-						this.m(GoodWe.ChannelId.GRID_FREQ_RECOVER_LOW, new UnsignedWordElement(45425),
+						m(GoodWe.ChannelId.GRID_FREQ_RECOVER_LOW, new UnsignedWordElement(45425),
 								ElementToChannelConverter.SCALE_FACTOR_MINUS_2), //
-						this.m(GoodWe.ChannelId.GRID_VOLT_RECOVER_TIME, new UnsignedWordElement(45426)), //
-						this.m(GoodWe.ChannelId.GRID_FREQ_RECOVER_TIME, new UnsignedWordElement(45427)), //
-						this.m(GoodWe.ChannelId.POWER_RATE_LIMIT_GENERATE, new UnsignedWordElement(45428)), //
-						this.m(GoodWe.ChannelId.POWER_RATE_LIMIT_RECONNECT, new UnsignedWordElement(45429)), //
-						this.m(GoodWe.ChannelId.POWER_RATE_LIMIT_REDUCTION, new UnsignedWordElement(45430)), //
-						this.m(GoodWe.ChannelId.GRID_PROTECT, new UnsignedWordElement(45431)) //
+						m(GoodWe.ChannelId.GRID_VOLT_RECOVER_TIME, new UnsignedWordElement(45426)), //
+						m(GoodWe.ChannelId.GRID_FREQ_RECOVER_TIME, new UnsignedWordElement(45427)), //
+						m(GoodWe.ChannelId.POWER_RATE_LIMIT_GENERATE, new UnsignedWordElement(45428)), //
+						m(GoodWe.ChannelId.POWER_RATE_LIMIT_RECONNECT, new UnsignedWordElement(45429)), //
+						m(GoodWe.ChannelId.POWER_RATE_LIMIT_REDUCTION, new UnsignedWordElement(45430)), //
+						m(GoodWe.ChannelId.GRID_PROTECT, new UnsignedWordElement(45431)) //
 				), //
 
 				new FC3ReadRegistersTask(45428, Priority.LOW, //
-						this.m(GoodWe.ChannelId.POWER_RATE_LIMIT_GENERATE, new UnsignedWordElement(45428),
+						m(GoodWe.ChannelId.POWER_RATE_LIMIT_GENERATE, new UnsignedWordElement(45428),
 								ElementToChannelConverter.SCALE_FACTOR_MINUS_2), //
-						this.m(GoodWe.ChannelId.POWER_RATE_LIMIT_RECONNECT, new UnsignedWordElement(45429),
+						m(GoodWe.ChannelId.POWER_RATE_LIMIT_RECONNECT, new UnsignedWordElement(45429),
 								ElementToChannelConverter.SCALE_FACTOR_MINUS_2), //
-						this.m(GoodWe.ChannelId.POWER_RATE_LIMIT_REDUCTION, new UnsignedWordElement(45430),
+						m(GoodWe.ChannelId.POWER_RATE_LIMIT_REDUCTION, new UnsignedWordElement(45430),
 								ElementToChannelConverter.SCALE_FACTOR_MINUS_2), //
-						this.m(GoodWe.ChannelId.GRID_PROTECT, new UnsignedWordElement(45431))), //
+						m(GoodWe.ChannelId.GRID_PROTECT, new UnsignedWordElement(45431))), //
 
 				// Cos Phi Curve
 				new FC3ReadRegistersTask(45432, Priority.LOW, //
-						this.m(GoodWe.ChannelId.POWER_SLOPE_ENABLE, new UnsignedWordElement(45432)), //
-						this.m(GoodWe.ChannelId.ENABLE_CURVE_PU, new UnsignedWordElement(45433)), //
-						this.m(GoodWe.ChannelId.A_POINT_POWER, new SignedWordElement(45434)), //
-						this.m(GoodWe.ChannelId.A_POINT_COS_PHI, new SignedWordElement(45435),
+						m(GoodWe.ChannelId.POWER_SLOPE_ENABLE, new UnsignedWordElement(45432)), //
+						m(GoodWe.ChannelId.ENABLE_CURVE_PU, new UnsignedWordElement(45433)), //
+						m(GoodWe.ChannelId.A_POINT_POWER, new SignedWordElement(45434)), //
+						m(GoodWe.ChannelId.A_POINT_COS_PHI, new SignedWordElement(45435),
 								ElementToChannelConverter.SCALE_FACTOR_MINUS_2), //
-						this.m(GoodWe.ChannelId.B_POINT_POWER, new SignedWordElement(45436)), //
-						this.m(GoodWe.ChannelId.B_POINT_COS_PHI, new SignedWordElement(45437),
+						m(GoodWe.ChannelId.B_POINT_POWER, new SignedWordElement(45436)), //
+						m(GoodWe.ChannelId.B_POINT_COS_PHI, new SignedWordElement(45437),
 								ElementToChannelConverter.SCALE_FACTOR_MINUS_2), //
-						this.m(GoodWe.ChannelId.C_POINT_POWER, new SignedWordElement(45438)), //
-						this.m(GoodWe.ChannelId.C_POINT_COS_PHI, new SignedWordElement(45439)),
-						this.m(GoodWe.ChannelId.LOCK_IN_VOLTAGE, new UnsignedWordElement(45440),
+						m(GoodWe.ChannelId.C_POINT_POWER, new SignedWordElement(45438)), //
+						m(GoodWe.ChannelId.C_POINT_COS_PHI, new SignedWordElement(45439)),
+						m(GoodWe.ChannelId.LOCK_IN_VOLTAGE, new UnsignedWordElement(45440),
 								ElementToChannelConverter.SCALE_FACTOR_MINUS_1), //
-						this.m(GoodWe.ChannelId.LOCK_OUT_VOLTAGE, new UnsignedWordElement(45441),
+						m(GoodWe.ChannelId.LOCK_OUT_VOLTAGE, new UnsignedWordElement(45441),
 								ElementToChannelConverter.SCALE_FACTOR_MINUS_1), //
-						this.m(GoodWe.ChannelId.LOCK_OUT_POWER, new SignedWordElement(45442)), //
+						m(GoodWe.ChannelId.LOCK_OUT_POWER, new SignedWordElement(45442)), //
 
 						// Power and frequency curve
-						this.m(new BitsWordElement(45443, this)//
+						m(new BitsWordElement(45443, this)//
 								.bit(0, GoodWe.ChannelId.POWER_FREQUENCY_ENABLED)//
 								.bit(1, GoodWe.ChannelId.POWER_FREQUENCY_RESPONSE_MODE)//
 						), //
-						this.m(GoodWe.ChannelId.FFROZEN_DCH, new UnsignedWordElement(45444),
+						m(GoodWe.ChannelId.FFROZEN_DCH, new UnsignedWordElement(45444),
 								ElementToChannelConverter.SCALE_FACTOR_MINUS_2), //
-						this.m(GoodWe.ChannelId.FFROZEN_CH, new UnsignedWordElement(45445),
+						m(GoodWe.ChannelId.FFROZEN_CH, new UnsignedWordElement(45445),
 								ElementToChannelConverter.SCALE_FACTOR_MINUS_2), //
-						this.m(GoodWe.ChannelId.FSTOP_DCH, new UnsignedWordElement(45446),
+						m(GoodWe.ChannelId.FSTOP_DCH, new UnsignedWordElement(45446),
 								ElementToChannelConverter.SCALE_FACTOR_MINUS_2), //
-						this.m(GoodWe.ChannelId.FSTOP_CH, new UnsignedWordElement(45447),
+						m(GoodWe.ChannelId.FSTOP_CH, new UnsignedWordElement(45447),
 								ElementToChannelConverter.SCALE_FACTOR_MINUS_2), //
-						this.m(GoodWe.ChannelId.OF_RECOVERY_WAITING_TIME, new UnsignedWordElement(45448),
+						m(GoodWe.ChannelId.OF_RECOVERY_WAITING_TIME, new UnsignedWordElement(45448),
 								ElementToChannelConverter.SCALE_FACTOR_MINUS_2), //
-						this.m(GoodWe.ChannelId.RECOVERY_FREQURNCY1, new UnsignedWordElement(45449),
+						m(GoodWe.ChannelId.RECOVERY_FREQURNCY1, new UnsignedWordElement(45449),
 								ElementToChannelConverter.SCALE_FACTOR_MINUS_2), //
-						this.m(GoodWe.ChannelId.RECOVERY_FREQUENCY2, new UnsignedWordElement(45450),
+						m(GoodWe.ChannelId.RECOVERY_FREQUENCY2, new UnsignedWordElement(45450),
 								ElementToChannelConverter.SCALE_FACTOR_MINUS_2), //
-						this.m(GoodWe.ChannelId.OF_RECOVERY_SLOPE, new UnsignedWordElement(45451), //
+						m(GoodWe.ChannelId.OF_RECOVERY_SLOPE, new UnsignedWordElement(45451), //
 								new ChannelMetaInfoReadAndWrite(45451, 45452)), //
-						this.m(GoodWe.ChannelId.CFP_SETTINGS, new UnsignedWordElement(45452), //
+						m(GoodWe.ChannelId.CFP_SETTINGS, new UnsignedWordElement(45452), //
 								new ChannelMetaInfoReadAndWrite(45452, 45451)), //
-						this.m(GoodWe.ChannelId.CFP_OF_SLOPE_PERCENT, new UnsignedWordElement(45453),
+						m(GoodWe.ChannelId.CFP_OF_SLOPE_PERCENT, new UnsignedWordElement(45453),
 								ElementToChannelConverter.SCALE_FACTOR_MINUS_2), //
-						this.m(GoodWe.ChannelId.CFP_UF_SLOPE_PERCENT, new UnsignedWordElement(45454),
+						m(GoodWe.ChannelId.CFP_UF_SLOPE_PERCENT, new UnsignedWordElement(45454),
 								ElementToChannelConverter.SCALE_FACTOR_MINUS_2), //
-						this.m(GoodWe.ChannelId.CFP_OF_RECOVER_POWER_PERCENT, new UnsignedWordElement(45455))), //
+						m(GoodWe.ChannelId.CFP_OF_RECOVER_POWER_PERCENT, new UnsignedWordElement(45455))), //
 
 				// QU Curve
 				new FC3ReadRegistersTask(45456, Priority.LOW, //
-						this.m(GoodWe.ChannelId.QU_CURVE, new UnsignedWordElement(45456)), //
-						this.m(GoodWe.ChannelId.LOCK_IN_POWER_QU, new SignedWordElement(45457)), //
-						this.m(GoodWe.ChannelId.LOCK_OUT_POWER_QU, new SignedWordElement(45458)), //
-						this.m(GoodWe.ChannelId.V1_VOLTAGE, new UnsignedWordElement(45459),
+						m(GoodWe.ChannelId.QU_CURVE, new UnsignedWordElement(45456)), //
+						m(GoodWe.ChannelId.LOCK_IN_POWER_QU, new SignedWordElement(45457)), //
+						m(GoodWe.ChannelId.LOCK_OUT_POWER_QU, new SignedWordElement(45458)), //
+						m(GoodWe.ChannelId.V1_VOLTAGE, new UnsignedWordElement(45459),
 								ElementToChannelConverter.SCALE_FACTOR_MINUS_1), // ), //
-						this.m(GoodWe.ChannelId.V1_VALUE, new SignedWordElement(45460)), //
-						this.m(GoodWe.ChannelId.V2_VOLTAGE, new UnsignedWordElement(45461),
+						m(GoodWe.ChannelId.V1_VALUE, new SignedWordElement(45460)), //
+						m(GoodWe.ChannelId.V2_VOLTAGE, new UnsignedWordElement(45461),
 								ElementToChannelConverter.SCALE_FACTOR_MINUS_1), //
-						this.m(GoodWe.ChannelId.V2_VALUE, new SignedWordElement(45462)), //
-						this.m(GoodWe.ChannelId.V3_VOLTAGE, new UnsignedWordElement(45463),
+						m(GoodWe.ChannelId.V2_VALUE, new SignedWordElement(45462)), //
+						m(GoodWe.ChannelId.V3_VOLTAGE, new UnsignedWordElement(45463),
 								ElementToChannelConverter.SCALE_FACTOR_MINUS_1), //
-						this.m(GoodWe.ChannelId.V3_VALUE, new SignedWordElement(45464)), //
-						this.m(GoodWe.ChannelId.V4_VOLTAGE, new UnsignedWordElement(45465),
+						m(GoodWe.ChannelId.V3_VALUE, new SignedWordElement(45464)), //
+						m(GoodWe.ChannelId.V4_VOLTAGE, new UnsignedWordElement(45465),
 								ElementToChannelConverter.SCALE_FACTOR_MINUS_1), //
-						this.m(GoodWe.ChannelId.V4_VALUE, new SignedWordElement(45466)), //
-						this.m(GoodWe.ChannelId.K_VALUE, new UnsignedWordElement(45467)), //
-						this.m(GoodWe.ChannelId.TIME_CONSTANT, new UnsignedWordElement(45468)), //
-						this.m(GoodWe.ChannelId.MISCELLANEA, new UnsignedWordElement(45469))), //
+						m(GoodWe.ChannelId.V4_VALUE, new SignedWordElement(45466)), //
+						m(GoodWe.ChannelId.K_VALUE, new UnsignedWordElement(45467)), //
+						m(GoodWe.ChannelId.TIME_CONSTANT, new UnsignedWordElement(45468)), //
+						m(GoodWe.ChannelId.MISCELLANEA, new UnsignedWordElement(45469))), //
 
 				// PU Curve
 				new FC3ReadRegistersTask(45472, Priority.LOW, //
-						this.m(GoodWe.ChannelId.PU_CURVE, new UnsignedWordElement(45472)), //
-						this.m(GoodWe.ChannelId.POWER_CHANGE_RATE, new UnsignedWordElement(45473)), //
-						this.m(GoodWe.ChannelId.V1_VOLTAGE_PU, new UnsignedWordElement(45474),
+						m(GoodWe.ChannelId.PU_CURVE, new UnsignedWordElement(45472)), //
+						m(GoodWe.ChannelId.POWER_CHANGE_RATE, new UnsignedWordElement(45473)), //
+						m(GoodWe.ChannelId.V1_VOLTAGE_PU, new UnsignedWordElement(45474),
 								ElementToChannelConverter.SCALE_FACTOR_MINUS_1), //
-						this.m(GoodWe.ChannelId.V1_VALUE_PU, new SignedWordElement(45475),
+						m(GoodWe.ChannelId.V1_VALUE_PU, new SignedWordElement(45475),
 								ElementToChannelConverter.SCALE_FACTOR_MINUS_1), //
-						this.m(GoodWe.ChannelId.V2_VOLTAGE_PU, new UnsignedWordElement(45476),
+						m(GoodWe.ChannelId.V2_VOLTAGE_PU, new UnsignedWordElement(45476),
 								ElementToChannelConverter.SCALE_FACTOR_MINUS_1), //
-						this.m(GoodWe.ChannelId.V2_VALUE_PU, new SignedWordElement(45477),
+						m(GoodWe.ChannelId.V2_VALUE_PU, new SignedWordElement(45477),
 								ElementToChannelConverter.SCALE_FACTOR_MINUS_1), //
-						this.m(GoodWe.ChannelId.V3_VOLTAGE_PU, new UnsignedWordElement(45478),
+						m(GoodWe.ChannelId.V3_VOLTAGE_PU, new UnsignedWordElement(45478),
 								ElementToChannelConverter.SCALE_FACTOR_MINUS_1), //
-						this.m(GoodWe.ChannelId.V3_VALUE_PU, new SignedWordElement(45479),
+						m(GoodWe.ChannelId.V3_VALUE_PU, new SignedWordElement(45479),
 								ElementToChannelConverter.SCALE_FACTOR_MINUS_1), //
-						this.m(GoodWe.ChannelId.V4_VOLTAGE_PU, new UnsignedWordElement(45480),
+						m(GoodWe.ChannelId.V4_VOLTAGE_PU, new UnsignedWordElement(45480),
 								ElementToChannelConverter.SCALE_FACTOR_MINUS_1), //
-						this.m(GoodWe.ChannelId.V4_VALUE_PU, new SignedWordElement(45481),
+						m(GoodWe.ChannelId.V4_VALUE_PU, new SignedWordElement(45481),
 								ElementToChannelConverter.SCALE_FACTOR_MINUS_1), //
 						// 80=Pf 0.8, 20= -0.8Pf
-						this.m(GoodWe.ChannelId.FIXED_POWER_FACTOR, new UnsignedWordElement(45482),
+						m(GoodWe.ChannelId.FIXED_POWER_FACTOR, new UnsignedWordElement(45482),
 								ElementToChannelConverter.SCALE_FACTOR_MINUS_2), //
 						// Set the percentage of rated power of the inverter
-						this.m(GoodWe.ChannelId.FIXED_REACTIVE_POWER, new SignedWordElement(45483),
+						m(GoodWe.ChannelId.FIXED_REACTIVE_POWER, new SignedWordElement(45483),
 								ElementToChannelConverter.SCALE_FACTOR_MINUS_1), //
-						this.m(GoodWe.ChannelId.FIXED_ACTIVE_POWER, new UnsignedWordElement(45484),
+						m(GoodWe.ChannelId.FIXED_ACTIVE_POWER, new UnsignedWordElement(45484),
 								ElementToChannelConverter.SCALE_FACTOR_MINUS_1)), //
 
 				new FC3ReadRegistersTask(45488, Priority.LOW, //
-						this.m(GoodWe.ChannelId.AUTO_TEST_ENABLE, new UnsignedWordElement(45488)), //
-						this.m(GoodWe.ChannelId.AUTO_TEST_STEP, new UnsignedWordElement(45489)), //
-						this.m(GoodWe.ChannelId.UW_ITALY_FREQ_MODE, new UnsignedWordElement(45490)), //
+						m(GoodWe.ChannelId.AUTO_TEST_ENABLE, new UnsignedWordElement(45488)), //
+						m(GoodWe.ChannelId.AUTO_TEST_STEP, new UnsignedWordElement(45489)), //
+						m(GoodWe.ChannelId.UW_ITALY_FREQ_MODE, new UnsignedWordElement(45490)), //
 						// this must be turned off to do Meter test . "1" means Off
-						this.m(GoodWe.ChannelId.ALL_POWER_CURVE_DISABLE, new UnsignedWordElement(45491)), //
-						this.m(GoodWe.ChannelId.R_PHASE_FIXED_ACTIVE_POWER, new UnsignedWordElement(45492)), //
-						this.m(GoodWe.ChannelId.S_PHASE_FIXED_ACTIVE_POWER, new UnsignedWordElement(45493)), //
-						this.m(GoodWe.ChannelId.T_PHASE_FIXED_ACTIVE_POWER, new UnsignedWordElement(45494)), //
-						this.m(GoodWe.ChannelId.GRID_VOLT_HIGH_S3, new UnsignedWordElement(45495),
+						m(GoodWe.ChannelId.ALL_POWER_CURVE_DISABLE, new UnsignedWordElement(45491)), //
+						m(GoodWe.ChannelId.R_PHASE_FIXED_ACTIVE_POWER, new UnsignedWordElement(45492)), //
+						m(GoodWe.ChannelId.S_PHASE_FIXED_ACTIVE_POWER, new UnsignedWordElement(45493)), //
+						m(GoodWe.ChannelId.T_PHASE_FIXED_ACTIVE_POWER, new UnsignedWordElement(45494)), //
+						m(GoodWe.ChannelId.GRID_VOLT_HIGH_S3, new UnsignedWordElement(45495),
 								ElementToChannelConverter.SCALE_FACTOR_MINUS_1), //
-						this.m(GoodWe.ChannelId.GRID_VOLT_HIGH_S3_TIME, new UnsignedWordElement(45496)), //
-						this.m(GoodWe.ChannelId.GRID_VOLT_LOW_S3, new UnsignedWordElement(45497),
+						m(GoodWe.ChannelId.GRID_VOLT_HIGH_S3_TIME, new UnsignedWordElement(45496)), //
+						m(GoodWe.ChannelId.GRID_VOLT_LOW_S3, new UnsignedWordElement(45497),
 								ElementToChannelConverter.SCALE_FACTOR_MINUS_1), //
-						this.m(GoodWe.ChannelId.GRID_VOLT_LOW_S3_TIME, new UnsignedWordElement(45498)), //
-						this.m(GoodWe.ChannelId.ZVRT_CONFIG, new UnsignedWordElement(45499)), //
-						this.m(GoodWe.ChannelId.LVRT_START_VOLT, new UnsignedWordElement(45500),
+						m(GoodWe.ChannelId.GRID_VOLT_LOW_S3_TIME, new UnsignedWordElement(45498)), //
+						m(GoodWe.ChannelId.ZVRT_CONFIG, new UnsignedWordElement(45499)), //
+						m(GoodWe.ChannelId.LVRT_START_VOLT, new UnsignedWordElement(45500),
 								ElementToChannelConverter.SCALE_FACTOR_MINUS_1), //
-						this.m(GoodWe.ChannelId.LVRT_END_VOLT, new UnsignedWordElement(45501),
+						m(GoodWe.ChannelId.LVRT_END_VOLT, new UnsignedWordElement(45501),
 								ElementToChannelConverter.SCALE_FACTOR_MINUS_1), //
-						this.m(GoodWe.ChannelId.LVRT_START_TRIP_TIME, new UnsignedWordElement(45502)), //
-						this.m(GoodWe.ChannelId.LVRT_END_TRIP_TIME, new UnsignedWordElement(45503)), //
-						this.m(GoodWe.ChannelId.LVRT_TRIP_LIMIT_VOLT, new UnsignedWordElement(45504),
+						m(GoodWe.ChannelId.LVRT_START_TRIP_TIME, new UnsignedWordElement(45502)), //
+						m(GoodWe.ChannelId.LVRT_END_TRIP_TIME, new UnsignedWordElement(45503)), //
+						m(GoodWe.ChannelId.LVRT_TRIP_LIMIT_VOLT, new UnsignedWordElement(45504),
 								ElementToChannelConverter.SCALE_FACTOR_MINUS_1), //
-						this.m(GoodWe.ChannelId.HVRT_START_VOLT, new UnsignedWordElement(45505),
+						m(GoodWe.ChannelId.HVRT_START_VOLT, new UnsignedWordElement(45505),
 								ElementToChannelConverter.SCALE_FACTOR_MINUS_1), //
-						this.m(GoodWe.ChannelId.HVRT_END_VOLT, new UnsignedWordElement(45506),
+						m(GoodWe.ChannelId.HVRT_END_VOLT, new UnsignedWordElement(45506),
 								ElementToChannelConverter.SCALE_FACTOR_MINUS_1), //
-						this.m(GoodWe.ChannelId.HVRT_START_TRIP_TIME, new UnsignedWordElement(45507)), //
-						this.m(GoodWe.ChannelId.HVRT_END_TRIP_TIME, new UnsignedWordElement(45508)), //
-						this.m(GoodWe.ChannelId.HVRT_TRIP_LIMIT_VOLT, new UnsignedWordElement(45509),
+						m(GoodWe.ChannelId.HVRT_START_TRIP_TIME, new UnsignedWordElement(45507)), //
+						m(GoodWe.ChannelId.HVRT_END_TRIP_TIME, new UnsignedWordElement(45508)), //
+						m(GoodWe.ChannelId.HVRT_TRIP_LIMIT_VOLT, new UnsignedWordElement(45509),
 								ElementToChannelConverter.SCALE_FACTOR_MINUS_1)//
 				), //
 
 				// Additional settings for PF/PU/UF
 				new FC3ReadRegistersTask(45510, Priority.LOW, //
-						this.m(GoodWe.ChannelId.PF_TIME_CONSTANT, new UnsignedWordElement(45510)), //
-						this.m(GoodWe.ChannelId.POWER_FREQ_TIME_CONSTANT, new UnsignedWordElement(45511)), //
+						m(GoodWe.ChannelId.PF_TIME_CONSTANT, new UnsignedWordElement(45510)), //
+						m(GoodWe.ChannelId.POWER_FREQ_TIME_CONSTANT, new UnsignedWordElement(45511)), //
 						// Additional settings for P(U) Curve
-						this.m(GoodWe.ChannelId.PU_TIME_CONSTANT, new UnsignedWordElement(45512)), //
-						this.m(GoodWe.ChannelId.D_POINT_POWER, new SignedWordElement(45513)), //
-						this.m(GoodWe.ChannelId.D_POINT_COS_PHI, new SignedWordElement(45514)), //
+						m(GoodWe.ChannelId.PU_TIME_CONSTANT, new UnsignedWordElement(45512)), //
+						m(GoodWe.ChannelId.D_POINT_POWER, new SignedWordElement(45513)), //
+						m(GoodWe.ChannelId.D_POINT_COS_PHI, new SignedWordElement(45514)), //
 						// Additional settings for UF Curve
-						this.m(GoodWe.ChannelId.UF_RECOVERY_WAITING_TIME, new UnsignedWordElement(45515),
+						m(GoodWe.ChannelId.UF_RECOVERY_WAITING_TIME, new UnsignedWordElement(45515),
 								ElementToChannelConverter.SCALE_FACTOR_MINUS_2), //
-						this.m(GoodWe.ChannelId.UF_RECOVER_SLOPE, new UnsignedWordElement(45516)), //
-						this.m(GoodWe.ChannelId.CFP_UF_RECOVER_POWER_PERCENT, new UnsignedWordElement(45517)), //
-						this.m(GoodWe.ChannelId.POWER_CHARGE_LIMIT, new UnsignedWordElement(45518),
+						m(GoodWe.ChannelId.UF_RECOVER_SLOPE, new UnsignedWordElement(45516)), //
+						m(GoodWe.ChannelId.CFP_UF_RECOVER_POWER_PERCENT, new UnsignedWordElement(45517)), //
+						m(GoodWe.ChannelId.POWER_CHARGE_LIMIT, new UnsignedWordElement(45518),
 								ElementToChannelConverter.SCALE_FACTOR_MINUS_2), //
-						this.m(GoodWe.ChannelId.POWER_CHARGE_LIMIT_RECONNECT, new UnsignedWordElement(45519),
+						m(GoodWe.ChannelId.POWER_CHARGE_LIMIT_RECONNECT, new UnsignedWordElement(45519),
 								ElementToChannelConverter.SCALE_FACTOR_MINUS_2), //
-						this.m(GoodWe.ChannelId.C_EXT_UF_CHARGE_STOP, new UnsignedWordElement(45520),
+						m(GoodWe.ChannelId.C_EXT_UF_CHARGE_STOP, new UnsignedWordElement(45520),
 								ElementToChannelConverter.SCALE_FACTOR_MINUS_2), //
-						this.m(GoodWe.ChannelId.C_EXT_OF_DISCHARGE_STOP, new UnsignedWordElement(45521),
+						m(GoodWe.ChannelId.C_EXT_OF_DISCHARGE_STOP, new UnsignedWordElement(45521),
 								ElementToChannelConverter.SCALE_FACTOR_MINUS_2), //
-						this.m(GoodWe.ChannelId.C_EXT_TWOSSTEPF_FLG, new UnsignedWordElement(45522))//
+						m(GoodWe.ChannelId.C_EXT_TWOSSTEPF_FLG, new UnsignedWordElement(45522))//
 				), //
 
 				new FC3ReadRegistersTask(47500, Priority.LOW, //
-						this.m(GoodWe.ChannelId.STOP_SOC_PROTECT, new UnsignedWordElement(47500)), //
-						this.m(GoodWe.ChannelId.BMS_FLOAT_VOLT, new UnsignedWordElement(47501),
-								ElementToChannelConverter.SCALE_FACTOR_MINUS_1), //
-						this.m(GoodWe.ChannelId.BMS_FLOAT_CURRENT, new UnsignedWordElement(47502)), //
-						this.m(GoodWe.ChannelId.BMS_FLOAT_TIME, new UnsignedWordElement(47503)), //
-						this.m(GoodWe.ChannelId.BMS_TYPE_INDEX_ARM, new UnsignedWordElement(47504)), //
-						this.m(GoodWe.ChannelId.MANUFACTURE_CODE, new UnsignedWordElement(47505)), //
-						this.m(GoodWe.ChannelId.DC_VOLT_OUTPUT, new UnsignedWordElement(47506)), //
-						this.m(GoodWe.ChannelId.BMS_AVG_CHG_VOLT, new UnsignedWordElement(47507),
-								ElementToChannelConverter.SCALE_FACTOR_MINUS_1), //
-						this.m(GoodWe.ChannelId.BMS_AVG_CHG_HOURS, new UnsignedWordElement(47508)), //
-						this.m(GoodWe.ChannelId.FEED_POWER_ENABLE, new UnsignedWordElement(47509)), //
-						this.m(GoodWe.ChannelId.FEED_POWER_PARA_SET, new UnsignedWordElement(47510)), //
-						this.m(GoodWe.ChannelId.EMS_POWER_MODE, new UnsignedWordElement(47511)), //
-						this.m(GoodWe.ChannelId.EMS_POWER_SET, new UnsignedWordElement(47512)), //
-						this.m(GoodWe.ChannelId.BMS_CURR_LMT_COFF, new UnsignedWordElement(47513)), //
-						this.m(GoodWe.ChannelId.BATTERY_PROTOCOL_ARM, new UnsignedWordElement(47514)), //
-
-						this.m(GoodWe.ChannelId.WORK_WEEK_1_START_TIME, new UnsignedWordElement(47515)), //
-						this.m(GoodWe.ChannelId.WORK_WEEK_1_END_TIME, new UnsignedWordElement(47516)), //
-						this.m(GoodWe.ChannelId.WORK_WEEK_1_BAT_POWER_PERCENT, new UnsignedWordElement(47517)), //
-						this.m(new BitsWordElement(47518, this)//
+						m(GoodWe.ChannelId.STOP_SOC_PROTECT, new UnsignedWordElement(47500)), //
+						m(GoodWe.ChannelId.BMS_FLOAT_VOLT, new UnsignedWordElement(47501),
+								ElementToChannelConverter.SCALE_FACTOR_MINUS_1), //
+						m(GoodWe.ChannelId.BMS_FLOAT_CURRENT, new UnsignedWordElement(47502)), //
+						m(GoodWe.ChannelId.BMS_FLOAT_TIME, new UnsignedWordElement(47503)), //
+						m(GoodWe.ChannelId.BMS_TYPE_INDEX_ARM, new UnsignedWordElement(47504)), //
+						m(GoodWe.ChannelId.MANUFACTURE_CODE, new UnsignedWordElement(47505)), //
+						m(GoodWe.ChannelId.DC_VOLT_OUTPUT, new UnsignedWordElement(47506)), //
+						m(GoodWe.ChannelId.BMS_AVG_CHG_VOLT, new UnsignedWordElement(47507),
+								ElementToChannelConverter.SCALE_FACTOR_MINUS_1), //
+						m(GoodWe.ChannelId.BMS_AVG_CHG_HOURS, new UnsignedWordElement(47508)), //
+						m(GoodWe.ChannelId.FEED_POWER_ENABLE, new UnsignedWordElement(47509)), //
+						m(GoodWe.ChannelId.FEED_POWER_PARA_SET, new UnsignedWordElement(47510)), //
+						m(GoodWe.ChannelId.EMS_POWER_MODE, new UnsignedWordElement(47511)), //
+						m(GoodWe.ChannelId.EMS_POWER_SET, new UnsignedWordElement(47512)), //
+						m(GoodWe.ChannelId.BMS_CURR_LMT_COFF, new UnsignedWordElement(47513)), //
+						m(GoodWe.ChannelId.BATTERY_PROTOCOL_ARM, new UnsignedWordElement(47514)), //
+
+						m(GoodWe.ChannelId.WORK_WEEK_1_START_TIME, new UnsignedWordElement(47515)), //
+						m(GoodWe.ChannelId.WORK_WEEK_1_END_TIME, new UnsignedWordElement(47516)), //
+						m(GoodWe.ChannelId.WORK_WEEK_1_BAT_POWER_PERCENT, new UnsignedWordElement(47517)), //
+						m(new BitsWordElement(47518, this)//
 								.bit(0, GoodWe.ChannelId.WORK_WEEK_1_SUNDAY)//
 								.bit(1, GoodWe.ChannelId.WORK_WEEK_1_MONDAY)//
 								.bit(2, GoodWe.ChannelId.WORK_WEEK_1_TUESDAY)//
@@ -874,116 +874,116 @@ protected final ModbusProtocol defineModbusProtocol() throws OpenemsException {
 
 				new FC16WriteRegistersTask(45216, //
 						// Choose "Warehouse" safety code first and then Set "1" to factory settings
-						this.m(GoodWe.ChannelId.FACTORY_SETTING, new UnsignedWordElement(45216)), //
+						m(GoodWe.ChannelId.FACTORY_SETTING, new UnsignedWordElement(45216)), //
 						// Reset inverter accumulated data like E-total, E-day, error log running data
 						// etc
-						this.m(GoodWe.ChannelId.CLEAR_DATA, new UnsignedWordElement(45217)), //
+						m(GoodWe.ChannelId.CLEAR_DATA, new UnsignedWordElement(45217)), //
 						new DummyRegisterElement(45218, 45219), //
 						// Inverter will re-check and reconnect to utility again. Inverter does not
 						// shutdown
-						this.m(GoodWe.ChannelId.RESTART, new UnsignedWordElement(45220)), //
+						m(GoodWe.ChannelId.RESTART, new UnsignedWordElement(45220)), //
 						// inverter will total shutdown and wake up again
-						this.m(GoodWe.ChannelId.RESET_SPS, new UnsignedWordElement(45221)), //
-						this.m(GoodWe.ChannelId.PV_E_TOTAL_2, new UnsignedDoublewordElement(45222),
+						m(GoodWe.ChannelId.RESET_SPS, new UnsignedWordElement(45221)), //
+						m(GoodWe.ChannelId.PV_E_TOTAL_2, new UnsignedDoublewordElement(45222),
 								ElementToChannelConverter.SCALE_FACTOR_MINUS_1), //
 						// to read or write the total PV production energy of the day
-						this.m(GoodWe.ChannelId.PV_E_DAY_2, new UnsignedDoublewordElement(45224),
+						m(GoodWe.ChannelId.PV_E_DAY_2, new UnsignedDoublewordElement(45224),
 								ElementToChannelConverter.SCALE_FACTOR_MINUS_1), //
 						// to read or write the accumulated exporting energy to grid from the
 						// installation date
-						this.m(GoodWe.ChannelId.E_TOTAL_SELL_2, new UnsignedDoublewordElement(45226),
+						m(GoodWe.ChannelId.E_TOTAL_SELL_2, new UnsignedDoublewordElement(45226),
 								ElementToChannelConverter.SCALE_FACTOR_MINUS_1), //
 						// to read or write the accumulated operation hours from the installation date
-						this.m(GoodWe.ChannelId.H_TOTAL_2, new UnsignedDoublewordElement(45228)), //
+						m(GoodWe.ChannelId.H_TOTAL_2, new UnsignedDoublewordElement(45228)), //
 						// to read or write the accumulated exporting energy to grid of the day
-						this.m(GoodWe.ChannelId.E_DAY_SELL_2, new UnsignedWordElement(45230),
+						m(GoodWe.ChannelId.E_DAY_SELL_2, new UnsignedWordElement(45230),
 								ElementToChannelConverter.SCALE_FACTOR_MINUS_1), //
 						// to read or write the accumulated energy imported from grid from the
 						// installation date
-						this.m(GoodWe.ChannelId.E_TOTAL_BUY_2, new UnsignedDoublewordElement(45231),
+						m(GoodWe.ChannelId.E_TOTAL_BUY_2, new UnsignedDoublewordElement(45231),
 								ElementToChannelConverter.SCALE_FACTOR_MINUS_1), //
 						// to read or write the accumulated energy imported from grid of the day
-						this.m(GoodWe.ChannelId.E_DAY_BUY_2, new UnsignedWordElement(45233),
+						m(GoodWe.ChannelId.E_DAY_BUY_2, new UnsignedWordElement(45233),
 								ElementToChannelConverter.SCALE_FACTOR_MINUS_1), //
 						// to read or write the accumulated load consumption energy from the
 						// installation date, not include backup load.
-						this.m(GoodWe.ChannelId.E_TOTAL_LOAD_2, new UnsignedDoublewordElement(45234),
+						m(GoodWe.ChannelId.E_TOTAL_LOAD_2, new UnsignedDoublewordElement(45234),
 								ElementToChannelConverter.SCALE_FACTOR_MINUS_1), //
 						// to read or write the accumulated load consumption energy of the day Not
 						// include backup loads
-						this.m(GoodWe.ChannelId.E_LOAD_DAY_2, new UnsignedWordElement(45236),
+						m(GoodWe.ChannelId.E_LOAD_DAY_2, new UnsignedWordElement(45236),
 								ElementToChannelConverter.SCALE_FACTOR_MINUS_1), //
 						// to read or write the accumulated energy charged to battery from the
 						// installation date Not from BMS
-						this.m(GoodWe.ChannelId.E_BATTERY_CHARGE_2, new UnsignedDoublewordElement(45237),
+						m(GoodWe.ChannelId.E_BATTERY_CHARGE_2, new UnsignedDoublewordElement(45237),
 								ElementToChannelConverter.SCALE_FACTOR_MINUS_1), //
 						// to read or write the accumulated energy charged to battery of the day Not
 						// from BMS
-						this.m(GoodWe.ChannelId.E_CHARGE_DAY_2, new UnsignedWordElement(45239),
+						m(GoodWe.ChannelId.E_CHARGE_DAY_2, new UnsignedWordElement(45239),
 								ElementToChannelConverter.SCALE_FACTOR_MINUS_1), //
 						// to read or write the accumulated energy battery discharged, from the
 						// installation date Not from BMS
-						this.m(GoodWe.ChannelId.E_BATTERY_DISCHARGE_2, new UnsignedDoublewordElement(45240),
+						m(GoodWe.ChannelId.E_BATTERY_DISCHARGE_2, new UnsignedDoublewordElement(45240),
 								ElementToChannelConverter.SCALE_FACTOR_MINUS_1), //
 						// to read or write the accumulated energy battery discharged, of the day Not
 						// from BMS
-						this.m(GoodWe.ChannelId.E_DISCHARGE_DAY_2, new UnsignedWordElement(45242),
+						m(GoodWe.ChannelId.E_DISCHARGE_DAY_2, new UnsignedWordElement(45242),
 								ElementToChannelConverter.SCALE_FACTOR_MINUS_1), //
 						new DummyRegisterElement(45243), //
 						// to set safety code for inverter or read the preset safety code for the
 						// inverter
-						this.m(GoodWe.ChannelId.SAFETY_COUNTRY_CODE, new UnsignedWordElement(45244)), //
+						m(GoodWe.ChannelId.SAFETY_COUNTRY_CODE, new UnsignedWordElement(45244)), //
 						// default 100 kilo Ohm, to read or set Isolation protection threshold for the
 						// inverter
-						this.m(GoodWe.ChannelId.ISO_LIMIT, new UnsignedWordElement(45245)), //
+						m(GoodWe.ChannelId.ISO_LIMIT, new UnsignedWordElement(45245)), //
 						// as default is deactivated, set "1" to activate LVRT function, Set "2" to
 						// activate HVRT, The same as 45499
-						this.m(GoodWe.ChannelId.LVRT_HVRT, new UnsignedWordElement(45246))), //
+						m(GoodWe.ChannelId.LVRT_HVRT, new UnsignedWordElement(45246))), //
 				new FC16WriteRegistersTask(45250, //
 						// to write or read the start up PV voltage of the inverter.Please refer to the
 						// user manual
-						this.m(GoodWe.ChannelId.PV_START_VOLTAGE, new UnsignedWordElement(45250),
+						m(GoodWe.ChannelId.PV_START_VOLTAGE, new UnsignedWordElement(45250),
 								ElementToChannelConverter.SCALE_FACTOR_MINUS_1), //
 						// as default is deactivated, set "1" to activate "Shadow Scan" function
-						this.m(GoodWe.ChannelId.MPPT_FOR_SHADOW_ENABLE, new UnsignedWordElement(45251)), //
+						m(GoodWe.ChannelId.MPPT_FOR_SHADOW_ENABLE, new UnsignedWordElement(45251)), //
 						// as default is deactivated, set "1" to activate "Shadow Scan" function
-						this.m(GoodWe.ChannelId.BACK_UP_ENABLE, new UnsignedWordElement(45252)), //
+						m(GoodWe.ChannelId.BACK_UP_ENABLE, new UnsignedWordElement(45252)), //
 						// Off-Grid Auto startup, as default is deactivated, set "1" to activate "Shadow
 						// Scan" function
-						this.m(GoodWe.ChannelId.AUTO_START_BACKUP, new UnsignedWordElement(45253)), //
+						m(GoodWe.ChannelId.AUTO_START_BACKUP, new UnsignedWordElement(45253)), //
 						// As default is "0"
-						this.m(GoodWe.ChannelId.GRID_WAVE_CHECK_LEVEL, new UnsignedWordElement(45254)), //
+						m(GoodWe.ChannelId.GRID_WAVE_CHECK_LEVEL, new UnsignedWordElement(45254)), //
 						new DummyRegisterElement(45255), //
 						// Default is 1500 (30s)
-						this.m(GoodWe.ChannelId.BACKUP_START_DLY, new UnsignedWordElement(45256)), //
-						this.m(GoodWe.ChannelId.UPS_STD_VOLT_TYPE, new UnsignedWordElement(45257)), //
+						m(GoodWe.ChannelId.BACKUP_START_DLY, new UnsignedWordElement(45256)), //
+						m(GoodWe.ChannelId.UPS_STD_VOLT_TYPE, new UnsignedWordElement(45257)), //
 						new DummyRegisterElement(45258, 45262), //
 						// Only can set 70, only for German
-						this.m(GoodWe.ChannelId.DERATE_RATE_VDE, new UnsignedWordElement(45263)), //
+						m(GoodWe.ChannelId.DERATE_RATE_VDE, new UnsignedWordElement(45263)), //
 						// This function is deactivated as default, set "1" to activate. After
 						// activated, All power needs to be turned off and restarted
-						this.m(GoodWe.ChannelId.THREE_PHASE_UNBALANCED_OUTPUT, new UnsignedWordElement(45264)), //
+						m(GoodWe.ChannelId.THREE_PHASE_UNBALANCED_OUTPUT, new UnsignedWordElement(45264)), //
 						new DummyRegisterElement(45265), //
 						// For weak grid area
-						this.m(GoodWe.ChannelId.HIGH_IMP_MODE, new UnsignedWordElement(45266)), //
+						m(GoodWe.ChannelId.HIGH_IMP_MODE, new UnsignedWordElement(45266)), //
 						new DummyRegisterElement(45267, 45270), //
 						// only for inverters with AFCI function
-						this.m(GoodWe.ChannelId.ARC_SELF_CHECK, new UnsignedWordElement(45271)), //
+						m(GoodWe.ChannelId.ARC_SELF_CHECK, new UnsignedWordElement(45271)), //
 						// only for inverters with AFCI function
-						this.m(GoodWe.ChannelId.ARC_FAULT_REMOVE, new UnsignedWordElement(45272)), //
+						m(GoodWe.ChannelId.ARC_FAULT_REMOVE, new UnsignedWordElement(45272)), //
 						new DummyRegisterElement(45273, 45274), //
 						// 0:Normal mode 1: cancel ISO test when offgrid to ongrid
-						this.m(GoodWe.ChannelId.ISO_CHECK_MODE, new UnsignedWordElement(45275)), //
+						m(GoodWe.ChannelId.ISO_CHECK_MODE, new UnsignedWordElement(45275)), //
 						// The delay time when grid is available
-						this.m(GoodWe.ChannelId.OFF_GRID_TO_ON_GRID_DELAY, new UnsignedWordElement(45276)), //
+						m(GoodWe.ChannelId.OFF_GRID_TO_ON_GRID_DELAY, new UnsignedWordElement(45276)), //
 						// If set 80%, when offgrid output voltage less than 230*80%=184V, inverter will
 						// have the error.Default setting is
-						this.m(GoodWe.ChannelId.OFF_GRID_UNDER_VOLTAGE_PROTECT_COEFFICIENT,
+						m(GoodWe.ChannelId.OFF_GRID_UNDER_VOLTAGE_PROTECT_COEFFICIENT,
 								new UnsignedWordElement(45277)), //
 						// When offgrid and the battery SOC is low, PV charge the battery
-						this.m(GoodWe.ChannelId.BATTERY_MODE_PV_CHARGE_ENABLE, new UnsignedWordElement(45278)), //
+						m(GoodWe.ChannelId.BATTERY_MODE_PV_CHARGE_ENABLE, new UnsignedWordElement(45278)), //
 						// Default setting 1, [1,20]
-						this.m(GoodWe.ChannelId.DCV_CHECK_OFF, new UnsignedWordElement(45279))), //
+						m(GoodWe.ChannelId.DCV_CHECK_OFF, new UnsignedWordElement(45279))), //
 
 				// These registers is to set the protection parameters on battery
 				// charge/discharge operation ON INVERTER SIDE. The real
@@ -993,95 +993,95 @@ protected final ModbusProtocol defineModbusProtocol() throws OpenemsException {
 				// charge at max 20A. but if battery BMS limit max charge current as 50A,then
 				// the real charge current of the battery will exceed 25A.
 				new FC16WriteRegistersTask(45352, //
-						this.m(GoodWe.ChannelId.BMS_CHARGE_MAX_VOLTAGE, new UnsignedWordElement(45352),
+						m(GoodWe.ChannelId.BMS_CHARGE_MAX_VOLTAGE, new UnsignedWordElement(45352),
 								ElementToChannelConverter.SCALE_FACTOR_MINUS_1), // [500*N,600*N]
-						this.m(GoodWe.ChannelId.BMS_CHARGE_MAX_CURRENT, new UnsignedWordElement(45353),
+						m(GoodWe.ChannelId.BMS_CHARGE_MAX_CURRENT, new UnsignedWordElement(45353),
 								ElementToChannelConverter.SCALE_FACTOR_MINUS_1), // [0,1000]
-						this.m(GoodWe.ChannelId.BMS_DISCHARGE_MIN_VOLTAGE, new UnsignedWordElement(45354),
+						m(GoodWe.ChannelId.BMS_DISCHARGE_MIN_VOLTAGE, new UnsignedWordElement(45354),
 								ElementToChannelConverter.SCALE_FACTOR_MINUS_1), // [400*N,480*N]
-						this.m(GoodWe.ChannelId.BMS_DISCHARGE_MAX_CURRENT, new UnsignedWordElement(45355),
+						m(GoodWe.ChannelId.BMS_DISCHARGE_MAX_CURRENT, new UnsignedWordElement(45355),
 								ElementToChannelConverter.SCALE_FACTOR_MINUS_1), // [0,1000]
-						this.m(GoodWe.ChannelId.BMS_SOC_UNDER_MIN, new UnsignedWordElement(45356)), // [0,100]
-						this.m(GoodWe.ChannelId.BMS_OFFLINE_DISCHARGE_MIN_VOLTAGE, new UnsignedWordElement(45357),
+						m(GoodWe.ChannelId.BMS_SOC_UNDER_MIN, new UnsignedWordElement(45356)), // [0,100]
+						m(GoodWe.ChannelId.BMS_OFFLINE_DISCHARGE_MIN_VOLTAGE, new UnsignedWordElement(45357),
 								ElementToChannelConverter.SCALE_FACTOR_MINUS_1), // ), //
-						this.m(GoodWe.ChannelId.BMS_OFFLINE_SOC_UNDER_MIN, new UnsignedWordElement(45358))), //
+						m(GoodWe.ChannelId.BMS_OFFLINE_SOC_UNDER_MIN, new UnsignedWordElement(45358))), //
 
 				// Safety Parameters
 				new FC16WriteRegistersTask(45400, //
-						this.m(GoodWe.ChannelId.GRID_VOLT_HIGH_S1, new UnsignedWordElement(45400),
+						m(GoodWe.ChannelId.GRID_VOLT_HIGH_S1, new UnsignedWordElement(45400),
 								ElementToChannelConverter.SCALE_FACTOR_MINUS_1), //
-						this.m(GoodWe.ChannelId.GRID_VOLT_HIGH_S1_TIME, new UnsignedWordElement(45401)), //
-						this.m(GoodWe.ChannelId.GRID_VOLT_LOW_S1, new UnsignedWordElement(45402),
+						m(GoodWe.ChannelId.GRID_VOLT_HIGH_S1_TIME, new UnsignedWordElement(45401)), //
+						m(GoodWe.ChannelId.GRID_VOLT_LOW_S1, new UnsignedWordElement(45402),
 								ElementToChannelConverter.SCALE_FACTOR_MINUS_1), //
-						this.m(GoodWe.ChannelId.GRID_VOLT_LOW_S1_TIME, new UnsignedWordElement(45403)), //
-						this.m(GoodWe.ChannelId.GRID_VOLT_HIGH_S2, new UnsignedWordElement(45404),
+						m(GoodWe.ChannelId.GRID_VOLT_LOW_S1_TIME, new UnsignedWordElement(45403)), //
+						m(GoodWe.ChannelId.GRID_VOLT_HIGH_S2, new UnsignedWordElement(45404),
 								ElementToChannelConverter.SCALE_FACTOR_MINUS_1), //
-						this.m(GoodWe.ChannelId.GRID_VOLT_HIGH_S2_TIME, new UnsignedWordElement(45405)), //
-						this.m(GoodWe.ChannelId.GRID_VOLT_LOW_S2, new UnsignedWordElement(45406),
+						m(GoodWe.ChannelId.GRID_VOLT_HIGH_S2_TIME, new UnsignedWordElement(45405)), //
+						m(GoodWe.ChannelId.GRID_VOLT_LOW_S2, new UnsignedWordElement(45406),
 								ElementToChannelConverter.SCALE_FACTOR_MINUS_1), //
-						this.m(GoodWe.ChannelId.GRID_VOLT_LOW_S2_TIME, new UnsignedWordElement(45407)), //
-						this.m(GoodWe.ChannelId.GRID_VOLT_QUALITY, new UnsignedWordElement(45408),
+						m(GoodWe.ChannelId.GRID_VOLT_LOW_S2_TIME, new UnsignedWordElement(45407)), //
+						m(GoodWe.ChannelId.GRID_VOLT_QUALITY, new UnsignedWordElement(45408),
 								ElementToChannelConverter.SCALE_FACTOR_MINUS_1), //
-						this.m(GoodWe.ChannelId.GRID_FREQ_HIGH_S1, new UnsignedWordElement(45409),
+						m(GoodWe.ChannelId.GRID_FREQ_HIGH_S1, new UnsignedWordElement(45409),
 								ElementToChannelConverter.SCALE_FACTOR_MINUS_2), //
-						this.m(GoodWe.ChannelId.GRID_FREQ_HIGH_S1_TIME, new UnsignedWordElement(45410)), //
-						this.m(GoodWe.ChannelId.GRID_FREQ_LOW_S1, new UnsignedWordElement(45411),
+						m(GoodWe.ChannelId.GRID_FREQ_HIGH_S1_TIME, new UnsignedWordElement(45410)), //
+						m(GoodWe.ChannelId.GRID_FREQ_LOW_S1, new UnsignedWordElement(45411),
 								ElementToChannelConverter.SCALE_FACTOR_MINUS_2), //
-						this.m(GoodWe.ChannelId.GRID_FREQ_LOW_S1_TIME, new UnsignedWordElement(45412)), //
-						this.m(GoodWe.ChannelId.GRID_FREQ_HIGH_S2, new UnsignedWordElement(45413),
+						m(GoodWe.ChannelId.GRID_FREQ_LOW_S1_TIME, new UnsignedWordElement(45412)), //
+						m(GoodWe.ChannelId.GRID_FREQ_HIGH_S2, new UnsignedWordElement(45413),
 								ElementToChannelConverter.SCALE_FACTOR_MINUS_2), //
-						this.m(GoodWe.ChannelId.GRID_FREQ_HIGH_S2_TIME, new UnsignedWordElement(45414)), //
-						this.m(GoodWe.ChannelId.GRID_FREQ_LOW_S2, new UnsignedWordElement(45415),
+						m(GoodWe.ChannelId.GRID_FREQ_HIGH_S2_TIME, new UnsignedWordElement(45414)), //
+						m(GoodWe.ChannelId.GRID_FREQ_LOW_S2, new UnsignedWordElement(45415),
 								ElementToChannelConverter.SCALE_FACTOR_MINUS_2), //
-						this.m(GoodWe.ChannelId.GRID_FREQ_LOW_S2_TIME, new UnsignedWordElement(45416)), //
+						m(GoodWe.ChannelId.GRID_FREQ_LOW_S2_TIME, new UnsignedWordElement(45416)), //
 						// Connect voltage
-						this.m(GoodWe.ChannelId.GRID_VOLT_HIGH, new UnsignedWordElement(45417),
+						m(GoodWe.ChannelId.GRID_VOLT_HIGH, new UnsignedWordElement(45417),
 								ElementToChannelConverter.SCALE_FACTOR_MINUS_1), //
-						this.m(GoodWe.ChannelId.GRID_VOLT_LOW, new UnsignedWordElement(45418),
+						m(GoodWe.ChannelId.GRID_VOLT_LOW, new UnsignedWordElement(45418),
 								ElementToChannelConverter.SCALE_FACTOR_MINUS_1), //
-						this.m(GoodWe.ChannelId.GRID_FREQ_HIGH, new UnsignedWordElement(45419),
+						m(GoodWe.ChannelId.GRID_FREQ_HIGH, new UnsignedWordElement(45419),
 								ElementToChannelConverter.SCALE_FACTOR_MINUS_2), //
-						this.m(GoodWe.ChannelId.GRID_FREQ_LOW, new UnsignedWordElement(45420),
+						m(GoodWe.ChannelId.GRID_FREQ_LOW, new UnsignedWordElement(45420),
 								ElementToChannelConverter.SCALE_FACTOR_MINUS_2), //
-						this.m(GoodWe.ChannelId.GRID_RECOVER_TIME, new UnsignedWordElement(45421)), //
+						m(GoodWe.ChannelId.GRID_RECOVER_TIME, new UnsignedWordElement(45421)), //
 						// Reconnect voltage
-						this.m(GoodWe.ChannelId.GRID_VOLT_RECOVER_HIGH, new UnsignedWordElement(45422),
+						m(GoodWe.ChannelId.GRID_VOLT_RECOVER_HIGH, new UnsignedWordElement(45422),
 								ElementToChannelConverter.SCALE_FACTOR_MINUS_1), //
-						this.m(GoodWe.ChannelId.GRID_VOLT_RECOVER_LOW, new UnsignedWordElement(45423),
+						m(GoodWe.ChannelId.GRID_VOLT_RECOVER_LOW, new UnsignedWordElement(45423),
 								ElementToChannelConverter.SCALE_FACTOR_MINUS_1), //
-						this.m(GoodWe.ChannelId.GRID_FREQ_RECOVER_HIGH, new UnsignedWordElement(45424),
+						m(GoodWe.ChannelId.GRID_FREQ_RECOVER_HIGH, new UnsignedWordElement(45424),
 								ElementToChannelConverter.SCALE_FACTOR_MINUS_2), //
-						this.m(GoodWe.ChannelId.GRID_FREQ_RECOVER_LOW, new UnsignedWordElement(45425),
+						m(GoodWe.ChannelId.GRID_FREQ_RECOVER_LOW, new UnsignedWordElement(45425),
 								ElementToChannelConverter.SCALE_FACTOR_MINUS_2), //
-						this.m(GoodWe.ChannelId.GRID_VOLT_RECOVER_TIME, new UnsignedWordElement(45426)), //
-						this.m(GoodWe.ChannelId.GRID_FREQ_RECOVER_TIME, new UnsignedWordElement(45427)), //
+						m(GoodWe.ChannelId.GRID_VOLT_RECOVER_TIME, new UnsignedWordElement(45426)), //
+						m(GoodWe.ChannelId.GRID_FREQ_RECOVER_TIME, new UnsignedWordElement(45427)), //
 						// Power rate limit
-						this.m(GoodWe.ChannelId.POWER_RATE_LIMIT_GENERATE, new UnsignedWordElement(45428),
+						m(GoodWe.ChannelId.POWER_RATE_LIMIT_GENERATE, new UnsignedWordElement(45428),
 								ElementToChannelConverter.SCALE_FACTOR_MINUS_2), //
-						this.m(GoodWe.ChannelId.POWER_RATE_LIMIT_RECONNECT, new UnsignedWordElement(45429),
+						m(GoodWe.ChannelId.POWER_RATE_LIMIT_RECONNECT, new UnsignedWordElement(45429),
 								ElementToChannelConverter.SCALE_FACTOR_MINUS_2), //
-						this.m(GoodWe.ChannelId.POWER_RATE_LIMIT_REDUCTION, new UnsignedWordElement(45430),
+						m(GoodWe.ChannelId.POWER_RATE_LIMIT_REDUCTION, new UnsignedWordElement(45430),
 								ElementToChannelConverter.SCALE_FACTOR_MINUS_2), //
-						this.m(GoodWe.ChannelId.GRID_PROTECT, new UnsignedWordElement(45431)), //
-						this.m(GoodWe.ChannelId.POWER_SLOPE_ENABLE, new UnsignedWordElement(45432))), //
+						m(GoodWe.ChannelId.GRID_PROTECT, new UnsignedWordElement(45431)), //
+						m(GoodWe.ChannelId.POWER_SLOPE_ENABLE, new UnsignedWordElement(45432))), //
 
 				// Cos Phi Curve
 				new FC16WriteRegistersTask(45433, //
-						this.m(GoodWe.ChannelId.ENABLE_CURVE_PU, new UnsignedWordElement(45433)), //
-						this.m(GoodWe.ChannelId.A_POINT_POWER, new SignedWordElement(45434)), //
-						this.m(GoodWe.ChannelId.A_POINT_COS_PHI, new SignedWordElement(45435),
+						m(GoodWe.ChannelId.ENABLE_CURVE_PU, new UnsignedWordElement(45433)), //
+						m(GoodWe.ChannelId.A_POINT_POWER, new SignedWordElement(45434)), //
+						m(GoodWe.ChannelId.A_POINT_COS_PHI, new SignedWordElement(45435),
 								ElementToChannelConverter.SCALE_FACTOR_MINUS_2), //
-						this.m(GoodWe.ChannelId.B_POINT_POWER, new SignedWordElement(45436)), //
-						this.m(GoodWe.ChannelId.B_POINT_COS_PHI, new SignedWordElement(45437),
+						m(GoodWe.ChannelId.B_POINT_POWER, new SignedWordElement(45436)), //
+						m(GoodWe.ChannelId.B_POINT_COS_PHI, new SignedWordElement(45437),
 								ElementToChannelConverter.SCALE_FACTOR_MINUS_2), //
-						this.m(GoodWe.ChannelId.C_POINT_POWER, new SignedWordElement(45438)), //
-						this.m(GoodWe.ChannelId.C_POINT_COS_PHI, new SignedWordElement(45439),
+						m(GoodWe.ChannelId.C_POINT_POWER, new SignedWordElement(45438)), //
+						m(GoodWe.ChannelId.C_POINT_COS_PHI, new SignedWordElement(45439),
 								ElementToChannelConverter.SCALE_FACTOR_MINUS_2), // ), //
-						this.m(GoodWe.ChannelId.LOCK_IN_VOLTAGE, new UnsignedWordElement(45440),
+						m(GoodWe.ChannelId.LOCK_IN_VOLTAGE, new UnsignedWordElement(45440),
 								ElementToChannelConverter.SCALE_FACTOR_MINUS_1), //
-						this.m(GoodWe.ChannelId.LOCK_OUT_VOLTAGE, new UnsignedWordElement(45441),
+						m(GoodWe.ChannelId.LOCK_OUT_VOLTAGE, new UnsignedWordElement(45441),
 								ElementToChannelConverter.SCALE_FACTOR_MINUS_1), //
-						this.m(GoodWe.ChannelId.LOCK_OUT_POWER, new SignedWordElement(45442))), //
+						m(GoodWe.ChannelId.LOCK_OUT_POWER, new SignedWordElement(45442))), //
 
 				// Power and frequency curve
 				// m(new BitsWordElement(45443, this)//
@@ -1090,169 +1090,169 @@ protected final ModbusProtocol defineModbusProtocol() throws OpenemsException {
 
 				// Power and frequency curve
 				new FC16WriteRegistersTask(45444, //
-						this.m(GoodWe.ChannelId.FFROZEN_DCH, new UnsignedWordElement(45444),
+						m(GoodWe.ChannelId.FFROZEN_DCH, new UnsignedWordElement(45444),
 								ElementToChannelConverter.SCALE_FACTOR_MINUS_2), //
-						this.m(GoodWe.ChannelId.FFROZEN_CH, new UnsignedWordElement(45445),
+						m(GoodWe.ChannelId.FFROZEN_CH, new UnsignedWordElement(45445),
 								ElementToChannelConverter.SCALE_FACTOR_MINUS_2), //
-						this.m(GoodWe.ChannelId.FSTOP_DCH, new UnsignedWordElement(45446),
+						m(GoodWe.ChannelId.FSTOP_DCH, new UnsignedWordElement(45446),
 								ElementToChannelConverter.SCALE_FACTOR_MINUS_2), //
-						this.m(GoodWe.ChannelId.FSTOP_CH, new UnsignedWordElement(45447),
+						m(GoodWe.ChannelId.FSTOP_CH, new UnsignedWordElement(45447),
 								ElementToChannelConverter.SCALE_FACTOR_MINUS_2), //
-						this.m(GoodWe.ChannelId.RECOVERY_WAITING_TIME, new UnsignedWordElement(45448)), //
-						this.m(GoodWe.ChannelId.RECOVERY_FREQURNCY1, new UnsignedWordElement(45449),
+						m(GoodWe.ChannelId.RECOVERY_WAITING_TIME, new UnsignedWordElement(45448)), //
+						m(GoodWe.ChannelId.RECOVERY_FREQURNCY1, new UnsignedWordElement(45449),
 								ElementToChannelConverter.SCALE_FACTOR_MINUS_2), //
-						this.m(GoodWe.ChannelId.RECOVERY_FREQUENCY2, new UnsignedWordElement(45450),
+						m(GoodWe.ChannelId.RECOVERY_FREQUENCY2, new UnsignedWordElement(45450),
 								ElementToChannelConverter.SCALE_FACTOR_MINUS_2), //
-						this.m(GoodWe.ChannelId.CFP_SETTINGS, new UnsignedWordElement(45451), //
+						m(GoodWe.ChannelId.CFP_SETTINGS, new UnsignedWordElement(45451), //
 								new ChannelMetaInfoReadAndWrite(45452, 45451)), //
-						this.m(GoodWe.ChannelId.OF_RECOVERY_SLOPE, new UnsignedWordElement(45452), //
+						m(GoodWe.ChannelId.OF_RECOVERY_SLOPE, new UnsignedWordElement(45452), //
 								new ChannelMetaInfoReadAndWrite(45451, 45452)), //
-						this.m(GoodWe.ChannelId.CFP_OF_SLOPE_PERCENT, new UnsignedWordElement(45453),
+						m(GoodWe.ChannelId.CFP_OF_SLOPE_PERCENT, new UnsignedWordElement(45453),
 								ElementToChannelConverter.SCALE_FACTOR_MINUS_2), //
-						this.m(GoodWe.ChannelId.CFP_UF_SLOPE_PERCENT, new UnsignedWordElement(45454),
+						m(GoodWe.ChannelId.CFP_UF_SLOPE_PERCENT, new UnsignedWordElement(45454),
 								ElementToChannelConverter.SCALE_FACTOR_MINUS_2), //
-						this.m(GoodWe.ChannelId.CFP_OF_RECOVER_POWER_PERCENT, new UnsignedWordElement(45455)), //
+						m(GoodWe.ChannelId.CFP_OF_RECOVER_POWER_PERCENT, new UnsignedWordElement(45455)), //
 
 						// QU Curve
-						this.m(GoodWe.ChannelId.QU_CURVE, new UnsignedWordElement(45456)), //
-						this.m(GoodWe.ChannelId.LOCK_IN_POWER_QU, new SignedWordElement(45457)), //
-						this.m(GoodWe.ChannelId.LOCK_OUT_POWER_QU, new SignedWordElement(45458)), //
-						this.m(GoodWe.ChannelId.V1_VOLTAGE, new UnsignedWordElement(45459),
+						m(GoodWe.ChannelId.QU_CURVE, new UnsignedWordElement(45456)), //
+						m(GoodWe.ChannelId.LOCK_IN_POWER_QU, new SignedWordElement(45457)), //
+						m(GoodWe.ChannelId.LOCK_OUT_POWER_QU, new SignedWordElement(45458)), //
+						m(GoodWe.ChannelId.V1_VOLTAGE, new UnsignedWordElement(45459),
 								ElementToChannelConverter.SCALE_FACTOR_MINUS_1), // ), //
-						this.m(GoodWe.ChannelId.V1_VALUE, new UnsignedWordElement(45460)), //
-						this.m(GoodWe.ChannelId.V2_VOLTAGE, new UnsignedWordElement(45461),
+						m(GoodWe.ChannelId.V1_VALUE, new UnsignedWordElement(45460)), //
+						m(GoodWe.ChannelId.V2_VOLTAGE, new UnsignedWordElement(45461),
 								ElementToChannelConverter.SCALE_FACTOR_MINUS_1), //
-						this.m(GoodWe.ChannelId.V2_VALUE, new UnsignedWordElement(45462)), //
-						this.m(GoodWe.ChannelId.V3_VOLTAGE, new UnsignedWordElement(45463),
+						m(GoodWe.ChannelId.V2_VALUE, new UnsignedWordElement(45462)), //
+						m(GoodWe.ChannelId.V3_VOLTAGE, new UnsignedWordElement(45463),
 								ElementToChannelConverter.SCALE_FACTOR_MINUS_1), //
-						this.m(GoodWe.ChannelId.V3_VALUE, new UnsignedWordElement(45464)), //
-						this.m(GoodWe.ChannelId.V4_VOLTAGE, new UnsignedWordElement(45465),
+						m(GoodWe.ChannelId.V3_VALUE, new UnsignedWordElement(45464)), //
+						m(GoodWe.ChannelId.V4_VOLTAGE, new UnsignedWordElement(45465),
 								ElementToChannelConverter.SCALE_FACTOR_MINUS_1), //
-						this.m(GoodWe.ChannelId.V4_VALUE, new SignedWordElement(45466)), //
-						this.m(GoodWe.ChannelId.K_VALUE, new UnsignedWordElement(45467)), //
-						this.m(GoodWe.ChannelId.TIME_CONSTANT, new UnsignedWordElement(45468)), //
-						this.m(GoodWe.ChannelId.MISCELLANEA, new UnsignedWordElement(45469))), //
+						m(GoodWe.ChannelId.V4_VALUE, new SignedWordElement(45466)), //
+						m(GoodWe.ChannelId.K_VALUE, new UnsignedWordElement(45467)), //
+						m(GoodWe.ChannelId.TIME_CONSTANT, new UnsignedWordElement(45468)), //
+						m(GoodWe.ChannelId.MISCELLANEA, new UnsignedWordElement(45469))), //
 
 				// PU Curve
 				new FC16WriteRegistersTask(45472, //
-						this.m(GoodWe.ChannelId.PU_CURVE, new UnsignedWordElement(45472)), //
-						this.m(GoodWe.ChannelId.POWER_CHANGE_RATE, new UnsignedWordElement(45473),
+						m(GoodWe.ChannelId.PU_CURVE, new UnsignedWordElement(45472)), //
+						m(GoodWe.ChannelId.POWER_CHANGE_RATE, new UnsignedWordElement(45473),
 								ElementToChannelConverter.SCALE_FACTOR_MINUS_2), //
-						this.m(GoodWe.ChannelId.V1_VOLTAGE_PU, new UnsignedWordElement(45474),
+						m(GoodWe.ChannelId.V1_VOLTAGE_PU, new UnsignedWordElement(45474),
 								ElementToChannelConverter.SCALE_FACTOR_MINUS_1), //
-						this.m(GoodWe.ChannelId.V1_VALUE_PU, new SignedWordElement(45475)), //
-						this.m(GoodWe.ChannelId.V2_VOLTAGE_PU, new UnsignedWordElement(45476),
+						m(GoodWe.ChannelId.V1_VALUE_PU, new SignedWordElement(45475)), //
+						m(GoodWe.ChannelId.V2_VOLTAGE_PU, new UnsignedWordElement(45476),
 								ElementToChannelConverter.SCALE_FACTOR_MINUS_1), //
-						this.m(GoodWe.ChannelId.V2_VALUE_PU, new SignedWordElement(45477)), //
-						this.m(GoodWe.ChannelId.V3_VOLTAGE_PU, new UnsignedWordElement(45478),
+						m(GoodWe.ChannelId.V2_VALUE_PU, new SignedWordElement(45477)), //
+						m(GoodWe.ChannelId.V3_VOLTAGE_PU, new UnsignedWordElement(45478),
 								ElementToChannelConverter.SCALE_FACTOR_MINUS_1), //
-						this.m(GoodWe.ChannelId.V3_VALUE_PU, new SignedWordElement(45479)), //
-						this.m(GoodWe.ChannelId.V4_VOLTAGE_PU, new UnsignedWordElement(45480),
+						m(GoodWe.ChannelId.V3_VALUE_PU, new SignedWordElement(45479)), //
+						m(GoodWe.ChannelId.V4_VOLTAGE_PU, new UnsignedWordElement(45480),
 								ElementToChannelConverter.SCALE_FACTOR_MINUS_1), //
-						this.m(GoodWe.ChannelId.V4_VALUE_PU, new SignedWordElement(45481)), //
+						m(GoodWe.ChannelId.V4_VALUE_PU, new SignedWordElement(45481)), //
 						// 80=Pf 0.8, 20= -0.8Pf
-						this.m(GoodWe.ChannelId.FIXED_POWER_FACTOR, new UnsignedWordElement(45482)), // [0,20]||[80,100]
+						m(GoodWe.ChannelId.FIXED_POWER_FACTOR, new UnsignedWordElement(45482)), // [0,20]||[80,100]
 						// Set the percentage of rated power of the inverter
-						this.m(GoodWe.ChannelId.FIXED_REACTIVE_POWER, new SignedWordElement(45483)), // [-600,600]
-						this.m(GoodWe.ChannelId.FIXED_ACTIVE_POWER, new UnsignedWordElement(45484)), // [0,1000]
+						m(GoodWe.ChannelId.FIXED_REACTIVE_POWER, new SignedWordElement(45483)), // [-600,600]
+						m(GoodWe.ChannelId.FIXED_ACTIVE_POWER, new UnsignedWordElement(45484)), // [0,1000]
 						new DummyRegisterElement(45485, 45490), //
 						// This must be turned off to do Meter test . "1" means Off
-						this.m(GoodWe.ChannelId.ALL_POWER_CURVE_DISABLE, new UnsignedWordElement(45491)), //
+						m(GoodWe.ChannelId.ALL_POWER_CURVE_DISABLE, new UnsignedWordElement(45491)), //
 						// if it is 1-phase inverter, then use only R phase. Unbalance output function
 						// must be turned on to set different values for R/S/T phases
-						this.m(GoodWe.ChannelId.R_PHASE_FIXED_ACTIVE_POWER, new UnsignedWordElement(45492)), //
-						this.m(GoodWe.ChannelId.S_PHASE_FIXED_ACTIVE_POWER, new UnsignedWordElement(45493)), //
-						this.m(GoodWe.ChannelId.T_PHASE_FIXED_ACTIVE_POWER, new UnsignedWordElement(45494)), //
+						m(GoodWe.ChannelId.R_PHASE_FIXED_ACTIVE_POWER, new UnsignedWordElement(45492)), //
+						m(GoodWe.ChannelId.S_PHASE_FIXED_ACTIVE_POWER, new UnsignedWordElement(45493)), //
+						m(GoodWe.ChannelId.T_PHASE_FIXED_ACTIVE_POWER, new UnsignedWordElement(45494)), //
 						// only for countries where it needs 3-stage grid voltage
 						// protection, Eg. Czech Republic
-						this.m(GoodWe.ChannelId.GRID_VOLT_HIGH_S3, new UnsignedWordElement(45495),
+						m(GoodWe.ChannelId.GRID_VOLT_HIGH_S3, new UnsignedWordElement(45495),
 								ElementToChannelConverter.SCALE_FACTOR_MINUS_1), //
-						this.m(GoodWe.ChannelId.GRID_VOLT_HIGH_S3_TIME, new UnsignedWordElement(45496)), //
-						this.m(GoodWe.ChannelId.GRID_VOLT_LOW_S3, new UnsignedWordElement(45497),
+						m(GoodWe.ChannelId.GRID_VOLT_HIGH_S3_TIME, new UnsignedWordElement(45496)), //
+						m(GoodWe.ChannelId.GRID_VOLT_LOW_S3, new UnsignedWordElement(45497),
 								ElementToChannelConverter.SCALE_FACTOR_MINUS_1), //
-						this.m(GoodWe.ChannelId.GRID_VOLT_LOW_S3_TIME, new UnsignedWordElement(45498)), //
+						m(GoodWe.ChannelId.GRID_VOLT_LOW_S3_TIME, new UnsignedWordElement(45498)), //
 
 						// For ZVRT, LVRT, HVRT
-						this.m(GoodWe.ChannelId.ZVRT_CONFIG, new UnsignedWordElement(45499)), //
-						this.m(GoodWe.ChannelId.LVRT_START_VOLT, new UnsignedWordElement(45500),
+						m(GoodWe.ChannelId.ZVRT_CONFIG, new UnsignedWordElement(45499)), //
+						m(GoodWe.ChannelId.LVRT_START_VOLT, new UnsignedWordElement(45500),
 								ElementToChannelConverter.SCALE_FACTOR_MINUS_1), //
-						this.m(GoodWe.ChannelId.LVRT_END_VOLT, new UnsignedWordElement(45501),
+						m(GoodWe.ChannelId.LVRT_END_VOLT, new UnsignedWordElement(45501),
 								ElementToChannelConverter.SCALE_FACTOR_MINUS_1), //
-						this.m(GoodWe.ChannelId.LVRT_START_TRIP_TIME, new UnsignedWordElement(45502)), //
-						this.m(GoodWe.ChannelId.LVRT_END_TRIP_TIME, new UnsignedWordElement(45503)), //
-						this.m(GoodWe.ChannelId.LVRT_TRIP_LIMIT_VOLT, new UnsignedWordElement(45504),
+						m(GoodWe.ChannelId.LVRT_START_TRIP_TIME, new UnsignedWordElement(45502)), //
+						m(GoodWe.ChannelId.LVRT_END_TRIP_TIME, new UnsignedWordElement(45503)), //
+						m(GoodWe.ChannelId.LVRT_TRIP_LIMIT_VOLT, new UnsignedWordElement(45504),
 								ElementToChannelConverter.SCALE_FACTOR_MINUS_1), //
-						this.m(GoodWe.ChannelId.HVRT_START_VOLT, new UnsignedWordElement(45505),
+						m(GoodWe.ChannelId.HVRT_START_VOLT, new UnsignedWordElement(45505),
 								ElementToChannelConverter.SCALE_FACTOR_MINUS_1), //
-						this.m(GoodWe.ChannelId.HVRT_END_VOLT, new UnsignedWordElement(45506),
+						m(GoodWe.ChannelId.HVRT_END_VOLT, new UnsignedWordElement(45506),
 								ElementToChannelConverter.SCALE_FACTOR_MINUS_1), //
-						this.m(GoodWe.ChannelId.HVRT_START_TRIP_TIME, new UnsignedWordElement(45507)), //
-						this.m(GoodWe.ChannelId.HVRT_END_TRIP_TIME, new UnsignedWordElement(45508)), //
-						this.m(GoodWe.ChannelId.HVRT_TRIP_LIMIT_VOLT, new UnsignedWordElement(45509),
+						m(GoodWe.ChannelId.HVRT_START_TRIP_TIME, new UnsignedWordElement(45507)), //
+						m(GoodWe.ChannelId.HVRT_END_TRIP_TIME, new UnsignedWordElement(45508)), //
+						m(GoodWe.ChannelId.HVRT_TRIP_LIMIT_VOLT, new UnsignedWordElement(45509),
 								ElementToChannelConverter.SCALE_FACTOR_MINUS_1)//
 				), //
 
 				// Additional settings for PF/PU/UF
 				new FC16WriteRegistersTask(45510, //
-						this.m(GoodWe.ChannelId.PF_TIME_CONSTANT, new UnsignedWordElement(45510)), //
-						this.m(GoodWe.ChannelId.POWER_FREQ_TIME_CONSTANT, new UnsignedWordElement(45511)), //
+						m(GoodWe.ChannelId.PF_TIME_CONSTANT, new UnsignedWordElement(45510)), //
+						m(GoodWe.ChannelId.POWER_FREQ_TIME_CONSTANT, new UnsignedWordElement(45511)), //
 						// Additional settings for P(U) Curve
-						this.m(GoodWe.ChannelId.PU_TIME_CONSTANT, new UnsignedWordElement(45512)), //
-						this.m(GoodWe.ChannelId.D_POINT_POWER, new SignedWordElement(45513)), //
-						this.m(GoodWe.ChannelId.D_POINT_COS_PHI, new SignedWordElement(45514)), //
+						m(GoodWe.ChannelId.PU_TIME_CONSTANT, new UnsignedWordElement(45512)), //
+						m(GoodWe.ChannelId.D_POINT_POWER, new SignedWordElement(45513)), //
+						m(GoodWe.ChannelId.D_POINT_COS_PHI, new SignedWordElement(45514)), //
 						// Additional settings for UF Curve
-						this.m(GoodWe.ChannelId.UF_RECOVERY_WAITING_TIME, new UnsignedWordElement(45515),
+						m(GoodWe.ChannelId.UF_RECOVERY_WAITING_TIME, new UnsignedWordElement(45515),
 								ElementToChannelConverter.SCALE_FACTOR_MINUS_2), //
-						this.m(GoodWe.ChannelId.UF_RECOVER_SLOPE, new UnsignedWordElement(45516)), //
-						this.m(GoodWe.ChannelId.CFP_UF_RECOVER_POWER_PERCENT, new UnsignedWordElement(45517)), //
-						this.m(GoodWe.ChannelId.POWER_CHARGE_LIMIT, new UnsignedWordElement(45518),
+						m(GoodWe.ChannelId.UF_RECOVER_SLOPE, new UnsignedWordElement(45516)), //
+						m(GoodWe.ChannelId.CFP_UF_RECOVER_POWER_PERCENT, new UnsignedWordElement(45517)), //
+						m(GoodWe.ChannelId.POWER_CHARGE_LIMIT, new UnsignedWordElement(45518),
 								ElementToChannelConverter.SCALE_FACTOR_MINUS_2), //
-						this.m(GoodWe.ChannelId.POWER_CHARGE_LIMIT_RECONNECT, new UnsignedWordElement(45519),
+						m(GoodWe.ChannelId.POWER_CHARGE_LIMIT_RECONNECT, new UnsignedWordElement(45519),
 								ElementToChannelConverter.SCALE_FACTOR_MINUS_2), //
-						this.m(GoodWe.ChannelId.C_EXT_UF_CHARGE_STOP, new UnsignedWordElement(45520),
+						m(GoodWe.ChannelId.C_EXT_UF_CHARGE_STOP, new UnsignedWordElement(45520),
 								ElementToChannelConverter.SCALE_FACTOR_MINUS_2), //
-						this.m(GoodWe.ChannelId.C_EXT_OF_DISCHARGE_STOP, new UnsignedWordElement(45521),
+						m(GoodWe.ChannelId.C_EXT_OF_DISCHARGE_STOP, new UnsignedWordElement(45521),
 								ElementToChannelConverter.SCALE_FACTOR_MINUS_2), //
-						this.m(GoodWe.ChannelId.C_EXT_TWOSSTEPF_FLG, new UnsignedWordElement(45522))//
+						m(GoodWe.ChannelId.C_EXT_TWOSSTEPF_FLG, new UnsignedWordElement(45522))//
 				), //
 
 				new FC16WriteRegistersTask(47505, //
 						// If using EMS, must set to "2"
-						this.m(GoodWe.ChannelId.MANUFACTURE_CODE, new UnsignedWordElement(47505)), //
+						m(GoodWe.ChannelId.MANUFACTURE_CODE, new UnsignedWordElement(47505)), //
 						new DummyRegisterElement(47506, 47508), //
-						this.m(GoodWe.ChannelId.FEED_POWER_ENABLE, new UnsignedWordElement(47509)), //
-						this.m(GoodWe.ChannelId.FEED_POWER_PARA_SET, new SignedWordElement(47510)), //
-						this.m(GoodWe.ChannelId.EMS_POWER_MODE, new UnsignedWordElement(47511)), //
-						this.m(GoodWe.ChannelId.EMS_POWER_SET, new UnsignedWordElement(47512)), //
+						m(GoodWe.ChannelId.FEED_POWER_ENABLE, new UnsignedWordElement(47509)), //
+						m(GoodWe.ChannelId.FEED_POWER_PARA_SET, new SignedWordElement(47510)), //
+						m(GoodWe.ChannelId.EMS_POWER_MODE, new UnsignedWordElement(47511)), //
+						m(GoodWe.ChannelId.EMS_POWER_SET, new UnsignedWordElement(47512)), //
 						new DummyRegisterElement(47513), //
-						this.m(GoodWe.ChannelId.BATTERY_PROTOCOL_ARM, new UnsignedWordElement(47514)), //
-						this.m(GoodWe.ChannelId.WORK_WEEK_1_START_TIME, new UnsignedWordElement(47515)), //
-						this.m(GoodWe.ChannelId.WORK_WEEK_1_END_TIME, new UnsignedWordElement(47516)), //
-						this.m(GoodWe.ChannelId.WORK_WEEK_1_BAT_POWER_PERCENT, new SignedWordElement(47517)), //
-						this.m(GoodWe.ChannelId.WORK_WEEK_1, new UnsignedWordElement(47518)) //
+						m(GoodWe.ChannelId.BATTERY_PROTOCOL_ARM, new UnsignedWordElement(47514)), //
+						m(GoodWe.ChannelId.WORK_WEEK_1_START_TIME, new UnsignedWordElement(47515)), //
+						m(GoodWe.ChannelId.WORK_WEEK_1_END_TIME, new UnsignedWordElement(47516)), //
+						m(GoodWe.ChannelId.WORK_WEEK_1_BAT_POWER_PERCENT, new SignedWordElement(47517)), //
+						m(GoodWe.ChannelId.WORK_WEEK_1, new UnsignedWordElement(47518)) //
 				// TODO .debug()
 				), //
 
 				// Real-Time BMS Data for EMS Control (the data directly from BMS. Please refer
 				// to the comments on registers 45352~45358)
 				new FC16WriteRegistersTask(47900, //
-						this.m(GoodWe.ChannelId.WBMS_VERSION, new UnsignedWordElement(47900)), //
-						this.m(GoodWe.ChannelId.WBMS_STRINGS, new UnsignedWordElement(47901)), //
-						this.m(GoodWe.ChannelId.WBMS_CHARGE_MAX_VOLTAGE, new UnsignedWordElement(47902),
+						m(GoodWe.ChannelId.WBMS_VERSION, new UnsignedWordElement(47900)), //
+						m(GoodWe.ChannelId.WBMS_STRINGS, new UnsignedWordElement(47901)), //
+						m(GoodWe.ChannelId.WBMS_CHARGE_MAX_VOLTAGE, new UnsignedWordElement(47902),
 								ElementToChannelConverter.SCALE_FACTOR_MINUS_1), //
-						this.m(GoodWe.ChannelId.WBMS_CHARGE_MAX_CURRENT, new UnsignedWordElement(47903),
+						m(GoodWe.ChannelId.WBMS_CHARGE_MAX_CURRENT, new UnsignedWordElement(47903),
 								ElementToChannelConverter.SCALE_FACTOR_MINUS_1), //
-						this.m(GoodWe.ChannelId.WBMS_DISCHARGE_MIN_VOLTAGE, new UnsignedWordElement(47904),
+						m(GoodWe.ChannelId.WBMS_DISCHARGE_MIN_VOLTAGE, new UnsignedWordElement(47904),
 								ElementToChannelConverter.SCALE_FACTOR_MINUS_1), //
-						this.m(GoodWe.ChannelId.WBMS_DISCHARGE_MAX_CURRENT, new UnsignedWordElement(47905),
+						m(GoodWe.ChannelId.WBMS_DISCHARGE_MAX_CURRENT, new UnsignedWordElement(47905),
 								ElementToChannelConverter.SCALE_FACTOR_MINUS_1), //
-						this.m(GoodWe.ChannelId.WBMS_VOLTAGE, new UnsignedWordElement(47906),
+						m(GoodWe.ChannelId.WBMS_VOLTAGE, new UnsignedWordElement(47906),
 								ElementToChannelConverter.SCALE_FACTOR_MINUS_1), //
-						this.m(GoodWe.ChannelId.WBMS_CURRENT, new UnsignedWordElement(47907),
+						m(GoodWe.ChannelId.WBMS_CURRENT, new UnsignedWordElement(47907),
 								ElementToChannelConverter.SCALE_FACTOR_MINUS_1), //
-						this.m(GoodWe.ChannelId.WBMS_SOC, new UnsignedWordElement(47908)), //
-						this.m(GoodWe.ChannelId.WBMS_SOH, new UnsignedWordElement(47909)), //
-						this.m(GoodWe.ChannelId.WBMS_TEMPERATURE, new SignedWordElement(47910),
+						m(GoodWe.ChannelId.WBMS_SOC, new UnsignedWordElement(47908)), //
+						m(GoodWe.ChannelId.WBMS_SOH, new UnsignedWordElement(47909)), //
+						m(GoodWe.ChannelId.WBMS_TEMPERATURE, new SignedWordElement(47910),
 								ElementToChannelConverter.SCALE_FACTOR_MINUS_1), //
 						/**
 						 * Warning Codes (table 8-8).
@@ -1273,7 +1273,7 @@ protected final ModbusProtocol defineModbusProtocol() throws OpenemsException {
 						 * <li>Bit 00: Charge Over-Voltage
 						 * </ul>
 						 */
-						this.m(GoodWe.ChannelId.WBMS_WARNING_CODE, new UnsignedDoublewordElement(47911)), //
+						m(GoodWe.ChannelId.WBMS_WARNING_CODE, new UnsignedDoublewordElement(47911)), //
 						/**
 						 * Alarm Codes (table 8-7).
 						 *
@@ -1297,7 +1297,7 @@ protected final ModbusProtocol defineModbusProtocol() throws OpenemsException {
 						 * <li>Bit 00: Charge Over-Voltage
 						 * </ul>
 						 */
-						this.m(GoodWe.ChannelId.WBMS_ALARM_CODE, new UnsignedDoublewordElement(47913)), //
+						m(GoodWe.ChannelId.WBMS_ALARM_CODE, new UnsignedDoublewordElement(47913)), //
 						/**
 						 * BMS Status
 						 *
@@ -1307,33 +1307,33 @@ protected final ModbusProtocol defineModbusProtocol() throws OpenemsException {
 						 * <li>Bit 0: Force Charge
 						 * </ul>
 						 */
-						this.m(GoodWe.ChannelId.WBMS_STATUS, new UnsignedWordElement(47915)), //
-						this.m(GoodWe.ChannelId.WBMS_DISABLE_TIMEOUT_DETECTION, new UnsignedWordElement(47916))), //
+						m(GoodWe.ChannelId.WBMS_STATUS, new UnsignedWordElement(47915)), //
+						m(GoodWe.ChannelId.WBMS_DISABLE_TIMEOUT_DETECTION, new UnsignedWordElement(47916))), //
 
 				new FC3ReadRegistersTask(47900, Priority.LOW, //
-						this.m(GoodWe.ChannelId.WBMS_VERSION, new UnsignedWordElement(47900)), //
-						this.m(GoodWe.ChannelId.WBMS_STRINGS, new UnsignedWordElement(47901)), //
-						this.m(GoodWe.ChannelId.WBMS_CHARGE_MAX_VOLTAGE, new UnsignedWordElement(47902),
+						m(GoodWe.ChannelId.WBMS_VERSION, new UnsignedWordElement(47900)), //
+						m(GoodWe.ChannelId.WBMS_STRINGS, new UnsignedWordElement(47901)), //
+						m(GoodWe.ChannelId.WBMS_CHARGE_MAX_VOLTAGE, new UnsignedWordElement(47902),
 								ElementToChannelConverter.SCALE_FACTOR_MINUS_1), //
-						this.m(GoodWe.ChannelId.WBMS_CHARGE_MAX_CURRENT, new UnsignedWordElement(47903),
+						m(GoodWe.ChannelId.WBMS_CHARGE_MAX_CURRENT, new UnsignedWordElement(47903),
 								ElementToChannelConverter.SCALE_FACTOR_MINUS_1), //
-						this.m(GoodWe.ChannelId.WBMS_DISCHARGE_MIN_VOLTAGE, new UnsignedWordElement(47904),
+						m(GoodWe.ChannelId.WBMS_DISCHARGE_MIN_VOLTAGE, new UnsignedWordElement(47904),
 								ElementToChannelConverter.SCALE_FACTOR_MINUS_1), //
-						this.m(GoodWe.ChannelId.WBMS_DISCHARGE_MAX_CURRENT, new UnsignedWordElement(47905),
+						m(GoodWe.ChannelId.WBMS_DISCHARGE_MAX_CURRENT, new UnsignedWordElement(47905),
 								ElementToChannelConverter.SCALE_FACTOR_MINUS_1), //
-						this.m(GoodWe.ChannelId.WBMS_VOLTAGE, new UnsignedWordElement(47906),
+						m(GoodWe.ChannelId.WBMS_VOLTAGE, new UnsignedWordElement(47906),
 								ElementToChannelConverter.SCALE_FACTOR_MINUS_1), //
-						this.m(GoodWe.ChannelId.WBMS_CURRENT, new UnsignedWordElement(47907)), //
-						this.m(GoodWe.ChannelId.WBMS_SOC, new UnsignedWordElement(47908)), //
-						this.m(GoodWe.ChannelId.WBMS_SOH, new UnsignedWordElement(47909)), //
-						this.m(GoodWe.ChannelId.WBMS_TEMPERATURE, new SignedWordElement(47910),
+						m(GoodWe.ChannelId.WBMS_CURRENT, new UnsignedWordElement(47907)), //
+						m(GoodWe.ChannelId.WBMS_SOC, new UnsignedWordElement(47908)), //
+						m(GoodWe.ChannelId.WBMS_SOH, new UnsignedWordElement(47909)), //
+						m(GoodWe.ChannelId.WBMS_TEMPERATURE, new SignedWordElement(47910),
 								ElementToChannelConverter.SCALE_FACTOR_MINUS_1), //
-						this.m(GoodWe.ChannelId.WBMS_WARNING_CODE, new UnsignedDoublewordElement(47911)), //
-						this.m(GoodWe.ChannelId.WBMS_ALARM_CODE, new UnsignedDoublewordElement(47913)), //
+						m(GoodWe.ChannelId.WBMS_WARNING_CODE, new UnsignedDoublewordElement(47911)), //
+						m(GoodWe.ChannelId.WBMS_ALARM_CODE, new UnsignedDoublewordElement(47913)), //
 						// TODO reset to individual states
 
-						this.m(GoodWe.ChannelId.WBMS_STATUS, new UnsignedWordElement(47915)), //
-						this.m(GoodWe.ChannelId.WBMS_DISABLE_TIMEOUT_DETECTION, new UnsignedWordElement(47916))) //
+						m(GoodWe.ChannelId.WBMS_STATUS, new UnsignedWordElement(47915)), //
+						m(GoodWe.ChannelId.WBMS_DISABLE_TIMEOUT_DETECTION, new UnsignedWordElement(47916))) //
 		);
 
 		// Handles different DSP versions
@@ -1360,10 +1360,10 @@ protected final ModbusProtocol defineModbusProtocol() throws OpenemsException {
 	private void handleDspVersion7(ModbusProtocol protocol) throws OpenemsException {
 		protocol.addTask(//
 				new FC3ReadRegistersTask(47519, Priority.LOW, //
-						this.m(GoodWe.ChannelId.WORK_WEEK_2_START_TIME, new UnsignedWordElement(47519)), //
-						this.m(GoodWe.ChannelId.WORK_WEEK_2_END_TIME, new UnsignedWordElement(47520)), //
-						this.m(GoodWe.ChannelId.WORK_WEEK_2_BAT_POWER_PERCENT, new UnsignedWordElement(47521)), //
-						this.m(new BitsWordElement(47522, this)//
+						m(GoodWe.ChannelId.WORK_WEEK_2_START_TIME, new UnsignedWordElement(47519)), //
+						m(GoodWe.ChannelId.WORK_WEEK_2_END_TIME, new UnsignedWordElement(47520)), //
+						m(GoodWe.ChannelId.WORK_WEEK_2_BAT_POWER_PERCENT, new UnsignedWordElement(47521)), //
+						m(new BitsWordElement(47522, this)//
 								.bit(0, GoodWe.ChannelId.WORK_WEEK_2_SUNDAY)//
 								.bit(1, GoodWe.ChannelId.WORK_WEEK_2_MONDAY)//
 								.bit(2, GoodWe.ChannelId.WORK_WEEK_2_TUESDAY)//
@@ -1373,10 +1373,10 @@ private void handleDspVersion7(ModbusProtocol protocol) throws OpenemsException
 								.bit(6, GoodWe.ChannelId.WORK_WEEK_2_SATURDAY)//
 								.bit(7, GoodWe.ChannelId.WORK_WEEK_2_NA)//
 								.bit(8, GoodWe.ChannelId.WORK_WEEK_2_ENABLED)), //
-						this.m(GoodWe.ChannelId.WORK_WEEK_3_START_TIME, new UnsignedWordElement(47523)), //
-						this.m(GoodWe.ChannelId.WORK_WEEK_3_END_TIME, new UnsignedWordElement(47524)), //
-						this.m(GoodWe.ChannelId.WORK_WEEK_3_BAT_POWER_PERCENT, new UnsignedWordElement(47525)), //
-						this.m(new BitsWordElement(47526, this)//
+						m(GoodWe.ChannelId.WORK_WEEK_3_START_TIME, new UnsignedWordElement(47523)), //
+						m(GoodWe.ChannelId.WORK_WEEK_3_END_TIME, new UnsignedWordElement(47524)), //
+						m(GoodWe.ChannelId.WORK_WEEK_3_BAT_POWER_PERCENT, new UnsignedWordElement(47525)), //
+						m(new BitsWordElement(47526, this)//
 								.bit(0, GoodWe.ChannelId.WORK_WEEK_3_SUNDAY)//
 								.bit(1, GoodWe.ChannelId.WORK_WEEK_3_MONDAY)//
 								.bit(2, GoodWe.ChannelId.WORK_WEEK_3_TUESDAY)//
@@ -1386,10 +1386,10 @@ private void handleDspVersion7(ModbusProtocol protocol) throws OpenemsException
 								.bit(6, GoodWe.ChannelId.WORK_WEEK_3_SATURDAY)//
 								.bit(7, GoodWe.ChannelId.WORK_WEEK_3_NA)//
 								.bit(8, GoodWe.ChannelId.WORK_WEEK_3_ENABLED)), //
-						this.m(GoodWe.ChannelId.WORK_WEEK_4_START_TIME, new UnsignedWordElement(47527)), //
-						this.m(GoodWe.ChannelId.WORK_WEEK_4_END_TIME, new UnsignedWordElement(47528)), //
-						this.m(GoodWe.ChannelId.WORK_WEEK_4_BMS_POWER_PERCENT, new UnsignedWordElement(47529)), //
-						this.m(new BitsWordElement(47530, this)//
+						m(GoodWe.ChannelId.WORK_WEEK_4_START_TIME, new UnsignedWordElement(47527)), //
+						m(GoodWe.ChannelId.WORK_WEEK_4_END_TIME, new UnsignedWordElement(47528)), //
+						m(GoodWe.ChannelId.WORK_WEEK_4_BMS_POWER_PERCENT, new UnsignedWordElement(47529)), //
+						m(new BitsWordElement(47530, this)//
 								.bit(0, GoodWe.ChannelId.WORK_WEEK_4_SUNDAY)//
 								.bit(1, GoodWe.ChannelId.WORK_WEEK_4_MONDAY)//
 								.bit(2, GoodWe.ChannelId.WORK_WEEK_4_TUESDAY)//
@@ -1399,32 +1399,32 @@ private void handleDspVersion7(ModbusProtocol protocol) throws OpenemsException
 								.bit(6, GoodWe.ChannelId.WORK_WEEK_4_SATURDAY)//
 								.bit(7, GoodWe.ChannelId.WORK_WEEK_4_NA)//
 								.bit(8, GoodWe.ChannelId.WORK_WEEK_4_ENABLED)), //
-						this.m(GoodWe.ChannelId.SOC_START_TO_FORCE_CHARGE, new UnsignedWordElement(47531)), //
-						this.m(GoodWe.ChannelId.SOC_STOP_TO_FORCE_CHARGE, new UnsignedWordElement(47532)), //
+						m(GoodWe.ChannelId.SOC_START_TO_FORCE_CHARGE, new UnsignedWordElement(47531)), //
+						m(GoodWe.ChannelId.SOC_STOP_TO_FORCE_CHARGE, new UnsignedWordElement(47532)), //
 						new DummyRegisterElement(47533, 47541), //
-						this.m(GoodWe.ChannelId.PEAK_SHAVING_POWER_LIMIT, new UnsignedWordElement(47542)), //
+						m(GoodWe.ChannelId.PEAK_SHAVING_POWER_LIMIT, new UnsignedWordElement(47542)), //
 						new DummyRegisterElement(47543), //
-						this.m(GoodWe.ChannelId.PEAK_SHAVING_SOC, new UnsignedWordElement(47544)), //
-						this.m(GoodWe.ChannelId.FAST_CHARGE_ENABLE, new UnsignedWordElement(47545)), // [0,1]
-						this.m(GoodWe.ChannelId.FAST_CHARGE_STOP_SOC, new UnsignedWordElement(47546))) // [0,100]
+						m(GoodWe.ChannelId.PEAK_SHAVING_SOC, new UnsignedWordElement(47544)), //
+						m(GoodWe.ChannelId.FAST_CHARGE_ENABLE, new UnsignedWordElement(47545)), // [0,1]
+						m(GoodWe.ChannelId.FAST_CHARGE_STOP_SOC, new UnsignedWordElement(47546))) // [0,100]
 		);
 
 		protocol.addTask(//
 				new FC16WriteRegistersTask(47519, //
-						this.m(GoodWe.ChannelId.WORK_WEEK_2_START_TIME, new UnsignedWordElement(47519)), //
-						this.m(GoodWe.ChannelId.WORK_WEEK_2_END_TIME, new UnsignedWordElement(47520)), //
-						this.m(GoodWe.ChannelId.WORK_WEEK_2_BAT_POWER_PERCENT, new SignedWordElement(47521)), //
-						this.m(GoodWe.ChannelId.WORK_WEEK_2, new UnsignedWordElement(47522)), //
+						m(GoodWe.ChannelId.WORK_WEEK_2_START_TIME, new UnsignedWordElement(47519)), //
+						m(GoodWe.ChannelId.WORK_WEEK_2_END_TIME, new UnsignedWordElement(47520)), //
+						m(GoodWe.ChannelId.WORK_WEEK_2_BAT_POWER_PERCENT, new SignedWordElement(47521)), //
+						m(GoodWe.ChannelId.WORK_WEEK_2, new UnsignedWordElement(47522)), //
 
-						this.m(GoodWe.ChannelId.WORK_WEEK_3_START_TIME, new UnsignedWordElement(47523)), //
-						this.m(GoodWe.ChannelId.WORK_WEEK_3_END_TIME, new UnsignedWordElement(47524)), //
-						this.m(GoodWe.ChannelId.WORK_WEEK_3_BAT_POWER_PERCENT, new SignedWordElement(47525)), //
-						this.m(GoodWe.ChannelId.WORK_WEEK_3, new UnsignedWordElement(47526)), //
+						m(GoodWe.ChannelId.WORK_WEEK_3_START_TIME, new UnsignedWordElement(47523)), //
+						m(GoodWe.ChannelId.WORK_WEEK_3_END_TIME, new UnsignedWordElement(47524)), //
+						m(GoodWe.ChannelId.WORK_WEEK_3_BAT_POWER_PERCENT, new SignedWordElement(47525)), //
+						m(GoodWe.ChannelId.WORK_WEEK_3, new UnsignedWordElement(47526)), //
 
-						this.m(GoodWe.ChannelId.WORK_WEEK_4_START_TIME, new UnsignedWordElement(47527)), //
-						this.m(GoodWe.ChannelId.WORK_WEEK_4_END_TIME, new UnsignedWordElement(47528)), //
-						this.m(GoodWe.ChannelId.WORK_WEEK_4_BMS_POWER_PERCENT, new SignedWordElement(47529)), //
-						this.m(GoodWe.ChannelId.WORK_WEEK_4, new UnsignedWordElement(47530)), //
+						m(GoodWe.ChannelId.WORK_WEEK_4_START_TIME, new UnsignedWordElement(47527)), //
+						m(GoodWe.ChannelId.WORK_WEEK_4_END_TIME, new UnsignedWordElement(47528)), //
+						m(GoodWe.ChannelId.WORK_WEEK_4_BMS_POWER_PERCENT, new SignedWordElement(47529)), //
+						m(GoodWe.ChannelId.WORK_WEEK_4, new UnsignedWordElement(47530)), //
 
 						// To set the SOC level to start/stop battery force charge.(this is not the
 						// command from BMS, but the protection on inverter side. Eg. StartchgSOC
@@ -1436,267 +1436,267 @@ private void handleDspVersion7(ModbusProtocol protocol) throws OpenemsException
 						// 5% SOC. ) Note: the default setting is 5% SOC to start and 10% to stop.
 						// force
 						// charge power is 1000W from PV or Grid as well
-						this.m(GoodWe.ChannelId.SOC_START_TO_FORCE_CHARGE, new UnsignedWordElement(47531),
+						m(GoodWe.ChannelId.SOC_START_TO_FORCE_CHARGE, new UnsignedWordElement(47531),
 								ElementToChannelConverter.SCALE_FACTOR_MINUS_1), //
-						this.m(GoodWe.ChannelId.SOC_STOP_TO_FORCE_CHARGE, new UnsignedWordElement(47532),
+						m(GoodWe.ChannelId.SOC_STOP_TO_FORCE_CHARGE, new UnsignedWordElement(47532),
 								ElementToChannelConverter.SCALE_FACTOR_MINUS_1), //
 						// to clear all economical mode settings (47515-47530) enter self Use Mode
-						this.m(GoodWe.ChannelId.CLEAR_ALL_ECONOMIC_MODE, new UnsignedWordElement(47533)), //
+						m(GoodWe.ChannelId.CLEAR_ALL_ECONOMIC_MODE, new UnsignedWordElement(47533)), //
 						new DummyRegisterElement(47534, 47538), //
-						this.m(GoodWe.ChannelId.WIFI_RESET, new UnsignedWordElement(47539)), //
+						m(GoodWe.ChannelId.WIFI_RESET, new UnsignedWordElement(47539)), //
 						new DummyRegisterElement(47540), //
-						this.m(GoodWe.ChannelId.WIFI_RELOAD, new UnsignedWordElement(47541)), //
+						m(GoodWe.ChannelId.WIFI_RELOAD, new UnsignedWordElement(47541)), //
 						// to set the threshold of importing power, where peak-shaving acts. Eg. If
 						// set
 						// peak-shaving power as 20kW, then battery will only discharge when
 						// imported
 						// power from grid exceed 20kW to make sure the importing power keeps below
 						// 20kW
-						this.m(GoodWe.ChannelId.PEAK_SHAVING_POWER_LIMIT, new UnsignedDoublewordElement(47542)), //
-						this.m(GoodWe.ChannelId.PEAK_SHAVING_SOC, new UnsignedWordElement(47544)), //
+						m(GoodWe.ChannelId.PEAK_SHAVING_POWER_LIMIT, new UnsignedDoublewordElement(47542)), //
+						m(GoodWe.ChannelId.PEAK_SHAVING_SOC, new UnsignedWordElement(47544)), //
 						// 0: Disable 1:Enable
-						this.m(GoodWe.ChannelId.FAST_CHARGE_ENABLE, new UnsignedWordElement(47545)), //
-						this.m(GoodWe.ChannelId.FAST_CHARGE_STOP_SOC, new UnsignedWordElement(47546))) //
+						m(GoodWe.ChannelId.FAST_CHARGE_ENABLE, new UnsignedWordElement(47545)), //
+						m(GoodWe.ChannelId.FAST_CHARGE_STOP_SOC, new UnsignedWordElement(47546))) //
 		);
 
 		protocol.addTask(//
 				// Economic mode setting for ARM version => 18
 				new FC3ReadRegistersTask(47547, Priority.LOW, //
-						this.m(GoodWe.ChannelId.WORK_WEEK_1_START_TIME_ECO_MODE_FOR_ARM_18_AND_GREATER,
+						m(GoodWe.ChannelId.WORK_WEEK_1_START_TIME_ECO_MODE_FOR_ARM_18_AND_GREATER,
 								new UnsignedWordElement(47547)), //
-						this.m(GoodWe.ChannelId.WORK_WEEK_1_END_TIME_ECO_MODE_FOR_ARM_18_AND_GREATER,
+						m(GoodWe.ChannelId.WORK_WEEK_1_END_TIME_ECO_MODE_FOR_ARM_18_AND_GREATER,
 								new UnsignedWordElement(47548)), //
-						this.m(GoodWe.ChannelId.WORK_WEEK_1_ECO_MODE_FOR_ARM_18_AND_GREATER,
+						m(GoodWe.ChannelId.WORK_WEEK_1_ECO_MODE_FOR_ARM_18_AND_GREATER,
 								new UnsignedWordElement(47549)), //
-						this.m(GoodWe.ChannelId.WORK_WEEK_1_PARAMETER1_1_ECO_MODE_FOR_ARM_18_AND_GREATER,
+						m(GoodWe.ChannelId.WORK_WEEK_1_PARAMETER1_1_ECO_MODE_FOR_ARM_18_AND_GREATER,
 								new UnsignedWordElement(47550)), //
-						this.m(GoodWe.ChannelId.WORK_WEEK_1_PARAMETER1_2_ECO_MODE_FOR_ARM_18_AND_GREATER,
+						m(GoodWe.ChannelId.WORK_WEEK_1_PARAMETER1_2_ECO_MODE_FOR_ARM_18_AND_GREATER,
 								new UnsignedWordElement(47551)), //
-						this.m(GoodWe.ChannelId.WORK_WEEK_1_PARAMETER1_3_ECO_MODE_FOR_ARM_18_AND_GREATER,
+						m(GoodWe.ChannelId.WORK_WEEK_1_PARAMETER1_3_ECO_MODE_FOR_ARM_18_AND_GREATER,
 								new UnsignedWordElement(47552)), //
 
-						this.m(GoodWe.ChannelId.WORK_WEEK_2_START_TIME_ECO_MODE_FOR_ARM_18_AND_GREATER,
+						m(GoodWe.ChannelId.WORK_WEEK_2_START_TIME_ECO_MODE_FOR_ARM_18_AND_GREATER,
 								new UnsignedWordElement(47553)), //
-						this.m(GoodWe.ChannelId.WORK_WEEK_2_END_TIME_ECO_MODE_FOR_ARM_18_AND_GREATER,
+						m(GoodWe.ChannelId.WORK_WEEK_2_END_TIME_ECO_MODE_FOR_ARM_18_AND_GREATER,
 								new UnsignedWordElement(47554)), //
-						this.m(GoodWe.ChannelId.WORK_WEEK_2_ECO_MODE_FOR_ARM_18_AND_GREATER,
+						m(GoodWe.ChannelId.WORK_WEEK_2_ECO_MODE_FOR_ARM_18_AND_GREATER,
 								new UnsignedWordElement(47555)), //
-						this.m(GoodWe.ChannelId.WORK_WEEK_2_PARAMETER2_1_ECO_MODE_FOR_ARM_18_AND_GREATER,
+						m(GoodWe.ChannelId.WORK_WEEK_2_PARAMETER2_1_ECO_MODE_FOR_ARM_18_AND_GREATER,
 								new UnsignedWordElement(47556)), //
-						this.m(GoodWe.ChannelId.WORK_WEEK_2_PARAMETER2_2_ECO_MODE_FOR_ARM_18_AND_GREATER,
+						m(GoodWe.ChannelId.WORK_WEEK_2_PARAMETER2_2_ECO_MODE_FOR_ARM_18_AND_GREATER,
 								new UnsignedWordElement(47557)), //
-						this.m(GoodWe.ChannelId.WORK_WEEK_2_PARAMETER2_3_ECO_MODE_FOR_ARM_18_AND_GREATER,
+						m(GoodWe.ChannelId.WORK_WEEK_2_PARAMETER2_3_ECO_MODE_FOR_ARM_18_AND_GREATER,
 								new UnsignedWordElement(47558)), //
 
-						this.m(GoodWe.ChannelId.WORK_WEEK_3_START_TIME_ECO_MODE_FOR_ARM_18_AND_GREATER,
+						m(GoodWe.ChannelId.WORK_WEEK_3_START_TIME_ECO_MODE_FOR_ARM_18_AND_GREATER,
 								new UnsignedWordElement(47559)), //
-						this.m(GoodWe.ChannelId.WORK_WEEK_3_END_TIME_ECO_MODE_FOR_ARM_18_AND_GREATER,
+						m(GoodWe.ChannelId.WORK_WEEK_3_END_TIME_ECO_MODE_FOR_ARM_18_AND_GREATER,
 								new UnsignedWordElement(47560)), //
-						this.m(GoodWe.ChannelId.WORK_WEEK_3_ECO_MODE_FOR_ARM_18_AND_GREATER,
+						m(GoodWe.ChannelId.WORK_WEEK_3_ECO_MODE_FOR_ARM_18_AND_GREATER,
 								new UnsignedWordElement(47561)), //
-						this.m(GoodWe.ChannelId.WORK_WEEK_3_PARAMETER3_1_ECO_MODE_FOR_ARM_18_AND_GREATER,
+						m(GoodWe.ChannelId.WORK_WEEK_3_PARAMETER3_1_ECO_MODE_FOR_ARM_18_AND_GREATER,
 								new UnsignedWordElement(47562)), //
-						this.m(GoodWe.ChannelId.WORK_WEEK_3_PARAMETER3_2_ECO_MODE_FOR_ARM_18_AND_GREATER,
+						m(GoodWe.ChannelId.WORK_WEEK_3_PARAMETER3_2_ECO_MODE_FOR_ARM_18_AND_GREATER,
 								new UnsignedWordElement(47563)), //
-						this.m(GoodWe.ChannelId.WORK_WEEK_3_PARAMETER3_3_ECO_MODE_FOR_ARM_18_AND_GREATER,
+						m(GoodWe.ChannelId.WORK_WEEK_3_PARAMETER3_3_ECO_MODE_FOR_ARM_18_AND_GREATER,
 								new UnsignedWordElement(47564)), //
 
-						this.m(GoodWe.ChannelId.WORK_WEEK_4_START_TIME_ECO_MODE_FOR_ARM_18_AND_GREATER,
+						m(GoodWe.ChannelId.WORK_WEEK_4_START_TIME_ECO_MODE_FOR_ARM_18_AND_GREATER,
 								new UnsignedWordElement(47565)), //
-						this.m(GoodWe.ChannelId.WORK_WEEK_4_END_TIME_ECO_MODE_FOR_ARM_18_AND_GREATER,
+						m(GoodWe.ChannelId.WORK_WEEK_4_END_TIME_ECO_MODE_FOR_ARM_18_AND_GREATER,
 								new UnsignedWordElement(47566)), //
-						this.m(GoodWe.ChannelId.WORK_WEEK_4_ECO_MODE_FOR_ARM_18_AND_GREATER,
+						m(GoodWe.ChannelId.WORK_WEEK_4_ECO_MODE_FOR_ARM_18_AND_GREATER,
 								new UnsignedWordElement(47567)), //
-						this.m(GoodWe.ChannelId.WORK_WEEK_4_PARAMETER4_1_ECO_MODE_FOR_ARM_18_AND_GREATER,
+						m(GoodWe.ChannelId.WORK_WEEK_4_PARAMETER4_1_ECO_MODE_FOR_ARM_18_AND_GREATER,
 								new UnsignedWordElement(47568)), //
-						this.m(GoodWe.ChannelId.WORK_WEEK_4_PARAMETER4_2_ECO_MODE_FOR_ARM_18_AND_GREATER,
+						m(GoodWe.ChannelId.WORK_WEEK_4_PARAMETER4_2_ECO_MODE_FOR_ARM_18_AND_GREATER,
 								new UnsignedWordElement(47569)), //
-						this.m(GoodWe.ChannelId.WORK_WEEK_4_PARAMETER4_3_ECO_MODE_FOR_ARM_18_AND_GREATER,
+						m(GoodWe.ChannelId.WORK_WEEK_4_PARAMETER4_3_ECO_MODE_FOR_ARM_18_AND_GREATER,
 								new UnsignedWordElement(47570)), //
 
-						this.m(GoodWe.ChannelId.WORK_WEEK_5_START_TIME_ECO_MODE_FOR_ARM_18_AND_GREATER,
+						m(GoodWe.ChannelId.WORK_WEEK_5_START_TIME_ECO_MODE_FOR_ARM_18_AND_GREATER,
 								new UnsignedWordElement(47571)), //
-						this.m(GoodWe.ChannelId.WORK_WEEK_5_END_TIME_ECO_MODE_FOR_ARM_18_AND_GREATER,
+						m(GoodWe.ChannelId.WORK_WEEK_5_END_TIME_ECO_MODE_FOR_ARM_18_AND_GREATER,
 								new UnsignedWordElement(47572)), //
-						this.m(GoodWe.ChannelId.WORK_WEEK_5_ECO_MODE_FOR_ARM_18_AND_GREATER,
+						m(GoodWe.ChannelId.WORK_WEEK_5_ECO_MODE_FOR_ARM_18_AND_GREATER,
 								new UnsignedWordElement(47573)), //
-						this.m(GoodWe.ChannelId.WORK_WEEK_5_PARAMETER5_1_ECO_MODE_FOR_ARM_18_AND_GREATER,
+						m(GoodWe.ChannelId.WORK_WEEK_5_PARAMETER5_1_ECO_MODE_FOR_ARM_18_AND_GREATER,
 								new UnsignedWordElement(47574)), //
-						this.m(GoodWe.ChannelId.WORK_WEEK_5_PARAMETER5_2_ECO_MODE_FOR_ARM_18_AND_GREATER,
+						m(GoodWe.ChannelId.WORK_WEEK_5_PARAMETER5_2_ECO_MODE_FOR_ARM_18_AND_GREATER,
 								new UnsignedWordElement(47575)), //
-						this.m(GoodWe.ChannelId.WORK_WEEK_5_PARAMETER5_3_ECO_MODE_FOR_ARM_18_AND_GREATER,
+						m(GoodWe.ChannelId.WORK_WEEK_5_PARAMETER5_3_ECO_MODE_FOR_ARM_18_AND_GREATER,
 								new UnsignedWordElement(47576)), //
 
-						this.m(GoodWe.ChannelId.WORK_WEEK_6_START_TIME_ECO_MODE_FOR_ARM_18_AND_GREATER,
+						m(GoodWe.ChannelId.WORK_WEEK_6_START_TIME_ECO_MODE_FOR_ARM_18_AND_GREATER,
 								new UnsignedWordElement(47577)), //
-						this.m(GoodWe.ChannelId.WORK_WEEK_6_END_TIME_ECO_MODE_FOR_ARM_18_AND_GREATER,
+						m(GoodWe.ChannelId.WORK_WEEK_6_END_TIME_ECO_MODE_FOR_ARM_18_AND_GREATER,
 								new UnsignedWordElement(47578)), //
-						this.m(GoodWe.ChannelId.WORK_WEEK_6_ECO_MODE_FOR_ARM_18_AND_GREATER,
+						m(GoodWe.ChannelId.WORK_WEEK_6_ECO_MODE_FOR_ARM_18_AND_GREATER,
 								new UnsignedWordElement(47579)), //
-						this.m(GoodWe.ChannelId.WORK_WEEK_6_PARAMETER6_1_ECO_MODE_FOR_ARM_18_AND_GREATER,
+						m(GoodWe.ChannelId.WORK_WEEK_6_PARAMETER6_1_ECO_MODE_FOR_ARM_18_AND_GREATER,
 								new UnsignedWordElement(47580)), //
-						this.m(GoodWe.ChannelId.WORK_WEEK_6_PARAMETER6_2_ECO_MODE_FOR_ARM_18_AND_GREATER,
+						m(GoodWe.ChannelId.WORK_WEEK_6_PARAMETER6_2_ECO_MODE_FOR_ARM_18_AND_GREATER,
 								new UnsignedWordElement(47581)), //
-						this.m(GoodWe.ChannelId.WORK_WEEK_6_PARAMETER6_3_ECO_MODE_FOR_ARM_18_AND_GREATER,
+						m(GoodWe.ChannelId.WORK_WEEK_6_PARAMETER6_3_ECO_MODE_FOR_ARM_18_AND_GREATER,
 								new UnsignedWordElement(47582)), //
 
-						this.m(GoodWe.ChannelId.WORK_WEEK_7_START_TIME_ECO_MODE_FOR_ARM_18_AND_GREATER,
+						m(GoodWe.ChannelId.WORK_WEEK_7_START_TIME_ECO_MODE_FOR_ARM_18_AND_GREATER,
 								new UnsignedWordElement(47583)), //
-						this.m(GoodWe.ChannelId.WORK_WEEK_7_END_TIME_ECO_MODE_FOR_ARM_18_AND_GREATER,
+						m(GoodWe.ChannelId.WORK_WEEK_7_END_TIME_ECO_MODE_FOR_ARM_18_AND_GREATER,
 								new UnsignedWordElement(47584)), //
-						this.m(GoodWe.ChannelId.WORK_WEEK_7_ECO_MODE_FOR_ARM_18_AND_GREATER,
+						m(GoodWe.ChannelId.WORK_WEEK_7_ECO_MODE_FOR_ARM_18_AND_GREATER,
 								new UnsignedWordElement(47585)), //
-						this.m(GoodWe.ChannelId.WORK_WEEK_7_PARAMETER7_1_ECO_MODE_FOR_ARM_18_AND_GREATER,
+						m(GoodWe.ChannelId.WORK_WEEK_7_PARAMETER7_1_ECO_MODE_FOR_ARM_18_AND_GREATER,
 								new UnsignedWordElement(47586)), //
-						this.m(GoodWe.ChannelId.WORK_WEEK_7_PARAMETER7_2_ECO_MODE_FOR_ARM_18_AND_GREATER,
+						m(GoodWe.ChannelId.WORK_WEEK_7_PARAMETER7_2_ECO_MODE_FOR_ARM_18_AND_GREATER,
 								new UnsignedWordElement(47587)), //
-						this.m(GoodWe.ChannelId.WORK_WEEK_7_PARAMETER7_3_ECO_MODE_FOR_ARM_18_AND_GREATER,
+						m(GoodWe.ChannelId.WORK_WEEK_7_PARAMETER7_3_ECO_MODE_FOR_ARM_18_AND_GREATER,
 								new UnsignedWordElement(47588)), //
 
-						this.m(GoodWe.ChannelId.WORK_WEEK_8_START_TIME_ECO_MODE_FOR_ARM_18_AND_GREATER,
+						m(GoodWe.ChannelId.WORK_WEEK_8_START_TIME_ECO_MODE_FOR_ARM_18_AND_GREATER,
 								new UnsignedWordElement(47589)), //
-						this.m(GoodWe.ChannelId.WORK_WEEK_8_END_TIME_ECO_MODE_FOR_ARM_18_AND_GREATER,
+						m(GoodWe.ChannelId.WORK_WEEK_8_END_TIME_ECO_MODE_FOR_ARM_18_AND_GREATER,
 								new UnsignedWordElement(47590)), //
-						this.m(GoodWe.ChannelId.WORK_WEEK_8_ECO_MODE_FOR_ARM_18_AND_GREATER,
+						m(GoodWe.ChannelId.WORK_WEEK_8_ECO_MODE_FOR_ARM_18_AND_GREATER,
 								new UnsignedWordElement(47591)), //
-						this.m(GoodWe.ChannelId.WORK_WEEK_8_PARAMETER8_1_ECO_MODE_FOR_ARM_18_AND_GREATER,
+						m(GoodWe.ChannelId.WORK_WEEK_8_PARAMETER8_1_ECO_MODE_FOR_ARM_18_AND_GREATER,
 								new UnsignedWordElement(47592)), //
-						this.m(GoodWe.ChannelId.WORK_WEEK_8_PARAMETER8_2_ECO_MODE_FOR_ARM_18_AND_GREATER,
+						m(GoodWe.ChannelId.WORK_WEEK_8_PARAMETER8_2_ECO_MODE_FOR_ARM_18_AND_GREATER,
 								new UnsignedWordElement(47593)), //
-						this.m(GoodWe.ChannelId.WORK_WEEK_8_PARAMETER8_3_ECO_MODE_FOR_ARM_18_AND_GREATER,
+						m(GoodWe.ChannelId.WORK_WEEK_8_PARAMETER8_3_ECO_MODE_FOR_ARM_18_AND_GREATER,
 								new UnsignedWordElement(47594)), //
 						// 0,Disable 1,switching mode 2,Time manage mode
 						// Only for inverter with ARM version equal or greater 18 To select Load
 						// control
 						// mode
-						this.m(GoodWe.ChannelId.LOAD_REGULATION_INDEX, new UnsignedWordElement(47595)), //
-						this.m(GoodWe.ChannelId.LOAD_SWITCH_STATUS, new UnsignedWordElement(47596)), //
+						m(GoodWe.ChannelId.LOAD_REGULATION_INDEX, new UnsignedWordElement(47595)), //
+						m(GoodWe.ChannelId.LOAD_SWITCH_STATUS, new UnsignedWordElement(47596)), //
 						// For load control function, if the controlled load on Backup side, use
 						// this to
 						// switch the load off when battery reaches the SOC set
-						this.m(GoodWe.ChannelId.BACKUP_SWITCH_SOC_MIN, new UnsignedWordElement(47597)), //
+						m(GoodWe.ChannelId.BACKUP_SWITCH_SOC_MIN, new UnsignedWordElement(47597)), //
 						new DummyRegisterElement(47598), //
-						this.m(GoodWe.ChannelId.HARDWARE_FEED_POWER, new UnsignedWordElement(47599))) //
+						m(GoodWe.ChannelId.HARDWARE_FEED_POWER, new UnsignedWordElement(47599))) //
 		);
 
 		protocol.addTask(//
 				new FC16WriteRegistersTask(47547, //
 						// Economic mode setting for ARM version => 18
-						this.m(GoodWe.ChannelId.WORK_WEEK_1_START_TIME_ECO_MODE_FOR_ARM_18_AND_GREATER,
+						m(GoodWe.ChannelId.WORK_WEEK_1_START_TIME_ECO_MODE_FOR_ARM_18_AND_GREATER,
 								new UnsignedWordElement(47547)), //
-						this.m(GoodWe.ChannelId.WORK_WEEK_1_END_TIME_ECO_MODE_FOR_ARM_18_AND_GREATER,
+						m(GoodWe.ChannelId.WORK_WEEK_1_END_TIME_ECO_MODE_FOR_ARM_18_AND_GREATER,
 								new UnsignedWordElement(47548)), //
-						this.m(GoodWe.ChannelId.WORK_WEEK_1_ECO_MODE_FOR_ARM_18_AND_GREATER,
+						m(GoodWe.ChannelId.WORK_WEEK_1_ECO_MODE_FOR_ARM_18_AND_GREATER,
 								new UnsignedWordElement(47549)), //
-						this.m(GoodWe.ChannelId.WORK_WEEK_1_PARAMETER1_1_ECO_MODE_FOR_ARM_18_AND_GREATER,
+						m(GoodWe.ChannelId.WORK_WEEK_1_PARAMETER1_1_ECO_MODE_FOR_ARM_18_AND_GREATER,
 								new UnsignedWordElement(47550)), //
-						this.m(GoodWe.ChannelId.WORK_WEEK_1_PARAMETER1_2_ECO_MODE_FOR_ARM_18_AND_GREATER,
+						m(GoodWe.ChannelId.WORK_WEEK_1_PARAMETER1_2_ECO_MODE_FOR_ARM_18_AND_GREATER,
 								new UnsignedWordElement(47551)), //
-						this.m(GoodWe.ChannelId.WORK_WEEK_1_PARAMETER1_3_ECO_MODE_FOR_ARM_18_AND_GREATER,
+						m(GoodWe.ChannelId.WORK_WEEK_1_PARAMETER1_3_ECO_MODE_FOR_ARM_18_AND_GREATER,
 								new UnsignedWordElement(47552)), //
 
-						this.m(GoodWe.ChannelId.WORK_WEEK_2_START_TIME_ECO_MODE_FOR_ARM_18_AND_GREATER,
+						m(GoodWe.ChannelId.WORK_WEEK_2_START_TIME_ECO_MODE_FOR_ARM_18_AND_GREATER,
 								new UnsignedWordElement(47553)), //
-						this.m(GoodWe.ChannelId.WORK_WEEK_2_END_TIME_ECO_MODE_FOR_ARM_18_AND_GREATER,
+						m(GoodWe.ChannelId.WORK_WEEK_2_END_TIME_ECO_MODE_FOR_ARM_18_AND_GREATER,
 								new UnsignedWordElement(47554)), //
-						this.m(GoodWe.ChannelId.WORK_WEEK_2_ECO_MODE_FOR_ARM_18_AND_GREATER,
+						m(GoodWe.ChannelId.WORK_WEEK_2_ECO_MODE_FOR_ARM_18_AND_GREATER,
 								new UnsignedWordElement(47555)), //
-						this.m(GoodWe.ChannelId.WORK_WEEK_2_PARAMETER2_1_ECO_MODE_FOR_ARM_18_AND_GREATER,
+						m(GoodWe.ChannelId.WORK_WEEK_2_PARAMETER2_1_ECO_MODE_FOR_ARM_18_AND_GREATER,
 								new UnsignedWordElement(47556)), //
-						this.m(GoodWe.ChannelId.WORK_WEEK_2_PARAMETER2_2_ECO_MODE_FOR_ARM_18_AND_GREATER,
+						m(GoodWe.ChannelId.WORK_WEEK_2_PARAMETER2_2_ECO_MODE_FOR_ARM_18_AND_GREATER,
 								new UnsignedWordElement(47557)), //
-						this.m(GoodWe.ChannelId.WORK_WEEK_2_PARAMETER2_3_ECO_MODE_FOR_ARM_18_AND_GREATER,
+						m(GoodWe.ChannelId.WORK_WEEK_2_PARAMETER2_3_ECO_MODE_FOR_ARM_18_AND_GREATER,
 								new UnsignedWordElement(47558)), //
 
-						this.m(GoodWe.ChannelId.WORK_WEEK_3_START_TIME_ECO_MODE_FOR_ARM_18_AND_GREATER,
+						m(GoodWe.ChannelId.WORK_WEEK_3_START_TIME_ECO_MODE_FOR_ARM_18_AND_GREATER,
 								new UnsignedWordElement(47559)), //
-						this.m(GoodWe.ChannelId.WORK_WEEK_3_END_TIME_ECO_MODE_FOR_ARM_18_AND_GREATER,
+						m(GoodWe.ChannelId.WORK_WEEK_3_END_TIME_ECO_MODE_FOR_ARM_18_AND_GREATER,
 								new UnsignedWordElement(47560)), //
-						this.m(GoodWe.ChannelId.WORK_WEEK_3_ECO_MODE_FOR_ARM_18_AND_GREATER,
+						m(GoodWe.ChannelId.WORK_WEEK_3_ECO_MODE_FOR_ARM_18_AND_GREATER,
 								new UnsignedWordElement(47561)), //
-						this.m(GoodWe.ChannelId.WORK_WEEK_3_PARAMETER3_1_ECO_MODE_FOR_ARM_18_AND_GREATER,
+						m(GoodWe.ChannelId.WORK_WEEK_3_PARAMETER3_1_ECO_MODE_FOR_ARM_18_AND_GREATER,
 								new UnsignedWordElement(47562)), //
-						this.m(GoodWe.ChannelId.WORK_WEEK_3_PARAMETER3_2_ECO_MODE_FOR_ARM_18_AND_GREATER,
+						m(GoodWe.ChannelId.WORK_WEEK_3_PARAMETER3_2_ECO_MODE_FOR_ARM_18_AND_GREATER,
 								new UnsignedWordElement(47563)), //
-						this.m(GoodWe.ChannelId.WORK_WEEK_3_PARAMETER3_3_ECO_MODE_FOR_ARM_18_AND_GREATER,
+						m(GoodWe.ChannelId.WORK_WEEK_3_PARAMETER3_3_ECO_MODE_FOR_ARM_18_AND_GREATER,
 								new UnsignedWordElement(47564)), //
 
-						this.m(GoodWe.ChannelId.WORK_WEEK_4_START_TIME_ECO_MODE_FOR_ARM_18_AND_GREATER,
+						m(GoodWe.ChannelId.WORK_WEEK_4_START_TIME_ECO_MODE_FOR_ARM_18_AND_GREATER,
 								new UnsignedWordElement(47565)), //
-						this.m(GoodWe.ChannelId.WORK_WEEK_4_END_TIME_ECO_MODE_FOR_ARM_18_AND_GREATER,
+						m(GoodWe.ChannelId.WORK_WEEK_4_END_TIME_ECO_MODE_FOR_ARM_18_AND_GREATER,
 								new UnsignedWordElement(47566)), //
-						this.m(GoodWe.ChannelId.WORK_WEEK_4_ECO_MODE_FOR_ARM_18_AND_GREATER,
+						m(GoodWe.ChannelId.WORK_WEEK_4_ECO_MODE_FOR_ARM_18_AND_GREATER,
 								new UnsignedWordElement(47567)), //
-						this.m(GoodWe.ChannelId.WORK_WEEK_4_PARAMETER4_1_ECO_MODE_FOR_ARM_18_AND_GREATER,
+						m(GoodWe.ChannelId.WORK_WEEK_4_PARAMETER4_1_ECO_MODE_FOR_ARM_18_AND_GREATER,
 								new UnsignedWordElement(47568)), //
-						this.m(GoodWe.ChannelId.WORK_WEEK_4_PARAMETER4_2_ECO_MODE_FOR_ARM_18_AND_GREATER,
+						m(GoodWe.ChannelId.WORK_WEEK_4_PARAMETER4_2_ECO_MODE_FOR_ARM_18_AND_GREATER,
 								new UnsignedWordElement(47569)), //
-						this.m(GoodWe.ChannelId.WORK_WEEK_4_PARAMETER4_3_ECO_MODE_FOR_ARM_18_AND_GREATER,
+						m(GoodWe.ChannelId.WORK_WEEK_4_PARAMETER4_3_ECO_MODE_FOR_ARM_18_AND_GREATER,
 								new UnsignedWordElement(47570)), //
 
-						this.m(GoodWe.ChannelId.WORK_WEEK_5_START_TIME_ECO_MODE_FOR_ARM_18_AND_GREATER,
+						m(GoodWe.ChannelId.WORK_WEEK_5_START_TIME_ECO_MODE_FOR_ARM_18_AND_GREATER,
 								new UnsignedWordElement(47571)), //
-						this.m(GoodWe.ChannelId.WORK_WEEK_5_END_TIME_ECO_MODE_FOR_ARM_18_AND_GREATER,
+						m(GoodWe.ChannelId.WORK_WEEK_5_END_TIME_ECO_MODE_FOR_ARM_18_AND_GREATER,
 								new UnsignedWordElement(47572)), //
-						this.m(GoodWe.ChannelId.WORK_WEEK_5_ECO_MODE_FOR_ARM_18_AND_GREATER,
+						m(GoodWe.ChannelId.WORK_WEEK_5_ECO_MODE_FOR_ARM_18_AND_GREATER,
 								new UnsignedWordElement(47573)), //
-						this.m(GoodWe.ChannelId.WORK_WEEK_5_PARAMETER5_1_ECO_MODE_FOR_ARM_18_AND_GREATER,
+						m(GoodWe.ChannelId.WORK_WEEK_5_PARAMETER5_1_ECO_MODE_FOR_ARM_18_AND_GREATER,
 								new UnsignedWordElement(47574)), //
-						this.m(GoodWe.ChannelId.WORK_WEEK_5_PARAMETER5_2_ECO_MODE_FOR_ARM_18_AND_GREATER,
+						m(GoodWe.ChannelId.WORK_WEEK_5_PARAMETER5_2_ECO_MODE_FOR_ARM_18_AND_GREATER,
 								new UnsignedWordElement(47575)), //
-						this.m(GoodWe.ChannelId.WORK_WEEK_5_PARAMETER5_3_ECO_MODE_FOR_ARM_18_AND_GREATER,
+						m(GoodWe.ChannelId.WORK_WEEK_5_PARAMETER5_3_ECO_MODE_FOR_ARM_18_AND_GREATER,
 								new UnsignedWordElement(47576)), //
 
-						this.m(GoodWe.ChannelId.WORK_WEEK_6_START_TIME_ECO_MODE_FOR_ARM_18_AND_GREATER,
+						m(GoodWe.ChannelId.WORK_WEEK_6_START_TIME_ECO_MODE_FOR_ARM_18_AND_GREATER,
 								new UnsignedWordElement(47577)), //
-						this.m(GoodWe.ChannelId.WORK_WEEK_6_END_TIME_ECO_MODE_FOR_ARM_18_AND_GREATER,
+						m(GoodWe.ChannelId.WORK_WEEK_6_END_TIME_ECO_MODE_FOR_ARM_18_AND_GREATER,
 								new UnsignedWordElement(47578)), //
-						this.m(GoodWe.ChannelId.WORK_WEEK_6_ECO_MODE_FOR_ARM_18_AND_GREATER,
+						m(GoodWe.ChannelId.WORK_WEEK_6_ECO_MODE_FOR_ARM_18_AND_GREATER,
 								new UnsignedWordElement(47579)), //
-						this.m(GoodWe.ChannelId.WORK_WEEK_6_PARAMETER6_1_ECO_MODE_FOR_ARM_18_AND_GREATER,
+						m(GoodWe.ChannelId.WORK_WEEK_6_PARAMETER6_1_ECO_MODE_FOR_ARM_18_AND_GREATER,
 								new UnsignedWordElement(47580)), //
-						this.m(GoodWe.ChannelId.WORK_WEEK_6_PARAMETER6_2_ECO_MODE_FOR_ARM_18_AND_GREATER,
+						m(GoodWe.ChannelId.WORK_WEEK_6_PARAMETER6_2_ECO_MODE_FOR_ARM_18_AND_GREATER,
 								new UnsignedWordElement(47581)), //
-						this.m(GoodWe.ChannelId.WORK_WEEK_6_PARAMETER6_3_ECO_MODE_FOR_ARM_18_AND_GREATER,
+						m(GoodWe.ChannelId.WORK_WEEK_6_PARAMETER6_3_ECO_MODE_FOR_ARM_18_AND_GREATER,
 								new UnsignedWordElement(47582)), //
 
-						this.m(GoodWe.ChannelId.WORK_WEEK_7_START_TIME_ECO_MODE_FOR_ARM_18_AND_GREATER,
+						m(GoodWe.ChannelId.WORK_WEEK_7_START_TIME_ECO_MODE_FOR_ARM_18_AND_GREATER,
 								new UnsignedWordElement(47583)), //
-						this.m(GoodWe.ChannelId.WORK_WEEK_7_END_TIME_ECO_MODE_FOR_ARM_18_AND_GREATER,
+						m(GoodWe.ChannelId.WORK_WEEK_7_END_TIME_ECO_MODE_FOR_ARM_18_AND_GREATER,
 								new UnsignedWordElement(47584)), //
-						this.m(GoodWe.ChannelId.WORK_WEEK_7_ECO_MODE_FOR_ARM_18_AND_GREATER,
+						m(GoodWe.ChannelId.WORK_WEEK_7_ECO_MODE_FOR_ARM_18_AND_GREATER,
 								new UnsignedWordElement(47585)), //
-						this.m(GoodWe.ChannelId.WORK_WEEK_7_PARAMETER7_1_ECO_MODE_FOR_ARM_18_AND_GREATER,
+						m(GoodWe.ChannelId.WORK_WEEK_7_PARAMETER7_1_ECO_MODE_FOR_ARM_18_AND_GREATER,
 								new UnsignedWordElement(47586)), //
-						this.m(GoodWe.ChannelId.WORK_WEEK_7_PARAMETER7_2_ECO_MODE_FOR_ARM_18_AND_GREATER,
+						m(GoodWe.ChannelId.WORK_WEEK_7_PARAMETER7_2_ECO_MODE_FOR_ARM_18_AND_GREATER,
 								new UnsignedWordElement(47587)), //
-						this.m(GoodWe.ChannelId.WORK_WEEK_7_PARAMETER7_3_ECO_MODE_FOR_ARM_18_AND_GREATER,
+						m(GoodWe.ChannelId.WORK_WEEK_7_PARAMETER7_3_ECO_MODE_FOR_ARM_18_AND_GREATER,
 								new UnsignedWordElement(47588)), //
 
-						this.m(GoodWe.ChannelId.WORK_WEEK_8_START_TIME_ECO_MODE_FOR_ARM_18_AND_GREATER,
+						m(GoodWe.ChannelId.WORK_WEEK_8_START_TIME_ECO_MODE_FOR_ARM_18_AND_GREATER,
 								new UnsignedWordElement(47589)), //
-						this.m(GoodWe.ChannelId.WORK_WEEK_8_END_TIME_ECO_MODE_FOR_ARM_18_AND_GREATER,
+						m(GoodWe.ChannelId.WORK_WEEK_8_END_TIME_ECO_MODE_FOR_ARM_18_AND_GREATER,
 								new UnsignedWordElement(47590)), //
-						this.m(GoodWe.ChannelId.WORK_WEEK_8_ECO_MODE_FOR_ARM_18_AND_GREATER,
+						m(GoodWe.ChannelId.WORK_WEEK_8_ECO_MODE_FOR_ARM_18_AND_GREATER,
 								new UnsignedWordElement(47591)), //
-						this.m(GoodWe.ChannelId.WORK_WEEK_8_PARAMETER8_1_ECO_MODE_FOR_ARM_18_AND_GREATER,
+						m(GoodWe.ChannelId.WORK_WEEK_8_PARAMETER8_1_ECO_MODE_FOR_ARM_18_AND_GREATER,
 								new UnsignedWordElement(47592)), //
-						this.m(GoodWe.ChannelId.WORK_WEEK_8_PARAMETER8_2_ECO_MODE_FOR_ARM_18_AND_GREATER,
+						m(GoodWe.ChannelId.WORK_WEEK_8_PARAMETER8_2_ECO_MODE_FOR_ARM_18_AND_GREATER,
 								new UnsignedWordElement(47593)), //
-						this.m(GoodWe.ChannelId.WORK_WEEK_8_PARAMETER8_3_ECO_MODE_FOR_ARM_18_AND_GREATER,
+						m(GoodWe.ChannelId.WORK_WEEK_8_PARAMETER8_3_ECO_MODE_FOR_ARM_18_AND_GREATER,
 								new UnsignedWordElement(47594)), //
 						// 0,Disable 1,switching mode 2,Time manage mode
 						// Only for inverter with ARM version equal or greater 18 To select Load
 						// control
 						// mode
-						this.m(GoodWe.ChannelId.LOAD_REGULATION_INDEX, new UnsignedWordElement(47595)), //
-						this.m(GoodWe.ChannelId.LOAD_SWITCH_STATUS, new UnsignedWordElement(47596)), //
+						m(GoodWe.ChannelId.LOAD_REGULATION_INDEX, new UnsignedWordElement(47595)), //
+						m(GoodWe.ChannelId.LOAD_SWITCH_STATUS, new UnsignedWordElement(47596)), //
 						// For load control function, if the controlled load on Backup side, use
 						// this to
 						// switch the load off when battery reaches the SOC set
-						this.m(GoodWe.ChannelId.BACKUP_SWITCH_SOC_MIN, new UnsignedWordElement(47597)), //
+						m(GoodWe.ChannelId.BACKUP_SWITCH_SOC_MIN, new UnsignedWordElement(47597)), //
 						new DummyRegisterElement(47598), //
-						this.m(GoodWe.ChannelId.HARDWARE_FEED_POWER, new UnsignedWordElement(47599)))//
+						m(GoodWe.ChannelId.HARDWARE_FEED_POWER, new UnsignedWordElement(47599)))//
 		);
 	}
 
@@ -1706,120 +1706,120 @@ private void handleDspVersion6(ModbusProtocol protocol) throws OpenemsException
 		protocol.addTask(//
 				new FC3ReadRegistersTask(36001, Priority.LOW, //
 						// External Communication Data(ARM)
-						this.m(GoodWe.ChannelId.RSSI, new UnsignedWordElement(36001)), //
+						m(GoodWe.ChannelId.RSSI, new UnsignedWordElement(36001)), //
 						new DummyRegisterElement(36002), //
-						this.m(GoodWe.ChannelId.B_METER_COMMUNICATE_STATUS, new UnsignedWordElement(36003)), //
-						this.m(GoodWe.ChannelId.METER_COMMUNICATE_STATUS, new UnsignedWordElement(36004)), //
+						m(GoodWe.ChannelId.B_METER_COMMUNICATE_STATUS, new UnsignedWordElement(36003)), //
+						m(GoodWe.ChannelId.METER_COMMUNICATE_STATUS, new UnsignedWordElement(36004)), //
 						// Registers for Grid Smart-Meter (36005 to 36014) are read via GridMeter
 						// implementation
 						new DummyRegisterElement(36005, 36014),
-						this.m(GoodWe.ChannelId.E_TOTAL_SELL, new FloatDoublewordElement(36015),
-								ElementToChannelConverter.SCALE_FACTOR_MINUS_1), //
-						this.m(GoodWe.ChannelId.E_TOTAL_BUY_F, new FloatDoublewordElement(36017),
-								ElementToChannelConverter.SCALE_FACTOR_MINUS_1), //
-						this.m(GoodWe.ChannelId.METER_ACTIVE_POWER_R, new SignedDoublewordElement(36019)), //
-						this.m(GoodWe.ChannelId.METER_ACTIVE_POWER_S, new SignedDoublewordElement(36021)), //
-						this.m(GoodWe.ChannelId.METER_ACTIVE_POWER_T, new SignedDoublewordElement(36023)), //
-						this.m(GoodWe.ChannelId.METER_TOTAL_ACTIVE_POWER, new SignedDoublewordElement(36025)), //
-						this.m(GoodWe.ChannelId.METER_REACTIVE_POWER_R, new SignedDoublewordElement(36027)), //
-						this.m(GoodWe.ChannelId.METER_REACTIVE_POWER_S, new SignedDoublewordElement(36029)), //
-						this.m(GoodWe.ChannelId.METER_REACTIVE_POWER_T, new SignedDoublewordElement(36031)), //
-						this.m(GoodWe.ChannelId.METER_TOTAL_REACTIVE_POWER, new SignedDoublewordElement(36033)), //
-						this.m(GoodWe.ChannelId.METER_APPARENT_POWER_R, new SignedDoublewordElement(36035)), //
-						this.m(GoodWe.ChannelId.METER_APPARENT_POWER_S, new SignedDoublewordElement(36037)), //
-						this.m(GoodWe.ChannelId.METER_APPARENT_POWER_T, new SignedDoublewordElement(36039)), //
-						this.m(GoodWe.ChannelId.METER_TOTAL_APPARENT_POWER, new SignedDoublewordElement(36041)), //
+						m(GoodWe.ChannelId.E_TOTAL_SELL, new FloatDoublewordElement(36015),
+								ElementToChannelConverter.SCALE_FACTOR_MINUS_1), //
+						m(GoodWe.ChannelId.E_TOTAL_BUY_F, new FloatDoublewordElement(36017),
+								ElementToChannelConverter.SCALE_FACTOR_MINUS_1), //
+						m(GoodWe.ChannelId.METER_ACTIVE_POWER_R, new SignedDoublewordElement(36019)), //
+						m(GoodWe.ChannelId.METER_ACTIVE_POWER_S, new SignedDoublewordElement(36021)), //
+						m(GoodWe.ChannelId.METER_ACTIVE_POWER_T, new SignedDoublewordElement(36023)), //
+						m(GoodWe.ChannelId.METER_TOTAL_ACTIVE_POWER, new SignedDoublewordElement(36025)), //
+						m(GoodWe.ChannelId.METER_REACTIVE_POWER_R, new SignedDoublewordElement(36027)), //
+						m(GoodWe.ChannelId.METER_REACTIVE_POWER_S, new SignedDoublewordElement(36029)), //
+						m(GoodWe.ChannelId.METER_REACTIVE_POWER_T, new SignedDoublewordElement(36031)), //
+						m(GoodWe.ChannelId.METER_TOTAL_REACTIVE_POWER, new SignedDoublewordElement(36033)), //
+						m(GoodWe.ChannelId.METER_APPARENT_POWER_R, new SignedDoublewordElement(36035)), //
+						m(GoodWe.ChannelId.METER_APPARENT_POWER_S, new SignedDoublewordElement(36037)), //
+						m(GoodWe.ChannelId.METER_APPARENT_POWER_T, new SignedDoublewordElement(36039)), //
+						m(GoodWe.ChannelId.METER_TOTAL_APPARENT_POWER, new SignedDoublewordElement(36041)), //
 						// Only for GoodWe smart meter
-						this.m(GoodWe.ChannelId.METER_TYPE, new UnsignedWordElement(36043)), //
-						this.m(GoodWe.ChannelId.METER_SOFTWARE_VERSION, new UnsignedWordElement(36044)), //
+						m(GoodWe.ChannelId.METER_TYPE, new UnsignedWordElement(36043)), //
+						m(GoodWe.ChannelId.METER_SOFTWARE_VERSION, new UnsignedWordElement(36044)), //
 						// Only for AC coupled inverter. Detect Pv Meter
-						this.m(GoodWe.ChannelId.METER_CT2_ACTIVE_POWER, new SignedDoublewordElement(36045)), //
-						this.m(GoodWe.ChannelId.CT2_E_TOTAL_SELL, new UnsignedDoublewordElement(36047),
+						m(GoodWe.ChannelId.METER_CT2_ACTIVE_POWER, new SignedDoublewordElement(36045)), //
+						m(GoodWe.ChannelId.CT2_E_TOTAL_SELL, new UnsignedDoublewordElement(36047),
 								ElementToChannelConverter.SCALE_FACTOR_MINUS_2), //
-						this.m(GoodWe.ChannelId.CT2_E_TOTAL_BUY, new UnsignedDoublewordElement(36049),
+						m(GoodWe.ChannelId.CT2_E_TOTAL_BUY, new UnsignedDoublewordElement(36049),
 								ElementToChannelConverter.SCALE_FACTOR_MINUS_2), //
-						this.m(GoodWe.ChannelId.METER_CT2_STATUS, new UnsignedWordElement(36051))) //
+						m(GoodWe.ChannelId.METER_CT2_STATUS, new UnsignedWordElement(36051))) //
 		);
 
 		protocol.addTask(//
 				new FC3ReadRegistersTask(47000, Priority.LOW, //
-						this.m(GoodWe.ChannelId.SELECT_WORK_MODE, new UnsignedWordElement(47000)), //
+						m(GoodWe.ChannelId.SELECT_WORK_MODE, new UnsignedWordElement(47000)), //
 						new DummyRegisterElement(47001), //
-						this.m(GoodWe.ChannelId.WMETER_CONNECT_CHECK_FLAG, new UnsignedWordElement(47002)), //
+						m(GoodWe.ChannelId.WMETER_CONNECT_CHECK_FLAG, new UnsignedWordElement(47002)), //
 						new DummyRegisterElement(47003, 47004), //
-						this.m(GoodWe.ChannelId.LOG_DATA_ENABLE, new UnsignedWordElement(47005)), //
-						this.m(GoodWe.ChannelId.DATA_SEND_INTERVAL, new UnsignedWordElement(47006)), //
-						this.m(GoodWe.ChannelId.DRED_CMD, new UnsignedWordElement(47007)), //
+						m(GoodWe.ChannelId.LOG_DATA_ENABLE, new UnsignedWordElement(47005)), //
+						m(GoodWe.ChannelId.DATA_SEND_INTERVAL, new UnsignedWordElement(47006)), //
+						m(GoodWe.ChannelId.DRED_CMD, new UnsignedWordElement(47007)), //
 						new DummyRegisterElement(47008), //
-						this.m(GoodWe.ChannelId.WIFI_OR_LAN_SWITCH, new UnsignedWordElement(47009)), //
+						m(GoodWe.ChannelId.WIFI_OR_LAN_SWITCH, new UnsignedWordElement(47009)), //
 						new DummyRegisterElement(47010, 47011), //
-						this.m(GoodWe.ChannelId.LED_BLINK_TIME, new UnsignedWordElement(47012)), //
-						this.m(GoodWe.ChannelId.WIFI_LED_STATE, new UnsignedWordElement(47013)), //
-						this.m(GoodWe.ChannelId.COM_LED_STATE, new UnsignedWordElement(47014)), //
-						this.m(GoodWe.ChannelId.METER_CT1_REVERSE_ENABLE, new UnsignedWordElement(47015)), //
-						this.m(GoodWe.ChannelId.ERROR_LOG_READ_PAGE, new UnsignedWordElement(47016)), //
+						m(GoodWe.ChannelId.LED_BLINK_TIME, new UnsignedWordElement(47012)), //
+						m(GoodWe.ChannelId.WIFI_LED_STATE, new UnsignedWordElement(47013)), //
+						m(GoodWe.ChannelId.COM_LED_STATE, new UnsignedWordElement(47014)), //
+						m(GoodWe.ChannelId.METER_CT1_REVERSE_ENABLE, new UnsignedWordElement(47015)), //
+						m(GoodWe.ChannelId.ERROR_LOG_READ_PAGE, new UnsignedWordElement(47016)), //
 						// 1:on 0:off If not connect to Internet, please set 1
-						this.m(GoodWe.ChannelId.MODBUS_TCP_WITHOUT_INTERNET, new UnsignedWordElement(47017)), //
+						m(GoodWe.ChannelId.MODBUS_TCP_WITHOUT_INTERNET, new UnsignedWordElement(47017)), //
 						// 1: off, 2: on, 3: flash 1x, 4: flash 2x, 5: flash 4x
-						this.m(GoodWe.ChannelId.BACKUP_LED, new UnsignedWordElement(47018)), // [1,5]
-						this.m(GoodWe.ChannelId.GRID_LED, new UnsignedWordElement(47019)), // [1,5]
-						this.m(GoodWe.ChannelId.SOC_LED_1, new UnsignedWordElement(47020)), // [1,5]
-						this.m(GoodWe.ChannelId.SOC_LED_2, new UnsignedWordElement(47021)), // [1,5]
-						this.m(GoodWe.ChannelId.SOC_LED_3, new UnsignedWordElement(47022)), // [1,5]
-						this.m(GoodWe.ChannelId.SOC_LED_4, new UnsignedWordElement(47023)), // [1,5]
-						this.m(GoodWe.ChannelId.BATTERY_LED, new UnsignedWordElement(47024)), // [1,5]
-						this.m(GoodWe.ChannelId.SYSTEM_LED, new UnsignedWordElement(47025)), // [1,5]
-						this.m(GoodWe.ChannelId.FAULT_LED, new UnsignedWordElement(47026)), // [1,5]
-						this.m(GoodWe.ChannelId.ENERGY_LED, new UnsignedWordElement(47027)), // [1,5]
-						this.m(GoodWe.ChannelId.LED_EXTERNAL_CONTROL, new UnsignedWordElement(47028)), // [42343]
+						m(GoodWe.ChannelId.BACKUP_LED, new UnsignedWordElement(47018)), // [1,5]
+						m(GoodWe.ChannelId.GRID_LED, new UnsignedWordElement(47019)), // [1,5]
+						m(GoodWe.ChannelId.SOC_LED_1, new UnsignedWordElement(47020)), // [1,5]
+						m(GoodWe.ChannelId.SOC_LED_2, new UnsignedWordElement(47021)), // [1,5]
+						m(GoodWe.ChannelId.SOC_LED_3, new UnsignedWordElement(47022)), // [1,5]
+						m(GoodWe.ChannelId.SOC_LED_4, new UnsignedWordElement(47023)), // [1,5]
+						m(GoodWe.ChannelId.BATTERY_LED, new UnsignedWordElement(47024)), // [1,5]
+						m(GoodWe.ChannelId.SYSTEM_LED, new UnsignedWordElement(47025)), // [1,5]
+						m(GoodWe.ChannelId.FAULT_LED, new UnsignedWordElement(47026)), // [1,5]
+						m(GoodWe.ChannelId.ENERGY_LED, new UnsignedWordElement(47027)), // [1,5]
+						m(GoodWe.ChannelId.LED_EXTERNAL_CONTROL, new UnsignedWordElement(47028)), // [42343]
 						new DummyRegisterElement(47029, 47037), //
 						// 1 Enable, After restart the inverter, setting saved
-						this.m(GoodWe.ChannelId.STOP_MODE_SAVE_ENABLE, new UnsignedWordElement(47038))) //
+						m(GoodWe.ChannelId.STOP_MODE_SAVE_ENABLE, new UnsignedWordElement(47038))) //
 		);
 
 		protocol.addTask(//
 				// The same function as that for Operation Mode on PV Master App
 				new FC16WriteRegistersTask(47000, //
-						this.m(GoodWe.ChannelId.SELECT_WORK_MODE, new UnsignedWordElement(47000)), //
+						m(GoodWe.ChannelId.SELECT_WORK_MODE, new UnsignedWordElement(47000)), //
 						new DummyRegisterElement(47001), //
-						this.m(GoodWe.ChannelId.WMETER_CONNECT_CHECK_FLAG, new UnsignedWordElement(47002)), //
+						m(GoodWe.ChannelId.WMETER_CONNECT_CHECK_FLAG, new UnsignedWordElement(47002)), //
 						new DummyRegisterElement(47003, 47004), //
 						// Breakpoint Resume for Data transferring. Activated as default, time
 						// interval 5
 						// minutes
-						this.m(GoodWe.ChannelId.LOG_DATA_ENABLE, new UnsignedWordElement(47005)), //
+						m(GoodWe.ChannelId.LOG_DATA_ENABLE, new UnsignedWordElement(47005)), //
 						// Time interval for data send to cloud or EMS,default is 1 minute
-						this.m(GoodWe.ChannelId.DATA_SEND_INTERVAL, new UnsignedWordElement(47006)), //
+						m(GoodWe.ChannelId.DATA_SEND_INTERVAL, new UnsignedWordElement(47006)), //
 						// Only for Australia, Refer to Table 8-22
-						this.m(GoodWe.ChannelId.DRED_CMD, new UnsignedWordElement(47007)), //
+						m(GoodWe.ChannelId.DRED_CMD, new UnsignedWordElement(47007)), //
 						new DummyRegisterElement(47008), //
 						// For wifi+Lan module, to switch to LAN or WiFi communicaiton
-						this.m(GoodWe.ChannelId.WIFI_OR_LAN_SWITCH, new UnsignedWordElement(47009)), //
+						m(GoodWe.ChannelId.WIFI_OR_LAN_SWITCH, new UnsignedWordElement(47009)), //
 						new DummyRegisterElement(47010, 47011), //
-						this.m(GoodWe.ChannelId.LED_BLINK_TIME, new UnsignedWordElement(47012)), //
+						m(GoodWe.ChannelId.LED_BLINK_TIME, new UnsignedWordElement(47012)), //
 						// 1: off, 2: on, 3: flash 1x, 4: flash 2x, 5: flash 4x
-						this.m(GoodWe.ChannelId.WIFI_LED_STATE, new UnsignedWordElement(47013)), //
-						this.m(GoodWe.ChannelId.COM_LED_STATE, new UnsignedWordElement(47014)), //
+						m(GoodWe.ChannelId.WIFI_LED_STATE, new UnsignedWordElement(47013)), //
+						m(GoodWe.ChannelId.COM_LED_STATE, new UnsignedWordElement(47014)), //
 						// 1:on 0:off only for single phase Smart meter
-						this.m(GoodWe.ChannelId.METER_CT1_REVERSE_ENABLE, new UnsignedWordElement(47015)), //
-						this.m(GoodWe.ChannelId.ERROR_LOG_READ_PAGE, new UnsignedWordElement(47016)), //
+						m(GoodWe.ChannelId.METER_CT1_REVERSE_ENABLE, new UnsignedWordElement(47015)), //
+						m(GoodWe.ChannelId.ERROR_LOG_READ_PAGE, new UnsignedWordElement(47016)), //
 						// 1:on 0:off If not connect to Internet, please set 1
-						this.m(GoodWe.ChannelId.MODBUS_TCP_WITHOUT_INTERNET, new UnsignedWordElement(47017)), //
+						m(GoodWe.ChannelId.MODBUS_TCP_WITHOUT_INTERNET, new UnsignedWordElement(47017)), //
 						// 1: off, 2: on, 3: flash 1x, 4: flash 2x, 5: flash 4x
-						this.m(GoodWe.ChannelId.BACKUP_LED, new UnsignedWordElement(47018)), // [1,5]
-						this.m(GoodWe.ChannelId.GRID_LED, new UnsignedWordElement(47019)), // [1,5]
-						this.m(GoodWe.ChannelId.SOC_LED_1, new UnsignedWordElement(47020)), // [1,5]
-						this.m(GoodWe.ChannelId.SOC_LED_2, new UnsignedWordElement(47021)), // [1,5]
-						this.m(GoodWe.ChannelId.SOC_LED_3, new UnsignedWordElement(47022)), // [1,5]
-						this.m(GoodWe.ChannelId.SOC_LED_4, new UnsignedWordElement(47023)), // [1,5]
-						this.m(GoodWe.ChannelId.BATTERY_LED, new UnsignedWordElement(47024)), // [1,5]
-						this.m(GoodWe.ChannelId.SYSTEM_LED, new UnsignedWordElement(47025)), // [1,5]
-						this.m(GoodWe.ChannelId.FAULT_LED, new UnsignedWordElement(47026)), // [1,5]
-						this.m(GoodWe.ChannelId.ENERGY_LED, new UnsignedWordElement(47027)), // [1,5]
-						this.m(GoodWe.ChannelId.LED_EXTERNAL_CONTROL, new UnsignedWordElement(47028)), // [42343]
+						m(GoodWe.ChannelId.BACKUP_LED, new UnsignedWordElement(47018)), // [1,5]
+						m(GoodWe.ChannelId.GRID_LED, new UnsignedWordElement(47019)), // [1,5]
+						m(GoodWe.ChannelId.SOC_LED_1, new UnsignedWordElement(47020)), // [1,5]
+						m(GoodWe.ChannelId.SOC_LED_2, new UnsignedWordElement(47021)), // [1,5]
+						m(GoodWe.ChannelId.SOC_LED_3, new UnsignedWordElement(47022)), // [1,5]
+						m(GoodWe.ChannelId.SOC_LED_4, new UnsignedWordElement(47023)), // [1,5]
+						m(GoodWe.ChannelId.BATTERY_LED, new UnsignedWordElement(47024)), // [1,5]
+						m(GoodWe.ChannelId.SYSTEM_LED, new UnsignedWordElement(47025)), // [1,5]
+						m(GoodWe.ChannelId.FAULT_LED, new UnsignedWordElement(47026)), // [1,5]
+						m(GoodWe.ChannelId.ENERGY_LED, new UnsignedWordElement(47027)), // [1,5]
+						m(GoodWe.ChannelId.LED_EXTERNAL_CONTROL, new UnsignedWordElement(47028)), // [42343]
 						new DummyRegisterElement(47029, 47037), //
 						// 1 Enable, After restart the inverter, setting saved
-						this.m(GoodWe.ChannelId.STOP_MODE_SAVE_ENABLE, new UnsignedWordElement(47038)))//
+						m(GoodWe.ChannelId.STOP_MODE_SAVE_ENABLE, new UnsignedWordElement(47038)))//
 		);
 	}
 
@@ -1828,45 +1828,45 @@ private void handleDspVersion5(ModbusProtocol protocol) throws OpenemsException
 
 		protocol.addTask(//
 				new FC3ReadRegistersTask(36001, Priority.LOW, //
-						this.m(GoodWe.ChannelId.RSSI, new UnsignedWordElement(36001)), //
+						m(GoodWe.ChannelId.RSSI, new UnsignedWordElement(36001)), //
 						new DummyRegisterElement(36002), //
-						this.m(GoodWe.ChannelId.B_METER_COMMUNICATE_STATUS, new UnsignedWordElement(36003)), //
-						this.m(GoodWe.ChannelId.METER_COMMUNICATE_STATUS, new UnsignedWordElement(36004)), //
+						m(GoodWe.ChannelId.B_METER_COMMUNICATE_STATUS, new UnsignedWordElement(36003)), //
+						m(GoodWe.ChannelId.METER_COMMUNICATE_STATUS, new UnsignedWordElement(36004)), //
 						// Registers for Grid Smart-Meter (36005 to 36014) are read via GridMeter
 						// implementation
 						new DummyRegisterElement(36005, 36014),
-						this.m(GoodWe.ChannelId.E_TOTAL_SELL, new FloatDoublewordElement(36015),
-								ElementToChannelConverter.SCALE_FACTOR_MINUS_1), //
-						this.m(GoodWe.ChannelId.E_TOTAL_BUY_F, new FloatDoublewordElement(36017),
-								ElementToChannelConverter.SCALE_FACTOR_MINUS_1), //
-						this.m(GoodWe.ChannelId.METER_ACTIVE_POWER_R, new SignedDoublewordElement(36019)), //
-						this.m(GoodWe.ChannelId.METER_ACTIVE_POWER_S, new SignedDoublewordElement(36021)), //
-						this.m(GoodWe.ChannelId.METER_ACTIVE_POWER_T, new SignedDoublewordElement(36023)), //
-						this.m(GoodWe.ChannelId.METER_TOTAL_ACTIVE_POWER, new SignedDoublewordElement(36025)), //
-						this.m(GoodWe.ChannelId.METER_REACTIVE_POWER_R, new SignedDoublewordElement(36027)), //
-						this.m(GoodWe.ChannelId.METER_REACTIVE_POWER_S, new SignedDoublewordElement(36029)), //
-						this.m(GoodWe.ChannelId.METER_REACTIVE_POWER_T, new SignedDoublewordElement(36031)), //
-						this.m(GoodWe.ChannelId.METER_TOTAL_REACTIVE_POWER, new SignedDoublewordElement(36033)), //
-						this.m(GoodWe.ChannelId.METER_APPARENT_POWER_R, new SignedDoublewordElement(36035)), //
-						this.m(GoodWe.ChannelId.METER_APPARENT_POWER_S, new SignedDoublewordElement(36037)), //
-						this.m(GoodWe.ChannelId.METER_APPARENT_POWER_T, new SignedDoublewordElement(36039)), //
-						this.m(GoodWe.ChannelId.METER_TOTAL_APPARENT_POWER, new SignedDoublewordElement(36041)), //
+						m(GoodWe.ChannelId.E_TOTAL_SELL, new FloatDoublewordElement(36015),
+								ElementToChannelConverter.SCALE_FACTOR_MINUS_1), //
+						m(GoodWe.ChannelId.E_TOTAL_BUY_F, new FloatDoublewordElement(36017),
+								ElementToChannelConverter.SCALE_FACTOR_MINUS_1), //
+						m(GoodWe.ChannelId.METER_ACTIVE_POWER_R, new SignedDoublewordElement(36019)), //
+						m(GoodWe.ChannelId.METER_ACTIVE_POWER_S, new SignedDoublewordElement(36021)), //
+						m(GoodWe.ChannelId.METER_ACTIVE_POWER_T, new SignedDoublewordElement(36023)), //
+						m(GoodWe.ChannelId.METER_TOTAL_ACTIVE_POWER, new SignedDoublewordElement(36025)), //
+						m(GoodWe.ChannelId.METER_REACTIVE_POWER_R, new SignedDoublewordElement(36027)), //
+						m(GoodWe.ChannelId.METER_REACTIVE_POWER_S, new SignedDoublewordElement(36029)), //
+						m(GoodWe.ChannelId.METER_REACTIVE_POWER_T, new SignedDoublewordElement(36031)), //
+						m(GoodWe.ChannelId.METER_TOTAL_REACTIVE_POWER, new SignedDoublewordElement(36033)), //
+						m(GoodWe.ChannelId.METER_APPARENT_POWER_R, new SignedDoublewordElement(36035)), //
+						m(GoodWe.ChannelId.METER_APPARENT_POWER_S, new SignedDoublewordElement(36037)), //
+						m(GoodWe.ChannelId.METER_APPARENT_POWER_T, new SignedDoublewordElement(36039)), //
+						m(GoodWe.ChannelId.METER_TOTAL_APPARENT_POWER, new SignedDoublewordElement(36041)), //
 						// Only for GoodWe smart meter
-						this.m(GoodWe.ChannelId.METER_TYPE, new UnsignedWordElement(36043)), //
-						this.m(GoodWe.ChannelId.METER_SOFTWARE_VERSION, new UnsignedWordElement(36044)), //
+						m(GoodWe.ChannelId.METER_TYPE, new UnsignedWordElement(36043)), //
+						m(GoodWe.ChannelId.METER_SOFTWARE_VERSION, new UnsignedWordElement(36044)), //
 						// Only for AC coupled inverter. Detect Pv Meter
-						this.m(GoodWe.ChannelId.METER_CT2_ACTIVE_POWER, new SignedDoublewordElement(36045)), //
-						this.m(GoodWe.ChannelId.CT2_E_TOTAL_SELL, new UnsignedDoublewordElement(36047),
+						m(GoodWe.ChannelId.METER_CT2_ACTIVE_POWER, new SignedDoublewordElement(36045)), //
+						m(GoodWe.ChannelId.CT2_E_TOTAL_SELL, new UnsignedDoublewordElement(36047),
 								ElementToChannelConverter.SCALE_FACTOR_MINUS_2), //
-						this.m(GoodWe.ChannelId.CT2_E_TOTAL_BUY, new UnsignedDoublewordElement(36049),
+						m(GoodWe.ChannelId.CT2_E_TOTAL_BUY, new UnsignedDoublewordElement(36049),
 								ElementToChannelConverter.SCALE_FACTOR_MINUS_2), //
-						this.m(GoodWe.ChannelId.METER_CT2_STATUS, new UnsignedWordElement(36051))) //
+						m(GoodWe.ChannelId.METER_CT2_STATUS, new UnsignedWordElement(36051))) //
 		);
 	}
 
 	protected AbstractModbusElement<?> getSocModbusElement(int address) throws NotImplementedException {
 		if (this instanceof HybridEss) {
-			return this.m(SymmetricEss.ChannelId.SOC, new UnsignedWordElement(address), new ElementToChannelConverter(
+			return m(SymmetricEss.ChannelId.SOC, new UnsignedWordElement(address), new ElementToChannelConverter(
 					// element -> channel
 					value -> {
 						// Set SoC to undefined if there is No Battery
diff --git a/io.openems.edge.goodwe/src/io/openems/edge/goodwe/emergencypowermeter/GoodWeEmergencyPowerMeterImpl.java b/io.openems.edge.goodwe/src/io/openems/edge/goodwe/emergencypowermeter/GoodWeEmergencyPowerMeterImpl.java
index c4ebf08d85d..46e4b496ceb 100644
--- a/io.openems.edge.goodwe/src/io/openems/edge/goodwe/emergencypowermeter/GoodWeEmergencyPowerMeterImpl.java
+++ b/io.openems.edge.goodwe/src/io/openems/edge/goodwe/emergencypowermeter/GoodWeEmergencyPowerMeterImpl.java
@@ -94,32 +94,32 @@ protected ModbusProtocol defineModbusProtocol() throws OpenemsException {
 
 				// Power of each backup up phase
 				new FC3ReadRegistersTask(35145, Priority.LOW, //
-						this.m(AsymmetricMeter.ChannelId.VOLTAGE_L1, new UnsignedWordElement(35145), //
+						m(AsymmetricMeter.ChannelId.VOLTAGE_L1, new UnsignedWordElement(35145), //
 								ElementToChannelConverter.SCALE_FACTOR_MINUS_1), //
-						this.m(AsymmetricMeter.ChannelId.CURRENT_L1, new UnsignedWordElement(35146), //
+						m(AsymmetricMeter.ChannelId.CURRENT_L1, new UnsignedWordElement(35146), //
 								ElementToChannelConverter.SCALE_FACTOR_MINUS_1), //
-						this.m(GoodWeEmergencyPowerMeter.ChannelId.FREQUENCY_L1, new UnsignedWordElement(35147), //
+						m(GoodWeEmergencyPowerMeter.ChannelId.FREQUENCY_L1, new UnsignedWordElement(35147), //
 								ElementToChannelConverter.SCALE_FACTOR_MINUS_2), //
 						new DummyRegisterElement(35148), //
-						this.m(AsymmetricMeter.ChannelId.ACTIVE_POWER_L1, new SignedDoublewordElement(35149)), //
+						m(AsymmetricMeter.ChannelId.ACTIVE_POWER_L1, new SignedDoublewordElement(35149)), //
 
-						this.m(AsymmetricMeter.ChannelId.VOLTAGE_L2, new UnsignedWordElement(35151), //
+						m(AsymmetricMeter.ChannelId.VOLTAGE_L2, new UnsignedWordElement(35151), //
 								ElementToChannelConverter.SCALE_FACTOR_MINUS_1), //
-						this.m(AsymmetricMeter.ChannelId.CURRENT_L2, new UnsignedWordElement(35152), //
+						m(AsymmetricMeter.ChannelId.CURRENT_L2, new UnsignedWordElement(35152), //
 								ElementToChannelConverter.SCALE_FACTOR_MINUS_1), //
-						this.m(GoodWeEmergencyPowerMeter.ChannelId.FREQUENCY_L2, new UnsignedWordElement(35153), //
+						m(GoodWeEmergencyPowerMeter.ChannelId.FREQUENCY_L2, new UnsignedWordElement(35153), //
 								ElementToChannelConverter.SCALE_FACTOR_MINUS_2), //
 						new DummyRegisterElement(35154), //
-						this.m(AsymmetricMeter.ChannelId.ACTIVE_POWER_L2, new SignedDoublewordElement(35155)), //
+						m(AsymmetricMeter.ChannelId.ACTIVE_POWER_L2, new SignedDoublewordElement(35155)), //
 
-						this.m(AsymmetricMeter.ChannelId.VOLTAGE_L3, new UnsignedWordElement(35157), //
+						m(AsymmetricMeter.ChannelId.VOLTAGE_L3, new UnsignedWordElement(35157), //
 								ElementToChannelConverter.SCALE_FACTOR_MINUS_1), //
-						this.m(AsymmetricMeter.ChannelId.CURRENT_L3, new UnsignedWordElement(35158), //
+						m(AsymmetricMeter.ChannelId.CURRENT_L3, new UnsignedWordElement(35158), //
 								ElementToChannelConverter.SCALE_FACTOR_MINUS_1), //
-						this.m(GoodWeEmergencyPowerMeter.ChannelId.FREQUENCY_L3, new UnsignedWordElement(35159), //
+						m(GoodWeEmergencyPowerMeter.ChannelId.FREQUENCY_L3, new UnsignedWordElement(35159), //
 								ElementToChannelConverter.SCALE_FACTOR_MINUS_2), //
 						new DummyRegisterElement(35160), //
-						this.m(AsymmetricMeter.ChannelId.ACTIVE_POWER_L3, new SignedDoublewordElement(35161))));
+						m(AsymmetricMeter.ChannelId.ACTIVE_POWER_L3, new SignedDoublewordElement(35161))));
 	}
 
 	@Override
diff --git a/io.openems.edge.goodwe/src/io/openems/edge/goodwe/gridmeter/GoodWeGridMeterImpl.java b/io.openems.edge.goodwe/src/io/openems/edge/goodwe/gridmeter/GoodWeGridMeterImpl.java
index 90d2a5173a8..4a018574936 100644
--- a/io.openems.edge.goodwe/src/io/openems/edge/goodwe/gridmeter/GoodWeGridMeterImpl.java
+++ b/io.openems.edge.goodwe/src/io/openems/edge/goodwe/gridmeter/GoodWeGridMeterImpl.java
@@ -95,41 +95,41 @@ protected ModbusProtocol defineModbusProtocol() throws OpenemsException {
 
 				// Active and reactive power, Power factor and frequency
 				new FC3ReadRegistersTask(36005, Priority.HIGH, //
-						this.m(AsymmetricMeter.ChannelId.ACTIVE_POWER_L1, new SignedWordElement(36005),
+						m(AsymmetricMeter.ChannelId.ACTIVE_POWER_L1, new SignedWordElement(36005),
 								ElementToChannelConverter.INVERT), //
-						this.m(AsymmetricMeter.ChannelId.ACTIVE_POWER_L2, new SignedWordElement(36006),
+						m(AsymmetricMeter.ChannelId.ACTIVE_POWER_L2, new SignedWordElement(36006),
 								ElementToChannelConverter.INVERT), //
-						this.m(AsymmetricMeter.ChannelId.ACTIVE_POWER_L3, new SignedWordElement(36007),
+						m(AsymmetricMeter.ChannelId.ACTIVE_POWER_L3, new SignedWordElement(36007),
 								ElementToChannelConverter.INVERT), //
 						new DummyRegisterElement(36008, 36012), //
-						this.m(GoodWeGridMeter.ChannelId.METER_POWER_FACTOR, new UnsignedWordElement(36013),
+						m(GoodWeGridMeter.ChannelId.METER_POWER_FACTOR, new UnsignedWordElement(36013),
 								ElementToChannelConverter.SCALE_FACTOR_MINUS_2), //
-						this.m(SymmetricMeter.ChannelId.FREQUENCY, new UnsignedWordElement(36014),
+						m(SymmetricMeter.ChannelId.FREQUENCY, new UnsignedWordElement(36014),
 								ElementToChannelConverter.SCALE_FACTOR_MINUS_2)), //
 
 				// Voltage, current and Grid Frequency of each phase
 				new FC3ReadRegistersTask(35121, Priority.LOW, //
-						this.m(AsymmetricMeter.ChannelId.VOLTAGE_L1, new UnsignedWordElement(35121),
+						m(AsymmetricMeter.ChannelId.VOLTAGE_L1, new UnsignedWordElement(35121),
 								ElementToChannelConverter.SCALE_FACTOR_MINUS_1), //
-						this.m(AsymmetricMeter.ChannelId.CURRENT_L1, new UnsignedWordElement(35122),
+						m(AsymmetricMeter.ChannelId.CURRENT_L1, new UnsignedWordElement(35122),
 								ElementToChannelConverter.SCALE_FACTOR_MINUS_1), //
-						this.m(GoodWeGridMeter.ChannelId.F_GRID_R, new UnsignedWordElement(35123),
+						m(GoodWeGridMeter.ChannelId.F_GRID_R, new UnsignedWordElement(35123),
 								ElementToChannelConverter.SCALE_FACTOR_MINUS_2), //
 						new DummyRegisterElement(35124, 35125), //
-						this.m(AsymmetricMeter.ChannelId.VOLTAGE_L2, new UnsignedWordElement(35126),
+						m(AsymmetricMeter.ChannelId.VOLTAGE_L2, new UnsignedWordElement(35126),
 								ElementToChannelConverter.SCALE_FACTOR_MINUS_1), //
-						this.m(AsymmetricMeter.ChannelId.CURRENT_L2, new UnsignedWordElement(35127),
+						m(AsymmetricMeter.ChannelId.CURRENT_L2, new UnsignedWordElement(35127),
 								ElementToChannelConverter.SCALE_FACTOR_MINUS_1), //
-						this.m(GoodWeGridMeter.ChannelId.F_GRID_S, new UnsignedWordElement(35128),
+						m(GoodWeGridMeter.ChannelId.F_GRID_S, new UnsignedWordElement(35128),
 								ElementToChannelConverter.SCALE_FACTOR_MINUS_2), //
 						new DummyRegisterElement(35129, 35130), //
-						this.m(AsymmetricMeter.ChannelId.VOLTAGE_L3, new UnsignedWordElement(35131),
+						m(AsymmetricMeter.ChannelId.VOLTAGE_L3, new UnsignedWordElement(35131),
 								ElementToChannelConverter.SCALE_FACTOR_MINUS_1), //
-						this.m(AsymmetricMeter.ChannelId.CURRENT_L3, new UnsignedWordElement(35132),
+						m(AsymmetricMeter.ChannelId.CURRENT_L3, new UnsignedWordElement(35132),
 								ElementToChannelConverter.SCALE_FACTOR_MINUS_1), //
-						this.m(GoodWeGridMeter.ChannelId.F_GRID_T, new UnsignedWordElement(35133),
+						m(GoodWeGridMeter.ChannelId.F_GRID_T, new UnsignedWordElement(35133),
 								ElementToChannelConverter.SCALE_FACTOR_MINUS_2), //
-						this.m(GoodWeGridMeter.ChannelId.P_GRID_T, new SignedDoublewordElement(35134),
+						m(GoodWeGridMeter.ChannelId.P_GRID_T, new SignedDoublewordElement(35134),
 								ElementToChannelConverter.SCALE_FACTOR_MINUS_2))); //
 	}
 
diff --git a/io.openems.edge.io.kmtronic/src/io/openems/edge/io/kmtronic/eight/KmtronicRelay8PortImpl.java b/io.openems.edge.io.kmtronic/src/io/openems/edge/io/kmtronic/eight/KmtronicRelay8PortImpl.java
index 2f6d32c793d..09cc9297d6d 100644
--- a/io.openems.edge.io.kmtronic/src/io/openems/edge/io/kmtronic/eight/KmtronicRelay8PortImpl.java
+++ b/io.openems.edge.io.kmtronic/src/io/openems/edge/io/kmtronic/eight/KmtronicRelay8PortImpl.java
@@ -71,26 +71,26 @@ protected ModbusProtocol defineModbusProtocol() throws OpenemsException {
 				 * For Read: Read Coils
 				 */
 				new FC1ReadCoilsTask(0, Priority.LOW, //
-						this.m(KmtronicRelay8Port.ChannelId.RELAY_1, new CoilElement(0)), //
-						this.m(KmtronicRelay8Port.ChannelId.RELAY_2, new CoilElement(1)), //
-						this.m(KmtronicRelay8Port.ChannelId.RELAY_3, new CoilElement(2)), //
-						this.m(KmtronicRelay8Port.ChannelId.RELAY_4, new CoilElement(3)), //
-						this.m(KmtronicRelay8Port.ChannelId.RELAY_5, new CoilElement(4)), //
-						this.m(KmtronicRelay8Port.ChannelId.RELAY_6, new CoilElement(5)), //
-						this.m(KmtronicRelay8Port.ChannelId.RELAY_7, new CoilElement(6)), //
-						this.m(KmtronicRelay8Port.ChannelId.RELAY_8, new CoilElement(7)) //
+						m(KmtronicRelay8Port.ChannelId.RELAY_1, new CoilElement(0)), //
+						m(KmtronicRelay8Port.ChannelId.RELAY_2, new CoilElement(1)), //
+						m(KmtronicRelay8Port.ChannelId.RELAY_3, new CoilElement(2)), //
+						m(KmtronicRelay8Port.ChannelId.RELAY_4, new CoilElement(3)), //
+						m(KmtronicRelay8Port.ChannelId.RELAY_5, new CoilElement(4)), //
+						m(KmtronicRelay8Port.ChannelId.RELAY_6, new CoilElement(5)), //
+						m(KmtronicRelay8Port.ChannelId.RELAY_7, new CoilElement(6)), //
+						m(KmtronicRelay8Port.ChannelId.RELAY_8, new CoilElement(7)) //
 				),
 				/*
 				 * For Write: Write Single Coil
 				 */
-				new FC5WriteCoilTask(0, this.m(KmtronicRelay8Port.ChannelId.RELAY_1, new CoilElement(0))), //
-				new FC5WriteCoilTask(1, this.m(KmtronicRelay8Port.ChannelId.RELAY_2, new CoilElement(1))), //
-				new FC5WriteCoilTask(2, this.m(KmtronicRelay8Port.ChannelId.RELAY_3, new CoilElement(2))), //
-				new FC5WriteCoilTask(3, this.m(KmtronicRelay8Port.ChannelId.RELAY_4, new CoilElement(3))), //
-				new FC5WriteCoilTask(4, this.m(KmtronicRelay8Port.ChannelId.RELAY_5, new CoilElement(4))), //
-				new FC5WriteCoilTask(5, this.m(KmtronicRelay8Port.ChannelId.RELAY_6, new CoilElement(5))), //
-				new FC5WriteCoilTask(6, this.m(KmtronicRelay8Port.ChannelId.RELAY_7, new CoilElement(6))), //
-				new FC5WriteCoilTask(7, this.m(KmtronicRelay8Port.ChannelId.RELAY_8, new CoilElement(7))) //
+				new FC5WriteCoilTask(0, m(KmtronicRelay8Port.ChannelId.RELAY_1, new CoilElement(0))), //
+				new FC5WriteCoilTask(1, m(KmtronicRelay8Port.ChannelId.RELAY_2, new CoilElement(1))), //
+				new FC5WriteCoilTask(2, m(KmtronicRelay8Port.ChannelId.RELAY_3, new CoilElement(2))), //
+				new FC5WriteCoilTask(3, m(KmtronicRelay8Port.ChannelId.RELAY_4, new CoilElement(3))), //
+				new FC5WriteCoilTask(4, m(KmtronicRelay8Port.ChannelId.RELAY_5, new CoilElement(4))), //
+				new FC5WriteCoilTask(5, m(KmtronicRelay8Port.ChannelId.RELAY_6, new CoilElement(5))), //
+				new FC5WriteCoilTask(6, m(KmtronicRelay8Port.ChannelId.RELAY_7, new CoilElement(6))), //
+				new FC5WriteCoilTask(7, m(KmtronicRelay8Port.ChannelId.RELAY_8, new CoilElement(7))) //
 		);
 	}
 
diff --git a/io.openems.edge.io.kmtronic/src/io/openems/edge/io/kmtronic/four/KmtronicRelay4PortImpl.java b/io.openems.edge.io.kmtronic/src/io/openems/edge/io/kmtronic/four/KmtronicRelay4PortImpl.java
index 54890102096..72d00c88f4e 100644
--- a/io.openems.edge.io.kmtronic/src/io/openems/edge/io/kmtronic/four/KmtronicRelay4PortImpl.java
+++ b/io.openems.edge.io.kmtronic/src/io/openems/edge/io/kmtronic/four/KmtronicRelay4PortImpl.java
@@ -71,18 +71,18 @@ protected ModbusProtocol defineModbusProtocol() throws OpenemsException {
 				 * For Read: Read Coils
 				 */
 				new FC1ReadCoilsTask(0, Priority.LOW, //
-						this.m(KmtronicRelay4Port.ChannelId.RELAY_1, new CoilElement(0)), //
-						this.m(KmtronicRelay4Port.ChannelId.RELAY_2, new CoilElement(1)), //
-						this.m(KmtronicRelay4Port.ChannelId.RELAY_3, new CoilElement(2)), //
-						this.m(KmtronicRelay4Port.ChannelId.RELAY_4, new CoilElement(3)) //
+						m(KmtronicRelay4Port.ChannelId.RELAY_1, new CoilElement(0)), //
+						m(KmtronicRelay4Port.ChannelId.RELAY_2, new CoilElement(1)), //
+						m(KmtronicRelay4Port.ChannelId.RELAY_3, new CoilElement(2)), //
+						m(KmtronicRelay4Port.ChannelId.RELAY_4, new CoilElement(3)) //
 				),
 				/*
 				 * For Write: Write Single Coil
 				 */
-				new FC5WriteCoilTask(0, this.m(KmtronicRelay4Port.ChannelId.RELAY_1, new CoilElement(0))), //
-				new FC5WriteCoilTask(1, this.m(KmtronicRelay4Port.ChannelId.RELAY_2, new CoilElement(1))), //
-				new FC5WriteCoilTask(2, this.m(KmtronicRelay4Port.ChannelId.RELAY_3, new CoilElement(2))), //
-				new FC5WriteCoilTask(3, this.m(KmtronicRelay4Port.ChannelId.RELAY_4, new CoilElement(3))) //
+				new FC5WriteCoilTask(0, m(KmtronicRelay4Port.ChannelId.RELAY_1, new CoilElement(0))), //
+				new FC5WriteCoilTask(1, m(KmtronicRelay4Port.ChannelId.RELAY_2, new CoilElement(1))), //
+				new FC5WriteCoilTask(2, m(KmtronicRelay4Port.ChannelId.RELAY_3, new CoilElement(2))), //
+				new FC5WriteCoilTask(3, m(KmtronicRelay4Port.ChannelId.RELAY_4, new CoilElement(3))) //
 		);
 	}
 
diff --git a/io.openems.edge.io.wago/src/io/openems/edge/wago/Wago.java b/io.openems.edge.io.wago/src/io/openems/edge/wago/Wago.java
index d435afa2146..c2ffd7bef3c 100644
--- a/io.openems.edge.io.wago/src/io/openems/edge/wago/Wago.java
+++ b/io.openems.edge.io.wago/src/io/openems/edge/wago/Wago.java
@@ -268,7 +268,7 @@ protected void createProtocolFromModules(List<FieldbusModule> modules) throws Op
 	 * @return the modbus {@link CoilElement}
 	 */
 	protected CoilElement createModbusCoilElement(io.openems.edge.common.channel.ChannelId channelId, int address) {
-		return this.m(channelId, new CoilElement(address));
+		return m(channelId, new CoilElement(address));
 	}
 
 	@Override
diff --git a/io.openems.edge.meter.artemes.am2/src/io/openems/edge/meter/artemes/am2/MeterArtemesAM2.java b/io.openems.edge.meter.artemes.am2/src/io/openems/edge/meter/artemes/am2/MeterArtemesAM2.java
index c365f116140..aee0fd80874 100644
--- a/io.openems.edge.meter.artemes.am2/src/io/openems/edge/meter/artemes/am2/MeterArtemesAM2.java
+++ b/io.openems.edge.meter.artemes.am2/src/io/openems/edge/meter/artemes/am2/MeterArtemesAM2.java
@@ -99,41 +99,41 @@ public MeterType getMeterType() {
 	protected ModbusProtocol defineModbusProtocol() throws OpenemsException {
 		return new ModbusProtocol(this,
 				new FC4ReadInputRegistersTask(0x0000, Priority.HIGH,
-						this.m(AsymmetricMeter.ChannelId.VOLTAGE_L1, new UnsignedDoublewordElement(0x0000)),
-						this.m(AsymmetricMeter.ChannelId.VOLTAGE_L2, new UnsignedDoublewordElement(0x0002)),
-						this.m(AsymmetricMeter.ChannelId.VOLTAGE_L3, new UnsignedDoublewordElement(0x0004)),
+						m(AsymmetricMeter.ChannelId.VOLTAGE_L1, new UnsignedDoublewordElement(0x0000)),
+						m(AsymmetricMeter.ChannelId.VOLTAGE_L2, new UnsignedDoublewordElement(0x0002)),
+						m(AsymmetricMeter.ChannelId.VOLTAGE_L3, new UnsignedDoublewordElement(0x0004)),
 						new DummyRegisterElement(0x0006, 0x000B),
-						this.m(SymmetricMeter.ChannelId.VOLTAGE, new UnsignedDoublewordElement(0x000C)),
-						this.m(AsymmetricMeter.ChannelId.CURRENT_L1, new SignedDoublewordElement(0x000E)),
-						this.m(AsymmetricMeter.ChannelId.CURRENT_L2, new SignedDoublewordElement(0x0010)),
-						this.m(AsymmetricMeter.ChannelId.CURRENT_L3, new SignedDoublewordElement(0x0012)),
+						m(SymmetricMeter.ChannelId.VOLTAGE, new UnsignedDoublewordElement(0x000C)),
+						m(AsymmetricMeter.ChannelId.CURRENT_L1, new SignedDoublewordElement(0x000E)),
+						m(AsymmetricMeter.ChannelId.CURRENT_L2, new SignedDoublewordElement(0x0010)),
+						m(AsymmetricMeter.ChannelId.CURRENT_L3, new SignedDoublewordElement(0x0012)),
 						new DummyRegisterElement(0x0014, 0x0015),
-						this.m(SymmetricMeter.ChannelId.CURRENT, new SignedDoublewordElement(0x0016)),
-						this.m(AsymmetricMeter.ChannelId.ACTIVE_POWER_L1, new SignedQuadruplewordElement(0x0018),
+						m(SymmetricMeter.ChannelId.CURRENT, new SignedDoublewordElement(0x0016)),
+						m(AsymmetricMeter.ChannelId.ACTIVE_POWER_L1, new SignedQuadruplewordElement(0x0018),
 								ElementToChannelConverter.SCALE_FACTOR_MINUS_3),
-						this.m(AsymmetricMeter.ChannelId.ACTIVE_POWER_L2, new SignedQuadruplewordElement(0x001C),
+						m(AsymmetricMeter.ChannelId.ACTIVE_POWER_L2, new SignedQuadruplewordElement(0x001C),
 								ElementToChannelConverter.SCALE_FACTOR_MINUS_3),
-						this.m(AsymmetricMeter.ChannelId.ACTIVE_POWER_L3, new SignedQuadruplewordElement(0X0020),
+						m(AsymmetricMeter.ChannelId.ACTIVE_POWER_L3, new SignedQuadruplewordElement(0X0020),
 								ElementToChannelConverter.SCALE_FACTOR_MINUS_3),
-						this.m(SymmetricMeter.ChannelId.ACTIVE_POWER, new SignedQuadruplewordElement(0X0024),
+						m(SymmetricMeter.ChannelId.ACTIVE_POWER, new SignedQuadruplewordElement(0X0024),
 								ElementToChannelConverter.SCALE_FACTOR_MINUS_3),
 						new DummyRegisterElement(0x0028, 0x0037),
-						this.m(AsymmetricMeter.ChannelId.REACTIVE_POWER_L1, new SignedQuadruplewordElement(0x0038),
+						m(AsymmetricMeter.ChannelId.REACTIVE_POWER_L1, new SignedQuadruplewordElement(0x0038),
 								ElementToChannelConverter.SCALE_FACTOR_MINUS_3),
-						this.m(AsymmetricMeter.ChannelId.REACTIVE_POWER_L2, new SignedQuadruplewordElement(0x003C),
+						m(AsymmetricMeter.ChannelId.REACTIVE_POWER_L2, new SignedQuadruplewordElement(0x003C),
 								ElementToChannelConverter.SCALE_FACTOR_MINUS_3),
-						this.m(AsymmetricMeter.ChannelId.REACTIVE_POWER_L3, new SignedQuadruplewordElement(0x0040),
+						m(AsymmetricMeter.ChannelId.REACTIVE_POWER_L3, new SignedQuadruplewordElement(0x0040),
 								ElementToChannelConverter.SCALE_FACTOR_MINUS_3),
-						this.m(SymmetricMeter.ChannelId.REACTIVE_POWER, new SignedQuadruplewordElement(0x0044),
+						m(SymmetricMeter.ChannelId.REACTIVE_POWER, new SignedQuadruplewordElement(0x0044),
 								ElementToChannelConverter.SCALE_FACTOR_MINUS_3),
 						new DummyRegisterElement(0x0048, 0x0071),
-						this.m(SymmetricMeter.ChannelId.FREQUENCY, new UnsignedDoublewordElement(0x0072))),
+						m(SymmetricMeter.ChannelId.FREQUENCY, new UnsignedDoublewordElement(0x0072))),
 
 				new FC4ReadInputRegistersTask(0x0418, Priority.LOW,
-						this.m(SymmetricMeter.ChannelId.ACTIVE_PRODUCTION_ENERGY,
+						m(SymmetricMeter.ChannelId.ACTIVE_PRODUCTION_ENERGY,
 								new UnsignedQuadruplewordElement(0x0418),
 								ElementToChannelConverter.SCALE_FACTOR_MINUS_1),
-						this.m(SymmetricMeter.ChannelId.ACTIVE_CONSUMPTION_ENERGY,
+						m(SymmetricMeter.ChannelId.ACTIVE_CONSUMPTION_ENERGY,
 								new UnsignedQuadruplewordElement(0x0041C),
 								ElementToChannelConverter.SCALE_FACTOR_MINUS_1)));
 	}
diff --git a/io.openems.edge.meter.bcontrol.em300/src/io/openems/edge/meter/bcontrol/em300/MeterBControlEM300Impl.java b/io.openems.edge.meter.bcontrol.em300/src/io/openems/edge/meter/bcontrol/em300/MeterBControlEM300Impl.java
index 3c28bc2632d..220f04b7396 100644
--- a/io.openems.edge.meter.bcontrol.em300/src/io/openems/edge/meter/bcontrol/em300/MeterBControlEM300Impl.java
+++ b/io.openems.edge.meter.bcontrol.em300/src/io/openems/edge/meter/bcontrol/em300/MeterBControlEM300Impl.java
@@ -92,72 +92,72 @@ public MeterType getMeterType() {
 	protected ModbusProtocol defineModbusProtocol() throws OpenemsException {
 		var modbusProtocol = new ModbusProtocol(this, //
 				new FC3ReadRegistersTask(0, Priority.HIGH, //
-						this.m(MeterBControlEM300.ChannelId.ACTIVE_POWER_POS, new UnsignedDoublewordElement(0),
+						m(MeterBControlEM300.ChannelId.ACTIVE_POWER_POS, new UnsignedDoublewordElement(0),
 								ElementToChannelConverter.SCALE_FACTOR_MINUS_1),
-						this.m(MeterBControlEM300.ChannelId.ACTIVE_POWER_NEG, new UnsignedDoublewordElement(2),
+						m(MeterBControlEM300.ChannelId.ACTIVE_POWER_NEG, new UnsignedDoublewordElement(2),
 								ElementToChannelConverter.SCALE_FACTOR_MINUS_1),
-						this.m(MeterBControlEM300.ChannelId.REACTIVE_POWER_POS, new UnsignedDoublewordElement(4),
+						m(MeterBControlEM300.ChannelId.REACTIVE_POWER_POS, new UnsignedDoublewordElement(4),
 								ElementToChannelConverter.SCALE_FACTOR_MINUS_1),
-						this.m(MeterBControlEM300.ChannelId.REACTIVE_POWER_NEG, new UnsignedDoublewordElement(6),
+						m(MeterBControlEM300.ChannelId.REACTIVE_POWER_NEG, new UnsignedDoublewordElement(6),
 								ElementToChannelConverter.SCALE_FACTOR_MINUS_1)),
 
 				new FC3ReadRegistersTask(10, Priority.LOW,
-						this.m(SymmetricMeter.ChannelId.FREQUENCY, new UnsignedDoublewordElement(10))),
+						m(SymmetricMeter.ChannelId.FREQUENCY, new UnsignedDoublewordElement(10))),
 
 				new FC3ReadRegistersTask(40, Priority.HIGH,
-						this.m(MeterBControlEM300.ChannelId.ACTIVE_POWER_L1_POS, new UnsignedDoublewordElement(40),
+						m(MeterBControlEM300.ChannelId.ACTIVE_POWER_L1_POS, new UnsignedDoublewordElement(40),
 								ElementToChannelConverter.SCALE_FACTOR_MINUS_1),
-						this.m(MeterBControlEM300.ChannelId.ACTIVE_POWER_L1_NEG, new UnsignedDoublewordElement(42),
+						m(MeterBControlEM300.ChannelId.ACTIVE_POWER_L1_NEG, new UnsignedDoublewordElement(42),
 								ElementToChannelConverter.SCALE_FACTOR_MINUS_1),
-						this.m(MeterBControlEM300.ChannelId.REACTIVE_POWER_L1_POS, new UnsignedDoublewordElement(44),
+						m(MeterBControlEM300.ChannelId.REACTIVE_POWER_L1_POS, new UnsignedDoublewordElement(44),
 								ElementToChannelConverter.SCALE_FACTOR_MINUS_1),
-						this.m(MeterBControlEM300.ChannelId.REACTIVE_POWER_L1_NEG, new UnsignedDoublewordElement(46),
+						m(MeterBControlEM300.ChannelId.REACTIVE_POWER_L1_NEG, new UnsignedDoublewordElement(46),
 								ElementToChannelConverter.SCALE_FACTOR_MINUS_1)),
 
 				new FC3ReadRegistersTask(60, Priority.HIGH,
-						this.m(AsymmetricMeter.ChannelId.CURRENT_L1, new UnsignedDoublewordElement(60)),
-						this.m(AsymmetricMeter.ChannelId.VOLTAGE_L1, new UnsignedDoublewordElement(62))), //
+						m(AsymmetricMeter.ChannelId.CURRENT_L1, new UnsignedDoublewordElement(60)),
+						m(AsymmetricMeter.ChannelId.VOLTAGE_L1, new UnsignedDoublewordElement(62))), //
 
 				new FC3ReadRegistersTask(80, Priority.HIGH,
-						this.m(MeterBControlEM300.ChannelId.ACTIVE_POWER_L2_POS, new UnsignedDoublewordElement(80),
+						m(MeterBControlEM300.ChannelId.ACTIVE_POWER_L2_POS, new UnsignedDoublewordElement(80),
 								ElementToChannelConverter.SCALE_FACTOR_MINUS_1),
-						this.m(MeterBControlEM300.ChannelId.ACTIVE_POWER_L2_NEG, new UnsignedDoublewordElement(82),
+						m(MeterBControlEM300.ChannelId.ACTIVE_POWER_L2_NEG, new UnsignedDoublewordElement(82),
 								ElementToChannelConverter.SCALE_FACTOR_MINUS_1),
 
-						this.m(MeterBControlEM300.ChannelId.REACTIVE_POWER_L2_POS, new UnsignedDoublewordElement(84),
+						m(MeterBControlEM300.ChannelId.REACTIVE_POWER_L2_POS, new UnsignedDoublewordElement(84),
 								ElementToChannelConverter.SCALE_FACTOR_MINUS_1),
-						this.m(MeterBControlEM300.ChannelId.REACTIVE_POWER_L2_NEG, new UnsignedDoublewordElement(86),
+						m(MeterBControlEM300.ChannelId.REACTIVE_POWER_L2_NEG, new UnsignedDoublewordElement(86),
 								ElementToChannelConverter.SCALE_FACTOR_MINUS_1)),
 
 				new FC3ReadRegistersTask(100, Priority.HIGH,
-						this.m(AsymmetricMeter.ChannelId.CURRENT_L2, new UnsignedDoublewordElement(100)),
-						this.m(AsymmetricMeter.ChannelId.VOLTAGE_L2, new UnsignedDoublewordElement(102))),
+						m(AsymmetricMeter.ChannelId.CURRENT_L2, new UnsignedDoublewordElement(100)),
+						m(AsymmetricMeter.ChannelId.VOLTAGE_L2, new UnsignedDoublewordElement(102))),
 
 				new FC3ReadRegistersTask(120, Priority.HIGH,
-						this.m(MeterBControlEM300.ChannelId.ACTIVE_POWER_L3_POS, new UnsignedDoublewordElement(120),
+						m(MeterBControlEM300.ChannelId.ACTIVE_POWER_L3_POS, new UnsignedDoublewordElement(120),
 								ElementToChannelConverter.SCALE_FACTOR_MINUS_1),
-						this.m(MeterBControlEM300.ChannelId.ACTIVE_POWER_L3_NEG, new UnsignedDoublewordElement(122),
+						m(MeterBControlEM300.ChannelId.ACTIVE_POWER_L3_NEG, new UnsignedDoublewordElement(122),
 								ElementToChannelConverter.SCALE_FACTOR_MINUS_1),
-						this.m(MeterBControlEM300.ChannelId.REACTIVE_POWER_L3_POS, new UnsignedDoublewordElement(124),
+						m(MeterBControlEM300.ChannelId.REACTIVE_POWER_L3_POS, new UnsignedDoublewordElement(124),
 								ElementToChannelConverter.SCALE_FACTOR_MINUS_1),
-						this.m(MeterBControlEM300.ChannelId.REACTIVE_POWER_L3_NEG, new UnsignedDoublewordElement(126),
+						m(MeterBControlEM300.ChannelId.REACTIVE_POWER_L3_NEG, new UnsignedDoublewordElement(126),
 								ElementToChannelConverter.SCALE_FACTOR_MINUS_1)),
 
 				new FC3ReadRegistersTask(140, Priority.HIGH,
-						this.m(AsymmetricMeter.ChannelId.CURRENT_L3, new UnsignedDoublewordElement(140)),
-						this.m(AsymmetricMeter.ChannelId.VOLTAGE_L3, new UnsignedDoublewordElement(142))));
+						m(AsymmetricMeter.ChannelId.CURRENT_L3, new UnsignedDoublewordElement(140)),
+						m(AsymmetricMeter.ChannelId.VOLTAGE_L3, new UnsignedDoublewordElement(142))));
 
 		if (this.config.invert()) {
 			modbusProtocol.addTask(new FC3ReadRegistersTask(512, Priority.LOW, //
-					this.m(SymmetricMeter.ChannelId.ACTIVE_CONSUMPTION_ENERGY, new UnsignedQuadruplewordElement(512),
+					m(SymmetricMeter.ChannelId.ACTIVE_CONSUMPTION_ENERGY, new UnsignedQuadruplewordElement(512),
 							ElementToChannelConverter.SCALE_FACTOR_MINUS_1),
-					this.m(SymmetricMeter.ChannelId.ACTIVE_PRODUCTION_ENERGY, new UnsignedQuadruplewordElement(516),
+					m(SymmetricMeter.ChannelId.ACTIVE_PRODUCTION_ENERGY, new UnsignedQuadruplewordElement(516),
 							ElementToChannelConverter.SCALE_FACTOR_MINUS_1)));
 		} else {
 			modbusProtocol.addTask(new FC3ReadRegistersTask(512, Priority.LOW, //
-					this.m(SymmetricMeter.ChannelId.ACTIVE_PRODUCTION_ENERGY, new UnsignedQuadruplewordElement(512),
+					m(SymmetricMeter.ChannelId.ACTIVE_PRODUCTION_ENERGY, new UnsignedQuadruplewordElement(512),
 							ElementToChannelConverter.SCALE_FACTOR_MINUS_1),
-					this.m(SymmetricMeter.ChannelId.ACTIVE_CONSUMPTION_ENERGY, new UnsignedQuadruplewordElement(516),
+					m(SymmetricMeter.ChannelId.ACTIVE_CONSUMPTION_ENERGY, new UnsignedQuadruplewordElement(516),
 							ElementToChannelConverter.SCALE_FACTOR_MINUS_1)));
 		}
 
diff --git a/io.openems.edge.meter.carlo.gavazzi.em300/src/io/openems/edge/meter/carlo/gavazzi/em300/MeterCarloGavazziEm300Impl.java b/io.openems.edge.meter.carlo.gavazzi.em300/src/io/openems/edge/meter/carlo/gavazzi/em300/MeterCarloGavazziEm300Impl.java
index ff458d0fdef..386424a2316 100644
--- a/io.openems.edge.meter.carlo.gavazzi.em300/src/io/openems/edge/meter/carlo/gavazzi/em300/MeterCarloGavazziEm300Impl.java
+++ b/io.openems.edge.meter.carlo.gavazzi.em300/src/io/openems/edge/meter/carlo/gavazzi/em300/MeterCarloGavazziEm300Impl.java
@@ -115,83 +115,83 @@ protected ModbusProtocol defineModbusProtocol() throws OpenemsException {
 
 		return new ModbusProtocol(this, //
 				new FC4ReadInputRegistersTask(300001 - offset, Priority.LOW, //
-						this.m(AsymmetricMeter.ChannelId.VOLTAGE_L1,
+						m(AsymmetricMeter.ChannelId.VOLTAGE_L1,
 								new SignedDoublewordElement(300001 - offset).wordOrder(WordOrder.LSWMSW),
 								ElementToChannelConverter.SCALE_FACTOR_2),
-						this.m(AsymmetricMeter.ChannelId.VOLTAGE_L2,
+						m(AsymmetricMeter.ChannelId.VOLTAGE_L2,
 								new SignedDoublewordElement(300003 - offset).wordOrder(WordOrder.LSWMSW),
 								ElementToChannelConverter.SCALE_FACTOR_2),
-						this.m(AsymmetricMeter.ChannelId.VOLTAGE_L3,
+						m(AsymmetricMeter.ChannelId.VOLTAGE_L3,
 								new SignedDoublewordElement(300005 - offset).wordOrder(WordOrder.LSWMSW),
 								ElementToChannelConverter.SCALE_FACTOR_2)),
 				new FC4ReadInputRegistersTask(300013 - offset, Priority.HIGH, //
-						this.m(AsymmetricMeter.ChannelId.CURRENT_L1,
+						m(AsymmetricMeter.ChannelId.CURRENT_L1,
 								new SignedDoublewordElement(300013 - offset).wordOrder(WordOrder.LSWMSW),
 								ElementToChannelConverter.SCALE_FACTOR_2_AND_INVERT_IF_TRUE(this.config.invert())),
-						this.m(AsymmetricMeter.ChannelId.CURRENT_L2,
+						m(AsymmetricMeter.ChannelId.CURRENT_L2,
 								new SignedDoublewordElement(300015 - offset).wordOrder(WordOrder.LSWMSW),
 								ElementToChannelConverter.SCALE_FACTOR_2_AND_INVERT_IF_TRUE(this.config.invert())),
-						this.m(AsymmetricMeter.ChannelId.CURRENT_L3,
+						m(AsymmetricMeter.ChannelId.CURRENT_L3,
 								new SignedDoublewordElement(300017 - offset).wordOrder(WordOrder.LSWMSW),
 								ElementToChannelConverter.SCALE_FACTOR_2_AND_INVERT_IF_TRUE(this.config.invert())),
-						this.m(AsymmetricMeter.ChannelId.ACTIVE_POWER_L1,
+						m(AsymmetricMeter.ChannelId.ACTIVE_POWER_L1,
 								new SignedDoublewordElement(300019 - offset).wordOrder(WordOrder.LSWMSW),
 								ElementToChannelConverter
 										.SCALE_FACTOR_MINUS_1_AND_INVERT_IF_TRUE(this.config.invert())),
-						this.m(AsymmetricMeter.ChannelId.ACTIVE_POWER_L2,
+						m(AsymmetricMeter.ChannelId.ACTIVE_POWER_L2,
 								new SignedDoublewordElement(300021 - offset).wordOrder(WordOrder.LSWMSW),
 								ElementToChannelConverter
 										.SCALE_FACTOR_MINUS_1_AND_INVERT_IF_TRUE(this.config.invert())),
-						this.m(AsymmetricMeter.ChannelId.ACTIVE_POWER_L3,
+						m(AsymmetricMeter.ChannelId.ACTIVE_POWER_L3,
 								new SignedDoublewordElement(300023 - offset).wordOrder(WordOrder.LSWMSW),
 								ElementToChannelConverter
 										.SCALE_FACTOR_MINUS_1_AND_INVERT_IF_TRUE(this.config.invert())),
-						this.m(MeterCarloGavazziEm300.ChannelId.APPARENT_POWER_L1,
+						m(MeterCarloGavazziEm300.ChannelId.APPARENT_POWER_L1,
 								new SignedDoublewordElement(300025 - offset).wordOrder(WordOrder.LSWMSW),
 								ElementToChannelConverter
 										.SCALE_FACTOR_MINUS_1_AND_INVERT_IF_TRUE(this.config.invert())),
-						this.m(MeterCarloGavazziEm300.ChannelId.APPARENT_POWER_L2,
+						m(MeterCarloGavazziEm300.ChannelId.APPARENT_POWER_L2,
 								new SignedDoublewordElement(300027 - offset).wordOrder(WordOrder.LSWMSW),
 								ElementToChannelConverter
 										.SCALE_FACTOR_MINUS_1_AND_INVERT_IF_TRUE(this.config.invert())),
-						this.m(MeterCarloGavazziEm300.ChannelId.APPARENT_POWER_L3,
+						m(MeterCarloGavazziEm300.ChannelId.APPARENT_POWER_L3,
 								new SignedDoublewordElement(300029 - offset).wordOrder(WordOrder.LSWMSW),
 								ElementToChannelConverter
 										.SCALE_FACTOR_MINUS_1_AND_INVERT_IF_TRUE(this.config.invert())),
-						this.m(AsymmetricMeter.ChannelId.REACTIVE_POWER_L1,
+						m(AsymmetricMeter.ChannelId.REACTIVE_POWER_L1,
 								new SignedDoublewordElement(300031 - offset).wordOrder(WordOrder.LSWMSW),
 								ElementToChannelConverter
 										.SCALE_FACTOR_MINUS_1_AND_INVERT_IF_TRUE(this.config.invert())),
-						this.m(AsymmetricMeter.ChannelId.REACTIVE_POWER_L2,
+						m(AsymmetricMeter.ChannelId.REACTIVE_POWER_L2,
 								new SignedDoublewordElement(300033 - offset).wordOrder(WordOrder.LSWMSW),
 								ElementToChannelConverter
 										.SCALE_FACTOR_MINUS_1_AND_INVERT_IF_TRUE(this.config.invert())),
-						this.m(AsymmetricMeter.ChannelId.REACTIVE_POWER_L3,
+						m(AsymmetricMeter.ChannelId.REACTIVE_POWER_L3,
 								new SignedDoublewordElement(300035 - offset).wordOrder(WordOrder.LSWMSW),
 								ElementToChannelConverter
 										.SCALE_FACTOR_MINUS_1_AND_INVERT_IF_TRUE(this.config.invert())),
 						new DummyRegisterElement(300037 - offset, 300040 - offset), //
-						this.m(SymmetricMeter.ChannelId.ACTIVE_POWER,
+						m(SymmetricMeter.ChannelId.ACTIVE_POWER,
 								new SignedDoublewordElement(300041 - offset).wordOrder(WordOrder.LSWMSW),
 								ElementToChannelConverter
 										.SCALE_FACTOR_MINUS_1_AND_INVERT_IF_TRUE(this.config.invert())),
-						this.m(MeterCarloGavazziEm300.ChannelId.APPARENT_POWER,
+						m(MeterCarloGavazziEm300.ChannelId.APPARENT_POWER,
 								new SignedDoublewordElement(300043 - offset).wordOrder(WordOrder.LSWMSW),
 								ElementToChannelConverter
 										.SCALE_FACTOR_MINUS_1_AND_INVERT_IF_TRUE(this.config.invert())),
-						this.m(SymmetricMeter.ChannelId.REACTIVE_POWER,
+						m(SymmetricMeter.ChannelId.REACTIVE_POWER,
 								new SignedDoublewordElement(300045 - offset).wordOrder(WordOrder.LSWMSW),
 								ElementToChannelConverter
 										.SCALE_FACTOR_MINUS_1_AND_INVERT_IF_TRUE(this.config.invert()))),
 
 				new FC4ReadInputRegistersTask(300052 - offset, Priority.LOW, //
-						this.m(SymmetricMeter.ChannelId.FREQUENCY, new UnsignedWordElement(300052 - offset),
+						m(SymmetricMeter.ChannelId.FREQUENCY, new UnsignedWordElement(300052 - offset),
 								ElementToChannelConverter.SCALE_FACTOR_2),
-						this.m(energyChannelId300053,
+						m(energyChannelId300053,
 								new SignedDoublewordElement(300053 - offset).wordOrder(WordOrder.LSWMSW),
 								ElementToChannelConverter.SCALE_FACTOR_2),
 						new DummyRegisterElement(300055 - offset, 300078 - offset), //
-						this.m(energyChannelId300079,
+						m(energyChannelId300079,
 								new SignedDoublewordElement(300079 - offset).wordOrder(WordOrder.LSWMSW),
 								ElementToChannelConverter.SCALE_FACTOR_2)));
 	}
diff --git a/io.openems.edge.meter.janitza/src/io/openems/edge/meter/janitza/umg511/MeterJanitzaUmg511Impl.java b/io.openems.edge.meter.janitza/src/io/openems/edge/meter/janitza/umg511/MeterJanitzaUmg511Impl.java
index 955e3279cd4..96f2d7e35ef 100644
--- a/io.openems.edge.meter.janitza/src/io/openems/edge/meter/janitza/umg511/MeterJanitzaUmg511Impl.java
+++ b/io.openems.edge.meter.janitza/src/io/openems/edge/meter/janitza/umg511/MeterJanitzaUmg511Impl.java
@@ -96,56 +96,56 @@ public MeterType getMeterType() {
 	protected ModbusProtocol defineModbusProtocol() throws OpenemsException {
 		var modbusProtocol = new ModbusProtocol(this, //
 				new FC3ReadRegistersTask(3845, Priority.HIGH, //
-						this.m(new FloatDoublewordElement(3845))
+						m(new FloatDoublewordElement(3845))
 								.m(AsymmetricMeter.ChannelId.VOLTAGE_L1, ElementToChannelConverter.SCALE_FACTOR_3)//
 								.m(SymmetricMeter.ChannelId.VOLTAGE, ElementToChannelConverter.SCALE_FACTOR_3)//
 								.build(),
-						this.m(AsymmetricMeter.ChannelId.VOLTAGE_L2, new FloatDoublewordElement(3847),
+						m(AsymmetricMeter.ChannelId.VOLTAGE_L2, new FloatDoublewordElement(3847),
 								ElementToChannelConverter.SCALE_FACTOR_3), //
-						this.m(AsymmetricMeter.ChannelId.VOLTAGE_L3, new FloatDoublewordElement(3849),
+						m(AsymmetricMeter.ChannelId.VOLTAGE_L3, new FloatDoublewordElement(3849),
 								ElementToChannelConverter.SCALE_FACTOR_3), // , //
-						new DummyRegisterElement(3851, 3852), this.m(new FloatDoublewordElement(3853)) //
+						new DummyRegisterElement(3851, 3852), m(new FloatDoublewordElement(3853)) //
 								.m(AsymmetricMeter.ChannelId.CURRENT_L1,
 										ElementToChannelConverter.SCALE_FACTOR_3_AND_INVERT_IF_TRUE(this.invert)) //
 								.m(SymmetricMeter.ChannelId.CURRENT,
 										ElementToChannelConverter.SCALE_FACTOR_3_AND_INVERT_IF_TRUE(this.invert)) //
 								.build(), //
-						this.m(AsymmetricMeter.ChannelId.CURRENT_L2, new FloatDoublewordElement(3855), //
+						m(AsymmetricMeter.ChannelId.CURRENT_L2, new FloatDoublewordElement(3855), //
 								ElementToChannelConverter.SCALE_FACTOR_3_AND_INVERT_IF_TRUE(this.invert)), //
-						this.m(AsymmetricMeter.ChannelId.CURRENT_L3, new FloatDoublewordElement(3857), //
+						m(AsymmetricMeter.ChannelId.CURRENT_L3, new FloatDoublewordElement(3857), //
 								ElementToChannelConverter.SCALE_FACTOR_3_AND_INVERT_IF_TRUE(this.invert)), //
 						new DummyRegisterElement(3859, 3860),
-						this.m(AsymmetricMeter.ChannelId.ACTIVE_POWER_L1, new FloatDoublewordElement(3861), //
+						m(AsymmetricMeter.ChannelId.ACTIVE_POWER_L1, new FloatDoublewordElement(3861), //
 								ElementToChannelConverter.INVERT_IF_TRUE(this.invert)), //
-						this.m(AsymmetricMeter.ChannelId.ACTIVE_POWER_L2, new FloatDoublewordElement(3863), //
+						m(AsymmetricMeter.ChannelId.ACTIVE_POWER_L2, new FloatDoublewordElement(3863), //
 								ElementToChannelConverter.INVERT_IF_TRUE(this.invert)), //
-						this.m(AsymmetricMeter.ChannelId.ACTIVE_POWER_L3, new FloatDoublewordElement(3865), //
+						m(AsymmetricMeter.ChannelId.ACTIVE_POWER_L3, new FloatDoublewordElement(3865), //
 								ElementToChannelConverter.INVERT_IF_TRUE(this.invert)), //
 						new DummyRegisterElement(3867, 3868),
-						this.m(AsymmetricMeter.ChannelId.REACTIVE_POWER_L1, new FloatDoublewordElement(3869), //
+						m(AsymmetricMeter.ChannelId.REACTIVE_POWER_L1, new FloatDoublewordElement(3869), //
 								ElementToChannelConverter.INVERT_IF_TRUE(this.invert)), //
-						this.m(AsymmetricMeter.ChannelId.REACTIVE_POWER_L2, new FloatDoublewordElement(3871), //
+						m(AsymmetricMeter.ChannelId.REACTIVE_POWER_L2, new FloatDoublewordElement(3871), //
 								ElementToChannelConverter.INVERT_IF_TRUE(this.invert)), //
-						this.m(AsymmetricMeter.ChannelId.REACTIVE_POWER_L3, new FloatDoublewordElement(3873), //
+						m(AsymmetricMeter.ChannelId.REACTIVE_POWER_L3, new FloatDoublewordElement(3873), //
 								ElementToChannelConverter.INVERT_IF_TRUE(this.invert))), //
 				new FC3ReadRegistersTask(3925, Priority.HIGH, //
-						this.m(SymmetricMeter.ChannelId.ACTIVE_POWER, new FloatDoublewordElement(3925)), //
-						this.m(SymmetricMeter.ChannelId.REACTIVE_POWER, new FloatDoublewordElement(3927), //
+						m(SymmetricMeter.ChannelId.ACTIVE_POWER, new FloatDoublewordElement(3925)), //
+						m(SymmetricMeter.ChannelId.REACTIVE_POWER, new FloatDoublewordElement(3927), //
 								ElementToChannelConverter.INVERT_IF_TRUE(this.invert))), //
 				new FC3ReadRegistersTask(3995, Priority.LOW, //
-						this.m(SymmetricMeter.ChannelId.FREQUENCY, new FloatDoublewordElement(3995), //
+						m(SymmetricMeter.ChannelId.FREQUENCY, new FloatDoublewordElement(3995), //
 								ElementToChannelConverter.SCALE_FACTOR_3)));
 
 		if (this.invert) {
 			modbusProtocol.addTask(new FC3ReadRegistersTask(19068, Priority.LOW, //
-					this.m(SymmetricMeter.ChannelId.ACTIVE_CONSUMPTION_ENERGY, new FloatDoublewordElement(19068)),
+					m(SymmetricMeter.ChannelId.ACTIVE_CONSUMPTION_ENERGY, new FloatDoublewordElement(19068)),
 					new DummyRegisterElement(19070, 19075),
-					this.m(SymmetricMeter.ChannelId.ACTIVE_PRODUCTION_ENERGY, new FloatDoublewordElement(19076))));
+					m(SymmetricMeter.ChannelId.ACTIVE_PRODUCTION_ENERGY, new FloatDoublewordElement(19076))));
 		} else {
 			modbusProtocol.addTask(new FC3ReadRegistersTask(19068, Priority.LOW, //
-					this.m(SymmetricMeter.ChannelId.ACTIVE_PRODUCTION_ENERGY, new FloatDoublewordElement(19068)),
+					m(SymmetricMeter.ChannelId.ACTIVE_PRODUCTION_ENERGY, new FloatDoublewordElement(19068)),
 					new DummyRegisterElement(19070, 19075),
-					this.m(SymmetricMeter.ChannelId.ACTIVE_CONSUMPTION_ENERGY, new FloatDoublewordElement(19076))));
+					m(SymmetricMeter.ChannelId.ACTIVE_CONSUMPTION_ENERGY, new FloatDoublewordElement(19076))));
 		}
 
 		return modbusProtocol;
diff --git a/io.openems.edge.meter.janitza/src/io/openems/edge/meter/janitza/umg604/MeterJanitzaUmg604Impl.java b/io.openems.edge.meter.janitza/src/io/openems/edge/meter/janitza/umg604/MeterJanitzaUmg604Impl.java
index 22292b764a9..47fa00c1c9b 100644
--- a/io.openems.edge.meter.janitza/src/io/openems/edge/meter/janitza/umg604/MeterJanitzaUmg604Impl.java
+++ b/io.openems.edge.meter.janitza/src/io/openems/edge/meter/janitza/umg604/MeterJanitzaUmg604Impl.java
@@ -96,58 +96,58 @@ public MeterType getMeterType() {
 	protected ModbusProtocol defineModbusProtocol() throws OpenemsException {
 		var modbusProtocol = new ModbusProtocol(this, //
 				new FC3ReadRegistersTask(1317, Priority.HIGH, //
-						this.m(new FloatDoublewordElement(1317))
+						m(new FloatDoublewordElement(1317))
 								.m(AsymmetricMeter.ChannelId.VOLTAGE_L1, ElementToChannelConverter.SCALE_FACTOR_3)//
 								.m(SymmetricMeter.ChannelId.VOLTAGE, ElementToChannelConverter.SCALE_FACTOR_3)//
 								.build(),
-						this.m(AsymmetricMeter.ChannelId.VOLTAGE_L2, new FloatDoublewordElement(1319), //
+						m(AsymmetricMeter.ChannelId.VOLTAGE_L2, new FloatDoublewordElement(1319), //
 								ElementToChannelConverter.SCALE_FACTOR_3), //
-						this.m(AsymmetricMeter.ChannelId.VOLTAGE_L3, new FloatDoublewordElement(1321), //
+						m(AsymmetricMeter.ChannelId.VOLTAGE_L3, new FloatDoublewordElement(1321), //
 								ElementToChannelConverter.SCALE_FACTOR_3), //
 						new DummyRegisterElement(1323, 1324), //
-						this.m(new FloatDoublewordElement(1325)) //
+						m(new FloatDoublewordElement(1325)) //
 								.m(AsymmetricMeter.ChannelId.CURRENT_L1,
 										ElementToChannelConverter.SCALE_FACTOR_3_AND_INVERT_IF_TRUE(this.invert)) //
 								.m(SymmetricMeter.ChannelId.CURRENT,
 										ElementToChannelConverter.SCALE_FACTOR_3_AND_INVERT_IF_TRUE(this.invert)) //
 								.build(), //
-						this.m(AsymmetricMeter.ChannelId.CURRENT_L2, new FloatDoublewordElement(1327), //
+						m(AsymmetricMeter.ChannelId.CURRENT_L2, new FloatDoublewordElement(1327), //
 								ElementToChannelConverter.SCALE_FACTOR_3_AND_INVERT_IF_TRUE(this.invert)), //
-						this.m(AsymmetricMeter.ChannelId.CURRENT_L3, new FloatDoublewordElement(1329), //
+						m(AsymmetricMeter.ChannelId.CURRENT_L3, new FloatDoublewordElement(1329), //
 								ElementToChannelConverter.SCALE_FACTOR_3_AND_INVERT_IF_TRUE(this.invert)), //
 						new DummyRegisterElement(1331, 1332), //
-						this.m(AsymmetricMeter.ChannelId.ACTIVE_POWER_L1, new FloatDoublewordElement(1333), //
+						m(AsymmetricMeter.ChannelId.ACTIVE_POWER_L1, new FloatDoublewordElement(1333), //
 								ElementToChannelConverter.INVERT_IF_TRUE(this.invert)), //
-						this.m(AsymmetricMeter.ChannelId.ACTIVE_POWER_L2, new FloatDoublewordElement(1335), //
+						m(AsymmetricMeter.ChannelId.ACTIVE_POWER_L2, new FloatDoublewordElement(1335), //
 								ElementToChannelConverter.INVERT_IF_TRUE(this.invert)), //
-						this.m(AsymmetricMeter.ChannelId.ACTIVE_POWER_L3, new FloatDoublewordElement(1337), //
+						m(AsymmetricMeter.ChannelId.ACTIVE_POWER_L3, new FloatDoublewordElement(1337), //
 								ElementToChannelConverter.INVERT_IF_TRUE(this.invert)), //
 						new DummyRegisterElement(1339, 1340), //
-						this.m(AsymmetricMeter.ChannelId.REACTIVE_POWER_L1, new FloatDoublewordElement(1341), //
+						m(AsymmetricMeter.ChannelId.REACTIVE_POWER_L1, new FloatDoublewordElement(1341), //
 								ElementToChannelConverter.INVERT_IF_TRUE(this.invert)), //
-						this.m(AsymmetricMeter.ChannelId.REACTIVE_POWER_L2, new FloatDoublewordElement(1343), //
+						m(AsymmetricMeter.ChannelId.REACTIVE_POWER_L2, new FloatDoublewordElement(1343), //
 								ElementToChannelConverter.INVERT_IF_TRUE(this.invert)), //
-						this.m(AsymmetricMeter.ChannelId.REACTIVE_POWER_L3, new FloatDoublewordElement(1345), //
+						m(AsymmetricMeter.ChannelId.REACTIVE_POWER_L3, new FloatDoublewordElement(1345), //
 								ElementToChannelConverter.INVERT_IF_TRUE(this.invert)), //
 						new DummyRegisterElement(1347, 1368), //
-						this.m(SymmetricMeter.ChannelId.ACTIVE_POWER, new FloatDoublewordElement(1369), //
+						m(SymmetricMeter.ChannelId.ACTIVE_POWER, new FloatDoublewordElement(1369), //
 								ElementToChannelConverter.INVERT_IF_TRUE(this.invert)), //
-						this.m(SymmetricMeter.ChannelId.REACTIVE_POWER, new FloatDoublewordElement(1371), //
+						m(SymmetricMeter.ChannelId.REACTIVE_POWER, new FloatDoublewordElement(1371), //
 								ElementToChannelConverter.INVERT_IF_TRUE(this.invert))), //
 				new FC3ReadRegistersTask(1439, Priority.LOW, //
-						this.m(SymmetricMeter.ChannelId.FREQUENCY, new FloatDoublewordElement(1439), //
+						m(SymmetricMeter.ChannelId.FREQUENCY, new FloatDoublewordElement(1439), //
 								ElementToChannelConverter.SCALE_FACTOR_3)));
 
 		if (this.invert) {
 			modbusProtocol.addTask(new FC3ReadRegistersTask(9851, Priority.LOW, //
-					this.m(SymmetricMeter.ChannelId.ACTIVE_CONSUMPTION_ENERGY, new FloatDoublewordElement(9851)),
+					m(SymmetricMeter.ChannelId.ACTIVE_CONSUMPTION_ENERGY, new FloatDoublewordElement(9851)),
 					new DummyRegisterElement(9853, 9862),
-					this.m(SymmetricMeter.ChannelId.ACTIVE_PRODUCTION_ENERGY, new FloatDoublewordElement(9863))));
+					m(SymmetricMeter.ChannelId.ACTIVE_PRODUCTION_ENERGY, new FloatDoublewordElement(9863))));
 		} else {
 			modbusProtocol.addTask(new FC3ReadRegistersTask(9851, Priority.LOW, //
-					this.m(SymmetricMeter.ChannelId.ACTIVE_PRODUCTION_ENERGY, new FloatDoublewordElement(9851)),
+					m(SymmetricMeter.ChannelId.ACTIVE_PRODUCTION_ENERGY, new FloatDoublewordElement(9851)),
 					new DummyRegisterElement(9853, 9862),
-					this.m(SymmetricMeter.ChannelId.ACTIVE_CONSUMPTION_ENERGY, new FloatDoublewordElement(9863))));
+					m(SymmetricMeter.ChannelId.ACTIVE_CONSUMPTION_ENERGY, new FloatDoublewordElement(9863))));
 		}
 
 		return modbusProtocol;
diff --git a/io.openems.edge.meter.janitza/src/io/openems/edge/meter/janitza/umg96rme/MeterJanitzaUmg96rme.java b/io.openems.edge.meter.janitza/src/io/openems/edge/meter/janitza/umg96rme/MeterJanitzaUmg96rme.java
index fbac55afd0a..5b6b60370a0 100644
--- a/io.openems.edge.meter.janitza/src/io/openems/edge/meter/janitza/umg96rme/MeterJanitzaUmg96rme.java
+++ b/io.openems.edge.meter.janitza/src/io/openems/edge/meter/janitza/umg96rme/MeterJanitzaUmg96rme.java
@@ -111,53 +111,53 @@ protected ModbusProtocol defineModbusProtocol() throws OpenemsException {
 		 */
 		var modbusProtocol = new ModbusProtocol(this, //
 				new FC3ReadRegistersTask(800, Priority.HIGH, //
-						this.m(SymmetricMeter.ChannelId.FREQUENCY, new FloatDoublewordElement(800),
+						m(SymmetricMeter.ChannelId.FREQUENCY, new FloatDoublewordElement(800),
 								ElementToChannelConverter.SCALE_FACTOR_3),
 						new DummyRegisterElement(802, 807), //
-						this.m(new FloatDoublewordElement(808)) //
+						m(new FloatDoublewordElement(808)) //
 								.m(AsymmetricMeter.ChannelId.VOLTAGE_L1, ElementToChannelConverter.SCALE_FACTOR_3) //
 								.m(SymmetricMeter.ChannelId.VOLTAGE, ElementToChannelConverter.SCALE_FACTOR_3) //
 								.build(), //
-						this.m(AsymmetricMeter.ChannelId.VOLTAGE_L2, new FloatDoublewordElement(810),
+						m(AsymmetricMeter.ChannelId.VOLTAGE_L2, new FloatDoublewordElement(810),
 								ElementToChannelConverter.SCALE_FACTOR_3),
-						this.m(AsymmetricMeter.ChannelId.VOLTAGE_L3, new FloatDoublewordElement(812),
+						m(AsymmetricMeter.ChannelId.VOLTAGE_L3, new FloatDoublewordElement(812),
 								ElementToChannelConverter.SCALE_FACTOR_3),
 						new DummyRegisterElement(814, 859), //
-						this.m(AsymmetricMeter.ChannelId.CURRENT_L1, new FloatDoublewordElement(860),
+						m(AsymmetricMeter.ChannelId.CURRENT_L1, new FloatDoublewordElement(860),
 								ElementToChannelConverter.SCALE_FACTOR_3_AND_INVERT_IF_TRUE(this.invert)),
-						this.m(AsymmetricMeter.ChannelId.CURRENT_L2, new FloatDoublewordElement(862),
+						m(AsymmetricMeter.ChannelId.CURRENT_L2, new FloatDoublewordElement(862),
 								ElementToChannelConverter.SCALE_FACTOR_3_AND_INVERT_IF_TRUE(this.invert)),
-						this.m(AsymmetricMeter.ChannelId.CURRENT_L3, new FloatDoublewordElement(864),
+						m(AsymmetricMeter.ChannelId.CURRENT_L3, new FloatDoublewordElement(864),
 								ElementToChannelConverter.SCALE_FACTOR_3_AND_INVERT_IF_TRUE(this.invert)),
-						this.m(SymmetricMeter.ChannelId.CURRENT, new FloatDoublewordElement(866),
+						m(SymmetricMeter.ChannelId.CURRENT, new FloatDoublewordElement(866),
 								ElementToChannelConverter.SCALE_FACTOR_3_AND_INVERT_IF_TRUE(this.invert)),
-						this.m(AsymmetricMeter.ChannelId.ACTIVE_POWER_L1, new FloatDoublewordElement(868),
+						m(AsymmetricMeter.ChannelId.ACTIVE_POWER_L1, new FloatDoublewordElement(868),
 								ElementToChannelConverter.INVERT_IF_TRUE(this.invert)),
-						this.m(AsymmetricMeter.ChannelId.ACTIVE_POWER_L2, new FloatDoublewordElement(870),
+						m(AsymmetricMeter.ChannelId.ACTIVE_POWER_L2, new FloatDoublewordElement(870),
 								ElementToChannelConverter.INVERT_IF_TRUE(this.invert)),
-						this.m(AsymmetricMeter.ChannelId.ACTIVE_POWER_L3, new FloatDoublewordElement(872),
+						m(AsymmetricMeter.ChannelId.ACTIVE_POWER_L3, new FloatDoublewordElement(872),
 								ElementToChannelConverter.INVERT_IF_TRUE(this.invert)),
-						this.m(SymmetricMeter.ChannelId.ACTIVE_POWER, new FloatDoublewordElement(874),
+						m(SymmetricMeter.ChannelId.ACTIVE_POWER, new FloatDoublewordElement(874),
 								ElementToChannelConverter.INVERT_IF_TRUE(this.invert)),
-						this.m(AsymmetricMeter.ChannelId.REACTIVE_POWER_L1, new FloatDoublewordElement(876),
+						m(AsymmetricMeter.ChannelId.REACTIVE_POWER_L1, new FloatDoublewordElement(876),
 								ElementToChannelConverter.INVERT_IF_TRUE(this.invert)),
-						this.m(AsymmetricMeter.ChannelId.REACTIVE_POWER_L2, new FloatDoublewordElement(878),
+						m(AsymmetricMeter.ChannelId.REACTIVE_POWER_L2, new FloatDoublewordElement(878),
 								ElementToChannelConverter.INVERT_IF_TRUE(this.invert)),
-						this.m(AsymmetricMeter.ChannelId.REACTIVE_POWER_L3, new FloatDoublewordElement(880),
+						m(AsymmetricMeter.ChannelId.REACTIVE_POWER_L3, new FloatDoublewordElement(880),
 								ElementToChannelConverter.INVERT_IF_TRUE(this.invert)),
-						this.m(SymmetricMeter.ChannelId.REACTIVE_POWER, new FloatDoublewordElement(882),
+						m(SymmetricMeter.ChannelId.REACTIVE_POWER, new FloatDoublewordElement(882),
 								ElementToChannelConverter.INVERT_IF_TRUE(this.invert))));
 
 		if (this.invert) {
 			modbusProtocol.addTask(new FC3ReadRegistersTask(19068, Priority.LOW, //
-					this.m(SymmetricMeter.ChannelId.ACTIVE_CONSUMPTION_ENERGY, new FloatDoublewordElement(19068)),
+					m(SymmetricMeter.ChannelId.ACTIVE_CONSUMPTION_ENERGY, new FloatDoublewordElement(19068)),
 					new DummyRegisterElement(19070, 19075),
-					this.m(SymmetricMeter.ChannelId.ACTIVE_PRODUCTION_ENERGY, new FloatDoublewordElement(19076))));
+					m(SymmetricMeter.ChannelId.ACTIVE_PRODUCTION_ENERGY, new FloatDoublewordElement(19076))));
 		} else {
 			modbusProtocol.addTask(new FC3ReadRegistersTask(19068, Priority.LOW, //
-					this.m(SymmetricMeter.ChannelId.ACTIVE_PRODUCTION_ENERGY, new FloatDoublewordElement(19068)),
+					m(SymmetricMeter.ChannelId.ACTIVE_PRODUCTION_ENERGY, new FloatDoublewordElement(19068)),
 					new DummyRegisterElement(19070, 19075),
-					this.m(SymmetricMeter.ChannelId.ACTIVE_CONSUMPTION_ENERGY, new FloatDoublewordElement(19076))));
+					m(SymmetricMeter.ChannelId.ACTIVE_CONSUMPTION_ENERGY, new FloatDoublewordElement(19076))));
 		}
 
 		return modbusProtocol;
diff --git a/io.openems.edge.meter.microcare.sdm630/src/io/openems/edge/meter/microcare/sdm630/MeterMicrocareSdm630Impl.java b/io.openems.edge.meter.microcare.sdm630/src/io/openems/edge/meter/microcare/sdm630/MeterMicrocareSdm630Impl.java
index 59d62e20328..9681909aac2 100644
--- a/io.openems.edge.meter.microcare.sdm630/src/io/openems/edge/meter/microcare/sdm630/MeterMicrocareSdm630Impl.java
+++ b/io.openems.edge.meter.microcare.sdm630/src/io/openems/edge/meter/microcare/sdm630/MeterMicrocareSdm630Impl.java
@@ -84,88 +84,88 @@ protected ModbusProtocol defineModbusProtocol() throws OpenemsException {
 		final var offset = 30001;
 		return new ModbusProtocol(this, //
 				new FC4ReadInputRegistersTask(30001 - offset, Priority.HIGH,
-						this.m(new FloatDoublewordElement(30001 - offset).wordOrder(WordOrder.MSWLSW)
+						m(new FloatDoublewordElement(30001 - offset).wordOrder(WordOrder.MSWLSW)
 								.byteOrder(ByteOrder.BIG_ENDIAN))
 								.m(AsymmetricMeter.ChannelId.VOLTAGE_L1, ElementToChannelConverter.SCALE_FACTOR_3)//
 								.m(SymmetricMeter.ChannelId.VOLTAGE, ElementToChannelConverter.SCALE_FACTOR_3)//
 								.build(),
-						this.m(AsymmetricMeter.ChannelId.VOLTAGE_L2,
+						m(AsymmetricMeter.ChannelId.VOLTAGE_L2,
 								new FloatDoublewordElement(30003 - offset).wordOrder(WordOrder.MSWLSW)
 										.byteOrder(ByteOrder.BIG_ENDIAN),
 								ElementToChannelConverter.SCALE_FACTOR_3),
-						this.m(AsymmetricMeter.ChannelId.VOLTAGE_L3,
+						m(AsymmetricMeter.ChannelId.VOLTAGE_L3,
 								new FloatDoublewordElement(30005 - offset).wordOrder(WordOrder.MSWLSW)
 										.byteOrder(ByteOrder.BIG_ENDIAN),
 								ElementToChannelConverter.SCALE_FACTOR_3),
-						this.m(AsymmetricMeter.ChannelId.CURRENT_L1,
+						m(AsymmetricMeter.ChannelId.CURRENT_L1,
 								new FloatDoublewordElement(30007 - offset).wordOrder(WordOrder.MSWLSW)
 										.byteOrder(ByteOrder.BIG_ENDIAN),
 								ElementToChannelConverter.SCALE_FACTOR_3),
-						this.m(AsymmetricMeter.ChannelId.CURRENT_L2,
+						m(AsymmetricMeter.ChannelId.CURRENT_L2,
 								new FloatDoublewordElement(30009 - offset).wordOrder(WordOrder.MSWLSW)
 										.byteOrder(ByteOrder.BIG_ENDIAN),
 								ElementToChannelConverter.SCALE_FACTOR_3),
-						this.m(AsymmetricMeter.ChannelId.CURRENT_L3,
+						m(AsymmetricMeter.ChannelId.CURRENT_L3,
 								new FloatDoublewordElement(30011 - offset).wordOrder(WordOrder.MSWLSW)
 										.byteOrder(ByteOrder.BIG_ENDIAN),
 								ElementToChannelConverter.SCALE_FACTOR_3),
-						this.m(AsymmetricMeter.ChannelId.ACTIVE_POWER_L1,
+						m(AsymmetricMeter.ChannelId.ACTIVE_POWER_L1,
 								new FloatDoublewordElement(30013 - offset).wordOrder(WordOrder.MSWLSW)
 										.byteOrder(ByteOrder.BIG_ENDIAN),
 								ElementToChannelConverter.DIRECT_1_TO_1),
-						this.m(AsymmetricMeter.ChannelId.ACTIVE_POWER_L2,
+						m(AsymmetricMeter.ChannelId.ACTIVE_POWER_L2,
 								new FloatDoublewordElement(30015 - offset).wordOrder(WordOrder.MSWLSW)
 										.byteOrder(ByteOrder.BIG_ENDIAN),
 								ElementToChannelConverter.DIRECT_1_TO_1),
-						this.m(AsymmetricMeter.ChannelId.ACTIVE_POWER_L3,
+						m(AsymmetricMeter.ChannelId.ACTIVE_POWER_L3,
 								new FloatDoublewordElement(30017 - offset).wordOrder(WordOrder.MSWLSW)
 										.byteOrder(ByteOrder.BIG_ENDIAN),
 								ElementToChannelConverter.DIRECT_1_TO_1),
-						this.m(AsymmetricMeter.ChannelId.REACTIVE_POWER_L1,
+						m(AsymmetricMeter.ChannelId.REACTIVE_POWER_L1,
 								new FloatDoublewordElement(30019 - offset).wordOrder(WordOrder.MSWLSW)
 										.byteOrder(ByteOrder.BIG_ENDIAN),
 								ElementToChannelConverter.DIRECT_1_TO_1),
-						this.m(AsymmetricMeter.ChannelId.REACTIVE_POWER_L2,
+						m(AsymmetricMeter.ChannelId.REACTIVE_POWER_L2,
 								new FloatDoublewordElement(30021 - offset).wordOrder(WordOrder.MSWLSW)
 										.byteOrder(ByteOrder.BIG_ENDIAN),
 								ElementToChannelConverter.DIRECT_1_TO_1),
-						this.m(AsymmetricMeter.ChannelId.REACTIVE_POWER_L3,
+						m(AsymmetricMeter.ChannelId.REACTIVE_POWER_L3,
 								new FloatDoublewordElement(30023 - offset).wordOrder(WordOrder.MSWLSW)
 										.byteOrder(ByteOrder.BIG_ENDIAN),
 								ElementToChannelConverter.DIRECT_1_TO_1),
 						new DummyRegisterElement(30025 - offset, 30048 - offset),
-						this.m(SymmetricMeter.ChannelId.CURRENT,
+						m(SymmetricMeter.ChannelId.CURRENT,
 								new FloatDoublewordElement(30049 - offset).wordOrder(WordOrder.MSWLSW)
 										.byteOrder(ByteOrder.BIG_ENDIAN),
 								ElementToChannelConverter.SCALE_FACTOR_3),
 						new DummyRegisterElement(30051 - offset, 30052 - offset),
-						this.m(SymmetricMeter.ChannelId.ACTIVE_POWER,
+						m(SymmetricMeter.ChannelId.ACTIVE_POWER,
 								new FloatDoublewordElement(30053 - offset).wordOrder(WordOrder.MSWLSW)
 										.byteOrder(ByteOrder.BIG_ENDIAN),
 								ElementToChannelConverter.DIRECT_1_TO_1),
 						new DummyRegisterElement(30055 - offset, 30056 - offset),
-						this.m(SymmetricMeter.ChannelId.REACTIVE_POWER,
+						m(SymmetricMeter.ChannelId.REACTIVE_POWER,
 								new FloatDoublewordElement(30057 - offset).wordOrder(WordOrder.MSWLSW)
 										.byteOrder(ByteOrder.BIG_ENDIAN),
 								ElementToChannelConverter.DIRECT_1_TO_1),
 						new DummyRegisterElement(30059 - offset, 30070 - offset),
-						this.m(SymmetricMeter.ChannelId.FREQUENCY,
+						m(SymmetricMeter.ChannelId.FREQUENCY,
 								new FloatDoublewordElement(30071 - offset).wordOrder(WordOrder.MSWLSW)
 										.byteOrder(ByteOrder.BIG_ENDIAN),
 								ElementToChannelConverter.DIRECT_1_TO_1),
-						this.m(SymmetricMeter.ChannelId.ACTIVE_PRODUCTION_ENERGY,
+						m(SymmetricMeter.ChannelId.ACTIVE_PRODUCTION_ENERGY,
 								new FloatDoublewordElement(30073 - offset).wordOrder(WordOrder.MSWLSW)
 										.byteOrder(ByteOrder.BIG_ENDIAN),
 								ElementToChannelConverter.DIRECT_1_TO_1),
-						this.m(SymmetricMeter.ChannelId.ACTIVE_CONSUMPTION_ENERGY,
+						m(SymmetricMeter.ChannelId.ACTIVE_CONSUMPTION_ENERGY,
 								new FloatDoublewordElement(30075 - offset).wordOrder(WordOrder.MSWLSW)
 										.byteOrder(ByteOrder.BIG_ENDIAN),
 								ElementToChannelConverter.DIRECT_1_TO_1),
-						this.m(MeterMicrocareSdm630.ChannelId.REACTIVE_PRODUCTION_ENERGY,
+						m(MeterMicrocareSdm630.ChannelId.REACTIVE_PRODUCTION_ENERGY,
 								new FloatDoublewordElement(30077 - offset).wordOrder(WordOrder.MSWLSW)
 										.byteOrder(ByteOrder.BIG_ENDIAN),
 								ElementToChannelConverter.DIRECT_1_TO_1),
-						this.m(MeterMicrocareSdm630.ChannelId.REACTIVE_CONSUMPTION_ENERGY,
+						m(MeterMicrocareSdm630.ChannelId.REACTIVE_CONSUMPTION_ENERGY,
 								new FloatDoublewordElement(30079 - offset).wordOrder(WordOrder.MSWLSW)
 										.byteOrder(ByteOrder.BIG_ENDIAN),
 								ElementToChannelConverter.DIRECT_1_TO_1)));
diff --git a/io.openems.edge.meter.pqplus/src/io/openems/edge/meter/pqplus/umd96/MeterPqplusUmd96Impl.java b/io.openems.edge.meter.pqplus/src/io/openems/edge/meter/pqplus/umd96/MeterPqplusUmd96Impl.java
index 80ab88473ac..4cc568d2ab8 100644
--- a/io.openems.edge.meter.pqplus/src/io/openems/edge/meter/pqplus/umd96/MeterPqplusUmd96Impl.java
+++ b/io.openems.edge.meter.pqplus/src/io/openems/edge/meter/pqplus/umd96/MeterPqplusUmd96Impl.java
@@ -90,40 +90,40 @@ protected ModbusProtocol defineModbusProtocol() throws OpenemsException {
 		return new ModbusProtocol(this, //
 				// Frequency
 				new FC3ReadRegistersTask(0x1004, Priority.LOW, //
-						this.m(SymmetricMeter.ChannelId.FREQUENCY, new FloatDoublewordElement(0x1004),
+						m(SymmetricMeter.ChannelId.FREQUENCY, new FloatDoublewordElement(0x1004),
 								ElementToChannelConverter.SCALE_FACTOR_3)),
 				// Voltages
 				new FC3ReadRegistersTask(0x1100, Priority.HIGH, //
-						this.m(new FloatDoublewordElement(0x1100)) //
+						m(new FloatDoublewordElement(0x1100)) //
 								.m(AsymmetricMeter.ChannelId.VOLTAGE_L1, ElementToChannelConverter.SCALE_FACTOR_3) //
 								.m(SymmetricMeter.ChannelId.VOLTAGE, ElementToChannelConverter.SCALE_FACTOR_3) //
 								.build(), //
-						this.m(AsymmetricMeter.ChannelId.VOLTAGE_L2, new FloatDoublewordElement(0x1102),
+						m(AsymmetricMeter.ChannelId.VOLTAGE_L2, new FloatDoublewordElement(0x1102),
 								ElementToChannelConverter.SCALE_FACTOR_3),
-						this.m(AsymmetricMeter.ChannelId.VOLTAGE_L3, new FloatDoublewordElement(0x1104),
+						m(AsymmetricMeter.ChannelId.VOLTAGE_L3, new FloatDoublewordElement(0x1104),
 								ElementToChannelConverter.SCALE_FACTOR_3)),
 				// Currents
 				new FC3ReadRegistersTask(0x1200, Priority.HIGH, //
-						this.m(new FloatDoublewordElement(0x1200))
+						m(new FloatDoublewordElement(0x1200))
 								.m(AsymmetricMeter.ChannelId.CURRENT_L1, ElementToChannelConverter.SCALE_FACTOR_3) //
 								.m(SymmetricMeter.ChannelId.CURRENT, ElementToChannelConverter.SCALE_FACTOR_3) //
 								.build(), //
-						this.m(AsymmetricMeter.ChannelId.CURRENT_L2, new FloatDoublewordElement(0x1202), //
+						m(AsymmetricMeter.ChannelId.CURRENT_L2, new FloatDoublewordElement(0x1202), //
 								ElementToChannelConverter.SCALE_FACTOR_3),
-						this.m(AsymmetricMeter.ChannelId.CURRENT_L3, new FloatDoublewordElement(0x1204), //
+						m(AsymmetricMeter.ChannelId.CURRENT_L3, new FloatDoublewordElement(0x1204), //
 								ElementToChannelConverter.SCALE_FACTOR_3)),
 				// Power values
 				new FC3ReadRegistersTask(0x1314, Priority.HIGH, //
-						this.m(SymmetricMeter.ChannelId.ACTIVE_POWER, new FloatDoublewordElement(0x1314)),
-						this.m(SymmetricMeter.ChannelId.REACTIVE_POWER, new FloatDoublewordElement(0x1316)), //
+						m(SymmetricMeter.ChannelId.ACTIVE_POWER, new FloatDoublewordElement(0x1314)),
+						m(SymmetricMeter.ChannelId.REACTIVE_POWER, new FloatDoublewordElement(0x1316)), //
 						new DummyRegisterElement(0x1318, 0x131F), //
-						this.m(AsymmetricMeter.ChannelId.ACTIVE_POWER_L1, new FloatDoublewordElement(0x1320)),
-						this.m(AsymmetricMeter.ChannelId.ACTIVE_POWER_L2, new FloatDoublewordElement(0x1322)),
-						this.m(AsymmetricMeter.ChannelId.ACTIVE_POWER_L3, new FloatDoublewordElement(0x1324)),
+						m(AsymmetricMeter.ChannelId.ACTIVE_POWER_L1, new FloatDoublewordElement(0x1320)),
+						m(AsymmetricMeter.ChannelId.ACTIVE_POWER_L2, new FloatDoublewordElement(0x1322)),
+						m(AsymmetricMeter.ChannelId.ACTIVE_POWER_L3, new FloatDoublewordElement(0x1324)),
 						new DummyRegisterElement(0x1326, 0x1327), //
-						this.m(AsymmetricMeter.ChannelId.REACTIVE_POWER_L1, new FloatDoublewordElement(0x1328)),
-						this.m(AsymmetricMeter.ChannelId.REACTIVE_POWER_L2, new FloatDoublewordElement(0x132A)),
-						this.m(AsymmetricMeter.ChannelId.REACTIVE_POWER_L3, new FloatDoublewordElement(0x132C)))//
+						m(AsymmetricMeter.ChannelId.REACTIVE_POWER_L1, new FloatDoublewordElement(0x1328)),
+						m(AsymmetricMeter.ChannelId.REACTIVE_POWER_L2, new FloatDoublewordElement(0x132A)),
+						m(AsymmetricMeter.ChannelId.REACTIVE_POWER_L3, new FloatDoublewordElement(0x132C)))//
 		);
 
 	}
diff --git a/io.openems.edge.meter.pqplus/src/io/openems/edge/meter/pqplus/umd97/MeterPqplusUmd97Impl.java b/io.openems.edge.meter.pqplus/src/io/openems/edge/meter/pqplus/umd97/MeterPqplusUmd97Impl.java
index 5f366821f5e..faa7c2e4919 100644
--- a/io.openems.edge.meter.pqplus/src/io/openems/edge/meter/pqplus/umd97/MeterPqplusUmd97Impl.java
+++ b/io.openems.edge.meter.pqplus/src/io/openems/edge/meter/pqplus/umd97/MeterPqplusUmd97Impl.java
@@ -87,34 +87,34 @@ public MeterType getMeterType() {
 	protected ModbusProtocol defineModbusProtocol() throws OpenemsException {
 		return new ModbusProtocol(this, //
 				new FC3ReadRegistersTask(19000, Priority.HIGH, //
-						this.m(new FloatDoublewordElement(19000)) //
+						m(new FloatDoublewordElement(19000)) //
 								.m(AsymmetricMeter.ChannelId.VOLTAGE_L1, ElementToChannelConverter.SCALE_FACTOR_3) //
 								.m(SymmetricMeter.ChannelId.VOLTAGE, ElementToChannelConverter.SCALE_FACTOR_3) //
 								.build(), //
-						this.m(AsymmetricMeter.ChannelId.VOLTAGE_L2, new FloatDoublewordElement(19002),
+						m(AsymmetricMeter.ChannelId.VOLTAGE_L2, new FloatDoublewordElement(19002),
 								ElementToChannelConverter.SCALE_FACTOR_3),
-						this.m(AsymmetricMeter.ChannelId.VOLTAGE_L3, new FloatDoublewordElement(19004),
+						m(AsymmetricMeter.ChannelId.VOLTAGE_L3, new FloatDoublewordElement(19004),
 								ElementToChannelConverter.SCALE_FACTOR_3),
 						new DummyRegisterElement(19006, 19011), //
-						this.m(AsymmetricMeter.ChannelId.CURRENT_L1, new FloatDoublewordElement(19012),
+						m(AsymmetricMeter.ChannelId.CURRENT_L1, new FloatDoublewordElement(19012),
 								ElementToChannelConverter.SCALE_FACTOR_3),
-						this.m(AsymmetricMeter.ChannelId.CURRENT_L2, new FloatDoublewordElement(19014),
+						m(AsymmetricMeter.ChannelId.CURRENT_L2, new FloatDoublewordElement(19014),
 								ElementToChannelConverter.SCALE_FACTOR_3),
-						this.m(AsymmetricMeter.ChannelId.CURRENT_L3, new FloatDoublewordElement(19016),
+						m(AsymmetricMeter.ChannelId.CURRENT_L3, new FloatDoublewordElement(19016),
 								ElementToChannelConverter.SCALE_FACTOR_3),
-						this.m(SymmetricMeter.ChannelId.CURRENT, new FloatDoublewordElement(19018),
+						m(SymmetricMeter.ChannelId.CURRENT, new FloatDoublewordElement(19018),
 								ElementToChannelConverter.SCALE_FACTOR_3),
-						this.m(AsymmetricMeter.ChannelId.ACTIVE_POWER_L1, new FloatDoublewordElement(19020)),
-						this.m(AsymmetricMeter.ChannelId.ACTIVE_POWER_L2, new FloatDoublewordElement(19022)),
-						this.m(AsymmetricMeter.ChannelId.ACTIVE_POWER_L3, new FloatDoublewordElement(19024)),
-						this.m(SymmetricMeter.ChannelId.ACTIVE_POWER, new FloatDoublewordElement(19026)),
+						m(AsymmetricMeter.ChannelId.ACTIVE_POWER_L1, new FloatDoublewordElement(19020)),
+						m(AsymmetricMeter.ChannelId.ACTIVE_POWER_L2, new FloatDoublewordElement(19022)),
+						m(AsymmetricMeter.ChannelId.ACTIVE_POWER_L3, new FloatDoublewordElement(19024)),
+						m(SymmetricMeter.ChannelId.ACTIVE_POWER, new FloatDoublewordElement(19026)),
 						new DummyRegisterElement(19028, 19035), //
-						this.m(AsymmetricMeter.ChannelId.REACTIVE_POWER_L1, new FloatDoublewordElement(19036)),
-						this.m(AsymmetricMeter.ChannelId.REACTIVE_POWER_L2, new FloatDoublewordElement(19038)),
-						this.m(AsymmetricMeter.ChannelId.REACTIVE_POWER_L3, new FloatDoublewordElement(19040)),
-						this.m(SymmetricMeter.ChannelId.REACTIVE_POWER, new FloatDoublewordElement(19042)),
+						m(AsymmetricMeter.ChannelId.REACTIVE_POWER_L1, new FloatDoublewordElement(19036)),
+						m(AsymmetricMeter.ChannelId.REACTIVE_POWER_L2, new FloatDoublewordElement(19038)),
+						m(AsymmetricMeter.ChannelId.REACTIVE_POWER_L3, new FloatDoublewordElement(19040)),
+						m(SymmetricMeter.ChannelId.REACTIVE_POWER, new FloatDoublewordElement(19042)),
 						new DummyRegisterElement(19044, 19049), //
-						this.m(SymmetricMeter.ChannelId.FREQUENCY, new FloatDoublewordElement(19050),
+						m(SymmetricMeter.ChannelId.FREQUENCY, new FloatDoublewordElement(19050),
 								ElementToChannelConverter.SCALE_FACTOR_3)));
 	}
 
diff --git a/io.openems.edge.meter.schneider.acti9.smartlink/src/io/openems/edge/meter/schneider/acti9/smartlink/MeterSchneiderActi9Smartlink.java b/io.openems.edge.meter.schneider.acti9.smartlink/src/io/openems/edge/meter/schneider/acti9/smartlink/MeterSchneiderActi9Smartlink.java
index f74c216fb2a..11d55c91a00 100644
--- a/io.openems.edge.meter.schneider.acti9.smartlink/src/io/openems/edge/meter/schneider/acti9/smartlink/MeterSchneiderActi9Smartlink.java
+++ b/io.openems.edge.meter.schneider.acti9.smartlink/src/io/openems/edge/meter/schneider/acti9/smartlink/MeterSchneiderActi9Smartlink.java
@@ -89,39 +89,39 @@ protected ModbusProtocol defineModbusProtocol() throws OpenemsException {
 		 */
 		return new ModbusProtocol(this, //
 				new FC4ReadInputRegistersTask(3000 - offset, Priority.HIGH,
-						this.m(AsymmetricMeter.ChannelId.CURRENT_L1, new FloatDoublewordElement(3000 - offset),
+						m(AsymmetricMeter.ChannelId.CURRENT_L1, new FloatDoublewordElement(3000 - offset),
 								ElementToChannelConverter.SCALE_FACTOR_3_AND_INVERT_IF_TRUE(this.inverted)),
-						this.m(AsymmetricMeter.ChannelId.CURRENT_L2, new FloatDoublewordElement(3002 - offset),
+						m(AsymmetricMeter.ChannelId.CURRENT_L2, new FloatDoublewordElement(3002 - offset),
 								ElementToChannelConverter.SCALE_FACTOR_3_AND_INVERT_IF_TRUE(this.inverted)),
-						this.m(AsymmetricMeter.ChannelId.CURRENT_L3, new FloatDoublewordElement(3004 - offset),
+						m(AsymmetricMeter.ChannelId.CURRENT_L3, new FloatDoublewordElement(3004 - offset),
 								ElementToChannelConverter.SCALE_FACTOR_3_AND_INVERT_IF_TRUE(this.inverted))),
 				new FC4ReadInputRegistersTask(3028 - offset, Priority.LOW,
-						this.m(AsymmetricMeter.ChannelId.VOLTAGE_L1, new FloatDoublewordElement(3028 - offset),
+						m(AsymmetricMeter.ChannelId.VOLTAGE_L1, new FloatDoublewordElement(3028 - offset),
 								ElementToChannelConverter.SCALE_FACTOR_3),
-						this.m(AsymmetricMeter.ChannelId.VOLTAGE_L2, new FloatDoublewordElement(3030 - offset),
+						m(AsymmetricMeter.ChannelId.VOLTAGE_L2, new FloatDoublewordElement(3030 - offset),
 								ElementToChannelConverter.SCALE_FACTOR_3),
-						this.m(AsymmetricMeter.ChannelId.VOLTAGE_L3, new FloatDoublewordElement(3032 - offset),
+						m(AsymmetricMeter.ChannelId.VOLTAGE_L3, new FloatDoublewordElement(3032 - offset),
 								ElementToChannelConverter.SCALE_FACTOR_3)),
 				new FC4ReadInputRegistersTask(3054 - offset, Priority.HIGH,
-						this.m(AsymmetricMeter.ChannelId.ACTIVE_POWER_L1, new FloatDoublewordElement(3054 - offset),
+						m(AsymmetricMeter.ChannelId.ACTIVE_POWER_L1, new FloatDoublewordElement(3054 - offset),
 								ElementToChannelConverter.INVERT_IF_TRUE(this.inverted)),
-						this.m(AsymmetricMeter.ChannelId.ACTIVE_POWER_L2, new FloatDoublewordElement(3056 - offset),
+						m(AsymmetricMeter.ChannelId.ACTIVE_POWER_L2, new FloatDoublewordElement(3056 - offset),
 								ElementToChannelConverter.INVERT_IF_TRUE(this.inverted)),
-						this.m(AsymmetricMeter.ChannelId.ACTIVE_POWER_L3, new FloatDoublewordElement(3058 - offset),
+						m(AsymmetricMeter.ChannelId.ACTIVE_POWER_L3, new FloatDoublewordElement(3058 - offset),
 								ElementToChannelConverter.INVERT_IF_TRUE(this.inverted)),
-						this.m(SymmetricMeter.ChannelId.ACTIVE_POWER, new FloatDoublewordElement(3060 - offset),
+						m(SymmetricMeter.ChannelId.ACTIVE_POWER, new FloatDoublewordElement(3060 - offset),
 								ElementToChannelConverter.INVERT_IF_TRUE(this.inverted)),
 						new DummyRegisterElement(3062 - offset, 3067 - offset),
-						this.m(SymmetricMeter.ChannelId.REACTIVE_POWER, new FloatDoublewordElement(3068 - offset),
+						m(SymmetricMeter.ChannelId.REACTIVE_POWER, new FloatDoublewordElement(3068 - offset),
 								ElementToChannelConverter.INVERT_IF_TRUE(this.inverted))),
 				new FC4ReadInputRegistersTask(3110 - offset, Priority.LOW,
-						this.m(SymmetricMeter.ChannelId.FREQUENCY, new FloatDoublewordElement(3110 - offset),
+						m(SymmetricMeter.ChannelId.FREQUENCY, new FloatDoublewordElement(3110 - offset),
 								ElementToChannelConverter.SCALE_FACTOR_3)),
 				new FC4ReadInputRegistersTask(3208 - offset, Priority.LOW,
-						this.m(this.inverted ? SymmetricMeter.ChannelId.ACTIVE_PRODUCTION_ENERGY
+						m(this.inverted ? SymmetricMeter.ChannelId.ACTIVE_PRODUCTION_ENERGY
 								: SymmetricMeter.ChannelId.ACTIVE_CONSUMPTION_ENERGY,
 								new UnsignedQuadruplewordElement(3208 - offset)),
-						this.m(this.inverted ? SymmetricMeter.ChannelId.ACTIVE_CONSUMPTION_ENERGY
+						m(this.inverted ? SymmetricMeter.ChannelId.ACTIVE_CONSUMPTION_ENERGY
 								: SymmetricMeter.ChannelId.ACTIVE_PRODUCTION_ENERGY,
 								new UnsignedQuadruplewordElement(3212 - offset))));
 	}
diff --git a/io.openems.edge.meter.siemens/src/io/openems/edge/meter/siemens/SiemensPacMeterImpl.java b/io.openems.edge.meter.siemens/src/io/openems/edge/meter/siemens/SiemensPacMeterImpl.java
index 7924a184773..21344d945ef 100644
--- a/io.openems.edge.meter.siemens/src/io/openems/edge/meter/siemens/SiemensPacMeterImpl.java
+++ b/io.openems.edge.meter.siemens/src/io/openems/edge/meter/siemens/SiemensPacMeterImpl.java
@@ -98,50 +98,50 @@ protected ModbusProtocol defineModbusProtocol() throws OpenemsException {
 
 		var modbusProtocol = new ModbusProtocol(this, //
 				new FC3ReadRegistersTask(1, Priority.HIGH, //
-						this.m(AsymmetricMeter.ChannelId.VOLTAGE_L1, new FloatDoublewordElement(1),
+						m(AsymmetricMeter.ChannelId.VOLTAGE_L1, new FloatDoublewordElement(1),
 								ElementToChannelConverter.SCALE_FACTOR_3),
-						this.m(AsymmetricMeter.ChannelId.VOLTAGE_L2, new FloatDoublewordElement(3),
+						m(AsymmetricMeter.ChannelId.VOLTAGE_L2, new FloatDoublewordElement(3),
 								ElementToChannelConverter.SCALE_FACTOR_3),
-						this.m(AsymmetricMeter.ChannelId.VOLTAGE_L3, new FloatDoublewordElement(5),
+						m(AsymmetricMeter.ChannelId.VOLTAGE_L3, new FloatDoublewordElement(5),
 								ElementToChannelConverter.SCALE_FACTOR_3),
 						new DummyRegisterElement(7, 12), //
-						this.m(AsymmetricMeter.ChannelId.CURRENT_L1, new FloatDoublewordElement(13),
+						m(AsymmetricMeter.ChannelId.CURRENT_L1, new FloatDoublewordElement(13),
 								ElementToChannelConverter.SCALE_FACTOR_3_AND_INVERT_IF_TRUE(this.invert)),
-						this.m(AsymmetricMeter.ChannelId.CURRENT_L2, new FloatDoublewordElement(15),
+						m(AsymmetricMeter.ChannelId.CURRENT_L2, new FloatDoublewordElement(15),
 								ElementToChannelConverter.SCALE_FACTOR_3_AND_INVERT_IF_TRUE(this.invert)),
-						this.m(AsymmetricMeter.ChannelId.CURRENT_L3, new FloatDoublewordElement(17),
+						m(AsymmetricMeter.ChannelId.CURRENT_L3, new FloatDoublewordElement(17),
 								ElementToChannelConverter.SCALE_FACTOR_3_AND_INVERT_IF_TRUE(this.invert)),
 						new DummyRegisterElement(19, 24), //
-						this.m(AsymmetricMeter.ChannelId.ACTIVE_POWER_L1, new FloatDoublewordElement(25),
+						m(AsymmetricMeter.ChannelId.ACTIVE_POWER_L1, new FloatDoublewordElement(25),
 								ElementToChannelConverter.INVERT_IF_TRUE(this.invert)),
-						this.m(AsymmetricMeter.ChannelId.ACTIVE_POWER_L2, new FloatDoublewordElement(27),
+						m(AsymmetricMeter.ChannelId.ACTIVE_POWER_L2, new FloatDoublewordElement(27),
 								ElementToChannelConverter.INVERT_IF_TRUE(this.invert)),
-						this.m(AsymmetricMeter.ChannelId.ACTIVE_POWER_L3, new FloatDoublewordElement(29),
+						m(AsymmetricMeter.ChannelId.ACTIVE_POWER_L3, new FloatDoublewordElement(29),
 								ElementToChannelConverter.INVERT_IF_TRUE(this.invert)),
-						this.m(AsymmetricMeter.ChannelId.REACTIVE_POWER_L1, new FloatDoublewordElement(31),
+						m(AsymmetricMeter.ChannelId.REACTIVE_POWER_L1, new FloatDoublewordElement(31),
 								ElementToChannelConverter.INVERT_IF_TRUE(this.invert)),
-						this.m(AsymmetricMeter.ChannelId.REACTIVE_POWER_L2, new FloatDoublewordElement(33),
+						m(AsymmetricMeter.ChannelId.REACTIVE_POWER_L2, new FloatDoublewordElement(33),
 								ElementToChannelConverter.INVERT_IF_TRUE(this.invert)),
-						this.m(AsymmetricMeter.ChannelId.REACTIVE_POWER_L3, new FloatDoublewordElement(35),
+						m(AsymmetricMeter.ChannelId.REACTIVE_POWER_L3, new FloatDoublewordElement(35),
 								ElementToChannelConverter.INVERT_IF_TRUE(this.invert)),
 						new DummyRegisterElement(37, 60), //
-						this.m(SymmetricMeter.ChannelId.CURRENT, new FloatDoublewordElement(61),
+						m(SymmetricMeter.ChannelId.CURRENT, new FloatDoublewordElement(61),
 								ElementToChannelConverter.SCALE_FACTOR_3_AND_INVERT_IF_TRUE(this.invert)),
 						new DummyRegisterElement(63, 64), //
-						this.m(SymmetricMeter.ChannelId.ACTIVE_POWER, new FloatDoublewordElement(65),
+						m(SymmetricMeter.ChannelId.ACTIVE_POWER, new FloatDoublewordElement(65),
 								ElementToChannelConverter.INVERT_IF_TRUE(this.invert)),
-						this.m(SymmetricMeter.ChannelId.REACTIVE_POWER, new FloatDoublewordElement(67),
+						m(SymmetricMeter.ChannelId.REACTIVE_POWER, new FloatDoublewordElement(67),
 								ElementToChannelConverter.INVERT_IF_TRUE(this.invert))));
 		if (this.invert) {
 			modbusProtocol.addTask(new FC3ReadRegistersTask(801, Priority.LOW, //
-					this.m(SymmetricMeter.ChannelId.ACTIVE_CONSUMPTION_ENERGY, new FloatQuadruplewordElement(801)),
+					m(SymmetricMeter.ChannelId.ACTIVE_CONSUMPTION_ENERGY, new FloatQuadruplewordElement(801)),
 					new DummyRegisterElement(805, 808), //
-					this.m(SymmetricMeter.ChannelId.ACTIVE_PRODUCTION_ENERGY, new FloatQuadruplewordElement(809))));
+					m(SymmetricMeter.ChannelId.ACTIVE_PRODUCTION_ENERGY, new FloatQuadruplewordElement(809))));
 		} else {
 			modbusProtocol.addTask(new FC3ReadRegistersTask(801, Priority.LOW, //
-					this.m(SymmetricMeter.ChannelId.ACTIVE_PRODUCTION_ENERGY, new FloatQuadruplewordElement(801)),
+					m(SymmetricMeter.ChannelId.ACTIVE_PRODUCTION_ENERGY, new FloatQuadruplewordElement(801)),
 					new DummyRegisterElement(805, 808), //
-					this.m(SymmetricMeter.ChannelId.ACTIVE_CONSUMPTION_ENERGY, new FloatQuadruplewordElement(809))));
+					m(SymmetricMeter.ChannelId.ACTIVE_CONSUMPTION_ENERGY, new FloatQuadruplewordElement(809))));
 		}
 
 		return modbusProtocol;
diff --git a/io.openems.edge.meter.sma.shm20/src/io/openems/edge/meter/sma/shm20/MeterSmaShm20Impl.java b/io.openems.edge.meter.sma.shm20/src/io/openems/edge/meter/sma/shm20/MeterSmaShm20Impl.java
index c6a0e3abbd9..765a12218c2 100644
--- a/io.openems.edge.meter.sma.shm20/src/io/openems/edge/meter/sma/shm20/MeterSmaShm20Impl.java
+++ b/io.openems.edge.meter.sma.shm20/src/io/openems/edge/meter/sma/shm20/MeterSmaShm20Impl.java
@@ -86,45 +86,45 @@ protected ModbusProtocol defineModbusProtocol() throws OpenemsException {
 		var modbusProtocol = new ModbusProtocol(this,
 				// Consumption and Production Energy
 				new FC3ReadRegistersTask(30581, Priority.HIGH, //
-						this.m(SymmetricMeter.ChannelId.ACTIVE_PRODUCTION_ENERGY, new UnsignedDoublewordElement(30581)),
-						this.m(SymmetricMeter.ChannelId.ACTIVE_CONSUMPTION_ENERGY,
+						m(SymmetricMeter.ChannelId.ACTIVE_PRODUCTION_ENERGY, new UnsignedDoublewordElement(30581)),
+						m(SymmetricMeter.ChannelId.ACTIVE_CONSUMPTION_ENERGY,
 								new UnsignedDoublewordElement(30583))),
 				// Power Readings
 				new FC3ReadRegistersTask(30865, Priority.HIGH, //
-						this.m(MeterSmaShm20.ChannelId.ACTIVE_PRODUCTION_POWER, new SignedDoublewordElement(30865)),
-						this.m(MeterSmaShm20.ChannelId.ACTIVE_CONSUMPTION_POWER, new SignedDoublewordElement(30867))),
+						m(MeterSmaShm20.ChannelId.ACTIVE_PRODUCTION_POWER, new SignedDoublewordElement(30865)),
+						m(MeterSmaShm20.ChannelId.ACTIVE_CONSUMPTION_POWER, new SignedDoublewordElement(30867))),
 				// Voltage, Power and Reactive Power
 				new FC3ReadRegistersTask(31253, Priority.HIGH, //
-						this.m(AsymmetricMeter.ChannelId.VOLTAGE_L1, new UnsignedDoublewordElement(31253),
+						m(AsymmetricMeter.ChannelId.VOLTAGE_L1, new UnsignedDoublewordElement(31253),
 								ElementToChannelConverter.SCALE_FACTOR_1),
-						this.m(AsymmetricMeter.ChannelId.VOLTAGE_L2, new UnsignedDoublewordElement(31255),
+						m(AsymmetricMeter.ChannelId.VOLTAGE_L2, new UnsignedDoublewordElement(31255),
 								ElementToChannelConverter.SCALE_FACTOR_1),
-						this.m(AsymmetricMeter.ChannelId.VOLTAGE_L3, new UnsignedDoublewordElement(31257),
+						m(AsymmetricMeter.ChannelId.VOLTAGE_L3, new UnsignedDoublewordElement(31257),
 								ElementToChannelConverter.SCALE_FACTOR_1),
-						this.m(MeterSmaShm20.ChannelId.ACTIVE_CONSUMPTION_POWER_L1,
+						m(MeterSmaShm20.ChannelId.ACTIVE_CONSUMPTION_POWER_L1,
 								new UnsignedDoublewordElement(31259)),
-						this.m(MeterSmaShm20.ChannelId.ACTIVE_CONSUMPTION_POWER_L2,
+						m(MeterSmaShm20.ChannelId.ACTIVE_CONSUMPTION_POWER_L2,
 								new UnsignedDoublewordElement(31261)),
-						this.m(MeterSmaShm20.ChannelId.ACTIVE_CONSUMPTION_POWER_L3,
+						m(MeterSmaShm20.ChannelId.ACTIVE_CONSUMPTION_POWER_L3,
 								new UnsignedDoublewordElement(31263)),
-						this.m(MeterSmaShm20.ChannelId.ACTIVE_PRODUCTION_POWER_L1,
+						m(MeterSmaShm20.ChannelId.ACTIVE_PRODUCTION_POWER_L1,
 								new UnsignedDoublewordElement(31265)),
-						this.m(MeterSmaShm20.ChannelId.ACTIVE_PRODUCTION_POWER_L2,
+						m(MeterSmaShm20.ChannelId.ACTIVE_PRODUCTION_POWER_L2,
 								new UnsignedDoublewordElement(31267)),
-						this.m(MeterSmaShm20.ChannelId.ACTIVE_PRODUCTION_POWER_L3,
+						m(MeterSmaShm20.ChannelId.ACTIVE_PRODUCTION_POWER_L3,
 								new UnsignedDoublewordElement(31269)),
-						this.m(AsymmetricMeter.ChannelId.REACTIVE_POWER_L1, new SignedDoublewordElement(31271)),
-						this.m(AsymmetricMeter.ChannelId.REACTIVE_POWER_L2, new SignedDoublewordElement(31273)),
-						this.m(AsymmetricMeter.ChannelId.REACTIVE_POWER_L3, new SignedDoublewordElement(31275)),
-						this.m(SymmetricMeter.ChannelId.REACTIVE_POWER, new SignedDoublewordElement(31277))),
+						m(AsymmetricMeter.ChannelId.REACTIVE_POWER_L1, new SignedDoublewordElement(31271)),
+						m(AsymmetricMeter.ChannelId.REACTIVE_POWER_L2, new SignedDoublewordElement(31273)),
+						m(AsymmetricMeter.ChannelId.REACTIVE_POWER_L3, new SignedDoublewordElement(31275)),
+						m(SymmetricMeter.ChannelId.REACTIVE_POWER, new SignedDoublewordElement(31277))),
 				// Current
 				new FC3ReadRegistersTask(31435, Priority.HIGH, //
-						this.m(AsymmetricMeter.ChannelId.CURRENT_L1, new SignedDoublewordElement(31435)),
-						this.m(AsymmetricMeter.ChannelId.CURRENT_L2, new SignedDoublewordElement(31437)),
-						this.m(AsymmetricMeter.ChannelId.CURRENT_L3, new SignedDoublewordElement(31439))),
+						m(AsymmetricMeter.ChannelId.CURRENT_L1, new SignedDoublewordElement(31435)),
+						m(AsymmetricMeter.ChannelId.CURRENT_L2, new SignedDoublewordElement(31437)),
+						m(AsymmetricMeter.ChannelId.CURRENT_L3, new SignedDoublewordElement(31439))),
 				// Frequency
 				new FC3ReadRegistersTask(31447, Priority.LOW, //
-						this.m(SymmetricMeter.ChannelId.FREQUENCY, new UnsignedDoublewordElement(31447),
+						m(SymmetricMeter.ChannelId.FREQUENCY, new UnsignedDoublewordElement(31447),
 								ElementToChannelConverter.SCALE_FACTOR_1)));
 
 		// Calculates required Channels from other existing Channels.
diff --git a/io.openems.edge.meter.socomec/src/io/openems/edge/meter/socomec/singlephase/SocomecMeterSinglephaseImpl.java b/io.openems.edge.meter.socomec/src/io/openems/edge/meter/socomec/singlephase/SocomecMeterSinglephaseImpl.java
index 54eb3c2f8ae..b089881f33f 100644
--- a/io.openems.edge.meter.socomec/src/io/openems/edge/meter/socomec/singlephase/SocomecMeterSinglephaseImpl.java
+++ b/io.openems.edge.meter.socomec/src/io/openems/edge/meter/socomec/singlephase/SocomecMeterSinglephaseImpl.java
@@ -99,7 +99,7 @@ public MeterType getMeterType() {
 	protected void identifiedCountisE14() throws OpenemsException {
 		this.modbusProtocol.addTask(//
 				new FC3ReadRegistersTask(0xc558, Priority.HIGH, //
-						this.m(new UnsignedDoublewordElement(0xc558)) //
+						m(new UnsignedDoublewordElement(0xc558)) //
 								.m(SymmetricMeter.ChannelId.VOLTAGE, ElementToChannelConverter.SCALE_FACTOR_1) //
 								.m(AsymmetricMeter.ChannelId.VOLTAGE_L1, new ElementToChannelConverterChain(//
 										ElementToChannelConverter.SCALE_FACTOR_1, //
@@ -115,8 +115,8 @@ protected void identifiedCountisE14() throws OpenemsException {
 												.SET_ZERO_IF_TRUE(this.config.phase() != SinglePhase.L3))) //
 								.build(), //
 						new DummyRegisterElement(0xc55A, 0xc55D), //
-						this.m(SymmetricMeter.ChannelId.FREQUENCY, new UnsignedDoublewordElement(0xc55E)), //
-						this.m(new UnsignedDoublewordElement(0xc560)) //
+						m(SymmetricMeter.ChannelId.FREQUENCY, new UnsignedDoublewordElement(0xc55E)), //
+						m(new UnsignedDoublewordElement(0xc560)) //
 								.m(SymmetricMeter.ChannelId.CURRENT,
 										ElementToChannelConverter.INVERT_IF_TRUE(this.config.invert())) //
 								.m(AsymmetricMeter.ChannelId.CURRENT_L1, new ElementToChannelConverterChain(//
@@ -133,7 +133,7 @@ protected void identifiedCountisE14() throws OpenemsException {
 												.SET_ZERO_IF_TRUE(this.config.phase() != SinglePhase.L3))) //
 								.build(), //
 						new DummyRegisterElement(0xc562, 0xc567), //
-						this.m(new SignedDoublewordElement(0xc568)) //
+						m(new SignedDoublewordElement(0xc568)) //
 								.m(SymmetricMeter.ChannelId.ACTIVE_POWER,
 										ElementToChannelConverter
 												.SCALE_FACTOR_1_AND_INVERT_IF_TRUE(this.config.invert()))
@@ -156,7 +156,7 @@ protected void identifiedCountisE14() throws OpenemsException {
 												ElementToChannelConverter
 														.SET_ZERO_IF_TRUE(this.config.phase() != SinglePhase.L3))) //
 								.build(), //
-						this.m(new SignedDoublewordElement(0xc56A)) //
+						m(new SignedDoublewordElement(0xc56A)) //
 								.m(SymmetricMeter.ChannelId.REACTIVE_POWER,
 										ElementToChannelConverter
 												.SCALE_FACTOR_1_AND_INVERT_IF_TRUE(this.config.invert()))
@@ -181,18 +181,18 @@ protected void identifiedCountisE14() throws OpenemsException {
 								.build()));
 		if (this.config.invert()) {
 			this.modbusProtocol.addTask(new FC3ReadRegistersTask(0xC702, Priority.LOW, //
-					this.m(SymmetricMeter.ChannelId.ACTIVE_CONSUMPTION_ENERGY, new UnsignedDoublewordElement(0xC702),
+					m(SymmetricMeter.ChannelId.ACTIVE_CONSUMPTION_ENERGY, new UnsignedDoublewordElement(0xC702),
 							ElementToChannelConverter.SCALE_FACTOR_1), //
 					new DummyRegisterElement(0xC704, 0xC707), //
-					this.m(SymmetricMeter.ChannelId.ACTIVE_PRODUCTION_ENERGY, new UnsignedDoublewordElement(0xC708),
+					m(SymmetricMeter.ChannelId.ACTIVE_PRODUCTION_ENERGY, new UnsignedDoublewordElement(0xC708),
 							ElementToChannelConverter.SCALE_FACTOR_1) //
 			));
 		} else {
 			this.modbusProtocol.addTask(new FC3ReadRegistersTask(0xC702, Priority.LOW, //
-					this.m(SymmetricMeter.ChannelId.ACTIVE_PRODUCTION_ENERGY, new UnsignedDoublewordElement(0xC702),
+					m(SymmetricMeter.ChannelId.ACTIVE_PRODUCTION_ENERGY, new UnsignedDoublewordElement(0xC702),
 							ElementToChannelConverter.SCALE_FACTOR_1), //
 					new DummyRegisterElement(0xC704, 0xC707), //
-					this.m(SymmetricMeter.ChannelId.ACTIVE_CONSUMPTION_ENERGY, new UnsignedDoublewordElement(0xC708),
+					m(SymmetricMeter.ChannelId.ACTIVE_CONSUMPTION_ENERGY, new UnsignedDoublewordElement(0xC708),
 							ElementToChannelConverter.SCALE_FACTOR_1) //
 			));
 		}
diff --git a/io.openems.edge.meter.socomec/src/io/openems/edge/meter/socomec/threephase/SocomecMeterThreephaseImpl.java b/io.openems.edge.meter.socomec/src/io/openems/edge/meter/socomec/threephase/SocomecMeterThreephaseImpl.java
index 60e3bcd1ad6..92a48828b06 100644
--- a/io.openems.edge.meter.socomec/src/io/openems/edge/meter/socomec/threephase/SocomecMeterThreephaseImpl.java
+++ b/io.openems.edge.meter.socomec/src/io/openems/edge/meter/socomec/threephase/SocomecMeterThreephaseImpl.java
@@ -95,56 +95,56 @@ public MeterType getMeterType() {
 	protected void identifiedCountisE23_E24_E27_E28() throws OpenemsException {
 		this.modbusProtocol.addTask(//
 				new FC3ReadRegistersTask(0xc558, Priority.HIGH, //
-						this.m(AsymmetricMeter.ChannelId.VOLTAGE_L1, new UnsignedDoublewordElement(0xc558),
+						m(AsymmetricMeter.ChannelId.VOLTAGE_L1, new UnsignedDoublewordElement(0xc558),
 								ElementToChannelConverter.SCALE_FACTOR_1), //
-						this.m(AsymmetricMeter.ChannelId.VOLTAGE_L2, new UnsignedDoublewordElement(0xc55A),
+						m(AsymmetricMeter.ChannelId.VOLTAGE_L2, new UnsignedDoublewordElement(0xc55A),
 								ElementToChannelConverter.SCALE_FACTOR_1), //
-						this.m(AsymmetricMeter.ChannelId.VOLTAGE_L3, new UnsignedDoublewordElement(0xc55C),
+						m(AsymmetricMeter.ChannelId.VOLTAGE_L3, new UnsignedDoublewordElement(0xc55C),
 								ElementToChannelConverter.SCALE_FACTOR_1), //
-						this.m(SymmetricMeter.ChannelId.FREQUENCY, new UnsignedDoublewordElement(0xc55E)), //
-						this.m(AsymmetricMeter.ChannelId.CURRENT_L1, new UnsignedDoublewordElement(0xc560), //
+						m(SymmetricMeter.ChannelId.FREQUENCY, new UnsignedDoublewordElement(0xc55E)), //
+						m(AsymmetricMeter.ChannelId.CURRENT_L1, new UnsignedDoublewordElement(0xc560), //
 								ElementToChannelConverter.INVERT_IF_TRUE(this.config.invert())), //
-						this.m(AsymmetricMeter.ChannelId.CURRENT_L2, new UnsignedDoublewordElement(0xc562), //
+						m(AsymmetricMeter.ChannelId.CURRENT_L2, new UnsignedDoublewordElement(0xc562), //
 								ElementToChannelConverter.INVERT_IF_TRUE(this.config.invert())), //
-						this.m(AsymmetricMeter.ChannelId.CURRENT_L3, new UnsignedDoublewordElement(0xc564), //
+						m(AsymmetricMeter.ChannelId.CURRENT_L3, new UnsignedDoublewordElement(0xc564), //
 								ElementToChannelConverter.INVERT_IF_TRUE(this.config.invert())), //
 						new DummyRegisterElement(0xc566, 0xc567), //
-						this.m(SymmetricMeter.ChannelId.ACTIVE_POWER, new SignedDoublewordElement(0xc568),
+						m(SymmetricMeter.ChannelId.ACTIVE_POWER, new SignedDoublewordElement(0xc568),
 								ElementToChannelConverter.SCALE_FACTOR_1_AND_INVERT_IF_TRUE(this.config.invert())), //
-						this.m(SymmetricMeter.ChannelId.REACTIVE_POWER, new SignedDoublewordElement(0xc56A),
+						m(SymmetricMeter.ChannelId.REACTIVE_POWER, new SignedDoublewordElement(0xc56A),
 								ElementToChannelConverter.SCALE_FACTOR_1_AND_INVERT_IF_TRUE(this.config.invert())), //
 						new DummyRegisterElement(0xc56C, 0xc56F), //
-						this.m(AsymmetricMeter.ChannelId.ACTIVE_POWER_L1, new SignedDoublewordElement(0xc570),
+						m(AsymmetricMeter.ChannelId.ACTIVE_POWER_L1, new SignedDoublewordElement(0xc570),
 								ElementToChannelConverter.SCALE_FACTOR_1_AND_INVERT_IF_TRUE(this.config.invert())), //
-						this.m(AsymmetricMeter.ChannelId.ACTIVE_POWER_L2, new SignedDoublewordElement(0xc572),
+						m(AsymmetricMeter.ChannelId.ACTIVE_POWER_L2, new SignedDoublewordElement(0xc572),
 								ElementToChannelConverter.SCALE_FACTOR_1_AND_INVERT_IF_TRUE(this.config.invert())), //
-						this.m(AsymmetricMeter.ChannelId.ACTIVE_POWER_L3, new SignedDoublewordElement(0xc574),
+						m(AsymmetricMeter.ChannelId.ACTIVE_POWER_L3, new SignedDoublewordElement(0xc574),
 								ElementToChannelConverter.SCALE_FACTOR_1_AND_INVERT_IF_TRUE(this.config.invert())), //
-						this.m(AsymmetricMeter.ChannelId.REACTIVE_POWER_L1, new SignedDoublewordElement(0xc576),
+						m(AsymmetricMeter.ChannelId.REACTIVE_POWER_L1, new SignedDoublewordElement(0xc576),
 								ElementToChannelConverter.SCALE_FACTOR_1_AND_INVERT_IF_TRUE(this.config.invert())), //
-						this.m(AsymmetricMeter.ChannelId.REACTIVE_POWER_L2, new SignedDoublewordElement(0xc578),
+						m(AsymmetricMeter.ChannelId.REACTIVE_POWER_L2, new SignedDoublewordElement(0xc578),
 								ElementToChannelConverter.SCALE_FACTOR_1_AND_INVERT_IF_TRUE(this.config.invert())), //
-						this.m(AsymmetricMeter.ChannelId.REACTIVE_POWER_L3, new SignedDoublewordElement(0xc57A),
+						m(AsymmetricMeter.ChannelId.REACTIVE_POWER_L3, new SignedDoublewordElement(0xc57A),
 								ElementToChannelConverter.SCALE_FACTOR_1_AND_INVERT_IF_TRUE(this.config.invert())), //
 						new DummyRegisterElement(0xC57C, 0xC587), //
-						this.m(SymmetricMeter.ChannelId.CURRENT, new UnsignedDoublewordElement(0xC588)), //
+						m(SymmetricMeter.ChannelId.CURRENT, new UnsignedDoublewordElement(0xC588)), //
 						new DummyRegisterElement(0xC58A, 0xC58B), //
-						this.m(SymmetricMeter.ChannelId.VOLTAGE, new UnsignedDoublewordElement(0xC58C),
+						m(SymmetricMeter.ChannelId.VOLTAGE, new UnsignedDoublewordElement(0xC58C),
 								ElementToChannelConverter.SCALE_FACTOR_1))); //
 		if (this.config.invert()) {
 			this.modbusProtocol.addTask(new FC3ReadRegistersTask(0xC702, Priority.LOW, //
-					this.m(SymmetricMeter.ChannelId.ACTIVE_CONSUMPTION_ENERGY, new UnsignedDoublewordElement(0xC702),
+					m(SymmetricMeter.ChannelId.ACTIVE_CONSUMPTION_ENERGY, new UnsignedDoublewordElement(0xC702),
 							ElementToChannelConverter.SCALE_FACTOR_1), //
 					new DummyRegisterElement(0xC704, 0xC707), //
-					this.m(SymmetricMeter.ChannelId.ACTIVE_PRODUCTION_ENERGY, new UnsignedDoublewordElement(0xC708),
+					m(SymmetricMeter.ChannelId.ACTIVE_PRODUCTION_ENERGY, new UnsignedDoublewordElement(0xC708),
 							ElementToChannelConverter.SCALE_FACTOR_1) //
 			));
 		} else {
 			this.modbusProtocol.addTask(new FC3ReadRegistersTask(0xC702, Priority.LOW, //
-					this.m(SymmetricMeter.ChannelId.ACTIVE_PRODUCTION_ENERGY, new UnsignedDoublewordElement(0xC702),
+					m(SymmetricMeter.ChannelId.ACTIVE_PRODUCTION_ENERGY, new UnsignedDoublewordElement(0xC702),
 							ElementToChannelConverter.SCALE_FACTOR_1), //
 					new DummyRegisterElement(0xC704, 0xC707), //
-					this.m(SymmetricMeter.ChannelId.ACTIVE_CONSUMPTION_ENERGY, new UnsignedDoublewordElement(0xC708),
+					m(SymmetricMeter.ChannelId.ACTIVE_CONSUMPTION_ENERGY, new UnsignedDoublewordElement(0xC708),
 							ElementToChannelConverter.SCALE_FACTOR_1) //
 			));
 		}
@@ -154,37 +154,37 @@ protected void identifiedCountisE23_E24_E27_E28() throws OpenemsException {
 	protected void identifiedCountisE34_E44() throws OpenemsException {
 		this.modbusProtocol.addTask(//
 				new FC3ReadRegistersTask(0xc558, Priority.HIGH, //
-						this.m(AsymmetricMeter.ChannelId.VOLTAGE_L1, new UnsignedDoublewordElement(0xc558),
+						m(AsymmetricMeter.ChannelId.VOLTAGE_L1, new UnsignedDoublewordElement(0xc558),
 								ElementToChannelConverter.SCALE_FACTOR_1), //
-						this.m(AsymmetricMeter.ChannelId.VOLTAGE_L2, new UnsignedDoublewordElement(0xc55A),
+						m(AsymmetricMeter.ChannelId.VOLTAGE_L2, new UnsignedDoublewordElement(0xc55A),
 								ElementToChannelConverter.SCALE_FACTOR_1), //
-						this.m(AsymmetricMeter.ChannelId.VOLTAGE_L3, new UnsignedDoublewordElement(0xc55C),
+						m(AsymmetricMeter.ChannelId.VOLTAGE_L3, new UnsignedDoublewordElement(0xc55C),
 								ElementToChannelConverter.SCALE_FACTOR_1), //
-						this.m(SymmetricMeter.ChannelId.FREQUENCY, new UnsignedDoublewordElement(0xc55E),
+						m(SymmetricMeter.ChannelId.FREQUENCY, new UnsignedDoublewordElement(0xc55E),
 								ElementToChannelConverter.SCALE_FACTOR_1), //
-						this.m(AsymmetricMeter.ChannelId.CURRENT_L1, new UnsignedDoublewordElement(0xc560), //
+						m(AsymmetricMeter.ChannelId.CURRENT_L1, new UnsignedDoublewordElement(0xc560), //
 								ElementToChannelConverter.INVERT_IF_TRUE(this.config.invert())), //
-						this.m(AsymmetricMeter.ChannelId.CURRENT_L2, new UnsignedDoublewordElement(0xc562), //
+						m(AsymmetricMeter.ChannelId.CURRENT_L2, new UnsignedDoublewordElement(0xc562), //
 								ElementToChannelConverter.INVERT_IF_TRUE(this.config.invert())), //
-						this.m(AsymmetricMeter.ChannelId.CURRENT_L3, new UnsignedDoublewordElement(0xc564), //
+						m(AsymmetricMeter.ChannelId.CURRENT_L3, new UnsignedDoublewordElement(0xc564), //
 								ElementToChannelConverter.INVERT_IF_TRUE(this.config.invert())), //
 						new DummyRegisterElement(0xc566, 0xc567), //
-						this.m(SymmetricMeter.ChannelId.ACTIVE_POWER, new SignedDoublewordElement(0xc568),
+						m(SymmetricMeter.ChannelId.ACTIVE_POWER, new SignedDoublewordElement(0xc568),
 								ElementToChannelConverter.SCALE_FACTOR_1_AND_INVERT_IF_TRUE(this.config.invert())), //
-						this.m(SymmetricMeter.ChannelId.REACTIVE_POWER, new SignedDoublewordElement(0xc56A),
+						m(SymmetricMeter.ChannelId.REACTIVE_POWER, new SignedDoublewordElement(0xc56A),
 								ElementToChannelConverter.SCALE_FACTOR_1_AND_INVERT_IF_TRUE(this.config.invert())), //
 						new DummyRegisterElement(0xc56C, 0xc56F), //
-						this.m(AsymmetricMeter.ChannelId.ACTIVE_POWER_L1, new SignedDoublewordElement(0xc570),
+						m(AsymmetricMeter.ChannelId.ACTIVE_POWER_L1, new SignedDoublewordElement(0xc570),
 								ElementToChannelConverter.SCALE_FACTOR_1_AND_INVERT_IF_TRUE(this.config.invert())), //
-						this.m(AsymmetricMeter.ChannelId.ACTIVE_POWER_L2, new SignedDoublewordElement(0xc572),
+						m(AsymmetricMeter.ChannelId.ACTIVE_POWER_L2, new SignedDoublewordElement(0xc572),
 								ElementToChannelConverter.SCALE_FACTOR_1_AND_INVERT_IF_TRUE(this.config.invert())), //
-						this.m(AsymmetricMeter.ChannelId.ACTIVE_POWER_L3, new SignedDoublewordElement(0xc574),
+						m(AsymmetricMeter.ChannelId.ACTIVE_POWER_L3, new SignedDoublewordElement(0xc574),
 								ElementToChannelConverter.SCALE_FACTOR_1_AND_INVERT_IF_TRUE(this.config.invert())), //
-						this.m(AsymmetricMeter.ChannelId.REACTIVE_POWER_L1, new SignedDoublewordElement(0xc576),
+						m(AsymmetricMeter.ChannelId.REACTIVE_POWER_L1, new SignedDoublewordElement(0xc576),
 								ElementToChannelConverter.SCALE_FACTOR_1_AND_INVERT_IF_TRUE(this.config.invert())), //
-						this.m(AsymmetricMeter.ChannelId.REACTIVE_POWER_L2, new SignedDoublewordElement(0xc578),
+						m(AsymmetricMeter.ChannelId.REACTIVE_POWER_L2, new SignedDoublewordElement(0xc578),
 								ElementToChannelConverter.SCALE_FACTOR_1_AND_INVERT_IF_TRUE(this.config.invert())), //
-						this.m(AsymmetricMeter.ChannelId.REACTIVE_POWER_L3, new SignedDoublewordElement(0xc57A),
+						m(AsymmetricMeter.ChannelId.REACTIVE_POWER_L3, new SignedDoublewordElement(0xc57A),
 								ElementToChannelConverter.SCALE_FACTOR_1_AND_INVERT_IF_TRUE(this.config.invert()))));
 
 		this.calculateSumCurrent();
@@ -192,18 +192,18 @@ protected void identifiedCountisE34_E44() throws OpenemsException {
 
 		if (this.config.invert()) {
 			this.modbusProtocol.addTask(new FC3ReadRegistersTask(0xC702, Priority.LOW, //
-					this.m(SymmetricMeter.ChannelId.ACTIVE_CONSUMPTION_ENERGY, new UnsignedDoublewordElement(0xC702),
+					m(SymmetricMeter.ChannelId.ACTIVE_CONSUMPTION_ENERGY, new UnsignedDoublewordElement(0xC702),
 							ElementToChannelConverter.SCALE_FACTOR_1), //
 					new DummyRegisterElement(0xC704, 0xC707), //
-					this.m(SymmetricMeter.ChannelId.ACTIVE_PRODUCTION_ENERGY, new UnsignedDoublewordElement(0xC708),
+					m(SymmetricMeter.ChannelId.ACTIVE_PRODUCTION_ENERGY, new UnsignedDoublewordElement(0xC708),
 							ElementToChannelConverter.SCALE_FACTOR_1) //
 			));
 		} else {
 			this.modbusProtocol.addTask(new FC3ReadRegistersTask(0xC702, Priority.LOW, //
-					this.m(SymmetricMeter.ChannelId.ACTIVE_PRODUCTION_ENERGY, new UnsignedDoublewordElement(0xC702),
+					m(SymmetricMeter.ChannelId.ACTIVE_PRODUCTION_ENERGY, new UnsignedDoublewordElement(0xC702),
 							ElementToChannelConverter.SCALE_FACTOR_1), //
 					new DummyRegisterElement(0xC704, 0xC707), //
-					this.m(SymmetricMeter.ChannelId.ACTIVE_CONSUMPTION_ENERGY, new UnsignedDoublewordElement(0xC708),
+					m(SymmetricMeter.ChannelId.ACTIVE_CONSUMPTION_ENERGY, new UnsignedDoublewordElement(0xC708),
 							ElementToChannelConverter.SCALE_FACTOR_1) //
 			));
 		}
@@ -213,37 +213,37 @@ protected void identifiedCountisE34_E44() throws OpenemsException {
 	protected void identifiedDirisA14() throws OpenemsException {
 		this.modbusProtocol.addTask(//
 				new FC3ReadRegistersTask(0xc558, Priority.HIGH, //
-						this.m(AsymmetricMeter.ChannelId.VOLTAGE_L1, new UnsignedDoublewordElement(0xc558),
+						m(AsymmetricMeter.ChannelId.VOLTAGE_L1, new UnsignedDoublewordElement(0xc558),
 								ElementToChannelConverter.SCALE_FACTOR_1), //
-						this.m(AsymmetricMeter.ChannelId.VOLTAGE_L2, new UnsignedDoublewordElement(0xc55A),
+						m(AsymmetricMeter.ChannelId.VOLTAGE_L2, new UnsignedDoublewordElement(0xc55A),
 								ElementToChannelConverter.SCALE_FACTOR_1), //
-						this.m(AsymmetricMeter.ChannelId.VOLTAGE_L3, new UnsignedDoublewordElement(0xc55C),
+						m(AsymmetricMeter.ChannelId.VOLTAGE_L3, new UnsignedDoublewordElement(0xc55C),
 								ElementToChannelConverter.SCALE_FACTOR_1), //
-						this.m(SymmetricMeter.ChannelId.FREQUENCY, new UnsignedDoublewordElement(0xc55E),
+						m(SymmetricMeter.ChannelId.FREQUENCY, new UnsignedDoublewordElement(0xc55E),
 								ElementToChannelConverter.SCALE_FACTOR_1), //
-						this.m(AsymmetricMeter.ChannelId.CURRENT_L1, new UnsignedDoublewordElement(0xc560), //
+						m(AsymmetricMeter.ChannelId.CURRENT_L1, new UnsignedDoublewordElement(0xc560), //
 								ElementToChannelConverter.INVERT_IF_TRUE(this.config.invert())), //
-						this.m(AsymmetricMeter.ChannelId.CURRENT_L2, new UnsignedDoublewordElement(0xc562), //
+						m(AsymmetricMeter.ChannelId.CURRENT_L2, new UnsignedDoublewordElement(0xc562), //
 								ElementToChannelConverter.INVERT_IF_TRUE(this.config.invert())), //
-						this.m(AsymmetricMeter.ChannelId.CURRENT_L3, new UnsignedDoublewordElement(0xc564), //
+						m(AsymmetricMeter.ChannelId.CURRENT_L3, new UnsignedDoublewordElement(0xc564), //
 								ElementToChannelConverter.INVERT_IF_TRUE(this.config.invert())), //
 						new DummyRegisterElement(0xc566, 0xc567), //
-						this.m(SymmetricMeter.ChannelId.ACTIVE_POWER, new SignedDoublewordElement(0xc568),
+						m(SymmetricMeter.ChannelId.ACTIVE_POWER, new SignedDoublewordElement(0xc568),
 								ElementToChannelConverter.SCALE_FACTOR_1_AND_INVERT_IF_TRUE(this.config.invert())), //
-						this.m(SymmetricMeter.ChannelId.REACTIVE_POWER, new SignedDoublewordElement(0xc56A),
+						m(SymmetricMeter.ChannelId.REACTIVE_POWER, new SignedDoublewordElement(0xc56A),
 								ElementToChannelConverter.SCALE_FACTOR_1_AND_INVERT_IF_TRUE(this.config.invert())), //
 						new DummyRegisterElement(0xc56C, 0xc56F), //
-						this.m(AsymmetricMeter.ChannelId.ACTIVE_POWER_L1, new SignedDoublewordElement(0xc570),
+						m(AsymmetricMeter.ChannelId.ACTIVE_POWER_L1, new SignedDoublewordElement(0xc570),
 								ElementToChannelConverter.SCALE_FACTOR_1_AND_INVERT_IF_TRUE(this.config.invert())), //
-						this.m(AsymmetricMeter.ChannelId.ACTIVE_POWER_L2, new SignedDoublewordElement(0xc572),
+						m(AsymmetricMeter.ChannelId.ACTIVE_POWER_L2, new SignedDoublewordElement(0xc572),
 								ElementToChannelConverter.SCALE_FACTOR_1_AND_INVERT_IF_TRUE(this.config.invert())), //
-						this.m(AsymmetricMeter.ChannelId.ACTIVE_POWER_L3, new SignedDoublewordElement(0xc574),
+						m(AsymmetricMeter.ChannelId.ACTIVE_POWER_L3, new SignedDoublewordElement(0xc574),
 								ElementToChannelConverter.SCALE_FACTOR_1_AND_INVERT_IF_TRUE(this.config.invert())), //
-						this.m(AsymmetricMeter.ChannelId.REACTIVE_POWER_L1, new SignedDoublewordElement(0xc576),
+						m(AsymmetricMeter.ChannelId.REACTIVE_POWER_L1, new SignedDoublewordElement(0xc576),
 								ElementToChannelConverter.SCALE_FACTOR_1_AND_INVERT_IF_TRUE(this.config.invert())), //
-						this.m(AsymmetricMeter.ChannelId.REACTIVE_POWER_L2, new SignedDoublewordElement(0xc578),
+						m(AsymmetricMeter.ChannelId.REACTIVE_POWER_L2, new SignedDoublewordElement(0xc578),
 								ElementToChannelConverter.SCALE_FACTOR_1_AND_INVERT_IF_TRUE(this.config.invert())), //
-						this.m(AsymmetricMeter.ChannelId.REACTIVE_POWER_L3, new SignedDoublewordElement(0xc57A),
+						m(AsymmetricMeter.ChannelId.REACTIVE_POWER_L3, new SignedDoublewordElement(0xc57A),
 								ElementToChannelConverter.SCALE_FACTOR_1_AND_INVERT_IF_TRUE(this.config.invert())))); //
 
 		this.calculateSumCurrent();
@@ -251,18 +251,18 @@ protected void identifiedDirisA14() throws OpenemsException {
 
 		if (this.config.invert()) {
 			this.modbusProtocol.addTask(new FC3ReadRegistersTask(0xC702, Priority.LOW, //
-					this.m(SymmetricMeter.ChannelId.ACTIVE_CONSUMPTION_ENERGY, new UnsignedDoublewordElement(0xC702),
+					m(SymmetricMeter.ChannelId.ACTIVE_CONSUMPTION_ENERGY, new UnsignedDoublewordElement(0xC702),
 							ElementToChannelConverter.SCALE_FACTOR_1), //
 					new DummyRegisterElement(0xC704, 0xC707), //
-					this.m(SymmetricMeter.ChannelId.ACTIVE_PRODUCTION_ENERGY, new UnsignedDoublewordElement(0xC708),
+					m(SymmetricMeter.ChannelId.ACTIVE_PRODUCTION_ENERGY, new UnsignedDoublewordElement(0xC708),
 							ElementToChannelConverter.SCALE_FACTOR_1) //
 			));
 		} else {
 			this.modbusProtocol.addTask(new FC3ReadRegistersTask(0xC702, Priority.LOW, //
-					this.m(SymmetricMeter.ChannelId.ACTIVE_PRODUCTION_ENERGY, new UnsignedDoublewordElement(0xC702),
+					m(SymmetricMeter.ChannelId.ACTIVE_PRODUCTION_ENERGY, new UnsignedDoublewordElement(0xC702),
 							ElementToChannelConverter.SCALE_FACTOR_1), //
 					new DummyRegisterElement(0xC704, 0xC707), //
-					this.m(SymmetricMeter.ChannelId.ACTIVE_CONSUMPTION_ENERGY, new UnsignedDoublewordElement(0xC708),
+					m(SymmetricMeter.ChannelId.ACTIVE_CONSUMPTION_ENERGY, new UnsignedDoublewordElement(0xC708),
 							ElementToChannelConverter.SCALE_FACTOR_1) //
 			));
 		}
@@ -272,37 +272,37 @@ protected void identifiedDirisA14() throws OpenemsException {
 	protected void identifiedDirisA10() throws OpenemsException {
 		this.modbusProtocol.addTask(//
 				new FC3ReadRegistersTask(0xc558, Priority.HIGH, //
-						this.m(AsymmetricMeter.ChannelId.VOLTAGE_L1, new UnsignedDoublewordElement(0xc558),
+						m(AsymmetricMeter.ChannelId.VOLTAGE_L1, new UnsignedDoublewordElement(0xc558),
 								ElementToChannelConverter.SCALE_FACTOR_1), //
-						this.m(AsymmetricMeter.ChannelId.VOLTAGE_L2, new UnsignedDoublewordElement(0xc55A),
+						m(AsymmetricMeter.ChannelId.VOLTAGE_L2, new UnsignedDoublewordElement(0xc55A),
 								ElementToChannelConverter.SCALE_FACTOR_1), //
-						this.m(AsymmetricMeter.ChannelId.VOLTAGE_L3, new UnsignedDoublewordElement(0xc55C),
+						m(AsymmetricMeter.ChannelId.VOLTAGE_L3, new UnsignedDoublewordElement(0xc55C),
 								ElementToChannelConverter.SCALE_FACTOR_1), //
-						this.m(SymmetricMeter.ChannelId.FREQUENCY, new UnsignedDoublewordElement(0xc55E),
+						m(SymmetricMeter.ChannelId.FREQUENCY, new UnsignedDoublewordElement(0xc55E),
 								ElementToChannelConverter.SCALE_FACTOR_1), //
-						this.m(AsymmetricMeter.ChannelId.CURRENT_L1, new UnsignedDoublewordElement(0xc560), //
+						m(AsymmetricMeter.ChannelId.CURRENT_L1, new UnsignedDoublewordElement(0xc560), //
 								ElementToChannelConverter.INVERT_IF_TRUE(this.config.invert())), //
-						this.m(AsymmetricMeter.ChannelId.CURRENT_L2, new UnsignedDoublewordElement(0xc562), //
+						m(AsymmetricMeter.ChannelId.CURRENT_L2, new UnsignedDoublewordElement(0xc562), //
 								ElementToChannelConverter.INVERT_IF_TRUE(this.config.invert())), //
-						this.m(AsymmetricMeter.ChannelId.CURRENT_L3, new UnsignedDoublewordElement(0xc564), //
+						m(AsymmetricMeter.ChannelId.CURRENT_L3, new UnsignedDoublewordElement(0xc564), //
 								ElementToChannelConverter.INVERT_IF_TRUE(this.config.invert())), //
 						new DummyRegisterElement(0xc566, 0xc567), //
-						this.m(SymmetricMeter.ChannelId.ACTIVE_POWER, new SignedDoublewordElement(0xc568),
+						m(SymmetricMeter.ChannelId.ACTIVE_POWER, new SignedDoublewordElement(0xc568),
 								ElementToChannelConverter.SCALE_FACTOR_1_AND_INVERT_IF_TRUE(this.config.invert())), //
-						this.m(SymmetricMeter.ChannelId.REACTIVE_POWER, new SignedDoublewordElement(0xc56A),
+						m(SymmetricMeter.ChannelId.REACTIVE_POWER, new SignedDoublewordElement(0xc56A),
 								ElementToChannelConverter.SCALE_FACTOR_1_AND_INVERT_IF_TRUE(this.config.invert())), //
 						new DummyRegisterElement(0xc56C, 0xc56F), //
-						this.m(AsymmetricMeter.ChannelId.ACTIVE_POWER_L1, new SignedDoublewordElement(0xc570),
+						m(AsymmetricMeter.ChannelId.ACTIVE_POWER_L1, new SignedDoublewordElement(0xc570),
 								ElementToChannelConverter.SCALE_FACTOR_1_AND_INVERT_IF_TRUE(this.config.invert())), //
-						this.m(AsymmetricMeter.ChannelId.ACTIVE_POWER_L2, new SignedDoublewordElement(0xc572),
+						m(AsymmetricMeter.ChannelId.ACTIVE_POWER_L2, new SignedDoublewordElement(0xc572),
 								ElementToChannelConverter.SCALE_FACTOR_1_AND_INVERT_IF_TRUE(this.config.invert())), //
-						this.m(AsymmetricMeter.ChannelId.ACTIVE_POWER_L3, new SignedDoublewordElement(0xc574),
+						m(AsymmetricMeter.ChannelId.ACTIVE_POWER_L3, new SignedDoublewordElement(0xc574),
 								ElementToChannelConverter.SCALE_FACTOR_1_AND_INVERT_IF_TRUE(this.config.invert())), //
-						this.m(AsymmetricMeter.ChannelId.REACTIVE_POWER_L1, new SignedDoublewordElement(0xc576),
+						m(AsymmetricMeter.ChannelId.REACTIVE_POWER_L1, new SignedDoublewordElement(0xc576),
 								ElementToChannelConverter.SCALE_FACTOR_1_AND_INVERT_IF_TRUE(this.config.invert())), //
-						this.m(AsymmetricMeter.ChannelId.REACTIVE_POWER_L2, new SignedDoublewordElement(0xc578),
+						m(AsymmetricMeter.ChannelId.REACTIVE_POWER_L2, new SignedDoublewordElement(0xc578),
 								ElementToChannelConverter.SCALE_FACTOR_1_AND_INVERT_IF_TRUE(this.config.invert())), //
-						this.m(AsymmetricMeter.ChannelId.REACTIVE_POWER_L3, new SignedDoublewordElement(0xc57A),
+						m(AsymmetricMeter.ChannelId.REACTIVE_POWER_L3, new SignedDoublewordElement(0xc57A),
 								ElementToChannelConverter.SCALE_FACTOR_1_AND_INVERT_IF_TRUE(this.config.invert())))); //
 
 		this.calculateSumCurrent();
@@ -310,18 +310,18 @@ protected void identifiedDirisA10() throws OpenemsException {
 
 		if (this.config.invert()) {
 			this.modbusProtocol.addTask(new FC3ReadRegistersTask(0xC65C, Priority.LOW, //
-					this.m(SymmetricMeter.ChannelId.ACTIVE_CONSUMPTION_ENERGY, new UnsignedDoublewordElement(0xC65C),
+					m(SymmetricMeter.ChannelId.ACTIVE_CONSUMPTION_ENERGY, new UnsignedDoublewordElement(0xC65C),
 							ElementToChannelConverter.SCALE_FACTOR_3), //
 					new DummyRegisterElement(0xC65E, 0xC661), //
-					this.m(SymmetricMeter.ChannelId.ACTIVE_PRODUCTION_ENERGY, new UnsignedDoublewordElement(0xC662),
+					m(SymmetricMeter.ChannelId.ACTIVE_PRODUCTION_ENERGY, new UnsignedDoublewordElement(0xC662),
 							ElementToChannelConverter.SCALE_FACTOR_3) //
 			));
 		} else {
 			this.modbusProtocol.addTask(new FC3ReadRegistersTask(0xC65C, Priority.LOW, //
-					this.m(SymmetricMeter.ChannelId.ACTIVE_PRODUCTION_ENERGY, new UnsignedDoublewordElement(0xC65C),
+					m(SymmetricMeter.ChannelId.ACTIVE_PRODUCTION_ENERGY, new UnsignedDoublewordElement(0xC65C),
 							ElementToChannelConverter.SCALE_FACTOR_3), //
 					new DummyRegisterElement(0xC65E, 0xC661), //
-					this.m(SymmetricMeter.ChannelId.ACTIVE_CONSUMPTION_ENERGY, new UnsignedDoublewordElement(0xC662),
+					m(SymmetricMeter.ChannelId.ACTIVE_CONSUMPTION_ENERGY, new UnsignedDoublewordElement(0xC662),
 							ElementToChannelConverter.SCALE_FACTOR_3) //
 			));
 		}
@@ -331,36 +331,36 @@ protected void identifiedDirisA10() throws OpenemsException {
 	protected void identifiedDirisB30() throws OpenemsException {
 		this.modbusProtocol.addTask(//
 				new FC3ReadRegistersTask(0x480C, Priority.HIGH, //
-						this.m(AsymmetricMeter.ChannelId.VOLTAGE_L1, new UnsignedDoublewordElement(0x480C),
+						m(AsymmetricMeter.ChannelId.VOLTAGE_L1, new UnsignedDoublewordElement(0x480C),
 								ElementToChannelConverter.SCALE_FACTOR_1), //
-						this.m(AsymmetricMeter.ChannelId.VOLTAGE_L2, new UnsignedDoublewordElement(0x480E),
+						m(AsymmetricMeter.ChannelId.VOLTAGE_L2, new UnsignedDoublewordElement(0x480E),
 								ElementToChannelConverter.SCALE_FACTOR_1), //
-						this.m(AsymmetricMeter.ChannelId.VOLTAGE_L3, new UnsignedDoublewordElement(0x4810),
+						m(AsymmetricMeter.ChannelId.VOLTAGE_L3, new UnsignedDoublewordElement(0x4810),
 								ElementToChannelConverter.SCALE_FACTOR_1), //
 						new DummyRegisterElement(0x4812, 0x4819), //
-						this.m(AsymmetricMeter.ChannelId.CURRENT_L1, new UnsignedDoublewordElement(0x481A), //
+						m(AsymmetricMeter.ChannelId.CURRENT_L1, new UnsignedDoublewordElement(0x481A), //
 								ElementToChannelConverter.INVERT_IF_TRUE(this.config.invert())), //
-						this.m(AsymmetricMeter.ChannelId.CURRENT_L2, new UnsignedDoublewordElement(0x481C), //
+						m(AsymmetricMeter.ChannelId.CURRENT_L2, new UnsignedDoublewordElement(0x481C), //
 								ElementToChannelConverter.INVERT_IF_TRUE(this.config.invert())), //
-						this.m(AsymmetricMeter.ChannelId.CURRENT_L3, new UnsignedDoublewordElement(0x481E), //
+						m(AsymmetricMeter.ChannelId.CURRENT_L3, new UnsignedDoublewordElement(0x481E), //
 								ElementToChannelConverter.INVERT_IF_TRUE(this.config.invert())), //
 						new DummyRegisterElement(0x4820, 0x482B), //
-						this.m(SymmetricMeter.ChannelId.ACTIVE_POWER, new SignedDoublewordElement(0x482C), //
+						m(SymmetricMeter.ChannelId.ACTIVE_POWER, new SignedDoublewordElement(0x482C), //
 								ElementToChannelConverter.INVERT_IF_TRUE(this.config.invert())), //
-						this.m(SymmetricMeter.ChannelId.REACTIVE_POWER, new SignedDoublewordElement(0x482E), //
+						m(SymmetricMeter.ChannelId.REACTIVE_POWER, new SignedDoublewordElement(0x482E), //
 								ElementToChannelConverter.INVERT_IF_TRUE(this.config.invert())), //
 						new DummyRegisterElement(0x4830, 0x4837), //
-						this.m(AsymmetricMeter.ChannelId.ACTIVE_POWER_L1, new SignedDoublewordElement(0x4838), //
+						m(AsymmetricMeter.ChannelId.ACTIVE_POWER_L1, new SignedDoublewordElement(0x4838), //
 								ElementToChannelConverter.INVERT_IF_TRUE(this.config.invert())), //
-						this.m(AsymmetricMeter.ChannelId.ACTIVE_POWER_L2, new SignedDoublewordElement(0x483A), //
+						m(AsymmetricMeter.ChannelId.ACTIVE_POWER_L2, new SignedDoublewordElement(0x483A), //
 								ElementToChannelConverter.INVERT_IF_TRUE(this.config.invert())), //
-						this.m(AsymmetricMeter.ChannelId.ACTIVE_POWER_L3, new SignedDoublewordElement(0x483C), //
+						m(AsymmetricMeter.ChannelId.ACTIVE_POWER_L3, new SignedDoublewordElement(0x483C), //
 								ElementToChannelConverter.INVERT_IF_TRUE(this.config.invert())), //
-						this.m(AsymmetricMeter.ChannelId.REACTIVE_POWER_L1, new SignedDoublewordElement(0x483E), //
+						m(AsymmetricMeter.ChannelId.REACTIVE_POWER_L1, new SignedDoublewordElement(0x483E), //
 								ElementToChannelConverter.INVERT_IF_TRUE(this.config.invert())), //
-						this.m(AsymmetricMeter.ChannelId.REACTIVE_POWER_L2, new SignedDoublewordElement(0x4840), //
+						m(AsymmetricMeter.ChannelId.REACTIVE_POWER_L2, new SignedDoublewordElement(0x4840), //
 								ElementToChannelConverter.INVERT_IF_TRUE(this.config.invert())), //
-						this.m(AsymmetricMeter.ChannelId.REACTIVE_POWER_L3, new SignedDoublewordElement(0x4842), //
+						m(AsymmetricMeter.ChannelId.REACTIVE_POWER_L3, new SignedDoublewordElement(0x4842), //
 								ElementToChannelConverter.INVERT_IF_TRUE(this.config.invert())) //
 				));
 
@@ -369,18 +369,18 @@ protected void identifiedDirisB30() throws OpenemsException {
 
 		if (this.config.invert()) {
 			this.modbusProtocol.addTask(new FC3ReadRegistersTask(0x4D83, Priority.LOW, //
-					this.m(SymmetricMeter.ChannelId.ACTIVE_CONSUMPTION_ENERGY, new UnsignedDoublewordElement(0x4D83),
+					m(SymmetricMeter.ChannelId.ACTIVE_CONSUMPTION_ENERGY, new UnsignedDoublewordElement(0x4D83),
 							ElementToChannelConverter.SCALE_FACTOR_3), //
 					new DummyRegisterElement(0x4D85), //
-					this.m(SymmetricMeter.ChannelId.ACTIVE_PRODUCTION_ENERGY, new UnsignedDoublewordElement(0x4D86),
+					m(SymmetricMeter.ChannelId.ACTIVE_PRODUCTION_ENERGY, new UnsignedDoublewordElement(0x4D86),
 							ElementToChannelConverter.SCALE_FACTOR_3) //
 			));
 		} else {
 			this.modbusProtocol.addTask(new FC3ReadRegistersTask(0x4D83, Priority.LOW, //
-					this.m(SymmetricMeter.ChannelId.ACTIVE_PRODUCTION_ENERGY, new UnsignedDoublewordElement(0x4D83),
+					m(SymmetricMeter.ChannelId.ACTIVE_PRODUCTION_ENERGY, new UnsignedDoublewordElement(0x4D83),
 							ElementToChannelConverter.SCALE_FACTOR_3), //
 					new DummyRegisterElement(0x4D85), //
-					this.m(SymmetricMeter.ChannelId.ACTIVE_CONSUMPTION_ENERGY, new UnsignedDoublewordElement(0x4D86),
+					m(SymmetricMeter.ChannelId.ACTIVE_CONSUMPTION_ENERGY, new UnsignedDoublewordElement(0x4D86),
 							ElementToChannelConverter.SCALE_FACTOR_3) //
 			));
 		}
diff --git a/io.openems.edge.meter.weidmueller/src/io/openems/edge/meter/weidmueller/MeterWeidmueller525.java b/io.openems.edge.meter.weidmueller/src/io/openems/edge/meter/weidmueller/MeterWeidmueller525.java
index 71fb10bc5bc..644b58430f4 100644
--- a/io.openems.edge.meter.weidmueller/src/io/openems/edge/meter/weidmueller/MeterWeidmueller525.java
+++ b/io.openems.edge.meter.weidmueller/src/io/openems/edge/meter/weidmueller/MeterWeidmueller525.java
@@ -79,71 +79,71 @@ public MeterType getMeterType() {
 	protected ModbusProtocol defineModbusProtocol() throws OpenemsException {
 		return new ModbusProtocol(this, //
 				new FC3ReadRegistersTask(19000, Priority.HIGH, //
-						this.m(new FloatDoublewordElement(19000)) //
+						m(new FloatDoublewordElement(19000)) //
 								.m(AsymmetricMeter.ChannelId.VOLTAGE_L1, ElementToChannelConverter.DIRECT_1_TO_1) //
 								.m(SymmetricMeter.ChannelId.VOLTAGE, ElementToChannelConverter.DIRECT_1_TO_1) //
 								.build(), //
-						this.m(AsymmetricMeter.ChannelId.VOLTAGE_L2, new FloatDoublewordElement(19002)), //
-						this.m(AsymmetricMeter.ChannelId.VOLTAGE_L3, new FloatDoublewordElement(19004)), //
-						this.m(WeidmuellerChannelId.VOLTAGE_L1_L2, new FloatDoublewordElement(19006)), //
-						this.m(WeidmuellerChannelId.VOLTAGE_L2_L3, new FloatDoublewordElement(19008)), //
-						this.m(WeidmuellerChannelId.VOLTAGE_L1_L3, new FloatDoublewordElement(19010)), //
-						this.m(AsymmetricMeter.ChannelId.CURRENT_L1, new FloatDoublewordElement(19012)), //
-						this.m(AsymmetricMeter.ChannelId.CURRENT_L2, new FloatDoublewordElement(19014)), //
-						this.m(AsymmetricMeter.ChannelId.CURRENT_L3, new FloatDoublewordElement(19016)), //
-						this.m(SymmetricMeter.ChannelId.CURRENT, new FloatDoublewordElement(19018)), //
-						this.m(AsymmetricMeter.ChannelId.ACTIVE_POWER_L1, new FloatDoublewordElement(19020)), //
-						this.m(AsymmetricMeter.ChannelId.ACTIVE_POWER_L2, new FloatDoublewordElement(19022)), //
-						this.m(AsymmetricMeter.ChannelId.ACTIVE_POWER_L3, new FloatDoublewordElement(19024)), //
-						this.m(SymmetricMeter.ChannelId.ACTIVE_POWER, new FloatDoublewordElement(19026)), //
-						this.m(WeidmuellerChannelId.APPARENT_POWER_S1_L1N, new FloatDoublewordElement(19028)), //
-						this.m(WeidmuellerChannelId.APPARENT_POWER_S2_L2N, new FloatDoublewordElement(19030)), //
-						this.m(WeidmuellerChannelId.APPARENT_POWER_S3_L3N, new FloatDoublewordElement(19032)), //
-						this.m(WeidmuellerChannelId.APPARENT_POWER_SUM, new FloatDoublewordElement(19034)), //
-						this.m(AsymmetricMeter.ChannelId.REACTIVE_POWER_L1, new FloatDoublewordElement(19036)), //
-						this.m(AsymmetricMeter.ChannelId.REACTIVE_POWER_L2, new FloatDoublewordElement(19038)), //
-						this.m(AsymmetricMeter.ChannelId.REACTIVE_POWER_L3, new FloatDoublewordElement(19040)), //
-						this.m(SymmetricMeter.ChannelId.REACTIVE_POWER, new FloatDoublewordElement(19042)), //
-						this.m(WeidmuellerChannelId.COSPHI_L1, new FloatDoublewordElement(19044)), //
-						this.m(WeidmuellerChannelId.COSPHI_L2, new FloatDoublewordElement(19046)), //
-						this.m(WeidmuellerChannelId.COSPHI_L3, new FloatDoublewordElement(19048)), //
-						this.m(SymmetricMeter.ChannelId.FREQUENCY, new FloatDoublewordElement(19050)), //
-						this.m(WeidmuellerChannelId.ROTATION_FIELD, new FloatDoublewordElement(19052)), //
-						this.m(WeidmuellerChannelId.REAL_ENERGY_L1, new FloatDoublewordElement(19054)), //
-						this.m(WeidmuellerChannelId.REAL_ENERGY_L2, new FloatDoublewordElement(19056)), //
-						this.m(WeidmuellerChannelId.REAL_ENERGY_L3, new FloatDoublewordElement(19058)), //
-						this.m(WeidmuellerChannelId.REAL_ENERGY_L1_L3, new FloatDoublewordElement(19060)), //
-						this.m(WeidmuellerChannelId.REAL_ENERGY_L1_CONSUMED, new FloatDoublewordElement(19062)), //
-						this.m(WeidmuellerChannelId.REAL_ENERGY_L2_CONSUMED, new FloatDoublewordElement(19064)), //
-						this.m(WeidmuellerChannelId.REAL_ENERGY_L3_CONSUMED, new FloatDoublewordElement(19066)), //
-						this.m(SymmetricMeter.ChannelId.ACTIVE_CONSUMPTION_ENERGY, new FloatDoublewordElement(19068)), //
-						this.m(WeidmuellerChannelId.REAL_ENERGY_L1_DELIVERED, new FloatDoublewordElement(19070)), //
-						this.m(WeidmuellerChannelId.REAL_ENERGY_L2_DELIVERED, new FloatDoublewordElement(19072)), //
-						this.m(WeidmuellerChannelId.REAL_ENERGY_L3_DELIVERED, new FloatDoublewordElement(19074)), //
-						this.m(SymmetricMeter.ChannelId.ACTIVE_PRODUCTION_ENERGY, new FloatDoublewordElement(19076)), //
-						this.m(WeidmuellerChannelId.APPARENT_ENERGY_L1, new FloatDoublewordElement(19078)), //
-						this.m(WeidmuellerChannelId.APPARENT_ENERGY_L2, new FloatDoublewordElement(19080)), //
-						this.m(WeidmuellerChannelId.APPARENT_ENERGY_L3, new FloatDoublewordElement(19082)), //
-						this.m(WeidmuellerChannelId.APPARENT_ENERGY_L1_L3, new FloatDoublewordElement(19084)), //
-						this.m(WeidmuellerChannelId.REACTIVE_ENERGY_L1, new FloatDoublewordElement(19086)), //
-						this.m(WeidmuellerChannelId.REACTIVE_ENERGY_L2, new FloatDoublewordElement(19088)), //
-						this.m(WeidmuellerChannelId.REACTIVE_ENERGY_L3, new FloatDoublewordElement(19090)), //
-						this.m(WeidmuellerChannelId.REACTIVE_ENERGY_L1_L3, new FloatDoublewordElement(19092)), //
-						this.m(WeidmuellerChannelId.REACTIVE_ENERGY_INDUCTIVE_L1, new FloatDoublewordElement(19094)), //
-						this.m(WeidmuellerChannelId.REACTIVE_ENERGY_INDUCTIVE_L2, new FloatDoublewordElement(19096)), //
-						this.m(WeidmuellerChannelId.REACTIVE_ENERGY_INDUCTIVE_L3, new FloatDoublewordElement(19098)), //
-						this.m(WeidmuellerChannelId.REACTIVE_ENERGY_INDUCTIVE_L1_L3, new FloatDoublewordElement(19100)), //
-						this.m(WeidmuellerChannelId.REACTIVE_ENERGY_CAPACITIVE_L1, new FloatDoublewordElement(19102)), //
-						this.m(WeidmuellerChannelId.REACTIVE_ENERGY_CAPACITIVE_L2, new FloatDoublewordElement(19104)), //
-						this.m(WeidmuellerChannelId.REACTIVE_ENERGY_CAPACITIVE_L3, new FloatDoublewordElement(19106)), //
-						this.m(WeidmuellerChannelId.REACTIVE_ENERGY_CAPACITIVE_L1_L3,
+						m(AsymmetricMeter.ChannelId.VOLTAGE_L2, new FloatDoublewordElement(19002)), //
+						m(AsymmetricMeter.ChannelId.VOLTAGE_L3, new FloatDoublewordElement(19004)), //
+						m(WeidmuellerChannelId.VOLTAGE_L1_L2, new FloatDoublewordElement(19006)), //
+						m(WeidmuellerChannelId.VOLTAGE_L2_L3, new FloatDoublewordElement(19008)), //
+						m(WeidmuellerChannelId.VOLTAGE_L1_L3, new FloatDoublewordElement(19010)), //
+						m(AsymmetricMeter.ChannelId.CURRENT_L1, new FloatDoublewordElement(19012)), //
+						m(AsymmetricMeter.ChannelId.CURRENT_L2, new FloatDoublewordElement(19014)), //
+						m(AsymmetricMeter.ChannelId.CURRENT_L3, new FloatDoublewordElement(19016)), //
+						m(SymmetricMeter.ChannelId.CURRENT, new FloatDoublewordElement(19018)), //
+						m(AsymmetricMeter.ChannelId.ACTIVE_POWER_L1, new FloatDoublewordElement(19020)), //
+						m(AsymmetricMeter.ChannelId.ACTIVE_POWER_L2, new FloatDoublewordElement(19022)), //
+						m(AsymmetricMeter.ChannelId.ACTIVE_POWER_L3, new FloatDoublewordElement(19024)), //
+						m(SymmetricMeter.ChannelId.ACTIVE_POWER, new FloatDoublewordElement(19026)), //
+						m(WeidmuellerChannelId.APPARENT_POWER_S1_L1N, new FloatDoublewordElement(19028)), //
+						m(WeidmuellerChannelId.APPARENT_POWER_S2_L2N, new FloatDoublewordElement(19030)), //
+						m(WeidmuellerChannelId.APPARENT_POWER_S3_L3N, new FloatDoublewordElement(19032)), //
+						m(WeidmuellerChannelId.APPARENT_POWER_SUM, new FloatDoublewordElement(19034)), //
+						m(AsymmetricMeter.ChannelId.REACTIVE_POWER_L1, new FloatDoublewordElement(19036)), //
+						m(AsymmetricMeter.ChannelId.REACTIVE_POWER_L2, new FloatDoublewordElement(19038)), //
+						m(AsymmetricMeter.ChannelId.REACTIVE_POWER_L3, new FloatDoublewordElement(19040)), //
+						m(SymmetricMeter.ChannelId.REACTIVE_POWER, new FloatDoublewordElement(19042)), //
+						m(WeidmuellerChannelId.COSPHI_L1, new FloatDoublewordElement(19044)), //
+						m(WeidmuellerChannelId.COSPHI_L2, new FloatDoublewordElement(19046)), //
+						m(WeidmuellerChannelId.COSPHI_L3, new FloatDoublewordElement(19048)), //
+						m(SymmetricMeter.ChannelId.FREQUENCY, new FloatDoublewordElement(19050)), //
+						m(WeidmuellerChannelId.ROTATION_FIELD, new FloatDoublewordElement(19052)), //
+						m(WeidmuellerChannelId.REAL_ENERGY_L1, new FloatDoublewordElement(19054)), //
+						m(WeidmuellerChannelId.REAL_ENERGY_L2, new FloatDoublewordElement(19056)), //
+						m(WeidmuellerChannelId.REAL_ENERGY_L3, new FloatDoublewordElement(19058)), //
+						m(WeidmuellerChannelId.REAL_ENERGY_L1_L3, new FloatDoublewordElement(19060)), //
+						m(WeidmuellerChannelId.REAL_ENERGY_L1_CONSUMED, new FloatDoublewordElement(19062)), //
+						m(WeidmuellerChannelId.REAL_ENERGY_L2_CONSUMED, new FloatDoublewordElement(19064)), //
+						m(WeidmuellerChannelId.REAL_ENERGY_L3_CONSUMED, new FloatDoublewordElement(19066)), //
+						m(SymmetricMeter.ChannelId.ACTIVE_CONSUMPTION_ENERGY, new FloatDoublewordElement(19068)), //
+						m(WeidmuellerChannelId.REAL_ENERGY_L1_DELIVERED, new FloatDoublewordElement(19070)), //
+						m(WeidmuellerChannelId.REAL_ENERGY_L2_DELIVERED, new FloatDoublewordElement(19072)), //
+						m(WeidmuellerChannelId.REAL_ENERGY_L3_DELIVERED, new FloatDoublewordElement(19074)), //
+						m(SymmetricMeter.ChannelId.ACTIVE_PRODUCTION_ENERGY, new FloatDoublewordElement(19076)), //
+						m(WeidmuellerChannelId.APPARENT_ENERGY_L1, new FloatDoublewordElement(19078)), //
+						m(WeidmuellerChannelId.APPARENT_ENERGY_L2, new FloatDoublewordElement(19080)), //
+						m(WeidmuellerChannelId.APPARENT_ENERGY_L3, new FloatDoublewordElement(19082)), //
+						m(WeidmuellerChannelId.APPARENT_ENERGY_L1_L3, new FloatDoublewordElement(19084)), //
+						m(WeidmuellerChannelId.REACTIVE_ENERGY_L1, new FloatDoublewordElement(19086)), //
+						m(WeidmuellerChannelId.REACTIVE_ENERGY_L2, new FloatDoublewordElement(19088)), //
+						m(WeidmuellerChannelId.REACTIVE_ENERGY_L3, new FloatDoublewordElement(19090)), //
+						m(WeidmuellerChannelId.REACTIVE_ENERGY_L1_L3, new FloatDoublewordElement(19092)), //
+						m(WeidmuellerChannelId.REACTIVE_ENERGY_INDUCTIVE_L1, new FloatDoublewordElement(19094)), //
+						m(WeidmuellerChannelId.REACTIVE_ENERGY_INDUCTIVE_L2, new FloatDoublewordElement(19096)), //
+						m(WeidmuellerChannelId.REACTIVE_ENERGY_INDUCTIVE_L3, new FloatDoublewordElement(19098)), //
+						m(WeidmuellerChannelId.REACTIVE_ENERGY_INDUCTIVE_L1_L3, new FloatDoublewordElement(19100)), //
+						m(WeidmuellerChannelId.REACTIVE_ENERGY_CAPACITIVE_L1, new FloatDoublewordElement(19102)), //
+						m(WeidmuellerChannelId.REACTIVE_ENERGY_CAPACITIVE_L2, new FloatDoublewordElement(19104)), //
+						m(WeidmuellerChannelId.REACTIVE_ENERGY_CAPACITIVE_L3, new FloatDoublewordElement(19106)), //
+						m(WeidmuellerChannelId.REACTIVE_ENERGY_CAPACITIVE_L1_L3,
 								new FloatDoublewordElement(19108)), //
-						this.m(WeidmuellerChannelId.HARMONIC_THD_VOLT_L1N, new FloatDoublewordElement(19110)), //
-						this.m(WeidmuellerChannelId.HARMONIC_THD_VOLT_L2N, new FloatDoublewordElement(19112)), //
-						this.m(WeidmuellerChannelId.HARMONIC_THD_VOLT_L3N, new FloatDoublewordElement(19114)), //
-						this.m(WeidmuellerChannelId.HARMONIC_THD_CURRENT_L1N, new FloatDoublewordElement(19116)), //
-						this.m(WeidmuellerChannelId.HARMONIC_THD_CURRENT_L2N, new FloatDoublewordElement(19118)), //
-						this.m(WeidmuellerChannelId.HARMONIC_THD_CURRENT_L3N, new FloatDoublewordElement(19120))));
+						m(WeidmuellerChannelId.HARMONIC_THD_VOLT_L1N, new FloatDoublewordElement(19110)), //
+						m(WeidmuellerChannelId.HARMONIC_THD_VOLT_L2N, new FloatDoublewordElement(19112)), //
+						m(WeidmuellerChannelId.HARMONIC_THD_VOLT_L3N, new FloatDoublewordElement(19114)), //
+						m(WeidmuellerChannelId.HARMONIC_THD_CURRENT_L1N, new FloatDoublewordElement(19116)), //
+						m(WeidmuellerChannelId.HARMONIC_THD_CURRENT_L2N, new FloatDoublewordElement(19118)), //
+						m(WeidmuellerChannelId.HARMONIC_THD_CURRENT_L3N, new FloatDoublewordElement(19120))));
 	}
 
 	@Override
diff --git a/io.openems.edge.pvinverter.solarlog/src/io/openems/edge/pvinverter/solarlog/SolarLogImpl.java b/io.openems.edge.pvinverter.solarlog/src/io/openems/edge/pvinverter/solarlog/SolarLogImpl.java
index f2dc8c6c245..d353e08dd6d 100644
--- a/io.openems.edge.pvinverter.solarlog/src/io/openems/edge/pvinverter/solarlog/SolarLogImpl.java
+++ b/io.openems.edge.pvinverter.solarlog/src/io/openems/edge/pvinverter/solarlog/SolarLogImpl.java
@@ -102,53 +102,53 @@ protected void deactivate() {
 	protected ModbusProtocol defineModbusProtocol() throws OpenemsException {
 		return new ModbusProtocol(this, //
 				new FC4ReadInputRegistersTask(3500, Priority.HIGH,
-						this.m(SolarLog.ChannelId.LAST_UPDATE_TIME,
+						m(SolarLog.ChannelId.LAST_UPDATE_TIME,
 								new SignedDoublewordElement(3500).wordOrder(WordOrder.LSWMSW)),
-						this.m(SymmetricMeter.ChannelId.ACTIVE_POWER,
+						m(SymmetricMeter.ChannelId.ACTIVE_POWER,
 								new SignedDoublewordElement(3502).wordOrder(WordOrder.LSWMSW)),
-						this.m(SolarLog.ChannelId.PDC, new SignedDoublewordElement(3504).wordOrder(WordOrder.LSWMSW)),
-						this.m(SymmetricMeter.ChannelId.VOLTAGE, new SignedWordElement(3506),
+						m(SolarLog.ChannelId.PDC, new SignedDoublewordElement(3504).wordOrder(WordOrder.LSWMSW)),
+						m(SymmetricMeter.ChannelId.VOLTAGE, new SignedWordElement(3506),
 								ElementToChannelConverter.SCALE_FACTOR_3),
-						this.m(SolarLog.ChannelId.UDC, new SignedWordElement(3507),
+						m(SolarLog.ChannelId.UDC, new SignedWordElement(3507),
 								ElementToChannelConverter.SCALE_FACTOR_2),
-						this.m(SymmetricMeter.ChannelId.ACTIVE_PRODUCTION_ENERGY,
+						m(SymmetricMeter.ChannelId.ACTIVE_PRODUCTION_ENERGY,
 								new SignedDoublewordElement(3508).wordOrder(WordOrder.LSWMSW)),
-						this.m(SolarLog.ChannelId.YESTERDAY_YIELD,
+						m(SolarLog.ChannelId.YESTERDAY_YIELD,
 								new SignedDoublewordElement(3510).wordOrder(WordOrder.LSWMSW)),
-						this.m(SolarLog.ChannelId.MONTHLY_YIELD,
+						m(SolarLog.ChannelId.MONTHLY_YIELD,
 								new SignedDoublewordElement(3512).wordOrder(WordOrder.LSWMSW)),
-						this.m(SolarLog.ChannelId.YEARLY_YIELD,
+						m(SolarLog.ChannelId.YEARLY_YIELD,
 								new SignedDoublewordElement(3514).wordOrder(WordOrder.LSWMSW)),
-						this.m(SolarLog.ChannelId.TOTAL_YIELD,
+						m(SolarLog.ChannelId.TOTAL_YIELD,
 								new SignedDoublewordElement(3516).wordOrder(WordOrder.LSWMSW)),
-						this.m(SolarLog.ChannelId.PAC_CONSUMPTION,
+						m(SolarLog.ChannelId.PAC_CONSUMPTION,
 								new SignedDoublewordElement(3518).wordOrder(WordOrder.LSWMSW)),
-						this.m(SymmetricMeter.ChannelId.ACTIVE_CONSUMPTION_ENERGY,
+						m(SymmetricMeter.ChannelId.ACTIVE_CONSUMPTION_ENERGY,
 								new SignedDoublewordElement(3520).wordOrder(WordOrder.LSWMSW)),
-						this.m(SolarLog.ChannelId.YESTERDAY_YIELD_CONS,
+						m(SolarLog.ChannelId.YESTERDAY_YIELD_CONS,
 								new SignedDoublewordElement(3522).wordOrder(WordOrder.LSWMSW)),
-						this.m(SolarLog.ChannelId.MONTHLY_YIELD_CONS,
+						m(SolarLog.ChannelId.MONTHLY_YIELD_CONS,
 								new SignedDoublewordElement(3524).wordOrder(WordOrder.LSWMSW)),
-						this.m(SolarLog.ChannelId.YEARLY_YIELD_CONS,
+						m(SolarLog.ChannelId.YEARLY_YIELD_CONS,
 								new SignedDoublewordElement(3526).wordOrder(WordOrder.LSWMSW)),
-						this.m(SolarLog.ChannelId.TOTAL_YIELD_CONS,
+						m(SolarLog.ChannelId.TOTAL_YIELD_CONS,
 								new SignedDoublewordElement(3528).wordOrder(WordOrder.LSWMSW)),
-						this.m(SolarLog.ChannelId.TOTAL_POWER,
+						m(SolarLog.ChannelId.TOTAL_POWER,
 								new SignedDoublewordElement(3530).wordOrder(WordOrder.LSWMSW))),
 
 				new FC16WriteRegistersTask(10400, //
-						this.m(SolarLog.ChannelId.P_LIMIT_TYPE, new UnsignedWordElement(10400)),
-						this.m(SolarLog.ChannelId.P_LIMIT_PERC, new UnsignedWordElement(10401),
+						m(SolarLog.ChannelId.P_LIMIT_TYPE, new UnsignedWordElement(10400)),
+						m(SolarLog.ChannelId.P_LIMIT_PERC, new UnsignedWordElement(10401),
 								new ChannelMetaInfoReadAndWrite(10901, 10401))),
 				new FC16WriteRegistersTask(10404,
-						this.m(SolarLog.ChannelId.WATCH_DOG_TAG,
+						m(SolarLog.ChannelId.WATCH_DOG_TAG,
 								new UnsignedDoublewordElement(10404).wordOrder(WordOrder.LSWMSW))),
 
 				new FC4ReadInputRegistersTask(10900, Priority.LOW, //
-						this.m(SolarLog.ChannelId.STATUS, new SignedWordElement(10900)), //
-						this.m(SolarLog.ChannelId.P_LIMIT_PERC, new SignedWordElement(10901),
+						m(SolarLog.ChannelId.STATUS, new SignedWordElement(10900)), //
+						m(SolarLog.ChannelId.P_LIMIT_PERC, new SignedWordElement(10901),
 								new ChannelMetaInfoReadAndWrite(10901, 10401)),
-						this.m(SolarLog.ChannelId.P_LIMIT, new SignedWordElement(10902))));
+						m(SolarLog.ChannelId.P_LIMIT, new SignedWordElement(10902))));
 	}
 
 	@Override

From e768257a523d12427e55ede1daa286366c9d72d6 Mon Sep 17 00:00:00 2001
From: Stefan Feilmeier <stefan.feilmeier@fenecon.de>
Date: Tue, 8 Mar 2022 17:15:42 +0100
Subject: [PATCH 89/96] Fix return on updateReferenceFilter

---
 .../io/openems/edge/controller/ess/cycle/EssCycleImpl.java | 5 +++--
 .../EmergencyCapacityReserveImpl.java                      | 1 +
 .../ess/gridoptimizedcharge/GridOptimizedChargeImpl.java   | 1 +
 .../surplusfeedtogrid/SurplusFeedToGridControllerImpl.java | 1 +
 .../symmetric/selltogridlimit/EssSellToGridLimitImpl.java  | 1 +
 .../discharge/TimeOfUseTariffDischargeImpl.java            | 7 +++----
 .../edge/ess/generic/offgrid/GenericOffGridEssImpl.java    | 1 +
 .../openems/edge/evcs/cluster/EvcsClusterPeakShaving.java  | 1 +
 .../edge/evcs/cluster/EvcsClusterSelfConsumption.java      | 1 +
 .../edge/kostal/piko/charger/KostalPikoCharger.java        | 1 +
 .../src/io/openems/edge/kostal/piko/ess/KostalPikoEss.java | 1 +
 .../edge/kostal/piko/gridmeter/KostalPikoGridMeter.java    | 1 +
 .../openems/edge/simulator/meter/nrc/acting/NrcMeter.java  | 1 +
 13 files changed, 17 insertions(+), 6 deletions(-)

diff --git a/io.openems.edge.controller.ess.cycle/src/io/openems/edge/controller/ess/cycle/EssCycleImpl.java b/io.openems.edge.controller.ess.cycle/src/io/openems/edge/controller/ess/cycle/EssCycleImpl.java
index 03d2c6449ea..09a05f1adf5 100644
--- a/io.openems.edge.controller.ess.cycle/src/io/openems/edge/controller/ess/cycle/EssCycleImpl.java
+++ b/io.openems.edge.controller.ess.cycle/src/io/openems/edge/controller/ess/cycle/EssCycleImpl.java
@@ -77,6 +77,7 @@ private void activate(ComponentContext context, Config config) throws OpenemsNam
 		this.config = config;
 		super.activate(context, this.config.id(), this.config.alias(), this.config.enabled());
 		if (OpenemsComponent.updateReferenceFilter(this.cm, this.servicePid(), "ess", this.config.ess_id())) {
+			return;
 		}
 	}
 
@@ -101,8 +102,8 @@ public void run() throws OpenemsNamedException {
 
 		// Prepare Context
 		var previousState = this.stateMachine.getPreviousState();
-		var context = new Context(this, this.config, this.componentManager, this.ess, maxChargePower,
-				maxDischargePower, previousState, this.lastStateChange);
+		var context = new Context(this, this.config, this.componentManager, this.ess, maxChargePower, maxDischargePower,
+				previousState, this.lastStateChange);
 
 		// Call the StateMachine
 		try {
diff --git a/io.openems.edge.controller.ess.emergencycapacityreserve/src/io/openems/edge/controller/ess/emergencycapacityreserve/EmergencyCapacityReserveImpl.java b/io.openems.edge.controller.ess.emergencycapacityreserve/src/io/openems/edge/controller/ess/emergencycapacityreserve/EmergencyCapacityReserveImpl.java
index 23448293f8b..a28f560f179 100644
--- a/io.openems.edge.controller.ess.emergencycapacityreserve/src/io/openems/edge/controller/ess/emergencycapacityreserve/EmergencyCapacityReserveImpl.java
+++ b/io.openems.edge.controller.ess.emergencycapacityreserve/src/io/openems/edge/controller/ess/emergencycapacityreserve/EmergencyCapacityReserveImpl.java
@@ -133,6 +133,7 @@ private void updateConfig(Config config) {
 		this._setRangeOfReserveSocOutsideAllowedValue(enableWarning);
 
 		if (OpenemsComponent.updateReferenceFilter(this.cm, this.servicePid(), "ess", config.ess_id())) {
+			return;
 		}
 	}
 
diff --git a/io.openems.edge.controller.ess.gridoptimizedcharge/src/io/openems/edge/controller/ess/gridoptimizedcharge/GridOptimizedChargeImpl.java b/io.openems.edge.controller.ess.gridoptimizedcharge/src/io/openems/edge/controller/ess/gridoptimizedcharge/GridOptimizedChargeImpl.java
index 18f447ee1e6..6212514bf69 100644
--- a/io.openems.edge.controller.ess.gridoptimizedcharge/src/io/openems/edge/controller/ess/gridoptimizedcharge/GridOptimizedChargeImpl.java
+++ b/io.openems.edge.controller.ess.gridoptimizedcharge/src/io/openems/edge/controller/ess/gridoptimizedcharge/GridOptimizedChargeImpl.java
@@ -137,6 +137,7 @@ private void updateConfig(Config config) {
 
 		// update filter for 'meter'
 		if (OpenemsComponent.updateReferenceFilter(this.cm, this.servicePid(), "meter", config.meter_id())) {
+			return;
 		}
 	}
 
diff --git a/io.openems.edge.controller.ess.hybrid.surplusfeedtogrid/src/io/openems/edge/controller/ess/hybrid/surplusfeedtogrid/SurplusFeedToGridControllerImpl.java b/io.openems.edge.controller.ess.hybrid.surplusfeedtogrid/src/io/openems/edge/controller/ess/hybrid/surplusfeedtogrid/SurplusFeedToGridControllerImpl.java
index eace3325afc..5afe03b5284 100644
--- a/io.openems.edge.controller.ess.hybrid.surplusfeedtogrid/src/io/openems/edge/controller/ess/hybrid/surplusfeedtogrid/SurplusFeedToGridControllerImpl.java
+++ b/io.openems.edge.controller.ess.hybrid.surplusfeedtogrid/src/io/openems/edge/controller/ess/hybrid/surplusfeedtogrid/SurplusFeedToGridControllerImpl.java
@@ -50,6 +50,7 @@ void activate(ComponentContext context, Config config) {
 
 		// update filter for 'ess'
 		if (OpenemsComponent.updateReferenceFilter(this.cm, this.servicePid(), "ess", config.ess_id())) {
+			return;
 		}
 	}
 
diff --git a/io.openems.edge.controller.ess.selltogridlimit/src/io/openems/edge/controller/symmetric/selltogridlimit/EssSellToGridLimitImpl.java b/io.openems.edge.controller.ess.selltogridlimit/src/io/openems/edge/controller/symmetric/selltogridlimit/EssSellToGridLimitImpl.java
index 951d542ae38..04dd87a960d 100644
--- a/io.openems.edge.controller.ess.selltogridlimit/src/io/openems/edge/controller/symmetric/selltogridlimit/EssSellToGridLimitImpl.java
+++ b/io.openems.edge.controller.ess.selltogridlimit/src/io/openems/edge/controller/symmetric/selltogridlimit/EssSellToGridLimitImpl.java
@@ -62,6 +62,7 @@ void activate(ComponentContext context, Config config) {
 
 		// update filter for 'meter'
 		if (OpenemsComponent.updateReferenceFilter(this.cm, this.servicePid(), "meter", config.meter_id())) {
+			return;
 		}
 	}
 
diff --git a/io.openems.edge.controller.ess.timeofusetariff.discharge/src/io/openems/edge/controller/ess/timeofusetariff/discharge/TimeOfUseTariffDischargeImpl.java b/io.openems.edge.controller.ess.timeofusetariff.discharge/src/io/openems/edge/controller/ess/timeofusetariff/discharge/TimeOfUseTariffDischargeImpl.java
index b0ad31c1f7a..20022dae5fe 100644
--- a/io.openems.edge.controller.ess.timeofusetariff.discharge/src/io/openems/edge/controller/ess/timeofusetariff/discharge/TimeOfUseTariffDischargeImpl.java
+++ b/io.openems.edge.controller.ess.timeofusetariff.discharge/src/io/openems/edge/controller/ess/timeofusetariff/discharge/TimeOfUseTariffDischargeImpl.java
@@ -114,6 +114,7 @@ void activate(ComponentContext context, Config config) {
 
 		// update filter for 'ess'
 		if (OpenemsComponent.updateReferenceFilter(this.cm, this.servicePid(), "ess", config.ess_id())) {
+			return;
 		}
 	}
 
@@ -370,8 +371,7 @@ private void modeAutomatic(ZonedDateTime now) throws OpenemsNamedException {
 
 		this._setTargetHoursIsEmpty(this.targetPeriods.isEmpty());
 
-		var currentQuarterHour = TimeOfUseTariffUtils
-				.getNowRoundedDownToMinutes(this.componentManager.getClock(), 15) //
+		var currentQuarterHour = TimeOfUseTariffUtils.getNowRoundedDownToMinutes(this.componentManager.getClock(), 15) //
 				.withZoneSameInstant(ZoneId.systemDefault());
 
 		if (this.boundarySpace != null && this.boundarySpace.isWithinBoundary(now)) {
@@ -549,8 +549,7 @@ private List<ZonedDateTime> calculateTargetPeriods(TreeMap<ZonedDateTime, Intege
 			TreeMap<ZonedDateTime, Float> quarterlyPrices, long remainingEnergy, BoundarySpace boundarySpace) {
 
 		List<ZonedDateTime> targetHours = new ArrayList<>();
-		var currentQuarterHour = TimeOfUseTariffUtils
-				.getNowRoundedDownToMinutes(this.componentManager.getClock(), 15) //
+		var currentQuarterHour = TimeOfUseTariffUtils.getNowRoundedDownToMinutes(this.componentManager.getClock(), 15) //
 				.withZoneSameInstant(ZoneId.systemDefault());
 
 		List<Entry<ZonedDateTime, Float>> priceList = new ArrayList<>(quarterlyPrices //
diff --git a/io.openems.edge.ess.generic/src/io/openems/edge/ess/generic/offgrid/GenericOffGridEssImpl.java b/io.openems.edge.ess.generic/src/io/openems/edge/ess/generic/offgrid/GenericOffGridEssImpl.java
index a167fb90184..ced66fde54f 100644
--- a/io.openems.edge.ess.generic/src/io/openems/edge/ess/generic/offgrid/GenericOffGridEssImpl.java
+++ b/io.openems.edge.ess.generic/src/io/openems/edge/ess/generic/offgrid/GenericOffGridEssImpl.java
@@ -103,6 +103,7 @@ private void activate(ComponentContext context, Config config) {
 		// update filter for 'Off Grid Switch'
 		if (OpenemsComponent.updateReferenceFilter(this.cm, this.servicePid(), "offGridSwitch",
 				config.offGridSwitch_id())) {
+			return;
 		}
 	}
 
diff --git a/io.openems.edge.evcs.cluster/src/io/openems/edge/evcs/cluster/EvcsClusterPeakShaving.java b/io.openems.edge.evcs.cluster/src/io/openems/edge/evcs/cluster/EvcsClusterPeakShaving.java
index 74faa4c5ba8..a0d9d98a8d1 100644
--- a/io.openems.edge.evcs.cluster/src/io/openems/edge/evcs/cluster/EvcsClusterPeakShaving.java
+++ b/io.openems.edge.evcs.cluster/src/io/openems/edge/evcs/cluster/EvcsClusterPeakShaving.java
@@ -114,6 +114,7 @@ void activate(ComponentContext context, ConfigPeakShaving config) throws Openems
 			return;
 		}
 		if (OpenemsComponent.updateReferenceFilter(this.cm, this.servicePid(), "meter", config.meter_id())) {
+			return;
 		}
 	}
 
diff --git a/io.openems.edge.evcs.cluster/src/io/openems/edge/evcs/cluster/EvcsClusterSelfConsumption.java b/io.openems.edge.evcs.cluster/src/io/openems/edge/evcs/cluster/EvcsClusterSelfConsumption.java
index 5468b1a4f17..522ef0af0de 100644
--- a/io.openems.edge.evcs.cluster/src/io/openems/edge/evcs/cluster/EvcsClusterSelfConsumption.java
+++ b/io.openems.edge.evcs.cluster/src/io/openems/edge/evcs/cluster/EvcsClusterSelfConsumption.java
@@ -92,6 +92,7 @@ void activate(ComponentContext context, ConfigSelfConsumption config) throws Ope
 
 		// update filter for 'evcs' component
 		if (OpenemsComponent.updateReferenceFilter(this.cm, this.servicePid(), "Evcs", config.evcs_ids())) {
+			return;
 		}
 	}
 
diff --git a/io.openems.edge.kostal.piko/src/io/openems/edge/kostal/piko/charger/KostalPikoCharger.java b/io.openems.edge.kostal.piko/src/io/openems/edge/kostal/piko/charger/KostalPikoCharger.java
index 1774345f242..d20d519c99a 100644
--- a/io.openems.edge.kostal.piko/src/io/openems/edge/kostal/piko/charger/KostalPikoCharger.java
+++ b/io.openems.edge.kostal.piko/src/io/openems/edge/kostal/piko/charger/KostalPikoCharger.java
@@ -78,6 +78,7 @@ void activate(ComponentContext context, Config config) {
 		super.activate(context, config.id(), config.alias(), config.enabled());
 		// update filter for 'Core'
 		if (OpenemsComponent.updateReferenceFilter(this.cm, this.servicePid(), "Core", config.core_id())) {
+			return;
 		}
 	}
 
diff --git a/io.openems.edge.kostal.piko/src/io/openems/edge/kostal/piko/ess/KostalPikoEss.java b/io.openems.edge.kostal.piko/src/io/openems/edge/kostal/piko/ess/KostalPikoEss.java
index 60c0ef01398..731192130a1 100644
--- a/io.openems.edge.kostal.piko/src/io/openems/edge/kostal/piko/ess/KostalPikoEss.java
+++ b/io.openems.edge.kostal.piko/src/io/openems/edge/kostal/piko/ess/KostalPikoEss.java
@@ -74,6 +74,7 @@ void activate(ComponentContext context, Config config) {
 		super.activate(context, config.id(), config.alias(), config.enabled());
 		// update filter for 'Core'
 		if (OpenemsComponent.updateReferenceFilter(this.cm, this.servicePid(), "Core", config.core_id())) {
+			return;
 		}
 	}
 
diff --git a/io.openems.edge.kostal.piko/src/io/openems/edge/kostal/piko/gridmeter/KostalPikoGridMeter.java b/io.openems.edge.kostal.piko/src/io/openems/edge/kostal/piko/gridmeter/KostalPikoGridMeter.java
index 3b11877cfcc..e7d32bc95da 100644
--- a/io.openems.edge.kostal.piko/src/io/openems/edge/kostal/piko/gridmeter/KostalPikoGridMeter.java
+++ b/io.openems.edge.kostal.piko/src/io/openems/edge/kostal/piko/gridmeter/KostalPikoGridMeter.java
@@ -77,6 +77,7 @@ void activate(ComponentContext context, Config config) {
 		super.activate(context, config.id(), config.alias(), config.enabled());
 		// update filter for 'Core'
 		if (OpenemsComponent.updateReferenceFilter(this.cm, this.servicePid(), "Core", config.core_id())) {
+			return;
 		}
 	}
 
diff --git a/io.openems.edge.simulator/src/io/openems/edge/simulator/meter/nrc/acting/NrcMeter.java b/io.openems.edge.simulator/src/io/openems/edge/simulator/meter/nrc/acting/NrcMeter.java
index fac14d9f5c0..5eace9671c1 100644
--- a/io.openems.edge.simulator/src/io/openems/edge/simulator/meter/nrc/acting/NrcMeter.java
+++ b/io.openems.edge.simulator/src/io/openems/edge/simulator/meter/nrc/acting/NrcMeter.java
@@ -79,6 +79,7 @@ void activate(ComponentContext context, Config config) throws IOException {
 
 		// update filter for 'datasource'
 		if (OpenemsComponent.updateReferenceFilter(this.cm, this.servicePid(), "datasource", config.datasource_id())) {
+			return;
 		}
 	}
 

From f0df8710c217f2429a0389d5ffef9596d76e9645 Mon Sep 17 00:00:00 2001
From: Stefan Feilmeier <stefan.feilmeier@fenecon.de>
Date: Tue, 8 Mar 2022 17:16:50 +0100
Subject: [PATCH 90/96] Apply autoformat

---
 .../metadata/odoo/odoo/OdooHandler.java       |   2 +-
 ...toricTimeseriesEnergyPerPeriodRequest.java |   3 +-
 .../io/openems/common/types/SystemLog.java    |   3 +-
 .../bydcommercial/BatteryBoxC130Impl.java     | 159 +++++----------
 .../fenecon/home/FeneconHomeBatteryImpl.java  |  36 ++--
 .../monitor/AbstractDeviceMonitor.java        |   6 +-
 .../onewire/application/tag/Humidity.java     |   3 +-
 .../src/com/dalsemi/onewire/utils/OWPath.java |   3 +-
 .../component/AbstractOpenemsComponent.java   |   4 +-
 .../common/linecharacteristic/PolyLine.java   |   3 +-
 .../api/mqtt/MqttApiControllerImplTest.java   |   4 +-
 .../edge/controller/api/rest/RestHandler.java |  10 +-
 .../readwrite/RestApiReadWriteImplTest.java   |   7 +-
 .../ess/gridoptimizedcharge/DelayCharge.java  |   3 +-
 .../GridOptimizedCharge.java                  |   9 +-
 .../gridoptimizedcharge/MyControllerTest.java | 168 ++++++++--------
 .../TimeOfUseTariffDischargeTest.java         |  59 +++---
 .../io/heatpump/sgready/MyControllerTest.java |  32 +--
 .../BalancingScheduleImplTest.java            |   4 +-
 .../DefaultConfigurationWorker.java           |  12 +-
 .../componentmanager/EdgeConfigWorker.java    |   9 +-
 .../host/OperatingSystemDebianSystemd.java    |   9 +-
 .../edge/core/host/SystemUpdateHandler.java   |   6 +-
 .../commercial40/SurplusFeedInHandler.java    |   3 +-
 .../edge/ess/mr/gridcon/WeightingHelper.java  |   3 +-
 .../gridcon/state/gridconstate/BaseState.java |   9 +-
 .../gridconstate/GridconStateObject.java      |   3 +-
 .../mr/gridcon/state/gridconstate/Run.java    |   9 +-
 .../gridcon/ongrid/state/TestUndefined.java   |   2 +-
 .../io/openems/edge/evcs/ocpp/abl/Abl.java    |   3 +-
 .../singleccs/IesKeywattSingleCcs.java        |   3 +-
 .../edge/evcs/ocpp/server/MyJsonServer.java   |  11 +-
 .../edge/goodwe/common/AbstractGoodWe.java    | 184 ++++++++----------
 .../meter/artemes/am2/MeterArtemesAM2.java    |   6 +-
 .../sdm630/MeterMicrocareSdm630Impl.java      |   7 +-
 .../meter/sma/shm20/MeterSmaShm20Impl.java    |  21 +-
 .../weidmueller/MeterWeidmueller525.java      |   3 +-
 .../SimilarDayPredictorImpl.java              |   3 +-
 .../edge/simulator/app/SimulatorApp.java      |   9 +-
 .../symmetric/reacting/EssSymmetricTest.java  |   4 +-
 .../edge/timedata/rrd4j/RecordWorker.java     |   3 +-
 .../timedata/rrd4j/Rrd4jTimedataImpl.java     |  12 +-
 .../shared/influxdb/InfluxConnector.java      |   4 +-
 43 files changed, 366 insertions(+), 490 deletions(-)

diff --git a/io.openems.backend.metadata.odoo/src/io/openems/backend/metadata/odoo/odoo/OdooHandler.java b/io.openems.backend.metadata.odoo/src/io/openems/backend/metadata/odoo/odoo/OdooHandler.java
index c87ae4dbc27..5401b1de73b 100644
--- a/io.openems.backend.metadata.odoo/src/io/openems/backend/metadata/odoo/odoo/OdooHandler.java
+++ b/io.openems.backend.metadata.odoo/src/io/openems/backend/metadata/odoo/odoo/OdooHandler.java
@@ -488,7 +488,7 @@ private int createOdooUser(JsonObject userJson, String password) throws OpenemsN
 
 		var email = JsonUtils.getAsString(userJson, "email").toLowerCase();
 		customerFields.put(Field.Partner.EMAIL.id(), email);
-		
+
 		JsonUtils.getAsOptionalString(userJson, "phone") //
 				.ifPresent(phone -> customerFields.put(Field.Partner.PHONE.id(), phone));
 
diff --git a/io.openems.common/src/io/openems/common/jsonrpc/request/QueryHistoricTimeseriesEnergyPerPeriodRequest.java b/io.openems.common/src/io/openems/common/jsonrpc/request/QueryHistoricTimeseriesEnergyPerPeriodRequest.java
index 89132dcac96..665295456a0 100644
--- a/io.openems.common/src/io/openems/common/jsonrpc/request/QueryHistoricTimeseriesEnergyPerPeriodRequest.java
+++ b/io.openems.common/src/io/openems/common/jsonrpc/request/QueryHistoricTimeseriesEnergyPerPeriodRequest.java
@@ -60,8 +60,7 @@ public static QueryHistoricTimeseriesEnergyPerPeriodRequest from(JsonrpcRequest
 		var fromDate = JsonUtils.getAsZonedDateTime(p, "fromDate", timezone);
 		var toDate = JsonUtils.getAsZonedDateTime(p, "toDate", timezone).plusDays(1);
 		var resolution = JsonUtils.getAsInt(p, "resolution");
-		var result = new QueryHistoricTimeseriesEnergyPerPeriodRequest(r,
-				fromDate, toDate, resolution);
+		var result = new QueryHistoricTimeseriesEnergyPerPeriodRequest(r, fromDate, toDate, resolution);
 		var channels = JsonUtils.getAsJsonArray(p, "channels");
 		for (JsonElement channel : channels) {
 			var address = ChannelAddress.fromString(JsonUtils.getAsString(channel));
diff --git a/io.openems.common/src/io/openems/common/types/SystemLog.java b/io.openems.common/src/io/openems/common/types/SystemLog.java
index a796c0c95fb..b98ec62a2f6 100644
--- a/io.openems.common/src/io/openems/common/types/SystemLog.java
+++ b/io.openems.common/src/io/openems/common/types/SystemLog.java
@@ -58,8 +58,7 @@ public static Level fromPaxLevel(PaxLevel paxLevel) {
 	 */
 	public static SystemLog fromPaxLoggingEvent(PaxLoggingEvent event) {
 		var level = Level.fromPaxLevel(event.getLevel());
-		var time = ZonedDateTime.ofInstant(Instant.ofEpochMilli(event.getTimeStamp()),
-				ZoneId.systemDefault());
+		var time = ZonedDateTime.ofInstant(Instant.ofEpochMilli(event.getTimeStamp()), ZoneId.systemDefault());
 		var source = event.getLoggerName();
 		var message = event.getRenderedMessage();
 		return new SystemLog(time, level, source, message);
diff --git a/io.openems.edge.battery.bydcommercial/src/io/openems/edge/battery/bydcommercial/BatteryBoxC130Impl.java b/io.openems.edge.battery.bydcommercial/src/io/openems/edge/battery/bydcommercial/BatteryBoxC130Impl.java
index 4f9f82b853e..c6ba83f4acc 100644
--- a/io.openems.edge.battery.bydcommercial/src/io/openems/edge/battery/bydcommercial/BatteryBoxC130Impl.java
+++ b/io.openems.edge.battery.bydcommercial/src/io/openems/edge/battery/bydcommercial/BatteryBoxC130Impl.java
@@ -195,8 +195,7 @@ protected ModbusProtocol defineModbusProtocol() throws OpenemsException {
 								.m(Battery.ChannelId.CURRENT, ElementToChannelConverter.SCALE_FACTOR_MINUS_1) // [A]
 								.build(), //
 						m(BatteryBoxC130.ChannelId.BATTERY_WORK_STATE, new UnsignedWordElement(0x2102)), //
-						m(Battery.ChannelId.SOC, new UnsignedWordElement(0x2103)),
-						m(new UnsignedWordElement(0x2104)) //
+						m(Battery.ChannelId.SOC, new UnsignedWordElement(0x2103)), m(new UnsignedWordElement(0x2104)) //
 								.m(BatteryBoxC130.ChannelId.CLUSTER_1_SOH, ElementToChannelConverter.DIRECT_1_TO_1) // [%]
 								.m(Battery.ChannelId.SOH, ElementToChannelConverter.DIRECT_1_TO_1) // [%]
 								.build(), //
@@ -212,16 +211,14 @@ protected ModbusProtocol defineModbusProtocol() throws OpenemsException {
 										ElementToChannelConverter.DIRECT_1_TO_1) //
 								.m(Battery.ChannelId.MIN_CELL_VOLTAGE, ElementToChannelConverter.DIRECT_1_TO_1) //
 								.build(), //
-						m(BatteryBoxC130.ChannelId.CLUSTER_1_MAX_CELL_TEMPERATURE_ID,
-								new UnsignedWordElement(0x2109)), //
+						m(BatteryBoxC130.ChannelId.CLUSTER_1_MAX_CELL_TEMPERATURE_ID, new UnsignedWordElement(0x2109)), //
 						m(new SignedWordElement(0x210A)) //
 								.m(BatteryBoxC130.ChannelId.CLUSTER_1_MAX_CELL_TEMPERATURE,
 										ElementToChannelConverter.DIRECT_1_TO_1) //
 								.m(Battery.ChannelId.MAX_CELL_TEMPERATURE,
 										ElementToChannelConverter.SCALE_FACTOR_MINUS_1) //
 								.build(), //
-						m(BatteryBoxC130.ChannelId.CLUSTER_1_MIN_CELL_TEMPERATURE_ID,
-								new UnsignedWordElement(0x210B)), //
+						m(BatteryBoxC130.ChannelId.CLUSTER_1_MIN_CELL_TEMPERATURE_ID, new UnsignedWordElement(0x210B)), //
 						m(new SignedWordElement(0x210C)) //
 								.m(BatteryBoxC130.ChannelId.CLUSTER_1_MIN_CELL_TEMPERATURE,
 										ElementToChannelConverter.DIRECT_1_TO_1) //
@@ -596,102 +593,54 @@ protected ModbusProtocol defineModbusProtocol() throws OpenemsException {
 						m(BatteryBoxC130.ChannelId.CLUSTER_1_BATTERY_216_VOLTAGE, new UnsignedWordElement(0x28D7)) //
 				), //
 				new FC3ReadRegistersTask(0x2C00, Priority.LOW, //
-						m(BatteryBoxC130.ChannelId.CLUSTER_1_BATTERY_00_TEMPERATURE,
-								new UnsignedWordElement(0x2C00)), //
-						m(BatteryBoxC130.ChannelId.CLUSTER_1_BATTERY_01_TEMPERATURE,
-								new UnsignedWordElement(0x2C01)), //
-						m(BatteryBoxC130.ChannelId.CLUSTER_1_BATTERY_02_TEMPERATURE,
-								new UnsignedWordElement(0x2C02)), //
-						m(BatteryBoxC130.ChannelId.CLUSTER_1_BATTERY_03_TEMPERATURE,
-								new UnsignedWordElement(0x2C03)), //
-						m(BatteryBoxC130.ChannelId.CLUSTER_1_BATTERY_04_TEMPERATURE,
-								new UnsignedWordElement(0x2C04)), //
-						m(BatteryBoxC130.ChannelId.CLUSTER_1_BATTERY_05_TEMPERATURE,
-								new UnsignedWordElement(0x2C05)), //
-						m(BatteryBoxC130.ChannelId.CLUSTER_1_BATTERY_06_TEMPERATURE,
-								new UnsignedWordElement(0x2C06)), //
-						m(BatteryBoxC130.ChannelId.CLUSTER_1_BATTERY_07_TEMPERATURE,
-								new UnsignedWordElement(0x2C07)), //
-						m(BatteryBoxC130.ChannelId.CLUSTER_1_BATTERY_08_TEMPERATURE,
-								new UnsignedWordElement(0x2C08)), //
-						m(BatteryBoxC130.ChannelId.CLUSTER_1_BATTERY_09_TEMPERATURE,
-								new UnsignedWordElement(0x2C09)), //
-						m(BatteryBoxC130.ChannelId.CLUSTER_1_BATTERY_10_TEMPERATURE,
-								new UnsignedWordElement(0x2C0A)), //
-						m(BatteryBoxC130.ChannelId.CLUSTER_1_BATTERY_11_TEMPERATURE,
-								new UnsignedWordElement(0x2C0B)), //
-						m(BatteryBoxC130.ChannelId.CLUSTER_1_BATTERY_12_TEMPERATURE,
-								new UnsignedWordElement(0x2C0C)), //
-						m(BatteryBoxC130.ChannelId.CLUSTER_1_BATTERY_13_TEMPERATURE,
-								new UnsignedWordElement(0x2C0D)), //
-						m(BatteryBoxC130.ChannelId.CLUSTER_1_BATTERY_14_TEMPERATURE,
-								new UnsignedWordElement(0x2C0E)), //
-						m(BatteryBoxC130.ChannelId.CLUSTER_1_BATTERY_15_TEMPERATURE,
-								new UnsignedWordElement(0x2C0F)), //
-						m(BatteryBoxC130.ChannelId.CLUSTER_1_BATTERY_16_TEMPERATURE,
-								new UnsignedWordElement(0x2C10)), //
-						m(BatteryBoxC130.ChannelId.CLUSTER_1_BATTERY_17_TEMPERATURE,
-								new UnsignedWordElement(0x2C11)), //
-						m(BatteryBoxC130.ChannelId.CLUSTER_1_BATTERY_18_TEMPERATURE,
-								new UnsignedWordElement(0x2C12)), //
-						m(BatteryBoxC130.ChannelId.CLUSTER_1_BATTERY_19_TEMPERATURE,
-								new UnsignedWordElement(0x2C13)), //
-						m(BatteryBoxC130.ChannelId.CLUSTER_1_BATTERY_20_TEMPERATURE,
-								new UnsignedWordElement(0x2C14)), //
-						m(BatteryBoxC130.ChannelId.CLUSTER_1_BATTERY_21_TEMPERATURE,
-								new UnsignedWordElement(0x2C15)), //
-						m(BatteryBoxC130.ChannelId.CLUSTER_1_BATTERY_22_TEMPERATURE,
-								new UnsignedWordElement(0x2C16)), //
-						m(BatteryBoxC130.ChannelId.CLUSTER_1_BATTERY_23_TEMPERATURE,
-								new UnsignedWordElement(0x2C17)), //
-						m(BatteryBoxC130.ChannelId.CLUSTER_1_BATTERY_24_TEMPERATURE,
-								new UnsignedWordElement(0x2C18)), //
-						m(BatteryBoxC130.ChannelId.CLUSTER_1_BATTERY_25_TEMPERATURE,
-								new UnsignedWordElement(0x2C19)), //
-						m(BatteryBoxC130.ChannelId.CLUSTER_1_BATTERY_26_TEMPERATURE,
-								new UnsignedWordElement(0x2C1A)), //
-						m(BatteryBoxC130.ChannelId.CLUSTER_1_BATTERY_27_TEMPERATURE,
-								new UnsignedWordElement(0x2C1B)), //
-						m(BatteryBoxC130.ChannelId.CLUSTER_1_BATTERY_28_TEMPERATURE,
-								new UnsignedWordElement(0x2C1C)), //
-						m(BatteryBoxC130.ChannelId.CLUSTER_1_BATTERY_29_TEMPERATURE,
-								new UnsignedWordElement(0x2C1D)), //
-						m(BatteryBoxC130.ChannelId.CLUSTER_1_BATTERY_30_TEMPERATURE,
-								new UnsignedWordElement(0x2C1E)), //
-						m(BatteryBoxC130.ChannelId.CLUSTER_1_BATTERY_31_TEMPERATURE,
-								new UnsignedWordElement(0x2C1F)), //
-						m(BatteryBoxC130.ChannelId.CLUSTER_1_BATTERY_32_TEMPERATURE,
-								new UnsignedWordElement(0x2C20)), //
-						m(BatteryBoxC130.ChannelId.CLUSTER_1_BATTERY_33_TEMPERATURE,
-								new UnsignedWordElement(0x2C21)), //
-						m(BatteryBoxC130.ChannelId.CLUSTER_1_BATTERY_34_TEMPERATURE,
-								new UnsignedWordElement(0x2C22)), //
-						m(BatteryBoxC130.ChannelId.CLUSTER_1_BATTERY_35_TEMPERATURE,
-								new UnsignedWordElement(0x2C23)), //
-						m(BatteryBoxC130.ChannelId.CLUSTER_1_BATTERY_36_TEMPERATURE,
-								new UnsignedWordElement(0x2C24)), //
-						m(BatteryBoxC130.ChannelId.CLUSTER_1_BATTERY_37_TEMPERATURE,
-								new UnsignedWordElement(0x2C25)), //
-						m(BatteryBoxC130.ChannelId.CLUSTER_1_BATTERY_38_TEMPERATURE,
-								new UnsignedWordElement(0x2C26)), //
-						m(BatteryBoxC130.ChannelId.CLUSTER_1_BATTERY_39_TEMPERATURE,
-								new UnsignedWordElement(0x2C27)), //
-						m(BatteryBoxC130.ChannelId.CLUSTER_1_BATTERY_40_TEMPERATURE,
-								new UnsignedWordElement(0x2C28)), //
-						m(BatteryBoxC130.ChannelId.CLUSTER_1_BATTERY_41_TEMPERATURE,
-								new UnsignedWordElement(0x2C29)), //
-						m(BatteryBoxC130.ChannelId.CLUSTER_1_BATTERY_42_TEMPERATURE,
-								new UnsignedWordElement(0x2C2A)), //
-						m(BatteryBoxC130.ChannelId.CLUSTER_1_BATTERY_43_TEMPERATURE,
-								new UnsignedWordElement(0x2C2B)), //
-						m(BatteryBoxC130.ChannelId.CLUSTER_1_BATTERY_44_TEMPERATURE,
-								new UnsignedWordElement(0x2C2C)), //
-						m(BatteryBoxC130.ChannelId.CLUSTER_1_BATTERY_45_TEMPERATURE,
-								new UnsignedWordElement(0x2C2D)), //
-						m(BatteryBoxC130.ChannelId.CLUSTER_1_BATTERY_46_TEMPERATURE,
-								new UnsignedWordElement(0x2C2E)), //
-						m(BatteryBoxC130.ChannelId.CLUSTER_1_BATTERY_47_TEMPERATURE,
-								new UnsignedWordElement(0x2C2F)) //
+						m(BatteryBoxC130.ChannelId.CLUSTER_1_BATTERY_00_TEMPERATURE, new UnsignedWordElement(0x2C00)), //
+						m(BatteryBoxC130.ChannelId.CLUSTER_1_BATTERY_01_TEMPERATURE, new UnsignedWordElement(0x2C01)), //
+						m(BatteryBoxC130.ChannelId.CLUSTER_1_BATTERY_02_TEMPERATURE, new UnsignedWordElement(0x2C02)), //
+						m(BatteryBoxC130.ChannelId.CLUSTER_1_BATTERY_03_TEMPERATURE, new UnsignedWordElement(0x2C03)), //
+						m(BatteryBoxC130.ChannelId.CLUSTER_1_BATTERY_04_TEMPERATURE, new UnsignedWordElement(0x2C04)), //
+						m(BatteryBoxC130.ChannelId.CLUSTER_1_BATTERY_05_TEMPERATURE, new UnsignedWordElement(0x2C05)), //
+						m(BatteryBoxC130.ChannelId.CLUSTER_1_BATTERY_06_TEMPERATURE, new UnsignedWordElement(0x2C06)), //
+						m(BatteryBoxC130.ChannelId.CLUSTER_1_BATTERY_07_TEMPERATURE, new UnsignedWordElement(0x2C07)), //
+						m(BatteryBoxC130.ChannelId.CLUSTER_1_BATTERY_08_TEMPERATURE, new UnsignedWordElement(0x2C08)), //
+						m(BatteryBoxC130.ChannelId.CLUSTER_1_BATTERY_09_TEMPERATURE, new UnsignedWordElement(0x2C09)), //
+						m(BatteryBoxC130.ChannelId.CLUSTER_1_BATTERY_10_TEMPERATURE, new UnsignedWordElement(0x2C0A)), //
+						m(BatteryBoxC130.ChannelId.CLUSTER_1_BATTERY_11_TEMPERATURE, new UnsignedWordElement(0x2C0B)), //
+						m(BatteryBoxC130.ChannelId.CLUSTER_1_BATTERY_12_TEMPERATURE, new UnsignedWordElement(0x2C0C)), //
+						m(BatteryBoxC130.ChannelId.CLUSTER_1_BATTERY_13_TEMPERATURE, new UnsignedWordElement(0x2C0D)), //
+						m(BatteryBoxC130.ChannelId.CLUSTER_1_BATTERY_14_TEMPERATURE, new UnsignedWordElement(0x2C0E)), //
+						m(BatteryBoxC130.ChannelId.CLUSTER_1_BATTERY_15_TEMPERATURE, new UnsignedWordElement(0x2C0F)), //
+						m(BatteryBoxC130.ChannelId.CLUSTER_1_BATTERY_16_TEMPERATURE, new UnsignedWordElement(0x2C10)), //
+						m(BatteryBoxC130.ChannelId.CLUSTER_1_BATTERY_17_TEMPERATURE, new UnsignedWordElement(0x2C11)), //
+						m(BatteryBoxC130.ChannelId.CLUSTER_1_BATTERY_18_TEMPERATURE, new UnsignedWordElement(0x2C12)), //
+						m(BatteryBoxC130.ChannelId.CLUSTER_1_BATTERY_19_TEMPERATURE, new UnsignedWordElement(0x2C13)), //
+						m(BatteryBoxC130.ChannelId.CLUSTER_1_BATTERY_20_TEMPERATURE, new UnsignedWordElement(0x2C14)), //
+						m(BatteryBoxC130.ChannelId.CLUSTER_1_BATTERY_21_TEMPERATURE, new UnsignedWordElement(0x2C15)), //
+						m(BatteryBoxC130.ChannelId.CLUSTER_1_BATTERY_22_TEMPERATURE, new UnsignedWordElement(0x2C16)), //
+						m(BatteryBoxC130.ChannelId.CLUSTER_1_BATTERY_23_TEMPERATURE, new UnsignedWordElement(0x2C17)), //
+						m(BatteryBoxC130.ChannelId.CLUSTER_1_BATTERY_24_TEMPERATURE, new UnsignedWordElement(0x2C18)), //
+						m(BatteryBoxC130.ChannelId.CLUSTER_1_BATTERY_25_TEMPERATURE, new UnsignedWordElement(0x2C19)), //
+						m(BatteryBoxC130.ChannelId.CLUSTER_1_BATTERY_26_TEMPERATURE, new UnsignedWordElement(0x2C1A)), //
+						m(BatteryBoxC130.ChannelId.CLUSTER_1_BATTERY_27_TEMPERATURE, new UnsignedWordElement(0x2C1B)), //
+						m(BatteryBoxC130.ChannelId.CLUSTER_1_BATTERY_28_TEMPERATURE, new UnsignedWordElement(0x2C1C)), //
+						m(BatteryBoxC130.ChannelId.CLUSTER_1_BATTERY_29_TEMPERATURE, new UnsignedWordElement(0x2C1D)), //
+						m(BatteryBoxC130.ChannelId.CLUSTER_1_BATTERY_30_TEMPERATURE, new UnsignedWordElement(0x2C1E)), //
+						m(BatteryBoxC130.ChannelId.CLUSTER_1_BATTERY_31_TEMPERATURE, new UnsignedWordElement(0x2C1F)), //
+						m(BatteryBoxC130.ChannelId.CLUSTER_1_BATTERY_32_TEMPERATURE, new UnsignedWordElement(0x2C20)), //
+						m(BatteryBoxC130.ChannelId.CLUSTER_1_BATTERY_33_TEMPERATURE, new UnsignedWordElement(0x2C21)), //
+						m(BatteryBoxC130.ChannelId.CLUSTER_1_BATTERY_34_TEMPERATURE, new UnsignedWordElement(0x2C22)), //
+						m(BatteryBoxC130.ChannelId.CLUSTER_1_BATTERY_35_TEMPERATURE, new UnsignedWordElement(0x2C23)), //
+						m(BatteryBoxC130.ChannelId.CLUSTER_1_BATTERY_36_TEMPERATURE, new UnsignedWordElement(0x2C24)), //
+						m(BatteryBoxC130.ChannelId.CLUSTER_1_BATTERY_37_TEMPERATURE, new UnsignedWordElement(0x2C25)), //
+						m(BatteryBoxC130.ChannelId.CLUSTER_1_BATTERY_38_TEMPERATURE, new UnsignedWordElement(0x2C26)), //
+						m(BatteryBoxC130.ChannelId.CLUSTER_1_BATTERY_39_TEMPERATURE, new UnsignedWordElement(0x2C27)), //
+						m(BatteryBoxC130.ChannelId.CLUSTER_1_BATTERY_40_TEMPERATURE, new UnsignedWordElement(0x2C28)), //
+						m(BatteryBoxC130.ChannelId.CLUSTER_1_BATTERY_41_TEMPERATURE, new UnsignedWordElement(0x2C29)), //
+						m(BatteryBoxC130.ChannelId.CLUSTER_1_BATTERY_42_TEMPERATURE, new UnsignedWordElement(0x2C2A)), //
+						m(BatteryBoxC130.ChannelId.CLUSTER_1_BATTERY_43_TEMPERATURE, new UnsignedWordElement(0x2C2B)), //
+						m(BatteryBoxC130.ChannelId.CLUSTER_1_BATTERY_44_TEMPERATURE, new UnsignedWordElement(0x2C2C)), //
+						m(BatteryBoxC130.ChannelId.CLUSTER_1_BATTERY_45_TEMPERATURE, new UnsignedWordElement(0x2C2D)), //
+						m(BatteryBoxC130.ChannelId.CLUSTER_1_BATTERY_46_TEMPERATURE, new UnsignedWordElement(0x2C2E)), //
+						m(BatteryBoxC130.ChannelId.CLUSTER_1_BATTERY_47_TEMPERATURE, new UnsignedWordElement(0x2C2F)) //
 				)//
 		); //
 	}
@@ -761,13 +710,11 @@ public StartStop getStartStopTarget() {
 							try {
 								this.getModbusProtocol().addTasks(//
 										new FC3ReadRegistersTask(0x210D, Priority.LOW, //
-												m(BatteryBoxC130.ChannelId.MODULE_QTY,
-														new UnsignedWordElement(0x210D)), //
+												m(BatteryBoxC130.ChannelId.MODULE_QTY, new UnsignedWordElement(0x210D)), //
 												m(BatteryBoxC130.ChannelId.TOTAL_VOLTAGE_OF_SINGLE_MODULE,
 														new UnsignedWordElement(0x210E))), //
 										new FC3ReadRegistersTask(0x216E, Priority.LOW, //
-												m(Battery.ChannelId.CHARGE_MAX_VOLTAGE,
-														new UnsignedWordElement(0x216E), //
+												m(Battery.ChannelId.CHARGE_MAX_VOLTAGE, new UnsignedWordElement(0x216E), //
 														ElementToChannelConverter.SCALE_FACTOR_MINUS_1), //
 												m(Battery.ChannelId.DISCHARGE_MIN_VOLTAGE,
 														new UnsignedWordElement(0x216F), //
diff --git a/io.openems.edge.battery.fenecon.home/src/io/openems/edge/battery/fenecon/home/FeneconHomeBatteryImpl.java b/io.openems.edge.battery.fenecon.home/src/io/openems/edge/battery/fenecon/home/FeneconHomeBatteryImpl.java
index ae6e69866f3..cee01e8b9f2 100644
--- a/io.openems.edge.battery.fenecon.home/src/io/openems/edge/battery/fenecon/home/FeneconHomeBatteryImpl.java
+++ b/io.openems.edge.battery.fenecon.home/src/io/openems/edge/battery/fenecon/home/FeneconHomeBatteryImpl.java
@@ -531,8 +531,10 @@ private synchronized void initializeTowerModulesChannels(int numberOfTowers, int
 												OpenemsType.BOOLEAN)) //
 										.bit(7, this.generateTowerChannel(tower, "PRE_ALARM_BCU_TEMP_DIFFERENCE",
 												OpenemsType.BOOLEAN)) //
-										.bit(8, this.generateTowerChannel(tower, "PRE_ALARM_UNDER_SOC", OpenemsType.BOOLEAN)) //
-										.bit(9, this.generateTowerChannel(tower, "PRE_ALARM_UNDER_SOH", OpenemsType.BOOLEAN)) //
+										.bit(8, this.generateTowerChannel(tower, "PRE_ALARM_UNDER_SOC",
+												OpenemsType.BOOLEAN)) //
+										.bit(9, this.generateTowerChannel(tower, "PRE_ALARM_UNDER_SOH",
+												OpenemsType.BOOLEAN)) //
 										.bit(10, this.generateTowerChannel(tower, "PRE_ALARM_OVER_CHARGING_POWER",
 												OpenemsType.BOOLEAN)) //
 										.bit(11, this.generateTowerChannel(tower, "PRE_ALARM_OVER_DISCHARGING_POWER",
@@ -558,8 +560,10 @@ private synchronized void initializeTowerModulesChannels(int numberOfTowers, int
 												OpenemsType.BOOLEAN)) //
 										.bit(7, this.generateTowerChannel(tower, "LEVEL_1_BCU_TEMP_DIFFERENCE",
 												OpenemsType.BOOLEAN)) //
-										.bit(8, this.generateTowerChannel(tower, "LEVEL_1_UNDER_SOC", OpenemsType.BOOLEAN)) //
-										.bit(9, this.generateTowerChannel(tower, "LEVEL_1_UNDER_SOH", OpenemsType.BOOLEAN)) //
+										.bit(8, this.generateTowerChannel(tower, "LEVEL_1_UNDER_SOC",
+												OpenemsType.BOOLEAN)) //
+										.bit(9, this.generateTowerChannel(tower, "LEVEL_1_UNDER_SOH",
+												OpenemsType.BOOLEAN)) //
 										.bit(10, this.generateTowerChannel(tower, "LEVEL_1_OVER_CHARGING_POWER",
 												OpenemsType.BOOLEAN)) //
 										.bit(11, this.generateTowerChannel(tower, "LEVEL_1_OVER_DISCHARGING_POWER",
@@ -591,22 +595,28 @@ private synchronized void initializeTowerModulesChannels(int numberOfTowers, int
 												Level.WARNING)) //
 										.bit(10, this.generateTowerChannel(tower, "LEVEL_2_EXTERNAL_COMMUNICATION",
 												Level.WARNING)) //
-										.bit(11, this.generateTowerChannel(tower, "LEVEL_2_PRECHARGE_FAIL", Level.WARNING)) //
-										.bit(12, this.generateTowerChannel(tower, "LEVEL_2_PARALLEL_FAIL", Level.WARNING)) //
+										.bit(11, this.generateTowerChannel(tower, "LEVEL_2_PRECHARGE_FAIL",
+												Level.WARNING)) //
+										.bit(12, this.generateTowerChannel(tower, "LEVEL_2_PARALLEL_FAIL",
+												Level.WARNING)) //
 										.bit(13, this.generateTowerChannel(tower, "LEVEL_2_SYSTEM_FAIL", Level.WARNING)) //
-										.bit(14, this.generateTowerChannel(tower, "LEVEL_2_HARDWARE_FAIL", Level.WARNING)) //
+										.bit(14, this.generateTowerChannel(tower, "LEVEL_2_HARDWARE_FAIL",
+												Level.WARNING)) //
 										.bit(14, this.generateTowerChannel(tower, "LEVEL_2_BAT_UNDER_VOLTAGE",
 												Level.WARNING))), //
 								m(new BitsWordElement(towerOffset + 6, this)
 										.bit(0, this.generateTowerChannel(tower, "HW_AFE_COMMUNICAITON_FAULT",
 												Level.WARNING)) //
-										.bit(1, this.generateTowerChannel(tower, "HW_ACTOR_DRIVER_FAULT", Level.WARNING)) //
+										.bit(1, this.generateTowerChannel(tower, "HW_ACTOR_DRIVER_FAULT",
+												Level.WARNING)) //
 										.bit(2, this.generateTowerChannel(tower, "HW_EEPROM_COMMUNICATION_FAULT",
 												Level.WARNING)) //
-										.bit(3, this.generateTowerChannel(tower, "HW_VOLTAGE_DETECT_FAULT", Level.WARNING)) //
+										.bit(3, this.generateTowerChannel(tower, "HW_VOLTAGE_DETECT_FAULT",
+												Level.WARNING)) //
 										.bit(4, this.generateTowerChannel(tower, "HW_TEMPERATURE_DETECT_FAULT",
 												Level.WARNING)) //
-										.bit(5, this.generateTowerChannel(tower, "HW_CURRENT_DETECT_FAULT", Level.WARNING)) //
+										.bit(5, this.generateTowerChannel(tower, "HW_CURRENT_DETECT_FAULT",
+												Level.WARNING)) //
 										.bit(6, this.generateTowerChannel(tower, "HW_ACTOR_NOT_CLOSE", Level.WARNING)) //
 										.bit(7, this.generateTowerChannel(tower, "HW_ACTOR_NOT_OPEN", Level.WARNING)) //
 										.bit(8, this.generateTowerChannel(tower, "HW_FUSE_BROKEN", Level.WARNING))), //
@@ -615,7 +625,8 @@ private synchronized void initializeTowerModulesChannels(int numberOfTowers, int
 												Level.WARNING)) //
 										.bit(1, this.generateTowerChannel(tower, "SYSTEM_AFE_UNDER_TEMPERATURE",
 												Level.WARNING)) //
-										.bit(2, this.generateTowerChannel(tower, "SYSTEM_AFE_OVER_VOLTAGE", Level.WARNING)) //
+										.bit(2, this.generateTowerChannel(tower, "SYSTEM_AFE_OVER_VOLTAGE",
+												Level.WARNING)) //
 										.bit(3, this.generateTowerChannel(tower, "SYSTEM_AFE_UNDER_VOLTAGE",
 												Level.WARNING)) //
 										.bit(4, this.generateTowerChannel(tower,
@@ -626,7 +637,8 @@ private synchronized void initializeTowerModulesChannels(int numberOfTowers, int
 												"SYSTEM_HIGH_CELL_VOLTAGE_PERMANENT_FAILURE", Level.WARNING)) //
 										.bit(7, this.generateTowerChannel(tower,
 												"SYSTEM_LOW_CELL_VOLTAGE_PERMANENT_FAILURE", Level.WARNING)) //
-										.bit(8, this.generateTowerChannel(tower, "SYSTEM_SHORT_CIRCUIT", Level.WARNING))), //
+										.bit(8, this.generateTowerChannel(tower, "SYSTEM_SHORT_CIRCUIT",
+												Level.WARNING))), //
 								m(this.generateTowerChannel(tower, "_SOC", OpenemsType.INTEGER),
 										new UnsignedWordElement(towerOffset + 8), // [%]
 										ElementToChannelConverter.SCALE_FACTOR_MINUS_1), //
diff --git a/io.openems.edge.bridge.onewire/src/com/dalsemi/onewire/application/monitor/AbstractDeviceMonitor.java b/io.openems.edge.bridge.onewire/src/com/dalsemi/onewire/application/monitor/AbstractDeviceMonitor.java
index 665c50b854d..2c23c44daf0 100644
--- a/io.openems.edge.bridge.onewire/src/com/dalsemi/onewire/application/monitor/AbstractDeviceMonitor.java
+++ b/io.openems.edge.bridge.onewire/src/com/dalsemi/onewire/application/monitor/AbstractDeviceMonitor.java
@@ -425,8 +425,7 @@ public void addDeviceMonitorEventListener(DeviceMonitorEventListener dmel) {
 	 *                arrivals.
 	 */
 	protected void fireArrivalEvent(DSPortAdapter adapter, Vector<Long> address) {
-		var dme = new DeviceMonitorEvent(DeviceMonitorEvent.ARRIVAL, this, adapter,
-				(Vector<Long>) address.clone());
+		var dme = new DeviceMonitorEvent(DeviceMonitorEvent.ARRIVAL, this, adapter, (Vector<Long>) address.clone());
 		for (var i = 0; i < this.listeners.size(); i++) {
 			var listener = this.listeners.elementAt(i);
 			listener.deviceArrival(dme);
@@ -440,8 +439,7 @@ protected void fireArrivalEvent(DSPortAdapter adapter, Vector<Long> address) {
 	 *                devices.
 	 */
 	protected void fireDepartureEvent(DSPortAdapter adapter, Vector<Long> address) {
-		var dme = new DeviceMonitorEvent(DeviceMonitorEvent.DEPARTURE, this, adapter,
-				(Vector<Long>) address.clone());
+		var dme = new DeviceMonitorEvent(DeviceMonitorEvent.DEPARTURE, this, adapter, (Vector<Long>) address.clone());
 
 		for (var i = 0; i < this.listeners.size(); i++) {
 			var listener = this.listeners.elementAt(i);
diff --git a/io.openems.edge.bridge.onewire/src/com/dalsemi/onewire/application/tag/Humidity.java b/io.openems.edge.bridge.onewire/src/com/dalsemi/onewire/application/tag/Humidity.java
index 987ccbf10b0..30baab0a9fe 100644
--- a/io.openems.edge.bridge.onewire/src/com/dalsemi/onewire/application/tag/Humidity.java
+++ b/io.openems.edge.bridge.onewire/src/com/dalsemi/onewire/application/tag/Humidity.java
@@ -71,8 +71,7 @@ public String readSensor() throws OneWireException {
 		hc.doHumidityConvert(state);
 
 		// construct the return string
-		var return_string = new StringBuilder().append((int) this.roundDouble(hc.getHumidity(state)))
-				.append("%");
+		var return_string = new StringBuilder().append((int) this.roundDouble(hc.getHumidity(state))).append("%");
 		if (hc.isRelative()) {
 			return_string.append("RH");
 		}
diff --git a/io.openems.edge.bridge.onewire/src/com/dalsemi/onewire/utils/OWPath.java b/io.openems.edge.bridge.onewire/src/com/dalsemi/onewire/utils/OWPath.java
index d07553ee81f..1e0b5487a71 100644
--- a/io.openems.edge.bridge.onewire/src/com/dalsemi/onewire/utils/OWPath.java
+++ b/io.openems.edge.bridge.onewire/src/com/dalsemi/onewire/utils/OWPath.java
@@ -136,8 +136,7 @@ public void copy(OWPath currentOWPath) {
 		if (currentOWPath != null) {
 
 			// enumerature through elements in current path
-			for (var path_enum = currentOWPath.getAllOWPathElements(); path_enum
-					.hasMoreElements();) {
+			for (var path_enum = currentOWPath.getAllOWPathElements(); path_enum.hasMoreElements();) {
 
 				// cast the enum as a OWPathElements and add to vector
 				this.elements.addElement(path_enum.nextElement());
diff --git a/io.openems.edge.common/src/io/openems/edge/common/component/AbstractOpenemsComponent.java b/io.openems.edge.common/src/io/openems/edge/common/component/AbstractOpenemsComponent.java
index 009ade1319a..0a2d33b5ae2 100644
--- a/io.openems.edge.common/src/io/openems/edge/common/component/AbstractOpenemsComponent.java
+++ b/io.openems.edge.common/src/io/openems/edge/common/component/AbstractOpenemsComponent.java
@@ -116,8 +116,8 @@ protected void activate(ComponentContext context, String id, String alias, boole
 		// If we wouldn't do this here, each inheriting Component would have to get an
 		// @Reference to MetaTypeService, which would be cumbersome.
 		if (context != null && context.getBundleContext() != null) {
-			this.metaTypeServiceTracker = new ServiceTracker<>(
-					context.getBundleContext(), MetaTypeService.class, null) {
+			this.metaTypeServiceTracker = new ServiceTracker<>(context.getBundleContext(), MetaTypeService.class,
+					null) {
 
 				@Override
 				public MetaTypeService addingService(ServiceReference<MetaTypeService> serviceReference) {
diff --git a/io.openems.edge.common/src/io/openems/edge/common/linecharacteristic/PolyLine.java b/io.openems.edge.common/src/io/openems/edge/common/linecharacteristic/PolyLine.java
index f3d17ad3bc7..3925e14e3a6 100644
--- a/io.openems.edge.common/src/io/openems/edge/common/linecharacteristic/PolyLine.java
+++ b/io.openems.edge.common/src/io/openems/edge/common/linecharacteristic/PolyLine.java
@@ -165,8 +165,7 @@ public Double getValue(Double x) {
 			return floorEntry.getValue();
 
 		} else {
-			var m = (ceilingEntry.getValue() - floorEntry.getValue())
-					/ (ceilingEntry.getKey() - floorEntry.getKey());
+			var m = (ceilingEntry.getValue() - floorEntry.getValue()) / (ceilingEntry.getKey() - floorEntry.getKey());
 			var t = floorEntry.getValue() - m * floorEntry.getKey();
 			return m * x + t;
 		}
diff --git a/io.openems.edge.controller.api.mqtt/test/io/openems/edge/controller/api/mqtt/MqttApiControllerImplTest.java b/io.openems.edge.controller.api.mqtt/test/io/openems/edge/controller/api/mqtt/MqttApiControllerImplTest.java
index f4f710dd12e..d0542d16685 100644
--- a/io.openems.edge.controller.api.mqtt/test/io/openems/edge/controller/api/mqtt/MqttApiControllerImplTest.java
+++ b/io.openems.edge.controller.api.mqtt/test/io/openems/edge/controller/api/mqtt/MqttApiControllerImplTest.java
@@ -17,8 +17,8 @@ public class MqttApiControllerImplTest {
 
 	@Test
 	public void test() throws Exception {
-		final var clock = new TimeLeapClock(
-				Instant.ofEpochSecond(1577836800L) /* starts at 1. January 2020 00:00:00 */, ZoneOffset.UTC);
+		final var clock = new TimeLeapClock(Instant.ofEpochSecond(1577836800L) /* starts at 1. January 2020 00:00:00 */,
+				ZoneOffset.UTC);
 		new ComponentTest(new MqttApiControllerImpl()) //
 				.addReference("componentManager", new DummyComponentManager(clock)) //
 				.addComponent(new DummySum()) //
diff --git a/io.openems.edge.controller.api.rest/src/io/openems/edge/controller/api/rest/RestHandler.java b/io.openems.edge.controller.api.rest/src/io/openems/edge/controller/api/rest/RestHandler.java
index b9d8ba87eed..adefdc2156a 100644
--- a/io.openems.edge.controller.api.rest/src/io/openems/edge/controller/api/rest/RestHandler.java
+++ b/io.openems.edge.controller.api.rest/src/io/openems/edge/controller/api/rest/RestHandler.java
@@ -515,10 +515,9 @@ private CompletableFuture<JsonrpcResponseSuccess> handleJsonRpcRequest(User user
 	 */
 	private CompletableFuture<JsonrpcResponseSuccess> handleQueryHistoricDataRequest(User user,
 			QueryHistoricTimeseriesDataRequest request) throws OpenemsNamedException {
-		var data = this.parent.getTimedata()
-				.queryHistoricData(//
-						null, /* ignore Edge-ID */
-						request);
+		var data = this.parent.getTimedata().queryHistoricData(//
+				null, /* ignore Edge-ID */
+				request);
 
 		// JSON-RPC response
 		return CompletableFuture.completedFuture(new QueryHistoricTimeseriesDataResponse(request.getId(), data));
@@ -553,8 +552,7 @@ private CompletableFuture<JsonrpcResponseSuccess> handleQueryHistoricEnergyReque
 	private CompletableFuture<JsonrpcResponseSuccess> handleGetEdgeConfigRequest(User user,
 			GetEdgeConfigRequest getEdgeConfigRequest) throws OpenemsNamedException {
 		// wrap original request inside ComponentJsonApiRequest
-		var request = new ComponentJsonApiRequest(ComponentManager.SINGLETON_COMPONENT_ID,
-				getEdgeConfigRequest);
+		var request = new ComponentJsonApiRequest(ComponentManager.SINGLETON_COMPONENT_ID, getEdgeConfigRequest);
 
 		return this.handleComponentJsonApiRequest(user, request);
 	}
diff --git a/io.openems.edge.controller.api.rest/test/io/openems/edge/controller/api/rest/readwrite/RestApiReadWriteImplTest.java b/io.openems.edge.controller.api.rest/test/io/openems/edge/controller/api/rest/readwrite/RestApiReadWriteImplTest.java
index 9584a1a9c4a..3f3385a9c41 100644
--- a/io.openems.edge.controller.api.rest/test/io/openems/edge/controller/api/rest/readwrite/RestApiReadWriteImplTest.java
+++ b/io.openems.edge.controller.api.rest/test/io/openems/edge/controller/api/rest/readwrite/RestApiReadWriteImplTest.java
@@ -85,10 +85,9 @@ public void test() throws OpenemsException, Exception {
 				.build(), channelGet);
 
 		// POST successful as OWNER
-		var channelPost = sendPostRequest(port, OWNER, "/rest/channel/dummy0/WriteChannel",
-				JsonUtils.buildJsonObject() //
-						.addProperty("value", 4321) //
-						.build());
+		var channelPost = sendPostRequest(port, OWNER, "/rest/channel/dummy0/WriteChannel", JsonUtils.buildJsonObject() //
+				.addProperty("value", 4321) //
+				.build());
 		assertEquals(new JsonObject(), channelPost);
 		test //
 				.next(new TestCase() //
diff --git a/io.openems.edge.controller.ess.gridoptimizedcharge/src/io/openems/edge/controller/ess/gridoptimizedcharge/DelayCharge.java b/io.openems.edge.controller.ess.gridoptimizedcharge/src/io/openems/edge/controller/ess/gridoptimizedcharge/DelayCharge.java
index 6256d36c61e..ee984ebcdb2 100644
--- a/io.openems.edge.controller.ess.gridoptimizedcharge/src/io/openems/edge/controller/ess/gridoptimizedcharge/DelayCharge.java
+++ b/io.openems.edge.controller.ess.gridoptimizedcharge/src/io/openems/edge/controller/ess/gridoptimizedcharge/DelayCharge.java
@@ -205,8 +205,7 @@ private Integer getCalculatedTargetMinute() {
 		}
 
 		// Calculate target minute
-		var targetMinute = this.calculateTargetMinute(hourlyProduction, hourlyConsumption,
-				predictionStartQuarterHour);
+		var targetMinute = this.calculateTargetMinute(hourlyProduction, hourlyConsumption, predictionStartQuarterHour);
 
 		// Production was never higher than consumption
 		if (targetMinute == null) {
diff --git a/io.openems.edge.controller.ess.gridoptimizedcharge/src/io/openems/edge/controller/ess/gridoptimizedcharge/GridOptimizedCharge.java b/io.openems.edge.controller.ess.gridoptimizedcharge/src/io/openems/edge/controller/ess/gridoptimizedcharge/GridOptimizedCharge.java
index 38a36cc0541..2796d8ffac1 100644
--- a/io.openems.edge.controller.ess.gridoptimizedcharge/src/io/openems/edge/controller/ess/gridoptimizedcharge/GridOptimizedCharge.java
+++ b/io.openems.edge.controller.ess.gridoptimizedcharge/src/io/openems/edge/controller/ess/gridoptimizedcharge/GridOptimizedCharge.java
@@ -112,15 +112,12 @@ public enum ChannelId implements io.openems.edge.common.channel.ChannelId {
 					((IntegerReadChannel) channel).onSetNextValue(value -> {
 						if (value != null && value.isDefined()) {
 							int targetTime = value.get();
-							var gridOptimizedCharge = (GridOptimizedChargeImpl) channel
-									.getComponent();
+							var gridOptimizedCharge = (GridOptimizedChargeImpl) channel.getComponent();
 
-							var targetDateTime = LocalDate
-									.now(gridOptimizedCharge.componentManager.getClock())
+							var targetDateTime = LocalDate.now(gridOptimizedCharge.componentManager.getClock())
 									.atTime(LocalTime.of(targetTime / 60, targetTime % 60));
 
-							var zonedDateTime = ZonedDateTime.ofLocal(targetDateTime, ZoneId.systemDefault(),
-									null);
+							var zonedDateTime = ZonedDateTime.ofLocal(targetDateTime, ZoneId.systemDefault(), null);
 							var targetEpochTime = zonedDateTime.toEpochSecond();
 
 							gridOptimizedCharge.channel(ChannelId.TARGET_EPOCH_SECONDS).setNextValue(targetEpochTime);
diff --git a/io.openems.edge.controller.ess.gridoptimizedcharge/test/io/openems/edge/controller/ess/gridoptimizedcharge/MyControllerTest.java b/io.openems.edge.controller.ess.gridoptimizedcharge/test/io/openems/edge/controller/ess/gridoptimizedcharge/MyControllerTest.java
index 75aedd32f00..a03ea12e06b 100644
--- a/io.openems.edge.controller.ess.gridoptimizedcharge/test/io/openems/edge/controller/ess/gridoptimizedcharge/MyControllerTest.java
+++ b/io.openems.edge.controller.ess.gridoptimizedcharge/test/io/openems/edge/controller/ess/gridoptimizedcharge/MyControllerTest.java
@@ -141,14 +141,13 @@ public void automatic_default_predictions_at_midnight_test() throws Exception {
 		final var consumptionPrediction = new DummyPrediction24Hours(DEFAULT_CONSUMPTION_PREDICTION);
 
 		// Predictors
-		final var productionPredictor = new DummyPredictor24Hours(PREDICTOR_ID, cm,
-				productionPrediction, "_sum/ProductionActivePower");
-		final var consumptionPredictor = new DummyPredictor24Hours(PREDICTOR_ID, cm,
-				consumptionPrediction, "_sum/ConsumptionActivePower");
+		final var productionPredictor = new DummyPredictor24Hours(PREDICTOR_ID, cm, productionPrediction,
+				"_sum/ProductionActivePower");
+		final var consumptionPredictor = new DummyPredictor24Hours(PREDICTOR_ID, cm, consumptionPrediction,
+				"_sum/ConsumptionActivePower");
 
 		// PredictorManager
-		final var predictorManager = new DummyPredictorManager(productionPredictor,
-				consumptionPredictor);
+		final var predictorManager = new DummyPredictorManager(productionPredictor, consumptionPredictor);
 
 		System.out.println(Arrays.toString(predictorManager
 				.get24HoursPrediction(ChannelAddress.fromString("_sum/ProductionActivePower")).getValues()));
@@ -198,14 +197,13 @@ public void automatic_default_predictions_at_midday_test() throws Exception {
 		final var consumptionPrediction = new DummyPrediction24Hours(DEFAULT_CONSUMPTION_PREDICTION);
 
 		// Predictors
-		final var productionPredictor = new DummyPredictor24Hours(PREDICTOR_ID, cm,
-				productionPrediction, "_sum/ProductionActivePower");
-		final var consumptionPredictor = new DummyPredictor24Hours(PREDICTOR_ID, cm,
-				consumptionPrediction, "_sum/ConsumptionActivePower");
+		final var productionPredictor = new DummyPredictor24Hours(PREDICTOR_ID, cm, productionPrediction,
+				"_sum/ProductionActivePower");
+		final var consumptionPredictor = new DummyPredictor24Hours(PREDICTOR_ID, cm, consumptionPrediction,
+				"_sum/ConsumptionActivePower");
 
 		// PredictorManager
-		final var predictorManager = new DummyPredictorManager(productionPredictor,
-				consumptionPredictor);
+		final var predictorManager = new DummyPredictorManager(productionPredictor, consumptionPredictor);
 
 		System.out.println(Arrays.toString(predictorManager
 				.get24HoursPrediction(ChannelAddress.fromString("_sum/ProductionActivePower")).getValues()));
@@ -260,14 +258,13 @@ public void automatic_default_predictions_at_midday_averaged_test() throws Excep
 		final var consumptionPrediction = new DummyPrediction24Hours(DEFAULT_CONSUMPTION_PREDICTION);
 
 		// Predictors
-		final var productionPredictor = new DummyPredictor24Hours(PREDICTOR_ID, cm,
-				productionPrediction, "_sum/ProductionActivePower");
-		final var consumptionPredictor = new DummyPredictor24Hours(PREDICTOR_ID, cm,
-				consumptionPrediction, "_sum/ConsumptionActivePower");
+		final var productionPredictor = new DummyPredictor24Hours(PREDICTOR_ID, cm, productionPrediction,
+				"_sum/ProductionActivePower");
+		final var consumptionPredictor = new DummyPredictor24Hours(PREDICTOR_ID, cm, consumptionPrediction,
+				"_sum/ConsumptionActivePower");
 
 		// PredictorManager
-		final var predictorManager = new DummyPredictorManager(productionPredictor,
-				consumptionPredictor);
+		final var predictorManager = new DummyPredictorManager(productionPredictor, consumptionPredictor);
 
 		System.out.println(Arrays.toString(predictorManager
 				.get24HoursPrediction(ChannelAddress.fromString("_sum/ProductionActivePower")).getValues()));
@@ -339,14 +336,13 @@ public void automatic_default_predictions_at_evening_test() throws Exception {
 		final var consumptionPrediction = new DummyPrediction24Hours(DEFAULT_CONSUMPTION_PREDICTION);
 
 		// Predictors
-		final var productionPredictor = new DummyPredictor24Hours(PREDICTOR_ID, cm,
-				productionPrediction, "_sum/ProductionActivePower");
-		final var consumptionPredictor = new DummyPredictor24Hours(PREDICTOR_ID, cm,
-				consumptionPrediction, "_sum/ConsumptionActivePower");
+		final var productionPredictor = new DummyPredictor24Hours(PREDICTOR_ID, cm, productionPrediction,
+				"_sum/ProductionActivePower");
+		final var consumptionPredictor = new DummyPredictor24Hours(PREDICTOR_ID, cm, consumptionPrediction,
+				"_sum/ConsumptionActivePower");
 
 		// PredictorManager
-		final var predictorManager = new DummyPredictorManager(productionPredictor,
-				consumptionPredictor);
+		final var predictorManager = new DummyPredictorManager(productionPredictor, consumptionPredictor);
 
 		System.out.println(Arrays.toString(predictorManager
 				.get24HoursPrediction(ChannelAddress.fromString("_sum/ProductionActivePower")).getValues()));
@@ -416,14 +412,13 @@ public void automatic_no_predictions_test() throws Exception {
 		final var consumptionPrediction = new DummyPrediction24Hours();
 
 		// Predictors
-		final var productionPredictor = new DummyPredictor24Hours(PREDICTOR_ID, cm,
-				productionPrediction, "_sum/ProductionActivePower");
-		final var consumptionPredictor = new DummyPredictor24Hours(PREDICTOR_ID, cm,
-				consumptionPrediction, "_sum/ConsumptionActivePower");
+		final var productionPredictor = new DummyPredictor24Hours(PREDICTOR_ID, cm, productionPrediction,
+				"_sum/ProductionActivePower");
+		final var consumptionPredictor = new DummyPredictor24Hours(PREDICTOR_ID, cm, consumptionPrediction,
+				"_sum/ConsumptionActivePower");
 
 		// PredictorManager
-		final var predictorManager = new DummyPredictorManager(productionPredictor,
-				consumptionPredictor);
+		final var predictorManager = new DummyPredictorManager(productionPredictor, consumptionPredictor);
 
 		new ControllerTest(new GridOptimizedChargeImpl()) //
 				.addReference("predictorManager", predictorManager) //
@@ -461,14 +456,13 @@ public void automatic_sell_to_grid_limit_test() throws Exception {
 		final var cm = new DummyComponentManager(clock);
 
 		// Predictors
-		final var productionPredictor = new DummyPredictor24Hours(PREDICTOR_ID, cm,
-				new DummyPrediction24Hours(), "_sum/ProductionActivePower");
-		final var consumptionPredictor = new DummyPredictor24Hours(PREDICTOR_ID, cm,
-				new DummyPrediction24Hours(), "_sum/ConsumptionActivePower");
+		final var productionPredictor = new DummyPredictor24Hours(PREDICTOR_ID, cm, new DummyPrediction24Hours(),
+				"_sum/ProductionActivePower");
+		final var consumptionPredictor = new DummyPredictor24Hours(PREDICTOR_ID, cm, new DummyPrediction24Hours(),
+				"_sum/ConsumptionActivePower");
 
 		// PredictorManager
-		final var predictorManager = new DummyPredictorManager(productionPredictor,
-				consumptionPredictor);
+		final var predictorManager = new DummyPredictorManager(productionPredictor, consumptionPredictor);
 
 		new ControllerTest(new GridOptimizedChargeImpl()) //
 				.addReference("predictorManager", predictorManager) //
@@ -559,14 +553,13 @@ public void automatic_sell_to_grid_limit_test_with_full_ess() throws Exception {
 		final var cm = new DummyComponentManager(clock);
 
 		// Predictors
-		final var productionPredictor = new DummyPredictor24Hours(PREDICTOR_ID, cm,
-				new DummyPrediction24Hours(), "_sum/ProductionActivePower");
-		final var consumptionPredictor = new DummyPredictor24Hours(PREDICTOR_ID, cm,
-				new DummyPrediction24Hours(), "_sum/ConsumptionActivePower");
+		final var productionPredictor = new DummyPredictor24Hours(PREDICTOR_ID, cm, new DummyPrediction24Hours(),
+				"_sum/ProductionActivePower");
+		final var consumptionPredictor = new DummyPredictor24Hours(PREDICTOR_ID, cm, new DummyPrediction24Hours(),
+				"_sum/ConsumptionActivePower");
 
 		// PredictorManager
-		final var predictorManager = new DummyPredictorManager(productionPredictor,
-				consumptionPredictor);
+		final var predictorManager = new DummyPredictorManager(productionPredictor, consumptionPredictor);
 
 		new ControllerTest(new GridOptimizedChargeImpl()) //
 				.addReference("predictorManager", predictorManager) //
@@ -659,14 +652,13 @@ public void automatic_sell_to_grid_limit_buffer_test() throws Exception {
 		final var cm = new DummyComponentManager(clock);
 
 		// Predictors
-		final var productionPredictor = new DummyPredictor24Hours(PREDICTOR_ID, cm,
-				new DummyPrediction24Hours(), "_sum/ProductionActivePower");
-		final var consumptionPredictor = new DummyPredictor24Hours(PREDICTOR_ID, cm,
-				new DummyPrediction24Hours(), "_sum/ConsumptionActivePower");
+		final var productionPredictor = new DummyPredictor24Hours(PREDICTOR_ID, cm, new DummyPrediction24Hours(),
+				"_sum/ProductionActivePower");
+		final var consumptionPredictor = new DummyPredictor24Hours(PREDICTOR_ID, cm, new DummyPrediction24Hours(),
+				"_sum/ConsumptionActivePower");
 
 		// PredictorManager
-		final var predictorManager = new DummyPredictorManager(productionPredictor,
-				consumptionPredictor);
+		final var predictorManager = new DummyPredictorManager(productionPredictor, consumptionPredictor);
 
 		new ControllerTest(new GridOptimizedChargeImpl()) //
 				.addReference("predictorManager", predictorManager) //
@@ -761,14 +753,13 @@ public void manual_midnight_test() throws Exception {
 		final var consumptionPrediction = new DummyPrediction24Hours(DEFAULT_CONSUMPTION_PREDICTION);
 
 		// Predictors
-		final var productionPredictor = new DummyPredictor24Hours(PREDICTOR_ID, cm,
-				productionPrediction, "_sum/ProductionActivePower");
-		final var consumptionPredictor = new DummyPredictor24Hours(PREDICTOR_ID, cm,
-				consumptionPrediction, "_sum/ConsumptionActivePower");
+		final var productionPredictor = new DummyPredictor24Hours(PREDICTOR_ID, cm, productionPrediction,
+				"_sum/ProductionActivePower");
+		final var consumptionPredictor = new DummyPredictor24Hours(PREDICTOR_ID, cm, consumptionPrediction,
+				"_sum/ConsumptionActivePower");
 
 		// PredictorManager
-		final var predictorManager = new DummyPredictorManager(productionPredictor,
-				consumptionPredictor);
+		final var predictorManager = new DummyPredictorManager(productionPredictor, consumptionPredictor);
 
 		System.out.println(Arrays.toString(predictorManager
 				.get24HoursPrediction(ChannelAddress.fromString("_sum/ProductionActivePower")).getValues()));
@@ -819,14 +810,13 @@ public void manual_midday_test() throws Exception {
 		final var consumptionPrediction = new DummyPrediction24Hours(DEFAULT_CONSUMPTION_PREDICTION);
 
 		// Predictors
-		final var productionPredictor = new DummyPredictor24Hours(PREDICTOR_ID, cm,
-				productionPrediction, "_sum/ProductionActivePower");
-		final var consumptionPredictor = new DummyPredictor24Hours(PREDICTOR_ID, cm,
-				consumptionPrediction, "_sum/ConsumptionActivePower");
+		final var productionPredictor = new DummyPredictor24Hours(PREDICTOR_ID, cm, productionPrediction,
+				"_sum/ProductionActivePower");
+		final var consumptionPredictor = new DummyPredictor24Hours(PREDICTOR_ID, cm, consumptionPrediction,
+				"_sum/ConsumptionActivePower");
 
 		// PredictorManager
-		final var predictorManager = new DummyPredictorManager(productionPredictor,
-				consumptionPredictor);
+		final var predictorManager = new DummyPredictorManager(productionPredictor, consumptionPredictor);
 
 		System.out.println(Arrays.toString(predictorManager
 				.get24HoursPrediction(ChannelAddress.fromString("_sum/ProductionActivePower")).getValues()));
@@ -875,14 +865,13 @@ public void hybridEss_manual_midday_test() throws Exception {
 		final var consumptionPrediction = new DummyPrediction24Hours(DEFAULT_CONSUMPTION_PREDICTION);
 
 		// Predictors
-		final var productionPredictor = new DummyPredictor24Hours(PREDICTOR_ID, cm,
-				productionPrediction, "_sum/ProductionActivePower");
-		final var consumptionPredictor = new DummyPredictor24Hours(PREDICTOR_ID, cm,
-				consumptionPrediction, "_sum/ConsumptionActivePower");
+		final var productionPredictor = new DummyPredictor24Hours(PREDICTOR_ID, cm, productionPrediction,
+				"_sum/ProductionActivePower");
+		final var consumptionPredictor = new DummyPredictor24Hours(PREDICTOR_ID, cm, consumptionPrediction,
+				"_sum/ConsumptionActivePower");
 
 		// PredictorManager
-		final var predictorManager = new DummyPredictorManager(productionPredictor,
-				consumptionPredictor);
+		final var predictorManager = new DummyPredictorManager(productionPredictor, consumptionPredictor);
 
 		System.out.println(Arrays.toString(predictorManager
 				.get24HoursPrediction(ChannelAddress.fromString("_sum/ProductionActivePower")).getValues()));
@@ -933,14 +922,13 @@ public void mode_off_test() throws Exception {
 		final var consumptionPrediction = new DummyPrediction24Hours(DEFAULT_CONSUMPTION_PREDICTION);
 
 		// Predictors
-		final var productionPredictor = new DummyPredictor24Hours(PREDICTOR_ID, cm,
-				productionPrediction, "_sum/ProductionActivePower");
-		final var consumptionPredictor = new DummyPredictor24Hours(PREDICTOR_ID, cm,
-				consumptionPrediction, "_sum/ConsumptionActivePower");
+		final var productionPredictor = new DummyPredictor24Hours(PREDICTOR_ID, cm, productionPrediction,
+				"_sum/ProductionActivePower");
+		final var consumptionPredictor = new DummyPredictor24Hours(PREDICTOR_ID, cm, consumptionPrediction,
+				"_sum/ConsumptionActivePower");
 
 		// PredictorManager
-		final var predictorManager = new DummyPredictorManager(productionPredictor,
-				consumptionPredictor);
+		final var predictorManager = new DummyPredictorManager(productionPredictor, consumptionPredictor);
 
 		new ControllerTest(new GridOptimizedChargeImpl()) //
 				.addReference("predictorManager", predictorManager) //
@@ -983,14 +971,13 @@ public void no_capacity_left_test() throws Exception {
 		final var consumptionPrediction = new DummyPrediction24Hours(DEFAULT_CONSUMPTION_PREDICTION);
 
 		// Predictors
-		final var productionPredictor = new DummyPredictor24Hours(PREDICTOR_ID, cm,
-				productionPrediction, "_sum/ProductionActivePower");
-		final var consumptionPredictor = new DummyPredictor24Hours(PREDICTOR_ID, cm,
-				consumptionPrediction, "_sum/ConsumptionActivePower");
+		final var productionPredictor = new DummyPredictor24Hours(PREDICTOR_ID, cm, productionPrediction,
+				"_sum/ProductionActivePower");
+		final var consumptionPredictor = new DummyPredictor24Hours(PREDICTOR_ID, cm, consumptionPrediction,
+				"_sum/ConsumptionActivePower");
 
 		// PredictorManager
-		final var predictorManager = new DummyPredictorManager(productionPredictor,
-				consumptionPredictor);
+		final var predictorManager = new DummyPredictorManager(productionPredictor, consumptionPredictor);
 
 		System.out.println(Arrays.toString(predictorManager
 				.get24HoursPrediction(ChannelAddress.fromString("_sum/ProductionActivePower")).getValues()));
@@ -1045,14 +1032,13 @@ public void start_production_no_enough_test() throws Exception {
 		final var consumptionPrediction = new DummyPrediction24Hours(DEFAULT_CONSUMPTION_PREDICTION);
 
 		// Predictors
-		final var productionPredictor = new DummyPredictor24Hours(PREDICTOR_ID, cm,
-				productionPrediction, "_sum/ProductionActivePower");
-		final var consumptionPredictor = new DummyPredictor24Hours(PREDICTOR_ID, cm,
-				consumptionPrediction, "_sum/ConsumptionActivePower");
+		final var productionPredictor = new DummyPredictor24Hours(PREDICTOR_ID, cm, productionPrediction,
+				"_sum/ProductionActivePower");
+		final var consumptionPredictor = new DummyPredictor24Hours(PREDICTOR_ID, cm, consumptionPrediction,
+				"_sum/ConsumptionActivePower");
 
 		// PredictorManager
-		final var predictorManager = new DummyPredictorManager(productionPredictor,
-				consumptionPredictor);
+		final var predictorManager = new DummyPredictorManager(productionPredictor, consumptionPredictor);
 
 		new ControllerTest(new GridOptimizedChargeImpl()) //
 				.addReference("predictorManager", predictorManager) //
@@ -1102,8 +1088,7 @@ public void start_production_average_test() throws Exception {
 		// does not consider the mocked Clock.
 		final ThrowingRunnable<Exception> sleep = () -> Thread.sleep(10);
 
-		final var clock = new TimeLeapClock(Instant.parse("2020-01-01T00:00:00.00Z"),
-				ZoneId.of("Europe/Berlin"));
+		final var clock = new TimeLeapClock(Instant.parse("2020-01-01T00:00:00.00Z"), ZoneId.of("Europe/Berlin"));
 		final var cm = new DummyComponentManager(clock);
 
 		// Predictions
@@ -1111,14 +1096,13 @@ public void start_production_average_test() throws Exception {
 		final var consumptionPrediction = new DummyPrediction24Hours(DEFAULT_CONSUMPTION_PREDICTION);
 
 		// Predictors
-		final var productionPredictor = new DummyPredictor24Hours(PREDICTOR_ID, cm,
-				productionPrediction, "_sum/ProductionActivePower");
-		final var consumptionPredictor = new DummyPredictor24Hours(PREDICTOR_ID, cm,
-				consumptionPrediction, "_sum/ConsumptionActivePower");
+		final var productionPredictor = new DummyPredictor24Hours(PREDICTOR_ID, cm, productionPrediction,
+				"_sum/ProductionActivePower");
+		final var consumptionPredictor = new DummyPredictor24Hours(PREDICTOR_ID, cm, consumptionPrediction,
+				"_sum/ConsumptionActivePower");
 
 		// PredictorManager
-		final var predictorManager = new DummyPredictorManager(productionPredictor,
-				consumptionPredictor);
+		final var predictorManager = new DummyPredictorManager(productionPredictor, consumptionPredictor);
 
 		new ControllerTest(new GridOptimizedChargeImpl()) //
 				.addReference("predictorManager", predictorManager) //
diff --git a/io.openems.edge.controller.ess.timeofusetariff.discharge/test/io/openems/edge/controller/ess/timeofusetariff/discharge/TimeOfUseTariffDischargeTest.java b/io.openems.edge.controller.ess.timeofusetariff.discharge/test/io/openems/edge/controller/ess/timeofusetariff/discharge/TimeOfUseTariffDischargeTest.java
index 229961d6ed0..15cf3fca4cb 100644
--- a/io.openems.edge.controller.ess.timeofusetariff.discharge/test/io/openems/edge/controller/ess/timeofusetariff/discharge/TimeOfUseTariffDischargeTest.java
+++ b/io.openems.edge.controller.ess.timeofusetariff.discharge/test/io/openems/edge/controller/ess/timeofusetariff/discharge/TimeOfUseTariffDischargeTest.java
@@ -118,18 +118,16 @@ public void nullTimeOfUseTariffTest() throws Exception {
 		final var consumptionPrediction = new DummyPrediction24Hours(DEFAULT_CONSUMPTION_PREDICTION);
 
 		// Predictors
-		final var productionPredictor = new DummyPredictor24Hours(PREDICTOR_ID, cm,
-				productionPrediction, "_sum/ProductionActivePower");
-		final var consumptionPredictor = new DummyPredictor24Hours(PREDICTOR_ID, cm,
-				consumptionPrediction, "_sum/ConsumptionActivePower");
+		final var productionPredictor = new DummyPredictor24Hours(PREDICTOR_ID, cm, productionPrediction,
+				"_sum/ProductionActivePower");
+		final var consumptionPredictor = new DummyPredictor24Hours(PREDICTOR_ID, cm, consumptionPrediction,
+				"_sum/ConsumptionActivePower");
 
 		// PredictorManager
-		final var predictorManager = new DummyPredictorManager(productionPredictor,
-				consumptionPredictor);
+		final var predictorManager = new DummyPredictorManager(productionPredictor, consumptionPredictor);
 
 		// Price provider
-		final var timeOfUseTariffProvider = DummyTimeOfUseTariffProvider.fromHourlyPrices(null,
-				DEFAULT_HOURLY_PRICES);
+		final var timeOfUseTariffProvider = DummyTimeOfUseTariffProvider.fromHourlyPrices(null, DEFAULT_HOURLY_PRICES);
 
 		// Printing
 		// System.out.println("Time: " + clock);
@@ -171,18 +169,17 @@ public void executesDuringMarketTimeTest() throws Exception {
 		final var consumptionPrediction = new DummyPrediction24Hours(DEFAULT_CONSUMPTION_PREDICTION);
 
 		// Predictors
-		final var productionPredictor = new DummyPredictor24Hours(PREDICTOR_ID, cm,
-				productionPrediction, "_sum/ProductionActivePower");
-		final var consumptionPredictor = new DummyPredictor24Hours(PREDICTOR_ID, cm,
-				consumptionPrediction, "_sum/ConsumptionActivePower");
+		final var productionPredictor = new DummyPredictor24Hours(PREDICTOR_ID, cm, productionPrediction,
+				"_sum/ProductionActivePower");
+		final var consumptionPredictor = new DummyPredictor24Hours(PREDICTOR_ID, cm, consumptionPrediction,
+				"_sum/ConsumptionActivePower");
 
 		// PredictorManager
-		final var predictorManager = new DummyPredictorManager(productionPredictor,
-				consumptionPredictor);
+		final var predictorManager = new DummyPredictorManager(productionPredictor, consumptionPredictor);
 
 		// Price provider
-		final var timeOfUseTariffProvider = DummyTimeOfUseTariffProvider
-				.fromHourlyPrices(ZonedDateTime.now(clock), DEFAULT_HOURLY_PRICES);
+		final var timeOfUseTariffProvider = DummyTimeOfUseTariffProvider.fromHourlyPrices(ZonedDateTime.now(clock),
+				DEFAULT_HOURLY_PRICES);
 
 		// Printing
 		// System.out.println("Time: " + clock);
@@ -253,18 +250,17 @@ public void executesBeforeMidnight() throws Exception {
 		final var consumptionPrediction = new DummyPrediction24Hours(DEFAULT_CONSUMPTION_PREDICTION);
 
 		// Predictors
-		final var productionPredictor = new DummyPredictor24Hours(PREDICTOR_ID, cm,
-				productionPrediction, "_sum/ProductionActivePower");
-		final var consumptionPredictor = new DummyPredictor24Hours(PREDICTOR_ID, cm,
-				consumptionPrediction, "_sum/ConsumptionActivePower");
+		final var productionPredictor = new DummyPredictor24Hours(PREDICTOR_ID, cm, productionPrediction,
+				"_sum/ProductionActivePower");
+		final var consumptionPredictor = new DummyPredictor24Hours(PREDICTOR_ID, cm, consumptionPrediction,
+				"_sum/ConsumptionActivePower");
 
 		// PredictorManager
-		final var predictorManager = new DummyPredictorManager(productionPredictor,
-				consumptionPredictor);
+		final var predictorManager = new DummyPredictorManager(productionPredictor, consumptionPredictor);
 
 		// Price provider
-		final var timeOfUseTariffProvider = DummyTimeOfUseTariffProvider
-				.fromHourlyPrices(ZonedDateTime.now(clock), DEFAULT_HOURLY_PRICES);
+		final var timeOfUseTariffProvider = DummyTimeOfUseTariffProvider.fromHourlyPrices(ZonedDateTime.now(clock),
+				DEFAULT_HOURLY_PRICES);
 
 		// Printing
 		// System.out.println("Time: " + clock);
@@ -310,18 +306,17 @@ public void executesAfterMidnight() throws Exception {
 		final var consumptionPrediction = new DummyPrediction24Hours(DEFAULT_CONSUMPTION_PREDICTION);
 
 		// Predictors
-		final var productionPredictor = new DummyPredictor24Hours(PREDICTOR_ID, cm,
-				productionPrediction, "_sum/ProductionActivePower");
-		final var consumptionPredictor = new DummyPredictor24Hours(PREDICTOR_ID, cm,
-				consumptionPrediction, "_sum/ConsumptionActivePower");
+		final var productionPredictor = new DummyPredictor24Hours(PREDICTOR_ID, cm, productionPrediction,
+				"_sum/ProductionActivePower");
+		final var consumptionPredictor = new DummyPredictor24Hours(PREDICTOR_ID, cm, consumptionPrediction,
+				"_sum/ConsumptionActivePower");
 
 		// PredictorManager
-		final var predictorManager = new DummyPredictorManager(productionPredictor,
-				consumptionPredictor);
+		final var predictorManager = new DummyPredictorManager(productionPredictor, consumptionPredictor);
 
 		// Price provider
-		final var timeOfUseTariffProvider = DummyTimeOfUseTariffProvider
-				.fromHourlyPrices(ZonedDateTime.now(clock), DEFAULT_HOURLY_PRICES);
+		final var timeOfUseTariffProvider = DummyTimeOfUseTariffProvider.fromHourlyPrices(ZonedDateTime.now(clock),
+				DEFAULT_HOURLY_PRICES);
 
 		// Printing
 		// System.out.println("Time: " + clock);
diff --git a/io.openems.edge.controller.io.heatpump.sgready/test/io/openems/edge/controller/io/heatpump/sgready/MyControllerTest.java b/io.openems.edge.controller.io.heatpump.sgready/test/io/openems/edge/controller/io/heatpump/sgready/MyControllerTest.java
index 3e88518a7d2..a1a99b343e8 100644
--- a/io.openems.edge.controller.io.heatpump.sgready/test/io/openems/edge/controller/io/heatpump/sgready/MyControllerTest.java
+++ b/io.openems.edge.controller.io.heatpump.sgready/test/io/openems/edge/controller/io/heatpump/sgready/MyControllerTest.java
@@ -34,8 +34,8 @@ public class MyControllerTest {
 	@Test
 	public void manual_undefined_test() throws Exception {
 
-		final var clock = new TimeLeapClock(
-				Instant.ofEpochSecond(1577836800) /* starts at 1. January 2020 00:00:00 */, ZoneOffset.UTC);
+		final var clock = new TimeLeapClock(Instant.ofEpochSecond(1577836800) /* starts at 1. January 2020 00:00:00 */,
+				ZoneOffset.UTC);
 
 		new ControllerTest(new HeatPumpImpl()) //
 				.addReference("componentManager", new DummyComponentManager(clock)) //
@@ -57,8 +57,8 @@ public void manual_undefined_test() throws Exception {
 	@Test
 	public void manual_regular_test() throws Exception {
 
-		final var clock = new TimeLeapClock(
-				Instant.ofEpochSecond(1577836800) /* starts at 1. January 2020 00:00:00 */, ZoneOffset.UTC);
+		final var clock = new TimeLeapClock(Instant.ofEpochSecond(1577836800) /* starts at 1. January 2020 00:00:00 */,
+				ZoneOffset.UTC);
 
 		new ControllerTest(new HeatPumpImpl()) //
 				.addReference("componentManager", new DummyComponentManager(clock)) //
@@ -80,8 +80,8 @@ public void manual_regular_test() throws Exception {
 	@Test
 	public void manual_recommendation_test() throws Exception {
 
-		final var clock = new TimeLeapClock(
-				Instant.ofEpochSecond(1577836800) /* starts at 1. January 2020 00:00:00 */, ZoneOffset.UTC);
+		final var clock = new TimeLeapClock(Instant.ofEpochSecond(1577836800) /* starts at 1. January 2020 00:00:00 */,
+				ZoneOffset.UTC);
 
 		new ControllerTest(new HeatPumpImpl()) //
 				.addReference("componentManager", new DummyComponentManager(clock)) //
@@ -103,8 +103,8 @@ public void manual_recommendation_test() throws Exception {
 	@Test
 	public void manual_force_on_test() throws Exception {
 
-		final var clock = new TimeLeapClock(
-				Instant.ofEpochSecond(1577836800) /* starts at 1. January 2020 00:00:00 */, ZoneOffset.UTC);
+		final var clock = new TimeLeapClock(Instant.ofEpochSecond(1577836800) /* starts at 1. January 2020 00:00:00 */,
+				ZoneOffset.UTC);
 
 		new ControllerTest(new HeatPumpImpl()) //
 				.addReference("componentManager", new DummyComponentManager(clock)) //
@@ -126,8 +126,8 @@ public void manual_force_on_test() throws Exception {
 	@Test
 	public void manual_lock_test() throws Exception {
 
-		final var clock = new TimeLeapClock(
-				Instant.ofEpochSecond(1577836800) /* starts at 1. January 2020 00:00:00 */, ZoneOffset.UTC);
+		final var clock = new TimeLeapClock(Instant.ofEpochSecond(1577836800) /* starts at 1. January 2020 00:00:00 */,
+				ZoneOffset.UTC);
 
 		new ControllerTest(new HeatPumpImpl()) //
 				.addReference("componentManager", new DummyComponentManager(clock)) //
@@ -149,8 +149,8 @@ public void manual_lock_test() throws Exception {
 	@Test
 	public void automatic_regular_test() throws Exception {
 
-		final var clock = new TimeLeapClock(
-				Instant.ofEpochSecond(1577836800) /* starts at 1. January 2020 00:00:00 */, ZoneOffset.UTC);
+		final var clock = new TimeLeapClock(Instant.ofEpochSecond(1577836800) /* starts at 1. January 2020 00:00:00 */,
+				ZoneOffset.UTC);
 
 		new ControllerTest(new HeatPumpImpl()) //
 				.addReference("componentManager", new DummyComponentManager(clock)) //
@@ -174,8 +174,8 @@ public void automatic_regular_test() throws Exception {
 	@Test
 	public void automatic_normal_config_test() throws Exception {
 
-		final var clock = new TimeLeapClock(
-				Instant.ofEpochSecond(1577836800) /* starts at 1. January 2020 00:00:00 */, ZoneOffset.UTC);
+		final var clock = new TimeLeapClock(Instant.ofEpochSecond(1577836800) /* starts at 1. January 2020 00:00:00 */,
+				ZoneOffset.UTC);
 
 		new ControllerTest(new HeatPumpImpl()) //
 				.addReference("componentManager", new DummyComponentManager(clock)) //
@@ -236,8 +236,8 @@ public void automatic_normal_config_test() throws Exception {
 	@Test
 	public void automatic_switching_time_test() throws Exception {
 
-		final var clock = new TimeLeapClock(
-				Instant.ofEpochSecond(1577836800) /* starts at 1. January 2020 00:00:00 */, ZoneOffset.UTC);
+		final var clock = new TimeLeapClock(Instant.ofEpochSecond(1577836800) /* starts at 1. January 2020 00:00:00 */,
+				ZoneOffset.UTC);
 
 		new ControllerTest(new HeatPumpImpl()) //
 				.addReference("componentManager", new DummyComponentManager(clock)) //
diff --git a/io.openems.edge.controller.symmetric.balancingschedule/test/io/openems/edge/controller/symmetric/balancingschedule/BalancingScheduleImplTest.java b/io.openems.edge.controller.symmetric.balancingschedule/test/io/openems/edge/controller/symmetric/balancingschedule/BalancingScheduleImplTest.java
index 9dcfb402dbd..56732716788 100644
--- a/io.openems.edge.controller.symmetric.balancingschedule/test/io/openems/edge/controller/symmetric/balancingschedule/BalancingScheduleImplTest.java
+++ b/io.openems.edge.controller.symmetric.balancingschedule/test/io/openems/edge/controller/symmetric/balancingschedule/BalancingScheduleImplTest.java
@@ -37,8 +37,8 @@ public class BalancingScheduleImplTest {
 	@Test
 	public void test() throws Exception {
 		final var start = 1577836800L;
-		final var clock = new TimeLeapClock(
-				Instant.ofEpochSecond(start) /* starts at 1. January 2020 00:00:00 */, ZoneOffset.UTC);
+		final var clock = new TimeLeapClock(Instant.ofEpochSecond(start) /* starts at 1. January 2020 00:00:00 */,
+				ZoneOffset.UTC);
 		new ControllerTest(new BalancingScheduleImpl()) //
 				.addReference("cm", new DummyConfigurationAdmin()) //
 				.addReference("componentManager", new DummyComponentManager(clock)) //
diff --git a/io.openems.edge.core/src/io/openems/edge/core/componentmanager/DefaultConfigurationWorker.java b/io.openems.edge.core/src/io/openems/edge/core/componentmanager/DefaultConfigurationWorker.java
index 20e855f850f..3131bc5fc76 100644
--- a/io.openems.edge.core/src/io/openems/edge/core/componentmanager/DefaultConfigurationWorker.java
+++ b/io.openems.edge.core/src/io/openems/edge/core/componentmanager/DefaultConfigurationWorker.java
@@ -180,8 +180,8 @@ protected void createConfiguration(AtomicBoolean defaultConfigurationFailed, Str
 					"Creating Component configuration [" + factoryPid + "]: " + properties.stream() //
 							.map(p -> p.getName() + ":" + p.getValue().toString()) //
 							.collect(Collectors.joining(", ")));
-			var response = this.parent.handleCreateComponentConfigRequest(
-					null /* no user */, new CreateComponentConfigRequest(factoryPid, properties));
+			var response = this.parent.handleCreateComponentConfigRequest(null /* no user */,
+					new CreateComponentConfigRequest(factoryPid, properties));
 			response.get(60, TimeUnit.SECONDS);
 
 		} catch (OpenemsNamedException | InterruptedException | ExecutionException | TimeoutException e) {
@@ -208,8 +208,8 @@ protected void updateConfiguration(AtomicBoolean defaultConfigurationFailed, Str
 							.map(p -> p.getName() + ":" + p.getValue().toString()) //
 							.collect(Collectors.joining(", ")));
 
-			var response = this.parent.handleUpdateComponentConfigRequest(
-					null /* no user */, new UpdateComponentConfigRequest(componentId, properties));
+			var response = this.parent.handleUpdateComponentConfigRequest(null /* no user */,
+					new UpdateComponentConfigRequest(componentId, properties));
 			response.get(60, TimeUnit.SECONDS);
 
 		} catch (OpenemsNamedException | InterruptedException | ExecutionException | TimeoutException e) {
@@ -231,8 +231,8 @@ protected void deleteConfiguration(AtomicBoolean defaultConfigurationFailed, Str
 		try {
 			this.parent.logInfo(this.log, "Deleting Component [" + componentId + "]");
 
-			var response = this.parent.handleDeleteComponentConfigRequest(
-					null /* no user */, new DeleteComponentConfigRequest(componentId));
+			var response = this.parent.handleDeleteComponentConfigRequest(null /* no user */,
+					new DeleteComponentConfigRequest(componentId));
 			response.get(60, TimeUnit.SECONDS);
 
 		} catch (OpenemsNamedException | InterruptedException | ExecutionException | TimeoutException e) {
diff --git a/io.openems.edge.core/src/io/openems/edge/core/componentmanager/EdgeConfigWorker.java b/io.openems.edge.core/src/io/openems/edge/core/componentmanager/EdgeConfigWorker.java
index e721b47e38b..37b98945e6b 100644
--- a/io.openems.edge.core/src/io/openems/edge/core/componentmanager/EdgeConfigWorker.java
+++ b/io.openems.edge.core/src/io/openems/edge/core/componentmanager/EdgeConfigWorker.java
@@ -284,8 +284,7 @@ private boolean readConfigurations(EdgeConfig result, String filter) {
 					}
 					var factory = result.getFactories().get(factoryPid);
 					if (factory != null) {
-						var defaultValue = JsonUtils
-								.getAsOptionalString(factory.getPropertyDefaultValue("id"));
+						var defaultValue = JsonUtils.getAsOptionalString(factory.getPropertyDefaultValue("id"));
 						if (defaultValue.isPresent()) {
 							componentId = defaultValue.get();
 						}
@@ -392,8 +391,7 @@ private void readComponent(EdgeConfig result, OpenemsComponent component) {
 			}
 
 			// Update existing Channels
-			var resultChannels = resultComponent.get()
-					.getChannels();
+			var resultChannels = resultComponent.get().getChannels();
 			for (Entry<String, io.openems.common.types.EdgeConfig.Component.Channel> channel : channels.entrySet()) {
 				if (!resultChannels.containsKey(channel.getKey())) {
 					resultChannels.put(channel.getKey(), channel.getValue());
@@ -482,8 +480,7 @@ private void readFactories(EdgeConfig result) {
 	private String[] getNatures(Bundle bundle, Manifest manifest, String factoryPid) {
 		try {
 			// get "Service-Component"-Entry of Manifest
-			var serviceComponentsString = manifest.getMainAttributes()
-					.getValue(ComponentConstants.SERVICE_COMPONENT);
+			var serviceComponentsString = manifest.getMainAttributes().getValue(ComponentConstants.SERVICE_COMPONENT);
 			if (serviceComponentsString == null) {
 				return new String[0];
 			}
diff --git a/io.openems.edge.core/src/io/openems/edge/core/host/OperatingSystemDebianSystemd.java b/io.openems.edge.core/src/io/openems/edge/core/host/OperatingSystemDebianSystemd.java
index 2a5f45eec29..42aea93323d 100644
--- a/io.openems.edge.core/src/io/openems/edge/core/host/OperatingSystemDebianSystemd.java
+++ b/io.openems.edge.core/src/io/openems/edge/core/host/OperatingSystemDebianSystemd.java
@@ -377,14 +377,11 @@ protected static <A> NetworkInterface<A> parseSystemdNetworkdConfigurationFile(L
 			throws OpenemsNamedException {
 		var currentBlock = Block.UNDEFINED;
 		final var name = new AtomicReference<String>();
-		final var dhcp = new AtomicReference<ConfigurationProperty<Boolean>>(
-				ConfigurationProperty.asNotSet());
+		final var dhcp = new AtomicReference<ConfigurationProperty<Boolean>>(ConfigurationProperty.asNotSet());
 		final var linkLocalAddressing = new AtomicReference<ConfigurationProperty<Boolean>>(
 				ConfigurationProperty.asNotSet());
-		final var gateway = new AtomicReference<ConfigurationProperty<Inet4Address>>(
-				ConfigurationProperty.asNotSet());
-		final var dns = new AtomicReference<ConfigurationProperty<Inet4Address>>(
-				ConfigurationProperty.asNotSet());
+		final var gateway = new AtomicReference<ConfigurationProperty<Inet4Address>>(ConfigurationProperty.asNotSet());
+		final var dns = new AtomicReference<ConfigurationProperty<Inet4Address>>(ConfigurationProperty.asNotSet());
 		final var addresses = new AtomicReference<ConfigurationProperty<Set<Inet4AddressWithNetmask>>>(
 				ConfigurationProperty.asNotSet());
 
diff --git a/io.openems.edge.core/src/io/openems/edge/core/host/SystemUpdateHandler.java b/io.openems.edge.core/src/io/openems/edge/core/host/SystemUpdateHandler.java
index f539dc7fb29..81f72d85bd8 100644
--- a/io.openems.edge.core/src/io/openems/edge/core/host/SystemUpdateHandler.java
+++ b/io.openems.edge.core/src/io/openems/edge/core/host/SystemUpdateHandler.java
@@ -147,8 +147,7 @@ protected CompletableFuture<JsonrpcResponseSuccess> handleExecuteSystemUpdateReq
 
 		var result = new CompletableFuture<JsonrpcResponseSuccess>();
 		this.executor.execute(() -> {
-			var response = GetSystemUpdateStateResponse.isRunning(request.getId(),
-					this.updateState);
+			var response = GetSystemUpdateStateResponse.isRunning(request.getId(), this.updateState);
 			try {
 				this.executeUpdate(result);
 				this.updateState.setPercentCompleted(100);
@@ -197,8 +196,7 @@ private void executeUpdate(CompletableFuture<JsonrpcResponseSuccess> result) thr
 				}
 				{
 					this.updateState.addLog("# Executing 'apt-get install at'");
-					var response = this.executeSystemCommand("apt-get -y install at", 3600)
-							.get();
+					var response = this.executeSystemCommand("apt-get -y install at", 3600).get();
 					this.updateState.addLog("'apt-get install at'", response);
 					if (response.getExitCode() != 0) {
 						throw new Exception("'apt-get install at' failed");
diff --git a/io.openems.edge.ess.fenecon.commercial40/src/io/openems/edge/ess/fenecon/commercial40/SurplusFeedInHandler.java b/io.openems.edge.ess.fenecon.commercial40/src/io/openems/edge/ess/fenecon/commercial40/SurplusFeedInHandler.java
index 76b29b50ea6..1b57acdb306 100644
--- a/io.openems.edge.ess.fenecon.commercial40/src/io/openems/edge/ess/fenecon/commercial40/SurplusFeedInHandler.java
+++ b/io.openems.edge.ess.fenecon.commercial40/src/io/openems/edge/ess/fenecon/commercial40/SurplusFeedInHandler.java
@@ -83,8 +83,7 @@ protected Integer run(List<EssDcChargerFeneconCommercial40> chargers, Config con
 					.toMinutes();
 			// slowly reduce the surplus-feed-in-power from 100 to 0 %
 			var pvPower = this.getPvPower(chargers);
-			var factor = DoubleUtils.normalize(goingDeactivatedSinceMinutes, 0, GOING_DEACTIVATED_MINUTES, 0, 1,
-					true);
+			var factor = DoubleUtils.normalize(goingDeactivatedSinceMinutes, 0, GOING_DEACTIVATED_MINUTES, 0, 1, true);
 			var power = Math.max((int) ((pvPower + this.getIncreasePower(config, pvPower)) * factor),
 					this.getIncreasePower(config, pvPower));
 			if (goingDeactivatedSinceMinutes > GOING_DEACTIVATED_MINUTES) {
diff --git a/io.openems.edge.ess.mr.gridcon/src/io/openems/edge/ess/mr/gridcon/WeightingHelper.java b/io.openems.edge.ess.mr.gridcon/src/io/openems/edge/ess/mr/gridcon/WeightingHelper.java
index 2ba2ef8e64d..fda119cd60d 100644
--- a/io.openems.edge.ess.mr.gridcon/src/io/openems/edge/ess/mr/gridcon/WeightingHelper.java
+++ b/io.openems.edge.ess.mr.gridcon/src/io/openems/edge/ess/mr/gridcon/WeightingHelper.java
@@ -5,7 +5,8 @@
 public class WeightingHelper {
 
 	/**
-	 * Calculates the weighting for Gridcon depending on connected batteries and given active power.
+	 * Calculates the weighting for Gridcon depending on connected batteries and
+	 * given active power.
 	 * 
 	 * @param activePower
 	 * @param b1
diff --git a/io.openems.edge.ess.mr.gridcon/src/io/openems/edge/ess/mr/gridcon/state/gridconstate/BaseState.java b/io.openems.edge.ess.mr.gridcon/src/io/openems/edge/ess/mr/gridcon/state/gridconstate/BaseState.java
index caddac52cd2..2c85e9d9b29 100644
--- a/io.openems.edge.ess.mr.gridcon/src/io/openems/edge/ess/mr/gridcon/state/gridconstate/BaseState.java
+++ b/io.openems.edge.ess.mr.gridcon/src/io/openems/edge/ess/mr/gridcon/state/gridconstate/BaseState.java
@@ -104,7 +104,8 @@ protected void startBatteries() {
 				try {
 					this.getBattery1().start();
 				} catch (OpenemsNamedException e) {
-					System.out.println("Was not able to start battery " + this.getBattery1().id() + "!\n" + e.getMessage());
+					System.out.println(
+							"Was not able to start battery " + this.getBattery1().id() + "!\n" + e.getMessage());
 				}
 			}
 		}
@@ -113,7 +114,8 @@ protected void startBatteries() {
 				try {
 					this.getBattery2().start();
 				} catch (OpenemsNamedException e) {
-					System.out.println("Was not able to start battery " + this.getBattery2().id() + "!\n" + e.getMessage());
+					System.out.println(
+							"Was not able to start battery " + this.getBattery2().id() + "!\n" + e.getMessage());
 				}
 			}
 		}
@@ -122,7 +124,8 @@ protected void startBatteries() {
 				try {
 					this.getBattery3().start();
 				} catch (OpenemsNamedException e) {
-					System.out.println("Was not able to start battery " + this.getBattery3().id() + "!\n" + e.getMessage());
+					System.out.println(
+							"Was not able to start battery " + this.getBattery3().id() + "!\n" + e.getMessage());
 				}
 			}
 		}
diff --git a/io.openems.edge.ess.mr.gridcon/src/io/openems/edge/ess/mr/gridcon/state/gridconstate/GridconStateObject.java b/io.openems.edge.ess.mr.gridcon/src/io/openems/edge/ess/mr/gridcon/state/gridconstate/GridconStateObject.java
index e71f36744b6..7e8dc849f77 100644
--- a/io.openems.edge.ess.mr.gridcon/src/io/openems/edge/ess/mr/gridcon/state/gridconstate/GridconStateObject.java
+++ b/io.openems.edge.ess.mr.gridcon/src/io/openems/edge/ess/mr/gridcon/state/gridconstate/GridconStateObject.java
@@ -24,8 +24,7 @@ public interface GridconStateObject {
 	 * in this method everything should be executed what there is to do in this
 	 * state.
 	 * 
-	 * @param GridconSettings
-	 * * @throws OpenemsNamedException
+	 * @param GridconSettings * @throws OpenemsNamedException
 	 */
 	void act(GridconSettings gridconSettings) throws OpenemsNamedException;
 
diff --git a/io.openems.edge.ess.mr.gridcon/src/io/openems/edge/ess/mr/gridcon/state/gridconstate/Run.java b/io.openems.edge.ess.mr.gridcon/src/io/openems/edge/ess/mr/gridcon/state/gridconstate/Run.java
index 3b91d0eb96e..2ba6e9b5526 100644
--- a/io.openems.edge.ess.mr.gridcon/src/io/openems/edge/ess/mr/gridcon/state/gridconstate/Run.java
+++ b/io.openems.edge.ess.mr.gridcon/src/io/openems/edge/ess/mr/gridcon/state/gridconstate/Run.java
@@ -82,7 +82,8 @@ private void checkBatteries() {
 				try {
 					this.getBattery1().start();
 				} catch (OpenemsNamedException e) {
-					System.out.println("Was not able to start battery " + this.getBattery1().id() + "!\n" + e.getMessage());
+					System.out.println(
+							"Was not able to start battery " + this.getBattery1().id() + "!\n" + e.getMessage());
 				}
 			}
 		}
@@ -91,7 +92,8 @@ private void checkBatteries() {
 				try {
 					this.getBattery2().start();
 				} catch (OpenemsNamedException e) {
-					System.out.println("Was not able to start battery " + this.getBattery2().id() + "!\n" + e.getMessage());
+					System.out.println(
+							"Was not able to start battery " + this.getBattery2().id() + "!\n" + e.getMessage());
 				}
 			}
 		}
@@ -100,7 +102,8 @@ private void checkBatteries() {
 				try {
 					this.getBattery3().start();
 				} catch (OpenemsNamedException e) {
-					System.out.println("Was not able to start battery " + this.getBattery3().id() + "!\n" + e.getMessage());
+					System.out.println(
+							"Was not able to start battery " + this.getBattery3().id() + "!\n" + e.getMessage());
 				}
 			}
 		}
diff --git a/io.openems.edge.ess.mr.gridcon/test/io/openems/edge/ess/mr/gridcon/ongrid/state/TestUndefined.java b/io.openems.edge.ess.mr.gridcon/test/io/openems/edge/ess/mr/gridcon/ongrid/state/TestUndefined.java
index cec55dce52b..c677d38f22c 100644
--- a/io.openems.edge.ess.mr.gridcon/test/io/openems/edge/ess/mr/gridcon/ongrid/state/TestUndefined.java
+++ b/io.openems.edge.ess.mr.gridcon/test/io/openems/edge/ess/mr/gridcon/ongrid/state/TestUndefined.java
@@ -37,7 +37,7 @@ public final void testGetStateUndefined() {
 	public final void testGetNextState() {
 		// without changes next state should be Undefined
 		assertEquals(GridconState.UNDEFINED, sut.getNextState());
-		
+
 	}
 
 	@Test
diff --git a/io.openems.edge.evcs.ocpp.abl/src/io/openems/edge/evcs/ocpp/abl/Abl.java b/io.openems.edge.evcs.ocpp.abl/src/io/openems/edge/evcs/ocpp/abl/Abl.java
index 819477d911f..8a851c075e0 100644
--- a/io.openems.edge.evcs.ocpp.abl/src/io/openems/edge/evcs/ocpp/abl/Abl.java
+++ b/io.openems.edge.evcs.ocpp.abl/src/io/openems/edge/evcs/ocpp/abl/Abl.java
@@ -148,8 +148,7 @@ public OcppStandardRequests getStandardRequests() {
 	public List<Request> getRequiredRequestsAfterConnection() {
 		List<Request> requests = new ArrayList<>();
 
-		var setMeterValueSampleInterval = new ChangeConfigurationRequest(
-				"MeterValueSampleInterval", "10");
+		var setMeterValueSampleInterval = new ChangeConfigurationRequest("MeterValueSampleInterval", "10");
 		requests.add(setMeterValueSampleInterval);
 
 		var setMeterValueSampledData = new ChangeConfigurationRequest("MeterValuesSampledData",
diff --git a/io.openems.edge.evcs.ocpp.ies.keywatt.singleccs/src/io/openems/edge/evcs/ocpp/ies/keywatt/singleccs/IesKeywattSingleCcs.java b/io.openems.edge.evcs.ocpp.ies.keywatt.singleccs/src/io/openems/edge/evcs/ocpp/ies/keywatt/singleccs/IesKeywattSingleCcs.java
index 13dc07bf3a4..ddd2ac589e0 100644
--- a/io.openems.edge.evcs.ocpp.ies.keywatt.singleccs/src/io/openems/edge/evcs/ocpp/ies/keywatt/singleccs/IesKeywattSingleCcs.java
+++ b/io.openems.edge.evcs.ocpp.ies.keywatt.singleccs/src/io/openems/edge/evcs/ocpp/ies/keywatt/singleccs/IesKeywattSingleCcs.java
@@ -125,8 +125,7 @@ public List<Request> getRequiredRequestsAfterConnection() {
 
 		var requests = new ArrayList<Request>();
 
-		var setMeterValueSampleInterval = new ChangeConfigurationRequest(
-				"MeterValueSampleInterval", "10");
+		var setMeterValueSampleInterval = new ChangeConfigurationRequest("MeterValueSampleInterval", "10");
 		requests.add(setMeterValueSampleInterval);
 
 		var requestStatus = new TriggerMessageRequest(TriggerMessageRequestType.StatusNotification);
diff --git a/io.openems.edge.evcs.ocpp.server/src/io/openems/edge/evcs/ocpp/server/MyJsonServer.java b/io.openems.edge.evcs.ocpp.server/src/io/openems/edge/evcs/ocpp/server/MyJsonServer.java
index ad9fb79d60f..3cbfa9a7ff5 100644
--- a/io.openems.edge.evcs.ocpp.server/src/io/openems/edge/evcs/ocpp/server/MyJsonServer.java
+++ b/io.openems.edge.evcs.ocpp.server/src/io/openems/edge/evcs/ocpp/server/MyJsonServer.java
@@ -105,8 +105,8 @@ public void newSession(UUID sessionIndex, SessionInformation information) {
 			public void lostSession(UUID sessionIndex) {
 				MyJsonServer.this.logDebug("Session " + sessionIndex + " lost connection");
 
-				var sessionEvcss = MyJsonServer.this.parent.activeEvcsSessions
-						.getOrDefault(sessionIndex, new ArrayList<>());
+				var sessionEvcss = MyJsonServer.this.parent.activeEvcsSessions.getOrDefault(sessionIndex,
+						new ArrayList<>());
 
 				if (sessionEvcss != null) {
 					for (AbstractOcppEvcsComponent ocppEvcs : sessionEvcss) {
@@ -174,8 +174,8 @@ public void sendDefault(UUID session, Request request) {
 	 */
 	protected void sendInitialRequests(UUID sessionIndex, AbstractOcppEvcsComponent ocppEvcs) {
 		// Setting the Evcss of this session id to available
-		var changeAvailabilityRequest = new ChangeAvailabilityRequest(
-				ocppEvcs.getConfiguredConnectorId(), AvailabilityType.Operative);
+		var changeAvailabilityRequest = new ChangeAvailabilityRequest(ocppEvcs.getConfiguredConnectorId(),
+				AvailabilityType.Operative);
 		this.sendDefault(sessionIndex, changeAvailabilityRequest);
 
 		// Sending all required requests defined for each EVCS
@@ -211,8 +211,7 @@ private HashMap<String, String> getConfiguration(UUID sessionIndex) {
 		try {
 			var resp = this.send(sessionIndex, request);
 
-			var get = (GetConfigurationConfirmation) resp.toCompletableFuture().get(2,
-					TimeUnit.SECONDS);
+			var get = (GetConfigurationConfirmation) resp.toCompletableFuture().get(2, TimeUnit.SECONDS);
 			var das = get.getConfigurationKey();
 			for (KeyValueType element : das) {
 				hash.put(element.getKey(), element.getValue());
diff --git a/io.openems.edge.goodwe/src/io/openems/edge/goodwe/common/AbstractGoodWe.java b/io.openems.edge.goodwe/src/io/openems/edge/goodwe/common/AbstractGoodWe.java
index c2d19b946fb..534f2485b42 100644
--- a/io.openems.edge.goodwe/src/io/openems/edge/goodwe/common/AbstractGoodWe.java
+++ b/io.openems.edge.goodwe/src/io/openems/edge/goodwe/common/AbstractGoodWe.java
@@ -83,68 +83,65 @@ protected final ModbusProtocol defineModbusProtocol() throws OpenemsException {
 						m(SymmetricEss.ChannelId.MAX_APPARENT_POWER, new UnsignedWordElement(35001)), //
 						new DummyRegisterElement(35002), //
 						m(GoodWe.ChannelId.SERIAL_NUMBER, new StringWordElement(35003, 8)), //
-						m(GoodWe.ChannelId.GOODWE_TYPE, new StringWordElement(35011, 5),
-								new ElementToChannelConverter(
-										// element -> channel
-										value -> {
-											// Evaluate GoodweType
-											final GoodweType result;
-											if (value == null) {
-												result = GoodweType.UNDEFINED;
-											} else {
-												String stringValue = TypeUtils.<String>getAsType(OpenemsType.STRING,
-														value);
-												switch (stringValue) {
-												// TODO add identification for FENECON branded inverter
-												case "GW10K-BT":
-													result = GoodweType.GOODWE_10K_BT;
-													break;
-												case "GW8K-BT":
-													result = GoodweType.GOODWE_8K_BT;
-													break;
-												case "GW5K-BT":
-													result = GoodweType.GOODWE_5K_BT;
-													break;
-												case "GW10K-ET":
-													result = GoodweType.GOODWE_10K_ET;
-													break;
-												case "GW8K-ET":
-													result = GoodweType.GOODWE_8K_ET;
-													break;
-												case "GW5K-ET":
-													result = GoodweType.GOODWE_5K_ET;
-													break;
-												case "FHI-10-DAH":
-													result = GoodweType.FENECON_FHI_10_DAH;
-													break;
-												default:
-													this.logInfo(this.log,
-															"Unable to identify GoodWe by name [" + value + "]");
-													result = GoodweType.UNDEFINED;
-													break;
-												}
-											}
-											// Log on first occurrence
-											if (result != this.getGoodweType()) {
-												switch (result) {
-												case GOODWE_10K_BT:
-												case GOODWE_8K_BT:
-												case GOODWE_5K_BT:
-												case GOODWE_10K_ET:
-												case GOODWE_8K_ET:
-												case GOODWE_5K_ET:
-												case FENECON_FHI_10_DAH:
-													this.logInfo(this.log, "Identified " + result.getName());
-													break;
-												case UNDEFINED:
-													break;
-												}
-											}
-											return result;
-										}, //
-
-										// channel -> element
-										value -> value))
+						m(GoodWe.ChannelId.GOODWE_TYPE, new StringWordElement(35011, 5), new ElementToChannelConverter(
+								// element -> channel
+								value -> {
+									// Evaluate GoodweType
+									final GoodweType result;
+									if (value == null) {
+										result = GoodweType.UNDEFINED;
+									} else {
+										String stringValue = TypeUtils.<String>getAsType(OpenemsType.STRING, value);
+										switch (stringValue) {
+										// TODO add identification for FENECON branded inverter
+										case "GW10K-BT":
+											result = GoodweType.GOODWE_10K_BT;
+											break;
+										case "GW8K-BT":
+											result = GoodweType.GOODWE_8K_BT;
+											break;
+										case "GW5K-BT":
+											result = GoodweType.GOODWE_5K_BT;
+											break;
+										case "GW10K-ET":
+											result = GoodweType.GOODWE_10K_ET;
+											break;
+										case "GW8K-ET":
+											result = GoodweType.GOODWE_8K_ET;
+											break;
+										case "GW5K-ET":
+											result = GoodweType.GOODWE_5K_ET;
+											break;
+										case "FHI-10-DAH":
+											result = GoodweType.FENECON_FHI_10_DAH;
+											break;
+										default:
+											this.logInfo(this.log, "Unable to identify GoodWe by name [" + value + "]");
+											result = GoodweType.UNDEFINED;
+											break;
+										}
+									}
+									// Log on first occurrence
+									if (result != this.getGoodweType()) {
+										switch (result) {
+										case GOODWE_10K_BT:
+										case GOODWE_8K_BT:
+										case GOODWE_5K_BT:
+										case GOODWE_10K_ET:
+										case GOODWE_8K_ET:
+										case GOODWE_5K_ET:
+										case FENECON_FHI_10_DAH:
+											this.logInfo(this.log, "Identified " + result.getName());
+											break;
+										case UNDEFINED:
+											break;
+										}
+									}
+									return result;
+								}, //
+
+								// channel -> element
+								value -> value))
 
 				), //
 
@@ -406,12 +403,9 @@ protected final ModbusProtocol defineModbusProtocol() throws OpenemsException {
 								ElementToChannelConverter.SCALE_FACTOR_MINUS_1), //
 						m(GoodWe.ChannelId.MIN_GRID_VOLTAGE_WITHIN_1_MINUTE_T, new UnsignedWordElement(35275),
 								ElementToChannelConverter.SCALE_FACTOR_MINUS_1), //
-						m(GoodWe.ChannelId.MAX_BACKUP_POWER_WITHIN_1_MINUTE_R,
-								new UnsignedDoublewordElement(35276)), //
-						m(GoodWe.ChannelId.MAX_BACKUP_POWER_WITHIN_1_MINUTE_S,
-								new UnsignedDoublewordElement(35278)), //
-						m(GoodWe.ChannelId.MAX_BACKUP_POWER_WITHIN_1_MINUTE_T,
-								new UnsignedDoublewordElement(35280)), //
+						m(GoodWe.ChannelId.MAX_BACKUP_POWER_WITHIN_1_MINUTE_R, new UnsignedDoublewordElement(35276)), //
+						m(GoodWe.ChannelId.MAX_BACKUP_POWER_WITHIN_1_MINUTE_S, new UnsignedDoublewordElement(35278)), //
+						m(GoodWe.ChannelId.MAX_BACKUP_POWER_WITHIN_1_MINUTE_T, new UnsignedDoublewordElement(35280)), //
 						m(GoodWe.ChannelId.MAX_BACKUP_POWER_WITHIN_1_MINUTE_TOTAL,
 								new UnsignedDoublewordElement(35282)), //
 						m(GoodWe.ChannelId.GRID_HVRT_EVENT_TIMES, new UnsignedWordElement(35284)), //
@@ -596,8 +590,7 @@ protected final ModbusProtocol defineModbusProtocol() throws OpenemsException {
 						m(GoodWe.ChannelId.OFF_GRID_TO_ON_GRID_DELAY, new UnsignedWordElement(45276)), //
 						// If set 80%, when offgrid output voltage less than 230*80%=184V, inverter will
 						// have the error.
-						m(GoodWe.ChannelId.OFF_GRID_UNDER_VOLTAGE_PROTECT_COEFFICIENT,
-								new UnsignedWordElement(45277)), //
+						m(GoodWe.ChannelId.OFF_GRID_UNDER_VOLTAGE_PROTECT_COEFFICIENT, new UnsignedWordElement(45277)), //
 						// When offgrid and the battery SOC is low, PV charge the battery
 						m(GoodWe.ChannelId.BATTERY_MODE_PV_CHARGE_ENABLE, new UnsignedWordElement(45278)), //
 						// Default fisresttt.ing is 1
@@ -978,8 +971,7 @@ protected final ModbusProtocol defineModbusProtocol() throws OpenemsException {
 						m(GoodWe.ChannelId.OFF_GRID_TO_ON_GRID_DELAY, new UnsignedWordElement(45276)), //
 						// If set 80%, when offgrid output voltage less than 230*80%=184V, inverter will
 						// have the error.Default setting is
-						m(GoodWe.ChannelId.OFF_GRID_UNDER_VOLTAGE_PROTECT_COEFFICIENT,
-								new UnsignedWordElement(45277)), //
+						m(GoodWe.ChannelId.OFF_GRID_UNDER_VOLTAGE_PROTECT_COEFFICIENT, new UnsignedWordElement(45277)), //
 						// When offgrid and the battery SOC is low, PV charge the battery
 						m(GoodWe.ChannelId.BATTERY_MODE_PV_CHARGE_ENABLE, new UnsignedWordElement(45278)), //
 						// Default setting 1, [1,20]
@@ -1466,8 +1458,7 @@ private void handleDspVersion7(ModbusProtocol protocol) throws OpenemsException
 								new UnsignedWordElement(47547)), //
 						m(GoodWe.ChannelId.WORK_WEEK_1_END_TIME_ECO_MODE_FOR_ARM_18_AND_GREATER,
 								new UnsignedWordElement(47548)), //
-						m(GoodWe.ChannelId.WORK_WEEK_1_ECO_MODE_FOR_ARM_18_AND_GREATER,
-								new UnsignedWordElement(47549)), //
+						m(GoodWe.ChannelId.WORK_WEEK_1_ECO_MODE_FOR_ARM_18_AND_GREATER, new UnsignedWordElement(47549)), //
 						m(GoodWe.ChannelId.WORK_WEEK_1_PARAMETER1_1_ECO_MODE_FOR_ARM_18_AND_GREATER,
 								new UnsignedWordElement(47550)), //
 						m(GoodWe.ChannelId.WORK_WEEK_1_PARAMETER1_2_ECO_MODE_FOR_ARM_18_AND_GREATER,
@@ -1479,8 +1470,7 @@ private void handleDspVersion7(ModbusProtocol protocol) throws OpenemsException
 								new UnsignedWordElement(47553)), //
 						m(GoodWe.ChannelId.WORK_WEEK_2_END_TIME_ECO_MODE_FOR_ARM_18_AND_GREATER,
 								new UnsignedWordElement(47554)), //
-						m(GoodWe.ChannelId.WORK_WEEK_2_ECO_MODE_FOR_ARM_18_AND_GREATER,
-								new UnsignedWordElement(47555)), //
+						m(GoodWe.ChannelId.WORK_WEEK_2_ECO_MODE_FOR_ARM_18_AND_GREATER, new UnsignedWordElement(47555)), //
 						m(GoodWe.ChannelId.WORK_WEEK_2_PARAMETER2_1_ECO_MODE_FOR_ARM_18_AND_GREATER,
 								new UnsignedWordElement(47556)), //
 						m(GoodWe.ChannelId.WORK_WEEK_2_PARAMETER2_2_ECO_MODE_FOR_ARM_18_AND_GREATER,
@@ -1492,8 +1482,7 @@ private void handleDspVersion7(ModbusProtocol protocol) throws OpenemsException
 								new UnsignedWordElement(47559)), //
 						m(GoodWe.ChannelId.WORK_WEEK_3_END_TIME_ECO_MODE_FOR_ARM_18_AND_GREATER,
 								new UnsignedWordElement(47560)), //
-						m(GoodWe.ChannelId.WORK_WEEK_3_ECO_MODE_FOR_ARM_18_AND_GREATER,
-								new UnsignedWordElement(47561)), //
+						m(GoodWe.ChannelId.WORK_WEEK_3_ECO_MODE_FOR_ARM_18_AND_GREATER, new UnsignedWordElement(47561)), //
 						m(GoodWe.ChannelId.WORK_WEEK_3_PARAMETER3_1_ECO_MODE_FOR_ARM_18_AND_GREATER,
 								new UnsignedWordElement(47562)), //
 						m(GoodWe.ChannelId.WORK_WEEK_3_PARAMETER3_2_ECO_MODE_FOR_ARM_18_AND_GREATER,
@@ -1505,8 +1494,7 @@ private void handleDspVersion7(ModbusProtocol protocol) throws OpenemsException
 								new UnsignedWordElement(47565)), //
 						m(GoodWe.ChannelId.WORK_WEEK_4_END_TIME_ECO_MODE_FOR_ARM_18_AND_GREATER,
 								new UnsignedWordElement(47566)), //
-						m(GoodWe.ChannelId.WORK_WEEK_4_ECO_MODE_FOR_ARM_18_AND_GREATER,
-								new UnsignedWordElement(47567)), //
+						m(GoodWe.ChannelId.WORK_WEEK_4_ECO_MODE_FOR_ARM_18_AND_GREATER, new UnsignedWordElement(47567)), //
 						m(GoodWe.ChannelId.WORK_WEEK_4_PARAMETER4_1_ECO_MODE_FOR_ARM_18_AND_GREATER,
 								new UnsignedWordElement(47568)), //
 						m(GoodWe.ChannelId.WORK_WEEK_4_PARAMETER4_2_ECO_MODE_FOR_ARM_18_AND_GREATER,
@@ -1518,8 +1506,7 @@ private void handleDspVersion7(ModbusProtocol protocol) throws OpenemsException
 								new UnsignedWordElement(47571)), //
 						m(GoodWe.ChannelId.WORK_WEEK_5_END_TIME_ECO_MODE_FOR_ARM_18_AND_GREATER,
 								new UnsignedWordElement(47572)), //
-						m(GoodWe.ChannelId.WORK_WEEK_5_ECO_MODE_FOR_ARM_18_AND_GREATER,
-								new UnsignedWordElement(47573)), //
+						m(GoodWe.ChannelId.WORK_WEEK_5_ECO_MODE_FOR_ARM_18_AND_GREATER, new UnsignedWordElement(47573)), //
 						m(GoodWe.ChannelId.WORK_WEEK_5_PARAMETER5_1_ECO_MODE_FOR_ARM_18_AND_GREATER,
 								new UnsignedWordElement(47574)), //
 						m(GoodWe.ChannelId.WORK_WEEK_5_PARAMETER5_2_ECO_MODE_FOR_ARM_18_AND_GREATER,
@@ -1531,8 +1518,7 @@ private void handleDspVersion7(ModbusProtocol protocol) throws OpenemsException
 								new UnsignedWordElement(47577)), //
 						m(GoodWe.ChannelId.WORK_WEEK_6_END_TIME_ECO_MODE_FOR_ARM_18_AND_GREATER,
 								new UnsignedWordElement(47578)), //
-						m(GoodWe.ChannelId.WORK_WEEK_6_ECO_MODE_FOR_ARM_18_AND_GREATER,
-								new UnsignedWordElement(47579)), //
+						m(GoodWe.ChannelId.WORK_WEEK_6_ECO_MODE_FOR_ARM_18_AND_GREATER, new UnsignedWordElement(47579)), //
 						m(GoodWe.ChannelId.WORK_WEEK_6_PARAMETER6_1_ECO_MODE_FOR_ARM_18_AND_GREATER,
 								new UnsignedWordElement(47580)), //
 						m(GoodWe.ChannelId.WORK_WEEK_6_PARAMETER6_2_ECO_MODE_FOR_ARM_18_AND_GREATER,
@@ -1544,8 +1530,7 @@ private void handleDspVersion7(ModbusProtocol protocol) throws OpenemsException
 								new UnsignedWordElement(47583)), //
 						m(GoodWe.ChannelId.WORK_WEEK_7_END_TIME_ECO_MODE_FOR_ARM_18_AND_GREATER,
 								new UnsignedWordElement(47584)), //
-						m(GoodWe.ChannelId.WORK_WEEK_7_ECO_MODE_FOR_ARM_18_AND_GREATER,
-								new UnsignedWordElement(47585)), //
+						m(GoodWe.ChannelId.WORK_WEEK_7_ECO_MODE_FOR_ARM_18_AND_GREATER, new UnsignedWordElement(47585)), //
 						m(GoodWe.ChannelId.WORK_WEEK_7_PARAMETER7_1_ECO_MODE_FOR_ARM_18_AND_GREATER,
 								new UnsignedWordElement(47586)), //
 						m(GoodWe.ChannelId.WORK_WEEK_7_PARAMETER7_2_ECO_MODE_FOR_ARM_18_AND_GREATER,
@@ -1557,8 +1542,7 @@ private void handleDspVersion7(ModbusProtocol protocol) throws OpenemsException
 								new UnsignedWordElement(47589)), //
 						m(GoodWe.ChannelId.WORK_WEEK_8_END_TIME_ECO_MODE_FOR_ARM_18_AND_GREATER,
 								new UnsignedWordElement(47590)), //
-						m(GoodWe.ChannelId.WORK_WEEK_8_ECO_MODE_FOR_ARM_18_AND_GREATER,
-								new UnsignedWordElement(47591)), //
+						m(GoodWe.ChannelId.WORK_WEEK_8_ECO_MODE_FOR_ARM_18_AND_GREATER, new UnsignedWordElement(47591)), //
 						m(GoodWe.ChannelId.WORK_WEEK_8_PARAMETER8_1_ECO_MODE_FOR_ARM_18_AND_GREATER,
 								new UnsignedWordElement(47592)), //
 						m(GoodWe.ChannelId.WORK_WEEK_8_PARAMETER8_2_ECO_MODE_FOR_ARM_18_AND_GREATER,
@@ -1586,8 +1570,7 @@ private void handleDspVersion7(ModbusProtocol protocol) throws OpenemsException
 								new UnsignedWordElement(47547)), //
 						m(GoodWe.ChannelId.WORK_WEEK_1_END_TIME_ECO_MODE_FOR_ARM_18_AND_GREATER,
 								new UnsignedWordElement(47548)), //
-						m(GoodWe.ChannelId.WORK_WEEK_1_ECO_MODE_FOR_ARM_18_AND_GREATER,
-								new UnsignedWordElement(47549)), //
+						m(GoodWe.ChannelId.WORK_WEEK_1_ECO_MODE_FOR_ARM_18_AND_GREATER, new UnsignedWordElement(47549)), //
 						m(GoodWe.ChannelId.WORK_WEEK_1_PARAMETER1_1_ECO_MODE_FOR_ARM_18_AND_GREATER,
 								new UnsignedWordElement(47550)), //
 						m(GoodWe.ChannelId.WORK_WEEK_1_PARAMETER1_2_ECO_MODE_FOR_ARM_18_AND_GREATER,
@@ -1599,8 +1582,7 @@ private void handleDspVersion7(ModbusProtocol protocol) throws OpenemsException
 								new UnsignedWordElement(47553)), //
 						m(GoodWe.ChannelId.WORK_WEEK_2_END_TIME_ECO_MODE_FOR_ARM_18_AND_GREATER,
 								new UnsignedWordElement(47554)), //
-						m(GoodWe.ChannelId.WORK_WEEK_2_ECO_MODE_FOR_ARM_18_AND_GREATER,
-								new UnsignedWordElement(47555)), //
+						m(GoodWe.ChannelId.WORK_WEEK_2_ECO_MODE_FOR_ARM_18_AND_GREATER, new UnsignedWordElement(47555)), //
 						m(GoodWe.ChannelId.WORK_WEEK_2_PARAMETER2_1_ECO_MODE_FOR_ARM_18_AND_GREATER,
 								new UnsignedWordElement(47556)), //
 						m(GoodWe.ChannelId.WORK_WEEK_2_PARAMETER2_2_ECO_MODE_FOR_ARM_18_AND_GREATER,
@@ -1612,8 +1594,7 @@ private void handleDspVersion7(ModbusProtocol protocol) throws OpenemsException
 								new UnsignedWordElement(47559)), //
 						m(GoodWe.ChannelId.WORK_WEEK_3_END_TIME_ECO_MODE_FOR_ARM_18_AND_GREATER,
 								new UnsignedWordElement(47560)), //
-						m(GoodWe.ChannelId.WORK_WEEK_3_ECO_MODE_FOR_ARM_18_AND_GREATER,
-								new UnsignedWordElement(47561)), //
+						m(GoodWe.ChannelId.WORK_WEEK_3_ECO_MODE_FOR_ARM_18_AND_GREATER, new UnsignedWordElement(47561)), //
 						m(GoodWe.ChannelId.WORK_WEEK_3_PARAMETER3_1_ECO_MODE_FOR_ARM_18_AND_GREATER,
 								new UnsignedWordElement(47562)), //
 						m(GoodWe.ChannelId.WORK_WEEK_3_PARAMETER3_2_ECO_MODE_FOR_ARM_18_AND_GREATER,
@@ -1625,8 +1606,7 @@ private void handleDspVersion7(ModbusProtocol protocol) throws OpenemsException
 								new UnsignedWordElement(47565)), //
 						m(GoodWe.ChannelId.WORK_WEEK_4_END_TIME_ECO_MODE_FOR_ARM_18_AND_GREATER,
 								new UnsignedWordElement(47566)), //
-						m(GoodWe.ChannelId.WORK_WEEK_4_ECO_MODE_FOR_ARM_18_AND_GREATER,
-								new UnsignedWordElement(47567)), //
+						m(GoodWe.ChannelId.WORK_WEEK_4_ECO_MODE_FOR_ARM_18_AND_GREATER, new UnsignedWordElement(47567)), //
 						m(GoodWe.ChannelId.WORK_WEEK_4_PARAMETER4_1_ECO_MODE_FOR_ARM_18_AND_GREATER,
 								new UnsignedWordElement(47568)), //
 						m(GoodWe.ChannelId.WORK_WEEK_4_PARAMETER4_2_ECO_MODE_FOR_ARM_18_AND_GREATER,
@@ -1638,8 +1618,7 @@ private void handleDspVersion7(ModbusProtocol protocol) throws OpenemsException
 								new UnsignedWordElement(47571)), //
 						m(GoodWe.ChannelId.WORK_WEEK_5_END_TIME_ECO_MODE_FOR_ARM_18_AND_GREATER,
 								new UnsignedWordElement(47572)), //
-						m(GoodWe.ChannelId.WORK_WEEK_5_ECO_MODE_FOR_ARM_18_AND_GREATER,
-								new UnsignedWordElement(47573)), //
+						m(GoodWe.ChannelId.WORK_WEEK_5_ECO_MODE_FOR_ARM_18_AND_GREATER, new UnsignedWordElement(47573)), //
 						m(GoodWe.ChannelId.WORK_WEEK_5_PARAMETER5_1_ECO_MODE_FOR_ARM_18_AND_GREATER,
 								new UnsignedWordElement(47574)), //
 						m(GoodWe.ChannelId.WORK_WEEK_5_PARAMETER5_2_ECO_MODE_FOR_ARM_18_AND_GREATER,
@@ -1651,8 +1630,7 @@ private void handleDspVersion7(ModbusProtocol protocol) throws OpenemsException
 								new UnsignedWordElement(47577)), //
 						m(GoodWe.ChannelId.WORK_WEEK_6_END_TIME_ECO_MODE_FOR_ARM_18_AND_GREATER,
 								new UnsignedWordElement(47578)), //
-						m(GoodWe.ChannelId.WORK_WEEK_6_ECO_MODE_FOR_ARM_18_AND_GREATER,
-								new UnsignedWordElement(47579)), //
+						m(GoodWe.ChannelId.WORK_WEEK_6_ECO_MODE_FOR_ARM_18_AND_GREATER, new UnsignedWordElement(47579)), //
 						m(GoodWe.ChannelId.WORK_WEEK_6_PARAMETER6_1_ECO_MODE_FOR_ARM_18_AND_GREATER,
 								new UnsignedWordElement(47580)), //
 						m(GoodWe.ChannelId.WORK_WEEK_6_PARAMETER6_2_ECO_MODE_FOR_ARM_18_AND_GREATER,
@@ -1664,8 +1642,7 @@ private void handleDspVersion7(ModbusProtocol protocol) throws OpenemsException
 								new UnsignedWordElement(47583)), //
 						m(GoodWe.ChannelId.WORK_WEEK_7_END_TIME_ECO_MODE_FOR_ARM_18_AND_GREATER,
 								new UnsignedWordElement(47584)), //
-						m(GoodWe.ChannelId.WORK_WEEK_7_ECO_MODE_FOR_ARM_18_AND_GREATER,
-								new UnsignedWordElement(47585)), //
+						m(GoodWe.ChannelId.WORK_WEEK_7_ECO_MODE_FOR_ARM_18_AND_GREATER, new UnsignedWordElement(47585)), //
 						m(GoodWe.ChannelId.WORK_WEEK_7_PARAMETER7_1_ECO_MODE_FOR_ARM_18_AND_GREATER,
 								new UnsignedWordElement(47586)), //
 						m(GoodWe.ChannelId.WORK_WEEK_7_PARAMETER7_2_ECO_MODE_FOR_ARM_18_AND_GREATER,
@@ -1677,8 +1654,7 @@ private void handleDspVersion7(ModbusProtocol protocol) throws OpenemsException
 								new UnsignedWordElement(47589)), //
 						m(GoodWe.ChannelId.WORK_WEEK_8_END_TIME_ECO_MODE_FOR_ARM_18_AND_GREATER,
 								new UnsignedWordElement(47590)), //
-						m(GoodWe.ChannelId.WORK_WEEK_8_ECO_MODE_FOR_ARM_18_AND_GREATER,
-								new UnsignedWordElement(47591)), //
+						m(GoodWe.ChannelId.WORK_WEEK_8_ECO_MODE_FOR_ARM_18_AND_GREATER, new UnsignedWordElement(47591)), //
 						m(GoodWe.ChannelId.WORK_WEEK_8_PARAMETER8_1_ECO_MODE_FOR_ARM_18_AND_GREATER,
 								new UnsignedWordElement(47592)), //
 						m(GoodWe.ChannelId.WORK_WEEK_8_PARAMETER8_2_ECO_MODE_FOR_ARM_18_AND_GREATER,
diff --git a/io.openems.edge.meter.artemes.am2/src/io/openems/edge/meter/artemes/am2/MeterArtemesAM2.java b/io.openems.edge.meter.artemes.am2/src/io/openems/edge/meter/artemes/am2/MeterArtemesAM2.java
index aee0fd80874..cf61b1aa878 100644
--- a/io.openems.edge.meter.artemes.am2/src/io/openems/edge/meter/artemes/am2/MeterArtemesAM2.java
+++ b/io.openems.edge.meter.artemes.am2/src/io/openems/edge/meter/artemes/am2/MeterArtemesAM2.java
@@ -130,11 +130,9 @@ protected ModbusProtocol defineModbusProtocol() throws OpenemsException {
 						m(SymmetricMeter.ChannelId.FREQUENCY, new UnsignedDoublewordElement(0x0072))),
 
 				new FC4ReadInputRegistersTask(0x0418, Priority.LOW,
-						m(SymmetricMeter.ChannelId.ACTIVE_PRODUCTION_ENERGY,
-								new UnsignedQuadruplewordElement(0x0418),
+						m(SymmetricMeter.ChannelId.ACTIVE_PRODUCTION_ENERGY, new UnsignedQuadruplewordElement(0x0418),
 								ElementToChannelConverter.SCALE_FACTOR_MINUS_1),
-						m(SymmetricMeter.ChannelId.ACTIVE_CONSUMPTION_ENERGY,
-								new UnsignedQuadruplewordElement(0x0041C),
+						m(SymmetricMeter.ChannelId.ACTIVE_CONSUMPTION_ENERGY, new UnsignedQuadruplewordElement(0x0041C),
 								ElementToChannelConverter.SCALE_FACTOR_MINUS_1)));
 	}
 
diff --git a/io.openems.edge.meter.microcare.sdm630/src/io/openems/edge/meter/microcare/sdm630/MeterMicrocareSdm630Impl.java b/io.openems.edge.meter.microcare.sdm630/src/io/openems/edge/meter/microcare/sdm630/MeterMicrocareSdm630Impl.java
index 9681909aac2..3f4f8e4fdcc 100644
--- a/io.openems.edge.meter.microcare.sdm630/src/io/openems/edge/meter/microcare/sdm630/MeterMicrocareSdm630Impl.java
+++ b/io.openems.edge.meter.microcare.sdm630/src/io/openems/edge/meter/microcare/sdm630/MeterMicrocareSdm630Impl.java
@@ -86,9 +86,10 @@ protected ModbusProtocol defineModbusProtocol() throws OpenemsException {
 				new FC4ReadInputRegistersTask(30001 - offset, Priority.HIGH,
 						m(new FloatDoublewordElement(30001 - offset).wordOrder(WordOrder.MSWLSW)
 								.byteOrder(ByteOrder.BIG_ENDIAN))
-								.m(AsymmetricMeter.ChannelId.VOLTAGE_L1, ElementToChannelConverter.SCALE_FACTOR_3)//
-								.m(SymmetricMeter.ChannelId.VOLTAGE, ElementToChannelConverter.SCALE_FACTOR_3)//
-								.build(),
+										.m(AsymmetricMeter.ChannelId.VOLTAGE_L1,
+												ElementToChannelConverter.SCALE_FACTOR_3)//
+										.m(SymmetricMeter.ChannelId.VOLTAGE, ElementToChannelConverter.SCALE_FACTOR_3)//
+										.build(),
 						m(AsymmetricMeter.ChannelId.VOLTAGE_L2,
 								new FloatDoublewordElement(30003 - offset).wordOrder(WordOrder.MSWLSW)
 										.byteOrder(ByteOrder.BIG_ENDIAN),
diff --git a/io.openems.edge.meter.sma.shm20/src/io/openems/edge/meter/sma/shm20/MeterSmaShm20Impl.java b/io.openems.edge.meter.sma.shm20/src/io/openems/edge/meter/sma/shm20/MeterSmaShm20Impl.java
index 765a12218c2..d8522db9183 100644
--- a/io.openems.edge.meter.sma.shm20/src/io/openems/edge/meter/sma/shm20/MeterSmaShm20Impl.java
+++ b/io.openems.edge.meter.sma.shm20/src/io/openems/edge/meter/sma/shm20/MeterSmaShm20Impl.java
@@ -87,8 +87,7 @@ protected ModbusProtocol defineModbusProtocol() throws OpenemsException {
 				// Consumption and Production Energy
 				new FC3ReadRegistersTask(30581, Priority.HIGH, //
 						m(SymmetricMeter.ChannelId.ACTIVE_PRODUCTION_ENERGY, new UnsignedDoublewordElement(30581)),
-						m(SymmetricMeter.ChannelId.ACTIVE_CONSUMPTION_ENERGY,
-								new UnsignedDoublewordElement(30583))),
+						m(SymmetricMeter.ChannelId.ACTIVE_CONSUMPTION_ENERGY, new UnsignedDoublewordElement(30583))),
 				// Power Readings
 				new FC3ReadRegistersTask(30865, Priority.HIGH, //
 						m(MeterSmaShm20.ChannelId.ACTIVE_PRODUCTION_POWER, new SignedDoublewordElement(30865)),
@@ -101,18 +100,12 @@ protected ModbusProtocol defineModbusProtocol() throws OpenemsException {
 								ElementToChannelConverter.SCALE_FACTOR_1),
 						m(AsymmetricMeter.ChannelId.VOLTAGE_L3, new UnsignedDoublewordElement(31257),
 								ElementToChannelConverter.SCALE_FACTOR_1),
-						m(MeterSmaShm20.ChannelId.ACTIVE_CONSUMPTION_POWER_L1,
-								new UnsignedDoublewordElement(31259)),
-						m(MeterSmaShm20.ChannelId.ACTIVE_CONSUMPTION_POWER_L2,
-								new UnsignedDoublewordElement(31261)),
-						m(MeterSmaShm20.ChannelId.ACTIVE_CONSUMPTION_POWER_L3,
-								new UnsignedDoublewordElement(31263)),
-						m(MeterSmaShm20.ChannelId.ACTIVE_PRODUCTION_POWER_L1,
-								new UnsignedDoublewordElement(31265)),
-						m(MeterSmaShm20.ChannelId.ACTIVE_PRODUCTION_POWER_L2,
-								new UnsignedDoublewordElement(31267)),
-						m(MeterSmaShm20.ChannelId.ACTIVE_PRODUCTION_POWER_L3,
-								new UnsignedDoublewordElement(31269)),
+						m(MeterSmaShm20.ChannelId.ACTIVE_CONSUMPTION_POWER_L1, new UnsignedDoublewordElement(31259)),
+						m(MeterSmaShm20.ChannelId.ACTIVE_CONSUMPTION_POWER_L2, new UnsignedDoublewordElement(31261)),
+						m(MeterSmaShm20.ChannelId.ACTIVE_CONSUMPTION_POWER_L3, new UnsignedDoublewordElement(31263)),
+						m(MeterSmaShm20.ChannelId.ACTIVE_PRODUCTION_POWER_L1, new UnsignedDoublewordElement(31265)),
+						m(MeterSmaShm20.ChannelId.ACTIVE_PRODUCTION_POWER_L2, new UnsignedDoublewordElement(31267)),
+						m(MeterSmaShm20.ChannelId.ACTIVE_PRODUCTION_POWER_L3, new UnsignedDoublewordElement(31269)),
 						m(AsymmetricMeter.ChannelId.REACTIVE_POWER_L1, new SignedDoublewordElement(31271)),
 						m(AsymmetricMeter.ChannelId.REACTIVE_POWER_L2, new SignedDoublewordElement(31273)),
 						m(AsymmetricMeter.ChannelId.REACTIVE_POWER_L3, new SignedDoublewordElement(31275)),
diff --git a/io.openems.edge.meter.weidmueller/src/io/openems/edge/meter/weidmueller/MeterWeidmueller525.java b/io.openems.edge.meter.weidmueller/src/io/openems/edge/meter/weidmueller/MeterWeidmueller525.java
index 644b58430f4..60a3a61ce68 100644
--- a/io.openems.edge.meter.weidmueller/src/io/openems/edge/meter/weidmueller/MeterWeidmueller525.java
+++ b/io.openems.edge.meter.weidmueller/src/io/openems/edge/meter/weidmueller/MeterWeidmueller525.java
@@ -136,8 +136,7 @@ protected ModbusProtocol defineModbusProtocol() throws OpenemsException {
 						m(WeidmuellerChannelId.REACTIVE_ENERGY_CAPACITIVE_L1, new FloatDoublewordElement(19102)), //
 						m(WeidmuellerChannelId.REACTIVE_ENERGY_CAPACITIVE_L2, new FloatDoublewordElement(19104)), //
 						m(WeidmuellerChannelId.REACTIVE_ENERGY_CAPACITIVE_L3, new FloatDoublewordElement(19106)), //
-						m(WeidmuellerChannelId.REACTIVE_ENERGY_CAPACITIVE_L1_L3,
-								new FloatDoublewordElement(19108)), //
+						m(WeidmuellerChannelId.REACTIVE_ENERGY_CAPACITIVE_L1_L3, new FloatDoublewordElement(19108)), //
 						m(WeidmuellerChannelId.HARMONIC_THD_VOLT_L1N, new FloatDoublewordElement(19110)), //
 						m(WeidmuellerChannelId.HARMONIC_THD_VOLT_L2N, new FloatDoublewordElement(19112)), //
 						m(WeidmuellerChannelId.HARMONIC_THD_VOLT_L3N, new FloatDoublewordElement(19114)), //
diff --git a/io.openems.edge.predictor.similardaymodel/src/io/openems/edge/predictor/similardaymodel/SimilarDayPredictorImpl.java b/io.openems.edge.predictor.similardaymodel/src/io/openems/edge/predictor/similardaymodel/SimilarDayPredictorImpl.java
index a20b26f3a0d..f2ae3c48dfc 100644
--- a/io.openems.edge.predictor.similardaymodel/src/io/openems/edge/predictor/similardaymodel/SimilarDayPredictorImpl.java
+++ b/io.openems.edge.predictor.similardaymodel/src/io/openems/edge/predictor/similardaymodel/SimilarDayPredictorImpl.java
@@ -127,8 +127,7 @@ protected Prediction24Hours createNewPrediction(ChannelAddress channelAddress) {
 		var mainData = getSlicedArrayList(result, numOfDataPerDay);
 
 		// Getting the indexes of the last four similar days
-		var lastFourSimilarDays = getCorrectIndexes(mainData, NUM_OF_DAYS_OF_WEEK,
-				PREDCTION_FOR_ONE_DAY);
+		var lastFourSimilarDays = getCorrectIndexes(mainData, NUM_OF_DAYS_OF_WEEK, PREDCTION_FOR_ONE_DAY);
 
 		// Getting the average predictions
 		var nextOneDayPredictions = getAverage(lastFourSimilarDays);
diff --git a/io.openems.edge.simulator/src/io/openems/edge/simulator/app/SimulatorApp.java b/io.openems.edge.simulator/src/io/openems/edge/simulator/app/SimulatorApp.java
index b424f77e18e..a32dcba1ccd 100644
--- a/io.openems.edge.simulator/src/io/openems/edge/simulator/app/SimulatorApp.java
+++ b/io.openems.edge.simulator/src/io/openems/edge/simulator/app/SimulatorApp.java
@@ -492,8 +492,7 @@ public SortedMap<ZonedDateTime, SortedMap<ChannelAddress, JsonElement>> queryHis
 		}
 
 		var fakePeriod = this.convertToSimulatedFromToDates(fromDate, toDate);
-		var data = this.lastSimulation.collectedData
-				.subMap(fakePeriod.fromDate, fakePeriod.toDate);
+		var data = this.lastSimulation.collectedData.subMap(fakePeriod.fromDate, fakePeriod.toDate);
 
 		if (channels.isEmpty()) {
 			// No Channels given -> return all data
@@ -521,8 +520,7 @@ public SortedMap<ChannelAddress, JsonElement> queryHistoricEnergy(String edgeId,
 			return new TreeMap<>();
 		}
 		var fakePeriod = this.convertToSimulatedFromToDates(fromDate, toDate);
-		var partOfCollectedData = this.lastSimulation.collectedData
-				.subMap(fakePeriod.fromDate, fakePeriod.toDate);
+		var partOfCollectedData = this.lastSimulation.collectedData.subMap(fakePeriod.fromDate, fakePeriod.toDate);
 		SortedMap<ChannelAddress, JsonElement> result = new TreeMap<>();
 		var firstValues = partOfCollectedData.get(partOfCollectedData.firstKey());
 		var lastValues = partOfCollectedData.get(partOfCollectedData.lastKey());
@@ -551,8 +549,7 @@ public CompletableFuture<Optional<Object>> getLatestValue(ChannelAddress channel
 		if (this.lastSimulation == null || this.lastSimulation.collectedData.isEmpty()) {
 			value = JsonNull.INSTANCE;
 		} else {
-			var lastValues = this.lastSimulation.collectedData
-					.get(this.lastSimulation.collectedData.lastKey());
+			var lastValues = this.lastSimulation.collectedData.get(this.lastSimulation.collectedData.lastKey());
 			value = lastValues.get(channelAddress);
 		}
 		return CompletableFuture.completedFuture(Optional.ofNullable(value));
diff --git a/io.openems.edge.simulator/test/io/openems/edge/simulator/ess/symmetric/reacting/EssSymmetricTest.java b/io.openems.edge.simulator/test/io/openems/edge/simulator/ess/symmetric/reacting/EssSymmetricTest.java
index c6feaea44c9..e4be284d0a1 100644
--- a/io.openems.edge.simulator/test/io/openems/edge/simulator/ess/symmetric/reacting/EssSymmetricTest.java
+++ b/io.openems.edge.simulator/test/io/openems/edge/simulator/ess/symmetric/reacting/EssSymmetricTest.java
@@ -25,8 +25,8 @@ public class EssSymmetricTest {
 
 	@Test
 	public void test() throws Exception {
-		final var clock = new TimeLeapClock(
-				Instant.ofEpochSecond(1577836800) /* starts at 1. January 2020 00:00:00 */, ZoneOffset.UTC);
+		final var clock = new TimeLeapClock(Instant.ofEpochSecond(1577836800) /* starts at 1. January 2020 00:00:00 */,
+				ZoneOffset.UTC);
 		new ManagedSymmetricEssTest(new EssSymmetric()) //
 				.addReference("cm", new DummyConfigurationAdmin()) //
 				.addReference("componentManager", new DummyComponentManager(clock)) //
diff --git a/io.openems.edge.timedata.rrd4j/src/io/openems/edge/timedata/rrd4j/RecordWorker.java b/io.openems.edge.timedata.rrd4j/src/io/openems/edge/timedata/rrd4j/RecordWorker.java
index 0a150690e68..9347696e7fd 100644
--- a/io.openems.edge.timedata.rrd4j/src/io/openems/edge/timedata/rrd4j/RecordWorker.java
+++ b/io.openems.edge.timedata.rrd4j/src/io/openems/edge/timedata/rrd4j/RecordWorker.java
@@ -102,8 +102,7 @@ public void collectData() {
 
 				ToDoubleFunction<? super Object> channelMapFunction = this
 						.getChannelMapFunction(channel.channelDoc().getType());
-				var channelAggregateFunction = this
-						.getChannelAggregateFunction(channel.channelDoc().getUnit());
+				var channelAggregateFunction = this.getChannelAggregateFunction(channel.channelDoc().getUnit());
 
 				var value = channelAggregateFunction.apply(//
 						channel.getPastValues() //
diff --git a/io.openems.edge.timedata.rrd4j/src/io/openems/edge/timedata/rrd4j/Rrd4jTimedataImpl.java b/io.openems.edge.timedata.rrd4j/src/io/openems/edge/timedata/rrd4j/Rrd4jTimedataImpl.java
index cab246eca55..1a8e8d48bea 100644
--- a/io.openems.edge.timedata.rrd4j/src/io/openems/edge/timedata/rrd4j/Rrd4jTimedataImpl.java
+++ b/io.openems.edge.timedata.rrd4j/src/io/openems/edge/timedata/rrd4j/Rrd4jTimedataImpl.java
@@ -125,8 +125,7 @@ public SortedMap<ZonedDateTime, SortedMap<ChannelAddress, JsonElement>> queryHis
 				}
 
 				var chDef = this.getDsDefForChannel(channel.channelDoc().getUnit());
-				var request = database.createFetchRequest(chDef.consolFun, fromTimestamp, toTimeStamp,
-						resolution);
+				var request = database.createFetchRequest(chDef.consolFun, fromTimestamp, toTimeStamp, resolution);
 
 				// Post-Process data
 				var result = postProcessData(request, resolution);
@@ -314,11 +313,9 @@ public SortedMap<ZonedDateTime, SortedMap<ChannelAddress, JsonElement>> queryHis
 					.withZoneSameInstant(timezone);
 
 			var timestampInstantTo = Instant.ofEpochSecond(nextStamp);
-			var dateTimeTo = ZonedDateTime.ofInstant(timestampInstantTo, ZoneOffset.UTC)
-					.withZoneSameInstant(timezone);
+			var dateTimeTo = ZonedDateTime.ofInstant(timestampInstantTo, ZoneOffset.UTC).withZoneSameInstant(timezone);
 
-			var tableRow = this.queryHistoricEnergy(null, dateTimeFrom, dateTimeTo,
-					channels);
+			var tableRow = this.queryHistoricEnergy(null, dateTimeFrom, dateTimeTo, channels);
 
 			table.put(dateTimeFrom, tableRow);
 
@@ -543,8 +540,7 @@ private RrdDb updateRrdDbToLatestDefinition(RrdDb oldDb, ChannelAddress channelA
 		// Read data of last month
 		var lastTimestamp = oldDb.getLastUpdateTime();
 		var firstTimestamp = lastTimestamp - 60 /* minute */ * 60 /* hour */ * 24 /* day */ * 31;
-		var fetchRequest = oldDb.createFetchRequest(oldDb.getArchive(0).getConsolFun(), firstTimestamp,
-				lastTimestamp);
+		var fetchRequest = oldDb.createFetchRequest(oldDb.getArchive(0).getConsolFun(), firstTimestamp, lastTimestamp);
 		var fetchData = fetchRequest.fetchData();
 		var values = postProcessData(fetchRequest, DEFAULT_HEARTBEAT_SECONDS);
 		if (fetchData.getTimestamps().length > 0) {
diff --git a/io.openems.shared.influxdb/src/io/openems/shared/influxdb/InfluxConnector.java b/io.openems.shared.influxdb/src/io/openems/shared/influxdb/InfluxConnector.java
index 986ed62c6c9..9165d3d35a2 100644
--- a/io.openems.shared.influxdb/src/io/openems/shared/influxdb/InfluxConnector.java
+++ b/io.openems.shared.influxdb/src/io/openems/shared/influxdb/InfluxConnector.java
@@ -124,8 +124,8 @@ private InfluxDB getConnection() {
 					.connectTimeout(CONNECT_TIMEOUT, TimeUnit.SECONDS) //
 					.readTimeout(READ_TIMEOUT, TimeUnit.SECONDS) //
 					.writeTimeout(WRITE_TIMEOUT, TimeUnit.SECONDS);
-			var influxDB = InfluxDBFactory.connect("http://" + this.ip + ":" + this.port, this.username,
-					this.password, okHttpClientBuilder);
+			var influxDB = InfluxDBFactory.connect("http://" + this.ip + ":" + this.port, this.username, this.password,
+					okHttpClientBuilder);
 			try {
 				influxDB.query(new Query("CREATE DATABASE " + this.database, ""));
 			} catch (InfluxDBException e) {

From 8080ac64563e5bf9d744068ca237ae0869075ab1 Mon Sep 17 00:00:00 2001
From: Stefan Feilmeier <stefan.feilmeier@fenecon.de>
Date: Tue, 8 Mar 2022 17:21:27 +0100
Subject: [PATCH 91/96] Add return on updateReferenceFilter

---
 .../edge/battery/fenecon/home/FeneconHomeBatteryImpl.java   | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/io.openems.edge.battery.fenecon.home/src/io/openems/edge/battery/fenecon/home/FeneconHomeBatteryImpl.java b/io.openems.edge.battery.fenecon.home/src/io/openems/edge/battery/fenecon/home/FeneconHomeBatteryImpl.java
index cee01e8b9f2..9e2ed9a704c 100644
--- a/io.openems.edge.battery.fenecon.home/src/io/openems/edge/battery/fenecon/home/FeneconHomeBatteryImpl.java
+++ b/io.openems.edge.battery.fenecon.home/src/io/openems/edge/battery/fenecon/home/FeneconHomeBatteryImpl.java
@@ -115,8 +115,10 @@ protected void setModbus(BridgeModbus modbus) {
 	void activate(ComponentContext context, Config config) throws OpenemsException {
 		this.config = config;
 
-		super.activate(context, config.id(), config.alias(), config.enabled(), config.modbusUnitId(), this.cm, "Modbus",
-				config.modbus_id());
+		if (super.activate(context, config.id(), config.alias(), config.enabled(), config.modbusUnitId(), this.cm,
+				"Modbus", config.modbus_id())) {
+			return;
+		}
 
 		// Initialize Battery-Protection
 		this.batteryProtection = BatteryProtection.create(this) //

From e262b27e97573adb54d56d65cf1a72ea104c0e8b Mon Sep 17 00:00:00 2001
From: Stefan Feilmeier <stefan.feilmeier@fenecon.de>
Date: Wed, 9 Mar 2022 11:42:11 +0100
Subject: [PATCH 92/96] Return when activate() changes component config

---
 .../edge/battery/bydcommercial/BatteryBoxC130Impl.java     | 3 ++-
 .../edge/batteryinverter/sinexcel/SinexcelImpl.java        | 1 +
 .../edge/ess/adstec/storaxe/AdstecStoraxeEssImpl.java      | 6 ++++--
 .../src/io/openems/edge/ess/mr/gridcon/GridconPcsImpl.java | 7 ++++---
 .../openems/edge/fenecon/dess/ess/FeneconDessEssImpl.java  | 1 +
 .../fenecon/dess/gridmeter/FeneconDessGridMeterImpl.java   | 1 +
 .../edge/fenecon/dess/pvmeter/FeneconDessPvMeterImpl.java  | 1 +
 .../fenecon/mini/gridmeter/FeneconMiniGridMeterImpl.java   | 1 +
 .../edge/fenecon/mini/pvmeter/FeneconMiniPvMeterImpl.java  | 1 +
 .../emergencypowermeter/GoodWeEmergencyPowerMeterImpl.java | 1 +
 .../openems/edge/goodwe/gridmeter/GoodWeGridMeterImpl.java | 1 +
 .../edge/io/kmtronic/eight/KmtronicRelay8PortImpl.java     | 1 +
 .../edge/io/kmtronic/four/KmtronicRelay4PortImpl.java      | 1 +
 .../io/openems/edge/meter/artemes/am2/MeterArtemesAM2.java | 1 +
 .../edge/meter/bcontrol/em300/MeterBControlEM300Impl.java  | 1 +
 .../carlo/gavazzi/em300/MeterCarloGavazziEm300Impl.java    | 1 +
 .../edge/meter/janitza/umg511/MeterJanitzaUmg511Impl.java  | 1 +
 .../edge/meter/janitza/umg604/MeterJanitzaUmg604Impl.java  | 1 +
 .../edge/meter/janitza/umg96rme/MeterJanitzaUmg96rme.java  | 1 +
 .../meter/microcare/sdm630/MeterMicrocareSdm630Impl.java   | 1 +
 .../edge/meter/pqplus/umd96/MeterPqplusUmd96Impl.java      | 1 +
 .../edge/meter/pqplus/umd97/MeterPqplusUmd97Impl.java      | 1 +
 .../acti9/smartlink/MeterSchneiderActi9Smartlink.java      | 1 +
 .../io/openems/edge/meter/siemens/SiemensPacMeterImpl.java | 1 +
 .../io/openems/edge/meter/sma/shm20/MeterSmaShm20Impl.java | 1 +
 .../edge/meter/weidmueller/MeterWeidmueller525.java        | 1 +
 26 files changed, 33 insertions(+), 6 deletions(-)

diff --git a/io.openems.edge.battery.bydcommercial/src/io/openems/edge/battery/bydcommercial/BatteryBoxC130Impl.java b/io.openems.edge.battery.bydcommercial/src/io/openems/edge/battery/bydcommercial/BatteryBoxC130Impl.java
index c6ba83f4acc..e35024baabb 100644
--- a/io.openems.edge.battery.bydcommercial/src/io/openems/edge/battery/bydcommercial/BatteryBoxC130Impl.java
+++ b/io.openems.edge.battery.bydcommercial/src/io/openems/edge/battery/bydcommercial/BatteryBoxC130Impl.java
@@ -195,7 +195,8 @@ protected ModbusProtocol defineModbusProtocol() throws OpenemsException {
 								.m(Battery.ChannelId.CURRENT, ElementToChannelConverter.SCALE_FACTOR_MINUS_1) // [A]
 								.build(), //
 						m(BatteryBoxC130.ChannelId.BATTERY_WORK_STATE, new UnsignedWordElement(0x2102)), //
-						m(Battery.ChannelId.SOC, new UnsignedWordElement(0x2103)), m(new UnsignedWordElement(0x2104)) //
+						m(Battery.ChannelId.SOC, new UnsignedWordElement(0x2103)), //
+						m(new UnsignedWordElement(0x2104)) //
 								.m(BatteryBoxC130.ChannelId.CLUSTER_1_SOH, ElementToChannelConverter.DIRECT_1_TO_1) // [%]
 								.m(Battery.ChannelId.SOH, ElementToChannelConverter.DIRECT_1_TO_1) // [%]
 								.build(), //
diff --git a/io.openems.edge.batteryinverter.sinexcel/src/io/openems/edge/batteryinverter/sinexcel/SinexcelImpl.java b/io.openems.edge.batteryinverter.sinexcel/src/io/openems/edge/batteryinverter/sinexcel/SinexcelImpl.java
index 5242b8c7ba4..1f29a8d0b08 100644
--- a/io.openems.edge.batteryinverter.sinexcel/src/io/openems/edge/batteryinverter/sinexcel/SinexcelImpl.java
+++ b/io.openems.edge.batteryinverter.sinexcel/src/io/openems/edge/batteryinverter/sinexcel/SinexcelImpl.java
@@ -125,6 +125,7 @@ protected void activate(ComponentContext context, Config config) throws OpenemsN
 		this.config = config;
 		if (super.activate(context, config.id(), config.alias(), config.enabled(), DEFAULT_UNIT_ID, this.cm, "Modbus",
 				config.modbus_id())) {
+			return;
 		}
 	}
 
diff --git a/io.openems.edge.ess.adstec.storaxe/src/io/openems/edge/ess/adstec/storaxe/AdstecStoraxeEssImpl.java b/io.openems.edge.ess.adstec.storaxe/src/io/openems/edge/ess/adstec/storaxe/AdstecStoraxeEssImpl.java
index fa1dbd3e43f..589462ff131 100644
--- a/io.openems.edge.ess.adstec.storaxe/src/io/openems/edge/ess/adstec/storaxe/AdstecStoraxeEssImpl.java
+++ b/io.openems.edge.ess.adstec.storaxe/src/io/openems/edge/ess/adstec/storaxe/AdstecStoraxeEssImpl.java
@@ -62,8 +62,10 @@ public AdstecStoraxeEssImpl() {
 
 	@Activate
 	void activate(ComponentContext context, Config config) throws OpenemsException {
-		super.activate(context, config.id(), config.alias(), config.enabled(), config.modbusUnitId(), this.cm, "Modbus",
-				config.modbus_id());
+		if (super.activate(context, config.id(), config.alias(), config.enabled(), config.modbusUnitId(), this.cm,
+				"Modbus", config.modbus_id())) {
+			return;
+		}
 		this._setCapacity(config.capacity());
 	}
 
diff --git a/io.openems.edge.ess.mr.gridcon/src/io/openems/edge/ess/mr/gridcon/GridconPcsImpl.java b/io.openems.edge.ess.mr.gridcon/src/io/openems/edge/ess/mr/gridcon/GridconPcsImpl.java
index 0552c22f03b..50ed8f91780 100644
--- a/io.openems.edge.ess.mr.gridcon/src/io/openems/edge/ess/mr/gridcon/GridconPcsImpl.java
+++ b/io.openems.edge.ess.mr.gridcon/src/io/openems/edge/ess/mr/gridcon/GridconPcsImpl.java
@@ -135,10 +135,11 @@ void activate(ComponentContext context, Config config) throws OpenemsNamedExcept
 		this.inverterCount = config.inverterCount();
 		this.efficiencyLossChargeFactor = config.efficiencyLossChargeFactor();
 		this.efficiencyLossDischargeFactor = config.efficiencyLossDischargeFactor();
-		;
 
-		super.activate(context, config.id(), config.alias(), config.enabled(), config.unit_id(), this.cm, "Modbus",
-				config.modbus_id());
+		if (super.activate(context, config.id(), config.alias(), config.enabled(), config.unit_id(), this.cm, "Modbus",
+				config.modbus_id())) {
+			return;
+		}
 
 		this.setBalancingMode(config.balancing_mode());
 		this.setFundamentalFrequencyMode(config.fundamental_frequency_mode());
diff --git a/io.openems.edge.fenecon.dess/src/io/openems/edge/fenecon/dess/ess/FeneconDessEssImpl.java b/io.openems.edge.fenecon.dess/src/io/openems/edge/fenecon/dess/ess/FeneconDessEssImpl.java
index a0aad280e11..c30783aa11a 100644
--- a/io.openems.edge.fenecon.dess/src/io/openems/edge/fenecon/dess/ess/FeneconDessEssImpl.java
+++ b/io.openems.edge.fenecon.dess/src/io/openems/edge/fenecon/dess/ess/FeneconDessEssImpl.java
@@ -101,6 +101,7 @@ void activate(ComponentContext context, Config config) throws OpenemsException {
 		this.config = config;
 		if (super.activate(context, config.id(), config.alias(), config.enabled(), FeneconDessConstants.UNIT_ID,
 				this.cm, "Modbus", config.modbus_id())) {
+			return;
 		}
 	}
 
diff --git a/io.openems.edge.fenecon.dess/src/io/openems/edge/fenecon/dess/gridmeter/FeneconDessGridMeterImpl.java b/io.openems.edge.fenecon.dess/src/io/openems/edge/fenecon/dess/gridmeter/FeneconDessGridMeterImpl.java
index af4744cc02f..eeb67bdcdb5 100644
--- a/io.openems.edge.fenecon.dess/src/io/openems/edge/fenecon/dess/gridmeter/FeneconDessGridMeterImpl.java
+++ b/io.openems.edge.fenecon.dess/src/io/openems/edge/fenecon/dess/gridmeter/FeneconDessGridMeterImpl.java
@@ -82,6 +82,7 @@ public FeneconDessGridMeterImpl() {
 	void activate(ComponentContext context, Config config) throws OpenemsException {
 		if (super.activate(context, config.id(), config.alias(), config.enabled(), FeneconDessConstants.UNIT_ID,
 				this.cm, "Modbus", config.modbus_id())) {
+			return;
 		}
 	}
 
diff --git a/io.openems.edge.fenecon.dess/src/io/openems/edge/fenecon/dess/pvmeter/FeneconDessPvMeterImpl.java b/io.openems.edge.fenecon.dess/src/io/openems/edge/fenecon/dess/pvmeter/FeneconDessPvMeterImpl.java
index e0f7ec9b496..05c4c7bf579 100644
--- a/io.openems.edge.fenecon.dess/src/io/openems/edge/fenecon/dess/pvmeter/FeneconDessPvMeterImpl.java
+++ b/io.openems.edge.fenecon.dess/src/io/openems/edge/fenecon/dess/pvmeter/FeneconDessPvMeterImpl.java
@@ -78,6 +78,7 @@ public FeneconDessPvMeterImpl() {
 	void activate(ComponentContext context, Config config) throws OpenemsException {
 		if (super.activate(context, config.id(), config.alias(), config.enabled(), FeneconDessConstants.UNIT_ID,
 				this.cm, "Modbus", config.modbus_id())) {
+			return;
 		}
 	}
 
diff --git a/io.openems.edge.fenecon.mini/src/io/openems/edge/fenecon/mini/gridmeter/FeneconMiniGridMeterImpl.java b/io.openems.edge.fenecon.mini/src/io/openems/edge/fenecon/mini/gridmeter/FeneconMiniGridMeterImpl.java
index 3b4ebf0c44e..91d4e06109b 100644
--- a/io.openems.edge.fenecon.mini/src/io/openems/edge/fenecon/mini/gridmeter/FeneconMiniGridMeterImpl.java
+++ b/io.openems.edge.fenecon.mini/src/io/openems/edge/fenecon/mini/gridmeter/FeneconMiniGridMeterImpl.java
@@ -76,6 +76,7 @@ public FeneconMiniGridMeterImpl() {
 	void activate(ComponentContext context, Config config) throws OpenemsException {
 		if (super.activate(context, config.id(), config.alias(), config.enabled(), FeneconMiniConstants.UNIT_ID,
 				this.cm, "Modbus", config.modbus_id())) {
+			return;
 		}
 	}
 
diff --git a/io.openems.edge.fenecon.mini/src/io/openems/edge/fenecon/mini/pvmeter/FeneconMiniPvMeterImpl.java b/io.openems.edge.fenecon.mini/src/io/openems/edge/fenecon/mini/pvmeter/FeneconMiniPvMeterImpl.java
index 3f72497670e..1c050cf4cf8 100644
--- a/io.openems.edge.fenecon.mini/src/io/openems/edge/fenecon/mini/pvmeter/FeneconMiniPvMeterImpl.java
+++ b/io.openems.edge.fenecon.mini/src/io/openems/edge/fenecon/mini/pvmeter/FeneconMiniPvMeterImpl.java
@@ -72,6 +72,7 @@ public FeneconMiniPvMeterImpl() {
 	void activate(ComponentContext context, Config config) throws OpenemsException {
 		if (super.activate(context, config.id(), config.alias(), config.enabled(), FeneconMiniConstants.UNIT_ID,
 				this.cm, "Modbus", config.modbus_id())) {
+			return;
 		}
 	}
 
diff --git a/io.openems.edge.goodwe/src/io/openems/edge/goodwe/emergencypowermeter/GoodWeEmergencyPowerMeterImpl.java b/io.openems.edge.goodwe/src/io/openems/edge/goodwe/emergencypowermeter/GoodWeEmergencyPowerMeterImpl.java
index 46e4b496ceb..3f13d2846ec 100644
--- a/io.openems.edge.goodwe/src/io/openems/edge/goodwe/emergencypowermeter/GoodWeEmergencyPowerMeterImpl.java
+++ b/io.openems.edge.goodwe/src/io/openems/edge/goodwe/emergencypowermeter/GoodWeEmergencyPowerMeterImpl.java
@@ -79,6 +79,7 @@ public GoodWeEmergencyPowerMeterImpl() {
 	private void activate(ComponentContext context, Config config) throws OpenemsException {
 		if (super.activate(context, config.id(), config.alias(), config.enabled(), config.modbusUnitId(), this.cm,
 				"Modbus", config.modbus_id())) {
+			return;
 		}
 	}
 
diff --git a/io.openems.edge.goodwe/src/io/openems/edge/goodwe/gridmeter/GoodWeGridMeterImpl.java b/io.openems.edge.goodwe/src/io/openems/edge/goodwe/gridmeter/GoodWeGridMeterImpl.java
index 4a018574936..8d9b88aca2c 100644
--- a/io.openems.edge.goodwe/src/io/openems/edge/goodwe/gridmeter/GoodWeGridMeterImpl.java
+++ b/io.openems.edge.goodwe/src/io/openems/edge/goodwe/gridmeter/GoodWeGridMeterImpl.java
@@ -80,6 +80,7 @@ public GoodWeGridMeterImpl() {
 	void activate(ComponentContext context, Config config) throws OpenemsException {
 		if (super.activate(context, config.id(), config.alias(), config.enabled(), config.modbusUnitId(), this.cm,
 				"Modbus", config.modbus_id())) {
+			return;
 		}
 	}
 
diff --git a/io.openems.edge.io.kmtronic/src/io/openems/edge/io/kmtronic/eight/KmtronicRelay8PortImpl.java b/io.openems.edge.io.kmtronic/src/io/openems/edge/io/kmtronic/eight/KmtronicRelay8PortImpl.java
index 09cc9297d6d..ef4fab97592 100644
--- a/io.openems.edge.io.kmtronic/src/io/openems/edge/io/kmtronic/eight/KmtronicRelay8PortImpl.java
+++ b/io.openems.edge.io.kmtronic/src/io/openems/edge/io/kmtronic/eight/KmtronicRelay8PortImpl.java
@@ -55,6 +55,7 @@ public KmtronicRelay8PortImpl() {
 	void activate(ComponentContext context, Config config) throws OpenemsException {
 		if (super.activate(context, config.id(), config.alias(), config.enabled(), config.modbusUnitId(), this.cm,
 				"Modbus", config.modbus_id())) {
+			return;
 		}
 	}
 
diff --git a/io.openems.edge.io.kmtronic/src/io/openems/edge/io/kmtronic/four/KmtronicRelay4PortImpl.java b/io.openems.edge.io.kmtronic/src/io/openems/edge/io/kmtronic/four/KmtronicRelay4PortImpl.java
index 72d00c88f4e..a0e67384ff3 100644
--- a/io.openems.edge.io.kmtronic/src/io/openems/edge/io/kmtronic/four/KmtronicRelay4PortImpl.java
+++ b/io.openems.edge.io.kmtronic/src/io/openems/edge/io/kmtronic/four/KmtronicRelay4PortImpl.java
@@ -55,6 +55,7 @@ public KmtronicRelay4PortImpl() {
 	void activate(ComponentContext context, Config config) throws OpenemsException {
 		if (super.activate(context, config.id(), config.alias(), config.enabled(), config.modbusUnitId(), this.cm,
 				"Modbus", config.modbus_id())) {
+			return;
 		}
 	}
 
diff --git a/io.openems.edge.meter.artemes.am2/src/io/openems/edge/meter/artemes/am2/MeterArtemesAM2.java b/io.openems.edge.meter.artemes.am2/src/io/openems/edge/meter/artemes/am2/MeterArtemesAM2.java
index cf61b1aa878..b8ca271cedb 100644
--- a/io.openems.edge.meter.artemes.am2/src/io/openems/edge/meter/artemes/am2/MeterArtemesAM2.java
+++ b/io.openems.edge.meter.artemes.am2/src/io/openems/edge/meter/artemes/am2/MeterArtemesAM2.java
@@ -67,6 +67,7 @@ void activate(ComponentContext context, Config config) throws OpenemsException {
 
 		if (super.activate(context, config.id(), config.alias(), config.enabled(), config.modbusUnitId(), this.cm,
 				"Modbus", config.modbus_id())) {
+			return;
 		}
 	}
 
diff --git a/io.openems.edge.meter.bcontrol.em300/src/io/openems/edge/meter/bcontrol/em300/MeterBControlEM300Impl.java b/io.openems.edge.meter.bcontrol.em300/src/io/openems/edge/meter/bcontrol/em300/MeterBControlEM300Impl.java
index 220f04b7396..16cbd7d518c 100644
--- a/io.openems.edge.meter.bcontrol.em300/src/io/openems/edge/meter/bcontrol/em300/MeterBControlEM300Impl.java
+++ b/io.openems.edge.meter.bcontrol.em300/src/io/openems/edge/meter/bcontrol/em300/MeterBControlEM300Impl.java
@@ -74,6 +74,7 @@ void activate(ComponentContext context, Config config) throws OpenemsException {
 
 		if (super.activate(context, config.id(), config.alias(), config.enabled(), config.modbusUnitId(), this.cm,
 				"Modbus", config.modbus_id())) {
+			return;
 		}
 	}
 
diff --git a/io.openems.edge.meter.carlo.gavazzi.em300/src/io/openems/edge/meter/carlo/gavazzi/em300/MeterCarloGavazziEm300Impl.java b/io.openems.edge.meter.carlo.gavazzi.em300/src/io/openems/edge/meter/carlo/gavazzi/em300/MeterCarloGavazziEm300Impl.java
index 386424a2316..0574e89c3f8 100644
--- a/io.openems.edge.meter.carlo.gavazzi.em300/src/io/openems/edge/meter/carlo/gavazzi/em300/MeterCarloGavazziEm300Impl.java
+++ b/io.openems.edge.meter.carlo.gavazzi.em300/src/io/openems/edge/meter/carlo/gavazzi/em300/MeterCarloGavazziEm300Impl.java
@@ -66,6 +66,7 @@ void activate(ComponentContext context, Config config) throws OpenemsException {
 
 		if (super.activate(context, config.id(), config.alias(), config.enabled(), config.modbusUnitId(), this.cm,
 				"Modbus", config.modbus_id())) {
+			return;
 		}
 	}
 
diff --git a/io.openems.edge.meter.janitza/src/io/openems/edge/meter/janitza/umg511/MeterJanitzaUmg511Impl.java b/io.openems.edge.meter.janitza/src/io/openems/edge/meter/janitza/umg511/MeterJanitzaUmg511Impl.java
index 96f2d7e35ef..88368cc0afc 100644
--- a/io.openems.edge.meter.janitza/src/io/openems/edge/meter/janitza/umg511/MeterJanitzaUmg511Impl.java
+++ b/io.openems.edge.meter.janitza/src/io/openems/edge/meter/janitza/umg511/MeterJanitzaUmg511Impl.java
@@ -78,6 +78,7 @@ void activate(ComponentContext context, Config config) throws OpenemsException {
 
 		if (super.activate(context, config.id(), config.alias(), config.enabled(), config.modbusUnitId(), this.cm,
 				"Modbus", config.modbus_id())) {
+			return;
 		}
 	}
 
diff --git a/io.openems.edge.meter.janitza/src/io/openems/edge/meter/janitza/umg604/MeterJanitzaUmg604Impl.java b/io.openems.edge.meter.janitza/src/io/openems/edge/meter/janitza/umg604/MeterJanitzaUmg604Impl.java
index 47fa00c1c9b..5a74759ba98 100644
--- a/io.openems.edge.meter.janitza/src/io/openems/edge/meter/janitza/umg604/MeterJanitzaUmg604Impl.java
+++ b/io.openems.edge.meter.janitza/src/io/openems/edge/meter/janitza/umg604/MeterJanitzaUmg604Impl.java
@@ -78,6 +78,7 @@ void activate(ComponentContext context, Config config) throws OpenemsException {
 
 		if (super.activate(context, config.id(), config.alias(), config.enabled(), config.modbusUnitId(), this.cm,
 				"Modbus", config.modbus_id())) {
+			return;
 		}
 	}
 
diff --git a/io.openems.edge.meter.janitza/src/io/openems/edge/meter/janitza/umg96rme/MeterJanitzaUmg96rme.java b/io.openems.edge.meter.janitza/src/io/openems/edge/meter/janitza/umg96rme/MeterJanitzaUmg96rme.java
index 5b6b60370a0..c57cfd51007 100644
--- a/io.openems.edge.meter.janitza/src/io/openems/edge/meter/janitza/umg96rme/MeterJanitzaUmg96rme.java
+++ b/io.openems.edge.meter.janitza/src/io/openems/edge/meter/janitza/umg96rme/MeterJanitzaUmg96rme.java
@@ -75,6 +75,7 @@ void activate(ComponentContext context, Config config) throws OpenemsException {
 
 		if (super.activate(context, config.id(), config.alias(), config.enabled(), config.modbusUnitId(), this.cm,
 				"Modbus", config.modbus_id())) {
+			return;
 		}
 	}
 
diff --git a/io.openems.edge.meter.microcare.sdm630/src/io/openems/edge/meter/microcare/sdm630/MeterMicrocareSdm630Impl.java b/io.openems.edge.meter.microcare.sdm630/src/io/openems/edge/meter/microcare/sdm630/MeterMicrocareSdm630Impl.java
index 3f4f8e4fdcc..f785179c5f8 100644
--- a/io.openems.edge.meter.microcare.sdm630/src/io/openems/edge/meter/microcare/sdm630/MeterMicrocareSdm630Impl.java
+++ b/io.openems.edge.meter.microcare.sdm630/src/io/openems/edge/meter/microcare/sdm630/MeterMicrocareSdm630Impl.java
@@ -65,6 +65,7 @@ void activate(ComponentContext context, Config config) throws OpenemsException {
 		this.meterType = config.type();
 		if (super.activate(context, config.id(), config.alias(), config.enabled(), config.modbusUnitId(), this.cm,
 				"Modbus", config.modbus_id())) {
+			return;
 		}
 	}
 
diff --git a/io.openems.edge.meter.pqplus/src/io/openems/edge/meter/pqplus/umd96/MeterPqplusUmd96Impl.java b/io.openems.edge.meter.pqplus/src/io/openems/edge/meter/pqplus/umd96/MeterPqplusUmd96Impl.java
index 4cc568d2ab8..aa17987ed0e 100644
--- a/io.openems.edge.meter.pqplus/src/io/openems/edge/meter/pqplus/umd96/MeterPqplusUmd96Impl.java
+++ b/io.openems.edge.meter.pqplus/src/io/openems/edge/meter/pqplus/umd96/MeterPqplusUmd96Impl.java
@@ -71,6 +71,7 @@ void activate(ComponentContext context, Config config) throws OpenemsException {
 
 		if (super.activate(context, config.id(), config.alias(), config.enabled(), config.modbusUnitId(), this.cm,
 				"Modbus", config.modbus_id())) {
+			return;
 		}
 	}
 
diff --git a/io.openems.edge.meter.pqplus/src/io/openems/edge/meter/pqplus/umd97/MeterPqplusUmd97Impl.java b/io.openems.edge.meter.pqplus/src/io/openems/edge/meter/pqplus/umd97/MeterPqplusUmd97Impl.java
index faa7c2e4919..94fd5f78f44 100644
--- a/io.openems.edge.meter.pqplus/src/io/openems/edge/meter/pqplus/umd97/MeterPqplusUmd97Impl.java
+++ b/io.openems.edge.meter.pqplus/src/io/openems/edge/meter/pqplus/umd97/MeterPqplusUmd97Impl.java
@@ -69,6 +69,7 @@ void activate(ComponentContext context, Config config) throws OpenemsException {
 
 		if (super.activate(context, config.id(), config.alias(), config.enabled(), config.modbusUnitId(), this.cm,
 				"Modbus", config.modbus_id())) {
+			return;
 		}
 	}
 
diff --git a/io.openems.edge.meter.schneider.acti9.smartlink/src/io/openems/edge/meter/schneider/acti9/smartlink/MeterSchneiderActi9Smartlink.java b/io.openems.edge.meter.schneider.acti9.smartlink/src/io/openems/edge/meter/schneider/acti9/smartlink/MeterSchneiderActi9Smartlink.java
index 11d55c91a00..de22ab9969e 100644
--- a/io.openems.edge.meter.schneider.acti9.smartlink/src/io/openems/edge/meter/schneider/acti9/smartlink/MeterSchneiderActi9Smartlink.java
+++ b/io.openems.edge.meter.schneider.acti9.smartlink/src/io/openems/edge/meter/schneider/acti9/smartlink/MeterSchneiderActi9Smartlink.java
@@ -64,6 +64,7 @@ void activate(ComponentContext context, Config config) throws OpenemsException {
 		this.inverted = config.invert();
 		if (super.activate(context, config.id(), config.alias(), config.enabled(), config.modbusUnitId(), this.cm,
 				"Modbus", config.modbus_id())) {
+			return;
 		}
 	}
 
diff --git a/io.openems.edge.meter.siemens/src/io/openems/edge/meter/siemens/SiemensPacMeterImpl.java b/io.openems.edge.meter.siemens/src/io/openems/edge/meter/siemens/SiemensPacMeterImpl.java
index 21344d945ef..bb5a814ae5d 100644
--- a/io.openems.edge.meter.siemens/src/io/openems/edge/meter/siemens/SiemensPacMeterImpl.java
+++ b/io.openems.edge.meter.siemens/src/io/openems/edge/meter/siemens/SiemensPacMeterImpl.java
@@ -79,6 +79,7 @@ void activate(ComponentContext context, Config config) throws OpenemsException {
 
 		if (super.activate(context, config.id(), config.alias(), config.enabled(), config.modbusUnitId(), this.cm,
 				"Modbus", config.modbus_id())) {
+			return;
 		}
 	}
 
diff --git a/io.openems.edge.meter.sma.shm20/src/io/openems/edge/meter/sma/shm20/MeterSmaShm20Impl.java b/io.openems.edge.meter.sma.shm20/src/io/openems/edge/meter/sma/shm20/MeterSmaShm20Impl.java
index d8522db9183..01e62a19f69 100644
--- a/io.openems.edge.meter.sma.shm20/src/io/openems/edge/meter/sma/shm20/MeterSmaShm20Impl.java
+++ b/io.openems.edge.meter.sma.shm20/src/io/openems/edge/meter/sma/shm20/MeterSmaShm20Impl.java
@@ -67,6 +67,7 @@ void activate(ComponentContext context, Config config) throws OpenemsException {
 		this.meterType = config.type();
 		if (super.activate(context, config.id(), config.alias(), config.enabled(), config.modbusUnitId(), this.cm,
 				"Modbus", config.modbus_id())) {
+			return;
 		}
 	}
 
diff --git a/io.openems.edge.meter.weidmueller/src/io/openems/edge/meter/weidmueller/MeterWeidmueller525.java b/io.openems.edge.meter.weidmueller/src/io/openems/edge/meter/weidmueller/MeterWeidmueller525.java
index 60a3a61ce68..822460b46bf 100644
--- a/io.openems.edge.meter.weidmueller/src/io/openems/edge/meter/weidmueller/MeterWeidmueller525.java
+++ b/io.openems.edge.meter.weidmueller/src/io/openems/edge/meter/weidmueller/MeterWeidmueller525.java
@@ -61,6 +61,7 @@ void activate(ComponentContext context, Config config) throws OpenemsException {
 
 		if (super.activate(context, config.id(), config.alias(), config.enabled(), config.modbusUnitId(), this.cm,
 				"Modbus", config.modbus_id())) {
+			return;
 		}
 	}
 

From e719ab391f0a45b3fac92f7979dd1848e4b064d7 Mon Sep 17 00:00:00 2001
From: Stefan Feilmeier <stefan.feilmeier@fenecon.de>
Date: Wed, 9 Mar 2022 21:57:10 +0100
Subject: [PATCH 93/96] Final touch

---
 .../modbus/api/ChannelToElementConverter.java | 234 ------------------
 .../edge/bridge/modbus/api/task/Utils.java    |   8 +-
 .../edge/common/channel/WriteChannel.java     |   2 +-
 .../openems/edge/common/offgrid/GridType.java |   3 +-
 .../edge/common/filter/PidFilterTest.java     | 176 ++++++-------
 .../delaycharge/DelayChargeController.java    |   6 +-
 .../fixactivepower/EssFixActivePowerImpl.java |   2 +
 .../ess/gridoptimizedcharge/DelayCharge.java  |   6 +-
 .../symmetric/fixreactivepower/Config.java    |   2 +-
 .../io/openems/edge/core/meta/MetaImpl.java   |   1 +
 .../PredictorManagerImpl.java                 |   1 +
 .../edge/core/componentmanager/MyConfig.java  |   3 +
 .../edge/ess/cluster/ChannelManager.java      |  36 ---
 .../cluster/EvcsClusterSelfConsumption.java   |   6 +-
 .../evcs/keba/kecontact/KebaChannelId.java    |  79 +++---
 .../edge/goodwe/common/AbstractGoodWe.java    |  10 +-
 .../pvinverter/solarlog/SolarLogImpl.java     |   1 +
 .../edge/simulator/app/SimulatorApp.java      |   1 +
 .../timedata/influxdb/InfluxTimedataImpl.java |   3 +-
 .../tibber/TibberProviderTest.java            | 165 ++++++++----
 20 files changed, 291 insertions(+), 454 deletions(-)

diff --git a/io.openems.edge.bridge.modbus/src/io/openems/edge/bridge/modbus/api/ChannelToElementConverter.java b/io.openems.edge.bridge.modbus/src/io/openems/edge/bridge/modbus/api/ChannelToElementConverter.java
index f9ae2dc05f8..1ece0122ab7 100644
--- a/io.openems.edge.bridge.modbus/src/io/openems/edge/bridge/modbus/api/ChannelToElementConverter.java
+++ b/io.openems.edge.bridge.modbus/src/io/openems/edge/bridge/modbus/api/ChannelToElementConverter.java
@@ -23,238 +23,4 @@ public ChannelToElementConverter(Function<Object, Object> function) {
 	public Object apply(Object t) {
 		return this.function.apply(t);
 	}
-//	/**
-//	 * Applies a scale factor of -1. Converts value [1] to [0.1].
-//	 *
-//	 * @see ElementToChannelScaleFactorConverter
-//	 */
-//	public static final ChannelToElementConverter SCALE_FACTOR_MINUS_1 = new ElementToChannelScaleFactorConverter(-1);
-//
-//	/**
-//	 * Applies a scale factor of -2. Converts value [1] to [0.01].
-//	 *
-//	 * @see ElementToChannelScaleFactorConverter
-//	 */
-//	public static final ChannelToElementConverter SCALE_FACTOR_MINUS_2 = new ElementToChannelScaleFactorConverter(-2);
-//
-//	/**
-//	 * Applies a scale factor of -3. Converts value [1] to [0.001].
-//	 *
-//	 * @see ElementToChannelScaleFactorConverter
-//	 */
-//	public static final ChannelToElementConverter SCALE_FACTOR_MINUS_3 = new ElementToChannelScaleFactorConverter(-3);
-//
-//	/**
-//	 * Applies a scale factor of 1. Converts value [1] to [10].
-//	 *
-//	 * @see ElementToChannelScaleFactorConverter
-//	 */
-//	public static final ChannelToElementConverter SCALE_FACTOR_1 = new ElementToChannelScaleFactorConverter(1);
-//
-//	/**
-//	 * Applies a scale factor of 2. Converts value [1] to [100].
-//	 *
-//	 * @see ElementToChannelScaleFactorConverter
-//	 */
-//	public static final ChannelToElementConverter SCALE_FACTOR_2 = new ElementToChannelScaleFactorConverter(2);
-//
-//	/**
-//	 * Applies a scale factor of 3. Converts value [1] to [1000].
-//	 *
-//	 * @see ElementToChannelScaleFactorConverter
-//	 */
-//	public static final ChannelToElementConverter SCALE_FACTOR_3 = new ElementToChannelScaleFactorConverter(3);
-//
-//	/**
-//	 * Converts only positive values from Element to Channel.
-//	 */
-//	public static final ChannelToElementConverter KEEP_POSITIVE = new ChannelToElementConverter(//
-//			// element -> channel
-//			value -> StaticConverters.KEEP_POSITIVE, //
-//			// channel -> element
-//			value -> value);
-//
-//	/**
-//	 * Inverts the value from Element to Channel.
-//	 */
-//	public static final ChannelToElementConverter INVERT = new ChannelToElementConverter(//
-//			// element -> channel
-//			StaticConverters.INVERT, //
-//			// channel -> element
-//			StaticConverters.INVERT);
-//
-//	/**
-//	 * Sets the value to 'zero' if parameter is true; otherwise
-//	 * {@link #DIRECT_1_TO_1}.
-//	 *
-//	 * <ul>
-//	 * <li>true: set zero
-//	 * <li>false: apply {@link #DIRECT_1_TO_1}
-//	 * </ul>
-//	 *
-//	 * @param setZero true to set to null
-//	 * @return the {@link ChannelToElementConverter}
-//	 */
-//	// CHECKSTYLE:OFF
-//	public static ChannelToElementConverter SET_ZERO_IF_TRUE(boolean setZero) {
-//		// CHECKSTYLE:ON
-//		if (setZero) {
-//			return new ChannelToElementConverter(//
-//					// element -> channel
-//					value -> 0, //
-//					// channel -> element
-//					value -> 0);
-//		} else {
-//			return DIRECT_1_TO_1;
-//		}
-//	}
-//
-//	/**
-//	 * Converts depending on the given parameter.
-//	 *
-//	 * <ul>
-//	 * <li>true: invert value
-//	 * <li>false: keep value (1-to-1)
-//	 * </ul>
-//	 *
-//	 * @param invert true if Converter should invert
-//	 * @return the {@link ChannelToElementConverter}
-//	 */
-//	// CHECKSTYLE:OFF
-//	public static ChannelToElementConverter INVERT_IF_TRUE(boolean invert) {
-//		// CHECKSTYLE:ON
-//		if (invert) {
-//			return INVERT;
-//		} else {
-//			return DIRECT_1_TO_1;
-//		}
-//	}
-//
-//	/**
-//	 * Converts only negative values from Element to Channel and inverts them (makes
-//	 * the value positive).
-//	 */
-//	public static final ChannelToElementConverter KEEP_NEGATIVE_AND_INVERT = new ElementToChannelConverterChain(INVERT,
-//			KEEP_POSITIVE);
-//
-//	/**
-//	 * Applies {@link ChannelToElementConverter#SCALE_FACTOR_1} and
-//	 * CONVERT_POSITIVE.
-//	 */
-//	public static final ChannelToElementConverter SCALE_FACTOR_1_AND_KEEP_POSITIVE = new ElementToChannelConverterChain(
-//			SCALE_FACTOR_1, KEEP_POSITIVE);
-//
-//	/**
-//	 * Applies {@link ChannelToElementConverter#SCALE_FACTOR_2} and INVERT.
-//	 */
-//	public static final ChannelToElementConverter SCALE_FACTOR_2_AND_INVERT = new ElementToChannelConverterChain(
-//			SCALE_FACTOR_2, INVERT);
-//
-//	/**
-//	 * Applies {@link ChannelToElementConverter#SCALE_FACTOR_1} and
-//	 * CONVERT_NEGATIVE_AND_INVERT.
-//	 */
-//	public static final ChannelToElementConverter SCALE_FACTOR_1_AND_KEEP_NEGATIVE_AND_INVERT = new ElementToChannelConverterChain(
-//			SCALE_FACTOR_1, KEEP_NEGATIVE_AND_INVERT);
-//
-//	/**
-//	 * Applies {@link ChannelToElementConverter#SCALE_FACTOR_2} and
-//	 * CONVERT_POSITIVE.
-//	 */
-//	public static final ChannelToElementConverter SCALE_FACTOR_2_AND_KEEP_POSITIVE = new ElementToChannelConverterChain(
-//			SCALE_FACTOR_2, KEEP_POSITIVE);
-//
-//	/**
-//	 * Applies {@link ChannelToElementConverter#SCALE_FACTOR_2} and @see
-//	 * {@link ChannelToElementConverter#KEEP_NEGATIVE_AND_INVERT}.
-//	 */
-//	public static final ChannelToElementConverter SCALE_FACTOR_2_AND_KEEP_NEGATIVE_AND_INVERT = new ElementToChannelConverterChain(
-//			SCALE_FACTOR_2, KEEP_NEGATIVE_AND_INVERT);
-//
-//	/**
-//	 * Applies {@link ChannelToElementConverter#SCALE_FACTOR_2_AND_KEEP_NEGATIVE}
-//	 * and @see {@link ChannelToElementConverter#INVERT}.
-//	 */
-//	public static ChannelToElementConverter SCALE_FACTOR_2_AND_KEEP_NEGATIVE = new ElementToChannelConverterChain(
-//			SCALE_FACTOR_2_AND_KEEP_NEGATIVE_AND_INVERT, INVERT);
-//
-//	/**
-//	 * Applies {@link ChannelToElementConverter#SCALE_FACTOR_1} and INVERT_IF_TRUE.
-//	 */
-//	public static final ChannelToElementConverter SCALE_FACTOR_1_AND_INVERT_IF_TRUE(boolean invert) {
-//		return new ElementToChannelConverterChain(SCALE_FACTOR_1, INVERT_IF_TRUE(invert));
-//	}
-//
-//	/**
-//	 * Applies {@link ChannelToElementConverter#SCALE_FACTOR_2} and INVERT_IF_TRUE.
-//	 */
-//	public static final ChannelToElementConverter SCALE_FACTOR_2_AND_INVERT_IF_TRUE(boolean invert) {
-//		return new ElementToChannelConverterChain(SCALE_FACTOR_2, INVERT_IF_TRUE(invert));
-//	}
-//
-//	/**
-//	 * Applies {@link ChannelToElementConverter#SCALE_FACTOR_3} and INVERT_IF_TRUE.
-//	 */
-//	public static final ChannelToElementConverter SCALE_FACTOR_3_AND_INVERT_IF_TRUE(boolean invert) {
-//		return new ElementToChannelConverterChain(SCALE_FACTOR_3, INVERT_IF_TRUE(invert));
-//	}
-//
-//	/**
-//	 * Applies {@link ChannelToElementConverter#SCALE_FACTOR_MINUS_1} and
-//	 * INVERT_IF_TRUE.
-//	 */
-//	public static final ChannelToElementConverter SCALE_FACTOR_MINUS_1_AND_INVERT_IF_TRUE(boolean invert) {
-//		return new ElementToChannelConverterChain(SCALE_FACTOR_MINUS_1, INVERT_IF_TRUE(invert));
-//	}
-//
-//	private final Function<Object, Object> elementToChannel;
-//	private final Function<Object, Object> channelToElement;
-//
-//	/**
-//	 * This constructs and back-and-forth converter from Element to Channel and
-//	 * back.
-//	 *
-//	 * @param elementToChannel from Element to Channel
-//	 * @param channelToElement from Channel to Element
-//	 */
-//	public ChannelToElementConverter(Function<Object, Object> elementToChannel,
-//			Function<Object, Object> channelToElement) {
-//		this.elementToChannel = elementToChannel;
-//		this.channelToElement = channelToElement;
-//	}
-//
-//	/**
-//	 * This constructs a forward-only converter from Element to Channel.
-//	 * Back-conversion throws an Exception.
-//	 *
-//	 * @param elementToChannel Element to Channel
-//	 */
-//	public ChannelToElementConverter(Function<Object, Object> elementToChannel) {
-//		this.elementToChannel = elementToChannel;
-//		this.channelToElement = (value) -> {
-//			throw new IllegalArgumentException("Backwards-Conversion for [" + value + "] is not implemented.");
-//		};
-//	}
-//
-//	/**
-//	 * Convert an Element value to a Channel value. If the value can or should not
-//	 * be converted, this method returns null.
-//	 *
-//	 * @param value the Element value
-//	 * @return the converted value or null
-//	 */
-//	public Object elementToChannel(Object value) {
-//		return this.elementToChannel.apply(value);
-//	}
-//
-//	/**
-//	 * Convert a Channel value to an Element value. If the value can or should not
-//	 * be converted, this method returns null.
-//	 *
-//	 * @param value the Channel value
-//	 * @return the converted value or null
-//	 */
-//	public Object channelToElement(Object value) {
-//		return this.channelToElement.apply(value);
-//	}
 }
diff --git a/io.openems.edge.bridge.modbus/src/io/openems/edge/bridge/modbus/api/task/Utils.java b/io.openems.edge.bridge.modbus/src/io/openems/edge/bridge/modbus/api/task/Utils.java
index 21ecb200b1b..498590bb8a8 100644
--- a/io.openems.edge.bridge.modbus/src/io/openems/edge/bridge/modbus/api/task/Utils.java
+++ b/io.openems.edge.bridge.modbus/src/io/openems/edge/bridge/modbus/api/task/Utils.java
@@ -54,7 +54,11 @@ public static String toBitString(InputRegister[] registers) {
 	}
 
 	public static String toBitString(byte[] bs) {
-		return IntStream.range(0, bs.length).map(idx -> bs[idx]).mapToObj(b -> String.format("%8s", //
-				Integer.toBinaryString((byte) b & 0xFF)).replace(' ', '0')).collect(Collectors.joining(" "));
+		return IntStream //
+				.range(0, bs.length) //
+				.map(idx -> bs[idx]) //
+				.mapToObj(b -> String.format("%8s", //
+						Integer.toBinaryString((byte) b & 0xFF)).replace(' ', '0'))
+				.collect(Collectors.joining(" "));
 	}
 }
diff --git a/io.openems.edge.common/src/io/openems/edge/common/channel/WriteChannel.java b/io.openems.edge.common/src/io/openems/edge/common/channel/WriteChannel.java
index e3e60dffc29..9a01c2d9aca 100644
--- a/io.openems.edge.common/src/io/openems/edge/common/channel/WriteChannel.java
+++ b/io.openems.edge.common/src/io/openems/edge/common/channel/WriteChannel.java
@@ -38,7 +38,7 @@ public default void setNextWriteValue(T value) throws OpenemsNamedException {
 	 */
 	public default void setNextWriteValueFromObject(Object value)
 			throws OpenemsNamedException, IllegalArgumentException {
-		var typedValue = TypeUtils.<T>getAsType(this.getType(), value);
+		T typedValue = TypeUtils.<T>getAsType(this.getType(), value);
 		OpenemsNamedException exception = null;
 		// set the write value
 		this._setNextWriteValue(typedValue);
diff --git a/io.openems.edge.common/src/io/openems/edge/common/offgrid/GridType.java b/io.openems.edge.common/src/io/openems/edge/common/offgrid/GridType.java
index db5fb121da0..c0d6c9bca4d 100644
--- a/io.openems.edge.common/src/io/openems/edge/common/offgrid/GridType.java
+++ b/io.openems.edge.common/src/io/openems/edge/common/offgrid/GridType.java
@@ -4,7 +4,8 @@
 
 public enum GridType implements OptionsEnum {
 	UNDEFINED(-1, "Undefined"), //
-	THREE_PHASE_FOUR_WIRE(0, "3 Phase 4 Wire"), THREE_PHASE_THREE_WIRE(1, "3 Phase 3 Wire"); //
+	THREE_PHASE_FOUR_WIRE(0, "3 Phase 4 Wire"), //
+	THREE_PHASE_THREE_WIRE(1, "3 Phase 3 Wire"); //
 
 	private int value;
 	private String name;
diff --git a/io.openems.edge.common/test/io/openems/edge/common/filter/PidFilterTest.java b/io.openems.edge.common/test/io/openems/edge/common/filter/PidFilterTest.java
index 295822fbd20..23324e2b598 100644
--- a/io.openems.edge.common/test/io/openems/edge/common/filter/PidFilterTest.java
+++ b/io.openems.edge.common/test/io/openems/edge/common/filter/PidFilterTest.java
@@ -21,90 +21,90 @@ public void prepare() {
 	public void test() {
 		var p = new PidFilter(0.3, 0.3, 0);
 		p.setLimits(-100000, 100000);
-		this.t(p, 0, 0, 0);
-		this.t(p, 0, 0, 0);
-		this.t(p, 0, 0, 0);
-		this.t(p, 0, 0, 0);
-		this.t(p, 0, 0, 0);
-		this.t(p, 0, 0, 0);
-		this.t(p, 0, 0, 0);
-		this.t(p, 0, 0, 0);
-		this.t(p, 0, 0, 0);
-		this.t(p, 0, 0, 0);
-		this.t(p, 0, 20000, 6000);
-		this.t(p, 0, 20000, 12000);
-		this.t(p, 3793, 20000, 16862);
-		this.t(p, 8981, 20000, 20168);
-		this.t(p, 13963, 20000, 21979);
-		this.t(p, 17885, 20000, 22613);
-		this.t(p, 20473, 20000, 22472);
-		this.t(p, 21826, 20000, 21924);
-		this.t(p, 22234, 20000, 21254);
-		this.t(p, 22038, 20000, 20642);
-		this.t(p, 21542, 20000, 20180);
-		this.t(p, 20973, 20000, 19888);
-		this.t(p, 20472, 20000, 19746);
-		this.t(p, 20103, 20000, 19715);
-		this.t(p, 19877, 20000, 19752);
-		this.t(p, 19775, 20000, 19820);
-		this.t(p, 19760, 20000, 19892);
-		this.t(p, 19798, 20000, 19952);
-		this.t(p, 19857, 20000, 19995);
-		this.t(p, 19917, 20000, 20020);
-		this.t(p, 19966, 20000, 20030);
-		this.t(p, 20000, 20000, 20000);
-		this.t(p, 20019, 20000, 20024);
-		this.t(p, 20007, 20000, 20022);
-		this.t(p, 20018, 20000, 20017);
-		this.t(p, 20021, 20000, 20011);
-		this.t(p, 20018, 20000, 20005);
-		this.t(p, 20014, 20000, 20001);
-		this.t(p, 20008, 20000, 19999);
+		t(p, 0, 0, 0);
+		t(p, 0, 0, 0);
+		t(p, 0, 0, 0);
+		t(p, 0, 0, 0);
+		t(p, 0, 0, 0);
+		t(p, 0, 0, 0);
+		t(p, 0, 0, 0);
+		t(p, 0, 0, 0);
+		t(p, 0, 0, 0);
+		t(p, 0, 0, 0);
+		t(p, 0, 20000, 6000);
+		t(p, 0, 20000, 12000);
+		t(p, 3793, 20000, 16862);
+		t(p, 8981, 20000, 20168);
+		t(p, 13963, 20000, 21979);
+		t(p, 17885, 20000, 22613);
+		t(p, 20473, 20000, 22472);
+		t(p, 21826, 20000, 21924);
+		t(p, 22234, 20000, 21254);
+		t(p, 22038, 20000, 20642);
+		t(p, 21542, 20000, 20180);
+		t(p, 20973, 20000, 19888);
+		t(p, 20472, 20000, 19746);
+		t(p, 20103, 20000, 19715);
+		t(p, 19877, 20000, 19752);
+		t(p, 19775, 20000, 19820);
+		t(p, 19760, 20000, 19892);
+		t(p, 19798, 20000, 19952);
+		t(p, 19857, 20000, 19995);
+		t(p, 19917, 20000, 20020);
+		t(p, 19966, 20000, 20030);
+		t(p, 20000, 20000, 20000);
+		t(p, 20019, 20000, 20024);
+		t(p, 20007, 20000, 20022);
+		t(p, 20018, 20000, 20017);
+		t(p, 20021, 20000, 20011);
+		t(p, 20018, 20000, 20005);
+		t(p, 20014, 20000, 20001);
+		t(p, 20008, 20000, 19999);
 	}
 
 	@Test
 	public void testLimits() {
 		var p = new PidFilter(0.3, 0.3, 0);
 		p.setLimits(-10000, 10000);
-		this.t(p, 0, 0, 0);
-		this.t(p, 0, 0, 0);
-		this.t(p, 0, 0, 0);
-		this.t(p, 0, 0, 0);
-		this.t(p, 0, 0, 0);
-		this.t(p, 0, 0, 0);
-		this.t(p, 0, 0, 0);
-		this.t(p, 0, 0, 0);
-		this.t(p, 0, 0, 0);
-		this.t(p, 0, 0, 0);
-		this.t(p, 0, 10000, 3000);
-		this.t(p, 0, 10000, 6000);
-		this.t(p, 1896, 10000, 8431);
-		this.t(p, 4490, 10000, 10000);
-		this.t(p, 6981, 10000, 10000);
-		this.t(p, 8889, 10000, 10000);
-		this.t(p, 9591, 10000, 10000);
-		this.t(p, 9850, 10000, 10000);
-		this.t(p, 9945, 10000, 10000);
-		this.t(p, 9980, 10000, 10000);
-		this.t(p, 9993, 10000, 10000);
-		this.t(p, 9997, 10000, 10000);
-		this.t(p, 9999, 10000, 10000);
-		this.t(p, 10000, 10000, 10000);
-		this.t(p, 10000, 10000, 10000);
-		this.t(p, 10000, 10000, 10000);
-		this.t(p, 10000, 10000, 10000);
-		this.t(p, 10000, 10000, 10000);
-		this.t(p, 10000, 10000, 10000);
-		this.t(p, 10000, 10000, 10000);
-		this.t(p, 10000, 10000, 10000);
-		this.t(p, 10000, 10000, 10000);
-		this.t(p, 10000, 10000, 10000);
-		this.t(p, 10000, 10000, 10000);
-		this.t(p, 10000, 10000, 10000);
-		this.t(p, 10000, 10000, 10000);
-		this.t(p, 10000, 10000, 10000);
-		this.t(p, 10000, 10000, 10000);
-		this.t(p, 10000, 10000, 10000);
+		t(p, 0, 0, 0);
+		t(p, 0, 0, 0);
+		t(p, 0, 0, 0);
+		t(p, 0, 0, 0);
+		t(p, 0, 0, 0);
+		t(p, 0, 0, 0);
+		t(p, 0, 0, 0);
+		t(p, 0, 0, 0);
+		t(p, 0, 0, 0);
+		t(p, 0, 0, 0);
+		t(p, 0, 10000, 3000);
+		t(p, 0, 10000, 6000);
+		t(p, 1896, 10000, 8431);
+		t(p, 4490, 10000, 10000);
+		t(p, 6981, 10000, 10000);
+		t(p, 8889, 10000, 10000);
+		t(p, 9591, 10000, 10000);
+		t(p, 9850, 10000, 10000);
+		t(p, 9945, 10000, 10000);
+		t(p, 9980, 10000, 10000);
+		t(p, 9993, 10000, 10000);
+		t(p, 9997, 10000, 10000);
+		t(p, 9999, 10000, 10000);
+		t(p, 10000, 10000, 10000);
+		t(p, 10000, 10000, 10000);
+		t(p, 10000, 10000, 10000);
+		t(p, 10000, 10000, 10000);
+		t(p, 10000, 10000, 10000);
+		t(p, 10000, 10000, 10000);
+		t(p, 10000, 10000, 10000);
+		t(p, 10000, 10000, 10000);
+		t(p, 10000, 10000, 10000);
+		t(p, 10000, 10000, 10000);
+		t(p, 10000, 10000, 10000);
+		t(p, 10000, 10000, 10000);
+		t(p, 10000, 10000, 10000);
+		t(p, 10000, 10000, 10000);
+		t(p, 10000, 10000, 10000);
+		t(p, 10000, 10000, 10000);
 	}
 
 	/**
@@ -118,36 +118,36 @@ public void testPriority() {
 
 		// Cycle 1
 		p.setLimits(-1000, 1000); // set by FixActivePower
-		this.t(p, 1000, 5000, 1000);
+		t(p, 1000, 5000, 1000);
 
 		// Cycle 2
 		// Limits and input value stay always at 1000 by FixActivePower
-		this.t(p, 1000, 5000, 1000);
+		t(p, 1000, 5000, 1000);
 
 		// Cycle 3
-		this.t(p, 1000, 5000, 1000);
+		t(p, 1000, 5000, 1000);
 
 		// Cycle 4
-		this.t(p, 1000, 5000, 1000);
+		t(p, 1000, 5000, 1000);
 
 		// Cycle 5
-		this.t(p, 1000, 5000, 1000);
+		t(p, 1000, 5000, 1000);
 
 		// Cycle 6
-		this.t(p, 1000, 5000, 1000);
+		t(p, 1000, 5000, 1000);
 
 		// Cycle 7
-		this.t(p, 1000, 5000, 1000);
+		t(p, 1000, 5000, 1000);
 
 		// Cycle 8
 		p.setLimits(-9999, 9999); // disable FixActivePower
-		this.t(p, 1000, 5000, 1200);
+		t(p, 1000, 5000, 1200);
 
 		// Cycle 9
-		this.t(p, 1000, 5000, 2400);
+		t(p, 1000, 5000, 2400);
 
 		// Cycle 10
-		this.t(p, 1000, 5000, 3600);
+		t(p, 1000, 5000, 3600);
 	}
 
 	private void t(PidFilter p, int input, int output, int expectedOutput) {
diff --git a/io.openems.edge.controller.ess.delaycharge/src/io/openems/edge/controller/ess/delaycharge/DelayChargeController.java b/io.openems.edge.controller.ess.delaycharge/src/io/openems/edge/controller/ess/delaycharge/DelayChargeController.java
index 36fc1fe8a57..c7890c72ef5 100644
--- a/io.openems.edge.controller.ess.delaycharge/src/io/openems/edge/controller/ess/delaycharge/DelayChargeController.java
+++ b/io.openems.edge.controller.ess.delaycharge/src/io/openems/edge/controller/ess/delaycharge/DelayChargeController.java
@@ -13,6 +13,8 @@
 import io.openems.common.exceptions.OpenemsError.OpenemsNamedException;
 import io.openems.common.types.OpenemsType;
 import io.openems.edge.common.channel.Doc;
+import io.openems.edge.common.channel.EnumReadChannel;
+import io.openems.edge.common.channel.IntegerReadChannel;
 import io.openems.edge.common.component.AbstractOpenemsComponent;
 import io.openems.edge.common.component.ComponentManager;
 import io.openems.edge.common.component.OpenemsComponent;
@@ -115,10 +117,10 @@ private int currentSecondOfDay() {
 	}
 
 	private void setChannels(State state, int limit) {
-		var stateMachineChannel = this.channel(ChannelId.STATE_MACHINE);
+		EnumReadChannel stateMachineChannel = this.channel(ChannelId.STATE_MACHINE);
 		stateMachineChannel.setNextValue(state);
 
-		var chargePowerLimitChannel = this.channel(ChannelId.CHARGE_POWER_LIMIT);
+		IntegerReadChannel chargePowerLimitChannel = this.channel(ChannelId.CHARGE_POWER_LIMIT);
 		chargePowerLimitChannel.setNextValue(limit);
 	}
 }
diff --git a/io.openems.edge.controller.ess.fixactivepower/src/io/openems/edge/controller/ess/fixactivepower/EssFixActivePowerImpl.java b/io.openems.edge.controller.ess.fixactivepower/src/io/openems/edge/controller/ess/fixactivepower/EssFixActivePowerImpl.java
index 7067e5fbb77..10672fe8353 100644
--- a/io.openems.edge.controller.ess.fixactivepower/src/io/openems/edge/controller/ess/fixactivepower/EssFixActivePowerImpl.java
+++ b/io.openems.edge.controller.ess.fixactivepower/src/io/openems/edge/controller/ess/fixactivepower/EssFixActivePowerImpl.java
@@ -48,6 +48,7 @@ public EssFixActivePowerImpl() {
 	private void activate(ComponentContext context, Config config) {
 		super.activate(context, config.id(), config.alias(), config.enabled());
 		if (this.applyConfig(context, config)) {
+			return;
 		}
 	}
 
@@ -55,6 +56,7 @@ private void activate(ComponentContext context, Config config) {
 	private void modified(ComponentContext context, Config config) {
 		super.modified(context, config.id(), config.alias(), config.enabled());
 		if (this.applyConfig(context, config)) {
+			return;
 		}
 	}
 
diff --git a/io.openems.edge.controller.ess.gridoptimizedcharge/src/io/openems/edge/controller/ess/gridoptimizedcharge/DelayCharge.java b/io.openems.edge.controller.ess.gridoptimizedcharge/src/io/openems/edge/controller/ess/gridoptimizedcharge/DelayCharge.java
index ee984ebcdb2..c7f0d35a7d3 100644
--- a/io.openems.edge.controller.ess.gridoptimizedcharge/src/io/openems/edge/controller/ess/gridoptimizedcharge/DelayCharge.java
+++ b/io.openems.edge.controller.ess.gridoptimizedcharge/src/io/openems/edge/controller/ess/gridoptimizedcharge/DelayCharge.java
@@ -12,6 +12,8 @@
 import io.openems.common.exceptions.OpenemsError.OpenemsNamedException;
 import io.openems.common.exceptions.OpenemsException;
 import io.openems.common.types.ChannelAddress;
+import io.openems.edge.common.channel.IntegerReadChannel;
+import io.openems.edge.common.channel.StateChannel;
 import io.openems.edge.common.channel.value.Value;
 import io.openems.edge.ess.power.api.Phase;
 import io.openems.edge.ess.power.api.Pwr;
@@ -75,7 +77,7 @@ protected Integer getManualDelayChargeMaxCharge() throws OpenemsNamedException {
 			} catch (DateTimeParseException i) {
 
 				// Set Info state channel and log
-				var noValidManualTargetTime = this.parent
+				StateChannel noValidManualTargetTime = this.parent
 						.channel(GridOptimizedCharge.ChannelId.NO_VALID_MANUAL_TARGET_TIME);
 				noValidManualTargetTime.setNextValue(true);
 				this.parent.logDebug(noValidManualTargetTime.channelDoc().getText());
@@ -275,7 +277,7 @@ public Integer getCalculatedPowerLimit(Integer targetMinute) throws OpenemsNamed
 		/**
 		 * Calculate the average with the last 900 limits
 		 */
-		var delayChargeLimitRawChannel = this.parent.getRawDelayChargeLimitChannel();
+		IntegerReadChannel delayChargeLimitRawChannel = this.parent.getRawDelayChargeLimitChannel();
 
 		var pastLimits = delayChargeLimitRawChannel.getPastValues()
 				.tailMap(LocalDateTime.now(this.parent.componentManager.getClock()).minusSeconds(900), true) //
diff --git a/io.openems.edge.controller.symmetric.fixreactivepower/src/io/openems/edge/controller/symmetric/fixreactivepower/Config.java b/io.openems.edge.controller.symmetric.fixreactivepower/src/io/openems/edge/controller/symmetric/fixreactivepower/Config.java
index 70f1f8d5d2c..a2a1badc88a 100644
--- a/io.openems.edge.controller.symmetric.fixreactivepower/src/io/openems/edge/controller/symmetric/fixreactivepower/Config.java
+++ b/io.openems.edge.controller.symmetric.fixreactivepower/src/io/openems/edge/controller/symmetric/fixreactivepower/Config.java
@@ -1,7 +1,7 @@
 package io.openems.edge.controller.symmetric.fixreactivepower;
 
 import org.osgi.service.metatype.annotations.AttributeDefinition;
-import org.osgi.service.metatype.annotations.ObjectClassDefinition;;
+import org.osgi.service.metatype.annotations.ObjectClassDefinition;
 
 @ObjectClassDefinition( //
 		name = "Controller Fix Reactive Power Symmetric", //
diff --git a/io.openems.edge.core/src/io/openems/edge/core/meta/MetaImpl.java b/io.openems.edge.core/src/io/openems/edge/core/meta/MetaImpl.java
index 492981f9008..5f910c734d8 100644
--- a/io.openems.edge.core/src/io/openems/edge/core/meta/MetaImpl.java
+++ b/io.openems.edge.core/src/io/openems/edge/core/meta/MetaImpl.java
@@ -38,6 +38,7 @@ public MetaImpl() {
 	void activate(ComponentContext context) {
 		super.activate(context, SINGLETON_COMPONENT_ID, Meta.SINGLETON_SERVICE_PID, true);
 		if (OpenemsComponent.validateSingleton(this.cm, Meta.SINGLETON_SERVICE_PID, SINGLETON_COMPONENT_ID)) {
+			return;
 		}
 	}
 
diff --git a/io.openems.edge.core/src/io/openems/edge/core/predictormanager/PredictorManagerImpl.java b/io.openems.edge.core/src/io/openems/edge/core/predictormanager/PredictorManagerImpl.java
index caf99bd9ded..5ee51e2f27a 100644
--- a/io.openems.edge.core/src/io/openems/edge/core/predictormanager/PredictorManagerImpl.java
+++ b/io.openems.edge.core/src/io/openems/edge/core/predictormanager/PredictorManagerImpl.java
@@ -67,6 +67,7 @@ public PredictorManagerImpl() {
 	void activate(ComponentContext context) {
 		super.activate(context, PredictorManager.SINGLETON_COMPONENT_ID, SINGLETON_SERVICE_PID, true);
 		if (OpenemsComponent.validateSingleton(this.cm, SINGLETON_SERVICE_PID, SINGLETON_COMPONENT_ID)) {
+			return;
 		}
 	}
 
diff --git a/io.openems.edge.core/test/io/openems/edge/core/componentmanager/MyConfig.java b/io.openems.edge.core/test/io/openems/edge/core/componentmanager/MyConfig.java
index f7caf276429..70fae550e5d 100644
--- a/io.openems.edge.core/test/io/openems/edge/core/componentmanager/MyConfig.java
+++ b/io.openems.edge.core/test/io/openems/edge/core/componentmanager/MyConfig.java
@@ -25,8 +25,11 @@ public static Builder create() {
 		return new Builder();
 	}
 
+	private final Builder builder;
+
 	private MyConfig(Builder builder) {
 		super(Config.class, ComponentManager.SINGLETON_COMPONENT_ID);
+		this.builder = builder;
 	}
 
 }
\ No newline at end of file
diff --git a/io.openems.edge.ess.cluster/src/io/openems/edge/ess/cluster/ChannelManager.java b/io.openems.edge.ess.cluster/src/io/openems/edge/ess/cluster/ChannelManager.java
index 466491c31af..6230f4e8351 100644
--- a/io.openems.edge.ess.cluster/src/io/openems/edge/ess/cluster/ChannelManager.java
+++ b/io.openems.edge.ess.cluster/src/io/openems/edge/ess/cluster/ChannelManager.java
@@ -231,41 +231,5 @@ private <T> void calculate(BiFunction<T, T, T> aggregator, List<SymmetricEss> es
 			}
 		}
 	}
-//	/**
-//	 * Aggregate Channels of {@link AsymmetricEss}s.
-//	 *
-//	 * @param aggregator          the aggregator function
-//	 * @param esss                the List of {@link SymmetricEss}
-//	 * @param asymmetricChannelId the AsymmetricEss.ChannelId
-//	 * @param asymmetricChannelId the fallback SymmetricEss.ChannelId; used for
-//	 *                            SymmetricEss and divided by 3
-//	 */
-//	private void calculate(BiFunction<Integer, Integer, Integer> aggregator, List<SymmetricEss> esss,
-//			AsymmetricEss.ChannelId asymmetricChannelId, SymmetricEss.ChannelId symmetricChannelId) {
-//		final BiConsumer<Value<Integer>, Value<Integer>> callback = (oldValue, newValue) -> {
-//			Integer result = null;
-//			for (SymmetricEss ess : esss) {
-//				if (ess instanceof AsymmetricEss) {
-//					Channel<Integer> channel = ((AsymmetricEss) ess).channel(asymmetricChannelId);
-//					result = aggregator.apply(result, channel.getNextValue().get());
-//				} else {
-//					// SymmetricEss
-//					Channel<Integer> channel = ess.channel(symmetricChannelId);
-//					result = aggregator.apply(result, TypeUtils.divide(channel.getNextValue().get(), 3));
-//				}
-//			}
-//
-//			Channel<Integer> channel = this.parent.channel(asymmetricChannelId);
-//			channel.setNextValue(result);
-//		};
-//
-//		for (SymmetricEss ess : esss) {
-//			if (ess instanceof AsymmetricEss) {
-//				this.addOnChangeListener((AsymmetricEss) ess, asymmetricChannelId, callback);
-//			} else {
-//				this.addOnChangeListener(ess, symmetricChannelId, callback);
-//			}
-//		}
-//	}
 
 }
diff --git a/io.openems.edge.evcs.cluster/src/io/openems/edge/evcs/cluster/EvcsClusterSelfConsumption.java b/io.openems.edge.evcs.cluster/src/io/openems/edge/evcs/cluster/EvcsClusterSelfConsumption.java
index 522ef0af0de..6ab858bb3c6 100644
--- a/io.openems.edge.evcs.cluster/src/io/openems/edge/evcs/cluster/EvcsClusterSelfConsumption.java
+++ b/io.openems.edge.evcs.cluster/src/io/openems/edge/evcs/cluster/EvcsClusterSelfConsumption.java
@@ -157,12 +157,16 @@ public List<Evcs> getSortedEvcss() {
 
 	@Override
 	public int getMaximumPowerToDistribute() {
+		int excessPower = 0;
+
 		int buyFromGrid = this.sum.getGridActivePower().orElse(0);
 		int essDischarge = this.sum.getEssActivePower().orElse(0);
 		int essActivePowerDC = this.sum.getProductionDcActualPower().orElse(0);
 		int evcsCharge = this.getChargePower().orElse(0);
 
-		return evcsCharge - buyFromGrid - (essDischarge - essActivePowerDC);
+		excessPower = evcsCharge - buyFromGrid - (essDischarge - essActivePowerDC);
+
+		return excessPower;
 	}
 
 	@Override
diff --git a/io.openems.edge.evcs.keba.kecontact/src/io/openems/edge/evcs/keba/kecontact/KebaChannelId.java b/io.openems.edge.evcs.keba.kecontact/src/io/openems/edge/evcs/keba/kecontact/KebaChannelId.java
index e52c0b80059..e4c2754ec55 100644
--- a/io.openems.edge.evcs.keba.kecontact/src/io/openems/edge/evcs/keba/kecontact/KebaChannelId.java
+++ b/io.openems.edge.evcs.keba.kecontact/src/io/openems/edge/evcs/keba/kecontact/KebaChannelId.java
@@ -9,42 +9,64 @@
 
 public enum KebaChannelId implements io.openems.edge.common.channel.ChannelId {
 
-	ALIAS(Doc.of(OpenemsType.STRING).text("A human-readable name of this Component")),
+	ALIAS(Doc.of(OpenemsType.STRING) //
+			.text("A human-readable name of this Component")),
 	/*
 	 * Report 1
 	 */
-	PRODUCT(Doc.of(OpenemsType.STRING).text("Model name (variant)")), //
-	SERIAL(Doc.of(OpenemsType.STRING).text("Serial number")), //
-	FIRMWARE(Doc.of(OpenemsType.STRING).text("Firmware version")), //
-	COM_MODULE(Doc.of(OpenemsType.STRING).text("Communication module is installed; KeContact P30 only")),
-	DIP_SWITCH_1(Doc.of(OpenemsType.STRING).text("The first eight dip switch settings as binary")),
-	DIP_SWITCH_2(Doc.of(OpenemsType.STRING).text("The second eight dip switch settings as binary")),
-	DIP_SWITCH_MAX_HW(
-			Doc.of(OpenemsType.INTEGER).unit(Unit.AMPERE).text("The raw maximum limit configured by the dip switches")),
+	PRODUCT(Doc.of(OpenemsType.STRING) //
+			.text("Model name (variant)")), //
+	SERIAL(Doc.of(OpenemsType.STRING) //
+			.text("Serial number")), //
+	FIRMWARE(Doc.of(OpenemsType.STRING) //
+			.text("Firmware version")), //
+	COM_MODULE(Doc.of(OpenemsType.STRING) //
+			.text("Communication module is installed; KeContact P30 only")),
+	DIP_SWITCH_1(Doc.of(OpenemsType.STRING) //
+			.text("The first eight dip switch settings as binary")),
+	DIP_SWITCH_2(Doc.of(OpenemsType.STRING) //
+			.text("The second eight dip switch settings as binary")),
+	DIP_SWITCH_MAX_HW(Doc.of(OpenemsType.INTEGER) //
+			.unit(Unit.AMPERE) //
+			.text("The raw maximum limit configured by the dip switches")),
 
 	/*
 	 * Report 2
 	 */
-	STATUS_KEBA(Doc.of(Status.values()).text("Current state of the charging station")),
-	ERROR_1(Doc.of(OpenemsType.INTEGER).text("Detail code for state ERROR; exceptions see FAQ on www.kecontact.com")), //
-	ERROR_2(Doc.of(OpenemsType.INTEGER).text("Detail code for state ERROR; exceptions see FAQ on www.kecontact.com")), //
-	PLUG(Doc.of(Plug.values())),
-	ENABLE_SYS(Doc.of(OpenemsType.BOOLEAN).text("Enable state for charging (contains Enable input, RFID, UDP,..)")), //
-	ENABLE_USER(Doc.of(OpenemsType.BOOLEAN).text("Enable condition via UDP")), //
-	MAX_CURR(Doc.of(OpenemsType.INTEGER).unit(Unit.MILLIAMPERE).text("Current preset value via Control pilot")), //
-	MAX_CURR_PERCENT(
-			Doc.of(OpenemsType.INTEGER).text("Current preset value via Control pilot in 0,1% of the PWM value")), //
-	CURR_USER(Doc.of(OpenemsType.INTEGER).unit(Unit.MILLIAMPERE)
-			.text("Current preset value of the user via UDP; Default = 63000mA")), //
-	CURR_FAILSAFE(
-			Doc.of(OpenemsType.INTEGER).unit(Unit.MILLIAMPERE).text("Current preset value for the Failsafe function")), //
-	TIMEOUT_FAILSAFE(Doc.of(OpenemsType.INTEGER).unit(Unit.SECONDS)
+	STATUS_KEBA(Doc.of(Status.values()) //
+			.text("Current state of the charging station")),
+	ERROR_1(Doc.of(OpenemsType.INTEGER) //
+			.text("Detail code for state ERROR; exceptions see FAQ on www.kecontact.com")), //
+	ERROR_2(Doc.of(OpenemsType.INTEGER) //
+			.text("Detail code for state ERROR; exceptions see FAQ on www.kecontact.com")), //
+	PLUG(Doc.of(Plug.values())), ENABLE_SYS(Doc.of(OpenemsType.BOOLEAN) //
+			.text("Enable state for charging (contains Enable input, RFID, UDP,..)")), //
+	ENABLE_USER(Doc.of(OpenemsType.BOOLEAN) //
+			.text("Enable condition via UDP")), //
+	MAX_CURR(Doc.of(OpenemsType.INTEGER) //
+			.unit(Unit.MILLIAMPERE) //
+			.text("Current preset value via Control pilot")), //
+	MAX_CURR_PERCENT(Doc.of(OpenemsType.INTEGER) //
+			.text("Current preset value via Control pilot in 0,1% of the PWM value")), //
+	CURR_USER(Doc.of(OpenemsType.INTEGER) //
+			.unit(Unit.MILLIAMPERE).text("Current preset value of the user via UDP; Default = 63000mA")), //
+	CURR_FAILSAFE(Doc.of(OpenemsType.INTEGER) //
+			.unit(Unit.MILLIAMPERE) //
+			.text("Current preset value for the Failsafe function")), //
+	TIMEOUT_FAILSAFE(Doc.of(OpenemsType.INTEGER) //
+			.unit(Unit.SECONDS) //
 			.text("Communication timeout before triggering the Failsafe function")), //
-	CURR_TIMER(Doc.of(OpenemsType.INTEGER).unit(Unit.MILLIAMPERE).text("Shows the current preset value of currtime")), //
-	TIMEOUT_CT(Doc.of(OpenemsType.INTEGER).unit(Unit.SECONDS)
+	CURR_TIMER(Doc.of(OpenemsType.INTEGER) //
+			.unit(Unit.MILLIAMPERE) //
+			.text("Shows the current preset value of currtime")), //
+	TIMEOUT_CT(Doc.of(OpenemsType.INTEGER) //
+			.unit(Unit.SECONDS) //
 			.text("Shows the remaining time until the current value is accepted")), //
-	OUTPUT(Doc.of(OpenemsType.BOOLEAN).unit(Unit.ON_OFF).text("State of the output X2")), //
-	INPUT(Doc.of(OpenemsType.BOOLEAN).unit(Unit.ON_OFF)
+	OUTPUT(Doc.of(OpenemsType.BOOLEAN) //
+			.unit(Unit.ON_OFF) //
+			.text("State of the output X2")), //
+	INPUT(Doc.of(OpenemsType.BOOLEAN) //
+			.unit(Unit.ON_OFF) //
 			.text("State of the potential free Enable input X1. When using the input, "
 					+ "please pay attention to the information in the installation manual.")), //
 	/*
@@ -58,7 +80,8 @@ public enum KebaChannelId implements io.openems.edge.common.channel.ChannelId {
 	CURRENT_L3(Doc.of(OpenemsType.INTEGER).unit(Unit.MILLIAMPERE).text("Current on L3")), //
 	ACTUAL_POWER(Doc.of(OpenemsType.INTEGER).unit(Unit.MILLIWATT).text("Total real power")), //
 	COS_PHI(Doc.of(OpenemsType.INTEGER).unit(Unit.PERCENT).text("Power factor")), //
-	ENERGY_TOTAL(Doc.of(OpenemsType.LONG).unit(Unit.WATT_HOURS)
+	ENERGY_TOTAL(Doc.of(OpenemsType.LONG) //
+			.unit(Unit.WATT_HOURS) //
 			.text("Total power consumption (persistent) without current loading session. "
 					+ "Is summed up after each completed charging session")), //
 	DIP_SWITCH_ERROR_1_3_NOT_SET_FOR_COMM(Doc.of(Level.FAULT) //
diff --git a/io.openems.edge.goodwe/src/io/openems/edge/goodwe/common/AbstractGoodWe.java b/io.openems.edge.goodwe/src/io/openems/edge/goodwe/common/AbstractGoodWe.java
index 534f2485b42..341ab29dd58 100644
--- a/io.openems.edge.goodwe/src/io/openems/edge/goodwe/common/AbstractGoodWe.java
+++ b/io.openems.edge.goodwe/src/io/openems/edge/goodwe/common/AbstractGoodWe.java
@@ -28,6 +28,8 @@
 import io.openems.edge.bridge.modbus.api.task.FC16WriteRegistersTask;
 import io.openems.edge.bridge.modbus.api.task.FC3ReadRegistersTask;
 import io.openems.edge.common.channel.Channel;
+import io.openems.edge.common.channel.EnumReadChannel;
+import io.openems.edge.common.channel.IntegerReadChannel;
 import io.openems.edge.common.component.OpenemsComponent;
 import io.openems.edge.common.sum.GridMode;
 import io.openems.edge.common.taskmanager.Priority;
@@ -1846,8 +1848,8 @@ protected AbstractModbusElement<?> getSocModbusElement(int address) throws NotIm
 					// element -> channel
 					value -> {
 						// Set SoC to undefined if there is No Battery
-						var batteryModeChannel = this.channel(GoodWe.ChannelId.BATTERY_MODE);
-						var batteryMode = batteryModeChannel.value().asEnum();
+						EnumReadChannel batteryModeChannel = this.channel(GoodWe.ChannelId.BATTERY_MODE);
+						BatteryMode batteryMode = batteryModeChannel.value().asEnum();
 						if (batteryMode == BatteryMode.NO_BATTERY || batteryMode == BatteryMode.UNDEFINED) {
 							return null;
 						} else {
@@ -1897,7 +1899,7 @@ protected void updatePowerAndEnergyChannels() {
 		/*
 		 * Update AC Active Power
 		 */
-		var activePowerChannel = this.channel(this.activePowerChannelId);
+		IntegerReadChannel activePowerChannel = this.channel(this.activePowerChannelId);
 		activePowerChannel.setNextValue(acActivePower);
 
 		/*
@@ -1920,7 +1922,7 @@ protected void updatePowerAndEnergyChannels() {
 		/*
 		 * Update DC Discharge Power
 		 */
-		var dcDischargePowerChannel = this.channel(this.dcDischargePowerChannelId);
+		IntegerReadChannel dcDischargePowerChannel = this.channel(this.dcDischargePowerChannelId);
 		dcDischargePowerChannel.setNextValue(dcDischargePower);
 
 		/*
diff --git a/io.openems.edge.pvinverter.solarlog/src/io/openems/edge/pvinverter/solarlog/SolarLogImpl.java b/io.openems.edge.pvinverter.solarlog/src/io/openems/edge/pvinverter/solarlog/SolarLogImpl.java
index d353e08dd6d..78382a8f857 100644
--- a/io.openems.edge.pvinverter.solarlog/src/io/openems/edge/pvinverter/solarlog/SolarLogImpl.java
+++ b/io.openems.edge.pvinverter.solarlog/src/io/openems/edge/pvinverter/solarlog/SolarLogImpl.java
@@ -89,6 +89,7 @@ void activate(ComponentContext context, Config config) throws OpenemsException {
 
 		// Stop if component is disabled
 		if (!config.enabled()) {
+			return;
 		}
 	}
 
diff --git a/io.openems.edge.simulator/src/io/openems/edge/simulator/app/SimulatorApp.java b/io.openems.edge.simulator/src/io/openems/edge/simulator/app/SimulatorApp.java
index a32dcba1ccd..149206be49c 100644
--- a/io.openems.edge.simulator/src/io/openems/edge/simulator/app/SimulatorApp.java
+++ b/io.openems.edge.simulator/src/io/openems/edge/simulator/app/SimulatorApp.java
@@ -149,6 +149,7 @@ public SimulatorApp() {
 	void activate(ComponentContext componentContext, Config config) throws OpenemsException {
 		super.activate(componentContext, SINGLETON_COMPONENT_ID, SINGLETON_SERVICE_PID, config.enabled());
 		if (OpenemsComponent.validateSingleton(this.cm, SINGLETON_SERVICE_PID, SINGLETON_COMPONENT_ID)) {
+			return;
 		}
 	}
 
diff --git a/io.openems.edge.timedata.influxdb/src/io/openems/edge/timedata/influxdb/InfluxTimedataImpl.java b/io.openems.edge.timedata.influxdb/src/io/openems/edge/timedata/influxdb/InfluxTimedataImpl.java
index ecd2c498f08..5ed81c9fd64 100644
--- a/io.openems.edge.timedata.influxdb/src/io/openems/edge/timedata/influxdb/InfluxTimedataImpl.java
+++ b/io.openems.edge.timedata.influxdb/src/io/openems/edge/timedata/influxdb/InfluxTimedataImpl.java
@@ -78,7 +78,8 @@ void activate(ComponentContext context, Config config) {
 		this.influxConnector = new InfluxConnector(config.ip(), config.port(), config.username(), config.password(),
 				config.database(), config.retentionPolicy(), config.isReadOnly(), //
 				(failedPoints, throwable) -> {
-					var pointsString = StreamSupport.stream(failedPoints.spliterator(), false).map(Point::lineProtocol)
+					var pointsString = StreamSupport.stream(failedPoints.spliterator(), false)//
+							.map(Point::lineProtocol) //
 							.collect(Collectors.joining(","));
 					this.logError(this.log, "Unable to write to InfluxDB: " + throwable.getMessage() + " for "
 							+ StringUtils.toShortString(pointsString, 100));
diff --git a/io.openems.edge.timeofusetariff.tibber/test/io/openems/edge/timeofusetariff/tibber/TibberProviderTest.java b/io.openems.edge.timeofusetariff.tibber/test/io/openems/edge/timeofusetariff/tibber/TibberProviderTest.java
index d1a1f962c51..2abb3ce3c7f 100644
--- a/io.openems.edge.timeofusetariff.tibber/test/io/openems/edge/timeofusetariff/tibber/TibberProviderTest.java
+++ b/io.openems.edge.timeofusetariff.tibber/test/io/openems/edge/timeofusetariff/tibber/TibberProviderTest.java
@@ -32,59 +32,118 @@ public void test() throws Exception {
 	@Test
 	public void nonEmptyStringTest() throws OpenemsNamedException {
 		// Parsing with custom data
-		SortedMap<ZonedDateTime, Float> prices = TibberImpl.parsePrices("{\n" + "  \"data\": {\n"
-				+ "    \"viewer\": {\n" + "      \"homes\": [\n" + "        {\n"
-				+ "          \"currentSubscription\": {\n" + "            \"priceInfo\": {\n"
-				+ "              \"today\": [\n" + "                {\n" + "                  \"total\": 0.187,\n"
-				+ "                  \"startsAt\": \"2021-11-15T00:00:00.000+01:00\"\n" + "                },\n"
-				+ "                {\n" + "                  \"total\": 0.1841,\n"
-				+ "                  \"startsAt\": \"2021-11-15T01:00:00.000+01:00\"\n" + "                },\n"
-				+ "                {\n" + "                  \"total\": 0.18,\n"
-				+ "                  \"startsAt\": \"2021-11-15T02:00:00.000+01:00\"\n" + "                },\n"
-				+ "                {\n" + "                  \"total\": 0.1747,\n"
-				+ "                  \"startsAt\": \"2021-11-15T03:00:00.000+01:00\"\n" + "                },\n"
-				+ "                {\n" + "                  \"total\": 0.179,\n"
-				+ "                  \"startsAt\": \"2021-11-15T04:00:00.000+01:00\"\n" + "                },\n"
-				+ "                {\n" + "                  \"total\": 0.1809,\n"
-				+ "                  \"startsAt\": \"2021-11-15T05:00:00.000+01:00\"\n" + "                },\n"
-				+ "                {\n" + "                  \"total\": 0.1795,\n"
-				+ "                  \"startsAt\": \"2021-11-15T06:00:00.000+01:00\"\n" + "                },\n"
-				+ "                {\n" + "                  \"total\": 0.1848,\n"
-				+ "                  \"startsAt\": \"2021-11-15T07:00:00.000+01:00\"\n" + "                },\n"
-				+ "                {\n" + "                  \"total\": 0.1868,\n"
-				+ "                  \"startsAt\": \"2021-11-15T08:00:00.000+01:00\"\n" + "                },\n"
-				+ "                {\n" + "                  \"total\": 0.1876,\n"
-				+ "                  \"startsAt\": \"2021-11-15T09:00:00.000+01:00\"\n" + "                },\n"
-				+ "                {\n" + "                  \"total\": 0.1874,\n"
-				+ "                  \"startsAt\": \"2021-11-15T10:00:00.000+01:00\"\n" + "                },\n"
-				+ "                {\n" + "                  \"total\": 0.1874,\n"
-				+ "                  \"startsAt\": \"2021-11-15T11:00:00.000+01:00\"\n" + "                },\n"
-				+ "                {\n" + "                  \"total\": 0.1875,\n"
-				+ "                  \"startsAt\": \"2021-11-15T12:00:00.000+01:00\"\n" + "                },\n"
-				+ "                {\n" + "                  \"total\": 0.1878,\n"
-				+ "                  \"startsAt\": \"2021-11-15T13:00:00.000+01:00\"\n" + "                },\n"
-				+ "                {\n" + "                  \"total\": 0.1868,\n"
-				+ "                  \"startsAt\": \"2021-11-15T14:00:00.000+01:00\"\n" + "                },\n"
-				+ "                {\n" + "                  \"total\": 0.1853,\n"
-				+ "                  \"startsAt\": \"2021-11-15T15:00:00.000+01:00\"\n" + "                },\n"
-				+ "                {\n" + "                  \"total\": 0.1848,\n"
-				+ "                  \"startsAt\": \"2021-11-15T16:00:00.000+01:00\"\n" + "                },\n"
-				+ "                {\n" + "                  \"total\": 0.1829,\n"
-				+ "                  \"startsAt\": \"2021-11-15T17:00:00.000+01:00\"\n" + "                },\n"
-				+ "                {\n" + "                  \"total\": 0.1835,\n"
-				+ "                  \"startsAt\": \"2021-11-15T18:00:00.000+01:00\"\n" + "                },\n"
-				+ "                {\n" + "                  \"total\": 0.1846,\n"
-				+ "                  \"startsAt\": \"2021-11-15T19:00:00.000+01:00\"\n" + "                },\n"
-				+ "                {\n" + "                  \"total\": 0.1851,\n"
-				+ "                  \"startsAt\": \"2021-11-15T20:00:00.000+01:00\"\n" + "                },\n"
-				+ "                {\n" + "                  \"total\": 0.1854,\n"
-				+ "                  \"startsAt\": \"2021-11-15T21:00:00.000+01:00\"\n" + "                },\n"
-				+ "                {\n" + "                  \"total\": 0.1853,\n"
-				+ "                  \"startsAt\": \"2021-11-15T22:00:00.000+01:00\"\n" + "                },\n"
-				+ "                {\n" + "                  \"total\": 0.1831,\n"
-				+ "                  \"startsAt\": \"2021-11-15T23:00:00.000+01:00\"\n" + "                }\n"
-				+ "              ],\n" + "              \"tomorrow\": []\n" + "            }\n" + "          }\n"
-				+ "        }\n" + "      ]\n" + "    }\n" + "  }\n" + "}"); //
+		SortedMap<ZonedDateTime, Float> prices = TibberImpl.parsePrices("{\n" //
+				+ "  \"data\": {\n" + "    \"viewer\": {\n" //
+				+ "      \"homes\": [\n" //
+				+ "        {\n" //
+				+ "          \"currentSubscription\": {\n" //
+				+ "            \"priceInfo\": {\n" //
+				+ "              \"today\": [\n" //
+				+ "                {\n" //
+				+ "                  \"total\": 0.187,\n"
+				+ "                  \"startsAt\": \"2021-11-15T00:00:00.000+01:00\"\n" //
+				+ "                },\n" //
+				+ "                {\n" //
+				+ "                  \"total\": 0.1841,\n"
+				+ "                  \"startsAt\": \"2021-11-15T01:00:00.000+01:00\"\n" //
+				+ "                },\n" //
+				+ "                {\n" //
+				+ "                  \"total\": 0.18,\n"
+				+ "                  \"startsAt\": \"2021-11-15T02:00:00.000+01:00\"\n" //
+				+ "                },\n" //
+				+ "                {\n" //
+				+ "                  \"total\": 0.1747,\n"
+				+ "                  \"startsAt\": \"2021-11-15T03:00:00.000+01:00\"\n" //
+				+ "                },\n" //
+				+ "                {\n" //
+				+ "                  \"total\": 0.179,\n"
+				+ "                  \"startsAt\": \"2021-11-15T04:00:00.000+01:00\"\n" //
+				+ "                },\n" //
+				+ "                {\n" //
+				+ "                  \"total\": 0.1809,\n"
+				+ "                  \"startsAt\": \"2021-11-15T05:00:00.000+01:00\"\n" //
+				+ "                },\n" //
+				+ "                {\n" //
+				+ "                  \"total\": 0.1795,\n"
+				+ "                  \"startsAt\": \"2021-11-15T06:00:00.000+01:00\"\n" //
+				+ "                },\n" //
+				+ "                {\n" //
+				+ "                  \"total\": 0.1848,\n"
+				+ "                  \"startsAt\": \"2021-11-15T07:00:00.000+01:00\"\n" //
+				+ "                },\n" //
+				+ "                {\n" //
+				+ "                  \"total\": 0.1868,\n"
+				+ "                  \"startsAt\": \"2021-11-15T08:00:00.000+01:00\"\n" //
+				+ "                },\n" //
+				+ "                {\n" //
+				+ "                  \"total\": 0.1876,\n"
+				+ "                  \"startsAt\": \"2021-11-15T09:00:00.000+01:00\"\n" //
+				+ "                },\n" //
+				+ "                {\n" //
+				+ "                  \"total\": 0.1874,\n"
+				+ "                  \"startsAt\": \"2021-11-15T10:00:00.000+01:00\"\n" //
+				+ "                },\n" //
+				+ "                {\n" //
+				+ "                  \"total\": 0.1874,\n"
+				+ "                  \"startsAt\": \"2021-11-15T11:00:00.000+01:00\"\n" //
+				+ "                },\n" //
+				+ "                {\n" //
+				+ "                  \"total\": 0.1875,\n"
+				+ "                  \"startsAt\": \"2021-11-15T12:00:00.000+01:00\"\n" //
+				+ "                },\n" //
+				+ "                {\n" //
+				+ "                  \"total\": 0.1878,\n"
+				+ "                  \"startsAt\": \"2021-11-15T13:00:00.000+01:00\"\n" //
+				+ "                },\n" //
+				+ "                {\n" //
+				+ "                  \"total\": 0.1868,\n"
+				+ "                  \"startsAt\": \"2021-11-15T14:00:00.000+01:00\"\n" //
+				+ "                },\n" //
+				+ "                {\n" //
+				+ "                  \"total\": 0.1853,\n"
+				+ "                  \"startsAt\": \"2021-11-15T15:00:00.000+01:00\"\n" //
+				+ "                },\n" //
+				+ "                {\n" //
+				+ "                  \"total\": 0.1848,\n"
+				+ "                  \"startsAt\": \"2021-11-15T16:00:00.000+01:00\"\n" //
+				+ "                },\n" //
+				+ "                {\n" //
+				+ "                  \"total\": 0.1829,\n"
+				+ "                  \"startsAt\": \"2021-11-15T17:00:00.000+01:00\"\n" //
+				+ "                },\n" //
+				+ "                {\n" //
+				+ "                  \"total\": 0.1835,\n"
+				+ "                  \"startsAt\": \"2021-11-15T18:00:00.000+01:00\"\n" //
+				+ "                },\n" //
+				+ "                {\n" //
+				+ "                  \"total\": 0.1846,\n"
+				+ "                  \"startsAt\": \"2021-11-15T19:00:00.000+01:00\"\n" //
+				+ "                },\n" //
+				+ "                {\n" //
+				+ "                  \"total\": 0.1851,\n"
+				+ "                  \"startsAt\": \"2021-11-15T20:00:00.000+01:00\"\n" //
+				+ "                },\n" //
+				+ "                {\n" //
+				+ "                  \"total\": 0.1854,\n"
+				+ "                  \"startsAt\": \"2021-11-15T21:00:00.000+01:00\"\n" //
+				+ "                },\n" //
+				+ "                {\n" //
+				+ "                  \"total\": 0.1853,\n"
+				+ "                  \"startsAt\": \"2021-11-15T22:00:00.000+01:00\"\n" //
+				+ "                },\n" //
+				+ "                {\n" //
+				+ "                  \"total\": 0.1831,\n"
+				+ "                  \"startsAt\": \"2021-11-15T23:00:00.000+01:00\"\n" //
+				+ "                }\n" //
+				+ "              ],\n" //
+				+ "              \"tomorrow\": []\n" //
+				+ "            }\n" //
+				+ "          }\n" //
+				+ "        }\n" //
+				+ "      ]\n" //
+				+ "    }\n" //
+				+ "  }\n" //
+				+ "}"); //
 
 		// To check if the Map is not empty
 		assertFalse(prices.isEmpty());

From e51652440b37bb473badede47d8e1f3ef4e547bc Mon Sep 17 00:00:00 2001
From: Stefan Feilmeier <stefan.feilmeier@fenecon.de>
Date: Fri, 11 Mar 2022 21:41:19 +0100
Subject: [PATCH 94/96] More cleanup

---
 .../openems/backend/b2brest/RestHandler.java  | 10 +-
 .../openems/backend/b2bwebsocket/OnOpen.java  |  7 +-
 .../SubscribedEdgesChannelsWorker.java        |  3 +-
 .../openems/backend/b2bwebsocket/WsData.java  |  2 +-
 .../EdgesCurrentDataNotification.java         | 10 +-
 .../SubscribeEdgesChannelsRequest.java        | 10 +-
 .../GetEdgesChannelsValuesResponse.java       |  8 +-
 .../response/GetEdgesStatusResponse.java      |  2 +-
 .../response/GetUserInformationResponse.java  |  2 +-
 .../openems/backend/common/metadata/Edge.java | 14 +--
 .../backend/common/metadata/Metadata.java     |  5 +-
 .../backend/common/timedata/EdgeCache.java    |  8 +-
 .../EdgeRpcRequestHandler.java                |  6 +-
 .../backend/edgewebsocket/OnNotification.java |  2 +-
 .../openems/backend/edgewebsocket/OnOpen.java |  2 +-
 .../edgewebsocket/SystemLogHandler.java       | 35 ++++---
 .../edgewebsocket/WebsocketServer.java        |  2 +-
 .../openems/backend/edgewebsocket/WsData.java |  4 +-
 .../backend/metadata/file/FileMetadata.java   |  6 +-
 .../backend/metadata/odoo/OdooMetadata.java   |  2 +-
 .../odoo/postgres/InitializeEdgesWorker.java  | 13 ++-
 .../odoo/postgres/PeriodicWriteWorker.java    |  4 +-
 .../backend/timedata/dummy/TimedataDummy.java |  4 +-
 .../timedata/influx/ChannelFormula.java       |  5 +-
 .../backend/timedata/influx/Influx.java       | 33 ++++---
 .../backend/uiwebsocket/impl/OnRequest.java   |  2 +-
 .../common/channel/PersistencePriority.java   |  4 +-
 .../src/io/openems/common/channel/Unit.java   |  6 +-
 .../common/exceptions/OpenemsError.java       |  2 +-
 .../common/function/ThrowingRunnable.java     |  2 +-
 .../jsonrpc/base/AbstractJsonrpcRequest.java  |  2 +-
 .../base/GenericJsonrpcNotification.java      |  4 +-
 .../common/jsonrpc/base/JsonrpcMessage.java   | 12 +--
 .../common/jsonrpc/base/JsonrpcResponse.java  |  7 +-
 .../jsonrpc/base/JsonrpcResponseError.java    |  6 +-
 .../jsonrpc/base/JsonrpcResponseSuccess.java  |  2 +-
 .../notification/CurrentDataNotification.java |  2 +-
 .../notification/EdgeConfigNotification.java  |  4 +-
 .../notification/SystemLogNotification.java   |  4 +-
 .../TimestampedDataNotification.java          | 14 +--
 .../request/AuthenticatedRpcRequest.java      |  4 +-
 .../request/UpdateUserLanguageRequest.java    |  2 +-
 .../response/AuthenticatedRpcResponse.java    |  2 +-
 .../QueryHistoricTimeseriesDataResponse.java  |  6 +-
 ...oricTimeseriesEnergyPerPeriodResponse.java |  6 +-
 .../timedata/CommonTimedataService.java       |  6 +-
 .../openems/common/types/ChannelAddress.java  | 10 +-
 .../common/types/ConfigurationProperty.java   | 11 ++-
 .../io/openems/common/types/EdgeConfig.java   | 91 +++++++++----------
 .../openems/common/types/EdgeConfigDiff.java  | 30 +++---
 .../openems/common/types/SemanticVersion.java |  2 +-
 .../io/openems/common/utils/EnumUtils.java    | 18 ++--
 .../io/openems/common/utils/JsonUtils.java    | 69 ++++++++------
 .../src/io/openems/common/utils/Mutex.java    |  4 +-
 .../common/utils/SecureRandomSingleton.java   |  2 +-
 .../io/openems/common/utils/StringUtils.java  | 15 +--
 .../src/io/openems/common/utils/XmlUtils.java | 26 +++---
 .../websocket/AbstractWebsocketClient.java    |  2 +-
 .../websocket/AbstractWebsocketServer.java    |  4 +-
 .../websocket/DummyWebsocketServer.java       | 10 +-
 .../io/openems/common/websocket/OnOpen.java   |  4 +-
 .../common/websocket/OnRequestHandler.java    |  2 +-
 62 files changed, 302 insertions(+), 296 deletions(-)

diff --git a/io.openems.backend.b2brest/src/io/openems/backend/b2brest/RestHandler.java b/io.openems.backend.b2brest/src/io/openems/backend/b2brest/RestHandler.java
index ef6cc491eeb..dce3bd937ba 100644
--- a/io.openems.backend.b2brest/src/io/openems/backend/b2brest/RestHandler.java
+++ b/io.openems.backend.b2brest/src/io/openems/backend/b2brest/RestHandler.java
@@ -49,7 +49,7 @@ public RestHandler(B2bRest parent) {
 	public void handle(String target, Request baseRequest, HttpServletRequest request, HttpServletResponse response)
 			throws IOException, ServletException {
 		try {
-			User user = this.authenticate(request);
+			var user = this.authenticate(request);
 
 			List<String> targets = Arrays.asList(//
 					target.substring(1) // remove leading '/'
@@ -59,7 +59,7 @@ public void handle(String target, Request baseRequest, HttpServletRequest reques
 				throw new OpenemsException("Missing arguments to handle request");
 			}
 
-			String thisTarget = targets.get(0);
+			var thisTarget = targets.get(0);
 			switch (thisTarget) {
 			case "jsonrpc":
 				this.handleJsonRpc(user, baseRequest, request, response);
@@ -78,11 +78,11 @@ public void handle(String target, Request baseRequest, HttpServletRequest reques
 	 * @throws OpenemsNamedException on error
 	 */
 	private User authenticate(HttpServletRequest request) throws OpenemsNamedException {
-		String authHeader = request.getHeader("Authorization");
+		var authHeader = request.getHeader("Authorization");
 		if (authHeader != null) {
 			var st = new StringTokenizer(authHeader);
 			if (st.hasMoreTokens()) {
-				String basic = st.nextToken();
+				var basic = st.nextToken();
 				if (basic.equalsIgnoreCase("Basic")) {
 					String credentials;
 					try {
@@ -90,7 +90,7 @@ private User authenticate(HttpServletRequest request) throws OpenemsNamedExcepti
 					} catch (UnsupportedEncodingException e) {
 						throw OpenemsError.COMMON_AUTHENTICATION_FAILED.exception();
 					}
-					int p = credentials.indexOf(":");
+					var p = credentials.indexOf(":");
 					if (p != -1) {
 						var username = credentials.substring(0, p).trim();
 						var password = credentials.substring(p + 1).trim();
diff --git a/io.openems.backend.b2bwebsocket/src/io/openems/backend/b2bwebsocket/OnOpen.java b/io.openems.backend.b2bwebsocket/src/io/openems/backend/b2bwebsocket/OnOpen.java
index 917ef5eecd9..fa0e7706a90 100644
--- a/io.openems.backend.b2bwebsocket/src/io/openems/backend/b2bwebsocket/OnOpen.java
+++ b/io.openems.backend.b2bwebsocket/src/io/openems/backend/b2bwebsocket/OnOpen.java
@@ -9,7 +9,6 @@
 
 import com.google.gson.JsonObject;
 
-import io.openems.backend.common.metadata.User;
 import io.openems.common.exceptions.OpenemsError;
 import io.openems.common.exceptions.OpenemsError.OpenemsNamedException;
 import io.openems.common.utils.JsonUtils;
@@ -33,8 +32,8 @@ public void run(WebSocket ws, JsonObject handshake) throws OpenemsNamedException
 				throw OpenemsError.COMMON_AUTHENTICATION_FAILED.exception();
 			}
 
-			String base64Credentials = authorization.substring("Basic".length()).trim();
-			byte[] credDecoded = Base64.getDecoder().decode(base64Credentials);
+			var base64Credentials = authorization.substring("Basic".length()).trim();
+			var credDecoded = Base64.getDecoder().decode(base64Credentials);
 			var credentials = new String(credDecoded, StandardCharsets.UTF_8);
 			// credentials = username:password
 			final var values = credentials.split(":", 2);
@@ -43,7 +42,7 @@ public void run(WebSocket ws, JsonObject handshake) throws OpenemsNamedException
 			}
 			var username = values[0];
 			var password = values[1];
-			User user = this.parent.metadata.authenticate(username, password);
+			var user = this.parent.metadata.authenticate(username, password);
 
 			WsData wsData = ws.getAttachment();
 			wsData.setUser(user);
diff --git a/io.openems.backend.b2bwebsocket/src/io/openems/backend/b2bwebsocket/SubscribedEdgesChannelsWorker.java b/io.openems.backend.b2bwebsocket/src/io/openems/backend/b2bwebsocket/SubscribedEdgesChannelsWorker.java
index f3a8f42c4e9..6da5bae1201 100644
--- a/io.openems.backend.b2bwebsocket/src/io/openems/backend/b2bwebsocket/SubscribedEdgesChannelsWorker.java
+++ b/io.openems.backend.b2bwebsocket/src/io/openems/backend/b2bwebsocket/SubscribedEdgesChannelsWorker.java
@@ -9,7 +9,6 @@
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-import com.google.gson.JsonElement;
 import com.google.gson.JsonNull;
 
 import io.openems.backend.b2bwebsocket.jsonrpc.notification.EdgesCurrentDataNotification;
@@ -131,7 +130,7 @@ private EdgesCurrentDataNotification getCurrentDataNotification() throws Openems
 			user.assertEdgeRoleIsAtLeast("EdgesCurrentDataNotification", edgeId, Role.GUEST);
 
 			for (ChannelAddress channel : this.channels) {
-				Optional<JsonElement> value = this.parent.timeData.getChannelValue(edgeId, channel);
+				var value = this.parent.timeData.getChannelValue(edgeId, channel);
 				result.addValue(edgeId, channel, value.orElse(JsonNull.INSTANCE));
 			}
 		}
diff --git a/io.openems.backend.b2bwebsocket/src/io/openems/backend/b2bwebsocket/WsData.java b/io.openems.backend.b2bwebsocket/src/io/openems/backend/b2bwebsocket/WsData.java
index d0db7fafc76..87fdfcebcf3 100644
--- a/io.openems.backend.b2bwebsocket/src/io/openems/backend/b2bwebsocket/WsData.java
+++ b/io.openems.backend.b2bwebsocket/src/io/openems/backend/b2bwebsocket/WsData.java
@@ -37,7 +37,7 @@ public CompletableFuture<User> getUser() {
 
 	/**
 	 * Gets the logged in User with a timeout.
-	 * 
+	 *
 	 * @param timeout the timeout length
 	 * @param unit    the {@link TimeUnit} of the timeout
 	 * @return the {@link User}
diff --git a/io.openems.backend.b2bwebsocket/src/io/openems/backend/b2bwebsocket/jsonrpc/notification/EdgesCurrentDataNotification.java b/io.openems.backend.b2bwebsocket/src/io/openems/backend/b2bwebsocket/jsonrpc/notification/EdgesCurrentDataNotification.java
index 36a50f361d7..3e80187f21a 100644
--- a/io.openems.backend.b2bwebsocket/src/io/openems/backend/b2bwebsocket/jsonrpc/notification/EdgesCurrentDataNotification.java
+++ b/io.openems.backend.b2bwebsocket/src/io/openems/backend/b2bwebsocket/jsonrpc/notification/EdgesCurrentDataNotification.java
@@ -39,7 +39,7 @@ public EdgesCurrentDataNotification() {
 
 	/**
 	 * Adds a value to the notification.
-	 * 
+	 *
 	 * @param edgeId  the Edge-ID
 	 * @param channel the {@link ChannelAddress}
 	 * @param value   the value
@@ -52,12 +52,12 @@ public void addValue(String edgeId, ChannelAddress channel, JsonElement value) {
 	public JsonObject getParams() {
 		var j = new JsonObject();
 		for (Entry<String, Map<ChannelAddress, JsonElement>> row : this.values.rowMap().entrySet()) {
-			String edgeId = row.getKey();
-			Map<ChannelAddress, JsonElement> columns = row.getValue();
+			var edgeId = row.getKey();
+			var columns = row.getValue();
 			var jEdge = new JsonObject();
 			for (Entry<ChannelAddress, JsonElement> column : columns.entrySet()) {
-				ChannelAddress channel = column.getKey();
-				JsonElement value = column.getValue();
+				var channel = column.getKey();
+				var value = column.getValue();
 				jEdge.add(channel.toString(), value);
 			}
 			j.add(edgeId, jEdge);
diff --git a/io.openems.backend.b2bwebsocket/src/io/openems/backend/b2bwebsocket/jsonrpc/request/SubscribeEdgesChannelsRequest.java b/io.openems.backend.b2bwebsocket/src/io/openems/backend/b2bwebsocket/jsonrpc/request/SubscribeEdgesChannelsRequest.java
index 733100b96b9..6df17a85318 100644
--- a/io.openems.backend.b2bwebsocket/src/io/openems/backend/b2bwebsocket/jsonrpc/request/SubscribeEdgesChannelsRequest.java
+++ b/io.openems.backend.b2bwebsocket/src/io/openems/backend/b2bwebsocket/jsonrpc/request/SubscribeEdgesChannelsRequest.java
@@ -34,7 +34,7 @@ public class SubscribeEdgesChannelsRequest extends JsonrpcRequest {
 
 	/**
 	 * Builds a {@link SubscribeEdgesChannelsRequest} from a {@link JsonrpcRequest}.
-	 * 
+	 *
 	 * @param r the {@link JsonrpcRequest}
 	 * @return the {@link SubscribeEdgesChannelsRequest}
 	 * @throws OpenemsNamedException on error
@@ -57,7 +57,7 @@ public static SubscribeEdgesChannelsRequest from(JsonrpcRequest r) throws Openem
 
 	/**
 	 * Builds a {@link SubscribeEdgesChannelsRequest} from a {@link JsonObject}.
-	 * 
+	 *
 	 * @param j the {@link JsonObject}
 	 * @return the {@link SubscribeEdgesChannelsRequest}
 	 * @throws OpenemsNamedException on error
@@ -82,7 +82,7 @@ public SubscribeEdgesChannelsRequest(int count) {
 
 	/**
 	 * Adds an Edge-ID.
-	 * 
+	 *
 	 * @param edgeId the Edge-ID.
 	 */
 	public void addEdgeId(String edgeId) {
@@ -91,7 +91,7 @@ public void addEdgeId(String edgeId) {
 
 	/**
 	 * Removes an Edge-ID.
-	 * 
+	 *
 	 * @param edgeId the Edge-ID
 	 */
 	public void removeEdgeId(String edgeId) {
@@ -104,7 +104,7 @@ public TreeSet<String> getEdgeIds() {
 
 	/**
 	 * Adds a Channel.
-	 * 
+	 *
 	 * @param address the {@link ChannelAddress}
 	 */
 	public void addChannel(ChannelAddress address) {
diff --git a/io.openems.backend.common/src/io/openems/backend/common/jsonrpc/response/GetEdgesChannelsValuesResponse.java b/io.openems.backend.common/src/io/openems/backend/common/jsonrpc/response/GetEdgesChannelsValuesResponse.java
index 6e4b8544af6..a2378633315 100644
--- a/io.openems.backend.common/src/io/openems/backend/common/jsonrpc/response/GetEdgesChannelsValuesResponse.java
+++ b/io.openems.backend.common/src/io/openems/backend/common/jsonrpc/response/GetEdgesChannelsValuesResponse.java
@@ -55,12 +55,12 @@ public void addValue(String edgeId, ChannelAddress channel, JsonElement value) {
 	public JsonObject getResult() {
 		var j = new JsonObject();
 		for (Entry<String, Map<ChannelAddress, JsonElement>> row : this.values.rowMap().entrySet()) {
-			String edgeId = row.getKey();
-			Map<ChannelAddress, JsonElement> columns = row.getValue();
+			var edgeId = row.getKey();
+			var columns = row.getValue();
 			var jEdge = new JsonObject();
 			for (Entry<ChannelAddress, JsonElement> column : columns.entrySet()) {
-				ChannelAddress channel = column.getKey();
-				JsonElement value = column.getValue();
+				var channel = column.getKey();
+				var value = column.getValue();
 				jEdge.add(channel.toString(), value);
 			}
 			j.add(edgeId, jEdge);
diff --git a/io.openems.backend.common/src/io/openems/backend/common/jsonrpc/response/GetEdgesStatusResponse.java b/io.openems.backend.common/src/io/openems/backend/common/jsonrpc/response/GetEdgesStatusResponse.java
index 7680bf570b9..3d063311e69 100644
--- a/io.openems.backend.common/src/io/openems/backend/common/jsonrpc/response/GetEdgesStatusResponse.java
+++ b/io.openems.backend.common/src/io/openems/backend/common/jsonrpc/response/GetEdgesStatusResponse.java
@@ -53,7 +53,7 @@ public GetEdgesStatusResponse(UUID id, Map<String, EdgeInfo> edgeInfos) {
 	public JsonObject getResult() {
 		var j = new JsonObject();
 		for (Entry<String, EdgeInfo> entry : this.edgeInfos.entrySet()) {
-			EdgeInfo edge = entry.getValue();
+			var edge = entry.getValue();
 			j.add(entry.getKey(), JsonUtils.buildJsonObject() //
 					.addProperty("online", edge.online) //
 					.build());
diff --git a/io.openems.backend.common/src/io/openems/backend/common/jsonrpc/response/GetUserInformationResponse.java b/io.openems.backend.common/src/io/openems/backend/common/jsonrpc/response/GetUserInformationResponse.java
index 5ce64b7e5ce..8a48fde7b6d 100644
--- a/io.openems.backend.common/src/io/openems/backend/common/jsonrpc/response/GetUserInformationResponse.java
+++ b/io.openems.backend.common/src/io/openems/backend/common/jsonrpc/response/GetUserInformationResponse.java
@@ -53,7 +53,7 @@ public JsonObject getResult() {
 				.build();
 
 		String country = null;
-		Object[] array = ObjectUtils.getAsObjectArrray(this.userInformation.get("country_id"));
+		var array = ObjectUtils.getAsObjectArrray(this.userInformation.get("country_id"));
 		if (array.length > 2) {
 			country = ObjectUtils.getAsString(array[2]).toLowerCase();
 		}
diff --git a/io.openems.backend.common/src/io/openems/backend/common/metadata/Edge.java b/io.openems.backend.common/src/io/openems/backend/common/metadata/Edge.java
index 012a510e375..7dd13d00668 100644
--- a/io.openems.backend.common/src/io/openems/backend/common/metadata/Edge.java
+++ b/io.openems.backend.common/src/io/openems/backend/common/metadata/Edge.java
@@ -68,7 +68,7 @@ public EdgeConfig getConfig() {
 
 	/**
 	 * Gets this {@link Edge} as {@link JsonObject}.
-	 * 
+	 *
 	 * @return a {@link JsonObject}
 	 */
 	public JsonObject toJsonObject() {
@@ -103,7 +103,7 @@ public String toString() {
 
 	/**
 	 * Add a Listener for Set-Online events.
-	 * 
+	 *
 	 * @param listener the listener
 	 */
 	public void onSetOnline(Consumer<Boolean> listener) {
@@ -179,7 +179,7 @@ public State getState() {
 
 	/**
 	 * Add a Listener for Set-Last-Message events.
-	 * 
+	 *
 	 * @param listener the listener
 	 */
 	public void onSetLastMessage(Runnable listener) {
@@ -217,7 +217,7 @@ public ZonedDateTime getLastMessageTimestamp() {
 
 	/**
 	 * Add a Listener for Set-Last-Update events.
-	 * 
+	 *
 	 * @param listener the listener
 	 */
 	public void onSetLastUpdate(Runnable listener) {
@@ -259,7 +259,7 @@ public SemanticVersion getVersion() {
 
 	/**
 	 * Add a Listener for Set-Version events.
-	 * 
+	 *
 	 * @param listener the listener
 	 */
 	public void onSetVersion(Consumer<SemanticVersion> listener) {
@@ -303,7 +303,7 @@ public String getProducttype() {
 
 	/**
 	 * Add a Listener for Set-Product-Type events.
-	 * 
+	 *
 	 * @param listener the listener
 	 */
 	public void onSetProducttype(Consumer<String> listener) {
@@ -347,7 +347,7 @@ public Level getSumState() {
 
 	/**
 	 * Add a Listener for Set-Sum-State events.
-	 * 
+	 *
 	 * @param listener the listener
 	 */
 	public void onSetSumState(Consumer<Level> listener) {
diff --git a/io.openems.backend.common/src/io/openems/backend/common/metadata/Metadata.java b/io.openems.backend.common/src/io/openems/backend/common/metadata/Metadata.java
index 47033b1fa42..a2a2261a50e 100644
--- a/io.openems.backend.common/src/io/openems/backend/common/metadata/Metadata.java
+++ b/io.openems.backend.common/src/io/openems/backend/common/metadata/Metadata.java
@@ -20,7 +20,6 @@
 import io.openems.common.types.ChannelAddress;
 import io.openems.common.types.EdgeConfig;
 import io.openems.common.types.EdgeConfig.Component.Channel;
-import io.openems.common.types.EdgeConfig.Component.Channel.ChannelDetail;
 import io.openems.common.types.EdgeConfig.Component.Channel.ChannelDetailState;
 
 @ProviderType
@@ -181,10 +180,10 @@ public static String activeStateChannelsToString(
 		// Sort active State-Channels by Level and Component-ID
 		var states = new HashMap<Level, HashMultimap<String, Channel>>();
 		for (Entry<ChannelAddress, Channel> entry : activeStateChannels.entrySet()) {
-			ChannelDetail detail = entry.getValue().getDetail();
+			var detail = entry.getValue().getDetail();
 			if (detail instanceof ChannelDetailState) {
 				var level = ((ChannelDetailState) detail).getLevel();
-				HashMultimap<String, Channel> channelsByComponent = states.get(level);
+				var channelsByComponent = states.get(level);
 				if (channelsByComponent == null) {
 					channelsByComponent = HashMultimap.create();
 					states.put(level, channelsByComponent);
diff --git a/io.openems.backend.common/src/io/openems/backend/common/timedata/EdgeCache.java b/io.openems.backend.common/src/io/openems/backend/common/timedata/EdgeCache.java
index b2b3d7c6f59..a86dae1b538 100644
--- a/io.openems.backend.common/src/io/openems/backend/common/timedata/EdgeCache.java
+++ b/io.openems.backend.common/src/io/openems/backend/common/timedata/EdgeCache.java
@@ -32,7 +32,7 @@ public class EdgeCache {
 
 	/**
 	 * Gets the channel value from cache.
-	 * 
+	 *
 	 * @param address the {@link ChannelAddress} of the channel
 	 * @return the value; empty if it is not in cache
 	 */
@@ -42,15 +42,15 @@ public final synchronized Optional<JsonElement> getChannelValue(ChannelAddress a
 
 	/**
 	 * Updates the 'incoming data' with the data from the cache.
-	 * 
+	 *
 	 * @param edgeId        the Edge-ID
 	 * @param incomingDatas the incoming data
 	 */
 	public synchronized void complementDataFromCache(String edgeId,
 			SortedMap<Long, Map<ChannelAddress, JsonElement>> incomingDatas) {
 		for (Entry<Long, Map<ChannelAddress, JsonElement>> entry : incomingDatas.entrySet()) {
-			Long incomingTimestamp = entry.getKey();
-			Map<ChannelAddress, JsonElement> incomingData = entry.getValue();
+			var incomingTimestamp = entry.getKey();
+			var incomingData = entry.getValue();
 
 			// Check if cache should be applied
 			if (incomingTimestamp < this.cacheTimestamp) {
diff --git a/io.openems.backend.core/src/io/openems/backend/core/jsonrpcrequesthandler/EdgeRpcRequestHandler.java b/io.openems.backend.core/src/io/openems/backend/core/jsonrpcrequesthandler/EdgeRpcRequestHandler.java
index 5e17d13410e..c45c8bce362 100644
--- a/io.openems.backend.core/src/io/openems/backend/core/jsonrpcrequesthandler/EdgeRpcRequestHandler.java
+++ b/io.openems.backend.core/src/io/openems/backend/core/jsonrpcrequesthandler/EdgeRpcRequestHandler.java
@@ -1,8 +1,6 @@
 package io.openems.backend.core.jsonrpcrequesthandler;
 
-import java.time.ZonedDateTime;
 import java.util.Map;
-import java.util.SortedMap;
 import java.util.UUID;
 import java.util.concurrent.CompletableFuture;
 
@@ -134,7 +132,7 @@ protected CompletableFuture<EdgeRpcResponse> handleRequest(User user, UUID messa
 	 */
 	private CompletableFuture<JsonrpcResponseSuccess> handleQueryHistoricDataRequest(String edgeId, User user,
 			QueryHistoricTimeseriesDataRequest request) throws OpenemsNamedException {
-		SortedMap<ZonedDateTime, SortedMap<ChannelAddress, JsonElement>> historicData = this.parent.timeData
+		var historicData = this.parent.timeData
 				.queryHistoricData(edgeId, request);
 
 		// JSON-RPC response
@@ -171,7 +169,7 @@ private CompletableFuture<JsonrpcResponseSuccess> handleQueryHistoricEnergyReque
 	 */
 	private CompletableFuture<JsonrpcResponseSuccess> handleQueryHistoricEnergyPerPeriodRequest(String edgeId,
 			User user, QueryHistoricTimeseriesEnergyPerPeriodRequest request) throws OpenemsNamedException {
-		SortedMap<ZonedDateTime, SortedMap<ChannelAddress, JsonElement>> data = this.parent.timeData
+		var data = this.parent.timeData
 				.queryHistoricEnergyPerPeriod(//
 						edgeId, request.getFromDate(), request.getToDate(), request.getChannels(),
 						request.getResolution());
diff --git a/io.openems.backend.edgewebsocket/src/io/openems/backend/edgewebsocket/OnNotification.java b/io.openems.backend.edgewebsocket/src/io/openems/backend/edgewebsocket/OnNotification.java
index 8029c340b88..b5f348be317 100644
--- a/io.openems.backend.edgewebsocket/src/io/openems/backend/edgewebsocket/OnNotification.java
+++ b/io.openems.backend.edgewebsocket/src/io/openems/backend/edgewebsocket/OnNotification.java
@@ -121,7 +121,7 @@ private void handleTimestampedDataNotification(TimestampedDataNotification messa
 
 			// set specific Edge values
 			if (data.has("_sum/State") && data.get("_sum/State").isJsonPrimitive()) {
-				Level sumState = Level.fromJson(data, "_sum/State").orElse(Level.FAULT);
+				var sumState = Level.fromJson(data, "_sum/State").orElse(Level.FAULT);
 				edge.setSumState(sumState);
 			}
 
diff --git a/io.openems.backend.edgewebsocket/src/io/openems/backend/edgewebsocket/OnOpen.java b/io.openems.backend.edgewebsocket/src/io/openems/backend/edgewebsocket/OnOpen.java
index 0d2b120b0bd..228d2c8aeb9 100644
--- a/io.openems.backend.edgewebsocket/src/io/openems/backend/edgewebsocket/OnOpen.java
+++ b/io.openems.backend.edgewebsocket/src/io/openems/backend/edgewebsocket/OnOpen.java
@@ -24,7 +24,7 @@ public void run(WebSocket ws, JsonObject handshake) {
 		// get websocket attachment
 		WsData wsData = ws.getAttachment();
 
-		String apikey = "";
+		var apikey = "";
 		try {
 			// get apikey from handshake
 			var apikeyOpt = JsonUtils.getAsOptionalString(handshake, "apikey");
diff --git a/io.openems.backend.edgewebsocket/src/io/openems/backend/edgewebsocket/SystemLogHandler.java b/io.openems.backend.edgewebsocket/src/io/openems/backend/edgewebsocket/SystemLogHandler.java
index 3ccf65b9bfd..798f23302ec 100644
--- a/io.openems.backend.edgewebsocket/src/io/openems/backend/edgewebsocket/SystemLogHandler.java
+++ b/io.openems.backend.edgewebsocket/src/io/openems/backend/edgewebsocket/SystemLogHandler.java
@@ -68,33 +68,32 @@ public CompletableFuture<JsonrpcResponseSuccess> handleSubscribeSystemLogRequest
 				// return this.parent.send(edgeId, request);
 			}
 
-		} else {
-			/*
-			 * End subscription
-			 */
-			boolean isAnySubscriptionForThisEdgeLeft;
-			synchronized (this.subscriptions) {
-				this.subscriptions.remove(edgeId, token);
+		}
+		/*
+		 * End subscription
+		 */
+		boolean isAnySubscriptionForThisEdgeLeft;
+		synchronized (this.subscriptions) {
+			this.subscriptions.remove(edgeId, token);
 
-				isAnySubscriptionForThisEdgeLeft = this.subscriptions.containsKey(edgeId);
-			}
+			isAnySubscriptionForThisEdgeLeft = this.subscriptions.containsKey(edgeId);
+		}
 
-			if (isAnySubscriptionForThisEdgeLeft) {
-				// announce success
-				return CompletableFuture.completedFuture(new GenericJsonrpcResponseSuccess(request.getId()));
+		if (isAnySubscriptionForThisEdgeLeft) {
+			// announce success
+			return CompletableFuture.completedFuture(new GenericJsonrpcResponseSuccess(request.getId()));
 
-			} else {
-				// send unsubscribe to Edge
-				return this.sendSubscribe(edgeId, user, request, false);
-				// return this.parent.send(edgeId, request);
-			}
+		} else {
+			// send unsubscribe to Edge
+			return this.sendSubscribe(edgeId, user, request, false);
+			// return this.parent.send(edgeId, request);
 		}
 	}
 
 	/**
 	 * Handles a {@link SystemLogNotification}, i.e. the replies to
 	 * {@link SubscribeSystemLogRequest}.
-	 * 
+	 *
 	 * @param edgeId       the Edge-ID
 	 * @param user         the {@link User}
 	 * @param notification the {@link SystemLogNotification}
diff --git a/io.openems.backend.edgewebsocket/src/io/openems/backend/edgewebsocket/WebsocketServer.java b/io.openems.backend.edgewebsocket/src/io/openems/backend/edgewebsocket/WebsocketServer.java
index 67811fc1b52..0d63d02eff9 100644
--- a/io.openems.backend.edgewebsocket/src/io/openems/backend/edgewebsocket/WebsocketServer.java
+++ b/io.openems.backend.edgewebsocket/src/io/openems/backend/edgewebsocket/WebsocketServer.java
@@ -55,7 +55,7 @@ protected WsData createWsData() {
 
 	/**
 	 * Is the given Edge online?.
-	 * 
+	 *
 	 * @param edgeId the Edge-ID
 	 * @return true if it is online.
 	 */
diff --git a/io.openems.backend.edgewebsocket/src/io/openems/backend/edgewebsocket/WsData.java b/io.openems.backend.edgewebsocket/src/io/openems/backend/edgewebsocket/WsData.java
index 7fa48cdbb15..99dd6fee4eb 100644
--- a/io.openems.backend.edgewebsocket/src/io/openems/backend/edgewebsocket/WsData.java
+++ b/io.openems.backend.edgewebsocket/src/io/openems/backend/edgewebsocket/WsData.java
@@ -35,7 +35,7 @@ public CompletableFuture<Boolean> isAuthenticated() {
 
 	/**
 	 * Asserts that the User is authenticated within a timeout.
-	 * 
+	 *
 	 * @param message a identification message on error
 	 * @param timeout the timeout length
 	 * @param unit    the {@link TimeUnit} of the timeout
@@ -90,7 +90,7 @@ public synchronized Optional<Edge> getEdge(Metadata metadata) {
 
 	/**
 	 * Asserts that the Edge-ID is present.
-	 * 
+	 *
 	 * @param message a identification message on error
 	 * @return the Edge-ID
 	 * @throws OpenemsException on error
diff --git a/io.openems.backend.metadata.file/src/io/openems/backend/metadata/file/FileMetadata.java b/io.openems.backend.metadata.file/src/io/openems/backend/metadata/file/FileMetadata.java
index c10a63469d1..8004205413b 100644
--- a/io.openems.backend.metadata.file/src/io/openems/backend/metadata/file/FileMetadata.java
+++ b/io.openems.backend.metadata.file/src/io/openems/backend/metadata/file/FileMetadata.java
@@ -176,10 +176,10 @@ private synchronized void refreshData() {
 
 			// parse to JSON
 			try {
-				JsonElement config = JsonUtils.parse(sb.toString());
-				JsonObject jEdges = JsonUtils.getAsJsonObject(config, "edges");
+				var config = JsonUtils.parse(sb.toString());
+				var jEdges = JsonUtils.getAsJsonObject(config, "edges");
 				for (Entry<String, JsonElement> entry : jEdges.entrySet()) {
-					JsonObject edge = JsonUtils.getAsJsonObject(entry.getValue());
+					var edge = JsonUtils.getAsJsonObject(entry.getValue());
 					edges.add(new MyEdge(//
 							entry.getKey(), // Edge-ID
 							JsonUtils.getAsString(edge, "apikey"), //
diff --git a/io.openems.backend.metadata.odoo/src/io/openems/backend/metadata/odoo/OdooMetadata.java b/io.openems.backend.metadata.odoo/src/io/openems/backend/metadata/odoo/OdooMetadata.java
index b4361fdbb67..6a3f02baabc 100644
--- a/io.openems.backend.metadata.odoo/src/io/openems/backend/metadata/odoo/OdooMetadata.java
+++ b/io.openems.backend.metadata.odoo/src/io/openems/backend/metadata/odoo/OdooMetadata.java
@@ -93,7 +93,7 @@ public User authenticate(String username, String password) throws OpenemsNamedEx
 	 */
 	@Override
 	public User authenticate(String sessionId) throws OpenemsNamedException {
-		JsonObject result = this.odooHandler.authenticateSession(sessionId);
+		var result = this.odooHandler.authenticateSession(sessionId);
 
 		// Parse Result
 		var jDevices = JsonUtils.getAsJsonArray(result, "devices");
diff --git a/io.openems.backend.metadata.odoo/src/io/openems/backend/metadata/odoo/postgres/InitializeEdgesWorker.java b/io.openems.backend.metadata.odoo/src/io/openems/backend/metadata/odoo/postgres/InitializeEdgesWorker.java
index 9531bdbc180..fd00341b866 100644
--- a/io.openems.backend.metadata.odoo/src/io/openems/backend/metadata/odoo/postgres/InitializeEdgesWorker.java
+++ b/io.openems.backend.metadata.odoo/src/io/openems/backend/metadata/odoo/postgres/InitializeEdgesWorker.java
@@ -2,7 +2,6 @@
 
 import java.sql.Connection;
 import java.sql.PreparedStatement;
-import java.sql.ResultSet;
 import java.sql.SQLException;
 import java.util.concurrent.ExecutorService;
 import java.util.concurrent.Executors;
@@ -54,8 +53,8 @@ public synchronized void stop() {
 		/*
 		 * First: mark all Edges as offline
 		 */
-		try (Connection con = self.dataSource.getConnection(); //
-				PreparedStatement pst = self.psUpdateAllEdgesOffline(con); //
+		try (var con = self.dataSource.getConnection(); //
+				var pst = self.psUpdateAllEdgesOffline(con); //
 		) {
 			pst.execute();
 		} catch (SQLException e) {
@@ -67,12 +66,12 @@ public synchronized void stop() {
 		/**
 		 * Reads all Edges from Postgres and puts them in a local Cache.
 		 */
-		try (Connection con = self.dataSource.getConnection(); //
-				PreparedStatement pst = self.psQueryAllEdges(con); //
-				ResultSet rs = pst.executeQuery(); //
+		try (var con = self.dataSource.getConnection(); //
+				var pst = self.psQueryAllEdges(con); //
+				var rs = pst.executeQuery(); //
 		) {
 			self.parent.logInfo(this.log, "Caching Edges from Postgres");
-			for (int i = 0; rs.next(); i++) {
+			for (var i = 0; rs.next(); i++) {
 				if (i % 100 == 0) {
 					self.parent.logInfo(this.log, "Caching Edges from Postgres. Finished [" + i + "]");
 				}
diff --git a/io.openems.backend.metadata.odoo/src/io/openems/backend/metadata/odoo/postgres/PeriodicWriteWorker.java b/io.openems.backend.metadata.odoo/src/io/openems/backend/metadata/odoo/postgres/PeriodicWriteWorker.java
index 7c2f23663f3..a5ecf010797 100644
--- a/io.openems.backend.metadata.odoo/src/io/openems/backend/metadata/odoo/postgres/PeriodicWriteWorker.java
+++ b/io.openems.backend.metadata.odoo/src/io/openems/backend/metadata/odoo/postgres/PeriodicWriteWorker.java
@@ -129,7 +129,7 @@ public void onLastUpdate(MyEdge edge) {
 	public void isOnline(MyEdge edge) {
 		synchronized (this.isOnlineOdooIds) {
 			synchronized (this.isOfflineOdooIds) {
-				int odooId = edge.getOdooId();
+				var odooId = edge.getOdooId();
 				this.isOfflineOdooIds.remove(odooId);
 				this.isOnlineOdooIds.add(edge.getOdooId());
 			}
@@ -144,7 +144,7 @@ public void isOnline(MyEdge edge) {
 	public void isOffline(MyEdge edge) {
 		synchronized (this.isOnlineOdooIds) {
 			synchronized (this.isOfflineOdooIds) {
-				int odooId = edge.getOdooId();
+				var odooId = edge.getOdooId();
 				this.isOnlineOdooIds.remove(odooId);
 				this.isOfflineOdooIds.add(edge.getOdooId());
 			}
diff --git a/io.openems.backend.timedata.dummy/src/io/openems/backend/timedata/dummy/TimedataDummy.java b/io.openems.backend.timedata.dummy/src/io/openems/backend/timedata/dummy/TimedataDummy.java
index 85f6d788ef9..628fc8de2a3 100644
--- a/io.openems.backend.timedata.dummy/src/io/openems/backend/timedata/dummy/TimedataDummy.java
+++ b/io.openems.backend.timedata.dummy/src/io/openems/backend/timedata/dummy/TimedataDummy.java
@@ -49,7 +49,7 @@ private void deactivate() {
 
 	@Override
 	public Optional<JsonElement> getChannelValue(String edgeId, ChannelAddress channelAddress) {
-		EdgeCache edgeCache = this.edgeCacheMap.get(edgeId);
+		var edgeCache = this.edgeCacheMap.get(edgeId);
 		if (edgeCache != null) {
 			return edgeCache.getChannelValue(channelAddress);
 		}
@@ -59,7 +59,7 @@ public Optional<JsonElement> getChannelValue(String edgeId, ChannelAddress chann
 	@Override
 	public void write(String edgeId, TreeBasedTable<Long, ChannelAddress, JsonElement> data) throws OpenemsException {
 		// get existing or create new EdgeCache
-		EdgeCache edgeCache = this.edgeCacheMap.get(edgeId);
+		var edgeCache = this.edgeCacheMap.get(edgeId);
 		if (edgeCache == null) {
 			edgeCache = new EdgeCache();
 			this.edgeCacheMap.put(edgeId, edgeCache);
diff --git a/io.openems.backend.timedata.influx/src/io/openems/backend/timedata/influx/ChannelFormula.java b/io.openems.backend.timedata.influx/src/io/openems/backend/timedata/influx/ChannelFormula.java
index 808c585368b..0f6c6398217 100644
--- a/io.openems.backend.timedata.influx/src/io/openems/backend/timedata/influx/ChannelFormula.java
+++ b/io.openems.backend.timedata.influx/src/io/openems/backend/timedata/influx/ChannelFormula.java
@@ -28,14 +28,15 @@ public ChannelFormula(Function function, int staticValue) {
 
 	/**
 	 * Gets the Channel value.
-	 * 
+	 *
 	 * @param cache an {@link EdgeCache}
 	 * @return the value
 	 */
 	public int getValue(EdgeCache cache) {
 		if (this.address.isPresent()) {
 			return cache.getChannelValue(this.address.get()).orElse(new JsonPrimitive(0)).getAsInt();
-		} else if (this.staticValue.isPresent()) {
+		}
+		if (this.staticValue.isPresent()) {
 			return this.staticValue.get();
 		} else {
 			return 0;
diff --git a/io.openems.backend.timedata.influx/src/io/openems/backend/timedata/influx/Influx.java b/io.openems.backend.timedata.influx/src/io/openems/backend/timedata/influx/Influx.java
index 826bed38c64..969358cc112 100644
--- a/io.openems.backend.timedata.influx/src/io/openems/backend/timedata/influx/Influx.java
+++ b/io.openems.backend.timedata.influx/src/io/openems/backend/timedata/influx/Influx.java
@@ -2,7 +2,6 @@
 
 import java.time.ZonedDateTime;
 import java.util.HashMap;
-import java.util.List;
 import java.util.Map;
 import java.util.Map.Entry;
 import java.util.Optional;
@@ -128,20 +127,20 @@ public void write(String edgeId, TreeBasedTable<Long, ChannelAddress, JsonElemen
 	 */
 	private void writeData(int influxEdgeId, TreeBasedTable<Long, ChannelAddress, JsonElement> data)
 			throws OpenemsException {
-		Set<Entry<Long, Map<ChannelAddress, JsonElement>>> dataEntries = data.rowMap().entrySet();
+		var dataEntries = data.rowMap().entrySet();
 		if (dataEntries.isEmpty()) {
 			// no data to write
 			return;
 		}
 
 		for (Entry<Long, Map<ChannelAddress, JsonElement>> dataEntry : dataEntries) {
-			Set<Entry<ChannelAddress, JsonElement>> channelEntries = dataEntry.getValue().entrySet();
+			var channelEntries = dataEntry.getValue().entrySet();
 			if (channelEntries.isEmpty()) {
 				// no points to add
 				continue;
 			}
 
-			Long timestamp = dataEntry.getKey();
+			var timestamp = dataEntry.getKey();
 			// this builds an InfluxDB record ("point") for a given timestamp
 			var builder = Point //
 					.measurement(InfluxConnector.MEASUREMENT) //
@@ -158,10 +157,10 @@ private void writeData(int influxEdgeId, TreeBasedTable<Long, ChannelAddress, Js
 
 	/**
 	 * Parses the number of an Edge from its name string.
-	 * 
+	 *
 	 * <p>
 	 * e.g. translates "edge0" to "0".
-	 * 
+	 *
 	 * @param name the edge name
 	 * @return the number
 	 * @throws OpenemsException on error
@@ -306,7 +305,7 @@ public Optional<JsonElement> getChannelValue(String edgeId, ChannelAddress addre
 	 */
 	@Deprecated
 	private Optional<JsonElement> getCompatibilityChannelValue(ChannelFormula[] compatibility, EdgeCache cache) {
-		int value = 0;
+		var value = 0;
 		for (ChannelFormula formula : compatibility) {
 			switch (formula.getFunction()) {
 			case PLUS:
@@ -331,7 +330,7 @@ private ChannelFormula[] getCompatibilityFormula(Edge edge, ChannelAddress addre
 			switch (address.getChannelId()) {
 
 			case "EssSoc": {
-				List<String> ids = config.getComponentsImplementingNature("EssNature");
+				var ids = config.getComponentsImplementingNature("EssNature");
 				if (ids.size() > 0) {
 					// take first result
 					return new ChannelFormula[] {
@@ -341,11 +340,11 @@ private ChannelFormula[] getCompatibilityFormula(Edge edge, ChannelAddress addre
 			}
 
 			case "EssActivePower": {
-				List<String> asymmetricIds = config.getComponentsImplementingNature("AsymmetricEssNature");
-				List<String> symmetricIds = config.getComponentsImplementingNature("SymmetricEssNature");
+				var asymmetricIds = config.getComponentsImplementingNature("AsymmetricEssNature");
+				var symmetricIds = config.getComponentsImplementingNature("SymmetricEssNature");
 				symmetricIds.removeAll(asymmetricIds);
 				var result = new ChannelFormula[asymmetricIds.size() * 3 + symmetricIds.size()];
-				int i = 0;
+				var i = 0;
 				for (String id : asymmetricIds) {
 					result[i++] = new ChannelFormula(Function.PLUS, new ChannelAddress(id, "ActivePowerL1"));
 					result[i++] = new ChannelFormula(Function.PLUS, new ChannelAddress(id, "ActivePowerL2"));
@@ -413,18 +412,18 @@ private ChannelFormula[] getCompatibilityFormula(Edge edge, ChannelAddress addre
 						ChannelFormula.class);
 
 			case "ProductionAcActivePower": {
-				List<String> ignoreIds = config.getComponentsImplementingNature("FeneconMiniConsumptionMeter");
+				var ignoreIds = config.getComponentsImplementingNature("FeneconMiniConsumptionMeter");
 				ignoreIds.add("meter0");
 
-				List<String> asymmetricIds = config.getComponentsImplementingNature("AsymmetricMeterNature");
+				var asymmetricIds = config.getComponentsImplementingNature("AsymmetricMeterNature");
 				asymmetricIds.removeAll(ignoreIds);
 
-				List<String> symmetricIds = config.getComponentsImplementingNature("SymmetricMeterNature");
+				var symmetricIds = config.getComponentsImplementingNature("SymmetricMeterNature");
 				symmetricIds.removeAll(ignoreIds);
 				symmetricIds.removeAll(asymmetricIds);
 
 				var result = new ChannelFormula[asymmetricIds.size() * 3 + symmetricIds.size()];
-				int i = 0;
+				var i = 0;
 				for (String id : asymmetricIds) {
 					result[i++] = new ChannelFormula(Function.PLUS, new ChannelAddress(id, "ActivePowerL1"));
 					result[i++] = new ChannelFormula(Function.PLUS, new ChannelAddress(id, "ActivePowerL2"));
@@ -437,9 +436,9 @@ private ChannelFormula[] getCompatibilityFormula(Edge edge, ChannelAddress addre
 			}
 
 			case "ProductionDcActualPower": {
-				List<String> ids = config.getComponentsImplementingNature("ChargerNature");
+				var ids = config.getComponentsImplementingNature("ChargerNature");
 				var result = new ChannelFormula[ids.size()];
-				for (int i = 0; i < ids.size(); i++) {
+				for (var i = 0; i < ids.size(); i++) {
 					result[i] = new ChannelFormula(Function.PLUS, new ChannelAddress(ids.get(i), "ActualPower"));
 				}
 				return result;
diff --git a/io.openems.backend.uiwebsocket/src/io/openems/backend/uiwebsocket/impl/OnRequest.java b/io.openems.backend.uiwebsocket/src/io/openems/backend/uiwebsocket/impl/OnRequest.java
index 0bb168fa346..f5359be9f49 100644
--- a/io.openems.backend.uiwebsocket/src/io/openems/backend/uiwebsocket/impl/OnRequest.java
+++ b/io.openems.backend.uiwebsocket/src/io/openems/backend/uiwebsocket/impl/OnRequest.java
@@ -348,7 +348,7 @@ private CompletableFuture<GenericJsonrpcResponseSuccess> handleSetUserInformatio
 	 */
 	private CompletableFuture<GenericJsonrpcResponseSuccess> handleSubmitSetupProtocolRequest(User user,
 			SubmitSetupProtocolRequest request) throws OpenemsNamedException {
-		int protocolId = this.parent.metadata.submitSetupProtocol(user, request.getJsonObject());
+		var protocolId = this.parent.metadata.submitSetupProtocol(user, request.getJsonObject());
 
 		var response = JsonUtils.buildJsonObject() //
 				.addProperty("setupProtocolId", protocolId) //
diff --git a/io.openems.common/src/io/openems/common/channel/PersistencePriority.java b/io.openems.common/src/io/openems/common/channel/PersistencePriority.java
index 421cb3c953a..d59b1a2fb62 100644
--- a/io.openems.common/src/io/openems/common/channel/PersistencePriority.java
+++ b/io.openems.common/src/io/openems/common/channel/PersistencePriority.java
@@ -18,7 +18,7 @@ private PersistencePriority(int value) {
 	/**
 	 * Is this {@link PersistencePriority} at least as high as the given
 	 * {@link PersistencePriority}?.
-	 * 
+	 *
 	 * @param other the given {@link PersistencePriority}
 	 * @return true if this is equal or higher than other
 	 */
@@ -29,7 +29,7 @@ public boolean isAtLeast(PersistencePriority other) {
 	/**
 	 * Is this {@link PersistencePriority} at lower than the given
 	 * {@link PersistencePriority}?.
-	 * 
+	 *
 	 * @param other the given {@link PersistencePriority}
 	 * @return true if this is strictly lower than other
 	 */
diff --git a/io.openems.common/src/io/openems/common/channel/Unit.java b/io.openems.common/src/io/openems/common/channel/Unit.java
index 5f4d23d0e58..12bbe1d1a81 100644
--- a/io.openems.common/src/io/openems/common/channel/Unit.java
+++ b/io.openems.common/src/io/openems/common/channel/Unit.java
@@ -262,7 +262,7 @@ public Unit getBaseUnit() {
 
 	/**
 	 * Gets the value in its base unit, e.g. converts [kW] to [W].
-	 * 
+	 *
 	 * @param value the value
 	 * @return the converted value
 	 */
@@ -276,11 +276,11 @@ public String getSymbol() {
 
 	/**
 	 * Formats the value in the given type.
-	 * 
+	 *
 	 * <p>
 	 * For most cases this adds the unit symbol to the value, like "123 kW".
 	 * Booleans are converted to "ON" or "OFF".
-	 * 
+	 *
 	 * @param value the value {@link Object}
 	 * @param type  the {@link OpenemsType}
 	 * @return the formatted value as String
diff --git a/io.openems.common/src/io/openems/common/exceptions/OpenemsError.java b/io.openems.common/src/io/openems/common/exceptions/OpenemsError.java
index b5ab6f7fb2c..f151619768a 100644
--- a/io.openems.common/src/io/openems/common/exceptions/OpenemsError.java
+++ b/io.openems.common/src/io/openems/common/exceptions/OpenemsError.java
@@ -118,7 +118,7 @@ public String getRawMessage() {
 
 	/**
 	 * Gets the formatted Error message.
-	 * 
+	 *
 	 * @param params the error parameters
 	 * @return the error message as String
 	 */
diff --git a/io.openems.common/src/io/openems/common/function/ThrowingRunnable.java b/io.openems.common/src/io/openems/common/function/ThrowingRunnable.java
index dee8fb4493a..04b1fc9fafa 100644
--- a/io.openems.common/src/io/openems/common/function/ThrowingRunnable.java
+++ b/io.openems.common/src/io/openems/common/function/ThrowingRunnable.java
@@ -14,7 +14,7 @@ public interface ThrowingRunnable<E extends Exception> {
 	 * When an object implementing interface <code>Runnable</code> is used to create
 	 * a thread, starting the thread causes the object's <code>run</code> method to
 	 * be called in that separately executing thread.
-	 * 
+	 *
 	 * <p>
 	 * The general contract of the method <code>run</code> is that it may take any
 	 * action whatsoever.
diff --git a/io.openems.common/src/io/openems/common/jsonrpc/base/AbstractJsonrpcRequest.java b/io.openems.common/src/io/openems/common/jsonrpc/base/AbstractJsonrpcRequest.java
index ee495898592..72acbaf6702 100644
--- a/io.openems.common/src/io/openems/common/jsonrpc/base/AbstractJsonrpcRequest.java
+++ b/io.openems.common/src/io/openems/common/jsonrpc/base/AbstractJsonrpcRequest.java
@@ -25,7 +25,7 @@ public String getMethod() {
 
 	/**
 	 * Gets the params {@link JsonObject} of the {@link JsonrpcRequest}.
-	 * 
+	 *
 	 * @return the params as {@link JsonObject}
 	 */
 	public abstract JsonObject getParams();
diff --git a/io.openems.common/src/io/openems/common/jsonrpc/base/GenericJsonrpcNotification.java b/io.openems.common/src/io/openems/common/jsonrpc/base/GenericJsonrpcNotification.java
index 2fb014b81ed..69080267aa0 100644
--- a/io.openems.common/src/io/openems/common/jsonrpc/base/GenericJsonrpcNotification.java
+++ b/io.openems.common/src/io/openems/common/jsonrpc/base/GenericJsonrpcNotification.java
@@ -23,7 +23,7 @@ public class GenericJsonrpcNotification extends JsonrpcNotification {
 
 	/**
 	 * Parses a JSON String to a {@link GenericJsonrpcNotification}.
-	 * 
+	 *
 	 * @param json the JSON String
 	 * @return the {@link GenericJsonrpcNotification}
 	 * @throws OpenemsNamedException on error
@@ -34,7 +34,7 @@ public static GenericJsonrpcNotification from(String json) throws OpenemsNamedEx
 
 	/**
 	 * Parses a {@link JsonObject} to a {@link GenericJsonrpcNotification}.
-	 * 
+	 *
 	 * @param j the {@link JsonObject}
 	 * @return the {@link GenericJsonrpcNotification}
 	 * @throws OpenemsNamedException on error
diff --git a/io.openems.common/src/io/openems/common/jsonrpc/base/JsonrpcMessage.java b/io.openems.common/src/io/openems/common/jsonrpc/base/JsonrpcMessage.java
index 5121fcf4ee0..2b4ad440394 100644
--- a/io.openems.common/src/io/openems/common/jsonrpc/base/JsonrpcMessage.java
+++ b/io.openems.common/src/io/openems/common/jsonrpc/base/JsonrpcMessage.java
@@ -26,7 +26,7 @@ public abstract class JsonrpcMessage {
 
 	/**
 	 * Parses a JSON String to a {@link JsonrpcMessage}.
-	 * 
+	 *
 	 * @param json the JSON String
 	 * @return the {@link JsonrpcMessage}
 	 * @throws OpenemsNamedException on error
@@ -37,7 +37,7 @@ public static JsonrpcMessage from(String json) throws OpenemsNamedException {
 
 	/**
 	 * Parses a {@link JsonObject} to a {@link JsonrpcMessage}.
-	 * 
+	 *
 	 * @param j the {@link JsonObject}
 	 * @return the {@link JsonrpcMessage}
 	 * @throws OpenemsNamedException on error
@@ -46,15 +46,15 @@ public static JsonrpcMessage from(JsonObject j) throws OpenemsNamedException {
 		if (j.has("method") && j.has("params")) {
 			if (j.has("id")) {
 				return GenericJsonrpcRequest.from(j);
-			} else {
-				return GenericJsonrpcNotification.from(j);
 			}
+			return GenericJsonrpcNotification.from(j);
 
 		}
 		if (j.has("result")) {
 			return JsonrpcResponseSuccess.from(j);
 
-		} else if (j.has("error")) {
+		}
+		if (j.has("error")) {
 			return JsonrpcResponseError.from(j);
 		}
 		throw new OpenemsException(
@@ -63,7 +63,7 @@ public static JsonrpcMessage from(JsonObject j) throws OpenemsNamedException {
 
 	/**
 	 * Gets the {@link JsonObject} representation of this {@link JsonrpcMessage}.
-	 * 
+	 *
 	 * @return a {@link JsonObject}
 	 */
 	public JsonObject toJsonObject() {
diff --git a/io.openems.common/src/io/openems/common/jsonrpc/base/JsonrpcResponse.java b/io.openems.common/src/io/openems/common/jsonrpc/base/JsonrpcResponse.java
index 1b1ebfba338..87bf060e807 100644
--- a/io.openems.common/src/io/openems/common/jsonrpc/base/JsonrpcResponse.java
+++ b/io.openems.common/src/io/openems/common/jsonrpc/base/JsonrpcResponse.java
@@ -27,7 +27,7 @@ public abstract class JsonrpcResponse extends JsonrpcMessage {
 
 	/**
 	 * Parses a JSON String to a {@link JsonrpcResponse}.
-	 * 
+	 *
 	 * @param json the JSON String
 	 * @return the {@link JsonrpcResponse}
 	 * @throws OpenemsNamedException on error
@@ -38,7 +38,7 @@ public static JsonrpcResponse from(String json) throws OpenemsNamedException {
 
 	/**
 	 * Parses a {@link JsonObject} to a {@link JsonrpcResponse}.
-	 * 
+	 *
 	 * @param j the {@link JsonObject}
 	 * @return the {@link JsonrpcResponse}
 	 * @throws OpenemsNamedException on error
@@ -47,7 +47,8 @@ public static JsonrpcResponse from(JsonObject j) throws OpenemsNamedException {
 		var id = UUID.fromString(JsonUtils.getAsString(j, "id"));
 		if (j.has("result")) {
 			return new GenericJsonrpcResponseSuccess(id, JsonUtils.getAsJsonObject(j, "result"));
-		} else if (j.has("error")) {
+		}
+		if (j.has("error")) {
 			return JsonrpcResponseError.from(j);
 		}
 		throw new OpenemsException("Unable to parse JsonrpcResponse from " + StringUtils.toShortString(j, 100));
diff --git a/io.openems.common/src/io/openems/common/jsonrpc/base/JsonrpcResponseError.java b/io.openems.common/src/io/openems/common/jsonrpc/base/JsonrpcResponseError.java
index 1a1d9e41a00..5514f047e87 100644
--- a/io.openems.common/src/io/openems/common/jsonrpc/base/JsonrpcResponseError.java
+++ b/io.openems.common/src/io/openems/common/jsonrpc/base/JsonrpcResponseError.java
@@ -37,7 +37,7 @@ public class JsonrpcResponseError extends JsonrpcResponse {
 
 	/**
 	 * Parses a JSON String to a {@link JsonrpcResponseError}.
-	 * 
+	 *
 	 * @param json the JSON String
 	 * @return the {@link JsonrpcResponseError}
 	 * @throws OpenemsNamedException on error
@@ -48,7 +48,7 @@ public static JsonrpcResponseError from(String json) throws OpenemsNamedExceptio
 
 	/**
 	 * Parses a {@link JsonObject} to a {@link JsonrpcResponseError}.
-	 * 
+	 *
 	 * @param j the {@link JsonObject}
 	 * @return the {@link JsonrpcResponseError}
 	 * @throws OpenemsNamedException on error
@@ -136,7 +136,7 @@ public JsonArray getParams() {
 
 	/**
 	 * Gets the error message parameters as Object array.
-	 * 
+	 *
 	 * @return the array of error message parameters
 	 */
 	public Object[] getParamsAsObjectArray() {
diff --git a/io.openems.common/src/io/openems/common/jsonrpc/base/JsonrpcResponseSuccess.java b/io.openems.common/src/io/openems/common/jsonrpc/base/JsonrpcResponseSuccess.java
index f5f5ea35307..05dae9f3b4e 100644
--- a/io.openems.common/src/io/openems/common/jsonrpc/base/JsonrpcResponseSuccess.java
+++ b/io.openems.common/src/io/openems/common/jsonrpc/base/JsonrpcResponseSuccess.java
@@ -52,7 +52,7 @@ public JsonObject toJsonObject() {
 
 	/**
 	 * Gets the result of this {@link JsonrpcResponseSuccess}.
-	 * 
+	 *
 	 * @return a JsonObject with the 'result' property of the response
 	 */
 	public abstract JsonObject getResult();
diff --git a/io.openems.common/src/io/openems/common/jsonrpc/notification/CurrentDataNotification.java b/io.openems.common/src/io/openems/common/jsonrpc/notification/CurrentDataNotification.java
index c413d92e88c..482e4007095 100644
--- a/io.openems.common/src/io/openems/common/jsonrpc/notification/CurrentDataNotification.java
+++ b/io.openems.common/src/io/openems/common/jsonrpc/notification/CurrentDataNotification.java
@@ -36,7 +36,7 @@ public CurrentDataNotification() {
 
 	/**
 	 * Add a Channel value.
-	 * 
+	 *
 	 * @param channel the {@link ChannelAddress}
 	 * @param value   the value as {@link JsonElement}
 	 */
diff --git a/io.openems.common/src/io/openems/common/jsonrpc/notification/EdgeConfigNotification.java b/io.openems.common/src/io/openems/common/jsonrpc/notification/EdgeConfigNotification.java
index 381fa095206..9badf79766c 100644
--- a/io.openems.common/src/io/openems/common/jsonrpc/notification/EdgeConfigNotification.java
+++ b/io.openems.common/src/io/openems/common/jsonrpc/notification/EdgeConfigNotification.java
@@ -24,7 +24,7 @@ public class EdgeConfigNotification extends JsonrpcNotification {
 
 	/**
 	 * Parses a {@link JsonObject} to a {@link EdgeConfigNotification}.
-	 * 
+	 *
 	 * @param j the {@link JsonObject}
 	 * @return the {@link EdgeConfigNotification}
 	 * @throws OpenemsNamedException on error
@@ -35,7 +35,7 @@ public static EdgeConfigNotification from(JsonObject j) throws OpenemsNamedExcep
 
 	/**
 	 * Parses a {@link JsonrpcNotification} to a {@link EdgeConfigNotification}.
-	 * 
+	 *
 	 * @param n the {@link JsonrpcNotification}
 	 * @return the {@link EdgeConfigNotification}
 	 * @throws OpenemsNamedException on error
diff --git a/io.openems.common/src/io/openems/common/jsonrpc/notification/SystemLogNotification.java b/io.openems.common/src/io/openems/common/jsonrpc/notification/SystemLogNotification.java
index ba9ad793684..34789641d75 100644
--- a/io.openems.common/src/io/openems/common/jsonrpc/notification/SystemLogNotification.java
+++ b/io.openems.common/src/io/openems/common/jsonrpc/notification/SystemLogNotification.java
@@ -30,7 +30,7 @@ public class SystemLogNotification extends JsonrpcNotification {
 
 	/**
 	 * Parses a {@link JsonrpcNotification} to a {@link SystemLogNotification}.
-	 * 
+	 *
 	 * @param n the {@link JsonrpcNotification}
 	 * @return the {@link SystemLogNotification}
 	 * @throws OpenemsNamedException on error
@@ -43,7 +43,7 @@ public static SystemLogNotification from(JsonrpcNotification n) throws OpenemsNa
 
 	/**
 	 * Creates a {@link SystemLogNotification} from a {@link PaxLoggingEvent}.
-	 * 
+	 *
 	 * @param event the {@link PaxLoggingEvent}
 	 * @return the {@link SystemLogNotification}
 	 */
diff --git a/io.openems.common/src/io/openems/common/jsonrpc/notification/TimestampedDataNotification.java b/io.openems.common/src/io/openems/common/jsonrpc/notification/TimestampedDataNotification.java
index b907dec4f19..3489fd6eec1 100644
--- a/io.openems.common/src/io/openems/common/jsonrpc/notification/TimestampedDataNotification.java
+++ b/io.openems.common/src/io/openems/common/jsonrpc/notification/TimestampedDataNotification.java
@@ -33,7 +33,7 @@ public class TimestampedDataNotification extends JsonrpcNotification {
 	/**
 	 * Parses a {@link JsonrpcNotification} to a
 	 * {@link TimestampedDataNotification}.
-	 * 
+	 *
 	 * @param n the {@link JsonrpcNotification}
 	 * @return the {@link TimestampedDataNotification}
 	 * @throws OpenemsNamedException on error
@@ -42,8 +42,8 @@ public static TimestampedDataNotification from(JsonrpcNotification n) throws Ope
 		var result = new TimestampedDataNotification();
 		var j = n.getParams();
 		for (Entry<String, JsonElement> e1 : j.entrySet()) {
-			long timestamp = Long.parseLong(e1.getKey());
-			JsonObject jTime = JsonUtils.getAsJsonObject(e1.getValue());
+			var timestamp = Long.parseLong(e1.getKey());
+			var jTime = JsonUtils.getAsJsonObject(e1.getValue());
 			for (Entry<String, JsonElement> e2 : jTime.entrySet()) {
 				result.add(timestamp, ChannelAddress.fromString(e2.getKey()), e2.getValue());
 			}
@@ -61,7 +61,7 @@ public TimestampedDataNotification() {
 
 	/**
 	 * Add timestamped data.
-	 * 
+	 *
 	 * @param timestamp the timestamp epoch in milliseconds
 	 * @param data      a map of {@link ChannelAddress} to {@link JsonElement} value
 	 */
@@ -73,7 +73,7 @@ public void add(long timestamp, Map<ChannelAddress, JsonElement> data) {
 
 	/**
 	 * Add a timestamped value.
-	 * 
+	 *
 	 * @param timestamp the timestamp epoch in milliseconds
 	 * @param address   the {@link ChannelAddress}
 	 * @param value     the {@link JsonElement} value
@@ -88,8 +88,8 @@ public JsonObject getParams() {
 		for (Entry<Long, Map<ChannelAddress, JsonElement>> e1 : this.data.rowMap().entrySet()) {
 			var jTime = new JsonObject();
 			for (Entry<ChannelAddress, JsonElement> e2 : e1.getValue().entrySet()) {
-				ChannelAddress address = e2.getKey();
-				JsonElement value = e2.getValue();
+				var address = e2.getKey();
+				var value = e2.getValue();
 				jTime.add(address.toString(), value);
 			}
 			p.add(e1.getKey().toString(), jTime);
diff --git a/io.openems.common/src/io/openems/common/jsonrpc/request/AuthenticatedRpcRequest.java b/io.openems.common/src/io/openems/common/jsonrpc/request/AuthenticatedRpcRequest.java
index c72b223e55e..8ba66deae9a 100644
--- a/io.openems.common/src/io/openems/common/jsonrpc/request/AuthenticatedRpcRequest.java
+++ b/io.openems.common/src/io/openems/common/jsonrpc/request/AuthenticatedRpcRequest.java
@@ -53,14 +53,14 @@ public class AuthenticatedRpcRequest<USER extends AbstractUser> extends JsonrpcR
 	 *   "role": {@link Role}
 	 * }
 	 *                    </pre>
-	 * 
+	 *
 	 * @return the {@link AuthenticatedRpcRequest}
 	 * @throws OpenemsNamedException on parse error
 	 */
 	public static <USER extends AbstractUser> AuthenticatedRpcRequest<USER> from(JsonrpcRequest r,
 			ThrowingFunction<JsonObject, USER, OpenemsNamedException> userFactory) throws OpenemsNamedException {
 		var p = r.getParams();
-		USER user = userFactory.apply(JsonUtils.getAsJsonObject(p, "user"));
+		var user = userFactory.apply(JsonUtils.getAsJsonObject(p, "user"));
 		JsonrpcRequest payload = GenericJsonrpcRequest.from(JsonUtils.getAsJsonObject(p, "payload"));
 		return new AuthenticatedRpcRequest<>(r, Optional.empty(), user, payload);
 	}
diff --git a/io.openems.common/src/io/openems/common/jsonrpc/request/UpdateUserLanguageRequest.java b/io.openems.common/src/io/openems/common/jsonrpc/request/UpdateUserLanguageRequest.java
index 51db5ed9377..62f47bc51cd 100644
--- a/io.openems.common/src/io/openems/common/jsonrpc/request/UpdateUserLanguageRequest.java
+++ b/io.openems.common/src/io/openems/common/jsonrpc/request/UpdateUserLanguageRequest.java
@@ -9,7 +9,7 @@
 
 /**
  * Updates the User Language.
- * 
+ *
  * <pre>
  * {
  *   "jsonrpc": "2.0",
diff --git a/io.openems.common/src/io/openems/common/jsonrpc/response/AuthenticatedRpcResponse.java b/io.openems.common/src/io/openems/common/jsonrpc/response/AuthenticatedRpcResponse.java
index 01d8e1ccd0d..1c6e7bcbbd2 100644
--- a/io.openems.common/src/io/openems/common/jsonrpc/response/AuthenticatedRpcResponse.java
+++ b/io.openems.common/src/io/openems/common/jsonrpc/response/AuthenticatedRpcResponse.java
@@ -26,7 +26,7 @@ public class AuthenticatedRpcResponse extends JsonrpcResponseSuccess {
 	/**
 	 * Parses a {@link JsonrpcResponseSuccess} to a
 	 * {@link AuthenticatedRpcResponse}.
-	 * 
+	 *
 	 * @param r the {@link JsonrpcResponseSuccess}
 	 * @return the {@link AuthenticatedRpcResponse}
 	 * @throws OpenemsNamedException on error
diff --git a/io.openems.common/src/io/openems/common/jsonrpc/response/QueryHistoricTimeseriesDataResponse.java b/io.openems.common/src/io/openems/common/jsonrpc/response/QueryHistoricTimeseriesDataResponse.java
index d272193270b..43318065d8f 100644
--- a/io.openems.common/src/io/openems/common/jsonrpc/response/QueryHistoricTimeseriesDataResponse.java
+++ b/io.openems.common/src/io/openems/common/jsonrpc/response/QueryHistoricTimeseriesDataResponse.java
@@ -60,9 +60,9 @@ public JsonObject getResult() {
 		var data = new JsonObject();
 		for (Entry<ZonedDateTime, SortedMap<ChannelAddress, JsonElement>> rowEntry : this.table.entrySet()) {
 			for (Entry<ChannelAddress, JsonElement> colEntry : rowEntry.getValue().entrySet()) {
-				String channelAddress = colEntry.getKey().toString();
-				JsonElement value = colEntry.getValue();
-				JsonElement channelValuesElement = data.get(channelAddress);
+				var channelAddress = colEntry.getKey().toString();
+				var value = colEntry.getValue();
+				var channelValuesElement = data.get(channelAddress);
 				JsonArray channelValues;
 				if (channelValuesElement != null) {
 					channelValues = channelValuesElement.getAsJsonArray();
diff --git a/io.openems.common/src/io/openems/common/jsonrpc/response/QueryHistoricTimeseriesEnergyPerPeriodResponse.java b/io.openems.common/src/io/openems/common/jsonrpc/response/QueryHistoricTimeseriesEnergyPerPeriodResponse.java
index 1a67899ae81..81767988916 100644
--- a/io.openems.common/src/io/openems/common/jsonrpc/response/QueryHistoricTimeseriesEnergyPerPeriodResponse.java
+++ b/io.openems.common/src/io/openems/common/jsonrpc/response/QueryHistoricTimeseriesEnergyPerPeriodResponse.java
@@ -61,9 +61,9 @@ public JsonObject getResult() {
 		var data = new JsonObject();
 		for (Entry<ZonedDateTime, SortedMap<ChannelAddress, JsonElement>> rowEntry : this.table.entrySet()) {
 			for (Entry<ChannelAddress, JsonElement> colEntry : rowEntry.getValue().entrySet()) {
-				String channelAddress = colEntry.getKey().toString();
-				JsonElement value = colEntry.getValue();
-				JsonElement channelValuesElement = data.get(channelAddress);
+				var channelAddress = colEntry.getKey().toString();
+				var value = colEntry.getValue();
+				var channelValuesElement = data.get(channelAddress);
 				JsonArray channelValues;
 				if (channelValuesElement != null) {
 					channelValues = channelValuesElement.getAsJsonArray();
diff --git a/io.openems.common/src/io/openems/common/timedata/CommonTimedataService.java b/io.openems.common/src/io/openems/common/timedata/CommonTimedataService.java
index 544c9ddd906..83edab7f4ab 100644
--- a/io.openems.common/src/io/openems/common/timedata/CommonTimedataService.java
+++ b/io.openems.common/src/io/openems/common/timedata/CommonTimedataService.java
@@ -28,10 +28,10 @@ public interface CommonTimedataService {
 	 */
 	public default QueryHistoricTimeseriesExportXlsxResponse handleQueryHistoricTimeseriesExportXlxsRequest(
 			String edgeId, QueryHistoricTimeseriesExportXlxsRequest request) throws OpenemsNamedException {
-		SortedMap<ZonedDateTime, SortedMap<ChannelAddress, JsonElement>> powerData = this.queryHistoricData(edgeId,
+		var powerData = this.queryHistoricData(edgeId,
 				request.getFromDate(), request.getToDate(), QueryHistoricTimeseriesExportXlsxResponse.POWER_CHANNELS,
 				15 * 60 /* 15 Minutes */);
-		SortedMap<ChannelAddress, JsonElement> energyData = this.queryHistoricEnergy(edgeId, request.getFromDate(),
+		var energyData = this.queryHistoricEnergy(edgeId, request.getFromDate(),
 				request.getToDate(), QueryHistoricTimeseriesExportXlsxResponse.ENERGY_CHANNELS);
 
 		try {
@@ -50,7 +50,7 @@ public default QueryHistoricTimeseriesExportXlsxResponse handleQueryHistoricTime
 	 * @return the resolution in seconds
 	 */
 	public static int calculateResolution(ZonedDateTime fromDate, ZonedDateTime toDate) {
-		int days = Period.between(fromDate.toLocalDate(), toDate.toLocalDate()).getDays();
+		var days = Period.between(fromDate.toLocalDate(), toDate.toLocalDate()).getDays();
 		int resolution;
 		if (days <= 1) {
 			resolution = 5 * 60; // 5 Minutes
diff --git a/io.openems.common/src/io/openems/common/types/ChannelAddress.java b/io.openems.common/src/io/openems/common/types/ChannelAddress.java
index a302955f8f7..1d0b4eef915 100644
--- a/io.openems.common/src/io/openems/common/types/ChannelAddress.java
+++ b/io.openems.common/src/io/openems/common/types/ChannelAddress.java
@@ -99,16 +99,18 @@ public boolean equals(Object obj) {
 	 * @return an integer value representing the degree of matching
 	 */
 	public static int match(ChannelAddress source, ChannelAddress pattern) {
-		int componentIdMatch = StringUtils.matchWildcard(source.componentId, pattern.componentId);
-		int channelIdMatch = StringUtils.matchWildcard(source.channelId, pattern.channelId);
+		var componentIdMatch = StringUtils.matchWildcard(source.componentId, pattern.componentId);
+		var channelIdMatch = StringUtils.matchWildcard(source.channelId, pattern.channelId);
 		if (componentIdMatch < 0 || channelIdMatch < 0) {
 			return -1;
-		} else if (componentIdMatch == 0 && channelIdMatch == 0) {
+		}
+		if (componentIdMatch == 0 && channelIdMatch == 0) {
 			return 0;
 		}
 		if (componentIdMatch == 0) {
 			return Integer.MAX_VALUE / 2 + channelIdMatch;
-		} else if (channelIdMatch == 0) {
+		}
+		if (channelIdMatch == 0) {
 			return Integer.MAX_VALUE / 2 + componentIdMatch;
 		} else {
 			return componentIdMatch + channelIdMatch;
diff --git a/io.openems.common/src/io/openems/common/types/ConfigurationProperty.java b/io.openems.common/src/io/openems/common/types/ConfigurationProperty.java
index f98280a21c2..7f49d3c4fe7 100644
--- a/io.openems.common/src/io/openems/common/types/ConfigurationProperty.java
+++ b/io.openems.common/src/io/openems/common/types/ConfigurationProperty.java
@@ -21,7 +21,7 @@ public class ConfigurationProperty<T> {
 
 	/**
 	 * Creates a {@link ConfigurationProperty} object from a value.
-	 * 
+	 *
 	 * @param <T>   the type of the value
 	 * @param value the value
 	 * @return the {@link ConfigurationProperty}
@@ -32,7 +32,7 @@ public static <T> ConfigurationProperty<T> of(T value) {
 
 	/**
 	 * Creates a {@link ConfigurationProperty} object with 'null' value.
-	 * 
+	 *
 	 * @param <T> the type of the value
 	 * @return the {@link ConfigurationProperty}
 	 */
@@ -42,7 +42,7 @@ public static <T> ConfigurationProperty<T> asNull() {
 
 	/**
 	 * Creates a {@link ConfigurationProperty} object with 'not set' value.
-	 * 
+	 *
 	 * @param <T> the type of the value
 	 * @return the {@link ConfigurationProperty}
 	 */
@@ -53,7 +53,7 @@ public static <T> ConfigurationProperty<T> asNotSet() {
 	/**
 	 * Creates a {@link ConfigurationProperty} object from a {@link JsonElement}
 	 * value.
-	 * 
+	 *
 	 * @param <T>      the type of the value
 	 * @param element  the {@link JsonElement} value
 	 * @param function conversion function from {@link JsonElement} to type T
@@ -64,7 +64,8 @@ public static <T> ConfigurationProperty<T> fromJsonElement(Optional<JsonElement>
 			ThrowingFunction<JsonElement, T, OpenemsNamedException> function) throws OpenemsNamedException {
 		if (!element.isPresent()) {
 			return ConfigurationProperty.asNotSet();
-		} else if (element.get().isJsonNull()) {
+		}
+		if (element.get().isJsonNull()) {
 			return ConfigurationProperty.asNull();
 		} else {
 			return ConfigurationProperty.of(function.apply(element.get()));
diff --git a/io.openems.common/src/io/openems/common/types/EdgeConfig.java b/io.openems.common/src/io/openems/common/types/EdgeConfig.java
index 9c18c72948b..12f507aaa35 100644
--- a/io.openems.common/src/io/openems/common/types/EdgeConfig.java
+++ b/io.openems.common/src/io/openems/common/types/EdgeConfig.java
@@ -179,8 +179,8 @@ public static Channel fromJson(String channelId, JsonElement json) throws Openem
 					}
 				}
 				var text = JsonUtils.getAsOptionalString(json, "text").orElse("");
-				Unit unit = JsonUtils.getAsOptionalEnum(Unit.class, json, "unit").orElse(Unit.NONE);
-				ChannelCategory category = JsonUtils.getAsOptionalEnum(ChannelCategory.class, json, "category")
+				var unit = JsonUtils.getAsOptionalEnum(Unit.class, json, "unit").orElse(Unit.NONE);
+				var category = JsonUtils.getAsOptionalEnum(ChannelCategory.class, json, "category")
 						.orElse(ChannelCategory.OPENEMS_TYPE);
 				ChannelDetail detail = null;
 				switch (category) {
@@ -202,7 +202,7 @@ public static Channel fromJson(String channelId, JsonElement json) throws Openem
 				}
 
 				case STATE: {
-					Level level = JsonUtils.getAsEnum(Level.class, json, "level");
+					var level = JsonUtils.getAsEnum(Level.class, json, "level");
 					detail = new ChannelDetailState(level);
 					break;
 				}
@@ -319,7 +319,7 @@ public Component(String servicePid, String id, String alias, String factoryId,
 
 		/**
 		 * Constructor with NO_SERVICE_PID.
-		 * 
+		 *
 		 * @param id         the Component-ID
 		 * @param alias      the Alias
 		 * @param factoryId  the Factory-ID
@@ -333,7 +333,7 @@ public Component(String id, String alias, String factoryId, SortedMap<String, Js
 
 		/**
 		 * Constructor with NO_SERVICE_PID, properties as JsonObject and no channels
-		 * 
+		 *
 		 * @param id         the Component-ID
 		 * @param factoryId  the Factory-ID
 		 * @param properties the configuration properties
@@ -408,7 +408,7 @@ public Optional<JsonElement> getProperty(String propertyId) {
 		 * @return the Property
 		 */
 		public JsonElement getPropertyOrError(String propertyId) throws InvalidValueException {
-			JsonElement property = this.properties.get(propertyId);
+			var property = this.properties.get(propertyId);
 			if (property != null) {
 				return property;
 			}
@@ -758,44 +758,43 @@ private static JsonObject getSchema(AttributeDefinition ad) {
 									.build()) //
 							.build();
 
-				} else {
-					// generate schema from AttributeDefinition Type
-					switch (ad.getType()) {
-					case AttributeDefinition.STRING:
-					case AttributeDefinition.CHARACTER:
-						return JsonUtils.buildJsonObject() //
-								.addProperty("type", "input") //
-								.add("templateOptions", JsonUtils.buildJsonObject() //
-										.addProperty("type", "text") //
-										.build()) //
-								.build();
-
-					case AttributeDefinition.LONG:
-					case AttributeDefinition.INTEGER:
-					case AttributeDefinition.SHORT:
-					case AttributeDefinition.DOUBLE:
-					case AttributeDefinition.FLOAT:
-					case AttributeDefinition.BYTE:
-						return JsonUtils.buildJsonObject() //
-								.addProperty("type", "input") //
-								.add("templateOptions", JsonUtils.buildJsonObject() //
-										.addProperty("type", "number") //
-										.build()) //
-								.build();
-
-					case AttributeDefinition.PASSWORD:
-						return JsonUtils.buildJsonObject() //
-								.addProperty("type", "input") //
-								.add("templateOptions", JsonUtils.buildJsonObject() //
-										.addProperty("type", "password") //
-										.build()) //
-								.build();
-
-					case AttributeDefinition.BOOLEAN:
-						return JsonUtils.buildJsonObject() //
-								.addProperty("type", "toggle") //
-								.build();
-					}
+				}
+				// generate schema from AttributeDefinition Type
+				switch (ad.getType()) {
+				case AttributeDefinition.STRING:
+				case AttributeDefinition.CHARACTER:
+					return JsonUtils.buildJsonObject() //
+							.addProperty("type", "input") //
+							.add("templateOptions", JsonUtils.buildJsonObject() //
+									.addProperty("type", "text") //
+									.build()) //
+							.build();
+
+				case AttributeDefinition.LONG:
+				case AttributeDefinition.INTEGER:
+				case AttributeDefinition.SHORT:
+				case AttributeDefinition.DOUBLE:
+				case AttributeDefinition.FLOAT:
+				case AttributeDefinition.BYTE:
+					return JsonUtils.buildJsonObject() //
+							.addProperty("type", "input") //
+							.add("templateOptions", JsonUtils.buildJsonObject() //
+									.addProperty("type", "number") //
+									.build()) //
+							.build();
+
+				case AttributeDefinition.PASSWORD:
+					return JsonUtils.buildJsonObject() //
+							.addProperty("type", "input") //
+							.add("templateOptions", JsonUtils.buildJsonObject() //
+									.addProperty("type", "password") //
+									.build()) //
+							.build();
+
+				case AttributeDefinition.BOOLEAN:
+					return JsonUtils.buildJsonObject() //
+							.addProperty("type", "toggle") //
+							.build();
 				}
 
 				return schema;
@@ -812,7 +811,7 @@ public static Property fromJson(JsonElement json) throws OpenemsNamedException {
 				var id = JsonUtils.getAsString(json, "id");
 				var name = JsonUtils.getAsString(json, "name");
 				var description = JsonUtils.getAsString(json, "description");
-				OpenemsType type = JsonUtils.getAsOptionalEnum(OpenemsType.class, json, "type")
+				var type = JsonUtils.getAsOptionalEnum(OpenemsType.class, json, "type")
 						.orElse(OpenemsType.STRING);
 				var isRequired = JsonUtils.getAsBoolean(json, "isRequired");
 				boolean isPassword = JsonUtils.getAsOptionalBoolean(json, "isPassword").orElse(false);
@@ -1108,7 +1107,7 @@ public Optional<Component> getComponent(String componentId) {
 	 * @return the {@link Component}
 	 */
 	public Component getComponentOrError(String componentId) throws InvalidValueException {
-		Component component = this.components.get(componentId);
+		var component = this.components.get(componentId);
 		if (component != null) {
 			return component;
 		}
diff --git a/io.openems.common/src/io/openems/common/types/EdgeConfigDiff.java b/io.openems.common/src/io/openems/common/types/EdgeConfigDiff.java
index d1d90f9f0a8..9741d7cfd98 100644
--- a/io.openems.common/src/io/openems/common/types/EdgeConfigDiff.java
+++ b/io.openems.common/src/io/openems/common/types/EdgeConfigDiff.java
@@ -57,8 +57,8 @@ public static EdgeConfigDiff diff(EdgeConfig newConfig, EdgeConfig oldConfig) {
 		if (!diffComponents.entriesDiffering().isEmpty()) {
 			for (Entry<String, ValueDifference<EdgeConfig.Component>> differingComponent : diffComponents
 					.entriesDiffering().entrySet()) {
-				EdgeConfig.Component newComponent = differingComponent.getValue().leftValue();
-				EdgeConfig.Component oldComponent = differingComponent.getValue().rightValue();
+				var newComponent = differingComponent.getValue().leftValue();
+				var oldComponent = differingComponent.getValue().rightValue();
 
 				MapDifference<String, JsonElement> diffProperties = Maps.difference(newComponent.getProperties(),
 						oldComponent.getProperties());
@@ -192,12 +192,12 @@ public TreeMap<String, OldNewProperty> getProperties() {
 	 * @param properties  the properties
 	 */
 	private void addCreated(String componentId, Component component, Map<String, JsonElement> properties) {
-		ComponentDiff.OldNewProperty lastChangeBy = new ComponentDiff.OldNewProperty(JsonNull.INSTANCE,
+		var lastChangeBy = new ComponentDiff.OldNewProperty(JsonNull.INSTANCE,
 				component.getProperty(OpenemsConstants.PROPERTY_LAST_CHANGE_BY)
 						.orElse(new JsonPrimitive("Apache Felix Webconsole")));
-		ComponentDiff.OldNewProperty lastChangeAt = new ComponentDiff.OldNewProperty(JsonNull.INSTANCE,
+		var lastChangeAt = new ComponentDiff.OldNewProperty(JsonNull.INSTANCE,
 				component.getProperty(OpenemsConstants.PROPERTY_LAST_CHANGE_AT).orElse(JsonNull.INSTANCE));
-		ComponentDiff diff = new ComponentDiff(component, Change.CREATED, lastChangeBy, lastChangeAt);
+		var diff = new ComponentDiff(component, Change.CREATED, lastChangeBy, lastChangeAt);
 		for (Entry<String, JsonElement> entry : properties.entrySet()) {
 			diff.add(entry.getKey(), new ComponentDiff.OldNewProperty(JsonNull.INSTANCE, entry.getValue()));
 		}
@@ -212,14 +212,14 @@ private void addCreated(String componentId, Component component, Map<String, Jso
 	 * @param properties  the properties
 	 */
 	private void addDeleted(String componentId, Component component, Map<String, JsonElement> properties) {
-		ComponentDiff.OldNewProperty lastChangeBy = new ComponentDiff.OldNewProperty(
+		var lastChangeBy = new ComponentDiff.OldNewProperty(
 				component.getProperty(OpenemsConstants.PROPERTY_LAST_CHANGE_BY)
 						.orElse(new JsonPrimitive("Apache Felix Webconsole")),
 				JsonNull.INSTANCE);
-		ComponentDiff.OldNewProperty lastChangeAt = new ComponentDiff.OldNewProperty(
+		var lastChangeAt = new ComponentDiff.OldNewProperty(
 				component.getProperty(OpenemsConstants.PROPERTY_LAST_CHANGE_AT).orElse(JsonNull.INSTANCE),
 				JsonNull.INSTANCE);
-		ComponentDiff diff = new ComponentDiff(component, Change.DELETED, lastChangeBy, lastChangeAt);
+		var diff = new ComponentDiff(component, Change.DELETED, lastChangeBy, lastChangeAt);
 		for (Entry<String, JsonElement> entry : properties.entrySet()) {
 			diff.add(entry.getKey(), new ComponentDiff.OldNewProperty(entry.getValue(), JsonNull.INSTANCE));
 		}
@@ -234,12 +234,12 @@ private void addDeleted(String componentId, Component component, Map<String, Jso
 	 * @param properties  the properties
 	 */
 	private void addUpdated(String componentId, Component component, Map<String, OldNewProperty> properties) {
-		ComponentDiff.OldNewProperty lastChangeBy = new ComponentDiff.OldNewProperty(JsonNull.INSTANCE,
+		var lastChangeBy = new ComponentDiff.OldNewProperty(JsonNull.INSTANCE,
 				component.getProperty(OpenemsConstants.PROPERTY_LAST_CHANGE_BY)
 						.orElse(new JsonPrimitive("Apache Felix Webconsole")));
-		ComponentDiff.OldNewProperty lastChangeAt = new ComponentDiff.OldNewProperty(JsonNull.INSTANCE,
+		var lastChangeAt = new ComponentDiff.OldNewProperty(JsonNull.INSTANCE,
 				JsonNull.INSTANCE);
-		ComponentDiff diff = new ComponentDiff(component, Change.UPDATED, lastChangeBy, lastChangeAt);
+		var diff = new ComponentDiff(component, Change.UPDATED, lastChangeBy, lastChangeAt);
 		for (Entry<String, OldNewProperty> property : properties.entrySet()) {
 			diff.add(property.getKey(), property.getValue());
 		}
@@ -265,8 +265,8 @@ public String getAsHtml() {
 				+ "	</thead>" //
 				+ "	<tbody>");
 		for (Entry<String, ComponentDiff> componentEntry : this.components.entrySet()) {
-			String componentId = componentEntry.getKey();
-			ComponentDiff component = componentEntry.getValue();
+			var componentId = componentEntry.getKey();
+			var component = componentEntry.getValue();
 			b.append("<tr>");
 			// Change column
 			b.append(String.format("<td rowspan=\"%s\" style=\"vertical-align: top\">%s</td>",
@@ -319,8 +319,8 @@ public String getAsHtml() {
 	public String getAsText() {
 		var b = new StringBuilder();
 		for (Entry<String, ComponentDiff> componentEntry : this.components.entrySet()) {
-			final ComponentDiff component = componentEntry.getValue();
-			String change = component.properties.entrySet().stream() //
+			final var component = componentEntry.getValue();
+			var change = component.properties.entrySet().stream() //
 					.filter(e -> {
 						switch (e.getKey()) {
 						case "_lastChangeAt":
diff --git a/io.openems.common/src/io/openems/common/types/SemanticVersion.java b/io.openems.common/src/io/openems/common/types/SemanticVersion.java
index 3484f9c9624..ac1b7b9561e 100644
--- a/io.openems.common/src/io/openems/common/types/SemanticVersion.java
+++ b/io.openems.common/src/io/openems/common/types/SemanticVersion.java
@@ -99,7 +99,7 @@ public SemanticVersion(int major, int minor, int patch) {
 
 	/**
 	 * Is this version at least as high as the given {@link SemanticVersion}?.
-	 * 
+	 *
 	 * @param o the given version
 	 * @return true if this version is greater or equal to the given version
 	 */
diff --git a/io.openems.common/src/io/openems/common/utils/EnumUtils.java b/io.openems.common/src/io/openems/common/utils/EnumUtils.java
index b96337222dd..c398d4a3b97 100644
--- a/io.openems.common/src/io/openems/common/utils/EnumUtils.java
+++ b/io.openems.common/src/io/openems/common/utils/EnumUtils.java
@@ -13,7 +13,7 @@ public class EnumUtils {
 
 	/**
 	 * Gets the member of the {@link EnumMap} as {@link Optional} {@link Boolean}.
-	 * 
+	 *
 	 * @param <ENUM> the type of the EnumMap key
 	 * @param map    the {@link EnumMap}
 	 * @param member the member
@@ -31,7 +31,7 @@ public static <ENUM extends Enum<ENUM>> Optional<Boolean> getAsOptionalBoolean(E
 
 	/**
 	 * Gets the member of the {@link EnumMap} as {@link Optional} {@link String}.
-	 * 
+	 *
 	 * @param <ENUM> the type of the EnumMap key
 	 * @param map    the {@link EnumMap}
 	 * @param member the member
@@ -49,7 +49,7 @@ public static <ENUM extends Enum<ENUM>> Optional<String> getAsOptionalString(Enu
 
 	/**
 	 * Gets the member of the {@link EnumMap} as {@link JsonPrimitive}.
-	 * 
+	 *
 	 * @param <ENUM> the type of the EnumMap key
 	 * @param map    the {@link EnumMap}
 	 * @param member the member
@@ -58,13 +58,13 @@ public static <ENUM extends Enum<ENUM>> Optional<String> getAsOptionalString(Enu
 	 */
 	public static <ENUM extends Enum<ENUM>> JsonPrimitive getAsPrimitive(EnumMap<ENUM, JsonElement> map, ENUM member)
 			throws OpenemsNamedException {
-		JsonElement jSubElement = getSubElement(map, member);
+		var jSubElement = getSubElement(map, member);
 		return JsonUtils.getAsPrimitive(jSubElement);
 	}
 
 	/**
 	 * Gets the member of the {@link EnumMap} as {@link Boolean}.
-	 * 
+	 *
 	 * @param <ENUM> the type of the EnumMap key
 	 * @param map    the {@link EnumMap}
 	 * @param member the member
@@ -78,7 +78,7 @@ public static <ENUM extends Enum<ENUM>> Boolean getAsBoolean(EnumMap<ENUM, JsonE
 
 	/**
 	 * Gets the member of the {@link EnumMap} as {@link String}.
-	 * 
+	 *
 	 * @param <ENUM> the type of the EnumMap key
 	 * @param map    the {@link EnumMap}
 	 * @param member the member
@@ -92,7 +92,7 @@ public static <ENUM extends Enum<ENUM>> String getAsString(EnumMap<ENUM, JsonEle
 
 	/**
 	 * Gets the member of the {@link EnumMap} as {@link JsonElement}.
-	 * 
+	 *
 	 * @param <ENUM> the type of the EnumMap key
 	 * @param map    the {@link EnumMap}
 	 * @param member the member
@@ -103,14 +103,14 @@ public static <ENUM extends Enum<ENUM>> JsonElement getSubElement(EnumMap<ENUM,
 			throws OpenemsNamedException {
 		if (!map.containsKey(member)) {
 			throw OpenemsError.JSON_HAS_NO_MEMBER.exception(member,
-					StringUtils.toShortString(map.toString(), 100).replaceAll("%", "%%"));
+					StringUtils.toShortString(map.toString(), 100).replace("%", "%%"));
 		}
 		return map.get(member);
 	}
 
 	/**
 	 * Gets the member of the {@link EnumMap} as int.
-	 * 
+	 *
 	 * @param <ENUM> the type of the EnumMap key
 	 * @param map    the {@link EnumMap}
 	 * @param member the member
diff --git a/io.openems.common/src/io/openems/common/utils/JsonUtils.java b/io.openems.common/src/io/openems/common/utils/JsonUtils.java
index 0cefd17859a..efdf6ca7dd5 100644
--- a/io.openems.common/src/io/openems/common/utils/JsonUtils.java
+++ b/io.openems.common/src/io/openems/common/utils/JsonUtils.java
@@ -1,6 +1,7 @@
 package io.openems.common.utils;
 
 import java.net.Inet4Address;
+import java.net.InetAddress;
 import java.net.UnknownHostException;
 import java.time.ZoneId;
 import java.time.ZonedDateTime;
@@ -342,8 +343,7 @@ public static JsonPrimitive getAsPrimitive(JsonElement jElement) throws OpenemsN
 	public static JsonPrimitive getAsPrimitive(JsonElement jElement, String memberName) throws OpenemsNamedException {
 		var jSubElement = getSubElement(jElement, memberName);
 		if (!jSubElement.isJsonPrimitive()) {
-			throw OpenemsError.JSON_NO_PRIMITIVE_MEMBER.exception(memberName,
-					jElement.toString().replaceAll("%", "%%"));
+			throw OpenemsError.JSON_NO_PRIMITIVE_MEMBER.exception(memberName, jElement.toString().replace("%", "%%"));
 		}
 		return jSubElement.getAsJsonPrimitive();
 	}
@@ -506,7 +506,7 @@ public static String getAsString(JsonElement jElement) throws OpenemsNamedExcept
 
 	/**
 	 * Gets the {@link JsonPrimitive} as {@link String}.
-	 * 
+	 *
 	 * @param jPrimitive the {@link JsonPrimitive}
 	 * @return the {@link String} value
 	 * @throws OpenemsNamedException on error
@@ -585,7 +585,7 @@ public static String[] getAsStringArray(JsonArray json) throws OpenemsNamedExcep
 
 	/**
 	 * Gets the {@link JsonPrimitive} as {@link Boolean}.
-	 * 
+	 *
 	 * @param jPrimitive the {@link JsonPrimitive}
 	 * @return the {@link Boolean} value
 	 * @throws OpenemsNamedException on error
@@ -598,7 +598,8 @@ public static boolean getAsBoolean(JsonPrimitive jPrimitive) throws OpenemsNamed
 			var element = jPrimitive.getAsString();
 			if (element.equalsIgnoreCase("false")) {
 				return false;
-			} else if (element.equalsIgnoreCase("true")) {
+			}
+			if (element.equalsIgnoreCase("true")) {
 				return true;
 			}
 		}
@@ -607,7 +608,7 @@ public static boolean getAsBoolean(JsonPrimitive jPrimitive) throws OpenemsNamed
 
 	/**
 	 * Gets the {@link JsonElement} as {@link Boolean}.
-	 * 
+	 *
 	 * @param jElement the {@link JsonElement}
 	 * @return the {@link Boolean} value
 	 * @throws OpenemsNamedException on error
@@ -648,7 +649,7 @@ public static Optional<Boolean> getAsOptionalBoolean(JsonElement jElement, Strin
 
 	/**
 	 * Gets the {@link JsonPrimitive} as short.
-	 * 
+	 *
 	 * @param jPrimitive the {@link JsonPrimitive}
 	 * @return the short value
 	 * @throws OpenemsNamedException on error
@@ -656,7 +657,8 @@ public static Optional<Boolean> getAsOptionalBoolean(JsonElement jElement, Strin
 	public static short getAsShort(JsonPrimitive jPrimitive) throws OpenemsNamedException {
 		if (jPrimitive.isNumber()) {
 			return jPrimitive.getAsShort();
-		} else if (jPrimitive.isString()) {
+		}
+		if (jPrimitive.isString()) {
 			var string = jPrimitive.getAsString();
 			return Short.parseShort(string);
 		}
@@ -665,7 +667,7 @@ public static short getAsShort(JsonPrimitive jPrimitive) throws OpenemsNamedExce
 
 	/**
 	 * Gets the {@link JsonElement} as short.
-	 * 
+	 *
 	 * @param jElement the {@link JsonElement}
 	 * @return the short value
 	 * @throws OpenemsNamedException on error
@@ -688,7 +690,7 @@ public static short getAsShort(JsonElement jElement, String memberName) throws O
 
 	/**
 	 * Gets the {@link JsonPrimitive} as int.
-	 * 
+	 *
 	 * @param jPrimitive the {@link JsonPrimitive}
 	 * @return the int value
 	 * @throws OpenemsNamedException on error
@@ -696,7 +698,8 @@ public static short getAsShort(JsonElement jElement, String memberName) throws O
 	public static int getAsInt(JsonPrimitive jPrimitive) throws OpenemsNamedException {
 		if (jPrimitive.isNumber()) {
 			return jPrimitive.getAsInt();
-		} else if (jPrimitive.isString()) {
+		}
+		if (jPrimitive.isString()) {
 			var string = jPrimitive.getAsString();
 			return Integer.parseInt(string);
 		}
@@ -705,7 +708,7 @@ public static int getAsInt(JsonPrimitive jPrimitive) throws OpenemsNamedExceptio
 
 	/**
 	 * Gets the {@link JsonElement} as int.
-	 * 
+	 *
 	 * @param jElement the {@link JsonElement}
 	 * @return the int value
 	 * @throws OpenemsNamedException on error
@@ -775,7 +778,7 @@ public static Optional<Integer> getAsOptionalInt(JsonElement jElement, String me
 
 	/**
 	 * Gets the {@link JsonPrimitive} as long.
-	 * 
+	 *
 	 * @param jPrimitive the {@link JsonPrimitive}
 	 * @return the long value
 	 * @throws OpenemsNamedException on error
@@ -783,7 +786,8 @@ public static Optional<Integer> getAsOptionalInt(JsonElement jElement, String me
 	public static long getAsLong(JsonPrimitive jPrimitive) throws OpenemsNamedException {
 		if (jPrimitive.isNumber()) {
 			return jPrimitive.getAsLong();
-		} else if (jPrimitive.isString()) {
+		}
+		if (jPrimitive.isString()) {
 			var string = jPrimitive.getAsString();
 			return Integer.parseInt(string);
 		}
@@ -792,7 +796,7 @@ public static long getAsLong(JsonPrimitive jPrimitive) throws OpenemsNamedExcept
 
 	/**
 	 * Gets the {@link JsonElement} as long.
-	 * 
+	 *
 	 * @param jElement the {@link JsonElement}
 	 * @return the long value
 	 * @throws OpenemsNamedException on error
@@ -831,7 +835,7 @@ public static Optional<Long> getAsOptionalLong(JsonElement jElement, String memb
 
 	/**
 	 * Gets the {@link JsonPrimitive} as {@link Float}.
-	 * 
+	 *
 	 * @param jPrimitive the {@link JsonPrimitive}
 	 * @return the {@link Float} value
 	 * @throws OpenemsNamedException on error
@@ -839,7 +843,8 @@ public static Optional<Long> getAsOptionalLong(JsonElement jElement, String memb
 	public static float getAsFloat(JsonPrimitive jPrimitive) throws OpenemsNamedException {
 		if (jPrimitive.isNumber()) {
 			return jPrimitive.getAsFloat();
-		} else if (jPrimitive.isString()) {
+		}
+		if (jPrimitive.isString()) {
 			var string = jPrimitive.getAsString();
 			return Float.parseFloat(string);
 		}
@@ -848,7 +853,7 @@ public static float getAsFloat(JsonPrimitive jPrimitive) throws OpenemsNamedExce
 
 	/**
 	 * Gets the {@link JsonElement} as {@link Float}.
-	 * 
+	 *
 	 * @param jElement the {@link JsonElement}
 	 * @return the {@link Float} value
 	 * @throws OpenemsNamedException on error
@@ -871,7 +876,7 @@ public static float getAsFloat(JsonElement jElement, String memberName) throws O
 
 	/**
 	 * Gets the {@link JsonPrimitive} as {@link Double}.
-	 * 
+	 *
 	 * @param jPrimitive the {@link JsonPrimitive}
 	 * @return the {@link Double} value
 	 * @throws OpenemsNamedException on error
@@ -879,7 +884,8 @@ public static float getAsFloat(JsonElement jElement, String memberName) throws O
 	public static double getAsDouble(JsonPrimitive jPrimitive) throws OpenemsNamedException {
 		if (jPrimitive.isNumber()) {
 			return jPrimitive.getAsDouble();
-		} else if (jPrimitive.isString()) {
+		}
+		if (jPrimitive.isString()) {
 			var string = jPrimitive.getAsString();
 			return Double.parseDouble(string);
 		}
@@ -888,7 +894,7 @@ public static double getAsDouble(JsonPrimitive jPrimitive) throws OpenemsNamedEx
 
 	/**
 	 * Gets the {@link JsonElement} as {@link Double}.
-	 * 
+	 *
 	 * @param jElement the {@link JsonElement}
 	 * @return the {@link Double} value
 	 * @throws OpenemsNamedException on error
@@ -922,7 +928,7 @@ public static <E extends Enum<E>> E getAsEnum(Class<E> enumType, JsonElement jEl
 			throws OpenemsNamedException {
 		var element = getAsString(jElement);
 		try {
-			return (E) Enum.valueOf(enumType, element);
+			return Enum.valueOf(enumType, element);
 		} catch (IllegalArgumentException e) {
 			throw OpenemsError.JSON_NO_ENUM.exception(element);
 		}
@@ -942,7 +948,7 @@ public static <E extends Enum<E>> E getAsEnum(Class<E> enumType, JsonElement jEl
 			throws OpenemsNamedException {
 		var element = getAsString(jElement, memberName);
 		try {
-			return (E) Enum.valueOf(enumType, element);
+			return Enum.valueOf(enumType, element);
 		} catch (IllegalArgumentException e) {
 			throw OpenemsError.JSON_NO_ENUM_MEMBER.exception(memberName, element);
 		}
@@ -980,7 +986,7 @@ public static <E extends Enum<E>> Optional<E> getAsOptionalEnum(Class<E> enumTyp
 	 */
 	public static Inet4Address getAsInet4Address(JsonElement jElement) throws OpenemsNamedException {
 		try {
-			return (Inet4Address) Inet4Address.getByName(getAsString(jElement));
+			return (Inet4Address) InetAddress.getByName(getAsString(jElement));
 		} catch (UnknownHostException e) {
 			throw OpenemsError.JSON_NO_INET4ADDRESS.exception(jElement.toString().replace("%", "%%"));
 		}
@@ -997,7 +1003,7 @@ public static Inet4Address getAsInet4Address(JsonElement jElement) throws Openem
 	 */
 	public static Optional<Inet4Address> getAsOptionalInet4Address(JsonElement jElement, String memberName) {
 		try {
-			return Optional.ofNullable((Inet4Address) Inet4Address.getByName(getAsString(jElement, memberName)));
+			return Optional.ofNullable((Inet4Address) InetAddress.getByName(getAsString(jElement, memberName)));
 		} catch (OpenemsNamedException | UnknownHostException e) {
 			return Optional.empty();
 		}
@@ -1032,7 +1038,7 @@ public static UUID getAsUUID(JsonElement jElement, String memberName) throws Ope
 	// CHECKSTYLE:OFF
 	public static Optional<UUID> getAsOptionalUUID(JsonElement jElement, String memberName) {
 		// CHECKSTYLE:ON
-		Optional<String> uuid = getAsOptionalString(jElement, memberName);
+		var uuid = getAsOptionalString(jElement, memberName);
 		if (uuid.isPresent()) {
 			return Optional.ofNullable(UUID.fromString(uuid.get()));
 		}
@@ -1078,7 +1084,8 @@ public static Object getAsBestType(JsonElement j) throws OpenemsNamedException {
 						result[i] = jA.get(i).getAsBoolean();
 					}
 					return result;
-				} else if (isInt) {
+				}
+				if (isInt) {
 					// convert to int array
 					var result = new int[jA.size()];
 					for (var i = 0; i < jA.size(); i++) {
@@ -1140,7 +1147,8 @@ public static JsonElement getAsJsonElement(Object value) {
 			 * Number
 			 */
 			return new JsonPrimitive((Number) value);
-		} else if (value instanceof String) {
+		}
+		if (value instanceof String) {
 			/*
 			 * String
 			 */
@@ -1263,7 +1271,8 @@ public static Object getAsType(Class<?> type, JsonElement j) throws NotImplement
 				 */
 				return j.getAsInt();
 
-			} else if (Long.class.isAssignableFrom(type)) {
+			}
+			if (Long.class.isAssignableFrom(type)) {
 				/*
 				 * Asking for an Long
 				 */
@@ -1434,7 +1443,7 @@ public static JsonObject parseToJsonObject(String string) throws OpenemsNamedExc
 
 	/**
 	 * Parses a string to a {@link JsonArray}.
-	 * 
+	 *
 	 * @param string the String
 	 * @return the {@link JsonArray}
 	 * @throws OpenemsNamedException on error
diff --git a/io.openems.common/src/io/openems/common/utils/Mutex.java b/io.openems.common/src/io/openems/common/utils/Mutex.java
index 2d57055e547..f311bf8d40c 100644
--- a/io.openems.common/src/io/openems/common/utils/Mutex.java
+++ b/io.openems.common/src/io/openems/common/utils/Mutex.java
@@ -17,7 +17,7 @@ public Mutex(boolean initiallyPermitted) {
 
 	/**
 	 * Wait for a {@link #release()}.
-	 * 
+	 *
 	 * @throws InterruptedException on wait error
 	 */
 	public void await() throws InterruptedException {
@@ -29,7 +29,7 @@ public void await() throws InterruptedException {
 
 	/**
 	 * Wait for a {@link #release()} with a timeout.
-	 * 
+	 *
 	 * @param timeout the timeout value
 	 * @param unit    the timeout {@link TimeUnit}
 	 * @throws InterruptedException on wait error
diff --git a/io.openems.common/src/io/openems/common/utils/SecureRandomSingleton.java b/io.openems.common/src/io/openems/common/utils/SecureRandomSingleton.java
index 4f8058ac100..dd3818e31c1 100644
--- a/io.openems.common/src/io/openems/common/utils/SecureRandomSingleton.java
+++ b/io.openems.common/src/io/openems/common/utils/SecureRandomSingleton.java
@@ -14,7 +14,7 @@ public class SecureRandomSingleton {
 
 	/**
 	 * Gets the {@link SecureRandom} singleton instance.
-	 * 
+	 *
 	 * @return the {@link SecureRandom} instance
 	 */
 	public static synchronized SecureRandom getInstance() {
diff --git a/io.openems.common/src/io/openems/common/utils/StringUtils.java b/io.openems.common/src/io/openems/common/utils/StringUtils.java
index 7db042b67b5..d7b87e53b0f 100644
--- a/io.openems.common/src/io/openems/common/utils/StringUtils.java
+++ b/io.openems.common/src/io/openems/common/utils/StringUtils.java
@@ -9,10 +9,10 @@ public class StringUtils {
 
 	/**
 	 * Shortens a string to a given length.
-	 * 
+	 *
 	 * <p>
 	 * Example: converts a string "hello world" to "hello w..."
-	 * 
+	 *
 	 * @param s      the string
 	 * @param length the target string length
 	 * @return the shortened string
@@ -26,10 +26,10 @@ public static String toShortString(String s, int length) {
 
 	/**
 	 * Shortens a {@link JsonElement} string representation to a given length.
-	 * 
+	 *
 	 * <p>
 	 * Example: converts a "{ 'foo': 'bar' }" to "{ 'foo': '..."
-	 * 
+	 *
 	 * @param j      the {@link JsonElement}
 	 * @param length the target string length
 	 * @return the shortened string
@@ -41,10 +41,10 @@ public static String toShortString(JsonElement j, int length) {
 
 	/**
 	 * Convert the first letter of a string to Upper-Case.
-	 * 
+	 *
 	 * <p>
 	 * Example: converts "hello world" to "Hello world"
-	 * 
+	 *
 	 * @param s the string
 	 * @return the converted string
 	 */
@@ -74,7 +74,8 @@ public static String capitalizeFirstLetter(String s) {
 	public static int matchWildcard(String source, String pattern) {
 		if (source.equals(pattern)) {
 			return 0;
-		} else if (pattern.equals("*")) {
+		}
+		if (pattern.equals("*")) {
 			return 1;
 		} else if (pattern.startsWith("*") && source.endsWith(pattern.substring(1))) {
 			return pattern.length();
diff --git a/io.openems.common/src/io/openems/common/utils/XmlUtils.java b/io.openems.common/src/io/openems/common/utils/XmlUtils.java
index 59431251e9d..6431897bda9 100644
--- a/io.openems.common/src/io/openems/common/utils/XmlUtils.java
+++ b/io.openems.common/src/io/openems/common/utils/XmlUtils.java
@@ -15,7 +15,7 @@ public class XmlUtils {
 
 	/**
 	 * Converts a {@link NamedNodeMap} to a string representative.
-	 * 
+	 *
 	 * @param attrs the {@link NamedNodeMap}
 	 * @return a string
 	 */
@@ -29,7 +29,7 @@ public static String namedNodeMapToString(NamedNodeMap attrs) {
 
 	/**
 	 * Gets the Sub-Node of a {@link NamedNodeMap} with the given name.
-	 * 
+	 *
 	 * @param attrs the {@link NamedNodeMap}
 	 * @param name  the name of the Sub-Node
 	 * @return the {@link Node}
@@ -47,7 +47,7 @@ public static Node getSubNode(NamedNodeMap attrs, String name) throws OpenemsNam
 	/**
 	 * Gets the value of a Sub-Node of a {@link NamedNodeMap} with the given name as
 	 * String.
-	 * 
+	 *
 	 * @param attrs the {@link NamedNodeMap}
 	 * @param name  the name of the Sub-Node
 	 * @return the value of the {@link Node}
@@ -65,7 +65,7 @@ public static String getAsString(NamedNodeMap attrs, String name) throws Openems
 	/**
 	 * Gets the value of a Sub-Node of a {@link NamedNodeMap} with the given name as
 	 * String; otherwise the alternative value.
-	 * 
+	 *
 	 * @param attrs the {@link NamedNodeMap}
 	 * @param name  the name of the Sub-Node
 	 * @param def   the alternative value
@@ -83,7 +83,7 @@ public static String getAsStringOrElse(NamedNodeMap attrs, String name, String d
 	/**
 	 * Gets the value of a Sub-Node of a {@link NamedNodeMap} with the given name as
 	 * Integer.
-	 * 
+	 *
 	 * @param attrs the {@link NamedNodeMap}
 	 * @param name  the name of the Sub-Node
 	 * @return the value of the {@link Node}
@@ -100,7 +100,7 @@ public static int getAsInt(NamedNodeMap attrs, String name) throws OpenemsNamedE
 	/**
 	 * Gets the value of a Sub-Node of a {@link NamedNodeMap} with the given name as
 	 * Integer; otherwise the alternative value.
-	 * 
+	 *
 	 * @param attrs the {@link NamedNodeMap}
 	 * @param name  the name of the Sub-Node
 	 * @param def   the alternative value
@@ -118,7 +118,7 @@ public static int getAsIntOrElse(NamedNodeMap attrs, String name, int def) {
 	/**
 	 * Gets the value of a Sub-Node of a {@link NamedNodeMap} with the given name as
 	 * Enum.
-	 * 
+	 *
 	 * @param <E>      the type of the {@link Enum}
 	 * @param enumType the class of the {@link Enum}
 	 * @param attrs    the {@link NamedNodeMap}
@@ -130,7 +130,7 @@ public static <E extends Enum<E>> E getAsEnum(Class<E> enumType, NamedNodeMap at
 			throws OpenemsNamedException {
 		var element = XmlUtils.getAsString(attrs, name);
 		try {
-			return (E) Enum.valueOf(enumType, element.toUpperCase());
+			return Enum.valueOf(enumType, element.toUpperCase());
 		} catch (IllegalArgumentException e) {
 			throw new OpenemsException(e);
 		}
@@ -139,7 +139,7 @@ public static <E extends Enum<E>> E getAsEnum(Class<E> enumType, NamedNodeMap at
 	/**
 	 * Gets the value of a Sub-Node of a {@link NamedNodeMap} with the given name as
 	 * Enum; otherwise the alternative value.
-	 * 
+	 *
 	 * @param <E>      the type of the {@link Enum}
 	 * @param enumType the class of the {@link Enum}
 	 * @param attrs    the {@link NamedNodeMap}
@@ -159,7 +159,7 @@ public static <E extends Enum<E>> E getAsEnumOrElse(Class<E> enumType, NamedNode
 	/**
 	 * Gets the value of a Sub-Node of a {@link NamedNodeMap} with the given name as
 	 * Boolean.
-	 * 
+	 *
 	 * @param attrs the {@link NamedNodeMap}
 	 * @param name  the name of the Sub-Node
 	 * @return the value of the {@link Node}
@@ -173,7 +173,7 @@ public static boolean getAsBoolean(NamedNodeMap attrs, String name) throws Opene
 	/**
 	 * Gets the value of a Sub-Node of a {@link NamedNodeMap} with the given name as
 	 * Boolean; otherwise the alternative value.
-	 * 
+	 *
 	 * @param attrs the {@link NamedNodeMap}
 	 * @param name  the name of the Sub-Node
 	 * @param def   the alternative value
@@ -190,7 +190,7 @@ public static boolean getAsBooleanOrElse(NamedNodeMap attrs, String name, boolea
 
 	/**
 	 * Gets the Content of a {@link Node}.
-	 * 
+	 *
 	 * @param node the {@link Node}
 	 * @return the text content as string
 	 */
@@ -200,7 +200,7 @@ public static String getContentAsString(Node node) {
 
 	/**
 	 * Gets the Content of a {@link Node} as Integer.
-	 * 
+	 *
 	 * @param node the {@link Node}
 	 * @return the text content as string
 	 */
diff --git a/io.openems.common/src/io/openems/common/websocket/AbstractWebsocketClient.java b/io.openems.common/src/io/openems/common/websocket/AbstractWebsocketClient.java
index 933de987884..28ea1de9ba6 100644
--- a/io.openems.common/src/io/openems/common/websocket/AbstractWebsocketClient.java
+++ b/io.openems.common/src/io/openems/common/websocket/AbstractWebsocketClient.java
@@ -167,7 +167,7 @@ protected OnInternalError getOnInternalError() {
 
 	/**
 	 * Sends a {@link JsonrpcMessage}.
-	 * 
+	 *
 	 * @param message the {@link JsonrpcMessage}
 	 * @throws OpenemsException on error, e.g. if the websocket is not connected
 	 */
diff --git a/io.openems.common/src/io/openems/common/websocket/AbstractWebsocketServer.java b/io.openems.common/src/io/openems/common/websocket/AbstractWebsocketServer.java
index 387b33e312c..f88a30d2f6c 100644
--- a/io.openems.common/src/io/openems/common/websocket/AbstractWebsocketServer.java
+++ b/io.openems.common/src/io/openems/common/websocket/AbstractWebsocketServer.java
@@ -46,7 +46,7 @@ public abstract class AbstractWebsocketServer<T extends WsData> extends Abstract
 
 	/**
 	 * Construct an {@link AbstractWebsocketServer}.
-	 * 
+	 *
 	 * @param name      to identify this server
 	 * @param port      to listen on
 	 * @param poolSize  number of threads dedicated to handle the tasks
@@ -217,7 +217,7 @@ public void stop() {
 		ThreadPoolUtils.shutdownAndAwaitTermination(this.executor, 5);
 		ThreadPoolUtils.shutdownAndAwaitTermination(this.debugLogExecutor, 5);
 
-		int tries = 3;
+		var tries = 3;
 		while (tries-- > 0) {
 			try {
 				this.ws.stop();
diff --git a/io.openems.common/src/io/openems/common/websocket/DummyWebsocketServer.java b/io.openems.common/src/io/openems/common/websocket/DummyWebsocketServer.java
index 487b821aa9b..5e23393a57a 100644
--- a/io.openems.common/src/io/openems/common/websocket/DummyWebsocketServer.java
+++ b/io.openems.common/src/io/openems/common/websocket/DummyWebsocketServer.java
@@ -25,7 +25,7 @@ private Builder() {
 
 		/**
 		 * Sets the {@link OnOpen} callback.
-		 * 
+		 *
 		 * @param onOpen the callback
 		 * @return the {@link Builder}
 		 */
@@ -36,7 +36,7 @@ public DummyWebsocketServer.Builder onOpen(OnOpen onOpen) {
 
 		/**
 		 * Sets the {@link OnRequest} callback.
-		 * 
+		 *
 		 * @param onRequest the callback
 		 * @return the {@link Builder}
 		 */
@@ -47,7 +47,7 @@ public DummyWebsocketServer.Builder onRequest(OnRequest onRequest) {
 
 		/**
 		 * Sets the {@link OnNotification} callback.
-		 * 
+		 *
 		 * @param onNotification the callback
 		 * @return the {@link Builder}
 		 */
@@ -58,7 +58,7 @@ public DummyWebsocketServer.Builder onNotification(OnNotification onNotification
 
 		/**
 		 * Sets the {@link OnError} callback.
-		 * 
+		 *
 		 * @param onError the callback
 		 * @return the {@link Builder}
 		 */
@@ -69,7 +69,7 @@ public DummyWebsocketServer.Builder onError(OnError onError) {
 
 		/**
 		 * Sets the {@link OnClose} callback.
-		 * 
+		 *
 		 * @param onClose the callback
 		 * @return the {@link Builder}
 		 */
diff --git a/io.openems.common/src/io/openems/common/websocket/OnOpen.java b/io.openems.common/src/io/openems/common/websocket/OnOpen.java
index bfa1ea360e6..3851d7e4524 100644
--- a/io.openems.common/src/io/openems/common/websocket/OnOpen.java
+++ b/io.openems.common/src/io/openems/common/websocket/OnOpen.java
@@ -38,10 +38,10 @@ public interface OnOpen {
 	public static Optional<String> getFieldFromHandshakeCookie(JsonObject handshake, String fieldname) {
 		for (Entry<String, JsonElement> entry : handshake.entrySet()) {
 			if (entry.getKey().equalsIgnoreCase("cookie")) {
-				Optional<String> cookieOpt = JsonUtils.getAsOptionalString(entry.getValue());
+				var cookieOpt = JsonUtils.getAsOptionalString(entry.getValue());
 				if (cookieOpt.isPresent()) {
 					for (String cookieVariable : cookieOpt.get().split("; ")) {
-						String[] keyValue = cookieVariable.split("=");
+						var keyValue = cookieVariable.split("=");
 						if (keyValue.length == 2) {
 							if (keyValue[0].equals(fieldname)) {
 								return Optional.ofNullable(keyValue[1]);
diff --git a/io.openems.common/src/io/openems/common/websocket/OnRequestHandler.java b/io.openems.common/src/io/openems/common/websocket/OnRequestHandler.java
index c225f32faf0..4883688c4da 100644
--- a/io.openems.common/src/io/openems/common/websocket/OnRequestHandler.java
+++ b/io.openems.common/src/io/openems/common/websocket/OnRequestHandler.java
@@ -75,7 +75,7 @@ public final void run() {
 	/**
 	 * Simplifies a {@link JsonrpcMessage} by recursively removing unnecessary
 	 * elements "jsonrpc" and "id".
-	 * 
+	 *
 	 * @param j the {@link JsonrpcMessage#toJsonObject()}
 	 * @return a simplified {@link JsonObject}
 	 */

From f18eb8a544f00ec411c484f769f4e4a24b98d9d4 Mon Sep 17 00:00:00 2001
From: Stefan Feilmeier <stefan.feilmeier@fenecon.de>
Date: Fri, 11 Mar 2022 21:42:16 +0100
Subject: [PATCH 95/96] Add Eclipse Clean-Up XML definition

---
 cnf/clean-up.xml | 142 +++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 142 insertions(+)
 create mode 100644 cnf/clean-up.xml

diff --git a/cnf/clean-up.xml b/cnf/clean-up.xml
new file mode 100644
index 00000000000..777d43aa96a
--- /dev/null
+++ b/cnf/clean-up.xml
@@ -0,0 +1,142 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<profiles version="2">
+    <profile kind="CleanUpProfile" name="OpenEMS Clean Up" version="2">
+        <setting id="cleanup.array_with_curly" value="true"/>
+        <setting id="cleanup.use_autoboxing" value="false"/>
+        <setting id="cleanup.always_use_this_for_non_static_method_access" value="true"/>
+        <setting id="cleanup.remove_trailing_whitespaces_ignore_empty" value="false"/>
+        <setting id="cleanup.primitive_comparison" value="true"/>
+        <setting id="cleanup.system_property_file_encoding" value="false"/>
+        <setting id="cleanup.format_source_code_changes_only" value="false"/>
+        <setting id="cleanup.remove_redundant_semicolons" value="true"/>
+        <setting id="cleanup.qualify_static_member_accesses_through_subtypes_with_declaring_class" value="true"/>
+        <setting id="cleanup.useless_continue" value="true"/>
+        <setting id="cleanup.remove_redundant_type_arguments" value="true"/>
+        <setting id="cleanup.remove_unused_imports" value="true"/>
+        <setting id="cleanup.break_loop" value="true"/>
+        <setting id="cleanup.pull_up_assignment" value="false"/>
+        <setting id="cleanup.stringbuilder" value="true"/>
+        <setting id="cleanup.no_super" value="true"/>
+        <setting id="cleanup.arrays_fill" value="true"/>
+        <setting id="cleanup.use_lambda" value="true"/>
+        <setting id="cleanup.operand_factorization" value="true"/>
+        <setting id="cleanup.simplify_lambda_expression_and_method_ref" value="true"/>
+        <setting id="cleanup.always_use_blocks" value="true"/>
+        <setting id="cleanup.stringconcat_to_textblock" value="false"/>
+        <setting id="cleanup.sort_members_all" value="false"/>
+        <setting id="cleanup.system_property_path_separator" value="false"/>
+        <setting id="cleanup.instanceof" value="false"/>
+        <setting id="cleanup.add_missing_annotations" value="true"/>
+        <setting id="cleanup.precompile_regex" value="true"/>
+        <setting id="cleanup.always_use_this_for_non_static_field_access" value="true"/>
+        <setting id="cleanup.boolean_literal" value="true"/>
+        <setting id="cleanup.always_use_parentheses_in_expressions" value="false"/>
+        <setting id="cleanup.sort_members" value="false"/>
+        <setting id="cleanup.remove_unused_local_variables" value="false"/>
+        <setting id="cleanup.add_missing_deprecated_annotations" value="true"/>
+        <setting id="cleanup.no_string_creation" value="true"/>
+        <setting id="cleanup.use_unboxing" value="false"/>
+        <setting id="cleanup.use_blocks_only_for_return_and_throw" value="false"/>
+        <setting id="cleanup.standard_comparison" value="false"/>
+        <setting id="cleanup.if_condition" value="true"/>
+        <setting id="cleanup.system_property_line_separator" value="false"/>
+        <setting id="cleanup.remove_trailing_whitespaces" value="true"/>
+        <setting id="cleanup.map_cloning" value="true"/>
+        <setting id="cleanup.add_serial_version_id" value="false"/>
+        <setting id="cleanup.try_with_resource" value="false"/>
+        <setting id="cleanup.use_this_for_non_static_method_access" value="true"/>
+        <setting id="cleanup.use_this_for_non_static_method_access_only_if_necessary" value="false"/>
+        <setting id="cleanup.single_used_field" value="true"/>
+        <setting id="cleanup.reduce_indentation" value="true"/>
+        <setting id="cleanup.primitive_parsing" value="true"/>
+        <setting id="cleanup.make_local_variable_final" value="false"/>
+        <setting id="cleanup.add_missing_methods" value="false"/>
+        <setting id="cleanup.qualify_static_member_accesses_with_declaring_class" value="true"/>
+        <setting id="cleanup.add_missing_override_annotations" value="true"/>
+        <setting id="cleanup.use_blocks" value="true"/>
+        <setting id="cleanup.multi_catch" value="false"/>
+        <setting id="cleanup.pull_out_if_from_if_else" value="true"/>
+        <setting id="cleanup.collection_cloning" value="true"/>
+        <setting id="cleanup.convert_to_enhanced_for_loop_if_loop_var_used" value="true"/>
+        <setting id="cleanup.make_variable_declarations_final" value="true"/>
+        <setting id="cleanup.redundant_comparator" value="true"/>
+        <setting id="cleanup.remove_unused_private_types" value="true"/>
+        <setting id="cleanup.system_property_boolean" value="false"/>
+        <setting id="cleanup.qualify_static_method_accesses_with_declaring_class" value="false"/>
+        <setting id="cleanup.organize_imports" value="true"/>
+        <setting id="cleanup.lazy_logical_operator" value="true"/>
+        <setting id="cleanup.bitwise_conditional_expression" value="false"/>
+        <setting id="cleanup.use_directly_map_method" value="true"/>
+        <setting id="cleanup.add_all" value="true"/>
+        <setting id="cleanup.system_property_file_separator" value="false"/>
+        <setting id="cleanup.qualify_static_field_accesses_with_declaring_class" value="false"/>
+        <setting id="cleanup.stringbuilder_for_local_vars" value="false"/>
+        <setting id="cleanup.add_generated_serial_version_id" value="false"/>
+        <setting id="cleanup.controlflow_merge" value="true"/>
+        <setting id="cleanup.primitive_serialization" value="true"/>
+        <setting id="cleanup.comparing_on_criteria" value="false"/>
+        <setting id="cleanup.do_while_rather_than_while" value="true"/>
+        <setting id="cleanup.comparison_statement" value="true"/>
+        <setting id="cleanup.extract_increment" value="false"/>
+        <setting id="cleanup.stringbuffer_to_stringbuilder" value="true"/>
+        <setting id="cleanup.insert_inferred_type_arguments" value="false"/>
+        <setting id="cleanup.make_private_fields_final" value="true"/>
+        <setting id="cleanup.useless_return" value="true"/>
+        <setting id="cleanup.instanceof_keyword" value="false"/>
+        <setting id="cleanup.use_this_for_non_static_field_access_only_if_necessary" value="false"/>
+        <setting id="cleanup.remove_trailing_whitespaces_all" value="true"/>
+        <setting id="cleanup.one_if_rather_than_duplicate_blocks_that_fall_through" value="false"/>
+        <setting id="cleanup.valueof_rather_than_instantiation" value="true"/>
+        <setting id="cleanup.plain_replacement" value="true"/>
+        <setting id="cleanup.remove_unnecessary_array_creation" value="true"/>
+        <setting id="cleanup.remove_private_constructors" value="true"/>
+        <setting id="cleanup.make_parameters_final" value="false"/>
+        <setting id="cleanup.substring" value="true"/>
+        <setting id="cleanup.ternary_operator" value="true"/>
+        <setting id="cleanup.merge_conditional_blocks" value="false"/>
+        <setting id="cleanup.return_expression" value="true"/>
+        <setting id="cleanup.system_property" value="false"/>
+        <setting id="cleanup.unlooped_while" value="true"/>
+        <setting id="cleanup.convert_to_enhanced_for_loop" value="true"/>
+        <setting id="cleanup.remove_unused_private_fields" value="true"/>
+        <setting id="cleanup.never_use_blocks" value="false"/>
+        <setting id="cleanup.remove_redundant_modifiers" value="false"/>
+        <setting id="cleanup.unreachable_block" value="true"/>
+        <setting id="cleanup.redundant_falling_through_block_end" value="false"/>
+        <setting id="cleanup.switch" value="true"/>
+        <setting id="cleanup.number_suffix" value="true"/>
+        <setting id="cleanup.remove_unnecessary_nls_tags" value="true"/>
+        <setting id="cleanup.convert_to_switch_expressions" value="false"/>
+        <setting id="cleanup.use_this_for_non_static_field_access" value="true"/>
+        <setting id="cleanup.static_inner_class" value="true"/>
+        <setting id="cleanup.use_string_is_blank" value="true"/>
+        <setting id="cleanup.add_missing_nls_tags" value="false"/>
+        <setting id="cleanup.qualify_static_member_accesses_through_instances_with_declaring_class" value="true"/>
+        <setting id="cleanup.remove_unnecessary_casts" value="true"/>
+        <setting id="cleanup.objects_equals" value="false"/>
+        <setting id="cleanup.convert_functional_interfaces" value="false"/>
+        <setting id="cleanup.format_source_code" value="true"/>
+        <setting id="cleanup.else_if" value="true"/>
+        <setting id="cleanup.boolean_value_rather_than_comparison" value="true"/>
+        <setting id="cleanup.add_default_serial_version_id" value="true"/>
+        <setting id="cleanup.remove_unused_private_methods" value="true"/>
+        <setting id="cleanup.make_type_abstract_if_missing_method" value="false"/>
+        <setting id="cleanup.join" value="false"/>
+        <setting id="cleanup.embedded_if" value="false"/>
+        <setting id="cleanup.use_anonymous_class_creation" value="false"/>
+        <setting id="cleanup.invert_equals" value="false"/>
+        <setting id="cleanup.add_missing_override_annotations_interface_methods" value="true"/>
+        <setting id="cleanup.remove_unused_private_members" value="true"/>
+        <setting id="cleanup.strictly_equal_or_different" value="true"/>
+        <setting id="cleanup.never_use_parentheses_in_expressions" value="true"/>
+        <setting id="cleanup.push_down_negation" value="false"/>
+        <setting id="cleanup.evaluate_nullable" value="true"/>
+        <setting id="cleanup.use_parentheses_in_expressions" value="true"/>
+        <setting id="cleanup.hash" value="false"/>
+        <setting id="cleanup.double_negation" value="true"/>
+        <setting id="cleanup.overridden_assignment" value="false"/>
+        <setting id="cleanup.primitive_rather_than_wrapper" value="true"/>
+        <setting id="cleanup.correct_indentation" value="true"/>
+        <setting id="cleanup.use_var" value="true"/>
+    </profile>
+</profiles>

From 197ea55978dcddd0c7d207d5045da6c3e25a3a3c Mon Sep 17 00:00:00 2001
From: Stefan Feilmeier <stefan.feilmeier@fenecon.de>
Date: Fri, 11 Mar 2022 21:57:27 +0100
Subject: [PATCH 96/96] Apply Checkstyle

---
 .../openems/backend/metadata/odoo/odoo/OdooHandler.java   | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/io.openems.backend.metadata.odoo/src/io/openems/backend/metadata/odoo/odoo/OdooHandler.java b/io.openems.backend.metadata.odoo/src/io/openems/backend/metadata/odoo/odoo/OdooHandler.java
index 5401b1de73b..977f22b79cf 100644
--- a/io.openems.backend.metadata.odoo/src/io/openems/backend/metadata/odoo/odoo/OdooHandler.java
+++ b/io.openems.backend.metadata.odoo/src/io/openems/backend/metadata/odoo/odoo/OdooHandler.java
@@ -426,7 +426,8 @@ public int submitSetupProtocol(MyUser user, JsonObject setupProtocolJson) throws
 
 		var protocolId = this.createSetupProtocol(setupProtocolJson, foundEdge[0], customerId, installerId);
 
-		var installer = OdooUtils.readOne(credentials, Field.Partner.ODOO_MODEL, installerId, Field.Partner.IS_COMPANY);
+		var installer = OdooUtils.readOne(this.credentials, Field.Partner.ODOO_MODEL, installerId,
+				Field.Partner.IS_COMPANY);
 		boolean isCompany = (boolean) installer.get("is_company");
 		if (!isCompany) {
 			Map<String, Object> fieldsToUpdate = new HashMap<>();
@@ -436,7 +437,8 @@ public int submitSetupProtocol(MyUser user, JsonObject setupProtocolJson) throws
 					.ifPresent(lastname -> fieldsToUpdate.put(Field.Partner.LASTNAME.id(), lastname));
 
 			if (!fieldsToUpdate.isEmpty()) {
-				OdooUtils.write(credentials, Field.Partner.ODOO_MODEL, new Integer[] { installerId }, fieldsToUpdate);
+				OdooUtils.write(this.credentials, Field.Partner.ODOO_MODEL, new Integer[] { installerId },
+						fieldsToUpdate);
 			}
 		}
 
@@ -525,7 +527,7 @@ private int createOdooUser(JsonObject userJson, String password) throws OpenemsN
 	 * @throws OpenemsException on error
 	 */
 	private void addTagToPartner(int userId) throws OpenemsException {
-		var tagId = OdooUtils.getObjectReference(credentials, "edge", "res_partner_category_created_via_ibn");
+		var tagId = OdooUtils.getObjectReference(this.credentials, "edge", "res_partner_category_created_via_ibn");
 		var partnerId = this.getOdooPartnerId(userId);
 
 		OdooUtils.write(this.credentials, Field.Partner.ODOO_MODEL, new Integer[] { partnerId },