Skip to content

Commit efc5c49

Browse files
davidawaddavidawad
committed
plural names for java packages
1 parent 5948633 commit efc5c49

File tree

41 files changed

+285
-284
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

41 files changed

+285
-284
lines changed

Advanced/auction-cordapp/client/src/main/java/net/corda/samples/client/APIResponse.java renamed to Advanced/auction-cordapp/client/src/main/java/net/corda/samples/auction/client/APIResponse.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package net.corda.samples.client;
1+
package net.corda.samples.auction.client;
22

33
/**
44
* A wrapper to send response from the rest calls.

Advanced/auction-cordapp/client/src/main/java/net/corda/samples/client/AppConfig.java renamed to Advanced/auction-cordapp/client/src/main/java/net/corda/samples/auction/client/AppConfig.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package net.corda.samples.client;
1+
package net.corda.samples.auction.client;
22

33
import com.fasterxml.jackson.databind.ObjectMapper;
44
import net.corda.client.jackson.JacksonSupport;

Advanced/auction-cordapp/client/src/main/java/net/corda/samples/client/Controller.java renamed to Advanced/auction-cordapp/client/src/main/java/net/corda/samples/auction/client/Controller.java

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package net.corda.samples.client;
1+
package net.corda.samples.auction.client;
22

33
import net.corda.core.contracts.Amount;
44
import net.corda.core.contracts.StateAndRef;
@@ -7,9 +7,11 @@
77
import net.corda.core.utilities.OpaqueBytes;
88
import net.corda.finance.contracts.asset.Cash;
99
import net.corda.finance.flows.CashIssueAndPaymentFlow;
10+
import net.corda.samples.auction.flows.*;
11+
import net.corda.samples.auction.flows.auction.flow.*;
12+
import net.corda.samples.auction.states.Asset;
13+
import net.corda.samples.auction.states.AuctionState;
1014
import net.corda.samples.flows.*;
11-
import net.corda.samples.states.Asset;
12-
import net.corda.samples.states.AuctionState;
1315
import org.springframework.beans.factory.annotation.Autowired;
1416
import org.springframework.beans.factory.annotation.Qualifier;
1517
import org.springframework.web.bind.annotation.*;

Advanced/auction-cordapp/client/src/main/java/net/corda/samples/client/Forms.java renamed to Advanced/auction-cordapp/client/src/main/java/net/corda/samples/auction/client/Forms.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package net.corda.samples.client;
1+
package net.corda.samples.auction.client;
22

33
public class Forms {
44

Advanced/auction-cordapp/client/src/main/java/net/corda/samples/client/Starter.java renamed to Advanced/auction-cordapp/client/src/main/java/net/corda/samples/auction/client/Starter.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package net.corda.samples.client;
1+
package net.corda.samples.auction.client;
22

33
import org.springframework.boot.Banner;
44
import org.springframework.boot.SpringApplication;
@@ -15,4 +15,4 @@ public static void main(String[] args) {
1515
app.run(args);
1616
}
1717

18-
}
18+
}

Advanced/auction-cordapp/contracts/src/main/java/net/corda/samples/contracts/AssetContract.java renamed to Advanced/auction-cordapp/contracts/src/main/java/net/corda/samples/auction/contracts/AssetContract.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package net.corda.samples.contracts;
1+
package net.corda.samples.auction.contracts;
22

33
import net.corda.core.contracts.CommandData;
44
import net.corda.core.contracts.Contract;

Advanced/auction-cordapp/contracts/src/main/java/net/corda/samples/contracts/AuctionContract.java renamed to Advanced/auction-cordapp/contracts/src/main/java/net/corda/samples/auction/contracts/AuctionContract.java

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,20 +1,20 @@
1-
package net.corda.samples.contracts;
1+
package net.corda.samples.auction.contracts;
22

33
import net.corda.core.contracts.Command;
44
import net.corda.core.contracts.CommandData;
55
import net.corda.core.contracts.Contract;
66
import net.corda.core.transactions.LedgerTransaction;
7-
import net.corda.samples.states.Asset;
8-
import net.corda.samples.states.AuctionState;
7+
import net.corda.samples.auction.states.Asset;
8+
import net.corda.samples.auction.states.AuctionState;
99

1010
// ************
1111
// * Contract *
1212
// ************
1313
public class AuctionContract implements Contract {
14-
// This is used to identify our contract when building a transaction.
15-
public static final String ID = "net.corda.samples.contracts.AuctionContract";
14+
// This is used to identify our contracts when building a transaction.
15+
public static final String ID = "AuctionContract";
1616

17-
// A transaction is valid if the verify() function of the contract of all the transaction's input and output states
17+
// A transaction is valid if the verify() function of the contracts of all the transaction's input and output states
1818
// does not throw an exception.
1919
@Override
2020
public void verify(LedgerTransaction tx) {
@@ -118,4 +118,4 @@ class Settlement implements Commands {}
118118
class Exit implements Commands {}
119119
}
120120

121-
}
121+
}

Advanced/auction-cordapp/contracts/src/main/java/net/corda/samples/states/Asset.java renamed to Advanced/auction-cordapp/contracts/src/main/java/net/corda/samples/auction/states/Asset.java

Lines changed: 5 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,15 @@
1-
package net.corda.samples.states;
1+
package net.corda.samples.auction.states;
22

3-
import com.google.common.collect.ImmutableList;
43
import net.corda.core.contracts.*;
54
import net.corda.core.identity.AbstractParty;
6-
import net.corda.samples.contracts.AssetContract;
7-
import net.corda.samples.contracts.AuctionContract;
5+
import net.corda.samples.auction.contracts.AssetContract;
86
import org.jetbrains.annotations.NotNull;
97

108
import java.util.Arrays;
119
import java.util.List;
1210

1311
/**
14-
* An ownable state to represent an asset that could be put on auction.
12+
* An ownable states to represent an asset that could be put on auction.
1513
*/
1614
@BelongsToContract(AssetContract.class)
1715
public class Asset implements OwnableState, LinearState {
@@ -44,11 +42,11 @@ public AbstractParty getOwner() {
4442
}
4543

4644
/**
47-
* This method should be called to retrieve an ownership transfer command and the updated state with the new owner
45+
* This method should be called to retrieve an ownership transfer command and the updated states with the new owner
4846
* passed as a parameter to the method.
4947
*
5048
* @param newOwner of the asset
51-
* @return A CommandAndState object encapsulating the command and the new state with the changed owner, to be used
49+
* @return A CommandAndState object encapsulating the command and the new states with the changed owner, to be used
5250
* in the ownership transfer transaction.
5351
*/
5452
@NotNull

Advanced/auction-cordapp/contracts/src/main/java/net/corda/samples/states/AuctionState.java renamed to Advanced/auction-cordapp/contracts/src/main/java/net/corda/samples/auction/states/AuctionState.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
1-
package net.corda.samples.states;
1+
package net.corda.samples.auction.states;
22

33
import net.corda.core.contracts.*;
44
import net.corda.core.flows.FlowLogicRef;
55
import net.corda.core.flows.FlowLogicRefFactory;
66
import net.corda.core.identity.AbstractParty;
77
import net.corda.core.identity.Party;
8-
import net.corda.samples.contracts.AuctionContract;
8+
import net.corda.samples.auction.contracts.AuctionContract;
99
import org.jetbrains.annotations.NotNull;
1010
import org.jetbrains.annotations.Nullable;
1111

@@ -63,7 +63,7 @@ public AuctionState(LinearPointer<LinearState> auctionItem, UUID auctionId, Amou
6363
}
6464

6565
/**
66-
* This method returns a ScheduledActivity. The ScheduledActivity encapsulates a flow ref and a trigger time
66+
* This method returns a ScheduledActivity. The ScheduledActivity encapsulates a flows ref and a trigger time
6767
* to start the ScheduledFlow.
6868
*
6969
* @param thisStateRef

Advanced/auction-cordapp/contracts/src/test/java/net/corda/samples/contracts/ContractTests.java renamed to Advanced/auction-cordapp/contracts/src/test/java/net/corda/samples/auction/contracts/ContractTests.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package net.corda.samples.contracts;
1+
package net.corda.samples.auction.contracts;
22

33
import net.corda.testing.node.MockServices;
44
import org.junit.Test;
@@ -10,4 +10,4 @@ public class ContractTests {
1010
public void dummyTest() {
1111

1212
}
13-
}
13+
}

0 commit comments

Comments
 (0)