Revert "Use lombok where sensible"

This reverts commit 7c70945.

Author: bzp99

smart-contract/hyperledger-fabric/v2/java/build.gradle.kts

@@ -18,7 +18,6 @@ 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)) } }

smart-contract/hyperledger-fabric/v2/java/src/main/java/hu/bme/mit/ftsrg/chaincode/tpcc/api/NotFoundException.java

@@ -1,7 +1,9 @@
 /* SPDX-License-Identifier: Apache-2.0 */
 package hu.bme.mit.ftsrg.chaincode.tpcc.api;
 
-import lombok.experimental.StandardException;
+public final class NotFoundException extends Exception {
 
-@StandardException
-public final class NotFoundException extends Exception {}
+  NotFoundException(String message) {
+    super(message);
+  }
+}

smart-contract/hyperledger-fabric/v2/java/src/main/java/hu/bme/mit/ftsrg/chaincode/tpcc/api/TPCCBusinessAPI.java

@@ -8,6 +8,7 @@
 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;

smart-contract/hyperledger-fabric/v2/java/src/main/java/hu/bme/mit/ftsrg/chaincode/tpcc/api/TPCCContractAPI.java

@@ -6,6 +6,7 @@
 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;

smart-contract/hyperledger-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
-public final class Customer implements Entity {
+@DataType()
+public class Customer implements Entity {
 
   /** The customer ID. Primary key. */
   @KeyPart

smart-contract/hyperledger-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. */

smart-contract/hyperledger-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. */
-@DataType
 @EqualsAndHashCode
+@DataType
 public final class History implements Entity {
 
   /** The customer ID. Primary key. */

smart-contract/hyperledger-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. */
-@DataType
 @EqualsAndHashCode
+@DataType
 public final class Item implements Entity {
 
   /** The ID of the item. Primary key. */

smart-contract/hyperledger-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. */
-@DataType
 @EqualsAndHashCode
+@DataType
 public final class NewOrder implements Entity {
 
   /** The order ID. Primary key. */

smart-contract/hyperledger-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. */
-@DataType
 @EqualsAndHashCode
+@DataType
 public final class Order implements Entity {
 
   /** The order ID. Primary key. */

smart-contract/hyperledger-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. */
-@DataType
 @EqualsAndHashCode
+@DataType
 public final class OrderLine implements Entity {
 
   /** The order ID associated with the order line. Primary key. */

smart-contract/hyperledger-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. */
-@DataType
 @EqualsAndHashCode
+@DataType
 public final class Stock implements Entity {
 
   /** The ID of the item associated with the stock. Primary key. */

smart-contract/hyperledger-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. */
-@DataType
 @EqualsAndHashCode
+@DataType
 public class Warehouse implements Entity {
 
   /** The warehouse ID. Primary key. */

smart-contract/hyperledger-fabric/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}. */
-@DataType
 @EqualsAndHashCode
+@DataType
 public final class DeliveredOrder {
 
   @Property(schema = {"minimum", "0"})

smart-contract/hyperledger-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}. */
-@DataType
 @EqualsAndHashCode
+@DataType
 public final class ItemsData {
 
   @Property(schema = {"minimum", "0"})

smart-contract/hyperledger-fabric/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}.
  */
-@DataType
 @EqualsAndHashCode
+@DataType
 public final class OrderLineData {
 
   @Property(schema = {"minimum", "0"})

smart-contract/hyperledger-fabric/v2/java/src/main/java/hu/bme/mit/ftsrg/chaincode/tpcc/data/input/DeliveryInput.java

@@ -1,12 +1,13 @@
 /* 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;
 
-@DataType
 @EqualsAndHashCode
+@DataType
 public final class DeliveryInput {
 
   /** The warehouse ID. */

smart-contract/hyperledger-fabric/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;
 
-@DataType
 @EqualsAndHashCode
+@DataType
 public final class NewOrderInput {
 
   /** The warehouse ID. */

smart-contract/hyperledger-fabric/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;
 
-@DataType
 @EqualsAndHashCode
+@DataType
 public final class OrderStatusInput {
 
   /** The warehouse ID. */

smart-contract/hyperledger-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;
 
-@DataType
 @EqualsAndHashCode
+@DataType
 public final class PaymentInput {
 
   /** The warehouse ID. */

smart-contract/hyperledger-fabric/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;
 
-@DataType
 @EqualsAndHashCode
+@DataType
 public final class StockLevelInput {
 
   /** The warehouse ID. */

smart-contract/hyperledger-fabric/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;
 
-@DataType
 @EqualsAndHashCode
+@DataType
 public final class DeliveryOutput {
 
   @Property(schema = {"minimum", "0"})

smart-contract/hyperledger-fabric/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;
 
-@DataType
 @EqualsAndHashCode
+@DataType
 public final class NewOrderOutput {
 
   @Property(schema = {"minimum", "0"})

smart-contract/hyperledger-fabric/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;
 
-@DataType
 @EqualsAndHashCode
+@DataType
 public final class OrderStatusOutput {
 
   @Property(schema = {"minimum", "0"})

smart-contract/hyperledger-fabric/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;
 
-@DataType
 @EqualsAndHashCode
+@DataType
 public final class PaymentOutput {
 
   @Property(schema = {"minimum", "0"})

smart-contract/hyperledger-fabric/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;
 
-@DataType
 @EqualsAndHashCode
+@DataType
 public final class StockLevelOutput {
 
   @Property(schema = {"minimum", "0"})

smart-contract/hyperledger-fabric/v2/java/src/main/java/hu/bme/mit/ftsrg/chaincode/tpcc/middleware/LoggingStubMiddleware.java

@@ -0,0 +1,56 @@
+/* SPDX-License-Identifier: Apache-2.0 */
+package hu.bme.mit.ftsrg.chaincode.tpcc.middleware;
+
+import hu.bme.mit.ftsrg.hypernate.middleware.ChaincodeStubMiddlewareBase;
+import java.util.Arrays;
+import org.hyperledger.fabric.shim.ChaincodeStub;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.slf4j.event.Level;
+
+/**
+ * Stub middleware that simply logs all {@link ChaincodeStub#getState(String)}, {@link
+ * ChaincodeStub#putState(String, byte[])}, and {@link ChaincodeStub#delState(String)} calls.
+ *
+ * @see ChaincodeStubMiddlewareBase
+ */
+public class LoggingStubMiddleware extends ChaincodeStubMiddlewareBase {
+
+  private static final Logger logger = LoggerFactory.getLogger(LoggingStubMiddleware.class);
+  private final Level logLevel;
+
+  public LoggingStubMiddleware(final ChaincodeStub next) {
+    this(next, Level.INFO);
+  }
+
+  public LoggingStubMiddleware(final ChaincodeStub next, final Level logLevel) {
+    super(next);
+    this.logLevel = logLevel;
+  }
+
+  @Override
+  public byte[] getState(final String key) {
+    logger.atLevel(this.logLevel).log("Getting state for key '{}'", key);
+    final byte[] value = this.nextLayer.getState(key);
+    logger
+        .atLevel(this.logLevel)
+        .log("Got state for key '{}'; value = '{}'", key, Arrays.toString(value));
+    return value;
+  }
+
+  @Override
+  public void putState(final String key, final byte[] value) {
+    logger
+        .atLevel(this.logLevel)
+        .log("Setting state for key '{}' to have value '{}'", key, Arrays.toString(value));
+    this.nextLayer.putState(key, value);
+    logger.atLevel(this.logLevel).log("Done setting state for key '{}'", key);
+  }
+
+  @Override
+  public void delState(final String key) {
+    logger.atLevel(this.logLevel).log("Deleting state for key '{}'", key);
+    this.nextLayer.delState(key);
+    logger.atLevel(this.logLevel).log("Done deleting state for key '{}'", key);
+  }
+}

smart-contract/hyperledger-fabric/v2/java/src/main/java/hu/bme/mit/ftsrg/chaincode/tpcc/api/TPCCContext.java renamed to smart-contract/hyperledger-fabric/v2/java/src/main/java/hu/bme/mit/ftsrg/chaincode/tpcc/middleware/TPCCContext.java

@@ -1,14 +1,11 @@
 /* SPDX-License-Identifier: Apache-2.0 */
-package hu.bme.mit.ftsrg.chaincode.tpcc.api;
+package hu.bme.mit.ftsrg.chaincode.tpcc.middleware;
 
 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. */

smart-contract/hyperledger-fabric/v2/java/src/main/java/hu/bme/mit/ftsrg/chaincode/tpcc/middleware/UpdateThrottledChaincodeStubMiddleware.java

@@ -0,0 +1,20 @@
+/* SPDX-License-Identifier: Apache-2.0 */
+package hu.bme.mit.ftsrg.chaincode.tpcc.middleware;
+
+import hu.bme.mit.ftsrg.hypernate.middleware.ChaincodeStubMiddlewareBase;
+import org.hyperledger.fabric.shim.ChaincodeStub;
+
+/**
+ * Stub middleware that only sends {@link ChaincodeStub#putState(String, byte[])} calls once the
+ * transaction is finished.
+ *
+ * @see ChaincodeStubMiddlewareBase
+ */
+public final class UpdateThrottledChaincodeStubMiddleware extends ChaincodeStubMiddlewareBase {
+
+  public UpdateThrottledChaincodeStubMiddleware(ChaincodeStub nextLayer) {
+    super(nextLayer);
+  }
+
+  /* TODO implement ? */
+}