Do after-merge fixes

Related to MID-2119 (shadow caching).
Evolveum · Jan 8, 2024 · d11177f · d11177f
1 parent 2aa298f
commit d11177f
Show file tree

Hide file tree

Showing 3 changed files with 21 additions and 10 deletions.
diff --git a/...common/src/test/java/com/evolveum/midpoint/common/cleanup/CleanupActionProcessorTest.java b/...common/src/test/java/com/evolveum/midpoint/common/cleanup/CleanupActionProcessorTest.java
@@ -39,7 +39,7 @@ public class CleanupActionProcessorTest extends AbstractUnitTest {
 
     @BeforeSuite
     public void setup() throws SchemaException, SAXException, IOException {
-        PrettyPrinter.setDefaultNamespacePrefix(MidPointConstants.NS_MIDPOINT_PUBLIC_PREFIX);
+        PrettyPrinter.addDefaultNamespacePrefix(MidPointConstants.NS_MIDPOINT_PUBLIC_PREFIX);
         PrismTestUtil.resetPrismContext(MidPointPrismContextFactory.FACTORY);
         SchemaDebugUtil.initialize(); // Make sure the pretty printer is activated
     }

diff --git a/...com/evolveum/midpoint/schema/processor/NormalizationAwareResourceAttributeDefinition.java b/...com/evolveum/midpoint/schema/processor/NormalizationAwareResourceAttributeDefinition.java
@@ -278,6 +278,21 @@ public boolean isOperational() {
         return originalDefinition.isOperational();
     }
 
+    @Override
+    public boolean isAlwaysUseForEquals() {
+        return originalDefinition.isAlwaysUseForEquals();
+    }
+
+    @Override
+    public boolean isOptionalCleanup() {
+        return originalDefinition.isOptionalCleanup();
+    }
+
+    @Override
+    public DisplayHint getDisplayHint() {
+        return originalDefinition.getDisplayHint();
+    }
+
     @Override
     public boolean isIndexOnly() {
         return originalDefinition.isIndexOnly();

diff --git a/...src/main/java/com/evolveum/midpoint/schema/processor/ResourceAttributeDefinitionImpl.java b/...src/main/java/com/evolveum/midpoint/schema/processor/ResourceAttributeDefinitionImpl.java
@@ -29,15 +29,6 @@
 import com.evolveum.midpoint.prism.path.ItemName;
 import com.evolveum.midpoint.prism.path.ItemPath;
 import com.evolveum.midpoint.prism.util.CloneUtil;
-import com.evolveum.midpoint.util.MiscUtil;
-import com.evolveum.midpoint.util.PrettyPrinter;
-
-import com.evolveum.midpoint.util.exception.SystemException;
-
-import org.apache.commons.lang3.StringUtils;
-import org.jetbrains.annotations.NotNull;
-import org.jetbrains.annotations.Nullable;
-
 import com.evolveum.midpoint.prism.util.DefinitionUtil;
 import com.evolveum.midpoint.schema.util.MiscSchemaUtil;
 import com.evolveum.midpoint.util.DebugUtil;
@@ -956,4 +947,9 @@ public boolean hasRefinements() {
     public void accept(Visitor<Definition> visitor) {
         rawDefinition.accept(visitor);
     }
+
+    @Override
+    public boolean isOptionalCleanup() {
+        return false; // TODO is this ok?
+    }
 }