Merge branch 'master' of github.com:Evolveum/midpoint

Evolveum · Jul 18, 2022 · 2cf6a09 · 2cf6a09
2 parents fc6a6ca + f25cabc
commit 2cf6a09
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 14 deletions.
diff --git a/...-common/src/main/java/com/evolveum/midpoint/model/common/archetypes/ArchetypeManager.java b/...-common/src/main/java/com/evolveum/midpoint/model/common/archetypes/ArchetypeManager.java
@@ -27,7 +27,6 @@
 import com.evolveum.midpoint.CacheInvalidationContext;
 import com.evolveum.midpoint.prism.PrismObject;
 import com.evolveum.midpoint.repo.api.Cache;
-import com.evolveum.midpoint.repo.api.CacheInvalidationEventSpecification;
 import com.evolveum.midpoint.repo.api.CacheRegistry;
 import com.evolveum.midpoint.schema.constants.ObjectTypes;
 import com.evolveum.midpoint.schema.expression.ExpressionProfile;
@@ -74,12 +73,6 @@ public class ArchetypeManager implements Cache {
             ObjectTemplateType.class
     );
 
-    private static final Set<CacheInvalidationEventSpecification> CACHE_SPECIFICATION = Collections.unmodifiableSet(
-            CacheInvalidationEventSpecification.setOf(
-                    ArchetypeType.class,
-                    SystemConfigurationType.class,
-                    ObjectTemplateType.class));
-
     @Autowired private SystemObjectCache systemObjectCache;
     @Autowired private CacheRegistry cacheRegistry;
     @Autowired private ArchetypeDeterminer archetypeDeterminer;
@@ -382,11 +375,6 @@ public <O extends ObjectType> ExpressionProfile determineExpressionProfile(Prism
         return systemObjectCache.getExpressionProfile(expressionProfileId, result);
     }
 
-    @Override
-    public Collection<CacheInvalidationEventSpecification> getEventSpecifications() {
-        return CACHE_SPECIFICATION;
-    }
-
     @Override
     public void invalidate(Class<?> type, String oid, CacheInvalidationContext context) {
         // This seems to be harsh (and probably is), but a policy can really depend on a mix of objects. So we have to play

diff --git a/...odel-impl/src/main/java/com/evolveum/midpoint/model/impl/security/GuiProfileCompiler.java b/...odel-impl/src/main/java/com/evolveum/midpoint/model/impl/security/GuiProfileCompiler.java
@@ -89,7 +89,9 @@ public void compileFocusProfile(GuiProfiledPrincipal principal, PrismObject<Syst
         Set<String> profileDependencies = new HashSet<>();
 
         profileDependencies.add(principal.getOid());
-        profileDependencies.add(systemConfiguration.getOid());
+        if (systemConfiguration != null) {
+            profileDependencies.add(systemConfiguration.getOid());
+        }
         collect(adminGuiConfigurations, profileDependencies, principal, authorizationTransformer, task, result);
 
         CompiledGuiProfile compiledGuiProfile = compileFocusProfile(adminGuiConfigurations, systemConfiguration, task, result);

diff --git a/testing/conntest/testng-integration.xml b/testing/conntest/testng-integration.xml
@@ -24,7 +24,8 @@
             <class name="com.evolveum.midpoint.testing.conntest.ad.multidomain.TestAdLdapAd2019"/>
             <class name="com.evolveum.midpoint.testing.conntest.ad.multidomain.TestAdLdapAd2019Strange"/>
 
-            <class name="com.evolveum.midpoint.testing.conntest.ad.multidomain.TestAdLdapAd2016"/>
+            <!-- disabled for now, see MID-7313 -->
+            <!--<class name="com.evolveum.midpoint.testing.conntest.ad.multidomain.TestAdLdapAd2016"/>-->
 
             <!--<class name="com.evolveum.midpoint.testing.conntest.ad.multidomain.TestAdLdapAd2016"/>-->
             <!-- Not testing "strange" configuration on 2016 to keep test runtime down. -->