honeymoose
/
hapi-fhir
mirror of https://github.com/hapifhir/hapi-fhir.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

sonar

This commit is contained in:
Ken Stevens 2019-02-13 20:50:04 -05:00
parent 7b3fedc642
commit 435f57335d
4 changed files with 12 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
hapi-fhir-jpaserver-model/src/main/java/ca/uhn/fhir/jpa/model/entity/ResourceHistoryTable.java
View File

@ -82,7 +82,7 @@ public class ResourceHistoryTable extends BaseHasResource implements Serializabl
public void addTag(ResourceHistoryTag theTag) { public void addTag(ResourceHistoryTag theTag) {
for (ResourceHistoryTag next : getTags()) { for (ResourceHistoryTag next : getTags()) {
if (next.getTag().equals(theTag)) { if (next.equals(theTag)) {
return; return;
} }
} }

6
hapi-fhir-jpaserver-model/src/main/java/ca/uhn/fhir/jpa/model/entity/ResourceLink.java
View File

@ -165,14 +165,14 @@ public class ResourceLink extends BaseResourceIndex {
Validate.isTrue(theTargetResourceUrl.hasBaseUrl()); Validate.isTrue(theTargetResourceUrl.hasBaseUrl());
Validate.isTrue(theTargetResourceUrl.hasResourceType()); Validate.isTrue(theTargetResourceUrl.hasResourceType());
if (theTargetResourceUrl.hasIdPart()) { // if (theTargetResourceUrl.hasIdPart()) {
// do nothing // do nothing
} else { // } else {
// Must have set an url like http://example.org/something // Must have set an url like http://example.org/something
// We treat 'something' as the resource type because of fix for #659. Prior to #659 fix, 'something' was // We treat 'something' as the resource type because of fix for #659. Prior to #659 fix, 'something' was
// treated as the id and 'example.org' was treated as the resource type // treated as the id and 'example.org' was treated as the resource type
// TODO: log a warning? // TODO: log a warning?
} // }
myTargetResourceType = theTargetResourceUrl.getResourceType(); myTargetResourceType = theTargetResourceUrl.getResourceType();
myTargetResourceUrl = theTargetResourceUrl.getValue(); myTargetResourceUrl = theTargetResourceUrl.getValue();

5
hapi-fhir-jpaserver-subscription/src/main/java/ca/uhn/fhir/jpa/subscription/module/LinkedBlockingQueueSubscribableChannel.java
View File

@ -53,9 +53,10 @@ public class LinkedBlockingQueueSubscribableChannel implements SubscribableChann
StopWatch sw = new StopWatch(); StopWatch sw = new StopWatch();
try { try {
theQueue.put(theRunnable); theQueue.put(theRunnable);
} catch (InterruptedException theE) { } catch (InterruptedException e) {
Thread.currentThread().interrupt();
throw new RejectedExecutionException("Task " + theRunnable.toString() + throw new RejectedExecutionException("Task " + theRunnable.toString() +
" rejected from " + theE.toString()); " rejected from " + e.toString());
} }
ourLog.info("Slot become available after {}ms", sw.getMillis()); ourLog.info("Slot become available after {}ms", sw.getMillis());
}; };

6
hapi-fhir-jpaserver-subscription/src/main/java/ca/uhn/fhir/jpa/subscription/module/subscriber/SubscriptionDeliveringRestHookSubscriber.java
View File

@ -97,7 +97,11 @@ public class SubscriptionDeliveringRestHookSubscriber extends BaseSubscriptionDe
operation.encoded(thePayloadType); operation.encoded(thePayloadType);
} }
ourLog.info("Delivering {} rest-hook payload {} for {}", theMsg.getOperationType(), thePayloadResource.getIdElement().toUnqualified().getValue(), theSubscription.getIdElement(myFhirContext).toUnqualifiedVersionless().getValue()); String payloadId = null;
if (thePayloadResource != null) {
payloadId = thePayloadResource.getIdElement().toUnqualified().getValue();
}
ourLog.info("Delivering {} rest-hook payload {} for {}", theMsg.getOperationType(), payloadId, theSubscription.getIdElement(myFhirContext).toUnqualifiedVersionless().getValue());
try { try {
operation.execute(); operation.execute();