Merge branch 'post-3.8-fixes' of https://github.com/Evolveum/midpoint …

…into post-3.8-fixes
Evolveum · Jun 12, 2018 · ba852fb · ba852fb
2 parents 863441e + b0b0a15
commit ba852fb
Show file tree

Hide file tree

Showing 3 changed files with 138 additions and 184 deletions.
diff --git a/...n-gui/src/main/java/com/evolveum/midpoint/web/page/admin/reports/PageAuditLogDetails.java b/...n-gui/src/main/java/com/evolveum/midpoint/web/page/admin/reports/PageAuditLogDetails.java
@@ -161,17 +161,15 @@ private void initLayout(){
         initLayoutBackButton();
     }
 
-    private void initAuditLogHistoryPanel(WebMarkupContainer eventPanel){
-        AuditEventRecordProvider provider = new AuditEventRecordProvider(PageAuditLogDetails.this){
-            private static final long serialVersionUID = 1L;
-
-            public Map<String, Object> getParameters() {
-                Map<String, Object> parameters = new HashMap<>();
-                parameters.put(AuditEventRecordProvider.PARAMETER_TASK_IDENTIFIER, recordModel.getObject().getTaskIdentifier());
-                return parameters;
-            }
-        };
-
+	public Map<String, Object> getAuditEventRecordProviderParameters() {
+		Map<String, Object> parameters = new HashMap<>();
+		parameters.put(AuditEventRecordProvider.PARAMETER_TASK_IDENTIFIER, recordModel.getObject().getTaskIdentifier());
+		return parameters;
+	}
+
+	private void initAuditLogHistoryPanel(WebMarkupContainer eventPanel) {
+        AuditEventRecordProvider provider = new AuditEventRecordProvider(PageAuditLogDetails.this, null,
+		        this::getAuditEventRecordProviderParameters);
 
         BoxedTablePanel<AuditEventRecordType> table = new BoxedTablePanel<AuditEventRecordType>(
                 ID_HISTORY_PANEL, provider, initColumns(), UserProfileStorage.TableId.TASK_EVENTS_TABLE, TASK_EVENTS_TABLE_SIZE) {

diff --git a/...main/java/com/evolveum/midpoint/web/page/admin/reports/component/AuditLogViewerPanel.java b/...main/java/com/evolveum/midpoint/web/page/admin/reports/component/AuditLogViewerPanel.java
@@ -370,59 +370,60 @@ public boolean isVisible() {
     		(Function<ObjectType, String> & Serializable) (ObjectType o) ->
         		o.getName().getOrig();
 
-	private void initAuditLogViewerTable(Form mainForm) {
-        AuditEventRecordProvider provider = new AuditEventRecordProvider(AuditLogViewerPanel.this) {
-            private static final long serialVersionUID = 1L;
+    private Map<String, Object> getAuditEventProviderParameters() {
+        Map<String, Object> parameters = new HashMap<>();
 
-            public Map<String, Object> getParameters() {
-                Map<String, Object> parameters = new HashMap<>();
+        AuditSearchDto search = AuditLogViewerPanel.this.getModelObject();
+        parameters.put(AuditEventRecordProvider.PARAMETER_FROM, search.getFrom());
+        parameters.put(AuditEventRecordProvider.PARAMETER_TO, search.getTo());
 
-                AuditSearchDto search = AuditLogViewerPanel.this.getModelObject();
-                parameters.put(AuditEventRecordProvider.PARAMETER_FROM, search.getFrom());
-                parameters.put(AuditEventRecordProvider.PARAMETER_TO, search.getTo());
+        if (search.getChannel() != null) {
+            parameters.put(AuditEventRecordProvider.PARAMETER_CHANNEL, QNameUtil.qNameToUri(search.getChannel()));
+        }
+        parameters.put(AuditEventRecordProvider.PARAMETER_HOST_IDENTIFIER, search.getHostIdentifier());
 
-                if (search.getChannel() != null) {
-                    parameters.put(AuditEventRecordProvider.PARAMETER_CHANNEL, QNameUtil.qNameToUri(search.getChannel()));
-                }
-                parameters.put(AuditEventRecordProvider.PARAMETER_HOST_IDENTIFIER, search.getHostIdentifier());
+        if (search.getInitiatorName() != null) {
+            parameters.put(AuditEventRecordProvider.PARAMETER_INITIATOR_NAME, search.getInitiatorName().getOid());
+        }
 
-                if (search.getInitiatorName() != null) {
-                    parameters.put(AuditEventRecordProvider.PARAMETER_INITIATOR_NAME, search.getInitiatorName().getOid());
-                }
+        if (search.getTargetOwnerName() != null) {
+            parameters.put(AuditEventRecordProvider.PARAMETER_TARGET_OWNER_NAME, search.getTargetOwnerName().getOid());
+        }
+        List<String> targetOids = new ArrayList<>();
+        if (isNotEmpty(search.getTargetNamesObjects())) {
+            targetOids.addAll(search.getTargetNamesObjects().stream()
+                    .map(ObjectType::getOid)
+                    .collect(toList()));
+        }
+        if (isNotEmpty(search.getTargetNames())) {
+            targetOids.addAll(search.getTargetNames().stream()
+                    .map(ObjectReferenceType::getOid)
+                    .collect(toList()));
+        }
+        if (!targetOids.isEmpty()) {
+            parameters.put(AuditEventRecordProvider.PARAMETER_TARGET_NAMES, targetOids);
+        }
+        if (search.getChangedItem().toItemPath() != null) {
+            ItemPath itemPath = search.getChangedItem().toItemPath();
+            parameters.put(AuditEventRecordProvider.PARAMETER_CHANGED_ITEM, CanonicalItemPath.create(itemPath).asString());
+        }
+        parameters.put(AuditEventRecordProvider.PARAMETER_EVENT_TYPE, search.getEventType());
+        parameters.put(AuditEventRecordProvider.PARAMETER_EVENT_STAGE, search.getEventStage());
+        parameters.put(AuditEventRecordProvider.PARAMETER_OUTCOME, search.getOutcome());
+        if (isNotEmpty(search.getvalueRefTargetNames())) {
+            parameters.put(AuditEventRecordProvider.PARAMETER_VALUE_REF_TARGET_NAMES,
+                    search.getvalueRefTargetNames().stream()
+                            .map(ObjectType::getName)
+                            .map(PolyStringType::getOrig)
+                            .collect(toList()));
+        }
+        return parameters;
+    }
 
-                if (search.getTargetOwnerName() != null) {
-                    parameters.put(AuditEventRecordProvider.PARAMETER_TARGET_OWNER_NAME, search.getTargetOwnerName().getOid());
-                }
-                List<String> targetOids = new ArrayList<>();
-                if (isNotEmpty(search.getTargetNamesObjects())) {
-                    targetOids.addAll(search.getTargetNamesObjects().stream()
-                    		.map(ObjectType::getOid)
-                    		.collect(toList()));
-                }
-                if (isNotEmpty(search.getTargetNames())) {
-                    targetOids.addAll(search.getTargetNames().stream()
-                    		.map(ObjectReferenceType::getOid)
-                    		.collect(toList()));
-                }
-                if (!targetOids.isEmpty()) {
-    				parameters.put(AuditEventRecordProvider.PARAMETER_TARGET_NAMES, targetOids);
-                }
-                if (search.getChangedItem().toItemPath() != null) {
-                	ItemPath itemPath = search.getChangedItem().toItemPath();
-                	parameters.put(AuditEventRecordProvider.PARAMETER_CHANGED_ITEM, CanonicalItemPath.create(itemPath).asString());
-                }
-                parameters.put(AuditEventRecordProvider.PARAMETER_EVENT_TYPE, search.getEventType());
-                parameters.put(AuditEventRecordProvider.PARAMETER_EVENT_STAGE, search.getEventStage());
-                parameters.put(AuditEventRecordProvider.PARAMETER_OUTCOME, search.getOutcome());
-                if (isNotEmpty(search.getvalueRefTargetNames())) {
-	                parameters.put(AuditEventRecordProvider.PARAMETER_VALUE_REF_TARGET_NAMES,
-	                		search.getvalueRefTargetNames().stream()
-	                		.map(ObjectType::getName)
-	                		.map(PolyStringType::getOrig)
-	                		.collect(toList()));
-                }
-                return parameters;
-            }
+    private void initAuditLogViewerTable(Form mainForm) {
+        AuditEventRecordProvider provider = new AuditEventRecordProvider(AuditLogViewerPanel.this, null,
+                this::getAuditEventProviderParameters) {
+            private static final long serialVersionUID = 1L;
 
             @Override
             protected void saveCurrentPage(long from, long count) {