diff --git a/adapter-cqld4/pom.xml b/adapter-cqld4/pom.xml
index 0dac0a0bf..248015bbb 100644
--- a/adapter-cqld4/pom.xml
+++ b/adapter-cqld4/pom.xml
@@ -104,12 +104,14 @@
antlr4-maven-plugin
4.10.1
- src/main/java/io/nosqlbench/converters/cql/grammars
+ src/main/java/io/nosqlbench/converters/cql/grammars
+
-package
io.nosqlbench.converters.cql.generated
- src/main/java/io/nosqlbench/converters/cql/generated
+ src/main/java/io/nosqlbench/converters/cql/generated
+
@@ -128,7 +130,8 @@
- src/main/java/io/nosqlbench/converters/cql/generated
+ src/main/java/io/nosqlbench/converters/cql/generated
+
**/*.java
**/*.interp
@@ -140,5 +143,23 @@
+
+
+ src/main/java
+
+ **/*.md
+ **/*.yaml
+ **/*.txt
+
+
+
+ src/main/resources
+
+ **
+
+
+
+
+
diff --git a/adapter-cqld4/src/main/java/io/nosqlbench/converters/cql/exporters/DefaultCqlBindings.java b/adapter-cqld4/src/main/java/io/nosqlbench/converters/cql/exporters/DefaultCqlBindings.java
index 09de2e318..63ff00498 100644
--- a/adapter-cqld4/src/main/java/io/nosqlbench/converters/cql/exporters/DefaultCqlBindings.java
+++ b/adapter-cqld4/src/main/java/io/nosqlbench/converters/cql/exporters/DefaultCqlBindings.java
@@ -22,6 +22,7 @@ import io.nosqlbench.engine.api.activityconfig.yaml.StmtsDocList;
import io.nosqlbench.nb.api.content.Content;
import io.nosqlbench.nb.api.content.NBIO;
+import java.io.File;
import java.io.InputStream;
import java.util.Map;
import java.util.Optional;
@@ -44,7 +45,8 @@ public class DefaultCqlBindings implements BindingsLibrary {
private Optional loadLocal(String path) {
try {
- InputStream stream = getClass().getClassLoader().getResourceAsStream(path);
+ String resourceName = getClass().getPackageName().replaceAll("\\.", File.separator)+File.separator+path;
+ InputStream stream = getClass().getClassLoader().getResourceAsStream(resourceName);
byte[] bytes = stream.readAllBytes();
return Optional.of(new String(bytes));
} catch (Exception e) {
diff --git a/adapter-cqld4/src/test/java/io/nosqlbench/converters/cql/cql/parser/CqlParserHarnessTest.java b/adapter-cqld4/src/test/java/io/nosqlbench/converters/cql/cql/parser/CqlParserHarnessTest.java
index cf218bdba..451c068f8 100644
--- a/adapter-cqld4/src/test/java/io/nosqlbench/converters/cql/cql/parser/CqlParserHarnessTest.java
+++ b/adapter-cqld4/src/test/java/io/nosqlbench/converters/cql/cql/parser/CqlParserHarnessTest.java
@@ -23,6 +23,8 @@ import org.junit.jupiter.api.Test;
import java.nio.file.Path;
+import static org.assertj.core.api.Assertions.assertThatThrownBy;
+
public class CqlParserHarnessTest {
private final static String ksddl = """
@@ -51,8 +53,7 @@ public class CqlParserHarnessTest {
@Test
public void testGenBasicWorkload() {
CqlWorkloadExporter exporter = new CqlWorkloadExporter(ddl);
- var workloadData = exporter.getWorkloadAsYaml();
- System.out.println("# generated workload:\n"+workloadData);
+ assertThatThrownBy(() -> exporter.getWorkloadAsYaml()).isInstanceOf(RuntimeException.class);
}
@Test
@@ -64,7 +65,7 @@ public class CqlParserHarnessTest {
@Test
public void testCqlParserHarnessKeyspace() {
CqlModelParser harness = new CqlModelParser();
- harness.parse("""
+ CqlModelParser.parse("""
CREATE KEYSPACE cycling
WITH REPLICATION = {\s
'class' : 'SimpleStrategy',\s
@@ -77,7 +78,7 @@ public class CqlParserHarnessTest {
@Disabled
public void testCqlParserHarnessTable() {
CqlModelParser harness = new CqlModelParser();
- harness.parse("""
+ CqlModelParser.parse("""
CREATE TABLE cycling.race_winners (
race_name text,\s
race_position int,\s