[FAB-13802] Metadata Support

- Added a classes to represent logical aspects of the contracts;
  these are stored in 2 registries
- Metadata Builder uses these classes to create the JSON form of
  the metadata
- As does the router to get access to the code to execute
- Added a Contract specific runtime exception to help with
  explaining to users what went wrong
- Found that the Commons logging never picked up on the debug
  statements; so added a simple wrapper
  to route via standard java.util.logging. also allowed some
  extra processing for exceptions
- Adjusted a number of the log points to use lambdas to improve
  performance
- White space removal

Change-Id: I9752b2e7c2ba62f521abbdbfcc86b3c4f2baa693
Signed-off-by: Matthew B. White <[email protected]>

Author: mbwhite

build.gradle

@@ -12,6 +12,8 @@ allprojects {
         mavenLocal()
         jcenter()
         maven { url "https://oss.sonatype.org/content/repositories/snapshots" }
+        maven { url 'https://jitpack.io' }
+        mavenCentral()
     }
 }
 
@@ -34,4 +36,8 @@ subprojects {
         testCompile 'org.mockito:mockito-core:2.23.0'
         testCompile 'com.github.stefanbirkner:system-rules:1.17.0'
     }
-}
+
+        tasks.withType(JavaCompile) {
+            options.compilerArgs << "-Xlint:unchecked" << "-Xlint:deprecation"
+        }
+    }

fabric-chaincode-docker/build.gradle

@@ -6,7 +6,10 @@
 
 buildscript {
     repositories {
+        mavenLocal()
         jcenter()
+        maven { url "https://oss.sonatype.org/content/repositories/snapshots" }
+        maven { url 'https://jitpack.io' }
         mavenCentral()
     }
     dependencies {

fabric-chaincode-example-gradle/build.gradle

@@ -11,6 +11,7 @@ sourceCompatibility = 1.8
 repositories {
     mavenLocal()
     mavenCentral()
+    maven { url 'https://jitpack.io' }
 }
 
 dependencies {

fabric-chaincode-example-maven/pom.xml

@@ -9,6 +9,13 @@
         <java.version>1.8</java.version>
     </properties>
 
+    <repositories>
+        <repository>
+            <id>jitpack.io</id>
+            <url>https://jitpack.io</url>
+        </repository>
+    </repositories>
+
     <dependencies>
 
         <dependency>

fabric-chaincode-integration-test/bin/.gitignore

@@ -0,0 +1 @@
+/test/

fabric-chaincode-protos/bin/.gitignore

@@ -0,0 +1 @@
+/main/

fabric-chaincode-shim/bin/.gitignore

@@ -0,0 +1,3 @@
+/test/
+/main/
+/default/

fabric-chaincode-shim/build.gradle

@@ -11,6 +11,11 @@ plugins {
     id 'signing'
 }
 
+tasks.withType(org.gradle.api.tasks.testing.Test) {
+    systemProperty 'CORE_CHAINCODE_LOGGING_LEVEL', 'DEBUG'
+}
+
+
 dependencies {
     compile project(':fabric-chaincode-protos')
     compile 'io.netty:netty-tcnative-boringssl-static:2.0.7.Final'
@@ -19,6 +24,8 @@ dependencies {
     compile 'org.bouncycastle:bcprov-jdk15on:1.60'
     compile 'org.reflections:reflections:0.9.11'
     compile group: 'cglib', name: 'cglib', version: '3.2.10'
+    implementation 'com.github.everit-org.json-schema:org.everit.json.schema:1.11.1'
+    implementation group: 'org.json', name: 'json', version: '20180813'
 }
 
 sourceSets {
@@ -27,6 +34,7 @@ sourceSets {
             srcDirs 'src/main/java'
         }
 
+
     }
 
     test {
@@ -67,6 +75,9 @@ jacocoTestCoverageVerification {
                         'org.hyperledger.fabric.shim.impl.Handler',
                         'org.hyperledger.fabric.shim.impl.ChaincodeSupportStream.1',
                         'org.hyperledger.fabric.contract.ContractRouter',
+                        'org.hyperledger.fabric.contract.routing.impl.ContractDefinitionImpl',
+                        'org.hyperledger.fabric.contract.routing.RoutingRegistry',
+                        'org.hyperledger.fabric.contract.execution.impl.ContractInvocationRequest',
                         'org.hyperledger.fabric.contract.routing.TransactionType']
             limit {
                 minimum = 0.86
@@ -77,9 +88,12 @@ jacocoTestCoverageVerification {
             element = 'CLASS'
             includes = ['org.hyperledger.fabric.shim.helper.Channel',
                         'org.hyperledger.fabric.contract.ContractRouter',
+                        'org.hyperledger.fabric.contract.execution.impl.ContractInvocationRequest',
+                        'org.hyperledger.fabric.contract.routing.impl.ContractDefinitionImpl',
+                        'org.hyperledger.fabric.contract.routing.RoutingRegistry',
                         'org.hyperledger.fabric.shim.impl.Handler']
             limit {
-                minimum = 0.79
+                minimum = 0.71
             }
         }
     }
@@ -99,6 +113,7 @@ task licenseCheck {
         sourceSet ->
             sourceSet.allSource.findAll { !it.path.contains("build") && !it.path.contains("test/resources")}.each {
                 file ->
+                if  (!file.name.contains("json")){
                     BufferedReader r = new BufferedReader(new FileReader(file))
                     def line, hasSPDX = false, hasTraditional = false
                     while ((line = r.readLine()) != null) {
@@ -118,6 +133,7 @@ task licenseCheck {
                             missing.add(file)
                         }
                     }
+                }
             }
     }
 
@@ -238,3 +254,43 @@ artifacts {
 
 
 build.dependsOn licenseCheck
+
+// setup more detailed test output formats
+import org.gradle.api.tasks.testing.logging.TestExceptionFormat
+import org.gradle.api.tasks.testing.logging.TestLogEvent
+
+tasks.withType(Test) {
+    testLogging {
+        // set options for log level LIFECYCLE
+        events TestLogEvent.FAILED,
+               TestLogEvent.PASSED,
+               TestLogEvent.SKIPPED,
+               TestLogEvent.STANDARD_OUT
+        exceptionFormat TestExceptionFormat.FULL
+        showExceptions true
+        showCauses true
+        showStackTraces true
+
+        // set options for log level DEBUG and INFO
+        debug {
+            events TestLogEvent.STARTED,
+                   TestLogEvent.FAILED,
+                   TestLogEvent.PASSED,
+                   TestLogEvent.SKIPPED,
+                   TestLogEvent.STANDARD_ERROR,
+                   TestLogEvent.STANDARD_OUT
+            exceptionFormat TestExceptionFormat.FULL
+        }
+        info.events = debug.events
+        info.exceptionFormat = debug.exceptionFormat
+
+        afterSuite { desc, result ->
+            if (!desc.parent) { // will match the outermost suite
+                def output = "Results: ${result.resultType} (${result.testCount} tests, ${result.successfulTestCount} successes, ${result.failedTestCount} failures, ${result.skippedTestCount} skipped)"
+                def startItem = '|  ', endItem = '  |'
+                def repeatLength = startItem.length() + output.length() + endItem.length()
+                println('\n' + ('-' * repeatLength) + '\n' + startItem + output + endItem + '\n' + ('-' * repeatLength))
+            }
+        }
+    }
+}

fabric-chaincode-shim/src/main/java/commons-logging.properties

@@ -30,4 +30,3 @@ java.util.logging.FileHandler.limit=50000
 # Optional - The number of files to cycle through, by
 # appending an integer to the base file name:
 java.util.logging.FileHandler.count=10
-

fabric-chaincode-shim/src/main/java/org/hyperledger/fabric/Logger.java

@@ -0,0 +1,58 @@
+/*
+Copyright IBM Corp. All Rights Reserved.
+
+SPDX-License-Identifier: Apache-2.0
+*/
+package org.hyperledger.fabric;
+
+import java.io.PrintWriter;
+import java.io.StringWriter;
+import java.util.function.Supplier;
+import java.util.logging.Level;
+
+public class Logger extends java.util.logging.Logger{
+
+    protected Logger(String name) {
+        super(name, null);
+    }
+
+    public static Logger getLogger(String name) {
+        return new Logger(name);
+    }
+
+    public void debug(Supplier<String> msgSupplier) {
+        log(Level.FINEST, msgSupplier);
+    }
+
+    public void debug(String msg) {
+        log(Level.FINEST, msg);
+    }
+
+    public static Logger getLogger(Class<?> class1) {
+        return Logger.getLogger(class1.getName());
+    }
+
+    public void error(String message) {
+        log(Level.SEVERE,message);
+    }
+
+    public void error(Supplier<String> msgSupplier) {
+        log(Level.SEVERE, msgSupplier);
+    }
+
+    public String formatError(Throwable throwable) {
+        if (throwable == null) return null;
+        final StringWriter buffer = new StringWriter();
+        buffer.append(throwable.getMessage());
+        throwable.printStackTrace(new PrintWriter(buffer));
+
+        Throwable cause = throwable.getCause();
+        if (cause != null) {
+            buffer.append(".. caused by ..");
+            buffer.append(this.formatError(cause));
+        }
+
+        return buffer.toString();
+    }
+
+}