From 8d630278eb2676c8f0e449bd5a11f1084e2af318 Mon Sep 17 00:00:00 2001 From: Gerrit Meier Date: Thu, 29 Apr 2021 12:04:15 +0200 Subject: [PATCH] Avoid duplicates in enum imports (Scala). --- .../scala-lang/scalaClassGraphqlType.ftl | 18 ++++++++++++++++-- 1 file changed, 16 insertions(+), 2 deletions(-) diff --git a/src/main/resources/templates/scala-lang/scalaClassGraphqlType.ftl b/src/main/resources/templates/scala-lang/scalaClassGraphqlType.ftl index 5af61b29a..bc2e590d3 100644 --- a/src/main/resources/templates/scala-lang/scalaClassGraphqlType.ftl +++ b/src/main/resources/templates/scala-lang/scalaClassGraphqlType.ftl @@ -15,23 +15,37 @@ import com.kobylynskyi.graphql.codegen.model.graphql.GraphQLRequestSerializer import java.util.Objects import scala.collection.JavaConverters._ +<#assign duplicateEnumImports = [] /> +<#assign enumImports = [] /> <#if fields?has_content> <#if enumImportItSelfInScala?has_content> <#list fields as field> <#list enumImportItSelfInScala as enum> <#if MapperUtil.isScalaCollection(field.type)> <#if enum == MapperUtil.getGenericParameter(field.type)> -import ${enum}._ + <#assign duplicateEnumImports = duplicateEnumImports + [enum] /> <#else > <#if enum == field.type> -import ${enum}._ + <#assign duplicateEnumImports = duplicateEnumImports + [enum] /> +<#if duplicateEnumImports?has_content> + <#list duplicateEnumImports as duplicateEnumImport> + <#if !enumImports?seq_contains(duplicateEnumImport)> + <#assign enumImports = enumImports + [duplicateEnumImport]> + + + +<#if enumImports?has_content> + <#list enumImports as enumImport> +import ${enumImport}._ + + <#assign duplicateParentInterfaces = [] /> <#assign parentInterfaces = [] /> <#if fields?has_content>