Merge branch 'develop'

csowada · Jun 27, 2021 · 64359df · 64359df
2 parents cf398ad + 1ad3b5a
commit 64359df
Show file tree

Hide file tree

Showing 20 changed files with 119 additions and 45 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -3,6 +3,12 @@ All notable changes to this project will be documented in this file.
 
 ## Unreleased 
 
+## [1.1.7] - 2021-06-27
+### Changed
+- Update project dependencies
+- Remove dependency to ``commons-io``
+- Update to commons lang3
+
 ## [1.1.6] - 2021-02-06
 ### Changed
 - Change interuppted behaviour in ``EBusLowLevelController`` thread

diff --git a/pom.xml b/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.6</version>
+	<version>1.1.7</version>
 	<url>https://github.com/csowada/ebus</url>
 	<packaging>bundle</packaging>
 
@@ -314,28 +314,21 @@
 		<dependency>
 			<groupId>org.slf4j</groupId>
 			<artifactId>slf4j-api</artifactId>
-			<version>1.7.25</version>
+			<version>1.7.31</version>
 			<scope>provided</scope>
 		</dependency>
 
 		<dependency>
-			<groupId>commons-io</groupId>
-			<artifactId>commons-io</artifactId>
-			<version>2.2</version>
-			<scope>provided</scope>
-		</dependency>
-
-		<dependency>
-			<groupId>commons-lang</groupId>
-			<artifactId>commons-lang</artifactId>
-			<version>2.6</version>
+			<groupId>org.apache.commons</groupId>
+			<artifactId>commons-lang3</artifactId>
+			<version>3.12.0</version>
 			<scope>provided</scope>
 		</dependency>
 
 		<dependency>
 			<groupId>com.neuronrobotics</groupId>
 			<artifactId>nrjavaserial</artifactId>
-			<version>3.12.1</version>
+			<version>5.2.1</version>
 			<scope>provided</scope>
 			<optional>true</optional>
 		</dependency>
@@ -351,7 +344,7 @@
 		<dependency>
 			<groupId>com.google.code.gson</groupId>
 			<artifactId>gson</artifactId>
-			<version>2.5</version>
+			<version>2.8.6</version>
 			<scope>provided</scope>
 		</dependency>
 

diff --git a/src/main/java/de/csdev/ebus/cfg/std/EBusConfigurationReader.java b/src/main/java/de/csdev/ebus/cfg/std/EBusConfigurationReader.java
@@ -27,7 +27,7 @@
 import com.google.gson.GsonBuilder;
 import com.google.gson.reflect.TypeToken;
 
-import org.apache.commons.lang.StringUtils;
+import org.apache.commons.lang3.StringUtils;
 import org.eclipse.jdt.annotation.NonNull;
 import org.eclipse.jdt.annotation.Nullable;
 import org.slf4j.Logger;

diff --git a/src/main/java/de/csdev/ebus/command/EBusCommandRegistry.java b/src/main/java/de/csdev/ebus/command/EBusCommandRegistry.java
@@ -19,7 +19,7 @@
 import java.util.Map;
 import java.util.Objects;
 
-import org.apache.commons.lang.ObjectUtils;
+import org.apache.commons.lang3.ObjectUtils;
 import org.eclipse.jdt.annotation.NonNull;
 import org.eclipse.jdt.annotation.Nullable;
 import org.slf4j.Logger;

diff --git a/src/main/java/de/csdev/ebus/command/EBusCommandUtils.java b/src/main/java/de/csdev/ebus/command/EBusCommandUtils.java
@@ -16,7 +16,7 @@
 import java.util.Map.Entry;
 import java.util.Objects;
 
-import org.apache.commons.lang.StringUtils;
+import org.apache.commons.lang3.StringUtils;
 import org.eclipse.jdt.annotation.NonNull;
 import org.eclipse.jdt.annotation.Nullable;
 import org.slf4j.Logger;

diff --git a/src/main/java/de/csdev/ebus/command/datatypes/EBusAbstractType.java b/src/main/java/de/csdev/ebus/command/datatypes/EBusAbstractType.java
@@ -17,8 +17,8 @@
 import java.util.Objects;
 import java.util.TreeMap;
 
-import org.apache.commons.lang.ArrayUtils;
-import org.apache.commons.lang.reflect.FieldUtils;
+import org.apache.commons.lang3.ArrayUtils;
+import org.apache.commons.lang3.reflect.FieldUtils;
 import org.eclipse.jdt.annotation.Nullable;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;

diff --git a/src/main/java/de/csdev/ebus/command/datatypes/ext/EBusTypeDate.java b/src/main/java/de/csdev/ebus/command/datatypes/ext/EBusTypeDate.java
@@ -14,7 +14,7 @@
 import java.util.GregorianCalendar;
 import java.util.Objects;
 
-import org.apache.commons.lang.StringUtils;
+import org.apache.commons.lang3.StringUtils;
 import org.eclipse.jdt.annotation.Nullable;
 
 import de.csdev.ebus.command.datatypes.EBusAbstractType;

diff --git a/src/main/java/de/csdev/ebus/command/datatypes/ext/EBusTypeDateTime.java b/src/main/java/de/csdev/ebus/command/datatypes/ext/EBusTypeDateTime.java
@@ -14,7 +14,7 @@
 import java.util.HashMap;
 import java.util.Map;
 
-import org.apache.commons.lang.ArrayUtils;
+import org.apache.commons.lang3.ArrayUtils;
 import org.eclipse.jdt.annotation.Nullable;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;

diff --git a/src/main/java/de/csdev/ebus/command/datatypes/ext/EBusTypeTime.java b/src/main/java/de/csdev/ebus/command/datatypes/ext/EBusTypeTime.java
@@ -13,7 +13,7 @@
 import java.util.Calendar;
 import java.util.GregorianCalendar;
 
-import org.apache.commons.lang.StringUtils;
+import org.apache.commons.lang3.StringUtils;
 import org.eclipse.jdt.annotation.Nullable;
 
 import de.csdev.ebus.command.datatypes.EBusAbstractType;

diff --git a/src/main/java/de/csdev/ebus/command/datatypes/std/AbstractEBusTypeNumber.java b/src/main/java/de/csdev/ebus/command/datatypes/std/AbstractEBusTypeNumber.java
@@ -11,7 +11,7 @@
 import java.math.BigDecimal;
 import java.math.BigInteger;
 
-import org.apache.commons.lang.ArrayUtils;
+import org.apache.commons.lang3.ArrayUtils;
 import org.eclipse.jdt.annotation.Nullable;
 
 import de.csdev.ebus.command.datatypes.EBusAbstractType;

diff --git a/src/main/java/de/csdev/ebus/command/datatypes/std/AbstractEBusTypeUnsignedNumber.java b/src/main/java/de/csdev/ebus/command/datatypes/std/AbstractEBusTypeUnsignedNumber.java
@@ -11,7 +11,7 @@
 import java.math.BigDecimal;
 import java.math.BigInteger;
 
-import org.apache.commons.lang.ArrayUtils;
+import org.apache.commons.lang3.ArrayUtils;
 import org.eclipse.jdt.annotation.Nullable;
 
 import de.csdev.ebus.command.datatypes.EBusAbstractType;

diff --git a/src/main/java/de/csdev/ebus/core/EBusEbusdController.java b/src/main/java/de/csdev/ebus/core/EBusEbusdController.java
@@ -19,13 +19,13 @@
 import java.nio.ByteBuffer;
 import java.util.Arrays;
 
-import org.apache.commons.io.IOUtils;
-import org.apache.commons.lang.StringUtils;
-import org.apache.commons.lang.math.NumberUtils;
+import org.apache.commons.lang3.StringUtils;
+import org.apache.commons.lang3.math.NumberUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
 import de.csdev.ebus.core.EBusQueue.QueueEntry;
+import de.csdev.ebus.utils.CommonsUtils;
 import de.csdev.ebus.utils.EBusUtils;
 
 /**
@@ -399,13 +399,13 @@ private void disconnect() {
 
         stopSenderThread();
 
-        IOUtils.closeQuietly(reader);
+        CommonsUtils.closeQuietly(reader);
         reader = null;
 
-        IOUtils.closeQuietly(writer);
+        CommonsUtils.closeQuietly(writer);
         writer = null;
 
-        IOUtils.closeQuietly(socket);
+        CommonsUtils.closeQuietly(socket);
         socket = null;
 
         directMode = false;

diff --git a/src/main/java/de/csdev/ebus/core/connection/AbstractEBusConnection.java b/src/main/java/de/csdev/ebus/core/connection/AbstractEBusConnection.java
@@ -12,10 +12,11 @@
 import java.io.InputStream;
 import java.io.OutputStream;
 
-import org.apache.commons.io.IOUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
+import de.csdev.ebus.utils.CommonsUtils;
+
 /**
  * @author Christian Sowada - Initial contribution
  *
@@ -37,8 +38,8 @@ public boolean close() throws IOException {
             outputStream.flush();
         }
 
-        IOUtils.closeQuietly(inputStream);
-        IOUtils.closeQuietly(outputStream);
+        CommonsUtils.closeQuietly(inputStream);
+        CommonsUtils.closeQuietly(outputStream);
 
         inputStream = null;
         outputStream = null;

diff --git a/src/main/java/de/csdev/ebus/core/connection/EBusJSerialCommConnection.java b/src/main/java/de/csdev/ebus/core/connection/EBusJSerialCommConnection.java
@@ -12,11 +12,11 @@
 
 import com.fazecast.jSerialComm.SerialPort;
 
-import org.apache.commons.io.IOUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
 import de.csdev.ebus.core.EBusConsts;
+import de.csdev.ebus.utils.CommonsUtils;
 
 /**
  * @author Christian Sowada - Initial contribution
@@ -70,8 +70,8 @@ public boolean close() throws IOException {
         // prevent an IllegalMonitorStateException error
         Thread shutdownThread = new Thread(() -> {
 
-            IOUtils.closeQuietly(inputStream);
-            IOUtils.closeQuietly(outputStream);
+            CommonsUtils.closeQuietly(inputStream);
+            CommonsUtils.closeQuietly(outputStream);
 
             if (serialPort != null) {
                 serialPort.closePort();

diff --git a/src/main/java/de/csdev/ebus/core/connection/EBusSerialNRJavaSerialConnection.java b/src/main/java/de/csdev/ebus/core/connection/EBusSerialNRJavaSerialConnection.java
@@ -11,11 +11,11 @@
 import java.io.IOException;
 import java.util.TooManyListenersException;
 
-import org.apache.commons.io.IOUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
 import de.csdev.ebus.core.EBusConsts;
+import de.csdev.ebus.utils.CommonsUtils;
 import gnu.io.CommPortIdentifier;
 import gnu.io.NoSuchPortException;
 import gnu.io.PortInUseException;
@@ -120,15 +120,15 @@ public boolean close() throws IOException {
         // prevent an IllegalMonitorStateException error
         Thread shutdownThread = new Thread(() -> {
 
-            IOUtils.closeQuietly(inputStream);
+            CommonsUtils.closeQuietly(inputStream);
 
             if (outputStream != null) {
                 try {
                     outputStream.flush();
                 } catch (IOException e) {
                     // noop
                 }
-                IOUtils.closeQuietly(outputStream);
+                CommonsUtils.closeQuietly(outputStream);
             }
 
             if (serialPort != null) {

diff --git a/src/main/java/de/csdev/ebus/service/device/EBusDeviceTable.java b/src/main/java/de/csdev/ebus/service/device/EBusDeviceTable.java
@@ -23,7 +23,7 @@
 import com.google.gson.Gson;
 import com.google.gson.reflect.TypeToken;
 
-import org.apache.commons.lang.ObjectUtils;
+import org.apache.commons.lang3.ObjectUtils;
 import org.eclipse.jdt.annotation.NonNull;
 import org.eclipse.jdt.annotation.Nullable;
 import org.slf4j.Logger;

diff --git a/src/main/java/de/csdev/ebus/utils/CommonsUtils.java b/src/main/java/de/csdev/ebus/utils/CommonsUtils.java
@@ -0,0 +1,75 @@
+/**
+ * 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
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ */
+package de.csdev.ebus.utils;
+
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.OutputStream;
+import java.io.Reader;
+import java.io.Writer;
+import java.net.Socket;
+
+/**
+ * @author Christian Sowada - Initial contribution
+ *
+ */
+public class CommonsUtils {
+
+    private CommonsUtils() {
+    }
+
+    public static final void closeQuietly(InputStream stream) {
+        try {
+            if(stream != null) {
+                stream.close();
+            }
+        } catch (IOException e) {
+            // noop
+        }
+    }
+    public static final void closeQuietly(OutputStream stream) {
+        try {
+            if(stream != null) {
+                stream.close();
+            }
+        } catch (IOException e) {
+            // noop
+        }
+    }
+
+    public static final void closeQuietly(Writer stream) {
+        try {
+            if(stream != null) {
+                stream.close();
+            }
+        } catch (IOException e) {
+            // noop
+        }
+    }
+
+    public static final void closeQuietly(Reader stream) {
+        try {
+            if(stream != null) {
+                stream.close();
+            }
+        } catch (IOException e) {
+            // noop
+        }
+    }
+
+    public static final void closeQuietly(Socket stream) {
+        try {
+            if(stream != null) {
+                stream.close();
+            }
+        } catch (IOException e) {
+            // noop
+        }
+    }
+}
diff --git a/src/main/java/de/csdev/ebus/utils/EBusConsoleUtils.java b/src/main/java/de/csdev/ebus/utils/EBusConsoleUtils.java
@@ -17,7 +17,7 @@
 import java.util.Map.Entry;
 import java.util.Objects;
 
-import org.apache.commons.lang.StringUtils;
+import org.apache.commons.lang3.StringUtils;
 import org.eclipse.jdt.annotation.NonNull;
 import org.eclipse.jdt.annotation.Nullable;
 import org.slf4j.Logger;

diff --git a/src/main/java/de/csdev/ebus/utils/EBusUtils.java b/src/main/java/de/csdev/ebus/utils/EBusUtils.java
@@ -11,7 +11,7 @@
 import java.nio.ByteBuffer;
 import java.util.Objects;
 
-import org.apache.commons.lang.StringUtils;
+import org.apache.commons.lang3.StringUtils;
 import org.eclipse.jdt.annotation.NonNull;
 import org.eclipse.jdt.annotation.Nullable;
 

diff --git a/src/main/java/de/csdev/ebus/utils/Emulator.java b/src/main/java/de/csdev/ebus/utils/Emulator.java
@@ -18,7 +18,6 @@
 import java.util.concurrent.ScheduledExecutorService;
 import java.util.concurrent.TimeUnit;
 
-import org.apache.commons.io.IOUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -161,7 +160,7 @@ public void close() {
             Thread.currentThread().interrupt();
         }
 
-        IOUtils.closeQuietly(in);
-        IOUtils.closeQuietly(out);
+        CommonsUtils.closeQuietly(in);
+        CommonsUtils.closeQuietly(out);
     }
 }