Merge pull request #41 from metabrainz/MBS-13768

MBS-13768: Allow MBID for medium elements

Author: reosarevok

brainz-mmd2-jaxb/src/main/java/org/musicbrainz/mmd2/Medium.java

@@ -37,6 +37,7 @@
  *         <group ref="{http://musicbrainz.org/ns/mmd-2.0#}def_track-list"/>
  *         <element ref="{http://musicbrainz.org/ns/mmd-2.0#}data-track-list" minOccurs="0"/>
  *       </sequence>
+ *       <attribute name="id" type="{http://musicbrainz.org/ns/mmd-2.0#}def_uuid" />
  *     </restriction>
  *   </complexContent>
  * </complexType>
@@ -68,6 +69,8 @@ public class Medium {
     protected Medium.TrackList trackList;
     @XmlElement(name = "data-track-list")
     protected DataTrackList dataTrackList;
+    @XmlAttribute(name = "id")
+    protected String id;
 
     /**
      * Gets the value of the title property.
@@ -237,6 +240,30 @@ public void setDataTrackList(DataTrackList value) {
         this.dataTrackList = value;
     }
 
+    /**
+     * Gets the value of the id property.
+     * 
+     * @return
+     *     possible object is
+     *     {@link String }
+     *     
+     */
+    public String getId() {
+        return id;
+    }
+
+    /**
+     * Sets the value of the id property.
+     * 
+     * @param value
+     *     allowed object is
+     *     {@link String }
+     *     
+     */
+    public void setId(String value) {
+        this.id = value;
+    }
+
 
     /**
      * <p>Java class for anonymous complex type.

brainz-mmd2-jaxb/src/main/resources/musicbrainz_mmd-2.0.xsd

@@ -679,6 +679,7 @@
         <xs:group ref="mmd-2.0:def_track-list"/>
         <xs:element minOccurs="0" ref="mmd-2.0:data-track-list"/>
       </xs:sequence>
+      <xs:attribute name="id" type="mmd-2.0:def_uuid"/>
     </xs:complexType>
   </xs:element>
   <xs:element name="position" type="xs:nonNegativeInteger"/>

schema/musicbrainz_mmd-2.0.rng

@@ -1556,6 +1556,11 @@
 
     <define name="def_medium">
         <element name="medium">
+            <optional>
+                <attribute name="id">
+                    <ref name="def_uuid"/>
+                </attribute>
+            </optional>
             <optional>
                 <element name="title">
                     <text/>