Squashed commit of the following:

commit 9f79d7f4dba3624c451fd9227240539a4626682f
Author: Matthew B White <whitemat@uk.ibm.com>
Date:   Thu Jan 23 15:16:03 2020 +0000

    [FABCJ-275] Fix coverage

    Correct perf tracing reset
    Add in coverage

    Signed-off-by: Matthew B White <whitemat@uk.ibm.com>

commit ac29118
Author: medikent <kbull@mediciventures.com>
Date:   Tue Jan 21 17:16:43 2020 -0700

    Correct typos in class names and descriptions

    Fix typos

    Signed-off-by: medikent <kbull@mediciventures.com>

Signed-off-by: medikent <kbull@mediciventures.com>

Author: medikent

ci/azure-pipelines.yml

@@ -45,7 +45,7 @@ pool:
   vmImage: "ubuntu-latest"
 
 # The stages and jobs, potential for rationalization and optimization
-# Keeping it simple and explict whilst we gain experience
+# Keeping it simple and explicit whilst we gain experience
 #
 stages:
   - stage: Build_and_test
@@ -71,6 +71,13 @@ stages:
                artifactName: checkstylereport
             displayName: 'Checkstyle'
             continueOnError: true
+          - task: PublishBuildArtifacts@1
+            condition: or(succeeded(), failed()) 
+            inputs:
+               pathToPublish: fabric-chaincode-shim/build/reports/jacoco/
+               artifactName: coveragereport
+            displayName: 'JaCoCo Coverage'
+            continueOnError: true            
           - task: PublishTestResults@2
             inputs:
               testResultsFormat: 'JUnit'
@@ -141,7 +148,7 @@ stages:
               git push https://$(GITHUB-PAT)@github.com/hyperledger/fabric-chaincode-java.git gh-pages
             displayName: 'Commit gh-pages changes'
 
-  # As the next script is more complex and uses loops, run this descretely in a sh file
+  # As the next script is more complex and uses loops, run this discretely in a sh file
   # Publishing step for git tags
   - stage: Publish_tag
     condition: and(succeeded(), startsWith(variables['Build.SourceBranch'], 'refs/tags'))

fabric-chaincode-integration-test/src/test/java/org/hyperleder/fabric/shim/integration/Command.java

@@ -84,7 +84,7 @@ public Result run(boolean quiet) {
      * 
      * @param is
      * @param stream
-     * @return Completable Future with the array list of the stdout/sstderr
+     * @return Completable Future with the array list of the stdout/stderr
      */
     CompletableFuture<ArrayList<String>> readOutStream(InputStream is, PrintStream stream) {
         return CompletableFuture.supplyAsync(() -> {

fabric-chaincode-shim/build.gradle

@@ -117,11 +117,11 @@ jacocoTestCoverageVerification {
                         'org.hyperledger.fabric.contract.routing.TransactionType',
                         'org.hyperledger.fabric.contract.metadata.MetadataBuilder',
                         'org.hyperledger.fabric.shim.ChaincodeBase*',
-                        'org.hyperledger.fabric.shim.impl.InnvocationTaskManager',
-                        'org.hyperledger.fabric.shim.impl.InnvocationStubImpl*',
+                        'org.hyperledger.fabric.shim.impl.InvocationTaskManager',
+                        'org.hyperledger.fabric.shim.impl.InvocationStubImpl*',
                         'org.hyperledger.fabric.shim.impl.ChaincodeSupportClient*',
-                        'org.hyperledger.fabric.shim.impl.InnvocationTaskExecutor',
-                        'org.hyperledger.fabric.shim.impl.ChaincodeInnvocationTask',
+                        'org.hyperledger.fabric.shim.impl.InvocationTaskExecutor',
+                        'org.hyperledger.fabric.shim.impl.ChaincodeInvocationTask',
                         'org.hyperledger.fabric.shim.impl.QueryResultsIteratorImpl*',
                         'org.hyperledger.fabric.shim.impl.ChaincodeMessageFactory']
             limit {
@@ -139,8 +139,8 @@ jacocoTestCoverageVerification {
                         'org.hyperledger.fabric.shim.impl.Handler',
                         'org.hyperledger.fabric.shim.ChaincodeBase',
                         'org.hyperledger.fabric.contract.metadata.MetadataBuilder',
-                        'org.hyperledger.fabric.shim.impl.InnvocationTaskManager',
-                        'org.hyperledger.fabric.shim.impl.InnvocationTaskExecutor',
+                        'org.hyperledger.fabric.shim.impl.InvocationTaskManager',
+                        'org.hyperledger.fabric.shim.impl.InvocationTaskExecutor',
                         'org.hyperledger.fabric.shim.impl.ChaincodeSupportClient',
                         'org.hyperledger.fabric.shim.impl.ChaincodeMessageFactory']
             limit {
@@ -352,4 +352,4 @@ tasks.withType(Test) {
             }
         }
     }
-}
+}

fabric-chaincode-shim/src/main/java/org/hyperledger/fabric/contract/ContractInterface.java

@@ -13,22 +13,22 @@
  * All Contracts should implement this interface, in addition to the
  * {@linkplain org.hyperledger.fabric.contract.annotation.Contract} annotation.
  * <p>
- * All the of the methods on this is inteface have default implementations; for
+ * All methods on this interface have default implementations; for
  * many contracts it may not be needed to sub-class these.
  * <p>
  * Each method on the Contract that is marked with the {@link Transaction}
  * annotation is considered a Transaction Function. This is eligible for
- * calling. Each transaction function is supplied with it's first parameter
- * being a {@link org.hyperledger.fabric.contract.Context} the other parameters
- * are at the developer's discretion.
+ * calling. Each transaction function is supplied with its first parameter
+ * being a {@link org.hyperledger.fabric.contract.Context}. The other parameters
+ * are supplied at the developer's discretion.
  * <p>
  * The sequence of calls is
  *
  * <pre>
  * createContext()  -&gt; beforeTransaction() -&gt; the transaction function -&gt; afterTransaction()
  * </pre>
  * <p>
- * If any of these functions throws an exception it is considered an error case,
+ * If any of these functions throws an exception it is considered an error case
  * and the whole transaction is failed. The
  * {@link org.hyperledger.fabric.contract.Context} is a very important object as
  * it provides transactional context for access to current transaction id,
@@ -41,10 +41,10 @@
  * ThreadLocal Storage. Ledger data is stored via the ledger api available via
  * the {@link Context}.
  * <p>
- * If information needs to be passed from the
- * {@link #beforeTransaction(Context)}
+ * If information needs to be passed from
+ * {@link #beforeTransaction(Context)} to
  * {@link #afterTransaction(Context, Object)} or between separate transaction
- * functions when called directory, then a subclass of the {@link Context}
+ * functions when called directly then a subclass of the {@link Context}
  * should be provided.
  */
 public interface ContractInterface {
@@ -56,7 +56,7 @@ public interface ContractInterface {
      * overwritten by contract
      *
      * @param stub Instance of the ChaincodeStub to use for this transaction
-     * @return instance of the context to use for the current transaciton being
+     * @return instance of the context to use for the current transaction being
      *         executed
      */
     default Context createContext(final ChaincodeStub stub) {

fabric-chaincode-shim/src/main/java/org/hyperledger/fabric/contract/annotation/Property.java

@@ -25,7 +25,7 @@
  * @Property(schema = {"pattern", "^[a-zA-Z\\s]{0,15}$"})
  * private String text;
  *
- * // How friendly is this on a scale of 1-5, 1 being formal, 5 being familar
+ * // How friendly is this on a scale of 1-5, 1 being formal, 5 being familiar
  * @Property(schema = {"minimum", "1", "maximum", "5"})
  * private int friendliness = 1;
  *

fabric-chaincode-shim/src/main/java/org/hyperledger/fabric/contract/execution/ExecutionFactory.java

@@ -26,7 +26,7 @@ public static ExecutionFactory getInstance() {
 
     /**
      * @param context Chaincode Context
-     * @return Innvocation request
+     * @return Invocation request
      */
     public InvocationRequest createRequest(final ChaincodeStub context) {
         return new ContractInvocationRequest(context);

fabric-chaincode-shim/src/main/java/org/hyperledger/fabric/contract/execution/InvocationRequest.java

@@ -9,7 +9,7 @@
 import java.util.List;
 
 /**
- * Innvocation Request.
+ * Invocation Request.
  *
  * All information needed to find
  * {@link org.hyperledger.fabric.contract.annotation.Contract} and invoke the

fabric-chaincode-shim/src/main/java/org/hyperledger/fabric/contract/execution/SerializerInterface.java

@@ -10,11 +10,11 @@
 
 /**
  * This interface allows contract developers to change the serialization
- * mechanism. There are two scenaios where instances of DataTypes are
+ * mechanism. There are two scenarios where instances of DataTypes are
  * serialized.
  *
  * When the objects are (logically) transferred from the Client application to
- * the Contract resulting in a transaction function being invoked. Typicaly this
+ * the Contract resulting in a transaction function being invoked. Typically this
  * is JSON, hence a default JSON parser is provided.
  *
  * The JSONTransactionSerializer can be extended if needed

fabric-chaincode-shim/src/main/java/org/hyperledger/fabric/contract/metadata/MetadataBuilder.java

@@ -144,7 +144,7 @@ public static void addComponent(final DataTypeDefinition datatype) {
      * Adds a new contract to the metadata as represented by the class object.
      *
      * @param contractDefinition Class of the object to use as a contract
-     * @return the key that the contract class is referred to in the meteadata
+     * @return the key that the contract class is referred to in the metadata
      */
     @SuppressWarnings("serial")
     public static String addContract(final ContractDefinition contractDefinition) {

fabric-chaincode-shim/src/main/java/org/hyperledger/fabric/contract/metadata/TypeSchema.java

@@ -148,7 +148,7 @@ public Class<?> getTypeClass(final TypeRegistry typeRegistry) {
                 clz = long.class;
                 break;
             default:
-                throw new RuntimeException("Unkown format for integer of " + format);
+                throw new RuntimeException("Unknown format for integer of " + format);
             }
         } else if (type.contentEquals("number")) {
             // need to check the format
@@ -161,7 +161,7 @@ public Class<?> getTypeClass(final TypeRegistry typeRegistry) {
                 clz = float.class;
                 break;
             default:
-                throw new RuntimeException("Unkown format for number of " + format);
+                throw new RuntimeException("Unknown format for number of " + format);
             }
         } else if (type.contentEquals("boolean")) {
             clz = boolean.class;