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

Refactored Mockmetadata to MetadataValueDTO and fixed checkstyle

Browse Source
This commit is contained in:
Raf Ponsaerts
2019-11-26 13:20:36 +01:00
parent c85f88d737
commit 196894e46e
2 changed files with 7 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
dspace-api/src/main/java/org/dspace/external/service/impl/ExternalDataServiceImpl.java vendored
View File

@@ -16,6 +16,7 @@ import org.dspace.authorize.AuthorizeException;
import org.dspace.authorize.service.AuthorizeService; import org.dspace.authorize.service.AuthorizeService;
import org.dspace.content.Collection; import org.dspace.content.Collection;
import org.dspace.content.Item; import org.dspace.content.Item;
import org.dspace.content.MetadataValueDTO;
import org.dspace.content.WorkspaceItem; import org.dspace.content.WorkspaceItem;
import org.dspace.content.service.InstallItemService; import org.dspace.content.service.InstallItemService;
import org.dspace.content.service.ItemService; import org.dspace.content.service.ItemService;
@@ -24,7 +25,6 @@ import org.dspace.core.Context;
import org.dspace.external.model.ExternalDataObject; import org.dspace.external.model.ExternalDataObject;
import org.dspace.external.provider.ExternalDataProvider; import org.dspace.external.provider.ExternalDataProvider;
import org.dspace.external.service.ExternalDataService; import org.dspace.external.service.ExternalDataService;
import org.dspace.mock.MockMetadataValue;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
/** /**
@@ -102,11 +102,11 @@ public class ExternalDataServiceImpl implements ExternalDataService {
} }
WorkspaceItem workspaceItem = workspaceItemService.create(context, collection, true); WorkspaceItem workspaceItem = workspaceItemService.create(context, collection, true);
Item item = workspaceItem.getItem(); Item item = workspaceItem.getItem();
for (MockMetadataValue mockMetadataValue : externalDataObject.getMetadata()) { for (MetadataValueDTO metadataValueDTO : externalDataObject.getMetadata()) {
itemService.addMetadata(context, item, mockMetadataValue.getSchema(), mockMetadataValue.getElement(), itemService.addMetadata(context, item, metadataValueDTO.getSchema(), metadataValueDTO.getElement(),
mockMetadataValue.getQualifier(), mockMetadataValue.getLanguage(), metadataValueDTO.getQualifier(), metadataValueDTO.getLanguage(),
mockMetadataValue.getValue(), mockMetadataValue.getAuthority(), metadataValueDTO.getValue(), metadataValueDTO.getAuthority(),
mockMetadataValue.getConfidence()); metadataValueDTO.getConfidence());
} }
return installItemService.installItem(context, workspaceItem); return installItemService.installItem(context, workspaceItem);

3
dspace-server-webapp/src/main/java/org/dspace/app/rest/repository/ItemRestRepository.java
View File

@@ -27,8 +27,8 @@ import org.dspace.app.rest.exception.UnprocessableEntityException;
import org.dspace.app.rest.model.BundleRest; import org.dspace.app.rest.model.BundleRest;
import org.dspace.app.rest.model.ItemRest; import org.dspace.app.rest.model.ItemRest;
import org.dspace.app.rest.model.patch.Patch; import org.dspace.app.rest.model.patch.Patch;
import org.dspace.app.rest.repository.handler.service.UriListHandlerService;
import org.dspace.app.rest.projection.Projection; import org.dspace.app.rest.projection.Projection;
import org.dspace.app.rest.repository.handler.service.UriListHandlerService;
import org.dspace.app.rest.repository.patch.ItemPatch; import org.dspace.app.rest.repository.patch.ItemPatch;
import org.dspace.authorize.AuthorizeException; import org.dspace.authorize.AuthorizeException;
import org.dspace.content.Bundle; import org.dspace.content.Bundle;
@@ -41,7 +41,6 @@ import org.dspace.content.service.InstallItemService;
import org.dspace.content.service.ItemService; import org.dspace.content.service.ItemService;
import org.dspace.content.service.WorkspaceItemService; import org.dspace.content.service.WorkspaceItemService;
import org.dspace.core.Context; import org.dspace.core.Context;
import org.dspace.external.service.ExternalDataService;
import org.dspace.util.UUIDUtils; import org.dspace.util.UUIDUtils;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.data.domain.Page; import org.springframework.data.domain.Page;