Skip to content

Commit 5a05679

Browse files
arshinsalimarshinsalim
authored
content type changes (#657)
* content type changes
1 parent 32e552f commit 5a05679

File tree

5 files changed

+89
-47
lines changed

5 files changed

+89
-47
lines changed

‎config/owasp/suppressions.xml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,7 @@
2121
<suppress>
2222
<notes>Suppressing disputed CVE: https://github.com/FasterXML/jackson-databind/issues/3972</notes>
2323
<cve>CVE-2023-35116</cve>
24+
<cve>CVE-2023-34047</cve>
2425
</suppress>
2526

2627
</suppressions>

‎src/integrationTest/java/uk/gov/hmcts/reform/judicialapi/SearchUsersIntegrationTest.java

Lines changed: 43 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
import java.util.List;
1313
import java.util.Map;
1414

15-
import static org.apache.commons.lang.StringUtils.EMPTY;
15+
import static org.apache.logging.log4j.util.Strings.EMPTY;
1616
import static org.assertj.core.api.Assertions.assertThat;
1717
import static org.junit.jupiter.api.Assertions.assertEquals;
1818
import static org.junit.jupiter.api.Assertions.assertTrue;
@@ -28,7 +28,8 @@ void shouldReturn200WhenUserProfileRequestedForGivenSearchString(String role) {
2828
.searchString("test")
2929
.build();
3030
var response = judicialReferenceDataClient.searchUsers(
31-
userSearchRequest, role, false,MediaType.valueOf(V1.MediaType.SERVICE));
31+
userSearchRequest, role, false,
32+
MediaType.valueOf(V1.MediaType.SERVICE),MediaType.valueOf(V1.MediaType.SERVICE));
3233
var profiles = (List<Map<String, String>>)response.get("body");
3334
assertEquals(3, profiles.size());
3435
assertEquals("test530@test.net", profiles.get(0).get("emailId"));
@@ -48,7 +49,8 @@ void shouldReturn200WhenUserProfileRequestedForGivenSearchStringAndServiceCodeAn
4849
.serviceCode("BBA3")
4950
.build();
5051
var response = judicialReferenceDataClient.searchUsers(
51-
userSearchRequest, role, false, MediaType.valueOf(V1.MediaType.SERVICE));
52+
userSearchRequest, role, false,
53+
MediaType.valueOf(V1.MediaType.SERVICE),MediaType.valueOf(V1.MediaType.SERVICE));
5254
var profiles = (List<Map<String, String>>)response.get("body");
5355
assertEquals(2, profiles.size());
5456
assertEquals("test528@test.net", profiles.get(0).get("emailId"));
@@ -65,7 +67,8 @@ void shouldReturn200AndIgnoreLocationWhenServiceCodeIsBfa1(String role, String l
6567
.serviceCode("BFA1")
6668
.build();
6769
var response = judicialReferenceDataClient.searchUsers(
68-
userSearchRequest, role, false,MediaType.valueOf(V1.MediaType.SERVICE));
70+
userSearchRequest, role, false,
71+
MediaType.valueOf(V1.MediaType.SERVICE),MediaType.valueOf(V1.MediaType.SERVICE));
6972
var profiles = (List<Map<String, String>>)response.get("body");
7073
assertEquals(2, profiles.size());
7174
assertEquals("test530@test.net", profiles.get(0).get("emailId"));
@@ -83,7 +86,8 @@ void shouldReturn200AndIgnoreLocationWhenServiceCodeIsAaa6(String role, String l
8386
.serviceCode("AAA6")
8487
.build();
8588
var response = judicialReferenceDataClient.searchUsers(
86-
userSearchRequest, role, false,MediaType.valueOf(V1.MediaType.SERVICE));
89+
userSearchRequest, role, false,
90+
MediaType.valueOf(V1.MediaType.SERVICE),MediaType.valueOf(V1.MediaType.SERVICE));
8791
var profiles = (List<Map<String, String>>)response.get("body");
8892
assertEquals(1, profiles.size());
8993
assertEquals("test528@test.net", profiles.get(0).get("emailId"));
@@ -100,7 +104,8 @@ void shouldReturn200AndIgnoreLocationWhenServiceCodeIsAaa7(String role, String l
100104
.serviceCode("AAA7")
101105
.build();
102106
var response = judicialReferenceDataClient.searchUsers(
103-
userSearchRequest, role, false,MediaType.valueOf(V1.MediaType.SERVICE));
107+
userSearchRequest, role, false,
108+
MediaType.valueOf(V1.MediaType.SERVICE),MediaType.valueOf(V1.MediaType.SERVICE));
104109
var profiles = (List<Map<String, String>>)response.get("body");
105110
assertEquals(1, profiles.size());
106111
assertEquals("test529@test.net", profiles.get(0).get("emailId"));
@@ -117,7 +122,8 @@ void shouldReturn200AndIgnoreLocationWhenServiceCodeIsAba5(String role, String l
117122
.serviceCode("ABA5")
118123
.build();
119124
var response = judicialReferenceDataClient.searchUsers(
120-
userSearchRequest, role, false,MediaType.valueOf(V1.MediaType.SERVICE));
125+
userSearchRequest, role, false,
126+
MediaType.valueOf(V1.MediaType.SERVICE),MediaType.valueOf(V1.MediaType.SERVICE));
121127
var profiles = (List<Map<String, String>>)response.get("body");
122128
assertEquals(1, profiles.size());
123129
assertEquals("test528@test.net", profiles.get(0).get("emailId"));
@@ -134,7 +140,8 @@ void shouldReturn200AndIgnoreLocationWhenServiceCodeIsAba3(String role, String l
134140
.serviceCode("ABA3")
135141
.build();
136142
var response = judicialReferenceDataClient.searchUsers(
137-
userSearchRequest, role, false,MediaType.valueOf(V1.MediaType.SERVICE));
143+
userSearchRequest, role, false,
144+
MediaType.valueOf(V1.MediaType.SERVICE),MediaType.valueOf(V1.MediaType.SERVICE));
138145
var profiles = (List<Map<String, String>>)response.get("body");
139146
assertEquals(1, profiles.size());
140147
assertEquals("test530@test.net", profiles.get(0).get("emailId"));
@@ -150,7 +157,8 @@ void shouldReturn200WhenUserProfileRequestedForGivenSearchStringAndLocation(Stri
150157
.location("20012")
151158
.build();
152159
var response = judicialReferenceDataClient.searchUsers(
153-
userSearchRequest, role, false,MediaType.valueOf(V1.MediaType.SERVICE));
160+
userSearchRequest, role, false,
161+
MediaType.valueOf(V1.MediaType.SERVICE),MediaType.valueOf(V1.MediaType.SERVICE));
154162
var profiles = (List<Map<String, String>>)response.get("body");
155163
assertEquals(1, profiles.size());
156164
assertEquals("test530@test.net", profiles.get(0).get("emailId"));
@@ -166,7 +174,8 @@ void shouldReturn200WhenUserProfileRequestedForGivenSearchStringAndServiceCode(S
166174
.serviceCode("BFA1")
167175
.build();
168176
var response = judicialReferenceDataClient.searchUsers(
169-
userSearchRequest, role, false,MediaType.valueOf(V1.MediaType.SERVICE));
177+
userSearchRequest, role, false,
178+
MediaType.valueOf(V1.MediaType.SERVICE),MediaType.valueOf(V1.MediaType.SERVICE));
170179
var profiles = (List<Map<String, String>>)response.get("body");
171180
assertEquals(2, profiles.size());
172181
assertEquals("test530@test.net", profiles.get(0).get("emailId"));
@@ -185,7 +194,8 @@ void shouldReturn401ForInvalidTokens(String role) {
185194
.serviceCode("BFA1")
186195
.build();
187196
var response = judicialReferenceDataClient.searchUsers(
188-
userSearchRequest, role, true,MediaType.valueOf(V1.MediaType.SERVICE));
197+
userSearchRequest, role, true,
198+
MediaType.valueOf(V1.MediaType.SERVICE),MediaType.valueOf(V1.MediaType.SERVICE));
189199
assertThat(response).containsEntry("http_status", "401");
190200
}
191201

@@ -199,7 +209,8 @@ void shouldReturn400WhenSearchStringIsEmpty(String role) {
199209
.serviceCode("BFA1")
200210
.build();
201211
var response = judicialReferenceDataClient.searchUsers(
202-
userSearchRequest, role, false,MediaType.valueOf(V1.MediaType.SERVICE));
212+
userSearchRequest, role, false,
213+
MediaType.valueOf(V1.MediaType.SERVICE),MediaType.valueOf(V1.MediaType.SERVICE));
203214
assertThat(response).containsEntry("http_status", "400");
204215
var responseBody = (String) response.get("response_body");
205216
assertTrue(responseBody.contains("cannot be empty"));
@@ -215,7 +226,8 @@ void shouldReturn400WhenSearchStringDoesNotContainRequiredLength(String role) {
215226
.serviceCode("BFA1")
216227
.build();
217228
var response = judicialReferenceDataClient.searchUsers(
218-
userSearchRequest, role, false,MediaType.valueOf(V1.MediaType.SERVICE));
229+
userSearchRequest, role, false,
230+
MediaType.valueOf(V1.MediaType.SERVICE),MediaType.valueOf(V1.MediaType.SERVICE));
219231
assertThat(response).containsEntry("http_status", "400");
220232
var responseBody = (String) response.get("response_body");
221233
assertTrue(responseBody.contains("searchString must be at least 3 characters including letters, "
@@ -232,7 +244,8 @@ void shouldReturn400WhenSearchStringContainsOtherThanLetters(String role) {
232244
.serviceCode("BFA1")
233245
.build();
234246
var response = judicialReferenceDataClient.searchUsers(
235-
userSearchRequest, role, false,MediaType.valueOf(V1.MediaType.SERVICE));
247+
userSearchRequest, role, false,
248+
MediaType.valueOf(V1.MediaType.SERVICE),MediaType.valueOf(V1.MediaType.SERVICE));
236249
assertThat(response).containsEntry("http_status", "400");
237250
var responseBody = (String) response.get("response_body");
238251
assertTrue(responseBody.contains("searchString must be at least 3 characters including letters, "
@@ -247,7 +260,8 @@ void shouldReturn200WhenUserProfileRequestedForGivenSearchStringWithEmptyAdditio
247260
.searchString("test")
248261
.build();
249262
var response = judicialReferenceDataClient.searchUsers(
250-
userSearchRequest, role, false,MediaType.valueOf(V1.MediaType.SERVICE));
263+
userSearchRequest, role, false,
264+
MediaType.valueOf(V1.MediaType.SERVICE),MediaType.valueOf(V1.MediaType.SERVICE));
251265
var profiles = (List<Map<String, String>>)response.get("body");
252266
assertEquals(3, profiles.size());
253267
assertEquals("test530@test.net", profiles.get(0).get("emailId"));
@@ -268,7 +282,8 @@ void shouldReturn200WhenUserProfileRequestedForGivenSearchStringWithEmptyAdditio
268282
.searchString("sample")
269283
.build();
270284
var response = judicialReferenceDataClient.searchUsers(
271-
userSearchRequest, role, false,MediaType.valueOf(V1.MediaType.SERVICE));
285+
userSearchRequest, role, false,
286+
MediaType.valueOf(V1.MediaType.SERVICE),MediaType.valueOf(V1.MediaType.SERVICE));
272287
var profiles = (List<Map<String, String>>)response.get("body");
273288
assertEquals(5, profiles.size());
274289
assertEquals("test900@test.net", profiles.get(0).get("emailId"));
@@ -292,7 +307,8 @@ void shouldReturn200WhenUserProfileApostropheString(String role) {
292307
.searchString("Am'")
293308
.build();
294309
var response = judicialReferenceDataClient.searchUsers(
295-
userSearchRequest, role, false,MediaType.valueOf(V1.MediaType.SERVICE));
310+
userSearchRequest, role, false,
311+
MediaType.valueOf(V1.MediaType.SERVICE),MediaType.valueOf(V1.MediaType.SERVICE));
296312
var profiles = (List<Map<String, String>>)response.get("body");
297313
assertEquals(1, profiles.size());
298314
assertEquals("test802@test.net", profiles.get(0).get("emailId"));
@@ -308,7 +324,8 @@ void shouldReturn200WhenUserProfileApostropheStrings(String role) {
308324
.searchString("O'j")
309325
.build();
310326
var response = judicialReferenceDataClient.searchUsers(
311-
userSearchRequest, role, false,MediaType.valueOf(V1.MediaType.SERVICE));
327+
userSearchRequest, role, false,
328+
MediaType.valueOf(V1.MediaType.SERVICE),MediaType.valueOf(V1.MediaType.SERVICE));
312329
var profiles = (List<Map<String, String>>)response.get("body");
313330
assertEquals(1, profiles.size());
314331
assertEquals("test803@test.net", profiles.get(0).get("emailId"));
@@ -324,7 +341,8 @@ void shouldReturn200WhenUserProfileHyphenString(String role) {
324341
.searchString("Li-a")
325342
.build();
326343
var response = judicialReferenceDataClient.searchUsers(
327-
userSearchRequest, role, false,MediaType.valueOf(V1.MediaType.SERVICE));
344+
userSearchRequest, role, false,
345+
MediaType.valueOf(V1.MediaType.SERVICE),MediaType.valueOf(V1.MediaType.SERVICE));
328346
var profiles = (List<Map<String, String>>)response.get("body");
329347
assertEquals(1, profiles.size());
330348
assertEquals("test804@test.net", profiles.get(0).get("emailId"));
@@ -340,7 +358,8 @@ void shouldReturn200WhenUserProfileHyphenStrings(String role) {
340358
.searchString("V-e")
341359
.build();
342360
var response = judicialReferenceDataClient.searchUsers(
343-
userSearchRequest, role, false,MediaType.valueOf(V1.MediaType.SERVICE));
361+
userSearchRequest, role, false,
362+
MediaType.valueOf(V1.MediaType.SERVICE),MediaType.valueOf(V1.MediaType.SERVICE));
344363
var profiles = (List<Map<String, String>>)response.get("body");
345364
assertEquals(1, profiles.size());
346365
assertEquals("test805@test.net", profiles.get(0).get("emailId"));
@@ -356,7 +375,8 @@ void shouldReturn200WhenUserProfileEmptySpace(String role) {
356375
.searchString("J Ro")
357376
.build();
358377
var response = judicialReferenceDataClient.searchUsers(
359-
userSearchRequest, role, false,MediaType.valueOf(V1.MediaType.SERVICE));
378+
userSearchRequest, role, false,
379+
MediaType.valueOf(V1.MediaType.SERVICE),MediaType.valueOf(V1.MediaType.SERVICE));
360380
var profiles = (List<Map<String, String>>)response.get("body");
361381
assertEquals(1, profiles.size());
362382
assertEquals("test806@test.net", profiles.get(0).get("emailId"));
@@ -372,7 +392,8 @@ void shouldReturn200WhenUserProfileEmptySpaces(String role) {
372392
.searchString("To N")
373393
.build();
374394
var response = judicialReferenceDataClient.searchUsers(
375-
userSearchRequest, role, false,MediaType.valueOf(V1.MediaType.SERVICE));
395+
userSearchRequest, role, false,
396+
MediaType.valueOf(V1.MediaType.SERVICE),MediaType.valueOf(V1.MediaType.SERVICE));
376397
var profiles = (List<Map<String, String>>)response.get("body");
377398
assertEquals(1, profiles.size());
378399
assertEquals("test807@test.net", profiles.get(0).get("emailId"));

0 commit comments

Comments
 (0)