add dynamic loading for monitoring components and remove influx

Author: gdaniel

pom.xml

@@ -27,7 +27,6 @@
         <lombok.version>1.18.12</lombok.version>
         <retrofit.version>2.9.0</retrofit.version>
         <okhttp3.logging-interceptor.version>3.14.0</okhttp3.logging-interceptor.version>
-        <influxdb-client.version>1.7.0</influxdb-client.version>
         <unirest.version>1.4.9</unirest.version>
         <opennlp-tools.version>1.9.3</opennlp-tools.version>
         <emoji-java.version>5.1.1</emoji-java.version>
@@ -72,12 +71,6 @@
             <artifactId>org.eclipse.emf.ecore.xmi</artifactId>
         </dependency>
 
-        <!-- InfluxDB -->
-        <dependency>
-            <groupId>com.influxdb</groupId>
-            <artifactId>influxdb-client-java</artifactId>
-        </dependency>
-
         <!-- Unirest -->
         <dependency>
             <groupId>com.mashape.unirest</groupId>
@@ -247,13 +240,6 @@
                 <version>${dialogflow.version}</version>
             </dependency>
 
-            <!-- InfluxDB -->
-            <dependency>
-                <groupId>com.influxdb</groupId>
-                <artifactId>influxdb-client-java</artifactId>
-                <version>${influxdb-client.version}</version>
-            </dependency>
-
             <!-- Utils -->
 
             <dependency>

src/main/java/com/xatkit/core/recognition/IntentRecognitionProviderFactory.java

@@ -6,6 +6,7 @@
 import com.xatkit.core.recognition.processor.InputPreProcessor;
 import com.xatkit.core.recognition.processor.IntentPostProcessor;
 import com.xatkit.core.recognition.regex.RegExIntentRecognitionProvider;
+import com.xatkit.core.server.XatkitServer;
 import com.xatkit.util.Loader;
 import fr.inria.atlanmod.commons.log.Log;
 import lombok.NonNull;
@@ -38,19 +39,20 @@ private IntentRecognitionProviderFactory() {
     }
 
     /**
-     * The database model that will be used for this instance of Xatkit.
+     * The database that will be used by this instance of Xatkit to store logs.
      * <p>
-     * This property is optional, and it's default value is set to "MAPDB" if not specified
+     * If this property is not set the bot won't use logging.
+     * <p>
+     * The value of this property is the fully-qualified name of the {@link RecognitionMonitor} subclass to
+     * instantiate. Libraries providing such implementations typically provide a constant value for that.
      */
-    public static final String DATABASE_MODEL_KEY = "xatkit.database.model";
+    public static final String LOGS_DATABASE = "xatkit.logs.database";
 
     /**
      * The default value for xatkit.database.model in case it's not specified in the properties file.
      */
     public static final String DATABASE_MODEL_MAPDB = "mapdb";
 
-    public static final String DATABASE_MODEL_INFLUXDB = "influxdb";
-
     public static final String DATABASE_MODEL_POSTGRESQL = "postgresql";
 
     public static final String DEFAULT_DATABASE_MODEL = DATABASE_MODEL_MAPDB;
@@ -120,16 +122,17 @@ public static IntentRecognitionProvider getIntentRecognitionProvider(@NonNull Xa
 
         IntentRecognitionProvider provider;
 
-        if(baseConfiguration.containsKey(INTENT_PROVIDER_KEY)) {
+        if (baseConfiguration.containsKey(INTENT_PROVIDER_KEY)) {
             try {
                 String providerClassName = baseConfiguration.getString(INTENT_PROVIDER_KEY);
-                Class<? extends IntentRecognitionProvider> providerClass = (Class<? extends IntentRecognitionProvider>) Class.forName(providerClassName);
+                Class<? extends IntentRecognitionProvider> providerClass =
+                        (Class<? extends IntentRecognitionProvider>) Class.forName(providerClassName);
                 Constructor<? extends IntentRecognitionProvider> providerConstructor =
                         providerClass.getConstructor(EventDefinitionRegistry.class, Configuration.class,
                                 RecognitionMonitor.class);
                 provider = providerConstructor.newInstance(xatkitBot.getEventDefinitionRegistry(), baseConfiguration,
                         recognitionMonitor);
-            } catch(ClassNotFoundException | NoSuchMethodException | InvocationTargetException | InstantiationException |
+            } catch (ClassNotFoundException | NoSuchMethodException | InvocationTargetException | InstantiationException |
                     IllegalAccessException e) {
                 throw new RuntimeException(e);
             }
@@ -176,27 +179,25 @@ private static RecognitionMonitor getRecognitionMonitor(XatkitBot xatkitBot,
          */
         RecognitionMonitor monitor = null;
         if (configuration.isEnableRecognitionAnalytics()) {
-            if (configuration.getBaseConfiguration().getString(DATABASE_MODEL_KEY, DEFAULT_DATABASE_MODEL)
-                    .toLowerCase().equals(DATABASE_MODEL_INFLUXDB)) {
-                Log.info("Using InfluxDB to store monitoring data");
-                monitor = new RecognitionMonitorInflux(xatkitBot.getXatkitServer(),
-                        configuration.getBaseConfiguration());
-            } else if (configuration.getBaseConfiguration().getString(DATABASE_MODEL_KEY)
-                    .toLowerCase().equals(DATABASE_MODEL_POSTGRESQL)) {
+            if (configuration.getBaseConfiguration().containsKey(LOGS_DATABASE)) {
                 try {
-                    monitor = new RecognitionMonitorPostgreSQL(xatkitBot.getXatkitServer(),
+                    String databaseClassName = configuration.getBaseConfiguration().getString(LOGS_DATABASE);
+                    Class<? extends RecognitionMonitor> databaseClass =
+                            (Class<? extends RecognitionMonitor>) Class.forName(databaseClassName);
+                    Constructor<? extends RecognitionMonitor> databaseConstructor =
+                            databaseClass.getConstructor(XatkitServer.class, Configuration.class);
+                    monitor = databaseConstructor.newInstance(xatkitBot.getXatkitServer(),
                             configuration.getBaseConfiguration());
-                } catch (Exception e) {
-                    throw new RuntimeException("Error creating the PostgreSQL monitoring, see the exception for "
-                            + "details ", e);
+                } catch (ClassNotFoundException | NoSuchMethodException | InvocationTargetException | InstantiationException |
+                        IllegalAccessException e) {
+                    throw new RuntimeException(e);
                 }
-
-
             } else {
-                Log.info("Using MapDB to store monitoring data");
-                monitor = new RecognitionMonitorMapDB(xatkitBot.getXatkitServer(),
-                        configuration.getBaseConfiguration());
+                Log.error("Analytics are enabled but no database provided for storing logs. Please provide a value "
+                        + "for {0}", LOGS_DATABASE);
             }
+        } else {
+            Log.debug("Analytics are disabled");
         }
         return monitor;
     }