refactor(java): Replace java.util.Base64 with `org.stellar.sdk.Base…

…64` to ensure compatibility on lower version Android platforms. (#170) * refactor(java): Replace `java.util.Base64` with `org.stellar.sdk.Base64` to ensure compatibility on lower version Android platforms. * SPI
stellar · Sep 27, 2023 · 7c9349c · 7c9349c
1 parent a231a92
commit 7c9349c
Show file tree

Hide file tree

Showing 67 changed files with 229 additions and 229 deletions.
diff --git a/lib/xdrgen/generators/java.rb b/lib/xdrgen/generators/java.rb
@@ -43,7 +43,7 @@ def render_definitions(node, constants_container)
       end
 
       def add_imports_for_definition(defn, imports)
-        imports.add("java.util.Base64")
+        imports.add("org.stellar.sdk.Base64Factory")
         imports.add("java.io.ByteArrayInputStream")
         imports.add("java.io.ByteArrayOutputStream")
 
@@ -716,7 +716,7 @@ def render_base64(return_type, out)
         out.puts <<-EOS.strip_heredoc
           @Override
           public String toXdrBase64() throws IOException {
-            return Base64.getEncoder().encodeToString(toXdrByteArray());
+            return Base64Factory.getInstance().encodeToString(toXdrByteArray());
           }
 
           @Override
@@ -728,7 +728,7 @@ def render_base64(return_type, out)
           }
 
           public static #{return_type} fromXdrBase64(String xdr) throws IOException {
-            byte[] bytes = Base64.getDecoder().decode(xdr);
+            byte[] bytes = Base64Factory.getInstance().decode(xdr);
             return fromXdrByteArray(bytes);
           }
 

diff --git a/lib/xdrgen/generators/java/XdrString.erb b/lib/xdrgen/generators/java/XdrString.erb
@@ -6,7 +6,7 @@ import java.io.IOException;
 import java.io.InvalidClassException;
 import java.nio.charset.Charset;
 import java.util.Arrays;
-import java.util.Base64;
+import org.stellar.sdk.Base64Factory;
 
 public class XdrString implements XdrElement {
     private byte[] bytes;
@@ -41,7 +41,7 @@ public class XdrString implements XdrElement {
 
     @Override
     public String toXdrBase64() throws IOException {
-        return Base64.getEncoder().encodeToString(toXdrByteArray());
+        return Base64Factory.getInstance().encodeToString(toXdrByteArray());
     }
 
     @Override
@@ -53,7 +53,7 @@ public class XdrString implements XdrElement {
     }
 
     public static XdrString fromXdrBase64(String xdr, int maxSize) throws IOException {
-        byte[] bytes = Base64.getDecoder().decode(xdr);
+        byte[] bytes = Base64Factory.getInstance().decode(xdr);
         return fromXdrByteArray(bytes, maxSize);
     }
 

diff --git a/lib/xdrgen/generators/java/XdrUnsignedHyperInteger.erb b/lib/xdrgen/generators/java/XdrUnsignedHyperInteger.erb
@@ -1,11 +1,11 @@
-package <%= @namespace %>;
+package org.stellar.sdk.xdr;
 
 import java.io.ByteArrayInputStream;
 import java.io.ByteArrayOutputStream;
 import java.io.IOException;
 import java.math.BigInteger;
-import java.util.Base64;
 import java.util.Objects;
+import org.stellar.sdk.Base64Factory;
 
 /**
  * Represents XDR Unsigned Hyper Integer.
@@ -61,7 +61,7 @@ public class XdrUnsignedHyperInteger implements XdrElement {
 
   @Override
   public String toXdrBase64() throws IOException {
-    return Base64.getEncoder().encodeToString(toXdrByteArray());
+    return Base64Factory.getInstance().encodeToString(toXdrByteArray());
   }
 
   @Override
@@ -73,7 +73,7 @@ public class XdrUnsignedHyperInteger implements XdrElement {
   }
 
   public static XdrUnsignedHyperInteger fromXdrBase64(String xdr) throws IOException {
-    byte[] bytes = Base64.getDecoder().decode(xdr);
+    byte[] bytes = Base64Factory.getInstance().decode(xdr);
     return fromXdrByteArray(bytes);
   }
 

diff --git a/lib/xdrgen/generators/java/XdrUnsignedInteger.erb b/lib/xdrgen/generators/java/XdrUnsignedInteger.erb
@@ -1,10 +1,10 @@
-package <%= @namespace %>;
+package org.stellar.sdk.xdr;
 
 import java.io.ByteArrayInputStream;
 import java.io.ByteArrayOutputStream;
 import java.io.IOException;
-import java.util.Base64;
 import java.util.Objects;
+import org.stellar.sdk.Base64Factory;
 
 /**
  * Represents XDR Unsigned Integer.
@@ -49,7 +49,7 @@ public class XdrUnsignedInteger implements XdrElement {
 
   @Override
   public String toXdrBase64() throws IOException {
-    return Base64.getEncoder().encodeToString(toXdrByteArray());
+    return Base64Factory.getInstance().encodeToString(toXdrByteArray());
   }
 
   @Override
@@ -61,7 +61,7 @@ public class XdrUnsignedInteger implements XdrElement {
   }
 
   public static XdrUnsignedInteger fromXdrBase64(String xdr) throws IOException {
-    byte[] bytes = Base64.getDecoder().decode(xdr);
+    byte[] bytes = Base64Factory.getInstance().decode(xdr);
     return fromXdrByteArray(bytes);
   }
 

diff --git a/spec/output/generator_spec_java/block_comments.x/AccountFlags.java b/spec/output/generator_spec_java/block_comments.x/AccountFlags.java
@@ -6,7 +6,7 @@
 import java.io.IOException;
 
 import static MyXDR.Constants.*;
-import java.util.Base64;
+import org.stellar.sdk.Base64Factory;
 import java.io.ByteArrayInputStream;
 import java.io.ByteArrayOutputStream;
 
@@ -49,7 +49,7 @@ public void encode(XdrDataOutputStream stream) throws IOException {
   }
   @Override
   public String toXdrBase64() throws IOException {
-    return Base64.getEncoder().encodeToString(toXdrByteArray());
+    return Base64Factory.getInstance().encodeToString(toXdrByteArray());
   }
 
   @Override
@@ -61,7 +61,7 @@ public byte[] toXdrByteArray() throws IOException {
   }
 
   public static AccountFlags fromXdrBase64(String xdr) throws IOException {
-    byte[] bytes = Base64.getDecoder().decode(xdr);
+    byte[] bytes = Base64Factory.getInstance().decode(xdr);
     return fromXdrByteArray(bytes);
   }
 

diff --git a/spec/output/generator_spec_java/block_comments.x/XdrString.java b/spec/output/generator_spec_java/block_comments.x/XdrString.java
@@ -6,7 +6,7 @@
 import java.io.InvalidClassException;
 import java.nio.charset.Charset;
 import java.util.Arrays;
-import java.util.Base64;
+import org.stellar.sdk.Base64Factory;
 
 public class XdrString implements XdrElement {
     private byte[] bytes;
@@ -41,7 +41,7 @@ public byte[] getBytes() {
 
     @Override
     public String toXdrBase64() throws IOException {
-        return Base64.getEncoder().encodeToString(toXdrByteArray());
+        return Base64Factory.getInstance().encodeToString(toXdrByteArray());
     }
 
     @Override
@@ -53,7 +53,7 @@ public byte[] toXdrByteArray() throws IOException {
     }
 
     public static XdrString fromXdrBase64(String xdr, int maxSize) throws IOException {
-        byte[] bytes = Base64.getDecoder().decode(xdr);
+        byte[] bytes = Base64Factory.getInstance().decode(xdr);
         return fromXdrByteArray(bytes, maxSize);
     }
 

diff --git a/spec/output/generator_spec_java/block_comments.x/XdrUnsignedHyperInteger.java b/spec/output/generator_spec_java/block_comments.x/XdrUnsignedHyperInteger.java
@@ -1,11 +1,11 @@
-package MyXDR;
+package org.stellar.sdk.xdr;
 
 import java.io.ByteArrayInputStream;
 import java.io.ByteArrayOutputStream;
 import java.io.IOException;
 import java.math.BigInteger;
-import java.util.Base64;
 import java.util.Objects;
+import org.stellar.sdk.Base64Factory;
 
 /**
  * Represents XDR Unsigned Hyper Integer.
@@ -61,7 +61,7 @@ public BigInteger getNumber() {
 
   @Override
   public String toXdrBase64() throws IOException {
-    return Base64.getEncoder().encodeToString(toXdrByteArray());
+    return Base64Factory.getInstance().encodeToString(toXdrByteArray());
   }
 
   @Override
@@ -73,7 +73,7 @@ public byte[] toXdrByteArray() throws IOException {
   }
 
   public static XdrUnsignedHyperInteger fromXdrBase64(String xdr) throws IOException {
-    byte[] bytes = Base64.getDecoder().decode(xdr);
+    byte[] bytes = Base64Factory.getInstance().decode(xdr);
     return fromXdrByteArray(bytes);
   }
 

diff --git a/spec/output/generator_spec_java/block_comments.x/XdrUnsignedInteger.java b/spec/output/generator_spec_java/block_comments.x/XdrUnsignedInteger.java
@@ -1,10 +1,10 @@
-package MyXDR;
+package org.stellar.sdk.xdr;
 
 import java.io.ByteArrayInputStream;
 import java.io.ByteArrayOutputStream;
 import java.io.IOException;
-import java.util.Base64;
 import java.util.Objects;
+import org.stellar.sdk.Base64Factory;
 
 /**
  * Represents XDR Unsigned Integer.
@@ -49,7 +49,7 @@ public void encode(XdrDataOutputStream stream) throws IOException {
 
   @Override
   public String toXdrBase64() throws IOException {
-    return Base64.getEncoder().encodeToString(toXdrByteArray());
+    return Base64Factory.getInstance().encodeToString(toXdrByteArray());
   }
 
   @Override
@@ -61,7 +61,7 @@ public byte[] toXdrByteArray() throws IOException {
   }
 
   public static XdrUnsignedInteger fromXdrBase64(String xdr) throws IOException {
-    byte[] bytes = Base64.getDecoder().decode(xdr);
+    byte[] bytes = Base64Factory.getInstance().decode(xdr);
     return fromXdrByteArray(bytes);
   }
 

diff --git a/spec/output/generator_spec_java/const.x/TestArray.java b/spec/output/generator_spec_java/const.x/TestArray.java
@@ -6,7 +6,7 @@
 import java.io.IOException;
 
 import static MyXDR.Constants.*;
-import java.util.Base64;
+import org.stellar.sdk.Base64Factory;
 import java.io.ByteArrayInputStream;
 import java.io.ByteArrayOutputStream;
 import java.util.Arrays;
@@ -69,7 +69,7 @@ public boolean equals(Object object) {
   }
   @Override
   public String toXdrBase64() throws IOException {
-    return Base64.getEncoder().encodeToString(toXdrByteArray());
+    return Base64Factory.getInstance().encodeToString(toXdrByteArray());
   }
 
   @Override
@@ -81,7 +81,7 @@ public byte[] toXdrByteArray() throws IOException {
   }
 
   public static TestArray fromXdrBase64(String xdr) throws IOException {
-    byte[] bytes = Base64.getDecoder().decode(xdr);
+    byte[] bytes = Base64Factory.getInstance().decode(xdr);
     return fromXdrByteArray(bytes);
   }
 

diff --git a/spec/output/generator_spec_java/const.x/TestArray2.java b/spec/output/generator_spec_java/const.x/TestArray2.java
@@ -6,7 +6,7 @@
 import java.io.IOException;
 
 import static MyXDR.Constants.*;
-import java.util.Base64;
+import org.stellar.sdk.Base64Factory;
 import java.io.ByteArrayInputStream;
 import java.io.ByteArrayOutputStream;
 import java.util.Arrays;
@@ -70,7 +70,7 @@ public boolean equals(Object object) {
   }
   @Override
   public String toXdrBase64() throws IOException {
-    return Base64.getEncoder().encodeToString(toXdrByteArray());
+    return Base64Factory.getInstance().encodeToString(toXdrByteArray());
   }
 
   @Override
@@ -82,7 +82,7 @@ public byte[] toXdrByteArray() throws IOException {
   }
 
   public static TestArray2 fromXdrBase64(String xdr) throws IOException {
-    byte[] bytes = Base64.getDecoder().decode(xdr);
+    byte[] bytes = Base64Factory.getInstance().decode(xdr);
     return fromXdrByteArray(bytes);
   }
 

diff --git a/spec/output/generator_spec_java/const.x/XdrString.java b/spec/output/generator_spec_java/const.x/XdrString.java
@@ -6,7 +6,7 @@
 import java.io.InvalidClassException;
 import java.nio.charset.Charset;
 import java.util.Arrays;
-import java.util.Base64;
+import org.stellar.sdk.Base64Factory;
 
 public class XdrString implements XdrElement {
     private byte[] bytes;
@@ -41,7 +41,7 @@ public byte[] getBytes() {
 
     @Override
     public String toXdrBase64() throws IOException {
-        return Base64.getEncoder().encodeToString(toXdrByteArray());
+        return Base64Factory.getInstance().encodeToString(toXdrByteArray());
     }
 
     @Override
@@ -53,7 +53,7 @@ public byte[] toXdrByteArray() throws IOException {
     }
 
     public static XdrString fromXdrBase64(String xdr, int maxSize) throws IOException {
-        byte[] bytes = Base64.getDecoder().decode(xdr);
+        byte[] bytes = Base64Factory.getInstance().decode(xdr);
         return fromXdrByteArray(bytes, maxSize);
     }
 

diff --git a/spec/output/generator_spec_java/const.x/XdrUnsignedHyperInteger.java b/spec/output/generator_spec_java/const.x/XdrUnsignedHyperInteger.java
@@ -1,11 +1,11 @@
-package MyXDR;
+package org.stellar.sdk.xdr;
 
 import java.io.ByteArrayInputStream;
 import java.io.ByteArrayOutputStream;
 import java.io.IOException;
 import java.math.BigInteger;
-import java.util.Base64;
 import java.util.Objects;
+import org.stellar.sdk.Base64Factory;
 
 /**
  * Represents XDR Unsigned Hyper Integer.
@@ -61,7 +61,7 @@ public BigInteger getNumber() {
 
   @Override
   public String toXdrBase64() throws IOException {
-    return Base64.getEncoder().encodeToString(toXdrByteArray());
+    return Base64Factory.getInstance().encodeToString(toXdrByteArray());
   }
 
   @Override
@@ -73,7 +73,7 @@ public byte[] toXdrByteArray() throws IOException {
   }
 
   public static XdrUnsignedHyperInteger fromXdrBase64(String xdr) throws IOException {
-    byte[] bytes = Base64.getDecoder().decode(xdr);
+    byte[] bytes = Base64Factory.getInstance().decode(xdr);
     return fromXdrByteArray(bytes);
   }
 

diff --git a/spec/output/generator_spec_java/const.x/XdrUnsignedInteger.java b/spec/output/generator_spec_java/const.x/XdrUnsignedInteger.java
@@ -1,10 +1,10 @@
-package MyXDR;
+package org.stellar.sdk.xdr;
 
 import java.io.ByteArrayInputStream;
 import java.io.ByteArrayOutputStream;
 import java.io.IOException;
-import java.util.Base64;
 import java.util.Objects;
+import org.stellar.sdk.Base64Factory;
 
 /**
  * Represents XDR Unsigned Integer.
@@ -49,7 +49,7 @@ public void encode(XdrDataOutputStream stream) throws IOException {
 
   @Override
   public String toXdrBase64() throws IOException {
-    return Base64.getEncoder().encodeToString(toXdrByteArray());
+    return Base64Factory.getInstance().encodeToString(toXdrByteArray());
   }
 
   @Override
@@ -61,7 +61,7 @@ public byte[] toXdrByteArray() throws IOException {
   }
 
   public static XdrUnsignedInteger fromXdrBase64(String xdr) throws IOException {
-    byte[] bytes = Base64.getDecoder().decode(xdr);
+    byte[] bytes = Base64Factory.getInstance().decode(xdr);
     return fromXdrByteArray(bytes);
   }