Merge pull request #25 from samj1912/isrcfix

MBS-9726: Fix ISRC output

Author: sambhav

mb-solrquerywriter/src/main/java/org/musicbrainz/search/solrwriter/moxy/StringIsrcAdapter.java

@@ -0,0 +1,41 @@
+/* Copyright (c) 2018 MetaBrainz Foundation
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ * 3. Neither the name of the MusicBrainz project nor the names of the
+ *    contributors may be used to endorse or promote products derived from
+ *    this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+ * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+ * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED
+ * TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
+ * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
+ * LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+ * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+package org.musicbrainz.search.solrwriter.moxy;
+
+import org.musicbrainz.mmd2.Isrc;
+
+import javax.xml.bind.annotation.adapters.XmlAdapter;
+
+public class StringIsrcAdapter extends NotUnmarshallableXmlAdapter<String, Isrc> {
+    @Override
+    public String marshal(Isrc v) throws Exception {
+        return v.getId();
+    }
+
+}

mb-solrquerywriter/src/main/resources/oxml.xml

@@ -315,7 +315,9 @@
         </java-type>
         <java-type name="IsrcList">
             <java-attributes>
-                <xml-element java-attribute="isrc" name="isrcs"/>
+                <xml-element java-attribute="isrc" name="isrcs">
+                    <xml-java-type-adapter value="org.musicbrainz.search.solrwriter.moxy.StringIsrcAdapter"/>
+                </xml-element>
             </java-attributes>
         </java-type>
         <java-type name="SecondaryTypeList">

mb-solrquerywriter/src/test/resources/org/musicbrainz/search/solrwriter/recording-list.json

@@ -138,9 +138,7 @@
                 }
             ],
             "isrcs": [
-                {
-                    "id": "USRE10701410"
-                }
+                "USRE10701410"
             ],
             "tags": [
                 {