added new information in support of blacklist reader

dhp-schemas/src/main/java/eu/dnetlib/dhp/schema/common/ModelSupport.java

@@ -1,11 +1,14 @@
+
 package eu.dnetlib.dhp.schema.common;
 
-import com.google.common.collect.Maps;
-import eu.dnetlib.dhp.schema.oaf.*;
 import java.util.Map;
 import java.util.Optional;
 import java.util.function.Function;
 
+import com.google.common.collect.Maps;
+
+import eu.dnetlib.dhp.schema.oaf.*;
+
 /** Oaf model utility methods. */
 public class ModelSupport {
 
@@ -56,159 +59,219 @@ public class ModelSupport {
 		entityIdPrefix.put("datasource", "10");
 		entityIdPrefix.put("organization", "20");
 		entityIdPrefix.put("project", "40");
-    entityIdPrefix.put("result","50");
+		entityIdPrefix.put("result", "50");
 	}
 
 	public static final Map<String, RelationInverse> relationInverseMap = Maps.newHashMap();
 
 	static {
-    relationInverseMap.put("personResult_authorship_isAuthorOf", new RelationInverse()
+		relationInverseMap
+			.put(
+				"personResult_authorship_isAuthorOf", new RelationInverse()
 					.setRelation("isAuthorOf")
 					.setInverse("hasAuthor")
 					.setRelType("personResult")
 					.setSubReltype("authorship"));
-    relationInverseMap.put("personResult_authorship_hasAuthor",  new RelationInverse()
+		relationInverseMap
+			.put(
+				"personResult_authorship_hasAuthor", new RelationInverse()
 					.setInverse("isAuthorOf")
 					.setRelation("hasAuthor")
 					.setRelType("personResult")
 					.setSubReltype("authorship"));
-    relationInverseMap.put("projectOrganization_participation_isParticipant", new RelationInverse()
+		relationInverseMap
+			.put(
+				"projectOrganization_participation_isParticipant", new RelationInverse()
 					.setRelation("isParticipant")
 					.setInverse("hasParticipant")
 					.setRelType("projectOrganization")
 					.setSubReltype("participation"));
-    relationInverseMap.put("projectOrganization_participation_hasParticipant",  new RelationInverse()
+		relationInverseMap
+			.put(
+				"projectOrganization_participation_hasParticipant", new RelationInverse()
 					.setInverse("isParticipant")
 					.setRelation("hasParticipant")
 					.setRelType("projectOrganization")
 					.setSubReltype("participation"));
-    relationInverseMap.put("resultOrganization_affiliation_hasAuthorInstitution", new RelationInverse()
+		relationInverseMap
+			.put(
+				"resultOrganization_affiliation_hasAuthorInstitution", new RelationInverse()
 					.setRelation("hasAuthorInstitution")
 					.setInverse("isAuthorInstitutionOf")
 					.setRelType("resultOrganization")
 					.setSubReltype("affiliation"));
-    relationInverseMap.put("resultOrganization_affiliation_isAuthorInstitutionOf", new RelationInverse()
+		relationInverseMap
+			.put(
+				"resultOrganization_affiliation_isAuthorInstitutionOf", new RelationInverse()
 					.setInverse("hasAuthorInstitution")
 					.setRelation("isAuthorInstitutionOf")
 					.setRelType("resultOrganization")
 					.setSubReltype("affiliation"));
-    relationInverseMap.put("organizationOrganization_dedup_merges", new RelationInverse()
+		relationInverseMap
+			.put(
+				"organizationOrganization_dedup_merges", new RelationInverse()
 					.setRelation("merges")
 					.setInverse("isMergedIn")
 					.setRelType("organizationOrganization")
 					.setSubReltype("dedup"));
-    relationInverseMap.put("organizationOrganization_dedup_isMergedIn",  new RelationInverse()
+		relationInverseMap
+			.put(
+				"organizationOrganization_dedup_isMergedIn", new RelationInverse()
 					.setInverse("merges")
 					.setRelation("isMergedIn")
 					.setRelType("organizationOrganization")
 					.setSubReltype("dedup"));
-    relationInverseMap.put("organizationOrganization_dedupSimilarity_isSimilarTo",  new RelationInverse()
+		relationInverseMap
+			.put(
+				"organizationOrganization_dedupSimilarity_isSimilarTo", new RelationInverse()
 					.setInverse("isSimilarTo")
 					.setRelation("isSimilarTo")
 					.setRelType("organizationOrganization")
 					.setSubReltype("dedupSimilarity"));
 
-    relationInverseMap.put("resultProject_outcome_isProducedBy", new RelationInverse()
+		relationInverseMap
+			.put(
+				"resultProject_outcome_isProducedBy", new RelationInverse()
 					.setRelation("isProducedBy")
 					.setInverse("produces")
 					.setRelType("resultProject")
 					.setSubReltype("outcome"));
-    relationInverseMap.put("resultProject_outcome_produces",  new RelationInverse()
+		relationInverseMap
+			.put(
+				"resultProject_outcome_produces", new RelationInverse()
 					.setInverse("isProducedBy")
 					.setRelation("produces")
 					.setRelType("resultProject")
 					.setSubReltype("outcome"));
-    relationInverseMap.put("projectPerson_contactPerson_isContact", new RelationInverse()
+		relationInverseMap
+			.put(
+				"projectPerson_contactPerson_isContact", new RelationInverse()
 					.setRelation("isContact")
 					.setInverse("hasContact")
 					.setRelType("projectPerson")
 					.setSubReltype("contactPerson"));
-    relationInverseMap.put("projectPerson_contactPerson_hasContact", new RelationInverse()
+		relationInverseMap
+			.put(
+				"projectPerson_contactPerson_hasContact", new RelationInverse()
 					.setInverse("isContact")
 					.setRelation("hasContact")
 					.setRelType("personPerson")
 					.setSubReltype("coAuthorship"));
-    relationInverseMap.put("personPerson_coAuthorship_isCoauthorOf", new RelationInverse()
+		relationInverseMap
+			.put(
+				"personPerson_coAuthorship_isCoauthorOf", new RelationInverse()
 					.setInverse("isCoAuthorOf")
 					.setRelation("isCoAuthorOf")
 					.setRelType("personPerson")
 					.setSubReltype("coAuthorship"));
-    relationInverseMap.put("personPerson_dedup_merges", new RelationInverse()
+		relationInverseMap
+			.put(
+				"personPerson_dedup_merges", new RelationInverse()
 					.setInverse("isMergedIn")
 					.setRelation("merges")
 					.setRelType("personPerson")
 					.setSubReltype("dedup"));
-    relationInverseMap.put("personPerson_dedup_isMergedIn", new RelationInverse()
+		relationInverseMap
+			.put(
+				"personPerson_dedup_isMergedIn", new RelationInverse()
 					.setInverse("merges")
 					.setRelation("isMergedIn")
 					.setRelType("personPerson")
 					.setSubReltype("dedup"));
-    relationInverseMap.put("personPerson_dedupSimilarity_isSimilarTo", new RelationInverse()
+		relationInverseMap
+			.put(
+				"personPerson_dedupSimilarity_isSimilarTo", new RelationInverse()
 					.setInverse("isSimilarTo")
 					.setRelation("isSimilarTo")
 					.setRelType("personPerson")
 					.setSubReltype("dedupSimilarity"));
-    relationInverseMap.put("datasourceOrganization_provision_isProvidedBy", new RelationInverse()
+		relationInverseMap
+			.put(
+				"datasourceOrganization_provision_isProvidedBy", new RelationInverse()
 					.setInverse("provides")
 					.setRelation("isProvidedBy")
 					.setRelType("datasourceOrganization")
 					.setSubReltype("provision"));
-    relationInverseMap.put("datasourceOrganization_provision_provides", new RelationInverse()
+		relationInverseMap
+			.put(
+				"datasourceOrganization_provision_provides", new RelationInverse()
 					.setInverse("isProvidedBy")
 					.setRelation("provides")
 					.setRelType("datasourceOrganization")
 					.setSubReltype("provision"));
-    relationInverseMap.put("resultResult_similarity_hasAmongTopNSimilarDocuments", new RelationInverse()
+		relationInverseMap
+			.put(
+				"resultResult_similarity_hasAmongTopNSimilarDocuments", new RelationInverse()
 					.setInverse("isAmongTopNSimilarDocuments")
 					.setRelation("hasAmongTopNSimilarDocuments")
 					.setRelType("resultResult")
 					.setSubReltype("similarity"));
-    relationInverseMap.put("resultResult_similarity_isAmongTopNSimilarDocuments", new RelationInverse()
+		relationInverseMap
+			.put(
+				"resultResult_similarity_isAmongTopNSimilarDocuments", new RelationInverse()
 					.setInverse("hasAmongTopNSimilarDocuments")
 					.setRelation("isAmongTopNSimilarDocuments")
 					.setRelType("resultResult")
 					.setSubReltype("similarity"));
-    relationInverseMap.put("resultResult_relationship_isRelatedTo", new RelationInverse()
+		relationInverseMap
+			.put(
+				"resultResult_relationship_isRelatedTo", new RelationInverse()
 					.setInverse("isRelatedTo")
 					.setRelation("isRelatedTo")
 					.setRelType("resultResult")
 					.setSubReltype("relationship"));
-    relationInverseMap.put("resultResult_similarity_isAmongTopNSimilarDocuments", new RelationInverse()
+		relationInverseMap
+			.put(
+				"resultResult_similarity_isAmongTopNSimilarDocuments", new RelationInverse()
 					.setInverse("hasAmongTopNSimilarDocuments")
 					.setRelation("isAmongTopNSimilarDocuments")
 					.setRelType("resultResult")
 					.setSubReltype("similarity"));
-    relationInverseMap.put("resultResult_supplement_isSupplementTo", new RelationInverse()
+		relationInverseMap
+			.put(
+				"resultResult_supplement_isSupplementTo", new RelationInverse()
 					.setInverse("isSupplementedBy")
 					.setRelation("isSupplementTo")
 					.setRelType("resultResult")
 					.setSubReltype("supplement"));
-    relationInverseMap.put("resultResult_supplement_isSupplementedBy", new RelationInverse()
+		relationInverseMap
+			.put(
+				"resultResult_supplement_isSupplementedBy", new RelationInverse()
 					.setInverse("isSupplementTo")
 					.setRelation("isSupplementedBy")
 					.setRelType("resultResult")
 					.setSubReltype("supplement"));
-    relationInverseMap.put("resultResult_part_isPartOf", new RelationInverse()
+		relationInverseMap
+			.put(
+				"resultResult_part_isPartOf", new RelationInverse()
 					.setInverse("hasPart")
 					.setRelation("isPartOf")
 					.setRelType("resultResult")
 					.setSubReltype("part"));
-    relationInverseMap.put("resultResult_part_hasPart", new RelationInverse()
+		relationInverseMap
+			.put(
+				"resultResult_part_hasPart", new RelationInverse()
 					.setInverse("isPartOf")
 					.setRelation("hasPart")
 					.setRelType("resultResult")
 					.setSubReltype("part"));
-    relationInverseMap.put("resultResult_dedup_merges", new RelationInverse()
+		relationInverseMap
+			.put(
+				"resultResult_dedup_merges", new RelationInverse()
 					.setInverse("isMergedIn")
 					.setRelation("merges")
 					.setRelType("resultResult")
 					.setSubReltype("dedup"));
-    relationInverseMap.put("resultResult_dedup_isMergedIn", new RelationInverse()
+		relationInverseMap
+			.put(
+				"resultResult_dedup_isMergedIn", new RelationInverse()
 					.setInverse("merges")
 					.setRelation("isMergedIn")
 					.setRelType("resultResult")
 					.setSubReltype("dedup"));
-    relationInverseMap.put("resultResult_dedupSimilarity_isSimilarTo", new RelationInverse()
+		relationInverseMap
+			.put(
+				"resultResult_dedupSimilarity_isSimilarTo", new RelationInverse()
 					.setInverse("isSimilarTo")
 					.setRelation("isSimilarTo")
 					.setRelType("resultResult")
@@ -218,7 +281,8 @@ public class ModelSupport {
 
 	private static final String schemeTemplate = "dnet:%s_%s_relations";
 
-  private ModelSupport() {}
+	private ModelSupport() {
+	}
 
 	/**
 	 * Checks subclass-superclass relationship.
@@ -308,7 +372,8 @@ public class ModelSupport {
 	}
 
 	public static String getScheme(final String sourceType, final String targetType) {
-    return String.format(
+		return String
+			.format(
 				schemeTemplate,
 				entityMapping.get(EntityType.valueOf(sourceType)).name(),
 				entityMapping.get(EntityType.valueOf(targetType)).name());
@@ -325,29 +390,31 @@ public class ModelSupport {
 
 	private static <T extends Oaf> String idFnForRelation(T t) {
 		Relation r = (Relation) t;
-    return Optional.ofNullable(r.getSource())
+		return Optional
+			.ofNullable(r.getSource())
 			.map(
-            source ->
+				source -> Optional
-                Optional.ofNullable(r.getTarget())
+					.ofNullable(r.getTarget())
 					.map(
-                        target ->
+						target -> Optional
-                            Optional.ofNullable(r.getRelType())
+							.ofNullable(r.getRelType())
 							.map(
-                                    relType ->
+								relType -> Optional
-                                        Optional.ofNullable(r.getSubRelType())
+									.ofNullable(r.getSubRelType())
 									.map(
-                                                subRelType ->
+										subRelType -> Optional
-                                                    Optional.ofNullable(r.getRelClass())
+											.ofNullable(r.getRelClass())
 											.map(
-                                                            relClass ->
+												relClass -> String
-                                                                String.join(
+													.join(
 														source,
 														target,
 														relType,
 														subRelType,
 														relClass))
 											.orElse(
-                                                            String.join(
+												String
+													.join(
 														source,
 														target,
 														relType,

dhp-schemas/src/main/java/eu/dnetlib/dhp/schema/common/RelationInverse.java

@@ -1,3 +1,4 @@
+
 package eu.dnetlib.dhp.schema.common;
 
 public class RelationInverse {
@@ -42,5 +43,4 @@ public class RelationInverse  {
 		return this;
 	}
 
-
 }