Skip to content

Commit 2b3b36d

Browse files
kobylynskyikobylynskyi
committed
Fix minor code smell issues
1 parent e948be7 commit 2b3b36d

File tree

10 files changed

+17
-130
lines changed

10 files changed

+17
-130
lines changed

‎src/main/java/com/kobylynskyi/graphql/codegen/GraphQLCodegen.java‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@ public abstract class GraphQLCodegen {
5252
private final DataModelMapperFactory dataModelMapperFactory;
5353

5454
// used in tests
55-
public GraphQLCodegen(List<String> schemas,
55+
protected GraphQLCodegen(List<String> schemas,
5656
File outputDir,
5757
MappingConfig mappingConfig,
5858
GeneratedInformation generatedInformation,
@@ -61,7 +61,7 @@ public GraphQLCodegen(List<String> schemas,
6161
}
6262

6363
// used in tests
64-
public GraphQLCodegen(String introspectionResult,
64+
protected GraphQLCodegen(String introspectionResult,
6565
File outputDir,
6666
MappingConfig mappingConfig,
6767
GeneratedInformation generatedInformation,
@@ -70,7 +70,7 @@ public GraphQLCodegen(String introspectionResult,
7070
}
7171

7272
// used in plugins
73-
public GraphQLCodegen(List<String> schemas,
73+
protected GraphQLCodegen(List<String> schemas,
7474
String introspectionResult,
7575
File outputDir,
7676
MappingConfig mappingConfig,
@@ -80,7 +80,7 @@ public GraphQLCodegen(List<String> schemas,
8080
}
8181

8282
// used by other constructors
83-
public GraphQLCodegen(List<String> schemas,
83+
protected GraphQLCodegen(List<String> schemas,
8484
String introspectionResult,
8585
File outputDir,
8686
MappingConfig mappingConfig,
@@ -212,9 +212,9 @@ private void validateConfigs(MappingConfig mappingConfig) {
212212
// we will have a conflict in case there is "type Query" in multiple graphql schema files
213213
throw new IllegalArgumentException("API prefix should not be CONSTANT for INTERFACE_PER_SCHEMA option");
214214
}
215-
if (Boolean.TRUE.equals(mappingConfig.getGenerateApis()) &&
216-
mappingConfig.getGenerateModelsForRootTypes() &&
217-
mappingConfig.getApiNamePrefixStrategy() == ApiNamePrefixStrategy.CONSTANT) {
215+
if (Boolean.TRUE.equals(mappingConfig.getGenerateApis())
216+
&& Boolean.TRUE.equals(mappingConfig.getGenerateModelsForRootTypes())
217+
&& mappingConfig.getApiNamePrefixStrategy() == ApiNamePrefixStrategy.CONSTANT) {
218218
// checking for conflict between root type model classes and api interfaces
219219
if (Utils.stringsEqualIgnoreSpaces(mappingConfig.getApiNamePrefix(), mappingConfig.getModelNamePrefix()) &&
220220
Utils.stringsEqualIgnoreSpaces(mappingConfig.getApiNameSuffix(), mappingConfig.getModelNameSuffix())) {

‎src/main/java/com/kobylynskyi/graphql/codegen/GraphQLCodegenFileCreator.java‎

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -19,9 +19,6 @@
1919
*/
2020
class GraphQLCodegenFileCreator {
2121

22-
private static final String EXTENSION = ".java";
23-
private static final String EXTENSION_SCALA = ".scala";
24-
2522
private GraphQLCodegenFileCreator() {
2623
}
2724

‎src/main/java/com/kobylynskyi/graphql/codegen/java/JavaDataModelMapper.java‎

Lines changed: 0 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -8,9 +8,6 @@
88
import java.util.HashSet;
99
import java.util.Set;
1010

11-
/**
12-
* {@inheritDoc}
13-
*/
1411
public class JavaDataModelMapper implements DataModelMapper {
1512

1613
private static final Set<String> JAVA_RESTRICTED_KEYWORDS = new HashSet<>(Arrays.asList(
@@ -23,9 +20,6 @@ public class JavaDataModelMapper implements DataModelMapper {
2320
private static final Set<String> JAVA_RESTRICTED_METHOD_NAMES = new HashSet<>(Arrays.asList(
2421
"getClass", "notify", "notifyAll", "wait"));
2522

26-
/**
27-
* {@inheritDoc}
28-
*/
2923
@Override
3024
public String capitalizeIfRestricted(MappingContext mappingContext, String fieldName) {
3125
if (JAVA_RESTRICTED_KEYWORDS.contains(fieldName)) {
@@ -34,9 +28,6 @@ public String capitalizeIfRestricted(MappingContext mappingContext, String field
3428
return fieldName;
3529
}
3630

37-
/**
38-
* {@inheritDoc}
39-
*/
4031
@Override
4132
public String capitalizeMethodNameIfRestricted(MappingContext mappingContext, String methodName) {
4233
if (JAVA_RESTRICTED_KEYWORDS.contains(methodName)) {

‎src/main/java/com/kobylynskyi/graphql/codegen/java/JavaGraphQLCodegen.java‎

Lines changed: 0 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -11,44 +11,26 @@
1111
import java.util.Collection;
1212
import java.util.List;
1313

14-
/**
15-
* {@inheritDoc}
16-
*/
1714
public class JavaGraphQLCodegen extends GraphQLCodegen {
1815

1916
private static final MapperFactory MAPPER_FACTORY = new JavaMapperFactoryImpl();
2017

21-
/**
22-
* {@inheritDoc}
23-
*/
2418
public JavaGraphQLCodegen(List<String> schemas, File outputDir, MappingConfig mappingConfig, GeneratedInformation generatedInformation) {
2519
super(schemas, outputDir, mappingConfig, generatedInformation, MAPPER_FACTORY);
2620
}
2721

28-
/**
29-
* {@inheritDoc}
30-
*/
3122
public JavaGraphQLCodegen(String introspectionResult, File outputDir, MappingConfig mappingConfig, GeneratedInformation generatedInformation) {
3223
super(introspectionResult, outputDir, mappingConfig, generatedInformation, MAPPER_FACTORY);
3324
}
3425

35-
/**
36-
* {@inheritDoc}
37-
*/
3826
public JavaGraphQLCodegen(List<String> schemas, String introspectionResult, File outputDir, MappingConfig mappingConfig, MappingConfigSupplier externalMappingConfigSupplier) {
3927
super(schemas, introspectionResult, outputDir, mappingConfig, externalMappingConfigSupplier, MAPPER_FACTORY);
4028
}
4129

42-
/**
43-
* {@inheritDoc}
44-
*/
4530
public JavaGraphQLCodegen(List<String> schemas, String introspectionResult, File outputDir, MappingConfig mappingConfig, MappingConfigSupplier externalMappingConfigSupplier, GeneratedInformation generatedInformation) {
4631
super(schemas, introspectionResult, outputDir, mappingConfig, externalMappingConfigSupplier, generatedInformation, MAPPER_FACTORY);
4732
}
4833

49-
/**
50-
* {@inheritDoc}
51-
*/
5234
@Override
5335
protected void initCustomTypeMappings(Collection<ExtendedScalarTypeDefinition> scalarTypeDefinitions) {
5436
super.initCustomTypeMappings(scalarTypeDefinitions);

‎src/main/java/com/kobylynskyi/graphql/codegen/java/JavaGraphQLTypeMapper.java‎

Lines changed: 4 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -13,9 +13,6 @@
1313

1414
import static java.util.Arrays.asList;
1515

16-
/**
17-
* {@inheritDoc}
18-
*/
1916
public class JavaGraphQLTypeMapper implements GraphQLTypeMapper {
2017

2118
public static final String JAVA_UTIL_LIST = "java.util.List";
@@ -33,25 +30,16 @@ public static boolean isJavaPrimitive(String possiblyPrimitiveType) {
3330
return JAVA_PRIMITIVE_TYPES.contains(possiblyPrimitiveType);
3431
}
3532

36-
/**
37-
* {@inheritDoc}
38-
*/
3933
@Override
4034
public String wrapIntoList(MappingContext mappingContext, String type) {
4135
return getGenericsString(mappingContext, JAVA_UTIL_LIST, type);
4236
}
4337

44-
/**
45-
* {@inheritDoc}
46-
*/
4738
@Override
4839
public String wrapSuperTypeIntoList(MappingContext mappingContext, String type) {
4940
return getGenericsString(mappingContext, JAVA_UTIL_LIST, "? extends " + type);
5041
}
5142

52-
/**
53-
* {@inheritDoc}
54-
*/
5543
public String wrapApiReturnTypeIfRequired(MappingContext mappingContext,
5644
NamedDefinition namedDefinition,
5745
String parentTypeName) {
@@ -62,10 +50,10 @@ public String wrapApiReturnTypeIfRequired(MappingContext mappingContext,
6250
return getGenericsString(mappingContext, mappingContext.getSubscriptionReturnType(), computedTypeName);
6351
}
6452

65-
if (Boolean.TRUE.equals(mappingContext.getUseOptionalForNullableReturnTypes()) && !namedDefinition.isMandatory()) {
66-
if (!computedTypeName.startsWith(JAVA_UTIL_LIST)) {
67-
computedTypeName = getGenericsString(mappingContext, JAVA_UTIL_OPTIONAL, computedTypeName);
68-
}
53+
if (Boolean.TRUE.equals(mappingContext.getUseOptionalForNullableReturnTypes())
54+
&& !namedDefinition.isMandatory()
55+
&& !computedTypeName.startsWith(JAVA_UTIL_LIST)) {
56+
computedTypeName = getGenericsString(mappingContext, JAVA_UTIL_OPTIONAL, computedTypeName);
6957
}
7058
if (computedTypeName.startsWith(JAVA_UTIL_LIST) &&
7159
Utils.isNotBlank(mappingContext.getApiReturnListType())) {
@@ -79,33 +67,21 @@ public String wrapApiReturnTypeIfRequired(MappingContext mappingContext,
7967
return getTypeConsideringPrimitive(mappingContext, namedDefinition, computedTypeName);
8068
}
8169

82-
/**
83-
* {@inheritDoc}
84-
*/
8570
@Override
8671
public boolean isPrimitive(String possiblyPrimitiveType) {
8772
return isJavaPrimitive(possiblyPrimitiveType);
8873
}
8974

90-
/**
91-
* {@inheritDoc}
92-
*/
9375
@Override
9476
public boolean addModelValidationAnnotationForType(String type) {
9577
return !isPrimitive(type);
9678
}
9779

98-
/**
99-
* {@inheritDoc}
100-
*/
10180
@Override
10281
public String getGenericsString(MappingContext mappingContext, String genericType, String typeParameter) {
10382
return String.format("%s<%s>", genericType, typeParameter);
10483
}
10584

106-
/**
107-
* {@inheritDoc}
108-
*/
10985
@Override
11086
public String mapDirectiveArgumentValue(MappingContext mappingContext, Argument dirArg, String argumentValueFormatter) {
11187
return valueMapper.map(mappingContext, dirArg.getValue(), null, argumentValueFormatter);

‎src/main/java/com/kobylynskyi/graphql/codegen/java/JavaValueFormatter.java‎

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -5,14 +5,8 @@
55
import java.util.List;
66
import java.util.StringJoiner;
77

8-
/**
9-
* {@inheritDoc}
10-
*/
118
public class JavaValueFormatter implements ValueFormatter {
129

13-
/**
14-
* {@inheritDoc}
15-
*/
1610
@Override
1711
public String formatList(List<String> values, String formatter) {
1812
if (values == null) {

‎src/main/java/com/kobylynskyi/graphql/codegen/scala/ScalaDataModelMapper.java‎

Lines changed: 0 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -9,9 +9,6 @@
99
import java.util.HashSet;
1010
import java.util.Set;
1111

12-
/**
13-
* {@inheritDoc}
14-
*/
1512
public class ScalaDataModelMapper implements DataModelMapper {
1613

1714
private static final Set<String> SCALA_RESTRICTED_KEYWORDS = new HashSet<>(Arrays.asList(
@@ -26,9 +23,6 @@ public class ScalaDataModelMapper implements DataModelMapper {
2623
"getClass", "notify", "notifyAll", "wait", "clone", "finalize"));
2724

2825

29-
/**
30-
* {@inheritDoc}
31-
*/
3226
@Override
3327
public String capitalizeIfRestricted(MappingContext mappingContext, String fieldName) {
3428

@@ -38,9 +32,6 @@ public String capitalizeIfRestricted(MappingContext mappingContext, String field
3832
return fieldName;
3933
}
4034

41-
/**
42-
* {@inheritDoc}
43-
*/
4435
@Override
4536
public String capitalizeMethodNameIfRestricted(MappingContext mappingContext, String methodName) {
4637
if (SCALA_RESTRICTED_KEYWORDS.contains(methodName)) {
@@ -52,9 +43,6 @@ public String capitalizeMethodNameIfRestricted(MappingContext mappingContext, St
5243
return methodName;
5344
}
5445

55-
/**
56-
* {@inheritDoc}
57-
*/
5846
@Override
5947
public String getModelClassNameWithPrefixAndSuffix(MappingContext mappingContext,
6048
ExtendedDefinition<?, ?> extendedDefinition) {

‎src/main/java/com/kobylynskyi/graphql/codegen/scala/ScalaGraphQLCodegen.java‎

Lines changed: 0 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -11,44 +11,26 @@
1111
import java.util.Collection;
1212
import java.util.List;
1313

14-
/**
15-
* {@inheritDoc}
16-
*/
1714
public class ScalaGraphQLCodegen extends GraphQLCodegen {
1815

1916
private static final MapperFactory MAPPER_FACTORY = new ScalaMapperFactoryImpl();
2017

21-
/**
22-
* {@inheritDoc}
23-
*/
2418
public ScalaGraphQLCodegen(List<String> schemas, File outputDir, MappingConfig mappingConfig, GeneratedInformation generatedInformation) {
2519
super(schemas, outputDir, mappingConfig, generatedInformation, MAPPER_FACTORY);
2620
}
2721

28-
/**
29-
* {@inheritDoc}
30-
*/
3122
public ScalaGraphQLCodegen(String introspectionResult, File outputDir, MappingConfig mappingConfig, GeneratedInformation generatedInformation) {
3223
super(introspectionResult, outputDir, mappingConfig, generatedInformation, MAPPER_FACTORY);
3324
}
3425

35-
/**
36-
* {@inheritDoc}
37-
*/
3826
public ScalaGraphQLCodegen(List<String> schemas, String introspectionResult, File outputDir, MappingConfig mappingConfig, MappingConfigSupplier externalMappingConfigSupplier) {
3927
super(schemas, introspectionResult, outputDir, mappingConfig, externalMappingConfigSupplier, MAPPER_FACTORY);
4028
}
4129

42-
/**
43-
* {@inheritDoc}
44-
*/
4530
public ScalaGraphQLCodegen(List<String> schemas, String introspectionResult, File outputDir, MappingConfig mappingConfig, MappingConfigSupplier externalMappingConfigSupplier, GeneratedInformation generatedInformation) {
4631
super(schemas, introspectionResult, outputDir, mappingConfig, externalMappingConfigSupplier, generatedInformation, MAPPER_FACTORY);
4732
}
4833

49-
/**
50-
* {@inheritDoc}
51-
*/
5234
@Override
5335
protected void initDefaultValues(MappingConfig mappingConfig) {
5436
if (mappingConfig.getGenerateBuilder() == null) {
@@ -62,9 +44,6 @@ protected void initDefaultValues(MappingConfig mappingConfig) {
6244
super.initDefaultValues(mappingConfig);
6345
}
6446

65-
/**
66-
* {@inheritDoc}
67-
*/
6847
@Override
6948
protected void initCustomTypeMappings(Collection<ExtendedScalarTypeDefinition> scalarTypeDefinitions) {
7049
super.initCustomTypeMappings(scalarTypeDefinitions);

‎src/main/java/com/kobylynskyi/graphql/codegen/scala/ScalaGraphQLTypeMapper.java‎

Lines changed: 6 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -16,9 +16,6 @@
1616
import static com.kobylynskyi.graphql.codegen.java.JavaGraphQLTypeMapper.JAVA_UTIL_LIST;
1717
import static java.util.Arrays.asList;
1818

19-
/**
20-
* {@inheritDoc}
21-
*/
2219
public class ScalaGraphQLTypeMapper implements GraphQLTypeMapper {
2320

2421
private static final String SCALA_UTIL_LIST = "Seq";
@@ -62,9 +59,6 @@ public String wrapSuperTypeIntoList(MappingContext mappingContext, String type)
6259
return getGenericsString(mappingContext, SCALA_UTIL_LIST, "_ <: " + type);
6360
}
6461

65-
/**
66-
* {@inheritDoc}
67-
*/
6862
@Override
6963
public String wrapApiReturnTypeIfRequired(MappingContext mappingContext,
7064
NamedDefinition namedDefinition,
@@ -76,11 +70,12 @@ public String wrapApiReturnTypeIfRequired(MappingContext mappingContext,
7670
return getGenericsString(mappingContext, mappingContext.getSubscriptionReturnType(), computedTypeName);
7771
}
7872

79-
if (Boolean.TRUE.equals(mappingContext.getUseOptionalForNullableReturnTypes()) && !namedDefinition.isMandatory()) {
80-
if (!computedTypeName.startsWith(SCALA_UTIL_LIST) && !computedTypeName.startsWith(JAVA_UTIL_LIST)) {
81-
// wrap the type into scala.Option (except java list and scala list)
82-
computedTypeName = getGenericsString(mappingContext, SCALA_UTIL_OPTIONAL, computedTypeName);
83-
}
73+
if (Boolean.TRUE.equals(mappingContext.getUseOptionalForNullableReturnTypes())
74+
&& !namedDefinition.isMandatory()
75+
&& !computedTypeName.startsWith(SCALA_UTIL_LIST)
76+
&& !computedTypeName.startsWith(JAVA_UTIL_LIST)) {
77+
// wrap the type into scala.Option (except java list and scala list)
78+
computedTypeName = getGenericsString(mappingContext, SCALA_UTIL_OPTIONAL, computedTypeName);
8479
}
8580

8681
if (computedTypeName.startsWith(SCALA_UTIL_LIST) &&
@@ -95,25 +90,16 @@ public String wrapApiReturnTypeIfRequired(MappingContext mappingContext,
9590
return getTypeConsideringPrimitive(mappingContext, namedDefinition, computedTypeName);
9691
}
9792

98-
/**
99-
* {@inheritDoc}
100-
*/
10193
@Override
10294
public boolean isPrimitive(String scalaType) {
10395
return isScalaPrimitive(scalaType);
10496
}
10597

106-
/**
107-
* {@inheritDoc}
108-
*/
10998
@Override
11099
public String getGenericsString(MappingContext mappingContext, String genericType, String typeParameter) {
111100
return String.format("%s[%s]", genericType, typeParameter);
112101
}
113102

114-
/**
115-
* {@inheritDoc}
116-
*/
117103
@Override
118104
public String mapDirectiveArgumentValue(MappingContext mappingContext, Argument dirArg, String argumentValueFormatter) {
119105
return valueMapper.map(mappingContext, dirArg.getValue(), null, argumentValueFormatter);

0 commit comments

Comments
 (0)