hazza/DSpace
1
0
Fork 0
mirror of https://github.com/DSpace/DSpace.git synced 2025-10-18 07:23:08 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #9203 from philipprumpf/issue-9202

Browse Source 
CrossRefImport: ignore empty responses rather than generating empty phantom ImportRecords
This commit is contained in:
Alan Orth
2023-11-23 08:26:33 +03:00
committed by GitHub
parent 50b47b707c a68755ee4f
commit 06cf8e10d8
2 changed files with 28 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
dspace-api/src/main/java/org/dspace/importer/external/crossref/CrossRefImportMetadataSourceServiceImpl.java vendored
View File

@@ -162,8 +162,10 @@ public class CrossRefImportMetadataSourceServiceImpl extends AbstractImportMetad
Iterator<JsonNode> nodes = jsonNode.at("/message/items").iterator(); Iterator<JsonNode> nodes = jsonNode.at("/message/items").iterator();
while (nodes.hasNext()) { while (nodes.hasNext()) {
JsonNode node = nodes.next(); JsonNode node = nodes.next();
if (!node.isMissingNode()) {
results.add(transformSourceRecords(node.toString())); results.add(transformSourceRecords(node.toString()));
} }
}
return results; return results;
} }
@@ -196,7 +198,9 @@ public class CrossRefImportMetadataSourceServiceImpl extends AbstractImportMetad
String responseString = liveImportClient.executeHttpGetRequest(1000, uriBuilder.toString(), params); String responseString = liveImportClient.executeHttpGetRequest(1000, uriBuilder.toString(), params);
JsonNode jsonNode = convertStringJsonToJsonNode(responseString); JsonNode jsonNode = convertStringJsonToJsonNode(responseString);
JsonNode messageNode = jsonNode.at("/message"); JsonNode messageNode = jsonNode.at("/message");
if (!messageNode.isMissingNode()) {
results.add(transformSourceRecords(messageNode.toString())); results.add(transformSourceRecords(messageNode.toString()));
}
return results; return results;
} }
} }
@@ -250,8 +254,10 @@ public class CrossRefImportMetadataSourceServiceImpl extends AbstractImportMetad
Iterator<JsonNode> nodes = jsonNode.at("/message/items").iterator(); Iterator<JsonNode> nodes = jsonNode.at("/message/items").iterator();
while (nodes.hasNext()) { while (nodes.hasNext()) {
JsonNode node = nodes.next(); JsonNode node = nodes.next();
if (!node.isMissingNode()) {
results.add(transformSourceRecords(node.toString())); results.add(transformSourceRecords(node.toString()));
} }
}
return results; return results;
} }

18
dspace-server-webapp/src/test/java/org/dspace/app/rest/CrossRefImportMetadataSourceServiceIT.java
View File

@@ -48,6 +48,24 @@ public class CrossRefImportMetadataSourceServiceIT extends AbstractLiveImportInt
@Autowired @Autowired
private CrossRefImportMetadataSourceServiceImpl crossRefServiceImpl; private CrossRefImportMetadataSourceServiceImpl crossRefServiceImpl;
@Test
public void crossRefImportMetadataGetNoRecordsTest() throws Exception {
context.turnOffAuthorisationSystem();
CloseableHttpClient originalHttpClient = liveImportClientImpl.getHttpClient();
CloseableHttpClient httpClient = Mockito.mock(CloseableHttpClient.class);
try {
liveImportClientImpl.setHttpClient(httpClient);
CloseableHttpResponse response = mockResponse("" , 404, "Not Found");
when(httpClient.execute(ArgumentMatchers.any())).thenReturn(response);
context.restoreAuthSystemState();
Collection<ImportRecord> recordsImported = crossRefServiceImpl.getRecords("test query", 0, 2);
assertEquals(0, recordsImported.size());
} finally {
liveImportClientImpl.setHttpClient(originalHttpClient);
}
}
@Test @Test
public void crossRefImportMetadataGetRecordsTest() throws Exception { public void crossRefImportMetadataGetRecordsTest() throws Exception {
context.turnOffAuthorisationSystem(); context.turnOffAuthorisationSystem();