From 1c968f69c2d5fbb1cac13c4dfeb97f2628f06b23 Mon Sep 17 00:00:00 2001 From: jhouse Date: Mon, 23 Dec 2019 16:12:15 +0900 Subject: [PATCH] Cleaning up code --- .../java/com/jasonhhouse/gaps/GapsSearch.java | 5 +- .../com/jasonhhouse/gaps/GapsService.java | 3 +- .../main/java/com/jasonhhouse/gaps/Movie.java | 4 +- .../java/com/jasonhhouse/gaps/PlexQuery.java | 3 +- .../com/jasonhhouse/gaps/GapsApplication.java | 5 +- .../jasonhhouse/gaps/PlexSearchEditor.java | 3 +- .../jasonhhouse/gaps/PlexSearchFormatter.java | 5 +- .../gaps/controller/GapsController.java | 3 - .../PlexConfigurationController.java | 7 +-- .../controller/PlexLibrariesController.java | 11 ++-- .../controller/PlexMovieListController.java | 7 ++- .../gaps/controller/RSSController.java | 4 -- .../controller/RecommendedController.java | 2 - .../gaps/controller/SearchController.java | 4 +- .../gaps/service/GapsSearchService.java | 59 ++++++------------- .../gaps/service/GapsServiceImpl.java | 3 +- .../jasonhhouse/gaps/service/IoService.java | 12 ++-- .../gaps/service/PlexQueryImpl.java | 27 +++++---- 18 files changed, 68 insertions(+), 99 deletions(-) diff --git a/Core/src/main/java/com/jasonhhouse/gaps/GapsSearch.java b/Core/src/main/java/com/jasonhhouse/gaps/GapsSearch.java index db56cce..8f2801b 100644 --- a/Core/src/main/java/com/jasonhhouse/gaps/GapsSearch.java +++ b/Core/src/main/java/com/jasonhhouse/gaps/GapsSearch.java @@ -8,12 +8,9 @@ package com.jasonhhouse.gaps;/* * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ -import java.util.List; -import okhttp3.HttpUrl; import org.jetbrains.annotations.NotNull; -import java.util.Set; -import java.util.concurrent.CompletableFuture; +import java.util.List; import java.util.concurrent.CopyOnWriteArrayList; public interface GapsSearch { diff --git a/Core/src/main/java/com/jasonhhouse/gaps/GapsService.java b/Core/src/main/java/com/jasonhhouse/gaps/GapsService.java index e2ac6dc..0624ae3 100644 --- a/Core/src/main/java/com/jasonhhouse/gaps/GapsService.java +++ b/Core/src/main/java/com/jasonhhouse/gaps/GapsService.java @@ -1,8 +1,9 @@ package com.jasonhhouse.gaps; -import java.util.List; import org.jetbrains.annotations.NotNull; +import java.util.List; + public interface GapsService { PlexSearch getPlexSearch(); diff --git a/Core/src/main/java/com/jasonhhouse/gaps/Movie.java b/Core/src/main/java/com/jasonhhouse/gaps/Movie.java index 68cbe10..1f9dd26 100644 --- a/Core/src/main/java/com/jasonhhouse/gaps/Movie.java +++ b/Core/src/main/java/com/jasonhhouse/gaps/Movie.java @@ -8,12 +8,12 @@ package com.jasonhhouse.gaps;/* * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ -import java.util.Objects; import org.apache.commons.lang3.StringUtils; -import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; import org.json.JSONObject; +import java.util.Objects; + public final class Movie implements Comparable, Jsonify { public static final String TVDB_ID = "tvdbId"; diff --git a/Core/src/main/java/com/jasonhhouse/gaps/PlexQuery.java b/Core/src/main/java/com/jasonhhouse/gaps/PlexQuery.java index e268330..ff09948 100644 --- a/Core/src/main/java/com/jasonhhouse/gaps/PlexQuery.java +++ b/Core/src/main/java/com/jasonhhouse/gaps/PlexQuery.java @@ -1,8 +1,9 @@ package com.jasonhhouse.gaps; -import java.util.List; import org.jetbrains.annotations.NotNull; +import java.util.List; + public interface PlexQuery { @NotNull List getLibraries(@NotNull PlexSearch plexSearch); diff --git a/GapsWeb/src/main/java/com/jasonhhouse/gaps/GapsApplication.java b/GapsWeb/src/main/java/com/jasonhhouse/gaps/GapsApplication.java index 19d936a..be67121 100644 --- a/GapsWeb/src/main/java/com/jasonhhouse/gaps/GapsApplication.java +++ b/GapsWeb/src/main/java/com/jasonhhouse/gaps/GapsApplication.java @@ -11,10 +11,8 @@ package com.jasonhhouse.gaps; import com.jasonhhouse.gaps.service.GapsServiceImpl; -import java.util.concurrent.Executor; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import org.springframework.beans.factory.annotation.Qualifier; import org.springframework.boot.SpringApplication; import org.springframework.boot.autoconfigure.SpringBootApplication; import org.springframework.context.annotation.Bean; @@ -25,7 +23,8 @@ import org.springframework.format.FormatterRegistry; import org.springframework.scheduling.annotation.EnableAsync; import org.springframework.scheduling.concurrent.ThreadPoolTaskExecutor; import org.springframework.web.servlet.config.annotation.WebMvcConfigurer; -import org.springframework.web.servlet.config.annotation.WebMvcConfigurerAdapter; + +import java.util.concurrent.Executor; /** * Search for all missing movies in your plex collection by MovieDB collection. diff --git a/GapsWeb/src/main/java/com/jasonhhouse/gaps/PlexSearchEditor.java b/GapsWeb/src/main/java/com/jasonhhouse/gaps/PlexSearchEditor.java index 226df94..4b182ac 100644 --- a/GapsWeb/src/main/java/com/jasonhhouse/gaps/PlexSearchEditor.java +++ b/GapsWeb/src/main/java/com/jasonhhouse/gaps/PlexSearchEditor.java @@ -2,10 +2,11 @@ package com.jasonhhouse.gaps; import com.fasterxml.jackson.core.JsonProcessingException; import com.fasterxml.jackson.databind.ObjectMapper; -import java.beans.PropertyEditorSupport; import org.slf4j.Logger; import org.slf4j.LoggerFactory; +import java.beans.PropertyEditorSupport; + public class PlexSearchEditor extends PropertyEditorSupport { private static final Logger LOGGER = LoggerFactory.getLogger(PropertyEditorSupport.class); diff --git a/GapsWeb/src/main/java/com/jasonhhouse/gaps/PlexSearchFormatter.java b/GapsWeb/src/main/java/com/jasonhhouse/gaps/PlexSearchFormatter.java index ba68454..9006268 100644 --- a/GapsWeb/src/main/java/com/jasonhhouse/gaps/PlexSearchFormatter.java +++ b/GapsWeb/src/main/java/com/jasonhhouse/gaps/PlexSearchFormatter.java @@ -2,13 +2,14 @@ package com.jasonhhouse.gaps; import com.fasterxml.jackson.core.JsonProcessingException; import com.fasterxml.jackson.databind.ObjectMapper; -import java.text.ParseException; -import java.util.Locale; import org.jetbrains.annotations.NotNull; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.format.Formatter; +import java.text.ParseException; +import java.util.Locale; + public class PlexSearchFormatter implements Formatter { private static final Logger LOGGER = LoggerFactory.getLogger(PlexSearchFormatter.class); diff --git a/GapsWeb/src/main/java/com/jasonhhouse/gaps/controller/GapsController.java b/GapsWeb/src/main/java/com/jasonhhouse/gaps/controller/GapsController.java index 9d1074e..5cce162 100644 --- a/GapsWeb/src/main/java/com/jasonhhouse/gaps/controller/GapsController.java +++ b/GapsWeb/src/main/java/com/jasonhhouse/gaps/controller/GapsController.java @@ -1,9 +1,6 @@ package com.jasonhhouse.gaps.controller; import com.jasonhhouse.gaps.GapsService; -import com.jasonhhouse.gaps.PlexSearchEditor; -import com.jasonhhouse.gaps.PlexSearch; -import com.jasonhhouse.gaps.PlexSearchFormatter; import com.jasonhhouse.gaps.PlexSearchValidator; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/GapsWeb/src/main/java/com/jasonhhouse/gaps/controller/PlexConfigurationController.java b/GapsWeb/src/main/java/com/jasonhhouse/gaps/controller/PlexConfigurationController.java index 017e4fc..2c92ad6 100644 --- a/GapsWeb/src/main/java/com/jasonhhouse/gaps/controller/PlexConfigurationController.java +++ b/GapsWeb/src/main/java/com/jasonhhouse/gaps/controller/PlexConfigurationController.java @@ -1,12 +1,9 @@ package com.jasonhhouse.gaps.controller; import com.jasonhhouse.gaps.GapsService; -import com.jasonhhouse.gaps.PlexSearchEditor; -import com.jasonhhouse.gaps.PlexSearchFormatter; -import com.jasonhhouse.gaps.PlexSearchValidator; import com.jasonhhouse.gaps.PlexSearch; +import com.jasonhhouse.gaps.PlexSearchFormatter; import com.jasonhhouse.gaps.service.BindingErrorsService; -import javax.validation.Valid; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; @@ -20,6 +17,8 @@ import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RequestMethod; import org.springframework.web.servlet.ModelAndView; +import javax.validation.Valid; + @Controller @RequestMapping(value = "/plexConfiguration") public class PlexConfigurationController { diff --git a/GapsWeb/src/main/java/com/jasonhhouse/gaps/controller/PlexLibrariesController.java b/GapsWeb/src/main/java/com/jasonhhouse/gaps/controller/PlexLibrariesController.java index 242e7b6..d884f1b 100644 --- a/GapsWeb/src/main/java/com/jasonhhouse/gaps/controller/PlexLibrariesController.java +++ b/GapsWeb/src/main/java/com/jasonhhouse/gaps/controller/PlexLibrariesController.java @@ -1,13 +1,7 @@ package com.jasonhhouse.gaps.controller; -import com.jasonhhouse.gaps.GapsService; -import com.jasonhhouse.gaps.PlexLibrary; -import com.jasonhhouse.gaps.PlexSearch; -import com.jasonhhouse.gaps.PlexSearchFormatter; -import com.jasonhhouse.gaps.PlexQuery; +import com.jasonhhouse.gaps.*; import com.jasonhhouse.gaps.service.BindingErrorsService; -import java.util.List; -import javax.validation.Valid; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; @@ -21,6 +15,9 @@ import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RequestMethod; import org.springframework.web.servlet.ModelAndView; +import javax.validation.Valid; +import java.util.List; + @Controller @RequestMapping(value = "/plexLibraries") public class PlexLibrariesController { diff --git a/GapsWeb/src/main/java/com/jasonhhouse/gaps/controller/PlexMovieListController.java b/GapsWeb/src/main/java/com/jasonhhouse/gaps/controller/PlexMovieListController.java index be04943..86e36e9 100644 --- a/GapsWeb/src/main/java/com/jasonhhouse/gaps/controller/PlexMovieListController.java +++ b/GapsWeb/src/main/java/com/jasonhhouse/gaps/controller/PlexMovieListController.java @@ -2,11 +2,9 @@ package com.jasonhhouse.gaps.controller; import com.jasonhhouse.gaps.GapsService; import com.jasonhhouse.gaps.PlexLibrary; -import com.jasonhhouse.gaps.PlexSearch; import com.jasonhhouse.gaps.PlexQuery; +import com.jasonhhouse.gaps.PlexSearch; import com.jasonhhouse.gaps.service.BindingErrorsService; -import java.util.List; -import javax.validation.Valid; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; @@ -18,6 +16,9 @@ import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RequestMethod; import org.springframework.web.servlet.ModelAndView; +import javax.validation.Valid; +import java.util.List; + @Controller @RequestMapping(value = "/plexMovieList") public class PlexMovieListController { diff --git a/GapsWeb/src/main/java/com/jasonhhouse/gaps/controller/RSSController.java b/GapsWeb/src/main/java/com/jasonhhouse/gaps/controller/RSSController.java index 0d0f61a..6962036 100644 --- a/GapsWeb/src/main/java/com/jasonhhouse/gaps/controller/RSSController.java +++ b/GapsWeb/src/main/java/com/jasonhhouse/gaps/controller/RSSController.java @@ -1,12 +1,8 @@ package com.jasonhhouse.gaps.controller; import com.jasonhhouse.gaps.service.IoService; - -import java.io.IOException; - import org.apache.commons.lang3.StringUtils; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.ui.Model; import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.RestController; import org.springframework.web.servlet.ModelAndView; diff --git a/GapsWeb/src/main/java/com/jasonhhouse/gaps/controller/RecommendedController.java b/GapsWeb/src/main/java/com/jasonhhouse/gaps/controller/RecommendedController.java index 2253c84..873822f 100644 --- a/GapsWeb/src/main/java/com/jasonhhouse/gaps/controller/RecommendedController.java +++ b/GapsWeb/src/main/java/com/jasonhhouse/gaps/controller/RecommendedController.java @@ -7,8 +7,6 @@ import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.RestController; import org.springframework.web.servlet.ModelAndView; -import java.io.IOException; - @RestController public class RecommendedController { diff --git a/GapsWeb/src/main/java/com/jasonhhouse/gaps/controller/SearchController.java b/GapsWeb/src/main/java/com/jasonhhouse/gaps/controller/SearchController.java index b665d6a..0c5b786 100644 --- a/GapsWeb/src/main/java/com/jasonhhouse/gaps/controller/SearchController.java +++ b/GapsWeb/src/main/java/com/jasonhhouse/gaps/controller/SearchController.java @@ -4,7 +4,6 @@ import com.jasonhhouse.gaps.Gaps; import com.jasonhhouse.gaps.GapsSearch; import com.jasonhhouse.gaps.Movie; import com.jasonhhouse.gaps.service.IoService; -import java.util.List; import org.apache.commons.collections4.CollectionUtils; import org.apache.commons.lang3.BooleanUtils; import org.apache.commons.lang3.StringUtils; @@ -12,7 +11,6 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.http.HttpStatus; -import org.springframework.http.ResponseEntity; import org.springframework.messaging.handler.annotation.MessageMapping; import org.springframework.stereotype.Controller; import org.springframework.web.bind.annotation.RequestBody; @@ -21,6 +19,8 @@ import org.springframework.web.bind.annotation.RequestMethod; import org.springframework.web.bind.annotation.ResponseStatus; import org.springframework.web.server.ResponseStatusException; +import java.util.List; + @Controller public class SearchController { diff --git a/GapsWeb/src/main/java/com/jasonhhouse/gaps/service/GapsSearchService.java b/GapsWeb/src/main/java/com/jasonhhouse/gaps/service/GapsSearchService.java index 249707b..51a8fa0 100644 --- a/GapsWeb/src/main/java/com/jasonhhouse/gaps/service/GapsSearchService.java +++ b/GapsWeb/src/main/java/com/jasonhhouse/gaps/service/GapsSearchService.java @@ -10,45 +10,8 @@ package com.jasonhhouse.gaps.service; -import com.jasonhhouse.gaps.Gaps; -import com.jasonhhouse.gaps.GapsSearch; -import com.jasonhhouse.gaps.Movie; -import com.jasonhhouse.gaps.SearchCancelledException; -import com.jasonhhouse.gaps.SearchResults; -import com.jasonhhouse.gaps.UrlGenerator; -import java.io.ByteArrayInputStream; -import java.io.File; -import java.io.FileWriter; -import java.io.IOException; -import java.io.InputStream; -import java.io.UnsupportedEncodingException; -import java.net.URLEncoder; -import java.time.LocalDate; -import java.time.Year; -import java.time.format.DateTimeFormatter; -import java.util.ArrayList; -import java.util.Date; -import java.util.HashSet; -import java.util.List; -import java.util.Locale; -import java.util.Set; -import java.util.concurrent.CopyOnWriteArrayList; -import java.util.concurrent.TimeUnit; -import java.util.concurrent.atomic.AtomicBoolean; -import java.util.concurrent.atomic.AtomicInteger; -import javax.xml.parsers.DocumentBuilder; -import javax.xml.parsers.DocumentBuilderFactory; -import javax.xml.parsers.ParserConfigurationException; -import javax.xml.xpath.XPath; -import javax.xml.xpath.XPathConstants; -import javax.xml.xpath.XPathExpressionException; -import javax.xml.xpath.XPathFactory; -import okhttp3.HttpUrl; -import okhttp3.MediaType; -import okhttp3.OkHttpClient; -import okhttp3.Request; -import okhttp3.RequestBody; -import okhttp3.Response; +import com.jasonhhouse.gaps.*; +import okhttp3.*; import org.apache.commons.lang3.BooleanUtils; import org.apache.commons.lang3.StringUtils; import org.apache.commons.lang3.time.StopWatch; @@ -72,7 +35,23 @@ import org.w3c.dom.Node; import org.w3c.dom.NodeList; import org.xml.sax.SAXException; -import static com.jasonhhouse.gaps.service.IoService.RSS_FEED_JSON_FILE; +import javax.xml.parsers.DocumentBuilder; +import javax.xml.parsers.DocumentBuilderFactory; +import javax.xml.parsers.ParserConfigurationException; +import javax.xml.xpath.XPath; +import javax.xml.xpath.XPathConstants; +import javax.xml.xpath.XPathExpressionException; +import javax.xml.xpath.XPathFactory; +import java.io.*; +import java.net.URLEncoder; +import java.time.LocalDate; +import java.time.Year; +import java.time.format.DateTimeFormatter; +import java.util.*; +import java.util.concurrent.CopyOnWriteArrayList; +import java.util.concurrent.TimeUnit; +import java.util.concurrent.atomic.AtomicBoolean; +import java.util.concurrent.atomic.AtomicInteger; @Service public class GapsSearchService implements GapsSearch { diff --git a/GapsWeb/src/main/java/com/jasonhhouse/gaps/service/GapsServiceImpl.java b/GapsWeb/src/main/java/com/jasonhhouse/gaps/service/GapsServiceImpl.java index 6961486..e31c3f4 100644 --- a/GapsWeb/src/main/java/com/jasonhhouse/gaps/service/GapsServiceImpl.java +++ b/GapsWeb/src/main/java/com/jasonhhouse/gaps/service/GapsServiceImpl.java @@ -3,11 +3,12 @@ package com.jasonhhouse.gaps.service; import com.jasonhhouse.gaps.GapsService; import com.jasonhhouse.gaps.PlexLibrary; import com.jasonhhouse.gaps.PlexSearch; -import java.util.List; import org.apache.commons.lang3.StringUtils; import org.jetbrains.annotations.NotNull; import org.springframework.stereotype.Service; +import java.util.List; + @Service public class GapsServiceImpl implements GapsService { diff --git a/GapsWeb/src/main/java/com/jasonhhouse/gaps/service/IoService.java b/GapsWeb/src/main/java/com/jasonhhouse/gaps/service/IoService.java index 0bb600f..4256135 100644 --- a/GapsWeb/src/main/java/com/jasonhhouse/gaps/service/IoService.java +++ b/GapsWeb/src/main/java/com/jasonhhouse/gaps/service/IoService.java @@ -2,12 +2,6 @@ package com.jasonhhouse.gaps.service; import com.fasterxml.jackson.databind.ObjectMapper; import com.jasonhhouse.gaps.Movie; - -import java.io.*; -import java.nio.file.Files; -import java.nio.file.Path; -import java.util.ArrayList; -import java.util.List; import org.jetbrains.annotations.NotNull; import org.json.JSONArray; import org.json.JSONException; @@ -16,6 +10,12 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.stereotype.Service; +import java.io.*; +import java.nio.file.Files; +import java.nio.file.Path; +import java.util.ArrayList; +import java.util.List; + @Service public class IoService { diff --git a/GapsWeb/src/main/java/com/jasonhhouse/gaps/service/PlexQueryImpl.java b/GapsWeb/src/main/java/com/jasonhhouse/gaps/service/PlexQueryImpl.java index d5d3331..8dc1065 100644 --- a/GapsWeb/src/main/java/com/jasonhhouse/gaps/service/PlexQueryImpl.java +++ b/GapsWeb/src/main/java/com/jasonhhouse/gaps/service/PlexQueryImpl.java @@ -1,20 +1,8 @@ package com.jasonhhouse.gaps.service; import com.jasonhhouse.gaps.PlexLibrary; -import com.jasonhhouse.gaps.PlexSearch; import com.jasonhhouse.gaps.PlexQuery; -import java.io.ByteArrayInputStream; -import java.io.IOException; -import java.io.InputStream; -import java.util.ArrayList; -import java.util.List; -import javax.xml.parsers.DocumentBuilder; -import javax.xml.parsers.DocumentBuilderFactory; -import javax.xml.parsers.ParserConfigurationException; -import javax.xml.xpath.XPath; -import javax.xml.xpath.XPathConstants; -import javax.xml.xpath.XPathExpressionException; -import javax.xml.xpath.XPathFactory; +import com.jasonhhouse.gaps.PlexSearch; import okhttp3.HttpUrl; import okhttp3.OkHttpClient; import okhttp3.Request; @@ -32,6 +20,19 @@ import org.w3c.dom.Node; import org.w3c.dom.NodeList; import org.xml.sax.SAXException; +import javax.xml.parsers.DocumentBuilder; +import javax.xml.parsers.DocumentBuilderFactory; +import javax.xml.parsers.ParserConfigurationException; +import javax.xml.xpath.XPath; +import javax.xml.xpath.XPathConstants; +import javax.xml.xpath.XPathExpressionException; +import javax.xml.xpath.XPathFactory; +import java.io.ByteArrayInputStream; +import java.io.IOException; +import java.io.InputStream; +import java.util.ArrayList; +import java.util.List; + @Service public class PlexQueryImpl implements PlexQuery {