This is an automated email from the ASF dual-hosted git repository. fmariani pushed a commit to branch main in repository https://gitbox.apache.org/repos/asf/camel.git
commit b3bfd03134153da2b39df049572ede005af787f7 Author: Croway <[email protected]> AuthorDate: Mon Mar 31 11:14:42 2025 +0200 Remove merge feature + use global instead of local --- .../dsl/jbang/core/commands/CamelCommand.java | 15 ++------- .../dsl/jbang/core/commands/CamelJBangMain.java | 33 +------------------ .../dsl/jbang/core/commands/config/ConfigGet.java | 6 ++-- .../dsl/jbang/core/commands/config/ConfigList.java | 19 +++++++++-- .../dsl/jbang/core/commands/config/ConfigSet.java | 10 ++++-- .../jbang/core/commands/config/ConfigUnset.java | 8 ++--- .../jbang/core/commands/version/VersionGet.java | 6 ++-- .../jbang/core/commands/version/VersionSet.java | 5 +-- .../dsl/jbang/core/common/CommandLineHelper.java | 15 ++++----- .../dsl/jbang/core/commands/UserConfigHelper.java | 4 ++- .../jbang/core/commands/config/BaseConfigTest.java | 2 +- .../jbang/core/commands/config/ConfigGetTest.java | 2 +- .../jbang/core/commands/config/ConfigListTest.java | 38 +++++++++++++++++----- .../jbang/core/commands/config/ConfigSetTest.java | 2 +- .../core/commands/config/ConfigUnsetTest.java | 2 +- 15 files changed, 83 insertions(+), 84 deletions(-) diff --git a/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/CamelCommand.java b/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/CamelCommand.java index 1477d27f129..188c9abd295 100644 --- a/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/CamelCommand.java +++ b/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/CamelCommand.java @@ -17,8 +17,6 @@ package org.apache.camel.dsl.jbang.core.commands; import java.io.File; -import java.nio.file.Files; -import java.nio.file.Path; import java.util.ArrayList; import java.util.Arrays; import java.util.List; @@ -131,17 +129,8 @@ public abstract class CamelCommand implements Callable<Integer> { protected void printConfigurationValues(String header) { if (spec != null) { - Properties configProperties = new Properties(); - Path userConfigInCurrentDirectory = Path.of(CommandLineHelper.USER_CONFIG); - if (main.isMergeUserConfigurations()) { - CommandLineHelper.loadProperties(configProperties::putAll, false); - if (Files.exists(userConfigInCurrentDirectory)) { - CommandLineHelper.loadProperties(configProperties::putAll, true); - } - } else { - boolean isLocalConfiguration = Files.exists(userConfigInCurrentDirectory); - CommandLineHelper.loadProperties(configProperties::putAll, isLocalConfiguration); - } + final Properties configProperties = new Properties(); + CommandLineHelper.loadProperties(configProperties::putAll); List<String> lines = new ArrayList<>(); spec.options().forEach(opt -> { if (Arrays.stream(opt.names()).anyMatch(name -> diff --git a/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/CamelJBangMain.java b/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/CamelJBangMain.java index bd1013c14ab..faf76da33d6 100644 --- a/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/CamelJBangMain.java +++ b/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/CamelJBangMain.java @@ -16,8 +16,6 @@ */ package org.apache.camel.dsl.jbang.core.commands; -import java.util.ArrayList; -import java.util.List; import java.util.concurrent.Callable; import org.apache.camel.catalog.CamelCatalog; @@ -74,8 +72,6 @@ public class CamelJBangMain implements Callable<Integer> { run(new CamelJBangMain(), args); } - private static boolean mergeUserConfigurations; - public static void run(CamelJBangMain main, String... args) { // set pid as system property as logging ${sys:pid} needs to be resolved on windows try { @@ -196,34 +192,11 @@ public class CamelJBangMain implements Callable<Integer> { return new String[] { v }; }); - List<String> arguments = new ArrayList<>(args.length); - mergeUserConfigurations = isMergeUserConfigurations(args, mergeUserConfigurations, arguments); - args = arguments.toArray(new String[0]); - CommandLineHelper.augmentWithUserConfiguration(commandLine, mergeUserConfigurations); + CommandLineHelper.augmentWithUserConfiguration(commandLine); int exitCode = commandLine.execute(args); main.quit(exitCode); } - /** - * The option --mergeConfigurations is used only during PicoCLI UserConfigDefaultProvider initialization if args - * contains the string --mergeConfigurations, it is removed, this way, it won't mess with PicoCLI @CommandLine.* - * - * @param args - * @param mergeConfigurations - * @param arguments - * @return - */ - private static boolean isMergeUserConfigurations(String[] args, boolean mergeConfigurations, List<String> arguments) { - for (String arg : args) { - if ("--mergeConfigurations".equals(arg)) { - mergeConfigurations = true; - } else { - arguments.add(arg); - } - } - return mergeConfigurations; - } - /** * Finish this main with given exit code. By default, uses system exit to terminate. Subclasses may want to * overwrite this exit behavior e.g. during unit tests. @@ -271,8 +244,4 @@ public class CamelJBangMain implements Callable<Integer> { public static CommandLine getCommandLine() { return commandLine; } - - public boolean isMergeUserConfigurations() { - return mergeUserConfigurations; - } } diff --git a/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/config/ConfigGet.java b/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/config/ConfigGet.java index 89257352327..0e8c44ad922 100644 --- a/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/config/ConfigGet.java +++ b/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/config/ConfigGet.java @@ -30,8 +30,8 @@ public class ConfigGet extends CamelCommand { @CommandLine.Parameters(description = "Configuration key", arity = "1") String key; - @CommandLine.Option(names = { "--local" }, description = "Retrieve configurations from current directory") - boolean local; + @CommandLine.Option(names = { "--global" }, description = "Use global or local configuration") + boolean global = true; public ConfigGet(CamelJBangMain main) { super(main); @@ -46,7 +46,7 @@ public class ConfigGet extends CamelCommand { } else { printer().println(key + " key not found"); } - }, local); + }, !global); return 0; } diff --git a/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/config/ConfigList.java b/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/config/ConfigList.java index 1c20bf6731a..8734c7734d9 100644 --- a/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/config/ConfigList.java +++ b/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/config/ConfigList.java @@ -24,8 +24,8 @@ import picocli.CommandLine; @CommandLine.Command(name = "list", description = "Displays user configuration", sortOptions = false, showDefaultValues = true) public class ConfigList extends CamelCommand { - @CommandLine.Option(names = { "--local" }, description = "Retrieve configurations from current directory") - boolean local; + @CommandLine.Option(names = { "--global" }, description = "Use global or local configuration") + boolean global = true; public ConfigList(CamelJBangMain main) { super(main); @@ -33,13 +33,26 @@ public class ConfigList extends CamelCommand { @Override public Integer doCall() throws Exception { + listConfigurations(true); + if (!global) { + return 0; + } + + listConfigurations(false); + return 0; + } + + private void listConfigurations(boolean local) { CommandLineHelper .loadProperties(p -> { + if (!p.stringPropertyNames().isEmpty()) { + String configurationType = local ? "Local" : "Global"; + printer().println("----- " + configurationType + " -----"); + } for (String k : p.stringPropertyNames()) { String v = p.getProperty(k); printer().printf("%s = %s%n", k, v); } }, local); - return 0; } } diff --git a/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/config/ConfigSet.java b/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/config/ConfigSet.java index 913e7c92fa7..1f51bcd874f 100644 --- a/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/config/ConfigSet.java +++ b/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/config/ConfigSet.java @@ -16,6 +16,8 @@ */ package org.apache.camel.dsl.jbang.core.commands.config; +import java.io.IOException; + import org.apache.camel.dsl.jbang.core.commands.CamelCommand; import org.apache.camel.dsl.jbang.core.commands.CamelJBangMain; import org.apache.camel.dsl.jbang.core.common.CommandLineHelper; @@ -29,8 +31,8 @@ public class ConfigSet extends CamelCommand { @CommandLine.Parameters(description = "Configuration parameter (ex. key=value)", arity = "1") String configuration; - @CommandLine.Option(names = { "--local" }, description = "Retrieve configurations from current directory") - boolean local; + @CommandLine.Option(names = { "--global" }, description = "Use global or local configuration") + boolean global = true; public ConfigSet(CamelJBangMain main) { super(main); @@ -38,6 +40,10 @@ public class ConfigSet extends CamelCommand { @Override public Integer doCall() throws Exception { + return setConfiguration(!global); + } + + private int setConfiguration(boolean local) throws IOException { CommandLineHelper.createPropertyFile(local); if (configuration.split("=").length == 1) { diff --git a/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/config/ConfigUnset.java b/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/config/ConfigUnset.java index ded8cdcb60d..43bcd703ab0 100644 --- a/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/config/ConfigUnset.java +++ b/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/config/ConfigUnset.java @@ -28,8 +28,8 @@ public class ConfigUnset extends CamelCommand { @CommandLine.Parameters(description = "Configuration key", arity = "1") String key; - @CommandLine.Option(names = { "--local" }, description = "Retrieve configurations from current directory") - boolean local; + @CommandLine.Option(names = { "--global" }, description = "Use global or local configurations") + boolean global = true; public ConfigUnset(CamelJBangMain main) { super(main); @@ -39,8 +39,8 @@ public class ConfigUnset extends CamelCommand { public Integer doCall() throws Exception { CommandLineHelper.loadProperties(properties -> { properties.remove(key); - CommandLineHelper.storeProperties(properties, printer(), local); - }, local); + CommandLineHelper.storeProperties(properties, printer(), !global); + }, !global); return 0; } diff --git a/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/version/VersionGet.java b/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/version/VersionGet.java index 0ea49504056..dc28fd73d64 100644 --- a/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/version/VersionGet.java +++ b/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/version/VersionGet.java @@ -28,8 +28,8 @@ import picocli.CommandLine; showDefaultValues = true) public class VersionGet extends CamelCommand { - @CommandLine.Option(names = { "--local" }, description = "Retrieve configurations from current directory") - boolean local; + @CommandLine.Option(names = { "--global" }, description = "Use global or local configuration") + boolean global = true; public VersionGet(CamelJBangMain main) { super(main); @@ -66,7 +66,7 @@ public class VersionGet extends CamelCommand { printer().println(" repos = " + repos); } } - }, local); + }, !global); return 0; } diff --git a/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/version/VersionSet.java b/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/version/VersionSet.java index b67fad3cb38..51b503a6ac5 100644 --- a/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/version/VersionSet.java +++ b/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/version/VersionSet.java @@ -43,8 +43,8 @@ public class VersionSet extends CamelCommand { @CommandLine.Option(names = { "--reset" }, description = "Reset by removing any custom version settings") boolean reset; - @CommandLine.Option(names = { "--local" }, description = "Retrieve configurations from current directory") - boolean local; + @CommandLine.Option(names = { "--global" }, description = "Use global or local configuration") + boolean global = true; public VersionSet(CamelJBangMain main) { super(main); @@ -52,6 +52,7 @@ public class VersionSet extends CamelCommand { @Override public Integer doCall() throws Exception { + boolean local = !global; CommandLineHelper.createPropertyFile(local); CommandLineHelper.loadProperties(properties -> { diff --git a/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/common/CommandLineHelper.java b/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/common/CommandLineHelper.java index 0c1103977f7..129bfc2f71d 100644 --- a/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/common/CommandLineHelper.java +++ b/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/common/CommandLineHelper.java @@ -37,6 +37,7 @@ public final class CommandLineHelper { private static volatile String homeDir = System.getProperty("user.home"); public static final String USER_CONFIG = ".camel-jbang-user.properties"; + public static final String LOCAL_USER_CONFIG = "camel-jbang-user.properties"; public static final String CAMEL_DIR = ".camel"; public static final String CAMEL_JBANG_WORK_DIR = ".camel-jbang"; @@ -44,15 +45,11 @@ public final class CommandLineHelper { super(); } - public static void augmentWithUserConfiguration(CommandLine commandLine, boolean mergeConfigurations) { + public static void augmentWithUserConfiguration(CommandLine commandLine) { File file = getUserConfigurationFile(); if (file.isFile() && file.exists()) { Properties properties = new Properties(); try { - if (mergeConfigurations) { - properties.load(new FileReader(getUserPropertyFile(false))); - } - properties.load(new FileReader(file)); } catch (IOException e) { commandLine.setDefaultValueProvider(new CamelUserConfigDefaultValueProvider(file)); @@ -64,8 +61,8 @@ public final class CommandLineHelper { private static File getUserConfigurationFile() { File file; - if (Files.exists(Path.of(USER_CONFIG))) { - file = new File(USER_CONFIG); + if (Files.exists(Path.of(LOCAL_USER_CONFIG))) { + file = new File(LOCAL_USER_CONFIG); } else { file = getUserPropertyFile(false); } @@ -109,7 +106,7 @@ public final class CommandLineHelper { throw new RuntimeException(ex); } } else { - printer.println(USER_CONFIG + " does not exist"); + printer.println(file.getName() + " does not exist"); } } @@ -121,7 +118,7 @@ public final class CommandLineHelper { */ private static File getUserPropertyFile(boolean local) { if (local) { - return new File(USER_CONFIG); + return new File(LOCAL_USER_CONFIG); } else { return new File(homeDir, USER_CONFIG); } diff --git a/dsl/camel-jbang/camel-jbang-core/src/test/java/org/apache/camel/dsl/jbang/core/commands/UserConfigHelper.java b/dsl/camel-jbang/camel-jbang-core/src/test/java/org/apache/camel/dsl/jbang/core/commands/UserConfigHelper.java index 8fbb630f2c6..56f0ee8971a 100644 --- a/dsl/camel-jbang/camel-jbang-core/src/test/java/org/apache/camel/dsl/jbang/core/commands/UserConfigHelper.java +++ b/dsl/camel-jbang/camel-jbang-core/src/test/java/org/apache/camel/dsl/jbang/core/commands/UserConfigHelper.java @@ -37,6 +37,7 @@ public final class UserConfigHelper { public static void createUserConfig(String content, boolean local) throws IOException { Path userConfigDir; + String configFileName = CommandLineHelper.USER_CONFIG; if (!local) { CommandLineHelper.useHomeDir("target"); userConfigDir = Paths.get("target"); @@ -45,9 +46,10 @@ public final class UserConfigHelper { } } else { userConfigDir = Paths.get("."); + configFileName = CommandLineHelper.LOCAL_USER_CONFIG; } - Files.writeString(userConfigDir.resolve(CommandLineHelper.USER_CONFIG), content, + Files.writeString(userConfigDir.resolve(configFileName), content, StandardOpenOption.CREATE, StandardOpenOption.WRITE, StandardOpenOption.TRUNCATE_EXISTING); diff --git a/dsl/camel-jbang/camel-jbang-core/src/test/java/org/apache/camel/dsl/jbang/core/commands/config/BaseConfigTest.java b/dsl/camel-jbang/camel-jbang-core/src/test/java/org/apache/camel/dsl/jbang/core/commands/config/BaseConfigTest.java index 9f7cd2bb9b0..93815174be9 100644 --- a/dsl/camel-jbang/camel-jbang-core/src/test/java/org/apache/camel/dsl/jbang/core/commands/config/BaseConfigTest.java +++ b/dsl/camel-jbang/camel-jbang-core/src/test/java/org/apache/camel/dsl/jbang/core/commands/config/BaseConfigTest.java @@ -28,6 +28,6 @@ public class BaseConfigTest extends CamelCommandBaseTest { @AfterEach void removeLocalConfigFile() throws IOException { - Files.deleteIfExists(Paths.get(CommandLineHelper.USER_CONFIG)); + Files.deleteIfExists(Paths.get(CommandLineHelper.LOCAL_USER_CONFIG)); } } diff --git a/dsl/camel-jbang/camel-jbang-core/src/test/java/org/apache/camel/dsl/jbang/core/commands/config/ConfigGetTest.java b/dsl/camel-jbang/camel-jbang-core/src/test/java/org/apache/camel/dsl/jbang/core/commands/config/ConfigGetTest.java index 3c4556aa0b3..34a3c0505b7 100644 --- a/dsl/camel-jbang/camel-jbang-core/src/test/java/org/apache/camel/dsl/jbang/core/commands/config/ConfigGetTest.java +++ b/dsl/camel-jbang/camel-jbang-core/src/test/java/org/apache/camel/dsl/jbang/core/commands/config/ConfigGetTest.java @@ -52,7 +52,7 @@ class ConfigGetTest extends BaseConfigTest { ConfigGet command = new ConfigGet(new CamelJBangMain().withPrinter(printer)); command.key = "foo"; - command.local = true; + command.global = false; command.doCall(); Assertions.assertEquals("bar", printer.getOutput()); diff --git a/dsl/camel-jbang/camel-jbang-core/src/test/java/org/apache/camel/dsl/jbang/core/commands/config/ConfigListTest.java b/dsl/camel-jbang/camel-jbang-core/src/test/java/org/apache/camel/dsl/jbang/core/commands/config/ConfigListTest.java index 7058d3266fd..28e2a8174b9 100644 --- a/dsl/camel-jbang/camel-jbang-core/src/test/java/org/apache/camel/dsl/jbang/core/commands/config/ConfigListTest.java +++ b/dsl/camel-jbang/camel-jbang-core/src/test/java/org/apache/camel/dsl/jbang/core/commands/config/ConfigListTest.java @@ -48,10 +48,11 @@ class ConfigListTest extends BaseConfigTest { command.doCall(); List<String> lines = printer.getLines(); - Assertions.assertEquals(3, lines.size()); - Assertions.assertEquals("camel-version = latest", lines.get(0)); - Assertions.assertEquals("kamelets-version = greatest", lines.get(1)); - Assertions.assertEquals("foo = bar", lines.get(2)); + Assertions.assertEquals(4, lines.size()); + Assertions.assertEquals("----- Global -----", lines.get(0)); + Assertions.assertEquals("camel-version = latest", lines.get(1)); + Assertions.assertEquals("kamelets-version = greatest", lines.get(2)); + Assertions.assertEquals("foo = bar", lines.get(3)); } @Test @@ -62,12 +63,33 @@ class ConfigListTest extends BaseConfigTest { """, true); ConfigList command = new ConfigList(new CamelJBangMain().withPrinter(printer)); - command.local = true; + command.global = false; + command.doCall(); + + List<String> lines = printer.getLines(); + Assertions.assertEquals(3, lines.size()); + Assertions.assertEquals("----- Local -----", lines.get(0)); + Assertions.assertEquals("camel-version = local", lines.get(1)); + Assertions.assertEquals("kamelets-version = local", lines.get(2)); + } + + @Test + public void shouldListGlobalAndLocalUserConfig() throws Exception { + UserConfigHelper.createUserConfig(""" + camel-version=local + """, true); + UserConfigHelper.createUserConfig(""" + kamelets-version=global + """); + + ConfigList command = new ConfigList(new CamelJBangMain().withPrinter(printer)); command.doCall(); List<String> lines = printer.getLines(); - Assertions.assertEquals(2, lines.size()); - Assertions.assertEquals("camel-version = local", lines.get(0)); - Assertions.assertEquals("kamelets-version = local", lines.get(1)); + Assertions.assertEquals(4, lines.size()); + Assertions.assertEquals("----- Local -----", lines.get(0)); + Assertions.assertEquals("camel-version = local", lines.get(1)); + Assertions.assertEquals("----- Global -----", lines.get(2)); + Assertions.assertEquals("kamelets-version = global", lines.get(3)); } } diff --git a/dsl/camel-jbang/camel-jbang-core/src/test/java/org/apache/camel/dsl/jbang/core/commands/config/ConfigSetTest.java b/dsl/camel-jbang/camel-jbang-core/src/test/java/org/apache/camel/dsl/jbang/core/commands/config/ConfigSetTest.java index 9165bc2f086..d20c201bc28 100644 --- a/dsl/camel-jbang/camel-jbang-core/src/test/java/org/apache/camel/dsl/jbang/core/commands/config/ConfigSetTest.java +++ b/dsl/camel-jbang/camel-jbang-core/src/test/java/org/apache/camel/dsl/jbang/core/commands/config/ConfigSetTest.java @@ -61,7 +61,7 @@ class ConfigSetTest extends BaseConfigTest { public void setLocalConfig() throws Exception { ConfigSet command = new ConfigSet(new CamelJBangMain().withPrinter(printer)); command.configuration = "foo=local"; - command.local = true; + command.global = false; command.doCall(); Assertions.assertEquals("", printer.getOutput()); diff --git a/dsl/camel-jbang/camel-jbang-core/src/test/java/org/apache/camel/dsl/jbang/core/commands/config/ConfigUnsetTest.java b/dsl/camel-jbang/camel-jbang-core/src/test/java/org/apache/camel/dsl/jbang/core/commands/config/ConfigUnsetTest.java index a1c7f6bb2bf..4a7db6d2201 100644 --- a/dsl/camel-jbang/camel-jbang-core/src/test/java/org/apache/camel/dsl/jbang/core/commands/config/ConfigUnsetTest.java +++ b/dsl/camel-jbang/camel-jbang-core/src/test/java/org/apache/camel/dsl/jbang/core/commands/config/ConfigUnsetTest.java @@ -75,7 +75,7 @@ class ConfigUnsetTest extends BaseConfigTest { ConfigUnset command = new ConfigUnset(new CamelJBangMain().withPrinter(printer)); command.key = "foo"; - command.local = true; + command.global = false; command.doCall(); Assertions.assertEquals("", printer.getOutput());
