Use lombok where sensible

ftsrg · May 16, 2024 · 21ce165 · 21ce165
1 parent 7cebd82
commit 21ce165
Show file tree

Hide file tree

Showing 30 changed files with 32 additions and 262 deletions.
diff --git a/smart-contract/hyperledger-fabric/v2/java/build.gradle.kts b/smart-contract/hyperledger-fabric/v2/java/build.gradle.kts
@@ -18,6 +18,7 @@ plugins {
   application
   id("com.github.johnrengelman.shadow") version "7.1.2"
   id("com.diffplug.spotless") version "6.19.0"
+  id("io.freefair.lombok") version "8.6"
 }
 
 // java { toolchain { languageVersion.set(JavaLanguageVersion.of(17)) } }
@@ -32,9 +33,8 @@ repositories {
 }
 
 dependencies {
-  implementation("ch.qos.logback:logback-core:1.5.6")
-  implementation("ch.qos.logback:logback-classic:1.5.6")
   implementation("org.slf4j:slf4j-api:2.0.13")
+  testImplementation("org.slf4j:slf4j-simple:2.0.13")
   implementation("com.google.code.gson:gson:2.10.1")
   implementation("com.jcabi:jcabi-aspects:0.25.1")
   implementation("org.aspectj:aspectjrt:1.9.19")

diff --git a/...r-fabric/v2/java/src/main/java/hu/bme/mit/ftsrg/chaincode/tpcc/api/NotFoundException.java b/...r-fabric/v2/java/src/main/java/hu/bme/mit/ftsrg/chaincode/tpcc/api/NotFoundException.java
@@ -1,9 +1,7 @@
 /* SPDX-License-Identifier: Apache-2.0 */
 package hu.bme.mit.ftsrg.chaincode.tpcc.api;
 
-public final class NotFoundException extends Exception {
+import lombok.experimental.StandardException;
 
-  NotFoundException(String message) {
-    super(message);
-  }
-}
+@StandardException
+public final class NotFoundException extends Exception {}
diff --git a/...ger-fabric/v2/java/src/main/java/hu/bme/mit/ftsrg/chaincode/tpcc/api/TPCCBusinessAPI.java b/...ger-fabric/v2/java/src/main/java/hu/bme/mit/ftsrg/chaincode/tpcc/api/TPCCBusinessAPI.java
@@ -7,7 +7,6 @@
 import hu.bme.mit.ftsrg.chaincode.tpcc.data.extra.*;
 import hu.bme.mit.ftsrg.chaincode.tpcc.data.input.*;
 import hu.bme.mit.ftsrg.chaincode.tpcc.data.output.*;
-import hu.bme.mit.ftsrg.chaincode.tpcc.middleware.TPCCContext;
 import hu.bme.mit.ftsrg.chaincode.tpcc.util.JSON;
 import hu.bme.mit.ftsrg.hypernate.Registry;
 import hu.bme.mit.ftsrg.hypernate.context.ContextWithRegistry;

diff --git a/...haincode/tpcc/middleware/TPCCContext.java → ...ftsrg/chaincode/tpcc/api/TPCCContext.java b/...haincode/tpcc/middleware/TPCCContext.java → ...ftsrg/chaincode/tpcc/api/TPCCContext.java
@@ -1,11 +1,14 @@
 /* SPDX-License-Identifier: Apache-2.0 */
-package hu.bme.mit.ftsrg.chaincode.tpcc.middleware;
+package hu.bme.mit.ftsrg.chaincode.tpcc.api;
 
 import hu.bme.mit.ftsrg.hypernate.context.ContextWithRegistry;
 import java.util.ArrayDeque;
 import java.util.ArrayList;
 import java.util.Deque;
 import java.util.List;
+
+import hu.bme.mit.ftsrg.hypernate.middleware.LoggingStubMiddleware;
+import hu.bme.mit.ftsrg.hypernate.middleware.WriteBackCachedChaincodeStubMiddleware;
 import org.hyperledger.fabric.shim.ChaincodeStub;
 
 /** Context specialized for the TPC-C chaincode implementation. */

diff --git a/...ger-fabric/v2/java/src/main/java/hu/bme/mit/ftsrg/chaincode/tpcc/api/TPCCContractAPI.java b/...ger-fabric/v2/java/src/main/java/hu/bme/mit/ftsrg/chaincode/tpcc/api/TPCCContractAPI.java
@@ -5,7 +5,6 @@
 import hu.bme.mit.ftsrg.chaincode.MethodLogger;
 import hu.bme.mit.ftsrg.chaincode.tpcc.data.entity.*;
 import hu.bme.mit.ftsrg.chaincode.tpcc.data.input.*;
-import hu.bme.mit.ftsrg.chaincode.tpcc.middleware.TPCCContext;
 import hu.bme.mit.ftsrg.chaincode.tpcc.util.JSON;
 import hu.bme.mit.ftsrg.hypernate.entity.EntityExistsException;
 import hu.bme.mit.ftsrg.hypernate.entity.EntityNotFoundException;

diff --git a/...er-fabric/v2/java/src/main/java/hu/bme/mit/ftsrg/chaincode/tpcc/data/entity/Customer.java b/...er-fabric/v2/java/src/main/java/hu/bme/mit/ftsrg/chaincode/tpcc/data/entity/Customer.java
@@ -8,9 +8,9 @@
 import org.hyperledger.fabric.contract.annotation.Property;
 
 /** Essentially, the CUSTOMER table. */
+@DataType
 @EqualsAndHashCode
-@DataType()
-public class Customer implements Entity {
+public final class Customer implements Entity {
 
   /** The customer ID. Primary key. */
   @KeyPart

diff --git a/...er-fabric/v2/java/src/main/java/hu/bme/mit/ftsrg/chaincode/tpcc/data/entity/District.java b/...er-fabric/v2/java/src/main/java/hu/bme/mit/ftsrg/chaincode/tpcc/data/entity/District.java
@@ -8,8 +8,8 @@
 import org.hyperledger.fabric.contract.annotation.Property;
 
 /** Essentially, the DISTRICT table. */
+@DataType
 @EqualsAndHashCode
-@DataType()
 public final class District implements Entity {
 
   /** The district ID. Primary key. */

diff --git a/...ger-fabric/v2/java/src/main/java/hu/bme/mit/ftsrg/chaincode/tpcc/data/entity/History.java b/...ger-fabric/v2/java/src/main/java/hu/bme/mit/ftsrg/chaincode/tpcc/data/entity/History.java
@@ -8,8 +8,8 @@
 import org.hyperledger.fabric.contract.annotation.Property;
 
 /** Essentially, the HISTORY table. */
-@EqualsAndHashCode
 @DataType
+@EqualsAndHashCode
 public final class History implements Entity {
 
   /** The customer ID. Primary key. */

diff --git a/...ledger-fabric/v2/java/src/main/java/hu/bme/mit/ftsrg/chaincode/tpcc/data/entity/Item.java b/...ledger-fabric/v2/java/src/main/java/hu/bme/mit/ftsrg/chaincode/tpcc/data/entity/Item.java
@@ -8,8 +8,8 @@
 import org.hyperledger.fabric.contract.annotation.Property;
 
 /** Essentially, the ITEM table. */
-@EqualsAndHashCode
 @DataType
+@EqualsAndHashCode
 public final class Item implements Entity {
 
   /** The ID of the item. Primary key. */

diff --git a/...er-fabric/v2/java/src/main/java/hu/bme/mit/ftsrg/chaincode/tpcc/data/entity/NewOrder.java b/...er-fabric/v2/java/src/main/java/hu/bme/mit/ftsrg/chaincode/tpcc/data/entity/NewOrder.java
@@ -8,8 +8,8 @@
 import org.hyperledger.fabric.contract.annotation.Property;
 
 /** Essentially, the NEW-ORDER table. */
-@EqualsAndHashCode
 @DataType
+@EqualsAndHashCode
 public final class NewOrder implements Entity {
 
   /** The order ID. Primary key. */

diff --git a/...edger-fabric/v2/java/src/main/java/hu/bme/mit/ftsrg/chaincode/tpcc/data/entity/Order.java b/...edger-fabric/v2/java/src/main/java/hu/bme/mit/ftsrg/chaincode/tpcc/data/entity/Order.java
@@ -8,8 +8,8 @@
 import org.hyperledger.fabric.contract.annotation.Property;
 
 /** Essentially, the ORDER table. */
-@EqualsAndHashCode
 @DataType
+@EqualsAndHashCode
 public final class Order implements Entity {
 
   /** The order ID. Primary key. */

diff --git a/...r-fabric/v2/java/src/main/java/hu/bme/mit/ftsrg/chaincode/tpcc/data/entity/OrderLine.java b/...r-fabric/v2/java/src/main/java/hu/bme/mit/ftsrg/chaincode/tpcc/data/entity/OrderLine.java
@@ -8,8 +8,8 @@
 import org.hyperledger.fabric.contract.annotation.Property;
 
 /** Essentially, the ORDER-LINE table. */
-@EqualsAndHashCode
 @DataType
+@EqualsAndHashCode
 public final class OrderLine implements Entity {
 
   /** The order ID associated with the order line. Primary key. */

diff --git a/...edger-fabric/v2/java/src/main/java/hu/bme/mit/ftsrg/chaincode/tpcc/data/entity/Stock.java b/...edger-fabric/v2/java/src/main/java/hu/bme/mit/ftsrg/chaincode/tpcc/data/entity/Stock.java
@@ -8,8 +8,8 @@
 import org.hyperledger.fabric.contract.annotation.Property;
 
 /** Essentially, the STOCK table. */
-@EqualsAndHashCode
 @DataType
+@EqualsAndHashCode
 public final class Stock implements Entity {
 
   /** The ID of the item associated with the stock. Primary key. */

diff --git a/...r-fabric/v2/java/src/main/java/hu/bme/mit/ftsrg/chaincode/tpcc/data/entity/Warehouse.java b/...r-fabric/v2/java/src/main/java/hu/bme/mit/ftsrg/chaincode/tpcc/data/entity/Warehouse.java
@@ -8,8 +8,8 @@
 import org.hyperledger.fabric.contract.annotation.Property;
 
 /** Essentially, the WAREHOUSE table. */
-@EqualsAndHashCode
 @DataType
+@EqualsAndHashCode
 public class Warehouse implements Entity {
 
   /** The warehouse ID. Primary key. */

diff --git a/...bric/v2/java/src/main/java/hu/bme/mit/ftsrg/chaincode/tpcc/data/extra/DeliveredOrder.java b/...bric/v2/java/src/main/java/hu/bme/mit/ftsrg/chaincode/tpcc/data/extra/DeliveredOrder.java
@@ -7,8 +7,8 @@
 import org.hyperledger.fabric.contract.annotation.Property;
 
 /** Class to encapsulate the <code>delivered</code> field's data of a {@link DeliveryOutput}. */
-@EqualsAndHashCode
 @DataType
+@EqualsAndHashCode
 public final class DeliveredOrder {
 
   @Property(schema = {"minimum", "0"})

diff --git a/...er-fabric/v2/java/src/main/java/hu/bme/mit/ftsrg/chaincode/tpcc/data/extra/ItemsData.java b/...er-fabric/v2/java/src/main/java/hu/bme/mit/ftsrg/chaincode/tpcc/data/extra/ItemsData.java
@@ -7,8 +7,8 @@
 import org.hyperledger.fabric.contract.annotation.Property;
 
 /** Class to encapsulate the <code>items</code> field's data of a {@link NewOrderOutput}. */
-@EqualsAndHashCode
 @DataType
+@EqualsAndHashCode
 public final class ItemsData {
 
   @Property(schema = {"minimum", "0"})

diff --git a/...abric/v2/java/src/main/java/hu/bme/mit/ftsrg/chaincode/tpcc/data/extra/OrderLineData.java b/...abric/v2/java/src/main/java/hu/bme/mit/ftsrg/chaincode/tpcc/data/extra/OrderLineData.java
@@ -10,8 +10,8 @@
 /**
  * Class to encapsulate the <code>order_lines</code> field's data of a {@link OrderStatusOutput}.
  */
-@EqualsAndHashCode
 @DataType
+@EqualsAndHashCode
 public final class OrderLineData {
 
   @Property(schema = {"minimum", "0"})

diff --git a/...abric/v2/java/src/main/java/hu/bme/mit/ftsrg/chaincode/tpcc/data/input/DeliveryInput.java b/...abric/v2/java/src/main/java/hu/bme/mit/ftsrg/chaincode/tpcc/data/input/DeliveryInput.java
@@ -1,13 +1,12 @@
 /* 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;
 
-@EqualsAndHashCode
 @DataType
+@EqualsAndHashCode
 public final class DeliveryInput {
 
   /** The warehouse ID. */

diff --git a/...abric/v2/java/src/main/java/hu/bme/mit/ftsrg/chaincode/tpcc/data/input/NewOrderInput.java b/...abric/v2/java/src/main/java/hu/bme/mit/ftsrg/chaincode/tpcc/data/input/NewOrderInput.java
@@ -5,8 +5,8 @@
 import org.hyperledger.fabric.contract.annotation.DataType;
 import org.hyperledger.fabric.contract.annotation.Property;
 
-@EqualsAndHashCode
 @DataType
+@EqualsAndHashCode
 public final class NewOrderInput {
 
   /** The warehouse ID. */

diff --git a/...ic/v2/java/src/main/java/hu/bme/mit/ftsrg/chaincode/tpcc/data/input/OrderStatusInput.java b/...ic/v2/java/src/main/java/hu/bme/mit/ftsrg/chaincode/tpcc/data/input/OrderStatusInput.java
@@ -5,8 +5,8 @@
 import org.hyperledger.fabric.contract.annotation.DataType;
 import org.hyperledger.fabric.contract.annotation.Property;
 
-@EqualsAndHashCode
 @DataType
+@EqualsAndHashCode
 public final class OrderStatusInput {
 
   /** The warehouse ID. */

diff --git a/...fabric/v2/java/src/main/java/hu/bme/mit/ftsrg/chaincode/tpcc/data/input/PaymentInput.java b/...fabric/v2/java/src/main/java/hu/bme/mit/ftsrg/chaincode/tpcc/data/input/PaymentInput.java
@@ -5,8 +5,8 @@
 import org.hyperledger.fabric.contract.annotation.DataType;
 import org.hyperledger.fabric.contract.annotation.Property;
 
-@EqualsAndHashCode
 @DataType
+@EqualsAndHashCode
 public final class PaymentInput {
 
   /** The warehouse ID. */

diff --git a/...ric/v2/java/src/main/java/hu/bme/mit/ftsrg/chaincode/tpcc/data/input/StockLevelInput.java b/...ric/v2/java/src/main/java/hu/bme/mit/ftsrg/chaincode/tpcc/data/input/StockLevelInput.java
@@ -5,8 +5,8 @@
 import org.hyperledger.fabric.contract.annotation.DataType;
 import org.hyperledger.fabric.contract.annotation.Property;
 
-@EqualsAndHashCode
 @DataType
+@EqualsAndHashCode
 public final class StockLevelInput {
 
   /** The warehouse ID. */

diff --git a/...ric/v2/java/src/main/java/hu/bme/mit/ftsrg/chaincode/tpcc/data/output/DeliveryOutput.java b/...ric/v2/java/src/main/java/hu/bme/mit/ftsrg/chaincode/tpcc/data/output/DeliveryOutput.java
@@ -7,8 +7,8 @@
 import org.hyperledger.fabric.contract.annotation.DataType;
 import org.hyperledger.fabric.contract.annotation.Property;
 
-@EqualsAndHashCode
 @DataType
+@EqualsAndHashCode
 public final class DeliveryOutput {
 
   @Property(schema = {"minimum", "0"})

diff --git a/...ric/v2/java/src/main/java/hu/bme/mit/ftsrg/chaincode/tpcc/data/output/NewOrderOutput.java b/...ric/v2/java/src/main/java/hu/bme/mit/ftsrg/chaincode/tpcc/data/output/NewOrderOutput.java
@@ -11,8 +11,8 @@
 import org.hyperledger.fabric.contract.annotation.DataType;
 import org.hyperledger.fabric.contract.annotation.Property;
 
-@EqualsAndHashCode
 @DataType
+@EqualsAndHashCode
 public final class NewOrderOutput {
 
   @Property(schema = {"minimum", "0"})

diff --git a/.../v2/java/src/main/java/hu/bme/mit/ftsrg/chaincode/tpcc/data/output/OrderStatusOutput.java b/.../v2/java/src/main/java/hu/bme/mit/ftsrg/chaincode/tpcc/data/output/OrderStatusOutput.java
@@ -9,8 +9,8 @@
 import org.hyperledger.fabric.contract.annotation.DataType;
 import org.hyperledger.fabric.contract.annotation.Property;
 
-@EqualsAndHashCode
 @DataType
+@EqualsAndHashCode
 public final class OrderStatusOutput {
 
   @Property(schema = {"minimum", "0"})

diff --git a/...bric/v2/java/src/main/java/hu/bme/mit/ftsrg/chaincode/tpcc/data/output/PaymentOutput.java b/...bric/v2/java/src/main/java/hu/bme/mit/ftsrg/chaincode/tpcc/data/output/PaymentOutput.java
@@ -9,8 +9,8 @@
 import org.hyperledger.fabric.contract.annotation.DataType;
 import org.hyperledger.fabric.contract.annotation.Property;
 
-@EqualsAndHashCode
 @DataType
+@EqualsAndHashCode
 public final class PaymentOutput {
 
   @Property(schema = {"minimum", "0"})

diff --git a/...c/v2/java/src/main/java/hu/bme/mit/ftsrg/chaincode/tpcc/data/output/StockLevelOutput.java b/...c/v2/java/src/main/java/hu/bme/mit/ftsrg/chaincode/tpcc/data/output/StockLevelOutput.java
@@ -6,8 +6,8 @@
 import org.hyperledger.fabric.contract.annotation.DataType;
 import org.hyperledger.fabric.contract.annotation.Property;
 
-@EqualsAndHashCode
 @DataType
+@EqualsAndHashCode
 public final class StockLevelOutput {
 
   @Property(schema = {"minimum", "0"})

diff --git a/.../java/src/main/java/hu/bme/mit/ftsrg/chaincode/tpcc/middleware/LoggingStubMiddleware.java b/.../java/src/main/java/hu/bme/mit/ftsrg/chaincode/tpcc/middleware/LoggingStubMiddleware.java
diff --git a/...va/hu/bme/mit/ftsrg/chaincode/tpcc/middleware/UpdateThrottledChaincodeStubMiddleware.java b/...va/hu/bme/mit/ftsrg/chaincode/tpcc/middleware/UpdateThrottledChaincodeStubMiddleware.java