refactor: rename and docs

Signed-off-by: Jan Kowalleck <jan.kowalleck@gmail.com>

Author: jkowalleck

schema/bom-1.7.proto

@@ -387,7 +387,7 @@ message LicenseChoice {
     // A valid SPDX license expression. Refer to https://spdx.org/specifications for syntax requirements.
     string expression = 2;
     // A SPDX license expression and its details
-    ExpressionDetailed expression_detailed = 5;
+    LicenseExpressionDetailed expression_detailed = 5;
   }
   // This field must only be used when `expression` is chosen as the other options have their own acknowledgement.
   optional LicenseAcknowledgementEnumeration acknowledgement = 3;
@@ -417,8 +417,9 @@ message License {
   optional LicenseAcknowledgementEnumeration acknowledgement = 8;
 }
 
-// Specifies the details and attributes related to a software license. It must be a valid SPDX license expression, along with additional properties such as license acknowledgment.
-message ExpressionDetailed {
+// Specifies the details and attributes related to a software license.
+// It must be a valid SPDX license expression, along with additional properties such as license acknowledgment.
+message LicenseExpressionDetailed {
 
   // Specifies the details and attributes related to a software license identifier.
   // (An SPDX expression may be a compound of license identifiers.)

schema/bom-1.7.schema.json

@@ -1479,6 +1479,8 @@
           "minItems": 1,
           "maxItems": 1,
           "items": [{
+            "title": "License Expression",
+            "description": "Specifies the details and attributes related to a software license.\nIt must be a valid SPDX license expression, along with additional properties such as license acknowledgment.",
             "type": "object",
             "additionalProperties": false,
             "required": ["expression"],

schema/bom-1.7.xsd

@@ -966,7 +966,7 @@ limitations under the License.
         <xs:attributeGroup ref="bom:licenseAttributes"/>
     </xs:complexType>
 
-    <xs:complexType name="expressionType">
+    <xs:complexType name="licenseExpressionType">
         <xs:simpleContent>
             <xs:extension base="xs:normalizedString">
                 <xs:annotation>
@@ -983,9 +983,12 @@ limitations under the License.
         </xs:simpleContent>
     </xs:complexType>
 
-    <xs:complexType name="expressionDetailedType">
+    <xs:complexType name="licenseExpressionDetailedType">
         <xs:annotation>
-            <xs:documentation>Specifies the details and attributes related to a software license. It must be a valid SPDX license expression, along with additional properties such as license acknowledgment.</xs:documentation>
+            <xs:documentation>
+                Specifies the details and attributes related to a software license.
+                It must be a valid SPDX license expression, along with additional properties such as license acknowledgment.
+            </xs:documentation>
         </xs:annotation>
         <xs:sequence>
             <xs:element name="details" minOccurs="0" maxOccurs="unbounded">
@@ -2387,8 +2390,8 @@ limitations under the License.
     <xs:complexType name="licenseChoiceType">
         <xs:choice>
             <xs:element name="license" type="bom:licenseType" minOccurs="0" maxOccurs="unbounded"/>
-            <xs:element name="expression" type="bom:expressionType" minOccurs="0" maxOccurs="1" />
-            <xs:element name="expression-detailed" type="bom:expressionDetailedType" minOccurs="0" maxOccurs="1" />
+            <xs:element name="expression" type="bom:licenseExpressionType" minOccurs="0" maxOccurs="1" />
+            <xs:element name="expression-detailed" type="bom:licenseExpressionDetailedType" minOccurs="0" maxOccurs="1" />
         </xs:choice>
     </xs:complexType>