Skip to content

Commit f3fe479

Browse files
Kotlin: Fix ParameterizedInput and toString() issue (#573)
* fxi ParameterizedInput bug * fix tostring
1 parent 0fd7796 commit f3fe479

File tree

7 files changed

+11
-5
lines changed

7 files changed

+11
-5
lines changed

src/main/resources/templates/kotlin-lang/kotlinClassGraphqlParametrizedInput.ftl

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@ package ${package}
33

44
</#if>
55
import com.kobylynskyi.graphql.codegen.model.graphql.GraphQLParametrizedInput
6+
import com.kobylynskyi.graphql.codegen.model.graphql.GraphQLRequestSerializer
67
import java.util.StringJoiner
78
<#if javaDoc?has_content>
89
/**

src/main/resources/templates/kotlin-lang/kotlinClassGraphqlType.ftl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -130,7 +130,7 @@ open class ${className}()<#if implements?has_content> : <#list implements as int
130130
return true</#if>
131131
}
132132

133-
override fun hashCode(): Int = {
133+
override fun hashCode(): Int {
134134
<#if fields?has_content>
135135
return Objects.hash(<#list fields as field>${field.name}<#if field_has_next>, </#if></#list>)
136136
<#else>

src/main/resources/templates/scala-lang/scalaClassGraphqlParametrizedInput.ftl

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@ package ${package}
44

55
</#if>
66
import com.kobylynskyi.graphql.codegen.model.graphql.GraphQLParametrizedInput
7+
import com.kobylynskyi.graphql.codegen.model.graphql.GraphQLRequestSerializer
78
import scala.collection.JavaConverters._
89
<#if fields?has_content>
910
<#if enumImportItSelfInScala?has_content>

src/test/java/com/kobylynskyi/graphql/codegen/scala/GraphQLCodegenReactorToStringTest.java

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -103,13 +103,15 @@ void generate_SetGenerateClient_False() throws Exception {
103103
outputBuildDir, mappingConfig, TestUtils.getStaticGeneratedInfo()).generate();
104104

105105
File[] files = Objects.requireNonNull(outputJavaClassesDir.listFiles());
106-
List<String> generatedFileNames = Arrays.stream(files).map(File::getName).filter(f -> Objects.equals("Synchronized.scala", f)).sorted().collect(toList());
106+
List<String> generatedFileNames = Arrays.stream(files).map(File::getName).filter(f -> Objects.equals("Synchronized.scala", f)
107+
|| Objects.equals("QueryCaseParametrizedInput.scala", f)).sorted().collect(toList());
107108
assertEquals(singletonList("Synchronized.scala"), generatedFileNames);
108109

109110
for (File file : files) {
110-
if (Objects.equals("Synchronized.scala", file.getName())) {
111+
if (Arrays.asList("QueryCaseParametrizedInput.scala", "Synchronized.scala").contains(file.getName())) {
111112
assertSameTrimmedContent(
112-
new File(String.format("src/test/resources/expected-classes/scala/tostring/%s.txt", "TOSTRING_Synchronized.scala")),
113+
new File(String.format("src/test/resources/expected-classes/scala/tostring/%s.txt", "TOSTRING_Synchronized.scala",
114+
"QueryCaseParametrizedInput")),
113115
file);
114116
}
115117
}

src/test/resources/expected-classes/kt/Commit_no_final_class.kt.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -172,7 +172,7 @@ open class Commit(
172172

173173
}
174174

175-
override fun hashCode(): Int = {
175+
override fun hashCode(): Int {
176176
return Objects.hash(abbreviatedOid, additions, associatedPullRequests, author, authoredByCommitter, authoredDate, blame, changedFiles, comments, commitResourcePath, commitUrl, committedDate, committedViaWeb, committer, deletions, deployments, history, id, message, messageBody, messageBodyHTML, messageHeadline, messageHeadlineHTML, oid, parents, pushedDate, repository, resourcePath, signature, status, tarballUrl, tree, treeResourcePath, treeUrl, url, viewerCanSubscribe, viewerSubscription, zipballUrl)
177177
}
178178

src/test/resources/expected-classes/kt/restricted-words/QueryFunParametrizedInput.kt.txt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
package com.kobylynskyi.graphql.codegen.prot
22

33
import com.kobylynskyi.graphql.codegen.model.graphql.GraphQLParametrizedInput
4+
import com.kobylynskyi.graphql.codegen.model.graphql.GraphQLRequestSerializer
45
import java.util.StringJoiner
56
/**
67
* Parametrized input for field fun in type Query

src/test/resources/expected-classes/scala/tostring/QueryPrivateParametrizedInput.scala.txt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
package com.kobylynskyi.graphql.codegen.prot
22

33
import com.kobylynskyi.graphql.codegen.model.graphql.GraphQLParametrizedInput
4+
import com.kobylynskyi.graphql.codegen.model.graphql.GraphQLRequestSerializer
45
import scala.collection.JavaConverters._
56
import TestEnum._
67

0 commit comments

Comments
 (0)