You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ignite.apache.org by vk...@apache.org on 2020/12/24 18:50:40 UTC
[ignite-3] branch main updated: IGNITE-13898 Init directories in
home directory instead of current (#15)
This is an automated email from the ASF dual-hosted git repository.
vkulichenko 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 a202a14 IGNITE-13898 Init directories in home directory instead of current (#15)
a202a14 is described below
commit a202a1433352da62b7e2ca3a77d717a100c558c9
Author: Kirill Gusakov <kg...@gmail.com>
AuthorDate: Thu Dec 24 21:50:32 2020 +0300
IGNITE-13898 Init directories in home directory instead of current (#15)
---
.../java/org/apache/ignite/cli/builtins/SystemPathResolver.java | 6 ------
.../org/apache/ignite/cli/builtins/init/InitIgniteCommand.java | 8 ++++----
.../apache/ignite/cli/builtins/init/InitIgniteCommandTest.java | 2 --
3 files changed, 4 insertions(+), 12 deletions(-)
diff --git a/modules/cli-demo/cli/src/main/java/org/apache/ignite/cli/builtins/SystemPathResolver.java b/modules/cli-demo/cli/src/main/java/org/apache/ignite/cli/builtins/SystemPathResolver.java
index eacef87..28f085e 100644
--- a/modules/cli-demo/cli/src/main/java/org/apache/ignite/cli/builtins/SystemPathResolver.java
+++ b/modules/cli-demo/cli/src/main/java/org/apache/ignite/cli/builtins/SystemPathResolver.java
@@ -25,8 +25,6 @@ public interface SystemPathResolver {
Path osHomeDirectoryPath();
- Path osCurrentDirPath();
-
/**
*
*/
@@ -38,9 +36,5 @@ public interface SystemPathResolver {
return Path.of(System.getProperty("user.home"));
}
- @Override public Path osCurrentDirPath() {
- return Path.of(System.getProperty("user.dir"));
- }
-
}
}
diff --git a/modules/cli-demo/cli/src/main/java/org/apache/ignite/cli/builtins/init/InitIgniteCommand.java b/modules/cli-demo/cli/src/main/java/org/apache/ignite/cli/builtins/init/InitIgniteCommand.java
index cb98ae0..108a329 100644
--- a/modules/cli-demo/cli/src/main/java/org/apache/ignite/cli/builtins/init/InitIgniteCommand.java
+++ b/modules/cli-demo/cli/src/main/java/org/apache/ignite/cli/builtins/init/InitIgniteCommand.java
@@ -57,9 +57,9 @@ public class InitIgniteCommand {
public void init(PrintWriter out, ColorScheme cs) {
moduleManager.setOut(out);
Optional<IgnitePaths> ignitePathsOpt = cliPathsConfigLoader.loadIgnitePathsConfig();
- if (ignitePathsOpt.isEmpty()) {
+ if (ignitePathsOpt.isEmpty())
initConfigFile();
- }
+
IgnitePaths cfg = cliPathsConfigLoader.loadIgnitePathsConfig().get();
out.print("Creating directories... ");
cfg.initOrRecover();
@@ -101,8 +101,8 @@ public class InitIgniteCommand {
File newCfgFile = newCfgPath.toFile();
try {
newCfgFile.createNewFile();
- Path binDir = pathResolver.osCurrentDirPath().resolve("ignite-bin");
- Path workDir = pathResolver.osCurrentDirPath().resolve("ignite-work");
+ Path binDir = pathResolver.osHomeDirectoryPath().resolve("ignite").resolve("bin");
+ Path workDir = pathResolver.osHomeDirectoryPath().resolve("ignite").resolve("work");
fillNewConfigFile(newCfgFile, binDir, workDir);
return newCfgFile;
}
diff --git a/modules/cli-demo/cli/src/test/java/org/apache/ignite/cli/builtins/init/InitIgniteCommandTest.java b/modules/cli-demo/cli/src/test/java/org/apache/ignite/cli/builtins/init/InitIgniteCommandTest.java
index 654440e..52aa308 100644
--- a/modules/cli-demo/cli/src/test/java/org/apache/ignite/cli/builtins/init/InitIgniteCommandTest.java
+++ b/modules/cli-demo/cli/src/test/java/org/apache/ignite/cli/builtins/init/InitIgniteCommandTest.java
@@ -43,7 +43,6 @@ public class InitIgniteCommandTest {
@Test
void init() throws IOException {
when(pathResolver.osHomeDirectoryPath()).thenReturn(homeDir);
- when(pathResolver.osCurrentDirPath()).thenReturn(currentDir);
when(mavenArtifactResolver.resolve(any(), any(), any(), any(), any()))
.thenReturn(new ResolveResult(Arrays.asList()));
@@ -58,7 +57,6 @@ public class InitIgniteCommandTest {
@Test
void reinit() throws IOException {
when(pathResolver.osHomeDirectoryPath()).thenReturn(homeDir);
- when(pathResolver.osCurrentDirPath()).thenReturn(currentDir);
when(mavenArtifactResolver.resolve(any(), any(), any(), any(), any()))
.thenReturn(new ResolveResult(Collections.emptyList()));