From 33c2fdf300f26b6a8d5e038bd95b57ad8908ed05 Mon Sep 17 00:00:00 2001 From: Mariusz Smykula Date: Tue, 12 Apr 2016 16:59:06 +0200 Subject: [PATCH] Allow external usage of StubRunner --- .../accurest/stubrunner/StubRunner.groovy | 20 ++++++++++++++----- .../stubrunner/StubRunnerFactory.groovy | 2 +- 2 files changed, 16 insertions(+), 6 deletions(-) diff --git a/stub-runner/stub-runner/src/main/groovy/io/codearte/accurest/stubrunner/StubRunner.groovy b/stub-runner/stub-runner/src/main/groovy/io/codearte/accurest/stubrunner/StubRunner.groovy index 0777d7d56a..b28238cddc 100644 --- a/stub-runner/stub-runner/src/main/groovy/io/codearte/accurest/stubrunner/StubRunner.groovy +++ b/stub-runner/stub-runner/src/main/groovy/io/codearte/accurest/stubrunner/StubRunner.groovy @@ -15,21 +15,31 @@ import groovy.util.logging.Slf4j class StubRunner implements StubRunning { private StubRunnerExecutor localStubRunner - private final Arguments arguments private final StubRepository stubRepository + private StubConfiguration stubsConfiguration + private StubRunnerOptions stubRunnerOptions + @Deprecated StubRunner(Arguments arguments) { - this.arguments = arguments + stubsConfiguration = arguments.stub + stubRunnerOptions = arguments.stubRunnerOptions this.stubRepository = new StubRepository(new File(arguments.repositoryPath)) } + StubRunner(StubRunnerOptions stubRunnerOptions, String repositoryPath, StubConfiguration stubsConfiguration) { + this.stubsConfiguration = stubsConfiguration + this.stubRunnerOptions = stubRunnerOptions + this.stubRepository = new StubRepository(new File(repositoryPath)) + } + @Override RunningStubs runStubs() { - AvailablePortScanner portScanner = new AvailablePortScanner(arguments.stubRunnerOptions.minPortValue, - arguments.stubRunnerOptions.maxPortValue) + AvailablePortScanner portScanner = new AvailablePortScanner(stubRunnerOptions.minPortValue, + stubRunnerOptions.maxPortValue) localStubRunner = new StubRunnerExecutor(portScanner) registerShutdownHook() - return localStubRunner.runStubs(stubRepository, arguments.stub) + + return localStubRunner.runStubs(stubRepository, stubsConfiguration) } @Override diff --git a/stub-runner/stub-runner/src/main/groovy/io/codearte/accurest/stubrunner/StubRunnerFactory.groovy b/stub-runner/stub-runner/src/main/groovy/io/codearte/accurest/stubrunner/StubRunnerFactory.groovy index d06ae1f190..9ea6992988 100644 --- a/stub-runner/stub-runner/src/main/groovy/io/codearte/accurest/stubrunner/StubRunnerFactory.groovy +++ b/stub-runner/stub-runner/src/main/groovy/io/codearte/accurest/stubrunner/StubRunnerFactory.groovy @@ -42,7 +42,7 @@ class StubRunnerFactory { private StubRunner createStubRunner(File unzippedStubsDir, StubConfiguration stubsConfiguration, StubRunnerOptions stubRunnerOptions) { - return new StubRunner(new Arguments(stubRunnerOptions, unzippedStubsDir.path, stubsConfiguration)) + return new StubRunner(stubRunnerOptions, unzippedStubsDir.path, stubsConfiguration) } }