Merge branch 'develop'

.github/workflows/codeql-analysis.yml

@@ -13,10 +13,10 @@ name: "CodeQL"
 
 on:
   push:
-    branches: [ master ]
+    branches: [ master, develop ]
   pull_request:
     # The branches below must be a subset of the branches above
-    branches: [ master ]
+    branches: [ master, develop ]
   schedule:
     - cron: '15 0 * * 6'
 

.github/workflows/maven-publish.yml

@@ -61,16 +61,15 @@ jobs:
       env:
         GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
 
-    - name: Create GitGub Release
-      id: create_release
-      uses: actions/create-release@v1
+    - name: Create a new GitHub Release
+      uses: docker://antonyurchenko/git-release:latest
       env:
-        GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} # This token is provided by Actions, you do not need to create your own token
+        GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+        DRAFT_RELEASE: "true"
+        PRE_RELEASE: "false"
+        CHANGELOG_FILE: "CHANGELOG.md"
+        ALLOW_EMPTY_CHANGELOG: "true"
+        ALLOW_TAG_PREFIX: "true"
       with:
-        tag_name: ${{ github.ref }}
-        release_name: Release ${{ github.ref }}
-        body: |
-          Changes in this Release
-          
-        draft: true
-        prerelease: false
+        args: |
+          target/*.jar

CHANGELOG.md

@@ -3,6 +3,14 @@ All notable changes to this project will be documented in this file.
 
 ## Unreleased 
 
+## [1.1.4] - 2020-12-27
+### Changed
+- Enhanced the internal ThreadPool from 30 to 60 to prevent issues on startup
+- Throw better excepetions if the json configuration file is not valid
+- Removed the unsed ``annotation`` folder
+### Fixed
+- The new "Change Status" check (from v1.0.8) does not work, since the old status is already set previously
+
 ## [1.1.3] - 2020-12-25
 ### Changed
 - Changed many line of code to fix sonarlint/cloud issues

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.3</version>
+	<version>1.1.4</version>
 	<url>https://github.com/csowada/ebus</url>
 	<packaging>bundle</packaging>
 

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

@@ -8,8 +8,6 @@
  */
 package de.csdev.ebus.cfg;
 
-import java.text.MessageFormat;
-
 /**
  * @author Christian Sowada - Initial contribution
  *
@@ -18,20 +16,19 @@ public class EBusConfigurationReaderException extends Exception {
 
     private static final long serialVersionUID = 1L;
 
-    public EBusConfigurationReaderException(final String message, final Throwable cause, final Object... args) {
-        super(String.format(message, args), cause);
+    public EBusConfigurationReaderException(final String message) {
+        super(message);
     }
 
     public EBusConfigurationReaderException(final String message, final Object... args) {
-        super(MessageFormat.format(message, args));
-    }
-
-    public EBusConfigurationReaderException(final String message) {
-        super(message);
+        super(String.format(message, args));
     }
 
     public EBusConfigurationReaderException(final String message, final Throwable cause) {
         super(message, cause);
     }
 
+    public EBusConfigurationReaderException(final String message, final Throwable cause, final Object... args) {
+        super(String.format(message, args), cause);
+    }
 }

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

@@ -25,39 +25,41 @@
 @NonNullByDefault
 public interface IEBusConfigurationReader {
 
-    /**
-     * Loads all build-in command collections implemented by the reader
-     *
-     * @return
-     */
-    public List<IEBusCommandCollection> loadBuildInConfigurationCollections();
-
-    /**
-     * Loads the configuration from an InputStream and returns a command collection
-     *
-     * @param url
-     * @return
-     * @throws EBusConfigurationReaderException
-     * @throws IOException
-     */
-    public @Nullable IEBusCommandCollection loadConfigurationCollection(final URL url)
-            throws EBusConfigurationReaderException, IOException;
-
-    /**
-     * @param url
-     * @return
-     */
-    public List<IEBusCommandCollection> loadConfigurationCollectionBundle(final URL url);
-
-    /**
-     * Sets the eBUS type registry to use
-     *
-     * @param ebusTypes
-     */
-    public void setEBusTypes(final EBusTypeRegistry ebusTypes);
-
-    /**
-     * Clears all internal states
-     */
-    public void clear();
+        /**
+         * Loads all build-in command collections implemented by the reader
+         *
+         * @return
+         */
+        public List<IEBusCommandCollection> loadBuildInConfigurationCollections()
+                        throws EBusConfigurationReaderException, IOException;
+
+        /**
+         * Loads the configuration from an InputStream and returns a command collection
+         *
+         * @param url
+         * @return
+         * @throws EBusConfigurationReaderException
+         * @throws IOException
+         */
+        public @Nullable IEBusCommandCollection loadConfigurationCollection(final URL url)
+                        throws EBusConfigurationReaderException, IOException;
+
+        /**
+         * @param url
+         * @return
+         */
+        public List<IEBusCommandCollection> loadConfigurationCollectionBundle(final URL url)
+                        throws EBusConfigurationReaderException, IOException;
+
+        /**
+         * Sets the eBUS type registry to use
+         *
+         * @param ebusTypes
+         */
+        public void setEBusTypes(final EBusTypeRegistry ebusTypes);
+
+        /**
+         * Clears all internal states
+         */
+        public void clear();
 }