CAUSEWAY-3995: immediately after MM init, clear all layout caches

Author: andi-huber

api/applib/src/main/java/org/apache/causeway/applib/services/grid/GridService.java

@@ -93,4 +93,6 @@ public LayoutKey(final Class<?> domainClass) {
     EnumSet<CommonMimeType> supportedFormats();
     Optional<GridMarshaller> marshaller(CommonMimeType format);
 
+	void clearCache();
+
 }

core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/object/grid/BSGridFacet.java

@@ -77,6 +77,11 @@ public void visitAttributes(final BiConsumer<String, Object> visitor) {
         visitor.accept("precedence", precedence().name());
     }
 
+    @Override
+    public void clearCache() {
+    	normalizedGridByLayoutPrefix.clear();
+    }
+    
     // -- HELPER
 
     /**
@@ -139,6 +144,7 @@ final static class NoLayout implements GridFacet {
         @Override public BSGrid getGrid(@Nullable final ManagedObject mo) {
             return null;
         }
+        @Override public void clearCache() {}
     }
 
 }

core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/object/grid/GridFacet.java

@@ -35,4 +35,6 @@ public interface GridFacet extends Facet {
 
     BSGrid getGrid(@Nullable ManagedObject mo);
 
+	void clearCache();
+
 }

core/metamodel/src/main/java/org/apache/causeway/core/metamodel/services/grid/GridCache.java

@@ -61,5 +61,9 @@ public void remove(final Class<?> domainClass) {
     public Try<BSGrid> computeIfAbsent(final LayoutKey layoutKey, final Function<LayoutKey, Try<BSGrid>> factory) {
         return gridsByKey.computeIfAbsent(layoutKey, factory);
     }
+    
+    public void clear() {
+    	gridsByKey.map().clear();
+    }
 
 }

core/metamodel/src/main/java/org/apache/causeway/core/metamodel/services/grid/GridServiceDefault.java

@@ -98,6 +98,11 @@ public void invalidate(final Class<?> domainClass) {
             cache.remove(domainClass);
         }
     }
+    
+    @Override
+    public void clearCache() {
+        cache.clear();
+    }
 
     @Override
     public BSGrid load(final LayoutKey layoutKey) {

core/metamodel/src/main/java/org/apache/causeway/core/metamodel/specloader/SpecificationLoaderDefault.java

@@ -36,14 +36,11 @@
 import javax.inject.Named;
 import javax.inject.Provider;
 
-import org.springframework.beans.factory.annotation.Qualifier;
-import org.springframework.lang.Nullable;
-import org.springframework.stereotype.Service;
-
 import org.apache.causeway.applib.Identifier;
 import org.apache.causeway.applib.annotation.PriorityPrecedence;
 import org.apache.causeway.applib.annotation.SemanticsOf;
 import org.apache.causeway.applib.id.LogicalType;
+import org.apache.causeway.applib.services.grid.GridService;
 import org.apache.causeway.applib.services.menu.MenuBarsService;
 import org.apache.causeway.applib.services.metamodel.BeanSort;
 import org.apache.causeway.applib.services.registry.ServiceRegistry;
@@ -68,6 +65,7 @@
 import org.apache.causeway.core.metamodel.commons.ClassUtil;
 import org.apache.causeway.core.metamodel.context.MetaModelContext;
 import org.apache.causeway.core.metamodel.facetapi.Facet;
+import org.apache.causeway.core.metamodel.facets.object.grid.GridFacet;
 import org.apache.causeway.core.metamodel.progmodel.ProgrammingModel;
 import org.apache.causeway.core.metamodel.progmodel.ProgrammingModelService;
 import org.apache.causeway.core.metamodel.progmodels.dflt.ProgrammingModelFacetsJava11;
@@ -84,6 +82,9 @@
 import org.apache.causeway.core.metamodel.specloader.validator.ValidationFailures;
 import org.apache.causeway.core.metamodel.valuetypes.ValueSemanticsResolverDefault;
 import org.apache.causeway.core.security.authorization.manager.ActionSemanticsResolver;
+import org.springframework.beans.factory.annotation.Qualifier;
+import org.springframework.lang.Nullable;
+import org.springframework.stereotype.Service;
 
 import lombok.Getter;
 import lombok.NonNull;
@@ -322,6 +323,9 @@ public void createMetaModel() {
 
         log.info(" - running remaining validators");
         _Blackhole.consume(getOrAssessValidationResult()); // as a side effect memoizes the validation result
+        
+        log.info(" - clearing layout caches");
+        clearLayoutCaches();
 
         stopWatch.stop();
         log.info("Metamodel created in " + stopWatch.getMillis() + " ms.");
@@ -331,7 +335,7 @@ public void createMetaModel() {
         }
     }
 
-    @Override
+	@Override
     public Optional<ValidationFailures> getValidationResult() {
         return validationResult.getMemoized();
     }
@@ -344,6 +348,7 @@ public ValidationFailures getOrAssessValidationResult() {
     @Override
     public void disposeMetaModel() {
         waitForValidationToFinish();
+        clearLayoutCaches();
         logicalTypeResolver.clear();
         cache.clear();
         validationResult.clear();
@@ -688,5 +693,14 @@ private void invalidateCache(final Class<?> cls) {
             spec = spec.superclass();
         }
     }
+    
+    private void clearLayoutCaches() {
+    	cache.forEachConcurrent(spec->{
+    		spec.lookupFacet(GridFacet.class)
+    			.ifPresent(GridFacet::clearCache);
+    	});
+    	serviceRegistry.lookupService(GridService.class)
+			.ifPresent(GridService::clearCache);
+	}
 
 }