From 59c5681678a1de9ef3c41d23b39273ea14f831d8 Mon Sep 17 00:00:00 2001
From: Claudio Atzori <claudio.atzori@isti.cnr.it>
Date: Wed, 24 Jul 2019 16:15:05 +0200
Subject: [PATCH] added mock bean for LocalSimpleDatasourceManager

---
 .../LocalSimpleDatasourceManager.java         |   4 +-
 .../LocalSimpleDatasourceManagerImpl.java     |  12 ++-
 ...icationContext-dnet-datasource-manager.xml | 102 +-----------------
 3 files changed, 17 insertions(+), 101 deletions(-)

diff --git a/dnet-data-services/src/main/java/eu/dnetlib/data/datasource/LocalSimpleDatasourceManager.java b/dnet-data-services/src/main/java/eu/dnetlib/data/datasource/LocalSimpleDatasourceManager.java
index 01ca7ae..48db94d 100644
--- a/dnet-data-services/src/main/java/eu/dnetlib/data/datasource/LocalSimpleDatasourceManager.java
+++ b/dnet-data-services/src/main/java/eu/dnetlib/data/datasource/LocalSimpleDatasourceManager.java
@@ -1,4 +1,6 @@
 package eu.dnetlib.data.datasource;
 
-public interface LocalSimpleDatasourceManager {
+import eu.dnetlib.enabling.datasources.common.*;
+
+public interface LocalSimpleDatasourceManager extends LocalDatasourceManager<Datasource<Organization<?>, Identity>, Api<ApiParam>> {
 }
diff --git a/dnet-data-services/src/main/java/eu/dnetlib/data/datasource/LocalSimpleDatasourceManagerImpl.java b/dnet-data-services/src/main/java/eu/dnetlib/data/datasource/LocalSimpleDatasourceManagerImpl.java
index 44b07ea..fd7193e 100644
--- a/dnet-data-services/src/main/java/eu/dnetlib/data/datasource/LocalSimpleDatasourceManagerImpl.java
+++ b/dnet-data-services/src/main/java/eu/dnetlib/data/datasource/LocalSimpleDatasourceManagerImpl.java
@@ -1,20 +1,28 @@
 package eu.dnetlib.data.datasource;
 
 import eu.dnetlib.enabling.datasources.common.*;
+import eu.dnetlib.enabling.locators.UniqueServiceLocator;
+import org.springframework.beans.factory.annotation.Autowired;
 
 import java.util.Date;
 import java.util.List;
 import java.util.Map;
 import java.util.Set;
 
-public class LocalDatasourceManagerImpl implements LocalSimpleDatasourceManager {
+public class LocalSimpleDatasourceManagerImpl implements LocalSimpleDatasourceManager {
+
+    @Autowired
+    private UniqueServiceLocator serviceLocator;
+
+
     @Override
     public Set<String> listManagedDatasourceIds() throws DsmRuntimeException {
-        return null;
+        throw new DsmRuntimeException("method 'listManagedDatasourceIds' not implemented");
     }
 
     @Override
     public List<SimpleDatasource> searchDatasourcesByType(String type) throws DsmException {
+
         return null;
     }
 
diff --git a/dnet-data-services/src/main/resources/eu/dnetlib/datasource/applicationContext-dnet-datasource-manager.xml b/dnet-data-services/src/main/resources/eu/dnetlib/datasource/applicationContext-dnet-datasource-manager.xml
index e8b2ade..e6e36f7 100644
--- a/dnet-data-services/src/main/resources/eu/dnetlib/datasource/applicationContext-dnet-datasource-manager.xml
+++ b/dnet-data-services/src/main/resources/eu/dnetlib/datasource/applicationContext-dnet-datasource-manager.xml
@@ -6,106 +6,12 @@
        xmlns:template="http://dnetlib.eu/springbeans/template"
        xmlns="http://www.springframework.org/schema/beans"
        xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd
+                           http://cxf.apache.org/transports/http/configuration http://cxf.apache.org/schemas/configuration/http-conf.xsd
+                           http://cxf.apache.org/jaxws http://cxf.apache.org/schemas/jaxws.xsd
+                           http://dnetlib.eu/springbeans/template http://dnetlib.eu/springbeans/template.xsd">
 
 
-                                    http://cxf.apache.org/transports/http/configuration http://cxf.apache.org/schemas/configuration/http-conf.xsd
-                            http://cxf.apache.org/jaxws http://cxf.apache.org/schemas/jaxws.xsd
-
-                            http://dnetlib.eu/springbeans/template http://dnetlib.eu/springbeans/template.xsd">
-
-
-    <bean id="objectStoreService"
-          class="eu.dnetlib.data.objectstore.modular.ModularObjectStoreService"
-          init-method="start" destroy-method="stop"
-          p:feeder-ref="objectstoreFeeder"
-          p:objectStoreDeliver-ref="objectstoreDeliver"
-          p:notificationHandler-ref="objectstoreNotificationHandler"
-            />
-
-    <bean id="objectstoreFeeder"
-          class="eu.dnetlib.data.objectstore.modular.ModularObjectStoreFeeder"
-          p:dao-ref="${services.objectstore.dao}"
-          p:resultSetClientFactory-ref="objectstoreResultSetClientFactory"
-          p:serviceLocator-ref="uniqueServiceLocator"
-            />
-
-    <bean id="objectstoreDeliver"
-          class="eu.dnetlib.data.objectstore.modular.ModularObjectStoreDeliver"
-          p:dao-ref="${services.objectstore.dao}"
-          p:resultSetClientFactory-ref="objectstoreResultSetClientFactory"
-
-            />
-
-
-    <bean id="objectstoreResultSetClientFactory" parent="resultSetClientFactory"
-          p:pageSize="${services.objectstore.rsfactory.pagesize}"/>
-
-
-    <bean id="objectstoreProfileCreator" class="eu.dnetlib.data.objectstore.modular.ObjectStoreProfileCreator"
-          p:serviceLocator-ref="uniqueServiceLocator" p:objectstoreDsTemplate-ref="objectstoreDsTemplate"
-          p:endpoint-ref="objectStoreServiceEndpoint" p:eprBuilder-ref="jaxwsEndpointReferenceBuilder"/>
-
-    <bean id="objectstoreNotificationHandler"
-          class="eu.dnetlib.enabling.tools.blackboard.BlackboardServerExecutorNotificationHandler"
-          p:blackboardExecutor-ref="objectstoreBlackboardExecutor"/>
-
-    <bean id="objectstoreBlackboardExecutor"
-          class="eu.dnetlib.enabling.tools.blackboard.BlackboardServerActionExecutor"
-          p:blackboardHandler-ref="blackboardHandler"
-          p:actionType="eu.dnetlib.data.objectstore.modular.ObjectStoreActions"
-          p:incomplete="false">
-        <property name="actionMap">
-            <map>
-                <entry key="CREATE">
-                    <bean class="eu.dnetlib.data.objectstore.modular.CreateObjectStoreAction"
-                          p:profileCreator-ref="objectstoreProfileCreator" p:dao-ref="${services.objectstore.dao}"/>
-                </entry>
-                <entry key="DELETE">
-                    <bean class="eu.dnetlib.data.objectstore.modular.DeleteObjectStoreAction"
-                          p:profileCreator-ref="objectstoreProfileCreator" p:dao-ref="${services.objectstore.dao}"/>
-                </entry>
-                <entry key="DROP_CONTENT">
-                    <bean class="eu.dnetlib.data.objectstore.modular.DropContentObjectStoreAction"
-                          p:dao-ref="${services.objectstore.dao}"/>
-                </entry>
-
-                <entry key="FEED">
-                    <bean class="eu.dnetlib.data.objectstore.modular.FeedObjectStoreAction"
-                          p:profileCreator-ref="objectstoreProfileCreator"
-                          p:storeFeeder-ref="objectstoreFeeder"
-                          p:dao-ref="${services.objectstore.dao}"/>
-                </entry>
-
-                <entry key="FEEDOBJECT">
-                    <bean class="eu.dnetlib.data.objectstore.modular.FeedCompleteObjectAction"
-                          p:storeFeeder-ref="objectstoreFeeder"
-                          p:dao-ref="${services.objectstore.dao}"/>
-                </entry>
-            </map>
-        </property>
-    </bean>
-
-
-    <bean id="objectStoreLocator" class="eu.dnetlib.enabling.tools.StaticServiceLocator"
-          p:service-ref="objectStoreService"/>
-
-
-    <bean id="objectstoreDsTemplate"
-          class="eu.dnetlib.springutils.stringtemplate.StringTemplateFactory"
-          p:template="classpath:/eu/dnetlib/data/objectstore/objectstoreds-template.xml"
-          scope="prototype"/>
-
-
-    <!-- endpoints -->
-    <jaxws:endpoint id="objectStoreServiceEndpoint"
-                    implementor="#objectStoreService" implementorClass="eu.dnetlib.data.objectstore.rmi.ObjectStoreService"
-                    address="/objectStore"/>
-
-    <template:instance name="serviceRegistrationManager"
-                       t:serviceRegistrationManagerClass="eu.dnetlib.enabling.tools.registration.ValidatingServiceRegistrationManagerImpl"
-                       t:name="objectStoreServiceRegistrationManager" t:service="objectStoreService"
-                       t:endpoint="objectStoreServiceEndpoint" t:jobScheduler="jobScheduler"
-                       t:serviceRegistrator="blackboardServiceRegistrator"/>
+    <bean id="datasourceManager" class="eu.dnetlib.data.datasource.LocalSimpleDatasourceManagerImpl" />
 
 
 </beans>