remove typed reference from grant

Max Presman · Max Presman · commit e0a47f20a692 · 2016-11-25T18:53:43.000-08:00
diff --git a/src/main/java/com/pubnub/api/endpoints/access/Grant.java b/src/main/java/com/pubnub/api/endpoints/access/Grant.java
@@ -1,16 +1,14 @@
 package com.pubnub.api.endpoints.access;
 
-import com.fasterxml.jackson.core.type.TypeReference;
+import com.fasterxml.jackson.databind.JsonNode;
 import com.pubnub.api.PubNub;
 import com.pubnub.api.PubNubException;
 import com.pubnub.api.PubNubUtil;
 import com.pubnub.api.builder.PubNubErrorBuilder;
 import com.pubnub.api.endpoints.Endpoint;
 import com.pubnub.api.enums.PNOperationType;
-import com.pubnub.api.managers.MapperManager;
 import com.pubnub.api.models.consumer.access_manager.PNAccessManagerGrantResult;
 import com.pubnub.api.models.consumer.access_manager.PNAccessManagerKeyData;
-import com.pubnub.api.models.consumer.access_manager.PNAccessManagerKeysData;
 import com.pubnub.api.models.server.Envelope;
 import com.pubnub.api.models.server.access_manager.AccessManagerGrantPayload;
 import lombok.Setter;
@@ -21,6 +19,7 @@
 
 import java.util.ArrayList;
 import java.util.HashMap;
+import java.util.Iterator;
 import java.util.List;
 import java.util.Map;
 
@@ -119,27 +118,19 @@ protected PNAccessManagerGrantResult createResponse(Response<Envelope<AccessMana
             if (channelGroups.size() == 1) {
                 constructedGroups.put(data.getChannelGroups().asText(), data.getAuthKeys());
             } else if (channelGroups.size() > 1) {
-                MapperManager mapper = this.getPubnub().getMapper();
-                HashMap<String, PNAccessManagerKeysData> channelGroupKeySet = mapper.fromJson(data.getChannelGroups().toString(),
-                        new TypeReference<HashMap<String, PNAccessManagerKeysData>>() {
-                        });
-//                    for (String fetchedChannelGroup : channelGroupKeySet.keySet()) {
-//                        constructedGroups.put(fetchedChannelGroup, channelGroupKeySet.get(fetchedChannelGroup).getAuthKeys());
-//                    }
-                for (Map.Entry<String, PNAccessManagerKeysData> entry : channelGroupKeySet.entrySet()) {
-                    constructedGroups.put(entry.getKey(), entry.getValue().getAuthKeys());
+                for (Iterator<Map.Entry<String, JsonNode>> it = data.getChannelGroups().fields(); it.hasNext();) {
+                    Map.Entry<String, JsonNode> channelGroup = it.next();
+                    constructedGroups.put(channelGroup.getKey(), createKeyMap(channelGroup.getValue()));
                 }
             }
         }
 
-
         if (data.getChannels() != null) {
             for (String fetchedChannel : data.getChannels().keySet()) {
                 constructedChannels.put(fetchedChannel, data.getChannels().get(fetchedChannel).getAuthKeys());
             }
         }
 
-
         return pnAccessManagerGrantResult
                 .subscribeKey(data.getSubscribeKey())
                 .level(data.getLevel())
@@ -159,4 +150,20 @@ protected boolean isAuthRequired() {
         return false;
     }
 
+    private Map<String, PNAccessManagerKeyData> createKeyMap(JsonNode input) {
+        Map<String, PNAccessManagerKeyData> result = new HashMap<>();
+
+        for (Iterator<Map.Entry<String, JsonNode>> it = input.get("auths").fields(); it.hasNext();) {
+            Map.Entry<String, JsonNode> keyMap = it.next();
+            PNAccessManagerKeyData pnAccessManagerKeyData = new PNAccessManagerKeyData()
+                    .setManageEnabled(keyMap.getValue().get("m").asBoolean())
+                    .setWriteEnabled(keyMap.getValue().get("w").asBoolean())
+                    .setReadEnabled(keyMap.getValue().get("r").asBoolean());
+
+            result.put(keyMap.getKey(), pnAccessManagerKeyData);
+        }
+
+        return result;
+    }
+
 }
diff --git a/src/main/java/com/pubnub/api/managers/MapperManager.java b/src/main/java/com/pubnub/api/managers/MapperManager.java
@@ -1,7 +1,6 @@
 package com.pubnub.api.managers;
 
 import com.fasterxml.jackson.core.JsonProcessingException;
-import com.fasterxml.jackson.core.type.TypeReference;
 import com.fasterxml.jackson.databind.DeserializationFeature;
 import com.fasterxml.jackson.databind.ObjectMapper;
 import com.pubnub.api.PubNubException;
@@ -35,15 +34,6 @@ public <T> T fromJson(String input, Class<T> clazz) throws PubNubException {
         }
     }
 
-    @SuppressWarnings("unchecked")
-    public <T> T fromJson(String input, TypeReference typeReference) throws PubNubException {
-        try {
-            return this.objectMapper.readValue(input, typeReference);
-        } catch (IOException e) {
-            throw PubNubException.builder().pubnubError(PubNubErrorBuilder.PNERROBJ_PARSING_ERROR).errormsg(e.getMessage()).build();
-        }
-    }
-
     @SuppressWarnings("unchecked")
     public <T> T convertValue(Object input, Class clazz) {
         return (T) this.objectMapper.convertValue(input, clazz);
diff --git a/src/main/java/com/pubnub/api/models/consumer/access_manager/PNAccessManagerKeyData.java b/src/main/java/com/pubnub/api/models/consumer/access_manager/PNAccessManagerKeyData.java
@@ -2,8 +2,12 @@
 
 import com.fasterxml.jackson.annotation.JsonProperty;
 import lombok.Getter;
+import lombok.Setter;
+import lombok.experimental.Accessors;
 
 @Getter
+@Setter
+@Accessors(chain = true)
 public class PNAccessManagerKeyData {
 
     @JsonProperty("r")
