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

docs/diag/aggressive-log-report.adoc

@@ -139,7 +139,8 @@ Send the gathered logfiles to the midPoint team with all the other relevant deta
 
 * If there is a form or other input tell us how it was filled in (e.g. an XML snippet used to import, etc.)
 
-* What kind of resource definition was used (we prefer if you replicate the problem with one of our link:https://svn.evolveum.com/midpoint/trunk/samples/[samples], see xref:/midpoint/reference/diag/creating-a-bug-report/[Creating a Bug Report].
+* What kind of resource definition was used.
+We prefer if you replicate the problem with one of our xref:/midpoint/reference/samples/[samples], see xref:/support/bug-tracking-system/creating-a-bug-report/[Creating a Bug Report].
 
 * Any other special settings that you feel can influence the outcome (custom schema, strange things in expressions, etc.)
 
@@ -151,4 +152,4 @@ Send the gathered logfiles to the midPoint team with all the other relevant deta
 == Clean Up
 
 Turn the logging back to normal using *Configuration  Logging* page.
-Turn the threads on using the dialog in *Server Tasks* page.
+Turn the threads on using the dialog in *Server Tasks* page.

docs/diag/troubleshooting/connectors.adoc

@@ -271,7 +271,7 @@ This is supposed to be the same as the package prefix used in the `connectorType
 So, you think you have found a connector bug.
 That may happen.
 No practical software is completely bug-free and the connectors are no exception.
-But before going to xref:/midpoint/reference/diag/creating-a-bug-report/[report a bug] please spend some time diagnosing the issue.
+But before going to xref:/support/bug-tracking-system/creating-a-bug-report/[report a bug] please spend some time diagnosing the issue.
 Firstly, what looks like a connector bug may in fact be a misconfiguration.
 Secondly, if your bug report states justs "the connector is broken" then such a bug is very unlikely to ever get fixed.
 We need more data about the issue to fix it.
@@ -309,7 +309,7 @@ Enable full connector logging.
 And maybe logging of the underlying libraries.
 Try to figure out what is going on.
 
-. If everything fails then you can xref:/midpoint/reference/diag/creating-a-bug-report/[report the issue]. However at this point it is almost sure that the issue will be very tricky.
+. If everything fails then you can xref:/support/bug-tracking-system/creating-a-bug-report/[report the issue]. However at this point it is almost sure that the issue will be very tricky.
 It is unlikely that the midPoint team will have time to address that issue unless you have an active xref:/support/subscription-sponsoring/[subscription].
 
 == Connector Exception Stack Trace
@@ -342,4 +342,4 @@ The audit is the easiest way to check that.
 
 * xref:/midpoint/reference/diag/troubleshooting/usual-troubleshooting-steps/[Usual Troubleshooting Steps]
 
-* xref:/midpoint/devel/bugfixing/[Bugfixing and Support]
+* xref:/midpoint/devel/bugfixing/[Bugfixing and Support]

docs/diag/troubleshooting/usual-troubleshooting-steps.adoc

@@ -98,7 +98,7 @@ It is easy to make a configuration mistake.
 Therefore if you experience a problem it is most likely a configuration problem and not a product bug.
 But no software is ever perfect and bugs happen.
 If you have gone through all the relevant steps above and you suspect that what you see is not misconfiguration, error caused by external source (e.g. resource being down) or other thing that you can correct then it is a time to follow with a bug report.
-Please see the xref:/midpoint/reference/diag/creating-a-bug-report/[Creating a Bug Report] page which describes how to create a good bug report.
+Please see the xref:/support/bug-tracking-system/creating-a-bug-report/[Creating a Bug Report] page which describes how to create a good bug report.
 
 
 == Aggressive Approach

docs/docstest/index.html

@@ -0,0 +1,13 @@
+---
+layout: page
+title: Test
+visibility: hidden
+---
+
+<p>
+    Testing pages for midPoint reference documentation.
+    This is <b>not</b> about midPoint testing.
+    It is about testing the docs infrastructure: Jekyll, scripts, hooks, etc.
+</p>
+
+{% children visibility: all %}

docs/docstest/params.html

@@ -0,0 +1,30 @@
+---
+layout: page
+title: Params (midPoint reference)
+visibility: hidden
+---
+<p>
+    Page that shows all parameters and variables available for the page in Jekyll.
+</p>
+
+<h2>Page</h2>
+
+<table class="tableblock frame-all grid-all fit-content">
+
+    <thead>
+    <tr>
+        <th class="tableblock halign-left valign-top">Key</th>
+        <th class="tableblock halign-left valign-top">Value</th>
+    </tr>
+    </thead>
+
+    <tbody>
+    {% for item in page %}
+    <tr>
+        <td class="tableblock halign-left valign-top">{{ item[0] }}</td>
+        <td class="tableblock halign-left valign-top">{{ item[1] }}</td>
+    </tr>
+    {% endfor %}
+    </tbody>
+
+</table>

docs/expressions/variables.adoc

@@ -54,7 +54,6 @@ while the path expressions use the dollar sign (`$`) to prefix the variables:
 $givenName
 ----
 
-
 == Accessing Object Items
 
 Some variables used in the expressions are simple (scalar) values.
@@ -89,7 +88,6 @@ The item path has a natural way how to reference the items inside a variable:
 $focus/activation/administrativeStatus
 ----
 
-
 == Mapping Variables vs Sources
 
 The nature of variables is very similar to mapping sources.
@@ -273,7 +271,6 @@ In addition to these variables there are other special purpose variables.
 These are documented on a separate pages that document the mechanism.
 E.g. the variables specific to assignment processing are described in the xref:/midpoint/reference/roles-policies/assignment/configuration/[Assignment Configuration] page.
 
-
 == Alternative Variable Names and Missing Variables
 
 Although midPoint has xref:/midpoint/architecture/[solid architectural background] it is not a software where every little detail was defined by a big design upfront.
@@ -289,7 +286,7 @@ Please, if you can try to avoid the use of the alternative names.
 
 Due to midPoint history all the variables that are supposed to be universally available to all expressions may not be actually available in some cases.
 If you expect a variable to be available, and it is not, then you have probably found a bug.
-Please xref:/midpoint/reference/diag/creating-a-bug-report/[report the bug].
+Please xref:/support/bug-tracking-system/creating-a-bug-report/[report the bug].
 We will fix that.
 
 == See Also

docs/resources/resource-schema/explanation/index.adoc

@@ -16,7 +16,7 @@ This page explains how are these schemas used and how they work together to supp
 ====
 The examples provided on this page are considerably simplified.
 The goal is to demonstrate the concept.
-Complete and working examples can be found in the link:https://svn.evolveum.com/midpoint/trunk/samples/[samples section of source code respository].
+Complete and working examples can be found in the https://github.com/Evolveum/midpoint-samples[samples section of source code repository].
 ====
 
 
@@ -66,4 +66,4 @@ http://midpoint.evolveum.com/xml/ns/public/connector/icf-1/bundle/org.identityco
 
 
 // TODO
-// == Schema Annotations
+// == Schema Annotations

gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/impl/page/admin/role/mining/tables/RoleAnalysisRoleBasedTable.java

@@ -807,9 +807,8 @@ private void onSubmitCandidateRolePerform(@NotNull AjaxRequestTarget target,
             operationData.setPatternId(detectedPattern.get(0).getId());
         }
 
-        @NotNull RoleType candidateBusinessRole = operationData.getBusinessRole().asObjectable();
         List<BusinessRoleDto> businessRoleDtos = operationData.getBusinessRoleDtos();
-        List<AssignmentType> inducement = candidateBusinessRole.getInducement();
+        Set<RoleType> inducement = operationData.getCandidateRoles();
         if (!inducement.isEmpty() && !businessRoleDtos.isEmpty()) {
             PageRole pageRole = new PageRole(operationData.getBusinessRole(), operationData);
             setResponsePage(pageRole);

model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/mining/RoleAnalysisServiceImpl.java

@@ -1400,13 +1400,30 @@ public <T extends ObjectType> void loadSearchObjectIterative(
             @NotNull Task task,
             @NotNull OperationResult parentResult) {
         try {
-            this.modelService.searchObjectsIterative(type, query, (object, result) -> {
-                modifyList.add(object.asObjectable());
+            Set<String> existingOidSet = modifyList.stream()
+                    .map(ObjectType::getOid)
+                    .collect(Collectors.toSet());
+
+            ResultHandler<RoleType> resultHandler = (role, lResult) -> {
+                try {
+                    if(!existingOidSet.contains(role.getOid())) {
+                        modifyList.add((T) role.asObjectable());
+                    }
+                } catch (Exception e) {
+                    String errorMessage = "Cannot resolve role: " + toShortString(role.asObjectable())
+                            + ": " + e.getMessage();
+                    throw new SystemException(errorMessage, e);
+                }
+
                 return true;
-            }, options, task, parentResult);
+            };
+
+            modelService.searchObjectsIterative(RoleType.class, query, resultHandler, null,
+                    task, parentResult);
+
         } catch (SchemaException | ObjectNotFoundException | ExpressionEvaluationException |
                 CommunicationException | ConfigurationException | SecurityViolationException e) {
-            LOGGER.error("Couldn't search  search and load object iterative {}", type, e);
+            LOGGER.error("Couldn't search and load object iterative {}", type, e);
         }
     }
 }