[base64] Use java natively (#1130)

especially not use plexus utils as that is for maven only.
damianszczepanik · Dec 26, 2023 · 3fd187c · 3fd187c
1 parent 83d7aed
commit 3fd187c
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 9 deletions.
diff --git a/pom.xml b/pom.xml
@@ -248,11 +248,6 @@
             <artifactId>commons-io</artifactId>
             <version>2.7</version>
         </dependency>
-        <dependency>
-            <groupId>org.codehaus.plexus</groupId>
-            <artifactId>plexus-utils</artifactId>
-            <version>3.5.1</version>
-        </dependency>
         <dependency>
             <groupId>org.jsoup</groupId>
             <artifactId>jsoup</artifactId>

diff --git a/src/main/java/net/masterthought/cucumber/json/Embedding.java b/src/main/java/net/masterthought/cucumber/json/Embedding.java
@@ -4,7 +4,7 @@
 import java.util.Locale;
 
 import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
-import org.codehaus.plexus.util.Base64;
+import java.util.Base64;
 
 import net.masterthought.cucumber.json.deserializers.EmbeddingDeserializer;
 
@@ -51,7 +51,7 @@ public String getName() {
     }
 
     public String getDecodedData() {
-        return new String(Base64.decodeBase64(data.getBytes(StandardCharsets.UTF_8)), StandardCharsets.UTF_8);
+        return new String(Base64.getDecoder().decode(data.getBytes(StandardCharsets.UTF_8)), StandardCharsets.UTF_8);
     }
 
     public String getFileName() {

diff --git a/...t/java/net/masterthought/cucumber/generators/integrations/helpers/EmbeddingAssertion.java b/...t/java/net/masterthought/cucumber/generators/integrations/helpers/EmbeddingAssertion.java
@@ -4,7 +4,7 @@
 
 import java.nio.charset.StandardCharsets;
 
-import org.codehaus.plexus.util.Base64;
+import java.util.Base64;
 
 import net.masterthought.cucumber.json.Embedding;
 
@@ -33,6 +33,6 @@ private WebAssertion getBox() {
     }
 
     private String getDecodedData(String data) {
-        return new String(Base64.decodeBase64(data.getBytes(StandardCharsets.UTF_8)), StandardCharsets.UTF_8);
+        return new String(Base64.getDecoder().decode(data.getBytes(StandardCharsets.UTF_8)), StandardCharsets.UTF_8);
     }
 }