Merge "Sonar Fixes - CadiAuthFilter.java"

[music.git] / src / main / java / org / onap / music / datastore / jsonobjects / JsonTable.java

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 c0d8521..badcaeb 100644 (file)
--- a/src/main/java/org/onap/music/datastore/jsonobjects/JsonTable.java
+++ b/src/main/java/org/onap/music/datastore/jsonobjects/JsonTable.java
@@ -19,13 +19,18 @@
  * ============LICENSE_END=============================================
  * ====================================================================
  */
+
 package org.onap.music.datastore.jsonobjects;
 
 import java.util.Map;
+
+import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
+
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 
 @ApiModel(value = "JsonTable", description = "Defines the Json for Creating a new Table.")
+@JsonIgnoreProperties(ignoreUnknown = true)
 public class JsonTable {
     private String keyspaceName;
     private String tableName;
@@ -33,7 +38,9 @@ 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;
     private String clusteringOrder;
     private Map<String, String> consistencyInfo;
 
@@ -82,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;
@@ -109,5 +107,29 @@ public class JsonTable {
         this.primaryKey = primaryKey;
     }
 
+    public String getClusteringKey() {
+        return clusteringKey;
+    }
+
+    public void setClusteringKey(String clusteringKey) {
+        this.clusteringKey = clusteringKey;
+    }
+
+    public String getFilteringKey() {
+        return filteringKey;
+    }
+
+    public void setFilteringKey(String filteringKey) {
+        this.filteringKey = filteringKey;
+    }
+
+    public String getPartitionKey() {
+        return partitionKey;
+    }
+
+    public void setPartitionKey(String partitionKey) {
+        this.partitionKey = partitionKey;
+    }
+
 
 }