Github user tbouron commented on a diff in the pull request:
https://github.com/apache/brooklyn-server/pull/852#discussion_r144297930
--- Diff:
core/src/main/java/org/apache/brooklyn/core/catalog/internal/CatalogInitialization.java
---
@@ -128,164 +146,255 @@ public void setFailOnStartupErrors(boolean
startupFailOnCatalogErrors) {
this.failOnStartupErrors = startupFailOnCatalogErrors;
}
- public CatalogInitialization
addPopulationCallback(Function<CatalogInitialization, Void> callback) {
- callbacks.add(callback);
- return this;
- }
-
public ManagementContextInternal getManagementContext() {
- return Preconditions.checkNotNull(managementContext, "management
context has not been injected into "+this);
+ return checkNotNull(managementContext, "management context has not
been injected into "+this);
}
/** Returns true if the canonical initialization has completed,
* that is, an initialization which is done when a node is rebinded as
master
* (or an initialization done by the startup routines when not running
persistence);
* see also {@link #hasRunAnyInitialization()}. */
- public boolean hasRunFinalInitialization() { return
hasRunFinalInitialization; }
+ private boolean hasRunFinalInitialization() {
+ return hasRunFinalInitialization;
+ }
- /** Returns true if an official initialization has run,
- * even if it was a transient run, e.g. so that the launch sequence
can tell whether rebind has triggered initialization */
- public boolean hasRunOfficialInitialization() { return
hasRunFinalInitialization || hasRunTransientOfficialInitialization; }
+ private boolean hasRunInitialCatalogInitialization() {
+ return hasRunInitialCatalogInitialization;
--- End diff --
Shouldn't be as below, i.e. `return hasRunFinalInitialization ||
hasRunInitialCatalogInitialization;` ?
---