From f3319a56f35aa8e902c05f07eee6ace5a8dfc81b Mon Sep 17 00:00:00 2001 From: DmitriyMX Date: Tue, 5 Jul 2016 17:24:36 +0300 Subject: [PATCH] check properties --- .../ru/dmitriymx/astralcheckreport/Main.java | 20 +++++++++++++++---- 1 file changed, 16 insertions(+), 4 deletions(-) diff --git a/src/main/java/ru/dmitriymx/astralcheckreport/Main.java b/src/main/java/ru/dmitriymx/astralcheckreport/Main.java index 511cd87..45db4b5 100644 --- a/src/main/java/ru/dmitriymx/astralcheckreport/Main.java +++ b/src/main/java/ru/dmitriymx/astralcheckreport/Main.java @@ -40,6 +40,16 @@ public class Main implements Runnable { return; } + logger.info("File: {}", properties.getProperty("file")); + logger.info("Login: {}", properties.getProperty("login")); + logger.info("Threads: {}", properties.getProperty("threads")); + + if (!checkProperties()) { + logger.error("Check properties fail!"); + System.exit(1); + return; + } + logger.trace("Load excel file"); try { excel = new ExcelReader(new File(properties.getProperty("file")), "Операции"); @@ -48,10 +58,6 @@ public class Main implements Runnable { return; } - logger.info("File: {}", properties.getProperty("file")); - logger.info("Login: {}", properties.getProperty("login")); - logger.info("Threads: {}", properties.getProperty("threads")); - ThreadGroup threadGroup = new ThreadGroup("Astral Clients"); int thredCount = Integer.parseInt(properties.getProperty("threads")); @@ -68,6 +74,12 @@ public class Main implements Runnable { } + private boolean checkProperties() { + return (properties.getProperty("login") != null && !properties.getProperty("login").isEmpty()) && + (properties.getProperty("file") != null && !properties.getProperty("file").isEmpty()) && + (properties.getProperty("threads") != null && !properties.getProperty("threads").isEmpty()); + } + private synchronized ExcelDataRow nextData() { return excel.getNextData(); }