From f45c9db57163adafe68cd1a662323f6d8db2559d Mon Sep 17 00:00:00 2001
From: Avgustin Marinov <Avgustin.Marinov@bosch.com>
Date: Tue, 16 Jul 2024 16:57:49 +0300
Subject: [PATCH] Remove guava BaseEncoding from sdk (#1773)

Signed-off-by: Marinov Avgustin <Avgustin.Marinov@bosch.com>
---
 .../java/org/eclipse/hawkbit/sdk/device/UpdateHandler.java    | 4 ++--
 .../main/java/org/eclipse/hawkbit/sdk/dmf/UpdateHandler.java  | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/hawkbit-sdk/hawkbit-sdk-device/src/main/java/org/eclipse/hawkbit/sdk/device/UpdateHandler.java b/hawkbit-sdk/hawkbit-sdk-device/src/main/java/org/eclipse/hawkbit/sdk/device/UpdateHandler.java
index 8ead374ed..d3973bd91 100644
--- a/hawkbit-sdk/hawkbit-sdk-device/src/main/java/org/eclipse/hawkbit/sdk/device/UpdateHandler.java
+++ b/hawkbit-sdk/hawkbit-sdk-device/src/main/java/org/eclipse/hawkbit/sdk/device/UpdateHandler.java
@@ -9,7 +9,6 @@
  */
 package org.eclipse.hawkbit.sdk.device;
 
-import com.google.common.io.BaseEncoding;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.hc.client5.http.classic.methods.HttpGet;
 import org.apache.hc.client5.http.impl.classic.CloseableHttpClient;
@@ -39,6 +38,7 @@ import java.security.MessageDigest;
 import java.security.NoSuchAlgorithmException;
 import java.util.ArrayList;
 import java.util.HashMap;
+import java.util.HexFormat;
 import java.util.LinkedList;
 import java.util.List;
 import java.util.Map;
@@ -361,7 +361,7 @@ public interface UpdateHandler {
                 }
 
                 private void check() {
-                    final String actual = BaseEncoding.base16().lowerCase().encode(messageDigest.digest());
+                    final String actual = HexFormat.of().withLowerCase().formatHex(messageDigest.digest());
                     if (!actual.equals(expected)) {
                         throw new SecurityException(
                                 messageDigest.getAlgorithm() + " hash mismatch " + EXPECTED + expected + BUT_GOT_LOG_MESSAGE + actual + ")!");
diff --git a/hawkbit-sdk/hawkbit-sdk-dmf/src/main/java/org/eclipse/hawkbit/sdk/dmf/UpdateHandler.java b/hawkbit-sdk/hawkbit-sdk-dmf/src/main/java/org/eclipse/hawkbit/sdk/dmf/UpdateHandler.java
index 3627bc563..1a1fb2c9d 100644
--- a/hawkbit-sdk/hawkbit-sdk-dmf/src/main/java/org/eclipse/hawkbit/sdk/dmf/UpdateHandler.java
+++ b/hawkbit-sdk/hawkbit-sdk-dmf/src/main/java/org/eclipse/hawkbit/sdk/dmf/UpdateHandler.java
@@ -9,7 +9,6 @@
  */
 package org.eclipse.hawkbit.sdk.dmf;
 
-import com.google.common.io.BaseEncoding;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.hc.client5.http.classic.methods.HttpGet;
 import org.apache.hc.client5.http.impl.classic.CloseableHttpClient;
@@ -40,6 +39,7 @@ import java.security.MessageDigest;
 import java.security.NoSuchAlgorithmException;
 import java.util.ArrayList;
 import java.util.HashMap;
+import java.util.HexFormat;
 import java.util.LinkedList;
 import java.util.List;
 import java.util.Map;
@@ -357,7 +357,7 @@ public interface UpdateHandler {
                 }
 
                 private void check() {
-                    final String actual = BaseEncoding.base16().lowerCase().encode(messageDigest.digest());
+                    final String actual = HexFormat.of().withLowerCase().formatHex(messageDigest.digest());
                     if (!actual.equals(expected)) {
                         throw new SecurityException(
                                 messageDigest.getAlgorithm() + " hash mismatch " + EXPECTED + expected + BUT_GOT_LOG_MESSAGE + actual + ")!");