Apply small fixes found by IDEA inspection

bzp99 · bzp99 · commit 47be7fdc6345 · 2024-05-15T09:53:30.000+02:00
diff --git a/smart-contract/hyperledger-fabric/v2/java/README.md b/smart-contract/hyperledger-fabric/v2/java/README.md
@@ -28,4 +28,4 @@ withoutOpenJML = "true"
 
 ## License
 
-The project uses the Apache License Version 2.0. For more information see [NOTICES.md](./../../NOTICES.md), [CONTRIBUTORS.md](./../../CONTRIBUTORS.md), and [LICENSE](./../../LICENSE).
+The project uses the Apache License Version 2.0. For more information see [NOTICES.md](../../../../NOTICES.md), [CONTRIBUTORS.md](../../../../CONTRIBUTORS.md), and [LICENSE](../../../../LICENSE).
diff --git a/smart-contract/hyperledger-fabric/v2/java/build.gradle.kts b/smart-contract/hyperledger-fabric/v2/java/build.gradle.kts
@@ -20,7 +20,7 @@ plugins {
   id("com.diffplug.spotless") version "6.19.0"
 }
 
-// java { toolchain { languageVersion.set(JavaLanguageVersion.of(17) } }
+// java { toolchain { languageVersion.set(JavaLanguageVersion.of(17)) } }
 
 group = "hu.bme.mit.ftsrg.chaincode.tpcc"
 
diff --git a/smart-contract/hyperledger-fabric/v2/java/buildSrc/src/main/kotlin/hu/bme/mit/ftsrg/openjmlhelper/OpenJMLHelper.kt b/smart-contract/hyperledger-fabric/v2/java/buildSrc/src/main/kotlin/hu/bme/mit/ftsrg/openjmlhelper/OpenJMLHelper.kt
@@ -17,7 +17,7 @@ import org.gradle.api.logging.Logger
  *
  * Originally based on https://github.com/mingyang91/openjml-template
  */
-val originalExecutableSuffix = ".orig"
+const val originalExecutableSuffix = ".orig"
 
 // NOTE: ${'$'} is just an escaped $ inside a Kotlin string literal
 val scriptPrefix =
diff --git a/smart-contract/hyperledger-fabric/v2/java/figures/class/class.puml b/smart-contract/hyperledger-fabric/v2/java/figures/class/class.puml
@@ -1,4 +1,4 @@
-@startuml "Specificaton"
+@startuml "Specification"
 skinparam groupInheritance 2
 Contract <|-- BusinessContract
 BusinessContract ..> EnhancedContext
diff --git a/smart-contract/hyperledger-fabric/v2/java/src/main/java/hu/bme/mit/ftsrg/chaincode/tpcc/api/TPCCContractAPI.java b/smart-contract/hyperledger-fabric/v2/java/src/main/java/hu/bme/mit/ftsrg/chaincode/tpcc/api/TPCCContractAPI.java
@@ -217,7 +217,7 @@ public String readOrder(final TPCCContext ctx, final int w_id, final int d_id, f
    *
    * @param ctx The transaction context
    * @param i_id The I_ID of the item
-   * @return The item with matchign I_ID
+   * @return The item with matching I_ID
    */
   @Transaction(intent = Transaction.TYPE.EVALUATE)
   public String readItem(final TPCCContext ctx, final int i_id) throws EntityNotFoundException, SerializationException {
diff --git a/smart-contract/hyperledger-fabric/v2/java/src/main/java/hu/bme/mit/ftsrg/chaincode/tpcc/data/input/DeliveryInput.java b/smart-contract/hyperledger-fabric/v2/java/src/main/java/hu/bme/mit/ftsrg/chaincode/tpcc/data/input/DeliveryInput.java
@@ -1,11 +1,11 @@
 /* SPDX-License-Identifier: Apache-2.0 */
 package hu.bme.mit.ftsrg.chaincode.tpcc.data.input;
 
+import hu.bme.mit.ftsrg.chaincode.tpcc.middleware.TPCCContext;
 import lombok.EqualsAndHashCode;
 import org.hyperledger.fabric.contract.annotation.DataType;
 import org.hyperledger.fabric.contract.annotation.Property;
 
-/** Input parameters to {@link TPCC#doDelivery(TPCCContext, String)}. */
 @EqualsAndHashCode
 @DataType
 public final class DeliveryInput {
diff --git a/smart-contract/hyperledger-fabric/v2/java/src/main/java/hu/bme/mit/ftsrg/chaincode/tpcc/data/input/NewOrderInput.java b/smart-contract/hyperledger-fabric/v2/java/src/main/java/hu/bme/mit/ftsrg/chaincode/tpcc/data/input/NewOrderInput.java
@@ -5,7 +5,6 @@
 import org.hyperledger.fabric.contract.annotation.DataType;
 import org.hyperledger.fabric.contract.annotation.Property;
 
-/** Input parameters to {@link TPCC#doNewOrder(TPCCContext, String)}. */
 @EqualsAndHashCode
 @DataType
 public final class NewOrderInput {
diff --git a/smart-contract/hyperledger-fabric/v2/java/src/main/java/hu/bme/mit/ftsrg/chaincode/tpcc/data/input/OrderStatusInput.java b/smart-contract/hyperledger-fabric/v2/java/src/main/java/hu/bme/mit/ftsrg/chaincode/tpcc/data/input/OrderStatusInput.java
@@ -5,7 +5,6 @@
 import org.hyperledger.fabric.contract.annotation.DataType;
 import org.hyperledger.fabric.contract.annotation.Property;
 
-/** Input parameters to {@link TPCC#doOrderStatus(TPCCContext, String)}. */
 @EqualsAndHashCode
 @DataType
 public final class OrderStatusInput {
diff --git a/smart-contract/hyperledger-fabric/v2/java/src/main/java/hu/bme/mit/ftsrg/chaincode/tpcc/data/input/PaymentInput.java b/smart-contract/hyperledger-fabric/v2/java/src/main/java/hu/bme/mit/ftsrg/chaincode/tpcc/data/input/PaymentInput.java
@@ -5,7 +5,6 @@
 import org.hyperledger.fabric.contract.annotation.DataType;
 import org.hyperledger.fabric.contract.annotation.Property;
 
-/** Input parameters to {@link TPCC#doPayment(TPCCContext, String)}. */
 @EqualsAndHashCode
 @DataType
 public final class PaymentInput {
diff --git a/smart-contract/hyperledger-fabric/v2/java/src/main/java/hu/bme/mit/ftsrg/chaincode/tpcc/data/input/StockLevelInput.java b/smart-contract/hyperledger-fabric/v2/java/src/main/java/hu/bme/mit/ftsrg/chaincode/tpcc/data/input/StockLevelInput.java
@@ -5,7 +5,6 @@
 import org.hyperledger.fabric.contract.annotation.DataType;
 import org.hyperledger.fabric.contract.annotation.Property;
 
-/** Input parameters to {@link TPCC#doStockLevel(TPCCContext, String)}. */
 @EqualsAndHashCode
 @DataType
 public final class StockLevelInput {
diff --git a/smart-contract/hyperledger-fabric/v2/java/src/main/java/hu/bme/mit/ftsrg/chaincode/tpcc/data/output/DeliveryOutput.java b/smart-contract/hyperledger-fabric/v2/java/src/main/java/hu/bme/mit/ftsrg/chaincode/tpcc/data/output/DeliveryOutput.java
@@ -7,7 +7,6 @@
 import org.hyperledger.fabric.contract.annotation.DataType;
 import org.hyperledger.fabric.contract.annotation.Property;
 
-/** Output of {@link TPCC#doDelivery(TPCCContext, String)}. */
 @EqualsAndHashCode
 @DataType
 public final class DeliveryOutput {
diff --git a/smart-contract/hyperledger-fabric/v2/java/src/main/java/hu/bme/mit/ftsrg/chaincode/tpcc/data/output/NewOrderOutput.java b/smart-contract/hyperledger-fabric/v2/java/src/main/java/hu/bme/mit/ftsrg/chaincode/tpcc/data/output/NewOrderOutput.java
@@ -11,7 +11,6 @@
 import org.hyperledger.fabric.contract.annotation.DataType;
 import org.hyperledger.fabric.contract.annotation.Property;
 
-/** Output of {@link TPCC#doNewOrder(TPCCContext, String)}. */
 @EqualsAndHashCode
 @DataType
 public final class NewOrderOutput {
diff --git a/smart-contract/hyperledger-fabric/v2/java/src/main/java/hu/bme/mit/ftsrg/chaincode/tpcc/data/output/OrderStatusOutput.java b/smart-contract/hyperledger-fabric/v2/java/src/main/java/hu/bme/mit/ftsrg/chaincode/tpcc/data/output/OrderStatusOutput.java
@@ -9,7 +9,6 @@
 import org.hyperledger.fabric.contract.annotation.DataType;
 import org.hyperledger.fabric.contract.annotation.Property;
 
-/** Output of {@link TPCC#doOrderStatus(TPCCContext, String)}. */
 @EqualsAndHashCode
 @DataType
 public final class OrderStatusOutput {
diff --git a/smart-contract/hyperledger-fabric/v2/java/src/main/java/hu/bme/mit/ftsrg/chaincode/tpcc/data/output/PaymentOutput.java b/smart-contract/hyperledger-fabric/v2/java/src/main/java/hu/bme/mit/ftsrg/chaincode/tpcc/data/output/PaymentOutput.java
@@ -9,7 +9,6 @@
 import org.hyperledger.fabric.contract.annotation.DataType;
 import org.hyperledger.fabric.contract.annotation.Property;
 
-/** Output of {@link TPCC#doPayment(TPCCContext, String)}. */
 @EqualsAndHashCode
 @DataType
 public final class PaymentOutput {
diff --git a/smart-contract/hyperledger-fabric/v2/java/src/main/java/hu/bme/mit/ftsrg/chaincode/tpcc/data/output/StockLevelOutput.java b/smart-contract/hyperledger-fabric/v2/java/src/main/java/hu/bme/mit/ftsrg/chaincode/tpcc/data/output/StockLevelOutput.java
@@ -6,7 +6,6 @@
 import org.hyperledger.fabric.contract.annotation.DataType;
 import org.hyperledger.fabric.contract.annotation.Property;
 
-/** Output of {@link TPCC#doStockLevel(TPCCContext, String)}. */
 @EqualsAndHashCode
 @DataType
 public final class StockLevelOutput {
diff --git a/smart-contract/hyperledger-fabric/v2/java/test_data/entities/warehouse.json b/smart-contract/hyperledger-fabric/v2/java/test_data/entities/warehouse.json
@@ -1,2 +1,2 @@
-{"w_id": 1 , "w_name": "HQ" , "w_street_1": "1034" , "w_street_2": "30" , "w_city": "Budapest" , "w_state": "Budaosh" , "w_zip": "+30" , "w_tax": 10 , "w_ytd": 10000 
+{"w_id": 1 , "w_name": "HQ" , "w_street_1": "1034" , "w_street_2": "30" , "w_city": "Budapest" , "w_state": "Budapest" , "w_zip": "+30" , "w_tax": 10 , "w_ytd": 10000
 }

Original file line number	Diff line number	Diff line change
`@@ -28,4 +28,4 @@ withoutOpenJML = "true"`
`28`	`28`
`29`	`29`	`## License`
`30`	`30`
`31`		`-The project uses the Apache License Version 2.0. For more information see [NOTICES.md](./../../NOTICES.md), [CONTRIBUTORS.md](./../../CONTRIBUTORS.md), and [LICENSE](./../../LICENSE).`
	`31`	`+The project uses the Apache License Version 2.0. For more information see [NOTICES.md](../../../../NOTICES.md), [CONTRIBUTORS.md](../../../../CONTRIBUTORS.md), and [LICENSE](../../../../LICENSE).`
Original file line number	Diff line number	Diff line change
`@@ -20,7 +20,7 @@ plugins {`
`20`	`20`	`id("com.diffplug.spotless") version "6.19.0"`
`21`	`21`	`}`
`22`	`22`
`23`		`-// java { toolchain { languageVersion.set(JavaLanguageVersion.of(17) } }`
	`23`	`+// java { toolchain { languageVersion.set(JavaLanguageVersion.of(17)) } }`
`24`	`24`
`25`	`25`	`group = "hu.bme.mit.ftsrg.chaincode.tpcc"`
`26`	`26`
Original file line number	Diff line number	Diff line change
`@@ -17,7 +17,7 @@ import org.gradle.api.logging.Logger`
`17`	`17`	`*`
`18`	`18`	`* Originally based on https://github.com/mingyang91/openjml-template`
`19`	`19`	`*/`
`20`		`-val originalExecutableSuffix = ".orig"`
	`20`	`+const val originalExecutableSuffix = ".orig"`
`21`	`21`
`22`	`22`	`// NOTE: ${'$'} is just an escaped $ inside a Kotlin string literal`
`23`	`23`	`val scriptPrefix =`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-@startuml "Specificaton"`
	`1`	`+@startuml "Specification"`
`2`	`2`	`skinparam groupInheritance 2`
`3`	`3`	`Contract <\|-- BusinessContract`
`4`	`4`	`BusinessContract ..> EnhancedContext`
Original file line number	Diff line number	Diff line change
`@@ -217,7 +217,7 @@ public String readOrder(final TPCCContext ctx, final int w_id, final int d_id, f`
`217`	`217`	`*`
`218`	`218`	`* @param ctx The transaction context`
`219`	`219`	`* @param i_id The I_ID of the item`
`220`		`- * @return The item with matchign I_ID`
	`220`	`+ * @return The item with matching I_ID`
`221`	`221`	`*/`
`222`	`222`	`@Transaction(intent = Transaction.TYPE.EVALUATE)`
`223`	`223`	`public String readItem(final TPCCContext ctx, final int i_id) throws EntityNotFoundException, SerializationException {`
Original file line number	Diff line number	Diff line change
`@@ -1,2 +1,2 @@`
`1`		`-{"w_id": 1 , "w_name": "HQ" , "w_street_1": "1034" , "w_street_2": "30" , "w_city": "Budapest" , "w_state": "Budaosh" , "w_zip": "+30" , "w_tax": 10 , "w_ytd": 10000`
	`1`	`+{"w_id": 1 , "w_name": "HQ" , "w_street_1": "1034" , "w_street_2": "30" , "w_city": "Budapest" , "w_state": "Budapest" , "w_zip": "+30" , "w_tax": 10 , "w_ytd": 10000`
`2`	`2`	`}`