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

Added a method to clear controller in cas

Browse Source
This commit is contained in:
Raf Ponsaerts
2019-09-26 10:54:10 +02:00
parent 1392b62d83
commit 017ba13710
3 changed files with 13 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
dspace-api/src/main/java/org/dspace/content/authority/ChoiceAuthorityServiceImpl.java
View File

@@ -220,6 +220,9 @@ public final class ChoiceAuthorityServiceImpl implements ChoiceAuthorityService
return controller; return controller;
} }
public void clearController() {
controller.clear();
}
private void loadChoiceAuthorityConfigurations() { private void loadChoiceAuthorityConfigurations() {
// Get all configuration keys starting with a given prefix // Get all configuration keys starting with a given prefix
List<String> propKeys = configurationService.getPropertyKeys(CHOICES_PLUGIN_PREFIX); List<String> propKeys = configurationService.getPropertyKeys(CHOICES_PLUGIN_PREFIX);

2
dspace-api/src/main/java/org/dspace/content/authority/service/ChoiceAuthorityService.java
View File

@@ -168,4 +168,6 @@ public interface ChoiceAuthorityService {
public ChoiceAuthority getChoiceAuthorityByAuthorityName(String authorityName); public ChoiceAuthority getChoiceAuthorityByAuthorityName(String authorityName);
public void clearController();
} }

9
dspace-server-webapp/src/test/java/org/dspace/app/rest/AuthorityRestRepositoryIT.java
View File

@@ -19,6 +19,7 @@ import org.apache.solr.client.solrj.response.QueryResponse;
import org.dspace.app.rest.test.AbstractControllerIntegrationTest; import org.dspace.app.rest.test.AbstractControllerIntegrationTest;
import org.dspace.authority.PersonAuthorityValue; import org.dspace.authority.PersonAuthorityValue;
import org.dspace.authority.factory.AuthorityServiceFactory; import org.dspace.authority.factory.AuthorityServiceFactory;
import org.dspace.content.authority.service.ChoiceAuthorityService;
import org.dspace.core.service.PluginService; import org.dspace.core.service.PluginService;
import org.dspace.services.ConfigurationService; import org.dspace.services.ConfigurationService;
import org.hamcrest.Matchers; import org.hamcrest.Matchers;
@@ -35,6 +36,9 @@ public class AuthorityRestRepositoryIT extends AbstractControllerIntegrationTest
@Autowired @Autowired
private PluginService pluginService; private PluginService pluginService;
@Autowired
private ChoiceAuthorityService cas;
@Before @Before
public void setup() throws Exception { public void setup() throws Exception {
super.setUp(); super.setUp();
@@ -53,8 +57,11 @@ public class AuthorityRestRepositoryIT extends AbstractControllerIntegrationTest
configurationService.setProperty("authority.author.indexer.field.1", configurationService.setProperty("authority.author.indexer.field.1",
"dc.contributor.author"); "dc.contributor.author");
//TODO Comments
pluginService.clearNamedPluginClasses(); pluginService.clearNamedPluginClasses();
cas.clearController();
PersonAuthorityValue person1 = new PersonAuthorityValue(); PersonAuthorityValue person1 = new PersonAuthorityValue();
person1.setId(String.valueOf(UUID.randomUUID())); person1.setId(String.valueOf(UUID.randomUUID()));
person1.setLastName("Shirasaka"); person1.setLastName("Shirasaka");