Merge branch 'feature/ninja-audit' into support-4.4

Evolveum · Dec 4, 2021 · b8bb174 · b8bb174
2 parents 8b1799a + 0b9149f
commit b8bb174
Show file tree

Hide file tree

Showing 29 changed files with 762 additions and 359 deletions.
diff --git a/gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/api/page/PageBase.java b/gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/api/page/PageBase.java
@@ -1056,7 +1056,7 @@ private VisibleEnableBehaviour getShoppingCartVisibleBehavior() {
             public boolean isVisible() {
                 return !isErrorPage() && isSideMenuVisible() &&
                         (WebComponentUtil.isAuthorized(AuthorizationConstants.AUTZ_UI_SELF_REQUESTS_ASSIGNMENTS_URL, PageSelf.AUTH_SELF_ALL_URI)
-                        && getSessionStorage().getRoleCatalog().getAssignmentShoppingCart().size() > 0);
+                                && getSessionStorage().getRoleCatalog().getAssignmentShoppingCart().size() > 0);
             }
         };
     }
@@ -1454,7 +1454,7 @@ public <T> void parseObject(String lexicalRepresentation, final Holder<T> object
         if (isListOfObjects) {
             objectHolder.setValue((T) list);
         }
-        EventHandler handler = new EventHandler() {
+        EventHandler<PrismObject<Objectable>, Objectable> handler = new EventHandler<>() {
 
             @Override
             public EventResult preMarshall(Element objectElement, Node postValidationTree,
@@ -1463,8 +1463,8 @@ public EventResult preMarshall(Element objectElement, Node postValidationTree,
             }
 
             @Override
-            public <O extends Objectable> EventResult postMarshall(PrismObject<O> object, Element objectElement,
-                    OperationResult objectResult) {
+            public EventResult postMarshall(
+                    PrismObject<Objectable> object, Element objectElement, OperationResult objectResult) {
                 if (isListOfObjects) {
                     list.add(object);
                 } else {

diff --git a/infra/common/src/main/java/com/evolveum/midpoint/common/validator/EventHandler.java b/infra/common/src/main/java/com/evolveum/midpoint/common/validator/EventHandler.java
@@ -1,19 +1,19 @@
 /*
- * Copyright (c) 2010-2013 Evolveum and contributors
+ * Copyright (C) 2010-2021 Evolveum and contributors
  *
  * This work is dual-licensed under the Apache License 2.0
  * and European Union Public License. See LICENSE file for details.
  */
 
 package com.evolveum.midpoint.common.validator;
 
-import com.evolveum.midpoint.prism.Objectable;
-import com.evolveum.midpoint.prism.PrismObject;
-import com.evolveum.midpoint.schema.result.OperationResult;
-
 import org.w3c.dom.Element;
 import org.w3c.dom.Node;
 
+import com.evolveum.midpoint.prism.Containerable;
+import com.evolveum.midpoint.prism.PrismContainer;
+import com.evolveum.midpoint.schema.result.OperationResult;
+
 /**
  * Set of callback methods used to convey information from the validator to the "working" code.
  *
@@ -23,7 +23,7 @@
  *
  * @author Radovan Semancik
  */
-public interface EventHandler {
+public interface EventHandler<T extends PrismContainer<C>, C extends Containerable> {
 
     /**
      * Call-back called after deserializing to DOM and static schema validation but before unmarshal to JAXB.
@@ -47,16 +47,14 @@ public interface EventHandler {
      * @param objectResult Operation result for this object
      * @return true if the process should continue, false if it should stop
      */
-    <T extends Objectable> EventResult postMarshall(PrismObject<T> object, Element objectElement, OperationResult objectResult);
+    EventResult postMarshall(T object, Element objectElement, OperationResult objectResult);
 
     /**
      * Call-back to handle global errors.
      *
      * This callback will be called with any error that cannot be attributed to any particular object.
      *
      * @param currentResult Operation result pointing to the particular error.
-     * @return true if the process should continue, false if it should stop
      */
     void handleGlobalError(OperationResult currentResult);
-
 }
diff --git a/infra/common/src/test/java/com/evolveum/midpoint/validator/test/BasicValidatorTest.java b/infra/common/src/test/java/com/evolveum/midpoint/validator/test/BasicValidatorTest.java
@@ -1,10 +1,9 @@
 /*
- * Copyright (c) 2010-2013 Evolveum and contributors
+ * Copyright (C) 2010-2021 Evolveum and contributors
  *
  * This work is dual-licensed under the Apache License 2.0
  * and European Union Public License. See LICENSE file for details.
  */
-
 package com.evolveum.midpoint.validator.test;
 
 import static org.testng.AssertJUnit.*;
@@ -61,7 +60,7 @@ public void setup() throws SchemaException, SAXException, IOException {
     @Test
     public void resource1Valid() throws Exception {
         OperationResult result = createOperationResult();
-        EventHandler handler = new EventHandler() {
+        EventHandler<PrismObject<Objectable>, Objectable> handler = new EventHandler<>() {
 
             @Override
             public EventResult preMarshall(Element objectElement, Node postValidationTree,
@@ -70,16 +69,17 @@ public EventResult preMarshall(Element objectElement, Node postValidationTree,
             }
 
             @Override
-            public <T extends Objectable> EventResult postMarshall(PrismObject<T> object, Element objectElement,
-                    OperationResult objectResult) {
+            public EventResult postMarshall(
+                    PrismObject<Objectable> object, Element objectElement, OperationResult objectResult) {
                 displayDumpable("Validating resource:", object);
                 object.checkConsistence();
 
                 PrismContainer<?> extensionContainer = object.getExtension();
-                PrismProperty<Integer> menProp = extensionContainer.findProperty(new ItemName("http://myself.me/schemas/whatever", "menOnChest"));
+                PrismProperty<Integer> menProp = extensionContainer.findProperty(
+                        new ItemName("http://myself.me/schemas/whatever", "menOnChest"));
                 assertNotNull("No men on a dead man chest!", menProp);
                 assertEquals("Wrong number of men on a dead man chest", (Integer) 15, menProp.getAnyRealValue());
-                PrismPropertyDefinition menPropDef = menProp.getDefinition();
+                PrismPropertyDefinition<?> menPropDef = menProp.getDefinition();
                 assertNotNull("Men on a dead man chest NOT defined", menPropDef);
                 assertEquals("Wrong type for men on a dead man chest definition", DOMUtil.XSD_INT, menPropDef.getTypeName());
                 assertTrue("Men on a dead man chest definition not dynamic", menPropDef.isDynamic());
@@ -103,16 +103,16 @@ public void handlerTest() throws Exception {
         final List<String> postMarshallHandledOids = new ArrayList<>();
         final List<String> preMarshallHandledOids = new ArrayList<>();
 
-        EventHandler handler = new EventHandler() {
-
+        EventHandler<PrismObject<Objectable>, Objectable> handler = new EventHandler<>() {
             @Override
             public EventResult preMarshall(Element objectElement, Node postValidationTree, OperationResult objectResult) {
                 preMarshallHandledOids.add(objectElement.getAttribute("oid"));
                 return EventResult.cont();
             }
 
             @Override
-            public <T extends Objectable> EventResult postMarshall(PrismObject<T> object, Element objectElement, OperationResult objectResult) {
+            public EventResult postMarshall(
+                    PrismObject<Objectable> object, Element objectElement, OperationResult objectResult) {
                 displayDumpable("Handler processing " + object + ", result:", objectResult);
                 postMarshallHandledOids.add(object.getOid());
                 return EventResult.cont();
@@ -215,10 +215,10 @@ public void noName() throws Exception {
     }
 
     private void validateFile(String filename, OperationResult result) throws FileNotFoundException {
-        validateFile(filename, (EventHandler) null, result);
+        validateFile(filename, (EventHandler<?, ?>) null, result);
     }
 
-    private void validateFile(String filename, EventHandler handler, OperationResult result) throws FileNotFoundException {
+    private void validateFile(String filename, EventHandler<?, ?> handler, OperationResult result) throws FileNotFoundException {
         LegacyValidator validator = new LegacyValidator(PrismTestUtil.getPrismContext());
         if (handler != null) {
             validator.setHandler(handler);