Skip to content

Commit f1af4ed

Browse files
cstamascstamas
committed
WIP
1 parent 9bf6561 commit f1af4ed

File tree

23 files changed

+115
-138
lines changed

23 files changed

+115
-138
lines changed

‎cli/src/main/java/eu/maveniverse/maven/toolbox/cli/Classpath.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ public final class Classpath extends ResolverCommandSupport {
3535

3636
@Override
3737
protected boolean doCall(Context context) throws Exception {
38-
ToolboxCommando toolboxCommando = ToolboxCommando.getOrCreate(context);
38+
ToolboxCommando toolboxCommando = getToolboxCommando(context);
3939
return toolboxCommando.classpath(
4040
ResolutionScope.parse(resolutionScope),
4141
toolboxCommando.toolboxResolver().loadGav(gav, boms),

‎cli/src/main/java/eu/maveniverse/maven/toolbox/cli/CommandSupport.java

+5-77
Original file line numberDiff line numberDiff line change
@@ -19,9 +19,6 @@
1919

2020
import eu.maveniverse.maven.mima.context.Context;
2121
import eu.maveniverse.maven.mima.context.ContextOverrides;
22-
import eu.maveniverse.maven.mima.context.HTTPProxy;
23-
import eu.maveniverse.maven.mima.context.MavenSystemHome;
24-
import eu.maveniverse.maven.mima.context.MavenUserHome;
2522
import eu.maveniverse.maven.mima.context.Runtime;
2623
import eu.maveniverse.maven.mima.context.Runtimes;
2724
import eu.maveniverse.maven.toolbox.shared.Output;
@@ -33,13 +30,11 @@
3330
import java.util.Arrays;
3431
import java.util.HashMap;
3532
import java.util.List;
36-
import java.util.Map;
3733
import java.util.concurrent.Callable;
3834
import java.util.concurrent.ConcurrentHashMap;
3935
import java.util.function.Supplier;
4036
import org.apache.maven.settings.Proxy;
4137
import org.apache.maven.settings.Settings;
42-
import org.eclipse.aether.repository.RemoteRepository;
4338
import org.jline.jansi.Ansi;
4439
import org.slf4j.helpers.MessageFormatter;
4540
import picocli.CommandLine;
@@ -142,81 +137,10 @@ protected void push(String key, Object object) {
142137
public String[] getVersion() {
143138
return new String[] {
144139
"MIMA " + getRuntime().version(),
145-
"Toolbox " + ToolboxCommando.getOrCreate(getContext()).getVersion()
140+
"Toolbox " + getToolboxCommando(getContext()).getVersion()
146141
};
147142
}
148143

149-
protected void mayDumpEnv(Runtime runtime, Context context, boolean verbose) {
150-
warn(
151-
"Toolbox {} (MIMA Runtime '{}' version {})",
152-
ToolboxCommando.getOrCreate(getContext()).getVersion(),
153-
runtime.name(),
154-
runtime.version());
155-
warn("=======");
156-
normal(" Maven version {}", runtime.mavenVersion());
157-
normal(" Managed {}", runtime.managedRepositorySystem());
158-
normal(" Basedir {}", context.basedir());
159-
normal(" Offline {}", context.repositorySystemSession().isOffline());
160-
161-
MavenSystemHome mavenSystemHome = context.mavenSystemHome();
162-
normal("");
163-
normal(" MAVEN_HOME {}", mavenSystemHome == null ? "undefined" : mavenSystemHome.basedir());
164-
if (mavenSystemHome != null) {
165-
normal(" settings.xml {}", mavenSystemHome.settingsXml());
166-
normal(" toolchains.xml {}", mavenSystemHome.toolchainsXml());
167-
}
168-
169-
MavenUserHome mavenUserHome = context.mavenUserHome();
170-
normal("");
171-
normal(" USER_HOME {}", mavenUserHome.basedir());
172-
normal(" settings.xml {}", mavenUserHome.settingsXml());
173-
normal(" settings-security.xml {}", mavenUserHome.settingsSecurityXml());
174-
normal(" local repository {}", mavenUserHome.localRepository());
175-
176-
normal("");
177-
normal(" PROFILES");
178-
normal(" Active {}", context.contextOverrides().getActiveProfileIds());
179-
normal(" Inactive {}", context.contextOverrides().getInactiveProfileIds());
180-
181-
normal("");
182-
normal(" REMOTE REPOSITORIES");
183-
for (RemoteRepository repository : context.remoteRepositories()) {
184-
if (repository.getMirroredRepositories().isEmpty()) {
185-
normal(" {}", repository);
186-
} else {
187-
normal(" {}, mirror of", repository);
188-
for (RemoteRepository mirrored : repository.getMirroredRepositories()) {
189-
normal(" {}", mirrored);
190-
}
191-
}
192-
}
193-
194-
if (context.httpProxy() != null) {
195-
HTTPProxy proxy = context.httpProxy();
196-
normal("");
197-
normal(" HTTP PROXY");
198-
normal(" url {}://{}:{}", proxy.getProtocol(), proxy.getHost(), proxy.getPort());
199-
normal(" nonProxyHosts {}", proxy.getNonProxyHosts());
200-
}
201-
202-
if (verbose) {
203-
verbose("");
204-
verbose(" USER PROPERTIES");
205-
context.contextOverrides().getUserProperties().entrySet().stream()
206-
.sorted(Map.Entry.comparingByKey())
207-
.forEach(e -> verbose(" {}={}", e.getKey(), e.getValue()));
208-
verbose(" SYSTEM PROPERTIES");
209-
context.contextOverrides().getSystemProperties().entrySet().stream()
210-
.sorted(Map.Entry.comparingByKey())
211-
.forEach(e -> verbose(" {}={}", e.getKey(), e.getValue()));
212-
verbose(" CONFIG PROPERTIES");
213-
context.contextOverrides().getConfigProperties().entrySet().stream()
214-
.sorted(Map.Entry.comparingByKey())
215-
.forEach(e -> verbose(" {}={}", e.getKey(), e.getValue()));
216-
}
217-
verbose("");
218-
}
219-
220144
protected Runtime getRuntime() {
221145
return (Runtime) getOrCreate(Runtime.class.getName(), Runtimes.INSTANCE::getRuntime);
222146
}
@@ -461,6 +385,10 @@ protected String getLocation(final StackTraceElement e) {
461385
}
462386
}
463387

388+
protected ToolboxCommando getToolboxCommando(Context context) {
389+
return ToolboxCommando.getOrCreate(getRuntime(), context);
390+
}
391+
464392
@Override
465393
public final Integer call() {
466394
Ansi.setEnabled(!batch);

‎cli/src/main/java/eu/maveniverse/maven/toolbox/cli/CopyAll.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ public final class CopyAll extends ResolverCommandSupport {
4141
@Override
4242
protected boolean doCall(Context context) throws Exception {
4343
Path targetPath = target.toAbsolutePath();
44-
ToolboxCommando toolboxCommando = ToolboxCommando.getOrCreate(context);
44+
ToolboxCommando toolboxCommando = getToolboxCommando(context);
4545
return toolboxCommando.copyAll(
4646
ResolutionScope.parse(resolutionScope),
4747
toolboxCommando.toolboxResolver().loadGav(gav, boms),

‎cli/src/main/java/eu/maveniverse/maven/toolbox/cli/Deploy.java

+1-2
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,6 @@
99

1010
import eu.maveniverse.maven.mima.context.Context;
1111
import eu.maveniverse.maven.toolbox.shared.Artifacts;
12-
import eu.maveniverse.maven.toolbox.shared.ToolboxCommando;
1312
import java.nio.file.Path;
1413
import org.eclipse.aether.deployment.DeploymentException;
1514
import picocli.CommandLine;
@@ -57,6 +56,6 @@ protected boolean doCall(Context context) throws DeploymentException {
5756
if (javadoc != null) {
5857
artifacts.addJavadoc(javadoc);
5958
}
60-
return ToolboxCommando.getOrCreate(getContext()).deploy(remoteRepositorySpec, artifacts, output);
59+
return getToolboxCommando(context).deploy(remoteRepositorySpec, artifacts, output);
6160
}
6261
}

‎cli/src/main/java/eu/maveniverse/maven/toolbox/cli/DeployRecorded.java

+1-2
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,6 @@
88
package eu.maveniverse.maven.toolbox.cli;
99

1010
import eu.maveniverse.maven.mima.context.Context;
11-
import eu.maveniverse.maven.toolbox.shared.ToolboxCommando;
1211
import org.eclipse.aether.deployment.DeploymentException;
1312
import picocli.CommandLine;
1413

@@ -22,6 +21,6 @@ public final class DeployRecorded extends ResolverCommandSupport {
2221

2322
@Override
2423
protected boolean doCall(Context context) throws DeploymentException {
25-
return ToolboxCommando.getOrCreate(getContext()).deployAllRecorded(remoteRepositorySpec, true, output);
24+
return getToolboxCommando(context).deployAllRecorded(remoteRepositorySpec, true, output);
2625
}
2726
}

‎cli/src/main/java/eu/maveniverse/maven/toolbox/cli/Dump.java

+1-2
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,6 @@
1717
public final class Dump extends CommandSupport {
1818
@Override
1919
protected boolean doCall(Context context) {
20-
mayDumpEnv(getRuntime(), context, true);
21-
return true;
20+
return getToolboxCommando(context).dump(verbose, output);
2221
}
2322
}

‎cli/src/main/java/eu/maveniverse/maven/toolbox/cli/Exists.java

+1-2
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,6 @@
88
package eu.maveniverse.maven.toolbox.cli;
99

1010
import eu.maveniverse.maven.mima.context.Context;
11-
import eu.maveniverse.maven.toolbox.shared.ToolboxCommando;
1211
import java.io.IOException;
1312
import picocli.CommandLine;
1413

@@ -49,7 +48,7 @@ public final class Exists extends SearchCommandSupport {
4948

5049
@Override
5150
protected boolean doCall(Context context) throws IOException {
52-
return ToolboxCommando.getOrCreate(context)
51+
return getToolboxCommando(context)
5352
.exists(getRemoteRepository(), gav, pom, sources, javadoc, signature, allRequired, output);
5453
}
5554
}

‎cli/src/main/java/eu/maveniverse/maven/toolbox/cli/Identify.java

+1-2
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,6 @@
88
package eu.maveniverse.maven.toolbox.cli;
99

1010
import eu.maveniverse.maven.mima.context.Context;
11-
import eu.maveniverse.maven.toolbox.shared.ToolboxCommando;
1211
import java.io.IOException;
1312
import picocli.CommandLine;
1413

@@ -23,6 +22,6 @@ public final class Identify extends SearchCommandSupport {
2322

2423
@Override
2524
protected boolean doCall(Context context) throws IOException {
26-
return ToolboxCommando.getOrCreate(context).identify(getRemoteRepository(), target, output);
25+
return getToolboxCommando(context).identify(getRemoteRepository(), target, output);
2726
}
2827
}

‎cli/src/main/java/eu/maveniverse/maven/toolbox/cli/Install.java

+1-2
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,6 @@
99

1010
import eu.maveniverse.maven.mima.context.Context;
1111
import eu.maveniverse.maven.toolbox.shared.Artifacts;
12-
import eu.maveniverse.maven.toolbox.shared.ToolboxCommando;
1312
import java.nio.file.Path;
1413
import org.eclipse.aether.installation.InstallationException;
1514
import picocli.CommandLine;
@@ -54,6 +53,6 @@ protected boolean doCall(Context context) throws InstallationException {
5453
if (javadoc != null) {
5554
artifacts.addJavadoc(javadoc);
5655
}
57-
return ToolboxCommando.getOrCreate(getContext()).install(artifacts, output);
56+
return getToolboxCommando(context).install(artifacts, output);
5857
}
5958
}

‎cli/src/main/java/eu/maveniverse/maven/toolbox/cli/List.java

+1-2
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,6 @@
88
package eu.maveniverse.maven.toolbox.cli;
99

1010
import eu.maveniverse.maven.mima.context.Context;
11-
import eu.maveniverse.maven.toolbox.shared.ToolboxCommando;
1211
import java.io.IOException;
1312
import picocli.CommandLine;
1413

@@ -23,6 +22,6 @@ public final class List extends SearchCommandSupport {
2322

2423
@Override
2524
protected boolean doCall(Context context) throws IOException {
26-
return ToolboxCommando.getOrCreate(context).list(getRemoteRepository(), gavoid, output);
25+
return getToolboxCommando(context).list(getRemoteRepository(), gavoid, output);
2726
}
2827
}

‎cli/src/main/java/eu/maveniverse/maven/toolbox/cli/ListAvailablePlugins.java

+1-2
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,6 @@
88
package eu.maveniverse.maven.toolbox.cli;
99

1010
import eu.maveniverse.maven.mima.context.Context;
11-
import eu.maveniverse.maven.toolbox.shared.ToolboxCommando;
1211
import picocli.CommandLine;
1312

1413
/**
@@ -22,6 +21,6 @@ public final class ListAvailablePlugins extends ResolverCommandSupport {
2221

2322
@Override
2423
protected boolean doCall(Context context) throws Exception {
25-
return ToolboxCommando.getOrCreate(context).listAvailablePlugins(groupIds, output);
24+
return getToolboxCommando(context).listAvailablePlugins(groupIds, output);
2625
}
2726
}

‎cli/src/main/java/eu/maveniverse/maven/toolbox/cli/ListRepositories.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ public final class ListRepositories extends ResolverCommandSupport {
3535

3636
@Override
3737
protected boolean doCall(Context context) throws Exception {
38-
ToolboxCommando toolboxCommando = ToolboxCommando.getOrCreate(context);
38+
ToolboxCommando toolboxCommando = getToolboxCommando(context);
3939
return toolboxCommando.listRepositories(
4040
ResolutionScope.parse(resolutionScope),
4141
toolboxCommando.toolboxResolver().loadGav(gav, boms),

‎cli/src/main/java/eu/maveniverse/maven/toolbox/cli/Main.java

+1-2
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,6 @@
3232
Resolve.class,
3333
Search.class,
3434
Tree.class,
35-
Test.class,
3635
Verify.class
3736
},
3837
versionProvider = Main.class,
@@ -41,7 +40,7 @@
4140
public class Main extends CommandSupport {
4241
@Override
4342
protected boolean doCall(Context context) {
44-
mayDumpEnv(getRuntime(), context, false);
43+
getToolboxCommando(context).dump(false, output);
4544
return new Repl().doCall(context);
4645
}
4746

‎cli/src/main/java/eu/maveniverse/maven/toolbox/cli/Record.java

+2-3
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,6 @@
88
package eu.maveniverse.maven.toolbox.cli;
99

1010
import eu.maveniverse.maven.mima.context.Context;
11-
import eu.maveniverse.maven.toolbox.shared.ToolboxCommando;
1211
import org.eclipse.aether.resolution.DependencyResolutionException;
1312
import picocli.CommandLine;
1413

@@ -26,9 +25,9 @@ public final class Record extends ResolverCommandSupport {
2625
@Override
2726
protected boolean doCall(Context context) throws DependencyResolutionException {
2827
if (stop) {
29-
return ToolboxCommando.getOrCreate(context).recordStop(output);
28+
return getToolboxCommando(context).recordStop(output);
3029
} else {
31-
return ToolboxCommando.getOrCreate(context).recordStart(output);
30+
return getToolboxCommando(context).recordStart(output);
3231
}
3332
}
3433
}

‎cli/src/main/java/eu/maveniverse/maven/toolbox/cli/Resolve.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@ public final class Resolve extends ResolverCommandSupport {
5151

5252
@Override
5353
protected boolean doCall(Context context) throws Exception {
54-
ToolboxCommando toolboxCommando = ToolboxCommando.getOrCreate(context);
54+
ToolboxCommando toolboxCommando = getToolboxCommando(context);
5555
return toolboxCommando.resolve(
5656
ResolutionScope.parse(resolutionScope),
5757
toolboxCommando.toolboxResolver().loadGav(gav, boms),

‎cli/src/main/java/eu/maveniverse/maven/toolbox/cli/Search.java

+1-2
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,6 @@
88
package eu.maveniverse.maven.toolbox.cli;
99

1010
import eu.maveniverse.maven.mima.context.Context;
11-
import eu.maveniverse.maven.toolbox.shared.ToolboxCommando;
1211
import java.io.IOException;
1312
import picocli.CommandLine;
1413

@@ -23,6 +22,6 @@ public final class Search extends SearchCommandSupport {
2322

2423
@Override
2524
protected boolean doCall(Context context) throws IOException {
26-
return ToolboxCommando.getOrCreate(context).search(getRemoteRepository(), expression, output);
25+
return getToolboxCommando(context).search(getRemoteRepository(), expression, output);
2726
}
2827
}

‎cli/src/main/java/eu/maveniverse/maven/toolbox/cli/Test.java

-23
This file was deleted.

‎cli/src/main/java/eu/maveniverse/maven/toolbox/cli/Tree.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ public final class Tree extends ResolverCommandSupport {
4242

4343
@Override
4444
protected boolean doCall(Context context) throws Exception {
45-
ToolboxCommando toolboxCommando = ToolboxCommando.getOrCreate(context);
45+
ToolboxCommando toolboxCommando = getToolboxCommando(context);
4646
return toolboxCommando.tree(
4747
ResolutionScope.parse(resolutionScope),
4848
toolboxCommando.toolboxResolver().loadGav(gav, boms),

‎cli/src/main/java/eu/maveniverse/maven/toolbox/cli/Verify.java

+1-2
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,6 @@
88
package eu.maveniverse.maven.toolbox.cli;
99

1010
import eu.maveniverse.maven.mima.context.Context;
11-
import eu.maveniverse.maven.toolbox.shared.ToolboxCommando;
1211
import java.io.IOException;
1312
import picocli.CommandLine;
1413

@@ -26,6 +25,6 @@ public final class Verify extends SearchCommandSupport {
2625

2726
@Override
2827
protected boolean doCall(Context context) throws IOException {
29-
return ToolboxCommando.getOrCreate(context).verify(getRemoteRepository(), gav, sha1, output);
28+
return getToolboxCommando(context).verify(getRemoteRepository(), gav, sha1, output);
3029
}
3130
}

‎maven-plugin/src/main/java/eu/maveniverse/maven/toolbox/plugin/GavTreeMojo.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,7 @@ public void execute() throws MojoExecutionException, MojoFailureException {
6060
try (Context context = runtime.create(ContextOverrides.create().build())) {
6161
ResolutionRoot root =
6262
ResolutionRoot.ofLoaded(new DefaultArtifact(gav)).build();
63-
ToolboxCommando.getOrCreate(context)
63+
ToolboxCommando.getOrCreate(runtime, context)
6464
.tree(ResolutionScope.parse(scope), root, false, new Slf4jOutput(logger));
6565
} catch (RuntimeException e) {
6666
throw new MojoExecutionException(e);

‎maven-plugin/src/main/java/eu/maveniverse/maven/toolbox/plugin/TreeMojo.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,7 @@ public void execute() throws MojoExecutionException, MojoFailureException {
6363
mavenProject,
6464
artifactHandlerManager,
6565
context.repositorySystemSession().getArtifactTypeRegistry());
66-
ToolboxCommando.getOrCreate(context)
66+
ToolboxCommando.getOrCreate(runtime, context)
6767
.tree(ResolutionScope.parse(scope), root, false, new Slf4jOutput(logger));
6868
} catch (RuntimeException e) {
6969
throw new MojoExecutionException(e.getCause());

0 commit comments

Comments
 (0)