From dfd52e9c610abf1312284674977f257e0cb59ce7 Mon Sep 17 00:00:00 2001 From: Hendrik Ebbers Date: Fri, 7 Feb 2025 15:35:30 +0100 Subject: [PATCH 1/2] TCK moved to hiero namespace Signed-off-by: Hendrik Ebbers --- tck/README.md | 9 +++++++-- .../hashgraph => org/hiero}/tck/TckServer.java | 2 +- .../tck/annotation/JSONRPC2Controller.java | 2 +- .../hiero}/tck/annotation/JSONRPC2Method.java | 2 +- .../hiero}/tck/annotation/JSONRPC2Service.java | 2 +- .../hiero}/tck/config/BeanConfig.java | 2 +- .../hiero}/tck/config/WebConfig.java | 4 ++-- .../hiero}/tck/controller/JRPCController.java | 6 +++--- .../hiero}/tck/controller/JRPCInterceptor.java | 2 +- .../InvalidJSONRPC2ParamsException.java | 2 +- .../InvalidJSONRPC2RequestException.java | 2 +- .../tck/methods/AbstractJSONRPC2Service.java | 12 ++++++------ .../hiero}/tck/methods/JSONRPC2Error.java | 2 +- .../hiero}/tck/methods/JSONRPC2Param.java | 2 +- .../hiero}/tck/methods/sdk/AccountService.java | 18 +++++++++--------- .../hiero}/tck/methods/sdk/KeyService.java | 18 +++++++++--------- .../hiero}/tck/methods/sdk/SdkService.java | 12 ++++++------ .../hiero}/tck/methods/sdk/TokenService.java | 14 +++++++------- .../sdk/param/CommonTransactionParams.java | 2 +- .../tck/methods/sdk/param/CustomFee.java | 4 ++-- .../methods/sdk/param/GenerateKeyParams.java | 6 +++--- .../tck/methods/sdk/param/SetupParams.java | 4 ++-- .../sdk/param/account/AccountCreateParams.java | 8 ++++---- .../sdk/param/account/AccountDeleteParams.java | 8 ++++---- .../sdk/param/account/AccountUpdateParams.java | 8 ++++---- .../AssociateDisassociateTokenParams.java | 8 ++++---- .../sdk/param/token/BurnTokenParams.java | 8 ++++---- .../param/token/FreezeUnfreezeTokenParams.java | 8 ++++---- .../param/token/GrantRevokeTokenKycParams.java | 8 ++++---- .../sdk/param/token/MintTokenParams.java | 8 ++++---- .../param/token/PauseUnpauseTokenParams.java | 8 ++++---- .../sdk/param/token/TokenCreateParams.java | 10 +++++----- .../sdk/param/token/TokenDeleteParams.java | 8 ++++---- .../token/TokenUpdateFeeScheduleParams.java | 10 +++++----- .../sdk/param/token/TokenUpdateParams.java | 8 ++++---- .../methods/sdk/response/AccountResponse.java | 2 +- .../sdk/response/GenerateKeyResponse.java | 2 +- .../methods/sdk/response/SetupResponse.java | 2 +- .../sdk/response/token/TokenBurnResponse.java | 2 +- .../sdk/response/token/TokenMintResponse.java | 2 +- .../sdk/response/token/TokenResponse.java | 2 +- .../tck/util/JSONRPC2ServiceScanner.java | 4 ++-- .../hiero}/tck/util/JSONRPCParamParser.java | 6 +++--- .../hiero}/tck/util/KeyUtils.java | 2 +- .../tck/controller/JRPCControllerTest.java | 2 +- .../tck/controller/JRPCInterceptorTest.java | 2 +- .../hiero}/tck/methods/sdk/KeyServiceTest.java | 10 +++++----- .../hiero}/tck/methods/sdk/SdkServiceTest.java | 6 +++--- .../sdk/param/AccountCreateParamsTest.java | 4 ++-- .../sdk/param/CommonTransactionParamsTest.java | 2 +- .../sdk/param/GenerateKeyParamsTest.java | 4 ++-- .../tck/methods/sdk/param/SetupParamsTest.java | 2 +- .../sdk/response/SetupResponseTest.java | 2 +- 53 files changed, 150 insertions(+), 145 deletions(-) rename tck/src/main/java/{com/hedera/hashgraph => org/hiero}/tck/TckServer.java (90%) rename tck/src/main/java/{com/hedera/hashgraph => org/hiero}/tck/annotation/JSONRPC2Controller.java (92%) rename tck/src/main/java/{com/hedera/hashgraph => org/hiero}/tck/annotation/JSONRPC2Method.java (94%) rename tck/src/main/java/{com/hedera/hashgraph => org/hiero}/tck/annotation/JSONRPC2Service.java (90%) rename tck/src/main/java/{com/hedera/hashgraph => org/hiero}/tck/config/BeanConfig.java (89%) rename tck/src/main/java/{com/hedera/hashgraph => org/hiero}/tck/config/WebConfig.java (82%) rename tck/src/main/java/{com/hedera/hashgraph => org/hiero}/tck/controller/JRPCController.java (89%) rename tck/src/main/java/{com/hedera/hashgraph => org/hiero}/tck/controller/JRPCInterceptor.java (97%) rename tck/src/main/java/{com/hedera/hashgraph => org/hiero}/tck/exception/InvalidJSONRPC2ParamsException.java (93%) rename tck/src/main/java/{com/hedera/hashgraph => org/hiero}/tck/exception/InvalidJSONRPC2RequestException.java (85%) rename tck/src/main/java/{com/hedera/hashgraph => org/hiero}/tck/methods/AbstractJSONRPC2Service.java (92%) rename tck/src/main/java/{com/hedera/hashgraph => org/hiero}/tck/methods/JSONRPC2Error.java (92%) rename tck/src/main/java/{com/hedera/hashgraph => org/hiero}/tck/methods/JSONRPC2Param.java (94%) rename tck/src/main/java/{com/hedera/hashgraph => org/hiero}/tck/methods/sdk/AccountService.java (91%) rename tck/src/main/java/{com/hedera/hashgraph => org/hiero}/tck/methods/sdk/KeyService.java (91%) rename tck/src/main/java/{com/hedera/hashgraph => org/hiero}/tck/methods/sdk/SdkService.java (84%) rename tck/src/main/java/{com/hedera/hashgraph => org/hiero}/tck/methods/sdk/TokenService.java (98%) rename tck/src/main/java/{com/hedera/hashgraph => org/hiero}/tck/methods/sdk/param/CommonTransactionParams.java (98%) rename tck/src/main/java/{com/hedera/hashgraph => org/hiero}/tck/methods/sdk/param/CustomFee.java (98%) rename tck/src/main/java/{com/hedera/hashgraph => org/hiero}/tck/methods/sdk/param/GenerateKeyParams.java (90%) rename tck/src/main/java/{com/hedera/hashgraph => org/hiero}/tck/methods/sdk/param/SetupParams.java (92%) rename tck/src/main/java/{com/hedera/hashgraph => org/hiero}/tck/methods/sdk/param/account/AccountCreateParams.java (91%) rename tck/src/main/java/{com/hedera/hashgraph => org/hiero}/tck/methods/sdk/param/account/AccountDeleteParams.java (81%) rename tck/src/main/java/{com/hedera/hashgraph => org/hiero}/tck/methods/sdk/param/account/AccountUpdateParams.java (91%) rename tck/src/main/java/{com/hedera/hashgraph => org/hiero}/tck/methods/sdk/param/token/AssociateDisassociateTokenParams.java (80%) rename tck/src/main/java/{com/hedera/hashgraph => org/hiero}/tck/methods/sdk/param/token/BurnTokenParams.java (83%) rename tck/src/main/java/{com/hedera/hashgraph => org/hiero}/tck/methods/sdk/param/token/FreezeUnfreezeTokenParams.java (79%) rename tck/src/main/java/{com/hedera/hashgraph => org/hiero}/tck/methods/sdk/param/token/GrantRevokeTokenKycParams.java (79%) rename tck/src/main/java/{com/hedera/hashgraph => org/hiero}/tck/methods/sdk/param/token/MintTokenParams.java (81%) rename tck/src/main/java/{com/hedera/hashgraph => org/hiero}/tck/methods/sdk/param/token/PauseUnpauseTokenParams.java (76%) rename tck/src/main/java/{com/hedera/hashgraph => org/hiero}/tck/methods/sdk/param/token/TokenCreateParams.java (93%) rename tck/src/main/java/{com/hedera/hashgraph => org/hiero}/tck/methods/sdk/param/token/TokenDeleteParams.java (77%) rename tck/src/main/java/{com/hedera/hashgraph => org/hiero}/tck/methods/sdk/param/token/TokenUpdateFeeScheduleParams.java (75%) rename tck/src/main/java/{com/hedera/hashgraph => org/hiero}/tck/methods/sdk/param/token/TokenUpdateParams.java (93%) rename tck/src/main/java/{com/hedera/hashgraph => org/hiero}/tck/methods/sdk/response/AccountResponse.java (79%) rename tck/src/main/java/{com/hedera/hashgraph => org/hiero}/tck/methods/sdk/response/GenerateKeyResponse.java (81%) rename tck/src/main/java/{com/hedera/hashgraph => org/hiero}/tck/methods/sdk/response/SetupResponse.java (86%) rename tck/src/main/java/{com/hedera/hashgraph => org/hiero}/tck/methods/sdk/response/token/TokenBurnResponse.java (87%) rename tck/src/main/java/{com/hedera/hashgraph => org/hiero}/tck/methods/sdk/response/token/TokenMintResponse.java (91%) rename tck/src/main/java/{com/hedera/hashgraph => org/hiero}/tck/methods/sdk/response/token/TokenResponse.java (90%) rename tck/src/main/java/{com/hedera/hashgraph => org/hiero}/tck/util/JSONRPC2ServiceScanner.java (89%) rename tck/src/main/java/{com/hedera/hashgraph => org/hiero}/tck/util/JSONRPCParamParser.java (91%) rename tck/src/main/java/{com/hedera/hashgraph => org/hiero}/tck/util/KeyUtils.java (97%) rename tck/src/test/java/{com/hedera/hashgraph => org/hiero}/tck/controller/JRPCControllerTest.java (97%) rename tck/src/test/java/{com/hedera/hashgraph => org/hiero}/tck/controller/JRPCInterceptorTest.java (97%) rename tck/src/test/java/{com/hedera/hashgraph => org/hiero}/tck/methods/sdk/KeyServiceTest.java (94%) rename tck/src/test/java/{com/hedera/hashgraph => org/hiero}/tck/methods/sdk/SdkServiceTest.java (91%) rename tck/src/test/java/{com/hedera/hashgraph => org/hiero}/tck/methods/sdk/param/AccountCreateParamsTest.java (98%) rename tck/src/test/java/{com/hedera/hashgraph => org/hiero}/tck/methods/sdk/param/CommonTransactionParamsTest.java (96%) rename tck/src/test/java/{com/hedera/hashgraph => org/hiero}/tck/methods/sdk/param/GenerateKeyParamsTest.java (97%) rename tck/src/test/java/{com/hedera/hashgraph => org/hiero}/tck/methods/sdk/param/SetupParamsTest.java (95%) rename tck/src/test/java/{com/hedera/hashgraph => org/hiero}/tck/methods/sdk/response/SetupResponseTest.java (96%) diff --git a/tck/README.md b/tck/README.md index 21578de122..e3ddeeb759 100644 --- a/tck/README.md +++ b/tck/README.md @@ -2,7 +2,11 @@ ## Description -This module contains implementation of the JSON-RPC server for the Java SDK to interpret and process requests from the Test Driver based on the [TCK's](https://github.com/hiero-ledger/hiero-sdk-tck) requirements. Upon receiving a request, it executes the corresponding function or procedure associated with the method specified in the request. Subsequently, it prepares the response in JSON format and sends it back to the test driver. +This module contains implementation of the JSON-RPC server for the Java SDK to interpret and process requests from the +Test Driver based on the [TCK's](https://github.com/hiero-ledger/hiero-sdk-tck) requirements. +Upon receiving a request, it executes the corresponding function or procedure associated with the method specified in +the request. +Subsequently, it prepares the response in JSON format and sends it back to the test driver. ## Setup @@ -24,7 +28,8 @@ cd tck ../gradlew bootRun ``` -By default, the server will occupy port 80. If you need to specify a different port, modify the port in the `application.yml` file: +By default, the server will occupy port 80. +If you need to specify a different port, modify the port in the `application.yml` file: ```yaml server: diff --git a/tck/src/main/java/com/hedera/hashgraph/tck/TckServer.java b/tck/src/main/java/org/hiero/tck/TckServer.java similarity index 90% rename from tck/src/main/java/com/hedera/hashgraph/tck/TckServer.java rename to tck/src/main/java/org/hiero/tck/TckServer.java index fb056e39b8..6dd4149882 100644 --- a/tck/src/main/java/com/hedera/hashgraph/tck/TckServer.java +++ b/tck/src/main/java/org/hiero/tck/TckServer.java @@ -1,5 +1,5 @@ // SPDX-License-Identifier: Apache-2.0 -package com.hedera.hashgraph.tck; +package org.hiero.tck; import org.springframework.boot.SpringApplication; import org.springframework.boot.autoconfigure.SpringBootApplication; diff --git a/tck/src/main/java/com/hedera/hashgraph/tck/annotation/JSONRPC2Controller.java b/tck/src/main/java/org/hiero/tck/annotation/JSONRPC2Controller.java similarity index 92% rename from tck/src/main/java/com/hedera/hashgraph/tck/annotation/JSONRPC2Controller.java rename to tck/src/main/java/org/hiero/tck/annotation/JSONRPC2Controller.java index c9105f187c..1945409f5e 100644 --- a/tck/src/main/java/com/hedera/hashgraph/tck/annotation/JSONRPC2Controller.java +++ b/tck/src/main/java/org/hiero/tck/annotation/JSONRPC2Controller.java @@ -1,5 +1,5 @@ // SPDX-License-Identifier: Apache-2.0 -package com.hedera.hashgraph.tck.annotation; +package org.hiero.tck.annotation; import java.lang.annotation.ElementType; import java.lang.annotation.Retention; diff --git a/tck/src/main/java/com/hedera/hashgraph/tck/annotation/JSONRPC2Method.java b/tck/src/main/java/org/hiero/tck/annotation/JSONRPC2Method.java similarity index 94% rename from tck/src/main/java/com/hedera/hashgraph/tck/annotation/JSONRPC2Method.java rename to tck/src/main/java/org/hiero/tck/annotation/JSONRPC2Method.java index 77fd9814df..f641b75501 100644 --- a/tck/src/main/java/com/hedera/hashgraph/tck/annotation/JSONRPC2Method.java +++ b/tck/src/main/java/org/hiero/tck/annotation/JSONRPC2Method.java @@ -1,5 +1,5 @@ // SPDX-License-Identifier: Apache-2.0 -package com.hedera.hashgraph.tck.annotation; +package org.hiero.tck.annotation; import java.lang.annotation.ElementType; import java.lang.annotation.Retention; diff --git a/tck/src/main/java/com/hedera/hashgraph/tck/annotation/JSONRPC2Service.java b/tck/src/main/java/org/hiero/tck/annotation/JSONRPC2Service.java similarity index 90% rename from tck/src/main/java/com/hedera/hashgraph/tck/annotation/JSONRPC2Service.java rename to tck/src/main/java/org/hiero/tck/annotation/JSONRPC2Service.java index d6fe319fc0..9af3eaa321 100644 --- a/tck/src/main/java/com/hedera/hashgraph/tck/annotation/JSONRPC2Service.java +++ b/tck/src/main/java/org/hiero/tck/annotation/JSONRPC2Service.java @@ -1,5 +1,5 @@ // SPDX-License-Identifier: Apache-2.0 -package com.hedera.hashgraph.tck.annotation; +package org.hiero.tck.annotation; import java.lang.annotation.ElementType; import java.lang.annotation.Retention; diff --git a/tck/src/main/java/com/hedera/hashgraph/tck/config/BeanConfig.java b/tck/src/main/java/org/hiero/tck/config/BeanConfig.java similarity index 89% rename from tck/src/main/java/com/hedera/hashgraph/tck/config/BeanConfig.java rename to tck/src/main/java/org/hiero/tck/config/BeanConfig.java index 0634f70079..881ea4c52f 100644 --- a/tck/src/main/java/com/hedera/hashgraph/tck/config/BeanConfig.java +++ b/tck/src/main/java/org/hiero/tck/config/BeanConfig.java @@ -1,5 +1,5 @@ // SPDX-License-Identifier: Apache-2.0 -package com.hedera.hashgraph.tck.config; +package org.hiero.tck.config; import com.thetransactioncompany.jsonrpc2.server.Dispatcher; import org.springframework.context.annotation.Bean; diff --git a/tck/src/main/java/com/hedera/hashgraph/tck/config/WebConfig.java b/tck/src/main/java/org/hiero/tck/config/WebConfig.java similarity index 82% rename from tck/src/main/java/com/hedera/hashgraph/tck/config/WebConfig.java rename to tck/src/main/java/org/hiero/tck/config/WebConfig.java index 518ad92d49..53929487a0 100644 --- a/tck/src/main/java/com/hedera/hashgraph/tck/config/WebConfig.java +++ b/tck/src/main/java/org/hiero/tck/config/WebConfig.java @@ -1,7 +1,7 @@ // SPDX-License-Identifier: Apache-2.0 -package com.hedera.hashgraph.tck.config; +package org.hiero.tck.config; -import com.hedera.hashgraph.tck.controller.JRPCInterceptor; +import org.hiero.tck.controller.JRPCInterceptor; import org.springframework.context.annotation.Configuration; import org.springframework.web.servlet.config.annotation.InterceptorRegistry; import org.springframework.web.servlet.config.annotation.WebMvcConfigurer; diff --git a/tck/src/main/java/com/hedera/hashgraph/tck/controller/JRPCController.java b/tck/src/main/java/org/hiero/tck/controller/JRPCController.java similarity index 89% rename from tck/src/main/java/com/hedera/hashgraph/tck/controller/JRPCController.java rename to tck/src/main/java/org/hiero/tck/controller/JRPCController.java index 3f39a0e049..04d40eea2d 100644 --- a/tck/src/main/java/com/hedera/hashgraph/tck/controller/JRPCController.java +++ b/tck/src/main/java/org/hiero/tck/controller/JRPCController.java @@ -1,8 +1,8 @@ // SPDX-License-Identifier: Apache-2.0 -package com.hedera.hashgraph.tck.controller; +package org.hiero.tck.controller; -import com.hedera.hashgraph.tck.annotation.JSONRPC2Controller; -import com.hedera.hashgraph.tck.util.JSONRPC2ServiceScanner; +import org.hiero.tck.annotation.JSONRPC2Controller; +import org.hiero.tck.util.JSONRPC2ServiceScanner; import com.thetransactioncompany.jsonrpc2.JSONRPC2Request; import com.thetransactioncompany.jsonrpc2.server.Dispatcher; import jakarta.servlet.http.HttpServletRequest; diff --git a/tck/src/main/java/com/hedera/hashgraph/tck/controller/JRPCInterceptor.java b/tck/src/main/java/org/hiero/tck/controller/JRPCInterceptor.java similarity index 97% rename from tck/src/main/java/com/hedera/hashgraph/tck/controller/JRPCInterceptor.java rename to tck/src/main/java/org/hiero/tck/controller/JRPCInterceptor.java index ddaef3b053..944e110895 100644 --- a/tck/src/main/java/com/hedera/hashgraph/tck/controller/JRPCInterceptor.java +++ b/tck/src/main/java/org/hiero/tck/controller/JRPCInterceptor.java @@ -1,5 +1,5 @@ // SPDX-License-Identifier: Apache-2.0 -package com.hedera.hashgraph.tck.controller; +package org.hiero.tck.controller; import com.thetransactioncompany.jsonrpc2.JSONRPC2ParseException; import com.thetransactioncompany.jsonrpc2.JSONRPC2Request; diff --git a/tck/src/main/java/com/hedera/hashgraph/tck/exception/InvalidJSONRPC2ParamsException.java b/tck/src/main/java/org/hiero/tck/exception/InvalidJSONRPC2ParamsException.java similarity index 93% rename from tck/src/main/java/com/hedera/hashgraph/tck/exception/InvalidJSONRPC2ParamsException.java rename to tck/src/main/java/org/hiero/tck/exception/InvalidJSONRPC2ParamsException.java index 3445a4126c..8144e8e297 100644 --- a/tck/src/main/java/com/hedera/hashgraph/tck/exception/InvalidJSONRPC2ParamsException.java +++ b/tck/src/main/java/org/hiero/tck/exception/InvalidJSONRPC2ParamsException.java @@ -1,5 +1,5 @@ // SPDX-License-Identifier: Apache-2.0 -package com.hedera.hashgraph.tck.exception; +package org.hiero.tck.exception; /** * Thrown when the server cannot parse the given parameters. diff --git a/tck/src/main/java/com/hedera/hashgraph/tck/exception/InvalidJSONRPC2RequestException.java b/tck/src/main/java/org/hiero/tck/exception/InvalidJSONRPC2RequestException.java similarity index 85% rename from tck/src/main/java/com/hedera/hashgraph/tck/exception/InvalidJSONRPC2RequestException.java rename to tck/src/main/java/org/hiero/tck/exception/InvalidJSONRPC2RequestException.java index 30c73ba2e5..46ad8d6a3d 100644 --- a/tck/src/main/java/com/hedera/hashgraph/tck/exception/InvalidJSONRPC2RequestException.java +++ b/tck/src/main/java/org/hiero/tck/exception/InvalidJSONRPC2RequestException.java @@ -1,5 +1,5 @@ // SPDX-License-Identifier: Apache-2.0 -package com.hedera.hashgraph.tck.exception; +package org.hiero.tck.exception; /** * Thrown when the server cannot process the request diff --git a/tck/src/main/java/com/hedera/hashgraph/tck/methods/AbstractJSONRPC2Service.java b/tck/src/main/java/org/hiero/tck/methods/AbstractJSONRPC2Service.java similarity index 92% rename from tck/src/main/java/com/hedera/hashgraph/tck/methods/AbstractJSONRPC2Service.java rename to tck/src/main/java/org/hiero/tck/methods/AbstractJSONRPC2Service.java index e6e71aec71..0228edfb03 100644 --- a/tck/src/main/java/com/hedera/hashgraph/tck/methods/AbstractJSONRPC2Service.java +++ b/tck/src/main/java/org/hiero/tck/methods/AbstractJSONRPC2Service.java @@ -1,12 +1,12 @@ // SPDX-License-Identifier: Apache-2.0 -package com.hedera.hashgraph.tck.methods; +package org.hiero.tck.methods; import com.hedera.hashgraph.sdk.PrecheckStatusException; import com.hedera.hashgraph.sdk.ReceiptStatusException; -import com.hedera.hashgraph.tck.annotation.JSONRPC2Method; -import com.hedera.hashgraph.tck.exception.InvalidJSONRPC2ParamsException; -import com.hedera.hashgraph.tck.exception.InvalidJSONRPC2RequestException; -import com.hedera.hashgraph.tck.methods.JSONRPC2Error.ErrorData; +import org.hiero.tck.annotation.JSONRPC2Method; +import org.hiero.tck.exception.InvalidJSONRPC2ParamsException; +import org.hiero.tck.exception.InvalidJSONRPC2RequestException; +import org.hiero.tck.methods.JSONRPC2Error.ErrorData; import com.thetransactioncompany.jsonrpc2.JSONRPC2Error; import com.thetransactioncompany.jsonrpc2.JSONRPC2Request; import com.thetransactioncompany.jsonrpc2.JSONRPC2Response; @@ -98,7 +98,7 @@ public JSONRPC2Response process(final JSONRPC2Request req, final MessageContext errorJsonObject.put("status", errorData.status().toString()); errorJsonObject.put("message", errorData.message()); - var hederaError = com.hedera.hashgraph.tck.methods.JSONRPC2Error.HEDERA_ERROR.setData(errorJsonObject); + var hederaError = org.hiero.tck.methods.JSONRPC2Error.HEDERA_ERROR.setData(errorJsonObject); return new JSONRPC2Response(hederaError, req.getID()); } catch (Exception e) { // other exceptions diff --git a/tck/src/main/java/com/hedera/hashgraph/tck/methods/JSONRPC2Error.java b/tck/src/main/java/org/hiero/tck/methods/JSONRPC2Error.java similarity index 92% rename from tck/src/main/java/com/hedera/hashgraph/tck/methods/JSONRPC2Error.java rename to tck/src/main/java/org/hiero/tck/methods/JSONRPC2Error.java index dd43acdf63..b8b21ea7fe 100644 --- a/tck/src/main/java/com/hedera/hashgraph/tck/methods/JSONRPC2Error.java +++ b/tck/src/main/java/org/hiero/tck/methods/JSONRPC2Error.java @@ -1,5 +1,5 @@ // SPDX-License-Identifier: Apache-2.0 -package com.hedera.hashgraph.tck.methods; +package org.hiero.tck.methods; import com.hedera.hashgraph.sdk.Status; diff --git a/tck/src/main/java/com/hedera/hashgraph/tck/methods/JSONRPC2Param.java b/tck/src/main/java/org/hiero/tck/methods/JSONRPC2Param.java similarity index 94% rename from tck/src/main/java/com/hedera/hashgraph/tck/methods/JSONRPC2Param.java rename to tck/src/main/java/org/hiero/tck/methods/JSONRPC2Param.java index c4dbbdb42a..8738002ea2 100644 --- a/tck/src/main/java/com/hedera/hashgraph/tck/methods/JSONRPC2Param.java +++ b/tck/src/main/java/org/hiero/tck/methods/JSONRPC2Param.java @@ -1,5 +1,5 @@ // SPDX-License-Identifier: Apache-2.0 -package com.hedera.hashgraph.tck.methods; +package org.hiero.tck.methods; import java.util.Map; diff --git a/tck/src/main/java/com/hedera/hashgraph/tck/methods/sdk/AccountService.java b/tck/src/main/java/org/hiero/tck/methods/sdk/AccountService.java similarity index 91% rename from tck/src/main/java/com/hedera/hashgraph/tck/methods/sdk/AccountService.java rename to tck/src/main/java/org/hiero/tck/methods/sdk/AccountService.java index 861e4b9297..0c2e9cdf35 100644 --- a/tck/src/main/java/com/hedera/hashgraph/tck/methods/sdk/AccountService.java +++ b/tck/src/main/java/org/hiero/tck/methods/sdk/AccountService.java @@ -1,5 +1,5 @@ // SPDX-License-Identifier: Apache-2.0 -package com.hedera.hashgraph.tck.methods.sdk; +package org.hiero.tck.methods.sdk; import com.google.protobuf.InvalidProtocolBufferException; import com.hedera.hashgraph.sdk.AccountCreateTransaction; @@ -10,14 +10,14 @@ import com.hedera.hashgraph.sdk.HbarUnit; import com.hedera.hashgraph.sdk.Status; import com.hedera.hashgraph.sdk.TransactionReceipt; -import com.hedera.hashgraph.tck.annotation.JSONRPC2Method; -import com.hedera.hashgraph.tck.annotation.JSONRPC2Service; -import com.hedera.hashgraph.tck.methods.AbstractJSONRPC2Service; -import com.hedera.hashgraph.tck.methods.sdk.param.account.AccountCreateParams; -import com.hedera.hashgraph.tck.methods.sdk.param.account.AccountDeleteParams; -import com.hedera.hashgraph.tck.methods.sdk.param.account.AccountUpdateParams; -import com.hedera.hashgraph.tck.methods.sdk.response.AccountResponse; -import com.hedera.hashgraph.tck.util.KeyUtils; +import org.hiero.tck.annotation.JSONRPC2Method; +import org.hiero.tck.annotation.JSONRPC2Service; +import org.hiero.tck.methods.AbstractJSONRPC2Service; +import org.hiero.tck.methods.sdk.param.account.AccountCreateParams; +import org.hiero.tck.methods.sdk.param.account.AccountDeleteParams; +import org.hiero.tck.methods.sdk.param.account.AccountUpdateParams; +import org.hiero.tck.methods.sdk.response.AccountResponse; +import org.hiero.tck.util.KeyUtils; import java.time.Duration; import java.time.Instant; diff --git a/tck/src/main/java/com/hedera/hashgraph/tck/methods/sdk/KeyService.java b/tck/src/main/java/org/hiero/tck/methods/sdk/KeyService.java similarity index 91% rename from tck/src/main/java/com/hedera/hashgraph/tck/methods/sdk/KeyService.java rename to tck/src/main/java/org/hiero/tck/methods/sdk/KeyService.java index 0d6f49e185..e37ec7e912 100644 --- a/tck/src/main/java/com/hedera/hashgraph/tck/methods/sdk/KeyService.java +++ b/tck/src/main/java/org/hiero/tck/methods/sdk/KeyService.java @@ -1,19 +1,19 @@ // SPDX-License-Identifier: Apache-2.0 -package com.hedera.hashgraph.tck.methods.sdk; +package org.hiero.tck.methods.sdk; import com.google.protobuf.InvalidProtocolBufferException; import com.hedera.hashgraph.sdk.Key; import com.hedera.hashgraph.sdk.KeyList; import com.hedera.hashgraph.sdk.PrivateKey; import com.hedera.hashgraph.sdk.PublicKey; -import com.hedera.hashgraph.tck.annotation.JSONRPC2Method; -import com.hedera.hashgraph.tck.annotation.JSONRPC2Service; -import com.hedera.hashgraph.tck.exception.InvalidJSONRPC2RequestException; -import com.hedera.hashgraph.tck.methods.AbstractJSONRPC2Service; -import com.hedera.hashgraph.tck.methods.sdk.param.GenerateKeyParams; -import com.hedera.hashgraph.tck.methods.sdk.response.GenerateKeyResponse; -import com.hedera.hashgraph.tck.util.KeyUtils; -import com.hedera.hashgraph.tck.util.KeyUtils.KeyType; +import org.hiero.tck.annotation.JSONRPC2Method; +import org.hiero.tck.annotation.JSONRPC2Service; +import org.hiero.tck.exception.InvalidJSONRPC2RequestException; +import org.hiero.tck.methods.AbstractJSONRPC2Service; +import org.hiero.tck.methods.sdk.param.GenerateKeyParams; +import org.hiero.tck.methods.sdk.response.GenerateKeyResponse; +import org.hiero.tck.util.KeyUtils; +import org.hiero.tck.util.KeyUtils.KeyType; import org.bouncycastle.util.encoders.Hex; @JSONRPC2Service diff --git a/tck/src/main/java/com/hedera/hashgraph/tck/methods/sdk/SdkService.java b/tck/src/main/java/org/hiero/tck/methods/sdk/SdkService.java similarity index 84% rename from tck/src/main/java/com/hedera/hashgraph/tck/methods/sdk/SdkService.java rename to tck/src/main/java/org/hiero/tck/methods/sdk/SdkService.java index 3986c3b101..c900a4572d 100644 --- a/tck/src/main/java/com/hedera/hashgraph/tck/methods/sdk/SdkService.java +++ b/tck/src/main/java/org/hiero/tck/methods/sdk/SdkService.java @@ -1,14 +1,14 @@ // SPDX-License-Identifier: Apache-2.0 -package com.hedera.hashgraph.tck.methods.sdk; +package org.hiero.tck.methods.sdk; import com.hedera.hashgraph.sdk.AccountId; import com.hedera.hashgraph.sdk.Client; import com.hedera.hashgraph.sdk.PrivateKey; -import com.hedera.hashgraph.tck.annotation.JSONRPC2Method; -import com.hedera.hashgraph.tck.annotation.JSONRPC2Service; -import com.hedera.hashgraph.tck.methods.AbstractJSONRPC2Service; -import com.hedera.hashgraph.tck.methods.sdk.param.SetupParams; -import com.hedera.hashgraph.tck.methods.sdk.response.SetupResponse; +import org.hiero.tck.annotation.JSONRPC2Method; +import org.hiero.tck.annotation.JSONRPC2Service; +import org.hiero.tck.methods.AbstractJSONRPC2Service; +import org.hiero.tck.methods.sdk.param.SetupParams; +import org.hiero.tck.methods.sdk.response.SetupResponse; import java.util.HashMap; import java.util.List; import java.util.Map; diff --git a/tck/src/main/java/com/hedera/hashgraph/tck/methods/sdk/TokenService.java b/tck/src/main/java/org/hiero/tck/methods/sdk/TokenService.java similarity index 98% rename from tck/src/main/java/com/hedera/hashgraph/tck/methods/sdk/TokenService.java rename to tck/src/main/java/org/hiero/tck/methods/sdk/TokenService.java index af35d75ed4..24b481e102 100644 --- a/tck/src/main/java/com/hedera/hashgraph/tck/methods/sdk/TokenService.java +++ b/tck/src/main/java/org/hiero/tck/methods/sdk/TokenService.java @@ -1,14 +1,14 @@ // SPDX-License-Identifier: Apache-2.0 -package com.hedera.hashgraph.tck.methods.sdk; +package org.hiero.tck.methods.sdk; import com.google.protobuf.InvalidProtocolBufferException; import com.hedera.hashgraph.sdk.*; -import com.hedera.hashgraph.tck.annotation.JSONRPC2Method; -import com.hedera.hashgraph.tck.annotation.JSONRPC2Service; -import com.hedera.hashgraph.tck.methods.AbstractJSONRPC2Service; -import com.hedera.hashgraph.tck.methods.sdk.param.token.*; -import com.hedera.hashgraph.tck.methods.sdk.response.token.*; -import com.hedera.hashgraph.tck.util.KeyUtils; +import org.hiero.tck.annotation.JSONRPC2Method; +import org.hiero.tck.annotation.JSONRPC2Service; +import org.hiero.tck.methods.AbstractJSONRPC2Service; +import org.hiero.tck.methods.sdk.param.token.*; +import org.hiero.tck.methods.sdk.response.token.*; +import org.hiero.tck.util.KeyUtils; import java.time.Duration; import java.util.List; import java.util.stream.Collectors; diff --git a/tck/src/main/java/com/hedera/hashgraph/tck/methods/sdk/param/CommonTransactionParams.java b/tck/src/main/java/org/hiero/tck/methods/sdk/param/CommonTransactionParams.java similarity index 98% rename from tck/src/main/java/com/hedera/hashgraph/tck/methods/sdk/param/CommonTransactionParams.java rename to tck/src/main/java/org/hiero/tck/methods/sdk/param/CommonTransactionParams.java index 32b1d5b28e..f10f021016 100644 --- a/tck/src/main/java/com/hedera/hashgraph/tck/methods/sdk/param/CommonTransactionParams.java +++ b/tck/src/main/java/org/hiero/tck/methods/sdk/param/CommonTransactionParams.java @@ -1,5 +1,5 @@ // SPDX-License-Identifier: Apache-2.0 -package com.hedera.hashgraph.tck.methods.sdk.param; +package org.hiero.tck.methods.sdk.param; import com.hedera.hashgraph.sdk.Client; import com.hedera.hashgraph.sdk.Hbar; diff --git a/tck/src/main/java/com/hedera/hashgraph/tck/methods/sdk/param/CustomFee.java b/tck/src/main/java/org/hiero/tck/methods/sdk/param/CustomFee.java similarity index 98% rename from tck/src/main/java/com/hedera/hashgraph/tck/methods/sdk/param/CustomFee.java rename to tck/src/main/java/org/hiero/tck/methods/sdk/param/CustomFee.java index 8b1c8526d3..bdd4700722 100644 --- a/tck/src/main/java/com/hedera/hashgraph/tck/methods/sdk/param/CustomFee.java +++ b/tck/src/main/java/org/hiero/tck/methods/sdk/param/CustomFee.java @@ -1,8 +1,8 @@ // SPDX-License-Identifier: Apache-2.0 -package com.hedera.hashgraph.tck.methods.sdk.param; +package org.hiero.tck.methods.sdk.param; import com.hedera.hashgraph.sdk.*; -import com.hedera.hashgraph.tck.methods.JSONRPC2Param; +import org.hiero.tck.methods.JSONRPC2Param; import java.util.ArrayList; import java.util.List; import java.util.Map; diff --git a/tck/src/main/java/com/hedera/hashgraph/tck/methods/sdk/param/GenerateKeyParams.java b/tck/src/main/java/org/hiero/tck/methods/sdk/param/GenerateKeyParams.java similarity index 90% rename from tck/src/main/java/com/hedera/hashgraph/tck/methods/sdk/param/GenerateKeyParams.java rename to tck/src/main/java/org/hiero/tck/methods/sdk/param/GenerateKeyParams.java index 9050541071..237921e31f 100644 --- a/tck/src/main/java/com/hedera/hashgraph/tck/methods/sdk/param/GenerateKeyParams.java +++ b/tck/src/main/java/org/hiero/tck/methods/sdk/param/GenerateKeyParams.java @@ -1,8 +1,8 @@ // SPDX-License-Identifier: Apache-2.0 -package com.hedera.hashgraph.tck.methods.sdk.param; +package org.hiero.tck.methods.sdk.param; -import com.hedera.hashgraph.tck.methods.JSONRPC2Param; -import com.hedera.hashgraph.tck.util.KeyUtils.KeyType; +import org.hiero.tck.methods.JSONRPC2Param; +import org.hiero.tck.util.KeyUtils.KeyType; import java.util.ArrayList; import java.util.List; import java.util.Map; diff --git a/tck/src/main/java/com/hedera/hashgraph/tck/methods/sdk/param/SetupParams.java b/tck/src/main/java/org/hiero/tck/methods/sdk/param/SetupParams.java similarity index 92% rename from tck/src/main/java/com/hedera/hashgraph/tck/methods/sdk/param/SetupParams.java rename to tck/src/main/java/org/hiero/tck/methods/sdk/param/SetupParams.java index 41aa659dd9..4f3e5eb04e 100644 --- a/tck/src/main/java/com/hedera/hashgraph/tck/methods/sdk/param/SetupParams.java +++ b/tck/src/main/java/org/hiero/tck/methods/sdk/param/SetupParams.java @@ -1,7 +1,7 @@ // SPDX-License-Identifier: Apache-2.0 -package com.hedera.hashgraph.tck.methods.sdk.param; +package org.hiero.tck.methods.sdk.param; -import com.hedera.hashgraph.tck.methods.JSONRPC2Param; +import org.hiero.tck.methods.JSONRPC2Param; import java.util.Map; import java.util.Optional; import lombok.AllArgsConstructor; diff --git a/tck/src/main/java/com/hedera/hashgraph/tck/methods/sdk/param/account/AccountCreateParams.java b/tck/src/main/java/org/hiero/tck/methods/sdk/param/account/AccountCreateParams.java similarity index 91% rename from tck/src/main/java/com/hedera/hashgraph/tck/methods/sdk/param/account/AccountCreateParams.java rename to tck/src/main/java/org/hiero/tck/methods/sdk/param/account/AccountCreateParams.java index e57e45ea8d..3fcec0f8b8 100644 --- a/tck/src/main/java/com/hedera/hashgraph/tck/methods/sdk/param/account/AccountCreateParams.java +++ b/tck/src/main/java/org/hiero/tck/methods/sdk/param/account/AccountCreateParams.java @@ -1,9 +1,9 @@ // SPDX-License-Identifier: Apache-2.0 -package com.hedera.hashgraph.tck.methods.sdk.param.account; +package org.hiero.tck.methods.sdk.param.account; -import com.hedera.hashgraph.tck.methods.JSONRPC2Param; -import com.hedera.hashgraph.tck.methods.sdk.param.CommonTransactionParams; -import com.hedera.hashgraph.tck.util.JSONRPCParamParser; +import org.hiero.tck.methods.JSONRPC2Param; +import org.hiero.tck.methods.sdk.param.CommonTransactionParams; +import org.hiero.tck.util.JSONRPCParamParser; import java.util.Map; import java.util.Optional; import lombok.AllArgsConstructor; diff --git a/tck/src/main/java/com/hedera/hashgraph/tck/methods/sdk/param/account/AccountDeleteParams.java b/tck/src/main/java/org/hiero/tck/methods/sdk/param/account/AccountDeleteParams.java similarity index 81% rename from tck/src/main/java/com/hedera/hashgraph/tck/methods/sdk/param/account/AccountDeleteParams.java rename to tck/src/main/java/org/hiero/tck/methods/sdk/param/account/AccountDeleteParams.java index f74adfebfa..0b3c62f901 100644 --- a/tck/src/main/java/com/hedera/hashgraph/tck/methods/sdk/param/account/AccountDeleteParams.java +++ b/tck/src/main/java/org/hiero/tck/methods/sdk/param/account/AccountDeleteParams.java @@ -1,9 +1,9 @@ // SPDX-License-Identifier: Apache-2.0 -package com.hedera.hashgraph.tck.methods.sdk.param.account; +package org.hiero.tck.methods.sdk.param.account; -import com.hedera.hashgraph.tck.methods.JSONRPC2Param; -import com.hedera.hashgraph.tck.methods.sdk.param.CommonTransactionParams; -import com.hedera.hashgraph.tck.util.JSONRPCParamParser; +import org.hiero.tck.methods.JSONRPC2Param; +import org.hiero.tck.methods.sdk.param.CommonTransactionParams; +import org.hiero.tck.util.JSONRPCParamParser; import java.util.Map; import java.util.Optional; import lombok.AllArgsConstructor; diff --git a/tck/src/main/java/com/hedera/hashgraph/tck/methods/sdk/param/account/AccountUpdateParams.java b/tck/src/main/java/org/hiero/tck/methods/sdk/param/account/AccountUpdateParams.java similarity index 91% rename from tck/src/main/java/com/hedera/hashgraph/tck/methods/sdk/param/account/AccountUpdateParams.java rename to tck/src/main/java/org/hiero/tck/methods/sdk/param/account/AccountUpdateParams.java index c0409d2d58..ad22ff264d 100644 --- a/tck/src/main/java/com/hedera/hashgraph/tck/methods/sdk/param/account/AccountUpdateParams.java +++ b/tck/src/main/java/org/hiero/tck/methods/sdk/param/account/AccountUpdateParams.java @@ -1,9 +1,9 @@ // SPDX-License-Identifier: Apache-2.0 -package com.hedera.hashgraph.tck.methods.sdk.param.account; +package org.hiero.tck.methods.sdk.param.account; -import com.hedera.hashgraph.tck.methods.JSONRPC2Param; -import com.hedera.hashgraph.tck.methods.sdk.param.CommonTransactionParams; -import com.hedera.hashgraph.tck.util.JSONRPCParamParser; +import org.hiero.tck.methods.JSONRPC2Param; +import org.hiero.tck.methods.sdk.param.CommonTransactionParams; +import org.hiero.tck.util.JSONRPCParamParser; import java.util.Map; import java.util.Optional; import lombok.AllArgsConstructor; diff --git a/tck/src/main/java/com/hedera/hashgraph/tck/methods/sdk/param/token/AssociateDisassociateTokenParams.java b/tck/src/main/java/org/hiero/tck/methods/sdk/param/token/AssociateDisassociateTokenParams.java similarity index 80% rename from tck/src/main/java/com/hedera/hashgraph/tck/methods/sdk/param/token/AssociateDisassociateTokenParams.java rename to tck/src/main/java/org/hiero/tck/methods/sdk/param/token/AssociateDisassociateTokenParams.java index 16eeaea839..663cd69711 100644 --- a/tck/src/main/java/com/hedera/hashgraph/tck/methods/sdk/param/token/AssociateDisassociateTokenParams.java +++ b/tck/src/main/java/org/hiero/tck/methods/sdk/param/token/AssociateDisassociateTokenParams.java @@ -1,9 +1,9 @@ // SPDX-License-Identifier: Apache-2.0 -package com.hedera.hashgraph.tck.methods.sdk.param.token; +package org.hiero.tck.methods.sdk.param.token; -import com.hedera.hashgraph.tck.methods.JSONRPC2Param; -import com.hedera.hashgraph.tck.methods.sdk.param.CommonTransactionParams; -import com.hedera.hashgraph.tck.util.JSONRPCParamParser; +import org.hiero.tck.methods.JSONRPC2Param; +import org.hiero.tck.methods.sdk.param.CommonTransactionParams; +import org.hiero.tck.util.JSONRPCParamParser; import java.util.List; import java.util.Map; import java.util.Optional; diff --git a/tck/src/main/java/com/hedera/hashgraph/tck/methods/sdk/param/token/BurnTokenParams.java b/tck/src/main/java/org/hiero/tck/methods/sdk/param/token/BurnTokenParams.java similarity index 83% rename from tck/src/main/java/com/hedera/hashgraph/tck/methods/sdk/param/token/BurnTokenParams.java rename to tck/src/main/java/org/hiero/tck/methods/sdk/param/token/BurnTokenParams.java index 2cbd838735..60a8f82945 100644 --- a/tck/src/main/java/com/hedera/hashgraph/tck/methods/sdk/param/token/BurnTokenParams.java +++ b/tck/src/main/java/org/hiero/tck/methods/sdk/param/token/BurnTokenParams.java @@ -1,9 +1,9 @@ // SPDX-License-Identifier: Apache-2.0 -package com.hedera.hashgraph.tck.methods.sdk.param.token; +package org.hiero.tck.methods.sdk.param.token; -import com.hedera.hashgraph.tck.methods.JSONRPC2Param; -import com.hedera.hashgraph.tck.methods.sdk.param.CommonTransactionParams; -import com.hedera.hashgraph.tck.util.JSONRPCParamParser; +import org.hiero.tck.methods.JSONRPC2Param; +import org.hiero.tck.methods.sdk.param.CommonTransactionParams; +import org.hiero.tck.util.JSONRPCParamParser; import java.util.List; import java.util.Map; import java.util.Optional; diff --git a/tck/src/main/java/com/hedera/hashgraph/tck/methods/sdk/param/token/FreezeUnfreezeTokenParams.java b/tck/src/main/java/org/hiero/tck/methods/sdk/param/token/FreezeUnfreezeTokenParams.java similarity index 79% rename from tck/src/main/java/com/hedera/hashgraph/tck/methods/sdk/param/token/FreezeUnfreezeTokenParams.java rename to tck/src/main/java/org/hiero/tck/methods/sdk/param/token/FreezeUnfreezeTokenParams.java index 77c3bd32ce..e7a6e59e4a 100644 --- a/tck/src/main/java/com/hedera/hashgraph/tck/methods/sdk/param/token/FreezeUnfreezeTokenParams.java +++ b/tck/src/main/java/org/hiero/tck/methods/sdk/param/token/FreezeUnfreezeTokenParams.java @@ -1,9 +1,9 @@ // SPDX-License-Identifier: Apache-2.0 -package com.hedera.hashgraph.tck.methods.sdk.param.token; +package org.hiero.tck.methods.sdk.param.token; -import com.hedera.hashgraph.tck.methods.JSONRPC2Param; -import com.hedera.hashgraph.tck.methods.sdk.param.CommonTransactionParams; -import com.hedera.hashgraph.tck.util.JSONRPCParamParser; +import org.hiero.tck.methods.JSONRPC2Param; +import org.hiero.tck.methods.sdk.param.CommonTransactionParams; +import org.hiero.tck.util.JSONRPCParamParser; import java.util.Map; import java.util.Optional; import lombok.AllArgsConstructor; diff --git a/tck/src/main/java/com/hedera/hashgraph/tck/methods/sdk/param/token/GrantRevokeTokenKycParams.java b/tck/src/main/java/org/hiero/tck/methods/sdk/param/token/GrantRevokeTokenKycParams.java similarity index 79% rename from tck/src/main/java/com/hedera/hashgraph/tck/methods/sdk/param/token/GrantRevokeTokenKycParams.java rename to tck/src/main/java/org/hiero/tck/methods/sdk/param/token/GrantRevokeTokenKycParams.java index 004668e343..e366d75b8a 100644 --- a/tck/src/main/java/com/hedera/hashgraph/tck/methods/sdk/param/token/GrantRevokeTokenKycParams.java +++ b/tck/src/main/java/org/hiero/tck/methods/sdk/param/token/GrantRevokeTokenKycParams.java @@ -1,9 +1,9 @@ // SPDX-License-Identifier: Apache-2.0 -package com.hedera.hashgraph.tck.methods.sdk.param.token; +package org.hiero.tck.methods.sdk.param.token; -import com.hedera.hashgraph.tck.methods.JSONRPC2Param; -import com.hedera.hashgraph.tck.methods.sdk.param.CommonTransactionParams; -import com.hedera.hashgraph.tck.util.JSONRPCParamParser; +import org.hiero.tck.methods.JSONRPC2Param; +import org.hiero.tck.methods.sdk.param.CommonTransactionParams; +import org.hiero.tck.util.JSONRPCParamParser; import java.util.Map; import java.util.Optional; import lombok.AllArgsConstructor; diff --git a/tck/src/main/java/com/hedera/hashgraph/tck/methods/sdk/param/token/MintTokenParams.java b/tck/src/main/java/org/hiero/tck/methods/sdk/param/token/MintTokenParams.java similarity index 81% rename from tck/src/main/java/com/hedera/hashgraph/tck/methods/sdk/param/token/MintTokenParams.java rename to tck/src/main/java/org/hiero/tck/methods/sdk/param/token/MintTokenParams.java index dc840ef652..e090c0e0b5 100644 --- a/tck/src/main/java/com/hedera/hashgraph/tck/methods/sdk/param/token/MintTokenParams.java +++ b/tck/src/main/java/org/hiero/tck/methods/sdk/param/token/MintTokenParams.java @@ -1,9 +1,9 @@ // SPDX-License-Identifier: Apache-2.0 -package com.hedera.hashgraph.tck.methods.sdk.param.token; +package org.hiero.tck.methods.sdk.param.token; -import com.hedera.hashgraph.tck.methods.JSONRPC2Param; -import com.hedera.hashgraph.tck.methods.sdk.param.CommonTransactionParams; -import com.hedera.hashgraph.tck.util.JSONRPCParamParser; +import org.hiero.tck.methods.JSONRPC2Param; +import org.hiero.tck.methods.sdk.param.CommonTransactionParams; +import org.hiero.tck.util.JSONRPCParamParser; import java.util.List; import java.util.Map; import java.util.Optional; diff --git a/tck/src/main/java/com/hedera/hashgraph/tck/methods/sdk/param/token/PauseUnpauseTokenParams.java b/tck/src/main/java/org/hiero/tck/methods/sdk/param/token/PauseUnpauseTokenParams.java similarity index 76% rename from tck/src/main/java/com/hedera/hashgraph/tck/methods/sdk/param/token/PauseUnpauseTokenParams.java rename to tck/src/main/java/org/hiero/tck/methods/sdk/param/token/PauseUnpauseTokenParams.java index b158f190d4..26a0098c1f 100644 --- a/tck/src/main/java/com/hedera/hashgraph/tck/methods/sdk/param/token/PauseUnpauseTokenParams.java +++ b/tck/src/main/java/org/hiero/tck/methods/sdk/param/token/PauseUnpauseTokenParams.java @@ -1,9 +1,9 @@ // SPDX-License-Identifier: Apache-2.0 -package com.hedera.hashgraph.tck.methods.sdk.param.token; +package org.hiero.tck.methods.sdk.param.token; -import com.hedera.hashgraph.tck.methods.JSONRPC2Param; -import com.hedera.hashgraph.tck.methods.sdk.param.CommonTransactionParams; -import com.hedera.hashgraph.tck.util.JSONRPCParamParser; +import org.hiero.tck.methods.JSONRPC2Param; +import org.hiero.tck.methods.sdk.param.CommonTransactionParams; +import org.hiero.tck.util.JSONRPCParamParser; import java.util.Map; import java.util.Optional; import lombok.AllArgsConstructor; diff --git a/tck/src/main/java/com/hedera/hashgraph/tck/methods/sdk/param/token/TokenCreateParams.java b/tck/src/main/java/org/hiero/tck/methods/sdk/param/token/TokenCreateParams.java similarity index 93% rename from tck/src/main/java/com/hedera/hashgraph/tck/methods/sdk/param/token/TokenCreateParams.java rename to tck/src/main/java/org/hiero/tck/methods/sdk/param/token/TokenCreateParams.java index 049091a66d..17a427cb48 100644 --- a/tck/src/main/java/com/hedera/hashgraph/tck/methods/sdk/param/token/TokenCreateParams.java +++ b/tck/src/main/java/org/hiero/tck/methods/sdk/param/token/TokenCreateParams.java @@ -1,10 +1,10 @@ // SPDX-License-Identifier: Apache-2.0 -package com.hedera.hashgraph.tck.methods.sdk.param.token; +package org.hiero.tck.methods.sdk.param.token; -import com.hedera.hashgraph.tck.methods.JSONRPC2Param; -import com.hedera.hashgraph.tck.methods.sdk.param.CommonTransactionParams; -import com.hedera.hashgraph.tck.methods.sdk.param.CustomFee; -import com.hedera.hashgraph.tck.util.JSONRPCParamParser; +import org.hiero.tck.methods.JSONRPC2Param; +import org.hiero.tck.methods.sdk.param.CommonTransactionParams; +import org.hiero.tck.methods.sdk.param.CustomFee; +import org.hiero.tck.util.JSONRPCParamParser; import java.util.List; import java.util.Map; import java.util.Optional; diff --git a/tck/src/main/java/com/hedera/hashgraph/tck/methods/sdk/param/token/TokenDeleteParams.java b/tck/src/main/java/org/hiero/tck/methods/sdk/param/token/TokenDeleteParams.java similarity index 77% rename from tck/src/main/java/com/hedera/hashgraph/tck/methods/sdk/param/token/TokenDeleteParams.java rename to tck/src/main/java/org/hiero/tck/methods/sdk/param/token/TokenDeleteParams.java index e72180bad8..129f186db1 100644 --- a/tck/src/main/java/com/hedera/hashgraph/tck/methods/sdk/param/token/TokenDeleteParams.java +++ b/tck/src/main/java/org/hiero/tck/methods/sdk/param/token/TokenDeleteParams.java @@ -1,9 +1,9 @@ // SPDX-License-Identifier: Apache-2.0 -package com.hedera.hashgraph.tck.methods.sdk.param.token; +package org.hiero.tck.methods.sdk.param.token; -import com.hedera.hashgraph.tck.methods.JSONRPC2Param; -import com.hedera.hashgraph.tck.methods.sdk.param.CommonTransactionParams; -import com.hedera.hashgraph.tck.util.JSONRPCParamParser; +import org.hiero.tck.methods.JSONRPC2Param; +import org.hiero.tck.methods.sdk.param.CommonTransactionParams; +import org.hiero.tck.util.JSONRPCParamParser; import java.util.Map; import java.util.Optional; import lombok.AllArgsConstructor; diff --git a/tck/src/main/java/com/hedera/hashgraph/tck/methods/sdk/param/token/TokenUpdateFeeScheduleParams.java b/tck/src/main/java/org/hiero/tck/methods/sdk/param/token/TokenUpdateFeeScheduleParams.java similarity index 75% rename from tck/src/main/java/com/hedera/hashgraph/tck/methods/sdk/param/token/TokenUpdateFeeScheduleParams.java rename to tck/src/main/java/org/hiero/tck/methods/sdk/param/token/TokenUpdateFeeScheduleParams.java index e7e83af9c5..77c27459db 100644 --- a/tck/src/main/java/com/hedera/hashgraph/tck/methods/sdk/param/token/TokenUpdateFeeScheduleParams.java +++ b/tck/src/main/java/org/hiero/tck/methods/sdk/param/token/TokenUpdateFeeScheduleParams.java @@ -1,10 +1,10 @@ // SPDX-License-Identifier: Apache-2.0 -package com.hedera.hashgraph.tck.methods.sdk.param.token; +package org.hiero.tck.methods.sdk.param.token; -import com.hedera.hashgraph.tck.methods.JSONRPC2Param; -import com.hedera.hashgraph.tck.methods.sdk.param.CommonTransactionParams; -import com.hedera.hashgraph.tck.methods.sdk.param.CustomFee; -import com.hedera.hashgraph.tck.util.JSONRPCParamParser; +import org.hiero.tck.methods.JSONRPC2Param; +import org.hiero.tck.methods.sdk.param.CommonTransactionParams; +import org.hiero.tck.methods.sdk.param.CustomFee; +import org.hiero.tck.util.JSONRPCParamParser; import java.util.List; import java.util.Map; import java.util.Optional; diff --git a/tck/src/main/java/com/hedera/hashgraph/tck/methods/sdk/param/token/TokenUpdateParams.java b/tck/src/main/java/org/hiero/tck/methods/sdk/param/token/TokenUpdateParams.java similarity index 93% rename from tck/src/main/java/com/hedera/hashgraph/tck/methods/sdk/param/token/TokenUpdateParams.java rename to tck/src/main/java/org/hiero/tck/methods/sdk/param/token/TokenUpdateParams.java index d6d5a81aab..521d0a8791 100644 --- a/tck/src/main/java/com/hedera/hashgraph/tck/methods/sdk/param/token/TokenUpdateParams.java +++ b/tck/src/main/java/org/hiero/tck/methods/sdk/param/token/TokenUpdateParams.java @@ -1,9 +1,9 @@ // SPDX-License-Identifier: Apache-2.0 -package com.hedera.hashgraph.tck.methods.sdk.param.token; +package org.hiero.tck.methods.sdk.param.token; -import com.hedera.hashgraph.tck.methods.JSONRPC2Param; -import com.hedera.hashgraph.tck.methods.sdk.param.CommonTransactionParams; -import com.hedera.hashgraph.tck.util.JSONRPCParamParser; +import org.hiero.tck.methods.JSONRPC2Param; +import org.hiero.tck.methods.sdk.param.CommonTransactionParams; +import org.hiero.tck.util.JSONRPCParamParser; import java.util.Map; import java.util.Optional; import lombok.AllArgsConstructor; diff --git a/tck/src/main/java/com/hedera/hashgraph/tck/methods/sdk/response/AccountResponse.java b/tck/src/main/java/org/hiero/tck/methods/sdk/response/AccountResponse.java similarity index 79% rename from tck/src/main/java/com/hedera/hashgraph/tck/methods/sdk/response/AccountResponse.java rename to tck/src/main/java/org/hiero/tck/methods/sdk/response/AccountResponse.java index f918be4766..baeab3d7e4 100644 --- a/tck/src/main/java/com/hedera/hashgraph/tck/methods/sdk/response/AccountResponse.java +++ b/tck/src/main/java/org/hiero/tck/methods/sdk/response/AccountResponse.java @@ -1,5 +1,5 @@ // SPDX-License-Identifier: Apache-2.0 -package com.hedera.hashgraph.tck.methods.sdk.response; +package org.hiero.tck.methods.sdk.response; import com.hedera.hashgraph.sdk.Status; import lombok.Data; diff --git a/tck/src/main/java/com/hedera/hashgraph/tck/methods/sdk/response/GenerateKeyResponse.java b/tck/src/main/java/org/hiero/tck/methods/sdk/response/GenerateKeyResponse.java similarity index 81% rename from tck/src/main/java/com/hedera/hashgraph/tck/methods/sdk/response/GenerateKeyResponse.java rename to tck/src/main/java/org/hiero/tck/methods/sdk/response/GenerateKeyResponse.java index 4423b7e069..9098104605 100644 --- a/tck/src/main/java/com/hedera/hashgraph/tck/methods/sdk/response/GenerateKeyResponse.java +++ b/tck/src/main/java/org/hiero/tck/methods/sdk/response/GenerateKeyResponse.java @@ -1,5 +1,5 @@ // SPDX-License-Identifier: Apache-2.0 -package com.hedera.hashgraph.tck.methods.sdk.response; +package org.hiero.tck.methods.sdk.response; import java.util.ArrayList; import java.util.List; diff --git a/tck/src/main/java/com/hedera/hashgraph/tck/methods/sdk/response/SetupResponse.java b/tck/src/main/java/org/hiero/tck/methods/sdk/response/SetupResponse.java similarity index 86% rename from tck/src/main/java/com/hedera/hashgraph/tck/methods/sdk/response/SetupResponse.java rename to tck/src/main/java/org/hiero/tck/methods/sdk/response/SetupResponse.java index cd84e5e470..d0988aebdf 100644 --- a/tck/src/main/java/com/hedera/hashgraph/tck/methods/sdk/response/SetupResponse.java +++ b/tck/src/main/java/org/hiero/tck/methods/sdk/response/SetupResponse.java @@ -1,5 +1,5 @@ // SPDX-License-Identifier: Apache-2.0 -package com.hedera.hashgraph.tck.methods.sdk.response; +package org.hiero.tck.methods.sdk.response; import lombok.Data; diff --git a/tck/src/main/java/com/hedera/hashgraph/tck/methods/sdk/response/token/TokenBurnResponse.java b/tck/src/main/java/org/hiero/tck/methods/sdk/response/token/TokenBurnResponse.java similarity index 87% rename from tck/src/main/java/com/hedera/hashgraph/tck/methods/sdk/response/token/TokenBurnResponse.java rename to tck/src/main/java/org/hiero/tck/methods/sdk/response/token/TokenBurnResponse.java index 2eaf3d6327..c1db873696 100644 --- a/tck/src/main/java/com/hedera/hashgraph/tck/methods/sdk/response/token/TokenBurnResponse.java +++ b/tck/src/main/java/org/hiero/tck/methods/sdk/response/token/TokenBurnResponse.java @@ -1,5 +1,5 @@ // SPDX-License-Identifier: Apache-2.0 -package com.hedera.hashgraph.tck.methods.sdk.response.token; +package org.hiero.tck.methods.sdk.response.token; import com.hedera.hashgraph.sdk.Status; diff --git a/tck/src/main/java/com/hedera/hashgraph/tck/methods/sdk/response/token/TokenMintResponse.java b/tck/src/main/java/org/hiero/tck/methods/sdk/response/token/TokenMintResponse.java similarity index 91% rename from tck/src/main/java/com/hedera/hashgraph/tck/methods/sdk/response/token/TokenMintResponse.java rename to tck/src/main/java/org/hiero/tck/methods/sdk/response/token/TokenMintResponse.java index d97cc1f322..7e972f93b8 100644 --- a/tck/src/main/java/com/hedera/hashgraph/tck/methods/sdk/response/token/TokenMintResponse.java +++ b/tck/src/main/java/org/hiero/tck/methods/sdk/response/token/TokenMintResponse.java @@ -1,5 +1,5 @@ // SPDX-License-Identifier: Apache-2.0 -package com.hedera.hashgraph.tck.methods.sdk.response.token; +package org.hiero.tck.methods.sdk.response.token; import com.hedera.hashgraph.sdk.Status; import java.util.List; diff --git a/tck/src/main/java/com/hedera/hashgraph/tck/methods/sdk/response/token/TokenResponse.java b/tck/src/main/java/org/hiero/tck/methods/sdk/response/token/TokenResponse.java similarity index 90% rename from tck/src/main/java/com/hedera/hashgraph/tck/methods/sdk/response/token/TokenResponse.java rename to tck/src/main/java/org/hiero/tck/methods/sdk/response/token/TokenResponse.java index c1373e60bc..b7264f8991 100644 --- a/tck/src/main/java/com/hedera/hashgraph/tck/methods/sdk/response/token/TokenResponse.java +++ b/tck/src/main/java/org/hiero/tck/methods/sdk/response/token/TokenResponse.java @@ -1,5 +1,5 @@ // SPDX-License-Identifier: Apache-2.0 -package com.hedera.hashgraph.tck.methods.sdk.response.token; +package org.hiero.tck.methods.sdk.response.token; import com.hedera.hashgraph.sdk.Status; diff --git a/tck/src/main/java/com/hedera/hashgraph/tck/util/JSONRPC2ServiceScanner.java b/tck/src/main/java/org/hiero/tck/util/JSONRPC2ServiceScanner.java similarity index 89% rename from tck/src/main/java/com/hedera/hashgraph/tck/util/JSONRPC2ServiceScanner.java rename to tck/src/main/java/org/hiero/tck/util/JSONRPC2ServiceScanner.java index 3771cb0563..38d624aa98 100644 --- a/tck/src/main/java/com/hedera/hashgraph/tck/util/JSONRPC2ServiceScanner.java +++ b/tck/src/main/java/org/hiero/tck/util/JSONRPC2ServiceScanner.java @@ -1,7 +1,7 @@ // SPDX-License-Identifier: Apache-2.0 -package com.hedera.hashgraph.tck.util; +package org.hiero.tck.util; -import com.hedera.hashgraph.tck.annotation.JSONRPC2Service; +import org.hiero.tck.annotation.JSONRPC2Service; import com.thetransactioncompany.jsonrpc2.server.*; import org.springframework.context.ApplicationContext; diff --git a/tck/src/main/java/com/hedera/hashgraph/tck/util/JSONRPCParamParser.java b/tck/src/main/java/org/hiero/tck/util/JSONRPCParamParser.java similarity index 91% rename from tck/src/main/java/com/hedera/hashgraph/tck/util/JSONRPCParamParser.java rename to tck/src/main/java/org/hiero/tck/util/JSONRPCParamParser.java index e17c693ae6..df66aa286b 100644 --- a/tck/src/main/java/com/hedera/hashgraph/tck/util/JSONRPCParamParser.java +++ b/tck/src/main/java/org/hiero/tck/util/JSONRPCParamParser.java @@ -1,8 +1,8 @@ // SPDX-License-Identifier: Apache-2.0 -package com.hedera.hashgraph.tck.util; +package org.hiero.tck.util; -import com.hedera.hashgraph.tck.methods.sdk.param.CommonTransactionParams; -import com.hedera.hashgraph.tck.methods.sdk.param.CustomFee; +import org.hiero.tck.methods.sdk.param.CommonTransactionParams; +import org.hiero.tck.methods.sdk.param.CustomFee; import java.util.ArrayList; import java.util.List; import java.util.Map; diff --git a/tck/src/main/java/com/hedera/hashgraph/tck/util/KeyUtils.java b/tck/src/main/java/org/hiero/tck/util/KeyUtils.java similarity index 97% rename from tck/src/main/java/com/hedera/hashgraph/tck/util/KeyUtils.java rename to tck/src/main/java/org/hiero/tck/util/KeyUtils.java index 192dd56f8c..4a572c05bb 100644 --- a/tck/src/main/java/com/hedera/hashgraph/tck/util/KeyUtils.java +++ b/tck/src/main/java/org/hiero/tck/util/KeyUtils.java @@ -1,5 +1,5 @@ // SPDX-License-Identifier: Apache-2.0 -package com.hedera.hashgraph.tck.util; +package org.hiero.tck.util; import com.google.protobuf.ByteString; import com.google.protobuf.InvalidProtocolBufferException; diff --git a/tck/src/test/java/com/hedera/hashgraph/tck/controller/JRPCControllerTest.java b/tck/src/test/java/org/hiero/tck/controller/JRPCControllerTest.java similarity index 97% rename from tck/src/test/java/com/hedera/hashgraph/tck/controller/JRPCControllerTest.java rename to tck/src/test/java/org/hiero/tck/controller/JRPCControllerTest.java index 9f2dd2bc0b..2a0f9a31c2 100644 --- a/tck/src/test/java/com/hedera/hashgraph/tck/controller/JRPCControllerTest.java +++ b/tck/src/test/java/org/hiero/tck/controller/JRPCControllerTest.java @@ -1,5 +1,5 @@ // SPDX-License-Identifier: Apache-2.0 -package com.hedera.hashgraph.tck.controller; +package org.hiero.tck.controller; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.mockito.Mockito.mock; diff --git a/tck/src/test/java/com/hedera/hashgraph/tck/controller/JRPCInterceptorTest.java b/tck/src/test/java/org/hiero/tck/controller/JRPCInterceptorTest.java similarity index 97% rename from tck/src/test/java/com/hedera/hashgraph/tck/controller/JRPCInterceptorTest.java rename to tck/src/test/java/org/hiero/tck/controller/JRPCInterceptorTest.java index 1f9e738918..9a2cc61f46 100644 --- a/tck/src/test/java/com/hedera/hashgraph/tck/controller/JRPCInterceptorTest.java +++ b/tck/src/test/java/org/hiero/tck/controller/JRPCInterceptorTest.java @@ -1,5 +1,5 @@ // SPDX-License-Identifier: Apache-2.0 -package com.hedera.hashgraph.tck.controller; +package org.hiero.tck.controller; import static org.junit.jupiter.api.Assertions.*; import static org.mockito.Mockito.*; diff --git a/tck/src/test/java/com/hedera/hashgraph/tck/methods/sdk/KeyServiceTest.java b/tck/src/test/java/org/hiero/tck/methods/sdk/KeyServiceTest.java similarity index 94% rename from tck/src/test/java/com/hedera/hashgraph/tck/methods/sdk/KeyServiceTest.java rename to tck/src/test/java/org/hiero/tck/methods/sdk/KeyServiceTest.java index 145cf180f6..51dfa28588 100644 --- a/tck/src/test/java/com/hedera/hashgraph/tck/methods/sdk/KeyServiceTest.java +++ b/tck/src/test/java/org/hiero/tck/methods/sdk/KeyServiceTest.java @@ -1,12 +1,12 @@ // SPDX-License-Identifier: Apache-2.0 -package com.hedera.hashgraph.tck.methods.sdk; +package org.hiero.tck.methods.sdk; -import static com.hedera.hashgraph.tck.util.KeyUtils.KeyType.*; +import static org.hiero.tck.util.KeyUtils.KeyType.*; import static org.junit.jupiter.api.Assertions.*; -import com.hedera.hashgraph.tck.exception.InvalidJSONRPC2RequestException; -import com.hedera.hashgraph.tck.methods.sdk.param.*; -import com.hedera.hashgraph.tck.methods.sdk.response.*; +import org.hiero.tck.exception.InvalidJSONRPC2RequestException; +import org.hiero.tck.methods.sdk.param.*; +import org.hiero.tck.methods.sdk.response.*; import java.util.Collections; import java.util.Optional; import org.junit.jupiter.api.Assertions; diff --git a/tck/src/test/java/com/hedera/hashgraph/tck/methods/sdk/SdkServiceTest.java b/tck/src/test/java/org/hiero/tck/methods/sdk/SdkServiceTest.java similarity index 91% rename from tck/src/test/java/com/hedera/hashgraph/tck/methods/sdk/SdkServiceTest.java rename to tck/src/test/java/org/hiero/tck/methods/sdk/SdkServiceTest.java index e63eda7205..632a5da50c 100644 --- a/tck/src/test/java/com/hedera/hashgraph/tck/methods/sdk/SdkServiceTest.java +++ b/tck/src/test/java/org/hiero/tck/methods/sdk/SdkServiceTest.java @@ -1,12 +1,12 @@ // SPDX-License-Identifier: Apache-2.0 -package com.hedera.hashgraph.tck.methods.sdk; +package org.hiero.tck.methods.sdk; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertNull; import static org.junit.jupiter.api.Assertions.assertThrows; -import com.hedera.hashgraph.tck.methods.sdk.param.*; -import com.hedera.hashgraph.tck.methods.sdk.response.*; +import org.hiero.tck.methods.sdk.param.*; +import org.hiero.tck.methods.sdk.response.*; import java.util.Optional; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.ExtendWith; diff --git a/tck/src/test/java/com/hedera/hashgraph/tck/methods/sdk/param/AccountCreateParamsTest.java b/tck/src/test/java/org/hiero/tck/methods/sdk/param/AccountCreateParamsTest.java similarity index 98% rename from tck/src/test/java/com/hedera/hashgraph/tck/methods/sdk/param/AccountCreateParamsTest.java rename to tck/src/test/java/org/hiero/tck/methods/sdk/param/AccountCreateParamsTest.java index fbcd491b39..804ac43125 100644 --- a/tck/src/test/java/com/hedera/hashgraph/tck/methods/sdk/param/AccountCreateParamsTest.java +++ b/tck/src/test/java/org/hiero/tck/methods/sdk/param/AccountCreateParamsTest.java @@ -1,9 +1,9 @@ // SPDX-License-Identifier: Apache-2.0 -package com.hedera.hashgraph.tck.methods.sdk.param; +package org.hiero.tck.methods.sdk.param; import static org.junit.jupiter.api.Assertions.*; -import com.hedera.hashgraph.tck.methods.sdk.param.account.*; +import org.hiero.tck.methods.sdk.param.account.*; import java.util.HashMap; import java.util.List; import java.util.Map; diff --git a/tck/src/test/java/com/hedera/hashgraph/tck/methods/sdk/param/CommonTransactionParamsTest.java b/tck/src/test/java/org/hiero/tck/methods/sdk/param/CommonTransactionParamsTest.java similarity index 96% rename from tck/src/test/java/com/hedera/hashgraph/tck/methods/sdk/param/CommonTransactionParamsTest.java rename to tck/src/test/java/org/hiero/tck/methods/sdk/param/CommonTransactionParamsTest.java index 1b57a0155b..64528d99a2 100644 --- a/tck/src/test/java/com/hedera/hashgraph/tck/methods/sdk/param/CommonTransactionParamsTest.java +++ b/tck/src/test/java/org/hiero/tck/methods/sdk/param/CommonTransactionParamsTest.java @@ -1,5 +1,5 @@ // SPDX-License-Identifier: Apache-2.0 -package com.hedera.hashgraph.tck.methods.sdk.param; +package org.hiero.tck.methods.sdk.param; import static org.junit.jupiter.api.Assertions.*; diff --git a/tck/src/test/java/com/hedera/hashgraph/tck/methods/sdk/param/GenerateKeyParamsTest.java b/tck/src/test/java/org/hiero/tck/methods/sdk/param/GenerateKeyParamsTest.java similarity index 97% rename from tck/src/test/java/com/hedera/hashgraph/tck/methods/sdk/param/GenerateKeyParamsTest.java rename to tck/src/test/java/org/hiero/tck/methods/sdk/param/GenerateKeyParamsTest.java index bef453a9ec..57508b6b03 100644 --- a/tck/src/test/java/com/hedera/hashgraph/tck/methods/sdk/param/GenerateKeyParamsTest.java +++ b/tck/src/test/java/org/hiero/tck/methods/sdk/param/GenerateKeyParamsTest.java @@ -1,9 +1,9 @@ // SPDX-License-Identifier: Apache-2.0 -package com.hedera.hashgraph.tck.methods.sdk.param; +package org.hiero.tck.methods.sdk.param; import static org.junit.jupiter.api.Assertions.*; -import com.hedera.hashgraph.tck.util.KeyUtils.KeyType; +import org.hiero.tck.util.KeyUtils.KeyType; import java.util.HashMap; import java.util.Map; import java.util.Optional; diff --git a/tck/src/test/java/com/hedera/hashgraph/tck/methods/sdk/param/SetupParamsTest.java b/tck/src/test/java/org/hiero/tck/methods/sdk/param/SetupParamsTest.java similarity index 95% rename from tck/src/test/java/com/hedera/hashgraph/tck/methods/sdk/param/SetupParamsTest.java rename to tck/src/test/java/org/hiero/tck/methods/sdk/param/SetupParamsTest.java index 283498ef4c..e56e6a0782 100644 --- a/tck/src/test/java/com/hedera/hashgraph/tck/methods/sdk/param/SetupParamsTest.java +++ b/tck/src/test/java/org/hiero/tck/methods/sdk/param/SetupParamsTest.java @@ -1,5 +1,5 @@ // SPDX-License-Identifier: Apache-2.0 -package com.hedera.hashgraph.tck.methods.sdk.param; +package org.hiero.tck.methods.sdk.param; import static org.junit.jupiter.api.Assertions.assertEquals; diff --git a/tck/src/test/java/com/hedera/hashgraph/tck/methods/sdk/response/SetupResponseTest.java b/tck/src/test/java/org/hiero/tck/methods/sdk/response/SetupResponseTest.java similarity index 96% rename from tck/src/test/java/com/hedera/hashgraph/tck/methods/sdk/response/SetupResponseTest.java rename to tck/src/test/java/org/hiero/tck/methods/sdk/response/SetupResponseTest.java index 1df5b1b399..018ce388d8 100644 --- a/tck/src/test/java/com/hedera/hashgraph/tck/methods/sdk/response/SetupResponseTest.java +++ b/tck/src/test/java/org/hiero/tck/methods/sdk/response/SetupResponseTest.java @@ -1,5 +1,5 @@ // SPDX-License-Identifier: Apache-2.0 -package com.hedera.hashgraph.tck.methods.sdk.response; +package org.hiero.tck.methods.sdk.response; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertNotNull; From b2da6c251b193bbe47ddbc78d40686d03c71fcda Mon Sep 17 00:00:00 2001 From: Hendrik Ebbers Date: Fri, 7 Feb 2025 15:51:55 +0100 Subject: [PATCH 2/2] spotless apply Signed-off-by: Hendrik Ebbers --- .../java/org/hiero/tck/controller/JRPCController.java | 4 ++-- .../org/hiero/tck/methods/AbstractJSONRPC2Service.java | 8 ++++---- .../java/org/hiero/tck/methods/sdk/AccountService.java | 4 ++-- .../main/java/org/hiero/tck/methods/sdk/KeyService.java | 2 +- .../main/java/org/hiero/tck/methods/sdk/SdkService.java | 8 ++++---- .../main/java/org/hiero/tck/methods/sdk/TokenService.java | 8 ++++---- .../java/org/hiero/tck/methods/sdk/param/CustomFee.java | 2 +- .../hiero/tck/methods/sdk/param/GenerateKeyParams.java | 4 ++-- .../java/org/hiero/tck/methods/sdk/param/SetupParams.java | 2 +- .../methods/sdk/param/account/AccountCreateParams.java | 6 +++--- .../methods/sdk/param/account/AccountDeleteParams.java | 6 +++--- .../methods/sdk/param/account/AccountUpdateParams.java | 6 +++--- .../sdk/param/token/AssociateDisassociateTokenParams.java | 6 +++--- .../tck/methods/sdk/param/token/BurnTokenParams.java | 6 +++--- .../sdk/param/token/FreezeUnfreezeTokenParams.java | 6 +++--- .../sdk/param/token/GrantRevokeTokenKycParams.java | 6 +++--- .../tck/methods/sdk/param/token/MintTokenParams.java | 6 +++--- .../methods/sdk/param/token/PauseUnpauseTokenParams.java | 6 +++--- .../tck/methods/sdk/param/token/TokenCreateParams.java | 8 ++++---- .../tck/methods/sdk/param/token/TokenDeleteParams.java | 6 +++--- .../sdk/param/token/TokenUpdateFeeScheduleParams.java | 8 ++++---- .../tck/methods/sdk/param/token/TokenUpdateParams.java | 6 +++--- .../java/org/hiero/tck/util/JSONRPC2ServiceScanner.java | 2 +- .../main/java/org/hiero/tck/util/JSONRPCParamParser.java | 4 ++-- .../java/org/hiero/tck/methods/sdk/KeyServiceTest.java | 4 ++-- .../java/org/hiero/tck/methods/sdk/SdkServiceTest.java | 2 +- .../tck/methods/sdk/param/AccountCreateParamsTest.java | 2 +- .../tck/methods/sdk/param/GenerateKeyParamsTest.java | 2 +- 28 files changed, 70 insertions(+), 70 deletions(-) diff --git a/tck/src/main/java/org/hiero/tck/controller/JRPCController.java b/tck/src/main/java/org/hiero/tck/controller/JRPCController.java index 04d40eea2d..434f55c822 100644 --- a/tck/src/main/java/org/hiero/tck/controller/JRPCController.java +++ b/tck/src/main/java/org/hiero/tck/controller/JRPCController.java @@ -1,11 +1,11 @@ // SPDX-License-Identifier: Apache-2.0 package org.hiero.tck.controller; -import org.hiero.tck.annotation.JSONRPC2Controller; -import org.hiero.tck.util.JSONRPC2ServiceScanner; import com.thetransactioncompany.jsonrpc2.JSONRPC2Request; import com.thetransactioncompany.jsonrpc2.server.Dispatcher; import jakarta.servlet.http.HttpServletRequest; +import org.hiero.tck.annotation.JSONRPC2Controller; +import org.hiero.tck.util.JSONRPC2ServiceScanner; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.context.ApplicationContext; diff --git a/tck/src/main/java/org/hiero/tck/methods/AbstractJSONRPC2Service.java b/tck/src/main/java/org/hiero/tck/methods/AbstractJSONRPC2Service.java index 0228edfb03..9d1df1aa33 100644 --- a/tck/src/main/java/org/hiero/tck/methods/AbstractJSONRPC2Service.java +++ b/tck/src/main/java/org/hiero/tck/methods/AbstractJSONRPC2Service.java @@ -3,10 +3,6 @@ import com.hedera.hashgraph.sdk.PrecheckStatusException; import com.hedera.hashgraph.sdk.ReceiptStatusException; -import org.hiero.tck.annotation.JSONRPC2Method; -import org.hiero.tck.exception.InvalidJSONRPC2ParamsException; -import org.hiero.tck.exception.InvalidJSONRPC2RequestException; -import org.hiero.tck.methods.JSONRPC2Error.ErrorData; import com.thetransactioncompany.jsonrpc2.JSONRPC2Error; import com.thetransactioncompany.jsonrpc2.JSONRPC2Request; import com.thetransactioncompany.jsonrpc2.JSONRPC2Response; @@ -18,6 +14,10 @@ import java.util.HashMap; import java.util.Map; import net.minidev.json.JSONObject; +import org.hiero.tck.annotation.JSONRPC2Method; +import org.hiero.tck.exception.InvalidJSONRPC2ParamsException; +import org.hiero.tck.exception.InvalidJSONRPC2RequestException; +import org.hiero.tck.methods.JSONRPC2Error.ErrorData; /** * Implements RequestHandler and overrides some of the Dispatcher logic, diff --git a/tck/src/main/java/org/hiero/tck/methods/sdk/AccountService.java b/tck/src/main/java/org/hiero/tck/methods/sdk/AccountService.java index 0c2e9cdf35..df37b06e42 100644 --- a/tck/src/main/java/org/hiero/tck/methods/sdk/AccountService.java +++ b/tck/src/main/java/org/hiero/tck/methods/sdk/AccountService.java @@ -10,6 +10,8 @@ import com.hedera.hashgraph.sdk.HbarUnit; import com.hedera.hashgraph.sdk.Status; import com.hedera.hashgraph.sdk.TransactionReceipt; +import java.time.Duration; +import java.time.Instant; import org.hiero.tck.annotation.JSONRPC2Method; import org.hiero.tck.annotation.JSONRPC2Service; import org.hiero.tck.methods.AbstractJSONRPC2Service; @@ -18,8 +20,6 @@ import org.hiero.tck.methods.sdk.param.account.AccountUpdateParams; import org.hiero.tck.methods.sdk.response.AccountResponse; import org.hiero.tck.util.KeyUtils; -import java.time.Duration; -import java.time.Instant; /** * AccountService for account related methods diff --git a/tck/src/main/java/org/hiero/tck/methods/sdk/KeyService.java b/tck/src/main/java/org/hiero/tck/methods/sdk/KeyService.java index e37ec7e912..69669e0af8 100644 --- a/tck/src/main/java/org/hiero/tck/methods/sdk/KeyService.java +++ b/tck/src/main/java/org/hiero/tck/methods/sdk/KeyService.java @@ -6,6 +6,7 @@ import com.hedera.hashgraph.sdk.KeyList; import com.hedera.hashgraph.sdk.PrivateKey; import com.hedera.hashgraph.sdk.PublicKey; +import org.bouncycastle.util.encoders.Hex; import org.hiero.tck.annotation.JSONRPC2Method; import org.hiero.tck.annotation.JSONRPC2Service; import org.hiero.tck.exception.InvalidJSONRPC2RequestException; @@ -14,7 +15,6 @@ import org.hiero.tck.methods.sdk.response.GenerateKeyResponse; import org.hiero.tck.util.KeyUtils; import org.hiero.tck.util.KeyUtils.KeyType; -import org.bouncycastle.util.encoders.Hex; @JSONRPC2Service public class KeyService extends AbstractJSONRPC2Service { diff --git a/tck/src/main/java/org/hiero/tck/methods/sdk/SdkService.java b/tck/src/main/java/org/hiero/tck/methods/sdk/SdkService.java index c900a4572d..a063a017ec 100644 --- a/tck/src/main/java/org/hiero/tck/methods/sdk/SdkService.java +++ b/tck/src/main/java/org/hiero/tck/methods/sdk/SdkService.java @@ -4,15 +4,15 @@ import com.hedera.hashgraph.sdk.AccountId; import com.hedera.hashgraph.sdk.Client; import com.hedera.hashgraph.sdk.PrivateKey; +import java.util.HashMap; +import java.util.List; +import java.util.Map; +import java.util.concurrent.Executors; import org.hiero.tck.annotation.JSONRPC2Method; import org.hiero.tck.annotation.JSONRPC2Service; import org.hiero.tck.methods.AbstractJSONRPC2Service; import org.hiero.tck.methods.sdk.param.SetupParams; import org.hiero.tck.methods.sdk.response.SetupResponse; -import java.util.HashMap; -import java.util.List; -import java.util.Map; -import java.util.concurrent.Executors; /** * SdkService for managing the {@link Client} setup and reset diff --git a/tck/src/main/java/org/hiero/tck/methods/sdk/TokenService.java b/tck/src/main/java/org/hiero/tck/methods/sdk/TokenService.java index 24b481e102..ef3ede0c1b 100644 --- a/tck/src/main/java/org/hiero/tck/methods/sdk/TokenService.java +++ b/tck/src/main/java/org/hiero/tck/methods/sdk/TokenService.java @@ -3,16 +3,16 @@ import com.google.protobuf.InvalidProtocolBufferException; import com.hedera.hashgraph.sdk.*; +import java.time.Duration; +import java.util.List; +import java.util.stream.Collectors; +import org.bouncycastle.util.encoders.Hex; import org.hiero.tck.annotation.JSONRPC2Method; import org.hiero.tck.annotation.JSONRPC2Service; import org.hiero.tck.methods.AbstractJSONRPC2Service; import org.hiero.tck.methods.sdk.param.token.*; import org.hiero.tck.methods.sdk.response.token.*; import org.hiero.tck.util.KeyUtils; -import java.time.Duration; -import java.util.List; -import java.util.stream.Collectors; -import org.bouncycastle.util.encoders.Hex; /** * TokenService for token related methods diff --git a/tck/src/main/java/org/hiero/tck/methods/sdk/param/CustomFee.java b/tck/src/main/java/org/hiero/tck/methods/sdk/param/CustomFee.java index bdd4700722..6612e43459 100644 --- a/tck/src/main/java/org/hiero/tck/methods/sdk/param/CustomFee.java +++ b/tck/src/main/java/org/hiero/tck/methods/sdk/param/CustomFee.java @@ -2,7 +2,6 @@ package org.hiero.tck.methods.sdk.param; import com.hedera.hashgraph.sdk.*; -import org.hiero.tck.methods.JSONRPC2Param; import java.util.ArrayList; import java.util.List; import java.util.Map; @@ -12,6 +11,7 @@ import lombok.NoArgsConstructor; import lombok.NonNull; import net.minidev.json.JSONObject; +import org.hiero.tck.methods.JSONRPC2Param; @Getter @AllArgsConstructor diff --git a/tck/src/main/java/org/hiero/tck/methods/sdk/param/GenerateKeyParams.java b/tck/src/main/java/org/hiero/tck/methods/sdk/param/GenerateKeyParams.java index 237921e31f..dce8179358 100644 --- a/tck/src/main/java/org/hiero/tck/methods/sdk/param/GenerateKeyParams.java +++ b/tck/src/main/java/org/hiero/tck/methods/sdk/param/GenerateKeyParams.java @@ -1,8 +1,6 @@ // SPDX-License-Identifier: Apache-2.0 package org.hiero.tck.methods.sdk.param; -import org.hiero.tck.methods.JSONRPC2Param; -import org.hiero.tck.util.KeyUtils.KeyType; import java.util.ArrayList; import java.util.List; import java.util.Map; @@ -12,6 +10,8 @@ import lombok.NoArgsConstructor; import net.minidev.json.JSONArray; import net.minidev.json.JSONObject; +import org.hiero.tck.methods.JSONRPC2Param; +import org.hiero.tck.util.KeyUtils.KeyType; @SuppressWarnings("OptionalUsedAsFieldOrParameterType") @Getter diff --git a/tck/src/main/java/org/hiero/tck/methods/sdk/param/SetupParams.java b/tck/src/main/java/org/hiero/tck/methods/sdk/param/SetupParams.java index 4f3e5eb04e..9d62568be8 100644 --- a/tck/src/main/java/org/hiero/tck/methods/sdk/param/SetupParams.java +++ b/tck/src/main/java/org/hiero/tck/methods/sdk/param/SetupParams.java @@ -1,12 +1,12 @@ // SPDX-License-Identifier: Apache-2.0 package org.hiero.tck.methods.sdk.param; -import org.hiero.tck.methods.JSONRPC2Param; import java.util.Map; import java.util.Optional; import lombok.AllArgsConstructor; import lombok.Getter; import lombok.NoArgsConstructor; +import org.hiero.tck.methods.JSONRPC2Param; /** * SetupParams for SDK client diff --git a/tck/src/main/java/org/hiero/tck/methods/sdk/param/account/AccountCreateParams.java b/tck/src/main/java/org/hiero/tck/methods/sdk/param/account/AccountCreateParams.java index 3fcec0f8b8..23cbaf420a 100644 --- a/tck/src/main/java/org/hiero/tck/methods/sdk/param/account/AccountCreateParams.java +++ b/tck/src/main/java/org/hiero/tck/methods/sdk/param/account/AccountCreateParams.java @@ -1,14 +1,14 @@ // SPDX-License-Identifier: Apache-2.0 package org.hiero.tck.methods.sdk.param.account; -import org.hiero.tck.methods.JSONRPC2Param; -import org.hiero.tck.methods.sdk.param.CommonTransactionParams; -import org.hiero.tck.util.JSONRPCParamParser; import java.util.Map; import java.util.Optional; import lombok.AllArgsConstructor; import lombok.Getter; import lombok.NoArgsConstructor; +import org.hiero.tck.methods.JSONRPC2Param; +import org.hiero.tck.methods.sdk.param.CommonTransactionParams; +import org.hiero.tck.util.JSONRPCParamParser; /** * AccountCreateParams for account create method diff --git a/tck/src/main/java/org/hiero/tck/methods/sdk/param/account/AccountDeleteParams.java b/tck/src/main/java/org/hiero/tck/methods/sdk/param/account/AccountDeleteParams.java index 0b3c62f901..61b9fafaa4 100644 --- a/tck/src/main/java/org/hiero/tck/methods/sdk/param/account/AccountDeleteParams.java +++ b/tck/src/main/java/org/hiero/tck/methods/sdk/param/account/AccountDeleteParams.java @@ -1,14 +1,14 @@ // SPDX-License-Identifier: Apache-2.0 package org.hiero.tck.methods.sdk.param.account; -import org.hiero.tck.methods.JSONRPC2Param; -import org.hiero.tck.methods.sdk.param.CommonTransactionParams; -import org.hiero.tck.util.JSONRPCParamParser; import java.util.Map; import java.util.Optional; import lombok.AllArgsConstructor; import lombok.Getter; import lombok.NoArgsConstructor; +import org.hiero.tck.methods.JSONRPC2Param; +import org.hiero.tck.methods.sdk.param.CommonTransactionParams; +import org.hiero.tck.util.JSONRPCParamParser; /** * AccountDeleteParams for account delete method diff --git a/tck/src/main/java/org/hiero/tck/methods/sdk/param/account/AccountUpdateParams.java b/tck/src/main/java/org/hiero/tck/methods/sdk/param/account/AccountUpdateParams.java index ad22ff264d..f44dd8914f 100644 --- a/tck/src/main/java/org/hiero/tck/methods/sdk/param/account/AccountUpdateParams.java +++ b/tck/src/main/java/org/hiero/tck/methods/sdk/param/account/AccountUpdateParams.java @@ -1,14 +1,14 @@ // SPDX-License-Identifier: Apache-2.0 package org.hiero.tck.methods.sdk.param.account; -import org.hiero.tck.methods.JSONRPC2Param; -import org.hiero.tck.methods.sdk.param.CommonTransactionParams; -import org.hiero.tck.util.JSONRPCParamParser; import java.util.Map; import java.util.Optional; import lombok.AllArgsConstructor; import lombok.Getter; import lombok.NoArgsConstructor; +import org.hiero.tck.methods.JSONRPC2Param; +import org.hiero.tck.methods.sdk.param.CommonTransactionParams; +import org.hiero.tck.util.JSONRPCParamParser; /** * AccountUpdateParams for account update method diff --git a/tck/src/main/java/org/hiero/tck/methods/sdk/param/token/AssociateDisassociateTokenParams.java b/tck/src/main/java/org/hiero/tck/methods/sdk/param/token/AssociateDisassociateTokenParams.java index 663cd69711..3ef9476146 100644 --- a/tck/src/main/java/org/hiero/tck/methods/sdk/param/token/AssociateDisassociateTokenParams.java +++ b/tck/src/main/java/org/hiero/tck/methods/sdk/param/token/AssociateDisassociateTokenParams.java @@ -1,15 +1,15 @@ // SPDX-License-Identifier: Apache-2.0 package org.hiero.tck.methods.sdk.param.token; -import org.hiero.tck.methods.JSONRPC2Param; -import org.hiero.tck.methods.sdk.param.CommonTransactionParams; -import org.hiero.tck.util.JSONRPCParamParser; import java.util.List; import java.util.Map; import java.util.Optional; import lombok.AllArgsConstructor; import lombok.Getter; import lombok.NoArgsConstructor; +import org.hiero.tck.methods.JSONRPC2Param; +import org.hiero.tck.methods.sdk.param.CommonTransactionParams; +import org.hiero.tck.util.JSONRPCParamParser; @Getter @AllArgsConstructor diff --git a/tck/src/main/java/org/hiero/tck/methods/sdk/param/token/BurnTokenParams.java b/tck/src/main/java/org/hiero/tck/methods/sdk/param/token/BurnTokenParams.java index 60a8f82945..5672d8e787 100644 --- a/tck/src/main/java/org/hiero/tck/methods/sdk/param/token/BurnTokenParams.java +++ b/tck/src/main/java/org/hiero/tck/methods/sdk/param/token/BurnTokenParams.java @@ -1,15 +1,15 @@ // SPDX-License-Identifier: Apache-2.0 package org.hiero.tck.methods.sdk.param.token; -import org.hiero.tck.methods.JSONRPC2Param; -import org.hiero.tck.methods.sdk.param.CommonTransactionParams; -import org.hiero.tck.util.JSONRPCParamParser; import java.util.List; import java.util.Map; import java.util.Optional; import lombok.AllArgsConstructor; import lombok.Getter; import lombok.NoArgsConstructor; +import org.hiero.tck.methods.JSONRPC2Param; +import org.hiero.tck.methods.sdk.param.CommonTransactionParams; +import org.hiero.tck.util.JSONRPCParamParser; @Getter @AllArgsConstructor diff --git a/tck/src/main/java/org/hiero/tck/methods/sdk/param/token/FreezeUnfreezeTokenParams.java b/tck/src/main/java/org/hiero/tck/methods/sdk/param/token/FreezeUnfreezeTokenParams.java index e7a6e59e4a..3d773f6fbf 100644 --- a/tck/src/main/java/org/hiero/tck/methods/sdk/param/token/FreezeUnfreezeTokenParams.java +++ b/tck/src/main/java/org/hiero/tck/methods/sdk/param/token/FreezeUnfreezeTokenParams.java @@ -1,14 +1,14 @@ // SPDX-License-Identifier: Apache-2.0 package org.hiero.tck.methods.sdk.param.token; -import org.hiero.tck.methods.JSONRPC2Param; -import org.hiero.tck.methods.sdk.param.CommonTransactionParams; -import org.hiero.tck.util.JSONRPCParamParser; import java.util.Map; import java.util.Optional; import lombok.AllArgsConstructor; import lombok.Getter; import lombok.NoArgsConstructor; +import org.hiero.tck.methods.JSONRPC2Param; +import org.hiero.tck.methods.sdk.param.CommonTransactionParams; +import org.hiero.tck.util.JSONRPCParamParser; @Getter @AllArgsConstructor diff --git a/tck/src/main/java/org/hiero/tck/methods/sdk/param/token/GrantRevokeTokenKycParams.java b/tck/src/main/java/org/hiero/tck/methods/sdk/param/token/GrantRevokeTokenKycParams.java index e366d75b8a..f23cffb9db 100644 --- a/tck/src/main/java/org/hiero/tck/methods/sdk/param/token/GrantRevokeTokenKycParams.java +++ b/tck/src/main/java/org/hiero/tck/methods/sdk/param/token/GrantRevokeTokenKycParams.java @@ -1,14 +1,14 @@ // SPDX-License-Identifier: Apache-2.0 package org.hiero.tck.methods.sdk.param.token; -import org.hiero.tck.methods.JSONRPC2Param; -import org.hiero.tck.methods.sdk.param.CommonTransactionParams; -import org.hiero.tck.util.JSONRPCParamParser; import java.util.Map; import java.util.Optional; import lombok.AllArgsConstructor; import lombok.Getter; import lombok.NoArgsConstructor; +import org.hiero.tck.methods.JSONRPC2Param; +import org.hiero.tck.methods.sdk.param.CommonTransactionParams; +import org.hiero.tck.util.JSONRPCParamParser; @Getter @AllArgsConstructor diff --git a/tck/src/main/java/org/hiero/tck/methods/sdk/param/token/MintTokenParams.java b/tck/src/main/java/org/hiero/tck/methods/sdk/param/token/MintTokenParams.java index e090c0e0b5..16f7469fe1 100644 --- a/tck/src/main/java/org/hiero/tck/methods/sdk/param/token/MintTokenParams.java +++ b/tck/src/main/java/org/hiero/tck/methods/sdk/param/token/MintTokenParams.java @@ -1,15 +1,15 @@ // SPDX-License-Identifier: Apache-2.0 package org.hiero.tck.methods.sdk.param.token; -import org.hiero.tck.methods.JSONRPC2Param; -import org.hiero.tck.methods.sdk.param.CommonTransactionParams; -import org.hiero.tck.util.JSONRPCParamParser; import java.util.List; import java.util.Map; import java.util.Optional; import lombok.AllArgsConstructor; import lombok.Getter; import lombok.NoArgsConstructor; +import org.hiero.tck.methods.JSONRPC2Param; +import org.hiero.tck.methods.sdk.param.CommonTransactionParams; +import org.hiero.tck.util.JSONRPCParamParser; @Getter @AllArgsConstructor diff --git a/tck/src/main/java/org/hiero/tck/methods/sdk/param/token/PauseUnpauseTokenParams.java b/tck/src/main/java/org/hiero/tck/methods/sdk/param/token/PauseUnpauseTokenParams.java index 26a0098c1f..0cb23a8dcb 100644 --- a/tck/src/main/java/org/hiero/tck/methods/sdk/param/token/PauseUnpauseTokenParams.java +++ b/tck/src/main/java/org/hiero/tck/methods/sdk/param/token/PauseUnpauseTokenParams.java @@ -1,14 +1,14 @@ // SPDX-License-Identifier: Apache-2.0 package org.hiero.tck.methods.sdk.param.token; -import org.hiero.tck.methods.JSONRPC2Param; -import org.hiero.tck.methods.sdk.param.CommonTransactionParams; -import org.hiero.tck.util.JSONRPCParamParser; import java.util.Map; import java.util.Optional; import lombok.AllArgsConstructor; import lombok.Getter; import lombok.NoArgsConstructor; +import org.hiero.tck.methods.JSONRPC2Param; +import org.hiero.tck.methods.sdk.param.CommonTransactionParams; +import org.hiero.tck.util.JSONRPCParamParser; @Getter @AllArgsConstructor diff --git a/tck/src/main/java/org/hiero/tck/methods/sdk/param/token/TokenCreateParams.java b/tck/src/main/java/org/hiero/tck/methods/sdk/param/token/TokenCreateParams.java index 17a427cb48..56cfaeb118 100644 --- a/tck/src/main/java/org/hiero/tck/methods/sdk/param/token/TokenCreateParams.java +++ b/tck/src/main/java/org/hiero/tck/methods/sdk/param/token/TokenCreateParams.java @@ -1,16 +1,16 @@ // SPDX-License-Identifier: Apache-2.0 package org.hiero.tck.methods.sdk.param.token; -import org.hiero.tck.methods.JSONRPC2Param; -import org.hiero.tck.methods.sdk.param.CommonTransactionParams; -import org.hiero.tck.methods.sdk.param.CustomFee; -import org.hiero.tck.util.JSONRPCParamParser; import java.util.List; import java.util.Map; import java.util.Optional; import lombok.AllArgsConstructor; import lombok.Getter; import lombok.NoArgsConstructor; +import org.hiero.tck.methods.JSONRPC2Param; +import org.hiero.tck.methods.sdk.param.CommonTransactionParams; +import org.hiero.tck.methods.sdk.param.CustomFee; +import org.hiero.tck.util.JSONRPCParamParser; /** * TokenCreateParams for token create method diff --git a/tck/src/main/java/org/hiero/tck/methods/sdk/param/token/TokenDeleteParams.java b/tck/src/main/java/org/hiero/tck/methods/sdk/param/token/TokenDeleteParams.java index 129f186db1..bab3d6ff2d 100644 --- a/tck/src/main/java/org/hiero/tck/methods/sdk/param/token/TokenDeleteParams.java +++ b/tck/src/main/java/org/hiero/tck/methods/sdk/param/token/TokenDeleteParams.java @@ -1,14 +1,14 @@ // SPDX-License-Identifier: Apache-2.0 package org.hiero.tck.methods.sdk.param.token; -import org.hiero.tck.methods.JSONRPC2Param; -import org.hiero.tck.methods.sdk.param.CommonTransactionParams; -import org.hiero.tck.util.JSONRPCParamParser; import java.util.Map; import java.util.Optional; import lombok.AllArgsConstructor; import lombok.Getter; import lombok.NoArgsConstructor; +import org.hiero.tck.methods.JSONRPC2Param; +import org.hiero.tck.methods.sdk.param.CommonTransactionParams; +import org.hiero.tck.util.JSONRPCParamParser; /** * TokenDeleteParams for token delete method diff --git a/tck/src/main/java/org/hiero/tck/methods/sdk/param/token/TokenUpdateFeeScheduleParams.java b/tck/src/main/java/org/hiero/tck/methods/sdk/param/token/TokenUpdateFeeScheduleParams.java index 77c27459db..2034962071 100644 --- a/tck/src/main/java/org/hiero/tck/methods/sdk/param/token/TokenUpdateFeeScheduleParams.java +++ b/tck/src/main/java/org/hiero/tck/methods/sdk/param/token/TokenUpdateFeeScheduleParams.java @@ -1,16 +1,16 @@ // SPDX-License-Identifier: Apache-2.0 package org.hiero.tck.methods.sdk.param.token; -import org.hiero.tck.methods.JSONRPC2Param; -import org.hiero.tck.methods.sdk.param.CommonTransactionParams; -import org.hiero.tck.methods.sdk.param.CustomFee; -import org.hiero.tck.util.JSONRPCParamParser; import java.util.List; import java.util.Map; import java.util.Optional; import lombok.AllArgsConstructor; import lombok.Getter; import lombok.NoArgsConstructor; +import org.hiero.tck.methods.JSONRPC2Param; +import org.hiero.tck.methods.sdk.param.CommonTransactionParams; +import org.hiero.tck.methods.sdk.param.CustomFee; +import org.hiero.tck.util.JSONRPCParamParser; @Getter @AllArgsConstructor diff --git a/tck/src/main/java/org/hiero/tck/methods/sdk/param/token/TokenUpdateParams.java b/tck/src/main/java/org/hiero/tck/methods/sdk/param/token/TokenUpdateParams.java index 521d0a8791..695654ecc0 100644 --- a/tck/src/main/java/org/hiero/tck/methods/sdk/param/token/TokenUpdateParams.java +++ b/tck/src/main/java/org/hiero/tck/methods/sdk/param/token/TokenUpdateParams.java @@ -1,14 +1,14 @@ // SPDX-License-Identifier: Apache-2.0 package org.hiero.tck.methods.sdk.param.token; -import org.hiero.tck.methods.JSONRPC2Param; -import org.hiero.tck.methods.sdk.param.CommonTransactionParams; -import org.hiero.tck.util.JSONRPCParamParser; import java.util.Map; import java.util.Optional; import lombok.AllArgsConstructor; import lombok.Getter; import lombok.NoArgsConstructor; +import org.hiero.tck.methods.JSONRPC2Param; +import org.hiero.tck.methods.sdk.param.CommonTransactionParams; +import org.hiero.tck.util.JSONRPCParamParser; /** * TokenUpdateParams for token update method diff --git a/tck/src/main/java/org/hiero/tck/util/JSONRPC2ServiceScanner.java b/tck/src/main/java/org/hiero/tck/util/JSONRPC2ServiceScanner.java index 38d624aa98..1d2585d299 100644 --- a/tck/src/main/java/org/hiero/tck/util/JSONRPC2ServiceScanner.java +++ b/tck/src/main/java/org/hiero/tck/util/JSONRPC2ServiceScanner.java @@ -1,8 +1,8 @@ // SPDX-License-Identifier: Apache-2.0 package org.hiero.tck.util; -import org.hiero.tck.annotation.JSONRPC2Service; import com.thetransactioncompany.jsonrpc2.server.*; +import org.hiero.tck.annotation.JSONRPC2Service; import org.springframework.context.ApplicationContext; /** diff --git a/tck/src/main/java/org/hiero/tck/util/JSONRPCParamParser.java b/tck/src/main/java/org/hiero/tck/util/JSONRPCParamParser.java index df66aa286b..cc1ccc7877 100644 --- a/tck/src/main/java/org/hiero/tck/util/JSONRPCParamParser.java +++ b/tck/src/main/java/org/hiero/tck/util/JSONRPCParamParser.java @@ -1,14 +1,14 @@ // SPDX-License-Identifier: Apache-2.0 package org.hiero.tck.util; -import org.hiero.tck.methods.sdk.param.CommonTransactionParams; -import org.hiero.tck.methods.sdk.param.CustomFee; import java.util.ArrayList; import java.util.List; import java.util.Map; import java.util.Optional; import net.minidev.json.JSONArray; import net.minidev.json.JSONObject; +import org.hiero.tck.methods.sdk.param.CommonTransactionParams; +import org.hiero.tck.methods.sdk.param.CustomFee; public class JSONRPCParamParser { diff --git a/tck/src/test/java/org/hiero/tck/methods/sdk/KeyServiceTest.java b/tck/src/test/java/org/hiero/tck/methods/sdk/KeyServiceTest.java index 51dfa28588..0314aaf33c 100644 --- a/tck/src/test/java/org/hiero/tck/methods/sdk/KeyServiceTest.java +++ b/tck/src/test/java/org/hiero/tck/methods/sdk/KeyServiceTest.java @@ -4,11 +4,11 @@ import static org.hiero.tck.util.KeyUtils.KeyType.*; import static org.junit.jupiter.api.Assertions.*; +import java.util.Collections; +import java.util.Optional; import org.hiero.tck.exception.InvalidJSONRPC2RequestException; import org.hiero.tck.methods.sdk.param.*; import org.hiero.tck.methods.sdk.response.*; -import java.util.Collections; -import java.util.Optional; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.function.Executable; diff --git a/tck/src/test/java/org/hiero/tck/methods/sdk/SdkServiceTest.java b/tck/src/test/java/org/hiero/tck/methods/sdk/SdkServiceTest.java index 632a5da50c..7d73ec0bb2 100644 --- a/tck/src/test/java/org/hiero/tck/methods/sdk/SdkServiceTest.java +++ b/tck/src/test/java/org/hiero/tck/methods/sdk/SdkServiceTest.java @@ -5,9 +5,9 @@ import static org.junit.jupiter.api.Assertions.assertNull; import static org.junit.jupiter.api.Assertions.assertThrows; +import java.util.Optional; import org.hiero.tck.methods.sdk.param.*; import org.hiero.tck.methods.sdk.response.*; -import java.util.Optional; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.ExtendWith; import org.mockito.junit.jupiter.MockitoExtension; diff --git a/tck/src/test/java/org/hiero/tck/methods/sdk/param/AccountCreateParamsTest.java b/tck/src/test/java/org/hiero/tck/methods/sdk/param/AccountCreateParamsTest.java index 804ac43125..4e561600aa 100644 --- a/tck/src/test/java/org/hiero/tck/methods/sdk/param/AccountCreateParamsTest.java +++ b/tck/src/test/java/org/hiero/tck/methods/sdk/param/AccountCreateParamsTest.java @@ -3,13 +3,13 @@ import static org.junit.jupiter.api.Assertions.*; -import org.hiero.tck.methods.sdk.param.account.*; import java.util.HashMap; import java.util.List; import java.util.Map; import java.util.Optional; import net.minidev.json.JSONArray; import net.minidev.json.JSONObject; +import org.hiero.tck.methods.sdk.param.account.*; import org.junit.jupiter.api.Test; class AccountCreateParamsTest { diff --git a/tck/src/test/java/org/hiero/tck/methods/sdk/param/GenerateKeyParamsTest.java b/tck/src/test/java/org/hiero/tck/methods/sdk/param/GenerateKeyParamsTest.java index 57508b6b03..8a3776f391 100644 --- a/tck/src/test/java/org/hiero/tck/methods/sdk/param/GenerateKeyParamsTest.java +++ b/tck/src/test/java/org/hiero/tck/methods/sdk/param/GenerateKeyParamsTest.java @@ -3,12 +3,12 @@ import static org.junit.jupiter.api.Assertions.*; -import org.hiero.tck.util.KeyUtils.KeyType; import java.util.HashMap; import java.util.Map; import java.util.Optional; import net.minidev.json.JSONArray; import net.minidev.json.JSONObject; +import org.hiero.tck.util.KeyUtils.KeyType; import org.junit.jupiter.api.Test; class GenerateKeyParamsTest {