[mb-commits] r13699 - in search_server/trunk/servlet/src: main/java/org/musicbrainz/search/servlet/mmd2 test/java/org/musicbrainz/search/servlet

Author: ijabz
Date: 2013-06-06 09:46:21 +0000 (Thu, 06 Jun 2013)
New Revision: 13699

Modified:
   search_server/trunk/servlet/src/main/java/org/musicbrainz/search/servlet/mmd2/ResultsWriter.java
   search_server/trunk/servlet/src/test/java/org/musicbrainz/search/servlet/FindAreaTest.java
   search_server/trunk/servlet/src/test/java/org/musicbrainz/search/servlet/FindArtistTest.java
   search_server/trunk/servlet/src/test/java/org/musicbrainz/search/servlet/FindLabelTest.java
Log:
SEARCH-297:Fixed The "name" vs "value" problem

Modified: search_server/trunk/servlet/src/main/java/org/musicbrainz/search/servlet/mmd2/ResultsWriter.java
===================================================================
--- search_server/trunk/servlet/src/main/java/org/musicbrainz/search/servlet/mmd2/ResultsWriter.java	2013-06-05 10:59:24 UTC (rev 13698)
+++ search_server/trunk/servlet/src/main/java/org/musicbrainz/search/servlet/mmd2/ResultsWriter.java	2013-06-06 09:46:21 UTC (rev 13699)
@@ -97,6 +97,7 @@
             properties.put(JAXBContextProperties.OXM_METADATA_SOURCE, "oxml.xml");
             properties.put(JAXBContextProperties.MEDIA_TYPE, "application/json");
             properties.put(JAXBContextProperties.JSON_INCLUDE_ROOT, false);
+            properties.put(JAXBContextProperties.JSON_VALUE_WRAPPER, "name");
             return JAXBContextFactory.createContext(new Class[]{Metadata.class}, properties);
         }
         catch (JAXBException ex) {

Modified: search_server/trunk/servlet/src/test/java/org/musicbrainz/search/servlet/FindAreaTest.java
===================================================================
--- search_server/trunk/servlet/src/test/java/org/musicbrainz/search/servlet/FindAreaTest.java	2013-06-05 10:59:24 UTC (rev 13698)
+++ search_server/trunk/servlet/src/test/java/org/musicbrainz/search/servlet/FindAreaTest.java	2013-06-06 09:46:21 UTC (rev 13699)
@@ -371,7 +371,7 @@
         assertTrue(output.contains("\"type\":\"Country\""));
         assertTrue(output.contains("name\":\"Afghanistan\""));
         assertTrue(output.contains("\"sort-name\":\"Afghanistan\""));
-        assertTrue(output.contains("\"aliases\":[{\"locale\":\"\",\"sort-name\":\"Afghan\",\"type\":\"\",\"primary\":\"false\",\"begin-date\":\"\",\"end-date\":\"\",\"value\":\"Afghany\""));
+        assertTrue(output.contains("\"aliases\":[{\"locale\":\"\",\"sort-name\":\"Afghan\",\"type\":\"\",\"primary\":\"false\",\"begin-date\":\"\",\"end-date\":\"\",\"name\":\"Afghany\""));
         assertTrue(output.contains("life-span\":{\"begin\":\"1993\""));
         assertTrue(output.contains("\"ended\":true"));
         assertTrue(output.contains("\"end\":\"2004\""));

Modified: search_server/trunk/servlet/src/test/java/org/musicbrainz/search/servlet/FindArtistTest.java
===================================================================
--- search_server/trunk/servlet/src/test/java/org/musicbrainz/search/servlet/FindArtistTest.java	2013-06-05 10:59:24 UTC (rev 13698)
+++ search_server/trunk/servlet/src/test/java/org/musicbrainz/search/servlet/FindArtistTest.java	2013-06-06 09:46:21 UTC (rev 13699)
@@ -689,7 +689,7 @@
         assertTrue(output.contains("\"primary\" : \"true\","));
         assertTrue(output.contains("\"begin-date\" : \"1978-05-01\","));
         assertTrue(output.contains(" \"end-date\" : \"\","));
-        assertTrue(output.contains("\"value\" : \"Echo And The Bunnymen\""));
+        assertTrue(output.contains("\"name\" : \"Echo And The Bunnymen\""));
         assertTrue(output.contains("\"locale\" : \"\","));
         assertTrue(output.contains("\"type\" : \"\","));
 

Modified: search_server/trunk/servlet/src/test/java/org/musicbrainz/search/servlet/FindLabelTest.java
===================================================================
--- search_server/trunk/servlet/src/test/java/org/musicbrainz/search/servlet/FindLabelTest.java	2013-06-05 10:59:24 UTC (rev 13698)
+++ search_server/trunk/servlet/src/test/java/org/musicbrainz/search/servlet/FindLabelTest.java	2013-06-06 09:46:21 UTC (rev 13699)
@@ -593,7 +593,7 @@
         assertTrue(output.contains("\"tags\":[{\"count\":22,\"name\":\"dance\"}]"));
         assertTrue(output.contains("\"ended\":true"));
         assertTrue(output.contains("\"ipis\":[\"1001\""));
-        assertTrue(output.contains("\"aliases\":[{\"locale\":\"\",\"type\":\"\",\"primary\":\"false\",\"begin-date\":\"\",\"end-date\":\"\",\"value\":\"Jockeys\"}]"));
+        assertTrue(output.contains("\"aliases\":[{\"locale\":\"\",\"type\":\"\",\"primary\":\"false\",\"begin-date\":\"\",\"end-date\":\"\",\"name\":\"Jockeys\"}]"));
         assertTrue(output.contains("\"end\":\"2004\""));
         assertTrue(output.contains("\"label-code\":1234"));
         assertTrue(output.contains("\"count\":1"));