put mongo initialisation of web app into init method instead of static under a path class

Author: coy123

curation-module-web/src/main/java/eu/clarin/helpers/LinkCheckerStatisticsHelper.java

@@ -1,16 +1,17 @@
 package eu.clarin.helpers;
 
-import com.mongodb.client.*;
+import com.mongodb.client.AggregateIterable;
+import com.mongodb.client.MongoCollection;
+import com.mongodb.client.MongoCursor;
+import com.mongodb.client.MongoDatabase;
 import com.mongodb.client.model.Accumulators;
 import com.mongodb.client.model.Aggregates;
-import eu.clarin.cmdi.curation.main.Configuration;
 import eu.clarin.cmdi.curation.utils.TimeUtils;
 import eu.clarin.curation.linkchecker.urlElements.URLElement;
 import org.bson.Document;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-import java.text.DecimalFormat;
 import java.util.Arrays;
 import java.util.List;
 
@@ -22,33 +23,12 @@
 public class LinkCheckerStatisticsHelper {
     private static final Logger _logger = LoggerFactory.getLogger(LinkCheckerStatisticsHelper.class);
 
-    private static final MongoClient mongoClient;
     private MongoCollection<Document> linksChecked;
 
-    private DecimalFormat numberFormatter = new DecimalFormat("###,###.##");
-
-    static { //since MongoClient is already a connection pool only one instance should exist in the application
-        if (Configuration.DATABASE) {
-            _logger.info("Connecting to database...");
-            if (Configuration.DATABASE_URI == null || Configuration.DATABASE_URI.isEmpty()) {//if it is empty, try localhost
-                mongoClient = MongoClients.create();
-            } else {
-                mongoClient = MongoClients.create(Configuration.DATABASE_URI);
-            }
-        } else {
-            mongoClient = null;
-        }
-    }
-
-    public LinkCheckerStatisticsHelper() {
-
-        MongoDatabase database = mongoClient.getDatabase(Configuration.DATABASE_NAME);
-        _logger.info("Connected to database.");
-
+    public LinkCheckerStatisticsHelper(MongoDatabase database) {
         this.linksChecked = database.getCollection("linksChecked");
     }
 
-
     private AggregateIterable<Document> getStatusStatistics() {
 
         return linksChecked.aggregate(Arrays.asList(

curation-module-web/src/main/java/eu/clarin/main/Configuration.java

@@ -1,5 +1,8 @@
 package eu.clarin.main;
 
+import com.mongodb.client.MongoClient;
+import com.mongodb.client.MongoClients;
+import com.mongodb.client.MongoDatabase;
 import eu.clarin.helpers.FileManager;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -25,6 +28,10 @@ public class Configuration {
     public static String VIEW_RESOURCES_PATH;
     public static String OUTPUT_DIRECTORY;
     public static String BASE_URL;
+    private static String DATABASE_URI;
+    private static String DATABASE_NAME;
+
+    public static MongoDatabase DATABASE;
 
     public static void init(ServletContext servletContext) throws IOException {
 
@@ -83,5 +90,25 @@ private static void loadVariables(Properties properties) {
 
         BASE_URL = properties.getProperty("BASE_URL");
 
+        DATABASE_URI = properties.getProperty("DATABASE_URI");
+        DATABASE_NAME = properties.getProperty("DATABASE_NAME");
+
+        loadMongo();
+
+    }
+
+    private static void loadMongo() {
+        _logger.info("Connecting to database...");
+        MongoClient mongoClient;
+
+        if (DATABASE_URI == null || DATABASE_URI.isEmpty()) {//if it is empty, try localhost
+            mongoClient = MongoClients.create();
+        } else {
+            mongoClient = MongoClients.create(DATABASE_URI);
+        }
+
+        DATABASE = mongoClient.getDatabase(DATABASE_NAME);
+        _logger.info("Connected to database.");
+
     }
 }

curation-module-web/src/main/java/eu/clarin/routes/Statistics.java

@@ -1,8 +1,10 @@
 package eu.clarin.routes;
 
+
 import eu.clarin.helpers.FileManager;
 import eu.clarin.helpers.LinkCheckerStatisticsHelper;
 import eu.clarin.helpers.ResponseManager;
+
 import eu.clarin.main.Configuration;
 import org.apache.log4j.Logger;
 
@@ -34,7 +36,7 @@ public Response getStatistics() {
     @Path("/{collectionName}/{status}")
     public Response getStatusStatsInit(@PathParam("collectionName") String collectionName, @PathParam("status") int status) {
 
-        LinkCheckerStatisticsHelper linkCheckerStatisticsHelper = new LinkCheckerStatisticsHelper();
+        LinkCheckerStatisticsHelper linkCheckerStatisticsHelper = new LinkCheckerStatisticsHelper(Configuration.DATABASE);
         String urlStatistics = linkCheckerStatisticsHelper.createURLTable(collectionName, status);
 
         return ResponseManager.returnHTML(200, urlStatistics, null);
@@ -46,10 +48,9 @@ public Response getStatusStatsInit(@PathParam("collectionName") String collectio
     @Path("/{collectionName}/{status}/{batchCount}")
     public Response getStatusStats(@PathParam("collectionName") String collectionName, @PathParam("status") int status, @PathParam("batchCount") int batchCount) {
 
-        LinkCheckerStatisticsHelper linkCheckerStatisticsHelper = new LinkCheckerStatisticsHelper();
+        LinkCheckerStatisticsHelper linkCheckerStatisticsHelper = new LinkCheckerStatisticsHelper(Configuration.DATABASE);
 
         String urlBatchStatistics = linkCheckerStatisticsHelper.getHtmlRowsInBatch(collectionName, status, batchCount);
-
         return ResponseManager.returnResponse(200, urlBatchStatistics, null);
 
     }

linkChecker/src/main/java/eu/clarin/curation/linkchecker/helpers/Configuration.java

@@ -1,10 +1,15 @@
 package eu.clarin.curation.linkchecker.helpers;
 
+import com.mongodb.MongoException;
+import com.mongodb.client.MongoClient;
+import com.mongodb.client.MongoClients;
+import com.mongodb.client.MongoDatabase;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
 import java.io.FileInputStream;
 import java.io.IOException;
+import java.rmi.ServerException;
 import java.util.HashMap;
 import java.util.Map;
 import java.util.Properties;
@@ -14,7 +19,6 @@ public class Configuration {
     private static Properties properties = new Properties();
     private final static Logger _logger = LoggerFactory.getLogger(Configuration.class);
 
-
     public static String DATABASE_NAME;
     public static String DATABASE_URI;
     public static int TIMEOUT;
@@ -24,7 +28,6 @@ public class Configuration {
     public static boolean ONLY_BROKEN;
     public static Map<String, Long> CRAWLDELAYMAP = new HashMap<>();
 
-
     public static void loadConfigVariables(String configPath) {
         try {
             properties.load(new FileInputStream(configPath));
@@ -50,7 +53,6 @@ public static void loadConfigVariables(String configPath) {
             CRAWLDELAYMAP.put(collection, delay);
         }
 
-
     }
 
 }