[isis] branch master updated: ISIS-2877: dto-schema: rename tuple 'element' to 'elements' (plural)

[ahuber]

This is an automated email from the ASF dual-hosted git repository.

ahuber pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/isis.git


The following commit(s) were added to refs/heads/master by this push:
     new bc56b2b  ISIS-2877: dto-schema: rename tuple 'element' to 'elements' 
(plural)
bc56b2b is described below

commit bc56b2b63f127e9a8379f0e4edf955b121d3caff
Author: Andi Huber <ahu...@apache.org>
AuthorDate: Fri Feb 4 15:35:27 2022 +0100

    ISIS-2877: dto-schema: rename tuple 'element' to 'elements' (plural)
---
 .../java/org/apache/isis/applib/util/schema/CommonDtoUtils.java     | 6 +++---
 .../src/main/resources/org/apache/isis/schema/common/common-2.0.xsd | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git 
a/api/applib/src/main/java/org/apache/isis/applib/util/schema/CommonDtoUtils.java
 
b/api/applib/src/main/java/org/apache/isis/applib/util/schema/CommonDtoUtils.java
index 24029ae..ea76d98 100644
--- 
a/api/applib/src/main/java/org/apache/isis/applib/util/schema/CommonDtoUtils.java
+++ 
b/api/applib/src/main/java/org/apache/isis/applib/util/schema/CommonDtoUtils.java
@@ -563,14 +563,14 @@ public final class CommonDtoUtils {
             val elementDto = new NamedValueWithTypeDto();
             _Assert.assertTrue(_Strings.isNotEmpty(fieldName));
             elementDto.setName(fieldName);
-            dto.getElement().add(
+            dto.getElements().add(
                     recordFundamentalValue(vType, elementDto, 
getter.apply(value)));
             return this;
         }
 
         public TypedTupleDto build() {
             dto.setType(value.getClass().getName());
-            dto.setCardinality(dto.getElement().size());
+            dto.setCardinality(dto.getElements().size());
             return dto;
         }
 
@@ -590,7 +590,7 @@ public final class CommonDtoUtils {
 
         val map = new LinkedHashMap<String, Object>(dto.getCardinality()); // 
preserve order
 
-        dto.getElement()
+        dto.getElements()
             .forEach(elementDto->
                 map.put(elementDto.getName(), getValueAsObject(elementDto)));
 
diff --git 
a/api/schema/src/main/resources/org/apache/isis/schema/common/common-2.0.xsd 
b/api/schema/src/main/resources/org/apache/isis/schema/common/common-2.0.xsd
index 03f41fe..b8a7e86 100644
--- a/api/schema/src/main/resources/org/apache/isis/schema/common/common-2.0.xsd
+++ b/api/schema/src/main/resources/org/apache/isis/schema/common/common-2.0.xsd
@@ -72,7 +72,7 @@
             </xs:documentation>
         </xs:annotation>
         <xs:sequence>
-            <xs:element name="element" type="namedValueWithTypeDto" 
minOccurs="1" maxOccurs="unbounded"/>
+            <xs:element name="elements" type="namedValueWithTypeDto" 
minOccurs="1" maxOccurs="unbounded"/>
         </xs:sequence>
         <xs:attribute name="type" use="required" type="xs:string"/>
         <xs:attribute name="cardinality" use="required" type="xs:int"/>