nonnull annotations

hendrikebbers · hendrikebbers · commit 0ec883fced0a · 2024-08-22T11:03:44.000+02:00
diff --git a/hedera-base/src/main/java/com/openelements/hedera/base/protocol/FileCreateRequest.java b/hedera-base/src/main/java/com/openelements/hedera/base/protocol/FileCreateRequest.java
@@ -7,11 +7,11 @@
 import org.jspecify.annotations.NonNull;
 import org.jspecify.annotations.Nullable;
 
-public record FileCreateRequest(Hbar maxTransactionFee,
-                                Duration transactionValidDuration,
+public record FileCreateRequest(@NonNull Hbar maxTransactionFee,
+                                @NonNull Duration transactionValidDuration,
                                 @NonNull byte[] contents,
                                 @Nullable Instant expirationTime,
-                                String fileMemo) implements TransactionRequest {
+                                @Nullable String fileMemo) implements TransactionRequest {
 
     private static final String DEFAULT_FILE_MEMO = "";
 
@@ -27,10 +27,12 @@ public record FileCreateRequest(Hbar maxTransactionFee,
     }
 
     public static FileCreateRequest of(@NonNull byte[] contents) {
-        return new FileCreateRequest(DEFAULT_MAX_TRANSACTION_FEE, DEFAULT_TRANSACTION_VALID_DURATION, contents, null, DEFAULT_FILE_MEMO);
+        return new FileCreateRequest(DEFAULT_MAX_TRANSACTION_FEE, DEFAULT_TRANSACTION_VALID_DURATION, contents, null,
+                DEFAULT_FILE_MEMO);
     }
 
     public static FileCreateRequest of(@NonNull byte[] contents, @NonNull Instant expirationTime) {
-        return new FileCreateRequest(DEFAULT_MAX_TRANSACTION_FEE, DEFAULT_TRANSACTION_VALID_DURATION, contents, expirationTime, DEFAULT_FILE_MEMO);
+        return new FileCreateRequest(DEFAULT_MAX_TRANSACTION_FEE, DEFAULT_TRANSACTION_VALID_DURATION, contents,
+                expirationTime, DEFAULT_FILE_MEMO);
     }
 }
diff --git a/hedera-base/src/main/java/com/openelements/hedera/base/protocol/FileDeleteRequest.java b/hedera-base/src/main/java/com/openelements/hedera/base/protocol/FileDeleteRequest.java
@@ -6,8 +6,8 @@
 import java.util.Objects;
 import org.jspecify.annotations.NonNull;
 
-public record FileDeleteRequest(Hbar maxTransactionFee,
-                                Duration transactionValidDuration,
+public record FileDeleteRequest(@NonNull Hbar maxTransactionFee,
+                                @NonNull Duration transactionValidDuration,
                                 @NonNull FileId fileId) implements TransactionRequest {
 
     public FileDeleteRequest {
diff --git a/hedera-base/src/main/java/com/openelements/hedera/base/protocol/FileUpdateRequest.java b/hedera-base/src/main/java/com/openelements/hedera/base/protocol/FileUpdateRequest.java
@@ -7,11 +7,11 @@
 import org.jspecify.annotations.NonNull;
 import org.jspecify.annotations.Nullable;
 
-public record FileUpdateRequest(Hbar maxTransactionFee,
+public record FileUpdateRequest(@NonNull Hbar maxTransactionFee,
 
-                                Duration transactionValidDuration,
+                                @NonNull Duration transactionValidDuration,
 
-                                FileId fileId,
+                                @NonNull FileId fileId,
 
                                 @Nullable byte[] contents,
 
@@ -29,10 +29,12 @@ public record FileUpdateRequest(Hbar maxTransactionFee,
     }
 
     public static FileUpdateRequest of(@NonNull FileId fileId, @NonNull byte[] contents) {
-        return new FileUpdateRequest(DEFAULT_MAX_TRANSACTION_FEE, DEFAULT_TRANSACTION_VALID_DURATION, fileId, contents, null, DEFAULT_FILE_MEMO);
+        return new FileUpdateRequest(DEFAULT_MAX_TRANSACTION_FEE, DEFAULT_TRANSACTION_VALID_DURATION, fileId, contents,
+                null, DEFAULT_FILE_MEMO);
     }
 
     public static FileUpdateRequest of(@NonNull FileId fileId, @NonNull Instant expirationTime) {
-        return new FileUpdateRequest(DEFAULT_MAX_TRANSACTION_FEE, DEFAULT_TRANSACTION_VALID_DURATION, fileId, null, expirationTime, DEFAULT_FILE_MEMO);
+        return new FileUpdateRequest(DEFAULT_MAX_TRANSACTION_FEE, DEFAULT_TRANSACTION_VALID_DURATION, fileId, null,
+                expirationTime, DEFAULT_FILE_MEMO);
     }
 }
diff --git a/hedera-base/src/main/java/com/openelements/hedera/base/protocol/TokenAssociateRequest.java b/hedera-base/src/main/java/com/openelements/hedera/base/protocol/TokenAssociateRequest.java
@@ -8,8 +8,8 @@
 import java.util.Objects;
 import org.jspecify.annotations.NonNull;
 
-public record TokenAssociateRequest(Hbar maxTransactionFee,
-                                    Duration transactionValidDuration,
+public record TokenAssociateRequest(@NonNull Hbar maxTransactionFee,
+                                    @NonNull Duration transactionValidDuration,
                                     @NonNull TokenId tokenId,
                                     @NonNull AccountId accountId,
                                     @NonNull PrivateKey accountPrivateKey) implements TransactionRequest {
diff --git a/hedera-base/src/main/java/com/openelements/hedera/base/protocol/TokenCreateRequest.java b/hedera-base/src/main/java/com/openelements/hedera/base/protocol/TokenCreateRequest.java
@@ -10,8 +10,8 @@
 import org.jspecify.annotations.NonNull;
 import org.jspecify.annotations.Nullable;
 
-public record TokenCreateRequest(Hbar maxTransactionFee,
-                                 Duration transactionValidDuration,
+public record TokenCreateRequest(@NonNull Hbar maxTransactionFee,
+                                 @NonNull Duration transactionValidDuration,
                                  @NonNull String name,
                                  @NonNull String symbol,
                                  @NonNull AccountId treasuryAccountId,
diff --git a/hedera-base/src/main/java/com/openelements/hedera/base/protocol/TokenMintRequest.java b/hedera-base/src/main/java/com/openelements/hedera/base/protocol/TokenMintRequest.java
@@ -10,8 +10,8 @@
 import org.jspecify.annotations.NonNull;
 import org.jspecify.annotations.Nullable;
 
-public record TokenMintRequest(Hbar maxTransactionFee,
-                               Duration transactionValidDuration,
+public record TokenMintRequest(@NonNull Hbar maxTransactionFee,
+                               @NonNull Duration transactionValidDuration,
                                @NonNull TokenId tokenId,
                                @NonNull PrivateKey supplyKey,
                                @Nullable Long amount,
diff --git a/hedera-base/src/main/java/com/openelements/hedera/base/protocol/TokenTransferRequest.java b/hedera-base/src/main/java/com/openelements/hedera/base/protocol/TokenTransferRequest.java
@@ -9,8 +9,8 @@
 import java.util.Objects;
 import org.jspecify.annotations.NonNull;
 
-public record TokenTransferRequest(Hbar maxTransactionFee,
-                                   Duration transactionValidDuration,
+public record TokenTransferRequest(@NonNull Hbar maxTransactionFee,
+                                   @NonNull Duration transactionValidDuration,
                                    @NonNull TokenId tokenId,
                                    @NonNull List<Long> serials,
                                    @NonNull AccountId sender,
diff --git a/hedera-base/src/main/java/com/openelements/hedera/base/protocol/TopicCreateRequest.java b/hedera-base/src/main/java/com/openelements/hedera/base/protocol/TopicCreateRequest.java
@@ -2,17 +2,19 @@
 
 import com.hedera.hashgraph.sdk.Hbar;
 import java.time.Duration;
+import org.jspecify.annotations.NonNull;
 
-public record TopicCreateRequest(Hbar maxTransactionFee,
+public record TopicCreateRequest(@NonNull Hbar maxTransactionFee,
 
-                                 Duration transactionValidDuration) implements TransactionRequest {
+                                 @NonNull Duration transactionValidDuration) implements TransactionRequest {
 
     public TopicCreateRequest {
 
     }
 
     public static TopicCreateRequest of() {
-        return new TopicCreateRequest(TransactionRequest.DEFAULT_MAX_TRANSACTION_FEE, TransactionRequest.DEFAULT_TRANSACTION_VALID_DURATION);
+        return new TopicCreateRequest(TransactionRequest.DEFAULT_MAX_TRANSACTION_FEE,
+                TransactionRequest.DEFAULT_TRANSACTION_VALID_DURATION);
     }
 
 

Original file line number	Diff line number	Diff line change
`@@ -7,11 +7,11 @@`
`7`	`7`	`import org.jspecify.annotations.NonNull;`
`8`	`8`	`import org.jspecify.annotations.Nullable;`
`9`	`9`
`10`		`-public record FileCreateRequest(Hbar maxTransactionFee,`
`11`		`- Duration transactionValidDuration,`
	`10`	`+public record FileCreateRequest(@NonNull Hbar maxTransactionFee,`
	`11`	`+ @NonNull Duration transactionValidDuration,`
`12`	`12`	`@NonNull byte[] contents,`
`13`	`13`	`@Nullable Instant expirationTime,`
`14`		`- String fileMemo) implements TransactionRequest {`
	`14`	`+ @Nullable String fileMemo) implements TransactionRequest {`
`15`	`15`
`16`	`16`	`private static final String DEFAULT_FILE_MEMO = "";`
`17`	`17`
`@@ -27,10 +27,12 @@ public record FileCreateRequest(Hbar maxTransactionFee,`
`27`	`27`	`}`
`28`	`28`
`29`	`29`	`public static FileCreateRequest of(@NonNull byte[] contents) {`
`30`		`- return new FileCreateRequest(DEFAULT_MAX_TRANSACTION_FEE, DEFAULT_TRANSACTION_VALID_DURATION, contents, null, DEFAULT_FILE_MEMO);`
	`30`	`+ return new FileCreateRequest(DEFAULT_MAX_TRANSACTION_FEE, DEFAULT_TRANSACTION_VALID_DURATION, contents, null,`
	`31`	`+ DEFAULT_FILE_MEMO);`
`31`	`32`	`}`
`32`	`33`
`33`	`34`	`public static FileCreateRequest of(@NonNull byte[] contents, @NonNull Instant expirationTime) {`
`34`		`- return new FileCreateRequest(DEFAULT_MAX_TRANSACTION_FEE, DEFAULT_TRANSACTION_VALID_DURATION, contents, expirationTime, DEFAULT_FILE_MEMO);`
	`35`	`+ return new FileCreateRequest(DEFAULT_MAX_TRANSACTION_FEE, DEFAULT_TRANSACTION_VALID_DURATION, contents,`
	`36`	`+ expirationTime, DEFAULT_FILE_MEMO);`
`35`	`37`	`}`
`36`	`38`	`}`