Skip to content
This repository was archived by the owner on Dec 19, 2023. It is now read-only.

Commit b8749bc

Browse files
oliemansmoliemansm
committed
Fix sonar issues
1 parent 2d34029 commit b8749bc

File tree

7 files changed

+60
-74
lines changed

7 files changed

+60
-74
lines changed

‎graphql-kickstart-spring-boot-autoconfigure-graphql-annotations/src/main/java/graphql/kickstart/graphql/annotations/GraphQLInterfaceTypeResolver.java‎

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,6 @@
44
import graphql.annotations.processor.GraphQLAnnotations;
55
import graphql.schema.GraphQLObjectType;
66
import graphql.schema.TypeResolver;
7-
import org.springframework.beans.BeansException;
87
import org.springframework.context.ApplicationContext;
98
import org.springframework.context.ApplicationContextAware;
109

@@ -27,8 +26,7 @@ public GraphQLObjectType getType(final TypeResolutionEnvironment env) {
2726
}
2827

2928
@Override
30-
public void setApplicationContext(final ApplicationContext applicationContext)
31-
throws BeansException {
29+
public void setApplicationContext(final ApplicationContext applicationContext) {
3230
graphQLAnnotations = applicationContext.getBean(GraphQLAnnotations.class);
3331
}
3432
}

‎graphql-kickstart-spring-boot-autoconfigure-graphql-annotations/src/test/java/graphql/kickstart/graphql/annotations/GraphQLInterfaceQueryTest.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
@DisplayName("Testing interface handling.")
1717
@SpringBootTest(webEnvironment = SpringBootTest.WebEnvironment.RANDOM_PORT)
1818
@ActiveProfiles({"test", "interface-test"})
19-
public class GraphQLInterfaceQueryTest {
19+
class GraphQLInterfaceQueryTest {
2020

2121
@Autowired
2222
private GraphQLTestTemplate graphQLTestTemplate;

‎graphql-kickstart-spring-boot-autoconfigure-tools/src/main/java/graphql/kickstart/tools/boot/GraphQLJavaToolsAutoConfiguration.java‎

Lines changed: 13 additions & 36 deletions
Original file line numberDiff line numberDiff line change
@@ -48,50 +48,23 @@
4848
@EnableConfigurationProperties(GraphQLToolsProperties.class)
4949
public class GraphQLJavaToolsAutoConfiguration {
5050

51-
@Autowired(required = false)
52-
private SchemaParserDictionary dictionary;
53-
54-
@Autowired(required = false)
55-
private GraphQLScalarType[] scalars;
56-
57-
@Autowired(required = false)
58-
private List<SchemaDirective> directives;
59-
60-
@Autowired(required = false)
61-
private List<SchemaDirectiveWiring> directiveWirings;
62-
63-
@Autowired(required = false)
64-
private List<GenericWrapper> genericWrappers;
65-
66-
@Autowired(required = false)
67-
private ObjectMapperConfigurer objectMapperConfigurer;
68-
69-
@Autowired(required = false)
70-
private List<ProxyHandler> proxyHandlers;
71-
72-
@Autowired(required = false)
73-
private CoroutineContextProvider coroutineContextProvider;
74-
75-
@Autowired(required = false)
76-
private List<TypeDefinitionFactory> typeDefinitionFactories;
77-
78-
@Autowired(required = false)
79-
private GraphqlFieldVisibility fieldVisibility;
80-
81-
@Autowired
82-
private GraphQLToolsProperties props;
83-
8451
@Bean
8552
@ConditionalOnMissingBean
86-
public SchemaStringProvider schemaStringProvider() {
53+
public SchemaStringProvider schemaStringProvider(GraphQLToolsProperties props) {
8754
return new ClasspathResourceSchemaStringProvider(props.getSchemaLocationPattern());
8855
}
8956

9057
@Bean
9158
@ConditionalOnMissingBean
9259
@ConfigurationProperties("graphql.tools.schema-parser-options")
9360
public SchemaParserOptions.Builder optionsBuilder(
94-
@Autowired(required = false) PerFieldObjectMapperProvider perFieldObjectMapperProvider
61+
@Autowired(required = false) PerFieldObjectMapperProvider perFieldObjectMapperProvider,
62+
@Autowired(required = false) List<GenericWrapper> genericWrappers,
63+
@Autowired(required = false) ObjectMapperConfigurer objectMapperConfigurer,
64+
@Autowired(required = false) List<ProxyHandler> proxyHandlers,
65+
@Autowired(required = false) CoroutineContextProvider coroutineContextProvider,
66+
@Autowired(required = false) List<TypeDefinitionFactory> typeDefinitionFactories,
67+
@Autowired(required = false) GraphqlFieldVisibility fieldVisibility
9568
) {
9669
SchemaParserOptions.Builder optionsBuilder = SchemaParserOptions.newOptions();
9770

@@ -125,7 +98,11 @@ public SchemaParserOptions.Builder optionsBuilder(
12598
public SchemaParser schemaParser(
12699
List<GraphQLResolver<?>> resolvers,
127100
SchemaStringProvider schemaStringProvider,
128-
SchemaParserOptions.Builder optionsBuilder
101+
SchemaParserOptions.Builder optionsBuilder,
102+
@Autowired(required = false) SchemaParserDictionary dictionary,
103+
@Autowired(required = false) GraphQLScalarType[] scalars,
104+
@Autowired(required = false) List<SchemaDirective> directives,
105+
@Autowired(required = false) List<SchemaDirectiveWiring> directiveWirings
129106
) throws IOException {
130107
SchemaParserBuilder builder = new SchemaParserBuilder();
131108
if (nonNull(dictionary)) {

‎graphql-spring-boot-autoconfigure/src/main/java/graphql/kickstart/spring/web/boot/GraphQLWsServerEndpointRegistration.java‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,7 @@ public void modifyHandshake(ServerEndpointConfig sec, HandshakeRequest request,
2929

3030
@Override
3131
public void start() {
32+
// do nothing
3233
}
3334

3435
@Override

‎graphql-spring-boot-autoconfigure/src/main/java/graphql/kickstart/spring/web/boot/metrics/MetricsInstrumentation.java‎

Lines changed: 27 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -22,11 +22,17 @@ public class MetricsInstrumentation extends TracingInstrumentation {
2222
private static final String UNKNOWN_OPERATION_NAME = "unknown";
2323
private static final String PARENT = "parent";
2424
private static final String FIELD = "field";
25+
private static final String TRACING = "tracing";
26+
private static final String DURATION = "duration";
27+
private static final String EXECUTION = "execution";
28+
private static final String VALIDATION = "validation";
29+
private static final String PARSING = "parsing";
30+
private static final String RESOLVERS = "resolvers";
2531
private static final String TIMER_DESCRIPTION = "Timer that records the time to fetch the data by Operation Name";
26-
private MeterRegistry meterRegistry;
27-
private Boolean tracingEnabled;
32+
private final MeterRegistry meterRegistry;
33+
private final boolean tracingEnabled;
2834

29-
public MetricsInstrumentation(MeterRegistry meterRegistry, Boolean tracingEnabled) {
35+
public MetricsInstrumentation(MeterRegistry meterRegistry, boolean tracingEnabled) {
3036
this.meterRegistry = meterRegistry;
3137
this.tracingEnabled = tracingEnabled;
3238
}
@@ -36,44 +42,44 @@ public CompletableFuture<ExecutionResult> instrumentExecutionResult(
3642
ExecutionResult executionResult, InstrumentationExecutionParameters parameters) {
3743

3844
if (executionResult.getExtensions() != null && executionResult.getExtensions()
39-
.containsKey("tracing")) {
45+
.containsKey(TRACING)) {
4046

4147
Map<String, Object> tracingData = (Map<String, Object>) executionResult.getExtensions()
42-
.get("tracing");
43-
Timer executionTimer = buildQueryTimer(parameters.getOperation(), "execution");
44-
executionTimer.record((long) tracingData.get("duration"), TimeUnit.NANOSECONDS);
48+
.get(TRACING);
49+
Timer executionTimer = buildQueryTimer(parameters.getOperation(), EXECUTION);
50+
executionTimer.record((long) tracingData.get(DURATION), TimeUnit.NANOSECONDS);
4551

4652
//These next 2 ifs might not run if the document is cached on the document provider
47-
if (tracingData.containsKey("validation") && ((Map<String, Object>) tracingData
48-
.get("validation")).containsKey("duration")) {
49-
Timer validationTimer = buildQueryTimer(parameters.getOperation(), "validation");
53+
if (tracingData.containsKey(VALIDATION) && ((Map<String, Object>) tracingData
54+
.get(VALIDATION)).containsKey(DURATION)) {
55+
Timer validationTimer = buildQueryTimer(parameters.getOperation(), VALIDATION);
5056
validationTimer
51-
.record((long) ((Map<String, Object>) tracingData.get("validation")).get("duration"),
57+
.record((long) ((Map<String, Object>) tracingData.get(VALIDATION)).get(DURATION),
5258
TimeUnit.NANOSECONDS);
5359
}
54-
if (tracingData.containsKey("parsing") && ((Map<String, Object>) tracingData.get("parsing"))
55-
.containsKey("duration")) {
56-
Timer parsingTimer = buildQueryTimer(parameters.getOperation(), "parsing");
60+
if (tracingData.containsKey(PARSING) && ((Map<String, Object>) tracingData.get(PARSING))
61+
.containsKey(DURATION)) {
62+
Timer parsingTimer = buildQueryTimer(parameters.getOperation(), PARSING);
5763
parsingTimer
58-
.record((long) ((Map<String, Object>) tracingData.get("parsing")).get("duration"),
64+
.record((long) ((Map<String, Object>) tracingData.get(PARSING)).get(DURATION),
5965
TimeUnit.NANOSECONDS);
6066
}
6167

62-
if (((Map<String, String>) tracingData.get("execution")).containsKey("resolvers")) {
68+
if (((Map<String, String>) tracingData.get(EXECUTION)).containsKey(RESOLVERS)) {
6369

64-
((List<Map<String, Object>>) ((Map<String, Object>) tracingData.get("execution"))
65-
.get("resolvers")).forEach(field -> {
70+
((List<Map<String, Object>>) ((Map<String, Object>) tracingData.get(EXECUTION))
71+
.get(RESOLVERS)).forEach(field -> {
6672

67-
Timer fieldTimer = buildFieldTimer(parameters.getOperation(), "resolvers",
73+
Timer fieldTimer = buildFieldTimer(parameters.getOperation(), RESOLVERS,
6874
(String) field.get("parentType"), (String) field.get("fieldName"));
69-
fieldTimer.record((long) field.get("duration"), TimeUnit.NANOSECONDS);
75+
fieldTimer.record((long) field.get(DURATION), TimeUnit.NANOSECONDS);
7076

7177
});
7278

7379
}
7480

7581
if (!tracingEnabled) {
76-
executionResult.getExtensions().remove("tracing");
82+
executionResult.getExtensions().remove(TRACING);
7783
}
7884
}
7985

‎graphql-spring-boot-test/src/main/java/com/graphql/spring/boot/test/GraphQLTestSubscription.java‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -53,6 +53,7 @@ public class GraphQLTestSubscription {
5353
private static final AtomicInteger ID_COUNTER = new AtomicInteger(1);
5454
private static final UriBuilderFactory URI_BUILDER_FACTORY = new DefaultUriBuilderFactory();
5555
private static final Object STATE_LOCK = new Object();
56+
public static final String PAYLOAD = "payload";
5657
private final Environment environment;
5758
private final ObjectMapper objectMapper;
5859
private final String subscriptionPath;
@@ -109,7 +110,7 @@ public GraphQLTestSubscription init(@Nullable final Object payload) {
109110
}
110111
final ObjectNode message = objectMapper.createObjectNode();
111112
message.put("type", "connection_init");
112-
message.set("payload", getFinalPayload(payload));
113+
message.set(PAYLOAD, getFinalPayload(payload));
113114
sendMessage(message);
114115
state.setInitialized(true);
115116
awaitAcknowledgement();
@@ -152,7 +153,7 @@ public GraphQLTestSubscription start(@NonNull final String graphGLResource,
152153
ObjectNode message = objectMapper.createObjectNode();
153154
message.put("type", "start");
154155
message.put("id", state.getId());
155-
message.set("payload", payload);
156+
message.set(PAYLOAD, payload);
156157
log.debug("Sending start message.");
157158
sendMessage(message);
158159
return this;
@@ -465,7 +466,7 @@ public void onMessage(final String message) {
465466
state.setAcknowledged(true);
466467
log.debug("WebSocket connection acknowledged by the GraphQL Server.");
467468
} else if (type.equals("data") || type.equals("error")) {
468-
final JsonNode payload = jsonNode.get("payload");
469+
final JsonNode payload = jsonNode.get(PAYLOAD);
469470
assertThat(payload).as("Data/error messages must have a payload.").isNotNull();
470471
final String payloadString = objectMapper.writeValueAsString(payload);
471472
final GraphQLResponse graphQLResponse = new GraphQLResponse(

‎graphql-spring-boot-test/src/main/java/com/graphql/spring/boot/test/assertions/GraphQLFieldAssert.java‎

Lines changed: 13 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
package com.graphql.spring.boot.test.assertions;
22

3+
import static java.util.Collections.emptyList;
34
import static java.util.Objects.nonNull;
45
import static org.assertj.core.api.Assertions.fail;
56

@@ -18,6 +19,8 @@
1819
@RequiredArgsConstructor
1920
public class GraphQLFieldAssert implements GraphQLResponseAssertion {
2021

22+
public static final String EXPECTED_FIELD_S_TO_BE_PRESENT = "Expected field %s to be present.";
23+
public static final String EXPECTED_THAT_CONTENT_OF_FIELD_S_CAN_BE_CONVERTED_TO_S = "Expected that content of field %s can be converted to %s.";
2124
private final GraphQLResponse graphQLResponse;
2225
private final String jsonPath;
2326

@@ -67,7 +70,7 @@ public GraphQLFieldAssert isNull() {
6770
fail("Expected field %s to be null.", jsonPath);
6871
}
6972
} catch (PathNotFoundException e) {
70-
fail(String.format("Expected field %s to be present.", jsonPath), e);
73+
fail(String.format(EXPECTED_FIELD_S_TO_BE_PRESENT, jsonPath), e);
7174
}
7275
return this;
7376
}
@@ -84,7 +87,7 @@ public GraphQLFieldAssert isNotNull() {
8487
fail("Expected field %s to be non-null.", jsonPath);
8588
}
8689
} catch (PathNotFoundException e) {
87-
fail(String.format("Expected field %s to be present.", jsonPath), e);
90+
fail(String.format(EXPECTED_FIELD_S_TO_BE_PRESENT, jsonPath), e);
8891
}
8992
return this;
9093
}
@@ -237,10 +240,10 @@ private <T> T getFieldAs(final Class<T> targetClass) {
237240
try {
238241
return graphQLResponse.get(jsonPath, targetClass);
239242
} catch (PathNotFoundException e) {
240-
fail(String.format("Expected field %s to be present.", jsonPath), e);
243+
fail(String.format(EXPECTED_FIELD_S_TO_BE_PRESENT, jsonPath), e);
241244
return null;
242245
} catch (IllegalArgumentException e) {
243-
fail(String.format("Expected that content of field %s can be converted to %s.", jsonPath,
246+
fail(String.format(EXPECTED_THAT_CONTENT_OF_FIELD_S_CAN_BE_CONVERTED_TO_S, jsonPath,
244247
targetClass), e);
245248
return null;
246249
}
@@ -250,11 +253,11 @@ private <T> T getFieldAs(final JavaType javaType) {
250253
try {
251254
return graphQLResponse.get(jsonPath, javaType);
252255
} catch (PathNotFoundException e) {
253-
fail(String.format("Expected field %s to be present.", jsonPath), e);
256+
fail(String.format(EXPECTED_FIELD_S_TO_BE_PRESENT, jsonPath), e);
254257
return null;
255258
} catch (IllegalArgumentException e) {
256259
fail(String
257-
.format("Expected that content of field %s can be converted to %s.", jsonPath, javaType),
260+
.format(EXPECTED_THAT_CONTENT_OF_FIELD_S_CAN_BE_CONVERTED_TO_S, jsonPath, javaType),
258261
e);
259262
return null;
260263
}
@@ -264,12 +267,12 @@ private <T> List<T> getFieldAsList(final Class<T> targetClass) {
264267
try {
265268
return graphQLResponse.getList(jsonPath, targetClass);
266269
} catch (PathNotFoundException e) {
267-
fail(String.format("Expected field %s to be present.", jsonPath), e);
268-
return null;
270+
fail(String.format(EXPECTED_FIELD_S_TO_BE_PRESENT, jsonPath), e);
271+
return emptyList();
269272
} catch (IllegalArgumentException e) {
270-
fail(String.format("Expected that content of field %s can be converted to %s.", jsonPath,
273+
fail(String.format(EXPECTED_THAT_CONTENT_OF_FIELD_S_CAN_BE_CONVERTED_TO_S, jsonPath,
271274
targetClass), e);
272-
return null;
275+
return emptyList();
273276
}
274277
}
275278
}

0 commit comments

Comments
 (0)