Revision 42790
Added by Argiro Kokogiannaki about 8 years ago
| HelloWorldService.java | ||
|---|---|---|
| 360 | 360 |
logger.info("sourceType " + sourceType);
|
| 361 | 361 |
String sourceCollectedFrom = jsonObject.get("sourceCollectedFrom").getAsString();
|
| 362 | 362 |
logger.info("sourceCollectedFrom " + sourceCollectedFrom);
|
| 363 |
String sourceAccessRights = jsonObject.get("sourceAccessRights").getAsString();
|
|
| 364 |
logger.info("sourceAccessRights " + sourceAccessRights);
|
|
| 365 |
String sourceEmbargoEndDate = jsonObject.get("sourceEmbargoEndDate").getAsString();
|
|
| 366 |
sourceEmbargoEndDate= (sourceEmbargoEndDate != null && sourceEmbargoEndDate.equals(""))?null: sourceEmbargoEndDate;
|
|
| 367 |
logger.info("sourceEmbargoEndDate " + sourceEmbargoEndDate);
|
|
| 363 | 368 |
|
| 364 | 369 |
String targetId = jsonObject.get("targetId").getAsString();
|
| 365 | 370 |
logger.info("targetId " + targetId);
|
| ... | ... | |
| 367 | 372 |
logger.info("targetType " + targetType);
|
| 368 | 373 |
String targetCollectedFrom = jsonObject.get("targetCollectedFrom").getAsString();
|
| 369 | 374 |
logger.info("targetCollectedFrom " + targetCollectedFrom);
|
| 375 |
String targetAccessRights = jsonObject.get("targetAccessRights").getAsString();
|
|
| 376 |
logger.info("targetAccessRights " + targetAccessRights);
|
|
| 377 |
String targetEmbargoEndDate = jsonObject.get("targetEmbargoEndDate").getAsString();
|
|
| 378 |
targetEmbargoEndDate= (targetEmbargoEndDate != null && targetEmbargoEndDate.equals(""))?null: targetEmbargoEndDate;
|
|
| 379 |
logger.info("targetEmbargoEndDate " + targetEmbargoEndDate);
|
|
| 370 | 380 |
|
| 371 | 381 |
EmailValidator emailValidator = EmailValidator.getInstance(); |
| 372 | 382 |
if (!emailValidator.isValid(claimedBy)) {
|
| ... | ... | |
| 376 | 386 |
|
| 377 | 387 |
|
| 378 | 388 |
try {
|
| 379 |
String claimId = claimHandler.buildAndInsertClaim(claimedBy, sourceType, sourceId, sourceCollectedFrom, targetType, targetId, targetCollectedFrom);
|
|
| 389 |
String claimId = claimHandler.buildAndInsertClaim(claimedBy, sourceType, sourceId, sourceCollectedFrom, sourceAccessRights, sourceEmbargoEndDate, targetType, targetId, targetCollectedFrom, targetAccessRights, targetEmbargoEndDate);
|
|
| 380 | 390 |
return Response.status(200).entity(compose201PostMessage(request, claimId)).type(MediaType.APPLICATION_JSON).build(); |
| 381 | 391 |
|
| 382 | 392 |
} catch (ClaimValidationException ve) {
|
Also available in: Unified diff
in insert claim method new parameters added for access rights and embargo date