post-merge fix-ups

This commit is contained in:
Jonathan Shook
2021-06-22 11:10:42 -05:00
339 changed files with 1331 additions and 1251 deletions

View File

@@ -7,7 +7,7 @@
<parent>
<artifactId>mvn-defaults</artifactId>
<groupId>io.nosqlbench</groupId>
<version>4.15.48-SNAPSHOT</version>
<version>4.15.51-SNAPSHOT</version>
<relativePath>../mvn-defaults</relativePath>
</parent>
@@ -21,13 +21,13 @@
<dependency>
<groupId>io.nosqlbench</groupId>
<artifactId>engine-api</artifactId>
<version>4.15.48-SNAPSHOT</version>
<version>4.15.51-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>io.nosqlbench</groupId>
<artifactId>drivers-api</artifactId>
<version>4.15.48-SNAPSHOT</version>
<version>4.15.51-SNAPSHOT</version>
</dependency>
<dependency>

View File

@@ -16,7 +16,7 @@ public class ReadyMongoStatement {
public ReadyMongoStatement(OpTemplate stmtDef) {
ParsedTemplate paramTemplate = new ParsedTemplate(stmtDef.getStmt(), stmtDef.getBindings());
BindingsTemplate paramBindings = new BindingsTemplate(paramTemplate.getCheckedBindPoints());
BindingsTemplate paramBindings = new BindingsTemplate(paramTemplate.getBindPoints());
StringBindingsTemplate template = new StringBindingsTemplate(stmtDef.getStmt(), paramBindings);
this.bindings = template.resolve();

View File

@@ -1,7 +1,7 @@
package io.nosqlbench.driver.mongodb;
import org.junit.Before;
import org.junit.Test;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
import io.nosqlbench.engine.api.activityapi.planning.OpSequence;
import io.nosqlbench.engine.api.activityimpl.ActivityDef;
@@ -12,7 +12,7 @@ public class MongoActivityTest {
private ActivityDef activityDef;
@Before
@BeforeEach
public void setup() {
String[] params = {
"yaml=activities/mongodb-basic.yaml",

View File

@@ -10,8 +10,8 @@ import io.nosqlbench.virtdata.core.templates.BindPoint;
import org.apache.logging.log4j.LogManager;
import org.apache.logging.log4j.Logger;
import org.bson.conversions.Bson;
import org.junit.Before;
import org.junit.Test;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
import java.util.List;
import java.util.Objects;
@@ -25,7 +25,7 @@ public class ReadyMongoStatementTest {
private ActivityDef activityDef;
private StmtsDocList stmtsDocList;
@Before
@BeforeEach
public void setup() {
String[] params = {
"yaml=activities/mongodb-basic.yaml",