From f3a4f6e83b8770243f23923c45df813622067004 Mon Sep 17 00:00:00 2001 From: Bogdan Kobylynskyi <92bogdan@gmail.com> Date: Mon, 26 Apr 2021 09:05:31 +0300 Subject: [PATCH] Code cleanup --- docs/client-side-cases-by-proxy.md | 18 +++++++++--------- .../gradle/GraphQLCodegenGradleTask.java | 2 +- .../codegen/FreeMarkerTemplateType.java | 2 +- .../codegen/mapper/GraphQLTypeMapper.java | 11 ++++------- .../codegen/model/ApiNamePrefixStrategy.java | 2 +- 5 files changed, 16 insertions(+), 19 deletions(-) diff --git a/docs/client-side-cases-by-proxy.md b/docs/client-side-cases-by-proxy.md index c264d2694..b76623d8d 100644 --- a/docs/client-side-cases-by-proxy.md +++ b/docs/client-side-cases-by-proxy.md @@ -42,17 +42,17 @@ final public class DynamicProxy implements InvocationHandler, ExecutionGraphql { /** * this is graphql request need that what response fields. */ - private GraphQLResponseProjection projection; + private final GraphQLResponseProjection projection; /** * this graphql request that need request params. (if have) */ - private GraphQLOperationRequest request; + private final GraphQLOperationRequest request; /** * should limit max depth when invoke method on projection. */ - private int maxDepth; + private final int maxDepth; DynamicProxy(GraphQLResponseProjection projection, GraphQLOperationRequest request, int maxDepth) { this.projection = projection; @@ -79,7 +79,7 @@ final public class DynamicProxy implements InvocationHandler, ExecutionGraphql { /** * proxy invoke - * + * *

when handle projection, we use reflect to invoke method directly * but when handle request(need set parameters), we use reflect to get field which is a internal implementation of set method * @@ -166,10 +166,10 @@ final public class DynamicProxy implements InvocationHandler, ExecutionGraphql { //if this method have no parameter, then do not need invoke on request instance //other wise, we need append parameters to request field which use hashmap store params if (!parameters.isEmpty()) { - for (Parameter parameter : parameters) { - Object argsCopy = args[i++]; - request.getInput().put(parameter.getName(), argsCopy); - } + for (Parameter parameter : parameters) { + Object argsCopy = args[i++]; + request.getInput().put(parameter.getName(), argsCopy); + } } try { field = projection.getClass().getSuperclass().getDeclaredField("fields"); @@ -191,7 +191,7 @@ final public class DynamicProxy implements InvocationHandler, ExecutionGraphql { } return executeByHttp(entityClazzName, request, projection);// request and projection for creating GraphQLRequest, entityClazzName for deserialize - } + } } ``` diff --git a/plugins/gradle/graphql-java-codegen-gradle-plugin/src/main/java/io/github/kobylynskyi/graphql/codegen/gradle/GraphQLCodegenGradleTask.java b/plugins/gradle/graphql-java-codegen-gradle-plugin/src/main/java/io/github/kobylynskyi/graphql/codegen/gradle/GraphQLCodegenGradleTask.java index 9cc8722cd..3a3289d61 100644 --- a/plugins/gradle/graphql-java-codegen-gradle-plugin/src/main/java/io/github/kobylynskyi/graphql/codegen/gradle/GraphQLCodegenGradleTask.java +++ b/plugins/gradle/graphql-java-codegen-gradle-plugin/src/main/java/io/github/kobylynskyi/graphql/codegen/gradle/GraphQLCodegenGradleTask.java @@ -87,7 +87,7 @@ public class GraphQLCodegenGradleTask extends DefaultTask implements GraphQLCode private Set fieldsWithResolvers = new HashSet<>(); private Set fieldsWithoutResolvers = new HashSet<>(); private Set typesAsInterfaces = new HashSet<>(); - private RelayConfig relayConfig = new RelayConfig(); + private final RelayConfig relayConfig = new RelayConfig(); private Boolean generateClient; diff --git a/src/main/java/com/kobylynskyi/graphql/codegen/FreeMarkerTemplateType.java b/src/main/java/com/kobylynskyi/graphql/codegen/FreeMarkerTemplateType.java index 72721434e..d98f0552a 100644 --- a/src/main/java/com/kobylynskyi/graphql/codegen/FreeMarkerTemplateType.java +++ b/src/main/java/com/kobylynskyi/graphql/codegen/FreeMarkerTemplateType.java @@ -11,6 +11,6 @@ enum FreeMarkerTemplateType { OPERATIONS, PARAMETRIZED_INPUT, RESPONSE_PROJECTION, - JACKSON_TYPE_ID_RESOLVER; + JACKSON_TYPE_ID_RESOLVER } diff --git a/src/main/java/com/kobylynskyi/graphql/codegen/mapper/GraphQLTypeMapper.java b/src/main/java/com/kobylynskyi/graphql/codegen/mapper/GraphQLTypeMapper.java index 67446b153..7f2242317 100644 --- a/src/main/java/com/kobylynskyi/graphql/codegen/mapper/GraphQLTypeMapper.java +++ b/src/main/java/com/kobylynskyi/graphql/codegen/mapper/GraphQLTypeMapper.java @@ -225,7 +225,6 @@ default NamedDefinition getLanguageType(MappingContext mappingContext, String gr Set serializeFieldsUsingObjectMapper = mappingContext.getUseObjectMapperForRequestSerialization(); String langTypeName; boolean primitiveCanBeUsed = !collection; - boolean serializeUsingObjectMapper = false; if (name != null && parentTypeName != null && customTypesMapping.containsKey(parentTypeName + "." + name)) { langTypeName = customTypesMapping.get(parentTypeName + "." + name); primitiveCanBeUsed = false; @@ -236,11 +235,9 @@ default NamedDefinition getLanguageType(MappingContext mappingContext, String gr } else { langTypeName = DataModelMapper.getModelClassNameWithPrefixAndSuffix(mappingContext, graphQLType); } - if (serializeFieldsUsingObjectMapper.contains(graphQLType) || - (name != null && parentTypeName != null && - serializeFieldsUsingObjectMapper.contains(parentTypeName + "." + name))) { - serializeUsingObjectMapper = true; - } + boolean serializeUsingObjectMapper = + serializeFieldsUsingObjectMapper.contains(graphQLType) || + serializeFieldsUsingObjectMapper.contains(parentTypeName + "." + name); return new NamedDefinition(langTypeName, graphQLType, mappingContext.getInterfacesName().contains(graphQLType), mandatory, primitiveCanBeUsed, serializeUsingObjectMapper); @@ -370,7 +367,7 @@ default List getJacksonTypeIdAnnotations(MappingContext mappingContext, */ String getJacksonResolverTypeIdAnnotation(String modelPackageName); - default List getAdditionalAnnotations(MappingContext mappingContext, String typeName) { + default List getAdditionalAnnotations(MappingContext mappingContext, String typeName) { return new ArrayList<>(); } diff --git a/src/main/java/com/kobylynskyi/graphql/codegen/model/ApiNamePrefixStrategy.java b/src/main/java/com/kobylynskyi/graphql/codegen/model/ApiNamePrefixStrategy.java index 4a332486b..7d458110d 100644 --- a/src/main/java/com/kobylynskyi/graphql/codegen/model/ApiNamePrefixStrategy.java +++ b/src/main/java/com/kobylynskyi/graphql/codegen/model/ApiNamePrefixStrategy.java @@ -24,6 +24,6 @@ public enum ApiNamePrefixStrategy { /** * Will take only the value of apiNamePrefix config option. */ - CONSTANT; + CONSTANT }