TransformableDefinition: Do not use prismContext in instantiate

Signed-off-by: Tony Tkacik <tonydamage@gmail.com>
Evolveum · Jul 28, 2021 · 8b65ee7 · 8b65ee7
1 parent 113b094
commit 8b65ee7
Show file tree

Hide file tree

Showing 5 changed files with 23 additions and 5 deletions.
diff --git a/...a/com/evolveum/midpoint/model/impl/schema/transform/TransformableContainerDefinition.java b/...a/com/evolveum/midpoint/model/impl/schema/transform/TransformableContainerDefinition.java
@@ -281,7 +281,7 @@ public PrismContainer<C> instantiate() throws SchemaException {
     @NotNull
     @Override
     public PrismContainer<C> instantiate(QName elementName) throws SchemaException {
-        return this.getPrismContext().itemFactory().createContainer(elementName, this);
+        return super.instantiate(elementName);
     }
 
     @Override

diff --git a/...n/java/com/evolveum/midpoint/model/impl/schema/transform/TransformableItemDefinition.java b/...n/java/com/evolveum/midpoint/model/impl/schema/transform/TransformableItemDefinition.java
@@ -6,6 +6,8 @@
 
 import javax.xml.namespace.QName;
 
+import org.jetbrains.annotations.NotNull;
+
 import com.evolveum.midpoint.prism.ComplexTypeDefinition;
 import com.evolveum.midpoint.prism.Item;
 import com.evolveum.midpoint.prism.ItemDefinition;
@@ -19,6 +21,7 @@
 import com.evolveum.midpoint.prism.PrismReferenceDefinition;
 import com.evolveum.midpoint.prism.PrismReferenceValue;
 import com.evolveum.midpoint.prism.deleg.ItemDefinitionDelegator;
+import com.evolveum.midpoint.util.exception.SchemaException;
 import com.evolveum.midpoint.xml.ns._public.common.common_3.ObjectTemplateItemDefinitionType;
 import com.google.common.base.Preconditions;
 
@@ -357,4 +360,10 @@ public String toString() {
         return "Transformable:" + delegate.toString();
     }
 
+    @Override
+    public @NotNull I instantiate(QName name) throws SchemaException {
+        var deleg = delegate().instantiate(name);
+        ((Item<?,ItemDefinition>)deleg).setDefinition(this);
+        return deleg;
+    }
 }
diff --git a/...java/com/evolveum/midpoint/model/impl/schema/transform/TransformableObjectDefinition.java b/...java/com/evolveum/midpoint/model/impl/schema/transform/TransformableObjectDefinition.java
@@ -81,8 +81,7 @@ public PrismObject<O> instantiate() throws SchemaException {
 
     @Override
     public @NotNull PrismObject<O> instantiate(QName name) throws SchemaException {
-        // TODO Auto-generated method stub
-        return getPrismContext().itemFactory().createObject(name, this);
+        return (PrismObject<O>) super.instantiate(name);
     }
 
 }
diff --git a/...va/com/evolveum/midpoint/model/impl/schema/transform/TransformablePropertyDefinition.java b/...va/com/evolveum/midpoint/model/impl/schema/transform/TransformablePropertyDefinition.java
@@ -26,6 +26,7 @@
 import com.evolveum.midpoint.schema.processor.MutableResourceAttributeDefinition;
 import com.evolveum.midpoint.schema.processor.ResourceAttributeDefinition;
 import com.evolveum.midpoint.schema.processor.deleg.AttributeDefinitionDelegator;
+import com.evolveum.midpoint.util.exception.SchemaException;
 
 public class TransformablePropertyDefinition<T> extends TransformableItemDefinition<PrismProperty<T>, PrismPropertyDefinition<T>>
     implements PropertyDefinitionDelegator<T>, PartiallyMutableItemDefinition.Property<T> {
@@ -88,7 +89,11 @@ public MutablePrismPropertyDefinition<T> toMutable() {
 
     @Override
     public @NotNull PrismProperty<T> instantiate(QName name) {
-        return getPrismContext().itemFactory().createProperty(name, this);
+        try {
+            return super.instantiate(name);
+        } catch (SchemaException e) {
+            throw new IllegalStateException("Should not happened");
+        }
     }
 
     @SuppressWarnings("unchecked")

diff --git a/...a/com/evolveum/midpoint/model/impl/schema/transform/TransformableReferenceDefinition.java b/...a/com/evolveum/midpoint/model/impl/schema/transform/TransformableReferenceDefinition.java
@@ -15,6 +15,7 @@
 import com.evolveum.midpoint.prism.PrismReference;
 import com.evolveum.midpoint.prism.PrismReferenceDefinition;
 import com.evolveum.midpoint.prism.deleg.ReferenceDefinitionDelegator;
+import com.evolveum.midpoint.util.exception.SchemaException;
 
 public class TransformableReferenceDefinition extends TransformableItemDefinition<PrismReference, PrismReferenceDefinition>
         implements ReferenceDefinitionDelegator, PartiallyMutableItemDefinition.Reference {
@@ -46,7 +47,11 @@ public MutablePrismReferenceDefinition toMutable() {
 
     @Override
     public @NotNull PrismReference instantiate(QName name) {
-        return getPrismContext().itemFactory().createReference(name, this);
+        try {
+            return super.instantiate(name);
+        } catch (SchemaException e) {
+            throw new IllegalStateException("Should not happened",e);
+        }
     }
 
     @Override