From b830e333922e9b421c4955c07d03c3b5aad4fc75 Mon Sep 17 00:00:00 2001
From: Claudio Atzori <claudio.atzori@isti.cnr.it>
Date: Thu, 25 Feb 2021 12:30:30 +0100
Subject: [PATCH] mdstore collector plugin

---
 .../java/eu/dnetlib/dhp/common/MdstoreClient.java  | 13 +++++++------
 .../plugin/mongodb/MDStoreCollectorPlugin.java     | 14 ++++++++------
 .../graph/raw/MigrateMongoMdstoresApplication.java |  2 +-
 3 files changed, 16 insertions(+), 13 deletions(-)

diff --git a/dhp-common/src/main/java/eu/dnetlib/dhp/common/MdstoreClient.java b/dhp-common/src/main/java/eu/dnetlib/dhp/common/MdstoreClient.java
index 236e4d8b0..d29498306 100644
--- a/dhp-common/src/main/java/eu/dnetlib/dhp/common/MdstoreClient.java
+++ b/dhp-common/src/main/java/eu/dnetlib/dhp/common/MdstoreClient.java
@@ -9,16 +9,16 @@ import java.util.Map;
 import java.util.Optional;
 import java.util.stream.StreamSupport;
 
-import com.mongodb.BasicDBObject;
-import com.mongodb.QueryBuilder;
 import org.apache.commons.lang3.StringUtils;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 import org.bson.Document;
 
 import com.google.common.collect.Iterables;
+import com.mongodb.BasicDBObject;
 import com.mongodb.MongoClient;
 import com.mongodb.MongoClientURI;
+import com.mongodb.QueryBuilder;
 import com.mongodb.client.MongoCollection;
 import com.mongodb.client.MongoDatabase;
 
@@ -40,10 +40,11 @@ public class MdstoreClient implements Closeable {
 	public MongoCollection<Document> mdStore(final String mdId) {
 		BasicDBObject query = (BasicDBObject) QueryBuilder.start("mdId").is(mdId).get();
 
-		final String currentId = Optional.ofNullable(getColl(db, COLL_METADATA_MANAGER, true).find(query))
-				.map(r -> r.first())
-				.map(d -> d.getString("currentId"))
-				.orElseThrow(() -> new IllegalArgumentException("cannot find current mdstore id for: " + mdId));
+		final String currentId = Optional
+			.ofNullable(getColl(db, COLL_METADATA_MANAGER, true).find(query))
+			.map(r -> r.first())
+			.map(d -> d.getString("currentId"))
+			.orElseThrow(() -> new IllegalArgumentException("cannot find current mdstore id for: " + mdId));
 		return getColl(db, currentId, true);
 	}
 
diff --git a/dhp-workflows/dhp-aggregation/src/main/java/eu/dnetlib/dhp/collection/plugin/mongodb/MDStoreCollectorPlugin.java b/dhp-workflows/dhp-aggregation/src/main/java/eu/dnetlib/dhp/collection/plugin/mongodb/MDStoreCollectorPlugin.java
index 33b9111dd..77e899cc9 100644
--- a/dhp-workflows/dhp-aggregation/src/main/java/eu/dnetlib/dhp/collection/plugin/mongodb/MDStoreCollectorPlugin.java
+++ b/dhp-workflows/dhp-aggregation/src/main/java/eu/dnetlib/dhp/collection/plugin/mongodb/MDStoreCollectorPlugin.java
@@ -7,27 +7,29 @@ import java.util.Spliterators;
 import java.util.stream.Stream;
 import java.util.stream.StreamSupport;
 
+import org.bson.Document;
+
 import com.mongodb.client.MongoCollection;
-import eu.dnetlib.dhp.common.MdstoreClient;
 
 import eu.dnetlib.dhp.aggregation.common.AggregatorReport;
 import eu.dnetlib.dhp.collection.ApiDescriptor;
 import eu.dnetlib.dhp.collection.CollectorException;
 import eu.dnetlib.dhp.collection.plugin.CollectorPlugin;
-import org.bson.Document;
+import eu.dnetlib.dhp.common.MdstoreClient;
 
 public class MDStoreCollectorPlugin implements CollectorPlugin {
 
-	public static final String MONGODB_BASEURL = "mongodb_baseurl";
 	public static final String MONGODB_DBNAME = "mongodb_dbname";
-	public static final String MDSTORE_ID = "mongodb_collection";
+	public static final String MDSTORE_ID = "mdstore_id";
 
 	@Override
 	public Stream<String> collect(ApiDescriptor api, AggregatorReport report) throws CollectorException {
 
 		final String mongoBaseUrl = Optional
-			.ofNullable(api.getParams().get(MONGODB_BASEURL))
-			.orElseThrow(() -> new CollectorException(String.format("missing parameter '%s'", MONGODB_BASEURL)));
+			.ofNullable(api.getBaseUrl())
+			.orElseThrow(
+				() -> new CollectorException(
+					"missing mongodb baseUrl, expected in eu.dnetlib.dhp.collection.ApiDescriptor.baseUrl"));
 
 		final String dbName = Optional
 			.ofNullable(api.getParams().get(MONGODB_DBNAME))
diff --git a/dhp-workflows/dhp-graph-mapper/src/main/java/eu/dnetlib/dhp/oa/graph/raw/MigrateMongoMdstoresApplication.java b/dhp-workflows/dhp-graph-mapper/src/main/java/eu/dnetlib/dhp/oa/graph/raw/MigrateMongoMdstoresApplication.java
index 9e7e051de..50042b569 100644
--- a/dhp-workflows/dhp-graph-mapper/src/main/java/eu/dnetlib/dhp/oa/graph/raw/MigrateMongoMdstoresApplication.java
+++ b/dhp-workflows/dhp-graph-mapper/src/main/java/eu/dnetlib/dhp/oa/graph/raw/MigrateMongoMdstoresApplication.java
@@ -11,8 +11,8 @@ import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 
 import eu.dnetlib.dhp.application.ArgumentApplicationParser;
-import eu.dnetlib.dhp.oa.graph.raw.common.AbstractMigrationApplication;
 import eu.dnetlib.dhp.common.MdstoreClient;
+import eu.dnetlib.dhp.oa.graph.raw.common.AbstractMigrationApplication;
 
 public class MigrateMongoMdstoresApplication extends AbstractMigrationApplication
 	implements Closeable {