lingwei.kong/hawkbit
1
0
Fork 0
Code Issues Pull Requests Actions 2 Packages Projects Releases Wiki Activity

Remove guava BaseEncoding from sdk (#1773)

Browse Source 
Signed-off-by: Marinov Avgustin <Avgustin.Marinov@bosch.com>
This commit is contained in:
Avgustin Marinov
2024-07-16 16:57:49 +03:00
committed by GitHub
parent 87050dd26c
commit f45c9db571
2 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
hawkbit-sdk/hawkbit-sdk-device/src/main/java/org/eclipse/hawkbit/sdk/device/UpdateHandler.java
View File

@@ -9,7 +9,6 @@
*/ */
package org.eclipse.hawkbit.sdk.device; package org.eclipse.hawkbit.sdk.device;
import com.google.common.io.BaseEncoding;
import lombok.extern.slf4j.Slf4j; import lombok.extern.slf4j.Slf4j;
import org.apache.hc.client5.http.classic.methods.HttpGet; import org.apache.hc.client5.http.classic.methods.HttpGet;
import org.apache.hc.client5.http.impl.classic.CloseableHttpClient; import org.apache.hc.client5.http.impl.classic.CloseableHttpClient;
@@ -39,6 +38,7 @@ import java.security.MessageDigest;
import java.security.NoSuchAlgorithmException; import java.security.NoSuchAlgorithmException;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.HashMap; import java.util.HashMap;
import java.util.HexFormat;
import java.util.LinkedList; import java.util.LinkedList;
import java.util.List; import java.util.List;
import java.util.Map; import java.util.Map;
@@ -361,7 +361,7 @@ public interface UpdateHandler {
} }
private void check() { 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)) { if (!actual.equals(expected)) {
throw new SecurityException( throw new SecurityException(
messageDigest.getAlgorithm() + " hash mismatch " + EXPECTED + expected + BUT_GOT_LOG_MESSAGE + actual + ")!"); messageDigest.getAlgorithm() + " hash mismatch " + EXPECTED + expected + BUT_GOT_LOG_MESSAGE + actual + ")!");

4
hawkbit-sdk/hawkbit-sdk-dmf/src/main/java/org/eclipse/hawkbit/sdk/dmf/UpdateHandler.java
View File

@@ -9,7 +9,6 @@
*/ */
package org.eclipse.hawkbit.sdk.dmf; package org.eclipse.hawkbit.sdk.dmf;
import com.google.common.io.BaseEncoding;
import lombok.extern.slf4j.Slf4j; import lombok.extern.slf4j.Slf4j;
import org.apache.hc.client5.http.classic.methods.HttpGet; import org.apache.hc.client5.http.classic.methods.HttpGet;
import org.apache.hc.client5.http.impl.classic.CloseableHttpClient; import org.apache.hc.client5.http.impl.classic.CloseableHttpClient;
@@ -40,6 +39,7 @@ import java.security.MessageDigest;
import java.security.NoSuchAlgorithmException; import java.security.NoSuchAlgorithmException;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.HashMap; import java.util.HashMap;
import java.util.HexFormat;
import java.util.LinkedList; import java.util.LinkedList;
import java.util.List; import java.util.List;
import java.util.Map; import java.util.Map;
@@ -357,7 +357,7 @@ public interface UpdateHandler {
} }
private void check() { 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)) { if (!actual.equals(expected)) {
throw new SecurityException( throw new SecurityException(
messageDigest.getAlgorithm() + " hash mismatch " + EXPECTED + expected + BUT_GOT_LOG_MESSAGE + actual + ")!"); messageDigest.getAlgorithm() + " hash mismatch " + EXPECTED + expected + BUT_GOT_LOG_MESSAGE + actual + ")!");