Skip to content

Commit a821169

Browse files
quintessequintesse
authored
refactor: TagReader has become Directives (jbangdev#2215)
1 parent 2f4298b commit a821169

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

62 files changed

+1193
-905
lines changed

‎itests/alltags.java‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,9 @@
88
//FILES res/resource.properties renamed.properties=res/resource.properties
99
//FILES META-INF/application.properties=res/resource.properties
1010

11+
//DOCS javadoc=readme.md
12+
//DOCS readme.adoc
13+
1114
//COMPILE_OPTIONS --enable-preview --verbose
1215
//RUNTIME_OPTIONS --add-opens java.base/java.net=ALL-UNNAMED
1316
//NATIVE_OPTIONS -O1 -d

‎itests/build.jbang‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,4 +3,6 @@ DEPS info.picocli:picocli:4.6.3
33
DESCRIPTION For testing purposes
44
GAV dev.jbang.itests:quote
55
SOURCES quote_notags.java
6+
FILES res/resource.properties renamed.properties=res/resource.properties
7+
DOCS readme.md
68
JAVA_OPTIONS -Dfoo=bar "-Dbar=aap noot mies"

‎src/main/java/dev/jbang/Configuration.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414

1515
import org.codejive.properties.Properties;
1616

17-
import dev.jbang.source.ResourceRef;
17+
import dev.jbang.resources.ResourceRef;
1818
import dev.jbang.util.Util;
1919

2020
public class Configuration {

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

Lines changed: 17 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -44,6 +44,8 @@ public class Alias extends CatalogItem {
4444
public final Boolean nativeImage;
4545
@SerializedName(value = "native-options")
4646
public final List<String> nativeOptions;
47+
@SerializedName(value = "source-type")
48+
public final String forceType;
4749
public final Boolean integrations;
4850
public final String jfr;
4951
public final Map<String, String> debug;
@@ -93,7 +95,7 @@ public int hashCode() {
9395

9496
public Alias() {
9597
this(null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null,
96-
null, null, null, null, null, null, null, null, null, null);
98+
null, null, null, null, null, null, null, null, null, null, null);
9799
}
98100

99101
public Alias(String scriptRef,
@@ -112,6 +114,7 @@ public Alias(String scriptRef,
112114
List<String> compileOptions,
113115
Boolean nativeImage,
114116
List<String> nativeOptions,
117+
String forceType,
115118
Boolean integrations,
116119
String jfr,
117120
Map<String, String> debug,
@@ -141,6 +144,7 @@ public Alias(String scriptRef,
141144
this.compileOptions = compileOptions;
142145
this.nativeImage = nativeImage;
143146
this.nativeOptions = nativeOptions;
147+
this.forceType = forceType;
144148
this.integrations = integrations;
145149
this.jfr = jfr;
146150
this.debug = debug;
@@ -240,6 +244,7 @@ private static Alias merge(Alias a1, String name, Function<String, Alias> findUn
240244
: a2.compileOptions;
241245
List<String> nopts = a1.nativeOptions != null && !a1.nativeOptions.isEmpty() ? a1.nativeOptions
242246
: a2.nativeOptions;
247+
String forceType = a1.forceType != null ? a1.forceType : a2.forceType;
243248
Boolean nimg = a1.nativeImage != null ? a1.nativeImage : a2.nativeImage;
244249
Boolean ints = a1.integrations != null ? a1.integrations : a2.integrations;
245250
String jfr = a1.jfr != null ? a1.jfr : a2.jfr;
@@ -255,8 +260,8 @@ private static Alias merge(Alias a1, String name, Function<String, Alias> findUn
255260
List<String> docs = a1.docs != null && !a1.docs.isEmpty() ? a1.docs : a2.docs;
256261
Catalog catalog = a2.catalog != null ? a2.catalog : a1.catalog;
257262
return new Alias(a2.scriptRef, desc, args, jopts, srcs, ress, deps, repos, cpaths, props, javaVersion,
258-
mainClass, moduleName, copts, nimg, nopts, ints, jfr, debug, cds, inter, ep, ea, esa, mopts, jags,
259-
docs, catalog);
263+
mainClass, moduleName, copts, nimg, nopts, forceType, ints, jfr, debug, cds, inter, ep, ea, esa,
264+
mopts, jags, docs, catalog);
260265
} else {
261266
return a1;
262267
}
@@ -300,14 +305,21 @@ private static Alias fromCatalog(String catalogName, String aliasName) {
300305
public Alias withCatalog(Catalog catalog) {
301306
return new Alias(scriptRef, description, arguments, runtimeOptions, sources, resources, dependencies,
302307
repositories, classpaths, properties, javaVersion, mainClass, moduleName, compileOptions, nativeImage,
303-
nativeOptions, integrations, jfr, debug, cds, interactive, enablePreview, enableAssertions,
308+
nativeOptions, forceType, integrations, jfr, debug, cds, interactive, enablePreview, enableAssertions,
304309
enableSystemAssertions, manifestOptions, javaAgents, docs, catalog);
305310
}
306311

307312
public Alias withScriptRef(String scriptRef) {
308313
return new Alias(scriptRef, description, arguments, runtimeOptions, sources, resources, dependencies,
309314
repositories, classpaths, properties, javaVersion, mainClass, moduleName, compileOptions, nativeImage,
310-
nativeOptions, integrations, jfr, debug, cds, interactive, enablePreview, enableAssertions,
315+
nativeOptions, forceType, integrations, jfr, debug, cds, interactive, enablePreview, enableAssertions,
316+
enableSystemAssertions, manifestOptions, javaAgents, docs, catalog);
317+
}
318+
319+
public Alias withForceType(String forceType) {
320+
return new Alias(scriptRef, description, arguments, runtimeOptions, sources, resources, dependencies,
321+
repositories, classpaths, properties, javaVersion, mainClass, moduleName, compileOptions, nativeImage,
322+
nativeOptions, forceType, integrations, jfr, debug, cds, interactive, enablePreview, enableAssertions,
311323
enableSystemAssertions, manifestOptions, javaAgents, docs, catalog);
312324
}
313325
}

‎src/main/java/dev/jbang/catalog/Catalog.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@
2929

3030
import dev.jbang.Settings;
3131
import dev.jbang.cli.ExitException;
32-
import dev.jbang.source.ResourceRef;
32+
import dev.jbang.resources.ResourceRef;
3333
import dev.jbang.util.Util;
3434

3535
public class Catalog {

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

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,9 +15,9 @@
1515
import dev.jbang.catalog.Alias.JavaAgent;
1616
import dev.jbang.catalog.Catalog;
1717
import dev.jbang.catalog.CatalogUtil;
18+
import dev.jbang.resources.ResourceRef;
1819
import dev.jbang.source.Project;
1920
import dev.jbang.source.ProjectBuilder;
20-
import dev.jbang.source.ResourceRef;
2121
import dev.jbang.util.ConsoleOutput;
2222
import dev.jbang.util.Util;
2323

@@ -120,7 +120,8 @@ public Integer doCall() {
120120
dependencyInfoMixin.getDependencies(),
121121
dependencyInfoMixin.getRepositories(), dependencyInfoMixin.getClasspaths(),
122122
dependencyInfoMixin.getProperties(), buildMixin.javaVersion, buildMixin.main, buildMixin.module,
123-
buildMixin.compileOptions, nativeMixin.nativeImage, nativeMixin.nativeOptions, buildMixin.integrations,
123+
buildMixin.compileOptions, nativeMixin.nativeImage, nativeMixin.nativeOptions,
124+
scriptMixin.forceType != null ? scriptMixin.forceType.name() : null, buildMixin.integrations,
124125
runMixin.flightRecorderString, runMixin.debugString, runMixin.cds, runMixin.interactive,
125126
enablePreviewRequested, runMixin.enableAssertions, runMixin.enableSystemAssertions,
126127
buildMixin.manifestOptions, createJavaAgents(), docs, null);

‎src/main/java/dev/jbang/cli/Catalog.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
import dev.jbang.Settings;
1616
import dev.jbang.catalog.CatalogRef;
1717
import dev.jbang.catalog.CatalogUtil;
18-
import dev.jbang.source.ResourceRef;
18+
import dev.jbang.resources.ResourceRef;
1919
import dev.jbang.util.ConsoleOutput;
2020
import dev.jbang.util.Util;
2121

‎src/main/java/dev/jbang/cli/Edit.java‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,7 @@
2121
import dev.jbang.dependencies.JitPackUtil;
2222
import dev.jbang.dependencies.MavenRepo;
2323
import dev.jbang.net.EditorManager;
24+
import dev.jbang.resources.ResourceRef;
2425
import dev.jbang.source.*;
2526
import dev.jbang.util.CommandBuffer;
2627
import dev.jbang.util.TemplateEngine;

‎src/main/java/dev/jbang/cli/Export.java‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,8 +21,9 @@
2121
import dev.jbang.catalog.Alias;
2222
import dev.jbang.catalog.CatalogUtil;
2323
import dev.jbang.dependencies.*;
24+
import dev.jbang.resources.ResourceRef;
25+
import dev.jbang.resources.resolvers.AliasResourceResolver;
2426
import dev.jbang.source.*;
25-
import dev.jbang.source.resolvers.AliasResourceResolver;
2627
import dev.jbang.source.sources.KotlinSource;
2728
import dev.jbang.util.JarUtil;
2829
import dev.jbang.util.JavaUtil;

‎src/main/java/dev/jbang/cli/Info.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,12 +28,12 @@
2828
import dev.jbang.dependencies.MavenRepo;
2929
import dev.jbang.devkitman.Jdk;
3030
import dev.jbang.devkitman.JdkManager;
31+
import dev.jbang.resources.ResourceRef;
3132
import dev.jbang.source.BuildContext;
3233
import dev.jbang.source.DocRef;
3334
import dev.jbang.source.Project;
3435
import dev.jbang.source.ProjectBuilder;
3536
import dev.jbang.source.RefTarget;
36-
import dev.jbang.source.ResourceRef;
3737
import dev.jbang.source.SourceSet;
3838
import dev.jbang.util.ConsoleOutput;
3939
import dev.jbang.util.JavaUtil;

0 commit comments

Comments
 (0)