FABJ-288 lifecycle

PS
10 Code works end2end needs Fabric commits.
11 Reverse unintended changes.
12 Fix queries
13 Clean up
14 Make class name more consistent.
15 Added namespace query.
16 Cleanup
17 Update for chaincode hash
18 Update to support init on invoke call.
19 Update to latest fabric changes.
20 Remove unneeded setting in peer.yaml
21 Support for QueryApprovalStatus
22 Fix up validation parameter
23 Cleanup
24 Cleanup
25 Cleanup
26 Cleanup
27 Collections fixes.
28 Minor refactor
29 Find sequence number.
30 Parameter checking.
31 Cleanup Parameter checking.
32 Cleanup
33 Cleanup more checks.
34 Javadoc
35 Javadoc deprecated
36 Javadoc updates.
37 Change how sourceNone is specified.
38 Change source None to Unavailable
39 Javadoc updates
40 Add missing protobuf
41 Rebuilt orderer block and v2channel with implicit policies.
42 Remove whitespace
44 Remove reference to Token protos.

Change-Id: I324bf96511cc532aa1f0e53d3dc50a4ea445b686
Signed-off-by: rickr <cr22rc@gmail.com>

Author: cr22rc

README.md

@@ -239,6 +239,11 @@ and execute the following commands:
  * configtxgen --configPath . -outputCreateChannelTx foo.tx -profile TwoOrgsChannel_v13 -channelID foo
  * configtxgen --configPath . -outputCreateChannelTx bar.tx -profile TwoOrgsChannel_v13 -channelID bar
 
+For v2.0 integration, cd to the `src/test/fixture/sdkintegration/e2e-2Orgs/v2.0` directory
+ * configtxgen --configPath . -outputCreateChannelTx v2channel.tx -profile TwoOrgsChannel_v20 -channelID v2channel
+ * configtxgen --configPath . -outputBlock orderer.block -profile TwoOrgsOrdererGenesis_v20 -channelID systemOrdererChannel
+
+
  This should produce the following files in the same directory: orderer.block, foo.tx, and bar.tx
 
  **Note:** The above describes how this was done. If you redo this there are private key files

config.properties

@@ -43,6 +43,12 @@
 #org.hyperledger.fabric.sdk.client.thread_executor_keepalivetime=60
 ## the time unit for the {@code keepAliveTime} argument (SECONDS,MILLISECONDS,NANOSECDONS) see Java's TimeUnit
 #org.hyperledger.fabric.sdk.client.thread_executor_keepalivetimeunit=SECONDS
+## The default chaincode endorsement plugin.  This should never need setting unless you've changed peer to include another endorser plugin.
+#org.hyperledger.fabric.sdk.lifecycle.chaincode_endorsement_plugin
+## The default chaincode validation plugin.  This should never need setting unless you've changed peer to include another validation plugin.
+#org.hyperledger.fabric.sdk.lifecycle.chaincode_validation_plugin
+## The default if chaincode will require an init routine. The default is to not set the protobuf which sets to false.  / true or false
+#org.hyperledger.fabric.sdk.lifecycle.initRequiredDefault=false
 
 # System wide defaults for CryptoPrimitives objects. You can customize further by using the
 # CryptoPrimitives.setProperties() method.

src/main/java/org/hyperledger/fabric/sdk/BlockInfo.java

@@ -363,8 +363,8 @@ public EnvelopeType getType() {
     /**
      * Return a specific envelope in the block by it's index.
      *
-     * @param envelopeIndex
-     * @return EnvelopeInfo that contains information on the envelope.
+     * @param envelopeIndex the index into list.
+     * @return envelopeIndex the index
      * @throws InvalidProtocolBufferException
      */
 

src/main/java/org/hyperledger/fabric/sdk/ChaincodeCollectionConfiguration.java

@@ -50,6 +50,11 @@
 public class ChaincodeCollectionConfiguration {
     private static final Log logger = LogFactory.getLog(ChaincodeCollectionConfiguration.class);
     private static final Pattern noofPattern = Pattern.compile("^(\\d+)-of$");
+
+    Collection.CollectionConfigPackage getCollectionConfigPackage() {
+        return collectionConfigPackage;
+    }
+
     private Collection.CollectionConfigPackage collectionConfigPackage = null;
 
     ChaincodeCollectionConfiguration(JsonArray jsonConfig) throws ChaincodeCollectionConfigurationException {

src/main/java/org/hyperledger/fabric/sdk/ChaincodeEndorsementPolicy.java

@@ -18,6 +18,7 @@
 import java.io.FileInputStream;
 import java.io.IOException;
 import java.io.InputStream;
+import java.nio.file.Path;
 import java.util.HashMap;
 import java.util.LinkedHashMap;
 import java.util.List;
@@ -41,6 +42,9 @@
  */
 public class ChaincodeEndorsementPolicy {
     private static final Pattern noofPattern = Pattern.compile("^(\\d+)-of$");
+    /**
+     * Serialized Policies.SignaturePolicyEnvelope protobuf
+     */
     private byte[] policyBytes = null;
 
     /**
@@ -229,6 +233,7 @@ public void fromFile(File policyFile) throws IOException {
      * @param yamlPolicyFile File location for the chaincode endorsement policy specification.
      * @throws IOException
      * @throws ChaincodeEndorsementPolicyParseException
+     * @deprecated use {@link #fromYamlFile(Path)}
      */
 
     public void fromYamlFile(File yamlPolicyFile) throws IOException, ChaincodeEndorsementPolicyParseException {
@@ -252,6 +257,31 @@ public void fromYamlFile(File yamlPolicyFile) throws IOException, ChaincodeEndor
                 .build().toByteArray();
     }
 
+    public static ChaincodeEndorsementPolicy fromYamlFile(Path yamlPolicyFile) throws IOException, ChaincodeEndorsementPolicyParseException {
+        final Yaml yaml = new Yaml();
+        final Map<?, ?> load = (Map<?, ?>) yaml.load(new FileInputStream(yamlPolicyFile.toFile()));
+
+        Map<?, ?> mp = (Map<?, ?>) load.get("policy");
+
+        if (null == mp) {
+            throw new ChaincodeEndorsementPolicyParseException("The policy file has no policy section");
+        }
+
+        IndexedHashMap<String, MSPPrincipal> identities = parseIdentities((Map<?, ?>) load.get("identities"));
+
+        SignaturePolicy sp = parsePolicy(identities, mp);
+
+        ChaincodeEndorsementPolicy chaincodeEndorsementPolicy = new ChaincodeEndorsementPolicy();
+
+        chaincodeEndorsementPolicy.policyBytes = Policies.SignaturePolicyEnvelope.newBuilder()
+                .setVersion(0)
+                .addAllIdentities(identities.values())
+                .setRule(sp)
+                .build().toByteArray();
+
+        return chaincodeEndorsementPolicy;
+    }
+
     /**
      * Construct a chaincode endorsement policy from a stream.
      *
@@ -268,8 +298,20 @@ public void fromStream(InputStream inputStream) throws IOException {
      *
      * @param policyAsBytes the byte array containing the serialized policy
      */
-    public void fromBytes(byte[] policyAsBytes) {
-        this.policyBytes = policyAsBytes;
+    public static ChaincodeEndorsementPolicy fromBytes(byte[] policyAsBytes) {
+
+        ChaincodeEndorsementPolicy ret = new ChaincodeEndorsementPolicy();
+
+        ret.policyBytes = new byte[policyAsBytes.length];
+        System.arraycopy(policyAsBytes, 0, ret.policyBytes, 0, policyAsBytes.length);
+        return ret;
+    }
+
+    public byte[] getPolicyBytes() {
+
+        byte[] ret = new byte[policyBytes.length];
+        System.arraycopy(policyBytes, 0, ret, 0, policyBytes.length); // provide a copy.
+        return ret;
     }
 
     /**

src/main/java/org/hyperledger/fabric/sdk/ChaincodeID.java

@@ -16,6 +16,7 @@
 
 /**
  * ChaincodeID identifies chaincode.
+ * @deprecated See lifecycle install {@link LifecycleChaincodePackage}
  */
 public final class ChaincodeID {
 
@@ -29,6 +30,10 @@ public org.hyperledger.fabric.protos.peer.Chaincode.ChaincodeID getFabricChainco
         this.fabricChaincodeID = chaincodeID;
     }
 
+    /**
+     * @return
+     * @deprecated See lifecycle install {@link LifecycleChaincodePackage}
+     */
     public String getName() {
         return fabricChaincodeID.getName();
     }
@@ -99,6 +104,7 @@ public ChaincodeID build() {
     /**
      * Chaincode builder
      *
+     * @deprecated See lifecycle install {@link LifecycleChaincodePackage}
      * @return ChaincodeID builder.
      */