Remove the use of com.google.common.base.Function and `com.google.c…

…ommon.primitives.Bytes`.
lightsail-network · Sep 11, 2023 · ad5cb6e · ad5cb6e
1 parent 7932cc0
commit ad5cb6e
Show file tree

Hide file tree

Showing 4 changed files with 16 additions and 27 deletions.
diff --git a/src/main/java/org/stellar/sdk/StrKey.java b/src/main/java/org/stellar/sdk/StrKey.java
@@ -1,7 +1,6 @@
 package org.stellar.sdk;
 
 import com.google.common.io.BaseEncoding;
-import com.google.common.primitives.Bytes;
 import java.io.ByteArrayInputStream;
 import java.io.ByteArrayOutputStream;
 import java.io.CharArrayWriter;
@@ -398,6 +397,9 @@ private static byte[] getMuxedEd25519AccountBytes(MuxedAccount muxedAccount) {
     int idCopyStartIndex = idBytes.length - idNumBytesToCopy;
     System.arraycopy(
         idBytes, idCopyStartIndex, idPaddedBytes, 8 - idNumBytesToCopy, idNumBytesToCopy);
-    return Bytes.concat(accountBytes, idPaddedBytes);
+    byte[] result = new byte[accountBytes.length + idPaddedBytes.length];
+    System.arraycopy(accountBytes, 0, result, 0, accountBytes.length);
+    System.arraycopy(idPaddedBytes, 0, result, accountBytes.length, idPaddedBytes.length);
+    return result;
   }
 }
diff --git a/src/main/java/org/stellar/sdk/TransactionBuilder.java b/src/main/java/org/stellar/sdk/TransactionBuilder.java
@@ -3,10 +3,10 @@
 import static com.google.common.collect.Lists.newArrayList;
 import static org.stellar.sdk.TransactionPreconditions.TIMEOUT_INFINITE;
 
-import com.google.common.base.Function;
 import java.math.BigInteger;
 import java.util.Collection;
 import java.util.List;
+import java.util.function.Function;
 import lombok.NonNull;
 import org.stellar.sdk.TransactionPreconditions.TransactionPreconditionsBuilder;
 import org.stellar.sdk.xdr.SorobanTransactionData;
@@ -243,8 +243,8 @@ public Transaction build() {
    * A default implementation of sequence number generation which will derive a sequence number
    * based on sourceAccount's current sequence number + 1.
    */
-  public static Function<TransactionBuilderAccount, Long> IncrementedSequenceNumberFunc =
-      sourceAccount -> sourceAccount.getIncrementedSequenceNumber();
+  public static Function<TransactionBuilderAccount, Long> incrementedSequenceNumberFunc =
+      TransactionBuilderAccount::getIncrementedSequenceNumber;
 
   @Deprecated
   public static org.stellar.sdk.xdr.TimeBounds buildTimeBounds(long minTime, long maxTime) {

diff --git a/src/main/java/org/stellar/sdk/responses/AssetDeserializer.java b/src/main/java/org/stellar/sdk/responses/AssetDeserializer.java
@@ -1,13 +1,11 @@
 package org.stellar.sdk.responses;
 
-import static com.google.common.base.Optional.fromNullable;
-
-import com.google.common.base.Function;
 import com.google.gson.JsonDeserializationContext;
 import com.google.gson.JsonDeserializer;
 import com.google.gson.JsonElement;
 import com.google.gson.JsonParseException;
 import java.lang.reflect.Type;
+import java.util.Optional;
 import org.stellar.sdk.Asset;
 
 class AssetDeserializer implements JsonDeserializer<Asset> {
@@ -21,23 +19,12 @@ public Asset deserialize(JsonElement json, Type typeOfT, JsonDeserializationCont
 
     return Asset.create(
         json.getAsJsonObject().get("asset_type").getAsString(),
-        fromNullable(json.getAsJsonObject().get("asset_code"))
-            .transform(ToString.FUNCTION)
-            .orNull(),
-        fromNullable(json.getAsJsonObject().get("asset_issuer"))
-            .transform(ToString.FUNCTION)
-            .orNull(),
-        fromNullable(json.getAsJsonObject().get("liquidity_pool_id"))
-            .transform(ToString.FUNCTION)
-            .orNull());
+        getValueAsString(json.getAsJsonObject().get("asset_code")),
+        getValueAsString(json.getAsJsonObject().get("asset_issuer")),
+        getValueAsString(json.getAsJsonObject().get("liquidity_pool_id")));
   }
 
-  enum ToString implements Function<JsonElement, String> {
-    FUNCTION;
-
-    @Override
-    public String apply(JsonElement input) {
-      return input.getAsString();
-    }
+  private String getValueAsString(JsonElement element) {
+    return Optional.ofNullable(element).map(JsonElement::getAsString).orElse(null);
   }
 }
diff --git a/src/test/java/org/stellar/sdk/MemoTest.java b/src/test/java/org/stellar/sdk/MemoTest.java
@@ -5,7 +5,6 @@
 import static org.junit.Assert.assertTrue;
 import static org.junit.Assert.fail;
 
-import com.google.common.base.Strings;
 import com.google.common.io.BaseEncoding;
 import com.google.gson.JsonElement;
 import com.google.gson.JsonParser;
@@ -95,7 +94,7 @@ public void testMemoNullHexHashSuccess() {
 
   @Test
   public void testMemoHashSuccess() {
-    MemoHash memo = Memo.hash(Strings.padEnd("4142434445464748494a4b4c", 64, '0'));
+    MemoHash memo = Memo.hash("4142434445464748494a4b4c0000000000000000000000000000000000000000");
     assertEquals(MemoType.MEMO_HASH, memo.toXdr().getDiscriminant());
     String test = "ABCDEFGHIJKL";
     assertEquals(test, Util.paddedByteArrayToString(memo.getBytes()));
@@ -105,7 +104,8 @@ public void testMemoHashSuccess() {
   @Test
   public void testMemoHashSuccessUppercase() {
 
-    MemoHash memo = Memo.hash(Strings.padEnd("4142434445464748494a4b4c".toUpperCase(), 64, '0'));
+    MemoHash memo =
+        Memo.hash("4142434445464748494a4b4c0000000000000000000000000000000000000000".toUpperCase());
     assertEquals(MemoType.MEMO_HASH, memo.toXdr().getDiscriminant());
     String test = "ABCDEFGHIJKL";
     assertEquals(test, Util.paddedByteArrayToString(memo.getBytes()));