Corrected cardinality and range of the oslc_config:acceptedBy property (

#423)

Corrected cardinality and range of the oslc_config:acceptedBy property

CHANGELOG.md

@@ -10,6 +10,7 @@
 
 - Kotlin 1.9.0 is used; `kotlin-stdlib-jdk8` dependency was replaced with `kotlin-stdlib` due to [Kotlin updates](https://kotlinlang.org/docs/whatsnew18.html#updated-jvm-compilation-target).
 - Allow application to reset the oauth token cached within the server, when it deems that it is no longer valid
+- 🧨Corrected cardinality and range of the oslc_config:acceptedBy property (from String[0..1] to Resource[0..*])
 
 ### Deprecated
 

domains/org.eclipse.lyo.tools.domainmodels/oslcDomainSpecifications.xml

@@ -382,7 +382,7 @@
     <resourceProperties id="_pnZqcZUdEeq-KoPaR9_Cfg" name="versionId" description="A short human-readable identifier for the version of a resource. All versioned resources should have this property; where the property is present, this identifier must be unique amongst all currently existing versions of the same concept resource. The subject of this property should be the concept resource URI." valueType="String"/>
     <resourceProperties id="_jaBLoBe3Ee2Qoa8h9kRCOQ" name="component" description="The component to which this version belongs. Configuration Management provider should indicate the owning component for each version resource using either this property, or using the membership relationship from the component LDPC." valueType="Resource" range="_BrY_wBe1Ee2Qoa8h9kRCOQ"/>
     <resourceProperties id="_Idof4BfGEe2Qoa8h9kRCOQ" name="configurations" valueType="Resource" range="_jaDA0Re3Ee2Qoa8h9kRCOQ"/>
-    <resourceProperties id="_fSwgsBfKEe2Qoa8h9kRCOQ" name="acceptedBy" occurs="zeroOrOne" valueType="String" range="_poyKgJUdEeq-KoPaR9_Cfg"/>
+    <resourceProperties id="_fSwgsBfKEe2Qoa8h9kRCOQ" name="acceptedBy" occurs="zeroOrMany" valueType="Resource" range="_poyKgJUdEeq-KoPaR9_Cfg"/>
     <resourceProperties id="_-mzV8BfLEe2Qoa8h9kRCOQ" name="baselineOfStream" valueType="Resource" range="_jaDA0Re3Ee2Qoa8h9kRCOQ"/>
     <resourceProperties id="_-mzV8RfLEe2Qoa8h9kRCOQ" name="branch" valueType="Resource"/>
     <resourceProperties id="_-mzV8hfLEe2Qoa8h9kRCOQ" name="previousBaseline" valueType="Resource" range="_U16uYBfKEe2Qoa8h9kRCOQ"/>

domains/oslc-domains/src/main/java/org/eclipse/lyo/oslc/domains/config/Configuration.java

@@ -66,6 +66,7 @@
 import org.eclipse.lyo.oslc.domains.DctermsVocabularyConstants;
 import org.eclipse.lyo.oslc.domains.OsclVocabularyConstants;
 import org.eclipse.lyo.oslc.domains.Agent;
+import org.eclipse.lyo.oslc.domains.RdfsClass;
 import org.eclipse.lyo.oslc.domains.config.Component;
 import org.eclipse.lyo.oslc.domains.config.Contribution;
 import org.eclipse.lyo.oslc.domains.Person;
@@ -111,7 +112,7 @@ public class Configuration
     private String title;
     // Start of user code attributeAnnotation:acceptedBy
     // End of user code
-    private String acceptedBy;
+    private Set<Link> acceptedBy = new HashSet<>();
     // Start of user code attributeAnnotation:branch
     // End of user code
     private Link branch;
@@ -215,6 +216,11 @@ public void addSubject(final String subject)
         this.subject.add(subject);
     }
 
+    public void addAcceptedBy(final Link acceptedBy)
+    {
+        this.acceptedBy.add(acceptedBy);
+    }
+
     public void addSelections(final Link selections)
     {
         this.selections.add(selections);
@@ -368,11 +374,11 @@ public String getTitle()
     // End of user code
     @OslcName("acceptedBy")
     @OslcPropertyDefinition(Oslc_configDomainConstants.CONFIGURATION_MANAGEMENT_NAMSPACE + "acceptedBy")
-    @OslcOccurs(Occurs.ZeroOrOne)
-    @OslcValueType(ValueType.String)
+    @OslcOccurs(Occurs.ZeroOrMany)
+    @OslcValueType(ValueType.Resource)
     @OslcRange({RdfsDomainConstants.CLASS_TYPE})
     @OslcReadOnly(false)
-    public String getAcceptedBy()
+    public Set<Link> getAcceptedBy()
     {
         // Start of user code getterInit:acceptedBy
         // End of user code
@@ -647,11 +653,15 @@ public void setTitle(final String title )
 
     // Start of user code setterAnnotation:acceptedBy
     // End of user code
-    public void setAcceptedBy(final String acceptedBy )
+    public void setAcceptedBy(final Set<Link> acceptedBy )
     {
         // Start of user code setterInit:acceptedBy
         // End of user code
-        this.acceptedBy = acceptedBy;
+        this.acceptedBy.clear();
+        if (acceptedBy != null)
+        {
+            this.acceptedBy.addAll(acceptedBy);
+        }
         // Start of user code setterFinalize:acceptedBy
         // End of user code
     }

domains/oslc-domains/src/main/java/org/eclipse/lyo/oslc/domains/config/IBaseline.java

@@ -58,6 +58,7 @@
 import org.eclipse.lyo.oslc.domains.ProvVocabularyConstants;
 import org.eclipse.lyo.oslc.domains.IAgent;
 import org.eclipse.lyo.oslc.domains.config.IBaseline;
+import org.eclipse.lyo.oslc.domains.IRdfsClass;
 import org.eclipse.lyo.oslc.domains.config.IComponent;
 import org.eclipse.lyo.oslc.domains.config.IConfiguration;
 import org.eclipse.lyo.oslc.domains.config.IContribution;

domains/oslc-domains/src/main/java/org/eclipse/lyo/oslc/domains/config/IConfiguration.java

@@ -61,6 +61,7 @@
 import org.eclipse.lyo.oslc.domains.DctermsVocabularyConstants;
 import org.eclipse.lyo.oslc.domains.OsclVocabularyConstants;
 import org.eclipse.lyo.oslc.domains.IAgent;
+import org.eclipse.lyo.oslc.domains.IRdfsClass;
 import org.eclipse.lyo.oslc.domains.config.IComponent;
 import org.eclipse.lyo.oslc.domains.config.IContribution;
 import org.eclipse.lyo.oslc.domains.IPerson;
@@ -77,6 +78,7 @@ public interface IConfiguration
     public void addContributor(final Link contributor );
     public void addCreator(final Link creator );
     public void addSubject(final String subject );
+    public void addAcceptedBy(final Link acceptedBy );
     public void addSelections(final Link selections );
     public void addInstanceShape(final Link instanceShape );
     public void addModifiedBy(final Link modifiedBy );
@@ -152,11 +154,11 @@ public interface IConfiguration
 
     @OslcName("acceptedBy")
     @OslcPropertyDefinition(Oslc_configDomainConstants.CONFIGURATION_MANAGEMENT_NAMSPACE + "acceptedBy")
-    @OslcOccurs(Occurs.ZeroOrOne)
-    @OslcValueType(ValueType.String)
+    @OslcOccurs(Occurs.ZeroOrMany)
+    @OslcValueType(ValueType.Resource)
     @OslcRange({RdfsDomainConstants.CLASS_TYPE})
     @OslcReadOnly(false)
-    public String getAcceptedBy();
+    public Set<Link> getAcceptedBy();
 
     @OslcName("branch")
     @OslcPropertyDefinition(Oslc_configDomainConstants.CONFIGURATION_MANAGEMENT_NAMSPACE + "branch")
@@ -256,7 +258,7 @@ public interface IConfiguration
     public void setModified(final Date modified );
     public void setSubject(final Set<String> subject );
     public void setTitle(final String title );
-    public void setAcceptedBy(final String acceptedBy );
+    public void setAcceptedBy(final Set<Link> acceptedBy );
     public void setBranch(final Link branch );
     public void setComponent(final Link component );
     public void setContribution(final Link contribution );