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

Author: davidawad

Features/cordaservice-autopayroll/Presentation1.pptx

@@ -42,7 +42,7 @@ flow start RequestFlowInitiator amount: 500, towhom: GeorgeJefferson
 ```
 As a result, we can check for the payment at GeorgeJefferson's node shell by running:
 ```
-run vaultQuery contractStateType: net.corda.examples.autopayroll.states.MoneyState
+run vaultQuery contractStateType: net.corda.samples.autopayroll.states.MoneyState
 ```
 We will see that George Jefferson received a `MoneyState` with amount $500.
 

Features/cordaservice-autopayroll/README.md

@@ -1,19 +1,22 @@
-buildscript {
+buildscript {//properties that you need to build the project
     Properties constants = new Properties()
     file("$projectDir/../constants.properties").withInputStream { constants.load(it) }
 
     ext {
-
         corda_release_group = constants.getProperty("cordaReleaseGroup")
-        corda_release_version = constants.getProperty("cordaVersion")
         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").toInteger()
+        //springboot
+        spring_boot_version = '2.0.2.RELEASE'
+        spring_boot_gradle_plugin_version = '2.0.2.RELEASE'
     }
 
     repositories {
@@ -27,10 +30,11 @@ 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"
     }
 }
 
-allprojects {
+allprojects {//Properties that you need to compile your project (The application)
     apply from: "${rootProject.projectDir}/repositories.gradle"
     apply plugin: 'java'
 
@@ -42,34 +46,99 @@ allprojects {
         maven { url 'https://jitpack.io' }
     }
 
-
-
     tasks.withType(JavaCompile) {
-        options.compilerArgs << "-parameters" // Required for shell commands.
+        options.compilerArgs << "-parameters" // Required by Corda's serialisation framework.
     }
 
     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.cordformation'
 apply plugin: 'net.corda.plugins.quasar-utils'
 
-cordapp {
-    info {
-        name "CorDapp AutoPayroll"
-        vendor "Corda Open Source"
-        targetPlatformVersion corda_platform_version
-        minimumPlatformVersion corda_platform_version
+sourceSets {
+    main {
+        resources {
+            srcDir rootProject.file("config/dev")
+        }
     }
 }
 
-task installQuasar(type: Copy) {
-    destinationDir rootProject.file("lib")
-    from(configurations.quasar) {
-        rename 'quasar-core(.*).jar', 'quasar.jar'
+//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 {
+        projectCordapp {
+            deploy = true
+        }
+        cordapp project(':contracts')
+        cordapp project(':workflows')
+        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=FinanceTeam,L=London,C=GB"
+        p2pPort 10005
+        rpcSettings {
+            address("localhost:10006")
+            adminAddress("localhost:10046")
+        }
+        rpcUsers = [[ user: "user1", "password": "test", "permissions": ["ALL"]]]
+    }
+    node {
+        name "O=PetersonThomas,L=New York,C=US"
+        p2pPort 10008
+        rpcSettings {
+            address("localhost:10009")
+            adminAddress("localhost:10049")
+        }
+        rpcUsers = [[ user: "user1", "password": "test", "permissions": ["ALL"]]]
+    }
+    node {
+        name "O=GeorgeJefferson,L=San Diego,C=US"
+        p2pPort 10011
+        rpcSettings {
+            address("localhost:10012")
+            adminAddress("localhost:10052")
+        }
+        rpcUsers = [[ user: "user1", "password": "test", "permissions": ["ALL"]]]
+    }
+    node {
+        name "O=BankOperator,L=Toronto,C=CA"
+        p2pPort 10014
+        rpcSettings {
+            address("localhost:10015")
+            adminAddress("localhost:10055")
+        }
+        rpcUsers = [[ user: "user1", "password": "test", "permissions": ["ALL"]]]
     }
 }
+

Features/cordaservice-autopayroll/build.gradle

@@ -14,6 +14,6 @@ cordapp {
 dependencies {
     // Corda dependencies.
     cordaCompile "$corda_core_release_group:corda-core:$corda_core_release_version"
-
+    cordaRuntime "$corda_release_group:corda:$corda_release_version"
     testCompile "$corda_release_group:corda-node-driver:$corda_release_version"
 }

Features/cordaservice-autopayroll/contracts/build.gradle

@@ -1,10 +1,10 @@
-package net.corda.examples.autopayroll.contracts;
+package net.corda.samples.autopayroll.contracts;
 
 import net.corda.core.contracts.CommandData;
 import net.corda.core.contracts.CommandWithParties;
 import net.corda.core.contracts.Contract;
 import net.corda.core.transactions.LedgerTransaction;
-import net.corda.examples.autopayroll.states.MoneyState;
+import net.corda.samples.autopayroll.states.MoneyState;
 
 import static net.corda.core.contracts.ContractsDSL.*;
 
@@ -13,7 +13,7 @@
 // ************
 public class MoneyStateContract implements Contract {
     // Used to identify our contract when building a transaction.
-    public static final String ID = "net.corda.examples.autopayroll.contracts.MoneyStateContract";
+    public static final String ID = "net.corda.samples.autopayroll.contracts.MoneyStateContract";
 
     // A transaction is valid if the verify() function of the contract of all the transaction's input and output states
     // does not throw an exception.

…ayroll/contracts/MoneyStateContract.java …ayroll/contracts/MoneyStateContract.javaFeatures/cordaservice-autopayroll/contracts/src/main/java/net/corda/examples/autopayroll/contracts/MoneyStateContract.java renamed to Features/cordaservice-autopayroll/contracts/src/main/java/net/corda/samples/autopayroll/contracts/MoneyStateContract.java Features/cordaservice-autopayroll/contracts/src/main/java/net/corda/examples/autopayroll/contracts/MoneyStateContract.java renamed to Features/cordaservice-autopayroll/contracts/src/main/java/net/corda/samples/autopayroll/contracts/MoneyStateContract.java

@@ -1,10 +1,10 @@
-package net.corda.examples.autopayroll.contracts;
+package net.corda.samples.autopayroll.contracts;
 
 import net.corda.core.contracts.CommandData;
 import net.corda.core.contracts.CommandWithParties;
 import net.corda.core.contracts.Contract;
 import net.corda.core.transactions.LedgerTransaction;
-import net.corda.examples.autopayroll.states.PaymentRequestState;
+import net.corda.samples.autopayroll.states.PaymentRequestState;
 
 import static net.corda.core.contracts.ContractsDSL.*;
 
@@ -13,7 +13,7 @@
 // ************
 public class PaymentRequestContract implements Contract {
     // Used to identify our contract when building a transaction.
-    public static final String ID = "net.corda.examples.autopayroll.contracts.PaymentRequestContract";
+    public static final String ID = "net.corda.samples.autopayroll.contracts.PaymentRequestContract";
 
     // A transaction is valid if the verify() function of the contract of all the transaction's input and output states
     // does not throw an exception.

…ll/contracts/PaymentRequestContract.java …ll/contracts/PaymentRequestContract.javaFeatures/cordaservice-autopayroll/contracts/src/main/java/net/corda/examples/autopayroll/contracts/PaymentRequestContract.java renamed to Features/cordaservice-autopayroll/contracts/src/main/java/net/corda/samples/autopayroll/contracts/PaymentRequestContract.java Features/cordaservice-autopayroll/contracts/src/main/java/net/corda/examples/autopayroll/contracts/PaymentRequestContract.java renamed to Features/cordaservice-autopayroll/contracts/src/main/java/net/corda/samples/autopayroll/contracts/PaymentRequestContract.java

@@ -1,13 +1,12 @@
-package net.corda.examples.autopayroll.states;
+package net.corda.samples.autopayroll.states;
 
 import net.corda.core.contracts.BelongsToContract;
 import net.corda.core.contracts.ContractState;
 import net.corda.core.identity.AbstractParty;
 import net.corda.core.identity.Party;
-import net.corda.examples.autopayroll.contracts.MoneyStateContract;
+import net.corda.samples.autopayroll.contracts.MoneyStateContract;
 import org.jetbrains.annotations.NotNull;
 
-import java.util.Arrays;
 import java.util.Collections;
 import java.util.List;
 

…mples/autopayroll/states/MoneyState.java …mples/autopayroll/states/MoneyState.javaFeatures/cordaservice-autopayroll/contracts/src/main/java/net/corda/examples/autopayroll/states/MoneyState.java renamed to Features/cordaservice-autopayroll/contracts/src/main/java/net/corda/samples/autopayroll/states/MoneyState.java Features/cordaservice-autopayroll/contracts/src/main/java/net/corda/examples/autopayroll/states/MoneyState.java renamed to Features/cordaservice-autopayroll/contracts/src/main/java/net/corda/samples/autopayroll/states/MoneyState.java

@@ -1,10 +1,10 @@
-package net.corda.examples.autopayroll.states;
+package net.corda.samples.autopayroll.states;
 
 import net.corda.core.contracts.BelongsToContract;
 import net.corda.core.contracts.ContractState;
 import net.corda.core.identity.AbstractParty;
 import net.corda.core.identity.Party;
-import net.corda.examples.autopayroll.contracts.PaymentRequestContract;
+import net.corda.samples.autopayroll.contracts.PaymentRequestContract;
 
 import java.util.List;
 

…opayroll/states/PaymentRequestState.java …opayroll/states/PaymentRequestState.javaFeatures/cordaservice-autopayroll/contracts/src/main/java/net/corda/examples/autopayroll/states/PaymentRequestState.java renamed to Features/cordaservice-autopayroll/contracts/src/main/java/net/corda/samples/autopayroll/states/PaymentRequestState.java Features/cordaservice-autopayroll/contracts/src/main/java/net/corda/examples/autopayroll/states/PaymentRequestState.java renamed to Features/cordaservice-autopayroll/contracts/src/main/java/net/corda/samples/autopayroll/states/PaymentRequestState.java

@@ -0,0 +1,38 @@
+package net.corda.samples.autopayroll.contracts;
+
+import net.corda.core.contracts.UniqueIdentifier;
+import net.corda.core.identity.CordaX500Name;
+import net.corda.samples.autopayroll.states.MoneyState;
+import net.corda.testing.core.TestIdentity;
+import net.corda.testing.node.MockServices;
+import org.junit.Test;
+
+import java.util.UUID;
+
+import static net.corda.testing.node.NodeTestUtils.ledger;
+
+public class ContractTests {
+    private final MockServices ledgerServices = new MockServices();
+    TestIdentity partya = new TestIdentity(new CordaX500Name("Alice",  "TestLand",  "US"));
+    TestIdentity partyb = new TestIdentity(new CordaX500Name("Bob",  "TestLand",  "US"));
+
+    @Test
+    public void NoNegativePayCheckValue() {
+        MoneyState tokenPass = new MoneyState(10,partyb.getParty());
+        MoneyState tokenfail = new MoneyState(-10,partyb.getParty());
+
+        ledger(ledgerServices, l -> {
+            l.transaction(tx -> {
+                tx.output(MoneyStateContract.ID, tokenfail);
+                tx.command(partya.getPublicKey(), new MoneyStateContract.Commands.Pay()); // Wrong amount.
+                return tx.fails();
+            });
+            l.transaction(tx -> {
+                tx.output(MoneyStateContract.ID, tokenPass);
+                tx.command(partya.getPublicKey(), new MoneyStateContract.Commands.Pay());
+                return tx.verifies();
+            });
+            return null;
+        });
+    }
+}

Features/cordaservice-autopayroll/contracts/src/test/java/net/corda/samples/autopayroll/contracts/ContractTests.java

@@ -0,0 +1,16 @@
+package net.corda.samples.autopayroll.contracts;
+import net.corda.samples.autopayroll.states.MoneyState;
+import net.corda.testing.node.MockServices;
+import org.junit.Test;
+
+public class StateTests {
+    private final MockServices ledgerServices = new MockServices();
+
+    @Test
+    public void hasFieldOfCorrectType() throws NoSuchFieldException {
+        // Does the message field exist?
+        MoneyState.class.getDeclaredField("amount");
+        // Is the message field of the correct type?
+        assert(MoneyState.class.getDeclaredField("amount").getType().equals(int.class));
+    }
+}