Changeset c164f8f for backend/GlobeGuru-backend/src/main/java/Scraper.java

Timestamp:

01/09/25 18:31:38 (6 days ago)

Author:

Kristijan <kristijanzafirovski26@…>

Branches:

master

Children:

53bad7e

Parents:

d4d8f61

Message:

pred-finalna

File:

• backend/GlobeGuru-backend/src/main/java/Scraper.java (modified) (2 diffs)

backend/GlobeGuru-backend/src/main/java/Scraper.java

@@ -7 +7 @@
 import java.util.Iterator;
 import java.util.List;
+import java.util.concurrent.Callable;
 import java.util.concurrent.ConcurrentLinkedQueue;
 import java.util.concurrent.CountDownLatch;
 
-public class Scraper extends Thread {
+public class Scraper implements Callable<Void> {
+
     private List<String> urls;
-    private String destination;
-    private String departureDate;
-    private int numberOfPeople;
     private ConcurrentLinkedQueue<Option> optionsQueue;
     private CountDownLatch latch;
 
-    public Scraper(String destination, String departureDate, int numberOfPeople) {
+    public Scraper() {
         urls = new ArrayList<>();
         this.optionsQueue = new ConcurrentLinkedQueue<>();
         ObjectMapper mapper = new ObjectMapper();
         try {
-            JsonNode root = mapper.readTree(new File("src/main/java/URLsJSON.json"));
+            ClassLoader classLoader = getClass().getClassLoader();
+            JsonNode root = mapper.readTree(new File(classLoader.getResource("URLsJSON.json").getFile()));
+
             JsonNode urlNode = root.get("agencyurls");
             if (urlNode.isArray()) {
@@ -36 +37 @@
             throw new RuntimeException(e);
         }
-        this.destination = destination;
-        this.departureDate = departureDate;
-        this.numberOfPeople = numberOfPeople;
         this.latch = new CountDownLatch(urls.size());
     }
 
-    @Override
-    public void run() {
+
+    public Void call() {
         System.out.println("Scraper has started ");
         for (String url : urls) {
-            new ScraperThread(url, destination, departureDate, numberOfPeople, optionsQueue, latch).start();
+            new ScraperThread(url, optionsQueue, latch).start();
         }
-    }
-    public List<Option> getOptions() {
-        try {
-            latch.await();  // Wait for all threads to finish
-        } catch (InterruptedException e) {
-            e.printStackTrace();
-        }
-        return new ArrayList<>(optionsQueue);
+        return null;
     }
 }