Merge remote-tracking branch 'refs/remotes/origin/master'

Evolveum · Feb 26, 2021 · 0c1c30c · 0c1c30c
2 parents eaede7a + 4902eb2
commit 0c1c30c
Show file tree

Hide file tree

Showing 8 changed files with 13 additions and 103 deletions.
diff --git a/...a/schema/src/main/java/com/evolveum/midpoint/schema/statistics/ProvisioningOperation.java b/...a/schema/src/main/java/com/evolveum/midpoint/schema/statistics/ProvisioningOperation.java
@@ -12,7 +12,7 @@
 import java.util.Arrays;
 
 /**
- *
+ * TODO reconsider usefulness of this class
  */
 public enum ProvisioningOperation {
 
@@ -38,4 +38,8 @@ public static ProvisioningOperation find(String name) {
                 .findFirst()
                 .orElse(null);
     }
+
+    public String getName() {
+        return name;
+    }
 }
diff --git a/.../schema/src/main/java/com/evolveum/midpoint/schema/statistics/ProvisioningStatistics.java b/.../schema/src/main/java/com/evolveum/midpoint/schema/statistics/ProvisioningStatistics.java
@@ -70,7 +70,7 @@ public synchronized void recordProvisioningOperation(String resourceOid, String
                 .resourceRef(resourceRef)
                 .objectClass(objectClassName)
                 .beginOperation()
-                .operation(operation.name())
+                .operation(operation.getName())
                    .status(success ? OperationResultStatusType.SUCCESS : OperationResultStatusType.FATAL_ERROR)
                     .count(count)
                     .totalTime(duration)

diff --git a/...ema/src/main/java/com/evolveum/midpoint/schema/statistics/ProvisioningStatisticsData.java b/...ema/src/main/java/com/evolveum/midpoint/schema/statistics/ProvisioningStatisticsData.java
diff --git a/...hema/src/main/java/com/evolveum/midpoint/schema/statistics/ProvisioningStatisticsKey.java b/...hema/src/main/java/com/evolveum/midpoint/schema/statistics/ProvisioningStatisticsKey.java
diff --git a/infra/schema/src/main/java/com/evolveum/midpoint/schema/statistics/StatisticsCollector.java b/infra/schema/src/main/java/com/evolveum/midpoint/schema/statistics/StatisticsCollector.java
@@ -36,7 +36,8 @@ public interface StatisticsCollector {
 
     void recordState(String message);
 
-    void recordProvisioningOperation(String resourceOid, String resourceName, QName objectClassName, ProvisioningOperation operation, boolean success, int count, long duration);
+    void recordProvisioningOperation(String resourceOid, String resourceName, QName objectClassName,
+            ProvisioningOperation operation, boolean success, int count, long duration);
 
     void recordNotificationOperation(String transportName, boolean success, long duration);
 

diff --git a/...c/test/java/com/evolveum/midpoint/model/intest/sync/AbstractSynchronizationStoryTest.java b/...c/test/java/com/evolveum/midpoint/model/intest/sync/AbstractSynchronizationStoryTest.java
@@ -166,7 +166,7 @@ public void test110AddDummyGreenAccountMancomb() throws Exception {
             assertThat(provisioningStatistics.getEntry()).hasSize(1);
             assertThat(provisioningStatistics.getEntry().get(0).getResourceRef().getOid()).isEqualTo(RESOURCE_DUMMY_GREEN_OID);
             assertThat(getOrig(provisioningStatistics.getEntry().get(0).getResourceRef().getTargetName())).isEqualTo("Dummy Resource Green");
-            assertThat(provisioningStatistics.getEntry().get(0).getOperation()).hasSize(2); // get + search
+            assertThat(provisioningStatistics.getEntry().get(0).getOperation()).isNotEmpty(); // search and sometimes get
         }
 
         // notifications

diff --git a/repo/task-api/src/main/java/com/evolveum/midpoint/task/api/StateReporter.java b/repo/task-api/src/main/java/com/evolveum/midpoint/task/api/StateReporter.java
@@ -161,7 +161,8 @@ public void recordIcfOperationEnd(ProvisioningOperation operation, ObjectClassCo
     }
 
     private void reportNoTask(String resourceOid, ProvisioningOperation operation) {
-        LOGGER.warn("Couldn't report execution of ICF operation {} on resource {} because there is no task assigned.", operation, resourceOid);
+        LOGGER.warn("Couldn't report execution of ICF operation {} on resource {} because there is no task assigned.",
+                operation, resourceOid);
     }
 
     private void recordState(String message) {

diff --git a/repo/task-api/src/main/java/com/evolveum/midpoint/task/api/test/NullTaskImpl.java b/repo/task-api/src/main/java/com/evolveum/midpoint/task/api/test/NullTaskImpl.java
@@ -544,7 +544,8 @@ public void recordState(String message) {
     }
 
     @Override
-    public void recordProvisioningOperation(String resourceOid, String resourceName, QName objectClassName, ProvisioningOperation operation, boolean success, int count, long duration) {
+    public void recordProvisioningOperation(String resourceOid, String resourceName, QName objectClassName,
+            ProvisioningOperation operation, boolean success, int count, long duration) {
     }
 
     @Override