blob: 14b3db9c1c2d6f84e223be1f50da37b12bf2f864 [file] [log] [blame]
Thomas Vachuskafe8c98a2015-02-04 01:24:32 -08001/*
Brian O'Connor5ab426f2016-04-09 01:19:45 -07002 * Copyright 2015-present Open Networking Laboratory
Thomas Vachuskafe8c98a2015-02-04 01:24:32 -08003 *
4 * Licensed under the Apache License, Version 2.0 (the "License");
5 * you may not use this file except in compliance with the License.
6 * You may obtain a copy of the License at
7 *
8 * http://www.apache.org/licenses/LICENSE-2.0
9 *
10 * Unless required by applicable law or agreed to in writing, software
11 * distributed under the License is distributed on an "AS IS" BASIS,
12 * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
13 * See the License for the specific language governing permissions and
14 * limitations under the License.
15 */
16package org.onosproject.ui.impl;
17
Thomas Vachuska9ed335b2015-04-14 12:07:47 -070018import com.fasterxml.jackson.databind.JsonNode;
Thomas Vachuska0af26912016-03-21 21:37:30 -070019import com.fasterxml.jackson.databind.ObjectMapper;
20import com.fasterxml.jackson.databind.node.ArrayNode;
21import com.fasterxml.jackson.databind.node.BooleanNode;
22import com.fasterxml.jackson.databind.node.DoubleNode;
23import com.fasterxml.jackson.databind.node.IntNode;
24import com.fasterxml.jackson.databind.node.JsonNodeFactory;
25import com.fasterxml.jackson.databind.node.LongNode;
26import com.fasterxml.jackson.databind.node.NullNode;
27import com.fasterxml.jackson.databind.node.ObjectNode;
28import com.fasterxml.jackson.databind.node.ShortNode;
29import com.fasterxml.jackson.databind.node.TextNode;
Thomas Vachuskafe8c98a2015-02-04 01:24:32 -080030import com.google.common.collect.ImmutableList;
Thomas Vachuska0af26912016-03-21 21:37:30 -070031import com.google.common.collect.ImmutableMap;
Thomas Vachuska9ed335b2015-04-14 12:07:47 -070032import com.google.common.collect.ImmutableSet;
Thomas Vachuskafe8c98a2015-02-04 01:24:32 -080033import com.google.common.collect.Lists;
34import com.google.common.collect.Maps;
35import org.apache.felix.scr.annotations.Activate;
36import org.apache.felix.scr.annotations.Component;
37import org.apache.felix.scr.annotations.Deactivate;
Thomas Vachuska51f540f2015-05-27 17:26:57 -070038import org.apache.felix.scr.annotations.Reference;
39import org.apache.felix.scr.annotations.ReferenceCardinality;
Thomas Vachuskafe8c98a2015-02-04 01:24:32 -080040import org.apache.felix.scr.annotations.Service;
Madan Jampanibf8ee802016-05-04 14:07:36 -070041import org.onlab.util.Tools;
Thomas Vachuska51f540f2015-05-27 17:26:57 -070042import org.onosproject.mastership.MastershipService;
Thomas Vachuska0af26912016-03-21 21:37:30 -070043import org.onosproject.store.serializers.KryoNamespaces;
Madan Jampani7b93ceb2016-05-04 09:58:40 -070044import org.onosproject.store.service.ConsistentMap;
45import org.onosproject.store.service.MapEvent;
46import org.onosproject.store.service.MapEventListener;
47import org.onosproject.store.service.Serializer;
Thomas Vachuska0af26912016-03-21 21:37:30 -070048import org.onosproject.store.service.StorageService;
Thomas Vachuskafe8c98a2015-02-04 01:24:32 -080049import org.onosproject.ui.UiExtension;
50import org.onosproject.ui.UiExtensionService;
Thomas Vachuska3553b302015-03-07 14:49:43 -080051import org.onosproject.ui.UiMessageHandlerFactory;
Thomas Vachuska0af26912016-03-21 21:37:30 -070052import org.onosproject.ui.UiPreferencesService;
Simon Huntd5b96732016-07-08 13:22:27 -070053import org.onosproject.ui.UiTopoMap;
Steven Burrows3a9a6442016-05-05 15:31:16 +010054import org.onosproject.ui.UiTopoMapFactory;
Simon Huntd5b96732016-07-08 13:22:27 -070055import org.onosproject.ui.UiTopoOverlayFactory;
Thomas Vachuskafe8c98a2015-02-04 01:24:32 -080056import org.onosproject.ui.UiView;
Simon Hunt1002cd82015-04-23 14:44:03 -070057import org.onosproject.ui.UiViewHidden;
Simon Huntd5b96732016-07-08 13:22:27 -070058import org.onosproject.ui.impl.topo.Topo2ViewMessageHandler;
Thomas Vachuskafe8c98a2015-02-04 01:24:32 -080059import org.slf4j.Logger;
60import org.slf4j.LoggerFactory;
61
Thomas Vachuska0af26912016-03-21 21:37:30 -070062import java.util.LinkedHashMap;
Thomas Vachuskafe8c98a2015-02-04 01:24:32 -080063import java.util.List;
64import java.util.Map;
Thomas Vachuska9ed335b2015-04-14 12:07:47 -070065import java.util.Set;
Madan Jampanibf8ee802016-05-04 14:07:36 -070066import java.util.concurrent.ExecutorService;
67import java.util.concurrent.Executors;
Thomas Vachuskafe8c98a2015-02-04 01:24:32 -080068
69import static com.google.common.collect.ImmutableList.of;
70import static java.util.stream.Collectors.toSet;
Heedo Kang4a47a302016-02-29 17:40:23 +090071import static org.onosproject.security.AppGuard.checkPermission;
72import static org.onosproject.security.AppPermission.Type.UI_READ;
73import static org.onosproject.security.AppPermission.Type.UI_WRITE;
Thomas Vachuska0af26912016-03-21 21:37:30 -070074import static org.onosproject.ui.UiView.Category.NETWORK;
75import static org.onosproject.ui.UiView.Category.PLATFORM;
Heedo Kang4a47a302016-02-29 17:40:23 +090076
Thomas Vachuskafe8c98a2015-02-04 01:24:32 -080077/**
78 * Manages the user interface extensions.
79 */
80@Component(immediate = true)
81@Service
Simon Hunt3678c2a2016-03-28 14:48:07 -070082public class UiExtensionManager
83 implements UiExtensionService, UiPreferencesService, SpriteService {
Thomas Vachuskafe8c98a2015-02-04 01:24:32 -080084
Thomas Vachuskafa74dd72016-03-20 19:11:12 -070085 private static final ClassLoader CL = UiExtensionManager.class.getClassLoader();
Simon Hunt3678c2a2016-03-28 14:48:07 -070086
Madan Jampani7b93ceb2016-05-04 09:58:40 -070087 private static final String ONOS_USER_PREFERENCES = "onos-ui-user-preferences";
Simon Hunte05cae42015-07-23 17:35:24 -070088 private static final String CORE = "core";
Thomas Vachuskafa74dd72016-03-20 19:11:12 -070089 private static final String GUI_ADDED = "guiAdded";
90 private static final String GUI_REMOVED = "guiRemoved";
Thomas Vachuska0af26912016-03-21 21:37:30 -070091 private static final String UPDATE_PREFS = "updatePrefs";
Simon Hunt3678c2a2016-03-28 14:48:07 -070092 private static final String SLASH = "/";
93
94 private static final int IDX_USER = 0;
95 private static final int IDX_KEY = 1;
Simon Hunte05cae42015-07-23 17:35:24 -070096
Thomas Vachuskafe8c98a2015-02-04 01:24:32 -080097 private final Logger log = LoggerFactory.getLogger(getClass());
98
99 // List of all extensions
100 private final List<UiExtension> extensions = Lists.newArrayList();
101
102 // Map of views to extensions
103 private final Map<String, UiExtension> views = Maps.newHashMap();
104
105 // Core views & core extension
Thomas Vachuska3553b302015-03-07 14:49:43 -0800106 private final UiExtension core = createCoreExtension();
Thomas Vachuskafe8c98a2015-02-04 01:24:32 -0800107
Thomas Vachuska51f540f2015-05-27 17:26:57 -0700108 @Reference(cardinality = ReferenceCardinality.MANDATORY_UNARY)
109 protected MastershipService mastershipService;
Thomas Vachuska3553b302015-03-07 14:49:43 -0800110
Thomas Vachuska0af26912016-03-21 21:37:30 -0700111 @Reference(cardinality = ReferenceCardinality.MANDATORY_UNARY)
112 protected StorageService storageService;
113
114 // User preferences
Madan Jampani7b93ceb2016-05-04 09:58:40 -0700115 private ConsistentMap<String, ObjectNode> prefsConsistentMap;
116 private Map<String, ObjectNode> prefs;
117 private final MapEventListener<String, ObjectNode> prefsListener =
Thomas Vachuska0af26912016-03-21 21:37:30 -0700118 new InternalPrefsListener();
119
120 private final ObjectMapper mapper = new ObjectMapper();
121
Madan Jampanibf8ee802016-05-04 14:07:36 -0700122 private final ExecutorService eventHandlingExecutor =
Simon Huntd5b96732016-07-08 13:22:27 -0700123 Executors.newSingleThreadExecutor(
124 Tools.groupedThreads("onos/ui-ext-manager", "event-handler", log));
Madan Jampanibf8ee802016-05-04 14:07:36 -0700125
Thomas Vachuska3553b302015-03-07 14:49:43 -0800126 // Creates core UI extension
Simon Huntc54cd1b2015-05-11 13:43:44 -0700127 private UiExtension createCoreExtension() {
Simon Hunt20e16792015-04-24 14:29:39 -0700128 List<UiView> coreViews = of(
129 new UiView(PLATFORM, "app", "Applications", "nav_apps"),
Thomas Vachuskaaa8b0eb2015-05-22 09:54:15 -0700130 new UiView(PLATFORM, "settings", "Settings", "nav_settings"),
Simon Hunt20e16792015-04-24 14:29:39 -0700131 new UiView(PLATFORM, "cluster", "Cluster Nodes", "nav_cluster"),
Thomas Vachuska3ece3732015-09-22 23:58:50 -0700132 new UiView(PLATFORM, "processor", "Packet Processors", "nav_processors"),
chengfanc5a99dc2017-01-08 19:28:29 +0800133 new UiView(PLATFORM, "partition", "Partitions", "nav_partitions"),
Simon Hunt20e16792015-04-24 14:29:39 -0700134 new UiView(NETWORK, "topo", "Topology", "nav_topo"),
Simon Huntd5b96732016-07-08 13:22:27 -0700135
136 // FIXME: leave commented out for now, while still under development
Simon Hunt1bee5292016-10-14 11:02:33 -0700137 // (remember to also comment out inclusions in index.html)
Simon Huntd5b96732016-07-08 13:22:27 -0700138// new UiView(NETWORK, "topo2", "New-Topo"),
139
Simon Hunt20e16792015-04-24 14:29:39 -0700140 new UiView(NETWORK, "device", "Devices", "nav_devs"),
141 new UiViewHidden("flow"),
Bri Prebilic Coleac829e42015-05-05 13:42:06 -0700142 new UiViewHidden("port"),
Bri Prebilic Coleff3dc672015-05-06 12:59:38 -0700143 new UiViewHidden("group"),
Jian Li1f544732015-12-30 23:36:37 -0800144 new UiViewHidden("meter"),
Simon Hunt20e16792015-04-24 14:29:39 -0700145 new UiView(NETWORK, "link", "Links", "nav_links"),
146 new UiView(NETWORK, "host", "Hosts", "nav_hosts"),
chengfanb466a7e2015-08-21 09:59:29 -0500147 new UiView(NETWORK, "intent", "Intents", "nav_intents"),
Simon Hunt986b92f2016-06-03 15:46:59 -0700148 new UiView(NETWORK, "tunnel", "Tunnels", "nav_tunnels")
Simon Hunt20e16792015-04-24 14:29:39 -0700149 );
Simon Hunt1002cd82015-04-23 14:44:03 -0700150
Simon Hunt4c7edd32015-03-11 10:42:53 -0700151 UiMessageHandlerFactory messageHandlerFactory =
152 () -> ImmutableList.of(
Thomas Vachuska0af26912016-03-21 21:37:30 -0700153 new UserPreferencesMessageHandler(),
Thomas Vachuskae586b792015-03-26 13:59:38 -0700154 new TopologyViewMessageHandler(),
Simon Huntd5b96732016-07-08 13:22:27 -0700155 new Topo2ViewMessageHandler(),
Thomas Vachuska26be4f32016-03-31 01:10:27 -0700156 new MapSelectorMessageHandler(),
Thomas Vachuskae586b792015-03-26 13:59:38 -0700157 new DeviceViewMessageHandler(),
Thomas Vachuska583bc632015-04-14 10:10:57 -0700158 new LinkViewMessageHandler(),
Thomas Vachuska0fa583c2015-03-30 23:07:41 -0700159 new HostViewMessageHandler(),
Bri Prebilic Colecdc188d2015-04-24 16:40:11 -0700160 new FlowViewMessageHandler(),
Bri Prebilic Coleac829e42015-05-05 13:42:06 -0700161 new PortViewMessageHandler(),
Bri Prebilic Coleff3dc672015-05-06 12:59:38 -0700162 new GroupViewMessageHandler(),
Jian Li1f544732015-12-30 23:36:37 -0800163 new MeterViewMessageHandler(),
Bri Prebilic Cole384e8dc2015-04-13 15:51:14 -0700164 new IntentViewMessageHandler(),
Thomas Vachuska583bc632015-04-14 10:10:57 -0700165 new ApplicationViewMessageHandler(),
Thomas Vachuskaaa8b0eb2015-05-22 09:54:15 -0700166 new SettingsViewMessageHandler(),
chengfanb466a7e2015-08-21 09:59:29 -0500167 new ClusterViewMessageHandler(),
Thomas Vachuska3ece3732015-09-22 23:58:50 -0700168 new ProcessorViewMessageHandler(),
chengfanc5a99dc2017-01-08 19:28:29 +0800169 new TunnelViewMessageHandler(),
170 new PartitionViewMessageHandler()
Simon Hunt4c7edd32015-03-11 10:42:53 -0700171 );
Simon Hunt1002cd82015-04-23 14:44:03 -0700172
Simon Hunte05cae42015-07-23 17:35:24 -0700173 UiTopoOverlayFactory topoOverlayFactory =
174 () -> ImmutableList.of(
Andrea Campanella732ea832017-02-06 09:25:59 -0800175 new TrafficOverlay(),
176 new ProtectedIntentOverlay()
Simon Hunte05cae42015-07-23 17:35:24 -0700177 );
178
Steven Burrows3a9a6442016-05-05 15:31:16 +0100179 UiTopoMapFactory topoMapFactory =
180 () -> ImmutableList.of(
181 new UiTopoMap("australia", "Australia", "*australia", 1.0),
182 new UiTopoMap("americas", "North, Central and South America", "*americas", 0.7),
183 new UiTopoMap("n_america", "North America", "*n_america", 0.9),
184 new UiTopoMap("s_america", "South America", "*s_america", 0.9),
Thomas Vachuskacc0b7d62016-07-12 14:03:11 -0700185 new UiTopoMap("usa", "United States", "*continental_us", 1.3),
Steven Burrows3a9a6442016-05-05 15:31:16 +0100186 new UiTopoMap("bayareaGEO", "Bay Area, California", "*bayarea", 1.0),
Thomas Vachuskacc0b7d62016-07-12 14:03:11 -0700187 new UiTopoMap("europe", "Europe", "*europe", 10.0),
Steven Burrows3a9a6442016-05-05 15:31:16 +0100188 new UiTopoMap("italy", "Italy", "*italy", 0.8),
Thomas Vachuskacc0b7d62016-07-12 14:03:11 -0700189 new UiTopoMap("uk", "United Kingdom and Ireland", "*uk", 2.0),
Steven Burrows3a9a6442016-05-05 15:31:16 +0100190 new UiTopoMap("japan", "Japan", "*japan", 0.8),
191 new UiTopoMap("s_korea", "South Korea", "*s_korea", 0.75),
192 new UiTopoMap("taiwan", "Taiwan", "*taiwan", 0.7),
193 new UiTopoMap("africa", "Africa", "*africa", 0.7),
194 new UiTopoMap("oceania", "Oceania", "*oceania", 0.7),
195 new UiTopoMap("asia", "Asia", "*asia", 0.7)
196 );
197
Simon Hunte05cae42015-07-23 17:35:24 -0700198 return new UiExtension.Builder(CL, coreViews)
199 .messageHandlerFactory(messageHandlerFactory)
200 .topoOverlayFactory(topoOverlayFactory)
Steven Burrows3a9a6442016-05-05 15:31:16 +0100201 .topoMapFactory(topoMapFactory)
Simon Hunte05cae42015-07-23 17:35:24 -0700202 .resourcePath(CORE)
203 .build();
Thomas Vachuska3553b302015-03-07 14:49:43 -0800204 }
Thomas Vachuskafe8c98a2015-02-04 01:24:32 -0800205
206 @Activate
207 public void activate() {
Madan Jampani7b93ceb2016-05-04 09:58:40 -0700208 Serializer serializer = Serializer.using(KryoNamespaces.API,
Simon Huntd5b96732016-07-08 13:22:27 -0700209 ObjectNode.class, ArrayNode.class,
210 JsonNodeFactory.class, LinkedHashMap.class,
211 TextNode.class, BooleanNode.class,
212 LongNode.class, DoubleNode.class, ShortNode.class,
213 IntNode.class, NullNode.class);
Thomas Vachuska0af26912016-03-21 21:37:30 -0700214
Madan Jampani7b93ceb2016-05-04 09:58:40 -0700215 prefsConsistentMap = storageService.<String, ObjectNode>consistentMapBuilder()
Simon Hunt3678c2a2016-03-28 14:48:07 -0700216 .withName(ONOS_USER_PREFERENCES)
Madan Jampani7b93ceb2016-05-04 09:58:40 -0700217 .withSerializer(serializer)
218 .withRelaxedReadConsistency()
Thomas Vachuska0af26912016-03-21 21:37:30 -0700219 .build();
Madan Jampani7b93ceb2016-05-04 09:58:40 -0700220 prefsConsistentMap.addListener(prefsListener);
221 prefs = prefsConsistentMap.asJavaMap();
Thomas Vachuskafe8c98a2015-02-04 01:24:32 -0800222 register(core);
223 log.info("Started");
224 }
225
226 @Deactivate
227 public void deactivate() {
Madan Jampani7b93ceb2016-05-04 09:58:40 -0700228 prefsConsistentMap.removeListener(prefsListener);
Madan Jampanibf8ee802016-05-04 14:07:36 -0700229 eventHandlingExecutor.shutdown();
Thomas Vachuska51f540f2015-05-27 17:26:57 -0700230 UiWebSocketServlet.closeAll();
Thomas Vachuskafe8c98a2015-02-04 01:24:32 -0800231 unregister(core);
232 log.info("Stopped");
233 }
234
235 @Override
236 public synchronized void register(UiExtension extension) {
Heedo Kang4a47a302016-02-29 17:40:23 +0900237 checkPermission(UI_WRITE);
Thomas Vachuskafe8c98a2015-02-04 01:24:32 -0800238 if (!extensions.contains(extension)) {
239 extensions.add(extension);
240 for (UiView view : extension.views()) {
241 views.put(view.id(), extension);
242 }
Thomas Vachuskafa74dd72016-03-20 19:11:12 -0700243 UiWebSocketServlet.sendToAll(GUI_ADDED, null);
Thomas Vachuskafe8c98a2015-02-04 01:24:32 -0800244 }
245 }
246
247 @Override
248 public synchronized void unregister(UiExtension extension) {
Heedo Kang4a47a302016-02-29 17:40:23 +0900249 checkPermission(UI_WRITE);
Thomas Vachuskafe8c98a2015-02-04 01:24:32 -0800250 extensions.remove(extension);
Thomas Vachuskafa74dd72016-03-20 19:11:12 -0700251 extension.views().stream().map(UiView::id).collect(toSet()).forEach(views::remove);
252 UiWebSocketServlet.sendToAll(GUI_REMOVED, null);
Thomas Vachuskafe8c98a2015-02-04 01:24:32 -0800253 }
254
255 @Override
256 public synchronized List<UiExtension> getExtensions() {
Heedo Kang4a47a302016-02-29 17:40:23 +0900257 checkPermission(UI_READ);
Thomas Vachuskafe8c98a2015-02-04 01:24:32 -0800258 return ImmutableList.copyOf(extensions);
259 }
260
261 @Override
262 public synchronized UiExtension getViewExtension(String viewId) {
Heedo Kang4a47a302016-02-29 17:40:23 +0900263 checkPermission(UI_READ);
Thomas Vachuskafe8c98a2015-02-04 01:24:32 -0800264 return views.get(viewId);
265 }
Thomas Vachuska9ed335b2015-04-14 12:07:47 -0700266
Thomas Vachuska0af26912016-03-21 21:37:30 -0700267 @Override
268 public Set<String> getUserNames() {
269 ImmutableSet.Builder<String> builder = ImmutableSet.builder();
270 prefs.keySet().forEach(k -> builder.add(userName(k)));
271 return builder.build();
272 }
273
274 @Override
275 public Map<String, ObjectNode> getPreferences(String userName) {
276 ImmutableMap.Builder<String, ObjectNode> builder = ImmutableMap.builder();
277 prefs.entrySet().stream()
Simon Hunt3678c2a2016-03-28 14:48:07 -0700278 .filter(e -> e.getKey().startsWith(userName + SLASH))
Thomas Vachuska0af26912016-03-21 21:37:30 -0700279 .forEach(e -> builder.put(keyName(e.getKey()), e.getValue()));
280 return builder.build();
281 }
282
283 @Override
284 public void setPreference(String userName, String preference, ObjectNode value) {
285 prefs.put(key(userName, preference), value);
286 }
287
Simon Huntc54cd1b2015-05-11 13:43:44 -0700288 // =====================================================================
Thomas Vachuska9ed335b2015-04-14 12:07:47 -0700289 // Provisional tracking of sprite definitions
Simon Huntc54cd1b2015-05-11 13:43:44 -0700290
291 private final Map<String, JsonNode> sprites = Maps.newHashMap();
Thomas Vachuska9ed335b2015-04-14 12:07:47 -0700292
293 @Override
294 public Set<String> getNames() {
295 return ImmutableSet.copyOf(sprites.keySet());
296 }
297
298 @Override
299 public void put(String name, JsonNode spriteData) {
Simon Huntfd8c7d72015-04-14 17:53:37 -0700300 log.info("Registered sprite definition [{}]", name);
Thomas Vachuska9ed335b2015-04-14 12:07:47 -0700301 sprites.put(name, spriteData);
302 }
303
304 @Override
305 public JsonNode get(String name) {
306 return sprites.get(name);
307 }
308
Thomas Vachuska0af26912016-03-21 21:37:30 -0700309 private String key(String userName, String keyName) {
Simon Hunt3678c2a2016-03-28 14:48:07 -0700310 return userName + SLASH + keyName;
Thomas Vachuska0af26912016-03-21 21:37:30 -0700311 }
312
Simon Hunt3678c2a2016-03-28 14:48:07 -0700313
Thomas Vachuska0af26912016-03-21 21:37:30 -0700314 private String userName(String key) {
Simon Hunt3678c2a2016-03-28 14:48:07 -0700315 return key.split(SLASH)[IDX_USER];
Thomas Vachuska0af26912016-03-21 21:37:30 -0700316 }
317
318 private String keyName(String key) {
Simon Hunt3678c2a2016-03-28 14:48:07 -0700319 return key.split(SLASH)[IDX_KEY];
Thomas Vachuska0af26912016-03-21 21:37:30 -0700320 }
321
322 // Auxiliary listener to preference map events.
323 private class InternalPrefsListener
Madan Jampani7b93ceb2016-05-04 09:58:40 -0700324 implements MapEventListener<String, ObjectNode> {
Thomas Vachuska0af26912016-03-21 21:37:30 -0700325 @Override
Madan Jampani7b93ceb2016-05-04 09:58:40 -0700326 public void event(MapEvent<String, ObjectNode> event) {
Madan Jampanibf8ee802016-05-04 14:07:36 -0700327 eventHandlingExecutor.execute(() -> {
328 String userName = userName(event.key());
329 if (event.type() == MapEvent.Type.INSERT || event.type() == MapEvent.Type.UPDATE) {
330 UiWebSocketServlet.sendToUser(userName, UPDATE_PREFS, jsonPrefs());
331 }
332 });
Thomas Vachuska0af26912016-03-21 21:37:30 -0700333 }
334
335 private ObjectNode jsonPrefs() {
336 ObjectNode json = mapper.createObjectNode();
337 prefs.entrySet().forEach(e -> json.set(keyName(e.getKey()), e.getValue()));
338 return json;
339 }
340 }
Thomas Vachuskafe8c98a2015-02-04 01:24:32 -0800341}