changed from null to return optional

Author: cybele-ripple

xrpl4j-core/src/main/java/org/xrpl/xrpl4j/codec/binary/definitions/Definitions.java

@@ -24,8 +24,6 @@
 import com.fasterxml.jackson.databind.JsonNode;
 import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
 import com.fasterxml.jackson.databind.annotation.JsonSerialize;
-import com.google.common.collect.ImmutableMap;
-import org.immutables.value.Value.Default;
 import org.immutables.value.Value.Immutable;
 
 import java.util.List;
@@ -87,8 +85,5 @@ public interface Definitions {
    * @return {@link Map} keyed by {@link String} with {@link Integer} values for all permission values.
    */
   @JsonProperty("PERMISSION_VALUES")
-  @Default
-  default Map<String, Integer> permissionValues() {
-    return ImmutableMap.of();
-  }
+  Map<String, Integer> permissionValues();
 }

xrpl4j-core/src/main/java/org/xrpl/xrpl4j/model/transactions/DelegateSet.java

@@ -78,8 +78,8 @@ static ImmutableDelegateSet.Builder builder() {
   }
 
   /**
-   * Set of {@link TransactionFlags}s for this {@link DelegateSet}, which only allows the {@code tfFullyCanonicalSig}
-   * flag, which is deprecated.
+   * Set of {@link TransactionFlags}s for this {@link DelegateSet}. Note that {@link DelegateSet} transactions
+   * do not support any transaction-specific flags, only universal flags.
    *
    * <p>The value of the flags cannot be set manually, but exists for JSON serialization/deserialization only and for
    * proper signature computation in rippled.
@@ -173,8 +173,7 @@ default void validatePermissionValuesAreValid() {
       boolean isValidTransactionType = transactionType != TransactionType.UNKNOWN;
 
       // Check if it's a valid GranularPermission
-      GranularPermission granularPermission = GranularPermission.forValue(permissionValue);
-      boolean isValidGranularPermission = granularPermission != null;
+      boolean isValidGranularPermission = GranularPermission.forValue(permissionValue).isPresent();
 
       Preconditions.checkArgument(
         isValidTransactionType || isValidGranularPermission,

xrpl4j-core/src/main/java/org/xrpl/xrpl4j/model/transactions/GranularPermission.java

@@ -23,6 +23,9 @@
 import com.fasterxml.jackson.annotation.JsonValue;
 import com.google.common.annotations.Beta;
 
+import java.util.Objects;
+import java.util.Optional;
+
 /**
  * Enumeration of granular permission types for delegated credentials.
  * These permissions support control over specific portions of transactions,
@@ -110,15 +113,17 @@ public enum GranularPermission {
    *
    * @param value The {@link String} value corresponding to a {@link GranularPermission}.
    *
-   * @return The {@link GranularPermission} with the corresponding value, or null if not found.
+   * @return An {@link Optional} containing the {@link GranularPermission} with the corresponding value,
+   *         or {@link Optional#empty()} if not found.
    */
-  public static GranularPermission forValue(String value) {
+  public static Optional<GranularPermission> forValue(final String value) {
+    Objects.requireNonNull(value);
     for (GranularPermission permission : GranularPermission.values()) {
       if (permission.value.equals(value)) {
-        return permission;
+        return Optional.of(permission);
       }
     }
-    return null;
+    return Optional.empty();
   }
 
   /**

xrpl4j-core/src/test/java/org/xrpl/xrpl4j/model/ledger/DelegateObjectJsonTest.java

@@ -31,7 +31,6 @@
 import org.xrpl.xrpl4j.model.transactions.PermissionWrapper;
 
 import java.util.Arrays;
-import java.util.Collections;
 
 /**
  * Unit tests for {@link DelegateObject}.

xrpl4j-core/src/test/java/org/xrpl/xrpl4j/model/transactions/json/DelegateSetJsonTest.java

@@ -107,5 +107,30 @@ public void testDelegateSetJsonWithFlags() throws JsonProcessingException, JSONE
 
     assertCanSerializeAndDeserialize(delegateSet, json);
   }
+
+  @Test
+  public void testDelegateSetJsonWithNoPermissions() throws JsonProcessingException, JSONException {
+    DelegateSet delegateSet = DelegateSet.builder()
+            .account(Address.of("rsUiUMpnrgxQp24dJYZDhmV4bE3aBtQyt8"))
+            .authorize(Address.of("rEhxGqkqPPSxQ3P25J66ft5TwpzV14k2de"))
+            .sequence(UnsignedInteger.valueOf(2))
+            .fee(XrpCurrencyAmount.ofDrops(10))
+            .signingPublicKey(
+                    PublicKey.fromBase16EncodedPublicKey("ED87987410480E90474F7A02E0DA0CE4E6ABC8A1377864026A1FEE2718688B0B84")
+            )
+            .build();
+
+    String json = "{" +
+            "  \"Account\":\"rsUiUMpnrgxQp24dJYZDhmV4bE3aBtQyt8\"," +
+            "  \"Authorize\":\"rEhxGqkqPPSxQ3P25J66ft5TwpzV14k2de\"," +
+            "  \"Permissions\":[]," +
+            "  \"Fee\":\"10\"," +
+            "  \"Sequence\":2," +
+            "  \"SigningPubKey\":\"ED87987410480E90474F7A02E0DA0CE4E6ABC8A1377864026A1FEE2718688B0B84\"," +
+            "  \"TransactionType\":\"DelegateSet\"" +
+            "}";
+
+    assertCanSerializeAndDeserialize(delegateSet, json);
+  }
 }