Merge remote-tracking branch 'origin/master'

# Conflicts: # model/model-impl/src/test/java/com/evolveum/midpoint/model/impl/lens/TestAbstractAssignmentEvaluator.java
Evolveum · Mar 3, 2020 · 3059dab · 3059dab
2 parents f32ea11 + 95cf535
commit 3059dab
Show file tree

Hide file tree

Showing 526 changed files with 23,465 additions and 33,289 deletions.
diff --git a/build-tools/pom.xml b/build-tools/pom.xml
diff --git a/...idpoint-build/checkstyle-suppressions.xml → ...ig/checkstyle/checkstyle-suppressions.xml b/...idpoint-build/checkstyle-suppressions.xml → ...ig/checkstyle/checkstyle-suppressions.xml
@@ -8,16 +8,20 @@
     <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="[/\\]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"/>
-    <suppress files="[/\\]resources[/\\]localization[/\\]Midpoint.*.properties" checks="NewlineAtEndOfFile"/>
+    <suppress files="[/\\]resources[/\\]localization[/\\]Midpoint.*\.properties" checks="NewlineAtEndOfFile"/>
+
+    <!-- TODO: added for tests in 2020, but I hope at least AvoidNestedBlocks could go away (Virgo) -->
+    <!-- For tests we use a lot of _ in various names and for good reason, so we want to ignore Name rules -->
+    <suppress files="[/\\]src[/\\]test[/\\]" checks="MethodName|ConstantName|LocalVariableName|AvoidNestedBlocks"/>
 
     <!-- This will be gone anyway. Sooner or later. -->
-    <suppress files="[/\\]com[/\\]evolveum[/\\]midpoint[/\\]model[/\\]api[/\\]ModelPort.java$" checks="InterfaceIsType"/>
-    <suppress files="[/\\]com[/\\]evolveum[/\\]midpoint[/\\]report[/\\]api[/\\]ReportPort.java$" checks="InterfaceIsType"/>
+    <suppress files="[/\\]com[/\\]evolveum[/\\]midpoint[/\\]model[/\\]api[/\\]ModelPort\.java$" checks="InterfaceIsType"/>
+    <suppress files="[/\\]com[/\\]evolveum[/\\]midpoint[/\\]report[/\\]api[/\\]ReportPort\.java$" checks="InterfaceIsType"/>
 </suppressions>
diff --git a/...n/resources/midpoint-build/checkstyle.xml → config/checkstyle/checkstyle.xml b/...n/resources/midpoint-build/checkstyle.xml → config/checkstyle/checkstyle.xml
diff --git a/gui/admin-gui/pom.xml b/gui/admin-gui/pom.xml
@@ -691,7 +691,6 @@
         <dependency>
             <groupId>com.evolveum.midpoint.infra</groupId>
             <artifactId>test-util</artifactId>
-            <version>4.1-SNAPSHOT</version>
             <scope>test</scope>
         </dependency>
         <dependency>
@@ -816,6 +815,11 @@
             <version>4.1-SNAPSHOT</version>
             <scope>test</scope>
         </dependency>
+
+        <dependency>
+            <groupId>org.slf4j</groupId>
+            <artifactId>slf4j-api</artifactId>
+        </dependency>
     </dependencies>
 
     <build>

diff --git a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/input/DatePanel.java b/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/input/DatePanel.java
@@ -28,6 +28,7 @@ public DatePanel(String id, IModel<XMLGregorianCalendar> model) {
         super(id);
 
         DateInput date = new DateInput(ID_INPUT, new XmlGregorianCalendarModel(model));
+        date.setOutputMarkupId(true);
         add(date);
     }
 

diff --git a/...src/main/java/com/evolveum/midpoint/web/page/admin/configuration/InternalsClockPanel.java b/...src/main/java/com/evolveum/midpoint/web/page/admin/configuration/InternalsClockPanel.java
@@ -49,9 +49,6 @@ protected void onInitialize() {
         add(form);
 
         DatePanel offset = new DatePanel(ID_OFFSET, getModel());
-        for (FormComponent<?> formComponent : offset.getFormComponents()) {
-            formComponent.add(new EmptyOnBlurAjaxFormUpdatingBehaviour());
-        }
         form.add(offset);
 
             AjaxSubmitButton saveButton = new AjaxSubmitButton(ID_BUTTON_SAVE, createStringResource("PageInternals.button.changeTime")) {

diff --git a/...-gui/src/main/java/com/evolveum/midpoint/web/page/admin/roles/MemberOperationsHelper.java b/...-gui/src/main/java/com/evolveum/midpoint/web/page/admin/roles/MemberOperationsHelper.java
@@ -264,19 +264,25 @@ public static <R extends AbstractRoleType> ObjectQuery createDirectMemberQuery(R
             q0 = prismContext.queryFor(FocusType.class)
                     .type(objectType);
         }
-        S_AtomicFilterExit q = q0.item(FocusType.F_ASSIGNMENT, AssignmentType.F_TARGET_REF)
+
+        // Use exists filter to build a query like this:
+        // $a/targetRef = oid1 and $a/tenantRef = oid2 and $a/orgRef = oid3
+        S_AtomicFilterExit q = q0.exists(FocusType.F_ASSIGNMENT)
+                .block()
+                .item(AssignmentType.F_TARGET_REF)
                 .ref(createReferenceValuesList(targetObject, relations));
+
         if (tenant != null && tenant.getObjectType() != null) {
-            q = q.and().item(FocusType.F_ASSIGNMENT, AssignmentType.F_TENANT_REF).ref(ObjectTypeUtil.createObjectRef(tenant.getObjectType(),
+            q = q.and().item(AssignmentType.F_TENANT_REF).ref(ObjectTypeUtil.createObjectRef(tenant.getObjectType(),
                     prismContext).asReferenceValue());
         }
 
         if (project != null && project.getObjectType() != null) {
-            q = q.and().item(FocusType.F_ASSIGNMENT, AssignmentType.F_ORG_REF).ref(ObjectTypeUtil.createObjectRef(project.getObjectType(),
+            q = q.and().item(AssignmentType.F_ORG_REF).ref(ObjectTypeUtil.createObjectRef(project.getObjectType(),
                     prismContext).asReferenceValue());
         }
 
-        ObjectQuery query = q.build();
+        ObjectQuery query = q.endBlock().build();
         if (LOGGER.isTraceEnabled()) {
             LOGGER.trace("Searching members of role {} with query:\n{}", targetObject.getOid(), query.debugDump());
         }

diff --git a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/server/PageTask.java b/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/server/PageTask.java
@@ -487,7 +487,10 @@ protected Class<? extends Page> getRestartResponsePage() {
 
     @Override
     public void finishProcessing(AjaxRequestTarget target, OperationResult result, boolean returningFromAsync) {
-
+        if (!isKeepDisplayingResults()) {
+            showResult(result);
+            redirectBack();
+        }
     }
 
     @Override