fix last erros

dethi · Dec 9, 2017 · 7553442 · 7553442
1 parent e8563f6
commit 7553442
Show file tree

Hide file tree

Showing 6 changed files with 37 additions and 17 deletions.
diff --git a/domain/src/main/java/com/epita/domain/Document.java b/domain/src/main/java/com/epita/domain/Document.java
@@ -3,8 +3,10 @@
 import java.util.HashMap;
 
 public class Document {
-    public final String url;
-    public final HashMap<String, Term> terms;
+    public String url;
+    public HashMap<String, Term> terms;
+
+    public Document() {}
 
     public Document(final String url, final HashMap<String, Term> terms) {
         this.url = url;

diff --git a/domain/src/main/java/com/epita/domain/Term.java b/domain/src/main/java/com/epita/domain/Term.java
@@ -3,9 +3,11 @@
 import java.util.List;
 
 public class Term {
-    public final String token;
-    public final List<Integer> position;
-    public final double frequency;
+    public String token;
+    public List<Integer> position;
+    public double frequency;
+
+    public Term() {}
 
     public Term(final String token, final List<Integer> position, final double frequency) {
         this.token = token;

diff --git a/src/main/java/com/epita/guereza/CrawlerApp.java b/src/main/java/com/epita/guereza/CrawlerApp.java
@@ -32,8 +32,10 @@ private void requestNextUrl() {
     }
 
     private void storeUrls(final String[] urls) {
-        LOGGER.info("Store {} urls", urls.length);
-        sendMessage("/store/crawler", urls);
+        if (urls != null) {
+            LOGGER.info("Store {} urls", urls.length);
+            sendMessage("/store/crawler", new WrapperStringArray(urls));
+        }
     }
 
 

diff --git a/src/main/java/com/epita/guereza/EventStoreApp.java b/src/main/java/com/epita/guereza/EventStoreApp.java
@@ -22,6 +22,7 @@ protected EventStoreApp(EventBusClient eventBus, EventStore eventStore) {
 
     private void extractThen(final EventBusClient.Message msg, final Consumer<Object> consumer) {
         try {
+            LOGGER.info("Message Type: {}", msg.getMessageType());
             Class c = ClassLoader.getSystemClassLoader().loadClass(msg.getMessageType());
             Object o = new ObjectMapper().readValue(msg.getContent(), c);
             if (o != null) {
@@ -43,7 +44,7 @@ public void run() {
             eventStore.dispatch(ev);
         }));
         eventBus.subscribe("/store/crawler", msg -> extractThen(msg, o -> {
-            Event<String[]> ev = new Event<>("ADD_URLS", (String[]) o);
+            Event<WrapperStringArray> ev = new Event<>("ADD_URLS", (WrapperStringArray) o);
             eventStore.dispatch(ev);
         }));
         eventBus.subscribe("/store/indexer", msg -> extractThen(msg, o -> {

diff --git a/src/main/java/com/epita/guereza/UrlStore.java b/src/main/java/com/epita/guereza/UrlStore.java
@@ -9,10 +9,7 @@
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-import java.util.HashSet;
-import java.util.LinkedList;
-import java.util.Queue;
-import java.util.Set;
+import java.util.*;
 
 public class UrlStore implements Reducer {
     private static final Logger LOGGER = LoggerFactory.getLogger(CrawlerService.class);
@@ -26,15 +23,17 @@ public class UrlStore implements Reducer {
 
     public UrlStore(final EventBusClient eventBus) {
         this.eventBus = eventBus;
-        store(new String[] {STARTING_URL});
+        final List<String> initialList = new ArrayList<String>();
+        initialList.add(STARTING_URL);
+        store(initialList);
     }
 
     @SuppressWarnings("unchecked")
     @Override
     public void reduce(final Event<?> event) {
         switch (event.type) {
             case "ADD_URLS":
-                addUrls((Event<String[]>) event);
+                addUrls((Event<WrapperStringArray>) event);
                 break;
             case "CRAWLER_REQUEST_URL":
                 crawlerRequestUrl((Event<String>) event);
@@ -45,7 +44,7 @@ public void reduce(final Event<?> event) {
         }
     }
 
-    private void store(String[] urls) {
+    private void store(List<String> urls) {
         for (String url : urls) {
             if (url == null || url.isEmpty())
                 continue;
@@ -58,8 +57,8 @@ private void store(String[] urls) {
         }
     }
 
-    private void addUrls(Event<String[]> event) {
-        store(event.obj);
+    private void addUrls(Event<WrapperStringArray> event) {
+        store(event.obj.content);
         LOGGER.info("added URLs to the repo");
     }
 

diff --git a/src/main/java/com/epita/guereza/WrapperStringArray.java b/src/main/java/com/epita/guereza/WrapperStringArray.java
@@ -0,0 +1,14 @@
+package com.epita.guereza;
+
+import java.util.Arrays;
+import java.util.List;
+
+public class WrapperStringArray {
+    public List<String> content;
+
+    public WrapperStringArray() {}
+
+    public WrapperStringArray(String[] content) {
+        this.content = Arrays.asList(content);
+    }
+}