From b2fc0da4b0a7996e4be317f469528be741e55516 Mon Sep 17 00:00:00 2001 From: Kyon <32325790+kyonRay@users.noreply.github.com> Date: Mon, 14 Mar 2022 09:46:06 +0800 Subject: [PATCH] (project): adapt java sdk. (#101) --- build.gradle | 2 +- .../java/org/example/demo/config/BcosConfig.java | 2 +- .../org/example/demo/config/SdkBeanConfig.java | 16 ++++++++-------- .../example/demo/service/HelloWorldService.java | 10 +++++----- src/test/java/org/example/demo/Demos.java | 14 +++++++------- 5 files changed, 22 insertions(+), 22 deletions(-) diff --git a/build.gradle b/build.gradle index b39802e..4c34fee 100644 --- a/build.gradle +++ b/build.gradle @@ -47,7 +47,7 @@ List logger = [ dependencies { implementation 'junit:junit:4.13.1' compile logger - compile ('org.fisco-bcos.java-sdk:fisco-bcos-java-sdk:3.0.0-rc2') + compile ('org.fisco-bcos.java-sdk:fisco-bcos-java-sdk:3.0.0-rc3-SNAPSHOT') compile ('org.springframework.boot:spring-boot-starter-web') compileOnly ('org.projectlombok:lombok') annotationProcessor ('org.projectlombok:lombok') diff --git a/src/main/java/org/example/demo/config/BcosConfig.java b/src/main/java/org/example/demo/config/BcosConfig.java index ca07ba7..f3836cd 100644 --- a/src/main/java/org/example/demo/config/BcosConfig.java +++ b/src/main/java/org/example/demo/config/BcosConfig.java @@ -3,7 +3,7 @@ import java.util.List; import java.util.Map; import lombok.Data; -import org.fisco.bcos.sdk.config.model.AmopTopic; +import org.fisco.bcos.sdk.v3.config.model.AmopTopic; import org.springframework.boot.context.properties.ConfigurationProperties; import org.springframework.context.annotation.Configuration; diff --git a/src/main/java/org/example/demo/config/SdkBeanConfig.java b/src/main/java/org/example/demo/config/SdkBeanConfig.java index 90ad8ca..5b88534 100644 --- a/src/main/java/org/example/demo/config/SdkBeanConfig.java +++ b/src/main/java/org/example/demo/config/SdkBeanConfig.java @@ -5,14 +5,14 @@ import java.util.Map; import lombok.extern.slf4j.Slf4j; import org.example.demo.constants.ContractConstants; -import org.fisco.bcos.sdk.BcosSDK; -import org.fisco.bcos.sdk.client.Client; -import org.fisco.bcos.sdk.config.ConfigOption; -import org.fisco.bcos.sdk.config.model.ConfigProperty; -import org.fisco.bcos.sdk.model.CryptoType; -import org.fisco.bcos.sdk.model.TransactionReceipt; -import org.fisco.bcos.sdk.transaction.manager.AssembleTransactionProcessor; -import org.fisco.bcos.sdk.transaction.manager.TransactionProcessorFactory; +import org.fisco.bcos.sdk.v3.BcosSDK; +import org.fisco.bcos.sdk.v3.client.Client; +import org.fisco.bcos.sdk.v3.config.ConfigOption; +import org.fisco.bcos.sdk.v3.config.model.ConfigProperty; +import org.fisco.bcos.sdk.v3.model.CryptoType; +import org.fisco.bcos.sdk.v3.model.TransactionReceipt; +import org.fisco.bcos.sdk.v3.transaction.manager.AssembleTransactionProcessor; +import org.fisco.bcos.sdk.v3.transaction.manager.TransactionProcessorFactory; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; diff --git a/src/main/java/org/example/demo/service/HelloWorldService.java b/src/main/java/org/example/demo/service/HelloWorldService.java index e22c93f..0ff44e1 100644 --- a/src/main/java/org/example/demo/service/HelloWorldService.java +++ b/src/main/java/org/example/demo/service/HelloWorldService.java @@ -7,11 +7,11 @@ import org.example.demo.config.ContractConfig; import org.example.demo.constants.ContractConstants; import org.example.demo.model.bo.HelloWorldSetInputBO; -import org.fisco.bcos.sdk.client.Client; -import org.fisco.bcos.sdk.transaction.manager.AssembleTransactionProcessor; -import org.fisco.bcos.sdk.transaction.manager.TransactionProcessorFactory; -import org.fisco.bcos.sdk.transaction.model.dto.CallResponse; -import org.fisco.bcos.sdk.transaction.model.dto.TransactionResponse; +import org.fisco.bcos.sdk.v3.client.Client; +import org.fisco.bcos.sdk.v3.transaction.manager.AssembleTransactionProcessor; +import org.fisco.bcos.sdk.v3.transaction.manager.TransactionProcessorFactory; +import org.fisco.bcos.sdk.v3.transaction.model.dto.CallResponse; +import org.fisco.bcos.sdk.v3.transaction.model.dto.TransactionResponse; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; diff --git a/src/test/java/org/example/demo/Demos.java b/src/test/java/org/example/demo/Demos.java index 6220cdd..7d5bdb5 100644 --- a/src/test/java/org/example/demo/Demos.java +++ b/src/test/java/org/example/demo/Demos.java @@ -2,13 +2,13 @@ import java.util.Arrays; import org.example.demo.constants.ContractConstants; -import org.fisco.bcos.sdk.client.Client; -import org.fisco.bcos.sdk.crypto.keypair.CryptoKeyPair; -import org.fisco.bcos.sdk.crypto.keypair.ECDSAKeyPair; -import org.fisco.bcos.sdk.crypto.keypair.SM2KeyPair; -import org.fisco.bcos.sdk.model.TransactionReceipt; -import org.fisco.bcos.sdk.transaction.manager.AssembleTransactionProcessor; -import org.fisco.bcos.sdk.transaction.manager.TransactionProcessorFactory; +import org.fisco.bcos.sdk.v3.client.Client; +import org.fisco.bcos.sdk.v3.crypto.keypair.CryptoKeyPair; +import org.fisco.bcos.sdk.v3.crypto.keypair.ECDSAKeyPair; +import org.fisco.bcos.sdk.v3.crypto.keypair.SM2KeyPair; +import org.fisco.bcos.sdk.v3.model.TransactionReceipt; +import org.fisco.bcos.sdk.v3.transaction.manager.AssembleTransactionProcessor; +import org.fisco.bcos.sdk.v3.transaction.manager.TransactionProcessorFactory; import org.junit.jupiter.api.Test; import org.junit.runner.RunWith; import org.springframework.beans.factory.annotation.Autowired;