Lots of work on new subscription model

hapi-fhir-igpacks/src/main/java/ca/uhn/fhir/igpacks/parser/IgPackParserDstu3.java

@@ -1,5 +1,25 @@
 package ca.uhn.fhir.igpacks.parser;
 
+/*-
+ * #%L
+ * hapi-fhir-igpacks
+ * %%
+ * Copyright (C) 2014 - 2017 University Health Network
+ * %%
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * 
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * #L%
+ */
+
 
 import ca.uhn.fhir.context.FhirContext;
 import ca.uhn.fhir.context.FhirVersionEnum;

hapi-fhir-igpacks/src/main/java/ca/uhn/fhir/igpacks/parser/IgPackValidationSupportDstu3.java

@@ -1,5 +1,25 @@
 package ca.uhn.fhir.igpacks.parser;
 
+/*-
+ * #%L
+ * hapi-fhir-igpacks
+ * %%
+ * Copyright (C) 2014 - 2017 University Health Network
+ * %%
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * 
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * #L%
+ */
+
 import ca.uhn.fhir.context.FhirContext;
 import org.hl7.fhir.dstu3.hapi.ctx.IValidationSupport;
 import org.hl7.fhir.dstu3.model.CodeSystem;

hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/dao/dstu3/JpaValidationSupportDstu3.java

@@ -28,9 +28,9 @@ import java.util.List;
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
- *
+ * 
  *      http://www.apache.org/licenses/LICENSE-2.0
- *
+ * 
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/dao/r4/JpaValidationSupportR4.java

@@ -28,9 +28,9 @@ import java.util.List;
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
- *
+ * 
  *      http://www.apache.org/licenses/LICENSE-2.0
- *
+ * 
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/subscription/BaseSubscriptionInterceptor.java

@@ -169,9 +169,8 @@ public abstract class BaseSubscriptionInterceptor<S extends IBaseResource> exten
 
 	@PostConstruct
 	public void postConstruct() {
-		{
+		if (getProcessingChannel() == null) {
 			myProcessingExecutorQueue = new LinkedBlockingQueue<>(1000);
-
 			RejectedExecutionHandler rejectedExecutionHandler = new RejectedExecutionHandler() {
 				@Override
 				public void rejectedExecution(Runnable theRunnable, ThreadPoolExecutor theExecutor) {
@@ -199,15 +198,17 @@ public abstract class BaseSubscriptionInterceptor<S extends IBaseResource> exten
 				myProcessingExecutorQueue,
 				threadFactory,
 				rejectedExecutionHandler);
+			setProcessingChannel(new ExecutorSubscribableChannel(myProcessingExecutor));
 		}
-		{
+
+		if (getDeliveryChannel() == null) {
 			myDeliveryExecutorQueue = new LinkedBlockingQueue<>(1000);
 			BasicThreadFactory threadFactory = new BasicThreadFactory.Builder()
 				.namingPattern("subscription-delivery-%d")
 				.daemon(false)
 				.priority(Thread.NORM_PRIORITY)
 				.build();
-			RejectedExecutionHandler rejectedExecutionHandler2 = new RejectedExecutionHandler() {
+			RejectedExecutionHandler rejectedExecutionHandler = new RejectedExecutionHandler() {
 				@Override
 				public void rejectedExecution(Runnable theRunnable, ThreadPoolExecutor theExecutor) {
 					ourLog.info("Note: Executor queue is full ({} elements), waiting for a slot to become available!", myDeliveryExecutorQueue.size());
@@ -228,35 +229,30 @@ public abstract class BaseSubscriptionInterceptor<S extends IBaseResource> exten
 				TimeUnit.MILLISECONDS,
 				myDeliveryExecutorQueue,
 				threadFactory,
-				rejectedExecutionHandler2);
+				rejectedExecutionHandler);
-		}
-
-		if (getProcessingChannel() == null) {
-			setProcessingChannel(new ExecutorSubscribableChannel(myProcessingExecutor));
-		}
-		if (getDeliveryChannel() == null) {
 			setDeliveryChannel(new ExecutorSubscribableChannel(myDeliveryExecutor));
 		}
 
 		if (mySubscriptionActivatingSubscriber == null) {
 			mySubscriptionActivatingSubscriber = new SubscriptionActivatingSubscriber(getSubscriptionDao(), getChannelType(), this);
 		}
-		getProcessingChannel().subscribe(mySubscriptionActivatingSubscriber);
-
-		if (mySubscriptionCheckingSubscriber == null) {
-			mySubscriptionCheckingSubscriber = new SubscriptionCheckingSubscriber(getSubscriptionDao(), getChannelType(), this);
-		}
-		getProcessingChannel().subscribe(mySubscriptionCheckingSubscriber);
 
+		registerSubscriptionCheckingSubscriber();
 		registerDeliverySubscriber();
 
 		initSubscriptions();
 	}
 
+	protected void registerSubscriptionCheckingSubscriber() {
+		if (mySubscriptionCheckingSubscriber == null) {
+			mySubscriptionCheckingSubscriber = new SubscriptionCheckingSubscriber(getSubscriptionDao(), getChannelType(), this);
+		}
+		getProcessingChannel().subscribe(mySubscriptionCheckingSubscriber);
+	}
+
 	@SuppressWarnings("unused")
 	@PreDestroy
 	public void preDestroy() {
-		getProcessingChannel().unsubscribe(mySubscriptionActivatingSubscriber);
 		getProcessingChannel().unsubscribe(mySubscriptionCheckingSubscriber);
 
 		unregisterDeliverySubscriber();
@@ -298,16 +294,10 @@ public abstract class BaseSubscriptionInterceptor<S extends IBaseResource> exten
 		submitResourceModified(msg);
 	}
 
-	private void submitResourceModified(final ResourceModifiedMessage theMsg) {
+	protected void submitResourceModified(final ResourceModifiedMessage theMsg) {
-		/*
+		final GenericMessage<ResourceModifiedMessage> message = new GenericMessage<>(theMsg);
-		 * We only actually submit this item work working after the
+		mySubscriptionActivatingSubscriber.handleMessage(message);
-		 */
+		getProcessingChannel().send(message);
-		TransactionSynchronizationManager.registerSynchronization(new TransactionSynchronizationAdapter() {
-			@Override
-			public void afterCommit() {
-				getProcessingChannel().send(new GenericMessage<>(theMsg));
-			}
-		});
 	}
 
 	protected abstract void unregisterDeliverySubscriber();

hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/subscription/CanonicalSubscription.java

@@ -1,5 +1,25 @@
 package ca.uhn.fhir.jpa.subscription;
 
+/*-
+ * #%L
+ * HAPI FHIR JPA Server
+ * %%
+ * Copyright (C) 2014 - 2017 University Health Network
+ * %%
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * 
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * #L%
+ */
+
 import org.hl7.fhir.instance.model.api.IBaseResource;
 import org.hl7.fhir.instance.model.api.IIdType;
 import org.hl7.fhir.instance.model.api.IPrimitiveType;

hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/subscription/dstu2/RestHookSubscriptionDstu2Interceptor.java

@@ -50,7 +50,7 @@ public class RestHookSubscriptionDstu2Interceptor extends BaseSubscriptionRestHo
 		try {
 			retVal.setStatus(org.hl7.fhir.r4.model.Subscription.SubscriptionStatus.fromCode(subscription.getStatus()));
 			retVal.setBackingSubscription(theSubscription);
-			retVal.setChannelType(org.hl7.fhir.r4.model.Subscription.SubscriptionChannelType.fromCode(subscription.getStatus()));
+			retVal.setChannelType(org.hl7.fhir.r4.model.Subscription.SubscriptionChannelType.fromCode(subscription.getChannel().getType()));
 			retVal.setCriteriaString(subscription.getCriteria());
 			retVal.setEndpointUrl(subscription.getChannel().getEndpoint());
 			retVal.setHeaders(subscription.getChannel().getHeader());

hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/subscription/dstu3/RestHookSubscriptionDstu3Interceptor.java

@@ -62,7 +62,7 @@ public class RestHookSubscriptionDstu3Interceptor extends BaseSubscriptionRestHo
 		try {
 			retVal.setStatus(org.hl7.fhir.r4.model.Subscription.SubscriptionStatus.fromCode(subscription.getStatus().toCode()));
 			retVal.setBackingSubscription(theSubscription);
-			retVal.setChannelType(org.hl7.fhir.r4.model.Subscription.SubscriptionChannelType.fromCode(subscription.getStatus().toCode()));
+			retVal.setChannelType(org.hl7.fhir.r4.model.Subscription.SubscriptionChannelType.fromCode(subscription.getChannel().getType().toCode()));
 			retVal.setCriteriaString(subscription.getCriteria());
 			retVal.setEndpointUrl(subscription.getChannel().getEndpoint());
 			retVal.setHeaders(subscription.getChannel().getHeader());

hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/subscription/r4/RestHookSubscriptionR4Interceptor.java

@@ -86,10 +86,7 @@ public class RestHookSubscriptionR4Interceptor extends BaseSubscriptionRestHookI
 			}
 
 			EventDefinition def = theEventDefinitionDao.read(ref.getReferenceElement());
-			for (TriggerDefinition next : def.getTrigger()) {
+			retVal.addTrigger(def.getTrigger());
-				retVal.addTrigger(next);
-			}
-
 		}
 
 		return retVal;

hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/subscription/r4/WebSocketSubscriptionR4Interceptor.java

@@ -34,9 +34,13 @@ public class WebSocketSubscriptionR4Interceptor extends BaseSubscriptionWebsocke
 	@Qualifier("mySubscriptionDaoR4")
 	private IFhirResourceDao<org.hl7.fhir.r4.model.Subscription> mySubscriptionDao;
 
+	@Autowired
+	@Qualifier("myEventDefinitionDaoR4")
+	private IFhirResourceDao<org.hl7.fhir.r4.model.EventDefinition> myEventDefinitionDao;
+
 	@Override
 	protected CanonicalSubscription canonicalize(IBaseResource theSubscription) {
-		return RestHookSubscriptionR4Interceptor.doCanonicalize(theSubscription);
+		return RestHookSubscriptionR4Interceptor.doCanonicalize(theSubscription, myEventDefinitionDao);
 	}
 
 	@Override

hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/term/HapiTerminologySvcDstu3.java

@@ -47,9 +47,9 @@ import static org.apache.commons.lang3.StringUtils.isNotBlank;
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
- *
+ * 
  * http://www.apache.org/licenses/LICENSE-2.0
- *
+ * 
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/term/HapiTerminologySvcR4.java

@@ -50,9 +50,9 @@ import static org.apache.commons.lang3.StringUtils.isNotBlank;
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
- *
+ * 
  * http://www.apache.org/licenses/LICENSE-2.0
- *
+ * 
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

hapi-fhir-jpaserver-base/src/test/java/ca/uhn/fhir/jpa/dao/r4/FhirResourceDaoR4Test.java

@@ -6,6 +6,7 @@ import static org.junit.Assert.*;
 import static org.mockito.Matchers.eq;
 import static org.mockito.Mockito.*;
 
+import java.io.IOException;
 import java.util.*;
 
 import org.apache.commons.io.IOUtils;
@@ -80,7 +81,24 @@ public class FhirResourceDaoR4Test extends BaseJpaR4Test {
 		}
 	}
 
-	
+
+	@Test
+	public void testSaveAndReturnCollectionBundle() throws IOException {
+		String input = IOUtils.toString(FhirResourceDaoR4Test.class.getResourceAsStream("/r4/collection-bundle.json"));
+		Bundle inputBundle = myFhirCtx.newJsonParser().parseResource(Bundle.class, input);
+
+		myBundleDao.update(inputBundle);
+
+		Bundle outputBundle = myBundleDao.read(new IdType("cftest"));
+		ourLog.info(myFhirCtx.newXmlParser().setPrettyPrint(true).encodeResourceToString(outputBundle));
+
+		for (BundleEntryComponent next : outputBundle.getEntry()) {
+			assertTrue(next.getResource().getIdElement().hasIdPart());
+		}
+	}
+
+
+
 	@Before
 	public void beforeDisableResultReuse() {
 		myDaoConfig.setReuseCachedSearchResultsForMillis(null);

hapi-fhir-jpaserver-base/src/test/java/ca/uhn/fhir/jpa/subscription/r4/FhirSubscriptionWithEventDefinitionR4Test.java

@@ -3,20 +3,17 @@ package ca.uhn.fhir.jpa.subscription.r4;
 import ca.uhn.fhir.jpa.dao.DaoConfig;
 import ca.uhn.fhir.jpa.provider.r4.BaseResourceProviderR4Test;
 import ca.uhn.fhir.jpa.subscription.SocketImplementation;
-import ca.uhn.fhir.rest.api.EncodingEnum;
 import ca.uhn.fhir.rest.api.MethodOutcome;
-import org.eclipse.jetty.websocket.api.Session;
+import com.google.common.collect.Lists;
-import org.eclipse.jetty.websocket.client.ClientUpgradeRequest;
+import org.hl7.fhir.instance.model.api.IIdType;
-import org.eclipse.jetty.websocket.client.WebSocketClient;
 import org.hl7.fhir.r4.model.*;
 import org.junit.After;
 import org.junit.Before;
 import org.junit.Test;
 import org.slf4j.Logger;
 
-import java.net.URI;
+import java.util.ArrayList;
-import java.util.concurrent.Future;
+import java.util.List;
-import java.util.concurrent.TimeUnit;
 
 import static org.hamcrest.Matchers.contains;
 import static org.junit.Assert.*;
@@ -41,32 +38,53 @@ import static org.junit.Assert.*;
 public class FhirSubscriptionWithEventDefinitionR4Test extends BaseResourceProviderR4Test {
 
 	private static final Logger ourLog = org.slf4j.LoggerFactory.getLogger(FhirSubscriptionWithEventDefinitionR4Test.class);
-
+	private static List<Observation> ourUpdatedObservations = Lists.newArrayList();
+	private static List<String> ourContentTypes = new ArrayList<>();
+	private static List<String> ourHeaders = new ArrayList<>();
+	private static List<Observation> ourCreatedObservations = Lists.newArrayList();
 	private String myPatientId;
 	private String mySubscriptionId;
-	private WebSocketClient myWebSocketClient;
+	private List<IIdType> mySubscriptionIds = new ArrayList<>();
-	private SocketImplementation mySocketImplementation;
 
 	@Override
 	@After
 	public void after() throws Exception {
 		super.after();
 		myDaoConfig.setSubscriptionEnabled(new DaoConfig().isSubscriptionEnabled());
-		myDaoConfig.setSubscriptionPollDelay(new DaoConfig().getSubscriptionPollDelay());
 	}
-	
+
+	@After
+	public void afterUnregisterRestHookListener() {
+		for (IIdType next : mySubscriptionIds) {
+			ourClient.delete().resourceById(next).execute();
+		}
+		mySubscriptionIds.clear();
+
+		myDaoConfig.setAllowMultipleDelete(true);
+		ourLog.info("Deleting all subscriptions");
+		ourClient.delete().resourceConditionalByUrl("Subscription?status=active").execute();
+		ourClient.delete().resourceConditionalByUrl("Observation?code:missing=false").execute();
+		ourLog.info("Done deleting all subscriptions");
+		myDaoConfig.setAllowMultipleDelete(new DaoConfig().isAllowMultipleDelete());
+
+		ourRestServer.unregisterInterceptor(getRestHookSubscriptionInterceptor());
+	}
+
 	@Override
 	@Before
 	public void before() throws Exception {
 		super.before();
-		
+
 		myDaoConfig.setSubscriptionEnabled(true);
-		myDaoConfig.setSubscriptionPollDelay(0L);
+
-		
+	}
+
+	@Test
+	public void testSubscriptionAddedTrigger() {
 		/*
 		 * Create patient
 		 */
-		
+
 		Patient patient = FhirR4Util.getPatient();
 		MethodOutcome methodOutcome = ourClient.create().resource(patient).execute();
 		myPatientId = methodOutcome.getId().getIdPart();
@@ -76,9 +94,18 @@ public class FhirSubscriptionWithEventDefinitionR4Test extends BaseResourceProvi
 		 */
 
 		EventDefinition eventDef = new EventDefinition();
+		eventDef
+			.setPurpose("Monitor all admissions to Emergency")
+			.setTrigger(new TriggerDefinition()
+				.setType(TriggerDefinition.TriggerType.DATAADDED)
+				.setEventCondition(new TriggerDefinition.TriggerDefinitionEventConditionComponent()
+					.setDescription("Encounter Location = emergency (active/completed encounters, current or previous)")
+					.setLanguage("text/fhirpath")
+					.setExpression("(this | %previous).location.where(location = 'Location/emergency' and status in {'active', 'completed'}).exists()")
+				)
+			);
 
-		 */
+		/*
-		/* 
 		 * Create subscription
 		 */
 		Subscription subscription = new Subscription();
@@ -92,85 +119,21 @@ public class FhirSubscriptionWithEventDefinitionR4Test extends BaseResourceProvi
 
 		methodOutcome = ourClient.create().resource(subscription).execute();
 		mySubscriptionId = methodOutcome.getId().getIdPart();
-		
-		/*
-		 * Attach websocket
-		 */
 
-		myWebSocketClient = new WebSocketClient();
-		mySocketImplementation = new SocketImplementation(mySubscriptionId, EncodingEnum.JSON);
-
-		myWebSocketClient.start();
-		URI echoUri = new URI("ws://localhost:" + ourPort + "/websocket/r4");
-		ClientUpgradeRequest request = new ClientUpgradeRequest();
-		ourLog.info("Connecting to : {}", echoUri);
-		Future<Session> connection = myWebSocketClient.connect(mySocketImplementation, echoUri, request);
-		Session session = connection.get(2, TimeUnit.SECONDS);
-		
-		ourLog.info("Connected to WS: {}", session.isOpen());
 	}
 
-	@After
+	@Before
-	public void afterCloseWebsocket() throws Exception {
+	public void beforeRegisterRestHookListener() {
-		ourLog.info("Shutting down websocket client");
+		ourRestServer.registerInterceptor(getRestHookSubscriptionInterceptor());
-		myWebSocketClient.stop();
-	}
-	
-	@Test
-	public void createObservation() throws Exception {
-		Observation observation = new Observation();
-		CodeableConcept codeableConcept = new CodeableConcept();
-		observation.setCode(codeableConcept);
-		Coding coding = codeableConcept.addCoding();
-		coding.setCode("82313006");
-		coding.setSystem("SNOMED-CT");
-		Reference reference = new Reference();
-		reference.setReference("Patient/" + myPatientId);
-		observation.setSubject(reference);
-		observation.setStatus(Observation.ObservationStatus.FINAL);
-
-		MethodOutcome methodOutcome2 = ourClient.create().resource(observation).execute();
-		String observationId = methodOutcome2.getId().getIdPart();
-		observation.setId(observationId);
-
-		ourLog.info("Observation id generated by server is: " + observationId);
-		
-		int changes = mySubscriptionDao.pollForNewUndeliveredResources();
-		ourLog.info("Polling showed {}", changes);
-		assertEquals(1, changes);
-
-		Thread.sleep(2000);
-		
-		ourLog.info("WS Messages: {}", mySocketImplementation.getMessages());
-		assertThat(mySocketImplementation.getMessages(), contains("bound " + mySubscriptionId, "ping " + mySubscriptionId));
 	}
 
-	@Test
+	@Before
-	public void createObservationThatDoesNotMatch() throws Exception {
+	public void beforeReset() {
-		Observation observation = new Observation();
+		ourCreatedObservations.clear();
-		CodeableConcept codeableConcept = new CodeableConcept();
+		ourUpdatedObservations.clear();
-		observation.setCode(codeableConcept);
+		ourContentTypes.clear();
-		Coding coding = codeableConcept.addCoding();
+		ourHeaders.clear();
-		coding.setCode("8231");
-		coding.setSystem("SNOMED-CT");
-		Reference reference = new Reference();
-		reference.setReference("Patient/" + myPatientId);
-		observation.setSubject(reference);
-		observation.setStatus(Observation.ObservationStatus.FINAL);
-
-		MethodOutcome methodOutcome2 = ourClient.create().resource(observation).execute();
-		String observationId = methodOutcome2.getId().getIdPart();
-		observation.setId(observationId);
-
-		ourLog.info("Observation id generated by server is: " + observationId);
-		
-		int changes = mySubscriptionDao.pollForNewUndeliveredResources();
-		ourLog.info("Polling showed {}", changes);
-		assertEquals(0, changes);
-
-		Thread.sleep(2000);
-		
-		ourLog.info("WS Messages: {}", mySocketImplementation.getMessages());
-		assertThat(mySocketImplementation.getMessages(), contains("bound " + mySubscriptionId));
 	}
+
+
 }

hapi-fhir-jpaserver-base/src/test/resources/r4/collection-bundle.json

@@ -0,0 +1,42 @@
+{
+	"resourceType": "Bundle",
+	"id": "cftest",
+	"type": "collection",
+	"entry": [
+		{"resource": {
+			"resourceType": "Condition",
+			"text": {
+				"status": "generated",
+				"div": "<div xmlns='http://www.w3.org/1999/xhtml'><a name='mm'/><\/div>"
+			},
+			"id": "cf-1505178568463",
+			"subject": {"reference": "Patient/2344"},
+			"clinicalStatus": "active",
+			"code": {"coding": [{
+				"system": "http://snomed.info/sct",
+				"code": "170631002",
+				"display": "Asthma disturbing sleep (finding)"
+			}]}
+		}},
+		{"resource": {
+			"resourceType": "Patient",
+			"id": "2344",
+			"meta": {
+				"versionId": "1",
+				"lastUpdated": "2017-09-11T19:43:52.666+12:00"
+			},
+			"text": {
+				"status": "generated",
+				"div": "<div xmlns=\"http://www.w3.org/1999/xhtml\">Peter hay<\/div>"
+			},
+			"name": [{
+				"use": "official",
+				"text": "Peter hay",
+				"family": "hay",
+				"given": ["Peter"]
+			}],
+			"gender": "male",
+			"birthDate": "1982-10-31"
+		}}
+	]
+}

hapi-fhir-structures-r4/src/main/java/org/hl7/fhir/r4/model/EventDefinition.java

@@ -29,7 +29,7 @@ package org.hl7.fhir.r4.model;
   
 */
 
-// Generated on Sat, Jul 8, 2017 23:19+1000 for FHIR v3.1.0
+// Generated on Fri, Aug 11, 2017 07:23+1000 for FHIR v3.1.0
 
 import java.util.*;
 
@@ -124,11 +124,11 @@ public class EventDefinition extends MetadataResource {
     /**
      * The trigger element defines when the event occurs.
      */
-    @Child(name = "trigger", type = {TriggerDefinition.class}, order=10, min=0, max=Child.MAX_UNLIMITED, modifier=false, summary=false)
+    @Child(name = "trigger", type = {TriggerDefinition.class}, order=10, min=1, max=1, modifier=false, summary=false)
     @Description(shortDefinition="\"when\" the event occurs", formalDefinition="The trigger element defines when the event occurs." )
-    protected List<TriggerDefinition> trigger;
+    protected TriggerDefinition trigger;
 
-    private static final long serialVersionUID = -809799868L;
+    private static final long serialVersionUID = 1396769290L;
 
   /**
    * Constructor
@@ -140,9 +140,10 @@ public class EventDefinition extends MetadataResource {
   /**
    * Constructor
    */
-    public EventDefinition(Enumeration<PublicationStatus> status) {
+    public EventDefinition(Enumeration<PublicationStatus> status, TriggerDefinition trigger) {
       super();
       this.status = status;
+      this.trigger = trigger;
     }
 
     /**
@@ -1221,54 +1222,25 @@ public class EventDefinition extends MetadataResource {
     /**
      * @return {@link #trigger} (The trigger element defines when the event occurs.)
      */
-    public List<TriggerDefinition> getTrigger() { 
+    public TriggerDefinition getTrigger() { 
       if (this.trigger == null)
-        this.trigger = new ArrayList<TriggerDefinition>();
+        if (Configuration.errorOnAutoCreate())
+          throw new Error("Attempt to auto-create EventDefinition.trigger");
+        else if (Configuration.doAutoCreate())
+          this.trigger = new TriggerDefinition(); // cc
       return this.trigger;
     }
 
-    /**
-     * @return Returns a reference to <code>this</code> for easy method chaining
-     */
-    public EventDefinition setTrigger(List<TriggerDefinition> theTrigger) { 
-      this.trigger = theTrigger;
-      return this;
-    }
-
     public boolean hasTrigger() { 
-      if (this.trigger == null)
+      return this.trigger != null && !this.trigger.isEmpty();
-        return false;
-      for (TriggerDefinition item : this.trigger)
-        if (!item.isEmpty())
-          return true;
-      return false;
-    }
-
-    public TriggerDefinition addTrigger() { //3
-      TriggerDefinition t = new TriggerDefinition();
-      if (this.trigger == null)
-        this.trigger = new ArrayList<TriggerDefinition>();
-      this.trigger.add(t);
-      return t;
-    }
-
-    public EventDefinition addTrigger(TriggerDefinition t) { //3
-      if (t == null)
-        return this;
-      if (this.trigger == null)
-        this.trigger = new ArrayList<TriggerDefinition>();
-      this.trigger.add(t);
-      return this;
     }
 
     /**
-     * @return The first repetition of repeating field {@link #trigger}, creating it if it does not already exist
+     * @param value {@link #trigger} (The trigger element defines when the event occurs.)
      */
-    public TriggerDefinition getTriggerFirstRep() { 
+    public EventDefinition setTrigger(TriggerDefinition value) { 
-      if (getTrigger().isEmpty()) {
+      this.trigger = value;
-        addTrigger();
+      return this;
-      }
-      return getTrigger().get(0);
     }
 
       protected void listChildren(List<Property> children) {
@@ -1295,7 +1267,7 @@ public class EventDefinition extends MetadataResource {
         children.add(new Property("contact", "ContactDetail", "Contact details to assist a user in finding and communicating with the publisher.", 0, java.lang.Integer.MAX_VALUE, contact));
         children.add(new Property("copyright", "markdown", "A copyright statement relating to the event definition and/or its contents. Copyright statements are generally legal restrictions on the use and publishing of the event definition.", 0, 1, copyright));
         children.add(new Property("relatedArtifact", "RelatedArtifact", "Related resources such as additional documentation, justification, or bibliographic references.", 0, java.lang.Integer.MAX_VALUE, relatedArtifact));
-        children.add(new Property("trigger", "TriggerDefinition", "The trigger element defines when the event occurs.", 0, java.lang.Integer.MAX_VALUE, trigger));
+        children.add(new Property("trigger", "TriggerDefinition", "The trigger element defines when the event occurs.", 0, 1, trigger));
       }
 
       @Override
@@ -1323,7 +1295,7 @@ public class EventDefinition extends MetadataResource {
         case 951526432: /*contact*/  return new Property("contact", "ContactDetail", "Contact details to assist a user in finding and communicating with the publisher.", 0, java.lang.Integer.MAX_VALUE, contact);
         case 1522889671: /*copyright*/  return new Property("copyright", "markdown", "A copyright statement relating to the event definition and/or its contents. Copyright statements are generally legal restrictions on the use and publishing of the event definition.", 0, 1, copyright);
         case 666807069: /*relatedArtifact*/  return new Property("relatedArtifact", "RelatedArtifact", "Related resources such as additional documentation, justification, or bibliographic references.", 0, java.lang.Integer.MAX_VALUE, relatedArtifact);
-        case -1059891784: /*trigger*/  return new Property("trigger", "TriggerDefinition", "The trigger element defines when the event occurs.", 0, java.lang.Integer.MAX_VALUE, trigger);
+        case -1059891784: /*trigger*/  return new Property("trigger", "TriggerDefinition", "The trigger element defines when the event occurs.", 0, 1, trigger);
         default: return super.getNamedProperty(_hash, _name, _checkValid);
         }
 
@@ -1354,7 +1326,7 @@ public class EventDefinition extends MetadataResource {
         case 951526432: /*contact*/ return this.contact == null ? new Base[0] : this.contact.toArray(new Base[this.contact.size()]); // ContactDetail
         case 1522889671: /*copyright*/ return this.copyright == null ? new Base[0] : new Base[] {this.copyright}; // MarkdownType
         case 666807069: /*relatedArtifact*/ return this.relatedArtifact == null ? new Base[0] : this.relatedArtifact.toArray(new Base[this.relatedArtifact.size()]); // RelatedArtifact
-        case -1059891784: /*trigger*/ return this.trigger == null ? new Base[0] : this.trigger.toArray(new Base[this.trigger.size()]); // TriggerDefinition
+        case -1059891784: /*trigger*/ return this.trigger == null ? new Base[0] : new Base[] {this.trigger}; // TriggerDefinition
         default: return super.getProperty(hash, name, checkValid);
         }
 
@@ -1431,7 +1403,7 @@ public class EventDefinition extends MetadataResource {
           this.getRelatedArtifact().add(castToRelatedArtifact(value)); // RelatedArtifact
           return value;
         case -1059891784: // trigger
-          this.getTrigger().add(castToTriggerDefinition(value)); // TriggerDefinition
+          this.trigger = castToTriggerDefinition(value); // TriggerDefinition
           return value;
         default: return super.setProperty(hash, name, value);
         }
@@ -1486,7 +1458,7 @@ public class EventDefinition extends MetadataResource {
         } else if (name.equals("relatedArtifact")) {
           this.getRelatedArtifact().add(castToRelatedArtifact(value));
         } else if (name.equals("trigger")) {
-          this.getTrigger().add(castToTriggerDefinition(value));
+          this.trigger = castToTriggerDefinition(value); // TriggerDefinition
         } else
           return super.setProperty(name, value);
         return value;
@@ -1517,7 +1489,7 @@ public class EventDefinition extends MetadataResource {
         case 951526432:  return addContact(); 
         case 1522889671:  return getCopyrightElement();
         case 666807069:  return addRelatedArtifact(); 
-        case -1059891784:  return addTrigger(); 
+        case -1059891784:  return getTrigger(); 
         default: return super.makeProperty(hash, name);
         }
 
@@ -1624,7 +1596,8 @@ public class EventDefinition extends MetadataResource {
           return addRelatedArtifact();
         }
         else if (name.equals("trigger")) {
-          return addTrigger();
+          this.trigger = new TriggerDefinition();
+          return this.trigger;
         }
         else
           return super.addChild(name);
@@ -1688,11 +1661,7 @@ public class EventDefinition extends MetadataResource {
           for (RelatedArtifact i : relatedArtifact)
             dst.relatedArtifact.add(i.copy());
         };
-        if (trigger != null) {
+        dst.trigger = trigger == null ? null : trigger.copy();
-          dst.trigger = new ArrayList<TriggerDefinition>();
-          for (TriggerDefinition i : trigger)
-            dst.trigger.add(i.copy());
-        };
         return dst;
       }