Revision 30052
Added by Antonis Lempesis over 9 years ago
| ValidatorManagerImpl.java | ||
|---|---|---|
| 1 | 1 |
package gr.uoa.di.validator.service; |
| 2 | 2 |
|
| 3 | 3 |
import eu.dnetlib.enabling.tools.blackboard.BlackboardJob; |
| 4 |
import eu.dnetlib.enabling.tools.blackboard.BlackboardNotificationHandler; |
|
| 5 |
import eu.dnetlib.enabling.tools.blackboard.BlackboardServerHandler; |
|
| 4 | 6 |
import gr.uoa.di.validator.Validator; |
| 5 | 7 |
import gr.uoa.di.validator.ValidatorException; |
| 6 | 8 |
import gr.uoa.di.validator.dao.JobSubmitted; |
| ... | ... | |
| 55 | 57 |
logger.debug("Initializing Validator Manager module");
|
| 56 | 58 |
} |
| 57 | 59 |
|
| 58 |
@Transactional(propagation = Propagation.REQUIRED) |
|
| 59 |
public JobSubmitted beginDataJobForWorkflow(String datasource, BlackboardJob bJob) throws ValidatorException{
|
|
| 60 |
public JobSubmitted beginDataJobForWorkflow(String datasource, BlackboardJob bJob, BlackboardNotificationHandler<BlackboardServerHandler> blackboardHandler) throws ValidatorException{
|
|
| 60 | 61 |
try {
|
| 61 | 62 |
logger.debug("Submitting data job for workflow");
|
| 62 | 63 |
Set<Integer> ruleIdsContent = new HashSet<Integer>(); |
| 64 |
|
|
| 63 | 65 |
for (RuleSet ruleset : ruleSetDao.getRuleSets()) {
|
| 64 | 66 |
String regRuleset; |
| 67 |
|
|
| 65 | 68 |
regRuleset = "OpenAIRE For Literature Repositories"; |
| 69 |
|
|
| 66 | 70 |
if (ruleset.getName().equals(regRuleset)) {
|
| 67 | 71 |
ruleIdsContent = Utilities.convertListToSet(ruleset.getRuleIdsContent()); |
| 68 | 72 |
} |
| 69 | 73 |
} |
| 70 | 74 |
|
| 71 |
Properties pros = null;
|
|
| 72 |
pros = new Properties(); |
|
| 75 |
Properties pros = new Properties();
|
|
| 76 |
|
|
| 73 | 77 |
pros.setProperty(DnetProvider.DATASOURCE, datasource); |
| 74 | 78 |
pros.setProperty(DnetProvider.BATCH_SIZE, "10"); |
| 75 | 79 |
pros.setProperty(DnetProvider.RECORDS, "5"); |
| ... | ... | |
| 125 | 129 |
newJob.setGroupBy_xpath(null); |
| 126 | 130 |
newJob.setMetadata_prefix("");
|
| 127 | 131 |
newJob.setId("-1");
|
| 132 |
|
|
| 128 | 133 |
int jobIdStored = jobSubmittedDao.save(newJob); |
| 129 | 134 |
|
| 130 | 135 |
ValidatorJobListener listener = createListener(); |
| ... | ... | |
| 136 | 141 |
|
| 137 | 142 |
DnetListener dnetListener = createDnetListener(); |
| 138 | 143 |
dnetListener.setJob(bJob); |
| 144 |
dnetListener.setBlackboardHandler(blackboardHandler); |
|
| 139 | 145 |
|
| 140 | 146 |
validator.submitJob(job, listener, dnetListener); |
| 141 | 147 |
return newJob; |
| ... | ... | |
| 146 | 152 |
} |
| 147 | 153 |
|
| 148 | 154 |
} |
| 149 |
|
|
| 150 |
public JobSubmitted beginContentJobForWorkflow(String baseUrl, String validationSet, BlackboardJob bJob) throws ValidatorException {
|
|
| 155 |
|
|
| 156 |
@Override |
|
| 157 |
public JobSubmitted beginContentJobForWorkflow(String baseUrl, String validationSet, BlackboardJob bJob, BlackboardNotificationHandler<BlackboardServerHandler> blackboardHandler) throws ValidatorException {
|
|
| 151 | 158 |
try {
|
| 152 | 159 |
logger.debug("Submitting content job for workflow");
|
| 153 | 160 |
Set<Integer> ruleIdsContent = new HashSet<Integer>(); |
| ... | ... | |
| 240 | 247 |
|
| 241 | 248 |
DnetListener dnetListener = createDnetListener(); |
| 242 | 249 |
dnetListener.setJob(bJob); |
| 250 |
dnetListener.setBlackboardHandler(blackboardHandler); |
|
| 243 | 251 |
|
| 244 | 252 |
validator.submitJob(job, listener, dnetListener); |
| 245 | 253 |
return newJob; |
| ... | ... | |
| 251 | 259 |
|
| 252 | 260 |
} |
| 253 | 261 |
|
| 254 |
public JobSubmitted beginUsageJobForWorkflow(String baseUrl, String validationSet, BlackboardJob bJob) throws ValidatorException {
|
|
| 262 |
@Override |
|
| 263 |
public JobSubmitted beginUsageJobForWorkflow(String baseUrl, String validationSet, BlackboardJob bJob, BlackboardNotificationHandler<BlackboardServerHandler> blackboardHandler) throws ValidatorException {
|
|
| 255 | 264 |
try {
|
| 256 | 265 |
|
| 257 | 266 |
logger.debug("Submitting Usage job(s) for workflow");
|
| ... | ... | |
| 345 | 354 |
|
| 346 | 355 |
DnetListener dnetListener = createDnetListener(); |
| 347 | 356 |
dnetListener.setJob(bJob); |
| 357 |
dnetListener.setBlackboardHandler(blackboardHandler); |
|
| 348 | 358 |
|
| 349 | 359 |
validator.submitJob(job, listener, dnetListener); |
| 350 | 360 |
|
| ... | ... | |
| 358 | 368 |
|
| 359 | 369 |
} |
| 360 | 370 |
|
| 361 |
@Override |
|
| 362 |
public Serializable getRuleClassInstanceByType(String type, |
|
| 371 |
private Serializable getRuleClassInstanceByType(String type, |
|
| 363 | 372 |
Properties pros, int id) throws ValidatorException {
|
| 364 | 373 |
logger.debug("getting rule object of type " + type);
|
| 365 | 374 |
String classname = RuleTypes.getClassOfType(type); |
| ... | ... | |
| 395 | 404 |
|
| 396 | 405 |
} |
| 397 | 406 |
|
| 398 |
@Override |
|
| 399 |
public void linkRules(int ruleRegistry, int ruleStored) {
|
|
| 407 |
private void linkRules(int ruleRegistry, int ruleStored) {
|
|
| 400 | 408 |
this.ruleLinkingMap.put(ruleRegistry, ruleStored); |
| 401 | 409 |
} |
| 402 |
@Override |
|
| 403 |
public int getRuleFromLink(int ruleRegistry) {
|
|
| 410 |
|
|
| 411 |
private int getRuleFromLink(int ruleRegistry) {
|
|
| 404 | 412 |
return this.ruleLinkingMap.get(ruleRegistry); |
| 405 | 413 |
} |
| 414 |
|
|
| 406 | 415 |
public Validator getValidator() {
|
| 407 | 416 |
return validator; |
| 408 | 417 |
} |
| ... | ... | |
| 433 | 442 |
public void setRuleLinkingMap(Map<Integer, Integer> ruleLinkingMap) {
|
| 434 | 443 |
this.ruleLinkingMap = ruleLinkingMap; |
| 435 | 444 |
} |
| 436 |
|
|
| 437 |
|
|
| 438 |
} |
|
| 445 |
} |
|
Also available in: Unified diff
- Added interface and client implementation for mdstore service
- Changes in validator to support reading from mdstores.