Skip to content

Commit 8b650e8

Browse files
igdianovigdianov
committed
apply prettier java format
1 parent e9f5a98 commit 8b650e8

File tree

200 files changed

+17865
-17299
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

200 files changed

+17865
-17299
lines changed

‎annotations/src/main/java/com/introproventures/graphql/jpa/query/annotation/GraphQLDefaultOrderBy.java

+4-4
Original file line numberDiff line numberDiff line change
@@ -22,13 +22,13 @@
2222

2323
/**
2424
* Mark the default field to be ordered by GraphQL JPA Schema Executor
25-
* If there are no orders specified in the resulting query, the @Id field
25+
* If there are no orders specified in the resulting query, the @Id field
2626
* will be used as a default sorting key
27-
*
27+
*
2828
* @author Igor Dianov
2929
*/
3030
@Retention(RetentionPolicy.RUNTIME)
3131
@Target(ElementType.FIELD)
3232
public @interface GraphQLDefaultOrderBy {
33-
public boolean asc() default true; //Default order ASCENDING
34-
}
33+
public boolean asc() default true; //Default order ASCENDING
34+
}

‎annotations/src/main/java/com/introproventures/graphql/jpa/query/annotation/GraphQLDescription.java

+3-5
Original file line numberDiff line numberDiff line change
@@ -16,23 +16,21 @@
1616
package com.introproventures.graphql.jpa.query.annotation;
1717

1818
import static java.lang.annotation.ElementType.FIELD;
19-
import static java.lang.annotation.ElementType.TYPE;
2019
import static java.lang.annotation.ElementType.METHOD;
20+
import static java.lang.annotation.ElementType.TYPE;
2121
import static java.lang.annotation.RetentionPolicy.RUNTIME;
2222

2323
import java.lang.annotation.Retention;
2424
import java.lang.annotation.Target;
2525

2626
/**
2727
* Use this annotation on Java types or fields to provide QraphQLSchema descriptions for QraphQLSchemaBuilder
28-
*
28+
*
2929
* @author Igor Dianov
3030
*
3131
*/
32-
@Target( { TYPE, FIELD, METHOD })
32+
@Target({ TYPE, FIELD, METHOD })
3333
@Retention(RUNTIME)
3434
public @interface GraphQLDescription {
35-
3635
String value();
37-
3836
}

‎annotations/src/main/java/com/introproventures/graphql/jpa/query/annotation/GraphQLIgnore.java

+3-3
Original file line numberDiff line numberDiff line change
@@ -24,12 +24,12 @@
2424
import java.lang.annotation.Target;
2525

2626
/**
27-
* Use this annotation on Java JPA Entity types or fields to exclude elements from GraphQLSchema
28-
*
27+
* Use this annotation on Java JPA Entity types or fields to exclude elements from GraphQLSchema
28+
*
2929
* @author Igor Dianov
3030
*
3131
*/
32-
@Target( { TYPE, FIELD, METHOD })
32+
@Target({ TYPE, FIELD, METHOD })
3333
@Retention(RUNTIME)
3434
public @interface GraphQLIgnore {
3535
}

‎annotations/src/main/java/com/introproventures/graphql/jpa/query/annotation/GraphQLIgnoreFilter.java

+4-5
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,13 @@
11
package com.introproventures.graphql.jpa.query.annotation;
22

3-
import java.lang.annotation.Retention;
4-
import java.lang.annotation.Target;
5-
63
import static java.lang.annotation.ElementType.FIELD;
74
import static java.lang.annotation.ElementType.TYPE;
85
import static java.lang.annotation.RetentionPolicy.RUNTIME;
96

10-
@Target( { TYPE, FIELD })
7+
import java.lang.annotation.Retention;
8+
import java.lang.annotation.Target;
9+
10+
@Target({ TYPE, FIELD })
1111
@Retention(RUNTIME)
1212
public @interface GraphQLIgnoreFilter {
1313
}
14-

‎annotations/src/main/java/com/introproventures/graphql/jpa/query/annotation/GraphQLIgnoreOrder.java

+3-5
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,12 @@
11
package com.introproventures.graphql.jpa.query.annotation;
22

3+
import static java.lang.annotation.ElementType.FIELD;
4+
import static java.lang.annotation.RetentionPolicy.RUNTIME;
35

46
import java.lang.annotation.Retention;
57
import java.lang.annotation.Target;
68

7-
import static java.lang.annotation.ElementType.FIELD;
8-
import static java.lang.annotation.RetentionPolicy.RUNTIME;
9-
10-
@Target( { FIELD })
9+
@Target({ FIELD })
1110
@Retention(RUNTIME)
1211
public @interface GraphQLIgnoreOrder {
1312
}
14-

‎autoconfigure/src/main/java/com/introproventures/graphql/jpa/query/autoconfigure/EnableGraphQLJpaQuerySchema.java

+4-5
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,14 @@
11
package com.introproventures.graphql.jpa.query.autoconfigure;
22

3-
import org.springframework.boot.autoconfigure.ImportAutoConfiguration;
4-
import org.springframework.boot.autoconfigure.domain.EntityScan;
5-
import org.springframework.context.annotation.Import;
6-
import org.springframework.core.annotation.AliasFor;
7-
83
import java.lang.annotation.Documented;
94
import java.lang.annotation.ElementType;
105
import java.lang.annotation.Retention;
116
import java.lang.annotation.RetentionPolicy;
127
import java.lang.annotation.Target;
8+
import org.springframework.boot.autoconfigure.ImportAutoConfiguration;
9+
import org.springframework.boot.autoconfigure.domain.EntityScan;
10+
import org.springframework.context.annotation.Import;
11+
import org.springframework.core.annotation.AliasFor;
1312

1413
@Target({ ElementType.TYPE })
1514
@Retention(RetentionPolicy.RUNTIME)

‎autoconfigure/src/main/java/com/introproventures/graphql/jpa/query/autoconfigure/EnableGraphQLJpaQuerySchemaImportSelector.java

+10-11
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,11 @@
11
package com.introproventures.graphql.jpa.query.autoconfigure;
22

3-
import org.springframework.context.annotation.ImportSelector;
4-
import org.springframework.core.annotation.AnnotationAttributes;
5-
import org.springframework.core.type.AnnotationMetadata;
6-
73
import java.util.ArrayList;
84
import java.util.List;
95
import java.util.stream.Stream;
6+
import org.springframework.context.annotation.ImportSelector;
7+
import org.springframework.core.annotation.AnnotationAttributes;
8+
import org.springframework.core.type.AnnotationMetadata;
109

1110
class EnableGraphQLJpaQuerySchemaImportSelector implements ImportSelector {
1211

@@ -15,14 +14,15 @@ class EnableGraphQLJpaQuerySchemaImportSelector implements ImportSelector {
1514
@Override
1615
public String[] selectImports(AnnotationMetadata importingClassMetadata) {
1716
AnnotationAttributes attributes = AnnotationAttributes.fromMap(
18-
importingClassMetadata.getAnnotationAttributes(
19-
EnableGraphQLJpaQuerySchema.class.getName(), false));
17+
importingClassMetadata.getAnnotationAttributes(EnableGraphQLJpaQuerySchema.class.getName(), false)
18+
);
2019

2120
if (attributes != null) {
22-
Stream.of(attributes.getClassArray("basePackageClasses"))
23-
.map(Class::getPackage)
24-
.map(Package::getName)
25-
.forEach(packageNames::add);
21+
Stream
22+
.of(attributes.getClassArray("basePackageClasses"))
23+
.map(Class::getPackage)
24+
.map(Package::getName)
25+
.forEach(packageNames::add);
2626
}
2727

2828
return new String[0];
@@ -31,5 +31,4 @@ public String[] selectImports(AnnotationMetadata importingClassMetadata) {
3131
static List<String> getPackageNames() {
3232
return packageNames;
3333
}
34-
3534
}

‎autoconfigure/src/main/java/com/introproventures/graphql/jpa/query/autoconfigure/GraphQLJpaQueryAutoConfiguration.java

+29-19
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,6 @@
1515
*/
1616
package com.introproventures.graphql.jpa.query.autoconfigure;
1717

18-
import java.util.function.Supplier;
1918
import com.introproventures.graphql.jpa.query.schema.GraphQLExecutionInputFactory;
2019
import com.introproventures.graphql.jpa.query.schema.GraphQLExecutor;
2120
import com.introproventures.graphql.jpa.query.schema.GraphQLExecutorContextFactory;
@@ -27,6 +26,7 @@
2726
import graphql.execution.instrumentation.Instrumentation;
2827
import graphql.schema.GraphQLSchema;
2928
import graphql.schema.visibility.GraphqlFieldVisibility;
29+
import java.util.function.Supplier;
3030
import org.springframework.beans.factory.ObjectProvider;
3131
import org.springframework.boot.autoconfigure.AutoConfiguration;
3232
import org.springframework.boot.autoconfigure.condition.ConditionalOnBean;
@@ -37,24 +37,33 @@
3737
import org.springframework.context.annotation.Bean;
3838
import org.springframework.graphql.ExecutionGraphQlService;
3939

40-
@AutoConfiguration(after = {
41-
HibernateJpaAutoConfiguration.class,
42-
GraphQLJpaQueryGraphQlExecutionAutoConfiguration.class,
43-
GraphQLSchemaAutoConfiguration.class
44-
})
45-
@ConditionalOnClass({GraphQL.class, GraphQLExecutor.class})
46-
@ConditionalOnProperty(prefix = "spring.graphql.jpa.query", name = {"enabled", "executor.enabled"}, havingValue="true", matchIfMissing=true)
40+
@AutoConfiguration(
41+
after = {
42+
HibernateJpaAutoConfiguration.class,
43+
GraphQLJpaQueryGraphQlExecutionAutoConfiguration.class,
44+
GraphQLSchemaAutoConfiguration.class,
45+
}
46+
)
47+
@ConditionalOnClass({ GraphQL.class, GraphQLExecutor.class })
48+
@ConditionalOnProperty(
49+
prefix = "spring.graphql.jpa.query",
50+
name = { "enabled", "executor.enabled" },
51+
havingValue = "true",
52+
matchIfMissing = true
53+
)
4754
public class GraphQLJpaQueryAutoConfiguration {
4855

4956
@Bean
5057
@ConditionalOnMissingBean
51-
public GraphQLExecutorContextFactory graphQLJpaExecutorContextFactory(ObjectProvider<GraphQLExecutionInputFactory> graphQLExecutionInputFactory,
52-
ObjectProvider<Supplier<GraphqlFieldVisibility>> graphqlFieldVisibility,
53-
ObjectProvider<Supplier<Instrumentation>> instrumentation,
54-
ObjectProvider<Supplier<GraphQLContext>> graphqlContext,
55-
ObjectProvider<Supplier<ExecutionStrategy>> queryExecutionStrategy,
56-
ObjectProvider<Supplier<ExecutionStrategy>> mutationExecutionStrategy,
57-
ObjectProvider<Supplier<ExecutionStrategy>> subscriptionExecutionStrategy) {
58+
public GraphQLExecutorContextFactory graphQLJpaExecutorContextFactory(
59+
ObjectProvider<GraphQLExecutionInputFactory> graphQLExecutionInputFactory,
60+
ObjectProvider<Supplier<GraphqlFieldVisibility>> graphqlFieldVisibility,
61+
ObjectProvider<Supplier<Instrumentation>> instrumentation,
62+
ObjectProvider<Supplier<GraphQLContext>> graphqlContext,
63+
ObjectProvider<Supplier<ExecutionStrategy>> queryExecutionStrategy,
64+
ObjectProvider<Supplier<ExecutionStrategy>> mutationExecutionStrategy,
65+
ObjectProvider<Supplier<ExecutionStrategy>> subscriptionExecutionStrategy
66+
) {
5867
GraphQLJpaExecutorContextFactory bean = new GraphQLJpaExecutorContextFactory();
5968

6069
graphQLExecutionInputFactory.ifAvailable(bean::withExecutionInputFactory);
@@ -71,9 +80,10 @@ public GraphQLExecutorContextFactory graphQLJpaExecutorContextFactory(ObjectProv
7180
@Bean
7281
@ConditionalOnMissingBean(ExecutionGraphQlService.class)
7382
@ConditionalOnBean(GraphQLSchema.class)
74-
public GraphQLExecutor graphQLJpaExecutor(GraphQLSchema graphQLSchema,
75-
GraphQLExecutorContextFactory graphQLExecutorContextFactory) {
76-
return new GraphQLJpaExecutor(graphQLSchema,
77-
graphQLExecutorContextFactory);
83+
public GraphQLExecutor graphQLJpaExecutor(
84+
GraphQLSchema graphQLSchema,
85+
GraphQLExecutorContextFactory graphQLExecutorContextFactory
86+
) {
87+
return new GraphQLJpaExecutor(graphQLSchema, graphQLExecutorContextFactory);
7888
}
7989
}

‎autoconfigure/src/main/java/com/introproventures/graphql/jpa/query/autoconfigure/GraphQLJpaQueryGraphQlExecutionAutoConfiguration.java

+7-7
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
import org.springframework.graphql.execution.GraphQlSource;
1414

1515
@AutoConfiguration(after = GraphQLJpaQueryGraphQlSourceAutoConfiguration.class)
16-
@ConditionalOnClass({GraphQL.class, GraphQlSource.class})
16+
@ConditionalOnClass({ GraphQL.class, GraphQlSource.class })
1717
public class GraphQLJpaQueryGraphQlExecutionAutoConfiguration {
1818

1919
@Bean
@@ -25,11 +25,11 @@ BatchLoaderRegistry batchLoaderRegistry(ListableBeanFactory beanFactory) {
2525
@Bean
2626
@ConditionalOnMissingBean
2727
@ConditionalOnBean(GraphQlSource.class)
28-
ExecutionGraphQlService executionGraphQlService(ListableBeanFactory beanFactory,
29-
GraphQlSource graphQlSource,
30-
BatchLoaderRegistry batchLoaderRegistry) {
31-
return new GraphQlAutoConfiguration(beanFactory).executionGraphQlService(graphQlSource,
32-
batchLoaderRegistry);
28+
ExecutionGraphQlService executionGraphQlService(
29+
ListableBeanFactory beanFactory,
30+
GraphQlSource graphQlSource,
31+
BatchLoaderRegistry batchLoaderRegistry
32+
) {
33+
return new GraphQlAutoConfiguration(beanFactory).executionGraphQlService(graphQlSource, batchLoaderRegistry);
3334
}
34-
3535
}

‎autoconfigure/src/main/java/com/introproventures/graphql/jpa/query/autoconfigure/GraphQLJpaQueryGraphQlSourceAutoConfiguration.java

+33-30
Original file line numberDiff line numberDiff line change
@@ -40,53 +40,57 @@
4040
import org.springframework.graphql.execution.SubscriptionExceptionResolver;
4141

4242
@AutoConfiguration(before = GraphQlAutoConfiguration.class, after = GraphQLSchemaAutoConfiguration.class)
43-
@ConditionalOnClass({GraphQL.class, GraphQlSource.class, GraphQLSchemaConfigurer.class})
44-
@ConditionalOnProperty(name="spring.graphql.jpa.query.enabled", havingValue="true", matchIfMissing=true)
43+
@ConditionalOnClass({ GraphQL.class, GraphQlSource.class, GraphQLSchemaConfigurer.class })
44+
@ConditionalOnProperty(name = "spring.graphql.jpa.query.enabled", havingValue = "true", matchIfMissing = true)
4545
@EnableConfigurationProperties(GraphQlProperties.class)
4646
public class GraphQLJpaQueryGraphQlSourceAutoConfiguration {
4747

4848
@Bean
4949
@ConditionalOnGraphQlSchema
50-
GraphQLSchemaConfigurer graphQlSourceSchemaConfigurer(ListableBeanFactory beanFactory,
51-
ResourcePatternResolver resourcePatternResolver,
52-
GraphQlProperties properties,
53-
ObjectProvider<DataFetcherExceptionResolver> exceptionResolvers,
54-
ObjectProvider<SubscriptionExceptionResolver> subscriptionExceptionResolvers,
55-
ObjectProvider<Instrumentation> instrumentations,
56-
ObjectProvider<RuntimeWiringConfigurer> wiringConfigurers,
57-
ObjectProvider<GraphQlSourceBuilderCustomizer> sourceCustomizers) {
50+
GraphQLSchemaConfigurer graphQlSourceSchemaConfigurer(
51+
ListableBeanFactory beanFactory,
52+
ResourcePatternResolver resourcePatternResolver,
53+
GraphQlProperties properties,
54+
ObjectProvider<DataFetcherExceptionResolver> exceptionResolvers,
55+
ObjectProvider<SubscriptionExceptionResolver> subscriptionExceptionResolvers,
56+
ObjectProvider<Instrumentation> instrumentations,
57+
ObjectProvider<RuntimeWiringConfigurer> wiringConfigurers,
58+
ObjectProvider<GraphQlSourceBuilderCustomizer> sourceCustomizers
59+
) {
5860
return registry -> {
5961
GraphQlAutoConfiguration graphQlAutoConfiguration = new GraphQlAutoConfiguration(beanFactory);
6062

61-
GraphQlSource graphQlSource = graphQlAutoConfiguration.graphQlSource(resourcePatternResolver,
62-
properties,
63-
exceptionResolvers,
64-
subscriptionExceptionResolvers,
65-
instrumentations,
66-
wiringConfigurers,
67-
sourceCustomizers);
63+
GraphQlSource graphQlSource = graphQlAutoConfiguration.graphQlSource(
64+
resourcePatternResolver,
65+
properties,
66+
exceptionResolvers,
67+
subscriptionExceptionResolvers,
68+
instrumentations,
69+
wiringConfigurers,
70+
sourceCustomizers
71+
);
6872
registry.register(graphQlSource.schema());
6973
};
7074
}
7175

7276
@Bean
7377
@ConditionalOnMissingBean(GraphQlSource.class)
7478
@ConditionalOnBean(GraphQLSchema.class)
75-
public GraphQlSource graphQlSource(GraphQLSchema graphQLSchema,
76-
ObjectProvider<DataFetcherExceptionResolver> exceptionResolvers,
77-
ObjectProvider<SubscriptionExceptionResolver> subscriptionExceptionResolvers,
78-
ObjectProvider<Instrumentation> instrumentations,
79-
ObjectProvider<Consumer<GraphQL.Builder>> configurers) {
79+
public GraphQlSource graphQlSource(
80+
GraphQLSchema graphQLSchema,
81+
ObjectProvider<DataFetcherExceptionResolver> exceptionResolvers,
82+
ObjectProvider<SubscriptionExceptionResolver> subscriptionExceptionResolvers,
83+
ObjectProvider<Instrumentation> instrumentations,
84+
ObjectProvider<Consumer<GraphQL.Builder>> configurers
85+
) {
8086
GraphQlSource.Builder<?> builder = GraphQlSource.builder(graphQLSchema);
8187

82-
builder.exceptionResolvers(exceptionResolvers.orderedStream().collect(Collectors.toList()))
83-
.subscriptionExceptionResolvers(subscriptionExceptionResolvers.orderedStream()
84-
.collect(Collectors.toList()))
85-
.instrumentation(instrumentations.orderedStream()
86-
.collect(Collectors.toList()));
88+
builder
89+
.exceptionResolvers(exceptionResolvers.orderedStream().collect(Collectors.toList()))
90+
.subscriptionExceptionResolvers(subscriptionExceptionResolvers.orderedStream().collect(Collectors.toList()))
91+
.instrumentation(instrumentations.orderedStream().collect(Collectors.toList()));
8792

88-
configurers.orderedStream()
89-
.forEach(builder::configureGraphQl);
93+
configurers.orderedStream().forEach(builder::configureGraphQl);
9094

9195
return builder.build();
9296
}
@@ -96,5 +100,4 @@ public GraphQlSource graphQlSource(GraphQLSchema graphQLSchema,
96100
public JavaScalarsRuntimeWiringConfigurer javaScalarsRuntimeWiringConfigurer() {
97101
return new JavaScalarsRuntimeWiringConfigurer();
98102
}
99-
100103
}

0 commit comments

Comments
 (0)