From 866a9d0ca83bafffb783f56ec61a44682f4ec493 Mon Sep 17 00:00:00 2001
From: Frank Delporte <frank@webtechie.be>
Date: Wed, 20 Nov 2024 10:35:12 +0100
Subject: [PATCH 1/2] Remove outdated DataRepository, and fix location of files
 for unit tests

---
 .../dlsc/jfxcentral/data/DataRepository.java  | 824 +++++-------------
 .../dlsc/jfxcentral/data/DataRepository2.java | 796 -----------------
 .../dlsc/jfxcentral/data/ImageManager.java    |   7 +-
 .../com/dlsc/jfxcentral/data/RSSManager.java  |   4 +-
 ...tory2Test.java => DataRepositoryTest.java} | 109 ++-
 .../jfxcentral/data/ImageManagerTest.java     |  40 +-
 .../dlsc/jfxcentral/data/RSSManagerTest.java  |   4 +-
 7 files changed, 306 insertions(+), 1478 deletions(-)
 delete mode 100755 src/main/java/com/dlsc/jfxcentral/data/DataRepository2.java
 rename src/test/java/com/dlsc/jfxcentral/data/{DataRepository2Test.java => DataRepositoryTest.java} (89%)

diff --git a/src/main/java/com/dlsc/jfxcentral/data/DataRepository.java b/src/main/java/com/dlsc/jfxcentral/data/DataRepository.java
index 4ce1015d..9ff5d7b1 100755
--- a/src/main/java/com/dlsc/jfxcentral/data/DataRepository.java
+++ b/src/main/java/com/dlsc/jfxcentral/data/DataRepository.java
@@ -34,12 +34,8 @@
 import com.rometools.rome.feed.synd.SyndFeed;
 import com.rometools.rome.io.SyndFeedInput;
 import com.rometools.rome.io.XmlReader;
-import javafx.beans.property.ObjectProperty;
-import javafx.beans.property.SimpleObjectProperty;
 import javafx.beans.property.SimpleStringProperty;
 import javafx.beans.property.StringProperty;
-import javafx.collections.FXCollections;
-import javafx.collections.ObservableList;
 import org.apache.commons.lang3.StringUtils;
 
 import java.io.BufferedReader;
@@ -47,21 +43,15 @@
 import java.io.FileReader;
 import java.io.IOException;
 import java.io.InputStreamReader;
-import java.net.HttpURLConnection;
-import java.net.MalformedURLException;
-import java.net.ProtocolException;
-import java.net.URL;
-import java.net.URLConnection;
+import java.lang.reflect.Type;
+import java.net.*;
 import java.nio.charset.StandardCharsets;
 import java.text.MessageFormat;
-import java.time.LocalDate;
 import java.time.format.DateTimeFormatter;
 import java.util.ArrayList;
+import java.util.Collection;
 import java.util.Collections;
-import java.util.Comparator;
-import java.util.HashMap;
 import java.util.List;
-import java.util.Map;
 import java.util.Optional;
 import java.util.logging.Logger;
 import java.util.stream.Collectors;
@@ -69,50 +59,39 @@
 public class DataRepository {
 
     private static final Logger LOG = Logger.getLogger(DataRepository.class.getName());
-
     public static File REPO_DIRECTORY = new File(System.getProperty("jfxcentral.repo", new File(System.getProperty("user.home"), ".jfxcentralrepo").getAbsolutePath())).getAbsoluteFile();
-
     private static final DateTimeFormatter DATE_FORMATTER = DateTimeFormatter.ofPattern("yyyy-MM-dd");
-
+    private static boolean testing;
     private static DataRepository instance;
-
     private final Gson gson = Converters.registerLocalDate(new GsonBuilder()).setPrettyPrinting().create();
+    private final List<Library> libraries = new ArrayList<>();
+    private final List<Blog> blogs = new ArrayList<>();
+    private final List<News> news = new ArrayList<>();
+    private final List<Book> books = new ArrayList<>();
+    private final List<LinksOfTheWeek> linksOfTheWeek = new ArrayList<>();
+    private final List<Tip> tips = new ArrayList<>();
+    private final List<Tutorial> tutorials = new ArrayList<>();
+    private final List<Video> videos = new ArrayList<>();
+    private final List<Download> downloads = new ArrayList<>();
+    private final List<RealWorldApp> realWorldApps = new ArrayList<>();
+    private final List<Tool> tools = new ArrayList<>();
+    private final List<Utility> utilities = new ArrayList<>();
+    private final List<Company> companies = new ArrayList<>();
+    private final List<Person> people = new ArrayList<>();
+    private final List<IkonliPack> ikonliPacks = new ArrayList<>();
+    private final List<Member> members = new ArrayList<>();
+    private final List<Documentation> documentation = new ArrayList<>();
+    private final List<LearnJavaFX> learnJavaFX = new ArrayList<>();
+    private final List<LearnMobile> learnMobile = new ArrayList<>();
+    private final List<LearnRaspberryPi> learnRaspberryPi = new ArrayList<>();
+    private String homeText;
+    private String openJFXText;
+    private long cachedPullRequestsTime;
+    private List<PullRequest> cachedPullRequests;
 
-    private final Map<Library, ObjectProperty<LibraryInfo>> libraryInfoMap = new HashMap<>();
-
-    private final Map<News, StringProperty> newsTextMap = new HashMap<>();
-
-    private final Map<Tutorial, StringProperty> tutorialTextMap = new HashMap<>();
-
-    private final Map<Download, StringProperty> downloadTextMap = new HashMap<>();
-
-    private final Map<Book, StringProperty> bookTextMap = new HashMap<>();
-
-    private final Map<Person, StringProperty> personDescriptionMap = new HashMap<>();
-
-    private final Map<Tool, StringProperty> toolDescriptionMap = new HashMap<>();
-
-    private final Map<Utility, StringProperty> utilityDescriptionMap = new HashMap<>();
-
-    private final Map<Tip, StringProperty> tipDescriptionMap = new HashMap<>();
-
-    private final Map<RealWorldApp, StringProperty> realWorldAppDescriptionMap = new HashMap<>();
-
-    private final Map<Company, StringProperty> companyDescriptionMap = new HashMap<>();
-
-    private final Map<Library, StringProperty> libraryReadMeMap = new HashMap<>();
-
-    private final Map<LinksOfTheWeek, StringProperty> linksOfTheWeekReadMeMap = new HashMap<>();
-
-    private final Map<Member, StringProperty> memberDescriptionMap = new HashMap<>();
-    //private final Map<Learn, StringProperty> learnDescriptionMap = new HashMap<>();
-    private final Map<LearnJavaFX,StringProperty> learnJavaFXDescriptionMap = new HashMap<>();
-    private final Map<LearnMobile,StringProperty> learnMobileDescriptionMap = new HashMap<>();
-    private final Map<LearnRaspberryPi,StringProperty> learnRaspberryPiDescriptionMap = new HashMap<>();
-
-    private boolean loaded;
-
-    public static boolean testing = false;
+    private DataRepository() {
+        doLoadData("initial loading of data upon creation of data repository instance");
+    }
 
     public static synchronized DataRepository getInstance() {
         if (instance == null) {
@@ -122,41 +101,23 @@ public static synchronized DataRepository getInstance() {
         return instance;
     }
 
-    public boolean isLoaded() {
-        return loaded;
+    public static void setTesting(boolean testing) {
+        DataRepository.testing = testing;
     }
 
-    private DataRepository() {
+    public static boolean isTesting() {
+        return DataRepository.testing;
     }
 
-    public void loadData() {
+    public void reload() {
         doLoadData("explicit call to refresh method");
     }
 
     public void clearData() {
-        loaded = false;
-
-        setHomeText("");
-        setOpenJFXText("");
-
-        libraryInfoMap.clear();
-        libraryReadMeMap.clear();
-        newsTextMap.clear();
-        personDescriptionMap.clear();
-        companyDescriptionMap.clear();
-        toolDescriptionMap.clear();
-        utilityDescriptionMap.clear();
-        tipDescriptionMap.clear();
-        realWorldAppDescriptionMap.clear();
-        downloadTextMap.clear();
-        bookTextMap.clear();
-        tutorialTextMap.clear();
-        linksOfTheWeekReadMeMap.clear();
-        memberDescriptionMap.clear();
-        learnJavaFXDescriptionMap.clear();
-        learnMobileDescriptionMap.clear();
-        learnRaspberryPiDescriptionMap.clear();
+        LOG.fine("clearing data");
 
+        homeText = "";
+        openJFXText = "";
         getPeople().clear();
         getLibraries().clear();
         getBooks().clear();
@@ -180,162 +141,74 @@ public void clearData() {
     }
 
     private void doLoadData(String reason) {
+        clearData();
+
         LOG.fine("loading data, reason = " + reason);
 
         try {
-            String homeText = loadString(new File(getRepositoryDirectory(), "intro.md"));
-
-            String openJFXText = loadString(new File(getRepositoryDirectory(), "openjfx/intro.md"));
-
-            List<Person> people = loadModel("people/people.json", new TypeToken<>() {
-            });
-            List<Book> books = loadModel("books/books.json", new TypeToken<>() {
-            });
-            List<Video> videos = loadModel("videos/videos.json", new TypeToken<>() {
-            });
-            List<Library> libraries = loadModel("libraries/libraries.json", new TypeToken<>() {
-            });
-            List<News> news = loadModel("news/news.json", new TypeToken<>() {
-            });
-            List<Blog> blogs = loadModel("blogs/blogs.json", new TypeToken<>() {
-            });
-            List<Company> companies = loadModel("companies/companies.json", new TypeToken<>() {
-            });
-            List<Tool> tools = loadModel("tools/tools.json", new TypeToken<>() {
-            });
-            List<Utility> utilities = loadModel("utilities/utilities.json", new TypeToken<>() {
-            });
-            List<RealWorldApp> realWorldApps = loadModel("realworld/realworld.json", new TypeToken<>() {
-            });
-            List<Download> downloads = loadModel("downloads/downloads.json", new TypeToken<>() {
-            });
-            List<Tutorial> tutorials = loadModel("tutorials/tutorials.json", new TypeToken<>() {
-            });
-            List<Tip> tips = loadModel("tips/tips.json", new TypeToken<>() {
-            });
-            List<LinksOfTheWeek> links = loadModel("links/links.json", new TypeToken<>() {
-            });
-            List<IkonliPack> ikonliPacks = loadModel("ikonlipacks/ikonlipacks.json", new TypeToken<>() {
-            });
-            List<Member> members = loadModel("members/members.json", new TypeToken<>() {
-            });
-            List<Documentation> documentation = loadModel("documentation/documentation.json", new TypeToken<>() {
-            });
-            List<LearnJavaFX> learnJavaFX = loadModel("learn/javafx/learn.json", new TypeToken<>() {
-            });
-            List<LearnMobile> learnMobile = loadModel("learn/mobile/learn.json", new TypeToken<>() {
-            });
-            List<LearnRaspberryPi> learnRaspberryPi = loadModel("learn/raspberrypi/learn.json", new TypeToken<>() {
-            });
-
-            setData(homeText, openJFXText, people, books, videos, libraries, news, blogs, companies, tools, utilities, realWorldApps, downloads, tutorials, tips, links, ikonliPacks, members, documentation, learnJavaFX, learnMobile, learnRaspberryPi);
-
-            LOG.fine("data loading finished");
+            // plain texts
+            homeText = loadString(new File(getRepositoryDirectory(), "intro.md"));
+            openJFXText = loadString(new File(getRepositoryDirectory(), "openjfx/intro.md"));
+
+            // collections
+            people.addAll(load(getFile("people/people.json"), new TypeToken<List<Person>>() {
+            }.getType()));
+            books.addAll(load(getFile("books/books.json"), new TypeToken<List<Book>>() {
+            }.getType()));
+            videos.addAll(load(getFile("videos/videos.json"), new TypeToken<List<Video>>() {
+            }.getType()));
+            libraries.addAll(load(getFile("libraries/libraries.json"), new TypeToken<List<Library>>() {
+            }.getType()));
+            news.addAll(load(getFile("news/news.json"), new TypeToken<List<News>>() {
+            }.getType()));
+            tutorials.addAll(load(getFile("tutorials/tutorials.json"), new TypeToken<List<Tutorial>>() {
+            }.getType()));
+            blogs.addAll(load(getFile("blogs/blogs.json"), new TypeToken<List<Blog>>() {
+            }.getType()));
+            companies.addAll(load(getFile("companies/companies.json"), new TypeToken<List<Company>>() {
+            }.getType()));
+            tools.addAll(load(getFile("tools/tools.json"), new TypeToken<List<Tool>>() {
+            }.getType()));
+            utilities.addAll(load(getFile("utilities/utilities.json"), new TypeToken<List<Utility>>() {
+            }.getType()));
+            realWorldApps.addAll(load(getFile("realworld/realworld.json"), new TypeToken<List<RealWorldApp>>() {
+            }.getType()));
+            downloads.addAll(load(getFile("downloads/downloads.json"), new TypeToken<List<Download>>() {
+            }.getType()));
+            tips.addAll(load(getFile("tips/tips.json"), new TypeToken<List<Tip>>() {
+            }.getType()));
+            linksOfTheWeek.addAll(load(getFile("links/links.json"), new TypeToken<List<LinksOfTheWeek>>() {
+            }.getType()));
+            ikonliPacks.addAll(load(getFile("ikonlipacks/ikonlipacks.json"), new TypeToken<List<IkonliPack>>() {
+            }.getType()));
+            members.addAll(load(getFile("members/members.json"), new TypeToken<List<Member>>() {
+            }.getType()));
+            documentation.addAll(load(getFile("documentation/documentation.json"), new TypeToken<List<Documentation>>() {
+            }.getType()));
+            learnJavaFX.addAll(load(getFile("learn/javafx/learn.json"), new TypeToken<List<LearnJavaFX>>() {
+            }.getType()));
+            learnMobile.addAll(load(getFile("learn/mobile/learn.json"), new TypeToken<List<LearnMobile>>() {
+            }.getType()));
+            learnRaspberryPi.addAll(load(getFile("learn/raspberrypi/learn.json"), new TypeToken<List<LearnRaspberryPi>>() {
+            }.getType()));
+
         } catch (Exception e) {
-            LOG.severe("data loading failed: " + e.getMessage());
-        } finally {
-            loaded = true;
+            LOG.severe("error loading data: " + e.getMessage());
         }
+
+        LOG.fine("data loading finished");
     }
 
-    private <T> List<T> loadModel(String path, TypeToken<List<T>> typeToken) {
-        File file = new File(getRepositoryDirectory(), path);
-        try (FileReader fileReader = new FileReader(file, StandardCharsets.UTF_8)) {
-            return gson.fromJson(fileReader, typeToken.getType());
+    private <T> Collection<T> load(File file, Type type) {
+        try (FileReader fr = new FileReader(file, StandardCharsets.UTF_8)) {
+            return gson.fromJson(fr, type);
         } catch (IOException e) {
-            LOG.severe("failed to load model from file " + path + ": " + e.getMessage());
-            return Collections.emptyList();
+            throw new RuntimeException(e);
         }
     }
 
-    private void setData(String homeText, String openJFXText, List<Person> people, List<Book> books, List<Video> videos, List<Library> libraries,
-                         List<News> news, List<Blog> blogs, List<Company> companies, List<Tool> tools, List<Utility> utilities, List<RealWorldApp> realWorldApps, List<Download> downloads,
-                         List<Tutorial> tutorials, List<Tip> tips, List<LinksOfTheWeek> links, List<IkonliPack> ikonliPacks, List<Member> members, List<Documentation> documentation, List<LearnJavaFX> learnJavaFX, List<LearnMobile> learnMobile, List<LearnRaspberryPi> learnRaspberryPi) {
-        clearData();
-
-        setOpenJFXText(openJFXText);
-        setHomeText(homeText);
-
-        getPeople().setAll(people);
-        getBooks().setAll(books);
-        getVideos().setAll(videos);
-        getLibraries().setAll(libraries);
-        getNews().setAll(news);
-        getBlogs().setAll(blogs);
-        getCompanies().setAll(companies);
-        getTools().setAll(tools);
-        getUtilities().setAll(utilities);
-        getRealWorldApps().setAll(realWorldApps);
-        getDownloads().setAll(downloads);
-        getTutorials().setAll(tutorials);
-        getTips().setAll(tips);
-        getLinksOfTheWeek().setAll(links);
-        getIkonliPacks().setAll(ikonliPacks);
-        getMembers().setAll(members);
-        getDocumentation().setAll(documentation);
-        getLearnJavaFX().setAll(learnJavaFX);
-        getLearnMobile().setAll(learnMobile);
-        getLearnRaspberryPi().setAll(learnRaspberryPi);
-
-        List<ModelObject> recentItems = findRecentItems();
-        getRecentItems().setAll(recentItems);
-    }
-
-    private List<ModelObject> findRecentItems() {
-        List<ModelObject> result = new ArrayList<>();
-        // News are not reachable through links!
-        //  result.addAll(findRecentItems(getNews()));
-        result.addAll(findRecentItems(getPeople()));
-        result.addAll(findRecentItems(getBooks()));
-        result.addAll(findRecentItems(getLibraries()));
-        result.addAll(findRecentItems(getVideos()));
-        result.addAll(findRecentItems(getBlogs()));
-        result.addAll(findRecentItems(getCompanies()));
-        result.addAll(findRecentItems(getTools()));
-        result.addAll(findRecentItems(getUtilities()));
-        result.addAll(findRecentItems(getTutorials()));
-        result.addAll(findRecentItems(getRealWorldApps()));
-        result.addAll(findRecentItems(getDownloads()));
-        result.addAll(findRecentItems(getTips()));
-        result.addAll(findRecentItems(getIkonliPacks()));
-        result.addAll(findRecentItems(getMembers()));
-        result.addAll(findRecentItems(getDocumentation()));
-        result.addAll(findRecentItems(getLearnJavaFX()));
-        result.addAll(findRecentItems(getLearnMobile()));
-        result.addAll(findRecentItems(getLearnRaspberryPi()));
-        // LinksOfTheWeek are not reachable through links!
-        //  result.addAll(findRecentItems(getLinksOfTheWeek()));
-
-        // newest ones on top
-        Collections.sort(result, Comparator.comparing(ModelObject::getCreationOrUpdateDate).reversed());
-
-        return result;
-    }
-
-    private List<ModelObject> findRecentItems(List<? extends ModelObject> items) {
-        List<ModelObject> result = new ArrayList<>();
-
-        final LocalDate today = LocalDate.now();
-
-        items.forEach(item -> {
-            LocalDate date = item.getModifiedOn();
-            if (date == null) {
-                date = item.getCreatedOn();
-            }
-            if (date != null) {
-                if (date.isAfter(today.minusWeeks(8))) {
-                    result.add(item);
-                }
-            }
-        });
-
-        return result;
-    }
-
-    private final ObservableList<ModelObject> recentItems = FXCollections.observableArrayList();
-
-    public ObservableList<ModelObject> getRecentItems() {
-        return recentItems;
+    private File getFile(String path) {
+        return new File(getRepositoryDirectory(), path);
     }
 
     public Optional<Person> getPersonById(String id) {
@@ -354,6 +227,18 @@ public Optional<Book> getBookById(String id) {
         return books.stream().filter(item -> item.getId().equals(id)).findFirst();
     }
 
+    public Optional<LearnJavaFX> getLearnJavaFXById(String id) {
+        return learnJavaFX.stream().filter(item -> item.getId().equals(id)).findFirst();
+    }
+
+    public Optional<LearnMobile> getLearnMobileById(String id) {
+        return learnMobile.stream().filter(item -> item.getId().equals(id)).findFirst();
+    }
+
+    public Optional<LearnRaspberryPi> getLearnRaspberryPiById(String id) {
+        return learnRaspberryPi.stream().filter(item -> item.getId().equals(id)).findFirst();
+    }
+
     public Optional<Blog> getBlogById(String id) {
         return blogs.stream().filter(item -> item.getId().equals(id)).findFirst();
     }
@@ -406,24 +291,10 @@ public Optional<Documentation> getDocumentationById(String id) {
         return documentation.stream().filter(item -> item.getId().equals(id)).findFirst();
     }
 
-    public Optional<LearnJavaFX> getLearnJavaFXById(String id) {
-        return learnJavaFX.stream().filter(item -> item.getId().equals(id)).findFirst();
-    }
-
-    public Optional<LearnMobile> getLearnMobileById(String id) {
-        return learnMobile.stream().filter(item -> item.getId().equals(id)).findFirst();
-    }
-
-    public Optional<LearnRaspberryPi> getLearnRaspberryPiById(String id) {
-        return learnRaspberryPi.stream().filter(item -> item.getId().equals(id)).findFirst();
-    }
-
-    public <T extends ModelObject> ObservableList<T> getLinkedObjects(ModelObject modelObject, Class<T> clazz) {
+    public <T extends ModelObject> List<T> getLinkedObjects(ModelObject modelObject, Class<T> clazz) {
         List<T> itemList = getList(clazz);
         List<String> idsList = getIdList(modelObject, clazz);
-        ObservableList<T> list = FXCollections.observableArrayList();
-        list.setAll(itemList.stream().filter(item -> idsList.contains(item.getId()) || getIdList(item, modelObject.getClass()).contains(modelObject.getId())).collect(Collectors.toList()));
-        return list;
+        return itemList.stream().filter(item -> idsList.contains(item.getId()) || getIdList(item, modelObject.getClass()).contains(modelObject.getId())).collect(Collectors.toList());
     }
 
     private <T extends ModelObject> List<String> getIdList(ModelObject modelObject, Class<T> clazz) {
@@ -518,470 +389,259 @@ public <T extends ModelObject> List<T> getList(Class<T> clazz) {
         throw new IllegalArgumentException("unsupported class type: " + clazz.getSimpleName());
     }
 
-    public ModelObject getByID(Class<? extends ModelObject> clz, String id) {
-        return getList(clz).stream().filter(item -> item.getId().equals(id)).findFirst().get();
-    }
-
-    public ObservableList<Video> getVideosByModelObject(ModelObject modelObject) {
-        return getLinkedObjects(modelObject, Video.class);
-    }
-
-    public ObservableList<Download> getDownloadsByModelObject(ModelObject modelObject) {
-        return getLinkedObjects(modelObject, Download.class);
+    public <T extends ModelObject> T getByID(Class<T> clz, String id) {
+        return getList(clz).stream().filter(item -> item.getId().equals(id)).findFirst().orElse(null);
     }
 
-    public ObservableList<LearnJavaFX> getLearnJavaFXByModelObject(ModelObject modelObject) {
-        return getLinkedObjects(modelObject, LearnJavaFX.class);
+    public boolean isValidId(Class<? extends ModelObject> clz, String id) {
+        return getList(clz).stream().anyMatch(item -> item.getId().equals(id));
     }
 
-    public ObservableList<LearnMobile> getLearnMobileByModelObject(ModelObject modelObject) {
-        return getLinkedObjects(modelObject, LearnMobile.class);
+    public List<Video> getVideosByModelObject(ModelObject modelObject) {
+        return getLinkedObjects(modelObject, Video.class);
     }
 
-    public ObservableList<LearnRaspberryPi> getLearnRaspberryPiByModelObject(ModelObject modelObject) {
-        return getLinkedObjects(modelObject, LearnRaspberryPi.class);
+    public List<Download> getDownloadsByModelObject(ModelObject modelObject) {
+        return getLinkedObjects(modelObject, Download.class);
     }
 
-    public ObservableList<Book> getBooksByModelObject(ModelObject modelObject) {
+    public List<Book> getBooksByModelObject(ModelObject modelObject) {
         return getLinkedObjects(modelObject, Book.class);
     }
 
-    public ObservableList<Tutorial> getTutorialsByModelObject(ModelObject modelObject) {
+    public List<Tutorial> getTutorialsByModelObject(ModelObject modelObject) {
         return getLinkedObjects(modelObject, Tutorial.class);
     }
 
-    public ObservableList<Blog> getBlogsByModelObject(ModelObject modelObject) {
+    public List<Blog> getBlogsByModelObject(ModelObject modelObject) {
         return getLinkedObjects(modelObject, Blog.class);
     }
 
-    public ObservableList<Library> getLibrariesByModelObject(ModelObject modelObject) {
+    public List<Library> getLibrariesByModelObject(ModelObject modelObject) {
         return getLinkedObjects(modelObject, Library.class);
     }
 
-    public ObservableList<Tool> getToolsByModelObject(ModelObject modelObject) {
+    public List<Tool> getToolsByModelObject(ModelObject modelObject) {
         return getLinkedObjects(modelObject, Tool.class);
     }
 
-    public ObservableList<News> getNewsByModelObject(ModelObject modelObject) {
+    public List<Utility> getUtilitiesByModelObject(ModelObject modelObject) {
+        return getLinkedObjects(modelObject, Utility.class);
+    }
+
+    public List<News> getNewsByModelObject(ModelObject modelObject) {
         return getLinkedObjects(modelObject, News.class);
     }
 
-    public ObservableList<Company> getCompaniesByModelObject(ModelObject modelObject) {
+    public List<Company> getCompaniesByModelObject(ModelObject modelObject) {
         return getLinkedObjects(modelObject, Company.class);
     }
 
-    public ObservableList<RealWorldApp> getRealWorldAppsByModelObject(ModelObject modelObject) {
+    public List<RealWorldApp> getRealWorldAppsByModelObject(ModelObject modelObject) {
         return getLinkedObjects(modelObject, RealWorldApp.class);
     }
 
-    public ObservableList<Person> getPeopleByModelObject(ModelObject modelObject) {
+    public List<Person> getPeopleByModelObject(ModelObject modelObject) {
         return getLinkedObjects(modelObject, Person.class);
     }
 
-    public ObservableList<Tip> getTipsByModelObject(ModelObject modelObject) {
+    public List<Tip> getTipsByModelObject(ModelObject modelObject) {
         return getLinkedObjects(modelObject, Tip.class);
     }
 
-    public ObservableList<LinksOfTheWeek> getLinksOfTheWeekByModelObject(ModelObject modelObject) {
-        return getLinkedObjects(modelObject, LinksOfTheWeek.class);
+    public List<LearnJavaFX> getLearnJavaFXByModelObject(ModelObject modelObject) {
+        return getLinkedObjects(modelObject, LearnJavaFX.class);
     }
 
-    public ObjectProperty<LibraryInfo> libraryInfoProperty(Library library) {
-        return libraryInfoMap.computeIfAbsent(library, key -> {
-            ObjectProperty<LibraryInfo> infoProperty = new SimpleObjectProperty<>();
-            loadLibraryInfo(library, infoProperty);
-            return infoProperty;
-        });
+    public List<LearnMobile> getLearnMobileByModelObject(ModelObject modelObject) {
+        return getLinkedObjects(modelObject, LearnMobile.class);
     }
 
-    private void loadLibraryInfo(Library library, ObjectProperty<LibraryInfo> infoProperty) {
+    public List<LearnRaspberryPi> getLearnRaspberryPiByModelObject(ModelObject modelObject) {
+        return getLinkedObjects(modelObject, LearnRaspberryPi.class);
+    }
+
+    public List<LinksOfTheWeek> getLinksOfTheWeekByModelObject(ModelObject modelObject) {
+        return getLinkedObjects(modelObject, LinksOfTheWeek.class);
+    }
+
+    public LibraryInfo getLibraryInfo(Library library) {
         try {
             String libraryId = library.getId();
             File file = new File(getRepositoryDirectory(), "libraries/" + libraryId + "/info.json");
             try (FileReader reader = new FileReader(file, StandardCharsets.UTF_8)) {
-                LibraryInfo result = gson.fromJson(reader, LibraryInfo.class);
-                infoProperty.set(result);
+                return gson.fromJson(reader, LibraryInfo.class);
             }
         } catch (IOException ex) {
             ex.printStackTrace();
         }
+        return null;
     }
 
-    public StringProperty newsTextProperty(News news) {
-        return newsTextMap.computeIfAbsent(news, key -> {
-            StringProperty textProperty = new SimpleStringProperty();
-            loadNewsText(news, textProperty);
-            return textProperty;
-        });
+    public File getNewsDirectory(News news) {
+        return new File(getRepositoryDirectory(), "news/" + DATE_FORMATTER.format(news.getCreatedOn()) + "-" + news.getId());
     }
 
-    private void loadNewsText(News news, StringProperty textProperty) {
-        String text = loadString(new File(getNewsDirectory(news), "/text.md"));
-        textProperty.set(text);
+    public String getNewsText(News news) {
+        return loadString(new File(getNewsDirectory(news), "/text.md"));
     }
 
-    public StringProperty linksOfTheWeekTextProperty(LinksOfTheWeek links) {
-        return linksOfTheWeekReadMeMap.computeIfAbsent(links, key -> {
-            StringProperty textProperty = new SimpleStringProperty();
-            loadLinksOfTheWeekText(links, textProperty);
-            return textProperty;
-        });
+    public String getLinksOfTheWeekReadMe(LinksOfTheWeek links) {
+        return loadString(new File(getRepositoryDirectory(), "links/" + links.getId() + "/readme.md"));
     }
 
     public void loadLinksOfTheWeekText(LinksOfTheWeek links, StringProperty textProperty) {
-        String text = loadString(new File(getRepositoryDirectory(), "links/" + links.getId() + "/readme.md"));
-        textProperty.set(text);
-    }
-
-    public StringProperty tutorialTextProperty(Tutorial tutorial) {
-        return tutorialTextMap.computeIfAbsent(tutorial, key -> {
-            StringProperty textProperty = new SimpleStringProperty();
-            loadTutorialText(tutorial, textProperty);
-            return textProperty;
-        });
-    }
-
-    private void loadTutorialText(Tutorial tutorial, StringProperty textProperty) {
-        String text = loadString(new File(getRepositoryDirectory(), "tutorials/" + tutorial.getId() + "/readme.md"));
-        textProperty.set(text);
-    }
-
-    public StringProperty downloadTextProperty(Download download) {
-        return downloadTextMap.computeIfAbsent(download, key -> {
-            StringProperty textProperty = new SimpleStringProperty();
-            loadDownloadText(download, textProperty);
-            return textProperty;
-        });
+        textProperty.set(getLinksOfTheWeekReadMe(links));
     }
 
-    private void loadDownloadText(Download download, StringProperty textProperty) {
-        String text = loadString(new File(getRepositoryDirectory(), "downloads/" + download.getId() + "/readme.md"));
-        textProperty.set(text);
+    public String getTutorialReadMe(Tutorial tutorial) {
+        return loadString(new File(getRepositoryDirectory(), "tutorials/" + tutorial.getId() + "/readme.md"));
     }
 
-    public StringProperty bookTextProperty(Book book) {
-        return bookTextMap.computeIfAbsent(book, key -> {
-            StringProperty textProperty = new SimpleStringProperty();
-            loadBookText(book, textProperty);
-            return textProperty;
-        });
+    public String getDownloadReadMe(Download download) {
+        return loadString(new File(getRepositoryDirectory(), "downloads/" + download.getId() + "/readme.md"));
     }
 
-    private void loadBookText(Book book, StringProperty textProperty) {
-        String text = loadString(new File(getRepositoryDirectory(), "books/" + book.getId() + "/readme.md"));
-        textProperty.set(text);
+    public String getBookReadMe(Book book) {
+        return loadString(new File(getRepositoryDirectory(), "books/" + book.getId() + "/readme.md"));
     }
 
-    public StringProperty personDescriptionProperty(Person person) {
-        return personDescriptionMap.computeIfAbsent(person, key -> {
-            StringProperty readmeProperty = new SimpleStringProperty();
-            loadPersonDescription(person, readmeProperty);
-            return readmeProperty;
-        });
+    public String getPersonReadMe(Person person) {
+        return loadString(new File(getRepositoryDirectory(), "people/" + person.getId() + "/readme.md"));
     }
 
-    private void loadPersonDescription(Person person, StringProperty readmeProperty) {
-        String readmeText = loadString(new File(getRepositoryDirectory(), "people/" + person.getId() + "/readme.md"));
-        readmeProperty.set(readmeText);
+    public String getMemberReadMe(Member member) {
+        return loadString(new File(getRepositoryDirectory(), "members/" + member.getId() + "/readme.md"));
     }
 
-    public StringProperty memberDescriptionProperty(Member member) {
-        return memberDescriptionMap.computeIfAbsent(member, key -> {
-            StringProperty readmeProperty = new SimpleStringProperty();
-            loadMemberDescription(member, readmeProperty);
-            return readmeProperty;
-        });
+    public String getToolReadMe(Tool tool) {
+        return loadString(new File(getRepositoryDirectory(), "tools/" + tool.getId() + "/readme.md"));
     }
 
-    private void loadMemberDescription(Member member, StringProperty readmeProperty) {
-        String readmeText = loadString(new File(getRepositoryDirectory(), "members/" + member.getId() + "/readme.md"));
-        readmeProperty.set(readmeText);
+    public String getUtilityReadMe(Utility utility) {
+        return loadString(new File(getRepositoryDirectory(), "utilities/" + utility.getId() + "/readme.md"));
     }
 
-    public StringProperty toolDescriptionProperty(Tool tool) {
-        return toolDescriptionMap.computeIfAbsent(tool, key -> {
-            StringProperty readmeProperty = new SimpleStringProperty();
-            loadToolDescription(tool, readmeProperty);
-            return readmeProperty;
-        });
+    public String getTipReadMe(Tip tip) {
+        return loadString(new File(getRepositoryDirectory(), "tips/" + tip.getId() + "/readme.md"));
     }
 
-    private void loadToolDescription(Tool tool, StringProperty readmeProperty) {
-        String readmeText = loadString(new File(getRepositoryDirectory(), "tools/" + tool.getId() + "/readme.md"));
-        readmeProperty.set(readmeText);
+    public String getRealWorldReadMe(RealWorldApp app) {
+        return loadString(new File(getRepositoryDirectory(), "realworld/" + app.getId() + "/readme.md"));
     }
 
-    public StringProperty utilityDescriptionProperty(Utility utility) {
-        return utilityDescriptionMap.computeIfAbsent(utility, key -> {
-            StringProperty readmeProperty = new SimpleStringProperty();
-            loadUtilityDescription(utility, readmeProperty);
-            return readmeProperty;
-        });
+    public String getCompanyReadMe(Company company) {
+        return loadString(new File(getRepositoryDirectory(), "companies/" + company.getId() + "/readme.md"));
     }
 
-    private void loadUtilityDescription(Utility utility, StringProperty readmeProperty) {
-        String readmeText = loadString(new File(getRepositoryDirectory(), "utilities/" + utility.getId() + "/readme.md"));
-        readmeProperty.set(readmeText);
+    public String getLibraryReadMe(Library library) {
+        return loadString(new File(getRepositoryDirectory(), "libraries/" + library.getId() + "/readme.md"));
     }
 
-    public StringProperty tipDescriptionProperty(Tip tip) {
-        return tipDescriptionMap.computeIfAbsent(tip, key -> {
-            StringProperty readmeProperty = new SimpleStringProperty();
-            loadTipDescription(tip, readmeProperty);
-            return readmeProperty;
-        });
+    public String getLearnJavaFXReadMe(LearnJavaFX learnJavaFX) {
+        return loadString(new File(getRepositoryDirectory(), "learn/javafx/" + learnJavaFX.getId() + "/readme.md"));
     }
 
-    private void loadTipDescription(Tip tip, StringProperty readmeProperty) {
-        String readmeText = loadString(new File(getRepositoryDirectory(), "tips/" + tip.getId() + "/readme.md"));
-        readmeProperty.set(readmeText);
+    public String getLearnMobileReadMe(LearnMobile learnMobile) {
+        return loadString(new File(getRepositoryDirectory(), "learn/mobile/" + learnMobile.getId() + "/readme.md"));
     }
 
-    public StringProperty realWorldAppDescriptionProperty(RealWorldApp app) {
-        return realWorldAppDescriptionMap.computeIfAbsent(app, key -> {
-            StringProperty readmeProperty = new SimpleStringProperty();
-            loadRealWorldDescription(app, readmeProperty);
-            return readmeProperty;
-        });
-    }
-
-    private void loadRealWorldDescription(RealWorldApp app, StringProperty readmeProperty) {
-        String readmeText = loadString(new File(getRepositoryDirectory(), "realworld/" + app.getId() + "/readme.md"));
-        readmeProperty.set(readmeText);
-    }
-
-    public StringProperty companyDescriptionProperty(Company company) {
-        return companyDescriptionMap.computeIfAbsent(company, key -> {
-            StringProperty readmeProperty = new SimpleStringProperty();
-            loadCompanyDescription(company, readmeProperty);
-            return readmeProperty;
-        });
-    }
-
-    private void loadCompanyDescription(Company company, StringProperty readmeProperty) {
-        String readmeText = loadString(new File(getRepositoryDirectory(), "companies/" + company.getId() + "/readme.md"));
-        readmeProperty.set(readmeText);
-    }
-
-    private void loadLearnJavaFXReadMe(LearnJavaFX learnJavaFX, StringProperty readmeProperty) {
-        String readmeText = loadString(new File(getRepositoryDirectory(), "learn/javafx/" + learnJavaFX.getId() + "/readme.md"));
-        readmeProperty.set(readmeText);
-    }
-
-    public StringProperty learnJavaFXReadMeProperty(LearnJavaFX learnJavaFX) {
-        return learnJavaFXDescriptionMap.computeIfAbsent(learnJavaFX, key -> {
-            StringProperty readmeProperty = new SimpleStringProperty();
-            loadLearnJavaFXReadMe(learnJavaFX, readmeProperty);
-            return readmeProperty;
-        });
-    }
-
-    private void loadLearnMobileReadMe(LearnMobile learnMobile, StringProperty readmeProperty) {
-        String readmeText = loadString(new File(getRepositoryDirectory(), "learn/mobile/" + learnMobile.getId() + "/readme.md"));
-        readmeProperty.set(readmeText);
-    }
-
-    public StringProperty learnMobileReadMeProperty(LearnMobile learnMobile) {
-        return learnMobileDescriptionMap.computeIfAbsent(learnMobile, key -> {
-            StringProperty readmeProperty = new SimpleStringProperty();
-            loadLearnMobileReadMe(learnMobile, readmeProperty);
-            return readmeProperty;
-        });
-    }
-
-    private void loadLearnRaspberryPiReadMe(LearnRaspberryPi learnRaspberryPi, StringProperty readmeProperty) {
-        String readmeText = loadString(new File(getRepositoryDirectory(), "learn/raspberrypi/" + learnRaspberryPi.getId() + "/readme.md"));
-        readmeProperty.set(readmeText);
-    }
-
-    public StringProperty learnRaspberryPiReadMeProperty(LearnRaspberryPi learnRaspberryPi) {
-        return learnRaspberryPiDescriptionMap.computeIfAbsent(learnRaspberryPi, key -> {
-            StringProperty readmeProperty = new SimpleStringProperty();
-            loadLearnRaspberryPiReadMe(learnRaspberryPi, readmeProperty);
-            return readmeProperty;
-        });
-    }
-
-    public static void setTesting(boolean testing) {
-        DataRepository.testing = testing;
-    }
-
-    public File getRepositoryDirectory() {
-        if (testing) {
-            return new File(System.getProperty("user.dir"));
-        }
-        return REPO_DIRECTORY;
+    public String getLearnRaspberryPiReadMe(LearnRaspberryPi learnRaspberryPi) {
+        return loadString(new File(getRepositoryDirectory(), "learn/raspberrypi/" + learnRaspberryPi.getId() + "/readme.md"));
     }
 
     public String getRepositoryDirectoryURL() {
         return getRepositoryDirectory().toURI().toString();
     }
 
-    public File getNewsDirectory(News news) {
-        return new File(getRepositoryDirectory(), "news/" + DATE_FORMATTER.format(news.getCreatedOn()) + "-" + news.getId());
-    }
-
-    public StringProperty libraryReadMeProperty(Library library) {
-        return libraryReadMeMap.computeIfAbsent(library, key -> {
-            StringProperty readmeProperty = new SimpleStringProperty();
-            loadLibraryDescription(library, readmeProperty);
-            return readmeProperty;
-        });
-    }
-
-    private void loadLibraryDescription(Library library, StringProperty readmeProperty) {
-        String readmeText = loadString(new File(getRepositoryDirectory(), "libraries/" + library.getId() + "/readme.md"));
-        readmeProperty.set(readmeText);
-    }
-
-    private final StringProperty homeText = new SimpleStringProperty(this, "homeText");
-
-    public String getHomeText() {
-        return homeText.get();
-    }
-
-    public StringProperty homeTextProperty() {
-        return homeText;
-    }
-
-    public void setHomeText(String homeText) {
-        this.homeText.set(homeText);
-    }
-
-    private final StringProperty openJFXText = new SimpleStringProperty(this, "openJFXText");
-
-    public String getOpenJFXText() {
-        return openJFXText.get();
-    }
-
-    public StringProperty openJFXTextProperty() {
-        return openJFXText;
-    }
-
-    public void setOpenJFXText(String openJFXText) {
-        this.openJFXText.set(openJFXText);
-    }
-
-    private final ObservableList<Library> libraries = FXCollections.observableArrayList();
-
-    public ObservableList<Library> getLibraries() {
+    public List<Library> getLibraries() {
         return libraries;
     }
 
-    private final ObservableList<Blog> blogs = FXCollections.observableArrayList();
-
-    public ObservableList<Blog> getBlogs() {
+    public List<Blog> getBlogs() {
         return blogs;
     }
 
-    private final ObservableList<News> news = FXCollections.observableArrayList();
-
-    public ObservableList<News> getNews() {
+    public List<News> getNews() {
         return news;
     }
 
-    private final ObservableList<Book> books = FXCollections.observableArrayList();
-
-    public ObservableList<Book> getBooks() {
+    public List<Book> getBooks() {
         return books;
     }
 
-    private final ObservableList<LinksOfTheWeek> linksOfTheWeek = FXCollections.observableArrayList();
-
-    public ObservableList<LinksOfTheWeek> getLinksOfTheWeek() {
+    public List<LinksOfTheWeek> getLinksOfTheWeek() {
         return linksOfTheWeek;
     }
 
-    private final ObservableList<Tip> tips = FXCollections.observableArrayList();
-
-    public ObservableList<Tip> getTips() {
+    public List<Tip> getTips() {
         return tips;
     }
 
-    private final ObservableList<Tutorial> tutorials = FXCollections.observableArrayList();
-
-    public ObservableList<Tutorial> getTutorials() {
+    public List<Tutorial> getTutorials() {
         return tutorials;
     }
 
-    private final ObservableList<Video> videos = FXCollections.observableArrayList();
-
-    public ObservableList<Video> getVideos() {
+    public List<Video> getVideos() {
         return videos;
     }
 
-    private final ObservableList<Download> downloads = FXCollections.observableArrayList();
-
-    public ObservableList<Download> getDownloads() {
+    public List<Download> getDownloads() {
         return downloads;
     }
 
-    private final ObservableList<RealWorldApp> realWorldApps = FXCollections.observableArrayList();
-
-    public ObservableList<RealWorldApp> getRealWorldApps() {
+    public List<RealWorldApp> getRealWorldApps() {
         return realWorldApps;
     }
 
-    private final ObservableList<Tool> tools = FXCollections.observableArrayList();
-
-    public ObservableList<Tool> getTools() {
+    public List<Tool> getTools() {
         return tools;
     }
 
-    private final ObservableList<Utility> utilities = FXCollections.observableArrayList();
-
-    public ObservableList<Utility> getUtilities() {
+    public List<Utility> getUtilities() {
         return utilities;
     }
 
-    private final ObservableList<Company> companies = FXCollections.observableArrayList();
-
-    public ObservableList<Company> getCompanies() {
+    public List<Company> getCompanies() {
         return companies;
     }
 
-    private final ObservableList<Person> people = FXCollections.observableArrayList();
-
-    public ObservableList<Person> getPeople() {
+    public List<Person> getPeople() {
         return people;
     }
 
-    private final ObservableList<IkonliPack> ikonliPacks = FXCollections.observableArrayList();
-
-    public ObservableList<IkonliPack> getIkonliPacks() {
+    public List<IkonliPack> getIkonliPacks() {
         return ikonliPacks;
     }
 
-    private final ObservableList<Member> members = FXCollections.observableArrayList();
-
-    public ObservableList<Member> getMembers() {
+    public List<Member> getMembers() {
         return members;
     }
 
-    private final ObservableList<Documentation> documentation = FXCollections.observableArrayList();
-
-    public ObservableList<Documentation> getDocumentation() {
+    public List<Documentation> getDocumentation() {
         return documentation;
     }
 
-    private final ObservableList<LearnJavaFX> learnJavaFX = FXCollections.observableArrayList();
-
-    public ObservableList<LearnJavaFX> getLearnJavaFX() {
+    public List<LearnJavaFX> getLearnJavaFX() {
         return learnJavaFX;
     }
 
-    private final ObservableList<LearnMobile> learnMobile = FXCollections.observableArrayList();
-
-    public ObservableList<LearnMobile> getLearnMobile() {
+    public List<LearnMobile> getLearnMobile() {
         return learnMobile;
     }
 
-    private final ObservableList<LearnRaspberryPi> learnRaspberryPi = FXCollections.observableArrayList();
-
-    public ObservableList<LearnRaspberryPi> getLearnRaspberryPi() {
+    public List<LearnRaspberryPi> getLearnRaspberryPi() {
         return learnRaspberryPi;
     }
 
+    public String getHomeText() {
+        return homeText;
+    }
+
+    public String getOpenJFXText() {
+        return openJFXText;
+    }
+
     private String loadString(File file) {
         LOG.fine("loading string from: " + file);
 
@@ -1030,7 +690,7 @@ private void loadArtifactVersion(String groupId, String artifactId, StringProper
             if (status == 200) {
                 try (BufferedReader in = new BufferedReader(new InputStreamReader(con.getInputStream()))) {
                     String inputLine;
-                    StringBuffer content = new StringBuffer();
+                    StringBuilder content = new StringBuilder();
                     while ((inputLine = in.readLine()) != null) {
                         content.append(inputLine);
                     }
@@ -1044,10 +704,6 @@ private void loadArtifactVersion(String groupId, String artifactId, StringProper
             } else {
                 result.set("unknown");
             }
-        } catch (ProtocolException e) {
-            e.printStackTrace();
-        } catch (MalformedURLException e) {
-            e.printStackTrace();
         } catch (IOException e) {
             e.printStackTrace();
         } finally {
@@ -1081,18 +737,13 @@ public List<Post> loadPosts(Blog blog) {
         return Collections.emptyList();
     }
 
-    private long cachedPullrequestsTime;
-
-    private final long timeToReloadSeconds = 600;
-
-    private List<PullRequest> cachedPullRequests;
-
     public List<PullRequest> loadPullRequests() {
         long time = System.currentTimeMillis() / 1000;
-        if (cachedPullrequestsTime + timeToReloadSeconds > time) {
+        long timeToReloadSeconds = 600;
+        if (cachedPullRequestsTime + timeToReloadSeconds > time) {
             return cachedPullRequests;
         }
-        cachedPullrequestsTime = time;
+        cachedPullRequestsTime = time;
         cachedPullRequests = loadPullRequestsImpl();
         return cachedPullRequests;
 
@@ -1115,7 +766,7 @@ private List<PullRequest> loadPullRequestsImpl() {
                 if (status == 200) {
                     try (BufferedReader in = new BufferedReader(new InputStreamReader(con.getInputStream()))) {
                         String inputLine;
-                        StringBuffer content = new StringBuffer();
+                        StringBuilder content = new StringBuilder();
                         while ((inputLine = in.readLine()) != null) {
                             content.append(inputLine);
                         }
@@ -1123,10 +774,6 @@ private List<PullRequest> loadPullRequestsImpl() {
                         }.getType());
                     }
                 }
-            } catch (ProtocolException e) {
-                e.printStackTrace();
-            } catch (MalformedURLException e) {
-                e.printStackTrace();
             } catch (IOException e) {
                 e.printStackTrace();
             } finally {
@@ -1139,34 +786,19 @@ private List<PullRequest> loadPullRequestsImpl() {
         return Collections.emptyList();
     }
 
-    public List<ModelObject> search(String pattern) {
-        List<ModelObject> result = new ArrayList<>();
-        search(getBooks(), pattern, result);
-        search(getBlogs(), pattern, result);
-        search(getCompanies(), pattern, result);
-        search(getPeople(), pattern, result);
-        search(getLibraries(), pattern, result);
-        search(getRealWorldApps(), pattern, result);
-        search(getTools(), pattern, result);
-        search(getVideos(), pattern, result);
-        search(getNews(), pattern, result);
-        search(getDownloads(), pattern, result);
-        search(getTutorials(), pattern, result);
-        search(getTips(), pattern, result);
-        search(getIkonliPacks(), pattern, result);
-        search(getMembers(), pattern, result);
-        search(getDocumentation(), pattern, result);
-        search(getLearnJavaFX(), pattern, result);
-        search(getLearnMobile(), pattern, result);
-        search(getLearnRaspberryPi(), pattern, result);
-        return result;
-    }
-
-    private void search(List<? extends ModelObject> modelObjects, String pattern, List<ModelObject> result) {
-        modelObjects.forEach(mo -> {
-            if (mo.matches(pattern)) {
-                result.add(mo);
+    public File getRepositoryDirectory() {
+        if (testing) {
+            try {
+                String path = this.getClass().getProtectionDomain().getCodeSource().getLocation().toURI().getPath();
+
+                // Convert the class file location to the Java file location
+                File classFile = new File(path, this.getClass().getName().replace('.', '/') + ".class");
+                return classFile.getParentFile().getParentFile().getParentFile().getParentFile().getParentFile().getParentFile().getParentFile();
+            } catch (URISyntaxException e) {
+                LOG.severe("Can not define source root path: " + e.getMessage());
+                return new File(System.getProperty("user.dir"));
             }
-        });
+        }
+        return REPO_DIRECTORY;
     }
 }
diff --git a/src/main/java/com/dlsc/jfxcentral/data/DataRepository2.java b/src/main/java/com/dlsc/jfxcentral/data/DataRepository2.java
deleted file mode 100755
index 7f617768..00000000
--- a/src/main/java/com/dlsc/jfxcentral/data/DataRepository2.java
+++ /dev/null
@@ -1,796 +0,0 @@
-package com.dlsc.jfxcentral.data;
-
-import com.dlsc.jfxcentral.data.model.Blog;
-import com.dlsc.jfxcentral.data.model.Book;
-import com.dlsc.jfxcentral.data.model.Company;
-import com.dlsc.jfxcentral.data.model.Coordinates;
-import com.dlsc.jfxcentral.data.model.Documentation;
-import com.dlsc.jfxcentral.data.model.Download;
-import com.dlsc.jfxcentral.data.model.IkonliPack;
-import com.dlsc.jfxcentral.data.model.LearnJavaFX;
-import com.dlsc.jfxcentral.data.model.LearnMobile;
-import com.dlsc.jfxcentral.data.model.LearnRaspberryPi;
-import com.dlsc.jfxcentral.data.model.Library;
-import com.dlsc.jfxcentral.data.model.LibraryInfo;
-import com.dlsc.jfxcentral.data.model.LinksOfTheWeek;
-import com.dlsc.jfxcentral.data.model.Member;
-import com.dlsc.jfxcentral.data.model.ModelObject;
-import com.dlsc.jfxcentral.data.model.News;
-import com.dlsc.jfxcentral.data.model.Person;
-import com.dlsc.jfxcentral.data.model.Post;
-import com.dlsc.jfxcentral.data.model.RealWorldApp;
-import com.dlsc.jfxcentral.data.model.Tip;
-import com.dlsc.jfxcentral.data.model.Tool;
-import com.dlsc.jfxcentral.data.model.Tutorial;
-import com.dlsc.jfxcentral.data.model.Utility;
-import com.dlsc.jfxcentral.data.model.Video;
-import com.dlsc.jfxcentral.data.pull.PullRequest;
-import com.dlsc.jfxcentral.data.util.QueryResult;
-import com.fatboyindustrial.gsonjavatime.Converters;
-import com.google.gson.Gson;
-import com.google.gson.GsonBuilder;
-import com.google.gson.reflect.TypeToken;
-import com.rometools.rome.feed.synd.SyndEntry;
-import com.rometools.rome.feed.synd.SyndFeed;
-import com.rometools.rome.io.SyndFeedInput;
-import com.rometools.rome.io.XmlReader;
-import javafx.beans.property.SimpleStringProperty;
-import javafx.beans.property.StringProperty;
-import org.apache.commons.lang3.StringUtils;
-
-import java.io.BufferedReader;
-import java.io.File;
-import java.io.FileReader;
-import java.io.IOException;
-import java.io.InputStreamReader;
-import java.lang.reflect.Type;
-import java.net.HttpURLConnection;
-import java.net.MalformedURLException;
-import java.net.URL;
-import java.net.URLConnection;
-import java.nio.charset.StandardCharsets;
-import java.text.MessageFormat;
-import java.time.format.DateTimeFormatter;
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.Collections;
-import java.util.List;
-import java.util.Optional;
-import java.util.logging.Logger;
-import java.util.stream.Collectors;
-
-public class DataRepository2 {
-
-    private static final File REPO_DIRECTORY = new File(System.getProperty("jfxcentral.repo", new File(System.getProperty("user.home"), ".jfxcentralrepo").getAbsolutePath())).getAbsoluteFile();
-
-    private static final Logger LOG = Logger.getLogger(DataRepository2.class.getName());
-
-    private static final DateTimeFormatter DATE_FORMATTER = DateTimeFormatter.ofPattern("yyyy-MM-dd");
-    public static boolean testing;
-    private static DataRepository2 instance;
-    private final Gson gson = Converters.registerLocalDate(new GsonBuilder()).setPrettyPrinting().create();
-    private final List<Library> libraries = new ArrayList<>();
-    private final List<Blog> blogs = new ArrayList<>();
-    private final List<News> news = new ArrayList<>();
-    private final List<Book> books = new ArrayList<>();
-    private final List<LinksOfTheWeek> linksOfTheWeek = new ArrayList<>();
-    private final List<Tip> tips = new ArrayList<>();
-    private final List<Tutorial> tutorials = new ArrayList<>();
-    private final List<Video> videos = new ArrayList<>();
-    private final List<Download> downloads = new ArrayList<>();
-    private final List<RealWorldApp> realWorldApps = new ArrayList<>();
-    private final List<Tool> tools = new ArrayList<>();
-    private final List<Utility> utilities = new ArrayList<>();
-    private final List<Company> companies = new ArrayList<>();
-    private final List<Person> people = new ArrayList<>();
-    private final List<IkonliPack> ikonliPacks = new ArrayList<>();
-    private final List<Member> members = new ArrayList<>();
-    private final List<Documentation> documentation = new ArrayList<>();
-    private final List<LearnJavaFX> learnJavaFX = new ArrayList<>();
-    private final List<LearnMobile> learnMobile = new ArrayList<>();
-    private final List<LearnRaspberryPi> learnRaspberryPi = new ArrayList<>();
-    private String homeText;
-    private String openJFXText;
-    private long cachedPullRequestsTime;
-    private List<PullRequest> cachedPullRequests;
-
-    private DataRepository2() {
-        doLoadData("initial loading of data upon creation of data repository instance");
-    }
-
-    public static synchronized DataRepository2 getInstance() {
-        if (instance == null) {
-            instance = new DataRepository2();
-        }
-
-        return instance;
-    }
-
-    public static void setTesting(boolean testing) {
-        DataRepository2.testing = testing;
-    }
-
-    public static File getRepositoryDirectory() {
-        if (testing) {
-            return new File(System.getProperty("user.dir"));
-        }
-        return REPO_DIRECTORY;
-    }
-
-    public void reload() {
-        doLoadData("explicit call to refresh method");
-    }
-
-    public void clearData() {
-        LOG.fine("clearing data");
-
-        homeText = "";
-        openJFXText = "";
-        getPeople().clear();
-        getLibraries().clear();
-        getBooks().clear();
-        getNews().clear();
-        getVideos().clear();
-        getBlogs().clear();
-        getCompanies().clear();
-        getTools().clear();
-        getUtilities().clear();
-        getRealWorldApps().clear();
-        getDownloads().clear();
-        getTutorials().clear();
-        getTips().clear();
-        getLinksOfTheWeek().clear();
-        getIkonliPacks().clear();
-        getMembers().clear();
-        getDocumentation().clear();
-        getLearnJavaFX().clear();
-        getLearnMobile().clear();
-        getLearnRaspberryPi().clear();
-    }
-
-    private void doLoadData(String reason) {
-        clearData();
-
-        LOG.fine("loading data, reason = " + reason);
-
-        try {
-            // plain texts
-            homeText = loadString(new File(getRepositoryDirectory(), "intro.md"));
-            openJFXText = loadString(new File(getRepositoryDirectory(), "openjfx/intro.md"));
-
-            // collections
-            people.addAll(load(getFile("people/people.json"), new TypeToken<List<Person>>() {
-            }.getType()));
-            books.addAll(load(getFile("books/books.json"), new TypeToken<List<Book>>() {
-            }.getType()));
-            videos.addAll(load(getFile("videos/videos.json"), new TypeToken<List<Video>>() {
-            }.getType()));
-            libraries.addAll(load(getFile("libraries/libraries.json"), new TypeToken<List<Library>>() {
-            }.getType()));
-            news.addAll(load(getFile("news/news.json"), new TypeToken<List<News>>() {
-            }.getType()));
-            tutorials.addAll(load(getFile("tutorials/tutorials.json"), new TypeToken<List<Tutorial>>() {
-            }.getType()));
-            blogs.addAll(load(getFile("blogs/blogs.json"), new TypeToken<List<Blog>>() {
-            }.getType()));
-            companies.addAll(load(getFile("companies/companies.json"), new TypeToken<List<Company>>() {
-            }.getType()));
-            tools.addAll(load(getFile("tools/tools.json"), new TypeToken<List<Tool>>() {
-            }.getType()));
-            utilities.addAll(load(getFile("utilities/utilities.json"), new TypeToken<List<Utility>>() {
-            }.getType()));
-            realWorldApps.addAll(load(getFile("realworld/realworld.json"), new TypeToken<List<RealWorldApp>>() {
-            }.getType()));
-            downloads.addAll(load(getFile("downloads/downloads.json"), new TypeToken<List<Download>>() {
-            }.getType()));
-            tips.addAll(load(getFile("tips/tips.json"), new TypeToken<List<Tip>>() {
-            }.getType()));
-            linksOfTheWeek.addAll(load(getFile("links/links.json"), new TypeToken<List<LinksOfTheWeek>>() {
-            }.getType()));
-            ikonliPacks.addAll(load(getFile("ikonlipacks/ikonlipacks.json"), new TypeToken<List<IkonliPack>>() {
-            }.getType()));
-            members.addAll(load(getFile("members/members.json"), new TypeToken<List<Member>>() {
-            }.getType()));
-            documentation.addAll(load(getFile("documentation/documentation.json"), new TypeToken<List<Documentation>>() {
-            }.getType()));
-            learnJavaFX.addAll(load(getFile("learn/javafx/learn.json"), new TypeToken<List<LearnJavaFX>>() {
-            }.getType()));
-            learnMobile.addAll(load(getFile("learn/mobile/learn.json"), new TypeToken<List<LearnMobile>>() {
-            }.getType()));
-            learnRaspberryPi.addAll(load(getFile("learn/raspberrypi/learn.json"), new TypeToken<List<LearnRaspberryPi>>() {
-            }.getType()));
-
-        } catch (Exception e) {
-            LOG.severe("error loading data: " + e.getMessage());
-        }
-
-        LOG.fine("data loading finished");
-    }
-
-    private <T> Collection<T> load(File file, Type type) {
-        try (FileReader fr = new FileReader(file, StandardCharsets.UTF_8)) {
-            return gson.fromJson(fr, type);
-        } catch (IOException e) {
-            throw new RuntimeException(e);
-        }
-    }
-
-    private File getFile(String path) {
-        return new File(getRepositoryDirectory(), path);
-    }
-
-    public Optional<Person> getPersonById(String id) {
-        return people.stream().filter(item -> item.getId().equals(id)).findFirst();
-    }
-
-    public Optional<Company> getCompanyById(String id) {
-        return companies.stream().filter(item -> item.getId().equals(id)).findFirst();
-    }
-
-    public Optional<Library> getLibraryById(String id) {
-        return libraries.stream().filter(item -> item.getId().equals(id)).findFirst();
-    }
-
-    public Optional<Book> getBookById(String id) {
-        return books.stream().filter(item -> item.getId().equals(id)).findFirst();
-    }
-
-    public Optional<LearnJavaFX> getLearnJavaFXById(String id) {
-        return learnJavaFX.stream().filter(item -> item.getId().equals(id)).findFirst();
-    }
-
-    public Optional<LearnMobile> getLearnMobileById(String id) {
-        return learnMobile.stream().filter(item -> item.getId().equals(id)).findFirst();
-    }
-
-    public Optional<LearnRaspberryPi> getLearnRaspberryPiById(String id) {
-        return learnRaspberryPi.stream().filter(item -> item.getId().equals(id)).findFirst();
-    }
-
-    public Optional<Blog> getBlogById(String id) {
-        return blogs.stream().filter(item -> item.getId().equals(id)).findFirst();
-    }
-
-    public Optional<RealWorldApp> getRealWorldAppById(String id) {
-        return realWorldApps.stream().filter(item -> item.getId().equals(id)).findFirst();
-    }
-
-    public Optional<Tool> getToolById(String id) {
-        return tools.stream().filter(item -> item.getId().equals(id)).findFirst();
-    }
-
-    public Optional<Utility> getUtilityById(String id) {
-        return utilities.stream().filter(item -> item.getId().equals(id)).findFirst();
-    }
-
-    public Optional<Download> getDownloadById(String id) {
-        return downloads.stream().filter(item -> item.getId().equals(id)).findFirst();
-    }
-
-    public Optional<News> getNewsById(String id) {
-        return news.stream().filter(item -> item.getId().equals(id)).findFirst();
-    }
-
-    public Optional<Video> getVideoById(String id) {
-        return videos.stream().filter(item -> item.getId().equals(id)).findFirst();
-    }
-
-    public Optional<Tutorial> getTutorialById(String id) {
-        return tutorials.stream().filter(item -> item.getId().equals(id)).findFirst();
-    }
-
-    public Optional<Tip> getTipById(String id) {
-        return tips.stream().filter(item -> item.getId().equals(id)).findFirst();
-    }
-
-    public Optional<LinksOfTheWeek> getLinksOfTheWeekById(String id) {
-        return linksOfTheWeek.stream().filter(item -> item.getId().equals(id)).findFirst();
-    }
-
-    public Optional<IkonliPack> getIkonliPackById(String id) {
-        return ikonliPacks.stream().filter(item -> item.getId().equals(id)).findFirst();
-    }
-
-    public Optional<Member> getMemberById(String id) {
-        return members.stream().filter(item -> item.getId().equals(id)).findFirst();
-    }
-
-    public Optional<Documentation> getDocumentationById(String id) {
-        return documentation.stream().filter(item -> item.getId().equals(id)).findFirst();
-    }
-
-    public <T extends ModelObject> List<T> getLinkedObjects(ModelObject modelObject, Class<T> clazz) {
-        List<T> itemList = getList(clazz);
-        List<String> idsList = getIdList(modelObject, clazz);
-        return itemList.stream().filter(item -> idsList.contains(item.getId()) || getIdList(item, modelObject.getClass()).contains(modelObject.getId())).collect(Collectors.toList());
-    }
-
-    private <T extends ModelObject> List<String> getIdList(ModelObject modelObject, Class<T> clazz) {
-        if (clazz.equals(Video.class)) {
-            return modelObject.getVideoIds();
-        } else if (clazz.equals(Book.class)) {
-            return modelObject.getBookIds();
-        } else if (clazz.equals(Library.class)) {
-            return modelObject.getLibraryIds();
-        } else if (clazz.equals(Tutorial.class)) {
-            return modelObject.getTutorialIds();
-        } else if (clazz.equals(Download.class)) {
-            return modelObject.getDownloadIds();
-        } else if (clazz.equals(Person.class)) {
-            return modelObject.getPersonIds();
-        } else if (clazz.equals(Tool.class)) {
-            return modelObject.getToolIds();
-        } else if (clazz.equals(Utility.class)) {
-            return modelObject.getUtilityIds();
-        } else if (clazz.equals(RealWorldApp.class)) {
-            return modelObject.getAppIds();
-        } else if (clazz.equals(News.class)) {
-            return modelObject.getNewsIds();
-        } else if (clazz.equals(Blog.class)) {
-            return modelObject.getBlogIds();
-        } else if (clazz.equals(Company.class)) {
-            return modelObject.getCompanyIds();
-        } else if (clazz.equals(Tip.class)) {
-            return modelObject.getTipIds();
-        } else if (clazz.equals(LinksOfTheWeek.class)) {
-            return modelObject.getLinksOfTheWeekIds();
-        } else if (clazz.equals(IkonliPack.class)) {
-            return modelObject.getIkonliPackIds();
-        } else if (clazz.equals(Member.class)) {
-            return modelObject.getMemberIds();
-        } else if (clazz.equals(Documentation.class)) {
-            return modelObject.getDocumentationIds();
-        } else if (clazz.equals(LearnJavaFX.class)) {
-            return modelObject.getLearnJavaFXIds();
-        } else if (clazz.equals(LearnMobile.class)) {
-            return modelObject.getLearnMobileIds();
-        } else if (clazz.equals(LearnRaspberryPi.class)) {
-            return modelObject.getLearnRaspberryPiIds();
-        }
-
-        throw new IllegalArgumentException("unsupported class type: " + clazz.getSimpleName());
-    }
-
-    public <T extends ModelObject> List<T> getList(Class<T> clazz) {
-        if (clazz.equals(Video.class)) {
-            return (List<T>) videos;
-        } else if (clazz.equals(Book.class)) {
-            return (List<T>) books;
-        } else if (clazz.equals(Library.class)) {
-            return (List<T>) libraries;
-        } else if (clazz.equals(Tutorial.class)) {
-            return (List<T>) tutorials;
-        } else if (clazz.equals(Download.class)) {
-            return (List<T>) downloads;
-        } else if (clazz.equals(Person.class)) {
-            return (List<T>) people;
-        } else if (clazz.equals(Tool.class)) {
-            return (List<T>) tools;
-        } else if (clazz.equals(Utility.class)) {
-            return (List<T>) utilities;
-        } else if (clazz.equals(RealWorldApp.class)) {
-            return (List<T>) realWorldApps;
-        } else if (clazz.equals(News.class)) {
-            return (List<T>) news;
-        } else if (clazz.equals(Blog.class)) {
-            return (List<T>) blogs;
-        } else if (clazz.equals(Company.class)) {
-            return (List<T>) companies;
-        } else if (clazz.equals(Tip.class)) {
-            return (List<T>) tips;
-        } else if (clazz.equals(LinksOfTheWeek.class)) {
-            return (List<T>) linksOfTheWeek;
-        } else if (clazz.equals(IkonliPack.class)) {
-            return (List<T>) ikonliPacks;
-        } else if (clazz.equals(Member.class)) {
-            return (List<T>) members;
-        } else if (clazz.equals(Documentation.class)) {
-            return (List<T>) documentation;
-        } else if (clazz.equals(LearnJavaFX.class)) {
-            return (List<T>) learnJavaFX;
-        } else if (clazz.equals(LearnMobile.class)) {
-            return (List<T>) learnMobile;
-        } else if (clazz.equals(LearnRaspberryPi.class)) {
-            return (List<T>) learnRaspberryPi;
-        }
-
-        throw new IllegalArgumentException("unsupported class type: " + clazz.getSimpleName());
-    }
-
-    public <T extends ModelObject> T getByID(Class<T> clz, String id) {
-        return getList(clz).stream().filter(item -> item.getId().equals(id)).findFirst().orElse(null);
-    }
-
-    public boolean isValidId(Class<? extends ModelObject> clz, String id) {
-        return getList(clz).stream().anyMatch(item -> item.getId().equals(id));
-    }
-
-    public List<Video> getVideosByModelObject(ModelObject modelObject) {
-        return getLinkedObjects(modelObject, Video.class);
-    }
-
-    public List<Download> getDownloadsByModelObject(ModelObject modelObject) {
-        return getLinkedObjects(modelObject, Download.class);
-    }
-
-    public List<Book> getBooksByModelObject(ModelObject modelObject) {
-        return getLinkedObjects(modelObject, Book.class);
-    }
-
-    public List<Tutorial> getTutorialsByModelObject(ModelObject modelObject) {
-        return getLinkedObjects(modelObject, Tutorial.class);
-    }
-
-    public List<Blog> getBlogsByModelObject(ModelObject modelObject) {
-        return getLinkedObjects(modelObject, Blog.class);
-    }
-
-    public List<Library> getLibrariesByModelObject(ModelObject modelObject) {
-        return getLinkedObjects(modelObject, Library.class);
-    }
-
-    public List<Tool> getToolsByModelObject(ModelObject modelObject) {
-        return getLinkedObjects(modelObject, Tool.class);
-    }
-
-    public List<Utility> getUtilitiesByModelObject(ModelObject modelObject) {
-        return getLinkedObjects(modelObject, Utility.class);
-    }
-
-    public List<News> getNewsByModelObject(ModelObject modelObject) {
-        return getLinkedObjects(modelObject, News.class);
-    }
-
-    public List<Company> getCompaniesByModelObject(ModelObject modelObject) {
-        return getLinkedObjects(modelObject, Company.class);
-    }
-
-    public List<RealWorldApp> getRealWorldAppsByModelObject(ModelObject modelObject) {
-        return getLinkedObjects(modelObject, RealWorldApp.class);
-    }
-
-    public List<Person> getPeopleByModelObject(ModelObject modelObject) {
-        return getLinkedObjects(modelObject, Person.class);
-    }
-
-    public List<Tip> getTipsByModelObject(ModelObject modelObject) {
-        return getLinkedObjects(modelObject, Tip.class);
-    }
-
-    public List<LearnJavaFX> getLearnJavaFXByModelObject(ModelObject modelObject) {
-        return getLinkedObjects(modelObject, LearnJavaFX.class);
-    }
-
-    public List<LearnMobile> getLearnMobileByModelObject(ModelObject modelObject) {
-        return getLinkedObjects(modelObject, LearnMobile.class);
-    }
-
-    public List<LearnRaspberryPi> getLearnRaspberryPiByModelObject(ModelObject modelObject) {
-        return getLinkedObjects(modelObject, LearnRaspberryPi.class);
-    }
-
-    public List<LinksOfTheWeek> getLinksOfTheWeekByModelObject(ModelObject modelObject) {
-        return getLinkedObjects(modelObject, LinksOfTheWeek.class);
-    }
-
-    public LibraryInfo getLibraryInfo(Library library) {
-        try {
-            String libraryId = library.getId();
-            File file = new File(getRepositoryDirectory(), "libraries/" + libraryId + "/info.json");
-            try (FileReader reader = new FileReader(file, StandardCharsets.UTF_8)) {
-                return gson.fromJson(reader, LibraryInfo.class);
-            }
-        } catch (IOException ex) {
-            ex.printStackTrace();
-        }
-        return null;
-    }
-
-    public File getNewsDirectory(News news) {
-        return new File(getRepositoryDirectory(), "news/" + DATE_FORMATTER.format(news.getCreatedOn()) + "-" + news.getId());
-    }
-
-    public String getNewsText(News news) {
-        return loadString(new File(getNewsDirectory(news), "/text.md"));
-    }
-
-    public String getLinksOfTheWeekReadMe(LinksOfTheWeek links) {
-        return loadString(new File(getRepositoryDirectory(), "links/" + links.getId() + "/readme.md"));
-    }
-
-    public void loadLinksOfTheWeekText(LinksOfTheWeek links, StringProperty textProperty) {
-        textProperty.set(getLinksOfTheWeekReadMe(links));
-    }
-
-    public String getTutorialReadMe(Tutorial tutorial) {
-        return loadString(new File(getRepositoryDirectory(), "tutorials/" + tutorial.getId() + "/readme.md"));
-    }
-
-    public String getDownloadReadMe(Download download) {
-        return loadString(new File(getRepositoryDirectory(), "downloads/" + download.getId() + "/readme.md"));
-    }
-
-    public String getBookReadMe(Book book) {
-        return loadString(new File(getRepositoryDirectory(), "books/" + book.getId() + "/readme.md"));
-    }
-
-    public String getPersonReadMe(Person person) {
-        return loadString(new File(getRepositoryDirectory(), "people/" + person.getId() + "/readme.md"));
-    }
-
-    public String getMemberReadMe(Member member) {
-        return loadString(new File(getRepositoryDirectory(), "members/" + member.getId() + "/readme.md"));
-    }
-
-    public String getToolReadMe(Tool tool) {
-        return loadString(new File(getRepositoryDirectory(), "tools/" + tool.getId() + "/readme.md"));
-    }
-
-    public String getUtilityReadMe(Utility utility) {
-        return loadString(new File(getRepositoryDirectory(), "utilities/" + utility.getId() + "/readme.md"));
-    }
-
-    public String getTipReadMe(Tip tip) {
-        return loadString(new File(getRepositoryDirectory(), "tips/" + tip.getId() + "/readme.md"));
-    }
-
-    public String getRealWorldReadMe(RealWorldApp app) {
-        return loadString(new File(getRepositoryDirectory(), "realworld/" + app.getId() + "/readme.md"));
-    }
-
-    public String getCompanyReadMe(Company company) {
-        return loadString(new File(getRepositoryDirectory(), "companies/" + company.getId() + "/readme.md"));
-    }
-
-    public String getLibraryReadMe(Library library) {
-        return loadString(new File(getRepositoryDirectory(), "libraries/" + library.getId() + "/readme.md"));
-    }
-
-    public String getLearnJavaFXReadMe(LearnJavaFX learnJavaFX) {
-        return loadString(new File(getRepositoryDirectory(), "learn/javafx/" + learnJavaFX.getId() + "/readme.md"));
-    }
-
-    public String getLearnMobileReadMe(LearnMobile learnMobile) {
-        return loadString(new File(getRepositoryDirectory(), "learn/mobile/" + learnMobile.getId() + "/readme.md"));
-    }
-
-    public String getLearnRaspberryPiReadMe(LearnRaspberryPi learnRaspberryPi) {
-        return loadString(new File(getRepositoryDirectory(), "learn/raspberrypi/" + learnRaspberryPi.getId() + "/readme.md"));
-    }
-
-    public String getRepositoryDirectoryURL() {
-        return getRepositoryDirectory().toURI().toString();
-    }
-
-    public List<Library> getLibraries() {
-        return libraries;
-    }
-
-    public List<Blog> getBlogs() {
-        return blogs;
-    }
-
-    public List<News> getNews() {
-        return news;
-    }
-
-    public List<Book> getBooks() {
-        return books;
-    }
-
-    public List<LinksOfTheWeek> getLinksOfTheWeek() {
-        return linksOfTheWeek;
-    }
-
-    public List<Tip> getTips() {
-        return tips;
-    }
-
-    public List<Tutorial> getTutorials() {
-        return tutorials;
-    }
-
-    public List<Video> getVideos() {
-        return videos;
-    }
-
-    public List<Download> getDownloads() {
-        return downloads;
-    }
-
-    public List<RealWorldApp> getRealWorldApps() {
-        return realWorldApps;
-    }
-
-    public List<Tool> getTools() {
-        return tools;
-    }
-
-    public List<Utility> getUtilities() {
-        return utilities;
-    }
-
-    public List<Company> getCompanies() {
-        return companies;
-    }
-
-    public List<Person> getPeople() {
-        return people;
-    }
-
-    public List<IkonliPack> getIkonliPacks() {
-        return ikonliPacks;
-    }
-
-    public List<Member> getMembers() {
-        return members;
-    }
-
-    public List<Documentation> getDocumentation() {
-        return documentation;
-    }
-
-    public List<LearnJavaFX> getLearnJavaFX() {
-        return learnJavaFX;
-    }
-
-    public List<LearnMobile> getLearnMobile() {
-        return learnMobile;
-    }
-
-    public List<LearnRaspberryPi> getLearnRaspberryPi() {
-        return learnRaspberryPi;
-    }
-
-    public String getHomeText() {
-        return homeText;
-    }
-
-    public String getOpenJFXText() {
-        return openJFXText;
-    }
-
-    private String loadString(File file) {
-        LOG.fine("loading string from: " + file);
-
-        StringBuilder sb = new StringBuilder();
-
-        try (BufferedReader in = new BufferedReader(new FileReader(file, StandardCharsets.UTF_8))) {
-            String line;
-            while ((line = in.readLine()) != null) {
-                sb.append(line);
-                sb.append("\n");
-            }
-        } catch (MalformedURLException e) {
-            LOG.fine("Malformed URL: " + e.getMessage());
-        } catch (IOException e) {
-            LOG.fine("I/O Error: " + e.getMessage());
-        }
-
-        return sb.toString();
-    }
-
-    public StringProperty getArtifactVersion(Coordinates coordinates) {
-
-        String groupId = coordinates.getGroupId();
-        String artifactId = coordinates.getArtifactId();
-
-        StringProperty result = new SimpleStringProperty("");
-
-        if (StringUtils.isNotBlank(groupId) && StringUtils.isNotBlank(artifactId)) {
-            loadArtifactVersion(groupId, artifactId, result);
-        }
-
-        return result;
-    }
-
-    private void loadArtifactVersion(String groupId, String artifactId, StringProperty result) {
-        HttpURLConnection con = null;
-
-        try {
-            URL url = new URL(MessageFormat.format("https://search.maven.org/solrsearch/select?q=g:{0}+AND+a:{1}", groupId, artifactId));
-
-            con = (HttpURLConnection) url.openConnection();
-            con.setRequestMethod("GET");
-            con.setUseCaches(false);
-
-            int status = con.getResponseCode();
-            if (status == 200) {
-                try (BufferedReader in = new BufferedReader(new InputStreamReader(con.getInputStream()))) {
-                    String inputLine;
-                    StringBuilder content = new StringBuilder();
-                    while ((inputLine = in.readLine()) != null) {
-                        content.append(inputLine);
-                    }
-                    in.close();
-
-                    QueryResult queryResult = gson.fromJson(content.toString(), QueryResult.class);
-                    if (!queryResult.getResponse().getDocs().isEmpty()) {
-                        result.set(queryResult.getResponse().getDocs().get(0).getLatestVersion());
-                    }
-                }
-            } else {
-                result.set("unknown");
-            }
-        } catch (IOException e) {
-            e.printStackTrace();
-        } finally {
-            if (con != null) {
-                con.disconnect();
-            }
-        }
-    }
-
-    public List<Post> loadPosts(Blog blog) {
-        LOG.fine("loading posts for blog " + blog.getName());
-        try {
-            String url = blog.getFeed();
-            if (StringUtils.isNotBlank(url)) {
-                List<Post> posts = new ArrayList<>();
-                URL urlObject = new URL(url);
-                URLConnection urlConnection = urlObject.openConnection();
-                try (XmlReader reader = new XmlReader(urlConnection.getInputStream())) {
-                    SyndFeed feed = new SyndFeedInput().build(reader);
-                    List<SyndEntry> entries = feed.getEntries();
-                    entries.forEach(entry -> posts.add(new Post(blog, feed, entry)));
-                } catch (Exception ex) {
-                    ex.printStackTrace();
-                }
-                return posts;
-            }
-        } catch (IOException ex) {
-            ex.printStackTrace();
-        }
-
-        return Collections.emptyList();
-    }
-
-    public List<PullRequest> loadPullRequests() {
-        long time = System.currentTimeMillis() / 1000;
-        long timeToReloadSeconds = 600;
-        if (cachedPullRequestsTime + timeToReloadSeconds > time) {
-            return cachedPullRequests;
-        }
-        cachedPullRequestsTime = time;
-        cachedPullRequests = loadPullRequestsImpl();
-        return cachedPullRequests;
-
-    }
-
-    private List<PullRequest> loadPullRequestsImpl() {
-        LOG.fine("loading pull requests");
-
-        HttpURLConnection con = null;
-
-        for (int page = 1; page < 2; page++) {
-            try {
-                URL url = new URL("https://api.github.com/repos/openjdk/jfx/pulls?state=all&per_page=100&page=" + page);
-
-                con = (HttpURLConnection) url.openConnection();
-                con.setRequestMethod("GET");
-                con.setUseCaches(false);
-
-                int status = con.getResponseCode();
-                if (status == 200) {
-                    try (BufferedReader in = new BufferedReader(new InputStreamReader(con.getInputStream()))) {
-                        String inputLine;
-                        StringBuilder content = new StringBuilder();
-                        while ((inputLine = in.readLine()) != null) {
-                            content.append(inputLine);
-                        }
-                        return gson.fromJson(content.toString(), new TypeToken<List<PullRequest>>() {
-                        }.getType());
-                    }
-                }
-            } catch (IOException e) {
-                e.printStackTrace();
-            } finally {
-                if (con != null) {
-                    con.disconnect();
-                }
-            }
-        }
-
-        return Collections.emptyList();
-    }
-}
diff --git a/src/main/java/com/dlsc/jfxcentral/data/ImageManager.java b/src/main/java/com/dlsc/jfxcentral/data/ImageManager.java
index e50f0d88..3d4f75b5 100644
--- a/src/main/java/com/dlsc/jfxcentral/data/ImageManager.java
+++ b/src/main/java/com/dlsc/jfxcentral/data/ImageManager.java
@@ -48,9 +48,6 @@ public class ImageManager {
 
     private static final ImageManager instance = new ImageManager();
 
-    private ImageManager() {
-    }
-
     public static synchronized ImageManager getInstance() {
         return instance;
     }
@@ -321,7 +318,7 @@ private ObjectProperty<Image> remoteImageProperty(String imageUrl, String append
 
                 connection.connect();
 
-                Image image = new Image(url.toExternalForm(), !DataRepository.testing);
+                Image image = new Image(url.toExternalForm(), !DataRepository.isTesting());
                 image.progressProperty().addListener(it -> {
                     // exception = 404 -> no image found for given URL
                     if (image.getProgress() == 1 && image.getException() == null) {
@@ -332,7 +329,7 @@ private ObjectProperty<Image> remoteImageProperty(String imageUrl, String append
                 image.exceptionProperty().addListener(it -> image.getException().printStackTrace());
 
                 // when running unit tests we set the loaded image immediately
-                if (DataRepository.testing) {
+                if (DataRepository.isTesting()) {
                     property.set(image);
                 }
             } catch (Exception e) {
diff --git a/src/main/java/com/dlsc/jfxcentral/data/RSSManager.java b/src/main/java/com/dlsc/jfxcentral/data/RSSManager.java
index 99fe12e8..6123c62a 100644
--- a/src/main/java/com/dlsc/jfxcentral/data/RSSManager.java
+++ b/src/main/java/com/dlsc/jfxcentral/data/RSSManager.java
@@ -23,7 +23,7 @@ public class RSSManager {
     private static final Logger LOG = Logger.getLogger(RSSManager.class.getName());
 
     public static String createRSS() {
-        DataRepository2 repository = DataRepository2.getInstance();
+        DataRepository repository = DataRepository.getInstance();
         List<LinksOfTheWeek> links = repository.getLinksOfTheWeek();
 
         // Based on the example provided on
@@ -62,7 +62,7 @@ public static String createRSS() {
         return "";
     }
 
-    private static String getLinksOfTheWeekAsHtml(DataRepository2 repository, LinksOfTheWeek linksOfTheWeek) {
+    private static String getLinksOfTheWeekAsHtml(DataRepository repository, LinksOfTheWeek linksOfTheWeek) {
         StringProperty markdownContent = new SimpleStringProperty();
         repository.loadLinksOfTheWeekText(linksOfTheWeek, markdownContent);
 
diff --git a/src/test/java/com/dlsc/jfxcentral/data/DataRepository2Test.java b/src/test/java/com/dlsc/jfxcentral/data/DataRepositoryTest.java
similarity index 89%
rename from src/test/java/com/dlsc/jfxcentral/data/DataRepository2Test.java
rename to src/test/java/com/dlsc/jfxcentral/data/DataRepositoryTest.java
index 840ca507..96e4c6fc 100644
--- a/src/test/java/com/dlsc/jfxcentral/data/DataRepository2Test.java
+++ b/src/test/java/com/dlsc/jfxcentral/data/DataRepositoryTest.java
@@ -23,8 +23,6 @@
 import org.apache.commons.lang3.StringUtils;
 import org.junit.jupiter.api.BeforeAll;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.extension.ExtendWith;
-import org.testfx.framework.junit5.ApplicationExtension;
 
 import java.io.File;
 import java.io.IOException;
@@ -40,18 +38,17 @@
 import static org.junit.jupiter.api.Assertions.assertTrue;
 import static org.junit.jupiter.api.Assertions.fail;
 
-public class DataRepository2Test {
+public class DataRepositoryTest {
 
     @BeforeAll
     public static void setup() {
-        DataRepository2.setTesting(true);
+        DataRepository.setTesting(true);
     }
 
     @Test
     public void shouldLoadData() {
-
-        // when
-        DataRepository2 repository = DataRepository2.getInstance();
+        // given
+        DataRepository repository = DataRepository.getInstance();
         repository.reload();
 
         // then
@@ -81,7 +78,7 @@ public void shouldLoadData() {
     @Test
     public void shouldClearData() {
         // given
-        DataRepository2 repository = DataRepository2.getInstance();
+        DataRepository repository = DataRepository.getInstance();
         repository.reload();
 
         // when
@@ -117,7 +114,7 @@ public void shouldClearData() {
     @Test
     public void shouldRefreshData() {
         // given
-        DataRepository2 repository = DataRepository2.getInstance();
+        DataRepository repository = DataRepository.getInstance();
         repository.reload();
 
         // when
@@ -150,7 +147,7 @@ public void shouldRefreshData() {
     @Test
     public void shouldLoadLibraryDescription() {
         // given
-        DataRepository2 repository = DataRepository2.getInstance();
+        DataRepository repository = DataRepository.getInstance();
         repository.reload();
 
         assertFalse(repository.getLibraries().isEmpty());
@@ -167,7 +164,7 @@ public void shouldLoadLibraryDescription() {
     @Test
     public void shouldLoadLibraryInfo() {
         // given
-        DataRepository2 repository = DataRepository2.getInstance();
+        DataRepository repository = DataRepository.getInstance();
         repository.reload();
 
         assertFalse(repository.getLibraries().isEmpty());
@@ -184,7 +181,7 @@ public void shouldLoadLibraryInfo() {
     @Test
     public void shouldLoadLibraryInfoFiles() {
         // given
-        DataRepository2 repository = DataRepository2.getInstance();
+        DataRepository repository = DataRepository.getInstance();
         repository.reload();
 
         assertFalse(repository.getLibraries().isEmpty());
@@ -201,7 +198,7 @@ public void shouldLoadLibraryInfoFiles() {
                 // then
                 assertTrue(StringUtils.isNotBlank(path));
 
-                File file = new File(DataRepository2.getInstance().getRepositoryDirectory(), "libraries/" + lib.getId() + "/" + path);
+                File file = new File(repository.getRepositoryDirectory(), "libraries/" + lib.getId() + "/" + path);
                 assertTrue(file.exists(), "file does not exist: " + file.getAbsolutePath() + " for library " + lib.getName());
 
             });
@@ -211,7 +208,7 @@ public void shouldLoadLibraryInfoFiles() {
     @Test
     public void shouldLoadPersonDescription() {
         // given
-        DataRepository2 repository = DataRepository2.getInstance();
+        DataRepository repository = DataRepository.getInstance();
         repository.reload();
 
         assertFalse(repository.getPeople().isEmpty());
@@ -228,7 +225,7 @@ public void shouldLoadPersonDescription() {
     @Test
     public void shouldLoadPersonMastodon() {
         // given
-        DataRepository2 repository = DataRepository2.getInstance();
+        DataRepository repository = DataRepository.getInstance();
         repository.reload();
 
         assertFalse(repository.getPeople().isEmpty());
@@ -245,7 +242,7 @@ public void shouldLoadPersonMastodon() {
     @Test
     public void shouldLoadMemberDescription() {
         // given
-        DataRepository2 repository = DataRepository2.getInstance();
+        DataRepository repository = DataRepository.getInstance();
         repository.reload();
 
         assertFalse(repository.getMembers().isEmpty());
@@ -262,7 +259,7 @@ public void shouldLoadMemberDescription() {
     @Test
     public void shouldLoadLinksOfTheWeek() {
         // given
-        DataRepository2 repository = DataRepository2.getInstance();
+        DataRepository repository = DataRepository.getInstance();
         repository.reload();
 
         assertFalse(repository.getLinksOfTheWeek().isEmpty());
@@ -279,7 +276,7 @@ public void shouldLoadLinksOfTheWeek() {
     @Test
     public void shouldLoadNewsText() {
         // given
-        DataRepository2 repository = DataRepository2.getInstance();
+        DataRepository repository = DataRepository.getInstance();
         repository.reload();
 
         assertFalse(repository.getNews().isEmpty());
@@ -296,7 +293,7 @@ public void shouldLoadNewsText() {
     @Test
     public void shouldLoadTutorialText() {
         // given
-        DataRepository2 repository = DataRepository2.getInstance();
+        DataRepository repository = DataRepository.getInstance();
         repository.reload();
 
         assertFalse(repository.getTutorials().isEmpty());
@@ -313,7 +310,7 @@ public void shouldLoadTutorialText() {
     @Test
     public void shouldLoadRealWorldDescription() {
         // given
-        DataRepository2 repository = DataRepository2.getInstance();
+        DataRepository repository = DataRepository.getInstance();
         repository.reload();
 
         assertFalse(repository.getRealWorldApps().isEmpty());
@@ -330,7 +327,7 @@ public void shouldLoadRealWorldDescription() {
     @Test
     public void shouldLoadCompanyDescription() {
         // given
-        DataRepository2 repository = DataRepository2.getInstance();
+        DataRepository repository = DataRepository.getInstance();
         repository.reload();
 
         assertFalse(repository.getCompanies().isEmpty());
@@ -347,7 +344,7 @@ public void shouldLoadCompanyDescription() {
     @Test
     public void shouldLoadDownloadsDescription() {
         // given
-        DataRepository2 repository = DataRepository2.getInstance();
+        DataRepository repository = DataRepository.getInstance();
         repository.reload();
 
         assertFalse(repository.getDownloads().isEmpty());
@@ -364,7 +361,7 @@ public void shouldLoadDownloadsDescription() {
     @Test
     public void shouldLoadBooksDescription() {
         // given
-        DataRepository2 repository = DataRepository2.getInstance();
+        DataRepository repository = DataRepository.getInstance();
         repository.reload();
 
         assertFalse(repository.getBooks().isEmpty());
@@ -381,7 +378,7 @@ public void shouldLoadBooksDescription() {
     @Test
     public void shouldLoadBlogs() {
         // given
-        DataRepository2 repository = DataRepository2.getInstance();
+        DataRepository repository = DataRepository.getInstance();
         repository.reload();
 
         assertFalse(repository.getBlogs().isEmpty());
@@ -397,7 +394,7 @@ public void shouldLoadBlogs() {
     @Test
     public void shouldLoadToolsDescription() {
         // given
-        DataRepository2 repository = DataRepository2.getInstance();
+        DataRepository repository = DataRepository.getInstance();
         repository.reload();
 
         assertFalse(repository.getTools().isEmpty());
@@ -414,7 +411,7 @@ public void shouldLoadToolsDescription() {
     @Test
     public void shouldLoadUtilityDescription() {
         // given
-        DataRepository2 repository = DataRepository2.getInstance();
+        DataRepository repository = DataRepository.getInstance();
         repository.reload();
 
         assertFalse(repository.getUtilities().isEmpty());
@@ -431,7 +428,7 @@ public void shouldLoadUtilityDescription() {
     @Test
     public void shouldLoadLibraryArtifactVersion() {
         // given
-        DataRepository2 repository = DataRepository2.getInstance();
+        DataRepository repository = DataRepository.getInstance();
         repository.reload();
 
         assertFalse(repository.getLibraries().isEmpty());
@@ -459,7 +456,7 @@ public void shouldLoadLibraryArtifactVersion() {
     @Test
     public void shouldGetVideosByPerson() {
         // given
-        DataRepository2 repository = DataRepository2.getInstance();
+        DataRepository repository = DataRepository.getInstance();
         repository.reload();
 
         assertFalse(repository.getPeople().isEmpty());
@@ -484,7 +481,7 @@ public void shouldGetVideosByPerson() {
     @Test
     public void shouldGetBlogsByPerson() {
         // given
-        DataRepository2 repository = DataRepository2.getInstance();
+        DataRepository repository = DataRepository.getInstance();
         repository.reload();
 
         assertFalse(repository.getPeople().isEmpty());
@@ -505,7 +502,7 @@ public void shouldGetBlogsByPerson() {
     @Test
     public void shouldNotGetGuiGarageBlog() {
         // given
-        DataRepository2 repository = DataRepository2.getInstance();
+        DataRepository repository = DataRepository.getInstance();
         repository.reload();
 
         // when
@@ -518,7 +515,7 @@ public void shouldNotGetGuiGarageBlog() {
     @Test
     public void shouldGetLibrariesByPerson() {
         // given
-        DataRepository2 repository = DataRepository2.getInstance();
+        DataRepository repository = DataRepository.getInstance();
         repository.reload();
 
         assertFalse(repository.getPeople().isEmpty());
@@ -539,7 +536,7 @@ public void shouldGetLibrariesByPerson() {
     @Test
     public void shouldGetTipsByPerson() {
         // given
-        DataRepository2 repository = DataRepository2.getInstance();
+        DataRepository repository = DataRepository.getInstance();
         repository.reload();
 
         assertFalse(repository.getPeople().isEmpty());
@@ -561,7 +558,7 @@ public void shouldGetTipsByPerson() {
     @Test
     public void shouldGetBooksByPerson() {
         // given
-        DataRepository2 repository = DataRepository2.getInstance();
+        DataRepository repository = DataRepository.getInstance();
         repository.reload();
 
         assertFalse(repository.getPeople().isEmpty());
@@ -582,7 +579,7 @@ public void shouldGetBooksByPerson() {
     @Test
     public void shouldGetTutorialsByPerson() {
         // given
-        DataRepository2 repository = DataRepository2.getInstance();
+        DataRepository repository = DataRepository.getInstance();
         repository.reload();
 
         assertFalse(repository.getPeople().isEmpty());
@@ -603,7 +600,7 @@ public void shouldGetTutorialsByPerson() {
     @Test
     public void shouldGetDownloadsByPerson() {
         // given
-        DataRepository2 repository = DataRepository2.getInstance();
+        DataRepository repository = DataRepository.getInstance();
         repository.reload();
 
         assertFalse(repository.getPeople().isEmpty());
@@ -624,7 +621,7 @@ public void shouldGetDownloadsByPerson() {
     @Test
     public void shouldGetPersonById() {
         // given
-        DataRepository2 repository = DataRepository2.getInstance();
+        DataRepository repository = DataRepository.getInstance();
         repository.reload();
 
         assertFalse(repository.getPeople().isEmpty());
@@ -641,7 +638,7 @@ public void shouldGetPersonById() {
     @Test
     public void shouldGetCompanyById() {
         // given
-        DataRepository2 repository = DataRepository2.getInstance();
+        DataRepository repository = DataRepository.getInstance();
         repository.reload();
 
         assertFalse(repository.getCompanies().isEmpty());
@@ -658,7 +655,7 @@ public void shouldGetCompanyById() {
     @Test
     public void shouldGetLibraryById() {
         // given
-        DataRepository2 repository = DataRepository2.getInstance();
+        DataRepository repository = DataRepository.getInstance();
         repository.reload();
 
         assertFalse(repository.getLibraries().isEmpty());
@@ -675,7 +672,7 @@ public void shouldGetLibraryById() {
     @Test
     public void shouldGetBlogById() {
         // given
-        DataRepository2 repository = DataRepository2.getInstance();
+        DataRepository repository = DataRepository.getInstance();
         repository.reload();
 
         assertFalse(repository.getBlogs().isEmpty());
@@ -692,7 +689,7 @@ public void shouldGetBlogById() {
     @Test
     public void shouldGetBookById() {
         // given
-        DataRepository2 repository = DataRepository2.getInstance();
+        DataRepository repository = DataRepository.getInstance();
         repository.reload();
 
         assertFalse(repository.getBooks().isEmpty());
@@ -709,7 +706,7 @@ public void shouldGetBookById() {
     @Test
     public void shouldGetLearnJavaFXById() {
         // given
-        DataRepository2 repository = DataRepository2.getInstance();
+        DataRepository repository = DataRepository.getInstance();
         repository.reload();
 
         assertFalse(repository.getLearnJavaFX().isEmpty());
@@ -732,7 +729,7 @@ public void shouldGetLearnJavaFXById() {
     @Test
     public void shouldLoadLearnJavaFXDescription() {
         // given
-        DataRepository2 repository = DataRepository2.getInstance();
+        DataRepository repository = DataRepository.getInstance();
         repository.reload();
 
         assertFalse(repository.getLearnJavaFX().isEmpty());
@@ -749,7 +746,7 @@ public void shouldLoadLearnJavaFXDescription() {
     @Test
     public void shouldGetLearnMobileById() {
         // given
-        DataRepository2 repository = DataRepository2.getInstance();
+        DataRepository repository = DataRepository.getInstance();
         repository.reload();
 
         assertFalse(repository.getLearnMobile().isEmpty());
@@ -772,7 +769,7 @@ public void shouldGetLearnMobileById() {
     @Test
     public void shouldLoadLearnMobileDescription() {
         // given
-        DataRepository2 repository = DataRepository2.getInstance();
+        DataRepository repository = DataRepository.getInstance();
         repository.reload();
 
         assertFalse(repository.getLearnMobile().isEmpty());
@@ -789,7 +786,7 @@ public void shouldLoadLearnMobileDescription() {
     @Test
     public void shouldGetLearnRaspberryPiById() {
         // given
-        DataRepository2 repository = DataRepository2.getInstance();
+        DataRepository repository = DataRepository.getInstance();
         repository.reload();
 
         assertFalse(repository.getLearnRaspberryPi().isEmpty());
@@ -812,7 +809,7 @@ public void shouldGetLearnRaspberryPiById() {
     @Test
     public void shouldLoadLearnRaspberryPiDescription() {
         // given
-        DataRepository2 repository = DataRepository2.getInstance();
+        DataRepository repository = DataRepository.getInstance();
         repository.reload();
 
         assertFalse(repository.getLearnRaspberryPi().isEmpty());
@@ -829,7 +826,7 @@ public void shouldLoadLearnRaspberryPiDescription() {
     @Test
     public void shouldGetRealWorldAppById() {
         // given
-        DataRepository2 repository = DataRepository2.getInstance();
+        DataRepository repository = DataRepository.getInstance();
         repository.reload();
 
         assertFalse(repository.getRealWorldApps().isEmpty());
@@ -846,7 +843,7 @@ public void shouldGetRealWorldAppById() {
     @Test
     public void shouldGetToolById() {
         // given
-        DataRepository2 repository = DataRepository2.getInstance();
+        DataRepository repository = DataRepository.getInstance();
         repository.reload();
 
         assertFalse(repository.getTools().isEmpty());
@@ -863,7 +860,7 @@ public void shouldGetToolById() {
     @Test
     public void shouldGetUtilityById() {
         // given
-        DataRepository2 repository = DataRepository2.getInstance();
+        DataRepository repository = DataRepository.getInstance();
         repository.reload();
 
         assertFalse(repository.getUtilities().isEmpty());
@@ -881,7 +878,7 @@ public void shouldGetUtilityById() {
     @Test
     public void shouldGetDownloadById() {
         // given
-        DataRepository2 repository = DataRepository2.getInstance();
+        DataRepository repository = DataRepository.getInstance();
         repository.reload();
 
         assertFalse(repository.getDownloads().isEmpty());
@@ -898,7 +895,7 @@ public void shouldGetDownloadById() {
     @Test
     public void shouldHaveValidDownloadsURL() {
         // given
-        DataRepository2 repository = DataRepository2.getInstance();
+        DataRepository repository = DataRepository.getInstance();
         repository.reload();
 
         assertFalse(repository.getDownloads().isEmpty());
@@ -930,7 +927,7 @@ public void shouldHaveValidDownloadsURL() {
     @Test
     public void shouldGetTutorialsByLibrary() {
         // given
-        DataRepository2 repository = DataRepository2.getInstance();
+        DataRepository repository = DataRepository.getInstance();
         repository.reload();
 
         assertFalse(repository.getLibraries().isEmpty());
@@ -951,7 +948,7 @@ public void shouldGetTutorialsByLibrary() {
     @Test
     public void shouldGetVideosByLibrary() {
         // given
-        DataRepository2 repository = DataRepository2.getInstance();
+        DataRepository repository = DataRepository.getInstance();
         repository.reload();
 
         assertFalse(repository.getLibraries().isEmpty());
@@ -972,7 +969,7 @@ public void shouldGetVideosByLibrary() {
     @Test
     public void shouldGetDownloadsByLibrary() {
         // given
-        DataRepository2 repository = DataRepository2.getInstance();
+        DataRepository repository = DataRepository.getInstance();
         repository.reload();
 
         assertFalse(repository.getLibraries().isEmpty());
@@ -993,7 +990,7 @@ public void shouldGetDownloadsByLibrary() {
     @Test
     public void shouldGetIkonliPacks() {
         // given
-        DataRepository2 repository = DataRepository2.getInstance();
+        DataRepository repository = DataRepository.getInstance();
         repository.reload();
 
         // when
@@ -1006,7 +1003,7 @@ public void shouldGetIkonliPacks() {
     @Test
     public void shouldGetDocumentation() {
         // given
-        DataRepository2 repository = DataRepository2.getInstance();
+        DataRepository repository = DataRepository.getInstance();
         repository.reload();
 
         // when
diff --git a/src/test/java/com/dlsc/jfxcentral/data/ImageManagerTest.java b/src/test/java/com/dlsc/jfxcentral/data/ImageManagerTest.java
index 77bfef59..6c51b158 100644
--- a/src/test/java/com/dlsc/jfxcentral/data/ImageManagerTest.java
+++ b/src/test/java/com/dlsc/jfxcentral/data/ImageManagerTest.java
@@ -32,14 +32,12 @@ public static void setup() {
         for (Handler handler : rootLogger.getHandlers()) {
             handler.setLevel(Level.FINE);
         }
-
-        DataRepository2.setTesting(true);
     }
 
     @Test
     public void shouldGetPersonImage() {
         // when .. then
-        DataRepository2.getInstance().getPeople().forEach(item -> {
+        DataRepository.getInstance().getPeople().forEach(item -> {
             ObjectProperty<Image> property = ImageManager.getInstance().personImageProperty(item);
             assertNotNull(property, "image property is null for item ID " + item.getId());
             assertNotNull(property.get(), "image is missing for item ID " + item.getId());
@@ -49,7 +47,7 @@ public void shouldGetPersonImage() {
     @Test
     public void shouldGetNewsBanner() {
         // when .. then
-        DataRepository2.getInstance().getNews().forEach(item -> {
+        DataRepository.getInstance().getNews().forEach(item -> {
             ObjectProperty<Image> property = ImageManager.getInstance().newsBannerImageProperty(item);
             assertNotNull(property, "image property is null for item ID " + item.getId());
             assertNotNull(property.get(), "image is missing for item ID " + item.getId());
@@ -59,7 +57,7 @@ public void shouldGetNewsBanner() {
     @Test
     public void shouldGetDownloadBanner() {
         // when .. then
-        DataRepository2.getInstance().getDownloads().forEach(item -> {
+        DataRepository.getInstance().getDownloads().forEach(item -> {
             ObjectProperty<Image> property = ImageManager.getInstance().downloadBannerImageProperty(item);
             assertNotNull(property, "image property is null for item ID " + item.getId());
             assertNotNull(property.get(), "image is missing for item ID " + item.getId());
@@ -69,7 +67,7 @@ public void shouldGetDownloadBanner() {
     @Test
     public void shouldGetTipBanner() {
         // when .. then
-        DataRepository2.getInstance().getTips().forEach(item -> {
+        DataRepository.getInstance().getTips().forEach(item -> {
             ObjectProperty<Image> property = ImageManager.getInstance().tipBannerImageProperty(item);
             assertNotNull(property, "image property is null for item ID " + item.getId());
             assertNotNull(property.get(), "image is missing for item ID " + item.getId());
@@ -79,7 +77,7 @@ public void shouldGetTipBanner() {
     @Test
     public void shouldGetBlogPageImage() {
         // when .. then
-        DataRepository2.getInstance().getBlogs().forEach(item -> {
+        DataRepository.getInstance().getBlogs().forEach(item -> {
             ObjectProperty<Image> property = ImageManager.getInstance().blogPageImageProperty(item);
             assertNotNull(property, "image property is null for item ID " + item.getId());
             assertNotNull(property.get(), "image is missing for item ID " + item.getId());
@@ -89,7 +87,7 @@ public void shouldGetBlogPageImage() {
     @Test
     public void shouldGetBlogIconImage() {
         // when .. then
-        DataRepository2.getInstance().getBlogs().forEach(item -> {
+        DataRepository.getInstance().getBlogs().forEach(item -> {
             ObjectProperty<Image> property = ImageManager.getInstance().blogIconImageProperty(item);
             assertNotNull(property, "image property is null for item ID " + item.getId());
             assertNotNull(property.get(), "image is missing for item ID " + item.getId());
@@ -99,7 +97,7 @@ public void shouldGetBlogIconImage() {
     @Test
     public void shouldGetBlogPageLargeImage() {
         // when .. then
-        DataRepository2.getInstance().getBlogs().forEach(item -> {
+        DataRepository.getInstance().getBlogs().forEach(item -> {
             ObjectProperty<Image> property = ImageManager.getInstance().blogPageLargeImageProperty(item);
             assertNotNull(property, "image property is null for item ID " + item.getId());
             assertNotNull(property.get(), "image is missing for item ID " + item.getId());
@@ -109,7 +107,7 @@ public void shouldGetBlogPageLargeImage() {
     @Test
     public void shouldGetTutorialPageImage() {
         // when .. then
-        DataRepository2.getInstance().getTutorials().forEach(item -> {
+        DataRepository.getInstance().getTutorials().forEach(item -> {
             ObjectProperty<Image> property = ImageManager.getInstance().tutorialImageProperty(item);
             assertNotNull(property, "image property is null for item ID " + item.getId());
             assertNotNull(property.get(), "image is missing for item ID " + item.getId());
@@ -119,7 +117,7 @@ public void shouldGetTutorialPageImage() {
     @Test
     public void shouldGetTutorialPageLargeImage() {
         // when .. then
-        DataRepository2.getInstance().getTutorials().forEach(item -> {
+        DataRepository.getInstance().getTutorials().forEach(item -> {
             ObjectProperty<Image> property = ImageManager.getInstance().tutorialImageLargeProperty(item);
             assertNotNull(property, "image property is null for item ID " + item.getId());
             assertNotNull(property.get(), "image is missing for item ID " + item.getId());
@@ -129,7 +127,7 @@ public void shouldGetTutorialPageLargeImage() {
     @Test
     public void shouldGetRealWorldImage() {
         // when .. then
-        DataRepository2.getInstance().getRealWorldApps().forEach(item -> {
+        DataRepository.getInstance().getRealWorldApps().forEach(item -> {
             ObjectProperty<Image> property = ImageManager.getInstance().realWorldAppImageProperty(item);
             assertNotNull(property, "small image property is null for item ID " + item.getId());
             assertNotNull(property.get(), "small image is missing for item ID " + item.getId());
@@ -139,7 +137,7 @@ public void shouldGetRealWorldImage() {
     @Test
     public void shouldGetRealWorldImageLarge() {
         // when .. then
-        DataRepository2.getInstance().getRealWorldApps().forEach(item -> {
+        DataRepository.getInstance().getRealWorldApps().forEach(item -> {
             ObjectProperty<Image> property = ImageManager.getInstance().realWorldAppLargeImageProperty(item);
             assertNotNull(property, "large image property is null for item ID " + item.getId());
             assertNotNull(property.get(), "large image is missing for item ID " + item.getId());
@@ -149,7 +147,7 @@ public void shouldGetRealWorldImageLarge() {
     @Test
     public void shouldGetRealWorldBanner() {
         // when .. then
-        DataRepository2.getInstance().getRealWorldApps().forEach(item -> {
+        DataRepository.getInstance().getRealWorldApps().forEach(item -> {
             ObjectProperty<Image> property = ImageManager.getInstance().realWorldAppBannerImageProperty(item);
             assertNotNull(property, "banner image property is null for item ID " + item.getId());
             assertNotNull(property.get(), "banner image is missing for item ID " + item.getId());
@@ -159,7 +157,7 @@ public void shouldGetRealWorldBanner() {
     @Test
     public void shouldGetToolImage() {
         // when .. then
-        DataRepository2.getInstance().getTools().forEach(item -> {
+        DataRepository.getInstance().getTools().forEach(item -> {
             ObjectProperty<Image> property = ImageManager.getInstance().toolImageProperty(item);
             assertNotNull(property, "image property is null for item ID " + item.getId());
             assertNotNull(property.get(), "image is missing for item ID " + item.getId());
@@ -169,7 +167,7 @@ public void shouldGetToolImage() {
     @Test
     public void shouldGetUtilityImage() {
         // when .. then
-        DataRepository2.getInstance().getUtilities().forEach(item -> {
+        DataRepository.getInstance().getUtilities().forEach(item -> {
             ObjectProperty<Image> property = ImageManager.getInstance().utilityImageProperty(item);
             assertNotNull(property, "image property is null for item ID " + item.getId());
             assertNotNull(property.get(), "image is missing for item ID " + item.getId());
@@ -179,7 +177,7 @@ public void shouldGetUtilityImage() {
     @Test
     public void shouldGetCompanyImage() {
         // when .. then
-        DataRepository2.getInstance().getCompanies().forEach(item -> {
+        DataRepository.getInstance().getCompanies().forEach(item -> {
             ObjectProperty<Image> property = ImageManager.getInstance().companyImageProperty(item);
             assertNotNull(property, "image property is null for item ID " + item.getId());
             assertNotNull(property.get(), "image is missing for item ID " + item.getId());
@@ -189,7 +187,7 @@ public void shouldGetCompanyImage() {
     @Test
     public void shouldGetBookCoverImage() {
         // when .. then
-        DataRepository2.getInstance().getBooks().forEach(item -> {
+        DataRepository.getInstance().getBooks().forEach(item -> {
             ObjectProperty<Image> property = ImageManager.getInstance().bookCoverImageProperty(item);
             assertNotNull(property, "image property is null for item ID " + item.getId());
             assertNotNull(property.get(), "image is missing for item ID " + item.getId());
@@ -199,7 +197,7 @@ public void shouldGetBookCoverImage() {
     @Disabled
     public void shouldGetYouTubeImage() {
         // when .. then
-        DataRepository2.getInstance().getVideos().forEach(item -> {
+        DataRepository.getInstance().getVideos().forEach(item -> {
             System.out.println("Youtube image url: " + ImageManager.getInstance().youTubeImageURL(item));
             ObjectProperty<Image> property = ImageManager.getInstance().youTubeImageProperty(item);
             assertNotNull(property, "image property is null for item ID " + item.getId() + ", name = " + item.getName());
@@ -228,7 +226,7 @@ public void shouldGetGithubAvatarImage() {
     @Test
     public void shouldGetDocumentationImage() {
         // when .. then
-        DataRepository2.getInstance().getDocumentation().forEach(item -> {
+        DataRepository.getInstance().getDocumentation().forEach(item -> {
             ObjectProperty<Image> property = ImageManager.getInstance().documentationImageProperty(item);
             assertNotNull(property, "image property is null for item ID " + item.getId());
             assertNotNull(property.get(), "image is missing for item ID " + item.getId());
@@ -238,7 +236,7 @@ public void shouldGetDocumentationImage() {
     @Test
     public void shouldGetLibraryFeaturedImage() {
         // when .. then
-        DataRepository2.getInstance().getLibraries().forEach(item -> {
+        DataRepository.getInstance().getLibraries().forEach(item -> {
             ObjectProperty<Image> featuredImageProperty = ImageManager.getInstance().libraryFeaturedImageProperty(item);
             assertNotNull(featuredImageProperty, "image featuredImageProperty is null for item ID " + item.getId());
             // featuredImageProperty.get() Can be null.
diff --git a/src/test/java/com/dlsc/jfxcentral/data/RSSManagerTest.java b/src/test/java/com/dlsc/jfxcentral/data/RSSManagerTest.java
index 9b6ff272..400cc9df 100644
--- a/src/test/java/com/dlsc/jfxcentral/data/RSSManagerTest.java
+++ b/src/test/java/com/dlsc/jfxcentral/data/RSSManagerTest.java
@@ -13,13 +13,13 @@ public class RSSManagerTest {
 
     @BeforeAll
     public static void setup() {
-        DataRepository2.setTesting(true);
+        DataRepository.setTesting(true);
     }
 
     @Test
     void shouldCreateLinksOfTheWeekRss() {
         // given
-        DataRepository2 repository = DataRepository2.getInstance();
+        DataRepository repository = DataRepository.getInstance();
         assertFalse(repository.getLinksOfTheWeek().isEmpty());
 
         String rss = RSSManager.createRSS();

From 848e8f24c70aa25c0b13c5c131eea7e92cd95bff Mon Sep 17 00:00:00 2001
From: Frank Delporte <frank@webtechie.be>
Date: Wed, 20 Nov 2024 10:44:12 +0100
Subject: [PATCH 2/2] Remove outdated DataRepository, and fix location of files
 for unit tests

---
 src/main/java/com/dlsc/jfxcentral/data/ImageManager.java | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/src/main/java/com/dlsc/jfxcentral/data/ImageManager.java b/src/main/java/com/dlsc/jfxcentral/data/ImageManager.java
index 3d4f75b5..9ed620a0 100644
--- a/src/main/java/com/dlsc/jfxcentral/data/ImageManager.java
+++ b/src/main/java/com/dlsc/jfxcentral/data/ImageManager.java
@@ -48,6 +48,9 @@ public class ImageManager {
 
     private static final ImageManager instance = new ImageManager();
 
+    private ImageManager() {
+    }
+
     public static synchronized ImageManager getInstance() {
         return instance;
     }