Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -80,7 +80,7 @@ import ${enum}._
<#list field.annotations as annotation>
@${annotation}
</#list>
<#if parentInterfaces?has_content><#list parentInterfaces as parent><#if parent == field.name>override </#if></#list></#if><#if !immutableModels>var <#else><#if parentInterfaces?has_content><#list parentInterfaces as parent><#if parent == field.name>val </#if></#list></#if></#if>${field.name}: ${field.type}<#if field.defaultValue?has_content> = <#if MapperUtil.isScalaOption(field.type)><#if field.defaultValue != "null">Some(${field.defaultValue})<#else>None</#if><#else>${field.defaultValue}</#if></#if><#if field_has_next>,</#if>
<#if parentInterfaces?has_content><#list parentInterfaces as parent><#if parent == field.name>override </#if></#list></#if><#if !immutableModels>var <#elseif generateModelOpenClasses>val <#else><#if parentInterfaces?has_content><#list parentInterfaces as parent><#if parent == field.name>val </#if></#list></#if></#if>${field.name}: ${field.type}<#if field.defaultValue?has_content> = <#if MapperUtil.isScalaOption(field.type)><#if field.defaultValue != "null">Some(${field.defaultValue})<#else>None</#if><#else>${field.defaultValue}</#if></#if><#if field_has_next>,</#if>
</#list>
</#if>
)<#if implements?has_content> extends <#list implements as interface>${interface}<#if interface_has_next> with </#if></#list></#if> {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -49,4 +49,14 @@ void generate_MultipleInterfacesPerType() throws Exception {
getFileByName(files, "Commit.scala"));
}

@Test
void generate_MultipleInterfacesPerTypeVarFields() throws Exception {
mappingConfig.setGenerateImmutableModels(false);
new ScalaGraphQLCodegen(singletonList("src/test/resources/schemas/github.graphqls"),
outputBuildDir, mappingConfig, TestUtils.getStaticGeneratedInfo()).generate();
File[] files = Objects.requireNonNull(outputScalaClassesDir.listFiles());

assertSameTrimmedContent(getFileByName(files, "Commit.scala"),
new File("src/test/resources/expected-classes/scala/Commit_normal_class_var_fields.scala.txt"));
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -12,67 +12,67 @@ import SubscriptionState._
class Commit(
@javax.validation.constraints.NotNull
override val abbreviatedOid: String,
additions: Int,
associatedPullRequests: PullRequestConnection,
author: GitActor,
authoredByCommitter: Boolean,
val additions: Int,
val associatedPullRequests: PullRequestConnection,
val author: GitActor,
val authoredByCommitter: Boolean,
@javax.validation.constraints.NotNull
authoredDate: String,
val authoredDate: String,
@javax.validation.constraints.NotNull
blame: Blame,
changedFiles: Int,
val blame: Blame,
val changedFiles: Int,
@javax.validation.constraints.NotNull
comments: CommitCommentConnection,
val comments: CommitCommentConnection,
@javax.validation.constraints.NotNull
override val commitResourcePath: String,
@javax.validation.constraints.NotNull
override val commitUrl: String,
@javax.validation.constraints.NotNull
committedDate: String,
committedViaWeb: Boolean,
committer: GitActor,
deletions: Int,
deployments: DeploymentConnection,
val committedDate: String,
val committedViaWeb: Boolean,
val committer: GitActor,
val deletions: Int,
val deployments: DeploymentConnection,
@javax.validation.constraints.NotNull
history: CommitHistoryConnection,
val history: CommitHistoryConnection,
@javax.validation.constraints.NotNull
override val id: String,
@javax.validation.constraints.NotNull
message: String,
val message: String,
@javax.validation.constraints.NotNull
messageBody: String,
val messageBody: String,
@javax.validation.constraints.NotNull
messageBodyHTML: String,
val messageBodyHTML: String,
@javax.validation.constraints.NotNull
messageHeadline: String,
val messageHeadline: String,
@javax.validation.constraints.NotNull
messageHeadlineHTML: String,
val messageHeadlineHTML: String,
@javax.validation.constraints.NotNull
override val oid: String,
@javax.validation.constraints.NotNull
parents: CommitConnection,
pushedDate: String,
val parents: CommitConnection,
val pushedDate: String,
@javax.validation.constraints.NotNull
override val repository: Repository,
@javax.validation.constraints.NotNull
override val resourcePath: String,
signature: GitSignature,
status: Status,
val signature: GitSignature,
val status: Status,
@javax.validation.constraints.NotNull
tarballUrl: String,
val tarballUrl: String,
@javax.validation.constraints.NotNull
tree: Tree,
val tree: Tree,
@javax.validation.constraints.NotNull
treeResourcePath: String,
val treeResourcePath: String,
@javax.validation.constraints.NotNull
treeUrl: String,
val treeUrl: String,
@javax.validation.constraints.NotNull
override val url: String,
override val viewerCanSubscribe: Boolean,
@com.fasterxml.jackson.module.scala.JsonScalaEnumeration(classOf[com.github.graphql.SubscriptionStateTypeRefer])
override val viewerSubscription: SubscriptionState,
@javax.validation.constraints.NotNull
zipballUrl: String
val zipballUrl: String
) extends Closer with IssueTimelineItem with PullRequestTimelineItem with Subscribable with Node with GitObject with UniformResourceLocatable {

override def toString(): String = {
Expand Down
Loading