chore: improve examples

examples/src/main/java/com/hedera/hashgraph/sdk/examples/AccountAliasExample.java

@@ -19,22 +19,10 @@
  */
 package com.hedera.hashgraph.sdk.examples;
 
-import com.hedera.hashgraph.sdk.AccountBalance;
-import com.hedera.hashgraph.sdk.AccountBalanceQuery;
-import com.hedera.hashgraph.sdk.AccountId;
-import com.hedera.hashgraph.sdk.AccountInfo;
-import com.hedera.hashgraph.sdk.AccountInfoQuery;
-import com.hedera.hashgraph.sdk.Client;
-import com.hedera.hashgraph.sdk.Hbar;
-import com.hedera.hashgraph.sdk.PrecheckStatusException;
-import com.hedera.hashgraph.sdk.PrivateKey;
-import com.hedera.hashgraph.sdk.PublicKey;
-import com.hedera.hashgraph.sdk.ReceiptStatusException;
-import com.hedera.hashgraph.sdk.TransferTransaction;
+import com.hedera.hashgraph.sdk.*;
 import io.github.cdimascio.dotenv.Dotenv;
 
 import java.util.Objects;
-import java.util.concurrent.TimeoutException;
 
 public class AccountAliasExample {
 
@@ -45,8 +33,7 @@ public class AccountAliasExample {
     // HEDERA_NETWORK defaults to testnet if not specified in dotenv
     private static final String HEDERA_NETWORK = Dotenv.load().get("HEDERA_NETWORK", "testnet");
 
-    public static void main(String[] args)
-        throws TimeoutException, PrecheckStatusException, ReceiptStatusException, InterruptedException {
+    public static void main(String[] args) throws Exception {
         Client client = ClientHelper.forName(HEDERA_NETWORK);
 
         // Defaults the operator account ID and key such that all generated transactions will be paid for
@@ -139,6 +126,16 @@ public static void main(String[] args)
         System.out.println("The alias key: " + info.aliasKey);
 
         System.out.println("Example complete!");
+
+        // Clean up
+        new AccountDeleteTransaction()
+            .setAccountId(info.accountId)
+            .setTransferAccountId(OPERATOR_ID)
+            .freezeWith(client)
+            .sign(privateKey)
+            .execute(client)
+            .getReceipt(client);
+
         client.close();
     }
 }

examples/src/main/java/com/hedera/hashgraph/sdk/examples/AccountAllowanceExample.java

@@ -19,18 +19,7 @@
  */
 package com.hedera.hashgraph.sdk.examples;
 
-import com.hedera.hashgraph.sdk.AccountAllowanceApproveTransaction;
-import com.hedera.hashgraph.sdk.AccountBalanceQuery;
-import com.hedera.hashgraph.sdk.AccountCreateTransaction;
-import com.hedera.hashgraph.sdk.AccountDeleteTransaction;
-import com.hedera.hashgraph.sdk.AccountId;
-import com.hedera.hashgraph.sdk.Client;
-import com.hedera.hashgraph.sdk.Hbar;
-import com.hedera.hashgraph.sdk.PrecheckStatusException;
-import com.hedera.hashgraph.sdk.PrivateKey;
-import com.hedera.hashgraph.sdk.ReceiptStatusException;
-import com.hedera.hashgraph.sdk.TransactionId;
-import com.hedera.hashgraph.sdk.TransferTransaction;
+import com.hedera.hashgraph.sdk.*;
 import io.github.cdimascio.dotenv.Dotenv;
 
 import java.util.Objects;
@@ -56,16 +45,14 @@ public class AccountAllowanceExample {
     private final PrivateKey charlieKey;
     private final AccountId charlieId;
 
-    public static void main(String[] args)
-        throws PrecheckStatusException, TimeoutException, ReceiptStatusException, InterruptedException {
+    public static void main(String[] args) throws Exception {
         AccountAllowanceExample example = new AccountAllowanceExample();
         example.demonstrateAllowances();
         example.cleanUp();
         System.out.println("End of example");
     }
 
-    private AccountAllowanceExample()
-        throws PrecheckStatusException, TimeoutException, ReceiptStatusException, InterruptedException {
+    private AccountAllowanceExample() throws Exception {
         client = ClientHelper.forName(HEDERA_NETWORK);
 
         // Defaults the operator account ID and key such that all generated transactions will be paid for

examples/src/main/java/com/hedera/hashgraph/sdk/examples/AccountCreateWithHtsExample.java

@@ -22,7 +22,9 @@
 import com.hedera.hashgraph.sdk.*;
 import io.github.cdimascio.dotenv.Dotenv;
 
-import java.util.*;
+import java.util.List;
+import java.util.Map;
+import java.util.Objects;
 
 public final class AccountCreateWithHtsExample {
 
@@ -142,14 +144,14 @@ public static void main(String[] args) throws Exception {
         System.out.println("Current owner account id: " + nftOwnerAccountId);
 
         // Step 6 - Show the new account ID owns the NFT
-        String accountId = new AccountInfoQuery()
+        String accountIdString = new AccountInfoQuery()
             .setAccountId(aliasAccountId)
             .execute(client)
             .accountId.toString();
 
-        System.out.println("The normal account ID of the given alias: " + accountId);
+        System.out.println("The normal account ID of the given alias: " + accountIdString);
 
-        if (nftOwnerAccountId.equals(accountId)) {
+        if (nftOwnerAccountId.equals(accountIdString)) {
             System.out.println("The NFT owner accountId matches the accountId created with the HTS");
         } else {
             throw new Exception("The two account IDs does not match");
@@ -161,11 +163,13 @@ public static void main(String[] args) throws Exception {
         TokenCreateTransaction tokenCreateTx = new TokenCreateTransaction()
             .setTokenName("HIP-542 Token")
             .setTokenSymbol("H542")
+            .setInitialSupply(10_000) // Total supply = 10000 / 10 ^ 2
+            .setDecimals(2)
             .setTokenType(TokenType.FUNGIBLE_COMMON)
             .setTreasuryAccountId(OPERATOR_ID)
-            .setInitialSupply(10000) // Total supply = 10000 / 10 ^ 2
-            .setDecimals(2)
             .setAutoRenewAccountId(OPERATOR_ID)
+            .setAdminKey(OPERATOR_KEY)
+            .setWipeKey(wipeKey)
             .freezeWith(client);
 
         // Sign the transaction with the operator key
@@ -208,12 +212,12 @@ public static void main(String[] args) throws Exception {
         tokenTransferSubmit.getReceipt(client);
 
         // Step 4 -  Return the new account ID in the child record
-        String accountId2 = new AccountInfoQuery()
+        String accountId2String = new AccountInfoQuery()
             .setAccountId(aliasAccountId2)
             .execute(client)
             .accountId.toString();
 
-        System.out.println("The normal account ID of the given alias: " + accountId2);
+        System.out.println("The normal account ID of the given alias: " + accountId2String);
 
         // Step 5 -  Show the new account ID owns the fungible token
         AccountBalance accountBalances = new AccountBalanceQuery()
@@ -226,6 +230,67 @@ public static void main(String[] args) throws Exception {
         else
             throw new Exception("Creating account with HTS using public key alias failed");
 
+        // Clean Up
+
+        var accountId1 = AccountId.fromString(accountIdString);
+
+        new TokenWipeTransaction()
+            .setTokenId(nftTokenId)
+            .addSerial(exampleNftId)
+            .setAccountId(accountId1)
+            .freezeWith(client)
+            .sign(wipeKey)
+            .execute(client)
+            .getReceipt(client);
+
+        var accountId2 = AccountId.fromString(accountId2String);
+
+        Map<TokenId, Long> accountId2TokensBeforeWipe = new AccountBalanceQuery()
+            .setAccountId(accountId2)
+            .execute(client)
+            .tokens;
+
+        System.out.println("Account Id 2 token balance (before wipe): " + accountId2TokensBeforeWipe.get(tokenId));
+
+        new TokenWipeTransaction()
+            .setTokenId(tokenId)
+            .setAmount(accountId2TokensBeforeWipe.get(tokenId))
+            .setAccountId(accountId2)
+            .freezeWith(client)
+            .sign(wipeKey)
+            .execute(client)
+            .getReceipt(client);
+
+        new AccountDeleteTransaction()
+            .setAccountId(accountId1)
+            .setTransferAccountId(OPERATOR_ID)
+            .freezeWith(client)
+            .sign(privateKey)
+            .execute(client)
+            .getReceipt(client);
+
+        new AccountDeleteTransaction()
+            .setAccountId(accountId2)
+            .setTransferAccountId(OPERATOR_ID)
+            .freezeWith(client)
+            .sign(privateKey2)
+            .execute(client)
+            .getReceipt(client);
+
+        new TokenDeleteTransaction()
+            .setTokenId(nftTokenId)
+            .freezeWith(client)
+            .sign(OPERATOR_KEY)
+            .execute(client)
+            .getReceipt(client);
+
+        new TokenDeleteTransaction()
+            .setTokenId(tokenId)
+            .freezeWith(client)
+            .sign(OPERATOR_KEY)
+            .execute(client)
+            .getReceipt(client);
+
         client.close();
     }
 }

examples/src/main/java/com/hedera/hashgraph/sdk/examples/AutoCreateAccountTransferTransactionExample.java

@@ -22,9 +22,7 @@
 import com.hedera.hashgraph.sdk.*;
 import io.github.cdimascio.dotenv.Dotenv;
 
-import java.io.IOException;
 import java.util.Objects;
-import java.util.concurrent.TimeoutException;
 
 public class AutoCreateAccountTransferTransactionExample {
     // see `.env.sample` in the repository root for how to specify these values
@@ -141,6 +139,7 @@ public static void main(String[] args) throws Exception {
          *     - To enhance the hollow account to have a public key the hollow account needs to be specified as a transaction fee payer in a HAPI transaction
          */
         TransactionReceipt receipt2 = new TopicCreateTransaction()
+            .setAdminKey(publicKey)
             .setTransactionId(TransactionId.generate(newAccountId))
             .setTopicMemo("Memo")
             .freezeWith(client)
@@ -159,5 +158,23 @@ public static void main(String[] args) throws Exception {
             .execute(client);
 
         System.out.println("The public key of the newly created and now complete account: " + accountInfo2.key);
+
+        // Clean up
+        new AccountDeleteTransaction()
+            .setTransferAccountId(OPERATOR_ID)
+            .setAccountId(newAccountId)
+            .freezeWith(client)
+            .sign(privateKey)
+            .execute(client)
+            .getReceipt(client);
+
+        new TopicDeleteTransaction()
+            .setTopicId(receipt2.topicId)
+            .freezeWith(client)
+            .sign(privateKey)
+            .execute(client)
+            .getReceipt(client);
+
+        client.close();
     }
 }

examples/src/main/java/com/hedera/hashgraph/sdk/examples/ChangeRemoveTokenKeys.java

@@ -19,17 +19,9 @@
  */
 package com.hedera.hashgraph.sdk.examples;
 
-import com.hedera.hashgraph.sdk.AccountId;
-import com.hedera.hashgraph.sdk.Client;
-import com.hedera.hashgraph.sdk.KeyList;
-import com.hedera.hashgraph.sdk.PrivateKey;
-import com.hedera.hashgraph.sdk.PublicKey;
-import com.hedera.hashgraph.sdk.TokenCreateTransaction;
-import com.hedera.hashgraph.sdk.TokenInfoQuery;
-import com.hedera.hashgraph.sdk.TokenKeyValidation;
-import com.hedera.hashgraph.sdk.TokenType;
-import com.hedera.hashgraph.sdk.TokenUpdateTransaction;
+import com.hedera.hashgraph.sdk.*;
 import io.github.cdimascio.dotenv.Dotenv;
+
 import java.util.Objects;
 
 public class ChangeRemoveTokenKeys {
@@ -163,6 +155,9 @@ public static void main(String[] args) throws Exception {
 
         System.out.println("Supply Key (after removal):" + supplyKeyAfterRemoval.toStringRaw());
 
+        // Clean up
+        // Can't delete a token as it is immutable
+
         client.close();
     }
 }

examples/src/main/java/com/hedera/hashgraph/sdk/examples/ConsensusPubSubChunkedExample.java

@@ -20,17 +20,7 @@
 package com.hedera.hashgraph.sdk.examples;
 
 import com.google.errorprone.annotations.Var;
-import com.google.protobuf.InvalidProtocolBufferException;
-import com.hedera.hashgraph.sdk.AccountId;
-import com.hedera.hashgraph.sdk.Client;
-import com.hedera.hashgraph.sdk.PrecheckStatusException;
-import com.hedera.hashgraph.sdk.PrivateKey;
-import com.hedera.hashgraph.sdk.ReceiptStatusException;
-import com.hedera.hashgraph.sdk.TopicCreateTransaction;
-import com.hedera.hashgraph.sdk.TopicId;
-import com.hedera.hashgraph.sdk.TopicMessageQuery;
-import com.hedera.hashgraph.sdk.TopicMessageSubmitTransaction;
-import com.hedera.hashgraph.sdk.Transaction;
+import com.hedera.hashgraph.sdk.*;
 import io.github.cdimascio.dotenv.Dotenv;
 
 import java.io.BufferedReader;
@@ -55,7 +45,7 @@ public final class ConsensusPubSubChunkedExample {
     private ConsensusPubSubChunkedExample() {
     }
 
-    public static void main(String[] args) throws TimeoutException, PrecheckStatusException, ReceiptStatusException, InterruptedException, InvalidProtocolBufferException {
+    public static void main(String[] args) throws Exception {
         Client client = ClientHelper.forName(HEDERA_NETWORK);
 
         // Defaults the operator account ID and key such that all generated transactions will be paid for
@@ -68,6 +58,7 @@ public static void main(String[] args) throws TimeoutException, PrecheckStatusEx
         // make a new topic ID to use
         TopicId newTopicId = new TopicCreateTransaction()
             .setTopicMemo("hedera-sdk-java/ConsensusPubSubChunkedExample")
+            .setAdminKey(OPERATOR_KEY.getPublicKey())
             .setSubmitKey(submitKey)
             .execute(client)
             .getReceipt(client)
@@ -79,7 +70,7 @@ public static void main(String[] args) throws TimeoutException, PrecheckStatusEx
 
         // Let's wait a bit
         System.out.println("wait 10s to propagate to the mirror ...");
-        Thread.sleep(10000);
+        Thread.sleep(10_000);
 
         // setup a mirror client to print out messages as we receive them
         new TopicMessageQuery()
@@ -90,7 +81,7 @@ public static void main(String[] args) throws TimeoutException, PrecheckStatusEx
             });
 
         // get a large file to send
-        String bigContents = readResources("large_message.txt");
+        String bigContents = readResources("util/large_message.txt");
 
         System.out.println("about to prepare a transaction to send a message of " + bigContents.length() + " bytes");
 
@@ -123,6 +114,16 @@ public static void main(String[] args) throws TimeoutException, PrecheckStatusEx
         transaction.execute(client).getReceipt(client);
 
         boolean largeMessageReceived = largeMessageLatch.await(60, TimeUnit.SECONDS);
+
+        // Clean up
+        new TopicDeleteTransaction()
+            .setTopicId(newTopicId)
+            .execute(client)
+            .getReceipt(client);
+
+        client.close();
+
+        // Edge case
         if (!largeMessageReceived) {
             throw new TimeoutException("Large topic message was not received!");
         }