Skip to content
This repository was archived by the owner on Nov 11, 2025. It is now read-only.

Commit 2a2808f

Browse files
authored
Remove quava dependency (#103)
Signed-off-by: Marinov Avgustin <[email protected]>
1 parent f8744c8 commit 2a2808f

File tree

6 files changed

+10
-25
lines changed

6 files changed

+10
-25
lines changed

hawkbit-extension-artifact-repository-azure/pom.xml

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -69,10 +69,6 @@
6969
<artifactId>hawkbit-core</artifactId>
7070
<scope>provided</scope>
7171
</dependency>
72-
<dependency>
73-
<groupId>com.google.guava</groupId>
74-
<artifactId>guava</artifactId>
75-
</dependency>
7672
<dependency>
7773
<groupId>org.springframework</groupId>
7874
<artifactId>spring-core</artifactId>

hawkbit-extension-artifact-repository-gcs/pom.xml

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -27,10 +27,6 @@
2727
<artifactId>hawkbit-core</artifactId>
2828
<scope>provided</scope>
2929
</dependency>
30-
<dependency>
31-
<groupId>com.google.guava</groupId>
32-
<artifactId>guava</artifactId>
33-
</dependency>
3430
<dependency>
3531
<groupId>org.springframework</groupId>
3632
<artifactId>spring-core</artifactId>

hawkbit-extension-artifact-repository-gcs/src/main/java/org/eclipse/hawkbit/artifact/repository/GcsRepository.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,7 @@
1414
import java.io.IOException;
1515
import java.io.InputStream;
1616
import java.util.Base64;
17+
import java.util.HexFormat;
1718

1819
import org.apache.commons.io.IOUtils;
1920
import org.eclipse.hawkbit.artifact.repository.model.AbstractDbArtifact;
@@ -27,7 +28,6 @@
2728
import com.google.cloud.storage.BlobId;
2829
import com.google.cloud.storage.BlobInfo;
2930
import com.google.cloud.storage.Storage;
30-
import com.google.common.io.BaseEncoding;
3131

3232
/**
3333
* An {@link ArtifactRepository} implementation for the Gcloud GCS service. All
@@ -113,7 +113,7 @@ public AbstractDbArtifact getArtifactBySha1(final String tenant, final String sh
113113
// the MD5Content is stored in the ETag
114114
return new GcsArtifact(gcsStorage, gcsProperties, key, sha1Hash,
115115
new DbArtifactHash(sha1Hash,
116-
BaseEncoding.base16().lowerCase().encode(Base64.getDecoder().decode(blob.getMd5())), null),
116+
HexFormat.of().withLowerCase().formatHex(Base64.getDecoder().decode(blob.getMd5())), null),
117117
blob.getSize(), blob.getContentType());
118118

119119
}

hawkbit-extension-artifact-repository-mongo/pom.xml

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -43,10 +43,6 @@
4343
<groupId>org.springframework.boot</groupId>
4444
<artifactId>spring-boot-actuator-autoconfigure</artifactId>
4545
</dependency>
46-
<dependency>
47-
<groupId>com.google.guava</groupId>
48-
<artifactId>guava</artifactId>
49-
</dependency>
5046

5147
<!-- TEST -->
5248
<dependency>

hawkbit-extension-artifact-repository-mongo/src/test/java/org/eclipse/hawkbit/artifact/repository/MongoDBArtifactStoreTest.java

Lines changed: 8 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,7 @@
1717
import java.security.DigestInputStream;
1818
import java.security.MessageDigest;
1919
import java.security.NoSuchAlgorithmException;
20+
import java.util.HexFormat;
2021
import java.util.Random;
2122

2223
import io.qameta.allure.Description;
@@ -27,8 +28,6 @@
2728
import org.springframework.beans.factory.annotation.Autowired;
2829
import org.springframework.boot.test.context.SpringBootTest;
2930

30-
import com.google.common.io.BaseEncoding;
31-
3231
import io.qameta.allure.Feature;
3332
import io.qameta.allure.Step;
3433
import io.qameta.allure.Story;
@@ -90,9 +89,10 @@ public void storeSameArtifactMultipleTimes() throws NoSuchAlgorithmException, IO
9089
final MessageDigest mdSHA1 = MessageDigest.getInstance("SHA1");
9190
final MessageDigest mdSHA256 = MessageDigest.getInstance("SHA-256");
9291
final MessageDigest mdMD5 = MessageDigest.getInstance("MD5");
93-
final DbArtifactHash hash = new DbArtifactHash(BaseEncoding.base16().lowerCase().encode(mdSHA1.digest(bytes)),
94-
BaseEncoding.base16().lowerCase().encode(mdMD5.digest(bytes)),
95-
BaseEncoding.base16().lowerCase().encode(mdSHA256.digest(bytes)));
92+
final HexFormat hexFormat = HexFormat.of().withLowerCase();
93+
final DbArtifactHash hash = new DbArtifactHash(hexFormat.formatHex(mdSHA1.digest(bytes)),
94+
hexFormat.formatHex(mdMD5.digest(bytes)),
95+
hexFormat.formatHex(mdSHA256.digest(bytes)));
9696

9797
final AbstractDbArtifact artifact1 = storeArtifact(TENANT, "file1.txt", new ByteArrayInputStream(bytes), mdSHA1,
9898
mdMD5, hash);
@@ -111,8 +111,9 @@ private String storeRandomArtifactAndVerify(final String tenant) throws NoSuchAl
111111

112112
storeArtifact(tenant, filename, generateInputStream(filelengthBytes), mdSHA1, mdMD5, null);
113113

114-
final String sha1Hash16 = BaseEncoding.base16().lowerCase().encode(mdSHA1.digest());
115-
final String md5Hash16 = BaseEncoding.base16().lowerCase().encode(mdMD5.digest());
114+
final HexFormat hexFormat = HexFormat.of().withLowerCase();
115+
final String sha1Hash16 = hexFormat.formatHex(mdSHA1.digest());
116+
final String md5Hash16 = hexFormat.formatHex(mdMD5.digest());
116117

117118
final AbstractDbArtifact loaded = artifactStoreUnderTest.getArtifactBySha1(tenant, sha1Hash16);
118119
assertThat(loaded).isNotNull();

hawkbit-extension-artifact-repository-s3/pom.xml

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -33,10 +33,6 @@
3333
<groupId>com.amazonaws</groupId>
3434
<artifactId>aws-java-sdk-core</artifactId>
3535
</dependency>
36-
<dependency>
37-
<groupId>com.google.guava</groupId>
38-
<artifactId>guava</artifactId>
39-
</dependency>
4036
<dependency>
4137
<groupId>org.springframework</groupId>
4238
<artifactId>spring-core</artifactId>

0 commit comments

Comments
 (0)