From 2eda63a08333887fc5340ba3d2d7d021231aa261 Mon Sep 17 00:00:00 2001 From: cyjseagull Date: Wed, 21 Oct 2020 02:33:47 +0800 Subject: [PATCH 1/2] fix account password property && add google java format --- build.gradle | 10 +++++++++- .../transaction/builder/TransactionBuilderService.java | 8 ++++---- src/test/resources/applicationContext-sample.xml | 2 +- 3 files changed, 14 insertions(+), 6 deletions(-) diff --git a/build.gradle b/build.gradle index 9f811c794..ca65b06b6 100644 --- a/build.gradle +++ b/build.gradle @@ -1,5 +1,6 @@ // Apply the java-library plugin to add support for Java Library plugins { + id 'com.github.sherter.google-java-format' version '0.8' id 'maven-publish' } println("Notice: current gradle version is " + gradle.gradleVersion) @@ -60,9 +61,9 @@ allprojects { // In this section you declare where to find the dependencies of your project repositories { + mavenCentral() maven { url "http://maven.aliyun.com/nexus/content/groups/public/" } maven { url "https://oss.sonatype.org/content/repositories/snapshots" } - mavenCentral() } dependencies { @@ -159,6 +160,13 @@ sourceSets { resources.srcDir file('src/integration-test/resources') } } + +googleJavaFormat { + options style: 'AOSP' + source = sourceSets*.allJava + include '**/*.java' +} + configurations { integrationTestCompile.extendsFrom testCompile integrationTestRuntime.extendsFrom testRuntime diff --git a/sdk-transaction/src/main/java/org/fisco/bcos/sdk/transaction/builder/TransactionBuilderService.java b/sdk-transaction/src/main/java/org/fisco/bcos/sdk/transaction/builder/TransactionBuilderService.java index 8c656f889..9532e70cc 100644 --- a/sdk-transaction/src/main/java/org/fisco/bcos/sdk/transaction/builder/TransactionBuilderService.java +++ b/sdk-transaction/src/main/java/org/fisco/bcos/sdk/transaction/builder/TransactionBuilderService.java @@ -15,14 +15,13 @@ package org.fisco.bcos.sdk.transaction.builder; import java.math.BigInteger; -import java.security.SecureRandom; +import java.util.Random; +import java.util.concurrent.ThreadLocalRandom; import org.fisco.bcos.sdk.client.Client; import org.fisco.bcos.sdk.transaction.model.gas.DefaultGasProvider; import org.fisco.bcos.sdk.transaction.model.po.RawTransaction; public class TransactionBuilderService implements TransactionBuilderInterface { - - private SecureRandom secureRandom = new SecureRandom(); private Client client; /** @@ -45,7 +44,8 @@ public RawTransaction createTransaction( BigInteger chainId, BigInteger groupId, String extraData) { - BigInteger randomId = new BigInteger(250, secureRandom); + Random r = ThreadLocalRandom.current(); + BigInteger randomId = new BigInteger(250, r); BigInteger blockLimit = client.getBlockLimit(); return RawTransaction.createTransaction( randomId, diff --git a/src/test/resources/applicationContext-sample.xml b/src/test/resources/applicationContext-sample.xml index a4684aec2..4310009b5 100644 --- a/src/test/resources/applicationContext-sample.xml +++ b/src/test/resources/applicationContext-sample.xml @@ -48,7 +48,7 @@ - + From ff45cc5e711362d1e9b875a935851ae9fd691fbf Mon Sep 17 00:00:00 2001 From: cyjseagull Date: Thu, 29 Oct 2020 14:48:50 +0800 Subject: [PATCH 2/2] upgrade netty version --- build.gradle | 2 +- .../transaction/codec/decode/TransactionDecoderService.java | 3 ++- .../fisco/bcos/sdk/transaction/model/dto/CommonResponse.java | 3 +-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/build.gradle b/build.gradle index ca65b06b6..b4188c078 100644 --- a/build.gradle +++ b/build.gradle @@ -19,7 +19,7 @@ ext { commonsLang3Version = "3.1" javapoetVersion = "1.7.0" picocliVersion = "3.6.0" - nettyVersion = "4.1.50.Final" + nettyVersion = "4.1.53.Final" nettySMSSLContextVersion = "1.2.0" toml4jVersion = "0.7.2" bcprovJDK15onVersion = "1.60" diff --git a/sdk-transaction/src/main/java/org/fisco/bcos/sdk/transaction/codec/decode/TransactionDecoderService.java b/sdk-transaction/src/main/java/org/fisco/bcos/sdk/transaction/codec/decode/TransactionDecoderService.java index 329eb7a9a..c7a54aa81 100644 --- a/sdk-transaction/src/main/java/org/fisco/bcos/sdk/transaction/codec/decode/TransactionDecoderService.java +++ b/sdk-transaction/src/main/java/org/fisco/bcos/sdk/transaction/codec/decode/TransactionDecoderService.java @@ -122,7 +122,8 @@ public Map>> decodeEvents(String abi, List logs) (name, events) -> { for (ABIDefinition abiDefinition : events) { ABIObjectFactory abiObjectFactory = new ABIObjectFactory(); - ABIObject outputObject = abiObjectFactory.createEventInputObject(abiDefinition); + ABIObject outputObject = + abiObjectFactory.createEventInputObject(abiDefinition); ABICodecObject abiCodecObject = new ABICodecObject(); for (Logs log : logs) { String eventSignature = diff --git a/sdk-transaction/src/main/java/org/fisco/bcos/sdk/transaction/model/dto/CommonResponse.java b/sdk-transaction/src/main/java/org/fisco/bcos/sdk/transaction/model/dto/CommonResponse.java index c395054a3..32ac334a6 100644 --- a/sdk-transaction/src/main/java/org/fisco/bcos/sdk/transaction/model/dto/CommonResponse.java +++ b/sdk-transaction/src/main/java/org/fisco/bcos/sdk/transaction/model/dto/CommonResponse.java @@ -42,8 +42,7 @@ public int getReturnCode() { return returnCode; } - /** - * @param returnCode the returnCode to set */ + /** @param returnCode the returnCode to set */ public void setReturnCode(int returnCode) { this.returnCode = returnCode; }