Skip to content

feat: Reduce redundant imports #950

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
rahulsom wants to merge 1 commit into
base: master
Choose a base branch
from
Open

feat: Reduce redundant imports #950

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
2 changes: 1 addition & 1 deletion graphql-dgs-codegen-core/src/main/kotlin/com/netflix/graphql/dgs/codegen/CodeGen.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -358,7 +358,7 @@ class CodeGen(
.addModifiers(Modifier.PUBLIC)
.addAnnotation(retention)
.build()
val generatedFile = JavaFile.builder(config.packageName, generated).build()
val generatedFile = JavaFile.builder(config.packageName, generated).skipJavaLangImports(true).build()
CodeGenResult(javaInterfaces = listOf(generatedFile))
} else {
CodeGenResult.EMPTY
Expand Down
10 changes: 5 additions & 5 deletions ...ore/src/main/kotlin/com/netflix/graphql/dgs/codegen/generators/java/ClientApiGenerator.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -345,7 +345,7 @@ class ClientApiGenerator(
.build(),
)
javaType.addType(builderClass.build())
return JavaFile.builder(getPackageName(), javaType.build()).build()
return JavaFile.builder(getPackageName(), javaType.build()).skipJavaLangImports(true).build()
}

private fun getVariableDefinitionType(inputValueType: Type<*>): String =
Expand Down Expand Up @@ -526,7 +526,7 @@ class ClientApiGenerator(
val concreteTypesResult = createConcreteTypes(type, javaType.build(), javaType, mutableSetOf(), 0)
val unionTypesResult = createUnionTypes(type, javaType, javaType.build(), mutableSetOf(), 0)

val javaFile = JavaFile.builder(getPackageName(), javaType.build()).build()
val javaFile = JavaFile.builder(getPackageName(), javaType.build()).skipJavaLangImports(true).build()
return CodeGenResult(clientProjections = listOf(javaFile)).merge(codeGenResult).merge(concreteTypesResult).merge(unionTypesResult)
}

Expand Down Expand Up @@ -670,7 +670,7 @@ class ClientApiGenerator(
)
}.fold(CodeGenResult.EMPTY) { total, current -> total.merge(current) }

val javaFile = JavaFile.builder(getPackageName(), javaType.build()).build()
val javaFile = JavaFile.builder(getPackageName(), javaType.build()).skipJavaLangImports(true).build()
return CodeGenResult(clientProjections = listOf(javaFile)).merge(codeGenResult)
}

Expand Down Expand Up @@ -790,7 +790,7 @@ class ClientApiGenerator(
).build(),
)

val javaFile = JavaFile.builder(getPackageName(), javaType.build()).build()
val javaFile = JavaFile.builder(getPackageName(), javaType.build()).skipJavaLangImports(true).build()
return CodeGenResult(clientProjections = listOf(javaFile)).merge(codeGenResult)
}

Expand All @@ -807,7 +807,7 @@ class ClientApiGenerator(
val javaType = subProjection.first
val codeGenResult = subProjection.second

val javaFile = JavaFile.builder(getPackageName(), javaType.build()).build()
val javaFile = JavaFile.builder(getPackageName(), javaType.build()).skipJavaLangImports(true).build()
return CodeGenResult(clientProjections = listOf(javaFile)).merge(codeGenResult)
}

Expand Down
2 changes: 1 addition & 1 deletion ...ore/src/main/kotlin/com/netflix/graphql/dgs/codegen/generators/java/ConstantsGenerator.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -212,7 +212,7 @@ class ConstantsGenerator(
)
}

val javaFile = JavaFile.builder(config.packageName, javaType.build()).build()
val javaFile = JavaFile.builder(config.packageName, javaType.build()).skipJavaLangImports(true).build()
return CodeGenResult(javaConstants = listOf(javaFile))
}

Expand Down
4 changes: 2 additions & 2 deletions ...core/src/main/kotlin/com/netflix/graphql/dgs/codegen/generators/java/DataTypeGenerator.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -488,7 +488,7 @@ abstract class BaseDataTypeGenerator(
addHashcode(javaType)
addBuilder(name, fields, javaType)

val javaFile = JavaFile.builder(packageName, javaType.build()).build()
val javaFile = JavaFile.builder(packageName, javaType.build()).skipJavaLangImports(true).build()

return CodeGenResult(javaDataTypes = listOf(javaFile))
}
Expand Down Expand Up @@ -516,7 +516,7 @@ abstract class BaseDataTypeGenerator(
addAbstractGetter(it.type, it, javaType)
}

val javaFile = JavaFile.builder(packageName, javaType.build()).build()
val javaFile = JavaFile.builder(packageName, javaType.build()).skipJavaLangImports(true).build()

return CodeGenResult(javaInterfaces = listOf(javaFile))
}
Expand Down
2 changes: 1 addition & 1 deletion ...e/src/main/kotlin/com/netflix/graphql/dgs/codegen/generators/java/DatafetcherGenerator.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -84,7 +84,7 @@ class DatafetcherGenerator(
.addAnnotation(DgsComponent::class.java)
.addMethod(methodSpec.build())

val javaFile = JavaFile.builder(getPackageName(), javaType.build()).build()
val javaFile = JavaFile.builder(getPackageName(), javaType.build()).skipJavaLangImports(true).build()

return CodeGenResult(javaDataFetchers = listOf(javaFile))
}
Expand Down
2 changes: 1 addition & 1 deletion ...core/src/main/kotlin/com/netflix/graphql/dgs/codegen/generators/java/EnumTypeGenerator.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -81,7 +81,7 @@ class EnumTypeGenerator(
javaType.addEnumConstant(javaReservedKeywordSanitizer.sanitize(it.name), typeSpec.build())
}

val javaFile = JavaFile.builder(getPackageName(), javaType.build()).build()
val javaFile = JavaFile.builder(getPackageName(), javaType.build()).skipJavaLangImports(true).build()

return CodeGenResult(javaEnumTypes = listOf(javaFile))
}
Expand Down
2 changes: 1 addition & 1 deletion ...ore/src/main/kotlin/com/netflix/graphql/dgs/codegen/generators/java/InterfaceGenerator.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -118,7 +118,7 @@ class InterfaceGenerator(
javaType.addAnnotation(jsonSubTypeAnnotation(implementations))
}

val javaFile = JavaFile.builder(packageName, javaType.build()).build()
val javaFile = JavaFile.builder(packageName, javaType.build()).skipJavaLangImports(true).build()

return CodeGenResult(javaInterfaces = listOf(javaFile))
}
Expand Down
2 changes: 1 addition & 1 deletion ...ore/src/main/kotlin/com/netflix/graphql/dgs/codegen/generators/java/UnionTypeGenerator.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -66,7 +66,7 @@ class UnionTypeGenerator(
javaType.addAnnotation(jsonSubTypeAnnotation(memberTypes))
}

val javaFile = JavaFile.builder(packageName, javaType.build()).build()
val javaFile = JavaFile.builder(packageName, javaType.build()).skipJavaLangImports(true).build()
return CodeGenResult(javaInterfaces = listOf(javaFile))
}
}
35 changes: 7 additions & 28 deletions graphql-dgs-codegen-core/src/test/kotlin/com/netflix/graphql/dgs/codegen/CodeGenTest.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -811,7 +811,6 @@ class CodeGenTest {
|import com.fasterxml.jackson.annotation.JsonSubTypes;
|import com.fasterxml.jackson.annotation.JsonTypeInfo;
|import com.netflix.graphql.dgs.codegen.tests.generated.Generated;
|import java.lang.String;
|
|@Generated
|@JsonTypeInfo(
Expand Down Expand Up @@ -883,7 +882,6 @@ class CodeGenTest {
|import com.fasterxml.jackson.annotation.JsonSubTypes;
|import com.fasterxml.jackson.annotation.JsonTypeInfo;
|import com.netflix.graphql.dgs.codegen.tests.generated.Generated;
|import java.lang.Boolean;
|
|@Generated
|@JsonTypeInfo(
Expand Down Expand Up @@ -964,7 +962,6 @@ class CodeGenTest {
|import com.fasterxml.jackson.annotation.JsonSubTypes;
|import com.fasterxml.jackson.annotation.JsonTypeInfo;
|import com.netflix.graphql.dgs.codegen.tests.generated.Generated;
|import java.lang.String;
|import java.util.List;
|
|@Generated
Expand Down Expand Up @@ -1041,7 +1038,6 @@ class CodeGenTest {
|import com.fasterxml.jackson.annotation.JsonSubTypes;
|import com.fasterxml.jackson.annotation.JsonTypeInfo;
|import com.netflix.graphql.dgs.codegen.tests.generated.Generated;
|import java.lang.String;
|
|@Generated
|@JsonTypeInfo(
Expand Down Expand Up @@ -1111,7 +1107,6 @@ class CodeGenTest {
|import com.fasterxml.jackson.annotation.JsonSubTypes;
|import com.fasterxml.jackson.annotation.JsonTypeInfo;
|import com.netflix.graphql.dgs.codegen.tests.generated.Generated;
|import java.lang.String;
|
|@Generated
|@JsonTypeInfo(
Expand Down Expand Up @@ -1412,7 +1407,6 @@ class CodeGenTest {
package com.netflix.graphql.dgs.codegen.tests.generated.types;

import com.netflix.graphql.dgs.codegen.tests.generated.Generated;
import java.lang.Deprecated;

@Generated
public enum EmployeeTypes {
Expand Down Expand Up @@ -1763,7 +1757,6 @@ class CodeGenTest {
|import com.fasterxml.jackson.annotation.JsonSubTypes;
|import com.fasterxml.jackson.annotation.JsonTypeInfo;
|import com.netflix.graphql.dgs.codegen.tests.generated.Generated;
|import java.lang.String;
|import mypackage.Cat;
|
|@Generated
Expand Down Expand Up @@ -3130,7 +3123,6 @@ class CodeGenTest {
|package com.netflix.graphql.dgs.codegen.tests.generated.types;
|
|import com.netflix.graphql.dgs.codegen.tests.generated.Generated;
|import java.lang.String;
|
|@Generated
|public interface Person {
Expand All @@ -3154,7 +3146,6 @@ class CodeGenTest {
|import com.fasterxml.jackson.annotation.JsonSubTypes;
|import com.fasterxml.jackson.annotation.JsonTypeInfo;
|import com.netflix.graphql.dgs.codegen.tests.generated.Generated;
|import java.lang.String;
|
|@Generated
|@JsonTypeInfo(
Expand All @@ -3180,15 +3171,18 @@ class CodeGenTest {
""".trimMargin(),
)

assertThat(JavaFile.builder("$BASE_PACKAGE_NAME.types", talent).build().toString()).isEqualTo(
assertThat(
JavaFile
.builder("$BASE_PACKAGE_NAME.types", talent)
.skipJavaLangImports(true)
.build()
.toString(),
).isEqualTo(
"""
|package com.netflix.graphql.dgs.codegen.tests.generated.types;
|
|import com.fasterxml.jackson.annotation.JsonTypeInfo;
|import com.netflix.graphql.dgs.codegen.tests.generated.Generated;
|import java.lang.Object;
|import java.lang.Override;
|import java.lang.String;
|import java.util.Objects;
|
|@Generated
Expand Down Expand Up @@ -3366,8 +3360,6 @@ class CodeGenTest {
|package com.netflix.graphql.dgs.codegen.tests.generated.types;
|
|import com.netflix.graphql.dgs.codegen.tests.generated.Generated;
|import java.lang.Integer;
|import java.lang.String;
|
|@Generated
|public interface Person {
Expand All @@ -3391,8 +3383,6 @@ class CodeGenTest {
|import com.fasterxml.jackson.annotation.JsonSubTypes;
|import com.fasterxml.jackson.annotation.JsonTypeInfo;
|import com.netflix.graphql.dgs.codegen.tests.generated.Generated;
|import java.lang.Integer;
|import java.lang.String;
|
|@Generated
|@JsonTypeInfo(
Expand Down Expand Up @@ -3466,8 +3456,6 @@ class CodeGenTest {
|package com.netflix.graphql.dgs.codegen.tests.generated.types;
|
|import com.netflix.graphql.dgs.codegen.tests.generated.Generated;
|import java.lang.Integer;
|import java.lang.String;
|import java.util.List;
|
|@Generated
Expand Down Expand Up @@ -3500,8 +3488,6 @@ class CodeGenTest {
|import com.fasterxml.jackson.annotation.JsonSubTypes;
|import com.fasterxml.jackson.annotation.JsonTypeInfo;
|import com.netflix.graphql.dgs.codegen.tests.generated.Generated;
|import java.lang.Integer;
|import java.lang.String;
|import java.util.List;
|
|@Generated
Expand Down Expand Up @@ -3568,7 +3554,6 @@ class CodeGenTest {
|package com.netflix.graphql.dgs.codegen.tests.generated.types;
|
|import com.netflix.graphql.dgs.codegen.tests.generated.Generated;
|import java.lang.String;
|
|@Generated
|public interface Person {
Expand Down Expand Up @@ -3798,7 +3783,6 @@ class CodeGenTest {
|import com.fasterxml.jackson.annotation.JsonSubTypes;
|import com.fasterxml.jackson.annotation.JsonTypeInfo;
|import com.netflix.graphql.dgs.codegen.tests.generated.Generated;
|import java.lang.String;
|
|@Generated
|@JsonTypeInfo(
Expand Down Expand Up @@ -3975,7 +3959,6 @@ class CodeGenTest {
|import com.fasterxml.jackson.annotation.JsonSubTypes;
|import com.fasterxml.jackson.annotation.JsonTypeInfo;
|import com.netflix.graphql.dgs.codegen.tests.generated.Generated;
|import java.lang.String;
|import java.util.List;
|
|@Generated
Expand Down Expand Up @@ -4049,8 +4032,6 @@ class CodeGenTest {
|package com.netflix.graphql.dgs.codegen.tests.generated.types;
|
|import com.netflix.graphql.dgs.codegen.tests.generated.Generated;
|import java.lang.Integer;
|import java.lang.String;
|import java.util.List;
|
|@Generated
Expand All @@ -4075,8 +4056,6 @@ class CodeGenTest {
|import com.fasterxml.jackson.annotation.JsonSubTypes;
|import com.fasterxml.jackson.annotation.JsonTypeInfo;
|import com.netflix.graphql.dgs.codegen.tests.generated.Generated;
|import java.lang.Integer;
|import java.lang.String;
|import java.util.List;
|
|@Generated
Expand Down
8 changes: 7 additions & 1 deletion ...ore/src/test/kotlin/com/netflix/graphql/dgs/codegen/clientapi/ClientApiGenFragmentTest.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -302,7 +302,13 @@ class ClientApiGenFragmentTest {

val searchResult = codeGenResult.javaInterfaces[0].typeSpec()

assertThat(JavaFile.builder("$BASE_PACKAGE_NAME.types", searchResult).build().toString()).isEqualTo(
assertThat(
JavaFile
.builder("$BASE_PACKAGE_NAME.types", searchResult)
.skipJavaLangImports(true)
.build()
.toString(),
).isEqualTo(
"""
|package com.netflix.graphql.dgs.codegen.tests.generated.types;
|
Expand Down
Loading