nellemann/hmci
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

Simplify conf file argument.

Browse source
This commit is contained in:
Mark Nellemann 2021-03-24 13:25:34 +01:00
parent 508f1b0219
commit d76f174eb9
4 changed files with 11 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
gradle.properties
View file

@ -1,3 +1,3 @@
id = hmci id = hmci
group = biz.nellemann.hmci group = biz.nellemann.hmci
version = 1.1.5 version = 1.1.6

9
src/main/java/biz/nellemann/hmci/Application.java
View file

@ -32,7 +32,7 @@ import java.util.concurrent.Callable;
public class Application implements Callable<Integer> { public class Application implements Callable<Integer> {
@Option(names = { "-c", "--conf" }, description = "Configuration file [default: '/etc/hmci.toml'].", defaultValue = "/etc/hmci.toml", paramLabel = "<file>") @Option(names = { "-c", "--conf" }, description = "Configuration file [default: '/etc/hmci.toml'].", defaultValue = "/etc/hmci.toml", paramLabel = "<file>")
private String configurationFile; private File configurationFile;
@Option(names = { "-d", "--debug" }, description = "Enable debugging [default: 'false'].") @Option(names = { "-d", "--debug" }, description = "Enable debugging [default: 'false'].")
private boolean[] enableDebug = new boolean[0]; private boolean[] enableDebug = new boolean[0];
@ -50,9 +50,8 @@ public class Application implements Callable<Integer> {
InfluxClient influxClient; InfluxClient influxClient;
List<Thread> threadList = new ArrayList<>(); List<Thread> threadList = new ArrayList<>();
File file = new File(configurationFile); if(!configurationFile.exists()) {
if(!file.exists()) { System.err.println("Error - No configuration file found at: " + configurationFile.toString());
System.err.println("Error - No configuration file found at: " + file.toString());
return -1; return -1;
} }
@ -66,7 +65,7 @@ public class Application implements Callable<Integer> {
} }
try { try {
configuration = new Configuration(configurationFile); configuration = new Configuration(configurationFile.toPath());
influxClient = new InfluxClient(configuration.getInflux()); influxClient = new InfluxClient(configuration.getInflux());
influxClient.login(); influxClient.login();

6
src/main/java/biz/nellemann/hmci/Configuration.java
View file

@ -6,7 +6,6 @@ import org.tomlj.TomlTable;
import java.io.IOException; import java.io.IOException;
import java.nio.file.Path; import java.nio.file.Path;
import java.nio.file.Paths;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.List; import java.util.List;
@ -20,10 +19,9 @@ public final class Configuration {
final private InfluxObject influx; final private InfluxObject influx;
final private List<HmcObject> hmcList; final private List<HmcObject> hmcList;
Configuration(String configurationFile) throws IOException { Configuration(Path configurationFile) throws IOException {
Path source = Paths.get(configurationFile); TomlParseResult result = Toml.parse(configurationFile);
TomlParseResult result = Toml.parse(source);
result.errors().forEach(error -> System.err.println(error.toString())); result.errors().forEach(error -> System.err.println(error.toString()));
if(result.contains("hmci.update")) { if(result.contains("hmci.update")) {

5
src/test/groovy/biz/nellemann/hmci/ConfigurationTest.groovy
View file

@ -2,10 +2,13 @@ package biz.nellemann.hmci
import spock.lang.Specification import spock.lang.Specification
import java.nio.file.Path
import java.nio.file.Paths
class ConfigurationTest extends Specification { class ConfigurationTest extends Specification {
String testConfigurationFile = new File(getClass().getResource('/hmci.toml').toURI()).absolutePath Path testConfigurationFile = Paths.get(getClass().getResource('/hmci.toml').toURI())
void "test parsing"() { void "test parsing"() {