Skip to content

Commit 53b6f32

Browse files
authored
Add default values for options (#553)
1 parent afde993 commit 53b6f32

14 files changed

Lines changed: 129 additions & 129 deletions

File tree

github4s/src/main/scala/github4s/Decoders.scala

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -222,13 +222,13 @@ object Decoders {
222222

223223
implicit val decodeStarredRepository: Decoder[StarredRepository] =
224224
Decoder[Repository]
225-
.map(StarredRepository(None, _))
225+
.map(StarredRepository(_))
226226
.or(
227227
Decoder.instance(c =>
228228
for {
229229
starred_at <- c.downField("starred_at").as[String]
230230
repo <- c.downField("repo").as[Repository]
231-
} yield StarredRepository(Some(starred_at), repo)
231+
} yield StarredRepository(repo, Some(starred_at))
232232
)
233233
)
234234

@@ -277,13 +277,13 @@ object Decoders {
277277

278278
implicit val decodeStargazer: Decoder[Stargazer] =
279279
decoderUser
280-
.map(Stargazer(None, _))
280+
.map(Stargazer(_))
281281
.or(
282282
Decoder.instance(c =>
283283
for {
284284
starred_at <- c.downField("starred_at").as[String]
285285
user <- c.downField("user").as[User]
286-
} yield Stargazer(Some(starred_at), user)
286+
} yield Stargazer(user, Some(starred_at))
287287
)
288288
)
289289

github4s/src/main/scala/github4s/domain/Activity.scala

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -19,10 +19,10 @@ package github4s.domain
1919
final case class Subscription(
2020
subscribed: Boolean,
2121
ignored: Boolean,
22-
reason: Option[String],
2322
created_at: String,
2423
url: String,
25-
thread_url: String
24+
thread_url: String,
25+
reason: Option[String] = None
2626
)
2727

2828
final case class SubscriptionRequest(
@@ -31,11 +31,11 @@ final case class SubscriptionRequest(
3131
)
3232

3333
final case class Stargazer(
34-
starred_at: Option[String],
35-
user: User
34+
user: User,
35+
starred_at: Option[String] = None
3636
)
3737

3838
final case class StarredRepository(
39-
starred_at: Option[String],
40-
repo: Repository
39+
repo: Repository,
40+
starred_at: Option[String] = None
4141
)

github4s/src/main/scala/github4s/domain/GitData.scala

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -71,29 +71,29 @@ final case class TreeDataResult(
7171
path: String,
7272
mode: String,
7373
`type`: String,
74-
size: Option[Int],
7574
sha: String,
76-
url: String
75+
url: String,
76+
size: Option[Int] = None
7777
)
7878

7979
final case class NewCommitRequest(
8080
message: String,
8181
tree: String,
8282
parents: List[String],
83-
author: Option[RefAuthor]
83+
author: Option[RefAuthor] = None
8484
)
8585

8686
final case class BlobContent(
87-
content: Option[String],
88-
encoding: Option[String],
8987
url: String,
9088
sha: String,
91-
size: Int
89+
size: Int,
90+
content: Option[String] = None,
91+
encoding: Option[String] = None
9292
)
9393

94-
final case class NewBlobRequest(content: String, encoding: Option[String])
94+
final case class NewBlobRequest(content: String, encoding: Option[String] = None)
9595

96-
final case class NewTreeRequest(base_tree: Option[String], tree: List[TreeData])
96+
final case class NewTreeRequest(tree: List[TreeData], base_tree: Option[String] = None)
9797

9898
final case class CreateReferenceRequest(ref: String, sha: String)
9999

@@ -104,5 +104,5 @@ final case class NewTagRequest(
104104
message: String,
105105
`object`: String,
106106
`type`: String,
107-
tagger: Option[RefAuthor]
107+
tagger: Option[RefAuthor] = None
108108
)

github4s/src/main/scala/github4s/domain/Issue.scala

Lines changed: 26 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,6 @@ import java.time.ZonedDateTime
2121
final case class Issue(
2222
id: Long,
2323
title: String,
24-
body: Option[String],
2524
url: String,
2625
repository_url: String,
2726
labels_url: String,
@@ -30,31 +29,32 @@ final case class Issue(
3029
html_url: String,
3130
number: Int,
3231
state: String,
33-
user: Option[User],
34-
assignee: Option[User],
3532
labels: List[Label] = List.empty,
36-
locked: Option[Boolean],
3733
comments: Int,
38-
pull_request: Option[IssuePullRequest],
39-
closed_at: Option[String],
4034
created_at: String,
41-
updated_at: String
35+
updated_at: String,
36+
body: Option[String] = None,
37+
user: Option[User] = None,
38+
assignee: Option[User] = None,
39+
locked: Option[Boolean] = None,
40+
pull_request: Option[IssuePullRequest] = None,
41+
closed_at: Option[String] = None
4242
)
4343

4444
final case class Label(
45-
id: Option[Long],
4645
name: String,
47-
description: Option[String],
48-
url: Option[String],
4946
color: String,
50-
default: Option[Boolean]
47+
id: Option[Long] = None,
48+
description: Option[String] = None,
49+
url: Option[String] = None,
50+
default: Option[Boolean] = None
5151
)
5252

5353
final case class IssuePullRequest(
54-
url: Option[String],
55-
html_url: Option[String],
56-
diff_url: Option[String],
57-
patch_url: Option[String]
54+
url: Option[String] = None,
55+
html_url: Option[String] = None,
56+
diff_url: Option[String] = None,
57+
patch_url: Option[String] = None
5858
)
5959

6060
final case class SearchIssuesResult(
@@ -66,28 +66,28 @@ final case class SearchIssuesResult(
6666
final case class NewIssueRequest(
6767
title: String,
6868
body: String,
69-
milestone: Option[Int],
7069
labels: List[String],
71-
assignees: List[String]
70+
assignees: List[String],
71+
milestone: Option[Int] = None
7272
)
7373

7474
final case class EditIssueRequest(
7575
state: String,
7676
title: String,
7777
body: String,
78-
milestone: Option[Int],
7978
labels: List[String],
80-
assignees: List[String]
79+
assignees: List[String],
80+
milestone: Option[Int] = None
8181
)
8282

8383
final case class Comment(
8484
id: Long,
8585
url: String,
8686
html_url: String,
8787
body: String,
88-
user: Option[User],
8988
created_at: String,
90-
updated_at: String
89+
updated_at: String,
90+
user: Option[User] = None
9191
)
9292

9393
final case class CommentData(body: String)
@@ -107,13 +107,13 @@ final case class Milestone(
107107
closed_issues: Int,
108108
created_at: String,
109109
updated_at: String,
110-
closed_at: Option[String],
111-
due_on: Option[String]
110+
closed_at: Option[String] = None,
111+
due_on: Option[String] = None
112112
)
113113

114114
final case class MilestoneData(
115115
title: String,
116-
state: Option[String],
117-
description: Option[String],
118-
due_on: Option[ZonedDateTime]
116+
state: Option[String] = None,
117+
description: Option[String] = None,
118+
due_on: Option[ZonedDateTime] = None
119119
)

github4s/src/main/scala/github4s/domain/Project.scala

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -24,21 +24,20 @@ final case class Project(
2424
id: Long,
2525
node_id: String,
2626
name: String,
27-
body: Option[String],
2827
number: Int,
2928
creator: Creator,
3029
created_at: String,
3130
updated_at: String,
32-
organization_permission: Option[String],
33-
`private`: Option[Boolean]
31+
body: Option[String] = None,
32+
organization_permission: Option[String] = None,
33+
`private`: Option[Boolean] = None
3434
)
3535

3636
final case class Creator(
3737
login: String,
3838
id: Long,
3939
node_id: String,
4040
avatar_url: String,
41-
gravatar_id: Option[String],
4241
url: String,
4342
html_url: String,
4443
followers_url: String,
@@ -51,7 +50,8 @@ final case class Creator(
5150
events_url: String,
5251
received_events_url: String,
5352
`type`: String,
54-
site_admin: Boolean
53+
site_admin: Boolean,
54+
gravatar_id: Option[String] = None
5555
)
5656

5757
final case class Column(
@@ -70,11 +70,11 @@ final case class Card(
7070
project_url: String,
7171
id: Long,
7272
node_id: String,
73-
note: Option[String],
7473
archived: Boolean,
7574
creator: Creator,
7675
created_at: String,
7776
updated_at: String,
7877
column_url: String,
79-
content_url: Option[String]
78+
note: Option[String] = None,
79+
content_url: Option[String] = None
8080
)

github4s/src/main/scala/github4s/domain/PullRequest.scala

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -21,26 +21,26 @@ final case class PullRequest(
2121
number: Int,
2222
state: String,
2323
title: String,
24-
body: Option[String],
2524
locked: Boolean,
2625
html_url: String,
2726
created_at: String,
28-
updated_at: Option[String],
29-
closed_at: Option[String],
30-
merged_at: Option[String],
31-
merge_commit_sha: Option[String],
32-
base: Option[PullRequestBase],
33-
head: Option[PullRequestBase],
34-
user: Option[User],
35-
assignee: Option[User]
27+
body: Option[String] = None,
28+
updated_at: Option[String] = None,
29+
closed_at: Option[String] = None,
30+
merged_at: Option[String] = None,
31+
merge_commit_sha: Option[String] = None,
32+
base: Option[PullRequestBase] = None,
33+
head: Option[PullRequestBase] = None,
34+
user: Option[User] = None,
35+
assignee: Option[User] = None
3636
)
3737

3838
final case class PullRequestBase(
39-
label: Option[String],
4039
ref: String,
4140
sha: String,
42-
user: Option[User],
43-
repo: Option[Repository]
41+
label: Option[String] = None,
42+
user: Option[User] = None,
43+
repo: Option[Repository] = None
4444
)
4545

4646
final case class PullRequestFile(
@@ -53,8 +53,8 @@ final case class PullRequestFile(
5353
blob_url: String,
5454
raw_url: String,
5555
contents_url: String,
56-
patch: Option[String],
57-
previous_filename: Option[String]
56+
patch: Option[String] = None,
57+
previous_filename: Option[String] = None
5858
)
5959
sealed trait CreatePullRequest {
6060
def head: String
@@ -108,12 +108,12 @@ final case class NewPullRequestIssue(issue: Int) extends NewPull
108108

109109
final case class PullRequestReview(
110110
id: Long,
111-
user: Option[User],
112111
body: String,
113112
commit_id: String,
114113
state: PullRequestReviewState,
115114
html_url: String,
116-
pull_request_url: String
115+
pull_request_url: String,
116+
user: Option[User] = None
117117
)
118118

119119
sealed abstract class PullRequestReviewState(val value: String)

0 commit comments

Comments
 (0)