Skip to content

Commit 5a230e1

Browse files
committed
optimize code
1 parent d0ba04e commit 5a230e1

File tree

7 files changed

+18
-14
lines changed

7 files changed

+18
-14
lines changed

src/main/java/com/zzhpro/movie/service/MovieService.java

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -117,6 +117,8 @@ private void saveDetailToMovie(MovieTypeEnum movieTypeEnum) {
117117
try {
118118
boolean fetchStatus = future.get();
119119
log.warn("update summary success: {}", fetchStatus);
120+
} catch (InterruptedException e) {
121+
Thread.currentThread().interrupt();
120122
} catch (Exception e) {
121123
log.error("get movie summary error", e);
122124
}

src/main/java/com/zzhpro/movie/service/db/PageDataService.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -49,10 +49,10 @@ public Page<Film> getFilmBySearchText(String searchText, Pageable pageable) {
4949
Specification<Film> specification = null;
5050
if (!specificationList.isEmpty()) {
5151
specification = Specification.where(specificationList.get(0));
52-
}
5352

54-
for (int i = 1; i < specificationList.size(); i++) {
55-
specification = specification.or(specificationList.get(i));
53+
for (int i = 1; i < specificationList.size(); i++) {
54+
specification = specification.or(specificationList.get(i));
55+
}
5656
}
5757

5858
return filmRepository.findAll(specification, pageable);

src/main/java/com/zzhpro/movie/util/ConstantUtils.java

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,5 +6,7 @@
66
* @since 3/8/20
77
*/
88
public final class ConstantUtils {
9+
10+
private ConstantUtils() { }
911
public static final String SEPARATOR = ",";
1012
}

src/test/java/com/zzhpro/movie/dao/FilmRepositoryTest.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -32,22 +32,22 @@ void findFirstByMovieId() {
3232
@Sql(scripts = { "/test-film-data.sql" })
3333
void findByMovieIdIsIn() {
3434
List<Film> filmList = filmRepository.findByMovieIdIsIn(Lists.newArrayList(MOVIE_ID));
35-
assertThat(filmList.size()).isEqualTo(1);
35+
assertThat(filmList).hasSize(1);
3636
}
3737

3838
@Transactional
3939
@Test
4040
@Sql(scripts = { "/test-film-data.sql" })
4141
void findAllByOrderByMovieYearDescRatingDesc() {
4242
List<Film> filmList = filmRepository.findAllByOrderByMovieYearDescRatingDesc();
43-
assertThat(filmList.isEmpty()).isFalse();
43+
assertThat(filmList).isNotEmpty();
4444
}
4545

4646
@Transactional
4747
@Test
4848
@Sql(scripts = { "/test-film-data.sql" })
4949
void findByMovieTypeEnumOrderByRatingDesc() {
5050
List<Film> filmList = filmRepository.findByMovieTypeEnumOrderByRatingDesc(MovieTypeEnum.TOP);
51-
assertThat(filmList.isEmpty()).isFalse();
51+
assertThat(filmList).isNotEmpty();
5252
}
5353
}

src/test/java/com/zzhpro/movie/mapper/FilmMapperTest.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ void listAllFilms() {
2626
.orderByDesc(Film::getMovieYear)
2727
.orderByDesc(Film::getRating)
2828
);
29-
assertThat(filmList.isEmpty()).isFalse();
29+
assertThat(filmList).isNotEmpty();
3030
}
3131

3232
@Transactional
@@ -37,6 +37,6 @@ void listFilmsByMovieTypeEnum() {
3737
.eq(Film::getMovieTypeEnum, MovieTypeEnum.TOP)
3838
.orderByDesc(Film::getRating)
3939
);
40-
assertThat(filmList.isEmpty()).isFalse();
40+
assertThat(filmList).isNotEmpty();
4141
}
4242
}

src/test/java/com/zzhpro/movie/service/MovieServiceTest.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -47,13 +47,13 @@ void findByMovieId() {
4747
void getMoviesByMovieTypeEnum() {
4848
when(dataService.listFilmsByMovieTypeEnum(MovieTypeEnum.TOP)).thenReturn(FILM_LIST);
4949
List<Film> filmList = movieService.getMoviesByMovieTypeEnum(MovieTypeEnum.TOP);
50-
assertThat(filmList.size()).isEqualTo(FILM_LIST.size());
50+
assertThat(filmList).hasSameSizeAs(FILM_LIST);
5151
}
5252

5353
@Test
5454
void getAllMovies() {
5555
when(dataService.listAllFilms()).thenReturn(FILM_LIST);
5656
List<Film> filmList = movieService.getAllMovies();
57-
assertThat(filmList.size()).isEqualTo(FILM_LIST.size());
57+
assertThat(filmList).hasSameSizeAs(FILM_LIST);
5858
}
5959
}

src/test/java/com/zzhpro/movie/service/db/DataServiceTest.java

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -33,31 +33,31 @@ void findByMovieId() {
3333
@Sql(scripts = { "/test-film-data.sql" })
3434
void findByMovieIds() {
3535
List<Film> filmList = dataService.findByMovieIds(Lists.newArrayList(MOVIE_ID));
36-
assertThat(filmList.size()).isEqualTo(1);
36+
assertThat(filmList).hasSize(1);
3737
}
3838

3939
@Transactional
4040
@Test
4141
@Sql(scripts = { "/test-film-data.sql" })
4242
void findByMovieTypeEnum() {
4343
List<Film> filmList = dataService.findByMovieTypeEnum(MovieTypeEnum.TOP);
44-
assertThat(filmList.isEmpty()).isFalse();
44+
assertThat(filmList).isNotEmpty();
4545
}
4646

4747
@Transactional
4848
@Test
4949
@Sql(scripts = { "/test-film-data.sql" })
5050
void listFilmsByMovieTypeEnum() {
5151
List<Film> filmList = dataService.findByMovieTypeEnum(MovieTypeEnum.TOP);
52-
assertThat(filmList.isEmpty()).isFalse();
52+
assertThat(filmList).isNotEmpty();
5353
}
5454

5555
@Transactional
5656
@Test
5757
@Sql(scripts = { "/test-film-data.sql" })
5858
void listAllFilms() {
5959
List<Film> filmList = dataService.listAllFilms();
60-
assertThat(filmList.isEmpty()).isFalse();
60+
assertThat(filmList).isNotEmpty();
6161
}
6262

6363
@Transactional

0 commit comments

Comments
 (0)