Un-nest Java packages from api since they aren't API-specific

server/src/main/java/org/animeatsume/ApplicationApi.java

@@ -1,18 +1,18 @@
 package org.animeatsume;
 
 import lombok.extern.log4j.Log4j2;
-import org.animeatsume.api.controller.FourAnimeController;
-import org.animeatsume.api.controller.KissanimeRuController;
-import org.animeatsume.api.controller.NineAnimeController;
-import org.animeatsume.api.controller.ZoroToController;
-import org.animeatsume.api.model.SearchAnimeResponse;
-import org.animeatsume.api.model.TitleSearchRequest;
-import org.animeatsume.api.model.TitlesAndEpisodes;
-import org.animeatsume.api.model.kissanime.KissanimeVideoHostRequest;
-import org.animeatsume.api.model.kissanime.NovelPlanetUrlRequest;
-import org.animeatsume.api.service.NovelPlanetService;
-import org.animeatsume.api.utils.http.CorsProxy;
-import org.animeatsume.api.utils.regex.RegexUtils;
+import org.animeatsume.controller.FourAnimeController;
+import org.animeatsume.controller.KissanimeRuController;
+import org.animeatsume.controller.NineAnimeController;
+import org.animeatsume.controller.ZoroToController;
+import org.animeatsume.model.SearchAnimeResponse;
+import org.animeatsume.model.TitleSearchRequest;
+import org.animeatsume.model.TitlesAndEpisodes;
+import org.animeatsume.model.kissanime.KissanimeVideoHostRequest;
+import org.animeatsume.model.kissanime.NovelPlanetUrlRequest;
+import org.animeatsume.service.NovelPlanetService;
+import org.animeatsume.utils.http.CorsProxy;
+import org.animeatsume.utils.regex.RegexUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.cache.annotation.Cacheable;

server/src/main/java/org/animeatsume/api/controller/FourAnimeController.java → server/src/main/java/org/animeatsume/controller/FourAnimeController.java

@@ -1,11 +1,11 @@
-package org.animeatsume.api.controller;
+package org.animeatsume.controller;
 
 import lombok.extern.log4j.Log4j2;
-import org.animeatsume.api.model.TitleSearchRequest;
-import org.animeatsume.api.model.TitlesAndEpisodes;
-import org.animeatsume.api.model.VideoSearchResult;
-import org.animeatsume.api.service.FourAnimeService;
-import org.animeatsume.api.utils.ObjectUtils;
+import org.animeatsume.model.TitleSearchRequest;
+import org.animeatsume.model.TitlesAndEpisodes;
+import org.animeatsume.model.VideoSearchResult;
+import org.animeatsume.service.FourAnimeService;
+import org.animeatsume.utils.ObjectUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Controller;
 

server/src/main/java/org/animeatsume/api/controller/KissanimeRuController.java → server/src/main/java/org/animeatsume/controller/KissanimeRuController.java

@@ -1,20 +1,20 @@
-package org.animeatsume.api.controller;
+package org.animeatsume.controller;
 
 import lombok.extern.log4j.Log4j2;
-import org.animeatsume.api.model.Anchor;
-import org.animeatsume.api.model.TitleSearchRequest;
-import org.animeatsume.api.model.TitlesAndEpisodes;
-import org.animeatsume.api.model.kissanime.CaptchaAttempt;
-import org.animeatsume.api.model.kissanime.KissanimeVideoHostRequest;
-import org.animeatsume.api.model.kissanime.KissanimeVideoHostResponse;
-import org.animeatsume.api.model.kissanime.NovelPlanetSourceResponse;
-import org.animeatsume.api.service.KissanimeRuService;
-import org.animeatsume.api.service.NovelPlanetService;
-import org.animeatsume.api.service.VideoFileService;
-import org.animeatsume.api.utils.ObjectUtils;
-import org.animeatsume.api.utils.http.CorsProxy;
-import org.animeatsume.api.utils.http.Requests;
-import org.animeatsume.api.utils.regex.RegexUtils;
+import org.animeatsume.model.Anchor;
+import org.animeatsume.model.TitleSearchRequest;
+import org.animeatsume.model.TitlesAndEpisodes;
+import org.animeatsume.model.kissanime.CaptchaAttempt;
+import org.animeatsume.model.kissanime.KissanimeVideoHostRequest;
+import org.animeatsume.model.kissanime.KissanimeVideoHostResponse;
+import org.animeatsume.model.kissanime.NovelPlanetSourceResponse;
+import org.animeatsume.service.KissanimeRuService;
+import org.animeatsume.service.NovelPlanetService;
+import org.animeatsume.service.VideoFileService;
+import org.animeatsume.utils.ObjectUtils;
+import org.animeatsume.utils.http.CorsProxy;
+import org.animeatsume.utils.http.Requests;
+import org.animeatsume.utils.regex.RegexUtils;
 import org.animeatsume.dao.AnimeAtsumeDao;
 import org.animeatsume.dao.model.CaptchaAnswer;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -60,7 +60,7 @@ public class KissanimeRuController implements ShowSearchController {
 
     public TitlesAndEpisodes searchShows(TitleSearchRequest titleSearchRequest) {
         TitlesAndEpisodes titlesAndEpisodes = kissanimeService.searchKissanimeTitles(titleSearchRequest);
-        List<TitlesAndEpisodes.EpisodesForTitle> titleSearchResults = titlesAndEpisodes.getResults();
+        List<TitlesAndEpisodes.EpisodesForTitle> titleSearchResults = (List<TitlesAndEpisodes.EpisodesForTitle>) titlesAndEpisodes.getResults();
 
         if (titleSearchResults != null) {
             List<CompletableFuture<List<Anchor>>> episodeSearchResultsFutures = new ArrayList<>();

server/src/main/java/org/animeatsume/api/controller/NineAnimeController.java → server/src/main/java/org/animeatsume/controller/NineAnimeController.java

@@ -1,12 +1,12 @@
-package org.animeatsume.api.controller;
+package org.animeatsume.controller;
 
 import lombok.extern.log4j.Log4j2;
-import org.animeatsume.api.model.SearchAnimeResponse;
-import org.animeatsume.api.model.TitleSearchRequest;
-import org.animeatsume.api.model.TitlesAndEpisodes;
-import org.animeatsume.api.model.VideoSearchResult;
-import org.animeatsume.api.service.NineAnimeService;
-import org.animeatsume.api.utils.ObjectUtils;
+import org.animeatsume.model.SearchAnimeResponse;
+import org.animeatsume.model.TitleSearchRequest;
+import org.animeatsume.model.TitlesAndEpisodes;
+import org.animeatsume.model.VideoSearchResult;
+import org.animeatsume.service.NineAnimeService;
+import org.animeatsume.utils.ObjectUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Controller;
 

server/src/main/java/org/animeatsume/api/controller/ShowSearchController.java → server/src/main/java/org/animeatsume/controller/ShowSearchController.java

@@ -1,7 +1,7 @@
-package org.animeatsume.api.controller;
+package org.animeatsume.controller;
 
-import org.animeatsume.api.model.TitleSearchRequest;
-import org.animeatsume.api.model.TitlesAndEpisodes;
+import org.animeatsume.model.TitleSearchRequest;
+import org.animeatsume.model.TitlesAndEpisodes;
 
 public interface ShowSearchController {
     TitlesAndEpisodes searchShows(TitleSearchRequest request);

server/src/main/java/org/animeatsume/api/controller/ZoroToController.java → server/src/main/java/org/animeatsume/controller/ZoroToController.java

@@ -1,11 +1,11 @@
-package org.animeatsume.api.controller;
+package org.animeatsume.controller;
 
 import lombok.extern.log4j.Log4j2;
-import org.animeatsume.api.model.TitleSearchRequest;
-import org.animeatsume.api.model.TitlesAndEpisodes;
-import org.animeatsume.api.model.VideoSearchResult;
-import org.animeatsume.api.service.ZoroToService;
-import org.animeatsume.api.utils.ObjectUtils;
+import org.animeatsume.model.TitleSearchRequest;
+import org.animeatsume.model.TitlesAndEpisodes;
+import org.animeatsume.model.VideoSearchResult;
+import org.animeatsume.service.ZoroToService;
+import org.animeatsume.utils.ObjectUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Controller;
 

server/src/main/java/org/animeatsume/api/model/Anchor.java → server/src/main/java/org/animeatsume/model/Anchor.java

@@ -1,4 +1,4 @@
-package org.animeatsume.api.model;
+package org.animeatsume.model;
 
 import lombok.AllArgsConstructor;
 import lombok.Data;

server/src/main/java/org/animeatsume/api/model/SearchAnimeResponse.java → server/src/main/java/org/animeatsume/model/SearchAnimeResponse.java

@@ -1,4 +1,4 @@
-package org.animeatsume.api.model;
+package org.animeatsume.model;
 
 
 import lombok.AllArgsConstructor;

server/src/main/java/org/animeatsume/api/model/TitleSearchRequest.java → server/src/main/java/org/animeatsume/model/TitleSearchRequest.java

@@ -1,4 +1,4 @@
-package org.animeatsume.api.model;
+package org.animeatsume.model;
 
 import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
 import lombok.Data;

server/src/main/java/org/animeatsume/api/model/TitlesAndEpisodes.java → server/src/main/java/org/animeatsume/model/TitlesAndEpisodes.java

@@ -1,4 +1,4 @@
-package org.animeatsume.api.model;
+package org.animeatsume.model;
 
 import lombok.AllArgsConstructor;
 import lombok.Data;

server/src/main/java/org/animeatsume/api/model/VideoSearchResult.java → server/src/main/java/org/animeatsume/model/VideoSearchResult.java

@@ -1,4 +1,4 @@
-package org.animeatsume.api.model;
+package org.animeatsume.model;
 
 import lombok.Data;
 import lombok.EqualsAndHashCode;

server/src/main/java/org/animeatsume/api/model/ZoroToEpisodes.java → server/src/main/java/org/animeatsume/model/ZoroToEpisodes.java

@@ -1,8 +1,8 @@
-package org.animeatsume.api.model;
+package org.animeatsume.model;
 
 import lombok.Data;
 import lombok.extern.log4j.Log4j2;
-import org.animeatsume.api.utils.ObjectUtils;
+import org.animeatsume.utils.ObjectUtils;
 import org.jsoup.Jsoup;
 
 import java.util.List;

server/src/main/java/org/animeatsume/api/model/ZoroToShowResponse.java → server/src/main/java/org/animeatsume/model/ZoroToShowResponse.java

@@ -1,10 +1,10 @@
-package org.animeatsume.api.model;
+package org.animeatsume.model;
 
 import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
 import lombok.AllArgsConstructor;
 import lombok.Data;
 import lombok.NoArgsConstructor;
-import org.animeatsume.api.utils.ObjectUtils;
+import org.animeatsume.utils.ObjectUtils;
 
 import java.util.Map;
 

server/src/main/java/org/animeatsume/api/model/ZoroToStreamingSource.java → server/src/main/java/org/animeatsume/model/ZoroToStreamingSource.java

@@ -1,13 +1,9 @@
-package org.animeatsume.api.model;
+package org.animeatsume.model;
 
 import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
 import lombok.Data;
 import lombok.extern.log4j.Log4j2;
-import org.animeatsume.api.utils.ObjectUtils;
-import org.jsoup.Jsoup;
-
-import java.util.List;
-import java.util.stream.Collectors;
+import org.animeatsume.utils.ObjectUtils;
 
 @Log4j2
 @Data

server/src/main/java/org/animeatsume/api/model/kissanime/CaptchaAttempt.java → server/src/main/java/org/animeatsume/model/kissanime/CaptchaAttempt.java

@@ -1,4 +1,4 @@
-package org.animeatsume.api.model.kissanime;
+package org.animeatsume.model.kissanime;
 
 import lombok.AllArgsConstructor;
 import lombok.Data;

server/src/main/java/org/animeatsume/api/model/kissanime/KissanimeVideoHostRequest.java → server/src/main/java/org/animeatsume/model/kissanime/KissanimeVideoHostRequest.java

@@ -1,4 +1,4 @@
-package org.animeatsume.api.model.kissanime;
+package org.animeatsume.model.kissanime;
 
 import lombok.AllArgsConstructor;
 import lombok.Data;

server/src/main/java/org/animeatsume/api/model/kissanime/KissanimeVideoHostResponse.java → server/src/main/java/org/animeatsume/model/kissanime/KissanimeVideoHostResponse.java

@@ -1,4 +1,4 @@
-package org.animeatsume.api.model.kissanime;
+package org.animeatsume.model.kissanime;
 
 import lombok.AllArgsConstructor;
 import lombok.Data;

server/src/main/java/org/animeatsume/api/model/kissanime/NovelPlanetSourceResponse.java → server/src/main/java/org/animeatsume/model/kissanime/NovelPlanetSourceResponse.java

@@ -1,4 +1,4 @@
-package org.animeatsume.api.model.kissanime;
+package org.animeatsume.model.kissanime;
 
 import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
 import lombok.AllArgsConstructor;

server/src/main/java/org/animeatsume/api/model/kissanime/NovelPlanetUrlRequest.java → server/src/main/java/org/animeatsume/model/kissanime/NovelPlanetUrlRequest.java

@@ -1,4 +1,4 @@
-package org.animeatsume.api.model.kissanime;
+package org.animeatsume.model.kissanime;
 
 import lombok.AllArgsConstructor;
 import lombok.Data;

server/src/main/java/org/animeatsume/api/model/nineanime/NineAnimeEpisodeHostResponse.java → server/src/main/java/org/animeatsume/model/nineanime/NineAnimeEpisodeHostResponse.java

@@ -1,10 +1,10 @@
-package org.animeatsume.api.model.nineanime;
+package org.animeatsume.model.nineanime;
 
 import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
 import lombok.AllArgsConstructor;
 import lombok.Data;
 import lombok.NoArgsConstructor;
-import org.animeatsume.api.utils.ObjectUtils;
+import org.animeatsume.utils.ObjectUtils;
 
 @Data
 @AllArgsConstructor

server/src/main/java/org/animeatsume/api/model/nineanime/NineAnimeSearchResponse.java → server/src/main/java/org/animeatsume/model/nineanime/NineAnimeSearchResponse.java

@@ -1,10 +1,10 @@
-package org.animeatsume.api.model.nineanime;
+package org.animeatsume.model.nineanime;
 
 import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
 import lombok.AllArgsConstructor;
 import lombok.Data;
 import lombok.NoArgsConstructor;
-import org.animeatsume.api.utils.ObjectUtils;
+import org.animeatsume.utils.ObjectUtils;
 
 @Data
 @AllArgsConstructor

server/src/main/java/org/animeatsume/api/service/FourAnimeService.java → server/src/main/java/org/animeatsume/service/FourAnimeService.java

@@ -1,12 +1,12 @@
-package org.animeatsume.api.service;
+package org.animeatsume.service;
 
 import lombok.extern.log4j.Log4j2;
-import org.animeatsume.api.model.TitlesAndEpisodes;
-import org.animeatsume.api.model.TitlesAndEpisodes.EpisodesForTitle;
-import org.animeatsume.api.model.VideoSearchResult;
-import org.animeatsume.api.utils.http.CorsProxy;
-import org.animeatsume.api.utils.http.Requests;
-import org.animeatsume.api.utils.regex.RegexUtils;
+import org.animeatsume.model.TitlesAndEpisodes;
+import org.animeatsume.model.TitlesAndEpisodes.EpisodesForTitle;
+import org.animeatsume.model.VideoSearchResult;
+import org.animeatsume.utils.http.CorsProxy;
+import org.animeatsume.utils.http.Requests;
+import org.animeatsume.utils.regex.RegexUtils;
 import org.jsoup.Jsoup;
 import org.jsoup.nodes.Document;
 import org.jsoup.nodes.Element;

server/src/main/java/org/animeatsume/api/service/KissanimeRuService.java → server/src/main/java/org/animeatsume/service/KissanimeRuService.java

@@ -1,21 +1,21 @@
-package org.animeatsume.api.service;
+package org.animeatsume.service;
 
 import io.webfolder.ui4j.api.browser.BrowserEngine;
 import io.webfolder.ui4j.api.browser.BrowserFactory;
 import io.webfolder.ui4j.api.browser.Page;
 import io.webfolder.ui4j.api.browser.PageConfiguration;
 import lombok.extern.log4j.Log4j2;
-import org.animeatsume.api.model.Anchor;
-import org.animeatsume.api.model.kissanime.CaptchaAttempt;
-import org.animeatsume.api.model.TitleSearchRequest;
-import org.animeatsume.api.model.TitlesAndEpisodes;
-import org.animeatsume.api.model.kissanime.KissanimeVideoHostResponse;
-import org.animeatsume.api.utils.ObjectUtils;
-import org.animeatsume.api.utils.AppProxy;
-import org.animeatsume.api.utils.http.Requests;
-import org.animeatsume.api.utils.regex.HtmlParser;
-import org.animeatsume.api.utils.regex.RegexUtils;
-import org.animeatsume.api.utils.ui4j.PageUtils;
+import org.animeatsume.model.Anchor;
+import org.animeatsume.model.kissanime.CaptchaAttempt;
+import org.animeatsume.model.TitleSearchRequest;
+import org.animeatsume.model.TitlesAndEpisodes;
+import org.animeatsume.model.kissanime.KissanimeVideoHostResponse;
+import org.animeatsume.utils.ObjectUtils;
+import org.animeatsume.utils.AppProxy;
+import org.animeatsume.utils.http.Requests;
+import org.animeatsume.utils.regex.HtmlParser;
+import org.animeatsume.utils.regex.RegexUtils;
+import org.animeatsume.utils.ui4j.PageUtils;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.core.io.Resource;
 import org.springframework.http.HttpEntity;

server/src/main/java/org/animeatsume/api/service/NineAnimeService.java → server/src/main/java/org/animeatsume/service/NineAnimeService.java

@@ -1,17 +1,17 @@
-package org.animeatsume.api.service;
+package org.animeatsume.service;
 
 import lombok.extern.log4j.Log4j2;
-import org.animeatsume.api.model.Anchor;
-import org.animeatsume.api.model.TitlesAndEpisodes;
-import org.animeatsume.api.model.TitlesAndEpisodes.EpisodesForTitle;
-import org.animeatsume.api.model.VideoSearchResult;
-import org.animeatsume.api.model.nineanime.NineAnimeEpisodeHostResponse;
-import org.animeatsume.api.model.nineanime.NineAnimeSearchResponse;
-import org.animeatsume.api.utils.ObjectUtils;
-import org.animeatsume.api.utils.SeleniumService;
-import org.animeatsume.api.utils.http.CorsProxy;
-import org.animeatsume.api.utils.http.UriParser;
-import org.animeatsume.api.utils.regex.RegexUtils;
+import org.animeatsume.model.Anchor;
+import org.animeatsume.model.TitlesAndEpisodes;
+import org.animeatsume.model.TitlesAndEpisodes.EpisodesForTitle;
+import org.animeatsume.model.VideoSearchResult;
+import org.animeatsume.model.nineanime.NineAnimeEpisodeHostResponse;
+import org.animeatsume.model.nineanime.NineAnimeSearchResponse;
+import org.animeatsume.utils.ObjectUtils;
+import org.animeatsume.utils.SeleniumService;
+import org.animeatsume.utils.http.CorsProxy;
+import org.animeatsume.utils.http.UriParser;
+import org.animeatsume.utils.regex.RegexUtils;
 import org.jsoup.Jsoup;
 import org.jsoup.nodes.Document;
 import org.jsoup.nodes.Element;

server/src/main/java/org/animeatsume/api/service/NovelPlanetService.java → server/src/main/java/org/animeatsume/service/NovelPlanetService.java

@@ -1,11 +1,11 @@
-package org.animeatsume.api.service;
+package org.animeatsume.service;
 
 import lombok.extern.log4j.Log4j2;
-import org.animeatsume.api.model.kissanime.NovelPlanetSourceResponse;
-import org.animeatsume.api.utils.http.Cookies;
-import org.animeatsume.api.utils.http.CorsProxy;
-import org.animeatsume.api.utils.http.Requests;
-import org.animeatsume.api.utils.http.UriParser;
+import org.animeatsume.model.kissanime.NovelPlanetSourceResponse;
+import org.animeatsume.utils.http.Cookies;
+import org.animeatsume.utils.http.CorsProxy;
+import org.animeatsume.utils.http.Requests;
+import org.animeatsume.utils.http.UriParser;
 import org.springframework.http.*;
 import org.springframework.scheduling.annotation.Async;
 import org.springframework.stereotype.Service;

server/src/main/java/org/animeatsume/api/service/VideoFileService.java → server/src/main/java/org/animeatsume/service/VideoFileService.java

@@ -1,7 +1,7 @@
-package org.animeatsume.api.service;
+package org.animeatsume.service;
 
 import lombok.extern.log4j.Log4j2;
-import org.animeatsume.api.utils.http.Requests;
+import org.animeatsume.utils.http.Requests;
 import org.springframework.http.*;
 import org.springframework.scheduling.annotation.Async;
 import org.springframework.stereotype.Service;