Skip to content

Commit 538b650

Browse files
committed
chore: minor code cleanup
1 parent 7984ce5 commit 538b650

File tree

2 files changed

+4
-6
lines changed

2 files changed

+4
-6
lines changed

src/main/java/dev/jbang/catalog/Alias.java

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,6 @@ public class Alias extends CatalogItem {
5858
public final Map<String, String> manifestOptions;
5959
@SerializedName(value = "java-agents")
6060
public final List<JavaAgent> javaAgents;
61-
@SerializedName(value = "docs")
6261
public final String docs;
6362

6463
public static class JavaAgent {
@@ -250,12 +249,11 @@ private static Alias merge(Alias a1, String name, Function<String, Alias> findUn
250249
Map<String, String> mopts = a1.manifestOptions != null && !a1.manifestOptions.isEmpty() ? a1.manifestOptions
251250
: a2.manifestOptions;
252251
List<JavaAgent> jags = a1.javaAgents != null && !a1.javaAgents.isEmpty() ? a1.javaAgents : a2.javaAgents;
253-
String docsRef = a1.docs != null ? a1.docs : a2.docs;
252+
String docs = a1.docs != null ? a1.docs : a2.docs;
254253
Catalog catalog = a2.catalog != null ? a2.catalog : a1.catalog;
255254
return new Alias(a2.scriptRef, desc, args, jopts, srcs, ress, deps, repos, cpaths, props, javaVersion,
256255
mainClass, moduleName, copts, nimg, nopts, ints, jfr, debug, cds, inter, ep, ea, esa, mopts, jags,
257-
docsRef,
258-
catalog);
256+
docs, catalog);
259257
} else {
260258
return a1;
261259
}

src/main/java/dev/jbang/cli/Alias.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -95,7 +95,7 @@ class AliasAdd extends BaseAliasCommand {
9595
List<String> userParams;
9696

9797
@CommandLine.Option(names = { "--docs" }, description = "Documentation reference for the alias")
98-
String docsRef;
98+
String docs;
9999

100100
@Override
101101
public Integer doCall() {
@@ -121,7 +121,7 @@ public Integer doCall() {
121121
buildMixin.compileOptions, nativeMixin.nativeImage, nativeMixin.nativeOptions, buildMixin.integrations,
122122
runMixin.flightRecorderString, runMixin.debugString, runMixin.cds, runMixin.interactive,
123123
enablePreviewRequested, runMixin.enableAssertions, runMixin.enableSystemAssertions,
124-
buildMixin.manifestOptions, createJavaAgents(), docsRef, null);
124+
buildMixin.manifestOptions, createJavaAgents(), docs, null);
125125
Path catFile = getCatalog(false);
126126
if (catFile == null) {
127127
catFile = Catalog.getCatalogFile(null);

0 commit comments

Comments
 (0)