optimize code

Author: zzh1991

.gitignore

@@ -5,6 +5,7 @@ node_modules
 .vscode
 .mvn
 .DS_Store
+src/test/java/app/util
 src/.DS_Store
 src/main/.DS_Store
 src/main/resources/.DS_Store
@@ -17,5 +18,3 @@ yarn.lock
 package-lock.json
 movie-helper.iml
 movie-helper-front
-
-src/test/java/app/util

src/main/java/app/constant/MovieTypeEnum.java

@@ -2,10 +2,15 @@
 
 /**
  * @author zhihao zhang
- * Date: 2018-10-27
+ * @since 2018-10-27
  */
 
 public enum MovieTypeEnum {
+    /**
+     * NORMAL: normal movies
+     * RECENT: recent movies
+     * TOP: top movies
+     */
     NORMAL,
     RECENT,
     TOP

src/main/java/app/service/MovieService.java

@@ -5,14 +5,10 @@
 import app.entity.Film;
 import app.service.db.DataService;
 import app.util.JsoupUtils;
-import app.vo.movie.Movie;
 import app.vo.movie.MovieSubject;
-import app.vo.movie.MovieVo;
-import com.fasterxml.jackson.annotation.JsonInclude;
 import com.fasterxml.jackson.databind.ObjectMapper;
 import com.fasterxml.jackson.databind.type.TypeFactory;
 import com.google.common.base.Strings;
-import com.google.common.collect.ImmutableMap;
 import com.google.common.collect.Lists;
 import lombok.AllArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
@@ -26,7 +22,6 @@
 
 import java.io.IOException;
 import java.util.List;
-import java.util.Map;
 import java.util.Objects;
 import java.util.concurrent.CompletableFuture;
 import java.util.concurrent.ExecutorService;
@@ -47,11 +42,6 @@ public class MovieService {
     private static final String DOUBAN_URL = "https://douban.uieee.com";
     private static final ObjectMapper MAPPER = new ObjectMapper();
 
-    private static final Map<MovieTypeEnum, String> URL_MAP = ImmutableMap.of(
-            MovieTypeEnum.RECENT, DOUBAN_URL.concat("/v2/movie/in_theaters?city=上海"),
-            MovieTypeEnum.TOP, DOUBAN_URL.concat("/v2/movie/top250?start=0&count=100")
-    );
-
     private static final OkHttpClient HTTP_CLIENT = new OkHttpClient();
     private static final ExecutorService executorService =
             new ThreadPoolExecutor(2, 2, 60, TimeUnit.SECONDS,
@@ -148,18 +138,6 @@ private void saveMovie(MovieTypeEnum movieTypeEnum) {
         this.saveFilmList(filmList, movieTypeEnum);
     }
 
-    private List<Movie> getMoviesFromOrigin(String url) {
-        MAPPER.setSerializationInclusion(JsonInclude.Include.NON_NULL);
-        try {
-            MovieVo movieVo = MAPPER.readValue(getUrlContent(url),
-                    TypeFactory.defaultInstance().constructType(MovieVo.class));
-            return movieVo.getSubjects();
-        } catch (Exception e) {
-            log.error("failed to get movie info by {}", url, e);
-            return Lists.newArrayList();
-        }
-    }
-
     private String getUrlContent(String url) throws IOException {
         Request request = new Request.Builder()
                 .url(url)

src/main/java/app/util/ConstantUtils.java

@@ -1,13 +1,14 @@
 package app.util;
 
+import lombok.experimental.UtilityClass;
+
 /**
  * @author zhihao zhang
  * @since 3/8/20
  */
 
-public final class ConstantUtils {
-    public static final String LARGE = "large";
-    public static final String SEPARATOR = ",";
-
-    private ConstantUtils() { }
+@UtilityClass
+public class ConstantUtils {
+    public final String LARGE = "large";
+    public final String SEPARATOR = ",";
 }

src/main/java/app/util/JsoupUtils.java

@@ -3,6 +3,7 @@
 import app.constant.MovieTypeEnum;
 import app.entity.Film;
 import com.google.common.collect.Lists;
+import lombok.experimental.UtilityClass;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang3.StringUtils;
 import org.jsoup.Jsoup;
@@ -25,16 +26,15 @@
  */
 
 @Slf4j
+@UtilityClass
 public final class JsoupUtils {
-    private static final String NOWPLAYING = "nowplaying";
-    private static final String RECENT_URL = "https://movie.douban.com/cinema/nowplaying/shanghai/";
-    private static final String DOUBAN_URL = "https://movie.douban.com/subject/";
-    private static final String TOP_DOUBAN_URL = "https://movie.douban.com/top250?start=";
-    private static final String PROPERTY = "property";
+    private final String NOWPLAYING = "nowplaying";
+    private final String RECENT_URL = "https://movie.douban.com/cinema/nowplaying/shanghai/";
+    private final String DOUBAN_URL = "https://movie.douban.com/subject/";
+    private final String TOP_DOUBAN_URL = "https://movie.douban.com/top250?start=";
+    private final String PROPERTY = "property";
 
-    private JsoupUtils() {}
-
-    public static List<Film> getFilmListFromDouban() {
+    public List<Film> getFilmListFromDouban() {
         List<Film> filmList = Lists.newArrayList();
         LocalDateTime updateTime = LocalDateTime.now();
 
@@ -61,7 +61,7 @@ public static List<Film> getFilmListFromDouban() {
         return filmList;
     }
 
-    public static List<Film> getTopFilmListFromDouban() {
+    public List<Film> getTopFilmListFromDouban() {
         int gap = 25;
         int n = 10;
         LocalDateTime updateTime = LocalDateTime.now();
@@ -94,7 +94,7 @@ public static List<Film> getTopFilmListFromDouban() {
         return filmList;
     }
 
-    public static Film getFilmDetailByMovieTypeAndUrl(MovieTypeEnum movieTypeEnum, String url) {
+    public Film getFilmDetailByMovieTypeAndUrl(MovieTypeEnum movieTypeEnum, String url) {
         if (MovieTypeEnum.RECENT.equals(movieTypeEnum)) {
             return getFilmDetailFromUrl(url);
         } else if (MovieTypeEnum.TOP.equals(movieTypeEnum)) {
@@ -103,7 +103,7 @@ public static Film getFilmDetailByMovieTypeAndUrl(MovieTypeEnum movieTypeEnum, S
         return null;
     }
 
-    private static Film getFilmDetailFromUrl(String url) {
+    private Film getFilmDetailFromUrl(String url) {
         if (StringUtils.isBlank(url)) {
             return null;
         }
@@ -130,7 +130,7 @@ private static Film getFilmDetailFromUrl(String url) {
         }
     }
 
-    private static Film getTopFilmDetailFromUrl(String url) {
+    private Film getTopFilmDetailFromUrl(String url) {
         if (StringUtils.isBlank(url)) {
             return null;
         }
@@ -193,7 +193,7 @@ private static Film getTopFilmDetailFromUrl(String url) {
         }
     }
 
-    private static String getImageUrl(Element item) {
+    private String getImageUrl(Element item) {
         Elements img = item.getElementsByTag("img");
         String url = "";
         try {
@@ -204,7 +204,7 @@ private static String getImageUrl(Element item) {
         return url;
     }
 
-    private static String getJoinString(String text, String split) {
+    private String getJoinString(String text, String split) {
         if (StringUtils.isBlank(text)) {
             return "";
         }