2 files changed, 6 insertions, 14 deletions
diff --git a/src/main/java/org/onap/music/datastore/jsonobjects/JsonDelete.java b/src/main/java/org/onap/music/datastore/jsonobjects/JsonDelete.java
index c90dd005..b98a391d 100644
--- a/src/main/java/org/onap/music/datastore/jsonobjects/JsonDelete.java
+++ b/src/main/java/org/onap/music/datastore/jsonobjects/JsonDelete.java
@@ -4,6 +4,8 @@
  * ===================================================================
  *  Copyright (c) 2017 AT&T Intellectual Property
  * ===================================================================
+ *  Modifications Copyright (c) 2019 Samsung
+ * ===================================================================
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
  *  You may obtain a copy of the License at
@@ -22,7 +24,7 @@
 
 package org.onap.music.datastore.jsonobjects;
 
-import java.util.ArrayList;
+import java.util.List;
 import java.util.Map;
 
 import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
@@ -34,7 +36,7 @@ import io.swagger.annotations.ApiModelProperty;
 @JsonIgnoreProperties(ignoreUnknown = true)
 public class JsonDelete {
 
-    private ArrayList<String> columns = null;
+    private List<String> columns = null;
     private Map<String, String> consistencyInfo;
     private Map<String, Object> conditions;
     String ttl, timestamp;
@@ -59,11 +61,11 @@ public class JsonDelete {
     }
 
     @ApiModelProperty(value = "Column values")
-    public ArrayList<String> getColumns() {
+    public List<String> getColumns() {
         return columns;
     }
 
-    public void setColumns(ArrayList<String> columns) {
+    public void setColumns(List<String> columns) {
         this.columns = columns;
     }
 
diff --git a/src/main/java/org/onap/music/datastore/jsonobjects/JsonTable.java b/src/main/java/org/onap/music/datastore/jsonobjects/JsonTable.java
index cf691590..badcaebe 100644
--- a/src/main/java/org/onap/music/datastore/jsonobjects/JsonTable.java
+++ b/src/main/java/org/onap/music/datastore/jsonobjects/JsonTable.java
@@ -38,7 +38,6 @@ public class JsonTable {
     private Map<String, String> fields;
     private Map<String, Object> properties;
     private String primaryKey;
-    private String sortingKey;
     private String partitionKey;
     private String clusteringKey;
     private String filteringKey;
@@ -90,15 +89,6 @@ public class JsonTable {
         this.tableName = tableName;
     }
 
-    @ApiModelProperty(value = "Sorting Key")
-    public String getSortingKey() {
-        return sortingKey;
-    }
-
-    public void setSortingKey(String sortingKey) {
-        this.sortingKey = sortingKey;
-    }
-
     @ApiModelProperty(value = "Clustering Order", notes = "")
     public String getClusteringOrder() {
         return clusteringOrder;