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

Merge pull request #9940 from DSpace/dependabot/maven/build-tools-9d8f74bba3

Browse Source 
Bump the build-tools group across 1 directory with 24 updates
This commit is contained in:
Tim Donohue
2024-10-30 10:57:52 -05:00
committed by GitHub
parent 9afe7d68ef a824e4d6ff
commit ce6b584324
34 changed files with 99 additions and 273 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
checkstyle.xml
View File

@@ -92,7 +92,7 @@ For more information on CheckStyle configurations below, see: http://checkstyle.
<!-- Requirements for Javadocs for methods --> <!-- Requirements for Javadocs for methods -->
<module name="JavadocMethod"> <module name="JavadocMethod">
<!-- All public methods MUST HAVE Javadocs --> <!-- All public methods MUST HAVE Javadocs -->
<property name="scope" value="public"/> <property name="accessModifiers" value="public"/>
<!-- Allow params, throws and return tags to be optional --> <!-- Allow params, throws and return tags to be optional -->
<property name="allowMissingParamTags" value="true"/> <property name="allowMissingParamTags" value="true"/>
<property name="allowMissingReturnTag" value="true"/> <property name="allowMissingReturnTag" value="true"/>

6
dspace-api/pom.xml
View File

@@ -102,7 +102,7 @@
<plugin> <plugin>
<groupId>org.codehaus.mojo</groupId> <groupId>org.codehaus.mojo</groupId>
<artifactId>build-helper-maven-plugin</artifactId> <artifactId>build-helper-maven-plugin</artifactId>
<version>3.4.0</version> <version>3.6.0</version>
<executions> <executions>
<execution> <execution>
<phase>validate</phase> <phase>validate</phase>
@@ -116,7 +116,7 @@
<plugin> <plugin>
<groupId>org.codehaus.mojo</groupId> <groupId>org.codehaus.mojo</groupId>
<artifactId>buildnumber-maven-plugin</artifactId> <artifactId>buildnumber-maven-plugin</artifactId>
<version>3.2.0</version> <version>3.2.1</version>
<configuration> <configuration>
<revisionOnScmFailure>UNKNOWN_REVISION</revisionOnScmFailure> <revisionOnScmFailure>UNKNOWN_REVISION</revisionOnScmFailure>
</configuration> </configuration>
@@ -177,7 +177,7 @@
<plugin> <plugin>
<groupId>org.codehaus.mojo</groupId> <groupId>org.codehaus.mojo</groupId>
<artifactId>jaxb2-maven-plugin</artifactId> <artifactId>jaxb2-maven-plugin</artifactId>
<version>3.1.0</version> <version>3.2.0</version>
<executions> <executions>
<execution> <execution>
<id>workflow-curation</id> <id>workflow-curation</id>

2
dspace-server-webapp/pom.xml
View File

@@ -31,7 +31,7 @@
<plugin> <plugin>
<groupId>org.codehaus.mojo</groupId> <groupId>org.codehaus.mojo</groupId>
<artifactId>properties-maven-plugin</artifactId> <artifactId>properties-maven-plugin</artifactId>
<version>1.1.0</version> <version>1.2.1</version>
<executions> <executions>
<execution> <execution>
<phase>initialize</phase> <phase>initialize</phase>

2
dspace-server-webapp/src/main/java/org/dspace/app/rest/AuthenticationRestController.java
View File

@@ -220,7 +220,7 @@ public class AuthenticationRestController implements InitializingBean {
* @return ResponseEntity * @return ResponseEntity
*/ */
@RequestMapping(value = "/login", method = { RequestMethod.GET, RequestMethod.PUT, RequestMethod.PATCH, @RequestMapping(value = "/login", method = { RequestMethod.GET, RequestMethod.PUT, RequestMethod.PATCH,
RequestMethod.DELETE }) RequestMethod.DELETE })
public ResponseEntity login() { public ResponseEntity login() {
return ResponseEntity.status(HttpStatus.METHOD_NOT_ALLOWED).body("Only POST is allowed for login requests."); return ResponseEntity.status(HttpStatus.METHOD_NOT_ALLOWED).body("Only POST is allowed for login requests.");
} }

6
dspace-server-webapp/src/main/java/org/dspace/app/rest/model/AuthorizationRest.java
View File

@@ -18,9 +18,9 @@ import org.dspace.app.rest.RestResourceController;
* @author Andrea Bollini (andrea.bollini at 4science.it) * @author Andrea Bollini (andrea.bollini at 4science.it)
*/ */
@LinksRest(links = { @LinksRest(links = {
@LinkRest(method = "getEperson", name = AuthorizationRest.EPERSON), @LinkRest(method = "getEperson", name = AuthorizationRest.EPERSON),
@LinkRest(method = "getFeature", name = AuthorizationRest.FEATURE), @LinkRest(method = "getFeature", name = AuthorizationRest.FEATURE),
@LinkRest(method = "getObject", name = AuthorizationRest.OBJECT) @LinkRest(method = "getObject", name = AuthorizationRest.OBJECT)
}) })
public class AuthorizationRest extends BaseObjectRest<String> { public class AuthorizationRest extends BaseObjectRest<String> {
public static final String NAME = "authorization"; public static final String NAME = "authorization";

15
dspace-server-webapp/src/main/java/org/dspace/app/rest/model/BitstreamRest.java
View File

@@ -16,18 +16,9 @@ import com.fasterxml.jackson.annotation.JsonProperty.Access;
* @author Andrea Bollini (andrea.bollini at 4science.it) * @author Andrea Bollini (andrea.bollini at 4science.it)
*/ */
@LinksRest(links = { @LinksRest(links = {
@LinkRest( @LinkRest(name = BitstreamRest.BUNDLE, method = "getBundle"),
name = BitstreamRest.BUNDLE, @LinkRest(name = BitstreamRest.FORMAT, method = "getFormat"),
method = "getBundle" @LinkRest(name = BitstreamRest.THUMBNAIL, method = "getThumbnail")
),
@LinkRest(
name = BitstreamRest.FORMAT,
method = "getFormat"
),
@LinkRest(
name = BitstreamRest.THUMBNAIL,
method = "getThumbnail"
)
}) })
public class BitstreamRest extends DSpaceObjectRest { public class BitstreamRest extends DSpaceObjectRest {
public static final String PLURAL_NAME = "bitstreams"; public static final String PLURAL_NAME = "bitstreams";

10
dspace-server-webapp/src/main/java/org/dspace/app/rest/model/BrowseIndexRest.java
View File

@@ -20,14 +20,8 @@ import org.dspace.app.rest.RestResourceController;
* @author Andrea Bollini (andrea.bollini at 4science.it) * @author Andrea Bollini (andrea.bollini at 4science.it)
*/ */
@LinksRest(links = { @LinksRest(links = {
@LinkRest( @LinkRest(name = BrowseIndexRest.LINK_ITEMS, method = "listBrowseItems"),
name = BrowseIndexRest.LINK_ITEMS, @LinkRest(name = BrowseIndexRest.LINK_ENTRIES, method = "listBrowseEntries")
method = "listBrowseItems"
),
@LinkRest(
name = BrowseIndexRest.LINK_ENTRIES,
method = "listBrowseEntries"
)
}) })
public class BrowseIndexRest extends BaseObjectRest<String> { public class BrowseIndexRest extends BaseObjectRest<String> {
private static final long serialVersionUID = -4870333170249999559L; private static final long serialVersionUID = -4870333170249999559L;

15
dspace-server-webapp/src/main/java/org/dspace/app/rest/model/BundleRest.java
View File

@@ -16,18 +16,9 @@ import com.fasterxml.jackson.annotation.JsonProperty;
* @author Jelle Pelgrims (jelle.pelgrims at atmire.com) * @author Jelle Pelgrims (jelle.pelgrims at atmire.com)
*/ */
@LinksRest(links = { @LinksRest(links = {
@LinkRest( @LinkRest(name = BundleRest.ITEM, method = "getItem"),
name = BundleRest.ITEM, @LinkRest(name = BundleRest.BITSTREAMS, method = "getBitstreams"),
method = "getItem" @LinkRest(name = BundleRest.PRIMARY_BITSTREAM, method = "getPrimaryBitstream")
),
@LinkRest(
name = BundleRest.BITSTREAMS,
method = "getBitstreams"
),
@LinkRest(
name = BundleRest.PRIMARY_BITSTREAM,
method = "getPrimaryBitstream"
)
}) })
public class BundleRest extends DSpaceObjectRest { public class BundleRest extends DSpaceObjectRest {
public static final String NAME = "bundle"; public static final String NAME = "bundle";

5
dspace-server-webapp/src/main/java/org/dspace/app/rest/model/ClaimedTaskRest.java
View File

@@ -16,10 +16,7 @@ import org.dspace.app.rest.RestResourceController;
* @author Andrea Bollini (andrea.bollini at 4science.it) * @author Andrea Bollini (andrea.bollini at 4science.it)
*/ */
@LinksRest(links = { @LinksRest(links = {
@LinkRest( @LinkRest(name = ClaimedTaskRest.STEP, method = "getStep")
name = ClaimedTaskRest.STEP,
method = "getStep"
)
}) })
public class ClaimedTaskRest extends BaseObjectRest<Integer> { public class ClaimedTaskRest extends BaseObjectRest<Integer> {
public static final String NAME = "claimedtask"; public static final String NAME = "claimedtask";

40
dspace-server-webapp/src/main/java/org/dspace/app/rest/model/CollectionRest.java
View File

@@ -15,38 +15,14 @@ import com.fasterxml.jackson.annotation.JsonProperty;
* @author Andrea Bollini (andrea.bollini at 4science.it) * @author Andrea Bollini (andrea.bollini at 4science.it)
*/ */
@LinksRest(links = { @LinksRest(links = {
@LinkRest( @LinkRest(name = CollectionRest.LICENSE, method = "getLicense"),
name = CollectionRest.LICENSE, @LinkRest(name = CollectionRest.LOGO, method = "getLogo"),
method = "getLicense" @LinkRest(name = CollectionRest.MAPPED_ITEMS, method = "getMappedItems"),
), @LinkRest(name = CollectionRest.PARENT_COMMUNITY, method = "getParentCommunity"),
@LinkRest( @LinkRest(name = CollectionRest.ADMIN_GROUP, method = "getAdminGroup"),
name = CollectionRest.LOGO, @LinkRest(name = CollectionRest.SUBMITTERS_GROUP, method = "getSubmittersGroup"),
method = "getLogo" @LinkRest(name = CollectionRest.ITEM_READ_GROUP, method = "getItemReadGroup"),
), @LinkRest(name = CollectionRest.BITSTREAM_READ_GROUP, method = "getBitstreamReadGroup"),
@LinkRest(
name = CollectionRest.MAPPED_ITEMS,
method = "getMappedItems"
),
@LinkRest(
name = CollectionRest.PARENT_COMMUNITY,
method = "getParentCommunity"
),
@LinkRest(
name = CollectionRest.ADMIN_GROUP,
method = "getAdminGroup"
),
@LinkRest(
name = CollectionRest.SUBMITTERS_GROUP,
method = "getSubmittersGroup"
),
@LinkRest(
name = CollectionRest.ITEM_READ_GROUP,
method = "getItemReadGroup"
),
@LinkRest(
name = CollectionRest.BITSTREAM_READ_GROUP,
method = "getBitstreamReadGroup"
),
}) })
public class CollectionRest extends DSpaceObjectRest { public class CollectionRest extends DSpaceObjectRest {
public static final String NAME = "collection"; public static final String NAME = "collection";

25
dspace-server-webapp/src/main/java/org/dspace/app/rest/model/CommunityRest.java
View File

@@ -15,26 +15,11 @@ import com.fasterxml.jackson.annotation.JsonProperty;
* @author Andrea Bollini (andrea.bollini at 4science.it) * @author Andrea Bollini (andrea.bollini at 4science.it)
*/ */
@LinksRest(links = { @LinksRest(links = {
@LinkRest( @LinkRest(name = CommunityRest.COLLECTIONS, method = "getCollections"),
name = CommunityRest.COLLECTIONS, @LinkRest(name = CommunityRest.LOGO, method = "getLogo"),
method = "getCollections" @LinkRest(name = CommunityRest.SUBCOMMUNITIES, method = "getSubcommunities"),
), @LinkRest(name = CommunityRest.PARENT_COMMUNITY, method = "getParentCommunity"),
@LinkRest( @LinkRest(name = CommunityRest.ADMIN_GROUP, method = "getAdminGroup")
name = CommunityRest.LOGO,
method = "getLogo"
),
@LinkRest(
name = CommunityRest.SUBCOMMUNITIES,
method = "getSubcommunities"
),
@LinkRest(
name = CommunityRest.PARENT_COMMUNITY,
method = "getParentCommunity"
),
@LinkRest(
name = CommunityRest.ADMIN_GROUP,
method = "getAdminGroup"
)
}) })
public class CommunityRest extends DSpaceObjectRest { public class CommunityRest extends DSpaceObjectRest {
public static final String NAME = "community"; public static final String NAME = "community";

5
dspace-server-webapp/src/main/java/org/dspace/app/rest/model/EPersonRest.java
View File

@@ -20,10 +20,7 @@ import org.dspace.app.rest.RestResourceController;
* @author Andrea Bollini (andrea.bollini at 4science.it) * @author Andrea Bollini (andrea.bollini at 4science.it)
*/ */
@LinksRest(links = { @LinksRest(links = {
@LinkRest( @LinkRest(name = EPersonRest.GROUPS, method = "getGroups")
name = EPersonRest.GROUPS,
method = "getGroups"
)
}) })
public class EPersonRest extends DSpaceObjectRest { public class EPersonRest extends DSpaceObjectRest {
public static final String NAME = "eperson"; public static final String NAME = "eperson";

5
dspace-server-webapp/src/main/java/org/dspace/app/rest/model/EntityTypeRest.java
View File

@@ -15,10 +15,7 @@ import org.dspace.app.rest.RestResourceController;
* Refer to {@link org.dspace.content.EntityType} for explanation of the properties * Refer to {@link org.dspace.content.EntityType} for explanation of the properties
*/ */
@LinksRest(links = { @LinksRest(links = {
@LinkRest( @LinkRest(name = EntityTypeRest.RELATION_SHIP_TYPES, method = "getEntityTypeRelationship")
name = EntityTypeRest.RELATION_SHIP_TYPES,
method = "getEntityTypeRelationship"
)
}) })
public class EntityTypeRest extends BaseObjectRest<Integer> { public class EntityTypeRest extends BaseObjectRest<Integer> {

5
dspace-server-webapp/src/main/java/org/dspace/app/rest/model/ExternalSourceRest.java
View File

@@ -13,10 +13,7 @@ import org.dspace.app.rest.RestResourceController;
* This class serves as a REST representation for an External Source * This class serves as a REST representation for an External Source
*/ */
@LinksRest(links = { @LinksRest(links = {
@LinkRest( @LinkRest(name = ExternalSourceRest.ENTITY_TYPES, method = "getSupportedEntityTypes")
name = ExternalSourceRest.ENTITY_TYPES,
method = "getSupportedEntityTypes"
)
}) })
public class ExternalSourceRest extends BaseObjectRest<String> { public class ExternalSourceRest extends BaseObjectRest<String> {

15
dspace-server-webapp/src/main/java/org/dspace/app/rest/model/GroupRest.java
View File

@@ -18,18 +18,9 @@ import org.dspace.app.rest.RestResourceController;
*/ */
@JsonIgnoreProperties(ignoreUnknown = true) @JsonIgnoreProperties(ignoreUnknown = true)
@LinksRest(links = { @LinksRest(links = {
@LinkRest( @LinkRest(name = GroupRest.SUBGROUPS, method = "getGroups"),
name = GroupRest.SUBGROUPS, @LinkRest(name = GroupRest.EPERSONS, method = "getMembers"),
method = "getGroups" @LinkRest(name = GroupRest.OBJECT, method = "getParentObject")
),
@LinkRest(
name = GroupRest.EPERSONS,
method = "getMembers"
),
@LinkRest(
name = GroupRest.OBJECT,
method = "getParentObject"
)
}) })
public class GroupRest extends DSpaceObjectRest { public class GroupRest extends DSpaceObjectRest {
public static final String NAME = "group"; public static final String NAME = "group";

50
dspace-server-webapp/src/main/java/org/dspace/app/rest/model/ItemRest.java
View File

@@ -17,46 +17,16 @@ import com.fasterxml.jackson.annotation.JsonProperty;
* @author Andrea Bollini (andrea.bollini at 4science.it) * @author Andrea Bollini (andrea.bollini at 4science.it)
*/ */
@LinksRest(links = { @LinksRest(links = {
@LinkRest( @LinkRest(name = ItemRest.ACCESS_STATUS, method = "getAccessStatus"),
name = ItemRest.ACCESS_STATUS, @LinkRest(name = ItemRest.BUNDLES, method = "getBundles"),
method = "getAccessStatus" @LinkRest(name = ItemRest.IDENTIFIERS, method = "getIdentifiers"),
), @LinkRest(name = ItemRest.MAPPED_COLLECTIONS, method = "getMappedCollections"),
@LinkRest( @LinkRest(name = ItemRest.OWNING_COLLECTION, method = "getOwningCollection"),
name = ItemRest.BUNDLES, @LinkRest(name = ItemRest.RELATIONSHIPS, method = "getRelationships"),
method = "getBundles" @LinkRest(name = ItemRest.VERSION, method = "getItemVersion"),
), @LinkRest(name = ItemRest.TEMPLATE_ITEM_OF, method = "getTemplateItemOf"),
@LinkRest( @LinkRest(name = ItemRest.THUMBNAIL, method = "getThumbnail"),
name = ItemRest.IDENTIFIERS, @LinkRest(name = ItemRest.SUBMITTER, method = "getItemSubmitter")
method = "getIdentifiers"
),
@LinkRest(
name = ItemRest.MAPPED_COLLECTIONS,
method = "getMappedCollections"
),
@LinkRest(
name = ItemRest.OWNING_COLLECTION,
method = "getOwningCollection"
),
@LinkRest(
name = ItemRest.RELATIONSHIPS,
method = "getRelationships"
),
@LinkRest(
name = ItemRest.VERSION,
method = "getItemVersion"
),
@LinkRest(
name = ItemRest.TEMPLATE_ITEM_OF,
method = "getTemplateItemOf"
),
@LinkRest(
name = ItemRest.THUMBNAIL,
method = "getThumbnail"
),
@LinkRest(
name = ItemRest.SUBMITTER,
method = "getItemSubmitter"
)
}) })
public class ItemRest extends DSpaceObjectRest { public class ItemRest extends DSpaceObjectRest {
public static final String NAME = "item"; public static final String NAME = "item";

2
dspace-server-webapp/src/main/java/org/dspace/app/rest/model/OrcidHistoryRest.java
View File

@@ -39,7 +39,7 @@ public class OrcidHistoryRest extends BaseObjectRest<Integer> {
private String responseMessage; private String responseMessage;
public OrcidHistoryRest(){} public OrcidHistoryRest() {}
@Override @Override
@JsonProperty(access = JsonProperty.Access.READ_ONLY) @JsonProperty(access = JsonProperty.Access.READ_ONLY)

5
dspace-server-webapp/src/main/java/org/dspace/app/rest/model/PoolTaskRest.java
View File

@@ -17,10 +17,7 @@ import org.dspace.xmlworkflow.storedcomponents.PoolTask;
* @author Andrea Bollini (andrea.bollini at 4science.it) * @author Andrea Bollini (andrea.bollini at 4science.it)
*/ */
@LinksRest(links = { @LinksRest(links = {
@LinkRest( @LinkRest(name = PoolTaskRest.STEP, method = "getStep")
name = PoolTaskRest.STEP,
method = "getStep"
)
}) })
public class PoolTaskRest extends BaseObjectRest<Integer> { public class PoolTaskRest extends BaseObjectRest<Integer> {
public static final String NAME = "pooltask"; public static final String NAME = "pooltask";

15
dspace-server-webapp/src/main/java/org/dspace/app/rest/model/ProcessRest.java
View File

@@ -21,18 +21,9 @@ import org.dspace.scripts.Process;
* This class serves as a REST representation for the {@link Process} class * This class serves as a REST representation for the {@link Process} class
*/ */
@LinksRest(links = { @LinksRest(links = {
@LinkRest( @LinkRest(name = ProcessRest.FILES, method = "getFilesFromProcess"),
name = ProcessRest.FILES, @LinkRest(name = ProcessRest.FILE_TYPES, method = "getFileTypesFromProcess"),
method = "getFilesFromProcess" @LinkRest(name = ProcessRest.OUTPUT, method = "getOutputFromProcess")
),
@LinkRest(
name = ProcessRest.FILE_TYPES,
method = "getFileTypesFromProcess"
),
@LinkRest(
name = ProcessRest.OUTPUT,
method = "getOutputFromProcess"
)
}) })
public class ProcessRest extends BaseObjectRest<Integer> { public class ProcessRest extends BaseObjectRest<Integer> {
public static final String NAME = "process"; public static final String NAME = "process";

5
dspace-server-webapp/src/main/java/org/dspace/app/rest/model/RelationshipRest.java
View File

@@ -19,10 +19,7 @@ import org.dspace.app.rest.RestResourceController;
* Refer to {@link org.dspace.content.Relationship} for explanation about the properties * Refer to {@link org.dspace.content.Relationship} for explanation about the properties
*/ */
@LinksRest(links = { @LinksRest(links = {
@LinkRest( @LinkRest(name = RelationshipRest.RELATIONSHIP_TYPE, method = "getRelationshipType")
name = RelationshipRest.RELATIONSHIP_TYPE,
method = "getRelationshipType"
)
}) })
public class RelationshipRest extends BaseObjectRest<Integer> { public class RelationshipRest extends BaseObjectRest<Integer> {
public static final String NAME = "relationship"; public static final String NAME = "relationship";

4
dspace-server-webapp/src/main/java/org/dspace/app/rest/model/ResearcherProfileRest.java
View File

@@ -20,8 +20,8 @@ import org.dspace.app.rest.RestResourceController;
* *
*/ */
@LinksRest(links = { @LinksRest(links = {
@LinkRest(name = ResearcherProfileRest.ITEM, method = "getItem"), @LinkRest(name = ResearcherProfileRest.ITEM, method = "getItem"),
@LinkRest(name = ResearcherProfileRest.EPERSON, method = "getEPerson") @LinkRest(name = ResearcherProfileRest.EPERSON, method = "getEPerson")
}) })
public class ResearcherProfileRest extends BaseObjectRest<UUID> { public class ResearcherProfileRest extends BaseObjectRest<UUID> {

4
dspace-server-webapp/src/main/java/org/dspace/app/rest/model/SuggestionRest.java
View File

@@ -21,7 +21,9 @@ import org.dspace.app.rest.RestResourceController;
* *
* @author Andrea Bollini (andrea.bollini at 4science.it) * @author Andrea Bollini (andrea.bollini at 4science.it)
*/ */
@LinksRest(links = { @LinkRest(name = SuggestionRest.TARGET, method = "getTarget") }) @LinksRest(links = {
@LinkRest(name = SuggestionRest.TARGET, method = "getTarget")
})
public class SuggestionRest extends BaseObjectRest<String> { public class SuggestionRest extends BaseObjectRest<String> {
private static final long serialVersionUID = 1L; private static final long serialVersionUID = 1L;
public static final String NAME = "suggestion"; public static final String NAME = "suggestion";

2
dspace-server-webapp/src/main/java/org/dspace/app/rest/model/SuggestionTargetRest.java
View File

@@ -19,7 +19,7 @@ import org.dspace.app.rest.RestResourceController;
* @author Andrea Bollini (andrea.bollini at 4science.it) * @author Andrea Bollini (andrea.bollini at 4science.it)
*/ */
@LinksRest(links = { @LinksRest(links = {
@LinkRest(name = SuggestionTargetRest.TARGET, method = "getTarget") @LinkRest(name = SuggestionTargetRest.TARGET, method = "getTarget")
}) })
public class SuggestionTargetRest extends BaseObjectRest<String> { public class SuggestionTargetRest extends BaseObjectRest<String> {
private static final long serialVersionUID = 1L; private static final long serialVersionUID = 1L;

10
dspace-server-webapp/src/main/java/org/dspace/app/rest/model/VersionHistoryRest.java
View File

@@ -13,14 +13,8 @@ import org.dspace.app.rest.RestResourceController;
* The REST object for the {@link org.dspace.versioning.VersionHistory} object * The REST object for the {@link org.dspace.versioning.VersionHistory} object
*/ */
@LinksRest(links = { @LinksRest(links = {
@LinkRest( @LinkRest(name = VersionHistoryRest.VERSIONS, method = "getVersions"),
name = VersionHistoryRest.VERSIONS, @LinkRest(name = VersionHistoryRest.DRAFT_VERSION, method = "getDraftVersion")
method = "getVersions"
),
@LinkRest(
name = VersionHistoryRest.DRAFT_VERSION,
method = "getDraftVersion"
)
}) })
public class VersionHistoryRest extends BaseObjectRest<Integer> { public class VersionHistoryRest extends BaseObjectRest<Integer> {

10
dspace-server-webapp/src/main/java/org/dspace/app/rest/model/VersionRest.java
View File

@@ -16,14 +16,8 @@ import org.dspace.app.rest.RestResourceController;
* The REST object for the {@link org.dspace.versioning.Version} objects * The REST object for the {@link org.dspace.versioning.Version} objects
*/ */
@LinksRest(links = { @LinksRest(links = {
@LinkRest( @LinkRest(name = VersionRest.VERSION_HISTORY, method = "getVersionHistory"),
name = VersionRest.VERSION_HISTORY, @LinkRest(name = VersionRest.ITEM, method = "getVersionItem")
method = "getVersionHistory"
),
@LinkRest(
name = VersionRest.ITEM,
method = "getVersionItem"
)
}) })
public class VersionRest extends BaseObjectRest<Integer> { public class VersionRest extends BaseObjectRest<Integer> {

6
dspace-server-webapp/src/main/java/org/dspace/app/rest/model/VocabularyEntryDetailsRest.java
View File

@@ -18,9 +18,9 @@ import org.dspace.app.rest.RestResourceController;
* @author Andrea Bollini (andrea.bollini at 4science.it) * @author Andrea Bollini (andrea.bollini at 4science.it)
*/ */
@LinksRest(links = { @LinksRest(links = {
@LinkRest(name = VocabularyEntryDetailsRest.PARENT, method = "getParent"), @LinkRest(name = VocabularyEntryDetailsRest.PARENT, method = "getParent"),
@LinkRest(name = VocabularyEntryDetailsRest.CHILDREN, method = "getChildren") @LinkRest(name = VocabularyEntryDetailsRest.CHILDREN, method = "getChildren")
}) })
public class VocabularyEntryDetailsRest extends BaseObjectRest<String> { public class VocabularyEntryDetailsRest extends BaseObjectRest<String> {
public static final String PLURAL_NAME = "vocabularyEntryDetails"; public static final String PLURAL_NAME = "vocabularyEntryDetails";
public static final String NAME = "vocabularyEntryDetail"; public static final String NAME = "vocabularyEntryDetail";

4
dspace-server-webapp/src/main/java/org/dspace/app/rest/model/VocabularyRest.java
View File

@@ -15,9 +15,7 @@ import org.dspace.app.rest.RestResourceController;
* @author Andrea Bollini (andrea.bollini at 4science.it) * @author Andrea Bollini (andrea.bollini at 4science.it)
*/ */
@LinksRest(links = { @LinksRest(links = {
@LinkRest(name = VocabularyRest.ENTRIES, @LinkRest(name = VocabularyRest.ENTRIES, method = "filter"),
method = "filter"
),
}) })
public class VocabularyRest extends BaseObjectRest<String> { public class VocabularyRest extends BaseObjectRest<String> {

10
dspace-server-webapp/src/main/java/org/dspace/app/rest/model/WorkflowDefinitionRest.java
View File

@@ -18,14 +18,8 @@ import org.dspace.app.rest.RestResourceController;
* @author Maria Verdonck (Atmire) on 11/12/2019 * @author Maria Verdonck (Atmire) on 11/12/2019
*/ */
@LinksRest(links = { @LinksRest(links = {
@LinkRest( @LinkRest(name = WorkflowDefinitionRest.COLLECTIONS_MAPPED_TO, method = "getCollections"),
name = WorkflowDefinitionRest.COLLECTIONS_MAPPED_TO, @LinkRest(name = WorkflowDefinitionRest.STEPS, method = "getSteps")
method = "getCollections"
),
@LinkRest(
name = WorkflowDefinitionRest.STEPS,
method = "getSteps"
)
}) })
public class WorkflowDefinitionRest extends BaseObjectRest<String> { public class WorkflowDefinitionRest extends BaseObjectRest<String> {

20
dspace-server-webapp/src/main/java/org/dspace/app/rest/model/WorkflowItemRest.java
View File

@@ -15,22 +15,10 @@ import org.dspace.app.rest.RestResourceController;
* @author Andrea Bollini (andrea.bollini at 4science.it) * @author Andrea Bollini (andrea.bollini at 4science.it)
*/ */
@LinksRest(links = { @LinksRest(links = {
@LinkRest( @LinkRest(name = WorkflowItemRest.STEP, method = "getStep"),
name = WorkflowItemRest.STEP, @LinkRest(name = WorkflowItemRest.SUBMITTER, method = "getWorkflowItemSubmitter"),
method = "getStep" @LinkRest(name = WorkflowItemRest.ITEM, method = "getWorkflowItemItem"),
), @LinkRest(name = WorkflowItemRest.COLLECTION, method = "getWorkflowItemCollection")
@LinkRest(
name = WorkflowItemRest.SUBMITTER,
method = "getWorkflowItemSubmitter"
),
@LinkRest(
name = WorkflowItemRest.ITEM,
method = "getWorkflowItemItem"
),
@LinkRest(
name = WorkflowItemRest.COLLECTION,
method = "getWorkflowItemCollection"
)
}) })
public class WorkflowItemRest extends AInprogressSubmissionRest { public class WorkflowItemRest extends AInprogressSubmissionRest {
public static final String NAME = "workflowitem"; public static final String NAME = "workflowitem";

5
dspace-server-webapp/src/main/java/org/dspace/app/rest/model/WorkflowStepRest.java
View File

@@ -18,10 +18,7 @@ import org.dspace.app.rest.RestResourceController;
* @author Maria Verdonck (Atmire) on 10/01/2020 * @author Maria Verdonck (Atmire) on 10/01/2020
*/ */
@LinksRest(links = { @LinksRest(links = {
@LinkRest( @LinkRest(name = WorkflowStepRest.ACTIONS, method = "getActions"),
name = WorkflowStepRest.ACTIONS,
method = "getActions"
),
}) })
public class WorkflowStepRest extends BaseObjectRest { public class WorkflowStepRest extends BaseObjectRest {

20
dspace-server-webapp/src/main/java/org/dspace/app/rest/model/WorkspaceItemRest.java
View File

@@ -15,22 +15,10 @@ import org.dspace.app.rest.RestResourceController;
* @author Andrea Bollini (andrea.bollini at 4science.it) * @author Andrea Bollini (andrea.bollini at 4science.it)
*/ */
@LinksRest(links = { @LinksRest(links = {
@LinkRest( @LinkRest(name = WorkspaceItemRest.SUPERVISION_ORDERS, method = "getSupervisionOrders"),
name = WorkspaceItemRest.SUPERVISION_ORDERS, @LinkRest(name = WorkspaceItemRest.SUBMITTER, method = "getWorkspaceItemSubmitter"),
method = "getSupervisionOrders" @LinkRest(name = WorkspaceItemRest.ITEM, method = "getWorkspaceItemItem"),
), @LinkRest(name = WorkspaceItemRest.COLLECTION, method = "getWorkspaceItemCollection")
@LinkRest(
name = WorkspaceItemRest.SUBMITTER,
method = "getWorkspaceItemSubmitter"
),
@LinkRest(
name = WorkspaceItemRest.ITEM,
method = "getWorkspaceItemItem"
),
@LinkRest(
name = WorkspaceItemRest.COLLECTION,
method = "getWorkspaceItemCollection"
)
}) })
public class WorkspaceItemRest extends AInprogressSubmissionRest { public class WorkspaceItemRest extends AInprogressSubmissionRest {
public static final String NAME = "workspaceitem"; public static final String NAME = "workspaceitem";

2
dspace-server-webapp/src/main/java/org/dspace/app/rest/utils/RegexUtils.java
View File

@@ -13,7 +13,7 @@ package org.dspace.app.rest.utils;
*/ */
public class RegexUtils { public class RegexUtils {
private RegexUtils(){} private RegexUtils() {}
/** /**
* Regular expression in the request mapping to accept UUID as identifier * Regular expression in the request mapping to accept UUID as identifier

2
dspace-server-webapp/src/test/java/org/dspace/app/rest/matcher/RegistrationMatcher.java
View File

@@ -17,7 +17,7 @@ import org.hamcrest.Matcher;
public class RegistrationMatcher { public class RegistrationMatcher {
private RegistrationMatcher(){} private RegistrationMatcher() {}
public static Matcher<? super Object> matchRegistration(String email, UUID epersonUuid) { public static Matcher<? super Object> matchRegistration(String email, UUID epersonUuid) {
return allOf( return allOf(

38
pom.xml
View File

@@ -29,7 +29,7 @@
<solr.client.version>8.11.3</solr.client.version> <solr.client.version>8.11.3</solr.client.version>
<ehcache.version>3.10.8</ehcache.version> <ehcache.version>3.10.8</ehcache.version>
<errorprone.version>2.32.0</errorprone.version> <errorprone.version>2.35.1</errorprone.version>
<!-- NOTE: when updating jackson.version, also sync jackson-databind.version below --> <!-- NOTE: when updating jackson.version, also sync jackson-databind.version below -->
<jackson.version>2.16.0</jackson.version> <jackson.version>2.16.0</jackson.version>
<jackson-databind.version>2.16.0</jackson-databind.version> <jackson-databind.version>2.16.0</jackson-databind.version>
@@ -89,7 +89,7 @@
<plugin> <plugin>
<groupId>org.apache.maven.plugins</groupId> <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-enforcer-plugin</artifactId> <artifactId>maven-enforcer-plugin</artifactId>
<version>3.4.1</version> <version>3.5.0</version>
<executions> <executions>
<execution> <execution>
<id>enforce-java</id> <id>enforce-java</id>
@@ -176,7 +176,7 @@
<plugin> <plugin>
<groupId>org.apache.maven.plugins</groupId> <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-jar-plugin</artifactId> <artifactId>maven-jar-plugin</artifactId>
<version>3.3.0</version> <version>3.4.2</version>
<configuration> <configuration>
<archive> <archive>
<manifest> <manifest>
@@ -207,7 +207,7 @@
<plugin> <plugin>
<groupId>org.apache.maven.plugins</groupId> <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId> <artifactId>maven-surefire-plugin</artifactId>
<version>3.2.5</version> <version>3.5.1</version>
<configuration> <configuration>
<!-- Allow for the ability to pass JVM memory flags for Unit Tests. Since <!-- Allow for the ability to pass JVM memory flags for Unit Tests. Since
maven-surefire-plugin forks a new JVM, it ignores MAVEN_OPTS.--> maven-surefire-plugin forks a new JVM, it ignores MAVEN_OPTS.-->
@@ -234,7 +234,7 @@
<!-- Used to run Integration tests (when enabled by -DskipIntegrationTests=false) --> <!-- Used to run Integration tests (when enabled by -DskipIntegrationTests=false) -->
<plugin> <plugin>
<artifactId>maven-failsafe-plugin</artifactId> <artifactId>maven-failsafe-plugin</artifactId>
<version>3.2.5</version> <version>3.5.1</version>
<configuration> <configuration>
<!-- Allow for the ability to pass JVM memory flags for Unit Tests. Since <!-- Allow for the ability to pass JVM memory flags for Unit Tests. Since
maven-failsafe-plugin forks a new JVM, it ignores MAVEN_OPTS.--> maven-failsafe-plugin forks a new JVM, it ignores MAVEN_OPTS.-->
@@ -266,7 +266,7 @@
<plugin> <plugin>
<groupId>org.apache.maven.plugins</groupId> <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-checkstyle-plugin</artifactId> <artifactId>maven-checkstyle-plugin</artifactId>
<version>3.3.1</version> <version>3.6.0</version>
<executions> <executions>
<execution> <execution>
<id>verify-style</id> <id>verify-style</id>
@@ -295,14 +295,14 @@
<dependency> <dependency>
<groupId>com.puppycrawl.tools</groupId> <groupId>com.puppycrawl.tools</groupId>
<artifactId>checkstyle</artifactId> <artifactId>checkstyle</artifactId>
<version>8.38</version> <version>8.45.1</version>
</dependency> </dependency>
</dependencies> </dependencies>
</plugin> </plugin>
<plugin> <plugin>
<groupId>com.github.spotbugs</groupId> <groupId>com.github.spotbugs</groupId>
<artifactId>spotbugs-maven-plugin</artifactId> <artifactId>spotbugs-maven-plugin</artifactId>
<version>4.8.2.0</version> <version>4.8.6.5</version>
<configuration> <configuration>
<effort>Max</effort> <effort>Max</effort>
<threshold>Low</threshold> <threshold>Low</threshold>
@@ -312,7 +312,7 @@
<dependency> <dependency>
<groupId>com.github.spotbugs</groupId> <groupId>com.github.spotbugs</groupId>
<artifactId>spotbugs</artifactId> <artifactId>spotbugs</artifactId>
<version>4.8.2</version> <version>4.8.6</version>
</dependency> </dependency>
</dependencies> </dependencies>
<executions> <executions>
@@ -328,7 +328,7 @@
<!-- This additional configuration also cleans sub-modules --> <!-- This additional configuration also cleans sub-modules -->
<plugin> <plugin>
<artifactId>maven-clean-plugin</artifactId> <artifactId>maven-clean-plugin</artifactId>
<version>3.3.2</version> <version>3.4.0</version>
<configuration> <configuration>
<filesets> <filesets>
<fileset> <fileset>
@@ -347,7 +347,7 @@
<plugin> <plugin>
<groupId>org.apache.maven.plugins</groupId> <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-dependency-plugin</artifactId> <artifactId>maven-dependency-plugin</artifactId>
<version>3.6.1</version> <version>3.8.1</version>
</plugin> </plugin>
<plugin> <plugin>
<groupId>org.apache.maven.plugins</groupId> <groupId>org.apache.maven.plugins</groupId>
@@ -364,13 +364,13 @@
<plugin> <plugin>
<groupId>org.sonatype.plugins</groupId> <groupId>org.sonatype.plugins</groupId>
<artifactId>nexus-staging-maven-plugin</artifactId> <artifactId>nexus-staging-maven-plugin</artifactId>
<version>1.6.13</version> <version>1.7.0</version>
</plugin> </plugin>
<!-- Used to generate JavaDocs for new releases (see release profile). --> <!-- Used to generate JavaDocs for new releases (see release profile). -->
<plugin> <plugin>
<groupId>org.apache.maven.plugins</groupId> <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-javadoc-plugin</artifactId> <artifactId>maven-javadoc-plugin</artifactId>
<version>3.6.3</version> <version>3.10.1</version>
<configuration> <configuration>
<!-- Never fail a build based on Javadoc errors --> <!-- Never fail a build based on Javadoc errors -->
<failOnError>false</failOnError> <failOnError>false</failOnError>
@@ -385,7 +385,7 @@
<plugin> <plugin>
<groupId>org.apache.maven.plugins</groupId> <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-source-plugin</artifactId> <artifactId>maven-source-plugin</artifactId>
<version>3.3.0</version> <version>3.3.1</version>
</plugin> </plugin>
<!-- Used for custom Groovy code that fills out the 'agnostic.build.dir' needed to <!-- Used for custom Groovy code that fills out the 'agnostic.build.dir' needed to
set 'dspace.dir' for our testing environment --> set 'dspace.dir' for our testing environment -->
@@ -398,13 +398,13 @@
<plugin> <plugin>
<groupId>org.apache.maven.plugins</groupId> <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-gpg-plugin</artifactId> <artifactId>maven-gpg-plugin</artifactId>
<version>3.2.1</version> <version>3.2.7</version>
</plugin> </plugin>
<!-- Used for code coverage reporting (see 'measure-test-coverage' profile) --> <!-- Used for code coverage reporting (see 'measure-test-coverage' profile) -->
<plugin> <plugin>
<groupId>org.jacoco</groupId> <groupId>org.jacoco</groupId>
<artifactId>jacoco-maven-plugin</artifactId> <artifactId>jacoco-maven-plugin</artifactId>
<version>0.8.11</version> <version>0.8.12</version>
</plugin> </plugin>
</plugins> </plugins>
</pluginManagement> </pluginManagement>
@@ -416,7 +416,7 @@
<plugin> <plugin>
<groupId>org.apache.maven.plugins</groupId> <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-release-plugin</artifactId> <artifactId>maven-release-plugin</artifactId>
<version>3.0.0</version> <version>3.1.1</version>
<configuration> <configuration>
<!-- During release:prepare and release:perform, pass the "release" property to enable the <!-- During release:prepare and release:perform, pass the "release" property to enable the
"release" profile (and enable/disable other profiles based on whether they need releasing) --> "release" profile (and enable/disable other profiles based on whether they need releasing) -->
@@ -484,7 +484,7 @@
<plugin> <plugin>
<groupId>org.codehaus.mojo</groupId> <groupId>org.codehaus.mojo</groupId>
<artifactId>xml-maven-plugin</artifactId> <artifactId>xml-maven-plugin</artifactId>
<version>1.0.2</version> <version>1.1.0</version>
<executions> <executions>
<execution> <execution>
<id>validate-ALL-xml-and-xsl</id> <id>validate-ALL-xml-and-xsl</id>
@@ -692,7 +692,7 @@
<plugin> <plugin>
<groupId>org.codehaus.mojo</groupId> <groupId>org.codehaus.mojo</groupId>
<artifactId>license-maven-plugin</artifactId> <artifactId>license-maven-plugin</artifactId>
<version>2.0.0</version> <version>2.4.0</version>
<!-- This plugin only needs to be run on the Parent POM <!-- This plugin only needs to be run on the Parent POM
as it aggregates results from all child POMs. --> as it aggregates results from all child POMs. -->
<inherited>false</inherited> <inherited>false</inherited>