/ - Diff - D-Net - D-Net project tracking tool

« Previous | Next »

Revision 48135

Added by Alessia Bardi over 7 years ago

Re-added Mongo DB bean to logger, as it is currently needed to a class for updating the LOD in dnet-openaireplus-workflows.

     import org.apache.commons.logging.LogFactory;
     import org.bson.Document;
     import org.bson.conversions.Bson;
     import org.springframework.beans.factory.annotation.Required;
     public class DnetLoggerMongoDao implements DnetLoggerDao {
-...
+    	}
     	@Override
     	public Iterator<Map<String, String>> findByDateRange(final String collection, final Date startDate, final Date endDate, final String key, final String value) {
     	public Iterator<Map<String, String>> findByDateRange(final String collection,
     			final Date startDate,
     			final Date endDate,
     			final String key,
     			final String value) {
     		final MongoCollection coll = db.getCollection(collection);
     		final Bson query = Filters.and(getBasicQuery(key, value), getDateQuery(startDate, endDate));
     		return iter(coll.find(query).iterator());
+    	}
     	@Override
     	public Iterator<Map<String, String>> findByDateRange(final String collection, final Date startDate, final Date endDate, final Map<String, Object> criteria) {
     	public Iterator<Map<String, String>> findByDateRange(final String collection,
     			final Date startDate,
     			final Date endDate,
     			final Map<String, Object> criteria) {
     		final MongoCollection coll = db.getCollection(collection);
     		final Bson query = Filters.and(getCustomQuery(criteria), getDateQuery(startDate, endDate));
     		return iter(coll.find(query).iterator());
-...
     		return res;
+    	}
     	public MongoDatabase getDb() {
     		return db;
+    	}
     	@Required
     	public void setDb(final MongoDatabase db) {
     		this.db = db;
+    	}
+    }

            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">
     	<bean id="dnetLoggerMongoDao" class="eu.dnetlib.common.logging.dao.DnetLoggerMongoDao" />
     	<bean id="dnetLoggerMongoDao" class="eu.dnetlib.common.logging.dao.DnetLoggerMongoDao"
     	      p:db-ref="loggingMongoDB"/>
     	<bean id="loggingMongoClient" class="com.mongodb.MongoClient">
     		<constructor-arg index="0" type="com.mongodb.ServerAddress">

Also available in: Unified diff

Project

General

Profile

D-Net

Revision 48135

Added by Alessia Bardi over 7 years ago