Revision 49184
Added by Sandro La Bruzzo over 6 years ago
RecordResolver.java | ||
---|---|---|
1 | 1 |
package eu.dnetlib.resolver.mdstore.plugin; |
2 | 2 |
|
3 |
import java.util.HashMap; |
|
4 |
import java.util.List; |
|
5 |
import java.util.Map; |
|
6 |
import java.util.concurrent.BlockingQueue; |
|
7 |
import java.util.concurrent.Callable; |
|
8 |
|
|
9 | 3 |
import com.mongodb.DBObject; |
10 | 4 |
import com.mongodb.client.MongoCollection; |
11 | 5 |
import eu.dnetlib.dli.DLIUtils; |
12 |
import eu.dnetlib.dli.resolver.PIDResolver; |
|
13 |
import eu.dnetlib.dli.resolver.model.*; |
|
6 |
import eu.dnetlib.dli.resolver.model.CompletionStatus; |
|
7 |
import eu.dnetlib.dli.resolver.model.DLIObjectRelation; |
|
8 |
import eu.dnetlib.dli.resolver.model.DLIResolvedObject; |
|
9 |
import eu.dnetlib.dli.resolver.model.PID; |
|
14 | 10 |
import eu.dnetlib.dli.resolver.model.serializer.ResolverSerializer; |
15 |
import eu.dnetlib.miscutils.collections.Pair; |
|
11 |
import eu.dnetlib.pid.resolver.PIDResolver; |
|
12 |
import eu.dnetlib.pid.resolver.model.ObjectType; |
|
16 | 13 |
import eu.dnetlib.resolver.parser.DLIParser; |
17 | 14 |
import org.antlr.stringtemplate.StringTemplate; |
18 | 15 |
import org.apache.commons.lang3.StringUtils; |
19 | 16 |
import org.apache.commons.logging.Log; |
20 | 17 |
import org.apache.commons.logging.LogFactory; |
21 | 18 |
|
22 |
import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.put; |
|
19 |
import java.util.HashMap; |
|
20 |
import java.util.List; |
|
21 |
import java.util.Map; |
|
22 |
import java.util.concurrent.BlockingQueue; |
|
23 |
import java.util.concurrent.Callable; |
|
23 | 24 |
|
24 | 25 |
/** |
25 | 26 |
* Created by sandro on 9/22/16. |
... | ... | |
41 | 42 |
|
42 | 43 |
private String resolve(final String inputRecord) { |
43 | 44 |
|
44 |
final ResolvedObject inputObject = parser.parse(inputRecord);
|
|
45 |
if (inputObject != null && StringUtils.isNoneBlank(inputObject.getResolvedDate()))
|
|
45 |
final DLIResolvedObject inputObject = parser.parse(inputRecord);
|
|
46 |
if (inputObject != null && StringUtils.isNoneBlank(inputObject.getResolvedDate()))
|
|
46 | 47 |
return null; |
47 | 48 |
|
48 | 49 |
if (inputObject != null && !StringUtils.isBlank(inputObject.getPid())) { |
... | ... | |
54 | 55 |
shouldUpdate = shouldUpdate || tryToResolveRecord(inputObject); |
55 | 56 |
} |
56 | 57 |
if (inputObject.getRelations() != null) { |
57 |
for (ObjectRelation rel : inputObject.getRelations()) {
|
|
58 |
for (DLIObjectRelation rel : inputObject.getRelations()) {
|
|
58 | 59 |
final Map<String, ObjectType> resolvedRelation = tryToResolveRelation(rel.getTargetPID()); |
59 | 60 |
if (resolvedRelation != null && !resolvedRelation.isEmpty()) { |
60 | 61 |
resolvedRelation.entrySet() |
... | ... | |
84 | 85 |
log.debug("tryToResolveRelation " + currentPid); |
85 | 86 |
|
86 | 87 |
for (PIDResolver resolver : pluginResolver) { |
87 |
final ResolvedObject currentIdentifier = resolver.retrievePID(currentPid.getId(), currentPid.getType());
|
|
88 |
final DLIResolvedObject currentIdentifier = (DLIResolvedObject) resolver.retrievePID(currentPid.getId(), currentPid.getType());
|
|
88 | 89 |
|
89 | 90 |
|
90 | 91 |
if (currentIdentifier != null && !StringUtils.isBlank(currentIdentifier.getPid()) && currentIdentifier.getPid().toLowerCase().equals(currentPid.getId().toLowerCase())) { |
... | ... | |
97 | 98 |
return null; |
98 | 99 |
} |
99 | 100 |
|
100 |
private boolean tryToResolveRecord(final ResolvedObject object) {
|
|
101 |
private boolean tryToResolveRecord(final DLIResolvedObject object) {
|
|
101 | 102 |
|
102 | 103 |
for (PIDResolver resolver : pluginResolver) { |
103 |
final ResolvedObject resolvedObject = resolver.retrievePID(object.getPid(), object.getPidType());
|
|
104 |
if (resolvedObject != null &&
|
|
104 |
final DLIResolvedObject resolvedObject = (DLIResolvedObject) resolver.retrievePID(object.getPid(), object.getPidType());
|
|
105 |
if (resolvedObject != null &&
|
|
105 | 106 |
resolvedObject.getCompletionStatus() != null && |
106 | 107 |
resolvedObject.getCompletionStatus().toString().equals(CompletionStatus.complete.toString())) { |
107 | 108 |
{ |
Also available in: Unified diff
Refactored Pid resolver