From 9329d59ce73d755e69c8afdc9872a6b0c9ad2243 Mon Sep 17 00:00:00 2001 From: "Nelson R. Perez" Date: Mon, 17 Sep 2018 12:19:22 -0500 Subject: [PATCH] Moved the Memo class --- .../main/java/cy/agorise/graphenej/{objects => }/Memo.java | 5 +---- .../cy/agorise/graphenej/api/GetRelativeAccountHistory.java | 2 +- .../cy/agorise/graphenej/api/SubscriptionMessagesHub.java | 2 +- .../cy/agorise/graphenej/api/android/DeserializationMap.java | 2 +- .../cy/agorise/graphenej/api/android/NetworkService.java | 2 +- .../cy/agorise/graphenej/operations/TransferOperation.java | 2 +- .../graphenej/operations/TransferOperationBuilder.java | 2 +- .../src/test/java/cy/agorise/graphenej/TransactionTest.java | 1 - .../cy/agorise/graphenej/models/FullAccountDetailsTest.java | 2 +- .../graphenej/models/HistoryOperationDetailsTest.java | 2 +- .../cy/agorise/graphenej/models/JsonRpcNotificationTest.java | 2 +- .../src/test/java/cy/agorise/graphenej/objects/MemoTest.java | 1 + .../java/cy/agorise/labs/sample/PerformCallActivity.java | 2 +- 13 files changed, 12 insertions(+), 15 deletions(-) rename graphenej/src/main/java/cy/agorise/graphenej/{objects => }/Memo.java (98%) diff --git a/graphenej/src/main/java/cy/agorise/graphenej/objects/Memo.java b/graphenej/src/main/java/cy/agorise/graphenej/Memo.java similarity index 98% rename from graphenej/src/main/java/cy/agorise/graphenej/objects/Memo.java rename to graphenej/src/main/java/cy/agorise/graphenej/Memo.java index 8bd3324..e0c9f03 100644 --- a/graphenej/src/main/java/cy/agorise/graphenej/objects/Memo.java +++ b/graphenej/src/main/java/cy/agorise/graphenej/Memo.java @@ -1,4 +1,4 @@ -package cy.agorise.graphenej.objects; +package cy.agorise.graphenej; import com.google.common.primitives.Bytes; import com.google.gson.Gson; @@ -19,9 +19,6 @@ import java.security.MessageDigest; import java.security.NoSuchAlgorithmException; import java.util.Arrays; -import cy.agorise.graphenej.Address; -import cy.agorise.graphenej.PublicKey; -import cy.agorise.graphenej.Util; import cy.agorise.graphenej.errors.ChecksumException; import cy.agorise.graphenej.errors.MalformedAddressException; import cy.agorise.graphenej.interfaces.ByteSerializable; diff --git a/graphenej/src/main/java/cy/agorise/graphenej/api/GetRelativeAccountHistory.java b/graphenej/src/main/java/cy/agorise/graphenej/api/GetRelativeAccountHistory.java index c0e7c7d..6a8d9d7 100644 --- a/graphenej/src/main/java/cy/agorise/graphenej/api/GetRelativeAccountHistory.java +++ b/graphenej/src/main/java/cy/agorise/graphenej/api/GetRelativeAccountHistory.java @@ -20,7 +20,7 @@ import cy.agorise.graphenej.models.ApiCall; import cy.agorise.graphenej.models.BaseResponse; import cy.agorise.graphenej.models.OperationHistory; import cy.agorise.graphenej.models.WitnessResponse; -import cy.agorise.graphenej.objects.Memo; +import cy.agorise.graphenej.Memo; import cy.agorise.graphenej.operations.TransferOperation; /** diff --git a/graphenej/src/main/java/cy/agorise/graphenej/api/SubscriptionMessagesHub.java b/graphenej/src/main/java/cy/agorise/graphenej/api/SubscriptionMessagesHub.java index de55c28..1e234d2 100644 --- a/graphenej/src/main/java/cy/agorise/graphenej/api/SubscriptionMessagesHub.java +++ b/graphenej/src/main/java/cy/agorise/graphenej/api/SubscriptionMessagesHub.java @@ -26,7 +26,7 @@ import cy.agorise.graphenej.models.DynamicGlobalProperties; import cy.agorise.graphenej.models.OperationHistory; import cy.agorise.graphenej.models.SubscriptionResponse; import cy.agorise.graphenej.models.WitnessResponse; -import cy.agorise.graphenej.objects.Memo; +import cy.agorise.graphenej.Memo; import cy.agorise.graphenej.operations.CustomOperation; import cy.agorise.graphenej.operations.LimitOrderCreateOperation; import cy.agorise.graphenej.operations.TransferOperation; diff --git a/graphenej/src/main/java/cy/agorise/graphenej/api/android/DeserializationMap.java b/graphenej/src/main/java/cy/agorise/graphenej/api/android/DeserializationMap.java index e12ebab..449bf22 100644 --- a/graphenej/src/main/java/cy/agorise/graphenej/api/android/DeserializationMap.java +++ b/graphenej/src/main/java/cy/agorise/graphenej/api/android/DeserializationMap.java @@ -38,7 +38,7 @@ import cy.agorise.graphenej.models.BucketObject; import cy.agorise.graphenej.models.FullAccountDetails; import cy.agorise.graphenej.models.HistoryOperationDetail; import cy.agorise.graphenej.models.OperationHistory; -import cy.agorise.graphenej.objects.Memo; +import cy.agorise.graphenej.Memo; import cy.agorise.graphenej.operations.CustomOperation; import cy.agorise.graphenej.operations.LimitOrderCreateOperation; import cy.agorise.graphenej.operations.TransferOperation; diff --git a/graphenej/src/main/java/cy/agorise/graphenej/api/android/NetworkService.java b/graphenej/src/main/java/cy/agorise/graphenej/api/android/NetworkService.java index ead3b51..7014eec 100644 --- a/graphenej/src/main/java/cy/agorise/graphenej/api/android/NetworkService.java +++ b/graphenej/src/main/java/cy/agorise/graphenej/api/android/NetworkService.java @@ -49,7 +49,7 @@ import cy.agorise.graphenej.models.HistoryOperationDetail; import cy.agorise.graphenej.models.JsonRpcNotification; import cy.agorise.graphenej.models.JsonRpcResponse; import cy.agorise.graphenej.models.OperationHistory; -import cy.agorise.graphenej.objects.Memo; +import cy.agorise.graphenej.Memo; import cy.agorise.graphenej.operations.CustomOperation; import cy.agorise.graphenej.operations.LimitOrderCreateOperation; import cy.agorise.graphenej.operations.TransferOperation; diff --git a/graphenej/src/main/java/cy/agorise/graphenej/operations/TransferOperation.java b/graphenej/src/main/java/cy/agorise/graphenej/operations/TransferOperation.java index 232a2a1..63b28c4 100644 --- a/graphenej/src/main/java/cy/agorise/graphenej/operations/TransferOperation.java +++ b/graphenej/src/main/java/cy/agorise/graphenej/operations/TransferOperation.java @@ -17,7 +17,7 @@ import cy.agorise.graphenej.AssetAmount; import cy.agorise.graphenej.BaseOperation; import cy.agorise.graphenej.OperationType; import cy.agorise.graphenej.UserAccount; -import cy.agorise.graphenej.objects.Memo; +import cy.agorise.graphenej.Memo; /** * Class used to encapsulate the TransferOperation operation related functionalities. diff --git a/graphenej/src/main/java/cy/agorise/graphenej/operations/TransferOperationBuilder.java b/graphenej/src/main/java/cy/agorise/graphenej/operations/TransferOperationBuilder.java index 709589b..c1516cf 100644 --- a/graphenej/src/main/java/cy/agorise/graphenej/operations/TransferOperationBuilder.java +++ b/graphenej/src/main/java/cy/agorise/graphenej/operations/TransferOperationBuilder.java @@ -3,7 +3,7 @@ package cy.agorise.graphenej.operations; import cy.agorise.graphenej.AssetAmount; import cy.agorise.graphenej.UserAccount; import cy.agorise.graphenej.errors.MalformedOperationException; -import cy.agorise.graphenej.objects.Memo; +import cy.agorise.graphenej.Memo; /** * Factory class used to build a transfer operation diff --git a/graphenej/src/test/java/cy/agorise/graphenej/TransactionTest.java b/graphenej/src/test/java/cy/agorise/graphenej/TransactionTest.java index d4dd064..92719f2 100644 --- a/graphenej/src/test/java/cy/agorise/graphenej/TransactionTest.java +++ b/graphenej/src/test/java/cy/agorise/graphenej/TransactionTest.java @@ -24,7 +24,6 @@ import cy.agorise.graphenej.api.TransactionBroadcastSequence; import cy.agorise.graphenej.interfaces.WitnessResponseListener; import cy.agorise.graphenej.models.BaseResponse; import cy.agorise.graphenej.models.WitnessResponse; -import cy.agorise.graphenej.objects.Memo; import cy.agorise.graphenej.operations.CustomOperation; import cy.agorise.graphenej.operations.LimitOrderCancelOperation; import cy.agorise.graphenej.operations.LimitOrderCreateOperation; diff --git a/graphenej/src/test/java/cy/agorise/graphenej/models/FullAccountDetailsTest.java b/graphenej/src/test/java/cy/agorise/graphenej/models/FullAccountDetailsTest.java index b4ab37f..33d49f8 100644 --- a/graphenej/src/test/java/cy/agorise/graphenej/models/FullAccountDetailsTest.java +++ b/graphenej/src/test/java/cy/agorise/graphenej/models/FullAccountDetailsTest.java @@ -13,7 +13,7 @@ import java.util.List; import cy.agorise.graphenej.AccountOptions; import cy.agorise.graphenej.Authority; -import cy.agorise.graphenej.objects.Memo; +import cy.agorise.graphenej.Memo; public class FullAccountDetailsTest { diff --git a/graphenej/src/test/java/cy/agorise/graphenej/models/HistoryOperationDetailsTest.java b/graphenej/src/test/java/cy/agorise/graphenej/models/HistoryOperationDetailsTest.java index 7bc9576..2b1a492 100644 --- a/graphenej/src/test/java/cy/agorise/graphenej/models/HistoryOperationDetailsTest.java +++ b/graphenej/src/test/java/cy/agorise/graphenej/models/HistoryOperationDetailsTest.java @@ -15,7 +15,7 @@ import cy.agorise.graphenej.BaseOperation; import cy.agorise.graphenej.Extensions; import cy.agorise.graphenej.UserAccount; import cy.agorise.graphenej.api.android.DeserializationMap; -import cy.agorise.graphenej.objects.Memo; +import cy.agorise.graphenej.Memo; public class HistoryOperationDetailsTest { diff --git a/graphenej/src/test/java/cy/agorise/graphenej/models/JsonRpcNotificationTest.java b/graphenej/src/test/java/cy/agorise/graphenej/models/JsonRpcNotificationTest.java index cef2d29..2dcbf9a 100644 --- a/graphenej/src/test/java/cy/agorise/graphenej/models/JsonRpcNotificationTest.java +++ b/graphenej/src/test/java/cy/agorise/graphenej/models/JsonRpcNotificationTest.java @@ -12,7 +12,7 @@ import java.util.ArrayList; import cy.agorise.graphenej.AssetAmount; import cy.agorise.graphenej.Transaction; import cy.agorise.graphenej.UserAccount; -import cy.agorise.graphenej.objects.Memo; +import cy.agorise.graphenej.Memo; import cy.agorise.graphenej.operations.CustomOperation; import cy.agorise.graphenej.operations.LimitOrderCreateOperation; import cy.agorise.graphenej.operations.TransferOperation; diff --git a/graphenej/src/test/java/cy/agorise/graphenej/objects/MemoTest.java b/graphenej/src/test/java/cy/agorise/graphenej/objects/MemoTest.java index 303b140..a614225 100644 --- a/graphenej/src/test/java/cy/agorise/graphenej/objects/MemoTest.java +++ b/graphenej/src/test/java/cy/agorise/graphenej/objects/MemoTest.java @@ -13,6 +13,7 @@ import org.junit.Test; import java.math.BigInteger; import cy.agorise.graphenej.Address; +import cy.agorise.graphenej.Memo; import cy.agorise.graphenej.PublicKey; import cy.agorise.graphenej.TestAccounts; import cy.agorise.graphenej.Util; diff --git a/sample/src/main/java/cy/agorise/labs/sample/PerformCallActivity.java b/sample/src/main/java/cy/agorise/labs/sample/PerformCallActivity.java index 99d1ebc..08254ef 100644 --- a/sample/src/main/java/cy/agorise/labs/sample/PerformCallActivity.java +++ b/sample/src/main/java/cy/agorise/labs/sample/PerformCallActivity.java @@ -38,7 +38,7 @@ import cy.agorise.graphenej.api.calls.GetLimitOrders; import cy.agorise.graphenej.api.calls.GetObjects; import cy.agorise.graphenej.api.calls.ListAssets; import cy.agorise.graphenej.models.JsonRpcResponse; -import cy.agorise.graphenej.objects.Memo; +import cy.agorise.graphenej.Memo; import io.reactivex.android.schedulers.AndroidSchedulers; import io.reactivex.disposables.Disposable; import io.reactivex.functions.Consumer;