Skip to content

Commit b171b4e

Browse files
yarinvakyarinvak
committed
name&packages changes
1 parent a3c86df commit b171b4e

File tree

7 files changed

+17
-22
lines changed

7 files changed

+17
-22
lines changed

‎src/main/java/graphql/annotations/processor/retrievers/GraphQLFieldRetriever.java‎

Lines changed: 6 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -19,11 +19,10 @@
1919
import graphql.annotations.processor.ProcessingElementsContainer;
2020
import graphql.annotations.annotationTypes.*;
2121
import graphql.annotations.annotationTypes.GraphQLType;
22-
import graphql.annotations.dataFetchers.MethodDataFetcher;
23-
import graphql.annotations.dataFetchers.connection.ConnectionDataFetcher;
24-
import graphql.annotations.dataFetchers.ExtensionDataFetcherWrapper;
2522
import graphql.annotations.processor.GraphQLAnnotations;
26-
import graphql.annotations.processor.retrievers.fieldBuilders.Builder;
23+
import graphql.annotations.processor.retrievers.fieldBuilders.ArgumentBuilder;
24+
import graphql.annotations.processor.retrievers.fieldBuilders.DeprecateBuilder;
25+
import graphql.annotations.processor.retrievers.fieldBuilders.DescriptionBuilder;
2726
import graphql.annotations.processor.retrievers.fieldBuilders.field.FieldDataFetcherBuilder;
2827
import graphql.annotations.processor.retrievers.fieldBuilders.field.FieldNameBuilder;
2928
import graphql.annotations.processor.retrievers.fieldBuilders.method.*;
@@ -41,14 +40,11 @@
4140
import java.util.*;
4241
import java.util.stream.Collectors;
4342

44-
import static graphql.Scalars.GraphQLBoolean;
4543
import static graphql.annotations.processor.util.ReflectionKit.newInstance;
46-
import static graphql.annotations.processor.util.NamingKit.toGraphqlName;
4744
import static graphql.annotations.processor.util.ObjectUtil.getAllFields;
4845
import static graphql.schema.GraphQLFieldDefinition.newFieldDefinition;
4946
import static graphql.schema.GraphQLInputObjectField.newInputObjectField;
5047
import static java.util.Arrays.stream;
51-
import static java.util.Objects.nonNull;
5248

5349
public class GraphQLFieldRetriever {
5450

@@ -100,8 +96,8 @@ public List<GraphQLFieldDefinition> getExtensionFields(Class<?> object, List<Str
10096
public GraphQLFieldDefinition getField(Method method, ProcessingElementsContainer container) throws GraphQLAnnotationsException {
10197
GraphQLFieldDefinition.Builder builder = newFieldDefinition();
10298
TypeFunction typeFunction = getTypeFunction(method, container);
103-
builder.name(new NameBuilder(method).build());
104-
GraphQLOutputType outputType = new TypeBuilder(method, typeFunction, container).build();
99+
builder.name(new MethodNameBuilder(method).build());
100+
GraphQLOutputType outputType = new MethodTypeBuilder(method, typeFunction, container).build();
105101

106102
boolean isConnection = ConnectionUtil.isConnection(method, outputType);
107103
if (isConnection) {
@@ -113,7 +109,7 @@ public GraphQLFieldDefinition getField(Method method, ProcessingElementsContaine
113109
GraphQLFieldDefinition relayFieldDefinition = handleRelayArguments(method, container, builder, outputType, args);
114110
builder.description(new DescriptionBuilder(method).build())
115111
.deprecate(new DeprecateBuilder(method).build())
116-
.dataFetcher(new DataFetcherBuilder(method, outputType, typeFunction, container, relayFieldDefinition, args, dataFetcherConstructor, isConnection).build());
112+
.dataFetcher(new MethodDataFetcherBuilder(method, outputType, typeFunction, container, relayFieldDefinition, args, dataFetcherConstructor, isConnection).build());
117113
return new GraphQLAnnotations.GraphQLFieldDefinitionWrapper(builder.build());
118114
}
119115

src/main/java/graphql/annotations/processor/retrievers/fieldBuilders/method/ArgumentBuilder.java renamed to src/main/java/graphql/annotations/processor/retrievers/fieldBuilders/ArgumentBuilder.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package graphql.annotations.processor.retrievers.fieldBuilders.method;
1+
package graphql.annotations.processor.retrievers.fieldBuilders;
22

33
import graphql.annotations.annotationTypes.GraphQLDefaultValue;
44
import graphql.annotations.annotationTypes.GraphQLDescription;

src/main/java/graphql/annotations/processor/retrievers/fieldBuilders/method/DeprecateBuilder.java renamed to src/main/java/graphql/annotations/processor/retrievers/fieldBuilders/DeprecateBuilder.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package graphql.annotations.processor.retrievers.fieldBuilders.method;
1+
package graphql.annotations.processor.retrievers.fieldBuilders;
22

33
import graphql.annotations.annotationTypes.GraphQLDeprecate;
44
import graphql.annotations.processor.retrievers.fieldBuilders.Builder;

src/main/java/graphql/annotations/processor/retrievers/fieldBuilders/method/DescriptionBuilder.java renamed to src/main/java/graphql/annotations/processor/retrievers/fieldBuilders/DescriptionBuilder.java

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
1-
package graphql.annotations.processor.retrievers.fieldBuilders.method;
1+
package graphql.annotations.processor.retrievers.fieldBuilders;
22

33
import graphql.annotations.annotationTypes.GraphQLDescription;
4-
import graphql.annotations.processor.retrievers.fieldBuilders.Builder;
54

65
import java.lang.reflect.AccessibleObject;
76

src/main/java/graphql/annotations/processor/retrievers/fieldBuilders/method/DataFetcherBuilder.java renamed to src/main/java/graphql/annotations/processor/retrievers/fieldBuilders/method/MethodDataFetcherBuilder.java

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020
import java.lang.reflect.Method;
2121
import java.util.List;
2222

23-
public class DataFetcherBuilder implements Builder<DataFetcher> {
23+
public class MethodDataFetcherBuilder implements Builder<DataFetcher> {
2424
private Method method;
2525
private GraphQLOutputType outputType;
2626
private TypeFunction typeFunction;
@@ -30,9 +30,9 @@ public class DataFetcherBuilder implements Builder<DataFetcher> {
3030
private DataFetcherConstructor dataFetcherConstructor;
3131
private boolean isConnection;
3232

33-
public DataFetcherBuilder(Method method, GraphQLOutputType outputType, TypeFunction typeFunction,
34-
ProcessingElementsContainer container, GraphQLFieldDefinition relayFieldDefinition,
35-
List<GraphQLArgument> args, DataFetcherConstructor dataFetcherConstructor, boolean isConnection) {
33+
public MethodDataFetcherBuilder(Method method, GraphQLOutputType outputType, TypeFunction typeFunction,
34+
ProcessingElementsContainer container, GraphQLFieldDefinition relayFieldDefinition,
35+
List<GraphQLArgument> args, DataFetcherConstructor dataFetcherConstructor, boolean isConnection) {
3636
this.method = method;
3737
this.outputType = outputType;
3838
this.typeFunction = typeFunction;

src/main/java/graphql/annotations/processor/retrievers/fieldBuilders/method/NameBuilder.java renamed to src/main/java/graphql/annotations/processor/retrievers/fieldBuilders/method/MethodNameBuilder.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,10 +7,10 @@
77

88
import static graphql.annotations.processor.util.NamingKit.toGraphqlName;
99

10-
public class NameBuilder implements Builder<String> {
10+
public class MethodNameBuilder implements Builder<String> {
1111
private Method method;
1212

13-
public NameBuilder(Method method) {
13+
public MethodNameBuilder(Method method) {
1414
this.method = method;
1515
}
1616

src/main/java/graphql/annotations/processor/retrievers/fieldBuilders/method/TypeBuilder.java renamed to src/main/java/graphql/annotations/processor/retrievers/fieldBuilders/method/MethodTypeBuilder.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,12 +10,12 @@
1010
import java.lang.reflect.AnnotatedType;
1111
import java.lang.reflect.Method;
1212

13-
public class TypeBuilder implements Builder<GraphQLOutputType> {
13+
public class MethodTypeBuilder implements Builder<GraphQLOutputType> {
1414
private Method method;
1515
private TypeFunction typeFunction;
1616
private ProcessingElementsContainer container;
1717

18-
public TypeBuilder(Method method, TypeFunction typeFunction, ProcessingElementsContainer container) {
18+
public MethodTypeBuilder(Method method, TypeFunction typeFunction, ProcessingElementsContainer container) {
1919
this.method = method;
2020
this.typeFunction = typeFunction;
2121
this.container = container;

0 commit comments

Comments
 (0)