SEARCH-628: Unmarshalling rules for Primary Type

Author: amCap1712

mb-solr/src/main/java/org/musicbrainz/search/solrwriter/moxy/StringPrimaryTypeAdapter.java

@@ -261,6 +261,7 @@
         <java-type name="ReleaseGroup">
             <java-attributes>
                 <xml-element java-attribute="secondaryTypeList" xml-path="."/>
+	            <xml-element java-attribute="primaryType" xml-path="." />
             </java-attributes>
         </java-type>
         <java-type name="ReleaseGroup">
@@ -452,9 +453,6 @@
         <java-type name="ReleaseGroup">
             <java-attributes>
                 <xml-element java-attribute="tagList" xml-path="."/>
-                <xml-element java-attribute="primaryType" name="primary-type">
-                    <xml-java-type-adapter value="org.musicbrainz.search.solrwriter.moxy.StringPrimaryTypeAdapter"/>
-                </xml-element>
             </java-attributes>
         </java-type>
         <java-type name="Medium$TrackList">
@@ -540,6 +538,12 @@
                 <xml-element java-attribute="iso31663Code" name="iso-3166-3-codes"/>
             </java-attributes>
         </java-type>
+	    <java-type name="PrimaryType">
+		    <java-attributes>
+			    <xml-element java-attribute="content" name="primary-type" />
+			    <xml-attribute java-attribute="id" name="primary-type-id" />
+		    </java-attributes>
+	    </java-type>
         <java-type name="Alias">
             <xml-type prop-order=""/>
             <java-attributes>

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

@@ -55,6 +55,7 @@
                     "release-group": {
                         "id": "f5fd971c-a1a2-33da-95b0-473e0176df83",
                         "primary-type": "Album",
+                        "primary-type-id": "f529b476-6e62-324f-b0aa-1f3e33d313fc",
                         "secondary-types": [
                             "Soundtrack"
                         ]
@@ -99,6 +100,7 @@
                     "release-group": {
                         "id": "f5fd971c-a1a2-33da-95b0-473e0176df83",
                         "primary-type": "Album",
+                        "primary-type-id": "f529b476-6e62-324f-b0aa-1f3e33d313fc",
                         "secondary-types": [
                           "Soundtrack"
                         ]

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

@@ -1 +1 @@
-<?xml version="1.0" encoding="UTF-8" standalone="yes"?><metadata xmlns="http://musicbrainz.org/ns/mmd-2.0#" xmlns:ns2="http://musicbrainz.org/ns/ext#-2.0"><recording-list count="1" offset="0"><recording id="3e0bdde6-74e0-46d4-855a-4493589fd6b2" ns2:score="100"><title>Roots and Beginnings</title><length>391000</length><artist-credit><name-credit><artist id="9b58672a-e68e-4972-956e-a8985a165a1f"><name>Howard Shore</name><sort-name>Shore, Howard</sort-name><alias-list><alias sort-name="Howard Shaw">Howard Shaw</alias><alias sort-name="H. Shore">H. Shore</alias><alias sort-name="Shore">Shore</alias></alias-list></artist></name-credit></artist-credit><release-list><release id="e7fe61ca-65b8-4abb-8723-1e7c1a5e0a49"><title>The Lord of the Rings: The Return of the King: The Complete Recordings</title><status>Official</status><release-group id="f5fd971c-a1a2-33da-95b0-473e0176df83" type="Soundtrack"><primary-type>Album</primary-type><secondary-type-list><secondary-type>Soundtrack</secondary-type></secondary-type-list></release-group><date>2007-11-20</date><country>US</country><release-event-list><release-event><date>2007-11-20</date><area id="489ce91b-6658-3307-9877-795b68554c98"><name>United States</name><sort-name>United States</sort-name><iso-3166-1-code-list><iso-3166-1-code>US</iso-3166-1-code></iso-3166-1-code-list></area></release-event></release-event-list><medium-list><track-count>106</track-count><medium><position>1</position><format>CD</format><track-list count="15" offset="0"><track id="fc51bf50-c329-3d93-bb1b-e4f55cf00db8"><number>1</number><title>Roots and Beginnings</title><length>391000</length></track></track-list></medium></medium-list></release><release id="e7fe61ca-65b8-4abb-8723-1e7c1a5e0a49"><title>The Lord of the Rings: The Return of the King: The Complete Recordings</title><status>Official</status><release-group id="f5fd971c-a1a2-33da-95b0-473e0176df83" type="Soundtrack"><primary-type>Album</primary-type><secondary-type-list><secondary-type>Soundtrack</secondary-type></secondary-type-list></release-group><date>2007-11-20</date><country>US</country><release-event-list><release-event><date>2007-11-20</date><area id="489ce91b-6658-3307-9877-795b68554c98"><name>United States</name><sort-name>United States</sort-name><iso-3166-1-code-list><iso-3166-1-code>US</iso-3166-1-code></iso-3166-1-code-list></area></release-event></release-event-list><medium-list><track-count>106</track-count><medium><position>5</position><format>DVD</format><track-list count="53" offset="0"><track id="af77973d-3ca5-38e3-89ff-c742c94f59af"><number>1</number><title>Roots and Beginnings</title><length>391000</length></track></track-list></medium></medium-list></release></release-list><isrc-list><isrc id="USRE10701410"/></isrc-list><tag-list><tag count="2"><name>soundtrack</name></tag></tag-list></recording></recording-list></metadata>
+<?xml version="1.0" encoding="UTF-8" standalone="yes"?><metadata xmlns="http://musicbrainz.org/ns/mmd-2.0#" xmlns:ns2="http://musicbrainz.org/ns/ext#-2.0"><recording-list count="1" offset="0"><recording id="3e0bdde6-74e0-46d4-855a-4493589fd6b2" ns2:score="100"><title>Roots and Beginnings</title><length>391000</length><artist-credit><name-credit><artist id="9b58672a-e68e-4972-956e-a8985a165a1f"><name>Howard Shore</name><sort-name>Shore, Howard</sort-name><alias-list><alias sort-name="Howard Shaw">Howard Shaw</alias><alias sort-name="H. Shore">H. Shore</alias><alias sort-name="Shore">Shore</alias></alias-list></artist></name-credit></artist-credit><release-list><release id="e7fe61ca-65b8-4abb-8723-1e7c1a5e0a49"><title>The Lord of the Rings: The Return of the King: The Complete Recordings</title><status>Official</status><release-group id="f5fd971c-a1a2-33da-95b0-473e0176df83" type="Soundtrack"><primary-type id="f529b476-6e62-324f-b0aa-1f3e33d313fc">Album</primary-type><secondary-type-list><secondary-type>Soundtrack</secondary-type></secondary-type-list></release-group><date>2007-11-20</date><country>US</country><release-event-list><release-event><date>2007-11-20</date><area id="489ce91b-6658-3307-9877-795b68554c98"><name>United States</name><sort-name>United States</sort-name><iso-3166-1-code-list><iso-3166-1-code>US</iso-3166-1-code></iso-3166-1-code-list></area></release-event></release-event-list><medium-list><track-count>106</track-count><medium><position>1</position><format>CD</format><track-list count="15" offset="0"><track id="fc51bf50-c329-3d93-bb1b-e4f55cf00db8"><number>1</number><title>Roots and Beginnings</title><length>391000</length></track></track-list></medium></medium-list></release><release id="e7fe61ca-65b8-4abb-8723-1e7c1a5e0a49"><title>The Lord of the Rings: The Return of the King: The Complete Recordings</title><status>Official</status><release-group id="f5fd971c-a1a2-33da-95b0-473e0176df83" type="Soundtrack"><primary-type id="f529b476-6e62-324f-b0aa-1f3e33d313fc">Album</primary-type><secondary-type-list><secondary-type>Soundtrack</secondary-type></secondary-type-list></release-group><date>2007-11-20</date><country>US</country><release-event-list><release-event><date>2007-11-20</date><area id="489ce91b-6658-3307-9877-795b68554c98"><name>United States</name><sort-name>United States</sort-name><iso-3166-1-code-list><iso-3166-1-code>US</iso-3166-1-code></iso-3166-1-code-list></area></release-event></release-event-list><medium-list><track-count>106</track-count><medium><position>5</position><format>DVD</format><track-list count="53" offset="0"><track id="af77973d-3ca5-38e3-89ff-c742c94f59af"><number>1</number><title>Roots and Beginnings</title><length>391000</length></track></track-list></medium></medium-list></release></release-list><isrc-list><isrc id="USRE10701410"/></isrc-list><tag-list><tag count="2"><name>soundtrack</name></tag></tag-list></recording></recording-list></metadata>

mb-solr/src/test/resources/org/musicbrainz/search/solrwriter/recording-list.xml

@@ -1 +1 @@
-<recording xmlns="http://musicbrainz.org/ns/mmd-2.0#" id="3e0bdde6-74e0-46d4-855a-4493589fd6b2"><title>Roots and Beginnings</title><length>391000</length><artist-credit><name-credit><artist id="9b58672a-e68e-4972-956e-a8985a165a1f"><name>Howard Shore</name><sort-name>Shore, Howard</sort-name><alias-list><alias sort-name="Howard Shaw">Howard Shaw</alias><alias sort-name="H. Shore">H. Shore</alias><alias sort-name="Shore">Shore</alias></alias-list></artist></name-credit></artist-credit><release-list><release id="e7fe61ca-65b8-4abb-8723-1e7c1a5e0a49"><title>The Lord of the Rings: The Return of the King: The Complete Recordings</title><status>Official</status><release-group id="f5fd971c-a1a2-33da-95b0-473e0176df83" type="Soundtrack"><primary-type>Album</primary-type><secondary-type-list><secondary-type>Soundtrack</secondary-type></secondary-type-list></release-group><date>2007-11-20</date><country>US</country><release-event-list><release-event><date>2007-11-20</date><area id="489ce91b-6658-3307-9877-795b68554c98"><name>United States</name><sort-name>United States</sort-name><iso-3166-1-code-list><iso-3166-1-code>US</iso-3166-1-code></iso-3166-1-code-list></area></release-event></release-event-list><medium-list><track-count>106</track-count><medium><position>1</position><format>CD</format><track-list count="15" offset="0"><track id="fc51bf50-c329-3d93-bb1b-e4f55cf00db8"><number>1</number><title>Roots and Beginnings</title><length>391000</length></track></track-list></medium></medium-list></release><release id="e7fe61ca-65b8-4abb-8723-1e7c1a5e0a49"><title>The Lord of the Rings: The Return of the King: The Complete Recordings</title><status>Official</status><release-group id="f5fd971c-a1a2-33da-95b0-473e0176df83" type="Soundtrack"><primary-type>Album</primary-type><secondary-type-list><secondary-type>Soundtrack</secondary-type></secondary-type-list></release-group><date>2007-11-20</date><country>US</country><release-event-list><release-event><date>2007-11-20</date><area id="489ce91b-6658-3307-9877-795b68554c98"><name>United States</name><sort-name>United States</sort-name><iso-3166-1-code-list><iso-3166-1-code>US</iso-3166-1-code></iso-3166-1-code-list></area></release-event></release-event-list><medium-list><track-count>106</track-count><medium><position>5</position><format>DVD</format><track-list count="53" offset="0"><track id="af77973d-3ca5-38e3-89ff-c742c94f59af"><number>1</number><title>Roots and Beginnings</title><length>391000</length></track></track-list></medium></medium-list></release></release-list><isrc-list><isrc id="USRE10701410"/></isrc-list><tag-list><tag count="2"><name>soundtrack</name></tag></tag-list></recording>
+<recording xmlns="http://musicbrainz.org/ns/mmd-2.0#" id="3e0bdde6-74e0-46d4-855a-4493589fd6b2"><title>Roots and Beginnings</title><length>391000</length><artist-credit><name-credit><artist id="9b58672a-e68e-4972-956e-a8985a165a1f"><name>Howard Shore</name><sort-name>Shore, Howard</sort-name><alias-list><alias sort-name="Howard Shaw">Howard Shaw</alias><alias sort-name="H. Shore">H. Shore</alias><alias sort-name="Shore">Shore</alias></alias-list></artist></name-credit></artist-credit><release-list><release id="e7fe61ca-65b8-4abb-8723-1e7c1a5e0a49"><title>The Lord of the Rings: The Return of the King: The Complete Recordings</title><status>Official</status><release-group id="f5fd971c-a1a2-33da-95b0-473e0176df83" type="Soundtrack"><primary-type id="f529b476-6e62-324f-b0aa-1f3e33d313fc">Album</primary-type><secondary-type-list><secondary-type>Soundtrack</secondary-type></secondary-type-list></release-group><date>2007-11-20</date><country>US</country><release-event-list><release-event><date>2007-11-20</date><area id="489ce91b-6658-3307-9877-795b68554c98"><name>United States</name><sort-name>United States</sort-name><iso-3166-1-code-list><iso-3166-1-code>US</iso-3166-1-code></iso-3166-1-code-list></area></release-event></release-event-list><medium-list><track-count>106</track-count><medium><position>1</position><format>CD</format><track-list count="15" offset="0"><track id="fc51bf50-c329-3d93-bb1b-e4f55cf00db8"><number>1</number><title>Roots and Beginnings</title><length>391000</length></track></track-list></medium></medium-list></release><release id="e7fe61ca-65b8-4abb-8723-1e7c1a5e0a49"><title>The Lord of the Rings: The Return of the King: The Complete Recordings</title><status>Official</status><release-group id="f5fd971c-a1a2-33da-95b0-473e0176df83" type="Soundtrack"><primary-type id="f529b476-6e62-324f-b0aa-1f3e33d313fc">Album</primary-type><secondary-type-list><secondary-type>Soundtrack</secondary-type></secondary-type-list></release-group><date>2007-11-20</date><country>US</country><release-event-list><release-event><date>2007-11-20</date><area id="489ce91b-6658-3307-9877-795b68554c98"><name>United States</name><sort-name>United States</sort-name><iso-3166-1-code-list><iso-3166-1-code>US</iso-3166-1-code></iso-3166-1-code-list></area></release-event></release-event-list><medium-list><track-count>106</track-count><medium><position>5</position><format>DVD</format><track-list count="53" offset="0"><track id="af77973d-3ca5-38e3-89ff-c742c94f59af"><number>1</number><title>Roots and Beginnings</title><length>391000</length></track></track-list></medium></medium-list></release></release-list><isrc-list><isrc id="USRE10701410"/></isrc-list><tag-list><tag count="2"><name>soundtrack</name></tag></tag-list></recording>

mb-solr/src/test/resources/org/musicbrainz/search/solrwriter/recording.xml

@@ -9,6 +9,7 @@
             "count": 1,
             "title": "Chiptunes = WIN \\m|♥|m/",
             "primary-type": "Album",
+            "primary-type-id": "f529b476-6e62-324f-b0aa-1f3e33d313fc",
             "secondary-types": [
                  "Compilation"
             ],

mb-solr/src/test/resources/org/musicbrainz/search/solrwriter/release-group-list.json

@@ -1 +1 @@
-<?xml version="1.0" encoding="UTF-8" standalone="yes"?><metadata  xmlns="http://musicbrainz.org/ns/mmd-2.0#" xmlns:ns2="http://musicbrainz.org/ns/ext#-2.0"><release-group-list count="1" offset="0"><release-group id="268d91a0-1a7f-4600-bfd4-74d738eb7de4" type="Compilation" ns2:score="100"><title>Chiptunes = WIN \m|♥|m/</title><primary-type>Album</primary-type><secondary-type-list><secondary-type>Compilation</secondary-type></secondary-type-list><artist-credit><name-credit><artist id="89ad4ac3-39f7-470e-963a-56509c546377"><name>Various Artists</name><sort-name>Various Artists</sort-name><disambiguation>add compilations to this artist</disambiguation></artist></name-credit></artist-credit><release-list count="1"><release id="871f12ec-6259-4e93-b440-9108559c38b1"><title>Chiptunes = WIN \m|♥|m/</title><status>Official</status></release></release-list><tag-list><tag count="1"><name>electronic</name></tag></tag-list></release-group></release-group-list></metadata>
+<?xml version="1.0" encoding="UTF-8" standalone="yes"?><metadata  xmlns="http://musicbrainz.org/ns/mmd-2.0#" xmlns:ns2="http://musicbrainz.org/ns/ext#-2.0"><release-group-list count="1" offset="0"><release-group id="268d91a0-1a7f-4600-bfd4-74d738eb7de4" type="Compilation" ns2:score="100"><title>Chiptunes = WIN \m|♥|m/</title><primary-type id="f529b476-6e62-324f-b0aa-1f3e33d313fc">Album</primary-type><secondary-type-list><secondary-type>Compilation</secondary-type></secondary-type-list><artist-credit><name-credit><artist id="89ad4ac3-39f7-470e-963a-56509c546377"><name>Various Artists</name><sort-name>Various Artists</sort-name><disambiguation>add compilations to this artist</disambiguation></artist></name-credit></artist-credit><release-list count="1"><release id="871f12ec-6259-4e93-b440-9108559c38b1"><title>Chiptunes = WIN \m|♥|m/</title><status>Official</status></release></release-list><tag-list><tag count="1"><name>electronic</name></tag></tag-list></release-group></release-group-list></metadata>

mb-solr/src/test/resources/org/musicbrainz/search/solrwriter/release-group-list.xml

@@ -1 +1 @@
-<release-group xmlns="http://musicbrainz.org/ns/mmd-2.0#" id="268d91a0-1a7f-4600-bfd4-74d738eb7de4" type="Compilation"><title>Chiptunes = WIN \m|♥|m/</title><primary-type>Album</primary-type><secondary-type-list><secondary-type>Compilation</secondary-type></secondary-type-list><artist-credit><name-credit><artist id="89ad4ac3-39f7-470e-963a-56509c546377"><name>Various Artists</name><sort-name>Various Artists</sort-name><disambiguation>add compilations to this artist</disambiguation></artist></name-credit></artist-credit><release-list count="1"><release id="871f12ec-6259-4e93-b440-9108559c38b1"><title>Chiptunes = WIN \m|♥|m/</title><status>Official</status></release></release-list><tag-list><tag count="1"><name>electronic</name></tag></tag-list></release-group>
+<release-group xmlns="http://musicbrainz.org/ns/mmd-2.0#" id="268d91a0-1a7f-4600-bfd4-74d738eb7de4" type="Compilation"><title>Chiptunes = WIN \m|♥|m/</title><primary-type id="f529b476-6e62-324f-b0aa-1f3e33d313fc">Album</primary-type><secondary-type-list><secondary-type>Compilation</secondary-type></secondary-type-list><artist-credit><name-credit><artist id="89ad4ac3-39f7-470e-963a-56509c546377"><name>Various Artists</name><sort-name>Various Artists</sort-name><disambiguation>add compilations to this artist</disambiguation></artist></name-credit></artist-credit><release-list count="1"><release id="871f12ec-6259-4e93-b440-9108559c38b1"><title>Chiptunes = WIN \m|♥|m/</title><status>Official</status></release></release-list><tag-list><tag count="1"><name>electronic</name></tag></tag-list></release-group>

mb-solr/src/test/resources/org/musicbrainz/search/solrwriter/release-group.xml

@@ -36,6 +36,7 @@
             "release-group": {
                 "id": "268d91a0-1a7f-4600-bfd4-74d738eb7de4",
                 "primary-type": "Album",
+                "primary-type-id": "f529b476-6e62-324f-b0aa-1f3e33d313fc",
                 "secondary-types": [
                     "Compilation"
                 ]