Skip to content

Commit d096a2c

Browse files
authored
#80 Adding back the path parameter (#81)
* #80 Adding back the path parameter * #80 Adding back the path parameter * fix build
1 parent 28520c5 commit d096a2c

7 files changed

Lines changed: 23 additions & 14 deletions

File tree

native-cli-integration-tests/build.gradle

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -17,15 +17,13 @@ sourceSets {
1717
dependencies {
1818
api(project(":native-cli"))
1919

20-
testImplementation group: 'org.scalatest', name: 'scalatest_2.12', version: scalaTestVersion
2120
testImplementation group: 'org.mule.weave', name: 'parser', version: weaveVersion
2221
testImplementation group: 'org.mule.weave', name: 'test-helpers', version: weaveVersion
2322

2423
weaveSuite "org.mule.weave:runtime:${weaveTestSuiteVersion}:test@zip"
2524
weaveSuite "org.mule.weave:yaml-module:${weaveTestSuiteVersion}:test@zip"
26-
25+
testRuntimeOnly 'com.vladsch.flexmark:flexmark-all:0.62.2'
2726
testImplementation 'commons-io:commons-io:2.11.0'
28-
testRuntimeOnly 'org.pegdown:pegdown:1.6.0'
2927
testImplementation group: 'com.sun.mail', name: 'jakarta.mail', version: '1.6.4'
3028
testImplementation group: 'xerces', name: 'xercesImpl', version: '2.12.1'
3129
testImplementation group: 'xalan', name: 'xalan', version: '2.7.2'

native-cli-integration-tests/src/test/scala/org/mule/weave/native/NativeCliRuntimeIT.scala

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -25,9 +25,7 @@ import org.mule.weave.v2.utils.DataWeaveVersion
2525
import org.mule.weave.v2.utils.StringHelper.toStringTransformer
2626
import org.mule.weave.v2.version.ComponentVersion
2727
import org.scalatest.Assertion
28-
import org.scalatest.FunSpec
29-
import org.scalatest.Matchers
30-
import sun.net.www.protocol.file.FileURLConnection
28+
import org.scalatest.funspec.AnyFunSpec
3129

3230
import java.io.ByteArrayInputStream
3331
import java.io.File
@@ -46,8 +44,9 @@ import javax.mail.util.ByteArrayDataSource
4644
import scala.collection.JavaConverters._
4745
import scala.io.BufferedSource
4846
import scala.io.Source
47+
import org.scalatest.matchers.should.Matchers
4948

50-
class NativeCliRuntimeIT extends FunSpec
49+
class NativeCliRuntimeIT extends AnyFunSpec
5150
with Matchers
5251
with FolderBasedTest
5352
with ResourceResolver
@@ -357,7 +356,7 @@ class NativeCliRuntimeIT extends FunSpec
357356

358357
override def ignoreTests(): Array[String] = {
359358
// Encoding issues
360-
val baseArray = Array("csv-invalid-utf8") ++
359+
val baseArray = Array("csv-invalid-utf8", "splitBy-regex", "splitBy-string" ) ++
361360
// Fail in java11 because broken backwards
362361
Array("coerciones_toString", "date-coercion") ++
363362
// Use resources (dwl files) that is present in the Tests but not in Cli (e.g: org::mule::weave::v2::libs::)

native-cli-integration-tests/src/test/scala/org/mule/weave/native/NativeCliTest.scala

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,13 +2,13 @@ package org.mule.weave.native
22

33
import org.mule.weave.v2.utils.DataWeaveVersion
44
import org.scalatest.BeforeAndAfterAll
5-
import org.scalatest.FreeSpec
6-
import org.scalatest.Matchers
5+
import org.scalatest.freespec.AnyFreeSpec
6+
import org.scalatest.matchers.should.Matchers
77

88
import java.io.File
99
import java.net.URL
1010

11-
class NativeCliTest extends FreeSpec
11+
class NativeCliTest extends AnyFreeSpec
1212
with Matchers
1313
with BeforeAndAfterAll
1414
with ResourceResolver {

native-cli/src/main/java/org/mule/weave/cli/pico/AbstractPicoExecCommand.java

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@
1313
import java.io.IOException;
1414
import java.nio.charset.StandardCharsets;
1515
import java.nio.file.Files;
16+
import java.util.ArrayList;
1617
import java.util.concurrent.Callable;
1718

1819
public abstract class AbstractPicoExecCommand implements Callable<Integer> {
@@ -30,6 +31,13 @@ public abstract class AbstractPicoExecCommand implements Callable<Integer> {
3031
protected boolean untrusted = false;
3132
@CommandLine.Option(names = {"--language-level"}, description = {"The version of DW to be supported."})
3233
protected String languageLevel = null;
34+
35+
@CommandLine.Option(
36+
names = {"--path"},
37+
description = {"The path where DW runtime will look for resolving modules."},
38+
split = ":"
39+
)
40+
protected java.util.List<String> path = new ArrayList<>();
3341
@CommandLine.Option(
3442
names = {"--privileges"},
3543
description = {"A list of all allowed runtime privileges for this execution to have."},

native-cli/src/main/java/org/mule/weave/cli/pico/PicoRepl.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ public PicoRepl(Console console) {
2525
@Override
2626
protected Integer doCall() {
2727
ReplConfiguration replConfiguration = new ReplConfiguration(
28-
new String[0],
28+
path.toArray(new String[0]),
2929
Option.empty(),
3030
Optional.ofNullable(params).map((s) -> toScalaMap(s)).orElse(Map$.MODULE$.<String, String>empty()),
3131
Optional.ofNullable(inputs).map((s) -> toScalaMap(s)).orElse(Map$.MODULE$.<String, File>empty()),

native-cli/src/main/java/org/mule/weave/cli/pico/PicoRunScript.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,7 @@ protected Integer doCall() {
5555

5656
Option<DataWeaveVersion> dataWeaveVersionOption = calculateRuntimeVersion(languageLevel, spec);
5757
final WeaveRunnerConfig config = new WeaveRunnerConfig(
58-
new String[0],
58+
path.toArray(new String[0]),
5959
eval,
6060
((nr) -> {
6161
if (script != null) {

native-cli/src/main/java/org/mule/weave/cli/pico/PicoRunSpell.java

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,7 @@
2222
import scala.collection.immutable.Map$;
2323

2424
import java.io.File;
25+
import java.util.ArrayList;
2526
import java.util.Optional;
2627

2728
@CommandLine.Command(
@@ -129,8 +130,11 @@ protected Integer doCall() {
129130

130131
Option<DataWeaveVersion> dataWeaveVersionOption = calculateRuntimeVersion(languageLevel, spec);
131132

133+
ArrayList<String> newPath = new ArrayList<>(path);
134+
newPath.add(srcFolder.getAbsolutePath());
135+
132136
final WeaveRunnerConfig config = WeaveRunnerConfig.apply(
133-
new String[]{srcFolder.getAbsolutePath()},
137+
newPath.toArray(new String[0]),
134138
eval,
135139
(st) -> {
136140
return new WeaveModule(fileToString(mainFile), nameIdentifier.toString());

0 commit comments

Comments
 (0)