This is an automated email from the ASF dual-hosted git repository.
apkhmv pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/ignite-3.git
The following commit(s) were added to refs/heads/main by this push:
new d1841247ce IGNITE-19283 JDBC URL is not taken from the session (#1936)
d1841247ce is described below
commit d1841247cee8c62a101b3a0b41b0937f442094fd
Author: Vadim Pakhnushev <[email protected]>
AuthorDate: Mon Apr 17 20:26:24 2023 +0300
IGNITE-19283 JDBC URL is not taken from the session (#1936)
---
.../ignite/internal/cli/commands/Options.java | 3 ++
.../internal/cli/commands/sql/SqlCommand.java | 3 +-
.../internal/cli/commands/sql/SqlReplCommand.java | 3 +-
.../internal/cli/config/ConfigConstants.java | 15 ------
.../cli/config/ConfigDefaultValueProvider.java | 8 +--
.../cli/core/repl/SessionDefaultValueProvider.java | 6 +--
.../ignite/internal/cli/core/repl/SessionInfo.java | 7 ---
.../core/repl/SessionDefaultValueProviderTest.java | 63 ++++++++++++++++++++++
8 files changed, 78 insertions(+), 30 deletions(-)
diff --git
a/modules/cli/src/main/java/org/apache/ignite/internal/cli/commands/Options.java
b/modules/cli/src/main/java/org/apache/ignite/internal/cli/commands/Options.java
index 07cc822532..cc4f3b2874 100644
---
a/modules/cli/src/main/java/org/apache/ignite/internal/cli/commands/Options.java
+++
b/modules/cli/src/main/java/org/apache/ignite/internal/cli/commands/Options.java
@@ -215,6 +215,9 @@ public enum Options {
/** JDBC URL option description. */
public static final String JDBC_URL_OPTION_DESC = "JDBC url to ignite
cluster";
+ /** JDBC URL option description key. */
+ public static final String JDBC_URL_KEY =
CliConfigKeys.Constants.JDBC_URL;
+
/** SQL script file option long name. */
public static final String SCRIPT_FILE_OPTION = "--script-file";
diff --git
a/modules/cli/src/main/java/org/apache/ignite/internal/cli/commands/sql/SqlCommand.java
b/modules/cli/src/main/java/org/apache/ignite/internal/cli/commands/sql/SqlCommand.java
index 882440eba9..493e5a2bb8 100644
---
a/modules/cli/src/main/java/org/apache/ignite/internal/cli/commands/sql/SqlCommand.java
+++
b/modules/cli/src/main/java/org/apache/ignite/internal/cli/commands/sql/SqlCommand.java
@@ -17,6 +17,7 @@
package org.apache.ignite.internal.cli.commands.sql;
+import static
org.apache.ignite.internal.cli.commands.Options.Constants.JDBC_URL_KEY;
import static
org.apache.ignite.internal.cli.commands.Options.Constants.JDBC_URL_OPTION;
import static
org.apache.ignite.internal.cli.commands.Options.Constants.JDBC_URL_OPTION_DESC;
import static
org.apache.ignite.internal.cli.commands.Options.Constants.JDBC_URL_OPTION_SHORT;
@@ -52,7 +53,7 @@ import picocli.CommandLine.Parameters;
@Command(name = "sql", description = "Executes SQL query")
public class SqlCommand extends BaseCommand implements Callable<Integer> {
@Option(names = {JDBC_URL_OPTION, JDBC_URL_OPTION_SHORT}, required = true,
- descriptionKey = "ignite.jdbc-url", description =
JDBC_URL_OPTION_DESC)
+ descriptionKey = JDBC_URL_KEY, description = JDBC_URL_OPTION_DESC)
private String jdbc;
@Option(names = PLAIN_OPTION, description = PLAIN_OPTION_DESC)
diff --git
a/modules/cli/src/main/java/org/apache/ignite/internal/cli/commands/sql/SqlReplCommand.java
b/modules/cli/src/main/java/org/apache/ignite/internal/cli/commands/sql/SqlReplCommand.java
index b3acb5465f..9371a4e7c6 100644
---
a/modules/cli/src/main/java/org/apache/ignite/internal/cli/commands/sql/SqlReplCommand.java
+++
b/modules/cli/src/main/java/org/apache/ignite/internal/cli/commands/sql/SqlReplCommand.java
@@ -17,6 +17,7 @@
package org.apache.ignite.internal.cli.commands.sql;
+import static
org.apache.ignite.internal.cli.commands.Options.Constants.JDBC_URL_KEY;
import static
org.apache.ignite.internal.cli.commands.Options.Constants.JDBC_URL_OPTION;
import static
org.apache.ignite.internal.cli.commands.Options.Constants.JDBC_URL_OPTION_DESC;
import static
org.apache.ignite.internal.cli.commands.Options.Constants.JDBC_URL_OPTION_SHORT;
@@ -63,7 +64,7 @@ import picocli.CommandLine.Parameters;
@Command(name = "sql", description = "Executes SQL query")
public class SqlReplCommand extends BaseCommand implements Runnable {
@Option(names = {JDBC_URL_OPTION, JDBC_URL_OPTION_SHORT}, required = true,
- descriptionKey = "ignite.jdbc-url", description =
JDBC_URL_OPTION_DESC)
+ descriptionKey = JDBC_URL_KEY, description = JDBC_URL_OPTION_DESC)
private String jdbc;
@Option(names = PLAIN_OPTION, description = PLAIN_OPTION_DESC)
diff --git
a/modules/cli/src/main/java/org/apache/ignite/internal/cli/config/ConfigConstants.java
b/modules/cli/src/main/java/org/apache/ignite/internal/cli/config/ConfigConstants.java
index 3ded73b0c3..d0bda13167 100644
---
a/modules/cli/src/main/java/org/apache/ignite/internal/cli/config/ConfigConstants.java
+++
b/modules/cli/src/main/java/org/apache/ignite/internal/cli/config/ConfigConstants.java
@@ -54,21 +54,6 @@ public final class ConfigConstants {
*/
public static final String CURRENT_PROFILE = "current_profile";
- /**
- * Default cluster or node URL property name.
- */
- public static final String CLUSTER_URL = "ignite.cluster-endpoint-url";
-
- /**
- * Default JDBC URL property name.
- */
- public static final String JDBC_URL = "ignite.jdbc-url";
-
- /**
- * Last connected URL property name.
- */
- public static final String LAST_CONNECTED_URL =
"ignite.last-connected-url";
-
private ConfigConstants() {
}
diff --git
a/modules/cli/src/main/java/org/apache/ignite/internal/cli/config/ConfigDefaultValueProvider.java
b/modules/cli/src/main/java/org/apache/ignite/internal/cli/config/ConfigDefaultValueProvider.java
index 7eaadd1eac..c0c292c6b6 100644
---
a/modules/cli/src/main/java/org/apache/ignite/internal/cli/config/ConfigDefaultValueProvider.java
+++
b/modules/cli/src/main/java/org/apache/ignite/internal/cli/config/ConfigDefaultValueProvider.java
@@ -17,7 +17,6 @@
package org.apache.ignite.internal.cli.config;
-import jakarta.inject.Inject;
import jakarta.inject.Singleton;
import picocli.CommandLine;
@@ -26,8 +25,11 @@ import picocli.CommandLine;
*/
@Singleton
public class ConfigDefaultValueProvider implements
CommandLine.IDefaultValueProvider {
- @Inject
- private ConfigManagerProvider configManagerProvider;
+ private final ConfigManagerProvider configManagerProvider;
+
+ public ConfigDefaultValueProvider(ConfigManagerProvider
configManagerProvider) {
+ this.configManagerProvider = configManagerProvider;
+ }
@Override
public String defaultValue(CommandLine.Model.ArgSpec argSpec) throws
Exception {
diff --git
a/modules/cli/src/main/java/org/apache/ignite/internal/cli/core/repl/SessionDefaultValueProvider.java
b/modules/cli/src/main/java/org/apache/ignite/internal/cli/core/repl/SessionDefaultValueProvider.java
index ad740701d8..e76349b4e6 100644
---
a/modules/cli/src/main/java/org/apache/ignite/internal/cli/core/repl/SessionDefaultValueProvider.java
+++
b/modules/cli/src/main/java/org/apache/ignite/internal/cli/core/repl/SessionDefaultValueProvider.java
@@ -17,9 +17,9 @@
package org.apache.ignite.internal.cli.core.repl;
+import static
org.apache.ignite.internal.cli.commands.Options.Constants.JDBC_URL_KEY;
+
import jakarta.inject.Singleton;
-import java.util.Objects;
-import org.apache.ignite.internal.cli.config.CliConfigKeys;
import org.apache.ignite.internal.cli.config.ConfigDefaultValueProvider;
import picocli.CommandLine.IDefaultValueProvider;
import picocli.CommandLine.Model.ArgSpec;
@@ -49,7 +49,7 @@ public class SessionDefaultValueProvider implements
IDefaultValueProvider {
public String defaultValue(ArgSpec argSpec) throws Exception {
SessionInfo sessionInfo = session.info();
if (sessionInfo != null) {
- if (Objects.equals(argSpec.descriptionKey(),
CliConfigKeys.JDBC_URL)) {
+ if (JDBC_URL_KEY.equals(argSpec.descriptionKey())) {
return sessionInfo.jdbcUrl();
}
}
diff --git
a/modules/cli/src/main/java/org/apache/ignite/internal/cli/core/repl/SessionInfo.java
b/modules/cli/src/main/java/org/apache/ignite/internal/cli/core/repl/SessionInfo.java
index 5b0139ec4b..da80457c57 100644
---
a/modules/cli/src/main/java/org/apache/ignite/internal/cli/core/repl/SessionInfo.java
+++
b/modules/cli/src/main/java/org/apache/ignite/internal/cli/core/repl/SessionInfo.java
@@ -25,13 +25,6 @@ public class SessionInfo {
private final String jdbcUrl;
- /** Default constructor. */
- public SessionInfo() {
- this.nodeUrl = null;
- this.nodeName = null;
- this.jdbcUrl = null;
- }
-
/** Constructor. */
public SessionInfo(String nodeUrl, String nodeName, String jdbcUrl) {
this.nodeUrl = nodeUrl;
diff --git
a/modules/cli/src/test/java/org/apache/ignite/internal/cli/core/repl/SessionDefaultValueProviderTest.java
b/modules/cli/src/test/java/org/apache/ignite/internal/cli/core/repl/SessionDefaultValueProviderTest.java
new file mode 100644
index 0000000000..c7ca3caa93
--- /dev/null
+++
b/modules/cli/src/test/java/org/apache/ignite/internal/cli/core/repl/SessionDefaultValueProviderTest.java
@@ -0,0 +1,63 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.apache.ignite.internal.cli.core.repl;
+
+import static
org.apache.ignite.internal.cli.commands.Options.Constants.JDBC_URL_KEY;
+import static
org.apache.ignite.internal.cli.commands.Options.Constants.JDBC_URL_OPTION;
+import static
org.apache.ignite.internal.cli.commands.Options.Constants.JDBC_URL_OPTION_DESC;
+import static
org.apache.ignite.internal.cli.commands.Options.Constants.JDBC_URL_OPTION_SHORT;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+
+import java.util.List;
+import
org.apache.ignite.internal.cli.commands.cliconfig.TestConfigManagerProvider;
+import org.apache.ignite.internal.cli.config.ConfigDefaultValueProvider;
+import org.junit.jupiter.api.Test;
+import picocli.CommandLine.Model.OptionSpec;
+
+class SessionDefaultValueProviderTest {
+ private static final String JDBC_URL_CONFIG =
"jdbc:ignite:thin://127.0.0.1:10800";
+ private static final String JDBC_URL_SESSION = "jdbcUrl";
+
+ @Test
+ void jdbcUrl() throws Exception {
+ // Given
+ Session session = new Session(List.of());
+ ConfigDefaultValueProvider configDefaultValueProvider = new
ConfigDefaultValueProvider(new TestConfigManagerProvider());
+ SessionDefaultValueProvider provider = new
SessionDefaultValueProvider(session, configDefaultValueProvider);
+
+ OptionSpec spec = createJdbcUrlSpec();
+
+ // When session is not connected
+ // Then default value is taken from the config
+ assertEquals(JDBC_URL_CONFIG, provider.defaultValue(spec));
+
+ // When session is connected
+ session.connect(new SessionInfo("nodeUrl", "nodeName",
JDBC_URL_SESSION));
+
+ // Then default value is taken from the session
+ assertEquals(JDBC_URL_SESSION, provider.defaultValue(spec));
+ }
+
+ private static OptionSpec createJdbcUrlSpec() {
+ return OptionSpec.builder(JDBC_URL_OPTION, JDBC_URL_OPTION_SHORT)
+ .required(true)
+ .descriptionKey(JDBC_URL_KEY)
+ .description(JDBC_URL_OPTION_DESC)
+ .build();
+ }
+}
