Merge remote-tracking branch 'refs/remotes/origin/master'

Evolveum · Aug 20, 2021 · 9bbb0ed · 9bbb0ed
2 parents c3a2ff7 + a1b9341
commit 9bbb0ed
Show file tree

Hide file tree

Showing 6 changed files with 19 additions and 10 deletions.
diff --git a/...n/src/main/java/com/evolveum/midpoint/common/refinery/RefinedAttributeDefinitionImpl.java b/...n/src/main/java/com/evolveum/midpoint/common/refinery/RefinedAttributeDefinitionImpl.java
@@ -671,7 +671,7 @@ public boolean isDisplayNameAttribute() {
     @Override
     public Optional<ComplexTypeDefinition> structuredType() {
         if(structuredType == null) {
-            this.structuredType = Optional.ofNullable(prismContext.getSchemaRegistry().findComplexTypeDefinitionByType(typeName));
+            this.structuredType = Optional.ofNullable(getPrismContext().getSchemaRegistry().findComplexTypeDefinitionByType(typeName));
         }
         return structuredType;
     }

diff --git a/...ain/java/com/evolveum/midpoint/schema/processor/ObjectClassComplexTypeDefinitionImpl.java b/...ain/java/com/evolveum/midpoint/schema/processor/ObjectClassComplexTypeDefinitionImpl.java
@@ -193,7 +193,7 @@ public void setDisplayNameAttribute(QName displayName) {
 
     @Override
     public <X> ResourceAttributeDefinitionImpl<X> createAttributeDefinition(QName name, QName typeName) {
-        ResourceAttributeDefinitionImpl<X> propDef = new ResourceAttributeDefinitionImpl<>(name, typeName, prismContext);
+        ResourceAttributeDefinitionImpl<X> propDef = new ResourceAttributeDefinitionImpl<>(name, typeName, getPrismContext());
         add(propDef);
         return propDef;
     }
@@ -239,7 +239,7 @@ public static ResourceAttributeContainer instantiate(QName elementName, ObjectCl
     @Override
     public ObjectClassComplexTypeDefinitionImpl clone() {
         ObjectClassComplexTypeDefinitionImpl clone = new ObjectClassComplexTypeDefinitionImpl(
-                getTypeName(), prismContext);
+                getTypeName(), getPrismContext());
         copyDefinitionData(clone);
         clone.shared = false;
         return clone;
@@ -347,6 +347,7 @@ public boolean equals(Object obj) {
         return true;
     }
 
+    @Override
     protected String getDebugDumpClassName() {
         return "OCD";
     }

diff --git a/...java/com/evolveum/midpoint/schema/processor/ResourceAttributeContainerDefinitionImpl.java b/...java/com/evolveum/midpoint/schema/processor/ResourceAttributeContainerDefinitionImpl.java
@@ -286,14 +286,14 @@ public ResourceAttributeContainer instantiate() {
     @Override
     public ResourceAttributeContainer instantiate(QName name) {
         name = DefinitionUtil.addNamespaceIfApplicable(name, this.itemName);
-        return new ResourceAttributeContainerImpl(name, this, prismContext);
+        return new ResourceAttributeContainerImpl(name, this, getPrismContext());
     }
 
     @NotNull
     @Override
     public ResourceAttributeContainerDefinitionImpl clone() {
         ResourceAttributeContainerDefinitionImpl clone = new ResourceAttributeContainerDefinitionImpl(itemName,
-                (ObjectClassComplexTypeDefinition)complexTypeDefinition.clone(), prismContext);
+                (ObjectClassComplexTypeDefinition)complexTypeDefinition.clone(), getPrismContext());
         copyDefinitionData(clone);
         return clone;
     }
@@ -346,7 +346,7 @@ public List<? extends ResourceAttributeDefinition> getDefinitions() {
     @Override
     public @NotNull <T extends ShadowType> PrismObjectDefinition<T> toShadowDefinition() {
         //noinspection unchecked
-        PrismObjectDefinition<T> origShadowDef =  (PrismObjectDefinition<T>) prismContext.getSchemaRegistry().
+        PrismObjectDefinition<T> origShadowDef =  (PrismObjectDefinition<T>) getPrismContext().getSchemaRegistry().
             findObjectDefinitionByCompileTimeClass(ShadowType.class);
         return origShadowDef.cloneWithReplacedDefinition(ShadowType.F_ATTRIBUTES, this);
     }

diff --git a/...src/main/java/com/evolveum/midpoint/schema/processor/ResourceAttributeDefinitionImpl.java b/...src/main/java/com/evolveum/midpoint/schema/processor/ResourceAttributeDefinitionImpl.java
@@ -57,7 +57,7 @@ public ResourceAttribute<T> instantiate() {
     @Override
     public ResourceAttribute<T> instantiate(QName name) {
         name = addNamespaceIfApplicable(name, this.itemName);
-        return new ResourceAttributeImpl<>(name, this, prismContext);
+        return new ResourceAttributeImpl<>(name, this, getPrismContext());
     }
 
     @Override
@@ -188,6 +188,7 @@ public int hashCode() {
         return Objects.hash(super.hashCode(), nativeAttributeName, frameworkAttributeName, returnedByDefault);
     }
 
+    @Override
     protected void extendToString(StringBuilder sb) {
         super.extendToString(sb);
         if (getNativeAttributeName()!=null) {
@@ -207,6 +208,7 @@ protected void extendToString(StringBuilder sb) {
     /**
      * Return a human readable name of this class suitable for logs.
      */
+    @Override
     protected String getDebugDumpClassName() {
         return "RAD";
     }

diff --git a/infra/schema/src/main/java/com/evolveum/midpoint/schema/util/ConnectorTypeUtil.java b/infra/schema/src/main/java/com/evolveum/midpoint/schema/util/ConnectorTypeUtil.java
@@ -59,7 +59,12 @@ public static void setConnectorXsdSchema(PrismObject<ConnectorType> connector, E
         PrismContainer<XmlSchemaType> schemaContainer;
         try {
             schemaContainer = connector.findOrCreateContainer(ConnectorType.F_SCHEMA);
-            PrismProperty<SchemaDefinitionType> definitionProperty = schemaContainer.findOrCreateProperty(XmlSchemaType.F_DEFINITION);
+
+            PrismContainerValue<XmlSchemaType> schemaInstance = schemaContainer.getAnyValue();
+            if (schemaInstance == null) {
+                schemaInstance = schemaContainer.createNewValue();
+            }
+            PrismProperty<SchemaDefinitionType> definitionProperty = schemaInstance.findOrCreateProperty(XmlSchemaType.F_DEFINITION);
             ObjectTypeUtil.setXsdSchemaDefinition(definitionProperty, xsdElement);
         } catch (SchemaException e) {
             // Should not happen

diff --git a/infra/schema/src/test/java/com/evolveum/midpoint/schema/TestDiffEquals.java b/infra/schema/src/test/java/com/evolveum/midpoint/schema/TestDiffEquals.java
@@ -180,7 +180,8 @@ public void testAssignmentEquivalent() {
         assertFalse(a2.asPrismContainerValue().equivalent(a1.asPrismContainerValue()));            // a bit redundant
     }
 
-    @Test
+    // Disabled, prismContext is now always present
+    @Test(enabled = false)
     public void testContextlessAssignmentEquals() throws Exception {
         AssignmentType a1 = new AssignmentType();            // no prismContext here
         a1.setDescription("descr1");
@@ -202,7 +203,7 @@ public void testContextlessAssignmentEquals() throws Exception {
         assertTrue(a1.equals(a3));
     }
 
-    @Test
+    @Test(enabled = false)
     public void testContextlessAssignmentEquals2() throws Exception {
         // (1) user without prismContext - the functionality is reduced