diff --git a/dspace-spring-rest/src/main/java/org/dspace/app/rest/BitstreamContentRestController.java b/dspace-spring-rest/src/main/java/org/dspace/app/rest/BitstreamContentRestController.java index 5d34dfcef3..1bba1f3dc2 100644 --- a/dspace-spring-rest/src/main/java/org/dspace/app/rest/BitstreamContentRestController.java +++ b/dspace-spring-rest/src/main/java/org/dspace/app/rest/BitstreamContentRestController.java @@ -18,8 +18,6 @@ import org.dspace.app.rest.model.BitstreamRest; import org.dspace.app.rest.repository.BitstreamRestRepository; import org.dspace.core.Utils; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.hateoas.Link; -import org.springframework.hateoas.ResourceSupport; import org.springframework.web.bind.annotation.PathVariable; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RequestMethod; diff --git a/dspace-spring-rest/src/main/java/org/dspace/app/rest/RootRestResourceController.java b/dspace-spring-rest/src/main/java/org/dspace/app/rest/RootRestResourceController.java index afd80c7b58..1f1c08d580 100644 --- a/dspace-spring-rest/src/main/java/org/dspace/app/rest/RootRestResourceController.java +++ b/dspace-spring-rest/src/main/java/org/dspace/app/rest/RootRestResourceController.java @@ -7,6 +7,8 @@ */ package org.dspace.app.rest; +import javax.servlet.http.HttpServletRequest; + import org.springframework.beans.factory.annotation.Autowired; import org.springframework.hateoas.Link; import org.springframework.hateoas.ResourceSupport; @@ -14,8 +16,6 @@ import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RequestMethod; import org.springframework.web.bind.annotation.RestController; -import javax.servlet.http.HttpServletRequest; - /** * This is the main entry point of the new REST API. Its responsibility is to * provide a consistent behaviors for all the exposed resources in terms of diff --git a/dspace-spring-rest/src/main/java/org/dspace/app/rest/converter/CommunityConverter.java b/dspace-spring-rest/src/main/java/org/dspace/app/rest/converter/CommunityConverter.java index 37d60d193e..8584437e6c 100644 --- a/dspace-spring-rest/src/main/java/org/dspace/app/rest/converter/CommunityConverter.java +++ b/dspace-spring-rest/src/main/java/org/dspace/app/rest/converter/CommunityConverter.java @@ -10,7 +10,6 @@ package org.dspace.app.rest.converter; import java.util.ArrayList; import java.util.List; -import org.dspace.app.rest.model.BitstreamRest; import org.dspace.app.rest.model.CollectionRest; import org.dspace.app.rest.model.CommunityRest; import org.dspace.content.Bitstream; diff --git a/dspace-spring-rest/src/main/java/org/dspace/app/rest/converter/DSpaceObjectConverter.java b/dspace-spring-rest/src/main/java/org/dspace/app/rest/converter/DSpaceObjectConverter.java index 6290f393bd..0b23e2a548 100644 --- a/dspace-spring-rest/src/main/java/org/dspace/app/rest/converter/DSpaceObjectConverter.java +++ b/dspace-spring-rest/src/main/java/org/dspace/app/rest/converter/DSpaceObjectConverter.java @@ -13,7 +13,6 @@ import java.util.List; import org.dspace.app.rest.model.MetadataEntryRest; import org.dspace.content.DSpaceObject; import org.dspace.content.MetadataValue; -import org.springframework.core.convert.converter.Converter; /** * diff --git a/dspace-spring-rest/src/main/java/org/dspace/app/rest/converter/EPersonConverter.java b/dspace-spring-rest/src/main/java/org/dspace/app/rest/converter/EPersonConverter.java index eb13dae8a7..ac39d44ef1 100644 --- a/dspace-spring-rest/src/main/java/org/dspace/app/rest/converter/EPersonConverter.java +++ b/dspace-spring-rest/src/main/java/org/dspace/app/rest/converter/EPersonConverter.java @@ -11,8 +11,8 @@ import java.util.ArrayList; import java.util.List; import org.apache.log4j.Logger; -import org.dspace.app.rest.model.GroupRest; import org.dspace.app.rest.model.EPersonRest; +import org.dspace.app.rest.model.GroupRest; import org.dspace.eperson.EPerson; import org.dspace.eperson.Group; import org.springframework.beans.factory.annotation.Autowired; diff --git a/dspace-spring-rest/src/main/java/org/dspace/app/rest/model/BaseObjectRest.java b/dspace-spring-rest/src/main/java/org/dspace/app/rest/model/BaseObjectRest.java index 9adafaa379..f6080d1224 100644 --- a/dspace-spring-rest/src/main/java/org/dspace/app/rest/model/BaseObjectRest.java +++ b/dspace-spring-rest/src/main/java/org/dspace/app/rest/model/BaseObjectRest.java @@ -9,9 +9,8 @@ package org.dspace.app.rest.model; import java.io.Serializable; -import org.springframework.hateoas.Identifiable; - import com.fasterxml.jackson.annotation.JsonIgnore; +import org.springframework.hateoas.Identifiable; /** * Base class for any REST resource that need to be addressable diff --git a/dspace-spring-rest/src/main/java/org/dspace/app/rest/model/BitstreamFormatRest.java b/dspace-spring-rest/src/main/java/org/dspace/app/rest/model/BitstreamFormatRest.java index 4a0b8abed8..1858c0fd20 100644 --- a/dspace-spring-rest/src/main/java/org/dspace/app/rest/model/BitstreamFormatRest.java +++ b/dspace-spring-rest/src/main/java/org/dspace/app/rest/model/BitstreamFormatRest.java @@ -9,9 +9,8 @@ package org.dspace.app.rest.model; import java.util.List; -import org.dspace.app.rest.RestResourceController; - import com.fasterxml.jackson.annotation.JsonIgnore; +import org.dspace.app.rest.RestResourceController; /** * The BitstreamFormat REST Resource diff --git a/dspace-spring-rest/src/main/java/org/dspace/app/rest/model/BrowseIndexRest.java b/dspace-spring-rest/src/main/java/org/dspace/app/rest/model/BrowseIndexRest.java index 593ad5ede1..43e23636df 100644 --- a/dspace-spring-rest/src/main/java/org/dspace/app/rest/model/BrowseIndexRest.java +++ b/dspace-spring-rest/src/main/java/org/dspace/app/rest/model/BrowseIndexRest.java @@ -9,10 +9,9 @@ package org.dspace.app.rest.model; import java.util.List; -import org.dspace.app.rest.RestResourceController; - import com.fasterxml.jackson.annotation.JsonIgnore; import com.fasterxml.jackson.annotation.JsonProperty; +import org.dspace.app.rest.RestResourceController; /** * The Browse Index REST Resource diff --git a/dspace-spring-rest/src/main/java/org/dspace/app/rest/model/GroupRest.java b/dspace-spring-rest/src/main/java/org/dspace/app/rest/model/GroupRest.java index d81d3e47f0..0703a02924 100644 --- a/dspace-spring-rest/src/main/java/org/dspace/app/rest/model/GroupRest.java +++ b/dspace-spring-rest/src/main/java/org/dspace/app/rest/model/GroupRest.java @@ -9,9 +9,8 @@ package org.dspace.app.rest.model; import java.util.List; -import org.dspace.app.rest.RestResourceController; - import com.fasterxml.jackson.annotation.JsonIgnore; +import org.dspace.app.rest.RestResourceController; /** * The Group REST Resource diff --git a/dspace-spring-rest/src/main/java/org/dspace/app/rest/model/ItemRest.java b/dspace-spring-rest/src/main/java/org/dspace/app/rest/model/ItemRest.java index f80c78eee0..6e11e4868e 100644 --- a/dspace-spring-rest/src/main/java/org/dspace/app/rest/model/ItemRest.java +++ b/dspace-spring-rest/src/main/java/org/dspace/app/rest/model/ItemRest.java @@ -11,8 +11,6 @@ import java.util.Date; import java.util.List; import com.fasterxml.jackson.annotation.JsonIgnore; -import com.fasterxml.jackson.annotation.JsonProperty; -import com.fasterxml.jackson.annotation.JsonProperty.Access; /** * The Item REST Resource diff --git a/dspace-spring-rest/src/main/java/org/dspace/app/rest/model/MetadataFieldRest.java b/dspace-spring-rest/src/main/java/org/dspace/app/rest/model/MetadataFieldRest.java index 77b91e63fc..5d2c3e7039 100644 --- a/dspace-spring-rest/src/main/java/org/dspace/app/rest/model/MetadataFieldRest.java +++ b/dspace-spring-rest/src/main/java/org/dspace/app/rest/model/MetadataFieldRest.java @@ -7,9 +7,8 @@ */ package org.dspace.app.rest.model; -import org.dspace.app.rest.RestResourceController; - import com.fasterxml.jackson.annotation.JsonIgnore; +import org.dspace.app.rest.RestResourceController; /** * The MetadataField REST Resource diff --git a/dspace-spring-rest/src/main/java/org/dspace/app/rest/model/MetadataSchemaRest.java b/dspace-spring-rest/src/main/java/org/dspace/app/rest/model/MetadataSchemaRest.java index fd9bb519e4..85f26bc4c3 100644 --- a/dspace-spring-rest/src/main/java/org/dspace/app/rest/model/MetadataSchemaRest.java +++ b/dspace-spring-rest/src/main/java/org/dspace/app/rest/model/MetadataSchemaRest.java @@ -7,12 +7,8 @@ */ package org.dspace.app.rest.model; -import java.util.List; - import org.dspace.app.rest.RestResourceController; -import com.fasterxml.jackson.annotation.JsonIgnore; - /** * The MetadataSchema REST Resource * diff --git a/dspace-spring-rest/src/main/java/org/dspace/app/rest/model/hateoas/BrowseEntryResource.java b/dspace-spring-rest/src/main/java/org/dspace/app/rest/model/hateoas/BrowseEntryResource.java index 311e14d63a..26beafe64a 100644 --- a/dspace-spring-rest/src/main/java/org/dspace/app/rest/model/hateoas/BrowseEntryResource.java +++ b/dspace-spring-rest/src/main/java/org/dspace/app/rest/model/hateoas/BrowseEntryResource.java @@ -10,6 +10,7 @@ package org.dspace.app.rest.model.hateoas; import static org.springframework.hateoas.mvc.ControllerLinkBuilder.linkTo; import static org.springframework.hateoas.mvc.ControllerLinkBuilder.methodOn; +import com.fasterxml.jackson.annotation.JsonUnwrapped; import org.atteo.evo.inflector.English; import org.dspace.app.rest.RestResourceController; import org.dspace.app.rest.model.BrowseEntryRest; @@ -18,8 +19,6 @@ import org.springframework.hateoas.Link; import org.springframework.hateoas.ResourceSupport; import org.springframework.web.util.UriComponentsBuilder; -import com.fasterxml.jackson.annotation.JsonUnwrapped; - /** * Browse Entry Rest HAL Resource. The HAL Resource wraps the REST Resource * adding support for the links and embedded resources diff --git a/dspace-spring-rest/src/main/java/org/dspace/app/rest/model/hateoas/DSpaceResource.java b/dspace-spring-rest/src/main/java/org/dspace/app/rest/model/hateoas/DSpaceResource.java index 96f5010519..109ef324c8 100644 --- a/dspace-spring-rest/src/main/java/org/dspace/app/rest/model/hateoas/DSpaceResource.java +++ b/dspace-spring-rest/src/main/java/org/dspace/app/rest/model/hateoas/DSpaceResource.java @@ -7,23 +7,22 @@ */ package org.dspace.app.rest.model.hateoas; -import static org.springframework.hateoas.mvc.ControllerLinkBuilder.linkTo; - import java.beans.IntrospectionException; import java.beans.Introspector; import java.beans.PropertyDescriptor; import java.io.Serializable; import java.lang.reflect.InvocationTargetException; import java.lang.reflect.Method; -import java.util.ArrayList; import java.util.Arrays; import java.util.HashMap; import java.util.List; import java.util.Map; -import java.util.Map.Entry; +import com.fasterxml.jackson.annotation.JsonInclude; +import com.fasterxml.jackson.annotation.JsonInclude.Include; +import com.fasterxml.jackson.annotation.JsonProperty; +import com.fasterxml.jackson.annotation.JsonUnwrapped; import org.apache.commons.lang3.StringUtils; -import org.atteo.evo.inflector.English; import org.dspace.app.rest.model.BaseObjectRest; import org.dspace.app.rest.model.LinkRest; import org.dspace.app.rest.model.LinksRest; @@ -33,17 +32,8 @@ import org.dspace.app.rest.repository.LinkRestRepository; import org.dspace.app.rest.utils.Utils; import org.springframework.data.domain.Page; import org.springframework.data.domain.PageImpl; -import org.springframework.data.domain.PageRequest; -import org.springframework.data.rest.webmvc.EmbeddedResourcesAssembler; import org.springframework.hateoas.Link; -import org.springframework.hateoas.PagedResources; import org.springframework.hateoas.ResourceSupport; -import org.springframework.hateoas.core.EmbeddedWrappers; - -import com.fasterxml.jackson.annotation.JsonInclude; -import com.fasterxml.jackson.annotation.JsonProperty; -import com.fasterxml.jackson.annotation.JsonInclude.Include; -import com.fasterxml.jackson.annotation.JsonUnwrapped; /** * A base class for DSpace Rest HAL Resource. The HAL Resource wraps the REST diff --git a/dspace-spring-rest/src/main/java/org/dspace/app/rest/model/hateoas/EmbeddedPage.java b/dspace-spring-rest/src/main/java/org/dspace/app/rest/model/hateoas/EmbeddedPage.java index 4ccc3073bf..06790a40a0 100644 --- a/dspace-spring-rest/src/main/java/org/dspace/app/rest/model/hateoas/EmbeddedPage.java +++ b/dspace-spring-rest/src/main/java/org/dspace/app/rest/model/hateoas/EmbeddedPage.java @@ -11,11 +11,10 @@ import java.util.HashMap; import java.util.List; import java.util.Map; -import org.springframework.data.domain.Page; -import org.springframework.web.util.UriComponentsBuilder; - import com.fasterxml.jackson.annotation.JsonIgnore; import com.fasterxml.jackson.annotation.JsonProperty; +import org.springframework.data.domain.Page; +import org.springframework.web.util.UriComponentsBuilder; public class EmbeddedPage { diff --git a/dspace-spring-rest/src/main/java/org/dspace/app/rest/repository/AbstractDSpaceRestRepository.java b/dspace-spring-rest/src/main/java/org/dspace/app/rest/repository/AbstractDSpaceRestRepository.java index af72b10a07..34b8c7aceb 100644 --- a/dspace-spring-rest/src/main/java/org/dspace/app/rest/repository/AbstractDSpaceRestRepository.java +++ b/dspace-spring-rest/src/main/java/org/dspace/app/rest/repository/AbstractDSpaceRestRepository.java @@ -7,6 +7,8 @@ */ package org.dspace.app.rest.repository; +import java.sql.SQLException; + import org.apache.log4j.Logger; import org.dspace.app.rest.utils.ContextUtil; import org.dspace.app.rest.utils.Utils; @@ -16,8 +18,6 @@ import org.dspace.services.model.Request; import org.dspace.utils.DSpace; import org.springframework.beans.factory.annotation.Autowired; -import java.sql.SQLException; - /** * This is the base class for any Rest Repository. It provides utility method to * access the DSpaceContext diff --git a/dspace-spring-rest/src/main/java/org/dspace/app/rest/repository/BrowseEntryLinkRepository.java b/dspace-spring-rest/src/main/java/org/dspace/app/rest/repository/BrowseEntryLinkRepository.java index 739d6c8b46..ca7ecc4948 100644 --- a/dspace-spring-rest/src/main/java/org/dspace/app/rest/repository/BrowseEntryLinkRepository.java +++ b/dspace-spring-rest/src/main/java/org/dspace/app/rest/repository/BrowseEntryLinkRepository.java @@ -12,6 +12,7 @@ import java.util.Arrays; import java.util.Iterator; import java.util.UUID; import java.util.function.Consumer; + import javax.servlet.http.HttpServletRequest; import org.apache.commons.lang3.StringUtils; diff --git a/dspace-spring-rest/src/main/java/org/dspace/app/rest/repository/BrowseIndexRestRepository.java b/dspace-spring-rest/src/main/java/org/dspace/app/rest/repository/BrowseIndexRestRepository.java index 152d98890e..e570067fe5 100644 --- a/dspace-spring-rest/src/main/java/org/dspace/app/rest/repository/BrowseIndexRestRepository.java +++ b/dspace-spring-rest/src/main/java/org/dspace/app/rest/repository/BrowseIndexRestRepository.java @@ -7,16 +7,12 @@ */ package org.dspace.app.rest.repository; -import java.sql.SQLException; import java.util.ArrayList; import java.util.List; import org.dspace.app.rest.converter.BrowseIndexConverter; -import org.dspace.app.rest.converter.CollectionConverter; import org.dspace.app.rest.model.BrowseIndexRest; -import org.dspace.app.rest.model.CollectionRest; import org.dspace.app.rest.model.hateoas.BrowseIndexResource; -import org.dspace.app.rest.model.hateoas.CollectionResource; import org.dspace.browse.BrowseException; import org.dspace.browse.BrowseIndex; import org.dspace.core.Context; @@ -24,7 +20,6 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.data.domain.Page; import org.springframework.data.domain.PageImpl; import org.springframework.data.domain.Pageable; -import org.springframework.data.rest.webmvc.ResourceNotFoundException; import org.springframework.stereotype.Component; /** diff --git a/dspace-spring-rest/src/main/java/org/dspace/app/rest/repository/BrowseItemLinkRepository.java b/dspace-spring-rest/src/main/java/org/dspace/app/rest/repository/BrowseItemLinkRepository.java index e6545733e7..2629c2492c 100644 --- a/dspace-spring-rest/src/main/java/org/dspace/app/rest/repository/BrowseItemLinkRepository.java +++ b/dspace-spring-rest/src/main/java/org/dspace/app/rest/repository/BrowseItemLinkRepository.java @@ -10,6 +10,7 @@ package org.dspace.app.rest.repository; import java.sql.SQLException; import java.util.Iterator; import java.util.UUID; + import javax.servlet.http.HttpServletRequest; import org.apache.commons.lang3.StringUtils; diff --git a/dspace-spring-rest/src/main/java/org/dspace/app/rest/repository/DSpaceRestRepository.java b/dspace-spring-rest/src/main/java/org/dspace/app/rest/repository/DSpaceRestRepository.java index e61842b7ef..55ec0604aa 100644 --- a/dspace-spring-rest/src/main/java/org/dspace/app/rest/repository/DSpaceRestRepository.java +++ b/dspace-spring-rest/src/main/java/org/dspace/app/rest/repository/DSpaceRestRepository.java @@ -11,13 +11,7 @@ import java.io.Serializable; import org.dspace.app.rest.model.RestModel; import org.dspace.app.rest.model.hateoas.DSpaceResource; -import org.dspace.app.rest.utils.ContextUtil; -import org.dspace.app.rest.utils.Utils; import org.dspace.core.Context; -import org.dspace.services.RequestService; -import org.dspace.services.model.Request; -import org.dspace.utils.DSpace; -import org.springframework.beans.factory.annotation.Autowired; import org.springframework.data.domain.Page; import org.springframework.data.domain.Pageable; import org.springframework.data.domain.Sort; diff --git a/dspace-spring-rest/src/main/java/org/dspace/app/rest/utils/ContextUtil.java b/dspace-spring-rest/src/main/java/org/dspace/app/rest/utils/ContextUtil.java index 500121882c..68ff18bff5 100644 --- a/dspace-spring-rest/src/main/java/org/dspace/app/rest/utils/ContextUtil.java +++ b/dspace-spring-rest/src/main/java/org/dspace/app/rest/utils/ContextUtil.java @@ -8,8 +8,10 @@ package org.dspace.app.rest.utils; import java.sql.SQLException; + import javax.servlet.ServletException; import javax.servlet.ServletRequest; + import org.apache.log4j.Logger; import org.dspace.core.Context; diff --git a/dspace-spring-rest/src/test/java/org/dspace/app/rest/builder/AbstractBuilder.java b/dspace-spring-rest/src/test/java/org/dspace/app/rest/builder/AbstractBuilder.java index f9b5f3dc55..2641ee47a6 100644 --- a/dspace-spring-rest/src/test/java/org/dspace/app/rest/builder/AbstractBuilder.java +++ b/dspace-spring-rest/src/test/java/org/dspace/app/rest/builder/AbstractBuilder.java @@ -7,6 +7,10 @@ */ package org.dspace.app.rest.builder; +import java.io.IOException; +import java.sql.SQLException; +import java.util.Date; + import org.apache.log4j.Logger; import org.dspace.authorize.AuthorizeException; import org.dspace.authorize.ResourcePolicy; @@ -16,7 +20,14 @@ import org.dspace.authorize.service.ResourcePolicyService; import org.dspace.content.DSpaceObject; import org.dspace.content.Item; import org.dspace.content.factory.ContentServiceFactory; -import org.dspace.content.service.*; +import org.dspace.content.service.BitstreamService; +import org.dspace.content.service.BundleService; +import org.dspace.content.service.CollectionService; +import org.dspace.content.service.CommunityService; +import org.dspace.content.service.DSpaceObjectService; +import org.dspace.content.service.InstallItemService; +import org.dspace.content.service.ItemService; +import org.dspace.content.service.WorkspaceItemService; import org.dspace.core.Constants; import org.dspace.core.Context; import org.dspace.discovery.IndexingService; @@ -30,10 +41,6 @@ import org.joda.time.DateTimeZone; import org.joda.time.MutablePeriod; import org.joda.time.format.PeriodFormat; -import java.io.IOException; -import java.sql.SQLException; -import java.util.Date; - /** * Abstract builder to construct DSpace Objects */ diff --git a/dspace-spring-rest/src/test/java/org/dspace/app/rest/builder/CollectionBuilder.java b/dspace-spring-rest/src/test/java/org/dspace/app/rest/builder/CollectionBuilder.java index 4bfce14978..6afaf56430 100644 --- a/dspace-spring-rest/src/test/java/org/dspace/app/rest/builder/CollectionBuilder.java +++ b/dspace-spring-rest/src/test/java/org/dspace/app/rest/builder/CollectionBuilder.java @@ -7,15 +7,11 @@ */ package org.dspace.app.rest.builder; -import org.dspace.authorize.AuthorizeException; import org.dspace.content.Collection; import org.dspace.content.Community; import org.dspace.content.MetadataSchema; import org.dspace.content.service.DSpaceObjectService; import org.dspace.core.Context; -import org.dspace.discovery.SearchServiceException; - -import java.sql.SQLException; /** * Builder to construct Collection objects diff --git a/dspace-spring-rest/src/test/java/org/dspace/app/rest/builder/CommunityBuilder.java b/dspace-spring-rest/src/test/java/org/dspace/app/rest/builder/CommunityBuilder.java index 0701fb7096..8bc73e23a5 100644 --- a/dspace-spring-rest/src/test/java/org/dspace/app/rest/builder/CommunityBuilder.java +++ b/dspace-spring-rest/src/test/java/org/dspace/app/rest/builder/CommunityBuilder.java @@ -11,7 +11,6 @@ import org.dspace.content.Community; import org.dspace.content.MetadataSchema; import org.dspace.content.service.DSpaceObjectService; import org.dspace.core.Context; -import org.dspace.discovery.SearchServiceException; /** * Builder to construct Community objects diff --git a/dspace-spring-rest/src/test/java/org/dspace/app/rest/builder/ItemBuilder.java b/dspace-spring-rest/src/test/java/org/dspace/app/rest/builder/ItemBuilder.java index ca86f2ea3c..1d06566a87 100644 --- a/dspace-spring-rest/src/test/java/org/dspace/app/rest/builder/ItemBuilder.java +++ b/dspace-spring-rest/src/test/java/org/dspace/app/rest/builder/ItemBuilder.java @@ -7,7 +7,11 @@ */ package org.dspace.app.rest.builder; -import org.dspace.content.*; +import org.dspace.content.Collection; +import org.dspace.content.DCDate; +import org.dspace.content.Item; +import org.dspace.content.MetadataSchema; +import org.dspace.content.WorkspaceItem; import org.dspace.content.service.DSpaceObjectService; import org.dspace.core.Context; import org.dspace.eperson.Group; diff --git a/dspace-spring-rest/src/test/java/org/dspace/app/rest/matcher/BrowseEntryResourceMatcher.java b/dspace-spring-rest/src/test/java/org/dspace/app/rest/matcher/BrowseEntryResourceMatcher.java index d2ea1b5966..d1b7984f3a 100644 --- a/dspace-spring-rest/src/test/java/org/dspace/app/rest/matcher/BrowseEntryResourceMatcher.java +++ b/dspace-spring-rest/src/test/java/org/dspace/app/rest/matcher/BrowseEntryResourceMatcher.java @@ -7,12 +7,12 @@ */ package org.dspace.app.rest.matcher; -import org.hamcrest.Matcher; - import static com.jayway.jsonpath.matchers.JsonPathMatchers.hasJsonPath; import static org.dspace.app.rest.test.AbstractControllerIntegrationTest.REST_SERVER_URL; import static org.hamcrest.Matchers.*; +import org.hamcrest.Matcher; + public class BrowseEntryResourceMatcher { public static Matcher matchBrowseEntry(String value, int expectedCount) { return allOf( diff --git a/dspace-spring-rest/src/test/java/org/dspace/app/rest/matcher/ItemMatcher.java b/dspace-spring-rest/src/test/java/org/dspace/app/rest/matcher/ItemMatcher.java index 7aaf3725d7..f15d081038 100644 --- a/dspace-spring-rest/src/test/java/org/dspace/app/rest/matcher/ItemMatcher.java +++ b/dspace-spring-rest/src/test/java/org/dspace/app/rest/matcher/ItemMatcher.java @@ -9,11 +9,7 @@ package org.dspace.app.rest.matcher; import static com.jayway.jsonpath.matchers.JsonPathMatchers.hasJsonPath; import static org.dspace.app.rest.test.AbstractControllerIntegrationTest.REST_SERVER_URL; -import static org.hamcrest.Matchers.allOf; -import static org.hamcrest.Matchers.contains; -import static org.hamcrest.Matchers.is; -import static org.hamcrest.Matchers.notNullValue; -import static org.hamcrest.Matchers.startsWith; +import static org.hamcrest.Matchers.*; import org.dspace.content.Item; import org.hamcrest.Matcher;