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

change entry id to a base64 value. A workaround solution for issue #7944

Browse Source
This commit is contained in:
Paulo Graça
2021-09-15 17:23:14 +01:00
parent db22657e74
commit b254c8eeea
1 changed files with 18 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
dspace-api/src/main/java/org/dspace/external/provider/impl/OpenAIREFundingDataProvider.java vendored
View File

@@ -12,6 +12,7 @@ import java.io.UnsupportedEncodingException;
import java.net.URLEncoder;
import java.nio.charset.StandardCharsets;
import java.util.ArrayList;
import java.util.Base64;
import java.util.Collections;
import java.util.List;
import java.util.Optional;
@@ -80,13 +81,19 @@ public class OpenAIREFundingDataProvider implements ExternalDataProvider {
@Override
public Optional<ExternalDataObject> getExternalDataObject(String id) {
Response response = searchByProjectURI(id);
// we use base64 encoding in order to use slashes / and other
// characters that must be escaped for the <:entry-id>
String decodedId = new String(Base64.getDecoder().decode(id));
Response response = searchByProjectURI(decodedId);
try {
if (response.getHeader() != null && Integer.parseInt(response.getHeader().getTotal()) > 0) {
Project project = response.getResults().getResult().get(0).getMetadata().getEntity().getProject();
ExternalDataObject externalDataObject = new OpenAIREFundingDataProvider.ExternalDataObjectBuilder(
project).setId(generateProjectURI(project)).setSource(sourceIdentifier).build();
ExternalDataObject externalDataObject = new OpenAIREFundingDataProvider.ExternalDataObjectBuilder(project)
.setId(generateProjectURI(project))
.setSource(sourceIdentifier)
.build();
return Optional.of(externalDataObject);
}
} catch (NumberFormatException e) {
@@ -130,7 +137,9 @@ public class OpenAIREFundingDataProvider implements ExternalDataProvider {
if (projects.size() > 0) {
return projects.stream()
.map(project -> new OpenAIREFundingDataProvider.ExternalDataObjectBuilder(project)
.setId(generateProjectURI(project)).setSource(sourceIdentifier).build())
.setId(generateProjectURI(project))
.setSource(sourceIdentifier)
.build())
.collect(Collectors.toList());
}
return Collections.emptyList();
@@ -337,7 +346,11 @@ public class OpenAIREFundingDataProvider implements ExternalDataProvider {
* @return ExternalDataObjectBuilder
*/
public ExternalDataObjectBuilder setId(String id) {
this.externalDataObject.setId(id);
// we use base64 encoding in order to use slashes / and other
// characters that must be escaped for the <:entry-id>
String base64Id = Base64.getEncoder().encodeToString(id.getBytes());
this.externalDataObject.setId(base64Id);
return this;
}