Merge pull request #37 from corda/featuresrevamp

merge Feature cordapp revamp into Q4 cleanup

Author: peterli-r3

Features/README.md

@@ -1,46 +1,45 @@
-## samples-java/feature-specific-cordapps
+## Feature Specific Cordapps
 
 This folder features several sample projects, each of them demonstrates different specific features of corda.
 
-### [attachment-blacklist](./attachment-blacklist):
+### [Blacklist -- Attachment](./attachment-blacklist):
 This CorDapp allows nodes to reach agreement over arbitrary strings of text, but only with parties that are not included in the blacklist uploaded to the nodes as an [attachment](https://training.corda.net/corda-details/attachments/).  
-[<img src="../webIDE.png" height=25 />](https://ide.corda.net/?folder=/home/coder/samples-java/Features/attachment-blacklist)
 
-### [attachment-sendfile](./attachment-sendfile):
+### [Sendfile -- Attachment](./attachment-sendfile):
 This Cordapp shows how to upload and download an [attachment](https://training.corda.net/corda-details/attachments/) via a flow.  
-[<img src="../webIDE.png" height=25 />](https://ide.corda.net/?folder=/home/coder/samples-java/Features/attachment-sendfile)
+<p align="center">
+  <img src="./attachment-sendfile/graph.png" alt="Corda" width="700">
+</p>
 
-### [confidential identity whistleblower](./confidentialidentity-whistleblower):
+### [Whistleblower -- Confidential Identity ](./confidentialidentity-whistleblower):
 This CorDapp is a simple showcase of [confidential identities](https://docs.corda.net/docs/corda-os/api-identity.html#confidential-identities) (i.e. anonymous public keys).  
-[<img src="../webIDE.png" height=25 />](https://ide.corda.net/?folder=/home/coder/samples-java/Features/confidentialidentity-whistleblower)
 
-### [service autopayroll](./cordaservice-autopayroll):
+### [Autopayroll -- CordaService](./cordaservice-autopayroll):
 This Cordapp shows how to trigger a flow with vault update(completion of prior flows) using [CordaService](https://training.corda.net/corda-details/automation/#services) & [trackby](https://training.corda.net/corda-details/automation-solution/#track-and-notify).  
-[<img src="../webIDE.png" height=25 />](https://ide.corda.net/?folder=/home/coder/samples-java/Features/cordaservice-autopayroll)
+<p align="center">
+  <img src="./cordaservice-autopayroll/webpic/Business%20Logic.png" alt="Corda" width="500">
+</p>
 
-### [observable states trade reporting](./observablestates-tradereporting):
+### [Trade Reporting -- ObservableStates](./observablestates-tradereporting):
 This CorDapp shows how Corda's [observable states](https://docs.corda.net/docs/corda-os/4.4/tutorial-observer-nodes.html#observer-nodes) feature works. Observable states is the ability for nodes who are not participants in a transaction to still store them if the transactions are sent to them.  
-[<img src="../webIDE.png" height=25 />](https://ide.corda.net/?folder=/home/coder/samples-java/Features/observablestates-tradereporting)
 
-### [oracle prime number](./oracle-primenumber):
+### [Prime Number -- Oracle](./oracle-primenumber):
 This CorDapp implements an [oracle service](https://training.corda.net/corda-details/oracles) that allows nodes to:
 
 * Request the Nth prime number
 * Request the oracle's signature to prove that the number included in their transaction is actually the Nth prime number  
 
-[<img src="../webIDE.png" height=25 />](https://ide.corda.net/?folder=/home/coder/samples-java/Features/oracle-primenumber)
 
-### [queryable state car insurance](./queryablestate-carinsurance):
+### [Car Insurance -- QueryableState](./queryablestate-carinsurance):
 This CorDapp demonstrates [QueryableState](https://docs.corda.net/docs/corda-os/api-persistence.html) works in Corda. Corda allows developers to have the ability to expose some or all parts of their states to a custom database table using an ORM tools. To support this feature the state must implement `QueryableState`.  
-[<img src="../webIDE.png" height=25 />](https://ide.corda.net/?folder=/home/coder/samples-java/Features/queryablestate-carinsurance)
 
-### [reference states and sanctionsbody](./referencestates-sanctionsbody):
+### [Sanctionsbody -- ReferenceStates](./referencestates-sanctionsbody):
 This CorDapp demonstrates the use of [reference states](https://training.corda.net/corda-details/reference-states/) in a transaction and in the verification method of a contract.
 
 This CorDapp allows two nodes to enter into an IOU agreement, but enforces that both parties belong to a list of sanctioned entities. This list of sanctioned entities is taken from a referenced SanctionedEntities state.  
-[<img src="../webIDE.png" height=25 />](https://ide.corda.net/?folder=/home/coder/samples-java/Features/referencestates-sanctionsbody)
 
-### [heartbeat schedulable state](./schedulablestate-heartbeat):
+### [Heartbeat -- SchedulableState](./schedulablestate-heartbeat):
 This CorDapp is a simple showcase of [scheduled activities](https://docs.corda.net/docs/corda-os/event-scheduling.html#how-to-implement-scheduled-events) (i.e. activities started by a node at a specific time without direct input from the node owner).  
-[<img src="../webIDE.png" height=25 />](https://ide.corda.net/?folder=/home/coder/samples-java/Features/schedulablestate-heartbeat)
-
+<p align="center">
+  <img src="./schedulablestate-heartbeat/heart.jpg" alt="Corda" width="500">
+</p>

Features/attachment-blacklist/README.md

@@ -1,4 +1,4 @@
-# blacklist cordapp [<img src="../../webIDE.png" height=25 />](https://ide.corda.net/?folder=/home/coder/samples-java/Features/attachment-blacklist)
+# Blacklist -- Attachment 
 
 This CorDapp allows nodes to reach agreement over arbitrary strings of text, but only with parties that are not included in the blacklist uploaded to the nodes as an [attachment](https://training.corda.net/corda-details/attachments/).
 
@@ -15,22 +15,15 @@ parties as being banned from entering into agreements:
 * Tifton Banking Company
 
 The blacklist jar is uploaded as an attachment when building a transaction, and used in the `AgreementContract` to
-check that the parties to the `AgreementState` are not blacklisted.
-
-### Flows
-
-There aren't many flows here, so it's quick to cover.
-
-There's a [proposal](./workflows/src/main/java/net/corda/examples/attachments/ProposeFlow.java) and [acceptance](./workflows/src/main/java/net/corda/examples/attachments/AgreeFlow.java) flow, and the blacklist is added as an attachment [here](./workflows/src/main/java/net/corda/examples/attachments/ProposeFlow.java#L47-L50).
+check that the parties to the `AgreementState` are not blacklisted. There aren't many flows here, so it's quick to cover. There's a proposal and acceptance flow, and the blacklist is added as an attachment.
 
 
 
 ## Usage
 
+## Pre-Requisites
 
-### Pre-requisites:
-
-See https://docs.corda.net/getting-set-up.html.
+For development environment setup, please refer to: [Setup Guide](https://docs.corda.net/getting-set-up.html).
 
 
 ### Running the CorDapp
@@ -54,8 +47,8 @@ be able to *initiate* an agreement. The blacklist can be uploaded via [RPC](http
 project's root folder:
 
 Java version
-* Unix/Mac OSX: ` ./gradlew clients-java:uploadBlacklist`
-* Windows: `gradlew clients-java:uploadBlacklist`
+* Unix/Mac OSX: ` ./gradlew uploadBlacklist`
+* Windows: `gradlew uploadBlacklist`
 
 Or by running the `Upload blacklist` run configuration from IntelliJ.
 
@@ -71,7 +64,7 @@ the shell of Monogram Bank:
 
     start ProposeFlow agreementTxt: "A and B agree Y", counterparty: "Hiseville Deposit Bank", untrustedPartiesAttachment: "4CEC607599723D7E0393EB5F05F24562732CD1B217DEAEDEABD4C25AFE5B333A"
 
-If you now run `run vaultQuery contractStateType: net.corda.examples.attachments.states.AgreementState` on either the
+If you now run `run vaultQuery contractStateType: net.corda.samples.blacklist.states.AgreementState` on either the
 Monogram Bank or Hiseville Deposit Bank node, you should see the agreement stored:
 
     data: !<net.corda.examples.attachments.state.AgreementState>

Features/attachment-blacklist/build.gradle

@@ -4,13 +4,16 @@ buildscript {
 
     ext {
         corda_release_group = constants.getProperty("cordaReleaseGroup")
+        corda_core_release_group = constants.getProperty("cordaCoreReleaseGroup")
         corda_release_version = constants.getProperty("cordaVersion")
+        corda_core_release_version = constants.getProperty("cordaCoreVersion")
         corda_gradle_plugins_version = constants.getProperty("gradlePluginsVersion")
+        kotlin_version = constants.getProperty("kotlinVersion")
         junit_version = constants.getProperty("junitVersion")
         quasar_version = constants.getProperty("quasarVersion")
         log4j_version = constants.getProperty("log4jVersion")
         slf4j_version = constants.getProperty("slf4jVersion")
-        corda_platform_version = constants.getProperty("platformVersion")
+        corda_platform_version = constants.getProperty("platformVersion").toInteger()
         spring_boot_version = '2.0.2.RELEASE'
         ext.spring_boot_gradle_plugin_version = '2.0.2.RELEASE'
     }
@@ -31,6 +34,8 @@ buildscript {
 }
 
 allprojects {
+    apply from: "${rootProject.projectDir}/repositories.gradle"
+    apply plugin: 'java'
 
     repositories {
         mavenLocal()
@@ -53,4 +58,86 @@ allprojects {
         options.compilerArgs << "-parameters" // Required for shell commands.
     }
 
-}
+    jar {
+        // This makes the JAR's SHA-256 hash repeatable.
+        preserveFileTimestamps = false
+        reproducibleFileOrder = true
+        duplicatesStrategy = DuplicatesStrategy.EXCLUDE
+    }
+}
+
+apply plugin: 'net.corda.plugins.cordapp'
+apply plugin: 'net.corda.plugins.quasar-utils'
+apply plugin: 'net.corda.plugins.cordformation'
+
+sourceSets {
+    main {
+        resources {
+            srcDir rootProject.file("config/dev")
+        }
+    }
+}
+
+//Module dependencis
+dependencies {
+    // Corda dependencies.
+    cordaCompile "$corda_core_release_group:corda-core:$corda_core_release_version"
+    cordaCompile "$corda_release_group:corda-node-api:$corda_release_version"
+    cordaRuntime "$corda_release_group:corda:$corda_release_version"
+
+    // CorDapp dependencies.
+    cordapp project(":workflows")
+    cordapp project(":contracts")
+
+    cordaCompile "org.apache.logging.log4j:log4j-slf4j-impl:${log4j_version}"
+    cordaCompile "org.apache.logging.log4j:log4j-web:${log4j_version}"
+    cordaCompile "org.slf4j:jul-to-slf4j:$slf4j_version"
+}
+
+task deployNodes(type: net.corda.plugins.Cordform, dependsOn: ['jar']) {
+    nodeDefaults {
+        cordapp project(':workflows')
+        cordapp project(':contracts')
+        runSchemaMigration = true
+    }
+
+    node {
+        name "O=Notary,L=London,C=GB"
+        notary = [validating: false]
+        p2pPort 10002
+        rpcSettings {
+            address("localhost:10003")
+            adminAddress("localhost:10043")
+        }
+    }
+
+    node {
+        name "O=Monogram Bank,L=London,C=GB"
+        p2pPort 10005
+        rpcSettings {
+            address("localhost:10006")
+            adminAddress("localhost:10046")
+        }
+        rpcUsers = [[user: "user1", "password": "test", "permissions": ["ALL"]]]
+    }
+
+    node {
+        name "O=Hiseville Deposit Bank,L=Sao Paulo,C=BR"
+        p2pPort 10008
+        rpcSettings {
+            address("localhost:10009")
+            adminAddress("localhost:10049")
+        }
+        rpcUsers = [[user: "user1", "password": "test", "permissions": ["ALL"]]]
+    }
+
+    node {
+        name "O=George State Bank,L=New York,C=US"
+        p2pPort 10011
+        rpcSettings {
+            address("localhost:10012")
+            adminAddress("localhost:10052")
+        }
+        rpcUsers = [[user: "user1", "password": "test", "permissions": ["ALL"]]]
+    }
+}

Features/attachment-blacklist/clients/build.gradle

@@ -27,17 +27,11 @@ dependencies {
 }
 
 springBoot {
-    mainClassName = "net.corda.examples.attachments.webserver.Server"
-}
-
-task runWebServer(type: JavaExec, dependsOn: assemble) {
-    classpath = sourceSets.main.runtimeClasspath
-    main = 'net.corda.examples.attachments.webserver.Starter'
-    args '--server.port=10050', '--config.rpc.host=localhost', '--config.rpc.port=10006', '--config.rpc.username=user1', '--config.rpc.password=test'
+    mainClassName = "net.corda.samples.blacklist.webserver.Server"
 }
 
 task uploadBlacklist(type: JavaExec, dependsOn: assemble) {
     classpath = sourceSets.main.runtimeClasspath
-    main = 'net.corda.examples.attachments.client.Client'
+    main = 'net.corda.samples.blacklist.client.Client'
     args 'localhost:10006', 'localhost:10009', 'localhost:10012'
 }

…/examples/attachments/client/Client.java …rda/samples/blacklist/client/Client.javaFeatures/attachment-blacklist/clients/src/main/java/net/corda/examples/attachments/client/Client.java renamed to Features/attachment-blacklist/clients/src/main/java/net/corda/samples/blacklist/client/Client.java Features/attachment-blacklist/clients/src/main/java/net/corda/examples/attachments/client/Client.java renamed to Features/attachment-blacklist/clients/src/main/java/net/corda/samples/blacklist/client/Client.java

@@ -1,11 +1,12 @@
-package net.corda.examples.attachments.client;
+package net.corda.samples.blacklist.client;
 
 import com.google.common.base.Charsets;
 import net.corda.client.rpc.CordaRPCClient;
 import net.corda.client.rpc.CordaRPCConnection;
 import net.corda.core.crypto.SecureHash;
 import net.corda.core.messaging.CordaRPCOps;
 import net.corda.core.utilities.NetworkHostAndPort;
+import net.corda.samples.blacklist.Constants;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -15,8 +16,6 @@
 import java.util.jar.JarInputStream;
 import java.util.stream.Collectors;
 
-import static net.corda.examples.attachments.Constants.*;
-
 public class Client {
 
     private static class Companion {
@@ -37,13 +36,13 @@ public static void main(String[] args) throws IOException {
             CordaRPCConnection rpcConnection = new CordaRPCClient(nodeAddress).start("user1", "test");
             CordaRPCOps proxy = rpcConnection.getProxy();
 
-            SecureHash attachmentHash = BLACKLIST_JAR_HASH;
+            SecureHash attachmentHash = Constants.BLACKLIST_JAR_HASH;
 
             // take relative path using substring of constant BLACKLIST_JAR_PATH, check if node contains blacklist already
             if (!proxy.attachmentExists(attachmentHash)) {
                 System.out.println("Working Directory = " +
                         System.getProperty("user.dir"));
-                attachmentHash = uploadAttachment(proxy, BLACKLIST_JAR_PATH);
+                attachmentHash = uploadAttachment(proxy, Constants.BLACKLIST_JAR_PATH);
                 Companion.logger.info("Blacklist uploaded to node at " + nodeAddress);
             } else {
                 Companion.logger.info("Node already contains Blacklist, skipping upload at " + nodeAddress);
@@ -52,7 +51,7 @@ public static void main(String[] args) throws IOException {
             JarInputStream attachmentJar = downloadAttachment(proxy, attachmentHash);
             Companion.logger.info("Blacklist downloaded from node at " + nodeAddress);
 
-            checkAttachment(attachmentJar, ATTACTMENT_FILE_NAME, ATTACHMENT_EXPECTED_CONTENTS);
+            checkAttachment(attachmentJar, Constants.ATTACTMENT_FILE_NAME, Constants.ATTACHMENT_EXPECTED_CONTENTS);
             Companion.logger.info("Attachment contents checked on node at " + nodeAddress);
         }
 
@@ -83,7 +82,7 @@ private static void checkAttachment(JarInputStream attachmentJar, String expecte
             name = attachmentJar.getNextEntry().getName();
         }
 
-        BufferedInputStream bisAttachmentJar = new BufferedInputStream(attachmentJar, (8*1024));
+        BufferedInputStream bisAttachmentJar = new BufferedInputStream(attachmentJar, (8 * 1024));
         InputStreamReader isrAttachmentJar = new InputStreamReader(bisAttachmentJar, Charsets.UTF_8);
         BufferedReader brAttachmentJar = new BufferedReader(isrAttachmentJar);
 

Features/attachment-blacklist/contracts/build.gradle

@@ -10,7 +10,7 @@ cordapp {
     targetPlatformVersion corda_platform_version.toInteger()
     minimumPlatformVersion corda_platform_version.toInteger()
     contract {
-        name "Blacklist"
+        name "Attachments Blacklist"
         vendor "Corda Open Source"
         licence "Apache License, Version 2.0"
         versionId 1
@@ -28,4 +28,4 @@ dependencies {
     cordaCompile "$corda_release_group:corda-rpc:$corda_release_version"
     cordaRuntime "$corda_release_group:corda:$corda_release_version"
 
-}
+}

…orda/examples/attachments/Constants.java …t/corda/samples/blacklist/Constants.javaFeatures/attachment-blacklist/contracts/src/main/java/net/corda/examples/attachments/Constants.java renamed to Features/attachment-blacklist/contracts/src/main/java/net/corda/samples/blacklist/Constants.java Features/attachment-blacklist/contracts/src/main/java/net/corda/examples/attachments/Constants.java renamed to Features/attachment-blacklist/contracts/src/main/java/net/corda/samples/blacklist/Constants.java

@@ -1,4 +1,4 @@
-package net.corda.examples.attachments;
+package net.corda.samples.blacklist;
 
 import net.corda.core.crypto.SecureHash;
 
@@ -25,4 +25,4 @@ public interface Constants {
     );
     // This jar exists, but does not meet the constraints imposed by AttachmentContract.
     String INCORRECT_JAR_PATH = "src/test/resources/invalid.jar";
-}
+}

…chments/contracts/AgreementContract.java …acklist/contracts/AgreementContract.javaFeatures/attachment-blacklist/contracts/src/main/java/net/corda/examples/attachments/contracts/AgreementContract.java renamed to Features/attachment-blacklist/contracts/src/main/java/net/corda/samples/blacklist/contracts/AgreementContract.java Features/attachment-blacklist/contracts/src/main/java/net/corda/examples/attachments/contracts/AgreementContract.java renamed to Features/attachment-blacklist/contracts/src/main/java/net/corda/samples/blacklist/contracts/AgreementContract.java

@@ -1,12 +1,12 @@
-package net.corda.examples.attachments.contracts;
+package net.corda.samples.blacklist.contracts;
 
 import com.google.common.base.Charsets;
 import net.corda.core.contracts.*;
 import net.corda.core.crypto.SecureHash;
 import net.corda.core.identity.AbstractParty;
 import net.corda.core.identity.Party;
 import net.corda.core.transactions.LedgerTransaction;
-import net.corda.examples.attachments.states.AgreementState;
+import net.corda.samples.blacklist.states.AgreementState;
 
 import java.io.BufferedReader;
 import java.io.IOException;
@@ -20,7 +20,7 @@
 import java.util.stream.Collectors;
 
 public class AgreementContract implements Contract {
-    public static final String AGREEMENT_CONTRACT_ID = "net.corda.examples.attachments.contracts.AgreementContract";
+    public static final String AGREEMENT_CONTRACT_ID = "net.corda.samples.blacklist.contracts.AgreementContract";
     private static SecureHash BLACKLIST_JAR_HASH = SecureHash.parse("4CEC607599723D7E0393EB5F05F24562732CD1B217DEAEDEABD4C25AFE5B333A");
 
     @Override
@@ -40,7 +40,7 @@ public void verify(LedgerTransaction tx) {
             return null;
         });
 
-        // Constraints on the included attachments.
+        // Constraints on the included blacklist.
         List<Attachment> nonContractAttachments = tx.getAttachments()
                 .stream()
                 .filter(p -> !(p instanceof ContractAttachment))
@@ -55,7 +55,7 @@ public void verify(LedgerTransaction tx) {
 
             // TODO: Switch to constraint on the jar's signer.
             // In the future, Corda will support singing of jars. We will then be able to restrict
-            // the attachments used to just those signed by party X.
+            // the blacklist used to just those signed by party X.
             req.using("The jar's hash should be correct", attached.getId().equals(BLACKLIST_JAR_HASH));
             return null;
         });
@@ -118,6 +118,7 @@ public void verify(LedgerTransaction tx) {
     }
 
     public interface Commands extends CommandData {
-        class Agree extends TypeOnlyCommandData implements Commands {}
+        class Agree extends TypeOnlyCommandData implements Commands {
+        }
     }
 }