epistemophiliac/fabric-samples
1
0
Fork 0
mirror of https://github.com/hyperledger/fabric-samples.git synced 2026-06-26 11:35:10 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch 'main' into patch-1

Browse source
This commit is contained in:
Arnaud J Le Hors 2021-09-03 13:18:37 +02:00 committed by GitHub
commit e27963eff2
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 8 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
commercial-paper/organization/digibank/application-java/src/org/papernet/CommercialPaper.java
View file

@ -18,6 +18,7 @@ public class CommercialPaper extends State {
public final static String ISSUED = "ISSUED"; public final static String ISSUED = "ISSUED";
public final static String TRADING = "TRADING"; public final static String TRADING = "TRADING";
public final static String REDEEMED = "REDEEMED"; public final static String REDEEMED = "REDEEMED";
public final static String[] STATES = new String[] {ISSUED, TRADING, REDEEMED};
@Property() @Property()
private String state=""; private String state="";
@ -161,8 +162,9 @@ public class CommercialPaper extends State {
String maturityDateTime = json.getString("maturityDateTime"); String maturityDateTime = json.getString("maturityDateTime");
String owner = json.getString("owner"); String owner = json.getString("owner");
int faceValue = json.getInt("faceValue"); int faceValue = json.getInt("faceValue");
String state = json.getString("state"); int currentState = json.getInt("currentState");
return createInstance(issuer, paperNumber, issueDateTime, maturityDateTime, faceValue,owner,state); String state = STATES[currentState-1];
return createInstance(issuer, paperNumber, issueDateTime, maturityDateTime, faceValue, owner, state);
} }
public static byte[] serialize(CommercialPaper paper) { public static byte[] serialize(CommercialPaper paper) {

4
commercial-paper/organization/magnetocorp/application-java/src/org/papernet/CommercialPaper.java
View file

@ -19,6 +19,7 @@ public class CommercialPaper extends State {
public final static String ISSUED = "ISSUED"; public final static String ISSUED = "ISSUED";
public final static String TRADING = "TRADING"; public final static String TRADING = "TRADING";
public final static String REDEEMED = "REDEEMED"; public final static String REDEEMED = "REDEEMED";
public final static String[] STATES = new String[] {ISSUED, TRADING, REDEEMED};
@Property() @Property()
private String state=""; private String state="";
@ -162,7 +163,8 @@ public class CommercialPaper extends State {
String maturityDateTime = json.getString("maturityDateTime"); String maturityDateTime = json.getString("maturityDateTime");
String owner = json.getString("owner"); String owner = json.getString("owner");
int faceValue = json.getInt("faceValue"); int faceValue = json.getInt("faceValue");
String state = json.getString("state"); int currentState = json.getInt("currentState");
String state = STATES[currentState-1];
return createInstance(issuer, paperNumber, issueDateTime, maturityDateTime, faceValue, owner, state); return createInstance(issuer, paperNumber, issueDateTime, maturityDateTime, faceValue, owner, state);
} }

1
test-network/scripts/deployCC.sh
View file

@ -63,6 +63,7 @@ if [ "$CC_SRC_LANGUAGE" = "go" ]; then
elif [ "$CC_SRC_LANGUAGE" = "java" ]; then elif [ "$CC_SRC_LANGUAGE" = "java" ]; then
CC_RUNTIME_LANGUAGE=java CC_RUNTIME_LANGUAGE=java
rm -rf $CC_SRC_PATH/build/install/
infoln "Compiling Java code..." infoln "Compiling Java code..."
pushd $CC_SRC_PATH pushd $CC_SRC_PATH
./gradlew installDist ./gradlew installDist