[MediaWiki-commits] [Gerrit] Servlet JSON output is now done using GSON library - change (mediawiki...WikidataEntitySuggester)

[Nilesh (Code Review)]

Nilesh has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/76877


Change subject: Servlet JSON output is now done using GSON library
......................................................................

Servlet JSON output is now done using GSON library

Change-Id: Ibacc8357d9afd4ad7b5ce0640dffea61c7884112
---
M client/pom.xml
M 
client/src/main/java/org/wikimedia/wikibase/entitysuggester/client/servlets/AbstractEntitySuggesterServlet.java
2 files changed, 14 insertions(+), 13 deletions(-)


  git pull 
ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/WikidataEntitySuggester 
refs/changes/77/76877/1

diff --git a/client/pom.xml b/client/pom.xml
index ce6dc08..3c62566 100644
--- a/client/pom.xml
+++ b/client/pom.xml
@@ -12,6 +12,11 @@
     <version>0.0.2</version>
     <dependencies>
         <dependency>
+            <groupId>com.google.code.gson</groupId>
+            <artifactId>gson</artifactId>
+            <version>2.2.4</version>
+        </dependency>
+        <dependency>
             <groupId>org.apache.hadoop</groupId>
             <artifactId>hadoop-core</artifactId>
             <version>0.20.2-cdh3u6</version>
diff --git 
a/client/src/main/java/org/wikimedia/wikibase/entitysuggester/client/servlets/AbstractEntitySuggesterServlet.java
 
b/client/src/main/java/org/wikimedia/wikibase/entitysuggester/client/servlets/AbstractEntitySuggesterServlet.java
index 3d55bcf..1df53f4 100644
--- 
a/client/src/main/java/org/wikimedia/wikibase/entitysuggester/client/servlets/AbstractEntitySuggesterServlet.java
+++ 
b/client/src/main/java/org/wikimedia/wikibase/entitysuggester/client/servlets/AbstractEntitySuggesterServlet.java
@@ -1,10 +1,15 @@
 package org.wikimedia.wikibase.entitysuggester.client.servlets;
 
 import com.google.common.base.Splitter;
+import com.google.gson.FieldNamingPolicy;
+import com.google.gson.FieldNamingStrategy;
+import com.google.gson.Gson;
+import com.google.gson.GsonBuilder;
 import java.io.IOException;
 import java.io.PrintWriter;
 import java.net.URISyntaxException;
 import java.net.URL;
+import java.util.ArrayList;
 import java.util.List;
 import javax.naming.Context;
 import javax.naming.InitialContext;
@@ -61,21 +66,12 @@
 
         PrintWriter writer = response.getWriter();
         // Always print JSON
-        writer.write('[');
-        boolean first = true;
+        List suggestedProperties = new ArrayList();
         for (TranslatedRecommendedItem item : items) {
-            if (first) {
-                first = false;
-            } else {
-                writer.write(',');
-            }
-            writer.write("[\"");
-            writer.write(item.getItemID());
-            writer.write("\",");
-            writer.write(Float.toString(item.getValue()));
-            writer.write(']');
+            suggestedProperties.add(new Object[]{item.getItemID(), 
item.getValue()});
         }
-        writer.write(']');
+        String json = new Gson().toJson(suggestedProperties);
+        writer.write(json);
         writer.flush();
     }
 }

-- 
To view, visit https://gerrit.wikimedia.org/r/76877
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ibacc8357d9afd4ad7b5ce0640dffea61c7884112
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/WikidataEntitySuggester
Gerrit-Branch: master
Gerrit-Owner: Nilesh <nil...@nileshc.com>

_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits