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

Merge branch 'D4CRIS-338' of https://github.com/4Science/DSpace into D4CRIS-338

Browse Source 
# Conflicts:
#	dspace-spring-rest/src/main/java/org/dspace/app/rest/RestResourceController.java
#	dspace-spring-rest/src/main/java/org/dspace/app/rest/submit/step/DescribeStep.java
This commit is contained in:
Luigi Andrea Pascarelli
2017-11-15 00:37:46 +01:00
parent fc13ad5725 b82e9bbbf2
commit 7a3532993f
34 changed files with 172 additions and 116 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
dspace-api/src/main/java/org/dspace/submit/model/UploadConfiguration.java
View File

@@ -19,7 +19,7 @@ public class UploadConfiguration<T extends SubmissionFormField>{
private ConfigurationService configurationService;
private List<T> metadata;
private String metadataDefinition;
private List<AccessConditionOption> options;
private Long maxSize;
private Boolean required;
@@ -33,12 +33,12 @@ public class UploadConfiguration<T extends SubmissionFormField>{
this.options = options;
}
public List<T> getMetadata() {
return metadata;
public String getMetadata() {
return metadataDefinition;
}
public void setMetadata(List<T> metadata) {
this.metadata = metadata;
public void setMetadata(String metadata) {
this.metadataDefinition = metadata;
}
public Long getMaxSize() {

50
dspace-spring-rest/src/main/java/org/dspace/app/rest/RestResourceController.java
View File

@@ -27,6 +27,7 @@ import org.dspace.app.rest.exception.PaginationException;
import org.dspace.app.rest.exception.RepositoryNotFoundException;
import org.dspace.app.rest.exception.RepositorySearchMethodNotFoundException;
import org.dspace.app.rest.exception.RepositorySearchNotFoundException;
import org.dspace.app.rest.model.DirectlyAddressableRestModel;
import org.dspace.app.rest.model.LinkRest;
import org.dspace.app.rest.model.RestModel;
import org.dspace.app.rest.model.hateoas.DSpaceResource;
@@ -115,30 +116,30 @@ public class RestResourceController implements InitializingBean {
@RequestMapping(method = RequestMethod.GET, value = "/{id:\\d+}")
@SuppressWarnings("unchecked")
public DSpaceResource<RestModel> findOne(@PathVariable String apiCategory, @PathVariable String model,
public DSpaceResource<DirectlyAddressableRestModel> findOne(@PathVariable String apiCategory, @PathVariable String model,
@PathVariable Integer id, @RequestParam(required = false) String projection) {
return findOneInternal(apiCategory, model, id, projection);
}
@RequestMapping(method = RequestMethod.GET, value = "/{id:^(?!^\\d+$)[A-z0-9]+$+}")
@SuppressWarnings("unchecked")
public DSpaceResource<RestModel> findOne(@PathVariable String apiCategory, @PathVariable String model,
public DSpaceResource<DirectlyAddressableRestModel> findOne(@PathVariable String apiCategory, @PathVariable String model,
@PathVariable String id, @RequestParam(required = false) String projection) {
return findOneInternal(apiCategory, model, id, projection);
}
@RequestMapping(method = RequestMethod.GET, value = "/{uuid:[0-9a-fxA-FX]{8}-[0-9a-fxA-FX]{4}-[0-9a-fxA-FX]{4}-[0-9a-fxA-FX]{4}-[0-9a-fxA-FX]{12}}")
@SuppressWarnings("unchecked")
public DSpaceResource<RestModel> findOne(@PathVariable String apiCategory, @PathVariable String model,
public DSpaceResource<DirectlyAddressableRestModel> findOne(@PathVariable String apiCategory, @PathVariable String model,
@PathVariable UUID uuid, @RequestParam(required = false) String projection) {
return findOneInternal(apiCategory, model, uuid, projection);
}
private <ID extends Serializable> DSpaceResource<RestModel> findOneInternal(String apiCategory, String model, ID id,
private <ID extends Serializable> DSpaceResource<DirectlyAddressableRestModel> findOneInternal(String apiCategory, String model, ID id,
String projection) {
checkModelPluralForm(apiCategory, model);
DSpaceRestRepository<RestModel, ID> repository = utils.getResourceRepository(apiCategory, model);
RestModel modelObject = null;
DSpaceRestRepository<DirectlyAddressableRestModel, ID> repository = utils.getResourceRepository(apiCategory, model);
DirectlyAddressableRestModel modelObject = null;
try {
modelObject = repository.findOne(id);
} catch (ClassCastException e) {
@@ -188,8 +189,8 @@ public class RestResourceController implements InitializingBean {
public <ID extends Serializable> ResponseEntity<ResourceSupport> postInternal(HttpServletRequest request, String apiCategory,
String model) throws HttpRequestMethodNotSupportedException {
checkModelPluralForm(apiCategory, model);
DSpaceRestRepository<RestModel, ID> repository = utils.getResourceRepository(apiCategory, model);
RestModel modelObject = null;
DSpaceRestRepository<DirectlyAddressableRestModel, ID> repository = utils.getResourceRepository(apiCategory, model);
DirectlyAddressableRestModel modelObject = null;
try {
modelObject = repository.createAndReturn();
} catch (ClassCastException e) {
@@ -223,7 +224,8 @@ public class RestResourceController implements InitializingBean {
private <ID extends Serializable, U extends UploadStatusResponse> ResponseEntity<ResourceSupport> uploadInternal(HttpServletRequest request, String apiCategory, String model, ID id,
String extraField, MultipartFile uploadfile) {
checkModelPluralForm(apiCategory, model);
DSpaceRestRepository<RestModel, ID> repository = utils.getResourceRepository(apiCategory, model);
DSpaceRestRepository<DirectlyAddressableRestModel, ID> repository = utils.getResourceRepository(apiCategory, model);
U result = null;
try {
result = repository.upload(request, apiCategory, model, id, extraField, uploadfile);
@@ -255,8 +257,8 @@ public class RestResourceController implements InitializingBean {
String model, ID id, JsonNode jsonNode) throws HttpRequestMethodNotSupportedException {
checkModelPluralForm(apiCategory, model);
DSpaceRestRepository<RestModel, ID> repository = utils.getResourceRepository(apiCategory, model);
RestModel modelObject = null;
DSpaceRestRepository<DirectlyAddressableRestModel, ID> repository = utils.getResourceRepository(apiCategory, model);
DirectlyAddressableRestModel modelObject = null;
try {
JsonPatchPatchConverter patchConverter = new JsonPatchPatchConverter(mapper);
Patch patch = patchConverter.convert(jsonNode);
@@ -277,8 +279,8 @@ public class RestResourceController implements InitializingBean {
private <ID extends Serializable> ResourceSupport findRelEntryInternal(HttpServletRequest request, String apiCategory, String model,
String id, String rel, String relid, Pageable page, PagedResourcesAssembler assembler, String projection) {
checkModelPluralForm(apiCategory, model);
DSpaceRestRepository<RestModel, ID> repository = utils.getResourceRepository(apiCategory, model);
Class<RestModel> domainClass = repository.getDomainClass();
DSpaceRestRepository<DirectlyAddressableRestModel, ID> repository = utils.getResourceRepository(apiCategory, model);
Class<DirectlyAddressableRestModel> domainClass = repository.getDomainClass();
LinkRest linkRest = utils.getLinkRest(rel, domainClass);
if (linkRest != null) {
@@ -291,7 +293,7 @@ public class RestResourceController implements InitializingBean {
.slash(rel).withSelfRel();
List result = new ArrayList();
result.add(object);
PageImpl<RestModel> pageResult = new PageImpl(result, page, 1);
PageImpl<DirectlyAddressableRestModel> pageResult = new PageImpl(result, page, 1);
return assembler.toResource(pageResult.map(linkRepository::wrapResource),link);
} catch (IllegalAccessException | IllegalArgumentException | InvocationTargetException e) {
throw new RuntimeException(e.getMessage(), e);
@@ -303,8 +305,8 @@ public class RestResourceController implements InitializingBean {
private <ID extends Serializable> ResourceSupport findRelInternal(HttpServletRequest request, String apiCategory,
String model, ID uuid, String rel, Pageable page, PagedResourcesAssembler assembler, String projection) {
checkModelPluralForm(apiCategory, model);
DSpaceRestRepository<RestModel, ID> repository = utils.getResourceRepository(apiCategory, model);
Class<RestModel> domainClass = repository.getDomainClass();
DSpaceRestRepository<DirectlyAddressableRestModel, ID> repository = utils.getResourceRepository(apiCategory, model);
Class<DirectlyAddressableRestModel> domainClass = repository.getDomainClass();
LinkRest linkRest = utils.getLinkRest(rel, domainClass);
@@ -319,7 +321,7 @@ public class RestResourceController implements InitializingBean {
else {
try {
if ( Page.class.isAssignableFrom( linkMethod.getReturnType()) ){
Page<? extends Serializable> pageResult = (Page<? extends RestModel>) linkMethod
Page<? extends RestModel> pageResult = (Page<? extends DirectlyAddressableRestModel>) linkMethod
.invoke(linkRepository, request, uuid, page, projection);
Link link = linkTo(this.getClass(), apiCategory, model).slash(uuid)
.slash(rel).withSelfRel();
@@ -328,7 +330,7 @@ public class RestResourceController implements InitializingBean {
return result;
}
else {
Serializable object = (Serializable) linkMethod.invoke(linkRepository, request, uuid, page,
RestModel object = (RestModel) linkMethod.invoke(linkRepository, request, uuid, page,
projection);
Link link = linkTo(this.getClass(), apiCategory, model).slash(uuid).slash(rel)
.withSelfRel();
@@ -341,7 +343,7 @@ public class RestResourceController implements InitializingBean {
}
}
}
RestModel modelObject = repository.findOne(uuid);
DirectlyAddressableRestModel modelObject = repository.findOne(uuid);
DSpaceResource result = repository.wrapResource(modelObject, rel);
if (result.getLink(rel) == null) {
// TODO create a custom exception
@@ -354,14 +356,14 @@ public class RestResourceController implements InitializingBean {
// if we really want to implement pagination we should implement a
// link repository so to fall in the previous block code
EmbeddedPage ep = (EmbeddedPage) result.getEmbedded().get(rel);
List<? extends RestModel> fullList = ep.getFullList();
List<? extends DirectlyAddressableRestModel> fullList = ep.getFullList();
if (fullList == null || fullList.size() == 0)
return null;
int start = page.getOffset();
int end = (start + page.getPageSize()) > fullList.size() ? fullList.size() : (start + page.getPageSize());
DSpaceRestRepository<RestModel, ?> resourceRepository = utils
DSpaceRestRepository<DirectlyAddressableRestModel, ?> resourceRepository = utils
.getResourceRepository(fullList.get(0).getCategory(), fullList.get(0).getType());
PageImpl<RestModel> pageResult = new PageImpl(fullList.subList(start, end), page, fullList.size());
PageImpl<DirectlyAddressableRestModel> pageResult = new PageImpl(fullList.subList(start, end), page, fullList.size());
return assembler.toResource(pageResult.map(resourceRepository::wrapResource));
} else {
ResourceSupport resu = (ResourceSupport) result.getEmbedded().get(rel);
@@ -371,7 +373,7 @@ public class RestResourceController implements InitializingBean {
@RequestMapping(method = RequestMethod.GET)
@SuppressWarnings("unchecked")
public <T extends RestModel> PagedResources<DSpaceResource<T>> findAll(@PathVariable String apiCategory,
public <T extends DirectlyAddressableRestModel> PagedResources<DSpaceResource<T>> findAll(@PathVariable String apiCategory,
@PathVariable String model, Pageable page, PagedResourcesAssembler assembler,
@RequestParam(required = false) String projection) {
DSpaceRestRepository<T, ?> repository = utils.getResourceRepository(apiCategory, model);
@@ -423,7 +425,7 @@ public class RestResourceController implements InitializingBean {
@RequestMapping(method = RequestMethod.GET, value = "/search/{searchMethodName}")
@SuppressWarnings("unchecked")
public <T extends RestModel> ResourceSupport executeSearchMethods(@PathVariable String apiCategory,
public <T extends DirectlyAddressableRestModel> ResourceSupport executeSearchMethods(@PathVariable String apiCategory,
@PathVariable String model, @PathVariable String searchMethodName, Pageable pageable, Sort sort,
PagedResourcesAssembler assembler, @RequestParam MultiValueMap<String, Object> parameters)
throws IllegalAccessException, IllegalArgumentException, InvocationTargetException {

12
dspace-spring-rest/src/main/java/org/dspace/app/rest/model/AccessConditionOptionRest.java
View File

@@ -10,8 +10,6 @@ package org.dspace.app.rest.model;
import java.util.Date;
import java.util.UUID;
import org.dspace.app.rest.RestResourceController;
/**
* The Access Condition (ResourcePolicy) REST Resource
*
@@ -20,7 +18,7 @@ import org.dspace.app.rest.RestResourceController;
*/
public class AccessConditionOptionRest {
private String type;
private String policyType;
private UUID groupUUID;
@@ -38,8 +36,8 @@ public class AccessConditionOptionRest {
this.groupUUID = groupUuid;
}
public void setType(String type) {
this.type = type;
public void setPolicyType(String type) {
this.policyType = type;
}
public UUID getSelectGroupUUID() {
@@ -66,8 +64,8 @@ public class AccessConditionOptionRest {
this.maxEndDate = maxEndDate;
}
public String getType() {
return type;
public String getPolicyType() {
return policyType;
}
}

12
dspace-spring-rest/src/main/java/org/dspace/app/rest/model/AccessConditionRest.java
View File

@@ -18,7 +18,7 @@ import java.util.UUID;
* @author Luigi Andrea Pascarelli (luigiandrea.pascarelli at 4science.it)
*
*/
public class AccessConditionRest implements Serializable {
public class AccessConditionRest implements RestModel {
public static final String NAME = "accessCondition";
@@ -47,5 +47,13 @@ public class AccessConditionRest implements Serializable {
public void setPolicyType(String type) {
this.policyType = type;
}
public String getPolicyType() {
return policyType;
}
@Override
public String getType() {
return NAME;
}
}

2
dspace-spring-rest/src/main/java/org/dspace/app/rest/model/AuthorityEntryRest.java
View File

@@ -19,7 +19,7 @@ import com.fasterxml.jackson.annotation.JsonIgnore;
* @author Andrea Bollini (andrea.bollini at 4science.it)
*
*/
public class AuthorityEntryRest implements RestModel {
public class AuthorityEntryRest implements DirectlyAddressableRestModel {
public static final String NAME = "authorityEntry";
private String id;
private String display;

2
dspace-spring-rest/src/main/java/org/dspace/app/rest/model/AuthorityRest.java
View File

@@ -22,7 +22,7 @@ import org.dspace.app.rest.RestResourceController;
public class AuthorityRest extends BaseObjectRest<String> {
public static final String NAME = "authority";
public static final String CATEGORY = RestModel.INTEGRATION;
public static final String CATEGORY = DirectlyAddressableRestModel.INTEGRATION;
public static final String ENTRIES = "entries";
public static final String ENTRY = "entryValues";

2
dspace-spring-rest/src/main/java/org/dspace/app/rest/model/BaseObjectRest.java
View File

@@ -21,7 +21,7 @@ import com.fasterxml.jackson.annotation.JsonIgnore;
* @param <T>
* the class of the resource identifier
*/
public abstract class BaseObjectRest<T extends Serializable> implements Identifiable<T>, RestModel {
public abstract class BaseObjectRest<T extends Serializable> implements Identifiable<T>, DirectlyAddressableRestModel {
protected T id;

2
dspace-spring-rest/src/main/java/org/dspace/app/rest/model/BitstreamFormatRest.java
View File

@@ -22,7 +22,7 @@ import com.fasterxml.jackson.annotation.JsonIgnore;
public class BitstreamFormatRest extends BaseObjectRest<Integer> {
public static final String NAME = "bitstreamformat";
public static final String CATEGORY = RestModel.CORE;
public static final String CATEGORY = DirectlyAddressableRestModel.CORE;
private String shortDescription;

2
dspace-spring-rest/src/main/java/org/dspace/app/rest/model/BitstreamRest.java
View File

@@ -18,7 +18,7 @@ import com.fasterxml.jackson.annotation.JsonProperty.Access;
public class BitstreamRest extends DSpaceObjectRest {
public static final String PLURAL_NAME = "bitstreams";
public static final String NAME = "bitstream";
public static final String CATEGORY = RestModel.CORE;
public static final String CATEGORY = DirectlyAddressableRestModel.CORE;
private String bundleName;
// avoid to serialize this object inline as we want a full resource embedded

7
dspace-spring-rest/src/main/java/org/dspace/app/rest/model/BrowseEntryRest.java
View File

@@ -17,7 +17,7 @@ import com.fasterxml.jackson.annotation.JsonIgnore;
* @author Andrea Bollini (andrea.bollini at 4science.it)
*
*/
public class BrowseEntryRest implements Serializable {
public class BrowseEntryRest implements RestModel {
private static final long serialVersionUID = -3415049466402327251L;
public static final String NAME = "browseEntry";
private String authority;
@@ -67,4 +67,9 @@ public class BrowseEntryRest implements Serializable {
public void setBrowseIndex(BrowseIndexRest browseIndex) {
this.browseIndex = browseIndex;
}
@Override
public String getType() {
return NAME;
}
}

2
dspace-spring-rest/src/main/java/org/dspace/app/rest/model/BrowseIndexRest.java
View File

@@ -29,7 +29,7 @@ public class BrowseIndexRest extends BaseObjectRest<String> {
public static final String NAME = "browse";
public static final String CATEGORY = RestModel.DISCOVER;
public static final String CATEGORY = DirectlyAddressableRestModel.DISCOVER;
public static final String ITEMS = "items";
public static final String ENTRIES = "entries";

2
dspace-spring-rest/src/main/java/org/dspace/app/rest/model/CollectionRest.java
View File

@@ -23,7 +23,7 @@ import com.fasterxml.jackson.annotation.JsonIgnore;
})
public class CollectionRest extends DSpaceObjectRest {
public static final String NAME = "collection";
public static final String CATEGORY = RestModel.CORE;
public static final String CATEGORY = DirectlyAddressableRestModel.CORE;
public static final String LICENSE = "license";
public static final String DEFAULT_ACCESS_CONDITIONS = "defaultAccessConditions";
@JsonIgnore

2
dspace-spring-rest/src/main/java/org/dspace/app/rest/model/CommunityRest.java
View File

@@ -19,7 +19,7 @@ import com.fasterxml.jackson.annotation.JsonIgnore;
*/
public class CommunityRest extends DSpaceObjectRest {
public static final String NAME = "community";
public static final String CATEGORY = RestModel.CORE;
public static final String CATEGORY = DirectlyAddressableRestModel.CORE;
@JsonIgnore
private BitstreamRest logo;

31
dspace-spring-rest/src/main/java/org/dspace/app/rest/model/DirectlyAddressableRestModel.java Normal file
View File

@@ -0,0 +1,31 @@
/**
* The contents of this file are subject to the license and copyright
* detailed in the LICENSE and NOTICE files at the root of the source
* tree and available online at
*
* http://www.dspace.org/license/
*/
package org.dspace.app.rest.model;
import com.fasterxml.jackson.annotation.JsonIgnore;
/**
* A directly addressable REST resource
*
* @author Andrea Bollini (andrea.bollini at 4science.it)
*
*/
public interface DirectlyAddressableRestModel extends RestModel {
public static final String CORE = "core";
public static final String EPERSON = "eperson";
public static final String DISCOVER = "discover";
public static final String CONFIGURATION = "config";
public static final String INTEGRATION = "integration";
public static final String SUBMISSION = "submission";
@JsonIgnore
public String getCategory();
@JsonIgnore
public Class getController();
}

2
dspace-spring-rest/src/main/java/org/dspace/app/rest/model/EPersonRest.java
View File

@@ -20,7 +20,7 @@ import org.dspace.app.rest.RestResourceController;
*/
public class EPersonRest extends DSpaceObjectRest {
public static final String NAME = "eperson";
public static final String CATEGORY = RestModel.EPERSON;
public static final String CATEGORY = DirectlyAddressableRestModel.EPERSON;
private String netid;
private Date lastActive;

2
dspace-spring-rest/src/main/java/org/dspace/app/rest/model/GroupRest.java
View File

@@ -22,7 +22,7 @@ import com.fasterxml.jackson.annotation.JsonIgnore;
public class GroupRest extends DSpaceObjectRest {
public static final String NAME = "group";
public static final String CATEGORY = RestModel.EPERSON;
public static final String CATEGORY = DirectlyAddressableRestModel.EPERSON;
private String name;

2
dspace-spring-rest/src/main/java/org/dspace/app/rest/model/ItemRest.java
View File

@@ -22,7 +22,7 @@ import com.fasterxml.jackson.annotation.JsonProperty.Access;
*/
public class ItemRest extends DSpaceObjectRest {
public static final String NAME = "item";
public static final String CATEGORY = RestModel.CORE;
public static final String CATEGORY = DirectlyAddressableRestModel.CORE;
private boolean inArchive = false;
private boolean discoverable = false;
private boolean withdrawn = false;

8
dspace-spring-rest/src/main/java/org/dspace/app/rest/model/LicenseRest.java
View File

@@ -15,7 +15,7 @@ import java.io.Serializable;
* @author Luigi Andrea Pascarelli (luigiandrea.pascarelli at 4science.it)
*
*/
public class LicenseRest implements Serializable {
public class LicenseRest implements RestModel {
public static final String NAME = "license";
private boolean custom = false;
private String text;
@@ -35,5 +35,9 @@ public class LicenseRest implements Serializable {
public void setText(String text) {
this.text = text;
}
@Override
public String getType() {
return NAME;
}
}

2
dspace-spring-rest/src/main/java/org/dspace/app/rest/model/MetadataFieldRest.java
View File

@@ -19,7 +19,7 @@ import com.fasterxml.jackson.annotation.JsonIgnore;
*/
public class MetadataFieldRest extends BaseObjectRest<Integer> {
public static final String NAME = "metadatafield";
public static final String CATEGORY = RestModel.CORE;
public static final String CATEGORY = DirectlyAddressableRestModel.CORE;
@JsonIgnore
private MetadataSchemaRest schema;

2
dspace-spring-rest/src/main/java/org/dspace/app/rest/model/MetadataSchemaRest.java
View File

@@ -17,7 +17,7 @@ import org.dspace.app.rest.RestResourceController;
*/
public class MetadataSchemaRest extends BaseObjectRest<Integer> {
public static final String NAME = "metadataschema";
public static final String CATEGORY = RestModel.CORE;
public static final String CATEGORY = DirectlyAddressableRestModel.CORE;
private String prefix;

18
dspace-spring-rest/src/main/java/org/dspace/app/rest/model/RestModel.java
View File

@@ -9,27 +9,13 @@ package org.dspace.app.rest.model;
import java.io.Serializable;
import com.fasterxml.jackson.annotation.JsonIgnore;
/**
* Methods to implement to make a REST resource addressable
* A REST resource directly or indirectly (in a collection) exposed must have at
* least a type attribute to facilitate deserialization
*
* @author Andrea Bollini (andrea.bollini at 4science.it)
*
*/
public interface RestModel extends Serializable {
public static final String CORE = "core";
public static final String EPERSON = "eperson";
public static final String DISCOVER = "discover";
public static final String CONFIGURATION = "config";
public static final String INTEGRATION = "integration";
public static final String SUBMISSION = "submission";
@JsonIgnore
public String getCategory();
public String getType();
@JsonIgnore
public Class getController();
}

2
dspace-spring-rest/src/main/java/org/dspace/app/rest/model/SiteRest.java
View File

@@ -15,7 +15,7 @@ package org.dspace.app.rest.model;
*/
public class SiteRest extends DSpaceObjectRest {
public static final String NAME = "site";
public static final String CATEGORY = RestModel.CORE;
public static final String CATEGORY = DirectlyAddressableRestModel.CORE;
@Override
public String getCategory() {

2
dspace-spring-rest/src/main/java/org/dspace/app/rest/model/SubmissionDefinitionRest.java
View File

@@ -24,7 +24,7 @@ import com.fasterxml.jackson.annotation.JsonProperty;
public class SubmissionDefinitionRest extends BaseObjectRest<String> {
public static final String NAME = "submissiondefinition";
public static final String CATEGORY = RestModel.CONFIGURATION;
public static final String CATEGORY = DirectlyAddressableRestModel.CONFIGURATION;
private String name;

4
dspace-spring-rest/src/main/java/org/dspace/app/rest/model/SubmissionFormRest.java
View File

@@ -21,8 +21,8 @@ import com.fasterxml.jackson.annotation.JsonProperty;
*/
public class SubmissionFormRest extends BaseObjectRest<String> {
public static final String NAME = "submissionform";
public static final String NAME_LINK_ON_PANEL = RestModel.CONFIGURATION;
public static final String CATEGORY = RestModel.CONFIGURATION;
public static final String NAME_LINK_ON_PANEL = DirectlyAddressableRestModel.CONFIGURATION;
public static final String CATEGORY = DirectlyAddressableRestModel.CONFIGURATION;
private String name;

22
dspace-spring-rest/src/main/java/org/dspace/app/rest/model/SubmissionUploadRest.java
View File

@@ -13,6 +13,7 @@ import java.util.List;
import org.dspace.app.rest.RestResourceController;
import org.dspace.submit.model.AccessConditionOption;
import com.fasterxml.jackson.annotation.JsonIgnore;
import com.fasterxml.jackson.annotation.JsonProperty;
/**
@@ -24,14 +25,15 @@ import com.fasterxml.jackson.annotation.JsonProperty;
public class SubmissionUploadRest extends BaseObjectRest<String> {
public static final String NAME = "submissionupload";
public static final String NAME_LINK_ON_PANEL = RestModel.CONFIGURATION;
public static final String CATEGORY = RestModel.CONFIGURATION;
public static final String NAME_LINK_ON_PANEL = DirectlyAddressableRestModel.CONFIGURATION;
public static final String CATEGORY = DirectlyAddressableRestModel.CONFIGURATION;
private String name;
private List<SubmissionFormFieldRest> metadata;
@JsonIgnore
private SubmissionFormRest metadata;
private List<AccessConditionOptionRest> accessConditions;
private List<AccessConditionOptionRest> accessConditionOptions;
private boolean required;
@@ -66,14 +68,14 @@ public class SubmissionUploadRest extends BaseObjectRest<String> {
}
public List<AccessConditionOptionRest> getAccessConditions() {
if(accessConditions==null) {
accessConditions = new ArrayList<>();
if(accessConditionOptions==null) {
accessConditionOptions = new ArrayList<>();
}
return accessConditions;
return accessConditionOptions;
}
public void setAccessConditions(List<AccessConditionOptionRest> accessConditions) {
this.accessConditions = accessConditions;
this.accessConditionOptions = accessConditions;
}
public boolean isRequired() {
@@ -92,11 +94,11 @@ public class SubmissionUploadRest extends BaseObjectRest<String> {
this.maxSize = maxSize;
}
public List<SubmissionFormFieldRest> getMetadata() {
public SubmissionFormRest getMetadata() {
return metadata;
}
public void setMetadata(List<SubmissionFormFieldRest> metadata) {
public void setMetadata(SubmissionFormRest metadata) {
this.metadata = metadata;
}
}

2
dspace-spring-rest/src/main/java/org/dspace/app/rest/model/WorkspaceItemRest.java
View File

@@ -26,7 +26,7 @@ import com.fasterxml.jackson.annotation.JsonUnwrapped;
*/
public class WorkspaceItemRest extends BaseObjectRest<Integer> {
public static final String NAME = "workspaceitem";
public static final String CATEGORY = RestModel.SUBMISSION;
public static final String CATEGORY = DirectlyAddressableRestModel.SUBMISSION;
private Date lastModified = new Date();

24
dspace-spring-rest/src/main/java/org/dspace/app/rest/model/hateoas/DSpaceResource.java
View File

@@ -22,7 +22,7 @@ import org.apache.commons.lang3.StringUtils;
import org.dspace.app.rest.model.BaseObjectRest;
import org.dspace.app.rest.model.LinkRest;
import org.dspace.app.rest.model.LinksRest;
import org.dspace.app.rest.model.RestModel;
import org.dspace.app.rest.model.DirectlyAddressableRestModel;
import org.dspace.app.rest.repository.DSpaceRestRepository;
import org.dspace.app.rest.repository.LinkRestRepository;
import org.dspace.app.rest.utils.Utils;
@@ -45,7 +45,7 @@ import com.fasterxml.jackson.annotation.JsonUnwrapped;
* @author Andrea Bollini (andrea.bollini at 4science.it)
*
*/
public abstract class DSpaceResource<T extends RestModel> extends ResourceSupport {
public abstract class DSpaceResource<T extends DirectlyAddressableRestModel> extends ResourceSupport {
@JsonUnwrapped
private final T data;
@@ -81,7 +81,7 @@ public abstract class DSpaceResource<T extends RestModel> extends ResourceSuppor
for (Method m : methods) {
if (StringUtils.equals(m.getName(), linkAnnotation.method())) {
// TODO add support for single linked object other than for collections
Page<? extends Serializable> pageResult = (Page<? extends RestModel>) m.invoke(linkRepository, null, ((BaseObjectRest) data).getId(), null, null);
Page<? extends Serializable> pageResult = (Page<? extends DirectlyAddressableRestModel>) m.invoke(linkRepository, null, ((BaseObjectRest) data).getId(), null, null);
EmbeddedPage ep = new EmbeddedPage(linkToSubResource.getHref(), pageResult, null);
embedded.put(name, ep);
found = true;
@@ -113,24 +113,24 @@ public abstract class DSpaceResource<T extends RestModel> extends ResourceSuppor
this.add(linkToSubResource);
Object linkedObject = readMethod.invoke(data);
Object wrapObject = linkedObject;
if (linkedObject instanceof RestModel) {
RestModel linkedRM = (RestModel) linkedObject;
if (linkedObject instanceof DirectlyAddressableRestModel) {
DirectlyAddressableRestModel linkedRM = (DirectlyAddressableRestModel) linkedObject;
wrapObject = utils.getResourceRepository(linkedRM.getCategory(), linkedRM.getType())
.wrapResource(linkedRM);
}
else {
if (linkedObject instanceof List) {
List<RestModel> linkedRMList = (List<RestModel>) linkedObject;
List<DirectlyAddressableRestModel> linkedRMList = (List<DirectlyAddressableRestModel>) linkedObject;
if (linkedRMList.size() > 0) {
DSpaceRestRepository<RestModel, ?> resourceRepository = utils.getResourceRepository(linkedRMList.get(0).getCategory(), linkedRMList.get(0).getType());
DSpaceRestRepository<DirectlyAddressableRestModel, ?> resourceRepository = utils.getResourceRepository(linkedRMList.get(0).getCategory(), linkedRMList.get(0).getType());
// TODO should we force pagination also of embedded resource?
// This will force a pagination with size 10 for embedded collections as well
// int pageSize = 1;
// PageImpl<RestModel> page = new PageImpl(
// linkedRMList.subList(0,
// linkedRMList.size() > pageSize ? pageSize : linkedRMList.size()), new PageRequest(0, pageSize), linkedRMList.size());
PageImpl<RestModel> page = new PageImpl(linkedRMList);
PageImpl<DirectlyAddressableRestModel> page = new PageImpl(linkedRMList);
wrapObject = new EmbeddedPage(linkToSubResource.getHref(), page.map(resourceRepository::wrapResource), linkedRMList);
}
else {
@@ -158,12 +158,12 @@ public abstract class DSpaceResource<T extends RestModel> extends ResourceSuppor
for (Method m : methods) {
if (StringUtils.equals(m.getName(), linkAnnotation.method())) {
if ( Page.class.isAssignableFrom( m.getReturnType()) ){
Page<? extends Serializable> pageResult = (Page<? extends RestModel>) m.invoke(linkRepository, null, ((BaseObjectRest) data).getId(), null, null);
Page<? extends Serializable> pageResult = (Page<? extends DirectlyAddressableRestModel>) m.invoke(linkRepository, null, ((BaseObjectRest) data).getId(), null, null);
EmbeddedPage ep = new EmbeddedPage(linkToSubResource.getHref(), pageResult, null);
embedded.put(name, ep);
}
else {
RestModel object = (RestModel)m.invoke(linkRepository, null, ((BaseObjectRest) data).getId(), null, null);
DirectlyAddressableRestModel object = (DirectlyAddressableRestModel)m.invoke(linkRepository, null, ((BaseObjectRest) data).getId(), null, null);
ResourceSupport ep = linkRepository.wrapResource(object, linkToSubResource.getHref());
embedded.put(name, ep);
}
@@ -180,10 +180,10 @@ public abstract class DSpaceResource<T extends RestModel> extends ResourceSuppor
}
}
}
else if (RestModel.class.isAssignableFrom(readMethod.getReturnType())) {
else if (DirectlyAddressableRestModel.class.isAssignableFrom(readMethod.getReturnType())) {
Link linkToSubResource = utils.linkToSubResource(data, name);
this.add(linkToSubResource);
RestModel linkedObject = (RestModel) readMethod.invoke(data);
DirectlyAddressableRestModel linkedObject = (DirectlyAddressableRestModel) readMethod.invoke(data);
if (linkedObject != null) {
embedded.put(name,
utils.getResourceRepository(linkedObject.getCategory(), linkedObject.getType())

4
dspace-spring-rest/src/main/java/org/dspace/app/rest/repository/DSpaceRestRepository.java
View File

@@ -12,7 +12,7 @@ import java.io.Serializable;
import javax.servlet.http.HttpServletRequest;
import org.apache.log4j.Logger;
import org.dspace.app.rest.model.RestModel;
import org.dspace.app.rest.model.DirectlyAddressableRestModel;
import org.dspace.app.rest.model.hateoas.DSpaceResource;
import org.dspace.app.rest.model.step.UploadStatusResponse;
import org.dspace.core.Context;
@@ -31,7 +31,7 @@ import org.springframework.web.multipart.MultipartFile;
* @author Andrea Bollini (andrea.bollini at 4science.it)
*
*/
public abstract class DSpaceRestRepository<T extends RestModel, ID extends Serializable>
public abstract class DSpaceRestRepository<T extends DirectlyAddressableRestModel, ID extends Serializable>
extends AbstractDSpaceRestRepository
implements PagingAndSortingRepository<T, ID> {

3
dspace-spring-rest/src/main/java/org/dspace/app/rest/repository/LinkRestRepository.java
View File

@@ -9,6 +9,7 @@ package org.dspace.app.rest.repository;
import java.io.Serializable;
import org.dspace.app.rest.model.RestModel;
import org.springframework.hateoas.ResourceSupport;
/**
@@ -17,7 +18,7 @@ import org.springframework.hateoas.ResourceSupport;
* @author Andrea Bollini (andrea.bollini at 4science.it)
*
*/
public interface LinkRestRepository<L extends Serializable> {
public interface LinkRestRepository<L extends RestModel> {
public abstract ResourceSupport wrapResource(L model, String... rels);
public default boolean isEmbeddableRelation(Object data, String name) {

9
dspace-spring-rest/src/main/java/org/dspace/app/rest/repository/SubmissionUploadRestRepository.java
View File

@@ -49,6 +49,9 @@ public class SubmissionUploadRestRepository extends DSpaceRestRepository<Submiss
private SubmissionConfigReader submissionConfigReader;
@Autowired
private SubmissionFormRestRepository submissionFormRestRepository;
@Autowired
private UploadConfigurationService uploadConfigurationService;
@@ -80,7 +83,7 @@ public class SubmissionUploadRestRepository extends DSpaceRestRepository<Submiss
for (SubmissionConfig config : subConfs) {
for (int i = 0; i < config.getNumberOfSteps(); i++) {
SubmissionStepConfig step = config.getStep(i);
if (SubmissionStepConfig.UPLOAD_STEP_NAME.equals(step.getId())) {
if (SubmissionStepConfig.UPLOAD_STEP_NAME.equals(step.getType())) {
UploadConfiguration uploadConfig = uploadConfigurationService.getMap().get(step.getId());
if (uploadConfig != null) {
try {
@@ -121,10 +124,10 @@ public class SubmissionUploadRestRepository extends DSpaceRestRepository<Submiss
if(StringUtils.isNotBlank(option.getDateLimit())) {
optionRest.setMaxEndDate(dateMathParser.parseMath(option.getDateLimit()));
}
optionRest.setType(option.getPolicyType());
optionRest.setPolicyType(option.getPolicyType());
result.getAccessConditions().add(optionRest);
}
result.setMetadata(config.getMetadata());
result.setMetadata(submissionFormRestRepository.findOne(config.getMetadata()));
result.setMaxSize(config.getMaxSize());
result.setRequired(config.isRequired());
result.setName(config.getName());

1
dspace-spring-rest/src/main/java/org/dspace/app/rest/submit/step/DescribeStep.java
View File

@@ -23,7 +23,6 @@ import org.dspace.app.util.SubmissionStepConfig;
import org.dspace.content.Item;
import org.dspace.content.MetadataValue;
import org.dspace.content.WorkspaceItem;
import org.dspace.content.factory.ContentServiceFactory;
import org.dspace.core.Context;
import org.dspace.core.Utils;
import org.dspace.services.model.Request;

12
dspace-spring-rest/src/main/java/org/dspace/app/rest/utils/Utils.java
View File

@@ -20,7 +20,7 @@ import org.dspace.app.rest.model.CommunityRest;
import org.dspace.app.rest.model.LinkRest;
import org.dspace.app.rest.model.LinksRest;
import org.dspace.app.rest.model.MetadataFieldRest;
import org.dspace.app.rest.model.RestModel;
import org.dspace.app.rest.model.DirectlyAddressableRestModel;
import org.dspace.app.rest.model.hateoas.DSpaceResource;
import org.dspace.app.rest.repository.DSpaceRestRepository;
import org.dspace.app.rest.repository.LinkRestRepository;
@@ -60,20 +60,20 @@ public class Utils {
}
public Link linkToSingleResource(DSpaceResource r, String rel) {
RestModel data = r.getData();
DirectlyAddressableRestModel data = r.getData();
return linkToSingleResource(data, rel);
}
public Link linkToSingleResource(RestModel data, String rel) {
public Link linkToSingleResource(DirectlyAddressableRestModel data, String rel) {
return linkTo(data.getController(), data.getCategory(), English.plural(data.getType())).slash(data)
.withRel(rel);
}
public Link linkToSubResource(RestModel data, String rel) {
public Link linkToSubResource(DirectlyAddressableRestModel data, String rel) {
return linkToSubResource(data, rel, rel);
}
public Link linkToSubResource(RestModel data, String rel, String path) {
public Link linkToSubResource(DirectlyAddressableRestModel data, String rel, String path) {
return linkTo(data.getController(), data.getCategory(), English.plural(data.getType())).slash(data).slash(path)
.withRel(rel);
}
@@ -131,7 +131,7 @@ public class Utils {
* @return the LinkRest annotation corresponding to the specified rel in the
* domainClass. Null if not found
*/
public LinkRest getLinkRest(String rel, Class<RestModel> domainClass) {
public LinkRest getLinkRest(String rel, Class<DirectlyAddressableRestModel> domainClass) {
LinkRest linkRest = null;
LinksRest linksAnnotation = domainClass.getDeclaredAnnotation(LinksRest.class);
if (linksAnnotation != null) {

7
dspace/config/spring/api/access-condition.xml
View File

@@ -7,12 +7,7 @@
<bean id="uploadConfigurationDefault" class="org.dspace.submit.model.UploadConfiguration">
<property name="name" value="upload"></property>
<property name="configurationService" ref="org.dspace.services.ConfigurationService"/>
<property name="metadata">
<list>
<ref local="fieldBitstreamName"/>
<ref local="fieldBitstreamDescription"/>
</list>
</property>
<property name="metadata" value="bitstream-metadata" />
<property name="options">
<list>
<ref local="openAccess"/>

22
dspace/config/submission-forms.xml
View File

@@ -21,7 +21,29 @@
<!-- serves as a 'this field is required' flag. -->
<form-definitions>
<form name="bitstream-metadata">
<field>
<dc-schema>dc</dc-schema>
<dc-element>title</dc-element>
<dc-qualifier></dc-qualifier>
<repeatable>false</repeatable>
<label>Title</label>
<input-type>onebox</input-type>
<hint>Enter the name of the file.</hint>
<required>You must enter a main title for this item.</required>
</field>
<field>
<dc-schema>dc</dc-schema>
<dc-element>description</dc-element>
<repeatable>true</repeatable>
<label>Description</label>
<input-type>textarea</input-type>
<hint>Enter a description for the file</hint>
<required></required>
</field>
</form>
<form name="traditionalpageone">
<field>
<dc-schema>dc</dc-schema>