Skip to content

Commit 01c1e86

Browse files
committed
fix minor changes.
Signed-off-by: Manish Dait <[email protected]>
1 parent 887c6bb commit 01c1e86

File tree

6 files changed

+36
-7
lines changed

6 files changed

+36
-7
lines changed
Lines changed: 13 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,18 @@
11
package com.openelements.hiero.base.data;
22

3+
import org.jspecify.annotations.NonNull;
4+
35
import java.util.List;
6+
import java.util.Objects;
47

5-
public record CustomFee(List<FixedFee> fixedFees, List<FractionalFee> fractionalFees, List<RoyaltyFee> royaltyFees) {
8+
public record CustomFee(
9+
@NonNull List<FixedFee> fixedFees,
10+
@NonNull List<FractionalFee> fractionalFees,
11+
@NonNull List<RoyaltyFee> royaltyFees
12+
) {
13+
public CustomFee {
14+
Objects.requireNonNull(fixedFees, "fixedFees must not be null");
15+
Objects.requireNonNull(fractionalFees, "fractionalFees must not be null");
16+
Objects.requireNonNull(royaltyFees, "royaltyFees must not be null");
17+
}
618
}

hiero-enterprise-base/src/main/java/com/openelements/hiero/base/data/FixedFee.java

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,4 +5,5 @@
55
import org.jspecify.annotations.Nullable;
66

77
public record FixedFee(long amount, @Nullable AccountId collectorAccountId, @Nullable TokenId denominatingTokenId) {
8+
public FixedFee {}
89
}

hiero-enterprise-base/src/main/java/com/openelements/hiero/base/data/FractionalFee.java

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,4 +10,12 @@ public record FractionalFee(
1010
@Nullable AccountId collectorAccountId,
1111
@Nullable TokenId denominatingTokenId
1212
) {
13+
public FractionalFee {
14+
if (numeratorAmount < 0) {
15+
throw new IllegalArgumentException("numeratorAmount must be greater than or equal to 0");
16+
}
17+
if (denominatorAmount < 0) {
18+
throw new IllegalArgumentException("denominatorAmount must be greater than or equal to 0");
19+
}
20+
}
1321
}

hiero-enterprise-base/src/main/java/com/openelements/hiero/base/data/RoyaltyFee.java

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,4 +11,12 @@ public record RoyaltyFee(
1111
@Nullable AccountId collectorAccountId,
1212
@Nullable TokenId denominatingTokenId
1313
) {
14+
public RoyaltyFee {
15+
if (numeratorAmount < 0) {
16+
throw new IllegalArgumentException("numeratorAmount must be greater than or equal to 0");
17+
}
18+
if (denominatorAmount < 0) {
19+
throw new IllegalArgumentException("denominatorAmount must be greater than or equal to 0");
20+
}
21+
}
1422
}

hiero-enterprise-microprofile/src/main/java/com/openelements/hiero/microprofile/implementation/MirrorNodeJsonConverterImpl.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -306,9 +306,9 @@ public Optional<TokenInfo> toTokenInfo(JsonObject jsonObject) {
306306
}
307307

308308
private CustomFee getCustomFee(JsonObject object) {
309-
List<FractionalFee> fractionalFees = null;
310-
List<FixedFee> fixedFees = null;
311-
List<RoyaltyFee> royaltyFees = null;
309+
List<FractionalFee> fractionalFees = List.of();
310+
List<FixedFee> fixedFees = List.of();
311+
List<RoyaltyFee> royaltyFees = List.of();
312312

313313
if (object.containsKey("fixed_fees")) {
314314
JsonArray fixedFeeArray = object.get("fixed_fees").asJsonArray();

hiero-enterprise-spring/src/main/java/com/openelements/hiero/spring/implementation/MirrorNodeJsonConverterImpl.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -275,9 +275,9 @@ public Optional<TokenInfo> toTokenInfo(JsonNode node) {
275275
}
276276

277277
private CustomFee getCustomFee(JsonNode node) {
278-
List<FractionalFee> fractionalFees = null;
279-
List<FixedFee> fixedFees = null;
280-
List<RoyaltyFee> royaltyFees = null;
278+
List<FractionalFee> fractionalFees = List.of();
279+
List<FixedFee> fixedFees = List.of();
280+
List<RoyaltyFee> royaltyFees = List.of();
281281

282282
if (node.has("fixed_fees")) {
283283
JsonNode fixedFeeNode = node.get("fixed_fees");

0 commit comments

Comments
 (0)