Smart integration: add SCIM-specific field handling in BaseUrlConnectorStepPanel

Show scimBaseUrl and developmentMode fields for SCIM integration type,
and baseAddress for REST. Suggested URL is pre-filled into the correct
field based on integration type. Completion check and mandatory handling
updated accordingly. Fix reference to renamed BASE_ADDRESS_ITEM_NAME
in ConnectorDevelopmentWizardSummaryPanel.

Preserve non-SCIM processed documentation when refreshing SCIM docs;
refactor loadShadowsAsDocumentation to return one entry per shadow.

Author: jkamenicky

gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/impl/page/admin/connector/development/component/wizard/scimrest/connection/BaseUrlConnectorStepPanel.java

@@ -34,6 +34,7 @@
 import com.evolveum.midpoint.xml.ns._public.common.common_3.*;
 
 import org.apache.commons.lang3.StringUtils;
+import java.util.List;
 import org.apache.wicket.ajax.AjaxRequestTarget;
 import org.apache.wicket.behavior.AttributeAppender;
 import org.apache.wicket.markup.html.WebMarkupContainer;
@@ -51,7 +52,9 @@
 public class BaseUrlConnectorStepPanel extends AbstractFormWizardStepPanel<ConnectorDevelopmentDetailsModel> {
 
     private static final String PANEL_TYPE = "cdw-base-url";
-    public static final ItemName PROPERTY_ITEM_NAME = ItemName.from("", "baseAddress");
+    public static final ItemName BASE_ADDRESS_ITEM_NAME = ItemName.from("", "baseAddress");
+    public static final ItemName DEVELOPMENT_MODE_ITEM_NAME = ItemName.from("", "developmentMode");
+    public static final ItemName SCIM_BASE_URL_ITEM_NAME = ItemName.from("", "scimBaseUrl");
 
     private static final String ID_AI_ALERT = "aiAlert";
 
@@ -83,12 +86,14 @@ protected IModel<? extends PrismContainerWrapper> getContainerFormModel() {
     protected void onInitialize() {
         super.onInitialize();
         try {
-            PrismPropertyValueWrapper<Object> suggestedValue = getDetailsModel().getObjectWrapper().findProperty(
-                    ItemPath.create(ConnectorDevelopmentType.F_APPLICATION, ConnDevApplicationInfoType.F_BASE_API_ENDPOINT)).getValue();
-            if (StringUtils.isNotEmpty((String) suggestedValue.getRealValue())) {
-                PrismPropertyValueWrapper<String> configurationValue = (PrismPropertyValueWrapper<String>) getContainerFormModel().getObject().findProperty(PROPERTY_ITEM_NAME).getValue();
-                if (StringUtils.isEmpty(configurationValue.getRealValue())) {
-                    configurationValue.setRealValue((String) suggestedValue.getRealValue());
+            String suggestedUrl = (String) getDetailsModel().getObjectWrapper().findProperty(
+                    ItemPath.create(ConnectorDevelopmentType.F_APPLICATION, ConnDevApplicationInfoType.F_BASE_API_ENDPOINT))
+                    .getValue().getRealValue();
+            if (StringUtils.isNotEmpty(suggestedUrl)) {
+                ItemName urlField = isScim() ? SCIM_BASE_URL_ITEM_NAME : BASE_ADDRESS_ITEM_NAME;
+                PrismPropertyValueWrapper<String> fieldValue = (PrismPropertyValueWrapper<String>) getContainerFormModel().getObject().findProperty(urlField).getValue();
+                if (StringUtils.isEmpty(fieldValue.getRealValue())) {
+                    fieldValue.setRealValue(suggestedUrl);
                 }
             }
         } catch (SchemaException e) {
@@ -186,22 +191,48 @@ protected IModel<?> getSubTextModel() {
     }
 
     protected boolean checkMandatory(ItemWrapper wrapper) {
-        if (QNameUtil.match(wrapper.getItemName(), PROPERTY_ITEM_NAME)) {
-            return true;
+        if (isScim()) {
+            if (QNameUtil.match(wrapper.getItemName(), SCIM_BASE_URL_ITEM_NAME)) {
+                return true;
+            }
+        } else {
+            if (QNameUtil.match(wrapper.getItemName(), BASE_ADDRESS_ITEM_NAME)) {
+                return true;
+            }
         }
         return wrapper.isMandatory();
     }
 
     @Override
     protected ItemVisibilityHandler getVisibilityHandler() {
         return wrapper -> {
-            if (QNameUtil.match(wrapper.getItemName(), PROPERTY_ITEM_NAME)) {
-                return ItemVisibility.AUTO;
+            if (isScim()) {
+                if (scimItemNames().stream().anyMatch(name -> QNameUtil.match(wrapper.getItemName(), name))) {
+                    return ItemVisibility.AUTO;
+                }
+            } else {
+                if (QNameUtil.match(wrapper.getItemName(), BASE_ADDRESS_ITEM_NAME)) {
+                    return ItemVisibility.AUTO;
+                }
             }
             return ItemVisibility.HIDDEN;
         };
     }
 
+    private List<ItemName> scimItemNames() {
+        return List.of(SCIM_BASE_URL_ITEM_NAME, DEVELOPMENT_MODE_ITEM_NAME);
+    }
+
+    private boolean isScim() {
+        try {
+            PrismPropertyWrapper<ConnDevIntegrationType> integrationType = getDetailsModel().getObjectWrapper().findProperty(
+                    ItemPath.create(ConnectorDevelopmentType.F_CONNECTOR, ConnDevConnectorType.F_INTEGRATION_TYPE));
+            return ConnDevIntegrationType.SCIM.equals(integrationType.getValue().getRealValue());
+        } catch (SchemaException e) {
+            return false;
+        }
+    }
+
     @Override
     public String getStepId() {
         return PANEL_TYPE;
@@ -236,7 +267,8 @@ public boolean onNextPerformed(AjaxRequestTarget target) {
 
     @Override
     public boolean isCompleted() {
+        ItemName fieldToCheck = isScim() ? SCIM_BASE_URL_ITEM_NAME : BASE_ADDRESS_ITEM_NAME;
         return ConnectorDevelopmentWizardUtil.existTestingResourcePropertyValue(
-                getDetailsModel(), getPanelType(), PROPERTY_ITEM_NAME);
+                getDetailsModel(), getPanelType(), fieldToCheck);
     }
 }

gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/impl/page/admin/connector/development/component/wizard/summary/ConnectorDevelopmentWizardSummaryPanel.java

@@ -255,7 +255,7 @@ protected StringValuesWidgetDetailsDto load() {
                 values.put(
                         createStringResource("ConnectorDevelopmentWizardSummaryPanel.baseUrl"),
                         defineValueModel((String) ConnectorDevelopmentWizardUtil.getTestingResourcePropertyValue(
-                                detailsModel, null, BaseUrlConnectorStepPanel.PROPERTY_ITEM_NAME)));
+                                detailsModel, null, BaseUrlConnectorStepPanel.BASE_ADDRESS_ITEM_NAME)));
                 values.put(
                         createStringResource("ConnectorDevelopmentWizardSummaryPanel.testEndpoint"),
                         defineValueModel((String) ConnectorDevelopmentWizardUtil.getTestingResourcePropertyValue(

model/smart-impl/src/main/java/com/evolveum/midpoint/smart/impl/conndev/ScimBackend.java

@@ -14,6 +14,7 @@
 import com.evolveum.midpoint.xml.ns._public.common.common_3.ConnDevDocumentationSourceType;
 import com.fasterxml.jackson.databind.ObjectMapper;
 import com.evolveum.midpoint.xml.ns._public.common.common_3.ConnectorDevelopmentType;
+import com.evolveum.midpoint.xml.ns._public.common.common_3.ProcessedDocumentationType;
 import com.evolveum.midpoint.xml.ns._public.common.common_3.ResourceType;
 import com.evolveum.midpoint.xml.ns._public.common.common_3.ShadowType;
 
@@ -28,8 +29,7 @@ public class ScimBackend extends RestBackend {
 
     private static final Trace LOGGER = TraceManager.getTrace(ScimBackend.class);
 
-    private static final String SCIM_SCHEMA_OBJECT_CLASS = "conndev_ScimSchema";
-    private static final String SCIM_RESOURCE_OBJECT_CLASS = "conndev_ScimResource";
+    private static final List<String> SCIM_OBJECT_CLASSES = List.of("conndev_ScimSchema", "conndev_ScimResource");
 
     public ScimBackend(ConnDevBeans beans, ConnectorDevelopmentType connDev, Task task, OperationResult result) {
         super(beans, connDev, task, result);
@@ -59,22 +59,32 @@ private void refreshScimDocumentation() throws SchemaException, ExpressionEvalua
         ResourceUtils.deleteSchema(testingResourceOid, beans.modelService, task, result);
         beans.provisioningService.testResource(testingResourceOid, task, result);
 
-        var docs = Stream.of(SCIM_SCHEMA_OBJECT_CLASS, SCIM_RESOURCE_OBJECT_CLASS)
-                .map(objectClass -> loadShadowsAsDocumentation(testingResourceOid, objectClass))
-                .filter(Objects::nonNull)
+        var newScimDocs = SCIM_OBJECT_CLASSES
+                .stream()
+                .flatMap(objectClass -> loadShadowsAsDocumentation(testingResourceOid, objectClass).stream())
                 .map(ProcessedDocumentation::toBean)
                 .toList();
 
+        var mergedDocs = new ArrayList<>(
+                developmentObject()
+                        .getProcessedDocumentation()
+                        .stream()
+                        .filter(d -> SCIM_OBJECT_CLASSES.stream().noneMatch(c -> d.getUri().startsWith(c)))
+                        .map(ProcessedDocumentationType::clone)
+                        .toList()
+        );
+        mergedDocs.addAll(newScimDocs);
+
         var delta = PrismContext.get().deltaFor(ConnectorDevelopmentType.class)
                 .item(ConnectorDevelopmentType.F_PROCESSED_DOCUMENTATION)
-                .replaceRealValues(docs)
+                .replaceRealValues(mergedDocs)
                 .<ConnectorDevelopmentType>asObjectDelta(developmentObject().getOid());
         beans.modelService.executeChanges(List.of(delta), null, task, result);
         reload();
         ensureDocumentationIsUploaded(client().synchronizationClient());
     }
 
-    private ProcessedDocumentation loadShadowsAsDocumentation(String resourceOid, String objectClassLocalName) {
+    private List<ProcessedDocumentation> loadShadowsAsDocumentation(String resourceOid, String objectClassLocalName) {
         try {
             var objectClass = new QName(SchemaConstants.NS_RI, objectClassLocalName);
             var query = PrismContext.get().queryFor(ShadowType.class)
@@ -85,24 +95,25 @@ private ProcessedDocumentation loadShadowsAsDocumentation(String resourceOid, St
             var shadows = beans.provisioningService.searchObjects(ShadowType.class, query, null, task, result);
             if (shadows.isEmpty()) {
                 LOGGER.warn("No shadows found for object class {} on resource {}", objectClassLocalName, resourceOid);
-                return null;
+                return List.of();
             }
 
-            LOGGER.info("Loaded {} shadow(s) for {}", shadows.size(), objectClassLocalName);
             var serializer = PrismContext.get().jsonSerializer();
             var mapper = new ObjectMapper();
-            var schemas = new ArrayList<String>();
+            var docs = new ArrayList<ProcessedDocumentation>();
             for (var shadow : shadows) {
                 var attrs = shadow.findContainer(ShadowType.F_ATTRIBUTES);
                 if (attrs != null && !attrs.isEmpty()) {
                     var json = serializer.serialize(attrs.getValue());
-                    schemas.add(mapper.readTree(json).get("attributes").toString());
+                    var parsedAttrs = mapper.readTree(json).get("attributes");
+                    var nameNode = parsedAttrs.get("name");
+                    var name = nameNode != null ? nameNode.asText() : shadow.getOid();
+                    var doc = new ProcessedDocumentation(UUID.randomUUID().toString(), objectClassLocalName + "_" + name);
+                    doc.write(parsedAttrs.toString());
+                    docs.add(doc);
                 }
             }
-            var serialized = "{\"schemas\":[" + String.join(",", schemas) + "]}";
-            var doc = new ProcessedDocumentation(UUID.randomUUID().toString(), objectClassLocalName);
-            doc.write(serialized);
-            return doc;
+            return docs;
         } catch (Exception e) {
             throw new SystemException("Could not load shadow documentation for " + objectClassLocalName, e);
         }