Skip to content

Commit

Permalink
Add default values for options (#553)
Browse files Browse the repository at this point in the history
  • Loading branch information
loonydev committed Sep 23, 2020
1 parent afde993 commit 53b6f32
Show file tree
Hide file tree
Showing 14 changed files with 129 additions and 129 deletions.
8 changes: 4 additions & 4 deletions github4s/src/main/scala/github4s/Decoders.scala
Original file line number Diff line number Diff line change
Expand Up @@ -222,13 +222,13 @@ object Decoders {

implicit val decodeStarredRepository: Decoder[StarredRepository] =
Decoder[Repository]
.map(StarredRepository(None, _))
.map(StarredRepository(_))
.or(
Decoder.instance(c =>
for {
starred_at <- c.downField("starred_at").as[String]
repo <- c.downField("repo").as[Repository]
} yield StarredRepository(Some(starred_at), repo)
} yield StarredRepository(repo, Some(starred_at))
)
)

Expand Down Expand Up @@ -277,13 +277,13 @@ object Decoders {

implicit val decodeStargazer: Decoder[Stargazer] =
decoderUser
.map(Stargazer(None, _))
.map(Stargazer(_))
.or(
Decoder.instance(c =>
for {
starred_at <- c.downField("starred_at").as[String]
user <- c.downField("user").as[User]
} yield Stargazer(Some(starred_at), user)
} yield Stargazer(user, Some(starred_at))
)
)

Expand Down
12 changes: 6 additions & 6 deletions github4s/src/main/scala/github4s/domain/Activity.scala
Original file line number Diff line number Diff line change
Expand Up @@ -19,10 +19,10 @@ package github4s.domain
final case class Subscription(
subscribed: Boolean,
ignored: Boolean,
reason: Option[String],
created_at: String,
url: String,
thread_url: String
thread_url: String,
reason: Option[String] = None
)

final case class SubscriptionRequest(
Expand All @@ -31,11 +31,11 @@ final case class SubscriptionRequest(
)

final case class Stargazer(
starred_at: Option[String],
user: User
user: User,
starred_at: Option[String] = None
)

final case class StarredRepository(
starred_at: Option[String],
repo: Repository
repo: Repository,
starred_at: Option[String] = None
)
18 changes: 9 additions & 9 deletions github4s/src/main/scala/github4s/domain/GitData.scala
Original file line number Diff line number Diff line change
Expand Up @@ -71,29 +71,29 @@ final case class TreeDataResult(
path: String,
mode: String,
`type`: String,
size: Option[Int],
sha: String,
url: String
url: String,
size: Option[Int] = None
)

final case class NewCommitRequest(
message: String,
tree: String,
parents: List[String],
author: Option[RefAuthor]
author: Option[RefAuthor] = None
)

final case class BlobContent(
content: Option[String],
encoding: Option[String],
url: String,
sha: String,
size: Int
size: Int,
content: Option[String] = None,
encoding: Option[String] = None
)

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

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

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

Expand All @@ -104,5 +104,5 @@ final case class NewTagRequest(
message: String,
`object`: String,
`type`: String,
tagger: Option[RefAuthor]
tagger: Option[RefAuthor] = None
)
52 changes: 26 additions & 26 deletions github4s/src/main/scala/github4s/domain/Issue.scala
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,6 @@ import java.time.ZonedDateTime
final case class Issue(
id: Long,
title: String,
body: Option[String],
url: String,
repository_url: String,
labels_url: String,
Expand All @@ -30,31 +29,32 @@ final case class Issue(
html_url: String,
number: Int,
state: String,
user: Option[User],
assignee: Option[User],
labels: List[Label] = List.empty,
locked: Option[Boolean],
comments: Int,
pull_request: Option[IssuePullRequest],
closed_at: Option[String],
created_at: String,
updated_at: String
updated_at: String,
body: Option[String] = None,
user: Option[User] = None,
assignee: Option[User] = None,
locked: Option[Boolean] = None,
pull_request: Option[IssuePullRequest] = None,
closed_at: Option[String] = None
)

final case class Label(
id: Option[Long],
name: String,
description: Option[String],
url: Option[String],
color: String,
default: Option[Boolean]
id: Option[Long] = None,
description: Option[String] = None,
url: Option[String] = None,
default: Option[Boolean] = None
)

final case class IssuePullRequest(
url: Option[String],
html_url: Option[String],
diff_url: Option[String],
patch_url: Option[String]
url: Option[String] = None,
html_url: Option[String] = None,
diff_url: Option[String] = None,
patch_url: Option[String] = None
)

final case class SearchIssuesResult(
Expand All @@ -66,28 +66,28 @@ final case class SearchIssuesResult(
final case class NewIssueRequest(
title: String,
body: String,
milestone: Option[Int],
labels: List[String],
assignees: List[String]
assignees: List[String],
milestone: Option[Int] = None
)

final case class EditIssueRequest(
state: String,
title: String,
body: String,
milestone: Option[Int],
labels: List[String],
assignees: List[String]
assignees: List[String],
milestone: Option[Int] = None
)

final case class Comment(
id: Long,
url: String,
html_url: String,
body: String,
user: Option[User],
created_at: String,
updated_at: String
updated_at: String,
user: Option[User] = None
)

final case class CommentData(body: String)
Expand All @@ -107,13 +107,13 @@ final case class Milestone(
closed_issues: Int,
created_at: String,
updated_at: String,
closed_at: Option[String],
due_on: Option[String]
closed_at: Option[String] = None,
due_on: Option[String] = None
)

final case class MilestoneData(
title: String,
state: Option[String],
description: Option[String],
due_on: Option[ZonedDateTime]
state: Option[String] = None,
description: Option[String] = None,
due_on: Option[ZonedDateTime] = None
)
14 changes: 7 additions & 7 deletions github4s/src/main/scala/github4s/domain/Project.scala
Original file line number Diff line number Diff line change
Expand Up @@ -24,21 +24,20 @@ final case class Project(
id: Long,
node_id: String,
name: String,
body: Option[String],
number: Int,
creator: Creator,
created_at: String,
updated_at: String,
organization_permission: Option[String],
`private`: Option[Boolean]
body: Option[String] = None,
organization_permission: Option[String] = None,
`private`: Option[Boolean] = None
)

final case class Creator(
login: String,
id: Long,
node_id: String,
avatar_url: String,
gravatar_id: Option[String],
url: String,
html_url: String,
followers_url: String,
Expand All @@ -51,7 +50,8 @@ final case class Creator(
events_url: String,
received_events_url: String,
`type`: String,
site_admin: Boolean
site_admin: Boolean,
gravatar_id: Option[String] = None
)

final case class Column(
Expand All @@ -70,11 +70,11 @@ final case class Card(
project_url: String,
id: Long,
node_id: String,
note: Option[String],
archived: Boolean,
creator: Creator,
created_at: String,
updated_at: String,
column_url: String,
content_url: Option[String]
note: Option[String] = None,
content_url: Option[String] = None
)
32 changes: 16 additions & 16 deletions github4s/src/main/scala/github4s/domain/PullRequest.scala
Original file line number Diff line number Diff line change
Expand Up @@ -21,26 +21,26 @@ final case class PullRequest(
number: Int,
state: String,
title: String,
body: Option[String],
locked: Boolean,
html_url: String,
created_at: String,
updated_at: Option[String],
closed_at: Option[String],
merged_at: Option[String],
merge_commit_sha: Option[String],
base: Option[PullRequestBase],
head: Option[PullRequestBase],
user: Option[User],
assignee: Option[User]
body: Option[String] = None,
updated_at: Option[String] = None,
closed_at: Option[String] = None,
merged_at: Option[String] = None,
merge_commit_sha: Option[String] = None,
base: Option[PullRequestBase] = None,
head: Option[PullRequestBase] = None,
user: Option[User] = None,
assignee: Option[User] = None
)

final case class PullRequestBase(
label: Option[String],
ref: String,
sha: String,
user: Option[User],
repo: Option[Repository]
label: Option[String] = None,
user: Option[User] = None,
repo: Option[Repository] = None
)

final case class PullRequestFile(
Expand All @@ -53,8 +53,8 @@ final case class PullRequestFile(
blob_url: String,
raw_url: String,
contents_url: String,
patch: Option[String],
previous_filename: Option[String]
patch: Option[String] = None,
previous_filename: Option[String] = None
)
sealed trait CreatePullRequest {
def head: String
Expand Down Expand Up @@ -108,12 +108,12 @@ final case class NewPullRequestIssue(issue: Int) extends NewPull

final case class PullRequestReview(
id: Long,
user: Option[User],
body: String,
commit_id: String,
state: PullRequestReviewState,
html_url: String,
pull_request_url: String
pull_request_url: String,
user: Option[User] = None
)

sealed abstract class PullRequestReviewState(val value: String)
Expand Down

0 comments on commit 53b6f32

Please sign in to comment.