cleanup action now checks unnamed mappings and mutlivalue refs withou…

…t oid. also
Evolveum · Apr 10, 2024 · a2b7cd4 · a2b7cd4
1 parent 5caa31b
commit a2b7cd4
Show file tree

Hide file tree

Showing 3 changed files with 57 additions and 1 deletion.
diff --git a/...o-idea-plugin/src/main/java/com/evolveum/midpoint/studio/action/task/CleanupFileTask.java b/...o-idea-plugin/src/main/java/com/evolveum/midpoint/studio/action/task/CleanupFileTask.java
@@ -148,7 +148,7 @@ private String cleanupObject(MidPointObject object) {
             processor.setHandler(handler);
 
             for (PrismObject<? extends ObjectType> obj : clonedObjects) {
-                CleanupResult result = processor.process(obj, Source.of(object.getFile(), object.getContent()));
+                CleanupResult result = processor.process(obj);
 
                 updateMissingReferencesSummary(object, result.getMessages());
 

diff --git a/...gin/src/main/java/com/evolveum/midpoint/studio/impl/lang/annotation/MappingAnnotator.java b/...gin/src/main/java/com/evolveum/midpoint/studio/impl/lang/annotation/MappingAnnotator.java
@@ -0,0 +1,54 @@
+package com.evolveum.midpoint.studio.impl.lang.annotation;
+
+import com.evolveum.midpoint.studio.util.MidPointUtils;
+import com.evolveum.midpoint.studio.util.PsiUtils;
+import com.evolveum.midpoint.xml.ns._public.common.common_3.MappingType;
+import com.intellij.lang.annotation.AnnotationHolder;
+import com.intellij.lang.annotation.Annotator;
+import com.intellij.lang.annotation.HighlightSeverity;
+import com.intellij.openapi.project.Project;
+import com.intellij.psi.PsiElement;
+import com.intellij.psi.xml.XmlTag;
+import org.apache.commons.lang3.StringUtils;
+import org.jetbrains.annotations.NotNull;
+
+import javax.xml.namespace.QName;
+
+public class MappingAnnotator implements Annotator, MidPointAnnotator {
+
+    private static final String MESSAGE =
+            "Mapping doesn't have name defined.";
+
+    @Override
+    public void annotate(@NotNull PsiElement element, @NotNull AnnotationHolder holder) {
+        Project project = element.getProject();
+        if (!MidPointUtils.hasMidPointFacet(project)) {
+            return;
+        }
+
+        XmlTag mapping = getMappingTypeTag(element);
+        if (mapping == null) {
+            return;
+        }
+
+        XmlTag name = MidPointUtils.findSubTag(mapping, MappingType.F_NAME);
+        if (name != null && StringUtils.isNotEmpty(name.getValue().getText())) {
+            return;
+        }
+
+        createTagAnnotations(mapping, holder, HighlightSeverity.WARNING, MESSAGE, null);
+    }
+
+    private XmlTag getMappingTypeTag(PsiElement element) {
+        if (!(element instanceof XmlTag tag)) {
+            return null;
+        }
+
+        QName type = PsiUtils.getTagXsdType(tag);
+        if (type == null || !MappingType.COMPLEX_TYPE.equals(type)) {
+            return null;
+        }
+
+        return tag;
+    }
+}
diff --git a/studio-idea-plugin/src/main/resources/META-INF/plugin.xml b/studio-idea-plugin/src/main/resources/META-INF/plugin.xml
@@ -230,6 +230,8 @@
                    implementationClass="com.evolveum.midpoint.studio.impl.lang.annotation.ShadowRefAnnotator"/>
         <annotator language="XML"
                    implementationClass="com.evolveum.midpoint.studio.impl.lang.intention.ProtectedStringAnnotatorIntention"/>
+        <annotator language="XML"
+                   implementationClass="com.evolveum.midpoint.studio.impl.lang.annotation.MappingAnnotator"/>
 
         <completion.contributor language="XML"
                                 implementationClass="com.evolveum.midpoint.studio.impl.lang.codeInsight.MidPointCompletionContributor"/>