Merge pull request #229 from cyjseagull/release-2.7.1

sync code from release-2.7.1 to master

Author: cyjseagull

build.gradle

@@ -36,7 +36,7 @@ ext {
 // integrationTest.mustRunAfter test
 allprojects {
     group = 'org.fisco-bcos.java-sdk'
-    version = '2.7.0'
+    version = '2.7.1-SNAPSHOT'
     apply plugin: 'maven'
     apply plugin: 'maven-publish'
     apply plugin: 'idea'
@@ -48,7 +48,9 @@ allprojects {
     configurations.all {
         resolutionStrategy.cacheChangingModulesFor 30, 'seconds'
     }
-
+    jacoco {
+        toolVersion = "0.8.6"
+    }
     jacocoTestReport {
         reports {
             xml.enabled true
@@ -92,10 +94,32 @@ subprojects {
     }
     jar {
         destinationDir file("dist/apps")
-        archiveName project.name + "-" + version + ".jar"
+        archiveName "fisco-bcos-" + project.name + "-" + version + ".jar"
 
         exclude "**/*.xml"
         exclude "**/*.properties"
+        manifest {
+            try {
+                def repo = grgit.open(currentDir: project.rootDir)
+                if (repo != null) {
+                    def date = new Date().format("yyyy-MM-dd'T'HH:mm:ssZ")
+                    def branch = repo.branch.getCurrent().getName()
+                    def commit = repo.head().getAbbreviatedId(40)
+
+                    attributes(["Implementation-Timestamp": date,
+                                "Git-Branch"              : branch,
+                                "Git-Commit"              : commit
+                    ])
+
+                    logger.info("  Commit : ")
+                    logger.info("  => date: {}", date)
+                    logger.info("  => branch: {}", branch)
+                    logger.info("  => commit: {}", commit)
+                }
+            } catch (Exception e) {
+                logger.warn(' .git not exist, cannot found commit info, e: {}', e)
+            }
+        } from sourceSets.main.output
 
         doLast {
             copy {
@@ -112,22 +136,6 @@ subprojects {
             }
         }
     }
-
-    // for upload to maven
-    task sourcesJar(type: Jar) {
-        classifier = "sources"
-        from sourceSets.main.allSource
-    }
-
-    task javadocJar(type: Jar, dependsOn: javadoc) {
-        classifier = "javadoc"
-        from javadoc.destinationDir
-    }
-    artifacts {
-        archives jar
-        archives sourcesJar
-        archives javadocJar
-    }
 }
 
 sourceSets {
@@ -212,7 +220,7 @@ publishing {
     publications {
         mavenJava(MavenPublication) {
 
-            artifactId project.name
+            artifactId "fisco-bcos-" + project.name
             groupId project.group
             version project.version
 
@@ -264,7 +272,7 @@ publishing {
 
 jar {
     // destinationDir file('dist/apps')
-    // archiveName project.name + '-' + project.version + '.jar'
+    archiveName "fisco-bcos-" + project.name + '-' + project.version + '.jar'
     exclude '**/*.xml'
     exclude '**/*.properties'
 

sdk-abi/build.gradle

@@ -7,45 +7,66 @@ dependencies {
     compile ("org.apache.commons:commons-lang3:${commonsLang3Version}")
 }
 
-uploadArchives {
-    repositories {
-        mavenDeployer {
-            beforeDeployment { MavenDeployment deployment -> signing.signPom(deployment) }
+task sourcesJar(type: Jar) {
+    from sourceSets.main.allJava
+    archiveClassifier = 'sources'
+}
 
-            repository(url: "https://oss.sonatype.org/service/local/staging/deploy/maven2/") {
-                authentication(userName: ossrhUsername, password: ossrhPassword)
-            }
+task javadocJar(type: Jar) {
+    from javadoc
+    archiveClassifier = 'javadoc'
+}
+/*
+publishing {
+    publications {
+        mavenJava(MavenPublication) {
 
-            snapshotRepository(url: "https://oss.sonatype.org/content/repositories/snapshots/") {
-                authentication(userName: ossrhUsername, password: ossrhPassword)
-            }
+            artifactId "fisco-bcos-" + project.name
+            groupId project.group
+            version project.version
 
-            pom.project {
-                name project.name
-                packaging 'jar'
+            from components.java
+            artifact sourcesJar
+            artifact javadocJar
+            pom {
+                name = 'fisco-bcos'
                 description = 'fisco-bcos java-sdk'
                 url = 'http://www.fisco-bcos.org'
 
-                scm {
-                    connection = 'https://github.com/FISCO-BCOS/java-sdk.git'
-                    url = 'https://github.com/FISCO-BCOS/java-sdk.git'
-                }
-
                 licenses {
                     license {
                         name = 'The Apache License, Version 2.0'
                         url = 'http://www.apache.org/licenses/LICENSE-2.0.txt'
                     }
                 }
-
                 developers {
                     developer {
                         id = 'zhangsan'
                         name = 'zhangsan'
                         email = 'zhangsan@example.com'
                     }
                 }
+                scm {
+                    connection = 'https://github.com/FISCO-BCOS/java-sdk.git'
+                    url = 'https://github.com/FISCO-BCOS/java-sdk.git'
+                }
             }
         }
     }
-}
+    repositories {
+        maven {
+            def releasesRepoURL = "https://oss.sonatype.org/service/local/staging/deploy/maven2"
+            def snapshotsRepoURL = "https://oss.sonatype.org/content/repositories/snapshots"
+            url = !version.endsWith("SNAPSHOT") ? releasesRepoURL : snapshotsRepoURL
+
+            credentials {
+                username ossrhUsername
+                password ossrhPassword
+            }
+        }
+    }
+
+    signing {
+        sign publishing.publications.mavenJava
+    }
+}*/

sdk-abi/src/main/java/org/fisco/bcos/sdk/abi/ABICodec.java

@@ -18,6 +18,7 @@
 import java.io.IOException;
 import java.util.ArrayList;
 import java.util.List;
+import org.apache.commons.lang3.tuple.Pair;
 import org.fisco.bcos.sdk.abi.wrapper.ABICodecJsonWrapper;
 import org.fisco.bcos.sdk.abi.wrapper.ABICodecObject;
 import org.fisco.bcos.sdk.abi.wrapper.ABIDefinition;
@@ -254,12 +255,12 @@ public String encodeMethodByInterfaceFromString(String methodInterface, List<Str
         throw new ABICodecException(errorMsg);
     }
 
-    public List<Object> decodeMethod(ABIDefinition abiDefinition, String output)
-            throws ABICodecException {
+    public Pair<List<Object>, List<ABIObject>> decodeMethodAndGetOutputObject(
+            ABIDefinition abiDefinition, String output) throws ABICodecException {
         ABIObject outputABIObject = abiObjectFactory.createOutputObject(abiDefinition);
         ABICodecObject abiCodecObject = new ABICodecObject();
         try {
-            return abiCodecObject.decodeJavaObject(outputABIObject, output);
+            return abiCodecObject.decodeJavaObjectAndOutputObject(outputABIObject, output);
         } catch (Exception e) {
             logger.error(" exception in decodeMethodToObject : {}", e.getMessage());
         }
@@ -268,15 +269,15 @@ public List<Object> decodeMethod(ABIDefinition abiDefinition, String output)
         throw new ABICodecException(errorMsg);
     }
 
-    public List<Object> decodeMethod(String ABI, String methodName, String output)
-            throws ABICodecException {
+    public Pair<List<Object>, List<ABIObject>> decodeMethodAndGetOutputObject(
+            String ABI, String methodName, String output) throws ABICodecException {
         ContractABIDefinition contractABIDefinition = abiDefinitionFactory.loadABI(ABI);
         List<ABIDefinition> methods = contractABIDefinition.getFunctions().get(methodName);
         for (ABIDefinition abiDefinition : methods) {
             ABIObject outputABIObject = abiObjectFactory.createOutputObject(abiDefinition);
             ABICodecObject abiCodecObject = new ABICodecObject();
             try {
-                return abiCodecObject.decodeJavaObject(outputABIObject, output);
+                return abiCodecObject.decodeJavaObjectAndOutputObject(outputABIObject, output);
             } catch (Exception e) {
                 logger.error(" exception in decodeMethodToObject : {}", e.getMessage());
             }
@@ -287,6 +288,16 @@ public List<Object> decodeMethod(String ABI, String methodName, String output)
         throw new ABICodecException(errorMsg);
     }
 
+    public List<Object> decodeMethod(ABIDefinition abiDefinition, String output)
+            throws ABICodecException {
+        return decodeMethodAndGetOutputObject(abiDefinition, output).getLeft();
+    }
+
+    public List<Object> decodeMethod(String ABI, String methodName, String output)
+            throws ABICodecException {
+        return decodeMethodAndGetOutputObject(ABI, methodName, output).getLeft();
+    }
+
     public List<Object> decodeMethodById(String ABI, String methodId, String output)
             throws ABICodecException {
         ContractABIDefinition contractABIDefinition = abiDefinitionFactory.loadABI(ABI);