From 42c456ffda8c632e8d590095cc57abcda126b06f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?QQ=E5=96=B5?= Date: Fri, 3 Sep 2021 15:54:36 +0800 Subject: [PATCH 1/2] Clean install folder for Java (#475) Signed-off-by: gqqnbig Co-authored-by: Matthew B White --- test-network/scripts/deployCC.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/test-network/scripts/deployCC.sh b/test-network/scripts/deployCC.sh index 1db781e1..951aae5a 100755 --- a/test-network/scripts/deployCC.sh +++ b/test-network/scripts/deployCC.sh @@ -63,6 +63,7 @@ if [ "$CC_SRC_LANGUAGE" = "go" ]; then elif [ "$CC_SRC_LANGUAGE" = "java" ]; then CC_RUNTIME_LANGUAGE=java + rm -rf $CC_SRC_PATH/build/install/ infoln "Compiling Java code..." pushd $CC_SRC_PATH ./gradlew installDist From bd559c81c8049e697f37fd17c27540b31334999f Mon Sep 17 00:00:00 2001 From: Luciano da Silva Ribas Date: Fri, 3 Sep 2021 05:16:35 -0300 Subject: [PATCH 2/2] Fixed state deserialize which is an uint enum in contract definition. (#467) Signed-off-by: Luciano da Silva Ribas Co-authored-by: Matthew B White --- .../application-java/src/org/papernet/CommercialPaper.java | 6 ++++-- .../application-java/src/org/papernet/CommercialPaper.java | 4 +++- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/commercial-paper/organization/digibank/application-java/src/org/papernet/CommercialPaper.java b/commercial-paper/organization/digibank/application-java/src/org/papernet/CommercialPaper.java index dbb4e3f1..179d1bdf 100644 --- a/commercial-paper/organization/digibank/application-java/src/org/papernet/CommercialPaper.java +++ b/commercial-paper/organization/digibank/application-java/src/org/papernet/CommercialPaper.java @@ -18,6 +18,7 @@ public class CommercialPaper extends State { public final static String ISSUED = "ISSUED"; public final static String TRADING = "TRADING"; public final static String REDEEMED = "REDEEMED"; + public final static String[] STATES = new String[] {ISSUED, TRADING, REDEEMED}; @Property() private String state=""; @@ -161,8 +162,9 @@ public class CommercialPaper extends State { String maturityDateTime = json.getString("maturityDateTime"); String owner = json.getString("owner"); int faceValue = json.getInt("faceValue"); - String state = json.getString("state"); - return createInstance(issuer, paperNumber, issueDateTime, maturityDateTime, faceValue,owner,state); + int currentState = json.getInt("currentState"); + String state = STATES[currentState-1]; + return createInstance(issuer, paperNumber, issueDateTime, maturityDateTime, faceValue, owner, state); } public static byte[] serialize(CommercialPaper paper) { diff --git a/commercial-paper/organization/magnetocorp/application-java/src/org/papernet/CommercialPaper.java b/commercial-paper/organization/magnetocorp/application-java/src/org/papernet/CommercialPaper.java index e909b494..e1397e46 100644 --- a/commercial-paper/organization/magnetocorp/application-java/src/org/papernet/CommercialPaper.java +++ b/commercial-paper/organization/magnetocorp/application-java/src/org/papernet/CommercialPaper.java @@ -19,6 +19,7 @@ public class CommercialPaper extends State { public final static String ISSUED = "ISSUED"; public final static String TRADING = "TRADING"; public final static String REDEEMED = "REDEEMED"; + public final static String[] STATES = new String[] {ISSUED, TRADING, REDEEMED}; @Property() private String state=""; @@ -162,7 +163,8 @@ public class CommercialPaper extends State { String maturityDateTime = json.getString("maturityDateTime"); String owner = json.getString("owner"); 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); }