Merge remote-tracking branch 'origin/master'

Evolveum · Sep 4, 2023 · eb25c00 · eb25c00
2 parents 40a8407 + f7514cd
commit eb25c00
Show file tree

Hide file tree

Showing 19 changed files with 207 additions and 160 deletions.
diff --git a/.../evolveum/midpoint/gui/impl/page/admin/role/mining/utils/chunk/PrepareChunkStructure.java b/.../evolveum/midpoint/gui/impl/page/admin/role/mining/utils/chunk/PrepareChunkStructure.java
@@ -85,7 +85,7 @@ public MiningOperationChunk prepareRoleBasedStructure(@NotNull RoleAnalysisClust
         Set<String> membersOidSet = new HashSet<>();
 
         handler.setActive(true);
-        handler.setSubTitle("Map Roles");
+        handler.enterNewStep("Map Roles");
         handler.setOperationCountToProcess(members.size());
         for (ObjectReferenceType member : members) {
             handler.iterateActualStatus();
@@ -109,7 +109,7 @@ public MiningOperationChunk prepareRoleBasedStructure(@NotNull RoleAnalysisClust
 
         }
 
-        handler.setSubTitle("Map Users");
+        handler.enterNewStep("Map Users");
         handler.setOperationCountToProcess(members.size());
         int roleMapSize = roleMap.size();
         ListMultimap<List<String>, String> roleChunk = ArrayListMultimap.create();
@@ -122,7 +122,7 @@ public MiningOperationChunk prepareRoleBasedStructure(@NotNull RoleAnalysisClust
         }
 
         int userChunkSize = userChunk.size();
-        handler.setSubTitle("Process Role Structure");
+        handler.enterNewStep("Process Role Structure");
         handler.setOperationCountToProcess(userChunkSize);
         for (List<String> users : userChunk.keySet()) {
             handler.iterateActualStatus();
@@ -146,7 +146,7 @@ public MiningOperationChunk prepareRoleBasedStructure(@NotNull RoleAnalysisClust
 
         int memberCount = membersOidSet.size();
         int roleChunkSize = roleChunk.size();
-        handler.setSubTitle("Process User Structure");
+        handler.enterNewStep("Process User Structure");
         handler.setOperationCountToProcess(roleChunkSize);
         for (List<String> key : roleChunk.keySet()) {
             handler.iterateActualStatus();
@@ -187,7 +187,7 @@ public MiningOperationChunk prepareUserBasedStructure(@NotNull RoleAnalysisClust
         Set<String> membersOidSet = new HashSet<>();
 
         handler.setActive(true);
-        handler.setSubTitle("Map Users");
+        handler.enterNewStep("Map Users");
         handler.setOperationCountToProcess(members.size());
         for (ObjectReferenceType member : members) {
             handler.iterateActualStatus();
@@ -214,7 +214,7 @@ public MiningOperationChunk prepareUserBasedStructure(@NotNull RoleAnalysisClust
         }
 
         int roleMapSize = roleMap.size();
-        handler.setSubTitle("Map Roles");
+        handler.enterNewStep("Map Roles");
         handler.setOperationCountToProcess(roleMapSize);
         ListMultimap<List<String>, String> roleChunk = ArrayListMultimap.create();
         for (String key : roleMap.keySet()) {
@@ -224,7 +224,7 @@ public MiningOperationChunk prepareUserBasedStructure(@NotNull RoleAnalysisClust
         }
 
         int userChunkSize = userChunk.size();
-        handler.setSubTitle("Process User Structure");
+        handler.enterNewStep("Process User Structure");
         handler.setOperationCountToProcess(userChunkSize);
         for (List<String> key : userChunk.keySet()) {
             handler.iterateActualStatus();
@@ -250,7 +250,7 @@ public MiningOperationChunk prepareUserBasedStructure(@NotNull RoleAnalysisClust
 
         int roleChunkSize = roleChunk.size();
 
-        handler.setSubTitle("Process Role Structure");
+        handler.enterNewStep("Process Role Structure");
         handler.setOperationCountToProcess(roleChunkSize);
         for (List<String> key : roleChunk.keySet()) {
             handler.iterateActualStatus();
@@ -291,7 +291,7 @@ public MiningOperationChunk preparePartialRoleBasedStructure(@NotNull RoleAnalys
 
         List<ObjectReferenceType> members = cluster.getMember();
         handler.setActive(true);
-        handler.setSubTitle("Map Roles");
+        handler.enterNewStep("Map Roles");
         handler.setOperationCountToProcess(members.size());
         for (ObjectReferenceType objectReferenceType : members) {
             handler.iterateActualStatus();
@@ -317,7 +317,7 @@ public MiningOperationChunk preparePartialRoleBasedStructure(@NotNull RoleAnalys
         int membersCount = membersOidSet.size();
         //user //role
         ListMultimap<List<String>, String> roleChunk = ArrayListMultimap.create();
-        handler.setSubTitle("Map Users");
+        handler.enterNewStep("Map Users");
         handler.setOperationCountToProcess(roleMap.size());
 
         for (String key : roleMap.keySet()) {
@@ -326,7 +326,7 @@ public MiningOperationChunk preparePartialRoleBasedStructure(@NotNull RoleAnalys
             roleChunk.put(values, key);
         }
 
-        handler.setSubTitle("Prepare User Structure");
+        handler.enterNewStep("Prepare User Structure");
         handler.setOperationCountToProcess(roleChunk.size());
         for (List<String> key : roleChunk.keySet()) {
             handler.iterateActualStatus();
@@ -363,7 +363,7 @@ public MiningOperationChunk preparePartialUserBasedStructure(@NotNull RoleAnalys
 
         List<ObjectReferenceType> members = cluster.getMember();
         handler.setActive(true);
-        handler.setSubTitle("Map Users");
+        handler.enterNewStep("Map Users");
         handler.setOperationCountToProcess(members.size());
         for (ObjectReferenceType objectReferenceType : members) {
             handler.iterateActualStatus();
@@ -389,7 +389,7 @@ public MiningOperationChunk preparePartialUserBasedStructure(@NotNull RoleAnalys
         //user //role
         ListMultimap<List<String>, String> roleChunk = ArrayListMultimap.create();
 
-        handler.setSubTitle("Map Roles");
+        handler.enterNewStep("Map Roles");
         handler.setOperationCountToProcess(roleMap.size());
         for (String key : roleMap.keySet()) {
             handler.iterateActualStatus();
@@ -398,7 +398,7 @@ public MiningOperationChunk preparePartialUserBasedStructure(@NotNull RoleAnalys
             roleChunk.put(values, key);
         }
 
-        handler.setSubTitle("Prepare Role Structure");
+        handler.enterNewStep("Prepare Role Structure");
         handler.setOperationCountToProcess(roleChunk.size());
         for (List<String> key : roleChunk.keySet()) {
             handler.iterateActualStatus();

diff --git a/...evolveum/midpoint/gui/impl/page/admin/role/mining/utils/chunk/PrepareExpandStructure.java b/...evolveum/midpoint/gui/impl/page/admin/role/mining/utils/chunk/PrepareExpandStructure.java
@@ -87,7 +87,7 @@ public MiningOperationChunk prepareRoleBasedStructure(@NotNull RoleAnalysisClust
 
         int rolesCount = rolesElements.size();
         handler.setActive(true);
-        handler.setSubTitle("Prepare Role Structure");
+        handler.enterNewStep("Prepare Role Structure");
         handler.setOperationCountToProcess(rolesCount);
         for (ObjectReferenceType rolesElement : rolesElements) {
             handler.iterateActualStatus();
@@ -115,7 +115,7 @@ public MiningOperationChunk prepareRoleBasedStructure(@NotNull RoleAnalysisClust
 
         int userChunkSize = userChunk.size();
 
-        handler.setSubTitle("Map Users");
+        handler.enterNewStep("Map Users");
         handler.setOperationCountToProcess(miningRoleTypeChunks.size());
         for (MiningRoleTypeChunk chunk : miningRoleTypeChunks) {
             handler.iterateActualStatus();
@@ -125,7 +125,7 @@ public MiningOperationChunk prepareRoleBasedStructure(@NotNull RoleAnalysisClust
 
         int memberCount = membersOidSet.size();
 
-        handler.setSubTitle("Prepare User Structure");
+        handler.enterNewStep("Prepare User Structure");
         handler.setOperationCountToProcess(userChunk.size());
         for (String key : userChunk.keySet()) {
             handler.iterateActualStatus();
@@ -164,7 +164,7 @@ public MiningOperationChunk prepareUserBasedStructure(@NotNull RoleAnalysisClust
         int usersCount = members.size();
 
         handler.setActive(true);
-        handler.setSubTitle("Prepare User Structure");
+        handler.enterNewStep("Prepare User Structure");
         handler.setOperationCountToProcess(usersCount);
         for (int i = 0; i < usersCount; i++) {
             handler.iterateActualStatus();
@@ -196,7 +196,7 @@ public MiningOperationChunk prepareUserBasedStructure(@NotNull RoleAnalysisClust
 
         int roleChunkSize = roleChunk.size();
 
-        handler.setSubTitle("Map Roles");
+        handler.enterNewStep("Map Roles");
         handler.setOperationCountToProcess(usersCount);
         for (MiningUserTypeChunk chunk : miningUserTypeChunks) {
             handler.iterateActualStatus();
@@ -206,7 +206,7 @@ public MiningOperationChunk prepareUserBasedStructure(@NotNull RoleAnalysisClust
 
         int memberCount = membersOidSet.size();
 
-        handler.setSubTitle("Prepare Role Structure");
+        handler.enterNewStep("Prepare Role Structure");
         handler.setOperationCountToProcess(usersCount);
         for (String key : roleChunk.keySet()) {
             handler.iterateActualStatus();
@@ -244,7 +244,7 @@ public MiningOperationChunk preparePartialRoleBasedStructure(@NotNull RoleAnalys
         Set<String> membersOidSet = new HashSet<>();
 
         handler.setActive(true);
-        handler.setSubTitle("Map Roles");
+        handler.enterNewStep("Map Roles");
         handler.setOperationCountToProcess(rolesElements.size());
         for (ObjectReferenceType objectReferenceType : rolesElements) {
             handler.iterateActualStatus();
@@ -267,7 +267,7 @@ public MiningOperationChunk preparePartialRoleBasedStructure(@NotNull RoleAnalys
 
         //user //role
         ListMultimap<List<String>, String> roleChunk = ArrayListMultimap.create();
-        handler.setSubTitle("Map Users");
+        handler.enterNewStep("Map Users");
         handler.setOperationCountToProcess(roleMap.size());
         for (String key : roleMap.keySet()) {
             handler.iterateActualStatus();
@@ -278,7 +278,7 @@ public MiningOperationChunk preparePartialRoleBasedStructure(@NotNull RoleAnalys
 
         int memberCount = membersOidSet.size();
 
-        handler.setSubTitle("Prepare User Structure");
+        handler.enterNewStep("Prepare User Structure");
         handler.setOperationCountToProcess(roleChunk.size());
         for (List<String> key : roleChunk.keySet()) {
             handler.iterateActualStatus();
@@ -317,7 +317,7 @@ public MiningOperationChunk preparePartialUserBasedStructure(@NotNull RoleAnalys
         List<ObjectReferenceType> members = cluster.getMember();
 
         handler.setActive(true);
-        handler.setSubTitle("Map Users");
+        handler.enterNewStep("Map Users");
         handler.setOperationCountToProcess(members.size());
         for (ObjectReferenceType objectReferenceType : members) {
             handler.iterateActualStatus();
@@ -346,7 +346,7 @@ public MiningOperationChunk preparePartialUserBasedStructure(@NotNull RoleAnalys
         //user //role
         ListMultimap<List<String>, String> roleChunk = ArrayListMultimap.create();
 
-        handler.setSubTitle("Map Roles");
+        handler.enterNewStep("Map Roles");
         handler.setOperationCountToProcess(roleMap.size());
         for (String key : roleMap.keySet()) {
             handler.iterateActualStatus();
@@ -357,7 +357,7 @@ public MiningOperationChunk preparePartialUserBasedStructure(@NotNull RoleAnalys
 
         int memberCount = membersOidSet.size();
 
-        handler.setSubTitle("Prepare Role Structure");
+        handler.enterNewStep("Prepare Role Structure");
         handler.setOperationCountToProcess(roleChunk.size());
         for (List<String> key : roleChunk.keySet()) {
             handler.iterateActualStatus();

diff --git a/gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/impl/page/login/module/PageLogin.html b/gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/impl/page/login/module/PageLogin.html
@@ -16,7 +16,7 @@
             </label>
             <div class="input-group d-flex login-panel-control">
                 <input wicket:id="username" name="username" type="text" class="form-control form-control-sm">
-                <div class="input-group-prepend">
+                <div class="input-group-append">
                     <span class="input-group-text">
                         <i class="fas fa-user"></i>
                     </span>

diff --git a/infra/common/src/main/java/com/evolveum/midpoint/common/mining/objects/handler/Handler.java b/infra/common/src/main/java/com/evolveum/midpoint/common/mining/objects/handler/Handler.java
@@ -7,25 +7,41 @@
 
 package com.evolveum.midpoint.common.mining.objects.handler;
 
+import com.evolveum.midpoint.util.logging.Trace;
+import com.evolveum.midpoint.util.logging.TraceManager;
+
+import org.jetbrains.annotations.Nullable;
+
 import java.io.Serializable;
 import java.time.Duration;
 
-import static com.evolveum.midpoint.util.ClassPathUtil.LOGGER;
-
-//TODO
+/**
+ * Keeps the state of the role-mining activity (clustering, pattern detection, etc).
+ *
+ * TODO rename
+ */
 public class Handler implements Serializable {
 
+    private static final Trace LOGGER = TraceManager.getTrace(Handler.class);
+
     private String title;
     private String subTitle;
     private int operationCountToProcess;
     private boolean isActive;
     private int actualStatus;
-    private int stepsCount;
+    private final int stepsCount;
     private int currentStep;
     private String objectId;
     private final long startTime;
     private long endTime;
 
+    /**
+     * Called when an external progress value (currently, for tasks) has to be incremented.
+     *
+     * TODO what about serializability? Currently we assume we'll never use deserialized version of this class isntance
+     */
+    @Nullable private transient final Runnable progressIncrementer;
+
     public int getPercentage() {
         return percentage;
     }
@@ -43,29 +59,37 @@ public String getDuration() {
     }
 
     public Handler(String title, int stepsCount) {
+        this(title, stepsCount, null);
+    }
+
+    public Handler(String title, int stepsCount, @Nullable Runnable progressIncrementer) {
         this.startTime = System.currentTimeMillis();
         this.endTime = System.currentTimeMillis();
         this.title = title;
         this.stepsCount = stepsCount;
         this.isActive = true;
         this.actualStatus = 0;
         this.currentStep = 0;
+        this.progressIncrementer = progressIncrementer;
     }
 
     public void iterateActualStatus() {
         this.actualStatus++;
         this.endTime = System.currentTimeMillis();
         this.percentage = (int) ((actualStatus / (double) operationCountToProcess) * 100);
-        print();
+        log();
     }
 
-    public void setSubTitle(String subTitle) {
+    public void enterNewStep(String subTitle) {
+        if (progressIncrementer != null) {
+            progressIncrementer.run();
+        }
         this.currentStep++;
         this.operationCountToProcess = 0;
         this.actualStatus = 0;
         this.subTitle = subTitle;
         this.percentage = 0;
-        print();
+        log();
     }
 
     @Override
@@ -76,12 +100,12 @@ public String toString() {
                 isActive, actualStatus, getObjectId(), getDuration());
     }
 
-    public void print() {
-        String handler = String.format("Step{%d/%d} - Status{%s, subOperation='%s', percentage=%d processedCount=%d, "
-                        + "isActive=%b, actualStatus=%d} Object Id{%s} Duration{%s}",
+    public void log() {
+        LOGGER.debug(
+                "Step {}/{} - Status=[{}, subOperation='{}', percentage={} processedCount={}, "
+                        + "isActive={}, actualStatus={}] Object Id={} Duration={}",
                 currentStep, stepsCount, title, subTitle, percentage, operationCountToProcess, isActive,
                 actualStatus, getObjectId(), getDuration());
-        LOGGER.info(handler);
     }
 
     public void setOperationCountToProcess(int operationCountToProcess) {
@@ -127,8 +151,4 @@ public void setActualStatus(int actualStatus) {
     public void setObjectId(String objectId) {
         this.objectId = objectId;
     }
-
-    public void setStepsCount(int stepsCount) {
-        this.stepsCount = stepsCount;
-    }
 }
diff --git a/...mmon/src/main/java/com/evolveum/midpoint/common/mining/utils/algorithm/JaccardSorter.java b/...mmon/src/main/java/com/evolveum/midpoint/common/mining/utils/algorithm/JaccardSorter.java
@@ -35,7 +35,7 @@ public class JaccardSorter {
     public static List<MiningUserTypeChunk> jaccardUserBasedSorter(List<MiningUserTypeChunk> dataPoints) {
 
         Handler handler = new Handler("Jaccard Sort", 1);
-        handler.setSubTitle("Sorting");
+        handler.enterNewStep("Sorting");
         handler.setActive(true);
 
         List<MiningUserTypeChunk> sorted = new ArrayList<>();
@@ -97,7 +97,7 @@ > jacquardSimilarity(sorted.get(0).getRoles(),
     public static List<MiningRoleTypeChunk> jaccardRoleBasedSorter(List<MiningRoleTypeChunk> dataPoints) {
 
         Handler handler = new Handler("Jaccard Sort", 1);
-        handler.setSubTitle("Sorting");
+        handler.enterNewStep("Sorting");
         handler.setActive(true);
 
         List<MiningRoleTypeChunk> sorted = new ArrayList<>();