obligation cordapp cleaned

Author: davidawad

Advanced/obligation-cordapp/build.gradle

@@ -60,8 +60,6 @@ allprojects {
 }
 
 
-
-
 apply plugin: 'net.corda.plugins.cordapp'
 apply plugin: 'net.corda.plugins.cordformation'
 apply plugin: 'net.corda.plugins.quasar-utils'
@@ -75,15 +73,18 @@ sourceSets {
 }
 
 dependencies {
+
     // Corda dependencies.
     cordaCompile "$corda_core_release_group:corda-core:$corda_core_release_version"
     cordaCompile "$corda_release_group:corda-finance-contracts:$corda_release_version"
     cordaCompile "$corda_release_group:corda-finance-workflows:$corda_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")
+
     cordapp "$corda_release_group:corda-finance-contracts:$corda_release_version"
     cordapp "$corda_release_group:corda-finance-workflows:$corda_release_version"
     cordapp "$corda_release_group:corda-confidential-identities:$corda_release_version"
@@ -95,7 +96,7 @@ dependencies {
 
 cordapp {
     info {
-        name "CorDapp Template"
+        name "Obligation Cordapp"
         vendor "Corda Open Source"
         targetPlatformVersion corda_platform_version
         minimumPlatformVersion corda_platform_version
@@ -107,8 +108,10 @@ task deployNodes(type: net.corda.plugins.Cordform, dependsOn: ['jar']) {
         projectCordapp {
             deploy = false
         }
-        cordapp project(':contracts')
-        cordapp project(':workflows')
+
+        cordapp project(":workflows")
+        cordapp project(":contracts")
+
 	runSchemaMigration = true
         cordapp("$corda_release_group:corda-finance-contracts:$corda_release_version")
         cordapp("$corda_release_group:corda-finance-workflows:$corda_release_version")

Advanced/obligation-cordapp/clients/src/main/java/net/corda/samples/server/MainController.java

@@ -9,11 +9,11 @@
 import net.corda.core.node.NodeInfo;
 import net.corda.core.transactions.SignedTransaction;
 import net.corda.finance.contracts.asset.Cash;
-import net.corda.samples.flows.IOUIssueFlow;
-import net.corda.samples.flows.IOUSettleFlow;
-import net.corda.samples.flows.IOUTransferFlow;
-import net.corda.samples.flows.SelfIssueCashFlow;
-import net.corda.samples.states.IOUState;
+import net.corda.samples.obligation.flow.IOUIssueFlow;
+import net.corda.samples.obligation.flow.IOUSettleFlow;
+import net.corda.samples.obligation.flow.IOUTransferFlow;
+import net.corda.samples.obligation.flow.SelfIssueCashFlow;
+import net.corda.samples.obligation.state.IOUState;
 import java.time.LocalDateTime;
 import java.time.ZoneId;
 import java.util.*;
@@ -122,12 +122,12 @@ private String notaries() {
         return proxy.notaryIdentities().toString();
     }
 
-    @GetMapping(value = "/flows", produces = TEXT_PLAIN_VALUE)
+    @GetMapping(value = "/flow", produces = TEXT_PLAIN_VALUE)
     private String flows() {
         return proxy.registeredFlows().toString();
     }
 
-    @GetMapping(value = "/states", produces = TEXT_PLAIN_VALUE)
+    @GetMapping(value = "/state", produces = TEXT_PLAIN_VALUE)
     private String states() {
         return proxy.vaultQuery(ContractState.class).getStates().toString();
     }
@@ -229,4 +229,4 @@ public ResponseEntity<String> selfIssueCash(@RequestParam(value = "amount") int
             return ResponseEntity.status(HttpStatus.BAD_REQUEST).body(e.getMessage());
         }
     }
-}
+}

Advanced/obligation-cordapp/contracts/build.gradle

@@ -5,7 +5,7 @@ cordapp {
     targetPlatformVersion corda_platform_version
     minimumPlatformVersion corda_platform_version
     contract {
-        name "Template CorDapp"
+        name "Obligation Cordapp Contracts"
         vendor "Corda Open Source"
         licence "Apache License, Version 2.0"
         versionId 1
@@ -20,7 +20,7 @@ sourceSets {
         }
     }
     test{
-        java{
+        java {
             srcDir 'src/test/java'
             java.outputDir = file('bin/test')
         }
@@ -37,4 +37,4 @@ dependencies {
     testCompile "$corda_release_group:corda-node-driver:$corda_release_version"
     cordapp "$corda_release_group:corda-finance-contracts:$corda_release_version"
     cordapp "$corda_release_group:corda-finance-workflows:$corda_release_version"
-}
+}

…corda/samples/contracts/IOUContract.java …les/obligation/contract/IOUContract.javaAdvanced/obligation-cordapp/contracts/src/main/java/net/corda/samples/contracts/IOUContract.java renamed to Advanced/obligation-cordapp/contracts/src/main/java/net/corda/samples/obligation/contract/IOUContract.java Advanced/obligation-cordapp/contracts/src/main/java/net/corda/samples/contracts/IOUContract.java renamed to Advanced/obligation-cordapp/contracts/src/main/java/net/corda/samples/obligation/contract/IOUContract.java

@@ -1,4 +1,4 @@
-package net.corda.samples.contracts;
+package net.corda.samples.obligation.contract;
 
 import net.corda.core.contracts.*;
 
@@ -9,7 +9,7 @@
 import net.corda.core.identity.Party;
 import net.corda.core.transactions.LedgerTransaction;
 import net.corda.finance.contracts.asset.Cash;
-import net.corda.samples.states.IOUState;
+import net.corda.samples.obligation.state.IOUState;
 
 import java.security.PublicKey;
 import java.util.*;
@@ -24,7 +24,7 @@
 
 @LegalProseReference(uri = "<prose_contract_uri>")
 public class IOUContract implements Contract {
-    public static final String IOU_CONTRACT_ID = "net.corda.samples.contracts.IOUContract";
+    public static final String IOU_CONTRACT_ID = "net.corda.samples.obligation.contract.IOUContract";
 
     /**
      * The IOUContract can handle three transaction types involving [IOUState]s.
@@ -123,7 +123,7 @@ else if (commandData.equals(new Commands.Settle())) {
                 List<LedgerTransaction.InOutGroup<IOUState, UniqueIdentifier>> groups = tx.groupStates(IOUState.class, IOUState::getLinearId);
                 require.using("There must be one input IOU.", groups.get(0).getInputs().size() > 0);
 
-                // Check that there are output cash states.
+                // Check that there are output cash state.
                 List<Cash.State> allOutputCash = tx.outputsOfType(Cash.State.class);
                 require.using("There must be output cash.", !allOutputCash.isEmpty());
 
@@ -177,4 +177,4 @@ else if (commandData.equals(new Commands.Settle())) {
 
     }
 
-}
+}

…a/net/corda/samples/states/IOUState.java …a/samples/obligation/state/IOUState.javaAdvanced/obligation-cordapp/contracts/src/main/java/net/corda/samples/states/IOUState.java renamed to Advanced/obligation-cordapp/contracts/src/main/java/net/corda/samples/obligation/state/IOUState.java Advanced/obligation-cordapp/contracts/src/main/java/net/corda/samples/states/IOUState.java renamed to Advanced/obligation-cordapp/contracts/src/main/java/net/corda/samples/obligation/state/IOUState.java

@@ -1,4 +1,4 @@
-package net.corda.samples.states;
+package net.corda.samples.obligation.state;
 
 import net.corda.core.contracts.*;
 import net.corda.core.identity.Party;
@@ -7,7 +7,7 @@
 import java.util.*;
 import com.google.common.collect.ImmutableList;
 import net.corda.core.serialization.ConstructorForDeserialization;
-import net.corda.samples.contracts.IOUContract;
+import net.corda.samples.obligation.contract.IOUContract;
 
 /**
  * The IOU State object, with the following properties:
@@ -16,7 +16,7 @@
  * - [borrower] The borrowing party.
  * - [contract] Holds a reference to the [IOUContract]
  * - [paid] Records how much of the [amount] has been paid.
- * - [linearId] A unique id shared by all LinearState states representing the same agreement throughout history within
+ * - [linearId] A unique id shared by all LinearState state representing the same agreement throughout history within
  *   the vaults of all parties. Verify methods should check that one input and one output share the id in a transaction,
  *   except at issuance/termination.
  */
@@ -93,4 +93,4 @@ public IOUState copy(Amount<Currency> amount, Party lender, Party borrower, Amou
         return new IOUState(amount, lender, borrower, paid, this.getLinearId());
     }
 
-}
+}

Advanced/obligation-cordapp/contracts/src/test/java/net/corda/samples/contracts/ContractTests.java

@@ -0,0 +1,13 @@
+package net.corda.samples.obligation;
+
+import net.corda.core.identity.CordaX500Name;
+import net.corda.testing.core.TestIdentity;
+
+public class TestUtils {
+    public static TestIdentity ALICE = new TestIdentity(new CordaX500Name("Alice", "TestLand", "US"));
+    public static TestIdentity BOB = new TestIdentity(new CordaX500Name("Bob", "TestCity", "US"));
+    public static TestIdentity CHARLIE = new TestIdentity(new CordaX500Name("Charlie", "TestVillage", "US"));
+    public static TestIdentity MINICORP = new TestIdentity(new CordaX500Name("MiniCorp", "MiniLand", "US"));
+    public static TestIdentity MEGACORP = new TestIdentity(new CordaX500Name("MegaCorp", "MiniLand", "US"));
+    public static TestIdentity DUMMY = new TestIdentity(new CordaX500Name("Dummy", "FakeLand", "US"));
+}