Split SchemaTransformer to smaller parts

Evolveum · Jun 7, 2023 · df63b46 · df63b46
1 parent c5a285a
commit df63b46
Show file tree

Hide file tree

Showing 7 changed files with 525 additions and 392 deletions.
diff --git a/infra/schema/src/main/java/com/evolveum/midpoint/schema/ParsedGetOperationOptions.java b/infra/schema/src/main/java/com/evolveum/midpoint/schema/ParsedGetOperationOptions.java
@@ -92,4 +92,16 @@ public Map<DefinitionProcessingOption, PathSet> getDefinitionProcessingMap() {
                 GetOperationOptions.getDefinitionUpdate(getRootOptions()),
                 DefinitionUpdateOption.NONE); // temporary default (for experiments)
     }
+
+    public boolean isRaw() {
+        return GetOperationOptions.isRaw(getRootOptions());
+    }
+
+    public boolean isTolerateRawData() {
+        return GetOperationOptions.isTolerateRawData(getRootOptions());
+    }
+
+    public boolean isExecutionPhase() {
+        return GetOperationOptions.isExecutionPhase(getRootOptions());
+    }
 }
diff --git a/...rc/main/java/com/evolveum/midpoint/model/impl/controller/ModelInteractionServiceImpl.java b/...rc/main/java/com/evolveum/midpoint/model/impl/controller/ModelInteractionServiceImpl.java
@@ -403,22 +403,19 @@ public ResourceObjectDefinition getEditObjectClassDefinition(
 //        }
 
         AuthorizationDecisionType attributesReadDecision =
-                schemaTransformer.computeItemDecision(
-                        securityConstraints,
+                securityConstraints.computeItemDecision(
                         SchemaConstants.PATH_ATTRIBUTES,
                         ModelAuthorizationAction.AUTZ_ACTIONS_URLS_GET,
                         securityConstraints.findAllItemsDecision(ModelAuthorizationAction.AUTZ_ACTIONS_URLS_GET, phase),
                         phase);
         AuthorizationDecisionType attributesAddDecision =
-                schemaTransformer.computeItemDecision(
-                        securityConstraints,
+                securityConstraints.computeItemDecision(
                         SchemaConstants.PATH_ATTRIBUTES,
                         ModelAuthorizationAction.AUTZ_ACTIONS_URLS_ADD,
                         securityConstraints.findAllItemsDecision(ModelAuthorizationAction.ADD.getUrl(), phase),
                         phase);
         AuthorizationDecisionType attributesModifyDecision =
-                schemaTransformer.computeItemDecision(
-                        securityConstraints,
+                securityConstraints.computeItemDecision(
                         SchemaConstants.PATH_ATTRIBUTES,
                         ModelAuthorizationAction.AUTZ_ACTIONS_URLS_MODIFY,
                         securityConstraints.findAllItemsDecision(ModelAuthorizationAction.MODIFY.getUrl(), phase),
@@ -437,14 +434,14 @@ public ResourceObjectDefinition getEditObjectClassDefinition(
         for (ResourceAttributeDefinition<?> rAttrDef : definitionsCopy) {
             ItemPath attributePath = ItemPath.create(ShadowType.F_ATTRIBUTES, rAttrDef.getItemName());
             AuthorizationDecisionType attributeReadDecision =
-                    schemaTransformer.computeItemDecision(
-                            securityConstraints, attributePath, ModelAuthorizationAction.AUTZ_ACTIONS_URLS_GET, attributesReadDecision, phase);
+                    securityConstraints.computeItemDecision(
+                            attributePath, ModelAuthorizationAction.AUTZ_ACTIONS_URLS_GET, attributesReadDecision, phase);
             AuthorizationDecisionType attributeAddDecision =
-                    schemaTransformer.computeItemDecision(
-                            securityConstraints, attributePath, ModelAuthorizationAction.AUTZ_ACTIONS_URLS_ADD, attributesAddDecision, phase);
+                    securityConstraints.computeItemDecision(
+                            attributePath, ModelAuthorizationAction.AUTZ_ACTIONS_URLS_ADD, attributesAddDecision, phase);
             AuthorizationDecisionType attributeModifyDecision =
-                    schemaTransformer.computeItemDecision(
-                            securityConstraints, attributePath, ModelAuthorizationAction.AUTZ_ACTIONS_URLS_MODIFY, attributesModifyDecision, phase);
+                    securityConstraints.computeItemDecision(
+                            attributePath, ModelAuthorizationAction.AUTZ_ACTIONS_URLS_MODIFY, attributesModifyDecision, phase);
             LOGGER.trace("Attribute {} access read:{}, add:{}, modify:{}", rAttrDef.getItemName(), attributeReadDecision,
                     attributeAddDecision, attributeModifyDecision);
 
@@ -486,10 +483,12 @@ public <O extends ObjectType> MetadataItemProcessingSpec getMetadataItemProcessi
                 "getting items with provenance support for " + object, task, result);
 
         LOGGER.trace(
-                "getMetadataSupportSpec for {} in {}:\n"
-                        + " - archetypePolicy = {}\n"
-                        + " - templateRef = {}\n"
-                        + " - processingSpec = \n{}",
+                """
+                        getMetadataSupportSpec for {} in {}:
+                         - archetypePolicy = {}
+                         - templateRef = {}
+                         - processingSpec =
+                        {}""",
                 metadataItemPath, object, archetypePolicy, templateRef,
                 DebugUtil.debugDumpLazily(processingSpec, 1));