Merge pull request #37 from amCap1712/master

SEARCH-579: JSON format doesn’t use 'packaging-id' key for packaging MBID

Author: yvanzo

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

@@ -251,6 +251,7 @@
                 <xml-element java-attribute="status">
                     <xml-java-type-adapter value="org.musicbrainz.search.solrwriter.moxy.StringStatusAdapter"/>
                 </xml-element>
+                <xml-element java-attribute="packaging" xml-path="." />
             </java-attributes>
         </java-type>
         <java-type name="Recording">
@@ -540,6 +541,12 @@
 			    <xml-attribute java-attribute="id" name="primary-type-id" />
 		    </java-attributes>
 	    </java-type>
+        <java-type name="Packaging">
+            <java-attributes>
+                <xml-element java-attribute="content" name="packaging" />
+                <xml-attribute java-attribute="id" name="packaging-id" />
+            </java-attributes>
+        </java-type>
         <java-type name="Alias">
             <xml-type prop-order=""/>
             <java-attributes>

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

@@ -9,6 +9,8 @@
             "count": 1,
             "title": "Chiptunes = WIN \\m|♥|m/",
             "status": "Official",
+            "packaging": "None",
+            "packaging-id": "119eba76-b343-3e02-a292-f0f00644bb9b",
             "text-representation": {
                 "language": "eng",
                 "script": "Latn"

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

@@ -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-list count="1" offset="0"><release id="871f12ec-6259-4e93-b440-9108559c38b1" ns2:score="100"><title>Chiptunes = WIN \m|♥|m/</title><status>Official</status><text-representation><language>eng</language><script>Latn</script></text-representation><artist-credit><name-credit><artist id="2b542c4a-694a-49b9-b475-9f55f99436a1"><name>Chiptunes = WIN \m|♥|m/</name><sort-name>Chiptunes = WIN \m|♥|m/</sort-name><alias-list><alias sort-name="Chiptunes = WIN">Chiptunes = WIN</alias></alias-list></artist></name-credit></artist-credit><release-group id="268d91a0-1a7f-4600-bfd4-74d738eb7de4" type="Compilation"><primary-type id="f529b476-6e62-324f-b0aa-1f3e33d313fc">Album</primary-type><secondary-type-list><secondary-type id="dd2a21e1-0c00-3729-a7a0-de60b84eb5d1">Compilation</secondary-type></secondary-type-list></release-group><date>2012-06-05</date><country>XW</country><release-event-list><release-event><date>2012-06-05</date><area id="525d4e18-3d00-31b9-a58b-a146a916de8f"><name>[Worldwide]</name><sort-name>[Worldwide]</sort-name><iso-3166-1-code-list><iso-3166-1-code>XW</iso-3166-1-code></iso-3166-1-code-list></area></release-event></release-event-list><barcode/><label-info-list><label-info><label id="7669cf9a-7328-44cf-96ba-b2dc9d534ed8"><name>Chiptunes = WIN \m|♥|m/</name></label></label-info></label-info-list><medium-list count="1"><track-count>51</track-count><medium><format>Digital Media</format><disc-list count="0"/><track-list count="51"/></medium></medium-list><tag-list><tag count="1"><name>bitunes</name></tag><tag count="1"><name>bandcamp</name></tag><tag count="2"><name>chiptunes</name></tag></tag-list></release></release-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-list count="1" offset="0"><release id="871f12ec-6259-4e93-b440-9108559c38b1" ns2:score="100"><title>Chiptunes = WIN \m|♥|m/</title><status>Official</status><packaging id="119eba76-b343-3e02-a292-f0f00644bb9b">None</packaging><text-representation><language>eng</language><script>Latn</script></text-representation><artist-credit><name-credit><artist id="2b542c4a-694a-49b9-b475-9f55f99436a1"><name>Chiptunes = WIN \m|♥|m/</name><sort-name>Chiptunes = WIN \m|♥|m/</sort-name><alias-list><alias sort-name="Chiptunes = WIN">Chiptunes = WIN</alias></alias-list></artist></name-credit></artist-credit><release-group id="268d91a0-1a7f-4600-bfd4-74d738eb7de4" type="Compilation"><primary-type id="f529b476-6e62-324f-b0aa-1f3e33d313fc">Album</primary-type><secondary-type-list><secondary-type id="dd2a21e1-0c00-3729-a7a0-de60b84eb5d1">Compilation</secondary-type></secondary-type-list></release-group><date>2012-06-05</date><country>XW</country><release-event-list><release-event><date>2012-06-05</date><area id="525d4e18-3d00-31b9-a58b-a146a916de8f"><name>[Worldwide]</name><sort-name>[Worldwide]</sort-name><iso-3166-1-code-list><iso-3166-1-code>XW</iso-3166-1-code></iso-3166-1-code-list></area></release-event></release-event-list><barcode/><label-info-list><label-info><label id="7669cf9a-7328-44cf-96ba-b2dc9d534ed8"><name>Chiptunes = WIN \m|♥|m/</name></label></label-info></label-info-list><medium-list count="1"><track-count>51</track-count><medium><format>Digital Media</format><disc-list count="0"/><track-list count="51"/></medium></medium-list><tag-list><tag count="1"><name>bitunes</name></tag><tag count="1"><name>bandcamp</name></tag><tag count="2"><name>chiptunes</name></tag></tag-list></release></release-list></metadata>

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

@@ -1 +1 @@
-<release xmlns="http://musicbrainz.org/ns/mmd-2.0#" id="871f12ec-6259-4e93-b440-9108559c38b1"><title>Chiptunes = WIN \m|♥|m/</title><status>Official</status><text-representation><language>eng</language><script>Latn</script></text-representation><artist-credit><name-credit><artist id="2b542c4a-694a-49b9-b475-9f55f99436a1"><name>Chiptunes = WIN \m|♥|m/</name><sort-name>Chiptunes = WIN \m|♥|m/</sort-name><alias-list><alias sort-name="Chiptunes = WIN">Chiptunes = WIN</alias></alias-list></artist></name-credit></artist-credit><release-group id="268d91a0-1a7f-4600-bfd4-74d738eb7de4" type="Compilation"><primary-type id="f529b476-6e62-324f-b0aa-1f3e33d313fc">Album</primary-type><secondary-type-list><secondary-type id="dd2a21e1-0c00-3729-a7a0-de60b84eb5d1">Compilation</secondary-type></secondary-type-list></release-group><date>2012-06-05</date><country>XW</country><release-event-list><release-event><date>2012-06-05</date><area id="525d4e18-3d00-31b9-a58b-a146a916de8f"><name>[Worldwide]</name><sort-name>[Worldwide]</sort-name><iso-3166-1-code-list><iso-3166-1-code>XW</iso-3166-1-code></iso-3166-1-code-list></area></release-event></release-event-list><barcode/><label-info-list><label-info><label id="7669cf9a-7328-44cf-96ba-b2dc9d534ed8"><name>Chiptunes = WIN \m|♥|m/</name></label></label-info></label-info-list><medium-list count="1"><track-count>51</track-count><medium><format>Digital Media</format><disc-list count="0"/><track-list count="51"/></medium></medium-list><tag-list><tag count="1"><name>bitunes</name></tag><tag count="1"><name>bandcamp</name></tag><tag count="2"><name>chiptunes</name></tag></tag-list></release>
+<release xmlns="http://musicbrainz.org/ns/mmd-2.0#" id="871f12ec-6259-4e93-b440-9108559c38b1"><title>Chiptunes = WIN \m|♥|m/</title><status>Official</status><packaging id="119eba76-b343-3e02-a292-f0f00644bb9b">None</packaging><text-representation><language>eng</language><script>Latn</script></text-representation><artist-credit><name-credit><artist id="2b542c4a-694a-49b9-b475-9f55f99436a1"><name>Chiptunes = WIN \m|♥|m/</name><sort-name>Chiptunes = WIN \m|♥|m/</sort-name><alias-list><alias sort-name="Chiptunes = WIN">Chiptunes = WIN</alias></alias-list></artist></name-credit></artist-credit><release-group id="268d91a0-1a7f-4600-bfd4-74d738eb7de4" type="Compilation"><primary-type id="f529b476-6e62-324f-b0aa-1f3e33d313fc">Album</primary-type><secondary-type-list><secondary-type id="dd2a21e1-0c00-3729-a7a0-de60b84eb5d1">Compilation</secondary-type></secondary-type-list></release-group><date>2012-06-05</date><country>XW</country><release-event-list><release-event><date>2012-06-05</date><area id="525d4e18-3d00-31b9-a58b-a146a916de8f"><name>[Worldwide]</name><sort-name>[Worldwide]</sort-name><iso-3166-1-code-list><iso-3166-1-code>XW</iso-3166-1-code></iso-3166-1-code-list></area></release-event></release-event-list><barcode/><label-info-list><label-info><label id="7669cf9a-7328-44cf-96ba-b2dc9d534ed8"><name>Chiptunes = WIN \m|♥|m/</name></label></label-info></label-info-list><medium-list count="1"><track-count>51</track-count><medium><format>Digital Media</format><disc-list count="0"/><track-list count="51"/></medium></medium-list><tag-list><tag count="1"><name>bitunes</name></tag><tag count="1"><name>bandcamp</name></tag><tag count="2"><name>chiptunes</name></tag></tag-list></release>