Skip to content

Commit d98d9e3

Browse files
committed
Rename postfix to suffix
1 parent d141674 commit d98d9e3

File tree

5 files changed

+12
-15
lines changed

5 files changed

+12
-15
lines changed

src/main/java/graphql/annotations/processor/ProcessingElementsContainer.java

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@
2727
import java.util.Set;
2828
import java.util.Stack;
2929

30-
import static graphql.annotations.processor.util.InputPropertiesUtil.DEFAULT_INPUT_POSTFIX;
30+
import static graphql.annotations.processor.util.InputPropertiesUtil.DEFAULT_INPUT_SUFFIX;
3131
import static graphql.annotations.processor.util.InputPropertiesUtil.DEFAULT_INPUT_PREFIX;
3232

3333
public class ProcessingElementsContainer {
@@ -39,7 +39,7 @@ public class ProcessingElementsContainer {
3939
private Map<Class<?>, Set<Class<?>>> extensionsTypeRegistry;
4040
private Stack<String> processing;
4141
private String inputPrefix = DEFAULT_INPUT_PREFIX;
42-
private String inputPostfix = DEFAULT_INPUT_POSTFIX;
42+
private String inputSuffix = DEFAULT_INPUT_SUFFIX;
4343

4444
public Map<String, GraphQLDirective> getDirectiveRegistry() {
4545
return directiveRegistry;
@@ -114,11 +114,11 @@ public void setInputPrefix(String inputPrefix) {
114114
this.inputPrefix = inputPrefix;
115115
}
116116

117-
public String getInputPostfix() {
118-
return inputPostfix;
117+
public String getInputSuffix() {
118+
return inputSuffix;
119119
}
120120

121-
public void setInputPostfix(String inputPostfix) {
122-
this.inputPostfix = inputPostfix;
121+
public void setInputSuffix(String inputSuffix) {
122+
this.inputSuffix = inputSuffix;
123123
}
124124
}

src/main/java/graphql/annotations/processor/retrievers/GraphQLTypeRetriever.java

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -26,8 +26,6 @@
2626
import graphql.schema.*;
2727
import org.osgi.service.component.annotations.*;
2828

29-
import static graphql.annotations.processor.util.InputPropertiesUtil.DEFAULT_INPUT_PREFIX;
30-
3129
@Component(service = GraphQLTypeRetriever.class, immediate = true)
3230
public class GraphQLTypeRetriever {
3331

@@ -62,7 +60,7 @@ public GraphQLType getGraphQLType(Class<?> object, ProcessingElementsContainer c
6260
GraphQLType type;
6361

6462
if (isInput) {
65-
typeName = container.getInputPrefix() + typeName + container.getInputPostfix();
63+
typeName = container.getInputPrefix() + typeName + container.getInputSuffix();
6664
}
6765

6866
if (container.getProcessing().contains(typeName)) {

src/main/java/graphql/annotations/processor/typeBuilders/InputObjectBuilder.java

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,6 @@
2929
import java.util.ArrayList;
3030
import java.util.List;
3131

32-
import static graphql.annotations.processor.util.InputPropertiesUtil.DEFAULT_INPUT_PREFIX;
3332
import static graphql.annotations.processor.util.ObjectUtil.getAllFields;
3433

3534
public class InputObjectBuilder {
@@ -56,7 +55,7 @@ public InputObjectBuilder(GraphQLObjectInfoRetriever graphQLObjectInfoRetriever,
5655

5756
public GraphQLInputObjectType.Builder getInputObjectBuilder(Class<?> object, ProcessingElementsContainer container) throws GraphQLAnnotationsException {
5857
GraphQLInputObjectType.Builder builder = GraphQLInputObjectType.newInputObject();
59-
builder.name(container.getInputPrefix() + graphQLObjectInfoRetriever.getTypeName(object) + container.getInputPostfix());
58+
builder.name(container.getInputPrefix() + graphQLObjectInfoRetriever.getTypeName(object) + container.getInputSuffix());
6059
GraphQLDescription description = object.getAnnotation(GraphQLDescription.class);
6160
if (description != null) {
6261
builder.description(description.value());

src/main/java/graphql/annotations/processor/util/InputPropertiesUtil.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,5 +16,5 @@
1616

1717
public class InputPropertiesUtil {
1818
public static final String DEFAULT_INPUT_PREFIX = "Input";
19-
public static final String DEFAULT_INPUT_POSTFIX = "";
19+
public static final String DEFAULT_INPUT_SUFFIX = "";
2020
}

src/test/java/graphql/annotations/GraphQLObjectTest.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@
4040
import java.util.function.Supplier;
4141

4242
import static graphql.Scalars.GraphQLString;
43-
import static graphql.annotations.processor.util.InputPropertiesUtil.DEFAULT_INPUT_POSTFIX;
43+
import static graphql.annotations.processor.util.InputPropertiesUtil.DEFAULT_INPUT_SUFFIX;
4444
import static graphql.annotations.processor.util.InputPropertiesUtil.DEFAULT_INPUT_PREFIX;
4545
import static graphql.schema.GraphQLFieldDefinition.newFieldDefinition;
4646
import static graphql.schema.GraphQLSchema.newSchema;
@@ -735,15 +735,15 @@ public void inputObjectCustomPrefixes() {
735735
GraphQLObjectInfoRetriever graphQLObjectInfoRetriever = new GraphQLObjectInfoRetriever();
736736
ProcessingElementsContainer container = GraphQLAnnotations.getInstance().getContainer();
737737
container.setInputPrefix("");
738-
container.setInputPostfix("Input");
738+
container.setInputSuffix("Input");
739739
GraphQLInputObjectType type = new InputObjectBuilder(graphQLObjectInfoRetriever, new ParentalSearch(graphQLObjectInfoRetriever),
740740
new BreadthFirstSearch(graphQLObjectInfoRetriever), new GraphQLFieldRetriever()).
741741
getInputObjectBuilder(InputObject.class, GraphQLAnnotations.getInstance().getContainer()).build();
742742

743743
assertEquals(type.getName(), "" + InputObject.class.getSimpleName() + "Input", "Type name prefix did not match expected value");
744744
assertEquals(type.getFields().size(), InputObject.class.getDeclaredFields().length);
745745
container.setInputPrefix(DEFAULT_INPUT_PREFIX);
746-
container.setInputPostfix(DEFAULT_INPUT_POSTFIX);
746+
container.setInputSuffix(DEFAULT_INPUT_SUFFIX);
747747
}
748748

749749
public static class UUIDTypeFunction implements TypeFunction {

0 commit comments

Comments
 (0)