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

D4CRIS-338 change resource name for accesscondition to resourcepolicy

Browse Source
This commit is contained in:
Luigi Andrea Pascarelli
2017-11-17 16:28:02 +01:00
parent 6003012d40
commit 56533d4c0f
2 changed files with 6 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -24,7 +24,7 @@ import com.fasterxml.jackson.annotation.JsonInclude.Include;
*/ */
public class ResourcePolicyRest extends BaseObjectRest<Integer> { public class ResourcePolicyRest extends BaseObjectRest<Integer> {
public static final String NAME = "accessCondition"; public static final String NAME = "resourcePolicy";
public static final String CATEGORY = DirectlyAddressableRestModel.AUTHORIZATION; public static final String CATEGORY = DirectlyAddressableRestModel.AUTHORIZATION;
private String name; private String name;

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

@@ -17,10 +17,10 @@ import org.dspace.app.rest.exception.PaginationException;
import org.dspace.app.rest.exception.RepositoryNotFoundException; import org.dspace.app.rest.exception.RepositoryNotFoundException;
import org.dspace.app.rest.model.AuthorityRest; import org.dspace.app.rest.model.AuthorityRest;
import org.dspace.app.rest.model.CommunityRest; import org.dspace.app.rest.model.CommunityRest;
import org.dspace.app.rest.model.DirectlyAddressableRestModel;
import org.dspace.app.rest.model.LinkRest; import org.dspace.app.rest.model.LinkRest;
import org.dspace.app.rest.model.LinksRest; import org.dspace.app.rest.model.LinksRest;
import org.dspace.app.rest.model.MetadataFieldRest; import org.dspace.app.rest.model.ResourcePolicyRest;
import org.dspace.app.rest.model.DirectlyAddressableRestModel;
import org.dspace.app.rest.model.hateoas.DSpaceResource; import org.dspace.app.rest.model.hateoas.DSpaceResource;
import org.dspace.app.rest.repository.DSpaceRestRepository; import org.dspace.app.rest.repository.DSpaceRestRepository;
import org.dspace.app.rest.repository.LinkRestRepository; import org.dspace.app.rest.repository.LinkRestRepository;
@@ -100,6 +100,9 @@ public class Utils {
if (modelPlural.equals("authorities")) { if (modelPlural.equals("authorities")) {
return AuthorityRest.NAME; return AuthorityRest.NAME;
} }
if (modelPlural.equals("resourcePolicies")) {
return ResourcePolicyRest.NAME;
}
return modelPlural.replaceAll("s$", ""); return modelPlural.replaceAll("s$", "");
} }