Fixed provisioning tests.

Evolveum · Sep 23, 2017 · 8143636 · 8143636
1 parent 1d81756
commit 8143636
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 4 deletions.
diff --git a/...del-test/src/main/java/com/evolveum/midpoint/model/test/AbstractModelIntegrationTest.java b/...del-test/src/main/java/com/evolveum/midpoint/model/test/AbstractModelIntegrationTest.java
@@ -4442,12 +4442,12 @@ protected String getTopOrgOid() {
 	protected void transplantGlobalPolicyRulesAdd(File configWithGlobalRulesFile, Task task, OperationResult parentResult) throws SchemaException, IOException, ObjectNotFoundException, ObjectAlreadyExistsException, ExpressionEvaluationException, CommunicationException, ConfigurationException, PolicyViolationException, SecurityViolationException {
 		// copy rules from the file into live system config object
 		PrismObject<SystemConfigurationType> rules = prismContext.parserFor(configWithGlobalRulesFile).parse();
-		ObjectDelta<SystemConfigurationType> delta = (ObjectDelta<SystemConfigurationType>) DeltaBuilder.deltaFor(SystemConfigurationType.class, prismContext)
+		ObjectDelta<SystemConfigurationType> delta = DeltaBuilder.deltaFor(SystemConfigurationType.class, prismContext)
 				.item(SystemConfigurationType.F_GLOBAL_POLICY_RULE).add(
 					rules.asObjectable().getGlobalPolicyRule().stream()
 							.map(r -> r.clone().asPrismContainerValue())
 							.collect(Collectors.toList()))
-				.asObjectDelta(SystemObjectsType.SYSTEM_CONFIGURATION.value());
+				.asObjectDeltaCast(SystemObjectsType.SYSTEM_CONFIGURATION.value());
 		modelService.executeChanges(MiscSchemaUtil.createCollection(delta), null, task, parentResult);
 	}
 

diff --git a/repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/helpers/ObjectRetriever.java b/repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/helpers/ObjectRetriever.java
@@ -573,10 +573,14 @@ private void applyShadowAttributeDefinitions(Class<? extends RAnyValue> anyValue
             if (item.getDefinition() == null) {
                 RValueType rValType = (RValueType) value[2];
                 if (rValType == RValueType.PROPERTY) {
-                    PrismPropertyDefinition<Object> def = new PrismPropertyDefinitionImpl<>(name, type, object.getPrismContext());
+                    PrismPropertyDefinitionImpl<Object> def = new PrismPropertyDefinitionImpl<>(name, type, object.getPrismContext());
+                    def.setMinOccurs(0);
+                    def.setMaxOccurs(-1);
                     item.applyDefinition(def, true);
                 } else if (rValType == RValueType.REFERENCE) {
-                    PrismReferenceDefinition def = new PrismReferenceDefinitionImpl(name, type, object.getPrismContext());
+                    PrismReferenceDefinitionImpl def = new PrismReferenceDefinitionImpl(name, type, object.getPrismContext());
+	                def.setMinOccurs(0);
+	                def.setMaxOccurs(-1);
                     item.applyDefinition(def, true);
                 } else {
                     throw new UnsupportedOperationException("Unsupported value type " + rValType);