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

#2893 Rebase on current main, patch recently-added class, tidy documentation.

Browse Source
This commit is contained in:
Mark H. Wood
2020-07-22 09:58:23 -04:00
parent dd9c0b9999
commit 9d6c8891ec
2 changed files with 4 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
dspace-api/src/test/java/org/dspace/statistics/MockSolrLoggerServiceImpl.java
View File

@@ -36,12 +36,6 @@ import org.springframework.stereotype.Service;
/** /**
* Mock service that uses an embedded SOLR server for the statistics core. * Mock service that uses an embedded SOLR server for the statistics core.
*
* <p>
* <strong>NOTE:</strong> this class overrides one <em>of the same name</em>
* defined in dspace-api and declared as a bean there.
* See {@code test/data/dspaceFolder/config/spring/api/solr-services.xml}. Some kind of classpath
* magic makes this work.
*/ */
@Service @Service
public class MockSolrLoggerServiceImpl public class MockSolrLoggerServiceImpl

8
dspace-server-webapp/src/test/java/org/dspace/app/rest/AnonymousAdditionalAuthorizationFilterIT.java
View File

@@ -10,11 +10,11 @@ package org.dspace.app.rest;
import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.get; import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.get;
import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.status; import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.status;
import org.dspace.app.rest.builder.CollectionBuilder;
import org.dspace.app.rest.builder.CommunityBuilder;
import org.dspace.app.rest.builder.GroupBuilder;
import org.dspace.app.rest.builder.ItemBuilder;
import org.dspace.app.rest.test.AbstractControllerIntegrationTest; import org.dspace.app.rest.test.AbstractControllerIntegrationTest;
import org.dspace.builder.CollectionBuilder;
import org.dspace.builder.CommunityBuilder;
import org.dspace.builder.GroupBuilder;
import org.dspace.builder.ItemBuilder;
import org.dspace.content.Collection; import org.dspace.content.Collection;
import org.dspace.content.Community; import org.dspace.content.Community;
import org.dspace.content.Item; import org.dspace.content.Item;