Skip to content

FPVTL-2050 : Fix NPE in method storeDocument #454

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
Jefex7 wants to merge 11 commits into
base: master
Choose a base branch
from
+38 −26
Open

FPVTL-2050 : Fix NPE in method storeDocument #454

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
cc687e6
FPVTL-2050 : Add check to prevent NPE.
Jefex7 Mar 3, 2026
0d60710
Update DocumentManagementServiceImpl.java
Jefex7 Mar 6, 2026
2195f2e
FPVTL-2050 : revert file
Jefex7 Mar 11, 2026
96aea11
Merge remote-tracking branch 'origin/FPVTL-2050' into FPVTL-2050
Jefex7 Mar 11, 2026
ccc8abb
FPVTL-2050 : revert file
Jefex7 Mar 11, 2026
efa22af
Merge branch 'master' into FPVTL-2050
Jefex7 Mar 11, 2026
d251137
Merge branch 'master' into FPVTL-2050
Jefex7 Mar 11, 2026
bb9d9e3
Merge branch 'master' into FPVTL-2050
Jefex7 Mar 12, 2026
33f38d3
Merge branch 'master' into FPVTL-2050
Jefex7 Mar 13, 2026
a23eb53
FPVTL-2050 : Re-add check for null doc
Jefex7 Mar 16, 2026
c9ce65b
Merge branch 'master' into FPVTL-2050
Jefex7 Mar 16, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 4 additions & 1 deletion ...uk/gov/hmcts/reform/prl/documentgenerator/service/impl/DocumentManagementServiceImpl.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,6 @@
@Slf4j
@RequiredArgsConstructor
public class DocumentManagementServiceImpl implements DocumentManagementService {

private static final String CURRENT_DATE_KEY = "current_date";
private static final String DATE_FORMAT = "yyyy-MM-dd'T'hh:mm:ss.SSS";

Expand Down Expand Up @@ -103,6 +102,10 @@ private GeneratedDocumentInfo getGeneratedDocumentInfo(String templateName, Map<

@Override
public GeneratedDocumentInfo storeDocument(byte[] document, String authorizationToken, String fileName) {
if (document == null) {
log.debug("Cannot Store the document [{}] because it's null", fileName);
throw new IllegalArgumentException("Document is missing for " + fileName);
}
log.debug("Store document requested with document of size [{}]", document.length);
String serviceAuthToken = authTokenGenerator.generate();

Expand Down
60 changes: 34 additions & 26 deletions ...ov/hmcts/reform/prl/documentgenerator/service/impl/DocumentManagementServiceImplTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,7 @@

import static org.hamcrest.MatcherAssert.assertThat;
import static org.hamcrest.core.Is.is;
import static org.junit.Assert.assertThrows;
import static org.mockito.ArgumentMatchers.any;
import static org.mockito.ArgumentMatchers.eq;
import static org.mockito.ArgumentMatchers.same;
Expand Down Expand Up @@ -56,22 +57,22 @@ public class DocumentManagementServiceImplTest {
ArgumentCaptor<Map<String, Object>> placeHolderCaptor;

static final Map<String, Object> placeholderMap = new HashMap<>();
static final String authToken = "userAuthToken";
static final String s2sToken = "s2sAuthToken";
static final String AUTH_TOKEN = "userAuthToken";
static final String S2S_TOKEN = "s2sAuthToken";
static final byte[] data = {126};
static final UploadResponse uploadResponse = new UploadResponse(List.of(mockCaseDocsDocuments()));

@Test
public void testGenerateAndStoreDraftDocumentMock() {
Mockito.when(authTokenGenerator.generate()).thenReturn(s2sToken);
Mockito.when(authTokenGenerator.generate()).thenReturn(S2S_TOKEN);
Mockito.when(pdfGenerationService.generate(D8_PETITION_WELSH_TEMPLATE, placeholderMap)).thenReturn(data);
Mockito.when(templatesConfiguration.getFileNameByTemplateName(D8_PETITION_WELSH_TEMPLATE))
.thenReturn(MINI_PETITION_NAME_FOR_WELSH_PDF_FILE);
Mockito.when(caseDocumentClient.uploadDocuments(eq(authToken),
eq(s2sToken), eq("PRLAPPS"), eq("PRIVATELAW"), any()))
Mockito.when(caseDocumentClient.uploadDocuments(eq(AUTH_TOKEN),
eq(S2S_TOKEN), eq("PRLAPPS"), eq("PRIVATELAW"), any()))
.thenReturn(uploadResponse);

classUnderTest.generateAndStoreDraftDocument(D8_PETITION_WELSH_TEMPLATE, placeholderMap, authToken);
classUnderTest.generateAndStoreDraftDocument(D8_PETITION_WELSH_TEMPLATE, placeholderMap, AUTH_TOKEN);

verify(pdfGenerationService).generate(same(D8_PETITION_WELSH_TEMPLATE), placeHolderCaptor.capture());
Map<String, Object> value = placeHolderCaptor.getValue();
Expand All @@ -81,13 +82,13 @@ public void testGenerateAndStoreDraftDocumentMock() {
@Test
public void testGenerateAndStoreDraftDocumentMockWithDynamicName() {
placeholderMap.put("dynamic_fileName","test-file.pdf");
Mockito.when(authTokenGenerator.generate()).thenReturn(s2sToken);
Mockito.when(authTokenGenerator.generate()).thenReturn(S2S_TOKEN);
Mockito.when(pdfGenerationService.generate(D8_PETITION_WELSH_TEMPLATE, placeholderMap)).thenReturn(data);
Mockito.when(caseDocumentClient.uploadDocuments(eq(authToken),
eq(s2sToken), eq("PRLAPPS"), eq("PRIVATELAW"), any()))
Mockito.when(caseDocumentClient.uploadDocuments(eq(AUTH_TOKEN),
eq(S2S_TOKEN), eq("PRLAPPS"), eq("PRIVATELAW"), any()))
.thenReturn(uploadResponse);

classUnderTest.generateAndStoreDraftDocument(D8_PETITION_WELSH_TEMPLATE, placeholderMap, authToken);
classUnderTest.generateAndStoreDraftDocument(D8_PETITION_WELSH_TEMPLATE, placeholderMap, AUTH_TOKEN);

verify(pdfGenerationService).generate(same(D8_PETITION_WELSH_TEMPLATE), placeHolderCaptor.capture());
Map<String, Object> value = placeHolderCaptor.getValue();
Expand All @@ -96,13 +97,13 @@ public void testGenerateAndStoreDraftDocumentMockWithDynamicName() {

@Test
public void testGenerateAndStoreDraftDocument_WithDraftPrefixMock() {
Mockito.when(authTokenGenerator.generate()).thenReturn(s2sToken);
Mockito.when(authTokenGenerator.generate()).thenReturn(S2S_TOKEN);
Mockito.when(pdfGenerationService.generate(DRAFT_MINI_PETITION_TEMPLATE_ID, placeholderMap)).thenReturn(data);
Mockito.when(caseDocumentClient.uploadDocuments(eq(authToken),
eq(s2sToken), eq("PRLAPPS"), eq("PRIVATELAW"), any()))
Mockito.when(caseDocumentClient.uploadDocuments(eq(AUTH_TOKEN),
eq(S2S_TOKEN), eq("PRLAPPS"), eq("PRIVATELAW"), any()))
.thenReturn(uploadResponse);

classUnderTest.generateAndStoreDraftDocument(DRAFT_MINI_PETITION_TEMPLATE_ID, placeholderMap, authToken);
classUnderTest.generateAndStoreDraftDocument(DRAFT_MINI_PETITION_TEMPLATE_ID, placeholderMap, AUTH_TOKEN);

verify(pdfGenerationService).generate(same(DRAFT_MINI_PETITION_TEMPLATE_ID), placeHolderCaptor.capture());
Map<String, Object> value = placeHolderCaptor.getValue();
Expand All @@ -115,14 +116,14 @@ public void testConvertToPdf() {

byte[] test = "Any String you want".getBytes();
placeholders.put("fileName",test);
Mockito.when(authTokenGenerator.generate()).thenReturn(s2sToken);
Mockito.when(authTokenGenerator.generate()).thenReturn(S2S_TOKEN);
Mockito.when(pdfGenerationService.converToPdf(placeholders,"fileName")).thenReturn(test);

Mockito.when(caseDocumentClient.uploadDocuments(eq(authToken),
eq(s2sToken), eq("PRLAPPS"), eq("PRIVATELAW"), any()))
Mockito.when(caseDocumentClient.uploadDocuments(eq(AUTH_TOKEN),
eq(S2S_TOKEN), eq("PRLAPPS"), eq("PRIVATELAW"), any()))
.thenReturn(uploadResponse);

classUnderTest.converToPdf(placeholders, authToken,"fileName");
classUnderTest.converToPdf(placeholders, AUTH_TOKEN,"fileName");

verify(pdfGenerationService).converToPdf(placeholders,"fileName");
}
Expand All @@ -131,13 +132,13 @@ public void testConvertToPdf() {
@Test
public void testGenerateAndStoreFinalDocument_WithDynamicFileName() {
placeholderMap.put("dynamic_fileName","test-file.pdf");
Mockito.when(authTokenGenerator.generate()).thenReturn(s2sToken);
Mockito.when(authTokenGenerator.generate()).thenReturn(S2S_TOKEN);
Mockito.when(pdfGenerationService.generate(FINAL_MINI_PETITION_TEMPLATE_ID, placeholderMap)).thenReturn(data);
Mockito.when(caseDocumentClient.uploadDocuments(eq(authToken),
eq(s2sToken), eq("PRLAPPS"), eq("PRIVATELAW"), any()))
Mockito.when(caseDocumentClient.uploadDocuments(eq(AUTH_TOKEN),
eq(S2S_TOKEN), eq("PRLAPPS"), eq("PRIVATELAW"), any()))
.thenReturn(uploadResponse);

classUnderTest.generateAndStoreDocument(FINAL_MINI_PETITION_TEMPLATE_ID, placeholderMap, authToken);
classUnderTest.generateAndStoreDocument(FINAL_MINI_PETITION_TEMPLATE_ID, placeholderMap, AUTH_TOKEN);

verify(pdfGenerationService).generate(same(FINAL_MINI_PETITION_TEMPLATE_ID), placeHolderCaptor.capture());
Map<String, Object> value = placeHolderCaptor.getValue();
Expand All @@ -147,18 +148,25 @@ public void testGenerateAndStoreFinalDocument_WithDynamicFileName() {
@Test
public void testGenerateAndStoreFinalDocument_WithOutDynamicFileName() {
placeholderMap.remove("dynamic_fileName");
Mockito.when(authTokenGenerator.generate()).thenReturn(s2sToken);
Mockito.when(authTokenGenerator.generate()).thenReturn(S2S_TOKEN);
Mockito.when(pdfGenerationService.generate(FINAL_MINI_PETITION_TEMPLATE_ID, placeholderMap)).thenReturn(data);
Mockito.when(templatesConfiguration.getFileNameByTemplateName(FINAL_MINI_PETITION_TEMPLATE_ID))
.thenReturn(DRAFT_MINI_PETITION_NAME_FOR_PDF_FILE);
Mockito.when(caseDocumentClient.uploadDocuments(eq(authToken),
eq(s2sToken), eq("PRLAPPS"), eq("PRIVATELAW"), any()))
Mockito.when(caseDocumentClient.uploadDocuments(eq(AUTH_TOKEN),
eq(S2S_TOKEN), eq("PRLAPPS"), eq("PRIVATELAW"), any()))
.thenReturn(uploadResponse);

classUnderTest.generateAndStoreDocument(FINAL_MINI_PETITION_TEMPLATE_ID, placeholderMap, authToken);
classUnderTest.generateAndStoreDocument(FINAL_MINI_PETITION_TEMPLATE_ID, placeholderMap, AUTH_TOKEN);

verify(pdfGenerationService).generate(same(FINAL_MINI_PETITION_TEMPLATE_ID), placeHolderCaptor.capture());
Map<String, Object> value = placeHolderCaptor.getValue();
Assert.assertNotNull(value);
}

@Test
public void shouldThrowIllegalArgumentExceptionWhenDocumentIsNull() {
assertThrows(IllegalArgumentException.class, () -> {
classUnderTest.storeDocument(null, AUTH_TOKEN ,"File Name");
});
}
}