Replace deprecated Gradle/ScalarDB features (#74)

* Replace deprecated Gradle features

* Replace deprecated put with update and insert

* Replace deprecated put with update and upsert in the Kotilin sample

* Change function names from put to insert

* Renamed the delete task

Author: KodaiD

microservice-transaction-sample/client/build.gradle

@@ -10,10 +10,15 @@ dependencies {
 }
 
 application {
-    mainClassName = 'sample.client.Client'
+    mainClass = 'sample.client.Client'
 }
 
-archivesBaseName = "sample-order-service"
+base {
+    archivesName = "sample-order-service"
+}
 
-sourceCompatibility = 1.8
-targetCompatibility = 1.8
+java {
+    toolchain {
+        languageVersion = JavaLanguageVersion.of(8)
+    }
+}

microservice-transaction-sample/customer-service/build.gradle

@@ -14,7 +14,7 @@ dependencies {
 }
 
 application {
-    mainClassName = 'sample.customer.CustomerServiceServer'
+    mainClass = 'sample.customer.CustomerServiceServer'
 }
 
 task copyFilesToDockerBuildContextDir(type: Copy) {
@@ -47,7 +47,12 @@ installDist {
     duplicatesStrategy DuplicatesStrategy.EXCLUDE
 }
 
-archivesBaseName = "sample-customer-service"
+base {
+    archivesName = "sample-customer-service"
+}
 
-sourceCompatibility = 1.8
-targetCompatibility = 1.8
+java {
+    toolchain {
+        languageVersion = JavaLanguageVersion.of(8)
+    }
+}

microservice-transaction-sample/customer-service/src/main/java/sample/customer/CustomerService.java

@@ -74,7 +74,7 @@ private void loadCustomerIfNotExists(
       throws CrudException {
     Optional<Customer> customer = Customer.get(transaction, id);
     if (!customer.isPresent()) {
-      Customer.put(transaction, id, name, creditLimit, creditTotal);
+      Customer.insert(transaction, id, name, creditLimit, creditTotal);
     }
   }
 

microservice-transaction-sample/customer-service/src/main/java/sample/customer/model/Customer.java

@@ -1,8 +1,9 @@
 package sample.customer.model;
 
 import com.scalar.db.api.Get;
-import com.scalar.db.api.Put;
+import com.scalar.db.api.Insert;
 import com.scalar.db.api.TransactionCrudOperable;
+import com.scalar.db.api.Update;
 import com.scalar.db.exception.transaction.CrudException;
 import com.scalar.db.io.Key;
 import java.util.Optional;
@@ -27,11 +28,11 @@ public Customer(int id, String name, int creditLimit, int creditTotal) {
     this.creditTotal = creditTotal;
   }
 
-  public static void put(
+  public static void insert(
       TransactionCrudOperable transaction, int id, String name, int creditLimit, int creditTotal)
       throws CrudException {
-    transaction.put(
-        Put.newBuilder()
+    transaction.insert(
+        Insert.newBuilder()
             .namespace(NAMESPACE)
             .table(TABLE)
             .partitionKey(Key.ofInt(COL_CUSTOMER_ID, id))
@@ -43,8 +44,8 @@ public static void put(
 
   public static void updateCreditTotal(TransactionCrudOperable transaction, int id, int creditTotal)
       throws CrudException {
-    transaction.put(
-        Put.newBuilder()
+    transaction.update(
+        Update.newBuilder()
             .namespace(NAMESPACE)
             .table(TABLE)
             .partitionKey(Key.ofInt(COL_CUSTOMER_ID, id))

microservice-transaction-sample/order-service/build.gradle

@@ -14,7 +14,7 @@ dependencies {
 }
 
 application {
-    mainClassName = 'sample.order.OrderServiceServer'
+    mainClass = 'sample.order.OrderServiceServer'
 }
 
 task copyFilesToDockerBuildContextDir(type: Copy) {
@@ -47,7 +47,12 @@ installDist {
     duplicatesStrategy DuplicatesStrategy.EXCLUDE
 }
 
-archivesBaseName = "sample-order-service"
+base {
+    archivesName = "sample-order-service"
+}
 
-sourceCompatibility = 1.8
-targetCompatibility = 1.8
+java {
+    toolchain {
+        languageVersion = JavaLanguageVersion.of(8)
+    }
+}

microservice-transaction-sample/order-service/src/main/java/sample/order/OrderService.java

@@ -94,7 +94,7 @@ private void loadItemIfNotExists(
       DistributedTransaction transaction, int id, String name, int price) throws CrudException {
     Optional<Item> item = Item.get(transaction, id);
     if (!item.isPresent()) {
-      Item.put(transaction, id, name, price);
+      Item.insert(transaction, id, name, price);
     }
   }
 
@@ -106,13 +106,13 @@ public void placeOrder(
         transaction -> {
           String orderId = UUID.randomUUID().toString();
 
-          // Put the order info into the orders table
-          Order.put(transaction, orderId, request.getCustomerId(), System.currentTimeMillis());
+          // Insert the order info into the orders table
+          Order.insert(transaction, orderId, request.getCustomerId(), System.currentTimeMillis());
 
           int amount = 0;
           for (ItemOrder itemOrder : request.getItemOrderList()) {
-            // Put the order statement into the statements table
-            Statement.put(transaction, orderId, itemOrder.getItemId(), itemOrder.getCount());
+            // Insert the order statement into the statements table
+            Statement.insert(transaction, orderId, itemOrder.getItemId(), itemOrder.getCount());
 
             // Retrieve the item info from the items table
             Optional<Item> item = Item.get(transaction, itemOrder.getItemId());

microservice-transaction-sample/order-service/src/main/java/sample/order/model/Item.java

@@ -1,7 +1,7 @@
 package sample.order.model;
 
 import com.scalar.db.api.Get;
-import com.scalar.db.api.Put;
+import com.scalar.db.api.Insert;
 import com.scalar.db.api.TransactionCrudOperable;
 import com.scalar.db.exception.transaction.CrudException;
 import com.scalar.db.io.Key;
@@ -25,10 +25,10 @@ public Item(int id, String name, int price) {
     this.price = price;
   }
 
-  public static void put(TransactionCrudOperable transaction, int id, String name, int price)
+  public static void insert(TransactionCrudOperable transaction, int id, String name, int price)
       throws CrudException {
-    transaction.put(
-        Put.newBuilder()
+    transaction.insert(
+        Insert.newBuilder()
             .namespace(NAMESPACE)
             .table(TABLE)
             .partitionKey(Key.ofInt(COL_ITEM_ID, id))

microservice-transaction-sample/order-service/src/main/java/sample/order/model/Order.java

@@ -1,7 +1,7 @@
 package sample.order.model;
 
 import com.scalar.db.api.Get;
-import com.scalar.db.api.Put;
+import com.scalar.db.api.Insert;
 import com.scalar.db.api.Result;
 import com.scalar.db.api.Scan;
 import com.scalar.db.api.Scan.Ordering;
@@ -30,11 +30,11 @@ public Order(String id, int customerId, long timestamp) {
     this.timestamp = timestamp;
   }
 
-  public static void put(
+  public static void insert(
       TransactionCrudOperable transaction, String id, int customerId, long timestamp)
       throws CrudException {
-    transaction.put(
-        Put.newBuilder()
+    transaction.insert(
+        Insert.newBuilder()
             .namespace(NAMESPACE)
             .table(TABLE)
             .partitionKey(Key.ofInt(COL_CUSTOMER_ID, customerId))

microservice-transaction-sample/order-service/src/main/java/sample/order/model/Statement.java

@@ -1,6 +1,6 @@
 package sample.order.model;
 
-import com.scalar.db.api.Put;
+import com.scalar.db.api.Insert;
 import com.scalar.db.api.Scan;
 import com.scalar.db.api.TransactionCrudOperable;
 import com.scalar.db.exception.transaction.CrudException;
@@ -26,10 +26,10 @@ public Statement(String orderId, int itemId, int count) {
     this.count = count;
   }
 
-  public static void put(TransactionCrudOperable transaction, String orderId, int itemId, int count)
+  public static void insert(TransactionCrudOperable transaction, String orderId, int itemId, int count)
       throws CrudException {
-    transaction.put(
-        Put.newBuilder()
+    transaction.insert(
+        Insert.newBuilder()
             .namespace(NAMESPACE)
             .table(TABLE)
             .partitionKey(Key.ofText(COL_ORDER_ID, orderId))

microservice-transaction-sample/rpc/build.gradle

@@ -1,7 +1,7 @@
 plugins {
     id 'java'
     id 'java-library-distribution'
-    id 'com.google.protobuf' version '0.9.1'
+    id 'com.google.protobuf' version '0.9.4'
 }
 
 dependencies {
@@ -20,16 +20,40 @@ protobuf {
     generateProtoTasks {
         all()*.plugins { grpc {} }
     }
-    generatedFilesBaseDir = "$projectDir/src"
 }
 
-archivesBaseName = "sample-rpc"
+base {
+    archivesName = "sample-rpc"
+}
+
+// Task copyGeneratedProtoToSrc copies the generated .java files into src directory
+task copyGeneratedProtoToSrc(type: Copy) {
+    description 'Copies generated Protocol Buffer classes to src/main/java/sample/rpc'
+    dependsOn generateProto
+    from "$buildDir/generated/source/proto/main/java/sample/rpc"
+    into "$projectDir/src/main/java/sample/rpc"
+    duplicatesStrategy = DuplicatesStrategy.INCLUDE
+}
+
+// Task deleteGeneratedProto deletes the generated .java files in build directory
+task deleteGeneratedProto(type: Delete) {
+    dependsOn copyGeneratedProtoToSrc
+    delete fileTree(dir: "$buildDir/generated/source/proto/main/java/sample/rpc")
+}
 
 // The processResources task needs to depend on the generateProto task because it uses the output
 // of the the generateProto task
 processResources {
     dependsOn generateProto
 }
 
-sourceCompatibility = 1.8
-targetCompatibility = 1.8
+// Task deleteGeneratedProto needs to depend on deleteGeneratedProto to avoid duplicate class error
+tasks.named("compileJava").configure {
+    dependsOn deleteGeneratedProto
+}
+
+java {
+    toolchain {
+        languageVersion = JavaLanguageVersion.of(8)
+    }
+}