From 30439d16b85cf2356f554b85b711d70c62dd57fa Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Pluta?= <bartlomiej.p.pluta@gmail.com>
Date: Wed, 3 Apr 2019 10:27:00 +0200
Subject: [PATCH] 6: Enable analysing in EsaMain

---
 src/main/java/com/bartek/esa/EsaMain.java            | 12 +++++++++---
 .../esa/dispatcher/dispatcher/MethodDispatcher.java  |  3 ++-
 2 files changed, 11 insertions(+), 4 deletions(-)

diff --git a/src/main/java/com/bartek/esa/EsaMain.java b/src/main/java/com/bartek/esa/EsaMain.java
index c3a9461..704a32b 100644
--- a/src/main/java/com/bartek/esa/EsaMain.java
+++ b/src/main/java/com/bartek/esa/EsaMain.java
@@ -1,5 +1,7 @@
 package com.bartek.esa;
 
+import com.bartek.esa.analyser.apk.ApkAnalyser;
+import com.bartek.esa.analyser.source.SourceAnalyser;
 import com.bartek.esa.cli.model.CliArgsOptions;
 import com.bartek.esa.cli.parser.CliArgsParser;
 import com.bartek.esa.core.model.object.Issue;
@@ -13,17 +15,21 @@ import java.util.List;
 public class EsaMain {
     private final CliArgsParser cliArgsParser;
     private final MethodDispatcher methodDispatcher;
+    private final SourceAnalyser sourceAnalyser;
+    private final ApkAnalyser apkAnalyser;
 
     @Inject
-    EsaMain(CliArgsParser cliArgsParser, MethodDispatcher methodDispatcher) {
+    EsaMain(CliArgsParser cliArgsParser, MethodDispatcher methodDispatcher, SourceAnalyser sourceAnalyser, ApkAnalyser apkAnalyser) {
         this.cliArgsParser = cliArgsParser;
         this.methodDispatcher = methodDispatcher;
+        this.sourceAnalyser = sourceAnalyser;
+        this.apkAnalyser = apkAnalyser;
     }
 
     private void run(String[] args) {
         DispatcherActions dispatcherActions = DispatcherActions.builder()
-                .sourceAnalysis((source, plugins, excludes) -> null)
-                .apkAudit((source, plugins, excludes) -> null)
+                .sourceAnalysis(sourceAnalyser::analyse)
+                .apkAudit(apkAnalyser::analyse)
                 .build();
 
         CliArgsOptions options = cliArgsParser.parse(args);
diff --git a/src/main/java/com/bartek/esa/dispatcher/dispatcher/MethodDispatcher.java b/src/main/java/com/bartek/esa/dispatcher/dispatcher/MethodDispatcher.java
index 29711ad..3dc20b4 100644
--- a/src/main/java/com/bartek/esa/dispatcher/dispatcher/MethodDispatcher.java
+++ b/src/main/java/com/bartek/esa/dispatcher/dispatcher/MethodDispatcher.java
@@ -25,7 +25,8 @@ public class MethodDispatcher {
         }
 
         if(options.isApkAudit()) {
-            return actions.getApkAudit().perform(options.getApkAuditFile(),
+            return actions.getApkAudit().perform(
+                    options.getApkAuditFile(),
                     options.getPlugins(),
                     options.getExcludes()
             );