Merge branch 'develop'

CHANGELOG.md

@@ -3,6 +3,12 @@ All notable changes to this project will be documented in this file.
 
 ## Unreleased 
 
+## [1.1.6] - 2021-02-06
+### Changed
+- Change interuppted behaviour in ``EBusLowLevelController`` thread
+- Enhance @Null check in ``EBusDeviceTableService``
+- Simplified checks due to safe @Null checks
+
 ## [1.1.5] - 2021-01-31
 ### Changed
 - Removed clone() from DataType objects

pom.xml

@@ -7,7 +7,7 @@
 	<description>eBUS core library - This library handles the communication with heating engineering via the BUS specification. This protocol is used by many heating manufacturers in Europe.</description>
 	<groupId>de.cs-dev.ebus</groupId>
 	<artifactId>ebus-core</artifactId>
-	<version>1.1.5</version>
+	<version>1.1.6</version>
 	<url>https://github.com/csowada/ebus</url>
 	<packaging>bundle</packaging>
 
@@ -17,7 +17,7 @@
 		<maven.compiler.source>1.8</maven.compiler.source>
 		<maven.compiler.target>1.8</maven.compiler.target>
 		<maven.compiler.release>8</maven.compiler.release>
-		<license.year>2020</license.year>
+		<license.year>2021</license.year>
 		<bundle.version>${project.version}</bundle.version>
 		<sonar.projectKey>csowada_ebus</sonar.projectKey>
 		<sonar.organization>csowada</sonar.organization>

src/etc/header.txt

@@ -1,4 +1,4 @@
-Copyright (c) 2016-${year} by the respective copyright holders.
+Copyright (c) 2017-${year} by the respective copyright holders.
 
 All rights reserved. This program and the accompanying materials
 are made available under the terms of the Eclipse Public License v1.0

src/main/java/de/csdev/ebus/cfg/EBusConfigurationReaderException.java

@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2016-2020 by the respective copyright holders.
+ * Copyright (c) 2017-2021 by the respective copyright holders.
  *
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0

src/main/java/de/csdev/ebus/cfg/IEBusConfigurationProvider.java

@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2016-2020 by the respective copyright holders.
+ * Copyright (c) 2017-2021 by the respective copyright holders.
  *
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0

src/main/java/de/csdev/ebus/cfg/IEBusConfigurationReader.java

@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2016-2020 by the respective copyright holders.
+ * Copyright (c) 2017-2021 by the respective copyright holders.
  *
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0

src/main/java/de/csdev/ebus/cfg/std/EBusConfigurationReader.java

@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2016-2020 by the respective copyright holders.
+ * Copyright (c) 2017-2021 by the respective copyright holders.
  *
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0

src/main/java/de/csdev/ebus/cfg/std/EBusValueJsonDeserializer.java

@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2016-2020 by the respective copyright holders.
+ * Copyright (c) 2017-2021 by the respective copyright holders.
  *
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0

src/main/java/de/csdev/ebus/cfg/std/dto/EBusCollectionDTO.java

@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2016-2020 by the respective copyright holders.
+ * Copyright (c) 2017-2021 by the respective copyright holders.
  *
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0

src/main/java/de/csdev/ebus/cfg/std/dto/EBusCommandDTO.java

@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2016-2020 by the respective copyright holders.
+ * Copyright (c) 2017-2021 by the respective copyright holders.
  *
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0

src/main/java/de/csdev/ebus/cfg/std/dto/EBusCommandMethodDTO.java

@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2016-2020 by the respective copyright holders.
+ * Copyright (c) 2017-2021 by the respective copyright holders.
  *
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0

src/main/java/de/csdev/ebus/cfg/std/dto/EBusCommandTemplatesDTO.java

@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2016-2020 by the respective copyright holders.
+ * Copyright (c) 2017-2021 by the respective copyright holders.
  *
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0

src/main/java/de/csdev/ebus/cfg/std/dto/EBusValueDTO.java

@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2016-2020 by the respective copyright holders.
+ * Copyright (c) 2017-2021 by the respective copyright holders.
  *
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0

src/main/java/de/csdev/ebus/client/EBusClient.java

@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2016-2020 by the respective copyright holders.
+ * Copyright (c) 2017-2021 by the respective copyright holders.
  *
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
@@ -80,11 +80,7 @@ public EBusClient(final @NonNull EBusCommandRegistry commandRegistry) {
      */
     public void addEBusDeviceTableListener(final @NonNull IEBusDeviceTableListener listener) {
         Objects.requireNonNull(listener, LABEL_LISTENER);
-        if (deviceTable != null) {
-            deviceTable.addEBusDeviceTableListener(listener);
-        } else {
-            throw new IllegalStateException("Device Table is not initialized!");
-        }
+        deviceTable.addEBusDeviceTableListener(listener);
     }
 
     /**
@@ -110,11 +106,7 @@ public void addEBusEventListener(final @NonNull IEBusConnectorEventListener list
      */
     public void addEBusParserListener(final @NonNull IEBusParserListener listener) {
         Objects.requireNonNull(listener, LABEL_LISTENER);
-        if (resolverService != null) {
-            resolverService.addEBusParserListener(listener);
-        } else {
-            throw new IllegalStateException("Resolver Service is not initialized!");
-        }
+        resolverService.addEBusParserListener(listener);
     }
 
     /**
@@ -182,7 +174,7 @@ public void addEBusParserListener(final @NonNull IEBusParserListener listener) {
      */
     public void connect(final @NonNull IEBusController controller, final byte masterAddress) {
 
-        Objects.requireNonNull(controller, "Parameter controller can't be null!");
+        Objects.requireNonNull(controller, "controller");
 
         controller.addEBusEventListener(resolverService);
 
@@ -206,10 +198,12 @@ public void connect(final @NonNull IEBusController controller, final byte master
     public void dispose() {
         if (controller != null) {
             controller.interrupt();
+            controller = null;
         }
 
         if (deviceTableService != null) {
             deviceTableService.dispose();
+            deviceTableService = null;
         }
 
         if (deviceTable != null) {

src/main/java/de/csdev/ebus/command/EBusCommand.java

@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2016-2020 by the respective copyright holders.
+ * Copyright (c) 2017-2021 by the respective copyright holders.
  *
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0

src/main/java/de/csdev/ebus/command/EBusCommandCollection.java

@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2016-2020 by the respective copyright holders.
+ * Copyright (c) 2017-2021 by the respective copyright holders.
  *
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0

src/main/java/de/csdev/ebus/command/EBusCommandException.java

@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2016-2020 by the respective copyright holders.
+ * Copyright (c) 2017-2021 by the respective copyright holders.
  *
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0

src/main/java/de/csdev/ebus/command/EBusCommandMethod.java

@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2016-2020 by the respective copyright holders.
+ * Copyright (c) 2017-2021 by the respective copyright holders.
  *
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0

src/main/java/de/csdev/ebus/command/EBusCommandNestedValue.java

@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2016-2020 by the respective copyright holders.
+ * Copyright (c) 2017-2021 by the respective copyright holders.
  *
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0

src/main/java/de/csdev/ebus/command/EBusCommandRegistry.java

@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2016-2020 by the respective copyright holders.
+ * Copyright (c) 2017-2021 by the respective copyright holders.
  *
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0

src/main/java/de/csdev/ebus/command/EBusCommandUtils.java

@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2016-2020 by the respective copyright holders.
+ * Copyright (c) 2017-2021 by the respective copyright holders.
  *
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0

src/main/java/de/csdev/ebus/command/EBusCommandValue.java

@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2016-2020 by the respective copyright holders.
+ * Copyright (c) 2017-2021 by the respective copyright holders.
  *
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0

src/main/java/de/csdev/ebus/command/IEBusCommand.java

@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2016-2020 by the respective copyright holders.
+ * Copyright (c) 2017-2021 by the respective copyright holders.
  *
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0

src/main/java/de/csdev/ebus/command/IEBusCommandCollection.java

@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2016-2020 by the respective copyright holders.
+ * Copyright (c) 2017-2021 by the respective copyright holders.
  *
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0

src/main/java/de/csdev/ebus/command/IEBusCommandMethod.java

@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2016-2020 by the respective copyright holders.
+ * Copyright (c) 2017-2021 by the respective copyright holders.
  *
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0

src/main/java/de/csdev/ebus/command/IEBusNestedValue.java

@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2016-2020 by the respective copyright holders.
+ * Copyright (c) 2017-2021 by the respective copyright holders.
  *
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0

src/main/java/de/csdev/ebus/command/IEBusValue.java

@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2016-2020 by the respective copyright holders.
+ * Copyright (c) 2017-2021 by the respective copyright holders.
  *
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0

src/main/java/de/csdev/ebus/command/datatypes/EBusAbstractType.java

@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2016-2020 by the respective copyright holders.
+ * Copyright (c) 2017-2021 by the respective copyright holders.
  *
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0

src/main/java/de/csdev/ebus/command/datatypes/EBusTypeException.java

@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2016-2020 by the respective copyright holders.
+ * Copyright (c) 2017-2021 by the respective copyright holders.
  *
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0

src/main/java/de/csdev/ebus/command/datatypes/EBusTypeRegistry.java

@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2016-2020 by the respective copyright holders.
+ * Copyright (c) 2017-2021 by the respective copyright holders.
  *
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0

src/main/java/de/csdev/ebus/command/datatypes/IEBusComplexType.java

@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2016-2020 by the respective copyright holders.
+ * Copyright (c) 2017-2021 by the respective copyright holders.
  *
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0

src/main/java/de/csdev/ebus/command/datatypes/IEBusType.java

@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2016-2020 by the respective copyright holders.
+ * Copyright (c) 2017-2021 by the respective copyright holders.
  *
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0

src/main/java/de/csdev/ebus/command/datatypes/ext/EBusTypeBytes.java

@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2016-2020 by the respective copyright holders.
+ * Copyright (c) 2017-2021 by the respective copyright holders.
  *
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0

src/main/java/de/csdev/ebus/command/datatypes/ext/EBusTypeDate.java

@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2016-2020 by the respective copyright holders.
+ * Copyright (c) 2017-2021 by the respective copyright holders.
  *
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0

src/main/java/de/csdev/ebus/command/datatypes/ext/EBusTypeDateTime.java

@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2016-2020 by the respective copyright holders.
+ * Copyright (c) 2017-2021 by the respective copyright holders.
  *
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0

src/main/java/de/csdev/ebus/command/datatypes/ext/EBusTypeKWCrc.java

@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2016-2020 by the respective copyright holders.
+ * Copyright (c) 2017-2021 by the respective copyright holders.
  *
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0

src/main/java/de/csdev/ebus/command/datatypes/ext/EBusTypeMultiWord.java

@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2016-2020 by the respective copyright holders.
+ * Copyright (c) 2017-2021 by the respective copyright holders.
  *
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0

src/main/java/de/csdev/ebus/command/datatypes/ext/EBusTypeString.java

@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2016-2020 by the respective copyright holders.
+ * Copyright (c) 2017-2021 by the respective copyright holders.
  *
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0

src/main/java/de/csdev/ebus/command/datatypes/ext/EBusTypeTime.java

@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2016-2020 by the respective copyright holders.
+ * Copyright (c) 2017-2021 by the respective copyright holders.
  *
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0

src/main/java/de/csdev/ebus/command/datatypes/ext/EBusTypeVersion.java

@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2016-2020 by the respective copyright holders.
+ * Copyright (c) 2017-2021 by the respective copyright holders.
  *
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0

src/main/java/de/csdev/ebus/command/datatypes/std/AbstractEBusTypeNumber.java

@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2016-2020 by the respective copyright holders.
+ * Copyright (c) 2017-2021 by the respective copyright holders.
  *
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0

src/main/java/de/csdev/ebus/command/datatypes/std/AbstractEBusTypeUnsignedNumber.java

@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2016-2020 by the respective copyright holders.
+ * Copyright (c) 2017-2021 by the respective copyright holders.
  *
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0

src/main/java/de/csdev/ebus/command/datatypes/std/EBusTypeBCD.java

@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2016-2020 by the respective copyright holders.
+ * Copyright (c) 2017-2021 by the respective copyright holders.
  *
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0

src/main/java/de/csdev/ebus/command/datatypes/std/EBusTypeBit.java

@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2016-2020 by the respective copyright holders.
+ * Copyright (c) 2017-2021 by the respective copyright holders.
  *
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0

src/main/java/de/csdev/ebus/command/datatypes/std/EBusTypeByte.java

@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2016-2020 by the respective copyright holders.
+ * Copyright (c) 2017-2021 by the respective copyright holders.
  *
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0

src/main/java/de/csdev/ebus/command/datatypes/std/EBusTypeChar.java

@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2016-2020 by the respective copyright holders.
+ * Copyright (c) 2017-2021 by the respective copyright holders.
  *
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0

src/main/java/de/csdev/ebus/command/datatypes/std/EBusTypeData1b.java

@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2016-2020 by the respective copyright holders.
+ * Copyright (c) 2017-2021 by the respective copyright holders.
  *
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0

src/main/java/de/csdev/ebus/command/datatypes/std/EBusTypeData1c.java

@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2016-2020 by the respective copyright holders.
+ * Copyright (c) 2017-2021 by the respective copyright holders.
  *
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0