diff --git a/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/config/BaseConfig.java b/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/config/BaseConfig.java index 706f4d1bdd9..9e4c2fef399 100644 --- a/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/config/BaseConfig.java +++ b/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/config/BaseConfig.java @@ -23,7 +23,7 @@ package ca.uhn.fhir.jpa.config; import ca.uhn.fhir.context.FhirContext; import ca.uhn.fhir.i18n.HapiLocalizer; import ca.uhn.fhir.jpa.dao.DaoRegistry; -import ca.uhn.fhir.jpa.provider.SubscriptionRetriggeringProvider; +import ca.uhn.fhir.jpa.provider.SubscriptionTriggeringProvider; import ca.uhn.fhir.jpa.search.*; import ca.uhn.fhir.jpa.sp.ISearchParamPresenceSvc; import ca.uhn.fhir.jpa.sp.SearchParamPresenceSvcImpl; @@ -117,8 +117,8 @@ public abstract class BaseConfig implements SchedulingConfigurer { @Bean @Lazy - public SubscriptionRetriggeringProvider mySubscriptionRetriggeringProvider() { - return new SubscriptionRetriggeringProvider(); + public SubscriptionTriggeringProvider mySubscriptionTriggeringProvider() { + return new SubscriptionTriggeringProvider(); } @Bean(autowire = Autowire.BY_TYPE) diff --git a/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/provider/SubscriptionRetriggeringProvider.java b/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/provider/SubscriptionTriggeringProvider.java similarity index 90% rename from hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/provider/SubscriptionRetriggeringProvider.java rename to hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/provider/SubscriptionTriggeringProvider.java index 736df36f37e..8c29aa2d903 100644 --- a/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/provider/SubscriptionRetriggeringProvider.java +++ b/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/provider/SubscriptionTriggeringProvider.java @@ -42,7 +42,7 @@ import org.springframework.beans.factory.annotation.Autowired; import java.util.List; -public class SubscriptionRetriggeringProvider implements IResourceProvider { +public class SubscriptionTriggeringProvider implements IResourceProvider { public static final String RESOURCE_ID = "resourceId"; @Autowired @@ -52,8 +52,8 @@ public class SubscriptionRetriggeringProvider implements IResourceProvider { @Autowired(required = false) private List> mySubscriptionInterceptorList; - @Operation(name= JpaConstants.OPERATION_RETRIGGER_SUBSCRIPTION) - public IBaseParameters reTriggerSubscription( + @Operation(name= JpaConstants.OPERATION_TRIGGER_SUBSCRIPTION) + public IBaseParameters triggerSubscription( @IdParam IIdType theSubscriptionId, @OperationParam(name= RESOURCE_ID) UriParam theResourceId) { @@ -64,13 +64,13 @@ public class SubscriptionRetriggeringProvider implements IResourceProvider { Class resourceType = myFhirContext.getResourceDefinition(resourceId.getResourceType()).getImplementingClass(); IFhirResourceDao dao = mySystemDao.getDao(resourceType); - IBaseResource resourceToRetrigger = dao.read(resourceId); + IBaseResource resourceToTrigger = dao.read(resourceId); ResourceModifiedMessage msg = new ResourceModifiedMessage(); - msg.setId(resourceToRetrigger.getIdElement()); + msg.setId(resourceToTrigger.getIdElement()); msg.setOperationType(ResourceModifiedMessage.OperationTypeEnum.UPDATE); msg.setSubscriptionId(theSubscriptionId.toUnqualifiedVersionless().getValue()); - msg.setNewPayload(myFhirContext, resourceToRetrigger); + msg.setNewPayload(myFhirContext, resourceToTrigger); for (BaseSubscriptionInterceptor next :mySubscriptionInterceptorList) { next.submitResourceModified(msg); diff --git a/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/subscription/ResourceModifiedMessage.java b/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/subscription/ResourceModifiedMessage.java index 7367df5df4d..caaccfbcaee 100644 --- a/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/subscription/ResourceModifiedMessage.java +++ b/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/subscription/ResourceModifiedMessage.java @@ -39,7 +39,7 @@ public class ResourceModifiedMessage { @JsonProperty("operationType") private OperationTypeEnum myOperationType; /** - * This will only be set if the resource is being retriggered for a specific + * This will only be set if the resource is being triggered for a specific * subscription */ @JsonProperty(value = "subscriptionId", required = false) @@ -97,7 +97,7 @@ public class ResourceModifiedMessage { CREATE, UPDATE, DELETE, - MANUALLY_RETRIGGERED; + MANUALLY_TRIGGERED; } diff --git a/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/subscription/SubscriptionCheckingSubscriber.java b/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/subscription/SubscriptionCheckingSubscriber.java index b4a43062f64..91d8dd5fc69 100644 --- a/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/subscription/SubscriptionCheckingSubscriber.java +++ b/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/subscription/SubscriptionCheckingSubscriber.java @@ -61,7 +61,7 @@ public class SubscriptionCheckingSubscriber extends BaseSubscriptionSubscriber { switch (msg.getOperationType()) { case CREATE: case UPDATE: - case MANUALLY_RETRIGGERED: + case MANUALLY_TRIGGERED: break; case DELETE: default: diff --git a/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/util/JpaConstants.java b/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/util/JpaConstants.java index 573af494f63..40e33fd26d5 100644 --- a/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/util/JpaConstants.java +++ b/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/util/JpaConstants.java @@ -176,7 +176,7 @@ public class JpaConstants { public static final String OPERATION_DOCUMENT = "$document"; /** - * Retrigger a subscription manually for a given resource + * Trigger a subscription manually for a given resource */ - public static final String OPERATION_RETRIGGER_SUBSCRIPTION = "$retrigger-subscription"; + public static final String OPERATION_TRIGGER_SUBSCRIPTION = "$trigger-subscription"; } diff --git a/hapi-fhir-jpaserver-base/src/test/java/ca/uhn/fhir/jpa/provider/dstu3/BaseResourceProviderDstu3Test.java b/hapi-fhir-jpaserver-base/src/test/java/ca/uhn/fhir/jpa/provider/dstu3/BaseResourceProviderDstu3Test.java index c0eb8435436..fdec1636947 100644 --- a/hapi-fhir-jpaserver-base/src/test/java/ca/uhn/fhir/jpa/provider/dstu3/BaseResourceProviderDstu3Test.java +++ b/hapi-fhir-jpaserver-base/src/test/java/ca/uhn/fhir/jpa/provider/dstu3/BaseResourceProviderDstu3Test.java @@ -4,7 +4,7 @@ import ca.uhn.fhir.jpa.config.WebsocketDispatcherConfig; import ca.uhn.fhir.jpa.dao.data.ISearchDao; import ca.uhn.fhir.jpa.dao.dstu3.BaseJpaDstu3Test; import ca.uhn.fhir.jpa.dao.dstu3.SearchParamRegistryDstu3; -import ca.uhn.fhir.jpa.provider.SubscriptionRetriggeringProvider; +import ca.uhn.fhir.jpa.provider.SubscriptionTriggeringProvider; import ca.uhn.fhir.jpa.search.DatabaseBackedPagingProvider; import ca.uhn.fhir.jpa.search.ISearchCoordinatorSvc; import ca.uhn.fhir.jpa.subscription.email.SubscriptionEmailInterceptor; @@ -100,8 +100,8 @@ public abstract class BaseResourceProviderDstu3Test extends BaseJpaDstu3Test { myTerminologyUploaderProvider = myAppCtx.getBean(TerminologyUploaderProviderDstu3.class); ourRestServer.setPlainProviders(mySystemProvider, myTerminologyUploaderProvider); - SubscriptionRetriggeringProvider subscriptionRetriggeringProvider = myAppCtx.getBean(SubscriptionRetriggeringProvider.class); - ourRestServer.registerProvider(subscriptionRetriggeringProvider); + SubscriptionTriggeringProvider subscriptionTriggeringProvider = myAppCtx.getBean(SubscriptionTriggeringProvider.class); + ourRestServer.registerProvider(subscriptionTriggeringProvider); JpaConformanceProviderDstu3 confProvider = new JpaConformanceProviderDstu3(ourRestServer, mySystemDao, myDaoConfig); confProvider.setImplementationDescription("THIS IS THE DESC"); diff --git a/hapi-fhir-jpaserver-base/src/test/java/ca/uhn/fhir/jpa/subscription/RetriggeringDstu3Test.java b/hapi-fhir-jpaserver-base/src/test/java/ca/uhn/fhir/jpa/subscription/SubscriptionTriggeringDstu3Test.java similarity index 92% rename from hapi-fhir-jpaserver-base/src/test/java/ca/uhn/fhir/jpa/subscription/RetriggeringDstu3Test.java rename to hapi-fhir-jpaserver-base/src/test/java/ca/uhn/fhir/jpa/subscription/SubscriptionTriggeringDstu3Test.java index 7bd2bd74391..561cd231988 100644 --- a/hapi-fhir-jpaserver-base/src/test/java/ca/uhn/fhir/jpa/subscription/RetriggeringDstu3Test.java +++ b/hapi-fhir-jpaserver-base/src/test/java/ca/uhn/fhir/jpa/subscription/SubscriptionTriggeringDstu3Test.java @@ -2,7 +2,7 @@ package ca.uhn.fhir.jpa.subscription; import ca.uhn.fhir.context.FhirContext; import ca.uhn.fhir.jpa.dao.DaoConfig; -import ca.uhn.fhir.jpa.provider.SubscriptionRetriggeringProvider; +import ca.uhn.fhir.jpa.provider.SubscriptionTriggeringProvider; import ca.uhn.fhir.jpa.provider.dstu3.BaseResourceProviderDstu3Test; import ca.uhn.fhir.jpa.util.JpaConstants; import ca.uhn.fhir.rest.annotation.Create; @@ -33,9 +33,9 @@ import static org.junit.Assert.assertEquals; * Test the rest-hook subscriptions */ @SuppressWarnings("Duplicates") -public class RetriggeringDstu3Test extends BaseResourceProviderDstu3Test { +public class SubscriptionTriggeringDstu3Test extends BaseResourceProviderDstu3Test { - private static final org.slf4j.Logger ourLog = org.slf4j.LoggerFactory.getLogger(RetriggeringDstu3Test.class); + private static final org.slf4j.Logger ourLog = org.slf4j.LoggerFactory.getLogger(SubscriptionTriggeringDstu3Test.class); private static List ourCreatedObservations = Lists.newArrayList(); private static int ourListenerPort; private static RestfulServer ourListenerRestServer; @@ -117,7 +117,7 @@ public class RetriggeringDstu3Test extends BaseResourceProviderDstu3Test { } @Test - public void testRetriggerResourceToSpecificSubscription() throws Exception { + public void testTriggerResourceToSpecificSubscription() throws Exception { String payload = "application/fhir+json"; String code = "1000000050"; @@ -140,8 +140,8 @@ public class RetriggeringDstu3Test extends BaseResourceProviderDstu3Test { Parameters response = ourClient .operation() .onInstance(subscriptionId) - .named(JpaConstants.OPERATION_RETRIGGER_SUBSCRIPTION) - .withParameter(Parameters.class, SubscriptionRetriggeringProvider.RESOURCE_ID, new UriType(obsId.toUnqualifiedVersionless().getValue())) + .named(JpaConstants.OPERATION_TRIGGER_SUBSCRIPTION) + .withParameter(Parameters.class, SubscriptionTriggeringProvider.RESOURCE_ID, new UriType(obsId.toUnqualifiedVersionless().getValue())) .execute(); String responseValue = response.getParameter().get(0).getValue().primitiveValue(); @@ -154,7 +154,7 @@ public class RetriggeringDstu3Test extends BaseResourceProviderDstu3Test { } @Test - public void testRetriggerResourceToSpecificSubscriptionWhichDoesntMatch() throws Exception { + public void testTriggerResourceToSpecificSubscriptionWhichDoesntMatch() throws Exception { String payload = "application/fhir+json"; String code = "1000000050"; @@ -177,8 +177,8 @@ public class RetriggeringDstu3Test extends BaseResourceProviderDstu3Test { Parameters response = ourClient .operation() .onInstance(subscriptionId) - .named(JpaConstants.OPERATION_RETRIGGER_SUBSCRIPTION) - .withParameter(Parameters.class, SubscriptionRetriggeringProvider.RESOURCE_ID, new UriType(obsId.toUnqualifiedVersionless().getValue())) + .named(JpaConstants.OPERATION_TRIGGER_SUBSCRIPTION) + .withParameter(Parameters.class, SubscriptionTriggeringProvider.RESOURCE_ID, new UriType(obsId.toUnqualifiedVersionless().getValue())) .execute(); String responseValue = response.getParameter().get(0).getValue().primitiveValue(); diff --git a/src/changes/changes.xml b/src/changes/changes.xml index e2fd6ff55cd..5ac3efeb8c2 100644 --- a/src/changes/changes.xml +++ b/src/changes/changes.xml @@ -34,7 +34,7 @@ A new operation has been added to the JPA server called - $retrigger-subscription]]>. This can + $trigger-subscription]]>. This can be used to cause a transaction to redeliver a resource that previously triggered.