From f915f8fc7a5ee027fa1ebc98f618384dc7f15a93 Mon Sep 17 00:00:00 2001
From: Calle Wilund <calle@scylladb.com>
Date: Mon, 30 Sep 2019 11:54:33 +0000
Subject: [PATCH] sstableinfo: Fix deserizalization of "properties"

Refs #76

Since the incoming json uses swagger "key", "value" syntax
we need to do explicit deserialization of this property
as well (not just extended props).

Message-Id: <20190930115432.27801-1-calle@scylladb.com>
---
 .../org/apache/cassandra/service/SSTableInfo.java     | 11 +++++++++++
 1 file changed, 11 insertions(+)

diff --git a/src/main/java/org/apache/cassandra/service/SSTableInfo.java b/src/main/java/org/apache/cassandra/service/SSTableInfo.java
index 17287c8..d451772 100644
--- a/src/main/java/org/apache/cassandra/service/SSTableInfo.java
+++ b/src/main/java/org/apache/cassandra/service/SSTableInfo.java
@@ -118,6 +118,17 @@ public class SSTableInfo {
         this.extendedProperties = extendedProperties;
     }
 
+    @JsonProperty("properties")
+    private void unpackProperties(List<Map<String, String>> maps) {
+        Map<String, String> result = new HashMap<>();
+        for (Map<String, String> map : maps) {
+            String key = map.get("key");
+            String value = map.get("value");
+            result.put(key, value);
+        }
+        properties = result;
+    }
+
     @JsonProperty("extended_properties")
     private void unpackNested(List<Map<String, Object>> properties) {
         Map<String, Map<String, String>> result = new HashMap<String, Map<String, String>>();