Delete `--catalogAdd` from classic mode Also delete `--catalogForce` (which only applied to the catalogAdd items)
Project: http://git-wip-us.apache.org/repos/asf/brooklyn-server/repo Commit: http://git-wip-us.apache.org/repos/asf/brooklyn-server/commit/25a4f92c Tree: http://git-wip-us.apache.org/repos/asf/brooklyn-server/tree/25a4f92c Diff: http://git-wip-us.apache.org/repos/asf/brooklyn-server/diff/25a4f92c Branch: refs/heads/master Commit: 25a4f92c55819084d690e036b557687fac382e97 Parents: 73abcb7 Author: Aled Sage <[email protected]> Authored: Tue Sep 26 12:51:42 2017 +0100 Committer: Aled Sage <[email protected]> Committed: Mon Oct 2 06:08:30 2017 +0100 ---------------------------------------------------------------------- .../catalog/internal/CatalogInitialization.java | 43 ++------------------ .../launcher/osgi/OsgiLauncherImpl.java | 2 +- .../BrooklynLauncherRebindCatalogTest.java | 2 +- .../brooklyn/launcher/BrooklynLauncherTest.java | 2 +- .../main/java/org/apache/brooklyn/cli/Main.java | 16 +------- .../java/org/apache/brooklyn/cli/CliTest.java | 32 ++++----------- 6 files changed, 14 insertions(+), 83 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/25a4f92c/core/src/main/java/org/apache/brooklyn/core/catalog/internal/CatalogInitialization.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/org/apache/brooklyn/core/catalog/internal/CatalogInitialization.java b/core/src/main/java/org/apache/brooklyn/core/catalog/internal/CatalogInitialization.java index 73d836b..282695e 100644 --- a/core/src/main/java/org/apache/brooklyn/core/catalog/internal/CatalogInitialization.java +++ b/core/src/main/java/org/apache/brooklyn/core/catalog/internal/CatalogInitialization.java @@ -44,8 +44,6 @@ import com.google.common.annotations.Beta; import com.google.common.base.Function; import com.google.common.base.Preconditions; import com.google.common.collect.ImmutableList; -import com.google.common.collect.Iterables; -import com.google.common.collect.Lists; @Beta public class CatalogInitialization implements ManagementContextInjectable { @@ -62,17 +60,13 @@ public class CatalogInitialization implements ManagementContextInjectable { B4) read all classpath://brooklyn/default.catalog.bom items, if they exist (and for now they will) B5) go to C1 - C1) if --catalog-add, read and add those items - - D1) if persisting, read the rest of the persisted items (entities etc) + C1) if persisting, read the rest of the persisted items (entities etc) */ private static final Logger log = LoggerFactory.getLogger(CatalogInitialization.class); private String initialUri; - private List<String> additionsUris; - private boolean force; private boolean disallowLocal = false; private List<Function<CatalogInitialization, Void>> callbacks = MutableList.of(); @@ -93,13 +87,11 @@ public class CatalogInitialization implements ManagementContextInjectable { private Object populatingCatalogMutex = new Object(); public CatalogInitialization() { - this(null, ImmutableList.<String>of(), false); + this(null); } - public CatalogInitialization(String initialUri, Iterable<String> additionUris, boolean force) { + public CatalogInitialization(String initialUri) { this.initialUri = initialUri; - this.additionsUris = (additionUris != null) ? ImmutableList.copyOf(additionUris) : ImmutableList.<String>of(); - this.force = force; } @Override @@ -221,7 +213,6 @@ public class CatalogInitialization implements ManagementContextInjectable { } if (needsAdditionsLoaded) { - populateAdditions(catalog); populateViaCallbacks(catalog); } } @@ -289,34 +280,6 @@ public class CatalogInitialization implements ManagementContextInjectable { } } - boolean hasRunAdditions = false; - protected void populateAdditions(BasicBrooklynCatalog catalog) { - if (!additionsUris.isEmpty()) { - if (disallowLocal) { - if (!hasRunAdditions) { - log.warn("CLI additions supplied but not supported when catalog load mode disallows local loads; ignoring."); - } - return; - } - if (!hasRunAdditions) { - log.debug("Adding to catalog from CLI: "+additionsUris+" (force: "+force+")"); - } - - List<CatalogItem<?,?>> items = Lists.newArrayList(); - for (String additionsUri : additionsUris) { - List<? extends CatalogItem<?, ?>> addedItems = catalog.addItems( - new ResourceUtils(this).getResourceAsString(additionsUri), force); - items.addAll(addedItems); - } - if (!hasRunAdditions) - log.debug("Added to catalog from CLI: "+items); - else - log.debug("Added to catalog from CLI: count "+Iterables.size(items)); - - hasRunAdditions = true; - } - } - protected void populateViaCallbacks(BasicBrooklynCatalog catalog) { for (Function<CatalogInitialization, Void> callback: callbacks) callback.apply(this); http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/25a4f92c/karaf/init/src/main/java/org/apache/brooklyn/launcher/osgi/OsgiLauncherImpl.java ---------------------------------------------------------------------- diff --git a/karaf/init/src/main/java/org/apache/brooklyn/launcher/osgi/OsgiLauncherImpl.java b/karaf/init/src/main/java/org/apache/brooklyn/launcher/osgi/OsgiLauncherImpl.java index 7c8aeb5..7ff388d 100644 --- a/karaf/init/src/main/java/org/apache/brooklyn/launcher/osgi/OsgiLauncherImpl.java +++ b/karaf/init/src/main/java/org/apache/brooklyn/launcher/osgi/OsgiLauncherImpl.java @@ -101,7 +101,7 @@ public class OsgiLauncherImpl extends BasicLauncher<OsgiLauncherImpl> implements final Stopwatch startupTimer = Stopwatch.createStarted(); BrooklynShutdownHooks.resetShutdownFlag(); LOG.debug("OsgiLauncher init, catalog "+defaultCatalogLocation); - catalogInitialization(new CatalogInitialization(String.format("file:%s", defaultCatalogLocation), null, false)); + catalogInitialization(new CatalogInitialization(String.format("file:%s", defaultCatalogLocation))); startPartOne(); startupTimer.stop(); LOG.info("Brooklyn initialisation (part one) complete after {}", startupTimer.toString()); http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/25a4f92c/launcher/src/test/java/org/apache/brooklyn/launcher/BrooklynLauncherRebindCatalogTest.java ---------------------------------------------------------------------- diff --git a/launcher/src/test/java/org/apache/brooklyn/launcher/BrooklynLauncherRebindCatalogTest.java b/launcher/src/test/java/org/apache/brooklyn/launcher/BrooklynLauncherRebindCatalogTest.java index b991fc1..1bf94cd 100644 --- a/launcher/src/test/java/org/apache/brooklyn/launcher/BrooklynLauncherRebindCatalogTest.java +++ b/launcher/src/test/java/org/apache/brooklyn/launcher/BrooklynLauncherRebindCatalogTest.java @@ -61,7 +61,7 @@ public class BrooklynLauncherRebindCatalogTest { } private BrooklynLauncher newLauncherForTests(String persistenceDir) { - CatalogInitialization catalogInitialization = new CatalogInitialization(CATALOG_INITIAL, null, false); + CatalogInitialization catalogInitialization = new CatalogInitialization(CATALOG_INITIAL); BrooklynLauncher launcher = BrooklynLauncher.newInstance() .brooklynProperties(LocalManagementContextForTests.builder(true).buildProperties()) .catalogInitialization(catalogInitialization) http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/25a4f92c/launcher/src/test/java/org/apache/brooklyn/launcher/BrooklynLauncherTest.java ---------------------------------------------------------------------- diff --git a/launcher/src/test/java/org/apache/brooklyn/launcher/BrooklynLauncherTest.java b/launcher/src/test/java/org/apache/brooklyn/launcher/BrooklynLauncherTest.java index c590fd4..c8d4352 100644 --- a/launcher/src/test/java/org/apache/brooklyn/launcher/BrooklynLauncherTest.java +++ b/launcher/src/test/java/org/apache/brooklyn/launcher/BrooklynLauncherTest.java @@ -272,7 +272,7 @@ public class BrooklynLauncherTest { @Test // takes a bit of time because starts webapp, but also tests rest api so useful public void testErrorsCaughtByApiAndRestApiWorks() throws Exception { launcher = newLauncherForTests(true) - .catalogInitialization(new CatalogInitialization(null, null, false).addPopulationCallback(new Function<CatalogInitialization, Void>() { + .catalogInitialization(new CatalogInitialization(null).addPopulationCallback(new Function<CatalogInitialization, Void>() { @Override public Void apply(CatalogInitialization input) { throw new RuntimeException("deliberate-exception-for-testing"); http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/25a4f92c/server-cli/src/main/java/org/apache/brooklyn/cli/Main.java ---------------------------------------------------------------------- diff --git a/server-cli/src/main/java/org/apache/brooklyn/cli/Main.java b/server-cli/src/main/java/org/apache/brooklyn/cli/Main.java index 669eb95..2ede25a 100644 --- a/server-cli/src/main/java/org/apache/brooklyn/cli/Main.java +++ b/server-cli/src/main/java/org/apache/brooklyn/cli/Main.java @@ -26,7 +26,6 @@ import java.io.InputStream; import java.lang.reflect.InvocationTargetException; import java.util.Arrays; import java.util.Collection; -import java.util.List; import java.util.concurrent.Callable; import java.util.concurrent.CountDownLatch; import java.util.concurrent.ExecutionException; @@ -229,16 +228,6 @@ public class Main extends AbstractMain { + "loaded on first run, or when persistence is off/empty or the catalog is reset") public String catalogInitial; - // Unfortunately does not support arity of 1 or more; only exactly n - @Option(name = { "--catalogAdd" }, title = "catalog bom URIs to add", - description = "Specifies one or more catalog.bom URIs (or files) to be added to the catalog, as a comma-separated list") - public String catalogAdd; - - @Option(name = { "--catalogForce" }, - description = "Specifies that catalog items added via the CLI should be forcibly added, " - + "replacing any identical versions already registered (use with care!)") - public boolean catalogForce; - @Option(name = { "-p", "--port" }, title = "port number", description = "Use this port for the brooklyn management web console and REST API; " + "default is 8081+ for http, 8443+ for https.") @@ -420,8 +409,7 @@ public class Main extends AbstractMain { launcher = createLauncher(); - List<String> catalogsAdd = Strings.isBlank(catalogAdd) ? ImmutableList.<String>of() : JavaStringEscapes.unwrapJsonishListIfPossible(catalogAdd); - CatalogInitialization catInit = new CatalogInitialization(catalogInitial, catalogsAdd, catalogForce); + CatalogInitialization catInit = new CatalogInitialization(catalogInitial); catInit.addPopulationCallback(new Function<CatalogInitialization,Void>() { @Override public Void apply(CatalogInitialization catInit) { @@ -815,8 +803,6 @@ public class Main extends AbstractMain { .add("startupContinueOnWebErrors", startupContinueOnWebErrors) .add("startupFailOnManagedAppsErrors", startupFailOnManagedAppsErrors) .add("catalogInitial", catalogInitial) - .add("catalogAdd", catalogAdd) - .add("catalogForce", catalogForce) .add("stopWhichAppsOnShutdown", stopWhichAppsOnShutdown) .add("stopOnKeyPress", stopOnKeyPress) .add("localBrooklynProperties", localBrooklynProperties) http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/25a4f92c/server-cli/src/test/java/org/apache/brooklyn/cli/CliTest.java ---------------------------------------------------------------------- diff --git a/server-cli/src/test/java/org/apache/brooklyn/cli/CliTest.java b/server-cli/src/test/java/org/apache/brooklyn/cli/CliTest.java index 2751d00..58b8874 100644 --- a/server-cli/src/test/java/org/apache/brooklyn/cli/CliTest.java +++ b/server-cli/src/test/java/org/apache/brooklyn/cli/CliTest.java @@ -436,37 +436,19 @@ public class CliTest { } @Test - public void testAddBomToCatalog() throws Exception { - runAddBomToCatalog(1); - } - - @Test - public void testAddMultipleBomsToCatalog() throws Exception { - runAddBomToCatalog(3); - } - - // This method assumes that only one test at a time will be running in the JVM! - protected void runAddBomToCatalog(int numBoms) throws Exception { - final List<String> bomFiles = Lists.newArrayList(); - final List<String> itemSymbolicNames = Lists.newArrayList(); - for (int i = 0; i < numBoms; i++) { - String itemName = "testAddToCatalog."+i+"."+Identifiers.makeRandomId(8); - String itemVersion = "1.2."+i; - File bomFile = generateSimpleBomFile(itemName, itemVersion); - bomFiles.add(bomFile.getAbsolutePath()); - itemSymbolicNames.add(itemName+":"+itemVersion); - } + public void testInitialCatalog() throws Exception { + final String itemName = "testAddToCatalog."+Identifiers.makeRandomId(8); + final String itemVersion = "1.2.3"; + File bomFile = generateSimpleBomFile(itemName, itemVersion); Cli<BrooklynCommand> cli = buildCli(); - BrooklynCommand command = cli.parse("launch", "--noConsole", "--catalogAdd", Joiner.on(",").join(bomFiles)); + BrooklynCommand command = cli.parse("launch", "--noConsole", "--catalogInitial", bomFile.getAbsolutePath()); submitCommandAndAssertFunctionSucceeds(command, new Function<ManagementContext, Void>() { @Override public Void apply(ManagementContext mgmt) { assertMgmtStartedEventually(mgmt); - for (String itemName : itemSymbolicNames) { - CatalogItem<?, ?> item = mgmt.getCatalog().getCatalogItem(CatalogUtils.getSymbolicNameFromVersionedId(itemName), CatalogUtils.getVersionFromVersionedId(itemName)); - assertNotNull(item); - } + CatalogItem<?, ?> item = mgmt.getCatalog().getCatalogItem(itemName, itemVersion); + assertNotNull(item); return null; } private void assertMgmtStartedEventually(final ManagementContext mgmt) {
