Skip to content

Commit 63d6fe9

Browse files
Address SonarCloud duplicate string literal issues
Co-authored-by: thomasturrell <1552612+thomasturrell@users.noreply.github.com>
1 parent 847195e commit 63d6fe9

2 files changed

Lines changed: 14 additions & 6 deletions

File tree

xapi-client/src/main/java/dev/learning/xapi/client/GetStatementsRequest.java

Lines changed: 9 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,11 @@
44

55
package dev.learning.xapi.client;
66

7+
import static dev.learning.xapi.client.XapiClientConstants.AGENT_PARAM;
8+
import static dev.learning.xapi.client.XapiClientConstants.AGENT_TEMPLATE;
9+
import static dev.learning.xapi.client.XapiClientConstants.ATTACHMENTS_PARAM;
10+
import static dev.learning.xapi.client.XapiClientConstants.STATEMENTS_PATH;
11+
712
import com.fasterxml.jackson.databind.ObjectMapper;
813
import dev.learning.xapi.model.Agent;
914
import dev.learning.xapi.model.StatementFormat;
@@ -68,11 +73,11 @@ public UriBuilder url(UriBuilder uriBuilder, Map<String, Object> queryParams) {
6873

6974
// All queryParams are optional
7075

71-
uriBuilder.path("/statements");
76+
uriBuilder.path(STATEMENTS_PATH);
7277

7378
if (agent != null) {
74-
queryParams.put("agent", agentToJsonString());
75-
uriBuilder.queryParam("agent", "{agent}");
79+
queryParams.put(AGENT_PARAM, agentToJsonString());
80+
uriBuilder.queryParam(AGENT_PARAM, AGENT_TEMPLATE);
7681
}
7782

7883
if (verb != null) {
@@ -101,7 +106,7 @@ public UriBuilder url(UriBuilder uriBuilder, Map<String, Object> queryParams) {
101106
.queryParamIfPresent("related_agents", Optional.ofNullable(relatedAgents))
102107
.queryParamIfPresent("limit", Optional.ofNullable(limit))
103108
.queryParamIfPresent("format", Optional.ofNullable(format))
104-
.queryParamIfPresent("attachments", Optional.ofNullable(attachments))
109+
.queryParamIfPresent(ATTACHMENTS_PARAM, Optional.ofNullable(attachments))
105110
.queryParamIfPresent("ascending", Optional.ofNullable(ascending));
106111
}
107112

xapi-client/src/main/java/dev/learning/xapi/client/GetVoidedStatementRequest.java

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,9 @@
44

55
package dev.learning.xapi.client;
66

7+
import static dev.learning.xapi.client.XapiClientConstants.ATTACHMENTS_PARAM;
8+
import static dev.learning.xapi.client.XapiClientConstants.STATEMENTS_PATH;
9+
710
import java.util.Map;
811
import java.util.Optional;
912
import java.util.UUID;
@@ -28,10 +31,10 @@ public class GetVoidedStatementRequest extends GetStatementRequest {
2831
public UriBuilder url(UriBuilder uriBuilder, Map<String, Object> queryParams) {
2932

3033
return uriBuilder
31-
.path("/statements")
34+
.path(STATEMENTS_PATH)
3235
.queryParam("voidedStatementId", id)
3336
.queryParamIfPresent("format", Optional.ofNullable(format))
34-
.queryParamIfPresent("attachments", Optional.ofNullable(attachments));
37+
.queryParamIfPresent(ATTACHMENTS_PARAM, Optional.ofNullable(attachments));
3538
}
3639

3740
/** Builder for GetVoidedStatementRequest. */

0 commit comments

Comments
 (0)