Skip to content

Commit 6df3c30

Browse files
committed
fix: use bean naming convention for property names
1 parent bde04d5 commit 6df3c30

File tree

4 files changed

+24
-23
lines changed

4 files changed

+24
-23
lines changed

graphql-jpa-query-autoconfigure/src/main/java/com/introproventures/graphql/jpa/query/autoconfigure/GraphQLJpaQueryProperties.java

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -39,12 +39,12 @@ public class GraphQLJpaQueryProperties {
3939
/**
4040
* Enable or disable distinct parameter.
4141
*/
42-
private boolean useDistinctParameter;
42+
private boolean isUseDistinctParameter = false;
4343

4444
/**
4545
* Enable or disable distinct distinct sql query fetcher.
4646
*/
47-
private boolean distinctFetcher;
47+
private boolean isDefaultDistinct = false;
4848

4949
/**
5050
* Enable or disable QraphQL module services.
@@ -92,28 +92,28 @@ public void setDescription(String description) {
9292
* @return the useDistinctParameter
9393
*/
9494
public boolean isUseDistinctParameter() {
95-
return useDistinctParameter;
95+
return isUseDistinctParameter;
9696
}
9797

9898
/**
9999
* @param useDistinctParameter the useDistinctParameter to set
100100
*/
101101
public void setUseDistinctParameter(boolean useDistinctParameter) {
102-
this.useDistinctParameter = useDistinctParameter;
102+
this.isUseDistinctParameter = useDistinctParameter;
103103
}
104104

105105
/**
106106
* @return the distinctFetcher
107107
*/
108-
public boolean isDistinctFetcher() {
109-
return distinctFetcher;
108+
public boolean isDefautltDistinct() {
109+
return isDefaultDistinct;
110110
}
111111

112112
/**
113-
* @param distinctFetcher the distinctFetcher to set
113+
* @param isDefaultDistinct the distinctFetcher to set
114114
*/
115-
public void setDistinctFetcher(boolean distinctFetcher) {
116-
this.distinctFetcher = distinctFetcher;
115+
public void setDefaultDistinct(boolean isDefaultDistinct) {
116+
this.isDefaultDistinct = isDefaultDistinct;
117117
}
118118

119119
/**
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
spring.graphql.jpa.query.name=Query
22
spring.graphql.jpa.query.description=
33
spring.graphql.jpa.query.useDistinctParameter=false
4-
spring.graphql.jpa.query.distinctFetcher=false
4+
spring.graphql.jpa.query.defaultDistinct=false
55
spring.graphql.jpa.query.enabled=true
66
spring.graphql.jpa.query.path=/graphql

graphql-jpa-query-example-merge/src/main/java/com/introproventures/graphql/jpa/query/example/books/BooksSchemaConfiguration.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -89,7 +89,7 @@ public void configure(GraphQLShemaRegistration registry) {
8989
new GraphQLJpaSchemaBuilder(entityManager)
9090
.name("GraphQLBooks")
9191
.useDistinctParameter(properties.isUseDistinctParameter())
92-
.setDistinctFetcher(properties.isDistinctFetcher())
92+
.setDefaultDistinct(properties.isDefautltDistinct())
9393
.build()
9494
);
9595
}

graphql-jpa-query-schema/src/main/java/com/introproventures/graphql/jpa/query/schema/impl/GraphQLJpaSchemaBuilder.java

Lines changed: 13 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -43,13 +43,13 @@
4343
import javax.persistence.metamodel.SingularAttribute;
4444
import javax.persistence.metamodel.Type;
4545

46-
import com.introproventures.graphql.jpa.query.annotation.GraphQLIgnoreFilter;
47-
import com.introproventures.graphql.jpa.query.annotation.GraphQLIgnoreOrder;
4846
import org.slf4j.Logger;
4947
import org.slf4j.LoggerFactory;
5048

5149
import com.introproventures.graphql.jpa.query.annotation.GraphQLDescription;
5250
import com.introproventures.graphql.jpa.query.annotation.GraphQLIgnore;
51+
import com.introproventures.graphql.jpa.query.annotation.GraphQLIgnoreFilter;
52+
import com.introproventures.graphql.jpa.query.annotation.GraphQLIgnoreOrder;
5353
import com.introproventures.graphql.jpa.query.schema.GraphQLSchemaBuilder;
5454
import com.introproventures.graphql.jpa.query.schema.JavaScalars;
5555
import com.introproventures.graphql.jpa.query.schema.NamingStrategy;
@@ -115,8 +115,8 @@ public class GraphQLJpaSchemaBuilder implements GraphQLSchemaBuilder {
115115

116116
private String description = "GraphQL Schema for all entities in this JPA application";
117117

118-
private boolean distinctParameter = false;
119-
private boolean distinctFetcher = false;
118+
private boolean isUseDistinctParameter = false;
119+
private boolean isDefaultDistinct = false;
120120

121121
public GraphQLJpaSchemaBuilder(EntityManager entityManager) {
122122
this.entityManager = entityManager;
@@ -205,10 +205,10 @@ private GraphQLFieldDefinition getQueryFieldSelectDefinition(EntityType<?> entit
205205
+ "Use the '"+QUERY_SELECT_PARAM_NAME+"' field to request actual fields. "
206206
+ "Use the '"+ORDER_BY_PARAM_NAME+"' on a field to specify sort order for each field. ")
207207
.type(pageType)
208-
.dataFetcher(new GraphQLJpaQueryDataFetcher(entityManager, entityType, distinctFetcher))
208+
.dataFetcher(new GraphQLJpaQueryDataFetcher(entityManager, entityType, isDefaultDistinct))
209209
.argument(paginationArgument)
210210
.argument(getWhereArgument(entityType));
211-
if (distinctParameter) {
211+
if (isUseDistinctParameter) {
212212
fdBuilder.argument(distinctArgument(entityType));
213213
}
214214

@@ -222,6 +222,7 @@ private GraphQLArgument distinctArgument(EntityType<?> entityType) {
222222
.name(SELECT_DISTINCT_PARAM_NAME)
223223
.description("Distinct logical specification")
224224
.type(Scalars.GraphQLBoolean)
225+
.defaultValue(isDefaultDistinct)
225226
.build();
226227
}
227228

@@ -258,7 +259,7 @@ private GraphQLArgument getWhereArgument(ManagedType<?> managedType) {
258259
.fields(managedType.getAttributes().stream()
259260
.filter(this::isValidInput)
260261
.filter(this::isNotIgnored)
261-
.filter(this::isNotIgnoredFilter)
262+
.filter(this::isNotIgnoredFilter)
262263
.map(this::getWhereInputField)
263264
.collect(Collectors.toList())
264265
)
@@ -988,21 +989,21 @@ public GraphQLJpaSchemaBuilder description(String description) {
988989
}
989990

990991
public GraphQLJpaSchemaBuilder useDistinctParameter(boolean distinctArgument) {
991-
this.distinctParameter = distinctArgument;
992+
this.isUseDistinctParameter = distinctArgument;
992993

993994
return this;
994995
}
995996

996997
public boolean isDistinctParameter() {
997-
return distinctParameter;
998+
return isUseDistinctParameter;
998999
}
9991000

10001001
public boolean isDistinctFetcher() {
1001-
return distinctFetcher;
1002+
return isDefaultDistinct;
10021003
}
10031004

1004-
public GraphQLJpaSchemaBuilder setDistinctFetcher(boolean distinctFetcher) {
1005-
this.distinctFetcher = distinctFetcher;
1005+
public GraphQLJpaSchemaBuilder setDefaultDistinct(boolean distinctFetcher) {
1006+
this.isDefaultDistinct = distinctFetcher;
10061007

10071008
return this;
10081009
}

0 commit comments

Comments
 (0)