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

CST-5249 add openaire to custom BrokerClient instance and factory

Browse Source
This commit is contained in:
frabacche
2023-12-13 16:14:36 +01:00
parent ff5f3fa74f
commit 5f992e0b71
5 changed files with 14 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
dspace-api/src/main/java/org/dspace/qaevent/script/OpenaireEventsImport.java
View File

@@ -32,7 +32,7 @@ import org.dspace.content.QAEvent;
import org.dspace.core.Context;
import org.dspace.eperson.EPerson;
import org.dspace.eperson.factory.EPersonServiceFactory;
import org.dspace.qaevent.service.BrokerClientFactory;
import org.dspace.qaevent.service.OpenaireClientFactory;
import org.dspace.qaevent.service.QAEventService;
import org.dspace.scripts.DSpaceRunnable;
import org.dspace.services.ConfigurationService;
@@ -105,7 +105,7 @@ public class OpenaireEventsImport
qaEventService = new DSpace().getSingletonService(QAEventService.class);
configurationService = DSpaceServicesFactory.getInstance().getConfigurationService();
brokerClient = BrokerClientFactory.getInstance().getBrokerClient();
brokerClient = OpenaireClientFactory.getInstance().getBrokerClient();
topicsToImport = configurationService.getArrayProperty("qaevents.openaire.import.topic");
openaireBrokerURL = getOpenaireBrokerUri();

6
dspace-api/src/main/java/org/dspace/qaevent/service/BrokerClientFactory.java → dspace-api/src/main/java/org/dspace/qaevent/service/OpenaireClientFactory.java
View File

@@ -16,7 +16,7 @@ import org.dspace.utils.DSpace;
* @author Luca Giamminonni (luca.giamminonni at 4science.it)
*
*/
public interface BrokerClientFactory {
public interface OpenaireClientFactory {
/**
* Returns an instance of the {@link BrokerClient}.
@@ -25,7 +25,7 @@ public interface BrokerClientFactory {
*/
public BrokerClient getBrokerClient();
public static BrokerClientFactory getInstance() {
return new DSpace().getServiceManager().getServiceByName("brokerClientFactory", BrokerClientFactory.class);
public static OpenaireClientFactory getInstance() {
return new DSpace().getServiceManager().getServiceByName("openaireClientFactory", OpenaireClientFactory.class);
}
}

6
dspace-api/src/main/java/org/dspace/qaevent/service/impl/BrokerClientFactoryImpl.java → dspace-api/src/main/java/org/dspace/qaevent/service/impl/OpenaireClientFactoryImpl.java
View File

@@ -8,17 +8,17 @@
package org.dspace.qaevent.service.impl;
import eu.dnetlib.broker.BrokerClient;
import org.dspace.qaevent.service.BrokerClientFactory;
import org.dspace.qaevent.service.OpenaireClientFactory;
import org.springframework.beans.factory.annotation.Autowired;
/**
* Implementation of {@link BrokerClientFactory} that returns the instance of
* Implementation of {@link OpenaireClientFactory} that returns the instance of
* {@link BrokerClient} managed by the Spring context.
*
* @author Luca Giamminonni (luca.giamminonni at 4science.it)
*
*/
public class BrokerClientFactoryImpl implements BrokerClientFactory {
public class OpenaireClientFactoryImpl implements OpenaireClientFactory {
@Autowired
private BrokerClient brokerClient;

10
dspace-api/src/test/java/org/dspace/qaevent/script/OpenaireEventsImportIT.java
View File

@@ -45,9 +45,9 @@ import org.dspace.content.Collection;
import org.dspace.content.Item;
import org.dspace.matcher.QASourceMatcher;
import org.dspace.matcher.QATopicMatcher;
import org.dspace.qaevent.service.BrokerClientFactory;
import org.dspace.qaevent.service.OpenaireClientFactory;
import org.dspace.qaevent.service.QAEventService;
import org.dspace.qaevent.service.impl.BrokerClientFactoryImpl;
import org.dspace.qaevent.service.impl.OpenaireClientFactoryImpl;
import org.dspace.utils.DSpace;
import org.junit.After;
import org.junit.Before;
@@ -67,7 +67,7 @@ public class OpenaireEventsImportIT extends AbstractIntegrationTestWithDatabase
private Collection collection;
private BrokerClient brokerClient = BrokerClientFactory.getInstance().getBrokerClient();
private BrokerClient brokerClient = OpenaireClientFactory.getInstance().getBrokerClient();
private BrokerClient mockBrokerClient = mock(BrokerClient.class);
@@ -86,12 +86,12 @@ public class OpenaireEventsImportIT extends AbstractIntegrationTestWithDatabase
context.restoreAuthSystemState();
((BrokerClientFactoryImpl) BrokerClientFactory.getInstance()).setBrokerClient(mockBrokerClient);
((OpenaireClientFactoryImpl) OpenaireClientFactory.getInstance()).setBrokerClient(mockBrokerClient);
}
@After
public void after() {
((BrokerClientFactoryImpl) BrokerClientFactory.getInstance()).setBrokerClient(brokerClient);
((OpenaireClientFactoryImpl) OpenaireClientFactory.getInstance()).setBrokerClient(brokerClient);
}
@Test

2
dspace/config/spring/api/qaevents.xml
View File

@@ -13,7 +13,7 @@
<bean id="openaireBrokerClient" class="eu.dnetlib.broker.BrokerClient" />
<bean id="brokerClientFactory" class="org.dspace.qaevent.service.impl.BrokerClientFactoryImpl" />
<bean id="openaireClientFactory" class="org.dspace.qaevent.service.impl.OpenaireClientFactoryImpl" />
<bean id="org.dspace.qaevent.service.QAEventActionService" class="org.dspace.qaevent.service.impl.QAEventActionServiceImpl">
<property name="topicsToActions">