Skip to content

-c argument can support multi files #189

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
macdao wants to merge 2 commits into
base: master
Choose a base branch
from
Open

-c argument can support multi files #189

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
95bdc50
-c argument can support multi files
macdao Apr 23, 2017
7d988da
fix issue that parser cannot parse multi config
macdao Apr 23, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 7 additions & 7 deletions moco-runner/src/main/java/com/github/dreamhead/moco/bootstrap/arg/HttpArgs.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,9 @@

public final class HttpArgs extends StartArgs {
private HttpArgs(final Integer port, final Integer shutdownPort,
final String configurationFile, final String globalSettings,
final String env) {
super(ServerType.HTTP, port, shutdownPort, configurationFile, globalSettings, env, null);
final String[] configurationFiles, final String globalSettings,
final String env) {
super(ServerType.HTTP, port, shutdownPort, configurationFiles, globalSettings, env, null);
}

public static Builder httpArgs() {
Expand All @@ -16,7 +16,7 @@ public static Builder httpArgs() {
public static class Builder {
private Integer port;
private Integer shutdownPort;
private String configurationFile;
private String[] configurationFiles;
private String settings;
private String env;

Expand All @@ -30,8 +30,8 @@ public Builder withShutdownPort(final Integer shutdownPort) {
return this;
}

public Builder withConfigurationFile(final String configurationFile) {
this.configurationFile = configurationFile;
public Builder withConfigurationFile(final String... configurationFiles) {
this.configurationFiles = configurationFiles;
return this;
}

Expand All @@ -46,7 +46,7 @@ public Builder withEnv(final String env) {
}

public HttpArgs build() {
return new HttpArgs(port, shutdownPort, configurationFile, settings, env);
return new HttpArgs(port, shutdownPort, configurationFiles, settings, env);
}
}
}
12 changes: 6 additions & 6 deletions moco-runner/src/main/java/com/github/dreamhead/moco/bootstrap/arg/HttpsArgs.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,9 @@
import com.github.dreamhead.moco.bootstrap.ServerType;

public final class HttpsArgs extends StartArgs {
private HttpsArgs(final Integer port, final Integer shutdownPort, final String configurationFile,
private HttpsArgs(final Integer port, final Integer shutdownPort, final String[] configurationFiles,
final String globalSettings, final String env, final HttpsArg httpsArg) {
super(ServerType.HTTPS, port, shutdownPort, configurationFile, globalSettings, env, httpsArg);
super(ServerType.HTTPS, port, shutdownPort, configurationFiles, globalSettings, env, httpsArg);
}

public static Builder httpsArgs() {
Expand All @@ -16,7 +16,7 @@ public static Builder httpsArgs() {
public static class Builder {
private Integer port;
private Integer shutdownPort;
private String configurationFile;
private String[] configurationFiles;
private String settings;
private String env;
private HttpsArg httpsArg;
Expand All @@ -31,8 +31,8 @@ public Builder withShutdownPort(final Integer shutdownPort) {
return this;
}

public Builder withConfigurationFile(final String configurationFile) {
this.configurationFile = configurationFile;
public Builder withConfigurationFile(final String... configurationFiles) {
this.configurationFiles = configurationFiles;
return this;
}

Expand All @@ -52,7 +52,7 @@ public Builder withHttpsArg(final HttpsArg httpsArg) {
}

public HttpsArgs build() {
return new HttpsArgs(port, shutdownPort, configurationFile, settings, env, httpsArg);
return new HttpsArgs(port, shutdownPort, configurationFiles, settings, env, httpsArg);
}
}
}
12 changes: 6 additions & 6 deletions moco-runner/src/main/java/com/github/dreamhead/moco/bootstrap/arg/SocketArgs.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,8 @@
import static com.github.dreamhead.moco.bootstrap.ServerType.SOCKET;

public final class SocketArgs extends StartArgs {
private SocketArgs(final Integer port, final Integer shutdownPort, final String configurationFile) {
super(SOCKET, port, shutdownPort, configurationFile, null, null, null);
private SocketArgs(final Integer port, final Integer shutdownPort, final String[] configurationFiles) {
super(SOCKET, port, shutdownPort, configurationFiles, null, null, null);
}

public static Builder socketArgs() {
Expand All @@ -14,7 +14,7 @@ public static Builder socketArgs() {
public static class Builder {
private Integer port;
private Integer shutdownPort;
private String configurationFile;
private String[] configurationFiles;

public Builder withPort(final Integer port) {
this.port = port;
Expand All @@ -26,13 +26,13 @@ public Builder withShutdownPort(final Integer shutdownPort) {
return this;
}

public Builder withConfigurationFile(final String configurationFile) {
this.configurationFile = configurationFile;
public Builder withConfigurationFile(final String... configurationFiles) {
this.configurationFiles = configurationFiles;
return this;
}

public SocketArgs build() {
return new SocketArgs(port, shutdownPort, configurationFile);
return new SocketArgs(port, shutdownPort, configurationFiles);
}
}
}
12 changes: 6 additions & 6 deletions moco-runner/src/main/java/com/github/dreamhead/moco/bootstrap/arg/StartArgs.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,18 +12,18 @@
public abstract class StartArgs extends ShutdownPortOption {
private final ServerType type;
private final Optional<Integer> port;
private final Optional<String> configurationFile;
private final Optional<String[]> configurationFiles;
private final Optional<String> settings;
private final Optional<String> env;
private final Optional<HttpsArg> httpsArg;

protected StartArgs(final ServerType type, final Integer port, final Integer shutdownPort,
final String configurationFile, final String globalSettings,
final String[] configurationFiles, final String globalSettings,
final String env, final HttpsArg httpsArg) {
super(shutdownPort);
this.type = type;
this.port = fromNullable(port);
this.configurationFile = fromNullable(configurationFile);
this.configurationFiles = fromNullable(configurationFiles);
this.settings = fromNullable(globalSettings);
this.env = fromNullable(env);
this.httpsArg = fromNullable(httpsArg);
Expand All @@ -33,12 +33,12 @@ public Optional<Integer> getPort() {
return port;
}

public Optional<String> getConfigurationFile() {
return configurationFile;
public Optional<String[]> getConfigurationFiles() {
return configurationFiles;
}

public boolean hasConfigurationFile() {
return this.configurationFile.isPresent();
return this.configurationFiles.isPresent();
}

public Optional<String> getSettings() {
Expand Down
8 changes: 4 additions & 4 deletions moco-runner/src/main/java/com/github/dreamhead/moco/bootstrap/parser/HttpArgsParser.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,16 +12,16 @@ public class HttpArgsParser extends StartArgsParser {
@Override
protected StartArgs parseArgs(final CommandLine cmd) {
String port = cmd.getOptionValue("p");
String config = cmd.getOptionValue("c");
String[] configs = cmd.getOptionValues("c");
String globalSettings = cmd.getOptionValue("g");
String shutdownPort = cmd.getOptionValue("s");
String env = cmd.getOptionValue("e");

if (config == null && globalSettings == null) {
if (configs == null && globalSettings == null) {
throw new ParseArgException("config or global setting is required");
}

if (config != null && globalSettings != null) {
if (configs != null && globalSettings != null) {
throw new ParseArgException("config and global settings can not be set at the same time");
}

Expand All @@ -36,7 +36,7 @@ protected StartArgs parseArgs(final CommandLine cmd) {
return httpArgs()
.withPort(getPort(port))
.withShutdownPort(getPort(shutdownPort))
.withConfigurationFile(config)
.withConfigurationFile(configs)
.withSettings(globalSettings)
.withEnv(env)
.build();
Expand Down
8 changes: 4 additions & 4 deletions moco-runner/src/main/java/com/github/dreamhead/moco/bootstrap/parser/HttpsArgsParser.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,16 +13,16 @@ public class HttpsArgsParser extends StartArgsParser {
@Override
protected StartArgs parseArgs(final CommandLine cmd) {
String port = cmd.getOptionValue("p");
String config = cmd.getOptionValue("c");
String[] configs = cmd.getOptionValues("c");
String globalSettings = cmd.getOptionValue("g");
String shutdownPort = cmd.getOptionValue("s");
String env = cmd.getOptionValue("e");

if (config == null && globalSettings == null) {
if (configs == null && globalSettings == null) {
throw new ParseArgException("config or global setting is required");
}

if (config != null && globalSettings != null) {
if (configs != null && globalSettings != null) {
throw new ParseArgException("config and global settings can not be set at the same time");
}

Expand All @@ -37,7 +37,7 @@ protected StartArgs parseArgs(final CommandLine cmd) {
return httpsArgs()
.withPort(getPort(port))
.withShutdownPort(getPort(shutdownPort))
.withConfigurationFile(config)
.withConfigurationFile(configs)
.withSettings(globalSettings)
.withEnv(env)
.withHttpsArg(httpsArg(cmd))
Expand Down
6 changes: 3 additions & 3 deletions moco-runner/src/main/java/com/github/dreamhead/moco/bootstrap/parser/SocketArgsParser.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,10 +12,10 @@ public class SocketArgsParser extends StartArgsParser {
@Override
protected StartArgs parseArgs(final CommandLine cmd) {
String port = cmd.getOptionValue("p");
String config = cmd.getOptionValue("c");
String[] configs = cmd.getOptionValues("c");
String shutdownPort = cmd.getOptionValue("s");

if (config == null) {
if (configs == null) {
throw new ParseArgException("config is required");
}

Expand All @@ -26,7 +26,7 @@ protected StartArgs parseArgs(final CommandLine cmd) {
return socketArgs()
.withPort(getPort(port))
.withShutdownPort(getPort(shutdownPort))
.withConfigurationFile(config)
.withConfigurationFile(configs)
.build();
}

Expand Down
1 change: 1 addition & 0 deletions moco-runner/src/main/java/com/github/dreamhead/moco/bootstrap/parser/StartArgsParser.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,6 +38,7 @@ protected Option configOption() {
Option opt = new Option("c", true, "config");
opt.setType(String.class);
opt.setRequired(false);
opt.setArgs(Option.UNLIMITED_VALUES);
return opt;
}

Expand Down
13 changes: 10 additions & 3 deletions moco-runner/src/main/java/com/github/dreamhead/moco/runner/FileRunner.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,13 +1,15 @@
package com.github.dreamhead.moco.runner;

import com.github.dreamhead.moco.bootstrap.arg.StartArgs;
import com.google.common.base.Function;

import java.io.File;
import java.io.FileInputStream;
import java.io.FileNotFoundException;
import java.io.InputStream;

import static com.github.dreamhead.moco.runner.JsonRunner.newJsonRunnerWithStreams;
import static com.google.common.collect.ImmutableList.of;
import static com.google.common.collect.FluentIterable.from;

public abstract class FileRunner implements Runner {
private Runner runner;
Expand Down Expand Up @@ -38,11 +40,16 @@ public void stop() {
this.runner.stop();
}

public static FileRunner createConfigurationFileRunner(final File file, final StartArgs startArgs) {
public static FileRunner createConfigurationFileRunner(final Iterable<File> files, final StartArgs startArgs) {
return new FileRunner() {
@Override
protected Runner newRunner() {
return newJsonRunnerWithStreams(of(toInputStream(file)), startArgs);
return newJsonRunnerWithStreams(from(files).transform(new Function<File, InputStream>() {
@Override
public InputStream apply(File input) {
return toInputStream(input);
}
}), startArgs);
}
};
}
Expand Down
16 changes: 13 additions & 3 deletions moco-runner/src/main/java/com/github/dreamhead/moco/runner/RunnerFactory.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,12 +3,15 @@
import com.github.dreamhead.moco.bootstrap.arg.StartArgs;
import com.github.dreamhead.moco.runner.watcher.MocoRunnerWatcher;
import com.github.dreamhead.moco.runner.watcher.MonitorFactory;
import com.google.common.base.Function;
import com.google.common.base.Optional;

import java.io.File;
import java.util.Arrays;

import static com.github.dreamhead.moco.runner.FileRunner.createConfigurationFileRunner;
import static com.github.dreamhead.moco.runner.FileRunner.createSettingFileRunner;
import static com.google.common.collect.FluentIterable.from;

public class RunnerFactory {
private final MonitorFactory monitorFactory = new MonitorFactory();
Expand Down Expand Up @@ -46,9 +49,16 @@ private Runner createDynamicSettingRunner(final StartArgs startArgs) {
}

private Runner createDynamicConfigurationRunner(final StartArgs startArgs) {
final File configuration = new File(startArgs.getConfigurationFile().get());
final FileRunner fileRunner = createConfigurationFileRunner(configuration, startArgs);
MocoRunnerWatcher fileMocoRunnerWatcher = monitorFactory.createConfigurationWatcher(configuration, fileRunner);
final String[] configurations = startArgs.getConfigurationFiles().get();
final Iterable<File> files = from(Arrays.asList(configurations)).transform(new Function<String, File>() {
@Override
public File apply(String input) {
return new File(input);
}
});

final FileRunner fileRunner = createConfigurationFileRunner(files, startArgs);
MocoRunnerWatcher fileMocoRunnerWatcher = monitorFactory.createConfigurationWatcher(files, fileRunner);
return new MonitorRunner(fileRunner, fileMocoRunnerWatcher);
}
}
4 changes: 2 additions & 2 deletions moco-runner/src/main/java/com/github/dreamhead/moco/runner/watcher/MonitorFactory.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,8 +24,8 @@ public void onShutdown() {
});
}

public FileMocoRunnerWatcher createConfigurationWatcher(final File configuration, final FileRunner fileRunner) {
return new FileMocoRunnerWatcher(configuration, createListener(fileRunner));
public MocoRunnerWatcher createConfigurationWatcher(final Iterable<File> files, final FileRunner fileRunner) {
return new FilesMocoRunnerWatcher(files, createListener(fileRunner));
}

public MocoRunnerWatcher createSettingWatcher(final File settingsFile,
Expand Down
4 changes: 2 additions & 2 deletions moco-runner/src/test/java/com/github/dreamhead/moco/bootstrap/StartArgsTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ public void setUp() throws Exception {
public void should_parse_start_arguments() {
StartArgs args = startArgsParser.parse(new String[]{"start", "-p", "12306", "-c", "foo.json"});
assertThat(args.getPort().get(), is(12306));
assertThat(args.getConfigurationFile().get(), is("foo.json"));
assertThat(args.getConfigurationFiles().get(), is(new String[]{"foo.json"}));
}

@Test
Expand Down Expand Up @@ -63,7 +63,7 @@ public void should_not_set_environment_with_config() {
public void should_parse_without_port() {
StartArgs args = startArgsParser.parse(new String[]{"start", "-c", "foo.json"});
assertThat(args.getPort(), is(Optional.<Integer>absent()));
assertThat(args.getConfigurationFile().get(), is("foo.json"));
assertThat(args.getConfigurationFiles().get(), is(new String[]{"foo.json"}));
}

@Test
Expand Down
33 changes: 33 additions & 0 deletions ...-runner/src/test/java/com/github/dreamhead/moco/bootstrap/parser/StartArgsParserTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,33 @@
package com.github.dreamhead.moco.bootstrap.parser;

import com.github.dreamhead.moco.bootstrap.arg.StartArgs;
import org.junit.Test;

import static org.hamcrest.CoreMatchers.is;
import static org.junit.Assert.assertThat;


public class StartArgsParserTest {
@Test
public void http_args_parse_should_get_configuration_files() throws Exception {
final StartArgs args = new HttpArgsParser().parse(new String[]{"http", "-c", "a", "b"});

assertThat(args.getConfigurationFiles().isPresent(), is(true));
assertThat(args.getConfigurationFiles().get(), is(new String[]{"a", "b"}));
}

@Test
public void https_args_parse_should_get_configuration_files() throws Exception {
final StartArgs args = new HttpsArgsParser().parse(new String[]{"https", "-g", "a", "--https", "/path/to/cert.jks", "--cert", "mocohttps", "--keystore", "mocohttps"});

assertThat(args.getConfigurationFiles().isPresent(), is(false));
}

@Test
public void socket_args_parse_should_get_configuration_files() throws Exception {
final StartArgs args = new SocketArgsParser().parse(new String[]{"socket", "-c", "a", "b"});

assertThat(args.getConfigurationFiles().isPresent(), is(true));
assertThat(args.getConfigurationFiles().get(), is(new String[]{"a", "b"}));
}
}
Loading