2 files changed, 12 insertions, 4 deletions
diff --git a/src/main/java/com/mavlushechka/animarfo/App.java b/src/main/java/com/mavlushechka/animarfo/App.java
index 27f9bff..054b92c 100644
--- a/src/main/java/com/mavlushechka/animarfo/App.java
+++ b/src/main/java/com/mavlushechka/animarfo/App.java
@@ -1,6 +1,7 @@
 package com.mavlushechka.animarfo;
 
 import com.mavlushechka.animarfo.telegram.bot.Bot;
+import org.jetbrains.annotations.NotNull;
 
 import java.io.File;
 import java.io.FileInputStream;
@@ -11,7 +12,9 @@ import java.util.logging.LogManager;
 import java.util.logging.Logger;
 
 public class App {
-    public final static Properties PROPERTIES = loadProperties(new File("src/main/resources/app.properties"));
+
+    public static final Properties PROPERTIES = loadProperties(new File("src/main/resources/app.properties"));
+
     private static final Logger LOGGER = Logger.getLogger(App.class.getName());
 
     static {
@@ -29,7 +32,8 @@ public class App {
         Bot.start();
     }
 
-    public static Properties loadProperties(File file) {
+    @NotNull
+    private static Properties loadProperties(File file) {
         Properties properties = new Properties();
         try (FileInputStream fis = new FileInputStream(file)) {
             properties.load(fis);
diff --git a/src/main/java/com/mavlushechka/animarfo/database/Database.java b/src/main/java/com/mavlushechka/animarfo/database/Database.java
index 5de20a1..d69bba3 100644
--- a/src/main/java/com/mavlushechka/animarfo/database/Database.java
+++ b/src/main/java/com/mavlushechka/animarfo/database/Database.java
@@ -16,8 +16,10 @@ import java.util.logging.Level;
 import java.util.logging.Logger;
 
 public class Database {
+
     private static final String MONGO_URI = App.PROPERTIES.getProperty("DATABASE_URL");
-    private static final MongoDatabase database = new MongoClient(new MongoClientURI(MONGO_URI))
+
+    private static final MongoDatabase MONGO_DATABASE = new MongoClient(new MongoClientURI(MONGO_URI))
             .getDatabase("animarfo")
             .withCodecRegistry(
                     CodecRegistries.fromRegistries(
@@ -25,14 +27,16 @@ public class Database {
                         CodecRegistries.fromProviders(PojoCodecProvider.builder().automatic(true).build())
                     )
             );
+
     private static final Logger LOGGER = Logger.getLogger(Database.class.getName());
+
     static {
         LOGGER.setLevel(Level.ALL);
     }
 
     public static void saveUser(TelegramUser telegramUser) {
         LOGGER.info("Trying to save user to database");
-        MongoCollection<TelegramUser> collection = database.getCollection("users", TelegramUser.class);
+        MongoCollection<TelegramUser> collection = MONGO_DATABASE.getCollection("users", TelegramUser.class);
         LOGGER.fine("Connected to database and got collection");
         TelegramUser searchedTelegramUser = collection.find(Filters.eq("_id", telegramUser.getId())).first();