Skip to content

Commit b09b5ab

Browse files
authored
Merge pull request #197 from zzh1991/springboot3
support spring boot 3
2 parents 5b9a94b + b0befc6 commit b09b5ab

File tree

5 files changed

+30
-86
lines changed

5 files changed

+30
-86
lines changed

pom.xml

Lines changed: 10 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -10,21 +10,21 @@
1010
<parent>
1111
<groupId>org.springframework.boot</groupId>
1212
<artifactId>spring-boot-starter-parent</artifactId>
13-
<version>2.7.5</version>
13+
<version>3.1.3</version>
1414
<relativePath/>
1515
</parent>
1616

1717
<properties>
18-
<java.version>1.8</java.version>
18+
<java.version>17</java.version>
1919
<guava.version>32.0.1-jre</guava.version>
20-
<swagger.version>3.0.0</swagger.version>
2120
<mybatis-plus-boot-starter.version>3.5.3.1</mybatis-plus-boot-starter.version>
2221
<graphql-spring-boot-starter.version>11.1.0</graphql-spring-boot-starter.version>
2322
<graphql-java-tools.version>11.1.2</graphql-java-tools.version>
2423
<jsoup.version>1.16.1</jsoup.version>
2524
<compileflow.version>1.1.0</compileflow.version>
2625
<org.mapstruct.version>1.5.5.Final</org.mapstruct.version>
2726
<druid.version>1.2.18</druid.version>
27+
<openapi.version>2.2.0</openapi.version>
2828

2929
<graphql-java-extended-scalars.version>17.0</graphql-java-extended-scalars.version>
3030
<spring-cloud-commons.version>3.1.3</spring-cloud-commons.version>
@@ -37,6 +37,13 @@
3737
</properties>
3838

3939
<dependencies>
40+
<dependency>
41+
<groupId>org.springdoc</groupId>
42+
<artifactId>springdoc-openapi-starter-webmvc-ui</artifactId>
43+
<version>${openapi.version}</version>
44+
</dependency>
45+
46+
4047
<dependency>
4148
<groupId>org.springframework.boot</groupId>
4249
<artifactId>spring-boot-starter-test</artifactId>
@@ -76,12 +83,6 @@
7683
<version>${guava.version}</version>
7784
</dependency>
7885

79-
<dependency>
80-
<groupId>io.springfox</groupId>
81-
<artifactId>springfox-boot-starter</artifactId>
82-
<version>${swagger.version}</version>
83-
</dependency>
84-
8586
<dependency>
8687
<groupId>org.flywaydb</groupId>
8788
<artifactId>flyway-core</artifactId>

src/main/java/com/zzhpro/movie/SwaggerConfig.java

Lines changed: 0 additions & 67 deletions
This file was deleted.

src/main/java/com/zzhpro/movie/controller/MovieController.java

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,10 @@
2222
public class MovieController {
2323
private MovieService movieService;
2424

25+
/**
26+
* get recent movies
27+
* @return
28+
*/
2529
@GetMapping("movie/recent")
2630
public List<Film> getRecentMovie() {
2731
return movieService.getMoviesByMovieTypeEnum(MovieTypeEnum.RECENT);

src/main/java/com/zzhpro/movie/entity/Film.java

Lines changed: 14 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -5,20 +5,20 @@
55
import com.baomidou.mybatisplus.annotation.TableId;
66
import com.baomidou.mybatisplus.annotation.TableName;
77
import com.zzhpro.movie.constant.MovieTypeEnum;
8+
import jakarta.persistence.Column;
9+
import jakarta.persistence.Entity;
10+
import jakarta.persistence.EnumType;
11+
import jakarta.persistence.Enumerated;
12+
import jakarta.persistence.GeneratedValue;
13+
import jakarta.persistence.GenerationType;
14+
import jakarta.persistence.Id;
15+
import jakarta.persistence.Table;
816
import lombok.AllArgsConstructor;
917
import lombok.Builder;
1018
import lombok.Data;
1119
import lombok.NoArgsConstructor;
1220
import org.apache.commons.lang3.StringUtils;
1321

14-
import javax.persistence.Column;
15-
import javax.persistence.Entity;
16-
import javax.persistence.EnumType;
17-
import javax.persistence.Enumerated;
18-
import javax.persistence.GeneratedValue;
19-
import javax.persistence.GenerationType;
20-
import javax.persistence.Id;
21-
import javax.persistence.Table;
2222
import java.io.Serializable;
2323
import java.time.LocalDateTime;
2424
import java.util.Objects;
@@ -42,7 +42,13 @@ public class Film implements Serializable {
4242
@GeneratedValue(strategy = GenerationType.IDENTITY)
4343
@TableId(type = IdType.AUTO)
4444
private Long id;
45+
/**
46+
* movie id
47+
*/
4548
private Long movieId;
49+
/**
50+
* movie title
51+
*/
4652
private String title;
4753
private double rating;
4854
private int movieYear;

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -117,7 +117,7 @@ private Film getFilmDetailFromUrl(String url) {
117117
Document document = Jsoup.parse(new URL(url), 30000);
118118
String summary = null;
119119
String genres = null;
120-
Element summaryElement = document.getElementById("link-report");
120+
Element summaryElement = document.getElementById("link-report-intra");
121121
if (Objects.nonNull(summaryElement)) {
122122
Elements summaryElements = summaryElement.getElementsByTag("span");
123123
summary = StringUtils.strip(summaryElements.get(0).text());
@@ -151,7 +151,7 @@ private Film getTopFilmDetailFromUrl(String url) {
151151
Document document = Jsoup.parse(new URL(url), 30000);
152152
String summary = null;
153153
String genres;
154-
Element summaryElement = document.getElementById("link-report");
154+
Element summaryElement = document.getElementById("link-report-intra");
155155
if (Objects.nonNull(summaryElement)) {
156156
Elements summaryElements = summaryElement.getElementsByTag("span");
157157
summary = StringUtils.strip(summaryElements.get(0).text());

0 commit comments

Comments
 (0)