[HippoCMS-scm] [Git][cms-community/hippo-repository][feature/msdts] REPO-1966 Baseline model should include nodes from known extensions during bootstrap

[Sergey Shepelevich]

Sergey Shepelevich pushed to branch feature/msdts at cms-community / 
hippo-repository


Commits:
f0af405e by Sergey Shepelevich at 2018-03-15T09:35:07+01:00
REPO-1966 Baseline model should include nodes from known extensions during 
bootstrap

- - - - -


1 changed file:

- engine/src/main/java/org/onehippo/cm/engine/ConfigurationServiceImpl.java


Changes:

=====================================
engine/src/main/java/org/onehippo/cm/engine/ConfigurationServiceImpl.java
=====================================
--- a/engine/src/main/java/org/onehippo/cm/engine/ConfigurationServiceImpl.java
+++ b/engine/src/main/java/org/onehippo/cm/engine/ConfigurationServiceImpl.java
@@ -85,6 +85,7 @@ import org.slf4j.LoggerFactory;
 import com.google.common.io.Files;
 
 import static java.util.stream.Collectors.toList;
+import static java.util.stream.Collectors.toSet;
 import static org.hippoecm.repository.api.HippoNodeType.HIPPO_LOCK;
 import static org.onehippo.cm.engine.Constants.HCM_NAMESPACE;
 import static org.onehippo.cm.engine.Constants.HCM_PREFIX;
@@ -204,8 +205,8 @@ public class ConfigurationServiceImpl implements 
InternalConfigurationService {
             ensureInitialized();
 
             // attempt to load a baseline, which may be empty -- we will need 
this if (mustConfigure == false)
-            // TODO: call with appropriate extensions
-            ConfigurationModelImpl baselineModel = loadBaselineModel();
+            final Set<String> knownExtensions = 
ExtensionRegistry.getContexts().values().stream().map(ExtensionEvent::getExtensionName).collect(toSet());
+            ConfigurationModelImpl baselineModel = 
loadBaselineModel(knownExtensions);
 
             // check the appropriate params to determine our state and 
bootstrap mode
             // empty baseline means we've never applied the v12+ bootstrap 
model before, since we should have at
@@ -236,8 +237,6 @@ public class ConfigurationServiceImpl implements 
InternalConfigurationService {
                             final List<ModuleImpl> modulesFromSourceFiles = 
readModulesFromSourceFiles(bootstrapModel);
                             // add all of the filesystem modules to a new 
model as "replacements" that override later additions
 
-                            final List<String> knownExtensions = 
ExtensionRegistry.getContexts().values().stream().map(ExtensionEvent::getExtensionName).collect(toList());
-
                             final List<ModuleImpl> eligibleModules = 
modulesFromSourceFiles.stream()
                                     .filter(m -> m.getExtension() == null || 
knownExtensions.contains(m.getExtension())).collect(toList());
                             bootstrapModel = 
mergeWithSourceModules(eligibleModules, bootstrapModel);



View it on GitLab: 
https://code.onehippo.org/cms-community/hippo-repository/commit/f0af405e264d01daadd00e676eb8bc0f6d9a94ce

---
View it on GitLab: 
https://code.onehippo.org/cms-community/hippo-repository/commit/f0af405e264d01daadd00e676eb8bc0f6d9a94ce
You're receiving this email because of your account on code.onehippo.org.

_______________________________________________
Hippocms-svn mailing list
Hippocms-svn@lists.onehippo.org
https://lists.onehippo.org/mailman/listinfo/hippocms-svn