Merge pull request #35 from corda/AdvancedSamplesRevamp

Merge advanced folder into Q4cleanup

Author: peterli-r3

Advanced/README.md

@@ -1,19 +1,28 @@
-## samples-java/advanced-cordapps
+## Advanced Cordapp Samples 
 
 This folder features Advanced sample projects, each of them demonstrates a complex cordapp that uses multiple features of Corda.
 
-### [auction cordapp](./auction-cordapp):
+### [Auction Cordapp](./auction-cordapp):
 An blockchain application that leverages different features of Corda like [SchedulableState](https://docs.corda.net/docs/corda-os/event-scheduling.html#how-to-implement-scheduled-events), [StatePointer](https://docs.corda.net/docs/corda-os/api-states.html#state-pointers)
 and [OwnableState](https://docs.corda.net/docs/corda-os/api-states.html#ownablestate). It also demonstrates how to perform a DvP (Delivery vs Payment) transaction on Corda.  
-[<img src="../webIDE.png" height=25 />](https://ide.corda.net/?folder=/home/coder/samples-java/Advanced/auction-cordapp)
+<p align="center">
+  <img src="./auction-cordapp/snaps/setup.png" alt="Corda" width="600">
+</p>
 
-### [negotiation cordapp](./negotiation-cordapp):
+
+### [Negotiation Cordapp](./negotiation-cordapp):
 An application that depicts the businsess negotiation and communication process over a distributed ledger system.
 It consists of the proposing, negotiating, and settling a corda transaction.  
-[<img src="../webIDE.png" height=25 />](https://ide.corda.net/?folder=/home/coder/samples-java/Advanced/negotiation-cordapp)
 
-### [obligation cordapp](./obligation-cordapp):
+### [Obligation Cordapp](./obligation-cordapp):
 A simple i-owe-you application illustrates all of the steps of creating an obligation for a resource to change owners.  
-[<img src="../webIDE.png" height=25 />](https://ide.corda.net/?folder=/home/coder/samples-java/Advanced/obligation-cordapp)
 
+### [Secret Santa Cordapp](./secretsanta-cordapp):
+This is an imlementation of Secret Santa using Corda as a tool to store multiple game states.It has a material-ui frontend that lets users create and self-service their own secret santa games. The frontend is implemented in ReactJS and the backend is implemented with a Spring Boot server and some corda flows. It is also equipped with an external emailing package(sendgrid), which you can utilze and turn the app into a live app and send the secret santa assignments to your friends'
+emails.
 
+### [Snake and Ladder Game Cordapp](./snakesandladders-cordapp):
+This sample implements a simple Snakes And Ladder Game on Corda. This cordapp demonstrate the use of multiple features, including Corda Account Library and Oracle service.
+<p align="center">
+  <img src="./snakesandladders-cordapp/snaps/game.png" alt="Corda" width="500">
+</p>

Advanced/auction-cordapp/README.md

@@ -1,4 +1,4 @@
-# auction cordapp [<img src="../../webIDE.png" height=25 />](https://ide.corda.net/?folder=/home/coder/samples-java/Advanced/auction-cordapp)
+# Auction Cordapp 
 
 This CorDapp serves as a demo of building an auction application on Corda. It leverages
 different features of Corda like [SchedulableState](https://docs.corda.net/docs/corda-os/event-scheduling.html#how-to-implement-scheduled-events), [StatePointer](https://docs.corda.net/docs/corda-os/api-states.html#state-pointers) and [OwnableState](https://docs.corda.net/docs/corda-os/api-states.html#ownablestate). It also demonstrate
@@ -37,19 +37,19 @@ ownership. Left black for simplicity. Has two commands, `CreateAsset` and `Trans
 
 ### Flows:
 
-- `CreateAssetFlow`: This flow is used create an asset. Implemented in [CreateAssetFlow.java](./workflows/src/main/java/net/corda/samples/flows/CreateAssetFlow.java#L44-L66)
+- `CreateAssetFlow`: This flow is used create an asset. Implemented in `CreateAssetFlow.java`
 
-- `CreateAuctionFlow`: This flow is used to create an auction ([CreateAuctionFlow.java can be found here](./workflows/src/main/java/net/corda/samples/flows/CreateAuctionFlow.java#L58-L96)). Once an asset has been created using
+- `CreateAuctionFlow`: This flow is used to create an auction. Once an asset has been created using
 the`CreateAssetFlow`, this flow can be used to put the asset on auction. The `AuctionState`
 references to the `Asset` using a `StatePointer`.
 
 Refer here to learn more about StatePointer: https://medium.com/corda/linking-corda-states-using-statepointer-16e24e5e602
 
 - `BidFlow`: It is used to place a bid on an auction. Bids can be placed only till a predetermined
-deadline defined in the `AuctionState`. Implemented in [BidFlow.java](./workflows/src/main/java/net/corda/samples/flows/BidFlow.java#L42-L86).
+deadline defined in the `AuctionState`. Implemented in `BidFlow.java`.
 
 - `EndAuctionFlow`: This is a scheduled flow, which run automatically on auction deadline to mark
-the corresponding auction as inactive, so that it stop receiving bids.The auction flow can be found [here](./workflows/src/main/java/net/corda/samples/flows/EndAuctionFlow.java#L39-L83)
+the corresponding auction as inactive, so that it stop receiving bids.
 
 - `AuctionSettlementFlow`: It is used to settle an auction once the bidding deadline has passed. It internally triggers two flows:
 
@@ -63,10 +63,9 @@ the corresponding auction as inactive, so that it stop receiving bids.The auctio
 
 
 ## Usage
+## Pre-Requisites
+For development environment setup, please refer to: [Setup Guide](https://docs.corda.net/getting-set-up.html).
 
-### Pre-requisites:
-
-See https://docs.corda.net/getting-set-up.html.
 
 ### Running the nodes:
 Open a terminal and go to the project root directory and type: (to deploy the nodes using bootstrapper)

Advanced/negotiation-cordapp/README.md

@@ -1,4 +1,4 @@
-# negotiation cordapp [<img src="../../webIDE.png" height=25 />](https://ide.corda.net/?folder=/home/coder/samples-java/Advanced/negotiation-cordapp)
+# Negotiation Cordapp 
 
 This CorDapp shows how multi-party negotiation is handled on the Corda ledger, in the absence of an API for user
 interaction.
@@ -16,21 +16,20 @@ accept or modify the proposal, this attempt will be rejected automatically at th
 
 ### Flows
 
-We start with the proposal flow implemented in [ProposalFlow.java](./workflows/src/main/java/negotiation/flows/ProposalFlow.java)
+We start with the proposal flow implemented in `ProposalFlow.java`.
 
 
-The modification of the proposal is implemented in [ModificationFlow.java](./workflows/src/main/java/negotiation/flows/ModificationFlow.java#L42-L49).
+The modification of the proposal is implemented in `ModificationFlow.java`.
 
 
-In the [AcceptanceFlow.java](./workflows/src/main/java/negotiation/flows/AcceptanceFlow.java#L42-L75), we receive the modified ProposalState and it's converted into a TradeState.
+In the `AcceptanceFlow.java`, we receive the modified ProposalState and it's converted into a TradeState.
 
 
 
 ## Usage
+## Pre-Requisites
+For development environment setup, please refer to: [Setup Guide](https://docs.corda.net/getting-set-up.html).
 
-### Pre-requisites:
-
-See https://docs.corda.net/getting-set-up.html.
 
 
 ### Running the nodes:

Advanced/obligation-cordapp/README.md

@@ -1,26 +1,20 @@
-# obligation-cordap [<img src="../../webIDE.png" height=25 />](https://ide.corda.net/?folder=/home/coder/samples-java/Advanced/obligation-cordapp)
+# Obligation Cordap
 
 This Cordapp is the complete implementation of our signature IOU (I-owe-you) demonstration.
 
 ## Concepts
 
-An IOU is someone who has cash that is paying it back to someone they owe it to.
-
-You have to have the original concept of the debt itself, (the IOU), and the cash.
-
-Then the ability to exchange assets like cash or assets, and then the ability to settle up.
-
-Given this is intended to implement an IOU, our cordapp consists of three flows `issue`, `transfer` and `settle` flows.
+An IOU is someone who has cash that is paying it back to someone they owe it to. You have to have the original concept of the debt itself, (the IOU), and the cash. Then the ability to exchange assets like cash or assets, and then the ability to settle up. Given this is intended to implement an IOU, our cordapp consists of three flows `issue`, `transfer` and `settle` flows.
 
 
 ### Flows
 
-The first flows are the ones that issue the original cash and assets. You can find that the cash flow [here](./workflows/src/main/java/net/corda/samples/flows/SelfIssueCashFlow.java#L24-L32) and the IOU issurance in [IOUIssueFlow.java](./workflows/src/main/java/net/corda/samples/flows/IOUIssueFlow.java#L40-L80).
+The first flows are the ones that issue the original cash and assets. You can find that the cash flow at `SelfIssueCashFlow.java` and the IOU issurance in `IOUIssueFlow.java`.
 
-The next flow is the one that transfers ownership of that asset over to another party. That can be found in [IOUTransferFlow.java](./workflows/src/main/java/net/corda/samples/flows/IOUTransferFlow.java#L132-L159).
+The next flow is the one that transfers ownership of that asset over to another party. That can be found in `IOUTransferFlow.java`.
 
 
-Finally, once we have the ability to transfer assets, we just need to settle up. That functiionality can be found here in [IOUSettleFlow.java](./workflows/src/main/java/net/corda/samples/flows/IOUSettleFlow.java#L54-L116)
+Finally, once we have the ability to transfer assets, we just need to settle up. That functiionality can be found here in `IOUSettleFlow.java`
 
 
 

Advanced/secretsanta-cordapp/build.gradle

@@ -1,6 +1,6 @@
 buildscript { //properties that you need to build the project
     Properties constants = new Properties()
-    file("$projectDir/./constants.properties").withInputStream { constants.load(it) }
+    file("$projectDir/../constants.properties").withInputStream { constants.load(it) }
 
     ext {
         corda_release_group = constants.getProperty("cordaReleaseGroup")
@@ -108,21 +108,6 @@ dependencies {
     cordaCompile "org.apache.logging.log4j:log4j-slf4j-impl:${log4j_version}"
 }
 
-//Task to build the jar for ganache.
-task ganache {
-    subprojects {
-        if (it.project.name != "clients") {
-            dependsOn jar
-            doLast {
-                copy {
-                    from "${buildDir}/libs"
-                    into "${rootDir}/build/libs"
-                }
-            }
-        }
-    }
-}
-
 //Task to deploy the nodes in order to bootstrap a network
 task deployNodes(type: net.corda.plugins.Cordform, dependsOn: ['jar']) {
 

Advanced/secretsanta-cordapp/constants.properties

@@ -1,3 +1,3 @@
-name=Test
+name=Secret Santa
 group=com.secretsanta
 version=0.1

Advanced/secretsanta-cordapp/gradle.properties

@@ -49,9 +49,11 @@ allprojects {
         jcenter()
         mavenCentral()
         maven { url 'https://software.r3.com/artifactory/corda' }
+        maven { url 'https://jitpack.io' }
+        //SDK lib
         maven { url 'https://software.r3.com/artifactory/corda-lib' }
-        maven { url 'https://software.r3.com/artifactory/corda-lib-dev' }
-        maven { url "https://repo.gradle.org/gradle/libs-releases-local" }
+        //Gradle Plugins
+        maven { url 'https://repo.gradle.org/gradle/libs-releases' }
     }
 
     tasks.withType(JavaCompile) {
@@ -103,29 +105,6 @@ dependencies {
     cordapp "$accounts_release_group:accounts-workflows:$accounts_release_version"
 }
 
-cordapp {
-    info {
-        name "CorDapp Snakes And Ladders"
-        vendor "Corda Open Source"
-        targetPlatformVersion corda_platform_version
-        minimumPlatformVersion corda_platform_version
-    }
-}
-
-task ganache {
-    subprojects {
-        if (it.project.name != "clients") {
-            dependsOn jar
-            doLast {
-                copy {
-                    from "${buildDir}/libs"
-                    into "${rootDir}/build/libs"
-                }
-            }
-        }
-    }
-}
-
 task deployNodes(type: net.corda.plugins.Cordform, dependsOn: ['jar']) {
     nodeDefaults {
         projectCordapp {
@@ -182,6 +161,7 @@ task deployNodes(type: net.corda.plugins.Cordform, dependsOn: ['jar']) {
         cordapp project(":oracle-flows")
     }
 }
+
 task installQuasar(type: Copy) {
     destinationDir rootProject.file("lib")
     from(configurations.quasar) {

Advanced/snakesandladders-cordapp/.gitignore

@@ -1,13 +1,13 @@
-package net.corda.sample.snl.contracts;
+package net.corda.samples.snl.contracts;
 
 import net.corda.core.contracts.CommandData;
 import net.corda.core.contracts.Contract;
 import net.corda.core.transactions.LedgerTransaction;
-import net.corda.sample.snl.states.BoardConfig;
+import net.corda.samples.snl.states.BoardConfig;
 import org.jetbrains.annotations.NotNull;
 
 public class BoardConfigContract implements Contract {
-    public static String ID = "net.corda.sample.snl.contracts.BoardConfigContract";
+    public static String ID = "BoardConfigContract";
 
     @Override
     public void verify(@NotNull LedgerTransaction tx) throws IllegalArgumentException {