diff --git a/src/main/java/ru/dmitriymx/astralcheckreport/Main.java b/src/main/java/ru/dmitriymx/astralcheckreport/Main.java index fc82358..511cd87 100644 --- a/src/main/java/ru/dmitriymx/astralcheckreport/Main.java +++ b/src/main/java/ru/dmitriymx/astralcheckreport/Main.java @@ -21,7 +21,7 @@ public class Main implements Runnable { private Logger logger = LoggerFactory.getLogger(Main.class); private ExcelReader excel; private Properties properties = new Properties(); - public static long sleepThread = 100; + static long sleepThread = 100; public static SimpleDateFormat sdf = new SimpleDateFormat("dd.MM.yyyy"); public static Date currentDate = new Date(System.currentTimeMillis()); @@ -72,7 +72,7 @@ public class Main implements Runnable { return excel.getNextData(); } - public static void safeSleep(long ms) { + static void safeSleep(long ms) { try { Thread.sleep(ms); } catch (InterruptedException ignore) { diff --git a/src/main/java/ru/dmitriymx/astralcheckreport/objects/LeftObject.java b/src/main/java/ru/dmitriymx/astralcheckreport/objects/LeftObject.java index 9557c2d..318b754 100644 --- a/src/main/java/ru/dmitriymx/astralcheckreport/objects/LeftObject.java +++ b/src/main/java/ru/dmitriymx/astralcheckreport/objects/LeftObject.java @@ -5,10 +5,7 @@ package ru.dmitriymx.astralcheckreport.objects; public class LeftObject { - public int id; - - public LeftObject() { - } + private int id; public LeftObject(int id) { this.id = id; @@ -16,7 +13,11 @@ public class LeftObject { @Override public boolean equals(Object obj) { - LeftObject lobj = (LeftObject) obj; - return this.id == lobj.id; + if (obj instanceof LeftObject) { + LeftObject lobj = (LeftObject) obj; + return this.id == lobj.id; + } else { + return false; + } } } diff --git a/src/main/java/ru/dmitriymx/astralcheckreport/objects/Organization.java b/src/main/java/ru/dmitriymx/astralcheckreport/objects/Organization.java index dda1d1e..6bc17a7 100644 --- a/src/main/java/ru/dmitriymx/astralcheckreport/objects/Organization.java +++ b/src/main/java/ru/dmitriymx/astralcheckreport/objects/Organization.java @@ -7,7 +7,7 @@ package ru.dmitriymx.astralcheckreport.objects; import java.util.List; public class Organization { - public int id; + int id; public String inn, kpp; public List products; public String companyGroupName; diff --git a/src/main/java/ru/dmitriymx/astralcheckreport/objects/Product.java b/src/main/java/ru/dmitriymx/astralcheckreport/objects/Product.java index a43144c..78ca2fd 100644 --- a/src/main/java/ru/dmitriymx/astralcheckreport/objects/Product.java +++ b/src/main/java/ru/dmitriymx/astralcheckreport/objects/Product.java @@ -7,7 +7,6 @@ package ru.dmitriymx.astralcheckreport.objects; import com.google.gson.annotations.SerializedName; import java.util.List; -import java.util.Map; public class Product { public int id;