From 0ee307c0c6b34350fd49801890678c8eb99a476a Mon Sep 17 00:00:00 2001 From: Sarbajit Dutta Date: Fri, 17 May 2019 12:19:52 -0400 Subject: [PATCH 1/2] added null check for identity for api --- .../java/reciter/controller/ReCiterController.java | 13 +++++-------- 1 file changed, 5 insertions(+), 8 deletions(-) diff --git a/src/main/java/reciter/controller/ReCiterController.java b/src/main/java/reciter/controller/ReCiterController.java index 985356a4..8e593a06 100644 --- a/src/main/java/reciter/controller/ReCiterController.java +++ b/src/main/java/reciter/controller/ReCiterController.java @@ -269,11 +269,8 @@ public ResponseEntity retrieveArticlesByUid(String uid, RetrievalRefreshFlag ref LocalDate initial = LocalDate.now(); LocalDate startDate = initial.withDayOfMonth(1); LocalDate endDate = LocalDate.parse("3000-01-01"); - Identity identity; - - try { - identity = identityService.findByUid(uid); - } catch (NullPointerException ne) { + Identity identity = identityService.findByUid(uid); + if(identity == null) { estimatedTime = System.currentTimeMillis() - startTime; slf4jLogger.info("elapsed time: " + estimatedTime); return ResponseEntity.status(HttpStatus.NOT_FOUND).body("The uid provided '" + uid + "' was not found in the Identity table"); @@ -368,9 +365,9 @@ public ResponseEntity runFeatureGenerator(@RequestParam(value = "uid") String ui EngineOutput engineOutput; EngineParameters parameters; List originalFeatures = new ArrayList(); - try { - identityService.findByUid(uid); - } catch (NullPointerException n) { + + Identity identity = identityService.findByUid(uid); + if(identity == null) { return ResponseEntity.status(HttpStatus.NOT_FOUND).body("The uid provided '" + uid + "' was not found in the Identity table"); } AnalysisOutput analysis = analysisService.findByUid(uid.trim()); From 998a22063b07ae66598d737507c85bf58c729ea7 Mon Sep 17 00:00:00 2001 From: Sarbajit Dutta Date: Fri, 17 May 2019 12:20:07 -0400 Subject: [PATCH 2/2] check optional null for affiliation --- .../affiliation/strategy/CommonAffiliationStrategy.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/main/java/reciter/algorithm/evidence/targetauthor/affiliation/strategy/CommonAffiliationStrategy.java b/src/main/java/reciter/algorithm/evidence/targetauthor/affiliation/strategy/CommonAffiliationStrategy.java index 21e39bd4..53798262 100644 --- a/src/main/java/reciter/algorithm/evidence/targetauthor/affiliation/strategy/CommonAffiliationStrategy.java +++ b/src/main/java/reciter/algorithm/evidence/targetauthor/affiliation/strategy/CommonAffiliationStrategy.java @@ -111,7 +111,7 @@ public double executeStrategy(List reCiterArticles, Identity ide for(Integer afid: matchingAfids) { TargetAuthorScopusAffiliation scopusAffiliationEvidence = new TargetAuthorScopusAffiliation(); if(reCiterArticle.getScopusArticle().getAffiliations() != null) { - Affiliation affiliationScopus = reCiterArticle.getScopusArticle().getAffiliations().stream().filter(affiliation -> affiliation.getAfid() == afid).findFirst().get(); + Affiliation affiliationScopus = reCiterArticle.getScopusArticle().getAffiliations().stream().filter(affiliation -> affiliation.getAfid() == afid).findFirst().orElse(null); if(affiliationScopus != null && affiliationScopus.getAffilname() != null) { @@ -135,7 +135,7 @@ public double executeStrategy(List reCiterArticles, Identity ide for(Integer afid: matchingAfids) { TargetAuthorScopusAffiliation scopusAffiliationEvidence = new TargetAuthorScopusAffiliation(); if(reCiterArticle.getScopusArticle().getAffiliations() != null) { - Affiliation affiliationScopus = reCiterArticle.getScopusArticle().getAffiliations().stream().filter(affiliation -> affiliation.getAfid() == afid).findFirst().get(); + Affiliation affiliationScopus = reCiterArticle.getScopusArticle().getAffiliations().stream().filter(affiliation -> affiliation.getAfid() == afid).findFirst().orElse(null); if(affiliationScopus != null && affiliationScopus.getAffilname() != null) {