Skip to content

Commit c432361

Browse files
mcpiercemcpierce
committed
Changed Spring Boot to v3.4.1 [#2116]
 * Changed okhttp to v4.12.0. * Changed httpclient5 to v5.4.1. * Added column definitions to enumerated persisted fields.
1 parent 914619f commit c432361

File tree

12 files changed

+48
-15
lines changed

12 files changed

+48
-15
lines changed

‎comixed-metadata/pom.xml‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -41,11 +41,13 @@
4141
<dependency>
4242
<groupId>com.squareup.okhttp3</groupId>
4343
<artifactId>okhttp</artifactId>
44+
<version>4.12.0</version>
4445
<scope>test</scope>
4546
</dependency>
4647
<dependency>
4748
<groupId>com.squareup.okhttp3</groupId>
4849
<artifactId>mockwebserver</artifactId>
50+
<version>4.12.0</version>
4951
<scope>test</scope>
5052
</dependency>
5153
<dependency>

‎comixed-model/src/main/java/org/comixedproject/model/comicbooks/ComicBook.java‎

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -135,7 +135,11 @@ public class ComicBook {
135135
@Setter
136136
private boolean organizing = false;
137137

138-
@Column(name = "target_archive_type", nullable = true, updatable = true)
138+
@Column(
139+
name = "target_archive_type",
140+
nullable = true,
141+
updatable = true,
142+
columnDefinition = "VARCHAR(4)")
139143
@Enumerated(EnumType.STRING)
140144
@JsonIgnore
141145
@Getter

‎comixed-model/src/main/java/org/comixedproject/model/comicbooks/ComicDetail.java‎

Lines changed: 11 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -90,7 +90,11 @@ public class ComicDetail implements PublicationDetail {
9090
@Setter
9191
private boolean missing = false;
9292

93-
@Column(name = "archive_type", nullable = false, updatable = true)
93+
@Column(
94+
name = "archive_type",
95+
nullable = false,
96+
updatable = true,
97+
columnDefinition = "VARCHAR(4)")
9498
@Enumerated(EnumType.STRING)
9599
@JsonProperty("archiveType")
96100
@JsonView({
@@ -105,7 +109,11 @@ public class ComicDetail implements PublicationDetail {
105109
@NonNull
106110
private ArchiveType archiveType;
107111

108-
@Column(name = "comic_state", nullable = false, updatable = true)
112+
@Column(
113+
name = "comic_state",
114+
nullable = false,
115+
updatable = true,
116+
columnDefinition = "VARCHAR(64)")
109117
@Enumerated(EnumType.STRING)
110118
@JsonProperty("comicState")
111119
@JsonView({
@@ -118,7 +126,7 @@ public class ComicDetail implements PublicationDetail {
118126
@Setter
119127
private ComicState comicState = ComicState.CREATED;
120128

121-
@Column(name = "comic_type", nullable = false, updatable = true)
129+
@Column(name = "comic_type", nullable = false, updatable = true, columnDefinition = "VARCHAR(32)")
122130
@Enumerated(EnumType.STRING)
123131
@JsonProperty("comicType")
124132
@JsonView({

‎comixed-model/src/main/java/org/comixedproject/model/comicbooks/ComicTag.java‎

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,12 @@ public class ComicTag {
5959
@NonNull
6060
private ComicDetail comicDetail;
6161

62-
@Column(name = "tag_type", insertable = true, nullable = false, updatable = false)
62+
@Column(
63+
name = "tag_type",
64+
insertable = true,
65+
nullable = false,
66+
updatable = false,
67+
columnDefinition = "VARCHAR(32)")
6368
@Enumerated(EnumType.STRING)
6469
@JsonProperty("type")
6570
@JsonView({View.ComicListView.class})

‎comixed-model/src/main/java/org/comixedproject/model/comicpages/ComicPage.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@ public class ComicPage {
5353
@NonNull
5454
private ComicBook comicBook;
5555

56-
@Column(name = "page_state", nullable = false, updatable = true)
56+
@Column(name = "page_state", nullable = false, updatable = true, columnDefinition = "VARCHAR(32)")
5757
@Enumerated(EnumType.STRING)
5858
@Getter
5959
@Setter

‎comixed-model/src/main/java/org/comixedproject/model/library/DisplayableComic.java‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -47,14 +47,14 @@ public class DisplayableComic {
4747
@Getter
4848
private Long comicDetailId;
4949

50-
@Column(name = "archive_type")
50+
@Column(name = "archive_type", columnDefinition = "VARCHAR(4)")
5151
@JsonView({View.ComicDetailsView.class})
5252
@Enumerated(EnumType.STRING)
5353
@Getter
5454
@Setter
5555
private ArchiveType archiveType;
5656

57-
@Column(name = "comic_state")
57+
@Column(name = "comic_state", columnDefinition = "VARCHAR(64)")
5858
@JsonView({View.ComicDetailsView.class})
5959
@Enumerated(EnumType.STRING)
6060
@Getter
@@ -67,7 +67,7 @@ public class DisplayableComic {
6767
@Setter
6868
private Boolean unscraped;
6969

70-
@Column(name = "comic_type")
70+
@Column(name = "comic_type", columnDefinition = "VARCHAR(32)")
7171
@JsonView({View.ComicDetailsView.class})
7272
@Enumerated(EnumType.STRING)
7373
@Getter

‎comixed-model/src/main/java/org/comixedproject/model/library/OrganizingComic.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ public class OrganizingComic implements PublicationDetail {
4646
@Getter
4747
private String filename;
4848

49-
@Column(name = "archive_type")
49+
@Column(name = "archive_type", columnDefinition = "VARCHAR(4)")
5050
@Enumerated(EnumType.STRING)
5151
@Getter
5252
private ArchiveType archiveType;

‎comixed-model/src/main/java/org/comixedproject/model/lists/ReadingList.java‎

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,11 @@ public class ReadingList {
4848
@Getter
4949
private Long id;
5050

51-
@Column(name = "reading_list_state", nullable = false, updatable = true)
51+
@Column(
52+
name = "reading_list_state",
53+
nullable = false,
54+
updatable = true,
55+
columnDefinition = "VARCHAR(32)")
5256
@Enumerated(EnumType.STRING)
5357
@JsonProperty("readingListState")
5458
@JsonView({View.ComicListView.class, View.ReadingLists.class})

‎comixed-model/src/main/java/org/comixedproject/model/lists/Story.java‎

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,11 @@ public class Story {
6161
@Setter
6262
private Integer comicVineId;
6363

64-
@Column(name = "story_state", nullable = false, updatable = true)
64+
@Column(
65+
name = "story_state",
66+
nullable = false,
67+
updatable = true,
68+
columnDefinition = "VARCHAR(32)")
6569
@Enumerated(EnumType.STRING)
6670
@JsonIgnore
6771
@Getter

‎comixed-model/src/main/java/org/comixedproject/model/lists/StoryEntry.java‎

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,11 @@ public class StoryEntry {
4949
@Getter
5050
private Story story;
5151

52-
@Column(name = "story_entry_state", nullable = false, updatable = true)
52+
@Column(
53+
name = "story_entry_state",
54+
nullable = false,
55+
updatable = true,
56+
columnDefinition = "VARCHAR(32)")
5357
@Enumerated(EnumType.STRING)
5458
@NonNull
5559
@Getter

0 commit comments

Comments
 (0)