Merge branch 'master' of https://github.com/Evolveum/midpoint

Evolveum · Nov 12, 2019 · 8f51e5d · 8f51e5d
2 parents f90a0a3 + 9c90d72
commit 8f51e5d
Show file tree

Hide file tree

Showing 57 changed files with 1,031 additions and 1,019 deletions.
diff --git a/build-system/pom.xml b/build-system/pom.xml
@@ -1725,6 +1725,9 @@
                     <consoleOutput>true</consoleOutput>
                     <failsOnError>true</failsOnError>
                     <linkXRef>false</linkXRef>
+                    <includes>**/*.java</includes>
+                    <!-- Also need to add suffixes to checkstyle.xml -->
+                    <resourceIncludes>**/*.properties,**/*.xml,**/*.xsd,**/*.wsdl,**/*.json,**/*.yaml,**/*.yml</resourceIncludes>
                 </configuration>
                 <executions>
                     <execution>

diff --git a/build-tools/src/main/resources/midpoint-build/checkstyle-suppressions.xml b/build-tools/src/main/resources/midpoint-build/checkstyle-suppressions.xml
@@ -8,6 +8,10 @@
     <suppress files="[/\\]annotation_3[/\\]" checks="ConstantName"/>
     <suppress files="[/\\]query_3[/\\]" checks="ConstantName|AvoidNestedBlocks|NeedBraces"/>
     <suppress files="[/\\]types_3[/\\]" checks="ConstantName|AvoidNestedBlocks|NeedBraces"/>
+    <suppress files="[/\\]public[/\\]query-3.xsd$" checks="NewlineAtEndOfFile"/>
+    <suppress files="[/\\]public[/\\]types-3.xsd$" checks="NewlineAtEndOfFile"/>
+    <suppress files="[/\\]public[/\\]annotation-3.xsd$" checks="NewlineAtEndOfFile"/>
+    <suppress files="[/\\]test[/\\]foo.*-1.xsd$" checks="NewlineAtEndOfFile"/>
     <suppress files="[/\\]com[/\\]evolveum[/\\]midpoint[/\\]prism[/\\]delta[/\\]builder[/\\]" checks="TypeName"/>
     <suppress files="[/\\]com[/\\]evolveum[/\\]midpoint[/\\]prism[/\\]query[/\\]builder[/\\]" checks="TypeName"/>
     <suppress files="[/\\]com[/\\]evolveum[/\\]midpoint[/\\]prism[/\\]impl[/\\]query[/\\]builder[/\\]" checks="TypeName"/>

diff --git a/build-tools/src/main/resources/midpoint-build/checkstyle.xml b/build-tools/src/main/resources/midpoint-build/checkstyle.xml
@@ -10,7 +10,8 @@
     -->
     <property name="severity" value="error"/>
 
-    <property name="fileExtensions" value="java, properties, xml"/>
+    <!-- Also need to add suffixes to parent pom.xml in checkstyle plugin configuration -->
+    <property name="fileExtensions" value="java, properties, xml, xsd, wsdl, json, yml, yaml"/>
 
     <!-- Excludes all 'module-info.java' files              -->
     <!-- See https://checkstyle.org/config_filefilters.html -->

diff --git a/infra/common/src/test/resources/objects/c0c010c0-d34d-b33f-f00d-999888111111.xml b/infra/common/src/test/resources/objects/c0c010c0-d34d-b33f-f00d-999888111111.xml
@@ -12,13 +12,6 @@
 
     <name>Testing Complex Password Policy</name>
     <description>Testing complex password policy</description>
-    <lifetime>
-        <expiration>999</expiration>
-        <warnBeforeExpiration>9</warnBeforeExpiration>
-        <lockAfterExpiration>0</lockAfterExpiration>
-        <minPasswordAge>0</minPasswordAge>
-        <passwordHistoryLength>0</passwordHistoryLength>
-    </lifetime>
     <stringPolicy>
         <description>Testing string policy</description>
         <limitations>

diff --git a/infra/common/src/test/resources/objects/c0c010c0-d34d-b33f-f00d-999888111113.xml b/infra/common/src/test/resources/objects/c0c010c0-d34d-b33f-f00d-999888111113.xml
@@ -12,13 +12,6 @@
 
     <name>Testing Bad Password Policy</name>
     <description>This policy is intentionally insane. The limits conflict with overall length limits. This should fail.</description>
-    <lifetime>
-        <expiration>999</expiration>
-        <warnBeforeExpiration>9</warnBeforeExpiration>
-        <lockAfterExpiration>0</lockAfterExpiration>
-        <minPasswordAge>0</minPasswordAge>
-        <passwordHistoryLength>0</passwordHistoryLength>
-    </lifetime>
     <stringPolicy>
         <description>Testing string policy</description>
         <limitations>

diff --git a/...ism-impl/src/main/java/com/evolveum/midpoint/prism/impl/marshaller/PrismUnmarshaller.java b/...ism-impl/src/main/java/com/evolveum/midpoint/prism/impl/marshaller/PrismUnmarshaller.java
@@ -275,7 +275,8 @@ private <C extends Containerable> PrismContainerValue<C> parseContainerValueFrom
                 SchemaMigration migration = determineSchemaMigration(complexTypeDefinition, itemName, pc);
                 if (migration != null && pc.isCompat()) {
                     if (migration.getOperation() == SchemaMigrationOperation.REMOVED) {
-                        LOGGER.warn("Item {} was removed from the schema, skipping", itemName);
+                        String msg = "Item "+itemName+" was removed from the schema, skipped processing of that item";
+                        pc.warn(LOGGER, msg);
                         continue;
                     } else {
                         pc.warnOrThrow(LOGGER, "Unsupported migration operation " + migration.getOperation() + " for item " + itemName + " (in container "

diff --git a/infra/schema/src/main/resources/xml/ns/public/common/common-core-3.xsd b/infra/schema/src/main/resources/xml/ns/public/common/common-core-3.xsd
@@ -12433,9 +12433,9 @@
                             <xsd:documentation>
                                 <p>
                                     <p>
-                                        This value indicates, whether the evaluation of this role gives the
+                                        This value indicates whether the evaluation of this role gives the
                                         same results regardless of its position in the assignment/inducement
-                                        hierarchy. I.e. evaluation of this roles does not depend on the assignment
+                                        hierarchy. I.e. evaluation of this role does not depend on the assignment
                                         parameters of focus or any of the preceding roles. This flag is used
                                         to enable aggressive caching of role evaluation, so idempotent roles
                                         are only evaluated once regardless of their position in the hierarchy
@@ -12467,7 +12467,7 @@
                                     </p>
                                 </p>
                             </xsd:documentation>
-                             <xsd:appinfo>
+                            <xsd:appinfo>
                                 <a:displayName>AbstractRoleType.idempotent</a:displayName>
                                 <a:since>3.6</a:since>
                             </xsd:appinfo>

diff --git a/infra/schema/src/main/resources/xml/ns/public/common/common-notifications-3.xsd b/infra/schema/src/main/resources/xml/ns/public/common/common-notifications-3.xsd
@@ -1521,6 +1521,16 @@
                     </xsd:documentation>
                 </xsd:annotation>
             </xsd:element>
+            <xsd:element name="contentId" type="xsd:string">
+                <xsd:annotation>
+                    <xsd:documentation>
+                        Value of the Content-ID header of MIME body part for this attachment.
+                    </xsd:documentation>
+                    <xsd:appinfo>
+                        <a:since>4.1</a:since>
+                    </xsd:appinfo>
+                </xsd:annotation>
+            </xsd:element>
         </xsd:sequence>
     </xsd:complexType>
 </xsd:schema>