#158 Simplify YamlStatement Loader part 2, remove previous loader

This commit is contained in:
Jonathan Shook
2020-06-11 16:03:33 -05:00
parent 46b2447d81
commit e27b39b0c2
21 changed files with 132 additions and 453 deletions

View File

@@ -101,7 +101,8 @@ public class MongoActivity extends SimpleActivity implements ActivityDefObserver
);
SequencePlanner<ReadyMongoStatement> sequencer = new SequencePlanner<>(sequencerType);
StmtsDocList stmtsDocList = StatementsLoader.load(logger, yamlLoc, new StrInterpolator(activityDef), "activities");
StmtsDocList stmtsDocList = StatementsLoader.loadPath(logger, yamlLoc, new StrInterpolator(activityDef),
"activities");
String tagfilter = activityDef.getParams().getOptionalString("tags").orElse("");

View File

@@ -34,7 +34,7 @@ public class ReadyMongoStatementTest {
};
activityDef = ActivityDef.parseActivityDef(String.join(";", params));
String yaml_loc = activityDef.getParams().getOptionalString("yaml", "workload").orElse("default");
stmtsDocList = StatementsLoader.load(logger, yaml_loc, new StrInterpolator(activityDef), "activities");
stmtsDocList = StatementsLoader.loadPath(logger, yaml_loc, new StrInterpolator(activityDef), "activities");
}
@Test