Merge branch 'featuresrevamp' of https://github.com/corda/samples-java into featuresrevamp

Author: davidawad

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

Features/attachment-sendfile/README.md

@@ -1,5 +1,4 @@
-# attachzip -- attachment demo [<img src="../../webIDE.png" height=25 />](https://ide.corda.net/?folder=/home/coder/samples-java/Features/attachment-sendfile)
-
+# Sendfile -- Attachment
 This Cordapp shows how to upload and download an [attachment](https://training.corda.net/corda-details/attachments/) via flow.
 
 
@@ -12,8 +11,7 @@ In this Cordapp, there are two parties:
 
 ### States
 
-You'll want to take a quick look at [InvoiceState.java](./contracts/src/main/java/net/corda/examples/sendfile/states/InvoiceState.java#L21)
-
+You'll want to take a quick look at `InvoiceState.java`
 ```java
 public InvoiceState(String invoiceAttachmentID, List<AbstractParty> participants) {
     this.invoiceAttachmentID = invoiceAttachmentID;
@@ -24,7 +22,7 @@ public InvoiceState(String invoiceAttachmentID, List<AbstractParty> participants
 
 ### Flows
 
-There are two flows [`sendAttachment`](./workflows/src/main/java/net/corda/examples/sendfile/flows/SendAttachment.java#L47-L67) and [`downloadAttachment`](./workflows/src/main/java/net/corda/examples/sendfile/flows/DownloadAttachment.java#L47-L66).
+There are two flows `sendAttachment`and `downloadAttachment`.
 
 The flow logic is the following:
 

Features/confidentialidentity-whistleblower/README.md

@@ -1,4 +1,4 @@
-# whistle blower cordapp [<img src="../../webIDE.png" height=25 />](https://ide.corda.net/?folder=/home/coder/samples-java/Features/confidentialidentity-whistleblower)
+# Whistleblower -- Confidential Identity 
 
 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).
 
@@ -12,16 +12,12 @@ who manage to get ahold of the state cannot identity the whistle-blower or inves
 automatically by the `SwapIdentitiesFlow`.
 
 
-You can find `SwapIdentitiesFlow` [here](./workflows/src/main/java/net/corda/examples/whistleblower/flows/BlowWhistleFlow.java#L117-L121).
-
-
-
 ## 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

Features/cordaservice-autopayroll/README.md

@@ -1,4 +1,4 @@
-# autopayroll -- cordaservice demo [<img src="../../webIDE.png" height=25 />](https://ide.corda.net/?folder=/home/coder/samples-java/Features/cordaservice-autopayroll)
+# Auto Payroll -- CordaService
 
 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).
 
@@ -10,7 +10,7 @@ In this Cordapp, there are four parties:
  - PetersonThomas: worker #1 will accept money
  - GeorgeJefferson: worker #2 will accept money
 
-There are two states [`PaymentRequestState`](./contracts/src/main/java/net/corda/examples/autopayroll/states/PaymentRequestState.java#L20-L24) & [`MoneyState`](./contracts/src/main/java/net/corda/examples/autopayroll/states/MoneyState.java#L23-L26), and two flows `RequestFlow` & `PaymentFlow`. The business logic looks like the following:
+There are two states `PaymentRequestState` & `MoneyState`, and two flows `RequestFlow` & `PaymentFlow`. The business logic looks like the following:
 ![alt text](./webpic/Business%20Logic.png)
 
 1. Finance team put in payroll request to the bank operators
@@ -20,9 +20,9 @@ There are two states [`PaymentRequestState`](./contracts/src/main/java/net/corda
 ## 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
 

Features/notarychange-iou/README.md

@@ -1,4 +1,4 @@
-# IOU - NotaryChange Demo [<img src="../../webIDE.png" height=25 />](https://ide.corda.net/?folder=/home/coder/samples-java/Features/notarychange-iou)
+# IOU - NotaryChange 
 
 This CorDapp serves as a demo of a Notary Change Transaction in Corda which can be performed 
 using one of the Corda library flow called `NotaryChangeFlow`.
@@ -71,4 +71,4 @@ start SwitchNotaryFlow linearId: <linear id received from issue transaction>, ne
 Now, we should be able to settle the IOU at NotaryB successfully. To settle go to PartyB terminal and run:
 ```
 start SettleFlow linearId: <linear id received from issue transaction>, notary: NotaryB
-```
+```

Features/notarychange-iou/build.gradle

@@ -15,9 +15,6 @@ buildscript {
         log4j_version = constants.getProperty("log4jVersion")
         slf4j_version = constants.getProperty("slf4jVersion")
         corda_platform_version = constants.getProperty("platformVersion").toInteger()
-        //springboot
-        spring_boot_version = '2.0.2.RELEASE'
-        spring_boot_gradle_plugin_version = '2.0.2.RELEASE'
     }
 
     repositories {
@@ -31,7 +28,6 @@ buildscript {
         classpath "net.corda.plugins:cordapp:$corda_gradle_plugins_version"
         classpath "net.corda.plugins:cordformation:$corda_gradle_plugins_version"
         classpath "net.corda.plugins:quasar-utils:$corda_gradle_plugins_version"
-        classpath "org.springframework.boot:spring-boot-gradle-plugin:$spring_boot_gradle_plugin_version"
 
     }
 }
@@ -91,15 +87,6 @@ dependencies {
     cordaCompile "org.slf4j:jul-to-slf4j:$slf4j_version"
 }
 
-cordapp {
-    info {
-        name "Notary Change Demo"
-        vendor "Corda Open Source"
-        targetPlatformVersion corda_platform_version
-        minimumPlatformVersion corda_platform_version
-    }
-}
-
 task deployNodes(type: net.corda.plugins.Cordform, dependsOn: ['jar']) {
     nodeDefaults {
         projectCordapp {

Features/notarychange-iou/contracts/build.gradle

@@ -4,7 +4,7 @@ cordapp {
     targetPlatformVersion corda_platform_version
     minimumPlatformVersion corda_platform_version
     contract {
-        name "AutoPayroll Contracts"
+        name "Notary-Change Contracts"
         vendor "Corda Open Source"
         licence "Apache License, Version 2.0"
         versionId 1

Features/notarychange-iou/contracts/src/main/java/net/corda/examples/notarychange/contracts/IOUContract.java

@@ -0,0 +1,34 @@
+package net.corda.samples.notarychange.contracts;
+
+import net.corda.core.contracts.CommandData;
+import net.corda.core.contracts.Contract;
+import net.corda.core.transactions.LedgerTransaction;
+import net.corda.core.contracts.CommandWithParties;
+import net.corda.samples.notarychange.states.IOUState;
+import static net.corda.core.contracts.ContractsDSL.requireThat;
+
+public class IOUContract implements Contract {
+    public static final String ID = "net.corda.samples.notarychange.contracts.IOUContract";
+
+    /**
+     * The verify() function of all the states' contracts must not throw an exception for a transaction to be
+     * considered valid.
+     */
+    @Override
+    public void verify(LedgerTransaction tx) {
+        requireThat(require -> {
+            final CommandWithParties<CommandData> command = tx.getCommands().get(0);
+            if( command.getValue() instanceof  Commands.Create) {
+                final IOUState out = tx.outputsOfType(IOUState.class).get(0);
+                // IOU-specific constraints.
+                require.using("The IOU's value must be non-negative.", out.getValue() > 0);
+            }
+            return null;
+        });
+    }
+
+    public interface Commands extends CommandData {
+        class Create implements Commands { }
+        class Settle implements Commands { }
+    }
+}