From: David ‘Bombe’ Roden <bombe@freenetproject.org>
Date: Sun, 29 Dec 2024 18:56:05 +0000 (+0100)
Subject: 🔥 Remove Guava dependency
X-Git-Url: https://git.pterodactylus.net/?a=commitdiff_plain;h=d279579ea44425b779fbf8220897aa1dc147ed26;p=jFCPlib.git

🔥 Remove Guava dependency
---

diff --git a/pom.xml b/pom.xml
index bf34759..f0fd4e3 100644
--- a/pom.xml
+++ b/pom.xml
@@ -31,11 +31,6 @@
 			<version>2.2</version>
 			<scope>test</scope>
 		</dependency>
-		<dependency>
-			<groupId>com.google.guava</groupId>
-			<artifactId>guava</artifactId>
-			<version>16.0.1</version>
-		</dependency>
 	</dependencies>
 	<repositories>
 		<repository>
diff --git a/src/main/java/net/pterodactylus/fcp/ModifyPeerNote.java b/src/main/java/net/pterodactylus/fcp/ModifyPeerNote.java
index 53e2a8c..965adc0 100644
--- a/src/main/java/net/pterodactylus/fcp/ModifyPeerNote.java
+++ b/src/main/java/net/pterodactylus/fcp/ModifyPeerNote.java
@@ -17,7 +17,7 @@
 
 package net.pterodactylus.fcp;
 
-import com.google.common.base.Charsets;
+import static java.nio.charset.StandardCharsets.UTF_8;
 
 /**
  * The “ModifyPeerNote” command modifies a peer note.
@@ -43,7 +43,7 @@ public class ModifyPeerNote extends FcpMessage {
 	}
 
 	public void setNoteText(String noteText) {
-		setField("NoteText", BASE64_ENCODER.encode(noteText.getBytes(Charsets.UTF_8)));
+		setField("NoteText", BASE64_ENCODER.encode(noteText.getBytes(UTF_8)));
 	}
 
 	public void setPeerNoteType(PeerNoteType peerNoteType) {
diff --git a/src/main/java/net/pterodactylus/fcp/PeerNote.java b/src/main/java/net/pterodactylus/fcp/PeerNote.java
index ce11f0e..1cbdb9d 100644
--- a/src/main/java/net/pterodactylus/fcp/PeerNote.java
+++ b/src/main/java/net/pterodactylus/fcp/PeerNote.java
@@ -17,7 +17,7 @@
 
 package net.pterodactylus.fcp;
 
-import com.google.common.base.Charsets;
+import static java.nio.charset.StandardCharsets.UTF_8;
 
 /**
  * The “PeerNote” message contains a private note that has been entered for a
@@ -57,7 +57,7 @@ public class PeerNote extends BaseMessage {
 	 * @return The note text
 	 */
 	public String getNoteText() {
-		return new String(BASE64_DECODER.decode(getField("NoteText")), Charsets.UTF_8);
+		return new String(BASE64_DECODER.decode(getField("NoteText")), UTF_8);
 	}
 
 	/**
diff --git a/src/test/java/net/pterodactylus/fcp/AllDataTest.java b/src/test/java/net/pterodactylus/fcp/AllDataTest.java
index 6ec8812..1bf8a86 100644
--- a/src/test/java/net/pterodactylus/fcp/AllDataTest.java
+++ b/src/test/java/net/pterodactylus/fcp/AllDataTest.java
@@ -3,9 +3,6 @@ package net.pterodactylus.fcp;
 import java.io.ByteArrayInputStream;
 import java.io.IOException;
 
-import com.google.common.io.ByteStreams;
-import org.hamcrest.MatcherAssert;
-import org.hamcrest.Matchers;
 import org.junit.Test;
 
 import static org.hamcrest.MatcherAssert.assertThat;