1599 lines
52 KiB
Java
Raw Normal View History

2014-02-18 08:26:49 -05:00
package ca.uhn.fhir.parser;
/*
* #%L
* HAPI FHIR - Core Library
* %%
2019-01-04 16:22:15 -05:00
* Copyright (C) 2014 - 2019 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.*;
2015-02-16 11:33:46 -05:00
import ca.uhn.fhir.context.BaseRuntimeChildDefinition.IMutator;
import ca.uhn.fhir.model.api.*;
2016-12-19 14:03:11 -05:00
import ca.uhn.fhir.model.api.annotation.Child;
import ca.uhn.fhir.model.base.composite.BaseResourceReferenceDt;
2014-12-01 08:13:32 -05:00
import ca.uhn.fhir.model.base.resource.ResourceMetadataMap;
import ca.uhn.fhir.model.primitive.IdDt;
import ca.uhn.fhir.model.primitive.InstantDt;
import ca.uhn.fhir.model.primitive.XhtmlDt;
import ca.uhn.fhir.parser.json.JsonLikeValue.ScalarType;
import ca.uhn.fhir.parser.json.JsonLikeValue.ValueType;
Merge in HAPI 3.0.0 working branch! Squashed commit of the following: commit 12f89a423a1691fdbc360706fd94a03bd9144d17 Author: James <jamesagnew@gmail.com> Date: Sun Aug 13 14:38:51 2017 -0400 Minimize validation resources commit f6868cce5c73b34d5ecd53bf1a220fdccd6b4e09 Merge: 3b80779fd3 1e158311d8 Author: James <jamesagnew@gmail.com> Date: Sun Aug 13 14:05:34 2017 -0400 Forward port fix for #710 Merge branch 'master' into hapi3_refactor commit 3b80779fd3905cbf5322e6973334eb0ecb3d8426 Merge: 1f534985e8 356d9acaf7 Author: James <jamesagnew@gmail.com> Date: Sun Aug 13 12:31:09 2017 -0400 Forward port #705, #708, and #710 Merge branch 'master' into hapi3_refactor commit 1f534985e8106347d9cc9da2dd8145fdd869547f Merge: 7c39a47852 dedd3d635b Author: James <jamesagnew@gmail.com> Date: Sun Aug 13 10:52:59 2017 -0400 Forward port #695 Merge branch 'master' into hapi3_refactor commit 7c39a47852142bee398101120678217ab0917c7e Merge: e0ffb84d21 6efafe62f1 Author: James <jamesagnew@gmail.com> Date: Sun Aug 13 09:53:17 2017 -0400 Forward port #688 Merge branch 'master' into hapi3_refactor commit e0ffb84d2129c209ccffc2611038592f37dddfd2 Merge: 52388c11c1 d19b00ff09 Author: James <jamesagnew@gmail.com> Date: Sat Aug 12 14:59:46 2017 -0400 Merge branch 'master' into hapi3_refactor commit 52388c11c17cf038591244548f2a592f6b655cee Author: James <jamesagnew@gmail.com> Date: Sat Aug 12 06:21:46 2017 -0400 Cleanup commit 209752cd638266b39574ae11c5989b624d5e85d3 Author: James <jamesagnew@gmail.com> Date: Thu Aug 10 11:18:19 2017 -0400 Fix tests commit 4543408dc8d63b5b9682a275e261d3168cdc2196 Author: James <jamesagnew@gmail.com> Date: Sat Aug 5 06:55:50 2017 -0400 Fix a potential deadlock commit ee360f537692672df473f94dae75c176b2287415 Author: James <jamesagnew@gmail.com> Date: Sat Aug 5 06:22:06 2017 -0400 Add R4 code to CLI commit 1a95ba3b6529afdaf81232b82cc303718c0187d6 Author: James Agnew <jamesagnew@gmail.com> Date: Thu Aug 3 06:14:01 2017 -0400 More cleanup commit f0d88026817296edaa65132accd67d0c8ad8088c Author: James <jamesagnew@gmail.com> Date: Wed Aug 2 11:27:43 2017 -0400 Tests are working! commit a4cbda357e8e7d024f24e3ee9a660b5366983ca1 Author: James Agnew <jamesagnew@gmail.com> Date: Wed Aug 2 10:42:04 2017 -0400 Connection handling cleanup for new tests commit 0e2cecfbd0d7a546444a66e8411600040fd9a17b Author: James Agnew <jamesagnew@gmail.com> Date: Wed Aug 2 10:16:28 2017 -0400 Clean up R4 JPA tests commit 40317a650d72c86e2529d5179cffe63399301de5 Author: James <jamesagnew@gmail.com> Date: Wed Aug 2 09:12:38 2017 -0400 Work on R4 for JPA server commit e7f8f8c30d72ed30d739979964db38d41c5baec1 Author: James <jamesagnew@gmail.com> Date: Tue Aug 1 20:43:47 2017 -0400 More work on porting tests commit 43c9003258696ab33e7bb335e882ab1c66fb61aa Author: James <jamesagnew@gmail.com> Date: Tue Aug 1 07:09:29 2017 -0400 Work on porting DSTU1 tests commit 602857f1e26a69a2284e176b5e44a860d9b828ff Author: James Agnew <jamesagnew@gmail.com> Date: Mon Jul 31 22:34:08 2017 -0400 More work on bring unit tests up to date commit e326a7b0cdb8368009119bba41886838a973e03e Author: James Agnew <jamesagnew@gmail.com> Date: Mon Jul 31 17:36:38 2017 -0400 Credit for #686 and forward port the fix to R4 validator commit 96543c3992adcb406df3c8899dab79cf4bd5b4b4 Merge: 3fb75aa61a 9901b802c4 Author: James Agnew <jamesagnew@gmail.com> Date: Mon Jul 31 17:12:33 2017 -0400 Merge branch 'master' into hapi3_refactor commit 3fb75aa61ad29d9f3876a1c30c912627486147af Author: James <jamesagnew@gmail.com> Date: Mon Jul 31 15:21:30 2017 -0400 More work on cleanup commit b02fbb6804127e77c61c4792eefd9fc0d23d63d0 Author: James Agnew <jamesagnew@gmail.com> Date: Sun Jul 30 22:11:07 2017 -0400 Work on porting STU1 tests commit 1ae37b0db3929ea4f37955adf8f026e33ccf43b2 Author: James Agnew <jamesagnew@gmail.com> Date: Sun Jul 30 20:56:10 2017 -0400 Try to get coverage report working commit 72b88849b30a94a9ff08d3a1ab50a05b2acbdfdd Author: James Agnew <jamesagnew@gmail.com> Date: Sun Jul 30 20:27:02 2017 -0400 Fix android tests commit e5f6c35aeab8bbc056870a038e1862181049a020 Author: James <jamesagnew@gmail.com> Date: Sun Jul 30 19:31:18 2017 -0400 More work on getting legacy code cleaned up commit 0b513b0845a082b5c20b0033dfab4e29f5e4a934 Author: James <jamesagnew@gmail.com> Date: Sun Jul 30 18:41:13 2017 -0400 Continue work on removing deprecated API commit defea69aa38a2e0f4137ed9c8527956872ff70bf Author: James Agnew <jamesagnew@gmail.com> Date: Sun Jul 30 17:10:01 2017 -0400 More cleanup of legacy code commit 9ae7295705cb58f5edcf7ee1259f023cbbe2fe51 Author: James <jamesagnew@gmail.com> Date: Sun Jul 30 07:11:45 2017 -0400 More cleanup of legacy code commit ebd3eeb5ee793cf5805cc726db353f3def35ab00 Author: James Agnew <jamesagnew@gmail.com> Date: Sun Jul 30 06:43:25 2017 -0400 More work on removing legacy code commit 92224c2532faf70171473d64429c3ceaf3e3406c Author: James <jamesagnew@gmail.com> Date: Sat Jul 29 18:44:06 2017 -0400 Remove DSTU1 Bundle commit c52cacf71bae3f5c02ffae03881c21de1f3aba22 Author: James <jamesagnew@gmail.com> Date: Sat Jul 29 14:27:42 2017 -0400 Now compiling commit b405e51773baf4ab3a3c387458cdc59541394cd1 Merge: c3ddf04e25 cb2cea54d7 Author: James Agnew <jamesagnew@gmail.com> Date: Fri Jul 28 06:21:02 2017 -0400 Merge branch 'master' into hapi3_refactor commit c3ddf04e2598b8d6214975ab0ae795f850396811 Author: James <jamesagnew@gmail.com> Date: Thu Jul 27 11:06:06 2017 -0400 Sync R4 releases in commit b13333c3c03ddb9a5061c3b22bf011f4592104f8 Author: James <jamesagnew@gmail.com> Date: Fri Jul 14 05:52:33 2017 -0400 JPA server is now able to handle placeholder IDs (e.g. urn:uuid:00....000) being used in Bundle.entry.request.url as a part of the conditional URL within transactions. commit 2e60ff7521b42890a32b97c2dda88ab233f5c91e Author: James Agnew <jamesagnew@gmail.com> Date: Thu Jul 13 20:02:46 2017 -0400 Fix imports commit a92ace2e0dac6e24f6dada53bf97d03861fd21a1 Merge: 3196db96d1 1a6b3ea867 Author: James Agnew <jamesagnew@gmail.com> Date: Thu Jul 13 12:02:27 2017 -0400 Merge branch 'master' into hapi3_refactor commit 3196db96d1c485310e746833df59c0e010b5b161 Author: James Agnew <jamesagnew@gmail.com> Date: Thu Jul 13 11:48:10 2017 -0400 Don't add false paging link to request commit bd4e1d338855a664045caa271d41616aed973a4d Author: James <jamesagnew@gmail.com> Date: Sun Jul 9 21:32:16 2017 -0400 Finally building correctly! commit 6464ce9304703cb3c5ecc58491282ddacc900853 Author: James <jamesagnew@gmail.com> Date: Sun Jul 9 16:38:28 2017 -0400 Work on refactor commit 0059f2e48e9d7c812c1d42a57c5b6059814f5155 Author: James <jamesagnew@gmail.com> Date: Sat Jul 8 07:16:20 2017 -0400 Keep working on refactor commit 6c2e87e8cc19863a811c11623d1c878c8b48f031 Author: James Agnew <jamesagnew@gmail.com> Date: Thu Jul 6 22:35:13 2017 -0400 Lots of work on refactor commit 11cab975047a0c28190e6533074fd3f11ddde240 Merge: 34ec6b8807 6c47bd4c51 Author: James Agnew <jamesagnew@gmail.com> Date: Thu Jul 6 21:43:57 2017 -0400 Merge branch 'master' into hapi3_refactor commit 34ec6b8807946aa6c97f0b5581dca9bd5f7b7a3e Merge: f8e647511b c520e60ac1 Author: James Agnew <jamesagnew@gmail.com> Date: Thu Jul 6 21:43:49 2017 -0400 Merge branch 'hapi3_refactor' of github.com:jamesagnew/hapi-fhir into hapi3_refactor commit f8e647511b4a82e7fde71a8850b8800e3d698b1f Author: James Agnew <jamesagnew@gmail.com> Date: Thu Jul 6 18:46:55 2017 -0400 Work on hapi3 changes commit c520e60ac1198f340cfb9090a7a33f91aa2d1e61 Author: James <jamesagnew@gmail.com> Date: Wed Jul 5 08:08:40 2017 -0400 Keep working on refactor commit f1d2ee90926f7db900a5b3b4ab9a8948d18e49f2 Author: James Agnew <jamesagnew@gmail.com> Date: Mon Jul 3 22:10:59 2017 -0400 Continue refactor for HAPI 3 commit 9281ccafc32354222932c5a9f5ee8b0f206ebc05 Merge: ea1264cd8e 294d080bd3 Author: James Agnew <jamesagnew@gmail.com> Date: Mon Jul 3 20:34:16 2017 -0400 Merge branch 'master' into hapi3_refactor commit ea1264cd8e9b8c5297d218e91cf14bd48d0a92c7 Author: James <jamesagnew@gmail.com> Date: Wed Jun 28 10:26:01 2017 -0400 Continue work on refactor commit fbe2f98a0238f3d4e065db4550dd2ef1b460c0d8 Merge: b2bef47100 0a4dcc32ec Author: James <jamesagnew@gmail.com> Date: Wed Jun 28 06:21:22 2017 -0400 Merge branch 'master' into hapi3_refactor commit b2bef47100370e1248834523d73a630950032d7a Author: James <jamesagnew@gmail.com> Date: Tue Jun 27 21:13:23 2017 -0400 Work on refactor commit 8f76e4e46385daa9ce3442e2d9342453ce373ba3 Author: James Agnew <jamesagnew@gmail.com> Date: Sun Jun 25 21:55:35 2017 -0400 Lots of work on refactoring
2017-08-13 14:39:47 -04:00
import ca.uhn.fhir.util.*;
import org.apache.commons.lang3.StringUtils;
import org.apache.commons.lang3.Validate;
import org.apache.commons.lang3.tuple.Pair;
import org.hl7.fhir.instance.model.api.*;
import javax.xml.stream.events.StartElement;
import javax.xml.stream.events.XMLEvent;
import java.util.*;
import static org.apache.commons.lang3.StringUtils.*;
2014-02-18 08:26:49 -05:00
class ParserState<T> {
2014-02-18 08:26:49 -05:00
2014-02-21 21:06:11 -05:00
private static final org.slf4j.Logger ourLog = org.slf4j.LoggerFactory.getLogger(ParserState.class);
private final FhirContext myContext;
private final IParserErrorHandler myErrorHandler;
private final boolean myJsonMode;
private final IParser myParser;
private List<String> myComments = new ArrayList<String>(2);
private T myObject;
private IBase myPreviousElement;
private BaseState myState;
private ParserState(IParser theParser, FhirContext theContext, boolean theJsonMode, IParserErrorHandler theErrorHandler) {
myParser = theParser;
2014-02-21 21:06:11 -05:00
myContext = theContext;
2014-03-22 12:33:07 -04:00
myJsonMode = theJsonMode;
myErrorHandler = theErrorHandler;
2014-02-21 21:06:11 -05:00
}
2014-02-19 17:33:46 -05:00
2014-02-27 16:51:43 -05:00
public void attributeValue(String theName, String theValue) throws DataFormatException {
myState.attributeValue(theName, theValue);
2014-02-19 17:33:46 -05:00
}
public void commentPost(String theCommentText) {
if (myPreviousElement != null) {
myPreviousElement.getFormatCommentsPost().add(theCommentText);
}
}
public void commentPre(String theCommentText) {
if (myState.getCurrentElement() != null) {
IBase element = myState.getCurrentElement();
element.getFormatCommentsPre().add(theCommentText);
}
}
2016-12-19 14:03:11 -05:00
public boolean elementIsRepeating(String theChildName) {
return myState.elementIsRepeating(theChildName);
}
public void endingElement() throws DataFormatException {
myState.endingElement();
2014-02-21 21:06:11 -05:00
}
2014-02-19 11:59:12 -05:00
2015-06-24 12:26:40 -04:00
public void enteringNewElement(String theNamespaceUri, String theName) throws DataFormatException {
myState.enteringNewElement(theNamespaceUri, theName);
2014-02-21 21:06:11 -05:00
}
2014-02-18 08:26:49 -05:00
public void enteringNewElementExtension(StartElement theElem, String theUrlAttr, boolean theIsModifier, final String baseServerUrl) {
myState.enteringNewElementExtension(theElem, theUrlAttr, theIsModifier, baseServerUrl);
2014-02-22 15:33:02 -05:00
}
2014-02-27 07:39:36 -05:00
public T getObject() {
return myObject;
2014-02-19 11:59:12 -05:00
}
public boolean isPreResource() {
return myState.isPreResource();
}
2015-02-16 11:33:46 -05:00
private Object newContainedDt(IResource theTarget) {
2016-05-26 21:42:03 -04:00
return ReflectionUtil.newInstance(theTarget.getStructureFhirVersionEnum().getVersionImplementation().getContainedType());
}
@SuppressWarnings("unchecked")
private void pop() {
myPreviousElement = myState.getCurrentElement();
if (myState.myStack != null) {
myState = myState.myStack;
myState.wereBack();
} else {
myObject = (T) myState.getCurrentElement();
myState = null;
}
}
private void push(BaseState theState) {
theState.setStack(myState);
myState = theState;
if (myComments.isEmpty() == false) {
if (myState.getCurrentElement() != null) {
myState.getCurrentElement().getFormatCommentsPre().addAll(myComments);
myComments.clear();
}
}
}
Merge in HAPI 3.0.0 working branch! Squashed commit of the following: commit 12f89a423a1691fdbc360706fd94a03bd9144d17 Author: James <jamesagnew@gmail.com> Date: Sun Aug 13 14:38:51 2017 -0400 Minimize validation resources commit f6868cce5c73b34d5ecd53bf1a220fdccd6b4e09 Merge: 3b80779fd3 1e158311d8 Author: James <jamesagnew@gmail.com> Date: Sun Aug 13 14:05:34 2017 -0400 Forward port fix for #710 Merge branch 'master' into hapi3_refactor commit 3b80779fd3905cbf5322e6973334eb0ecb3d8426 Merge: 1f534985e8 356d9acaf7 Author: James <jamesagnew@gmail.com> Date: Sun Aug 13 12:31:09 2017 -0400 Forward port #705, #708, and #710 Merge branch 'master' into hapi3_refactor commit 1f534985e8106347d9cc9da2dd8145fdd869547f Merge: 7c39a47852 dedd3d635b Author: James <jamesagnew@gmail.com> Date: Sun Aug 13 10:52:59 2017 -0400 Forward port #695 Merge branch 'master' into hapi3_refactor commit 7c39a47852142bee398101120678217ab0917c7e Merge: e0ffb84d21 6efafe62f1 Author: James <jamesagnew@gmail.com> Date: Sun Aug 13 09:53:17 2017 -0400 Forward port #688 Merge branch 'master' into hapi3_refactor commit e0ffb84d2129c209ccffc2611038592f37dddfd2 Merge: 52388c11c1 d19b00ff09 Author: James <jamesagnew@gmail.com> Date: Sat Aug 12 14:59:46 2017 -0400 Merge branch 'master' into hapi3_refactor commit 52388c11c17cf038591244548f2a592f6b655cee Author: James <jamesagnew@gmail.com> Date: Sat Aug 12 06:21:46 2017 -0400 Cleanup commit 209752cd638266b39574ae11c5989b624d5e85d3 Author: James <jamesagnew@gmail.com> Date: Thu Aug 10 11:18:19 2017 -0400 Fix tests commit 4543408dc8d63b5b9682a275e261d3168cdc2196 Author: James <jamesagnew@gmail.com> Date: Sat Aug 5 06:55:50 2017 -0400 Fix a potential deadlock commit ee360f537692672df473f94dae75c176b2287415 Author: James <jamesagnew@gmail.com> Date: Sat Aug 5 06:22:06 2017 -0400 Add R4 code to CLI commit 1a95ba3b6529afdaf81232b82cc303718c0187d6 Author: James Agnew <jamesagnew@gmail.com> Date: Thu Aug 3 06:14:01 2017 -0400 More cleanup commit f0d88026817296edaa65132accd67d0c8ad8088c Author: James <jamesagnew@gmail.com> Date: Wed Aug 2 11:27:43 2017 -0400 Tests are working! commit a4cbda357e8e7d024f24e3ee9a660b5366983ca1 Author: James Agnew <jamesagnew@gmail.com> Date: Wed Aug 2 10:42:04 2017 -0400 Connection handling cleanup for new tests commit 0e2cecfbd0d7a546444a66e8411600040fd9a17b Author: James Agnew <jamesagnew@gmail.com> Date: Wed Aug 2 10:16:28 2017 -0400 Clean up R4 JPA tests commit 40317a650d72c86e2529d5179cffe63399301de5 Author: James <jamesagnew@gmail.com> Date: Wed Aug 2 09:12:38 2017 -0400 Work on R4 for JPA server commit e7f8f8c30d72ed30d739979964db38d41c5baec1 Author: James <jamesagnew@gmail.com> Date: Tue Aug 1 20:43:47 2017 -0400 More work on porting tests commit 43c9003258696ab33e7bb335e882ab1c66fb61aa Author: James <jamesagnew@gmail.com> Date: Tue Aug 1 07:09:29 2017 -0400 Work on porting DSTU1 tests commit 602857f1e26a69a2284e176b5e44a860d9b828ff Author: James Agnew <jamesagnew@gmail.com> Date: Mon Jul 31 22:34:08 2017 -0400 More work on bring unit tests up to date commit e326a7b0cdb8368009119bba41886838a973e03e Author: James Agnew <jamesagnew@gmail.com> Date: Mon Jul 31 17:36:38 2017 -0400 Credit for #686 and forward port the fix to R4 validator commit 96543c3992adcb406df3c8899dab79cf4bd5b4b4 Merge: 3fb75aa61a 9901b802c4 Author: James Agnew <jamesagnew@gmail.com> Date: Mon Jul 31 17:12:33 2017 -0400 Merge branch 'master' into hapi3_refactor commit 3fb75aa61ad29d9f3876a1c30c912627486147af Author: James <jamesagnew@gmail.com> Date: Mon Jul 31 15:21:30 2017 -0400 More work on cleanup commit b02fbb6804127e77c61c4792eefd9fc0d23d63d0 Author: James Agnew <jamesagnew@gmail.com> Date: Sun Jul 30 22:11:07 2017 -0400 Work on porting STU1 tests commit 1ae37b0db3929ea4f37955adf8f026e33ccf43b2 Author: James Agnew <jamesagnew@gmail.com> Date: Sun Jul 30 20:56:10 2017 -0400 Try to get coverage report working commit 72b88849b30a94a9ff08d3a1ab50a05b2acbdfdd Author: James Agnew <jamesagnew@gmail.com> Date: Sun Jul 30 20:27:02 2017 -0400 Fix android tests commit e5f6c35aeab8bbc056870a038e1862181049a020 Author: James <jamesagnew@gmail.com> Date: Sun Jul 30 19:31:18 2017 -0400 More work on getting legacy code cleaned up commit 0b513b0845a082b5c20b0033dfab4e29f5e4a934 Author: James <jamesagnew@gmail.com> Date: Sun Jul 30 18:41:13 2017 -0400 Continue work on removing deprecated API commit defea69aa38a2e0f4137ed9c8527956872ff70bf Author: James Agnew <jamesagnew@gmail.com> Date: Sun Jul 30 17:10:01 2017 -0400 More cleanup of legacy code commit 9ae7295705cb58f5edcf7ee1259f023cbbe2fe51 Author: James <jamesagnew@gmail.com> Date: Sun Jul 30 07:11:45 2017 -0400 More cleanup of legacy code commit ebd3eeb5ee793cf5805cc726db353f3def35ab00 Author: James Agnew <jamesagnew@gmail.com> Date: Sun Jul 30 06:43:25 2017 -0400 More work on removing legacy code commit 92224c2532faf70171473d64429c3ceaf3e3406c Author: James <jamesagnew@gmail.com> Date: Sat Jul 29 18:44:06 2017 -0400 Remove DSTU1 Bundle commit c52cacf71bae3f5c02ffae03881c21de1f3aba22 Author: James <jamesagnew@gmail.com> Date: Sat Jul 29 14:27:42 2017 -0400 Now compiling commit b405e51773baf4ab3a3c387458cdc59541394cd1 Merge: c3ddf04e25 cb2cea54d7 Author: James Agnew <jamesagnew@gmail.com> Date: Fri Jul 28 06:21:02 2017 -0400 Merge branch 'master' into hapi3_refactor commit c3ddf04e2598b8d6214975ab0ae795f850396811 Author: James <jamesagnew@gmail.com> Date: Thu Jul 27 11:06:06 2017 -0400 Sync R4 releases in commit b13333c3c03ddb9a5061c3b22bf011f4592104f8 Author: James <jamesagnew@gmail.com> Date: Fri Jul 14 05:52:33 2017 -0400 JPA server is now able to handle placeholder IDs (e.g. urn:uuid:00....000) being used in Bundle.entry.request.url as a part of the conditional URL within transactions. commit 2e60ff7521b42890a32b97c2dda88ab233f5c91e Author: James Agnew <jamesagnew@gmail.com> Date: Thu Jul 13 20:02:46 2017 -0400 Fix imports commit a92ace2e0dac6e24f6dada53bf97d03861fd21a1 Merge: 3196db96d1 1a6b3ea867 Author: James Agnew <jamesagnew@gmail.com> Date: Thu Jul 13 12:02:27 2017 -0400 Merge branch 'master' into hapi3_refactor commit 3196db96d1c485310e746833df59c0e010b5b161 Author: James Agnew <jamesagnew@gmail.com> Date: Thu Jul 13 11:48:10 2017 -0400 Don't add false paging link to request commit bd4e1d338855a664045caa271d41616aed973a4d Author: James <jamesagnew@gmail.com> Date: Sun Jul 9 21:32:16 2017 -0400 Finally building correctly! commit 6464ce9304703cb3c5ecc58491282ddacc900853 Author: James <jamesagnew@gmail.com> Date: Sun Jul 9 16:38:28 2017 -0400 Work on refactor commit 0059f2e48e9d7c812c1d42a57c5b6059814f5155 Author: James <jamesagnew@gmail.com> Date: Sat Jul 8 07:16:20 2017 -0400 Keep working on refactor commit 6c2e87e8cc19863a811c11623d1c878c8b48f031 Author: James Agnew <jamesagnew@gmail.com> Date: Thu Jul 6 22:35:13 2017 -0400 Lots of work on refactor commit 11cab975047a0c28190e6533074fd3f11ddde240 Merge: 34ec6b8807 6c47bd4c51 Author: James Agnew <jamesagnew@gmail.com> Date: Thu Jul 6 21:43:57 2017 -0400 Merge branch 'master' into hapi3_refactor commit 34ec6b8807946aa6c97f0b5581dca9bd5f7b7a3e Merge: f8e647511b c520e60ac1 Author: James Agnew <jamesagnew@gmail.com> Date: Thu Jul 6 21:43:49 2017 -0400 Merge branch 'hapi3_refactor' of github.com:jamesagnew/hapi-fhir into hapi3_refactor commit f8e647511b4a82e7fde71a8850b8800e3d698b1f Author: James Agnew <jamesagnew@gmail.com> Date: Thu Jul 6 18:46:55 2017 -0400 Work on hapi3 changes commit c520e60ac1198f340cfb9090a7a33f91aa2d1e61 Author: James <jamesagnew@gmail.com> Date: Wed Jul 5 08:08:40 2017 -0400 Keep working on refactor commit f1d2ee90926f7db900a5b3b4ab9a8948d18e49f2 Author: James Agnew <jamesagnew@gmail.com> Date: Mon Jul 3 22:10:59 2017 -0400 Continue refactor for HAPI 3 commit 9281ccafc32354222932c5a9f5ee8b0f206ebc05 Merge: ea1264cd8e 294d080bd3 Author: James Agnew <jamesagnew@gmail.com> Date: Mon Jul 3 20:34:16 2017 -0400 Merge branch 'master' into hapi3_refactor commit ea1264cd8e9b8c5297d218e91cf14bd48d0a92c7 Author: James <jamesagnew@gmail.com> Date: Wed Jun 28 10:26:01 2017 -0400 Continue work on refactor commit fbe2f98a0238f3d4e065db4550dd2ef1b460c0d8 Merge: b2bef47100 0a4dcc32ec Author: James <jamesagnew@gmail.com> Date: Wed Jun 28 06:21:22 2017 -0400 Merge branch 'master' into hapi3_refactor commit b2bef47100370e1248834523d73a630950032d7a Author: James <jamesagnew@gmail.com> Date: Tue Jun 27 21:13:23 2017 -0400 Work on refactor commit 8f76e4e46385daa9ce3442e2d9342453ce373ba3 Author: James Agnew <jamesagnew@gmail.com> Date: Sun Jun 25 21:55:35 2017 -0400 Lots of work on refactoring
2017-08-13 14:39:47 -04:00
public void string(String theData) {
myState.string(theData);
}
Merge in HAPI 3.0.0 working branch! Squashed commit of the following: commit 12f89a423a1691fdbc360706fd94a03bd9144d17 Author: James <jamesagnew@gmail.com> Date: Sun Aug 13 14:38:51 2017 -0400 Minimize validation resources commit f6868cce5c73b34d5ecd53bf1a220fdccd6b4e09 Merge: 3b80779fd3 1e158311d8 Author: James <jamesagnew@gmail.com> Date: Sun Aug 13 14:05:34 2017 -0400 Forward port fix for #710 Merge branch 'master' into hapi3_refactor commit 3b80779fd3905cbf5322e6973334eb0ecb3d8426 Merge: 1f534985e8 356d9acaf7 Author: James <jamesagnew@gmail.com> Date: Sun Aug 13 12:31:09 2017 -0400 Forward port #705, #708, and #710 Merge branch 'master' into hapi3_refactor commit 1f534985e8106347d9cc9da2dd8145fdd869547f Merge: 7c39a47852 dedd3d635b Author: James <jamesagnew@gmail.com> Date: Sun Aug 13 10:52:59 2017 -0400 Forward port #695 Merge branch 'master' into hapi3_refactor commit 7c39a47852142bee398101120678217ab0917c7e Merge: e0ffb84d21 6efafe62f1 Author: James <jamesagnew@gmail.com> Date: Sun Aug 13 09:53:17 2017 -0400 Forward port #688 Merge branch 'master' into hapi3_refactor commit e0ffb84d2129c209ccffc2611038592f37dddfd2 Merge: 52388c11c1 d19b00ff09 Author: James <jamesagnew@gmail.com> Date: Sat Aug 12 14:59:46 2017 -0400 Merge branch 'master' into hapi3_refactor commit 52388c11c17cf038591244548f2a592f6b655cee Author: James <jamesagnew@gmail.com> Date: Sat Aug 12 06:21:46 2017 -0400 Cleanup commit 209752cd638266b39574ae11c5989b624d5e85d3 Author: James <jamesagnew@gmail.com> Date: Thu Aug 10 11:18:19 2017 -0400 Fix tests commit 4543408dc8d63b5b9682a275e261d3168cdc2196 Author: James <jamesagnew@gmail.com> Date: Sat Aug 5 06:55:50 2017 -0400 Fix a potential deadlock commit ee360f537692672df473f94dae75c176b2287415 Author: James <jamesagnew@gmail.com> Date: Sat Aug 5 06:22:06 2017 -0400 Add R4 code to CLI commit 1a95ba3b6529afdaf81232b82cc303718c0187d6 Author: James Agnew <jamesagnew@gmail.com> Date: Thu Aug 3 06:14:01 2017 -0400 More cleanup commit f0d88026817296edaa65132accd67d0c8ad8088c Author: James <jamesagnew@gmail.com> Date: Wed Aug 2 11:27:43 2017 -0400 Tests are working! commit a4cbda357e8e7d024f24e3ee9a660b5366983ca1 Author: James Agnew <jamesagnew@gmail.com> Date: Wed Aug 2 10:42:04 2017 -0400 Connection handling cleanup for new tests commit 0e2cecfbd0d7a546444a66e8411600040fd9a17b Author: James Agnew <jamesagnew@gmail.com> Date: Wed Aug 2 10:16:28 2017 -0400 Clean up R4 JPA tests commit 40317a650d72c86e2529d5179cffe63399301de5 Author: James <jamesagnew@gmail.com> Date: Wed Aug 2 09:12:38 2017 -0400 Work on R4 for JPA server commit e7f8f8c30d72ed30d739979964db38d41c5baec1 Author: James <jamesagnew@gmail.com> Date: Tue Aug 1 20:43:47 2017 -0400 More work on porting tests commit 43c9003258696ab33e7bb335e882ab1c66fb61aa Author: James <jamesagnew@gmail.com> Date: Tue Aug 1 07:09:29 2017 -0400 Work on porting DSTU1 tests commit 602857f1e26a69a2284e176b5e44a860d9b828ff Author: James Agnew <jamesagnew@gmail.com> Date: Mon Jul 31 22:34:08 2017 -0400 More work on bring unit tests up to date commit e326a7b0cdb8368009119bba41886838a973e03e Author: James Agnew <jamesagnew@gmail.com> Date: Mon Jul 31 17:36:38 2017 -0400 Credit for #686 and forward port the fix to R4 validator commit 96543c3992adcb406df3c8899dab79cf4bd5b4b4 Merge: 3fb75aa61a 9901b802c4 Author: James Agnew <jamesagnew@gmail.com> Date: Mon Jul 31 17:12:33 2017 -0400 Merge branch 'master' into hapi3_refactor commit 3fb75aa61ad29d9f3876a1c30c912627486147af Author: James <jamesagnew@gmail.com> Date: Mon Jul 31 15:21:30 2017 -0400 More work on cleanup commit b02fbb6804127e77c61c4792eefd9fc0d23d63d0 Author: James Agnew <jamesagnew@gmail.com> Date: Sun Jul 30 22:11:07 2017 -0400 Work on porting STU1 tests commit 1ae37b0db3929ea4f37955adf8f026e33ccf43b2 Author: James Agnew <jamesagnew@gmail.com> Date: Sun Jul 30 20:56:10 2017 -0400 Try to get coverage report working commit 72b88849b30a94a9ff08d3a1ab50a05b2acbdfdd Author: James Agnew <jamesagnew@gmail.com> Date: Sun Jul 30 20:27:02 2017 -0400 Fix android tests commit e5f6c35aeab8bbc056870a038e1862181049a020 Author: James <jamesagnew@gmail.com> Date: Sun Jul 30 19:31:18 2017 -0400 More work on getting legacy code cleaned up commit 0b513b0845a082b5c20b0033dfab4e29f5e4a934 Author: James <jamesagnew@gmail.com> Date: Sun Jul 30 18:41:13 2017 -0400 Continue work on removing deprecated API commit defea69aa38a2e0f4137ed9c8527956872ff70bf Author: James Agnew <jamesagnew@gmail.com> Date: Sun Jul 30 17:10:01 2017 -0400 More cleanup of legacy code commit 9ae7295705cb58f5edcf7ee1259f023cbbe2fe51 Author: James <jamesagnew@gmail.com> Date: Sun Jul 30 07:11:45 2017 -0400 More cleanup of legacy code commit ebd3eeb5ee793cf5805cc726db353f3def35ab00 Author: James Agnew <jamesagnew@gmail.com> Date: Sun Jul 30 06:43:25 2017 -0400 More work on removing legacy code commit 92224c2532faf70171473d64429c3ceaf3e3406c Author: James <jamesagnew@gmail.com> Date: Sat Jul 29 18:44:06 2017 -0400 Remove DSTU1 Bundle commit c52cacf71bae3f5c02ffae03881c21de1f3aba22 Author: James <jamesagnew@gmail.com> Date: Sat Jul 29 14:27:42 2017 -0400 Now compiling commit b405e51773baf4ab3a3c387458cdc59541394cd1 Merge: c3ddf04e25 cb2cea54d7 Author: James Agnew <jamesagnew@gmail.com> Date: Fri Jul 28 06:21:02 2017 -0400 Merge branch 'master' into hapi3_refactor commit c3ddf04e2598b8d6214975ab0ae795f850396811 Author: James <jamesagnew@gmail.com> Date: Thu Jul 27 11:06:06 2017 -0400 Sync R4 releases in commit b13333c3c03ddb9a5061c3b22bf011f4592104f8 Author: James <jamesagnew@gmail.com> Date: Fri Jul 14 05:52:33 2017 -0400 JPA server is now able to handle placeholder IDs (e.g. urn:uuid:00....000) being used in Bundle.entry.request.url as a part of the conditional URL within transactions. commit 2e60ff7521b42890a32b97c2dda88ab233f5c91e Author: James Agnew <jamesagnew@gmail.com> Date: Thu Jul 13 20:02:46 2017 -0400 Fix imports commit a92ace2e0dac6e24f6dada53bf97d03861fd21a1 Merge: 3196db96d1 1a6b3ea867 Author: James Agnew <jamesagnew@gmail.com> Date: Thu Jul 13 12:02:27 2017 -0400 Merge branch 'master' into hapi3_refactor commit 3196db96d1c485310e746833df59c0e010b5b161 Author: James Agnew <jamesagnew@gmail.com> Date: Thu Jul 13 11:48:10 2017 -0400 Don't add false paging link to request commit bd4e1d338855a664045caa271d41616aed973a4d Author: James <jamesagnew@gmail.com> Date: Sun Jul 9 21:32:16 2017 -0400 Finally building correctly! commit 6464ce9304703cb3c5ecc58491282ddacc900853 Author: James <jamesagnew@gmail.com> Date: Sun Jul 9 16:38:28 2017 -0400 Work on refactor commit 0059f2e48e9d7c812c1d42a57c5b6059814f5155 Author: James <jamesagnew@gmail.com> Date: Sat Jul 8 07:16:20 2017 -0400 Keep working on refactor commit 6c2e87e8cc19863a811c11623d1c878c8b48f031 Author: James Agnew <jamesagnew@gmail.com> Date: Thu Jul 6 22:35:13 2017 -0400 Lots of work on refactor commit 11cab975047a0c28190e6533074fd3f11ddde240 Merge: 34ec6b8807 6c47bd4c51 Author: James Agnew <jamesagnew@gmail.com> Date: Thu Jul 6 21:43:57 2017 -0400 Merge branch 'master' into hapi3_refactor commit 34ec6b8807946aa6c97f0b5581dca9bd5f7b7a3e Merge: f8e647511b c520e60ac1 Author: James Agnew <jamesagnew@gmail.com> Date: Thu Jul 6 21:43:49 2017 -0400 Merge branch 'hapi3_refactor' of github.com:jamesagnew/hapi-fhir into hapi3_refactor commit f8e647511b4a82e7fde71a8850b8800e3d698b1f Author: James Agnew <jamesagnew@gmail.com> Date: Thu Jul 6 18:46:55 2017 -0400 Work on hapi3 changes commit c520e60ac1198f340cfb9090a7a33f91aa2d1e61 Author: James <jamesagnew@gmail.com> Date: Wed Jul 5 08:08:40 2017 -0400 Keep working on refactor commit f1d2ee90926f7db900a5b3b4ab9a8948d18e49f2 Author: James Agnew <jamesagnew@gmail.com> Date: Mon Jul 3 22:10:59 2017 -0400 Continue refactor for HAPI 3 commit 9281ccafc32354222932c5a9f5ee8b0f206ebc05 Merge: ea1264cd8e 294d080bd3 Author: James Agnew <jamesagnew@gmail.com> Date: Mon Jul 3 20:34:16 2017 -0400 Merge branch 'master' into hapi3_refactor commit ea1264cd8e9b8c5297d218e91cf14bd48d0a92c7 Author: James <jamesagnew@gmail.com> Date: Wed Jun 28 10:26:01 2017 -0400 Continue work on refactor commit fbe2f98a0238f3d4e065db4550dd2ef1b460c0d8 Merge: b2bef47100 0a4dcc32ec Author: James <jamesagnew@gmail.com> Date: Wed Jun 28 06:21:22 2017 -0400 Merge branch 'master' into hapi3_refactor commit b2bef47100370e1248834523d73a630950032d7a Author: James <jamesagnew@gmail.com> Date: Tue Jun 27 21:13:23 2017 -0400 Work on refactor commit 8f76e4e46385daa9ce3442e2d9342453ce373ba3 Author: James Agnew <jamesagnew@gmail.com> Date: Sun Jun 25 21:55:35 2017 -0400 Lots of work on refactoring
2017-08-13 14:39:47 -04:00
public boolean verifyNamespace(String theExpect, String theActual) {
if (myJsonMode) {
return true;
}
Merge in HAPI 3.0.0 working branch! Squashed commit of the following: commit 12f89a423a1691fdbc360706fd94a03bd9144d17 Author: James <jamesagnew@gmail.com> Date: Sun Aug 13 14:38:51 2017 -0400 Minimize validation resources commit f6868cce5c73b34d5ecd53bf1a220fdccd6b4e09 Merge: 3b80779fd3 1e158311d8 Author: James <jamesagnew@gmail.com> Date: Sun Aug 13 14:05:34 2017 -0400 Forward port fix for #710 Merge branch 'master' into hapi3_refactor commit 3b80779fd3905cbf5322e6973334eb0ecb3d8426 Merge: 1f534985e8 356d9acaf7 Author: James <jamesagnew@gmail.com> Date: Sun Aug 13 12:31:09 2017 -0400 Forward port #705, #708, and #710 Merge branch 'master' into hapi3_refactor commit 1f534985e8106347d9cc9da2dd8145fdd869547f Merge: 7c39a47852 dedd3d635b Author: James <jamesagnew@gmail.com> Date: Sun Aug 13 10:52:59 2017 -0400 Forward port #695 Merge branch 'master' into hapi3_refactor commit 7c39a47852142bee398101120678217ab0917c7e Merge: e0ffb84d21 6efafe62f1 Author: James <jamesagnew@gmail.com> Date: Sun Aug 13 09:53:17 2017 -0400 Forward port #688 Merge branch 'master' into hapi3_refactor commit e0ffb84d2129c209ccffc2611038592f37dddfd2 Merge: 52388c11c1 d19b00ff09 Author: James <jamesagnew@gmail.com> Date: Sat Aug 12 14:59:46 2017 -0400 Merge branch 'master' into hapi3_refactor commit 52388c11c17cf038591244548f2a592f6b655cee Author: James <jamesagnew@gmail.com> Date: Sat Aug 12 06:21:46 2017 -0400 Cleanup commit 209752cd638266b39574ae11c5989b624d5e85d3 Author: James <jamesagnew@gmail.com> Date: Thu Aug 10 11:18:19 2017 -0400 Fix tests commit 4543408dc8d63b5b9682a275e261d3168cdc2196 Author: James <jamesagnew@gmail.com> Date: Sat Aug 5 06:55:50 2017 -0400 Fix a potential deadlock commit ee360f537692672df473f94dae75c176b2287415 Author: James <jamesagnew@gmail.com> Date: Sat Aug 5 06:22:06 2017 -0400 Add R4 code to CLI commit 1a95ba3b6529afdaf81232b82cc303718c0187d6 Author: James Agnew <jamesagnew@gmail.com> Date: Thu Aug 3 06:14:01 2017 -0400 More cleanup commit f0d88026817296edaa65132accd67d0c8ad8088c Author: James <jamesagnew@gmail.com> Date: Wed Aug 2 11:27:43 2017 -0400 Tests are working! commit a4cbda357e8e7d024f24e3ee9a660b5366983ca1 Author: James Agnew <jamesagnew@gmail.com> Date: Wed Aug 2 10:42:04 2017 -0400 Connection handling cleanup for new tests commit 0e2cecfbd0d7a546444a66e8411600040fd9a17b Author: James Agnew <jamesagnew@gmail.com> Date: Wed Aug 2 10:16:28 2017 -0400 Clean up R4 JPA tests commit 40317a650d72c86e2529d5179cffe63399301de5 Author: James <jamesagnew@gmail.com> Date: Wed Aug 2 09:12:38 2017 -0400 Work on R4 for JPA server commit e7f8f8c30d72ed30d739979964db38d41c5baec1 Author: James <jamesagnew@gmail.com> Date: Tue Aug 1 20:43:47 2017 -0400 More work on porting tests commit 43c9003258696ab33e7bb335e882ab1c66fb61aa Author: James <jamesagnew@gmail.com> Date: Tue Aug 1 07:09:29 2017 -0400 Work on porting DSTU1 tests commit 602857f1e26a69a2284e176b5e44a860d9b828ff Author: James Agnew <jamesagnew@gmail.com> Date: Mon Jul 31 22:34:08 2017 -0400 More work on bring unit tests up to date commit e326a7b0cdb8368009119bba41886838a973e03e Author: James Agnew <jamesagnew@gmail.com> Date: Mon Jul 31 17:36:38 2017 -0400 Credit for #686 and forward port the fix to R4 validator commit 96543c3992adcb406df3c8899dab79cf4bd5b4b4 Merge: 3fb75aa61a 9901b802c4 Author: James Agnew <jamesagnew@gmail.com> Date: Mon Jul 31 17:12:33 2017 -0400 Merge branch 'master' into hapi3_refactor commit 3fb75aa61ad29d9f3876a1c30c912627486147af Author: James <jamesagnew@gmail.com> Date: Mon Jul 31 15:21:30 2017 -0400 More work on cleanup commit b02fbb6804127e77c61c4792eefd9fc0d23d63d0 Author: James Agnew <jamesagnew@gmail.com> Date: Sun Jul 30 22:11:07 2017 -0400 Work on porting STU1 tests commit 1ae37b0db3929ea4f37955adf8f026e33ccf43b2 Author: James Agnew <jamesagnew@gmail.com> Date: Sun Jul 30 20:56:10 2017 -0400 Try to get coverage report working commit 72b88849b30a94a9ff08d3a1ab50a05b2acbdfdd Author: James Agnew <jamesagnew@gmail.com> Date: Sun Jul 30 20:27:02 2017 -0400 Fix android tests commit e5f6c35aeab8bbc056870a038e1862181049a020 Author: James <jamesagnew@gmail.com> Date: Sun Jul 30 19:31:18 2017 -0400 More work on getting legacy code cleaned up commit 0b513b0845a082b5c20b0033dfab4e29f5e4a934 Author: James <jamesagnew@gmail.com> Date: Sun Jul 30 18:41:13 2017 -0400 Continue work on removing deprecated API commit defea69aa38a2e0f4137ed9c8527956872ff70bf Author: James Agnew <jamesagnew@gmail.com> Date: Sun Jul 30 17:10:01 2017 -0400 More cleanup of legacy code commit 9ae7295705cb58f5edcf7ee1259f023cbbe2fe51 Author: James <jamesagnew@gmail.com> Date: Sun Jul 30 07:11:45 2017 -0400 More cleanup of legacy code commit ebd3eeb5ee793cf5805cc726db353f3def35ab00 Author: James Agnew <jamesagnew@gmail.com> Date: Sun Jul 30 06:43:25 2017 -0400 More work on removing legacy code commit 92224c2532faf70171473d64429c3ceaf3e3406c Author: James <jamesagnew@gmail.com> Date: Sat Jul 29 18:44:06 2017 -0400 Remove DSTU1 Bundle commit c52cacf71bae3f5c02ffae03881c21de1f3aba22 Author: James <jamesagnew@gmail.com> Date: Sat Jul 29 14:27:42 2017 -0400 Now compiling commit b405e51773baf4ab3a3c387458cdc59541394cd1 Merge: c3ddf04e25 cb2cea54d7 Author: James Agnew <jamesagnew@gmail.com> Date: Fri Jul 28 06:21:02 2017 -0400 Merge branch 'master' into hapi3_refactor commit c3ddf04e2598b8d6214975ab0ae795f850396811 Author: James <jamesagnew@gmail.com> Date: Thu Jul 27 11:06:06 2017 -0400 Sync R4 releases in commit b13333c3c03ddb9a5061c3b22bf011f4592104f8 Author: James <jamesagnew@gmail.com> Date: Fri Jul 14 05:52:33 2017 -0400 JPA server is now able to handle placeholder IDs (e.g. urn:uuid:00....000) being used in Bundle.entry.request.url as a part of the conditional URL within transactions. commit 2e60ff7521b42890a32b97c2dda88ab233f5c91e Author: James Agnew <jamesagnew@gmail.com> Date: Thu Jul 13 20:02:46 2017 -0400 Fix imports commit a92ace2e0dac6e24f6dada53bf97d03861fd21a1 Merge: 3196db96d1 1a6b3ea867 Author: James Agnew <jamesagnew@gmail.com> Date: Thu Jul 13 12:02:27 2017 -0400 Merge branch 'master' into hapi3_refactor commit 3196db96d1c485310e746833df59c0e010b5b161 Author: James Agnew <jamesagnew@gmail.com> Date: Thu Jul 13 11:48:10 2017 -0400 Don't add false paging link to request commit bd4e1d338855a664045caa271d41616aed973a4d Author: James <jamesagnew@gmail.com> Date: Sun Jul 9 21:32:16 2017 -0400 Finally building correctly! commit 6464ce9304703cb3c5ecc58491282ddacc900853 Author: James <jamesagnew@gmail.com> Date: Sun Jul 9 16:38:28 2017 -0400 Work on refactor commit 0059f2e48e9d7c812c1d42a57c5b6059814f5155 Author: James <jamesagnew@gmail.com> Date: Sat Jul 8 07:16:20 2017 -0400 Keep working on refactor commit 6c2e87e8cc19863a811c11623d1c878c8b48f031 Author: James Agnew <jamesagnew@gmail.com> Date: Thu Jul 6 22:35:13 2017 -0400 Lots of work on refactor commit 11cab975047a0c28190e6533074fd3f11ddde240 Merge: 34ec6b8807 6c47bd4c51 Author: James Agnew <jamesagnew@gmail.com> Date: Thu Jul 6 21:43:57 2017 -0400 Merge branch 'master' into hapi3_refactor commit 34ec6b8807946aa6c97f0b5581dca9bd5f7b7a3e Merge: f8e647511b c520e60ac1 Author: James Agnew <jamesagnew@gmail.com> Date: Thu Jul 6 21:43:49 2017 -0400 Merge branch 'hapi3_refactor' of github.com:jamesagnew/hapi-fhir into hapi3_refactor commit f8e647511b4a82e7fde71a8850b8800e3d698b1f Author: James Agnew <jamesagnew@gmail.com> Date: Thu Jul 6 18:46:55 2017 -0400 Work on hapi3 changes commit c520e60ac1198f340cfb9090a7a33f91aa2d1e61 Author: James <jamesagnew@gmail.com> Date: Wed Jul 5 08:08:40 2017 -0400 Keep working on refactor commit f1d2ee90926f7db900a5b3b4ab9a8948d18e49f2 Author: James Agnew <jamesagnew@gmail.com> Date: Mon Jul 3 22:10:59 2017 -0400 Continue refactor for HAPI 3 commit 9281ccafc32354222932c5a9f5ee8b0f206ebc05 Merge: ea1264cd8e 294d080bd3 Author: James Agnew <jamesagnew@gmail.com> Date: Mon Jul 3 20:34:16 2017 -0400 Merge branch 'master' into hapi3_refactor commit ea1264cd8e9b8c5297d218e91cf14bd48d0a92c7 Author: James <jamesagnew@gmail.com> Date: Wed Jun 28 10:26:01 2017 -0400 Continue work on refactor commit fbe2f98a0238f3d4e065db4550dd2ef1b460c0d8 Merge: b2bef47100 0a4dcc32ec Author: James <jamesagnew@gmail.com> Date: Wed Jun 28 06:21:22 2017 -0400 Merge branch 'master' into hapi3_refactor commit b2bef47100370e1248834523d73a630950032d7a Author: James <jamesagnew@gmail.com> Date: Tue Jun 27 21:13:23 2017 -0400 Work on refactor commit 8f76e4e46385daa9ce3442e2d9342453ce373ba3 Author: James Agnew <jamesagnew@gmail.com> Date: Sun Jun 25 21:55:35 2017 -0400 Lots of work on refactoring
2017-08-13 14:39:47 -04:00
return StringUtils.equals(theExpect, theActual);
}
Merge in HAPI 3.0.0 working branch! Squashed commit of the following: commit 12f89a423a1691fdbc360706fd94a03bd9144d17 Author: James <jamesagnew@gmail.com> Date: Sun Aug 13 14:38:51 2017 -0400 Minimize validation resources commit f6868cce5c73b34d5ecd53bf1a220fdccd6b4e09 Merge: 3b80779fd3 1e158311d8 Author: James <jamesagnew@gmail.com> Date: Sun Aug 13 14:05:34 2017 -0400 Forward port fix for #710 Merge branch 'master' into hapi3_refactor commit 3b80779fd3905cbf5322e6973334eb0ecb3d8426 Merge: 1f534985e8 356d9acaf7 Author: James <jamesagnew@gmail.com> Date: Sun Aug 13 12:31:09 2017 -0400 Forward port #705, #708, and #710 Merge branch 'master' into hapi3_refactor commit 1f534985e8106347d9cc9da2dd8145fdd869547f Merge: 7c39a47852 dedd3d635b Author: James <jamesagnew@gmail.com> Date: Sun Aug 13 10:52:59 2017 -0400 Forward port #695 Merge branch 'master' into hapi3_refactor commit 7c39a47852142bee398101120678217ab0917c7e Merge: e0ffb84d21 6efafe62f1 Author: James <jamesagnew@gmail.com> Date: Sun Aug 13 09:53:17 2017 -0400 Forward port #688 Merge branch 'master' into hapi3_refactor commit e0ffb84d2129c209ccffc2611038592f37dddfd2 Merge: 52388c11c1 d19b00ff09 Author: James <jamesagnew@gmail.com> Date: Sat Aug 12 14:59:46 2017 -0400 Merge branch 'master' into hapi3_refactor commit 52388c11c17cf038591244548f2a592f6b655cee Author: James <jamesagnew@gmail.com> Date: Sat Aug 12 06:21:46 2017 -0400 Cleanup commit 209752cd638266b39574ae11c5989b624d5e85d3 Author: James <jamesagnew@gmail.com> Date: Thu Aug 10 11:18:19 2017 -0400 Fix tests commit 4543408dc8d63b5b9682a275e261d3168cdc2196 Author: James <jamesagnew@gmail.com> Date: Sat Aug 5 06:55:50 2017 -0400 Fix a potential deadlock commit ee360f537692672df473f94dae75c176b2287415 Author: James <jamesagnew@gmail.com> Date: Sat Aug 5 06:22:06 2017 -0400 Add R4 code to CLI commit 1a95ba3b6529afdaf81232b82cc303718c0187d6 Author: James Agnew <jamesagnew@gmail.com> Date: Thu Aug 3 06:14:01 2017 -0400 More cleanup commit f0d88026817296edaa65132accd67d0c8ad8088c Author: James <jamesagnew@gmail.com> Date: Wed Aug 2 11:27:43 2017 -0400 Tests are working! commit a4cbda357e8e7d024f24e3ee9a660b5366983ca1 Author: James Agnew <jamesagnew@gmail.com> Date: Wed Aug 2 10:42:04 2017 -0400 Connection handling cleanup for new tests commit 0e2cecfbd0d7a546444a66e8411600040fd9a17b Author: James Agnew <jamesagnew@gmail.com> Date: Wed Aug 2 10:16:28 2017 -0400 Clean up R4 JPA tests commit 40317a650d72c86e2529d5179cffe63399301de5 Author: James <jamesagnew@gmail.com> Date: Wed Aug 2 09:12:38 2017 -0400 Work on R4 for JPA server commit e7f8f8c30d72ed30d739979964db38d41c5baec1 Author: James <jamesagnew@gmail.com> Date: Tue Aug 1 20:43:47 2017 -0400 More work on porting tests commit 43c9003258696ab33e7bb335e882ab1c66fb61aa Author: James <jamesagnew@gmail.com> Date: Tue Aug 1 07:09:29 2017 -0400 Work on porting DSTU1 tests commit 602857f1e26a69a2284e176b5e44a860d9b828ff Author: James Agnew <jamesagnew@gmail.com> Date: Mon Jul 31 22:34:08 2017 -0400 More work on bring unit tests up to date commit e326a7b0cdb8368009119bba41886838a973e03e Author: James Agnew <jamesagnew@gmail.com> Date: Mon Jul 31 17:36:38 2017 -0400 Credit for #686 and forward port the fix to R4 validator commit 96543c3992adcb406df3c8899dab79cf4bd5b4b4 Merge: 3fb75aa61a 9901b802c4 Author: James Agnew <jamesagnew@gmail.com> Date: Mon Jul 31 17:12:33 2017 -0400 Merge branch 'master' into hapi3_refactor commit 3fb75aa61ad29d9f3876a1c30c912627486147af Author: James <jamesagnew@gmail.com> Date: Mon Jul 31 15:21:30 2017 -0400 More work on cleanup commit b02fbb6804127e77c61c4792eefd9fc0d23d63d0 Author: James Agnew <jamesagnew@gmail.com> Date: Sun Jul 30 22:11:07 2017 -0400 Work on porting STU1 tests commit 1ae37b0db3929ea4f37955adf8f026e33ccf43b2 Author: James Agnew <jamesagnew@gmail.com> Date: Sun Jul 30 20:56:10 2017 -0400 Try to get coverage report working commit 72b88849b30a94a9ff08d3a1ab50a05b2acbdfdd Author: James Agnew <jamesagnew@gmail.com> Date: Sun Jul 30 20:27:02 2017 -0400 Fix android tests commit e5f6c35aeab8bbc056870a038e1862181049a020 Author: James <jamesagnew@gmail.com> Date: Sun Jul 30 19:31:18 2017 -0400 More work on getting legacy code cleaned up commit 0b513b0845a082b5c20b0033dfab4e29f5e4a934 Author: James <jamesagnew@gmail.com> Date: Sun Jul 30 18:41:13 2017 -0400 Continue work on removing deprecated API commit defea69aa38a2e0f4137ed9c8527956872ff70bf Author: James Agnew <jamesagnew@gmail.com> Date: Sun Jul 30 17:10:01 2017 -0400 More cleanup of legacy code commit 9ae7295705cb58f5edcf7ee1259f023cbbe2fe51 Author: James <jamesagnew@gmail.com> Date: Sun Jul 30 07:11:45 2017 -0400 More cleanup of legacy code commit ebd3eeb5ee793cf5805cc726db353f3def35ab00 Author: James Agnew <jamesagnew@gmail.com> Date: Sun Jul 30 06:43:25 2017 -0400 More work on removing legacy code commit 92224c2532faf70171473d64429c3ceaf3e3406c Author: James <jamesagnew@gmail.com> Date: Sat Jul 29 18:44:06 2017 -0400 Remove DSTU1 Bundle commit c52cacf71bae3f5c02ffae03881c21de1f3aba22 Author: James <jamesagnew@gmail.com> Date: Sat Jul 29 14:27:42 2017 -0400 Now compiling commit b405e51773baf4ab3a3c387458cdc59541394cd1 Merge: c3ddf04e25 cb2cea54d7 Author: James Agnew <jamesagnew@gmail.com> Date: Fri Jul 28 06:21:02 2017 -0400 Merge branch 'master' into hapi3_refactor commit c3ddf04e2598b8d6214975ab0ae795f850396811 Author: James <jamesagnew@gmail.com> Date: Thu Jul 27 11:06:06 2017 -0400 Sync R4 releases in commit b13333c3c03ddb9a5061c3b22bf011f4592104f8 Author: James <jamesagnew@gmail.com> Date: Fri Jul 14 05:52:33 2017 -0400 JPA server is now able to handle placeholder IDs (e.g. urn:uuid:00....000) being used in Bundle.entry.request.url as a part of the conditional URL within transactions. commit 2e60ff7521b42890a32b97c2dda88ab233f5c91e Author: James Agnew <jamesagnew@gmail.com> Date: Thu Jul 13 20:02:46 2017 -0400 Fix imports commit a92ace2e0dac6e24f6dada53bf97d03861fd21a1 Merge: 3196db96d1 1a6b3ea867 Author: James Agnew <jamesagnew@gmail.com> Date: Thu Jul 13 12:02:27 2017 -0400 Merge branch 'master' into hapi3_refactor commit 3196db96d1c485310e746833df59c0e010b5b161 Author: James Agnew <jamesagnew@gmail.com> Date: Thu Jul 13 11:48:10 2017 -0400 Don't add false paging link to request commit bd4e1d338855a664045caa271d41616aed973a4d Author: James <jamesagnew@gmail.com> Date: Sun Jul 9 21:32:16 2017 -0400 Finally building correctly! commit 6464ce9304703cb3c5ecc58491282ddacc900853 Author: James <jamesagnew@gmail.com> Date: Sun Jul 9 16:38:28 2017 -0400 Work on refactor commit 0059f2e48e9d7c812c1d42a57c5b6059814f5155 Author: James <jamesagnew@gmail.com> Date: Sat Jul 8 07:16:20 2017 -0400 Keep working on refactor commit 6c2e87e8cc19863a811c11623d1c878c8b48f031 Author: James Agnew <jamesagnew@gmail.com> Date: Thu Jul 6 22:35:13 2017 -0400 Lots of work on refactor commit 11cab975047a0c28190e6533074fd3f11ddde240 Merge: 34ec6b8807 6c47bd4c51 Author: James Agnew <jamesagnew@gmail.com> Date: Thu Jul 6 21:43:57 2017 -0400 Merge branch 'master' into hapi3_refactor commit 34ec6b8807946aa6c97f0b5581dca9bd5f7b7a3e Merge: f8e647511b c520e60ac1 Author: James Agnew <jamesagnew@gmail.com> Date: Thu Jul 6 21:43:49 2017 -0400 Merge branch 'hapi3_refactor' of github.com:jamesagnew/hapi-fhir into hapi3_refactor commit f8e647511b4a82e7fde71a8850b8800e3d698b1f Author: James Agnew <jamesagnew@gmail.com> Date: Thu Jul 6 18:46:55 2017 -0400 Work on hapi3 changes commit c520e60ac1198f340cfb9090a7a33f91aa2d1e61 Author: James <jamesagnew@gmail.com> Date: Wed Jul 5 08:08:40 2017 -0400 Keep working on refactor commit f1d2ee90926f7db900a5b3b4ab9a8948d18e49f2 Author: James Agnew <jamesagnew@gmail.com> Date: Mon Jul 3 22:10:59 2017 -0400 Continue refactor for HAPI 3 commit 9281ccafc32354222932c5a9f5ee8b0f206ebc05 Merge: ea1264cd8e 294d080bd3 Author: James Agnew <jamesagnew@gmail.com> Date: Mon Jul 3 20:34:16 2017 -0400 Merge branch 'master' into hapi3_refactor commit ea1264cd8e9b8c5297d218e91cf14bd48d0a92c7 Author: James <jamesagnew@gmail.com> Date: Wed Jun 28 10:26:01 2017 -0400 Continue work on refactor commit fbe2f98a0238f3d4e065db4550dd2ef1b460c0d8 Merge: b2bef47100 0a4dcc32ec Author: James <jamesagnew@gmail.com> Date: Wed Jun 28 06:21:22 2017 -0400 Merge branch 'master' into hapi3_refactor commit b2bef47100370e1248834523d73a630950032d7a Author: James <jamesagnew@gmail.com> Date: Tue Jun 27 21:13:23 2017 -0400 Work on refactor commit 8f76e4e46385daa9ce3442e2d9342453ce373ba3 Author: James Agnew <jamesagnew@gmail.com> Date: Sun Jun 25 21:55:35 2017 -0400 Lots of work on refactoring
2017-08-13 14:39:47 -04:00
/**
* Invoked after any new XML event is individually processed, containing a copy of the XML event. This is basically
* intended for embedded XHTML content
*/
public void xmlEvent(XMLEvent theNextEvent) {
if (myState != null) {
myState.xmlEvent(theNextEvent);
2014-12-01 08:13:32 -05:00
}
Merge in HAPI 3.0.0 working branch! Squashed commit of the following: commit 12f89a423a1691fdbc360706fd94a03bd9144d17 Author: James <jamesagnew@gmail.com> Date: Sun Aug 13 14:38:51 2017 -0400 Minimize validation resources commit f6868cce5c73b34d5ecd53bf1a220fdccd6b4e09 Merge: 3b80779fd3 1e158311d8 Author: James <jamesagnew@gmail.com> Date: Sun Aug 13 14:05:34 2017 -0400 Forward port fix for #710 Merge branch 'master' into hapi3_refactor commit 3b80779fd3905cbf5322e6973334eb0ecb3d8426 Merge: 1f534985e8 356d9acaf7 Author: James <jamesagnew@gmail.com> Date: Sun Aug 13 12:31:09 2017 -0400 Forward port #705, #708, and #710 Merge branch 'master' into hapi3_refactor commit 1f534985e8106347d9cc9da2dd8145fdd869547f Merge: 7c39a47852 dedd3d635b Author: James <jamesagnew@gmail.com> Date: Sun Aug 13 10:52:59 2017 -0400 Forward port #695 Merge branch 'master' into hapi3_refactor commit 7c39a47852142bee398101120678217ab0917c7e Merge: e0ffb84d21 6efafe62f1 Author: James <jamesagnew@gmail.com> Date: Sun Aug 13 09:53:17 2017 -0400 Forward port #688 Merge branch 'master' into hapi3_refactor commit e0ffb84d2129c209ccffc2611038592f37dddfd2 Merge: 52388c11c1 d19b00ff09 Author: James <jamesagnew@gmail.com> Date: Sat Aug 12 14:59:46 2017 -0400 Merge branch 'master' into hapi3_refactor commit 52388c11c17cf038591244548f2a592f6b655cee Author: James <jamesagnew@gmail.com> Date: Sat Aug 12 06:21:46 2017 -0400 Cleanup commit 209752cd638266b39574ae11c5989b624d5e85d3 Author: James <jamesagnew@gmail.com> Date: Thu Aug 10 11:18:19 2017 -0400 Fix tests commit 4543408dc8d63b5b9682a275e261d3168cdc2196 Author: James <jamesagnew@gmail.com> Date: Sat Aug 5 06:55:50 2017 -0400 Fix a potential deadlock commit ee360f537692672df473f94dae75c176b2287415 Author: James <jamesagnew@gmail.com> Date: Sat Aug 5 06:22:06 2017 -0400 Add R4 code to CLI commit 1a95ba3b6529afdaf81232b82cc303718c0187d6 Author: James Agnew <jamesagnew@gmail.com> Date: Thu Aug 3 06:14:01 2017 -0400 More cleanup commit f0d88026817296edaa65132accd67d0c8ad8088c Author: James <jamesagnew@gmail.com> Date: Wed Aug 2 11:27:43 2017 -0400 Tests are working! commit a4cbda357e8e7d024f24e3ee9a660b5366983ca1 Author: James Agnew <jamesagnew@gmail.com> Date: Wed Aug 2 10:42:04 2017 -0400 Connection handling cleanup for new tests commit 0e2cecfbd0d7a546444a66e8411600040fd9a17b Author: James Agnew <jamesagnew@gmail.com> Date: Wed Aug 2 10:16:28 2017 -0400 Clean up R4 JPA tests commit 40317a650d72c86e2529d5179cffe63399301de5 Author: James <jamesagnew@gmail.com> Date: Wed Aug 2 09:12:38 2017 -0400 Work on R4 for JPA server commit e7f8f8c30d72ed30d739979964db38d41c5baec1 Author: James <jamesagnew@gmail.com> Date: Tue Aug 1 20:43:47 2017 -0400 More work on porting tests commit 43c9003258696ab33e7bb335e882ab1c66fb61aa Author: James <jamesagnew@gmail.com> Date: Tue Aug 1 07:09:29 2017 -0400 Work on porting DSTU1 tests commit 602857f1e26a69a2284e176b5e44a860d9b828ff Author: James Agnew <jamesagnew@gmail.com> Date: Mon Jul 31 22:34:08 2017 -0400 More work on bring unit tests up to date commit e326a7b0cdb8368009119bba41886838a973e03e Author: James Agnew <jamesagnew@gmail.com> Date: Mon Jul 31 17:36:38 2017 -0400 Credit for #686 and forward port the fix to R4 validator commit 96543c3992adcb406df3c8899dab79cf4bd5b4b4 Merge: 3fb75aa61a 9901b802c4 Author: James Agnew <jamesagnew@gmail.com> Date: Mon Jul 31 17:12:33 2017 -0400 Merge branch 'master' into hapi3_refactor commit 3fb75aa61ad29d9f3876a1c30c912627486147af Author: James <jamesagnew@gmail.com> Date: Mon Jul 31 15:21:30 2017 -0400 More work on cleanup commit b02fbb6804127e77c61c4792eefd9fc0d23d63d0 Author: James Agnew <jamesagnew@gmail.com> Date: Sun Jul 30 22:11:07 2017 -0400 Work on porting STU1 tests commit 1ae37b0db3929ea4f37955adf8f026e33ccf43b2 Author: James Agnew <jamesagnew@gmail.com> Date: Sun Jul 30 20:56:10 2017 -0400 Try to get coverage report working commit 72b88849b30a94a9ff08d3a1ab50a05b2acbdfdd Author: James Agnew <jamesagnew@gmail.com> Date: Sun Jul 30 20:27:02 2017 -0400 Fix android tests commit e5f6c35aeab8bbc056870a038e1862181049a020 Author: James <jamesagnew@gmail.com> Date: Sun Jul 30 19:31:18 2017 -0400 More work on getting legacy code cleaned up commit 0b513b0845a082b5c20b0033dfab4e29f5e4a934 Author: James <jamesagnew@gmail.com> Date: Sun Jul 30 18:41:13 2017 -0400 Continue work on removing deprecated API commit defea69aa38a2e0f4137ed9c8527956872ff70bf Author: James Agnew <jamesagnew@gmail.com> Date: Sun Jul 30 17:10:01 2017 -0400 More cleanup of legacy code commit 9ae7295705cb58f5edcf7ee1259f023cbbe2fe51 Author: James <jamesagnew@gmail.com> Date: Sun Jul 30 07:11:45 2017 -0400 More cleanup of legacy code commit ebd3eeb5ee793cf5805cc726db353f3def35ab00 Author: James Agnew <jamesagnew@gmail.com> Date: Sun Jul 30 06:43:25 2017 -0400 More work on removing legacy code commit 92224c2532faf70171473d64429c3ceaf3e3406c Author: James <jamesagnew@gmail.com> Date: Sat Jul 29 18:44:06 2017 -0400 Remove DSTU1 Bundle commit c52cacf71bae3f5c02ffae03881c21de1f3aba22 Author: James <jamesagnew@gmail.com> Date: Sat Jul 29 14:27:42 2017 -0400 Now compiling commit b405e51773baf4ab3a3c387458cdc59541394cd1 Merge: c3ddf04e25 cb2cea54d7 Author: James Agnew <jamesagnew@gmail.com> Date: Fri Jul 28 06:21:02 2017 -0400 Merge branch 'master' into hapi3_refactor commit c3ddf04e2598b8d6214975ab0ae795f850396811 Author: James <jamesagnew@gmail.com> Date: Thu Jul 27 11:06:06 2017 -0400 Sync R4 releases in commit b13333c3c03ddb9a5061c3b22bf011f4592104f8 Author: James <jamesagnew@gmail.com> Date: Fri Jul 14 05:52:33 2017 -0400 JPA server is now able to handle placeholder IDs (e.g. urn:uuid:00....000) being used in Bundle.entry.request.url as a part of the conditional URL within transactions. commit 2e60ff7521b42890a32b97c2dda88ab233f5c91e Author: James Agnew <jamesagnew@gmail.com> Date: Thu Jul 13 20:02:46 2017 -0400 Fix imports commit a92ace2e0dac6e24f6dada53bf97d03861fd21a1 Merge: 3196db96d1 1a6b3ea867 Author: James Agnew <jamesagnew@gmail.com> Date: Thu Jul 13 12:02:27 2017 -0400 Merge branch 'master' into hapi3_refactor commit 3196db96d1c485310e746833df59c0e010b5b161 Author: James Agnew <jamesagnew@gmail.com> Date: Thu Jul 13 11:48:10 2017 -0400 Don't add false paging link to request commit bd4e1d338855a664045caa271d41616aed973a4d Author: James <jamesagnew@gmail.com> Date: Sun Jul 9 21:32:16 2017 -0400 Finally building correctly! commit 6464ce9304703cb3c5ecc58491282ddacc900853 Author: James <jamesagnew@gmail.com> Date: Sun Jul 9 16:38:28 2017 -0400 Work on refactor commit 0059f2e48e9d7c812c1d42a57c5b6059814f5155 Author: James <jamesagnew@gmail.com> Date: Sat Jul 8 07:16:20 2017 -0400 Keep working on refactor commit 6c2e87e8cc19863a811c11623d1c878c8b48f031 Author: James Agnew <jamesagnew@gmail.com> Date: Thu Jul 6 22:35:13 2017 -0400 Lots of work on refactor commit 11cab975047a0c28190e6533074fd3f11ddde240 Merge: 34ec6b8807 6c47bd4c51 Author: James Agnew <jamesagnew@gmail.com> Date: Thu Jul 6 21:43:57 2017 -0400 Merge branch 'master' into hapi3_refactor commit 34ec6b8807946aa6c97f0b5581dca9bd5f7b7a3e Merge: f8e647511b c520e60ac1 Author: James Agnew <jamesagnew@gmail.com> Date: Thu Jul 6 21:43:49 2017 -0400 Merge branch 'hapi3_refactor' of github.com:jamesagnew/hapi-fhir into hapi3_refactor commit f8e647511b4a82e7fde71a8850b8800e3d698b1f Author: James Agnew <jamesagnew@gmail.com> Date: Thu Jul 6 18:46:55 2017 -0400 Work on hapi3 changes commit c520e60ac1198f340cfb9090a7a33f91aa2d1e61 Author: James <jamesagnew@gmail.com> Date: Wed Jul 5 08:08:40 2017 -0400 Keep working on refactor commit f1d2ee90926f7db900a5b3b4ab9a8948d18e49f2 Author: James Agnew <jamesagnew@gmail.com> Date: Mon Jul 3 22:10:59 2017 -0400 Continue refactor for HAPI 3 commit 9281ccafc32354222932c5a9f5ee8b0f206ebc05 Merge: ea1264cd8e 294d080bd3 Author: James Agnew <jamesagnew@gmail.com> Date: Mon Jul 3 20:34:16 2017 -0400 Merge branch 'master' into hapi3_refactor commit ea1264cd8e9b8c5297d218e91cf14bd48d0a92c7 Author: James <jamesagnew@gmail.com> Date: Wed Jun 28 10:26:01 2017 -0400 Continue work on refactor commit fbe2f98a0238f3d4e065db4550dd2ef1b460c0d8 Merge: b2bef47100 0a4dcc32ec Author: James <jamesagnew@gmail.com> Date: Wed Jun 28 06:21:22 2017 -0400 Merge branch 'master' into hapi3_refactor commit b2bef47100370e1248834523d73a630950032d7a Author: James <jamesagnew@gmail.com> Date: Tue Jun 27 21:13:23 2017 -0400 Work on refactor commit 8f76e4e46385daa9ce3442e2d9342453ce373ba3 Author: James Agnew <jamesagnew@gmail.com> Date: Sun Jun 25 21:55:35 2017 -0400 Lots of work on refactoring
2017-08-13 14:39:47 -04:00
}
2014-12-01 08:13:32 -05:00
Merge in HAPI 3.0.0 working branch! Squashed commit of the following: commit 12f89a423a1691fdbc360706fd94a03bd9144d17 Author: James <jamesagnew@gmail.com> Date: Sun Aug 13 14:38:51 2017 -0400 Minimize validation resources commit f6868cce5c73b34d5ecd53bf1a220fdccd6b4e09 Merge: 3b80779fd3 1e158311d8 Author: James <jamesagnew@gmail.com> Date: Sun Aug 13 14:05:34 2017 -0400 Forward port fix for #710 Merge branch 'master' into hapi3_refactor commit 3b80779fd3905cbf5322e6973334eb0ecb3d8426 Merge: 1f534985e8 356d9acaf7 Author: James <jamesagnew@gmail.com> Date: Sun Aug 13 12:31:09 2017 -0400 Forward port #705, #708, and #710 Merge branch 'master' into hapi3_refactor commit 1f534985e8106347d9cc9da2dd8145fdd869547f Merge: 7c39a47852 dedd3d635b Author: James <jamesagnew@gmail.com> Date: Sun Aug 13 10:52:59 2017 -0400 Forward port #695 Merge branch 'master' into hapi3_refactor commit 7c39a47852142bee398101120678217ab0917c7e Merge: e0ffb84d21 6efafe62f1 Author: James <jamesagnew@gmail.com> Date: Sun Aug 13 09:53:17 2017 -0400 Forward port #688 Merge branch 'master' into hapi3_refactor commit e0ffb84d2129c209ccffc2611038592f37dddfd2 Merge: 52388c11c1 d19b00ff09 Author: James <jamesagnew@gmail.com> Date: Sat Aug 12 14:59:46 2017 -0400 Merge branch 'master' into hapi3_refactor commit 52388c11c17cf038591244548f2a592f6b655cee Author: James <jamesagnew@gmail.com> Date: Sat Aug 12 06:21:46 2017 -0400 Cleanup commit 209752cd638266b39574ae11c5989b624d5e85d3 Author: James <jamesagnew@gmail.com> Date: Thu Aug 10 11:18:19 2017 -0400 Fix tests commit 4543408dc8d63b5b9682a275e261d3168cdc2196 Author: James <jamesagnew@gmail.com> Date: Sat Aug 5 06:55:50 2017 -0400 Fix a potential deadlock commit ee360f537692672df473f94dae75c176b2287415 Author: James <jamesagnew@gmail.com> Date: Sat Aug 5 06:22:06 2017 -0400 Add R4 code to CLI commit 1a95ba3b6529afdaf81232b82cc303718c0187d6 Author: James Agnew <jamesagnew@gmail.com> Date: Thu Aug 3 06:14:01 2017 -0400 More cleanup commit f0d88026817296edaa65132accd67d0c8ad8088c Author: James <jamesagnew@gmail.com> Date: Wed Aug 2 11:27:43 2017 -0400 Tests are working! commit a4cbda357e8e7d024f24e3ee9a660b5366983ca1 Author: James Agnew <jamesagnew@gmail.com> Date: Wed Aug 2 10:42:04 2017 -0400 Connection handling cleanup for new tests commit 0e2cecfbd0d7a546444a66e8411600040fd9a17b Author: James Agnew <jamesagnew@gmail.com> Date: Wed Aug 2 10:16:28 2017 -0400 Clean up R4 JPA tests commit 40317a650d72c86e2529d5179cffe63399301de5 Author: James <jamesagnew@gmail.com> Date: Wed Aug 2 09:12:38 2017 -0400 Work on R4 for JPA server commit e7f8f8c30d72ed30d739979964db38d41c5baec1 Author: James <jamesagnew@gmail.com> Date: Tue Aug 1 20:43:47 2017 -0400 More work on porting tests commit 43c9003258696ab33e7bb335e882ab1c66fb61aa Author: James <jamesagnew@gmail.com> Date: Tue Aug 1 07:09:29 2017 -0400 Work on porting DSTU1 tests commit 602857f1e26a69a2284e176b5e44a860d9b828ff Author: James Agnew <jamesagnew@gmail.com> Date: Mon Jul 31 22:34:08 2017 -0400 More work on bring unit tests up to date commit e326a7b0cdb8368009119bba41886838a973e03e Author: James Agnew <jamesagnew@gmail.com> Date: Mon Jul 31 17:36:38 2017 -0400 Credit for #686 and forward port the fix to R4 validator commit 96543c3992adcb406df3c8899dab79cf4bd5b4b4 Merge: 3fb75aa61a 9901b802c4 Author: James Agnew <jamesagnew@gmail.com> Date: Mon Jul 31 17:12:33 2017 -0400 Merge branch 'master' into hapi3_refactor commit 3fb75aa61ad29d9f3876a1c30c912627486147af Author: James <jamesagnew@gmail.com> Date: Mon Jul 31 15:21:30 2017 -0400 More work on cleanup commit b02fbb6804127e77c61c4792eefd9fc0d23d63d0 Author: James Agnew <jamesagnew@gmail.com> Date: Sun Jul 30 22:11:07 2017 -0400 Work on porting STU1 tests commit 1ae37b0db3929ea4f37955adf8f026e33ccf43b2 Author: James Agnew <jamesagnew@gmail.com> Date: Sun Jul 30 20:56:10 2017 -0400 Try to get coverage report working commit 72b88849b30a94a9ff08d3a1ab50a05b2acbdfdd Author: James Agnew <jamesagnew@gmail.com> Date: Sun Jul 30 20:27:02 2017 -0400 Fix android tests commit e5f6c35aeab8bbc056870a038e1862181049a020 Author: James <jamesagnew@gmail.com> Date: Sun Jul 30 19:31:18 2017 -0400 More work on getting legacy code cleaned up commit 0b513b0845a082b5c20b0033dfab4e29f5e4a934 Author: James <jamesagnew@gmail.com> Date: Sun Jul 30 18:41:13 2017 -0400 Continue work on removing deprecated API commit defea69aa38a2e0f4137ed9c8527956872ff70bf Author: James Agnew <jamesagnew@gmail.com> Date: Sun Jul 30 17:10:01 2017 -0400 More cleanup of legacy code commit 9ae7295705cb58f5edcf7ee1259f023cbbe2fe51 Author: James <jamesagnew@gmail.com> Date: Sun Jul 30 07:11:45 2017 -0400 More cleanup of legacy code commit ebd3eeb5ee793cf5805cc726db353f3def35ab00 Author: James Agnew <jamesagnew@gmail.com> Date: Sun Jul 30 06:43:25 2017 -0400 More work on removing legacy code commit 92224c2532faf70171473d64429c3ceaf3e3406c Author: James <jamesagnew@gmail.com> Date: Sat Jul 29 18:44:06 2017 -0400 Remove DSTU1 Bundle commit c52cacf71bae3f5c02ffae03881c21de1f3aba22 Author: James <jamesagnew@gmail.com> Date: Sat Jul 29 14:27:42 2017 -0400 Now compiling commit b405e51773baf4ab3a3c387458cdc59541394cd1 Merge: c3ddf04e25 cb2cea54d7 Author: James Agnew <jamesagnew@gmail.com> Date: Fri Jul 28 06:21:02 2017 -0400 Merge branch 'master' into hapi3_refactor commit c3ddf04e2598b8d6214975ab0ae795f850396811 Author: James <jamesagnew@gmail.com> Date: Thu Jul 27 11:06:06 2017 -0400 Sync R4 releases in commit b13333c3c03ddb9a5061c3b22bf011f4592104f8 Author: James <jamesagnew@gmail.com> Date: Fri Jul 14 05:52:33 2017 -0400 JPA server is now able to handle placeholder IDs (e.g. urn:uuid:00....000) being used in Bundle.entry.request.url as a part of the conditional URL within transactions. commit 2e60ff7521b42890a32b97c2dda88ab233f5c91e Author: James Agnew <jamesagnew@gmail.com> Date: Thu Jul 13 20:02:46 2017 -0400 Fix imports commit a92ace2e0dac6e24f6dada53bf97d03861fd21a1 Merge: 3196db96d1 1a6b3ea867 Author: James Agnew <jamesagnew@gmail.com> Date: Thu Jul 13 12:02:27 2017 -0400 Merge branch 'master' into hapi3_refactor commit 3196db96d1c485310e746833df59c0e010b5b161 Author: James Agnew <jamesagnew@gmail.com> Date: Thu Jul 13 11:48:10 2017 -0400 Don't add false paging link to request commit bd4e1d338855a664045caa271d41616aed973a4d Author: James <jamesagnew@gmail.com> Date: Sun Jul 9 21:32:16 2017 -0400 Finally building correctly! commit 6464ce9304703cb3c5ecc58491282ddacc900853 Author: James <jamesagnew@gmail.com> Date: Sun Jul 9 16:38:28 2017 -0400 Work on refactor commit 0059f2e48e9d7c812c1d42a57c5b6059814f5155 Author: James <jamesagnew@gmail.com> Date: Sat Jul 8 07:16:20 2017 -0400 Keep working on refactor commit 6c2e87e8cc19863a811c11623d1c878c8b48f031 Author: James Agnew <jamesagnew@gmail.com> Date: Thu Jul 6 22:35:13 2017 -0400 Lots of work on refactor commit 11cab975047a0c28190e6533074fd3f11ddde240 Merge: 34ec6b8807 6c47bd4c51 Author: James Agnew <jamesagnew@gmail.com> Date: Thu Jul 6 21:43:57 2017 -0400 Merge branch 'master' into hapi3_refactor commit 34ec6b8807946aa6c97f0b5581dca9bd5f7b7a3e Merge: f8e647511b c520e60ac1 Author: James Agnew <jamesagnew@gmail.com> Date: Thu Jul 6 21:43:49 2017 -0400 Merge branch 'hapi3_refactor' of github.com:jamesagnew/hapi-fhir into hapi3_refactor commit f8e647511b4a82e7fde71a8850b8800e3d698b1f Author: James Agnew <jamesagnew@gmail.com> Date: Thu Jul 6 18:46:55 2017 -0400 Work on hapi3 changes commit c520e60ac1198f340cfb9090a7a33f91aa2d1e61 Author: James <jamesagnew@gmail.com> Date: Wed Jul 5 08:08:40 2017 -0400 Keep working on refactor commit f1d2ee90926f7db900a5b3b4ab9a8948d18e49f2 Author: James Agnew <jamesagnew@gmail.com> Date: Mon Jul 3 22:10:59 2017 -0400 Continue refactor for HAPI 3 commit 9281ccafc32354222932c5a9f5ee8b0f206ebc05 Merge: ea1264cd8e 294d080bd3 Author: James Agnew <jamesagnew@gmail.com> Date: Mon Jul 3 20:34:16 2017 -0400 Merge branch 'master' into hapi3_refactor commit ea1264cd8e9b8c5297d218e91cf14bd48d0a92c7 Author: James <jamesagnew@gmail.com> Date: Wed Jun 28 10:26:01 2017 -0400 Continue work on refactor commit fbe2f98a0238f3d4e065db4550dd2ef1b460c0d8 Merge: b2bef47100 0a4dcc32ec Author: James <jamesagnew@gmail.com> Date: Wed Jun 28 06:21:22 2017 -0400 Merge branch 'master' into hapi3_refactor commit b2bef47100370e1248834523d73a630950032d7a Author: James <jamesagnew@gmail.com> Date: Tue Jun 27 21:13:23 2017 -0400 Work on refactor commit 8f76e4e46385daa9ce3442e2d9342453ce373ba3 Author: James Agnew <jamesagnew@gmail.com> Date: Sun Jun 25 21:55:35 2017 -0400 Lots of work on refactoring
2017-08-13 14:39:47 -04:00
private abstract class BaseState {
Merge in HAPI 3.0.0 working branch! Squashed commit of the following: commit 12f89a423a1691fdbc360706fd94a03bd9144d17 Author: James <jamesagnew@gmail.com> Date: Sun Aug 13 14:38:51 2017 -0400 Minimize validation resources commit f6868cce5c73b34d5ecd53bf1a220fdccd6b4e09 Merge: 3b80779fd3 1e158311d8 Author: James <jamesagnew@gmail.com> Date: Sun Aug 13 14:05:34 2017 -0400 Forward port fix for #710 Merge branch 'master' into hapi3_refactor commit 3b80779fd3905cbf5322e6973334eb0ecb3d8426 Merge: 1f534985e8 356d9acaf7 Author: James <jamesagnew@gmail.com> Date: Sun Aug 13 12:31:09 2017 -0400 Forward port #705, #708, and #710 Merge branch 'master' into hapi3_refactor commit 1f534985e8106347d9cc9da2dd8145fdd869547f Merge: 7c39a47852 dedd3d635b Author: James <jamesagnew@gmail.com> Date: Sun Aug 13 10:52:59 2017 -0400 Forward port #695 Merge branch 'master' into hapi3_refactor commit 7c39a47852142bee398101120678217ab0917c7e Merge: e0ffb84d21 6efafe62f1 Author: James <jamesagnew@gmail.com> Date: Sun Aug 13 09:53:17 2017 -0400 Forward port #688 Merge branch 'master' into hapi3_refactor commit e0ffb84d2129c209ccffc2611038592f37dddfd2 Merge: 52388c11c1 d19b00ff09 Author: James <jamesagnew@gmail.com> Date: Sat Aug 12 14:59:46 2017 -0400 Merge branch 'master' into hapi3_refactor commit 52388c11c17cf038591244548f2a592f6b655cee Author: James <jamesagnew@gmail.com> Date: Sat Aug 12 06:21:46 2017 -0400 Cleanup commit 209752cd638266b39574ae11c5989b624d5e85d3 Author: James <jamesagnew@gmail.com> Date: Thu Aug 10 11:18:19 2017 -0400 Fix tests commit 4543408dc8d63b5b9682a275e261d3168cdc2196 Author: James <jamesagnew@gmail.com> Date: Sat Aug 5 06:55:50 2017 -0400 Fix a potential deadlock commit ee360f537692672df473f94dae75c176b2287415 Author: James <jamesagnew@gmail.com> Date: Sat Aug 5 06:22:06 2017 -0400 Add R4 code to CLI commit 1a95ba3b6529afdaf81232b82cc303718c0187d6 Author: James Agnew <jamesagnew@gmail.com> Date: Thu Aug 3 06:14:01 2017 -0400 More cleanup commit f0d88026817296edaa65132accd67d0c8ad8088c Author: James <jamesagnew@gmail.com> Date: Wed Aug 2 11:27:43 2017 -0400 Tests are working! commit a4cbda357e8e7d024f24e3ee9a660b5366983ca1 Author: James Agnew <jamesagnew@gmail.com> Date: Wed Aug 2 10:42:04 2017 -0400 Connection handling cleanup for new tests commit 0e2cecfbd0d7a546444a66e8411600040fd9a17b Author: James Agnew <jamesagnew@gmail.com> Date: Wed Aug 2 10:16:28 2017 -0400 Clean up R4 JPA tests commit 40317a650d72c86e2529d5179cffe63399301de5 Author: James <jamesagnew@gmail.com> Date: Wed Aug 2 09:12:38 2017 -0400 Work on R4 for JPA server commit e7f8f8c30d72ed30d739979964db38d41c5baec1 Author: James <jamesagnew@gmail.com> Date: Tue Aug 1 20:43:47 2017 -0400 More work on porting tests commit 43c9003258696ab33e7bb335e882ab1c66fb61aa Author: James <jamesagnew@gmail.com> Date: Tue Aug 1 07:09:29 2017 -0400 Work on porting DSTU1 tests commit 602857f1e26a69a2284e176b5e44a860d9b828ff Author: James Agnew <jamesagnew@gmail.com> Date: Mon Jul 31 22:34:08 2017 -0400 More work on bring unit tests up to date commit e326a7b0cdb8368009119bba41886838a973e03e Author: James Agnew <jamesagnew@gmail.com> Date: Mon Jul 31 17:36:38 2017 -0400 Credit for #686 and forward port the fix to R4 validator commit 96543c3992adcb406df3c8899dab79cf4bd5b4b4 Merge: 3fb75aa61a 9901b802c4 Author: James Agnew <jamesagnew@gmail.com> Date: Mon Jul 31 17:12:33 2017 -0400 Merge branch 'master' into hapi3_refactor commit 3fb75aa61ad29d9f3876a1c30c912627486147af Author: James <jamesagnew@gmail.com> Date: Mon Jul 31 15:21:30 2017 -0400 More work on cleanup commit b02fbb6804127e77c61c4792eefd9fc0d23d63d0 Author: James Agnew <jamesagnew@gmail.com> Date: Sun Jul 30 22:11:07 2017 -0400 Work on porting STU1 tests commit 1ae37b0db3929ea4f37955adf8f026e33ccf43b2 Author: James Agnew <jamesagnew@gmail.com> Date: Sun Jul 30 20:56:10 2017 -0400 Try to get coverage report working commit 72b88849b30a94a9ff08d3a1ab50a05b2acbdfdd Author: James Agnew <jamesagnew@gmail.com> Date: Sun Jul 30 20:27:02 2017 -0400 Fix android tests commit e5f6c35aeab8bbc056870a038e1862181049a020 Author: James <jamesagnew@gmail.com> Date: Sun Jul 30 19:31:18 2017 -0400 More work on getting legacy code cleaned up commit 0b513b0845a082b5c20b0033dfab4e29f5e4a934 Author: James <jamesagnew@gmail.com> Date: Sun Jul 30 18:41:13 2017 -0400 Continue work on removing deprecated API commit defea69aa38a2e0f4137ed9c8527956872ff70bf Author: James Agnew <jamesagnew@gmail.com> Date: Sun Jul 30 17:10:01 2017 -0400 More cleanup of legacy code commit 9ae7295705cb58f5edcf7ee1259f023cbbe2fe51 Author: James <jamesagnew@gmail.com> Date: Sun Jul 30 07:11:45 2017 -0400 More cleanup of legacy code commit ebd3eeb5ee793cf5805cc726db353f3def35ab00 Author: James Agnew <jamesagnew@gmail.com> Date: Sun Jul 30 06:43:25 2017 -0400 More work on removing legacy code commit 92224c2532faf70171473d64429c3ceaf3e3406c Author: James <jamesagnew@gmail.com> Date: Sat Jul 29 18:44:06 2017 -0400 Remove DSTU1 Bundle commit c52cacf71bae3f5c02ffae03881c21de1f3aba22 Author: James <jamesagnew@gmail.com> Date: Sat Jul 29 14:27:42 2017 -0400 Now compiling commit b405e51773baf4ab3a3c387458cdc59541394cd1 Merge: c3ddf04e25 cb2cea54d7 Author: James Agnew <jamesagnew@gmail.com> Date: Fri Jul 28 06:21:02 2017 -0400 Merge branch 'master' into hapi3_refactor commit c3ddf04e2598b8d6214975ab0ae795f850396811 Author: James <jamesagnew@gmail.com> Date: Thu Jul 27 11:06:06 2017 -0400 Sync R4 releases in commit b13333c3c03ddb9a5061c3b22bf011f4592104f8 Author: James <jamesagnew@gmail.com> Date: Fri Jul 14 05:52:33 2017 -0400 JPA server is now able to handle placeholder IDs (e.g. urn:uuid:00....000) being used in Bundle.entry.request.url as a part of the conditional URL within transactions. commit 2e60ff7521b42890a32b97c2dda88ab233f5c91e Author: James Agnew <jamesagnew@gmail.com> Date: Thu Jul 13 20:02:46 2017 -0400 Fix imports commit a92ace2e0dac6e24f6dada53bf97d03861fd21a1 Merge: 3196db96d1 1a6b3ea867 Author: James Agnew <jamesagnew@gmail.com> Date: Thu Jul 13 12:02:27 2017 -0400 Merge branch 'master' into hapi3_refactor commit 3196db96d1c485310e746833df59c0e010b5b161 Author: James Agnew <jamesagnew@gmail.com> Date: Thu Jul 13 11:48:10 2017 -0400 Don't add false paging link to request commit bd4e1d338855a664045caa271d41616aed973a4d Author: James <jamesagnew@gmail.com> Date: Sun Jul 9 21:32:16 2017 -0400 Finally building correctly! commit 6464ce9304703cb3c5ecc58491282ddacc900853 Author: James <jamesagnew@gmail.com> Date: Sun Jul 9 16:38:28 2017 -0400 Work on refactor commit 0059f2e48e9d7c812c1d42a57c5b6059814f5155 Author: James <jamesagnew@gmail.com> Date: Sat Jul 8 07:16:20 2017 -0400 Keep working on refactor commit 6c2e87e8cc19863a811c11623d1c878c8b48f031 Author: James Agnew <jamesagnew@gmail.com> Date: Thu Jul 6 22:35:13 2017 -0400 Lots of work on refactor commit 11cab975047a0c28190e6533074fd3f11ddde240 Merge: 34ec6b8807 6c47bd4c51 Author: James Agnew <jamesagnew@gmail.com> Date: Thu Jul 6 21:43:57 2017 -0400 Merge branch 'master' into hapi3_refactor commit 34ec6b8807946aa6c97f0b5581dca9bd5f7b7a3e Merge: f8e647511b c520e60ac1 Author: James Agnew <jamesagnew@gmail.com> Date: Thu Jul 6 21:43:49 2017 -0400 Merge branch 'hapi3_refactor' of github.com:jamesagnew/hapi-fhir into hapi3_refactor commit f8e647511b4a82e7fde71a8850b8800e3d698b1f Author: James Agnew <jamesagnew@gmail.com> Date: Thu Jul 6 18:46:55 2017 -0400 Work on hapi3 changes commit c520e60ac1198f340cfb9090a7a33f91aa2d1e61 Author: James <jamesagnew@gmail.com> Date: Wed Jul 5 08:08:40 2017 -0400 Keep working on refactor commit f1d2ee90926f7db900a5b3b4ab9a8948d18e49f2 Author: James Agnew <jamesagnew@gmail.com> Date: Mon Jul 3 22:10:59 2017 -0400 Continue refactor for HAPI 3 commit 9281ccafc32354222932c5a9f5ee8b0f206ebc05 Merge: ea1264cd8e 294d080bd3 Author: James Agnew <jamesagnew@gmail.com> Date: Mon Jul 3 20:34:16 2017 -0400 Merge branch 'master' into hapi3_refactor commit ea1264cd8e9b8c5297d218e91cf14bd48d0a92c7 Author: James <jamesagnew@gmail.com> Date: Wed Jun 28 10:26:01 2017 -0400 Continue work on refactor commit fbe2f98a0238f3d4e065db4550dd2ef1b460c0d8 Merge: b2bef47100 0a4dcc32ec Author: James <jamesagnew@gmail.com> Date: Wed Jun 28 06:21:22 2017 -0400 Merge branch 'master' into hapi3_refactor commit b2bef47100370e1248834523d73a630950032d7a Author: James <jamesagnew@gmail.com> Date: Tue Jun 27 21:13:23 2017 -0400 Work on refactor commit 8f76e4e46385daa9ce3442e2d9342453ce373ba3 Author: James Agnew <jamesagnew@gmail.com> Date: Sun Jun 25 21:55:35 2017 -0400 Lots of work on refactoring
2017-08-13 14:39:47 -04:00
private PreResourceState myPreResourceState;
private BaseState myStack;
Merge in HAPI 3.0.0 working branch! Squashed commit of the following: commit 12f89a423a1691fdbc360706fd94a03bd9144d17 Author: James <jamesagnew@gmail.com> Date: Sun Aug 13 14:38:51 2017 -0400 Minimize validation resources commit f6868cce5c73b34d5ecd53bf1a220fdccd6b4e09 Merge: 3b80779fd3 1e158311d8 Author: James <jamesagnew@gmail.com> Date: Sun Aug 13 14:05:34 2017 -0400 Forward port fix for #710 Merge branch 'master' into hapi3_refactor commit 3b80779fd3905cbf5322e6973334eb0ecb3d8426 Merge: 1f534985e8 356d9acaf7 Author: James <jamesagnew@gmail.com> Date: Sun Aug 13 12:31:09 2017 -0400 Forward port #705, #708, and #710 Merge branch 'master' into hapi3_refactor commit 1f534985e8106347d9cc9da2dd8145fdd869547f Merge: 7c39a47852 dedd3d635b Author: James <jamesagnew@gmail.com> Date: Sun Aug 13 10:52:59 2017 -0400 Forward port #695 Merge branch 'master' into hapi3_refactor commit 7c39a47852142bee398101120678217ab0917c7e Merge: e0ffb84d21 6efafe62f1 Author: James <jamesagnew@gmail.com> Date: Sun Aug 13 09:53:17 2017 -0400 Forward port #688 Merge branch 'master' into hapi3_refactor commit e0ffb84d2129c209ccffc2611038592f37dddfd2 Merge: 52388c11c1 d19b00ff09 Author: James <jamesagnew@gmail.com> Date: Sat Aug 12 14:59:46 2017 -0400 Merge branch 'master' into hapi3_refactor commit 52388c11c17cf038591244548f2a592f6b655cee Author: James <jamesagnew@gmail.com> Date: Sat Aug 12 06:21:46 2017 -0400 Cleanup commit 209752cd638266b39574ae11c5989b624d5e85d3 Author: James <jamesagnew@gmail.com> Date: Thu Aug 10 11:18:19 2017 -0400 Fix tests commit 4543408dc8d63b5b9682a275e261d3168cdc2196 Author: James <jamesagnew@gmail.com> Date: Sat Aug 5 06:55:50 2017 -0400 Fix a potential deadlock commit ee360f537692672df473f94dae75c176b2287415 Author: James <jamesagnew@gmail.com> Date: Sat Aug 5 06:22:06 2017 -0400 Add R4 code to CLI commit 1a95ba3b6529afdaf81232b82cc303718c0187d6 Author: James Agnew <jamesagnew@gmail.com> Date: Thu Aug 3 06:14:01 2017 -0400 More cleanup commit f0d88026817296edaa65132accd67d0c8ad8088c Author: James <jamesagnew@gmail.com> Date: Wed Aug 2 11:27:43 2017 -0400 Tests are working! commit a4cbda357e8e7d024f24e3ee9a660b5366983ca1 Author: James Agnew <jamesagnew@gmail.com> Date: Wed Aug 2 10:42:04 2017 -0400 Connection handling cleanup for new tests commit 0e2cecfbd0d7a546444a66e8411600040fd9a17b Author: James Agnew <jamesagnew@gmail.com> Date: Wed Aug 2 10:16:28 2017 -0400 Clean up R4 JPA tests commit 40317a650d72c86e2529d5179cffe63399301de5 Author: James <jamesagnew@gmail.com> Date: Wed Aug 2 09:12:38 2017 -0400 Work on R4 for JPA server commit e7f8f8c30d72ed30d739979964db38d41c5baec1 Author: James <jamesagnew@gmail.com> Date: Tue Aug 1 20:43:47 2017 -0400 More work on porting tests commit 43c9003258696ab33e7bb335e882ab1c66fb61aa Author: James <jamesagnew@gmail.com> Date: Tue Aug 1 07:09:29 2017 -0400 Work on porting DSTU1 tests commit 602857f1e26a69a2284e176b5e44a860d9b828ff Author: James Agnew <jamesagnew@gmail.com> Date: Mon Jul 31 22:34:08 2017 -0400 More work on bring unit tests up to date commit e326a7b0cdb8368009119bba41886838a973e03e Author: James Agnew <jamesagnew@gmail.com> Date: Mon Jul 31 17:36:38 2017 -0400 Credit for #686 and forward port the fix to R4 validator commit 96543c3992adcb406df3c8899dab79cf4bd5b4b4 Merge: 3fb75aa61a 9901b802c4 Author: James Agnew <jamesagnew@gmail.com> Date: Mon Jul 31 17:12:33 2017 -0400 Merge branch 'master' into hapi3_refactor commit 3fb75aa61ad29d9f3876a1c30c912627486147af Author: James <jamesagnew@gmail.com> Date: Mon Jul 31 15:21:30 2017 -0400 More work on cleanup commit b02fbb6804127e77c61c4792eefd9fc0d23d63d0 Author: James Agnew <jamesagnew@gmail.com> Date: Sun Jul 30 22:11:07 2017 -0400 Work on porting STU1 tests commit 1ae37b0db3929ea4f37955adf8f026e33ccf43b2 Author: James Agnew <jamesagnew@gmail.com> Date: Sun Jul 30 20:56:10 2017 -0400 Try to get coverage report working commit 72b88849b30a94a9ff08d3a1ab50a05b2acbdfdd Author: James Agnew <jamesagnew@gmail.com> Date: Sun Jul 30 20:27:02 2017 -0400 Fix android tests commit e5f6c35aeab8bbc056870a038e1862181049a020 Author: James <jamesagnew@gmail.com> Date: Sun Jul 30 19:31:18 2017 -0400 More work on getting legacy code cleaned up commit 0b513b0845a082b5c20b0033dfab4e29f5e4a934 Author: James <jamesagnew@gmail.com> Date: Sun Jul 30 18:41:13 2017 -0400 Continue work on removing deprecated API commit defea69aa38a2e0f4137ed9c8527956872ff70bf Author: James Agnew <jamesagnew@gmail.com> Date: Sun Jul 30 17:10:01 2017 -0400 More cleanup of legacy code commit 9ae7295705cb58f5edcf7ee1259f023cbbe2fe51 Author: James <jamesagnew@gmail.com> Date: Sun Jul 30 07:11:45 2017 -0400 More cleanup of legacy code commit ebd3eeb5ee793cf5805cc726db353f3def35ab00 Author: James Agnew <jamesagnew@gmail.com> Date: Sun Jul 30 06:43:25 2017 -0400 More work on removing legacy code commit 92224c2532faf70171473d64429c3ceaf3e3406c Author: James <jamesagnew@gmail.com> Date: Sat Jul 29 18:44:06 2017 -0400 Remove DSTU1 Bundle commit c52cacf71bae3f5c02ffae03881c21de1f3aba22 Author: James <jamesagnew@gmail.com> Date: Sat Jul 29 14:27:42 2017 -0400 Now compiling commit b405e51773baf4ab3a3c387458cdc59541394cd1 Merge: c3ddf04e25 cb2cea54d7 Author: James Agnew <jamesagnew@gmail.com> Date: Fri Jul 28 06:21:02 2017 -0400 Merge branch 'master' into hapi3_refactor commit c3ddf04e2598b8d6214975ab0ae795f850396811 Author: James <jamesagnew@gmail.com> Date: Thu Jul 27 11:06:06 2017 -0400 Sync R4 releases in commit b13333c3c03ddb9a5061c3b22bf011f4592104f8 Author: James <jamesagnew@gmail.com> Date: Fri Jul 14 05:52:33 2017 -0400 JPA server is now able to handle placeholder IDs (e.g. urn:uuid:00....000) being used in Bundle.entry.request.url as a part of the conditional URL within transactions. commit 2e60ff7521b42890a32b97c2dda88ab233f5c91e Author: James Agnew <jamesagnew@gmail.com> Date: Thu Jul 13 20:02:46 2017 -0400 Fix imports commit a92ace2e0dac6e24f6dada53bf97d03861fd21a1 Merge: 3196db96d1 1a6b3ea867 Author: James Agnew <jamesagnew@gmail.com> Date: Thu Jul 13 12:02:27 2017 -0400 Merge branch 'master' into hapi3_refactor commit 3196db96d1c485310e746833df59c0e010b5b161 Author: James Agnew <jamesagnew@gmail.com> Date: Thu Jul 13 11:48:10 2017 -0400 Don't add false paging link to request commit bd4e1d338855a664045caa271d41616aed973a4d Author: James <jamesagnew@gmail.com> Date: Sun Jul 9 21:32:16 2017 -0400 Finally building correctly! commit 6464ce9304703cb3c5ecc58491282ddacc900853 Author: James <jamesagnew@gmail.com> Date: Sun Jul 9 16:38:28 2017 -0400 Work on refactor commit 0059f2e48e9d7c812c1d42a57c5b6059814f5155 Author: James <jamesagnew@gmail.com> Date: Sat Jul 8 07:16:20 2017 -0400 Keep working on refactor commit 6c2e87e8cc19863a811c11623d1c878c8b48f031 Author: James Agnew <jamesagnew@gmail.com> Date: Thu Jul 6 22:35:13 2017 -0400 Lots of work on refactor commit 11cab975047a0c28190e6533074fd3f11ddde240 Merge: 34ec6b8807 6c47bd4c51 Author: James Agnew <jamesagnew@gmail.com> Date: Thu Jul 6 21:43:57 2017 -0400 Merge branch 'master' into hapi3_refactor commit 34ec6b8807946aa6c97f0b5581dca9bd5f7b7a3e Merge: f8e647511b c520e60ac1 Author: James Agnew <jamesagnew@gmail.com> Date: Thu Jul 6 21:43:49 2017 -0400 Merge branch 'hapi3_refactor' of github.com:jamesagnew/hapi-fhir into hapi3_refactor commit f8e647511b4a82e7fde71a8850b8800e3d698b1f Author: James Agnew <jamesagnew@gmail.com> Date: Thu Jul 6 18:46:55 2017 -0400 Work on hapi3 changes commit c520e60ac1198f340cfb9090a7a33f91aa2d1e61 Author: James <jamesagnew@gmail.com> Date: Wed Jul 5 08:08:40 2017 -0400 Keep working on refactor commit f1d2ee90926f7db900a5b3b4ab9a8948d18e49f2 Author: James Agnew <jamesagnew@gmail.com> Date: Mon Jul 3 22:10:59 2017 -0400 Continue refactor for HAPI 3 commit 9281ccafc32354222932c5a9f5ee8b0f206ebc05 Merge: ea1264cd8e 294d080bd3 Author: James Agnew <jamesagnew@gmail.com> Date: Mon Jul 3 20:34:16 2017 -0400 Merge branch 'master' into hapi3_refactor commit ea1264cd8e9b8c5297d218e91cf14bd48d0a92c7 Author: James <jamesagnew@gmail.com> Date: Wed Jun 28 10:26:01 2017 -0400 Continue work on refactor commit fbe2f98a0238f3d4e065db4550dd2ef1b460c0d8 Merge: b2bef47100 0a4dcc32ec Author: James <jamesagnew@gmail.com> Date: Wed Jun 28 06:21:22 2017 -0400 Merge branch 'master' into hapi3_refactor commit b2bef47100370e1248834523d73a630950032d7a Author: James <jamesagnew@gmail.com> Date: Tue Jun 27 21:13:23 2017 -0400 Work on refactor commit 8f76e4e46385daa9ce3442e2d9342453ce373ba3 Author: James Agnew <jamesagnew@gmail.com> Date: Sun Jun 25 21:55:35 2017 -0400 Lots of work on refactoring
2017-08-13 14:39:47 -04:00
public BaseState(PreResourceState thePreResourceState) {
super();
myPreResourceState = thePreResourceState;
}
Merge in HAPI 3.0.0 working branch! Squashed commit of the following: commit 12f89a423a1691fdbc360706fd94a03bd9144d17 Author: James <jamesagnew@gmail.com> Date: Sun Aug 13 14:38:51 2017 -0400 Minimize validation resources commit f6868cce5c73b34d5ecd53bf1a220fdccd6b4e09 Merge: 3b80779fd3 1e158311d8 Author: James <jamesagnew@gmail.com> Date: Sun Aug 13 14:05:34 2017 -0400 Forward port fix for #710 Merge branch 'master' into hapi3_refactor commit 3b80779fd3905cbf5322e6973334eb0ecb3d8426 Merge: 1f534985e8 356d9acaf7 Author: James <jamesagnew@gmail.com> Date: Sun Aug 13 12:31:09 2017 -0400 Forward port #705, #708, and #710 Merge branch 'master' into hapi3_refactor commit 1f534985e8106347d9cc9da2dd8145fdd869547f Merge: 7c39a47852 dedd3d635b Author: James <jamesagnew@gmail.com> Date: Sun Aug 13 10:52:59 2017 -0400 Forward port #695 Merge branch 'master' into hapi3_refactor commit 7c39a47852142bee398101120678217ab0917c7e Merge: e0ffb84d21 6efafe62f1 Author: James <jamesagnew@gmail.com> Date: Sun Aug 13 09:53:17 2017 -0400 Forward port #688 Merge branch 'master' into hapi3_refactor commit e0ffb84d2129c209ccffc2611038592f37dddfd2 Merge: 52388c11c1 d19b00ff09 Author: James <jamesagnew@gmail.com> Date: Sat Aug 12 14:59:46 2017 -0400 Merge branch 'master' into hapi3_refactor commit 52388c11c17cf038591244548f2a592f6b655cee Author: James <jamesagnew@gmail.com> Date: Sat Aug 12 06:21:46 2017 -0400 Cleanup commit 209752cd638266b39574ae11c5989b624d5e85d3 Author: James <jamesagnew@gmail.com> Date: Thu Aug 10 11:18:19 2017 -0400 Fix tests commit 4543408dc8d63b5b9682a275e261d3168cdc2196 Author: James <jamesagnew@gmail.com> Date: Sat Aug 5 06:55:50 2017 -0400 Fix a potential deadlock commit ee360f537692672df473f94dae75c176b2287415 Author: James <jamesagnew@gmail.com> Date: Sat Aug 5 06:22:06 2017 -0400 Add R4 code to CLI commit 1a95ba3b6529afdaf81232b82cc303718c0187d6 Author: James Agnew <jamesagnew@gmail.com> Date: Thu Aug 3 06:14:01 2017 -0400 More cleanup commit f0d88026817296edaa65132accd67d0c8ad8088c Author: James <jamesagnew@gmail.com> Date: Wed Aug 2 11:27:43 2017 -0400 Tests are working! commit a4cbda357e8e7d024f24e3ee9a660b5366983ca1 Author: James Agnew <jamesagnew@gmail.com> Date: Wed Aug 2 10:42:04 2017 -0400 Connection handling cleanup for new tests commit 0e2cecfbd0d7a546444a66e8411600040fd9a17b Author: James Agnew <jamesagnew@gmail.com> Date: Wed Aug 2 10:16:28 2017 -0400 Clean up R4 JPA tests commit 40317a650d72c86e2529d5179cffe63399301de5 Author: James <jamesagnew@gmail.com> Date: Wed Aug 2 09:12:38 2017 -0400 Work on R4 for JPA server commit e7f8f8c30d72ed30d739979964db38d41c5baec1 Author: James <jamesagnew@gmail.com> Date: Tue Aug 1 20:43:47 2017 -0400 More work on porting tests commit 43c9003258696ab33e7bb335e882ab1c66fb61aa Author: James <jamesagnew@gmail.com> Date: Tue Aug 1 07:09:29 2017 -0400 Work on porting DSTU1 tests commit 602857f1e26a69a2284e176b5e44a860d9b828ff Author: James Agnew <jamesagnew@gmail.com> Date: Mon Jul 31 22:34:08 2017 -0400 More work on bring unit tests up to date commit e326a7b0cdb8368009119bba41886838a973e03e Author: James Agnew <jamesagnew@gmail.com> Date: Mon Jul 31 17:36:38 2017 -0400 Credit for #686 and forward port the fix to R4 validator commit 96543c3992adcb406df3c8899dab79cf4bd5b4b4 Merge: 3fb75aa61a 9901b802c4 Author: James Agnew <jamesagnew@gmail.com> Date: Mon Jul 31 17:12:33 2017 -0400 Merge branch 'master' into hapi3_refactor commit 3fb75aa61ad29d9f3876a1c30c912627486147af Author: James <jamesagnew@gmail.com> Date: Mon Jul 31 15:21:30 2017 -0400 More work on cleanup commit b02fbb6804127e77c61c4792eefd9fc0d23d63d0 Author: James Agnew <jamesagnew@gmail.com> Date: Sun Jul 30 22:11:07 2017 -0400 Work on porting STU1 tests commit 1ae37b0db3929ea4f37955adf8f026e33ccf43b2 Author: James Agnew <jamesagnew@gmail.com> Date: Sun Jul 30 20:56:10 2017 -0400 Try to get coverage report working commit 72b88849b30a94a9ff08d3a1ab50a05b2acbdfdd Author: James Agnew <jamesagnew@gmail.com> Date: Sun Jul 30 20:27:02 2017 -0400 Fix android tests commit e5f6c35aeab8bbc056870a038e1862181049a020 Author: James <jamesagnew@gmail.com> Date: Sun Jul 30 19:31:18 2017 -0400 More work on getting legacy code cleaned up commit 0b513b0845a082b5c20b0033dfab4e29f5e4a934 Author: James <jamesagnew@gmail.com> Date: Sun Jul 30 18:41:13 2017 -0400 Continue work on removing deprecated API commit defea69aa38a2e0f4137ed9c8527956872ff70bf Author: James Agnew <jamesagnew@gmail.com> Date: Sun Jul 30 17:10:01 2017 -0400 More cleanup of legacy code commit 9ae7295705cb58f5edcf7ee1259f023cbbe2fe51 Author: James <jamesagnew@gmail.com> Date: Sun Jul 30 07:11:45 2017 -0400 More cleanup of legacy code commit ebd3eeb5ee793cf5805cc726db353f3def35ab00 Author: James Agnew <jamesagnew@gmail.com> Date: Sun Jul 30 06:43:25 2017 -0400 More work on removing legacy code commit 92224c2532faf70171473d64429c3ceaf3e3406c Author: James <jamesagnew@gmail.com> Date: Sat Jul 29 18:44:06 2017 -0400 Remove DSTU1 Bundle commit c52cacf71bae3f5c02ffae03881c21de1f3aba22 Author: James <jamesagnew@gmail.com> Date: Sat Jul 29 14:27:42 2017 -0400 Now compiling commit b405e51773baf4ab3a3c387458cdc59541394cd1 Merge: c3ddf04e25 cb2cea54d7 Author: James Agnew <jamesagnew@gmail.com> Date: Fri Jul 28 06:21:02 2017 -0400 Merge branch 'master' into hapi3_refactor commit c3ddf04e2598b8d6214975ab0ae795f850396811 Author: James <jamesagnew@gmail.com> Date: Thu Jul 27 11:06:06 2017 -0400 Sync R4 releases in commit b13333c3c03ddb9a5061c3b22bf011f4592104f8 Author: James <jamesagnew@gmail.com> Date: Fri Jul 14 05:52:33 2017 -0400 JPA server is now able to handle placeholder IDs (e.g. urn:uuid:00....000) being used in Bundle.entry.request.url as a part of the conditional URL within transactions. commit 2e60ff7521b42890a32b97c2dda88ab233f5c91e Author: James Agnew <jamesagnew@gmail.com> Date: Thu Jul 13 20:02:46 2017 -0400 Fix imports commit a92ace2e0dac6e24f6dada53bf97d03861fd21a1 Merge: 3196db96d1 1a6b3ea867 Author: James Agnew <jamesagnew@gmail.com> Date: Thu Jul 13 12:02:27 2017 -0400 Merge branch 'master' into hapi3_refactor commit 3196db96d1c485310e746833df59c0e010b5b161 Author: James Agnew <jamesagnew@gmail.com> Date: Thu Jul 13 11:48:10 2017 -0400 Don't add false paging link to request commit bd4e1d338855a664045caa271d41616aed973a4d Author: James <jamesagnew@gmail.com> Date: Sun Jul 9 21:32:16 2017 -0400 Finally building correctly! commit 6464ce9304703cb3c5ecc58491282ddacc900853 Author: James <jamesagnew@gmail.com> Date: Sun Jul 9 16:38:28 2017 -0400 Work on refactor commit 0059f2e48e9d7c812c1d42a57c5b6059814f5155 Author: James <jamesagnew@gmail.com> Date: Sat Jul 8 07:16:20 2017 -0400 Keep working on refactor commit 6c2e87e8cc19863a811c11623d1c878c8b48f031 Author: James Agnew <jamesagnew@gmail.com> Date: Thu Jul 6 22:35:13 2017 -0400 Lots of work on refactor commit 11cab975047a0c28190e6533074fd3f11ddde240 Merge: 34ec6b8807 6c47bd4c51 Author: James Agnew <jamesagnew@gmail.com> Date: Thu Jul 6 21:43:57 2017 -0400 Merge branch 'master' into hapi3_refactor commit 34ec6b8807946aa6c97f0b5581dca9bd5f7b7a3e Merge: f8e647511b c520e60ac1 Author: James Agnew <jamesagnew@gmail.com> Date: Thu Jul 6 21:43:49 2017 -0400 Merge branch 'hapi3_refactor' of github.com:jamesagnew/hapi-fhir into hapi3_refactor commit f8e647511b4a82e7fde71a8850b8800e3d698b1f Author: James Agnew <jamesagnew@gmail.com> Date: Thu Jul 6 18:46:55 2017 -0400 Work on hapi3 changes commit c520e60ac1198f340cfb9090a7a33f91aa2d1e61 Author: James <jamesagnew@gmail.com> Date: Wed Jul 5 08:08:40 2017 -0400 Keep working on refactor commit f1d2ee90926f7db900a5b3b4ab9a8948d18e49f2 Author: James Agnew <jamesagnew@gmail.com> Date: Mon Jul 3 22:10:59 2017 -0400 Continue refactor for HAPI 3 commit 9281ccafc32354222932c5a9f5ee8b0f206ebc05 Merge: ea1264cd8e 294d080bd3 Author: James Agnew <jamesagnew@gmail.com> Date: Mon Jul 3 20:34:16 2017 -0400 Merge branch 'master' into hapi3_refactor commit ea1264cd8e9b8c5297d218e91cf14bd48d0a92c7 Author: James <jamesagnew@gmail.com> Date: Wed Jun 28 10:26:01 2017 -0400 Continue work on refactor commit fbe2f98a0238f3d4e065db4550dd2ef1b460c0d8 Merge: b2bef47100 0a4dcc32ec Author: James <jamesagnew@gmail.com> Date: Wed Jun 28 06:21:22 2017 -0400 Merge branch 'master' into hapi3_refactor commit b2bef47100370e1248834523d73a630950032d7a Author: James <jamesagnew@gmail.com> Date: Tue Jun 27 21:13:23 2017 -0400 Work on refactor commit 8f76e4e46385daa9ce3442e2d9342453ce373ba3 Author: James Agnew <jamesagnew@gmail.com> Date: Sun Jun 25 21:55:35 2017 -0400 Lots of work on refactoring
2017-08-13 14:39:47 -04:00
/**
* @param theValue The attribute value
Merge in HAPI 3.0.0 working branch! Squashed commit of the following: commit 12f89a423a1691fdbc360706fd94a03bd9144d17 Author: James <jamesagnew@gmail.com> Date: Sun Aug 13 14:38:51 2017 -0400 Minimize validation resources commit f6868cce5c73b34d5ecd53bf1a220fdccd6b4e09 Merge: 3b80779fd3 1e158311d8 Author: James <jamesagnew@gmail.com> Date: Sun Aug 13 14:05:34 2017 -0400 Forward port fix for #710 Merge branch 'master' into hapi3_refactor commit 3b80779fd3905cbf5322e6973334eb0ecb3d8426 Merge: 1f534985e8 356d9acaf7 Author: James <jamesagnew@gmail.com> Date: Sun Aug 13 12:31:09 2017 -0400 Forward port #705, #708, and #710 Merge branch 'master' into hapi3_refactor commit 1f534985e8106347d9cc9da2dd8145fdd869547f Merge: 7c39a47852 dedd3d635b Author: James <jamesagnew@gmail.com> Date: Sun Aug 13 10:52:59 2017 -0400 Forward port #695 Merge branch 'master' into hapi3_refactor commit 7c39a47852142bee398101120678217ab0917c7e Merge: e0ffb84d21 6efafe62f1 Author: James <jamesagnew@gmail.com> Date: Sun Aug 13 09:53:17 2017 -0400 Forward port #688 Merge branch 'master' into hapi3_refactor commit e0ffb84d2129c209ccffc2611038592f37dddfd2 Merge: 52388c11c1 d19b00ff09 Author: James <jamesagnew@gmail.com> Date: Sat Aug 12 14:59:46 2017 -0400 Merge branch 'master' into hapi3_refactor commit 52388c11c17cf038591244548f2a592f6b655cee Author: James <jamesagnew@gmail.com> Date: Sat Aug 12 06:21:46 2017 -0400 Cleanup commit 209752cd638266b39574ae11c5989b624d5e85d3 Author: James <jamesagnew@gmail.com> Date: Thu Aug 10 11:18:19 2017 -0400 Fix tests commit 4543408dc8d63b5b9682a275e261d3168cdc2196 Author: James <jamesagnew@gmail.com> Date: Sat Aug 5 06:55:50 2017 -0400 Fix a potential deadlock commit ee360f537692672df473f94dae75c176b2287415 Author: James <jamesagnew@gmail.com> Date: Sat Aug 5 06:22:06 2017 -0400 Add R4 code to CLI commit 1a95ba3b6529afdaf81232b82cc303718c0187d6 Author: James Agnew <jamesagnew@gmail.com> Date: Thu Aug 3 06:14:01 2017 -0400 More cleanup commit f0d88026817296edaa65132accd67d0c8ad8088c Author: James <jamesagnew@gmail.com> Date: Wed Aug 2 11:27:43 2017 -0400 Tests are working! commit a4cbda357e8e7d024f24e3ee9a660b5366983ca1 Author: James Agnew <jamesagnew@gmail.com> Date: Wed Aug 2 10:42:04 2017 -0400 Connection handling cleanup for new tests commit 0e2cecfbd0d7a546444a66e8411600040fd9a17b Author: James Agnew <jamesagnew@gmail.com> Date: Wed Aug 2 10:16:28 2017 -0400 Clean up R4 JPA tests commit 40317a650d72c86e2529d5179cffe63399301de5 Author: James <jamesagnew@gmail.com> Date: Wed Aug 2 09:12:38 2017 -0400 Work on R4 for JPA server commit e7f8f8c30d72ed30d739979964db38d41c5baec1 Author: James <jamesagnew@gmail.com> Date: Tue Aug 1 20:43:47 2017 -0400 More work on porting tests commit 43c9003258696ab33e7bb335e882ab1c66fb61aa Author: James <jamesagnew@gmail.com> Date: Tue Aug 1 07:09:29 2017 -0400 Work on porting DSTU1 tests commit 602857f1e26a69a2284e176b5e44a860d9b828ff Author: James Agnew <jamesagnew@gmail.com> Date: Mon Jul 31 22:34:08 2017 -0400 More work on bring unit tests up to date commit e326a7b0cdb8368009119bba41886838a973e03e Author: James Agnew <jamesagnew@gmail.com> Date: Mon Jul 31 17:36:38 2017 -0400 Credit for #686 and forward port the fix to R4 validator commit 96543c3992adcb406df3c8899dab79cf4bd5b4b4 Merge: 3fb75aa61a 9901b802c4 Author: James Agnew <jamesagnew@gmail.com> Date: Mon Jul 31 17:12:33 2017 -0400 Merge branch 'master' into hapi3_refactor commit 3fb75aa61ad29d9f3876a1c30c912627486147af Author: James <jamesagnew@gmail.com> Date: Mon Jul 31 15:21:30 2017 -0400 More work on cleanup commit b02fbb6804127e77c61c4792eefd9fc0d23d63d0 Author: James Agnew <jamesagnew@gmail.com> Date: Sun Jul 30 22:11:07 2017 -0400 Work on porting STU1 tests commit 1ae37b0db3929ea4f37955adf8f026e33ccf43b2 Author: James Agnew <jamesagnew@gmail.com> Date: Sun Jul 30 20:56:10 2017 -0400 Try to get coverage report working commit 72b88849b30a94a9ff08d3a1ab50a05b2acbdfdd Author: James Agnew <jamesagnew@gmail.com> Date: Sun Jul 30 20:27:02 2017 -0400 Fix android tests commit e5f6c35aeab8bbc056870a038e1862181049a020 Author: James <jamesagnew@gmail.com> Date: Sun Jul 30 19:31:18 2017 -0400 More work on getting legacy code cleaned up commit 0b513b0845a082b5c20b0033dfab4e29f5e4a934 Author: James <jamesagnew@gmail.com> Date: Sun Jul 30 18:41:13 2017 -0400 Continue work on removing deprecated API commit defea69aa38a2e0f4137ed9c8527956872ff70bf Author: James Agnew <jamesagnew@gmail.com> Date: Sun Jul 30 17:10:01 2017 -0400 More cleanup of legacy code commit 9ae7295705cb58f5edcf7ee1259f023cbbe2fe51 Author: James <jamesagnew@gmail.com> Date: Sun Jul 30 07:11:45 2017 -0400 More cleanup of legacy code commit ebd3eeb5ee793cf5805cc726db353f3def35ab00 Author: James Agnew <jamesagnew@gmail.com> Date: Sun Jul 30 06:43:25 2017 -0400 More work on removing legacy code commit 92224c2532faf70171473d64429c3ceaf3e3406c Author: James <jamesagnew@gmail.com> Date: Sat Jul 29 18:44:06 2017 -0400 Remove DSTU1 Bundle commit c52cacf71bae3f5c02ffae03881c21de1f3aba22 Author: James <jamesagnew@gmail.com> Date: Sat Jul 29 14:27:42 2017 -0400 Now compiling commit b405e51773baf4ab3a3c387458cdc59541394cd1 Merge: c3ddf04e25 cb2cea54d7 Author: James Agnew <jamesagnew@gmail.com> Date: Fri Jul 28 06:21:02 2017 -0400 Merge branch 'master' into hapi3_refactor commit c3ddf04e2598b8d6214975ab0ae795f850396811 Author: James <jamesagnew@gmail.com> Date: Thu Jul 27 11:06:06 2017 -0400 Sync R4 releases in commit b13333c3c03ddb9a5061c3b22bf011f4592104f8 Author: James <jamesagnew@gmail.com> Date: Fri Jul 14 05:52:33 2017 -0400 JPA server is now able to handle placeholder IDs (e.g. urn:uuid:00....000) being used in Bundle.entry.request.url as a part of the conditional URL within transactions. commit 2e60ff7521b42890a32b97c2dda88ab233f5c91e Author: James Agnew <jamesagnew@gmail.com> Date: Thu Jul 13 20:02:46 2017 -0400 Fix imports commit a92ace2e0dac6e24f6dada53bf97d03861fd21a1 Merge: 3196db96d1 1a6b3ea867 Author: James Agnew <jamesagnew@gmail.com> Date: Thu Jul 13 12:02:27 2017 -0400 Merge branch 'master' into hapi3_refactor commit 3196db96d1c485310e746833df59c0e010b5b161 Author: James Agnew <jamesagnew@gmail.com> Date: Thu Jul 13 11:48:10 2017 -0400 Don't add false paging link to request commit bd4e1d338855a664045caa271d41616aed973a4d Author: James <jamesagnew@gmail.com> Date: Sun Jul 9 21:32:16 2017 -0400 Finally building correctly! commit 6464ce9304703cb3c5ecc58491282ddacc900853 Author: James <jamesagnew@gmail.com> Date: Sun Jul 9 16:38:28 2017 -0400 Work on refactor commit 0059f2e48e9d7c812c1d42a57c5b6059814f5155 Author: James <jamesagnew@gmail.com> Date: Sat Jul 8 07:16:20 2017 -0400 Keep working on refactor commit 6c2e87e8cc19863a811c11623d1c878c8b48f031 Author: James Agnew <jamesagnew@gmail.com> Date: Thu Jul 6 22:35:13 2017 -0400 Lots of work on refactor commit 11cab975047a0c28190e6533074fd3f11ddde240 Merge: 34ec6b8807 6c47bd4c51 Author: James Agnew <jamesagnew@gmail.com> Date: Thu Jul 6 21:43:57 2017 -0400 Merge branch 'master' into hapi3_refactor commit 34ec6b8807946aa6c97f0b5581dca9bd5f7b7a3e Merge: f8e647511b c520e60ac1 Author: James Agnew <jamesagnew@gmail.com> Date: Thu Jul 6 21:43:49 2017 -0400 Merge branch 'hapi3_refactor' of github.com:jamesagnew/hapi-fhir into hapi3_refactor commit f8e647511b4a82e7fde71a8850b8800e3d698b1f Author: James Agnew <jamesagnew@gmail.com> Date: Thu Jul 6 18:46:55 2017 -0400 Work on hapi3 changes commit c520e60ac1198f340cfb9090a7a33f91aa2d1e61 Author: James <jamesagnew@gmail.com> Date: Wed Jul 5 08:08:40 2017 -0400 Keep working on refactor commit f1d2ee90926f7db900a5b3b4ab9a8948d18e49f2 Author: James Agnew <jamesagnew@gmail.com> Date: Mon Jul 3 22:10:59 2017 -0400 Continue refactor for HAPI 3 commit 9281ccafc32354222932c5a9f5ee8b0f206ebc05 Merge: ea1264cd8e 294d080bd3 Author: James Agnew <jamesagnew@gmail.com> Date: Mon Jul 3 20:34:16 2017 -0400 Merge branch 'master' into hapi3_refactor commit ea1264cd8e9b8c5297d218e91cf14bd48d0a92c7 Author: James <jamesagnew@gmail.com> Date: Wed Jun 28 10:26:01 2017 -0400 Continue work on refactor commit fbe2f98a0238f3d4e065db4550dd2ef1b460c0d8 Merge: b2bef47100 0a4dcc32ec Author: James <jamesagnew@gmail.com> Date: Wed Jun 28 06:21:22 2017 -0400 Merge branch 'master' into hapi3_refactor commit b2bef47100370e1248834523d73a630950032d7a Author: James <jamesagnew@gmail.com> Date: Tue Jun 27 21:13:23 2017 -0400 Work on refactor commit 8f76e4e46385daa9ce3442e2d9342453ce373ba3 Author: James Agnew <jamesagnew@gmail.com> Date: Sun Jun 25 21:55:35 2017 -0400 Lots of work on refactoring
2017-08-13 14:39:47 -04:00
*/
public void attributeValue(String theName, String theValue) throws DataFormatException {
myErrorHandler.unknownAttribute(null, theName);
}
2014-12-01 08:13:32 -05:00
Merge in HAPI 3.0.0 working branch! Squashed commit of the following: commit 12f89a423a1691fdbc360706fd94a03bd9144d17 Author: James <jamesagnew@gmail.com> Date: Sun Aug 13 14:38:51 2017 -0400 Minimize validation resources commit f6868cce5c73b34d5ecd53bf1a220fdccd6b4e09 Merge: 3b80779fd3 1e158311d8 Author: James <jamesagnew@gmail.com> Date: Sun Aug 13 14:05:34 2017 -0400 Forward port fix for #710 Merge branch 'master' into hapi3_refactor commit 3b80779fd3905cbf5322e6973334eb0ecb3d8426 Merge: 1f534985e8 356d9acaf7 Author: James <jamesagnew@gmail.com> Date: Sun Aug 13 12:31:09 2017 -0400 Forward port #705, #708, and #710 Merge branch 'master' into hapi3_refactor commit 1f534985e8106347d9cc9da2dd8145fdd869547f Merge: 7c39a47852 dedd3d635b Author: James <jamesagnew@gmail.com> Date: Sun Aug 13 10:52:59 2017 -0400 Forward port #695 Merge branch 'master' into hapi3_refactor commit 7c39a47852142bee398101120678217ab0917c7e Merge: e0ffb84d21 6efafe62f1 Author: James <jamesagnew@gmail.com> Date: Sun Aug 13 09:53:17 2017 -0400 Forward port #688 Merge branch 'master' into hapi3_refactor commit e0ffb84d2129c209ccffc2611038592f37dddfd2 Merge: 52388c11c1 d19b00ff09 Author: James <jamesagnew@gmail.com> Date: Sat Aug 12 14:59:46 2017 -0400 Merge branch 'master' into hapi3_refactor commit 52388c11c17cf038591244548f2a592f6b655cee Author: James <jamesagnew@gmail.com> Date: Sat Aug 12 06:21:46 2017 -0400 Cleanup commit 209752cd638266b39574ae11c5989b624d5e85d3 Author: James <jamesagnew@gmail.com> Date: Thu Aug 10 11:18:19 2017 -0400 Fix tests commit 4543408dc8d63b5b9682a275e261d3168cdc2196 Author: James <jamesagnew@gmail.com> Date: Sat Aug 5 06:55:50 2017 -0400 Fix a potential deadlock commit ee360f537692672df473f94dae75c176b2287415 Author: James <jamesagnew@gmail.com> Date: Sat Aug 5 06:22:06 2017 -0400 Add R4 code to CLI commit 1a95ba3b6529afdaf81232b82cc303718c0187d6 Author: James Agnew <jamesagnew@gmail.com> Date: Thu Aug 3 06:14:01 2017 -0400 More cleanup commit f0d88026817296edaa65132accd67d0c8ad8088c Author: James <jamesagnew@gmail.com> Date: Wed Aug 2 11:27:43 2017 -0400 Tests are working! commit a4cbda357e8e7d024f24e3ee9a660b5366983ca1 Author: James Agnew <jamesagnew@gmail.com> Date: Wed Aug 2 10:42:04 2017 -0400 Connection handling cleanup for new tests commit 0e2cecfbd0d7a546444a66e8411600040fd9a17b Author: James Agnew <jamesagnew@gmail.com> Date: Wed Aug 2 10:16:28 2017 -0400 Clean up R4 JPA tests commit 40317a650d72c86e2529d5179cffe63399301de5 Author: James <jamesagnew@gmail.com> Date: Wed Aug 2 09:12:38 2017 -0400 Work on R4 for JPA server commit e7f8f8c30d72ed30d739979964db38d41c5baec1 Author: James <jamesagnew@gmail.com> Date: Tue Aug 1 20:43:47 2017 -0400 More work on porting tests commit 43c9003258696ab33e7bb335e882ab1c66fb61aa Author: James <jamesagnew@gmail.com> Date: Tue Aug 1 07:09:29 2017 -0400 Work on porting DSTU1 tests commit 602857f1e26a69a2284e176b5e44a860d9b828ff Author: James Agnew <jamesagnew@gmail.com> Date: Mon Jul 31 22:34:08 2017 -0400 More work on bring unit tests up to date commit e326a7b0cdb8368009119bba41886838a973e03e Author: James Agnew <jamesagnew@gmail.com> Date: Mon Jul 31 17:36:38 2017 -0400 Credit for #686 and forward port the fix to R4 validator commit 96543c3992adcb406df3c8899dab79cf4bd5b4b4 Merge: 3fb75aa61a 9901b802c4 Author: James Agnew <jamesagnew@gmail.com> Date: Mon Jul 31 17:12:33 2017 -0400 Merge branch 'master' into hapi3_refactor commit 3fb75aa61ad29d9f3876a1c30c912627486147af Author: James <jamesagnew@gmail.com> Date: Mon Jul 31 15:21:30 2017 -0400 More work on cleanup commit b02fbb6804127e77c61c4792eefd9fc0d23d63d0 Author: James Agnew <jamesagnew@gmail.com> Date: Sun Jul 30 22:11:07 2017 -0400 Work on porting STU1 tests commit 1ae37b0db3929ea4f37955adf8f026e33ccf43b2 Author: James Agnew <jamesagnew@gmail.com> Date: Sun Jul 30 20:56:10 2017 -0400 Try to get coverage report working commit 72b88849b30a94a9ff08d3a1ab50a05b2acbdfdd Author: James Agnew <jamesagnew@gmail.com> Date: Sun Jul 30 20:27:02 2017 -0400 Fix android tests commit e5f6c35aeab8bbc056870a038e1862181049a020 Author: James <jamesagnew@gmail.com> Date: Sun Jul 30 19:31:18 2017 -0400 More work on getting legacy code cleaned up commit 0b513b0845a082b5c20b0033dfab4e29f5e4a934 Author: James <jamesagnew@gmail.com> Date: Sun Jul 30 18:41:13 2017 -0400 Continue work on removing deprecated API commit defea69aa38a2e0f4137ed9c8527956872ff70bf Author: James Agnew <jamesagnew@gmail.com> Date: Sun Jul 30 17:10:01 2017 -0400 More cleanup of legacy code commit 9ae7295705cb58f5edcf7ee1259f023cbbe2fe51 Author: James <jamesagnew@gmail.com> Date: Sun Jul 30 07:11:45 2017 -0400 More cleanup of legacy code commit ebd3eeb5ee793cf5805cc726db353f3def35ab00 Author: James Agnew <jamesagnew@gmail.com> Date: Sun Jul 30 06:43:25 2017 -0400 More work on removing legacy code commit 92224c2532faf70171473d64429c3ceaf3e3406c Author: James <jamesagnew@gmail.com> Date: Sat Jul 29 18:44:06 2017 -0400 Remove DSTU1 Bundle commit c52cacf71bae3f5c02ffae03881c21de1f3aba22 Author: James <jamesagnew@gmail.com> Date: Sat Jul 29 14:27:42 2017 -0400 Now compiling commit b405e51773baf4ab3a3c387458cdc59541394cd1 Merge: c3ddf04e25 cb2cea54d7 Author: James Agnew <jamesagnew@gmail.com> Date: Fri Jul 28 06:21:02 2017 -0400 Merge branch 'master' into hapi3_refactor commit c3ddf04e2598b8d6214975ab0ae795f850396811 Author: James <jamesagnew@gmail.com> Date: Thu Jul 27 11:06:06 2017 -0400 Sync R4 releases in commit b13333c3c03ddb9a5061c3b22bf011f4592104f8 Author: James <jamesagnew@gmail.com> Date: Fri Jul 14 05:52:33 2017 -0400 JPA server is now able to handle placeholder IDs (e.g. urn:uuid:00....000) being used in Bundle.entry.request.url as a part of the conditional URL within transactions. commit 2e60ff7521b42890a32b97c2dda88ab233f5c91e Author: James Agnew <jamesagnew@gmail.com> Date: Thu Jul 13 20:02:46 2017 -0400 Fix imports commit a92ace2e0dac6e24f6dada53bf97d03861fd21a1 Merge: 3196db96d1 1a6b3ea867 Author: James Agnew <jamesagnew@gmail.com> Date: Thu Jul 13 12:02:27 2017 -0400 Merge branch 'master' into hapi3_refactor commit 3196db96d1c485310e746833df59c0e010b5b161 Author: James Agnew <jamesagnew@gmail.com> Date: Thu Jul 13 11:48:10 2017 -0400 Don't add false paging link to request commit bd4e1d338855a664045caa271d41616aed973a4d Author: James <jamesagnew@gmail.com> Date: Sun Jul 9 21:32:16 2017 -0400 Finally building correctly! commit 6464ce9304703cb3c5ecc58491282ddacc900853 Author: James <jamesagnew@gmail.com> Date: Sun Jul 9 16:38:28 2017 -0400 Work on refactor commit 0059f2e48e9d7c812c1d42a57c5b6059814f5155 Author: James <jamesagnew@gmail.com> Date: Sat Jul 8 07:16:20 2017 -0400 Keep working on refactor commit 6c2e87e8cc19863a811c11623d1c878c8b48f031 Author: James Agnew <jamesagnew@gmail.com> Date: Thu Jul 6 22:35:13 2017 -0400 Lots of work on refactor commit 11cab975047a0c28190e6533074fd3f11ddde240 Merge: 34ec6b8807 6c47bd4c51 Author: James Agnew <jamesagnew@gmail.com> Date: Thu Jul 6 21:43:57 2017 -0400 Merge branch 'master' into hapi3_refactor commit 34ec6b8807946aa6c97f0b5581dca9bd5f7b7a3e Merge: f8e647511b c520e60ac1 Author: James Agnew <jamesagnew@gmail.com> Date: Thu Jul 6 21:43:49 2017 -0400 Merge branch 'hapi3_refactor' of github.com:jamesagnew/hapi-fhir into hapi3_refactor commit f8e647511b4a82e7fde71a8850b8800e3d698b1f Author: James Agnew <jamesagnew@gmail.com> Date: Thu Jul 6 18:46:55 2017 -0400 Work on hapi3 changes commit c520e60ac1198f340cfb9090a7a33f91aa2d1e61 Author: James <jamesagnew@gmail.com> Date: Wed Jul 5 08:08:40 2017 -0400 Keep working on refactor commit f1d2ee90926f7db900a5b3b4ab9a8948d18e49f2 Author: James Agnew <jamesagnew@gmail.com> Date: Mon Jul 3 22:10:59 2017 -0400 Continue refactor for HAPI 3 commit 9281ccafc32354222932c5a9f5ee8b0f206ebc05 Merge: ea1264cd8e 294d080bd3 Author: James Agnew <jamesagnew@gmail.com> Date: Mon Jul 3 20:34:16 2017 -0400 Merge branch 'master' into hapi3_refactor commit ea1264cd8e9b8c5297d218e91cf14bd48d0a92c7 Author: James <jamesagnew@gmail.com> Date: Wed Jun 28 10:26:01 2017 -0400 Continue work on refactor commit fbe2f98a0238f3d4e065db4550dd2ef1b460c0d8 Merge: b2bef47100 0a4dcc32ec Author: James <jamesagnew@gmail.com> Date: Wed Jun 28 06:21:22 2017 -0400 Merge branch 'master' into hapi3_refactor commit b2bef47100370e1248834523d73a630950032d7a Author: James <jamesagnew@gmail.com> Date: Tue Jun 27 21:13:23 2017 -0400 Work on refactor commit 8f76e4e46385daa9ce3442e2d9342453ce373ba3 Author: James Agnew <jamesagnew@gmail.com> Date: Sun Jun 25 21:55:35 2017 -0400 Lots of work on refactoring
2017-08-13 14:39:47 -04:00
public boolean elementIsRepeating(String theChildName) {
return false;
2014-12-01 08:13:32 -05:00
}
Merge in HAPI 3.0.0 working branch! Squashed commit of the following: commit 12f89a423a1691fdbc360706fd94a03bd9144d17 Author: James <jamesagnew@gmail.com> Date: Sun Aug 13 14:38:51 2017 -0400 Minimize validation resources commit f6868cce5c73b34d5ecd53bf1a220fdccd6b4e09 Merge: 3b80779fd3 1e158311d8 Author: James <jamesagnew@gmail.com> Date: Sun Aug 13 14:05:34 2017 -0400 Forward port fix for #710 Merge branch 'master' into hapi3_refactor commit 3b80779fd3905cbf5322e6973334eb0ecb3d8426 Merge: 1f534985e8 356d9acaf7 Author: James <jamesagnew@gmail.com> Date: Sun Aug 13 12:31:09 2017 -0400 Forward port #705, #708, and #710 Merge branch 'master' into hapi3_refactor commit 1f534985e8106347d9cc9da2dd8145fdd869547f Merge: 7c39a47852 dedd3d635b Author: James <jamesagnew@gmail.com> Date: Sun Aug 13 10:52:59 2017 -0400 Forward port #695 Merge branch 'master' into hapi3_refactor commit 7c39a47852142bee398101120678217ab0917c7e Merge: e0ffb84d21 6efafe62f1 Author: James <jamesagnew@gmail.com> Date: Sun Aug 13 09:53:17 2017 -0400 Forward port #688 Merge branch 'master' into hapi3_refactor commit e0ffb84d2129c209ccffc2611038592f37dddfd2 Merge: 52388c11c1 d19b00ff09 Author: James <jamesagnew@gmail.com> Date: Sat Aug 12 14:59:46 2017 -0400 Merge branch 'master' into hapi3_refactor commit 52388c11c17cf038591244548f2a592f6b655cee Author: James <jamesagnew@gmail.com> Date: Sat Aug 12 06:21:46 2017 -0400 Cleanup commit 209752cd638266b39574ae11c5989b624d5e85d3 Author: James <jamesagnew@gmail.com> Date: Thu Aug 10 11:18:19 2017 -0400 Fix tests commit 4543408dc8d63b5b9682a275e261d3168cdc2196 Author: James <jamesagnew@gmail.com> Date: Sat Aug 5 06:55:50 2017 -0400 Fix a potential deadlock commit ee360f537692672df473f94dae75c176b2287415 Author: James <jamesagnew@gmail.com> Date: Sat Aug 5 06:22:06 2017 -0400 Add R4 code to CLI commit 1a95ba3b6529afdaf81232b82cc303718c0187d6 Author: James Agnew <jamesagnew@gmail.com> Date: Thu Aug 3 06:14:01 2017 -0400 More cleanup commit f0d88026817296edaa65132accd67d0c8ad8088c Author: James <jamesagnew@gmail.com> Date: Wed Aug 2 11:27:43 2017 -0400 Tests are working! commit a4cbda357e8e7d024f24e3ee9a660b5366983ca1 Author: James Agnew <jamesagnew@gmail.com> Date: Wed Aug 2 10:42:04 2017 -0400 Connection handling cleanup for new tests commit 0e2cecfbd0d7a546444a66e8411600040fd9a17b Author: James Agnew <jamesagnew@gmail.com> Date: Wed Aug 2 10:16:28 2017 -0400 Clean up R4 JPA tests commit 40317a650d72c86e2529d5179cffe63399301de5 Author: James <jamesagnew@gmail.com> Date: Wed Aug 2 09:12:38 2017 -0400 Work on R4 for JPA server commit e7f8f8c30d72ed30d739979964db38d41c5baec1 Author: James <jamesagnew@gmail.com> Date: Tue Aug 1 20:43:47 2017 -0400 More work on porting tests commit 43c9003258696ab33e7bb335e882ab1c66fb61aa Author: James <jamesagnew@gmail.com> Date: Tue Aug 1 07:09:29 2017 -0400 Work on porting DSTU1 tests commit 602857f1e26a69a2284e176b5e44a860d9b828ff Author: James Agnew <jamesagnew@gmail.com> Date: Mon Jul 31 22:34:08 2017 -0400 More work on bring unit tests up to date commit e326a7b0cdb8368009119bba41886838a973e03e Author: James Agnew <jamesagnew@gmail.com> Date: Mon Jul 31 17:36:38 2017 -0400 Credit for #686 and forward port the fix to R4 validator commit 96543c3992adcb406df3c8899dab79cf4bd5b4b4 Merge: 3fb75aa61a 9901b802c4 Author: James Agnew <jamesagnew@gmail.com> Date: Mon Jul 31 17:12:33 2017 -0400 Merge branch 'master' into hapi3_refactor commit 3fb75aa61ad29d9f3876a1c30c912627486147af Author: James <jamesagnew@gmail.com> Date: Mon Jul 31 15:21:30 2017 -0400 More work on cleanup commit b02fbb6804127e77c61c4792eefd9fc0d23d63d0 Author: James Agnew <jamesagnew@gmail.com> Date: Sun Jul 30 22:11:07 2017 -0400 Work on porting STU1 tests commit 1ae37b0db3929ea4f37955adf8f026e33ccf43b2 Author: James Agnew <jamesagnew@gmail.com> Date: Sun Jul 30 20:56:10 2017 -0400 Try to get coverage report working commit 72b88849b30a94a9ff08d3a1ab50a05b2acbdfdd Author: James Agnew <jamesagnew@gmail.com> Date: Sun Jul 30 20:27:02 2017 -0400 Fix android tests commit e5f6c35aeab8bbc056870a038e1862181049a020 Author: James <jamesagnew@gmail.com> Date: Sun Jul 30 19:31:18 2017 -0400 More work on getting legacy code cleaned up commit 0b513b0845a082b5c20b0033dfab4e29f5e4a934 Author: James <jamesagnew@gmail.com> Date: Sun Jul 30 18:41:13 2017 -0400 Continue work on removing deprecated API commit defea69aa38a2e0f4137ed9c8527956872ff70bf Author: James Agnew <jamesagnew@gmail.com> Date: Sun Jul 30 17:10:01 2017 -0400 More cleanup of legacy code commit 9ae7295705cb58f5edcf7ee1259f023cbbe2fe51 Author: James <jamesagnew@gmail.com> Date: Sun Jul 30 07:11:45 2017 -0400 More cleanup of legacy code commit ebd3eeb5ee793cf5805cc726db353f3def35ab00 Author: James Agnew <jamesagnew@gmail.com> Date: Sun Jul 30 06:43:25 2017 -0400 More work on removing legacy code commit 92224c2532faf70171473d64429c3ceaf3e3406c Author: James <jamesagnew@gmail.com> Date: Sat Jul 29 18:44:06 2017 -0400 Remove DSTU1 Bundle commit c52cacf71bae3f5c02ffae03881c21de1f3aba22 Author: James <jamesagnew@gmail.com> Date: Sat Jul 29 14:27:42 2017 -0400 Now compiling commit b405e51773baf4ab3a3c387458cdc59541394cd1 Merge: c3ddf04e25 cb2cea54d7 Author: James Agnew <jamesagnew@gmail.com> Date: Fri Jul 28 06:21:02 2017 -0400 Merge branch 'master' into hapi3_refactor commit c3ddf04e2598b8d6214975ab0ae795f850396811 Author: James <jamesagnew@gmail.com> Date: Thu Jul 27 11:06:06 2017 -0400 Sync R4 releases in commit b13333c3c03ddb9a5061c3b22bf011f4592104f8 Author: James <jamesagnew@gmail.com> Date: Fri Jul 14 05:52:33 2017 -0400 JPA server is now able to handle placeholder IDs (e.g. urn:uuid:00....000) being used in Bundle.entry.request.url as a part of the conditional URL within transactions. commit 2e60ff7521b42890a32b97c2dda88ab233f5c91e Author: James Agnew <jamesagnew@gmail.com> Date: Thu Jul 13 20:02:46 2017 -0400 Fix imports commit a92ace2e0dac6e24f6dada53bf97d03861fd21a1 Merge: 3196db96d1 1a6b3ea867 Author: James Agnew <jamesagnew@gmail.com> Date: Thu Jul 13 12:02:27 2017 -0400 Merge branch 'master' into hapi3_refactor commit 3196db96d1c485310e746833df59c0e010b5b161 Author: James Agnew <jamesagnew@gmail.com> Date: Thu Jul 13 11:48:10 2017 -0400 Don't add false paging link to request commit bd4e1d338855a664045caa271d41616aed973a4d Author: James <jamesagnew@gmail.com> Date: Sun Jul 9 21:32:16 2017 -0400 Finally building correctly! commit 6464ce9304703cb3c5ecc58491282ddacc900853 Author: James <jamesagnew@gmail.com> Date: Sun Jul 9 16:38:28 2017 -0400 Work on refactor commit 0059f2e48e9d7c812c1d42a57c5b6059814f5155 Author: James <jamesagnew@gmail.com> Date: Sat Jul 8 07:16:20 2017 -0400 Keep working on refactor commit 6c2e87e8cc19863a811c11623d1c878c8b48f031 Author: James Agnew <jamesagnew@gmail.com> Date: Thu Jul 6 22:35:13 2017 -0400 Lots of work on refactor commit 11cab975047a0c28190e6533074fd3f11ddde240 Merge: 34ec6b8807 6c47bd4c51 Author: James Agnew <jamesagnew@gmail.com> Date: Thu Jul 6 21:43:57 2017 -0400 Merge branch 'master' into hapi3_refactor commit 34ec6b8807946aa6c97f0b5581dca9bd5f7b7a3e Merge: f8e647511b c520e60ac1 Author: James Agnew <jamesagnew@gmail.com> Date: Thu Jul 6 21:43:49 2017 -0400 Merge branch 'hapi3_refactor' of github.com:jamesagnew/hapi-fhir into hapi3_refactor commit f8e647511b4a82e7fde71a8850b8800e3d698b1f Author: James Agnew <jamesagnew@gmail.com> Date: Thu Jul 6 18:46:55 2017 -0400 Work on hapi3 changes commit c520e60ac1198f340cfb9090a7a33f91aa2d1e61 Author: James <jamesagnew@gmail.com> Date: Wed Jul 5 08:08:40 2017 -0400 Keep working on refactor commit f1d2ee90926f7db900a5b3b4ab9a8948d18e49f2 Author: James Agnew <jamesagnew@gmail.com> Date: Mon Jul 3 22:10:59 2017 -0400 Continue refactor for HAPI 3 commit 9281ccafc32354222932c5a9f5ee8b0f206ebc05 Merge: ea1264cd8e 294d080bd3 Author: James Agnew <jamesagnew@gmail.com> Date: Mon Jul 3 20:34:16 2017 -0400 Merge branch 'master' into hapi3_refactor commit ea1264cd8e9b8c5297d218e91cf14bd48d0a92c7 Author: James <jamesagnew@gmail.com> Date: Wed Jun 28 10:26:01 2017 -0400 Continue work on refactor commit fbe2f98a0238f3d4e065db4550dd2ef1b460c0d8 Merge: b2bef47100 0a4dcc32ec Author: James <jamesagnew@gmail.com> Date: Wed Jun 28 06:21:22 2017 -0400 Merge branch 'master' into hapi3_refactor commit b2bef47100370e1248834523d73a630950032d7a Author: James <jamesagnew@gmail.com> Date: Tue Jun 27 21:13:23 2017 -0400 Work on refactor commit 8f76e4e46385daa9ce3442e2d9342453ce373ba3 Author: James Agnew <jamesagnew@gmail.com> Date: Sun Jun 25 21:55:35 2017 -0400 Lots of work on refactoring
2017-08-13 14:39:47 -04:00
public void endingElement() throws DataFormatException {
// ignore by default
2014-12-01 08:13:32 -05:00
}
Merge in HAPI 3.0.0 working branch! Squashed commit of the following: commit 12f89a423a1691fdbc360706fd94a03bd9144d17 Author: James <jamesagnew@gmail.com> Date: Sun Aug 13 14:38:51 2017 -0400 Minimize validation resources commit f6868cce5c73b34d5ecd53bf1a220fdccd6b4e09 Merge: 3b80779fd3 1e158311d8 Author: James <jamesagnew@gmail.com> Date: Sun Aug 13 14:05:34 2017 -0400 Forward port fix for #710 Merge branch 'master' into hapi3_refactor commit 3b80779fd3905cbf5322e6973334eb0ecb3d8426 Merge: 1f534985e8 356d9acaf7 Author: James <jamesagnew@gmail.com> Date: Sun Aug 13 12:31:09 2017 -0400 Forward port #705, #708, and #710 Merge branch 'master' into hapi3_refactor commit 1f534985e8106347d9cc9da2dd8145fdd869547f Merge: 7c39a47852 dedd3d635b Author: James <jamesagnew@gmail.com> Date: Sun Aug 13 10:52:59 2017 -0400 Forward port #695 Merge branch 'master' into hapi3_refactor commit 7c39a47852142bee398101120678217ab0917c7e Merge: e0ffb84d21 6efafe62f1 Author: James <jamesagnew@gmail.com> Date: Sun Aug 13 09:53:17 2017 -0400 Forward port #688 Merge branch 'master' into hapi3_refactor commit e0ffb84d2129c209ccffc2611038592f37dddfd2 Merge: 52388c11c1 d19b00ff09 Author: James <jamesagnew@gmail.com> Date: Sat Aug 12 14:59:46 2017 -0400 Merge branch 'master' into hapi3_refactor commit 52388c11c17cf038591244548f2a592f6b655cee Author: James <jamesagnew@gmail.com> Date: Sat Aug 12 06:21:46 2017 -0400 Cleanup commit 209752cd638266b39574ae11c5989b624d5e85d3 Author: James <jamesagnew@gmail.com> Date: Thu Aug 10 11:18:19 2017 -0400 Fix tests commit 4543408dc8d63b5b9682a275e261d3168cdc2196 Author: James <jamesagnew@gmail.com> Date: Sat Aug 5 06:55:50 2017 -0400 Fix a potential deadlock commit ee360f537692672df473f94dae75c176b2287415 Author: James <jamesagnew@gmail.com> Date: Sat Aug 5 06:22:06 2017 -0400 Add R4 code to CLI commit 1a95ba3b6529afdaf81232b82cc303718c0187d6 Author: James Agnew <jamesagnew@gmail.com> Date: Thu Aug 3 06:14:01 2017 -0400 More cleanup commit f0d88026817296edaa65132accd67d0c8ad8088c Author: James <jamesagnew@gmail.com> Date: Wed Aug 2 11:27:43 2017 -0400 Tests are working! commit a4cbda357e8e7d024f24e3ee9a660b5366983ca1 Author: James Agnew <jamesagnew@gmail.com> Date: Wed Aug 2 10:42:04 2017 -0400 Connection handling cleanup for new tests commit 0e2cecfbd0d7a546444a66e8411600040fd9a17b Author: James Agnew <jamesagnew@gmail.com> Date: Wed Aug 2 10:16:28 2017 -0400 Clean up R4 JPA tests commit 40317a650d72c86e2529d5179cffe63399301de5 Author: James <jamesagnew@gmail.com> Date: Wed Aug 2 09:12:38 2017 -0400 Work on R4 for JPA server commit e7f8f8c30d72ed30d739979964db38d41c5baec1 Author: James <jamesagnew@gmail.com> Date: Tue Aug 1 20:43:47 2017 -0400 More work on porting tests commit 43c9003258696ab33e7bb335e882ab1c66fb61aa Author: James <jamesagnew@gmail.com> Date: Tue Aug 1 07:09:29 2017 -0400 Work on porting DSTU1 tests commit 602857f1e26a69a2284e176b5e44a860d9b828ff Author: James Agnew <jamesagnew@gmail.com> Date: Mon Jul 31 22:34:08 2017 -0400 More work on bring unit tests up to date commit e326a7b0cdb8368009119bba41886838a973e03e Author: James Agnew <jamesagnew@gmail.com> Date: Mon Jul 31 17:36:38 2017 -0400 Credit for #686 and forward port the fix to R4 validator commit 96543c3992adcb406df3c8899dab79cf4bd5b4b4 Merge: 3fb75aa61a 9901b802c4 Author: James Agnew <jamesagnew@gmail.com> Date: Mon Jul 31 17:12:33 2017 -0400 Merge branch 'master' into hapi3_refactor commit 3fb75aa61ad29d9f3876a1c30c912627486147af Author: James <jamesagnew@gmail.com> Date: Mon Jul 31 15:21:30 2017 -0400 More work on cleanup commit b02fbb6804127e77c61c4792eefd9fc0d23d63d0 Author: James Agnew <jamesagnew@gmail.com> Date: Sun Jul 30 22:11:07 2017 -0400 Work on porting STU1 tests commit 1ae37b0db3929ea4f37955adf8f026e33ccf43b2 Author: James Agnew <jamesagnew@gmail.com> Date: Sun Jul 30 20:56:10 2017 -0400 Try to get coverage report working commit 72b88849b30a94a9ff08d3a1ab50a05b2acbdfdd Author: James Agnew <jamesagnew@gmail.com> Date: Sun Jul 30 20:27:02 2017 -0400 Fix android tests commit e5f6c35aeab8bbc056870a038e1862181049a020 Author: James <jamesagnew@gmail.com> Date: Sun Jul 30 19:31:18 2017 -0400 More work on getting legacy code cleaned up commit 0b513b0845a082b5c20b0033dfab4e29f5e4a934 Author: James <jamesagnew@gmail.com> Date: Sun Jul 30 18:41:13 2017 -0400 Continue work on removing deprecated API commit defea69aa38a2e0f4137ed9c8527956872ff70bf Author: James Agnew <jamesagnew@gmail.com> Date: Sun Jul 30 17:10:01 2017 -0400 More cleanup of legacy code commit 9ae7295705cb58f5edcf7ee1259f023cbbe2fe51 Author: James <jamesagnew@gmail.com> Date: Sun Jul 30 07:11:45 2017 -0400 More cleanup of legacy code commit ebd3eeb5ee793cf5805cc726db353f3def35ab00 Author: James Agnew <jamesagnew@gmail.com> Date: Sun Jul 30 06:43:25 2017 -0400 More work on removing legacy code commit 92224c2532faf70171473d64429c3ceaf3e3406c Author: James <jamesagnew@gmail.com> Date: Sat Jul 29 18:44:06 2017 -0400 Remove DSTU1 Bundle commit c52cacf71bae3f5c02ffae03881c21de1f3aba22 Author: James <jamesagnew@gmail.com> Date: Sat Jul 29 14:27:42 2017 -0400 Now compiling commit b405e51773baf4ab3a3c387458cdc59541394cd1 Merge: c3ddf04e25 cb2cea54d7 Author: James Agnew <jamesagnew@gmail.com> Date: Fri Jul 28 06:21:02 2017 -0400 Merge branch 'master' into hapi3_refactor commit c3ddf04e2598b8d6214975ab0ae795f850396811 Author: James <jamesagnew@gmail.com> Date: Thu Jul 27 11:06:06 2017 -0400 Sync R4 releases in commit b13333c3c03ddb9a5061c3b22bf011f4592104f8 Author: James <jamesagnew@gmail.com> Date: Fri Jul 14 05:52:33 2017 -0400 JPA server is now able to handle placeholder IDs (e.g. urn:uuid:00....000) being used in Bundle.entry.request.url as a part of the conditional URL within transactions. commit 2e60ff7521b42890a32b97c2dda88ab233f5c91e Author: James Agnew <jamesagnew@gmail.com> Date: Thu Jul 13 20:02:46 2017 -0400 Fix imports commit a92ace2e0dac6e24f6dada53bf97d03861fd21a1 Merge: 3196db96d1 1a6b3ea867 Author: James Agnew <jamesagnew@gmail.com> Date: Thu Jul 13 12:02:27 2017 -0400 Merge branch 'master' into hapi3_refactor commit 3196db96d1c485310e746833df59c0e010b5b161 Author: James Agnew <jamesagnew@gmail.com> Date: Thu Jul 13 11:48:10 2017 -0400 Don't add false paging link to request commit bd4e1d338855a664045caa271d41616aed973a4d Author: James <jamesagnew@gmail.com> Date: Sun Jul 9 21:32:16 2017 -0400 Finally building correctly! commit 6464ce9304703cb3c5ecc58491282ddacc900853 Author: James <jamesagnew@gmail.com> Date: Sun Jul 9 16:38:28 2017 -0400 Work on refactor commit 0059f2e48e9d7c812c1d42a57c5b6059814f5155 Author: James <jamesagnew@gmail.com> Date: Sat Jul 8 07:16:20 2017 -0400 Keep working on refactor commit 6c2e87e8cc19863a811c11623d1c878c8b48f031 Author: James Agnew <jamesagnew@gmail.com> Date: Thu Jul 6 22:35:13 2017 -0400 Lots of work on refactor commit 11cab975047a0c28190e6533074fd3f11ddde240 Merge: 34ec6b8807 6c47bd4c51 Author: James Agnew <jamesagnew@gmail.com> Date: Thu Jul 6 21:43:57 2017 -0400 Merge branch 'master' into hapi3_refactor commit 34ec6b8807946aa6c97f0b5581dca9bd5f7b7a3e Merge: f8e647511b c520e60ac1 Author: James Agnew <jamesagnew@gmail.com> Date: Thu Jul 6 21:43:49 2017 -0400 Merge branch 'hapi3_refactor' of github.com:jamesagnew/hapi-fhir into hapi3_refactor commit f8e647511b4a82e7fde71a8850b8800e3d698b1f Author: James Agnew <jamesagnew@gmail.com> Date: Thu Jul 6 18:46:55 2017 -0400 Work on hapi3 changes commit c520e60ac1198f340cfb9090a7a33f91aa2d1e61 Author: James <jamesagnew@gmail.com> Date: Wed Jul 5 08:08:40 2017 -0400 Keep working on refactor commit f1d2ee90926f7db900a5b3b4ab9a8948d18e49f2 Author: James Agnew <jamesagnew@gmail.com> Date: Mon Jul 3 22:10:59 2017 -0400 Continue refactor for HAPI 3 commit 9281ccafc32354222932c5a9f5ee8b0f206ebc05 Merge: ea1264cd8e 294d080bd3 Author: James Agnew <jamesagnew@gmail.com> Date: Mon Jul 3 20:34:16 2017 -0400 Merge branch 'master' into hapi3_refactor commit ea1264cd8e9b8c5297d218e91cf14bd48d0a92c7 Author: James <jamesagnew@gmail.com> Date: Wed Jun 28 10:26:01 2017 -0400 Continue work on refactor commit fbe2f98a0238f3d4e065db4550dd2ef1b460c0d8 Merge: b2bef47100 0a4dcc32ec Author: James <jamesagnew@gmail.com> Date: Wed Jun 28 06:21:22 2017 -0400 Merge branch 'master' into hapi3_refactor commit b2bef47100370e1248834523d73a630950032d7a Author: James <jamesagnew@gmail.com> Date: Tue Jun 27 21:13:23 2017 -0400 Work on refactor commit 8f76e4e46385daa9ce3442e2d9342453ce373ba3 Author: James Agnew <jamesagnew@gmail.com> Date: Sun Jun 25 21:55:35 2017 -0400 Lots of work on refactoring
2017-08-13 14:39:47 -04:00
/**
* @param theNamespaceUri The XML namespace (if XML) or null
Merge in HAPI 3.0.0 working branch! Squashed commit of the following: commit 12f89a423a1691fdbc360706fd94a03bd9144d17 Author: James <jamesagnew@gmail.com> Date: Sun Aug 13 14:38:51 2017 -0400 Minimize validation resources commit f6868cce5c73b34d5ecd53bf1a220fdccd6b4e09 Merge: 3b80779fd3 1e158311d8 Author: James <jamesagnew@gmail.com> Date: Sun Aug 13 14:05:34 2017 -0400 Forward port fix for #710 Merge branch 'master' into hapi3_refactor commit 3b80779fd3905cbf5322e6973334eb0ecb3d8426 Merge: 1f534985e8 356d9acaf7 Author: James <jamesagnew@gmail.com> Date: Sun Aug 13 12:31:09 2017 -0400 Forward port #705, #708, and #710 Merge branch 'master' into hapi3_refactor commit 1f534985e8106347d9cc9da2dd8145fdd869547f Merge: 7c39a47852 dedd3d635b Author: James <jamesagnew@gmail.com> Date: Sun Aug 13 10:52:59 2017 -0400 Forward port #695 Merge branch 'master' into hapi3_refactor commit 7c39a47852142bee398101120678217ab0917c7e Merge: e0ffb84d21 6efafe62f1 Author: James <jamesagnew@gmail.com> Date: Sun Aug 13 09:53:17 2017 -0400 Forward port #688 Merge branch 'master' into hapi3_refactor commit e0ffb84d2129c209ccffc2611038592f37dddfd2 Merge: 52388c11c1 d19b00ff09 Author: James <jamesagnew@gmail.com> Date: Sat Aug 12 14:59:46 2017 -0400 Merge branch 'master' into hapi3_refactor commit 52388c11c17cf038591244548f2a592f6b655cee Author: James <jamesagnew@gmail.com> Date: Sat Aug 12 06:21:46 2017 -0400 Cleanup commit 209752cd638266b39574ae11c5989b624d5e85d3 Author: James <jamesagnew@gmail.com> Date: Thu Aug 10 11:18:19 2017 -0400 Fix tests commit 4543408dc8d63b5b9682a275e261d3168cdc2196 Author: James <jamesagnew@gmail.com> Date: Sat Aug 5 06:55:50 2017 -0400 Fix a potential deadlock commit ee360f537692672df473f94dae75c176b2287415 Author: James <jamesagnew@gmail.com> Date: Sat Aug 5 06:22:06 2017 -0400 Add R4 code to CLI commit 1a95ba3b6529afdaf81232b82cc303718c0187d6 Author: James Agnew <jamesagnew@gmail.com> Date: Thu Aug 3 06:14:01 2017 -0400 More cleanup commit f0d88026817296edaa65132accd67d0c8ad8088c Author: James <jamesagnew@gmail.com> Date: Wed Aug 2 11:27:43 2017 -0400 Tests are working! commit a4cbda357e8e7d024f24e3ee9a660b5366983ca1 Author: James Agnew <jamesagnew@gmail.com> Date: Wed Aug 2 10:42:04 2017 -0400 Connection handling cleanup for new tests commit 0e2cecfbd0d7a546444a66e8411600040fd9a17b Author: James Agnew <jamesagnew@gmail.com> Date: Wed Aug 2 10:16:28 2017 -0400 Clean up R4 JPA tests commit 40317a650d72c86e2529d5179cffe63399301de5 Author: James <jamesagnew@gmail.com> Date: Wed Aug 2 09:12:38 2017 -0400 Work on R4 for JPA server commit e7f8f8c30d72ed30d739979964db38d41c5baec1 Author: James <jamesagnew@gmail.com> Date: Tue Aug 1 20:43:47 2017 -0400 More work on porting tests commit 43c9003258696ab33e7bb335e882ab1c66fb61aa Author: James <jamesagnew@gmail.com> Date: Tue Aug 1 07:09:29 2017 -0400 Work on porting DSTU1 tests commit 602857f1e26a69a2284e176b5e44a860d9b828ff Author: James Agnew <jamesagnew@gmail.com> Date: Mon Jul 31 22:34:08 2017 -0400 More work on bring unit tests up to date commit e326a7b0cdb8368009119bba41886838a973e03e Author: James Agnew <jamesagnew@gmail.com> Date: Mon Jul 31 17:36:38 2017 -0400 Credit for #686 and forward port the fix to R4 validator commit 96543c3992adcb406df3c8899dab79cf4bd5b4b4 Merge: 3fb75aa61a 9901b802c4 Author: James Agnew <jamesagnew@gmail.com> Date: Mon Jul 31 17:12:33 2017 -0400 Merge branch 'master' into hapi3_refactor commit 3fb75aa61ad29d9f3876a1c30c912627486147af Author: James <jamesagnew@gmail.com> Date: Mon Jul 31 15:21:30 2017 -0400 More work on cleanup commit b02fbb6804127e77c61c4792eefd9fc0d23d63d0 Author: James Agnew <jamesagnew@gmail.com> Date: Sun Jul 30 22:11:07 2017 -0400 Work on porting STU1 tests commit 1ae37b0db3929ea4f37955adf8f026e33ccf43b2 Author: James Agnew <jamesagnew@gmail.com> Date: Sun Jul 30 20:56:10 2017 -0400 Try to get coverage report working commit 72b88849b30a94a9ff08d3a1ab50a05b2acbdfdd Author: James Agnew <jamesagnew@gmail.com> Date: Sun Jul 30 20:27:02 2017 -0400 Fix android tests commit e5f6c35aeab8bbc056870a038e1862181049a020 Author: James <jamesagnew@gmail.com> Date: Sun Jul 30 19:31:18 2017 -0400 More work on getting legacy code cleaned up commit 0b513b0845a082b5c20b0033dfab4e29f5e4a934 Author: James <jamesagnew@gmail.com> Date: Sun Jul 30 18:41:13 2017 -0400 Continue work on removing deprecated API commit defea69aa38a2e0f4137ed9c8527956872ff70bf Author: James Agnew <jamesagnew@gmail.com> Date: Sun Jul 30 17:10:01 2017 -0400 More cleanup of legacy code commit 9ae7295705cb58f5edcf7ee1259f023cbbe2fe51 Author: James <jamesagnew@gmail.com> Date: Sun Jul 30 07:11:45 2017 -0400 More cleanup of legacy code commit ebd3eeb5ee793cf5805cc726db353f3def35ab00 Author: James Agnew <jamesagnew@gmail.com> Date: Sun Jul 30 06:43:25 2017 -0400 More work on removing legacy code commit 92224c2532faf70171473d64429c3ceaf3e3406c Author: James <jamesagnew@gmail.com> Date: Sat Jul 29 18:44:06 2017 -0400 Remove DSTU1 Bundle commit c52cacf71bae3f5c02ffae03881c21de1f3aba22 Author: James <jamesagnew@gmail.com> Date: Sat Jul 29 14:27:42 2017 -0400 Now compiling commit b405e51773baf4ab3a3c387458cdc59541394cd1 Merge: c3ddf04e25 cb2cea54d7 Author: James Agnew <jamesagnew@gmail.com> Date: Fri Jul 28 06:21:02 2017 -0400 Merge branch 'master' into hapi3_refactor commit c3ddf04e2598b8d6214975ab0ae795f850396811 Author: James <jamesagnew@gmail.com> Date: Thu Jul 27 11:06:06 2017 -0400 Sync R4 releases in commit b13333c3c03ddb9a5061c3b22bf011f4592104f8 Author: James <jamesagnew@gmail.com> Date: Fri Jul 14 05:52:33 2017 -0400 JPA server is now able to handle placeholder IDs (e.g. urn:uuid:00....000) being used in Bundle.entry.request.url as a part of the conditional URL within transactions. commit 2e60ff7521b42890a32b97c2dda88ab233f5c91e Author: James Agnew <jamesagnew@gmail.com> Date: Thu Jul 13 20:02:46 2017 -0400 Fix imports commit a92ace2e0dac6e24f6dada53bf97d03861fd21a1 Merge: 3196db96d1 1a6b3ea867 Author: James Agnew <jamesagnew@gmail.com> Date: Thu Jul 13 12:02:27 2017 -0400 Merge branch 'master' into hapi3_refactor commit 3196db96d1c485310e746833df59c0e010b5b161 Author: James Agnew <jamesagnew@gmail.com> Date: Thu Jul 13 11:48:10 2017 -0400 Don't add false paging link to request commit bd4e1d338855a664045caa271d41616aed973a4d Author: James <jamesagnew@gmail.com> Date: Sun Jul 9 21:32:16 2017 -0400 Finally building correctly! commit 6464ce9304703cb3c5ecc58491282ddacc900853 Author: James <jamesagnew@gmail.com> Date: Sun Jul 9 16:38:28 2017 -0400 Work on refactor commit 0059f2e48e9d7c812c1d42a57c5b6059814f5155 Author: James <jamesagnew@gmail.com> Date: Sat Jul 8 07:16:20 2017 -0400 Keep working on refactor commit 6c2e87e8cc19863a811c11623d1c878c8b48f031 Author: James Agnew <jamesagnew@gmail.com> Date: Thu Jul 6 22:35:13 2017 -0400 Lots of work on refactor commit 11cab975047a0c28190e6533074fd3f11ddde240 Merge: 34ec6b8807 6c47bd4c51 Author: James Agnew <jamesagnew@gmail.com> Date: Thu Jul 6 21:43:57 2017 -0400 Merge branch 'master' into hapi3_refactor commit 34ec6b8807946aa6c97f0b5581dca9bd5f7b7a3e Merge: f8e647511b c520e60ac1 Author: James Agnew <jamesagnew@gmail.com> Date: Thu Jul 6 21:43:49 2017 -0400 Merge branch 'hapi3_refactor' of github.com:jamesagnew/hapi-fhir into hapi3_refactor commit f8e647511b4a82e7fde71a8850b8800e3d698b1f Author: James Agnew <jamesagnew@gmail.com> Date: Thu Jul 6 18:46:55 2017 -0400 Work on hapi3 changes commit c520e60ac1198f340cfb9090a7a33f91aa2d1e61 Author: James <jamesagnew@gmail.com> Date: Wed Jul 5 08:08:40 2017 -0400 Keep working on refactor commit f1d2ee90926f7db900a5b3b4ab9a8948d18e49f2 Author: James Agnew <jamesagnew@gmail.com> Date: Mon Jul 3 22:10:59 2017 -0400 Continue refactor for HAPI 3 commit 9281ccafc32354222932c5a9f5ee8b0f206ebc05 Merge: ea1264cd8e 294d080bd3 Author: James Agnew <jamesagnew@gmail.com> Date: Mon Jul 3 20:34:16 2017 -0400 Merge branch 'master' into hapi3_refactor commit ea1264cd8e9b8c5297d218e91cf14bd48d0a92c7 Author: James <jamesagnew@gmail.com> Date: Wed Jun 28 10:26:01 2017 -0400 Continue work on refactor commit fbe2f98a0238f3d4e065db4550dd2ef1b460c0d8 Merge: b2bef47100 0a4dcc32ec Author: James <jamesagnew@gmail.com> Date: Wed Jun 28 06:21:22 2017 -0400 Merge branch 'master' into hapi3_refactor commit b2bef47100370e1248834523d73a630950032d7a Author: James <jamesagnew@gmail.com> Date: Tue Jun 27 21:13:23 2017 -0400 Work on refactor commit 8f76e4e46385daa9ce3442e2d9342453ce373ba3 Author: James Agnew <jamesagnew@gmail.com> Date: Sun Jun 25 21:55:35 2017 -0400 Lots of work on refactoring
2017-08-13 14:39:47 -04:00
*/
public void enteringNewElement(String theNamespaceUri, String theLocalPart) throws DataFormatException {
myErrorHandler.unknownElement(null, theLocalPart);
2014-12-01 08:13:32 -05:00
}
Merge in HAPI 3.0.0 working branch! Squashed commit of the following: commit 12f89a423a1691fdbc360706fd94a03bd9144d17 Author: James <jamesagnew@gmail.com> Date: Sun Aug 13 14:38:51 2017 -0400 Minimize validation resources commit f6868cce5c73b34d5ecd53bf1a220fdccd6b4e09 Merge: 3b80779fd3 1e158311d8 Author: James <jamesagnew@gmail.com> Date: Sun Aug 13 14:05:34 2017 -0400 Forward port fix for #710 Merge branch 'master' into hapi3_refactor commit 3b80779fd3905cbf5322e6973334eb0ecb3d8426 Merge: 1f534985e8 356d9acaf7 Author: James <jamesagnew@gmail.com> Date: Sun Aug 13 12:31:09 2017 -0400 Forward port #705, #708, and #710 Merge branch 'master' into hapi3_refactor commit 1f534985e8106347d9cc9da2dd8145fdd869547f Merge: 7c39a47852 dedd3d635b Author: James <jamesagnew@gmail.com> Date: Sun Aug 13 10:52:59 2017 -0400 Forward port #695 Merge branch 'master' into hapi3_refactor commit 7c39a47852142bee398101120678217ab0917c7e Merge: e0ffb84d21 6efafe62f1 Author: James <jamesagnew@gmail.com> Date: Sun Aug 13 09:53:17 2017 -0400 Forward port #688 Merge branch 'master' into hapi3_refactor commit e0ffb84d2129c209ccffc2611038592f37dddfd2 Merge: 52388c11c1 d19b00ff09 Author: James <jamesagnew@gmail.com> Date: Sat Aug 12 14:59:46 2017 -0400 Merge branch 'master' into hapi3_refactor commit 52388c11c17cf038591244548f2a592f6b655cee Author: James <jamesagnew@gmail.com> Date: Sat Aug 12 06:21:46 2017 -0400 Cleanup commit 209752cd638266b39574ae11c5989b624d5e85d3 Author: James <jamesagnew@gmail.com> Date: Thu Aug 10 11:18:19 2017 -0400 Fix tests commit 4543408dc8d63b5b9682a275e261d3168cdc2196 Author: James <jamesagnew@gmail.com> Date: Sat Aug 5 06:55:50 2017 -0400 Fix a potential deadlock commit ee360f537692672df473f94dae75c176b2287415 Author: James <jamesagnew@gmail.com> Date: Sat Aug 5 06:22:06 2017 -0400 Add R4 code to CLI commit 1a95ba3b6529afdaf81232b82cc303718c0187d6 Author: James Agnew <jamesagnew@gmail.com> Date: Thu Aug 3 06:14:01 2017 -0400 More cleanup commit f0d88026817296edaa65132accd67d0c8ad8088c Author: James <jamesagnew@gmail.com> Date: Wed Aug 2 11:27:43 2017 -0400 Tests are working! commit a4cbda357e8e7d024f24e3ee9a660b5366983ca1 Author: James Agnew <jamesagnew@gmail.com> Date: Wed Aug 2 10:42:04 2017 -0400 Connection handling cleanup for new tests commit 0e2cecfbd0d7a546444a66e8411600040fd9a17b Author: James Agnew <jamesagnew@gmail.com> Date: Wed Aug 2 10:16:28 2017 -0400 Clean up R4 JPA tests commit 40317a650d72c86e2529d5179cffe63399301de5 Author: James <jamesagnew@gmail.com> Date: Wed Aug 2 09:12:38 2017 -0400 Work on R4 for JPA server commit e7f8f8c30d72ed30d739979964db38d41c5baec1 Author: James <jamesagnew@gmail.com> Date: Tue Aug 1 20:43:47 2017 -0400 More work on porting tests commit 43c9003258696ab33e7bb335e882ab1c66fb61aa Author: James <jamesagnew@gmail.com> Date: Tue Aug 1 07:09:29 2017 -0400 Work on porting DSTU1 tests commit 602857f1e26a69a2284e176b5e44a860d9b828ff Author: James Agnew <jamesagnew@gmail.com> Date: Mon Jul 31 22:34:08 2017 -0400 More work on bring unit tests up to date commit e326a7b0cdb8368009119bba41886838a973e03e Author: James Agnew <jamesagnew@gmail.com> Date: Mon Jul 31 17:36:38 2017 -0400 Credit for #686 and forward port the fix to R4 validator commit 96543c3992adcb406df3c8899dab79cf4bd5b4b4 Merge: 3fb75aa61a 9901b802c4 Author: James Agnew <jamesagnew@gmail.com> Date: Mon Jul 31 17:12:33 2017 -0400 Merge branch 'master' into hapi3_refactor commit 3fb75aa61ad29d9f3876a1c30c912627486147af Author: James <jamesagnew@gmail.com> Date: Mon Jul 31 15:21:30 2017 -0400 More work on cleanup commit b02fbb6804127e77c61c4792eefd9fc0d23d63d0 Author: James Agnew <jamesagnew@gmail.com> Date: Sun Jul 30 22:11:07 2017 -0400 Work on porting STU1 tests commit 1ae37b0db3929ea4f37955adf8f026e33ccf43b2 Author: James Agnew <jamesagnew@gmail.com> Date: Sun Jul 30 20:56:10 2017 -0400 Try to get coverage report working commit 72b88849b30a94a9ff08d3a1ab50a05b2acbdfdd Author: James Agnew <jamesagnew@gmail.com> Date: Sun Jul 30 20:27:02 2017 -0400 Fix android tests commit e5f6c35aeab8bbc056870a038e1862181049a020 Author: James <jamesagnew@gmail.com> Date: Sun Jul 30 19:31:18 2017 -0400 More work on getting legacy code cleaned up commit 0b513b0845a082b5c20b0033dfab4e29f5e4a934 Author: James <jamesagnew@gmail.com> Date: Sun Jul 30 18:41:13 2017 -0400 Continue work on removing deprecated API commit defea69aa38a2e0f4137ed9c8527956872ff70bf Author: James Agnew <jamesagnew@gmail.com> Date: Sun Jul 30 17:10:01 2017 -0400 More cleanup of legacy code commit 9ae7295705cb58f5edcf7ee1259f023cbbe2fe51 Author: James <jamesagnew@gmail.com> Date: Sun Jul 30 07:11:45 2017 -0400 More cleanup of legacy code commit ebd3eeb5ee793cf5805cc726db353f3def35ab00 Author: James Agnew <jamesagnew@gmail.com> Date: Sun Jul 30 06:43:25 2017 -0400 More work on removing legacy code commit 92224c2532faf70171473d64429c3ceaf3e3406c Author: James <jamesagnew@gmail.com> Date: Sat Jul 29 18:44:06 2017 -0400 Remove DSTU1 Bundle commit c52cacf71bae3f5c02ffae03881c21de1f3aba22 Author: James <jamesagnew@gmail.com> Date: Sat Jul 29 14:27:42 2017 -0400 Now compiling commit b405e51773baf4ab3a3c387458cdc59541394cd1 Merge: c3ddf04e25 cb2cea54d7 Author: James Agnew <jamesagnew@gmail.com> Date: Fri Jul 28 06:21:02 2017 -0400 Merge branch 'master' into hapi3_refactor commit c3ddf04e2598b8d6214975ab0ae795f850396811 Author: James <jamesagnew@gmail.com> Date: Thu Jul 27 11:06:06 2017 -0400 Sync R4 releases in commit b13333c3c03ddb9a5061c3b22bf011f4592104f8 Author: James <jamesagnew@gmail.com> Date: Fri Jul 14 05:52:33 2017 -0400 JPA server is now able to handle placeholder IDs (e.g. urn:uuid:00....000) being used in Bundle.entry.request.url as a part of the conditional URL within transactions. commit 2e60ff7521b42890a32b97c2dda88ab233f5c91e Author: James Agnew <jamesagnew@gmail.com> Date: Thu Jul 13 20:02:46 2017 -0400 Fix imports commit a92ace2e0dac6e24f6dada53bf97d03861fd21a1 Merge: 3196db96d1 1a6b3ea867 Author: James Agnew <jamesagnew@gmail.com> Date: Thu Jul 13 12:02:27 2017 -0400 Merge branch 'master' into hapi3_refactor commit 3196db96d1c485310e746833df59c0e010b5b161 Author: James Agnew <jamesagnew@gmail.com> Date: Thu Jul 13 11:48:10 2017 -0400 Don't add false paging link to request commit bd4e1d338855a664045caa271d41616aed973a4d Author: James <jamesagnew@gmail.com> Date: Sun Jul 9 21:32:16 2017 -0400 Finally building correctly! commit 6464ce9304703cb3c5ecc58491282ddacc900853 Author: James <jamesagnew@gmail.com> Date: Sun Jul 9 16:38:28 2017 -0400 Work on refactor commit 0059f2e48e9d7c812c1d42a57c5b6059814f5155 Author: James <jamesagnew@gmail.com> Date: Sat Jul 8 07:16:20 2017 -0400 Keep working on refactor commit 6c2e87e8cc19863a811c11623d1c878c8b48f031 Author: James Agnew <jamesagnew@gmail.com> Date: Thu Jul 6 22:35:13 2017 -0400 Lots of work on refactor commit 11cab975047a0c28190e6533074fd3f11ddde240 Merge: 34ec6b8807 6c47bd4c51 Author: James Agnew <jamesagnew@gmail.com> Date: Thu Jul 6 21:43:57 2017 -0400 Merge branch 'master' into hapi3_refactor commit 34ec6b8807946aa6c97f0b5581dca9bd5f7b7a3e Merge: f8e647511b c520e60ac1 Author: James Agnew <jamesagnew@gmail.com> Date: Thu Jul 6 21:43:49 2017 -0400 Merge branch 'hapi3_refactor' of github.com:jamesagnew/hapi-fhir into hapi3_refactor commit f8e647511b4a82e7fde71a8850b8800e3d698b1f Author: James Agnew <jamesagnew@gmail.com> Date: Thu Jul 6 18:46:55 2017 -0400 Work on hapi3 changes commit c520e60ac1198f340cfb9090a7a33f91aa2d1e61 Author: James <jamesagnew@gmail.com> Date: Wed Jul 5 08:08:40 2017 -0400 Keep working on refactor commit f1d2ee90926f7db900a5b3b4ab9a8948d18e49f2 Author: James Agnew <jamesagnew@gmail.com> Date: Mon Jul 3 22:10:59 2017 -0400 Continue refactor for HAPI 3 commit 9281ccafc32354222932c5a9f5ee8b0f206ebc05 Merge: ea1264cd8e 294d080bd3 Author: James Agnew <jamesagnew@gmail.com> Date: Mon Jul 3 20:34:16 2017 -0400 Merge branch 'master' into hapi3_refactor commit ea1264cd8e9b8c5297d218e91cf14bd48d0a92c7 Author: James <jamesagnew@gmail.com> Date: Wed Jun 28 10:26:01 2017 -0400 Continue work on refactor commit fbe2f98a0238f3d4e065db4550dd2ef1b460c0d8 Merge: b2bef47100 0a4dcc32ec Author: James <jamesagnew@gmail.com> Date: Wed Jun 28 06:21:22 2017 -0400 Merge branch 'master' into hapi3_refactor commit b2bef47100370e1248834523d73a630950032d7a Author: James <jamesagnew@gmail.com> Date: Tue Jun 27 21:13:23 2017 -0400 Work on refactor commit 8f76e4e46385daa9ce3442e2d9342453ce373ba3 Author: James Agnew <jamesagnew@gmail.com> Date: Sun Jun 25 21:55:35 2017 -0400 Lots of work on refactoring
2017-08-13 14:39:47 -04:00
/**
* Default implementation just handles undeclared extensions
*/
@SuppressWarnings("unused")
public void enteringNewElementExtension(StartElement theElement, String theUrlAttr, boolean theIsModifier, final String baseServerUrl) {
if (myPreResourceState != null && getCurrentElement() instanceof ISupportsUndeclaredExtensions) {
ExtensionDt newExtension = new ExtensionDt(theIsModifier);
newExtension.setUrl(theUrlAttr);
ISupportsUndeclaredExtensions elem = (ISupportsUndeclaredExtensions) getCurrentElement();
elem.addUndeclaredExtension(newExtension);
ExtensionState newState = new ExtensionState(myPreResourceState, newExtension);
push(newState);
} else {
if (theIsModifier == false) {
if (getCurrentElement() instanceof IBaseHasExtensions) {
IBaseExtension<?, ?> ext = ((IBaseHasExtensions) getCurrentElement()).addExtension();
ext.setUrl(theUrlAttr);
ParserState<T>.ExtensionState newState = new ExtensionState(myPreResourceState, ext);
push(newState);
} else {
logAndSwallowUnexpectedElement("extension");
2014-12-01 08:13:32 -05:00
}
} else {
Merge in HAPI 3.0.0 working branch! Squashed commit of the following: commit 12f89a423a1691fdbc360706fd94a03bd9144d17 Author: James <jamesagnew@gmail.com> Date: Sun Aug 13 14:38:51 2017 -0400 Minimize validation resources commit f6868cce5c73b34d5ecd53bf1a220fdccd6b4e09 Merge: 3b80779fd3 1e158311d8 Author: James <jamesagnew@gmail.com> Date: Sun Aug 13 14:05:34 2017 -0400 Forward port fix for #710 Merge branch 'master' into hapi3_refactor commit 3b80779fd3905cbf5322e6973334eb0ecb3d8426 Merge: 1f534985e8 356d9acaf7 Author: James <jamesagnew@gmail.com> Date: Sun Aug 13 12:31:09 2017 -0400 Forward port #705, #708, and #710 Merge branch 'master' into hapi3_refactor commit 1f534985e8106347d9cc9da2dd8145fdd869547f Merge: 7c39a47852 dedd3d635b Author: James <jamesagnew@gmail.com> Date: Sun Aug 13 10:52:59 2017 -0400 Forward port #695 Merge branch 'master' into hapi3_refactor commit 7c39a47852142bee398101120678217ab0917c7e Merge: e0ffb84d21 6efafe62f1 Author: James <jamesagnew@gmail.com> Date: Sun Aug 13 09:53:17 2017 -0400 Forward port #688 Merge branch 'master' into hapi3_refactor commit e0ffb84d2129c209ccffc2611038592f37dddfd2 Merge: 52388c11c1 d19b00ff09 Author: James <jamesagnew@gmail.com> Date: Sat Aug 12 14:59:46 2017 -0400 Merge branch 'master' into hapi3_refactor commit 52388c11c17cf038591244548f2a592f6b655cee Author: James <jamesagnew@gmail.com> Date: Sat Aug 12 06:21:46 2017 -0400 Cleanup commit 209752cd638266b39574ae11c5989b624d5e85d3 Author: James <jamesagnew@gmail.com> Date: Thu Aug 10 11:18:19 2017 -0400 Fix tests commit 4543408dc8d63b5b9682a275e261d3168cdc2196 Author: James <jamesagnew@gmail.com> Date: Sat Aug 5 06:55:50 2017 -0400 Fix a potential deadlock commit ee360f537692672df473f94dae75c176b2287415 Author: James <jamesagnew@gmail.com> Date: Sat Aug 5 06:22:06 2017 -0400 Add R4 code to CLI commit 1a95ba3b6529afdaf81232b82cc303718c0187d6 Author: James Agnew <jamesagnew@gmail.com> Date: Thu Aug 3 06:14:01 2017 -0400 More cleanup commit f0d88026817296edaa65132accd67d0c8ad8088c Author: James <jamesagnew@gmail.com> Date: Wed Aug 2 11:27:43 2017 -0400 Tests are working! commit a4cbda357e8e7d024f24e3ee9a660b5366983ca1 Author: James Agnew <jamesagnew@gmail.com> Date: Wed Aug 2 10:42:04 2017 -0400 Connection handling cleanup for new tests commit 0e2cecfbd0d7a546444a66e8411600040fd9a17b Author: James Agnew <jamesagnew@gmail.com> Date: Wed Aug 2 10:16:28 2017 -0400 Clean up R4 JPA tests commit 40317a650d72c86e2529d5179cffe63399301de5 Author: James <jamesagnew@gmail.com> Date: Wed Aug 2 09:12:38 2017 -0400 Work on R4 for JPA server commit e7f8f8c30d72ed30d739979964db38d41c5baec1 Author: James <jamesagnew@gmail.com> Date: Tue Aug 1 20:43:47 2017 -0400 More work on porting tests commit 43c9003258696ab33e7bb335e882ab1c66fb61aa Author: James <jamesagnew@gmail.com> Date: Tue Aug 1 07:09:29 2017 -0400 Work on porting DSTU1 tests commit 602857f1e26a69a2284e176b5e44a860d9b828ff Author: James Agnew <jamesagnew@gmail.com> Date: Mon Jul 31 22:34:08 2017 -0400 More work on bring unit tests up to date commit e326a7b0cdb8368009119bba41886838a973e03e Author: James Agnew <jamesagnew@gmail.com> Date: Mon Jul 31 17:36:38 2017 -0400 Credit for #686 and forward port the fix to R4 validator commit 96543c3992adcb406df3c8899dab79cf4bd5b4b4 Merge: 3fb75aa61a 9901b802c4 Author: James Agnew <jamesagnew@gmail.com> Date: Mon Jul 31 17:12:33 2017 -0400 Merge branch 'master' into hapi3_refactor commit 3fb75aa61ad29d9f3876a1c30c912627486147af Author: James <jamesagnew@gmail.com> Date: Mon Jul 31 15:21:30 2017 -0400 More work on cleanup commit b02fbb6804127e77c61c4792eefd9fc0d23d63d0 Author: James Agnew <jamesagnew@gmail.com> Date: Sun Jul 30 22:11:07 2017 -0400 Work on porting STU1 tests commit 1ae37b0db3929ea4f37955adf8f026e33ccf43b2 Author: James Agnew <jamesagnew@gmail.com> Date: Sun Jul 30 20:56:10 2017 -0400 Try to get coverage report working commit 72b88849b30a94a9ff08d3a1ab50a05b2acbdfdd Author: James Agnew <jamesagnew@gmail.com> Date: Sun Jul 30 20:27:02 2017 -0400 Fix android tests commit e5f6c35aeab8bbc056870a038e1862181049a020 Author: James <jamesagnew@gmail.com> Date: Sun Jul 30 19:31:18 2017 -0400 More work on getting legacy code cleaned up commit 0b513b0845a082b5c20b0033dfab4e29f5e4a934 Author: James <jamesagnew@gmail.com> Date: Sun Jul 30 18:41:13 2017 -0400 Continue work on removing deprecated API commit defea69aa38a2e0f4137ed9c8527956872ff70bf Author: James Agnew <jamesagnew@gmail.com> Date: Sun Jul 30 17:10:01 2017 -0400 More cleanup of legacy code commit 9ae7295705cb58f5edcf7ee1259f023cbbe2fe51 Author: James <jamesagnew@gmail.com> Date: Sun Jul 30 07:11:45 2017 -0400 More cleanup of legacy code commit ebd3eeb5ee793cf5805cc726db353f3def35ab00 Author: James Agnew <jamesagnew@gmail.com> Date: Sun Jul 30 06:43:25 2017 -0400 More work on removing legacy code commit 92224c2532faf70171473d64429c3ceaf3e3406c Author: James <jamesagnew@gmail.com> Date: Sat Jul 29 18:44:06 2017 -0400 Remove DSTU1 Bundle commit c52cacf71bae3f5c02ffae03881c21de1f3aba22 Author: James <jamesagnew@gmail.com> Date: Sat Jul 29 14:27:42 2017 -0400 Now compiling commit b405e51773baf4ab3a3c387458cdc59541394cd1 Merge: c3ddf04e25 cb2cea54d7 Author: James Agnew <jamesagnew@gmail.com> Date: Fri Jul 28 06:21:02 2017 -0400 Merge branch 'master' into hapi3_refactor commit c3ddf04e2598b8d6214975ab0ae795f850396811 Author: James <jamesagnew@gmail.com> Date: Thu Jul 27 11:06:06 2017 -0400 Sync R4 releases in commit b13333c3c03ddb9a5061c3b22bf011f4592104f8 Author: James <jamesagnew@gmail.com> Date: Fri Jul 14 05:52:33 2017 -0400 JPA server is now able to handle placeholder IDs (e.g. urn:uuid:00....000) being used in Bundle.entry.request.url as a part of the conditional URL within transactions. commit 2e60ff7521b42890a32b97c2dda88ab233f5c91e Author: James Agnew <jamesagnew@gmail.com> Date: Thu Jul 13 20:02:46 2017 -0400 Fix imports commit a92ace2e0dac6e24f6dada53bf97d03861fd21a1 Merge: 3196db96d1 1a6b3ea867 Author: James Agnew <jamesagnew@gmail.com> Date: Thu Jul 13 12:02:27 2017 -0400 Merge branch 'master' into hapi3_refactor commit 3196db96d1c485310e746833df59c0e010b5b161 Author: James Agnew <jamesagnew@gmail.com> Date: Thu Jul 13 11:48:10 2017 -0400 Don't add false paging link to request commit bd4e1d338855a664045caa271d41616aed973a4d Author: James <jamesagnew@gmail.com> Date: Sun Jul 9 21:32:16 2017 -0400 Finally building correctly! commit 6464ce9304703cb3c5ecc58491282ddacc900853 Author: James <jamesagnew@gmail.com> Date: Sun Jul 9 16:38:28 2017 -0400 Work on refactor commit 0059f2e48e9d7c812c1d42a57c5b6059814f5155 Author: James <jamesagnew@gmail.com> Date: Sat Jul 8 07:16:20 2017 -0400 Keep working on refactor commit 6c2e87e8cc19863a811c11623d1c878c8b48f031 Author: James Agnew <jamesagnew@gmail.com> Date: Thu Jul 6 22:35:13 2017 -0400 Lots of work on refactor commit 11cab975047a0c28190e6533074fd3f11ddde240 Merge: 34ec6b8807 6c47bd4c51 Author: James Agnew <jamesagnew@gmail.com> Date: Thu Jul 6 21:43:57 2017 -0400 Merge branch 'master' into hapi3_refactor commit 34ec6b8807946aa6c97f0b5581dca9bd5f7b7a3e Merge: f8e647511b c520e60ac1 Author: James Agnew <jamesagnew@gmail.com> Date: Thu Jul 6 21:43:49 2017 -0400 Merge branch 'hapi3_refactor' of github.com:jamesagnew/hapi-fhir into hapi3_refactor commit f8e647511b4a82e7fde71a8850b8800e3d698b1f Author: James Agnew <jamesagnew@gmail.com> Date: Thu Jul 6 18:46:55 2017 -0400 Work on hapi3 changes commit c520e60ac1198f340cfb9090a7a33f91aa2d1e61 Author: James <jamesagnew@gmail.com> Date: Wed Jul 5 08:08:40 2017 -0400 Keep working on refactor commit f1d2ee90926f7db900a5b3b4ab9a8948d18e49f2 Author: James Agnew <jamesagnew@gmail.com> Date: Mon Jul 3 22:10:59 2017 -0400 Continue refactor for HAPI 3 commit 9281ccafc32354222932c5a9f5ee8b0f206ebc05 Merge: ea1264cd8e 294d080bd3 Author: James Agnew <jamesagnew@gmail.com> Date: Mon Jul 3 20:34:16 2017 -0400 Merge branch 'master' into hapi3_refactor commit ea1264cd8e9b8c5297d218e91cf14bd48d0a92c7 Author: James <jamesagnew@gmail.com> Date: Wed Jun 28 10:26:01 2017 -0400 Continue work on refactor commit fbe2f98a0238f3d4e065db4550dd2ef1b460c0d8 Merge: b2bef47100 0a4dcc32ec Author: James <jamesagnew@gmail.com> Date: Wed Jun 28 06:21:22 2017 -0400 Merge branch 'master' into hapi3_refactor commit b2bef47100370e1248834523d73a630950032d7a Author: James <jamesagnew@gmail.com> Date: Tue Jun 27 21:13:23 2017 -0400 Work on refactor commit 8f76e4e46385daa9ce3442e2d9342453ce373ba3 Author: James Agnew <jamesagnew@gmail.com> Date: Sun Jun 25 21:55:35 2017 -0400 Lots of work on refactoring
2017-08-13 14:39:47 -04:00
if (getCurrentElement() instanceof IBaseHasModifierExtensions) {
IBaseExtension<?, ?> ext = ((IBaseHasModifierExtensions) getCurrentElement()).addModifierExtension();
ext.setUrl(theUrlAttr);
ParserState<T>.ExtensionState newState = new ExtensionState(myPreResourceState, ext);
push(newState);
} else {
logAndSwallowUnexpectedElement("modifierExtension");
2014-12-01 08:13:32 -05:00
}
}
}
}
Merge in HAPI 3.0.0 working branch! Squashed commit of the following: commit 12f89a423a1691fdbc360706fd94a03bd9144d17 Author: James <jamesagnew@gmail.com> Date: Sun Aug 13 14:38:51 2017 -0400 Minimize validation resources commit f6868cce5c73b34d5ecd53bf1a220fdccd6b4e09 Merge: 3b80779fd3 1e158311d8 Author: James <jamesagnew@gmail.com> Date: Sun Aug 13 14:05:34 2017 -0400 Forward port fix for #710 Merge branch 'master' into hapi3_refactor commit 3b80779fd3905cbf5322e6973334eb0ecb3d8426 Merge: 1f534985e8 356d9acaf7 Author: James <jamesagnew@gmail.com> Date: Sun Aug 13 12:31:09 2017 -0400 Forward port #705, #708, and #710 Merge branch 'master' into hapi3_refactor commit 1f534985e8106347d9cc9da2dd8145fdd869547f Merge: 7c39a47852 dedd3d635b Author: James <jamesagnew@gmail.com> Date: Sun Aug 13 10:52:59 2017 -0400 Forward port #695 Merge branch 'master' into hapi3_refactor commit 7c39a47852142bee398101120678217ab0917c7e Merge: e0ffb84d21 6efafe62f1 Author: James <jamesagnew@gmail.com> Date: Sun Aug 13 09:53:17 2017 -0400 Forward port #688 Merge branch 'master' into hapi3_refactor commit e0ffb84d2129c209ccffc2611038592f37dddfd2 Merge: 52388c11c1 d19b00ff09 Author: James <jamesagnew@gmail.com> Date: Sat Aug 12 14:59:46 2017 -0400 Merge branch 'master' into hapi3_refactor commit 52388c11c17cf038591244548f2a592f6b655cee Author: James <jamesagnew@gmail.com> Date: Sat Aug 12 06:21:46 2017 -0400 Cleanup commit 209752cd638266b39574ae11c5989b624d5e85d3 Author: James <jamesagnew@gmail.com> Date: Thu Aug 10 11:18:19 2017 -0400 Fix tests commit 4543408dc8d63b5b9682a275e261d3168cdc2196 Author: James <jamesagnew@gmail.com> Date: Sat Aug 5 06:55:50 2017 -0400 Fix a potential deadlock commit ee360f537692672df473f94dae75c176b2287415 Author: James <jamesagnew@gmail.com> Date: Sat Aug 5 06:22:06 2017 -0400 Add R4 code to CLI commit 1a95ba3b6529afdaf81232b82cc303718c0187d6 Author: James Agnew <jamesagnew@gmail.com> Date: Thu Aug 3 06:14:01 2017 -0400 More cleanup commit f0d88026817296edaa65132accd67d0c8ad8088c Author: James <jamesagnew@gmail.com> Date: Wed Aug 2 11:27:43 2017 -0400 Tests are working! commit a4cbda357e8e7d024f24e3ee9a660b5366983ca1 Author: James Agnew <jamesagnew@gmail.com> Date: Wed Aug 2 10:42:04 2017 -0400 Connection handling cleanup for new tests commit 0e2cecfbd0d7a546444a66e8411600040fd9a17b Author: James Agnew <jamesagnew@gmail.com> Date: Wed Aug 2 10:16:28 2017 -0400 Clean up R4 JPA tests commit 40317a650d72c86e2529d5179cffe63399301de5 Author: James <jamesagnew@gmail.com> Date: Wed Aug 2 09:12:38 2017 -0400 Work on R4 for JPA server commit e7f8f8c30d72ed30d739979964db38d41c5baec1 Author: James <jamesagnew@gmail.com> Date: Tue Aug 1 20:43:47 2017 -0400 More work on porting tests commit 43c9003258696ab33e7bb335e882ab1c66fb61aa Author: James <jamesagnew@gmail.com> Date: Tue Aug 1 07:09:29 2017 -0400 Work on porting DSTU1 tests commit 602857f1e26a69a2284e176b5e44a860d9b828ff Author: James Agnew <jamesagnew@gmail.com> Date: Mon Jul 31 22:34:08 2017 -0400 More work on bring unit tests up to date commit e326a7b0cdb8368009119bba41886838a973e03e Author: James Agnew <jamesagnew@gmail.com> Date: Mon Jul 31 17:36:38 2017 -0400 Credit for #686 and forward port the fix to R4 validator commit 96543c3992adcb406df3c8899dab79cf4bd5b4b4 Merge: 3fb75aa61a 9901b802c4 Author: James Agnew <jamesagnew@gmail.com> Date: Mon Jul 31 17:12:33 2017 -0400 Merge branch 'master' into hapi3_refactor commit 3fb75aa61ad29d9f3876a1c30c912627486147af Author: James <jamesagnew@gmail.com> Date: Mon Jul 31 15:21:30 2017 -0400 More work on cleanup commit b02fbb6804127e77c61c4792eefd9fc0d23d63d0 Author: James Agnew <jamesagnew@gmail.com> Date: Sun Jul 30 22:11:07 2017 -0400 Work on porting STU1 tests commit 1ae37b0db3929ea4f37955adf8f026e33ccf43b2 Author: James Agnew <jamesagnew@gmail.com> Date: Sun Jul 30 20:56:10 2017 -0400 Try to get coverage report working commit 72b88849b30a94a9ff08d3a1ab50a05b2acbdfdd Author: James Agnew <jamesagnew@gmail.com> Date: Sun Jul 30 20:27:02 2017 -0400 Fix android tests commit e5f6c35aeab8bbc056870a038e1862181049a020 Author: James <jamesagnew@gmail.com> Date: Sun Jul 30 19:31:18 2017 -0400 More work on getting legacy code cleaned up commit 0b513b0845a082b5c20b0033dfab4e29f5e4a934 Author: James <jamesagnew@gmail.com> Date: Sun Jul 30 18:41:13 2017 -0400 Continue work on removing deprecated API commit defea69aa38a2e0f4137ed9c8527956872ff70bf Author: James Agnew <jamesagnew@gmail.com> Date: Sun Jul 30 17:10:01 2017 -0400 More cleanup of legacy code commit 9ae7295705cb58f5edcf7ee1259f023cbbe2fe51 Author: James <jamesagnew@gmail.com> Date: Sun Jul 30 07:11:45 2017 -0400 More cleanup of legacy code commit ebd3eeb5ee793cf5805cc726db353f3def35ab00 Author: James Agnew <jamesagnew@gmail.com> Date: Sun Jul 30 06:43:25 2017 -0400 More work on removing legacy code commit 92224c2532faf70171473d64429c3ceaf3e3406c Author: James <jamesagnew@gmail.com> Date: Sat Jul 29 18:44:06 2017 -0400 Remove DSTU1 Bundle commit c52cacf71bae3f5c02ffae03881c21de1f3aba22 Author: James <jamesagnew@gmail.com> Date: Sat Jul 29 14:27:42 2017 -0400 Now compiling commit b405e51773baf4ab3a3c387458cdc59541394cd1 Merge: c3ddf04e25 cb2cea54d7 Author: James Agnew <jamesagnew@gmail.com> Date: Fri Jul 28 06:21:02 2017 -0400 Merge branch 'master' into hapi3_refactor commit c3ddf04e2598b8d6214975ab0ae795f850396811 Author: James <jamesagnew@gmail.com> Date: Thu Jul 27 11:06:06 2017 -0400 Sync R4 releases in commit b13333c3c03ddb9a5061c3b22bf011f4592104f8 Author: James <jamesagnew@gmail.com> Date: Fri Jul 14 05:52:33 2017 -0400 JPA server is now able to handle placeholder IDs (e.g. urn:uuid:00....000) being used in Bundle.entry.request.url as a part of the conditional URL within transactions. commit 2e60ff7521b42890a32b97c2dda88ab233f5c91e Author: James Agnew <jamesagnew@gmail.com> Date: Thu Jul 13 20:02:46 2017 -0400 Fix imports commit a92ace2e0dac6e24f6dada53bf97d03861fd21a1 Merge: 3196db96d1 1a6b3ea867 Author: James Agnew <jamesagnew@gmail.com> Date: Thu Jul 13 12:02:27 2017 -0400 Merge branch 'master' into hapi3_refactor commit 3196db96d1c485310e746833df59c0e010b5b161 Author: James Agnew <jamesagnew@gmail.com> Date: Thu Jul 13 11:48:10 2017 -0400 Don't add false paging link to request commit bd4e1d338855a664045caa271d41616aed973a4d Author: James <jamesagnew@gmail.com> Date: Sun Jul 9 21:32:16 2017 -0400 Finally building correctly! commit 6464ce9304703cb3c5ecc58491282ddacc900853 Author: James <jamesagnew@gmail.com> Date: Sun Jul 9 16:38:28 2017 -0400 Work on refactor commit 0059f2e48e9d7c812c1d42a57c5b6059814f5155 Author: James <jamesagnew@gmail.com> Date: Sat Jul 8 07:16:20 2017 -0400 Keep working on refactor commit 6c2e87e8cc19863a811c11623d1c878c8b48f031 Author: James Agnew <jamesagnew@gmail.com> Date: Thu Jul 6 22:35:13 2017 -0400 Lots of work on refactor commit 11cab975047a0c28190e6533074fd3f11ddde240 Merge: 34ec6b8807 6c47bd4c51 Author: James Agnew <jamesagnew@gmail.com> Date: Thu Jul 6 21:43:57 2017 -0400 Merge branch 'master' into hapi3_refactor commit 34ec6b8807946aa6c97f0b5581dca9bd5f7b7a3e Merge: f8e647511b c520e60ac1 Author: James Agnew <jamesagnew@gmail.com> Date: Thu Jul 6 21:43:49 2017 -0400 Merge branch 'hapi3_refactor' of github.com:jamesagnew/hapi-fhir into hapi3_refactor commit f8e647511b4a82e7fde71a8850b8800e3d698b1f Author: James Agnew <jamesagnew@gmail.com> Date: Thu Jul 6 18:46:55 2017 -0400 Work on hapi3 changes commit c520e60ac1198f340cfb9090a7a33f91aa2d1e61 Author: James <jamesagnew@gmail.com> Date: Wed Jul 5 08:08:40 2017 -0400 Keep working on refactor commit f1d2ee90926f7db900a5b3b4ab9a8948d18e49f2 Author: James Agnew <jamesagnew@gmail.com> Date: Mon Jul 3 22:10:59 2017 -0400 Continue refactor for HAPI 3 commit 9281ccafc32354222932c5a9f5ee8b0f206ebc05 Merge: ea1264cd8e 294d080bd3 Author: James Agnew <jamesagnew@gmail.com> Date: Mon Jul 3 20:34:16 2017 -0400 Merge branch 'master' into hapi3_refactor commit ea1264cd8e9b8c5297d218e91cf14bd48d0a92c7 Author: James <jamesagnew@gmail.com> Date: Wed Jun 28 10:26:01 2017 -0400 Continue work on refactor commit fbe2f98a0238f3d4e065db4550dd2ef1b460c0d8 Merge: b2bef47100 0a4dcc32ec Author: James <jamesagnew@gmail.com> Date: Wed Jun 28 06:21:22 2017 -0400 Merge branch 'master' into hapi3_refactor commit b2bef47100370e1248834523d73a630950032d7a Author: James <jamesagnew@gmail.com> Date: Tue Jun 27 21:13:23 2017 -0400 Work on refactor commit 8f76e4e46385daa9ce3442e2d9342453ce373ba3 Author: James Agnew <jamesagnew@gmail.com> Date: Sun Jun 25 21:55:35 2017 -0400 Lots of work on refactoring
2017-08-13 14:39:47 -04:00
protected IBase getCurrentElement() {
return null;
2014-12-01 08:13:32 -05:00
}
Merge in HAPI 3.0.0 working branch! Squashed commit of the following: commit 12f89a423a1691fdbc360706fd94a03bd9144d17 Author: James <jamesagnew@gmail.com> Date: Sun Aug 13 14:38:51 2017 -0400 Minimize validation resources commit f6868cce5c73b34d5ecd53bf1a220fdccd6b4e09 Merge: 3b80779fd3 1e158311d8 Author: James <jamesagnew@gmail.com> Date: Sun Aug 13 14:05:34 2017 -0400 Forward port fix for #710 Merge branch 'master' into hapi3_refactor commit 3b80779fd3905cbf5322e6973334eb0ecb3d8426 Merge: 1f534985e8 356d9acaf7 Author: James <jamesagnew@gmail.com> Date: Sun Aug 13 12:31:09 2017 -0400 Forward port #705, #708, and #710 Merge branch 'master' into hapi3_refactor commit 1f534985e8106347d9cc9da2dd8145fdd869547f Merge: 7c39a47852 dedd3d635b Author: James <jamesagnew@gmail.com> Date: Sun Aug 13 10:52:59 2017 -0400 Forward port #695 Merge branch 'master' into hapi3_refactor commit 7c39a47852142bee398101120678217ab0917c7e Merge: e0ffb84d21 6efafe62f1 Author: James <jamesagnew@gmail.com> Date: Sun Aug 13 09:53:17 2017 -0400 Forward port #688 Merge branch 'master' into hapi3_refactor commit e0ffb84d2129c209ccffc2611038592f37dddfd2 Merge: 52388c11c1 d19b00ff09 Author: James <jamesagnew@gmail.com> Date: Sat Aug 12 14:59:46 2017 -0400 Merge branch 'master' into hapi3_refactor commit 52388c11c17cf038591244548f2a592f6b655cee Author: James <jamesagnew@gmail.com> Date: Sat Aug 12 06:21:46 2017 -0400 Cleanup commit 209752cd638266b39574ae11c5989b624d5e85d3 Author: James <jamesagnew@gmail.com> Date: Thu Aug 10 11:18:19 2017 -0400 Fix tests commit 4543408dc8d63b5b9682a275e261d3168cdc2196 Author: James <jamesagnew@gmail.com> Date: Sat Aug 5 06:55:50 2017 -0400 Fix a potential deadlock commit ee360f537692672df473f94dae75c176b2287415 Author: James <jamesagnew@gmail.com> Date: Sat Aug 5 06:22:06 2017 -0400 Add R4 code to CLI commit 1a95ba3b6529afdaf81232b82cc303718c0187d6 Author: James Agnew <jamesagnew@gmail.com> Date: Thu Aug 3 06:14:01 2017 -0400 More cleanup commit f0d88026817296edaa65132accd67d0c8ad8088c Author: James <jamesagnew@gmail.com> Date: Wed Aug 2 11:27:43 2017 -0400 Tests are working! commit a4cbda357e8e7d024f24e3ee9a660b5366983ca1 Author: James Agnew <jamesagnew@gmail.com> Date: Wed Aug 2 10:42:04 2017 -0400 Connection handling cleanup for new tests commit 0e2cecfbd0d7a546444a66e8411600040fd9a17b Author: James Agnew <jamesagnew@gmail.com> Date: Wed Aug 2 10:16:28 2017 -0400 Clean up R4 JPA tests commit 40317a650d72c86e2529d5179cffe63399301de5 Author: James <jamesagnew@gmail.com> Date: Wed Aug 2 09:12:38 2017 -0400 Work on R4 for JPA server commit e7f8f8c30d72ed30d739979964db38d41c5baec1 Author: James <jamesagnew@gmail.com> Date: Tue Aug 1 20:43:47 2017 -0400 More work on porting tests commit 43c9003258696ab33e7bb335e882ab1c66fb61aa Author: James <jamesagnew@gmail.com> Date: Tue Aug 1 07:09:29 2017 -0400 Work on porting DSTU1 tests commit 602857f1e26a69a2284e176b5e44a860d9b828ff Author: James Agnew <jamesagnew@gmail.com> Date: Mon Jul 31 22:34:08 2017 -0400 More work on bring unit tests up to date commit e326a7b0cdb8368009119bba41886838a973e03e Author: James Agnew <jamesagnew@gmail.com> Date: Mon Jul 31 17:36:38 2017 -0400 Credit for #686 and forward port the fix to R4 validator commit 96543c3992adcb406df3c8899dab79cf4bd5b4b4 Merge: 3fb75aa61a 9901b802c4 Author: James Agnew <jamesagnew@gmail.com> Date: Mon Jul 31 17:12:33 2017 -0400 Merge branch 'master' into hapi3_refactor commit 3fb75aa61ad29d9f3876a1c30c912627486147af Author: James <jamesagnew@gmail.com> Date: Mon Jul 31 15:21:30 2017 -0400 More work on cleanup commit b02fbb6804127e77c61c4792eefd9fc0d23d63d0 Author: James Agnew <jamesagnew@gmail.com> Date: Sun Jul 30 22:11:07 2017 -0400 Work on porting STU1 tests commit 1ae37b0db3929ea4f37955adf8f026e33ccf43b2 Author: James Agnew <jamesagnew@gmail.com> Date: Sun Jul 30 20:56:10 2017 -0400 Try to get coverage report working commit 72b88849b30a94a9ff08d3a1ab50a05b2acbdfdd Author: James Agnew <jamesagnew@gmail.com> Date: Sun Jul 30 20:27:02 2017 -0400 Fix android tests commit e5f6c35aeab8bbc056870a038e1862181049a020 Author: James <jamesagnew@gmail.com> Date: Sun Jul 30 19:31:18 2017 -0400 More work on getting legacy code cleaned up commit 0b513b0845a082b5c20b0033dfab4e29f5e4a934 Author: James <jamesagnew@gmail.com> Date: Sun Jul 30 18:41:13 2017 -0400 Continue work on removing deprecated API commit defea69aa38a2e0f4137ed9c8527956872ff70bf Author: James Agnew <jamesagnew@gmail.com> Date: Sun Jul 30 17:10:01 2017 -0400 More cleanup of legacy code commit 9ae7295705cb58f5edcf7ee1259f023cbbe2fe51 Author: James <jamesagnew@gmail.com> Date: Sun Jul 30 07:11:45 2017 -0400 More cleanup of legacy code commit ebd3eeb5ee793cf5805cc726db353f3def35ab00 Author: James Agnew <jamesagnew@gmail.com> Date: Sun Jul 30 06:43:25 2017 -0400 More work on removing legacy code commit 92224c2532faf70171473d64429c3ceaf3e3406c Author: James <jamesagnew@gmail.com> Date: Sat Jul 29 18:44:06 2017 -0400 Remove DSTU1 Bundle commit c52cacf71bae3f5c02ffae03881c21de1f3aba22 Author: James <jamesagnew@gmail.com> Date: Sat Jul 29 14:27:42 2017 -0400 Now compiling commit b405e51773baf4ab3a3c387458cdc59541394cd1 Merge: c3ddf04e25 cb2cea54d7 Author: James Agnew <jamesagnew@gmail.com> Date: Fri Jul 28 06:21:02 2017 -0400 Merge branch 'master' into hapi3_refactor commit c3ddf04e2598b8d6214975ab0ae795f850396811 Author: James <jamesagnew@gmail.com> Date: Thu Jul 27 11:06:06 2017 -0400 Sync R4 releases in commit b13333c3c03ddb9a5061c3b22bf011f4592104f8 Author: James <jamesagnew@gmail.com> Date: Fri Jul 14 05:52:33 2017 -0400 JPA server is now able to handle placeholder IDs (e.g. urn:uuid:00....000) being used in Bundle.entry.request.url as a part of the conditional URL within transactions. commit 2e60ff7521b42890a32b97c2dda88ab233f5c91e Author: James Agnew <jamesagnew@gmail.com> Date: Thu Jul 13 20:02:46 2017 -0400 Fix imports commit a92ace2e0dac6e24f6dada53bf97d03861fd21a1 Merge: 3196db96d1 1a6b3ea867 Author: James Agnew <jamesagnew@gmail.com> Date: Thu Jul 13 12:02:27 2017 -0400 Merge branch 'master' into hapi3_refactor commit 3196db96d1c485310e746833df59c0e010b5b161 Author: James Agnew <jamesagnew@gmail.com> Date: Thu Jul 13 11:48:10 2017 -0400 Don't add false paging link to request commit bd4e1d338855a664045caa271d41616aed973a4d Author: James <jamesagnew@gmail.com> Date: Sun Jul 9 21:32:16 2017 -0400 Finally building correctly! commit 6464ce9304703cb3c5ecc58491282ddacc900853 Author: James <jamesagnew@gmail.com> Date: Sun Jul 9 16:38:28 2017 -0400 Work on refactor commit 0059f2e48e9d7c812c1d42a57c5b6059814f5155 Author: James <jamesagnew@gmail.com> Date: Sat Jul 8 07:16:20 2017 -0400 Keep working on refactor commit 6c2e87e8cc19863a811c11623d1c878c8b48f031 Author: James Agnew <jamesagnew@gmail.com> Date: Thu Jul 6 22:35:13 2017 -0400 Lots of work on refactor commit 11cab975047a0c28190e6533074fd3f11ddde240 Merge: 34ec6b8807 6c47bd4c51 Author: James Agnew <jamesagnew@gmail.com> Date: Thu Jul 6 21:43:57 2017 -0400 Merge branch 'master' into hapi3_refactor commit 34ec6b8807946aa6c97f0b5581dca9bd5f7b7a3e Merge: f8e647511b c520e60ac1 Author: James Agnew <jamesagnew@gmail.com> Date: Thu Jul 6 21:43:49 2017 -0400 Merge branch 'hapi3_refactor' of github.com:jamesagnew/hapi-fhir into hapi3_refactor commit f8e647511b4a82e7fde71a8850b8800e3d698b1f Author: James Agnew <jamesagnew@gmail.com> Date: Thu Jul 6 18:46:55 2017 -0400 Work on hapi3 changes commit c520e60ac1198f340cfb9090a7a33f91aa2d1e61 Author: James <jamesagnew@gmail.com> Date: Wed Jul 5 08:08:40 2017 -0400 Keep working on refactor commit f1d2ee90926f7db900a5b3b4ab9a8948d18e49f2 Author: James Agnew <jamesagnew@gmail.com> Date: Mon Jul 3 22:10:59 2017 -0400 Continue refactor for HAPI 3 commit 9281ccafc32354222932c5a9f5ee8b0f206ebc05 Merge: ea1264cd8e 294d080bd3 Author: James Agnew <jamesagnew@gmail.com> Date: Mon Jul 3 20:34:16 2017 -0400 Merge branch 'master' into hapi3_refactor commit ea1264cd8e9b8c5297d218e91cf14bd48d0a92c7 Author: James <jamesagnew@gmail.com> Date: Wed Jun 28 10:26:01 2017 -0400 Continue work on refactor commit fbe2f98a0238f3d4e065db4550dd2ef1b460c0d8 Merge: b2bef47100 0a4dcc32ec Author: James <jamesagnew@gmail.com> Date: Wed Jun 28 06:21:22 2017 -0400 Merge branch 'master' into hapi3_refactor commit b2bef47100370e1248834523d73a630950032d7a Author: James <jamesagnew@gmail.com> Date: Tue Jun 27 21:13:23 2017 -0400 Work on refactor commit 8f76e4e46385daa9ce3442e2d9342453ce373ba3 Author: James Agnew <jamesagnew@gmail.com> Date: Sun Jun 25 21:55:35 2017 -0400 Lots of work on refactoring
2017-08-13 14:39:47 -04:00
public PreResourceState getPreResourceState() {
return myPreResourceState;
2014-12-01 08:13:32 -05:00
}
Merge in HAPI 3.0.0 working branch! Squashed commit of the following: commit 12f89a423a1691fdbc360706fd94a03bd9144d17 Author: James <jamesagnew@gmail.com> Date: Sun Aug 13 14:38:51 2017 -0400 Minimize validation resources commit f6868cce5c73b34d5ecd53bf1a220fdccd6b4e09 Merge: 3b80779fd3 1e158311d8 Author: James <jamesagnew@gmail.com> Date: Sun Aug 13 14:05:34 2017 -0400 Forward port fix for #710 Merge branch 'master' into hapi3_refactor commit 3b80779fd3905cbf5322e6973334eb0ecb3d8426 Merge: 1f534985e8 356d9acaf7 Author: James <jamesagnew@gmail.com> Date: Sun Aug 13 12:31:09 2017 -0400 Forward port #705, #708, and #710 Merge branch 'master' into hapi3_refactor commit 1f534985e8106347d9cc9da2dd8145fdd869547f Merge: 7c39a47852 dedd3d635b Author: James <jamesagnew@gmail.com> Date: Sun Aug 13 10:52:59 2017 -0400 Forward port #695 Merge branch 'master' into hapi3_refactor commit 7c39a47852142bee398101120678217ab0917c7e Merge: e0ffb84d21 6efafe62f1 Author: James <jamesagnew@gmail.com> Date: Sun Aug 13 09:53:17 2017 -0400 Forward port #688 Merge branch 'master' into hapi3_refactor commit e0ffb84d2129c209ccffc2611038592f37dddfd2 Merge: 52388c11c1 d19b00ff09 Author: James <jamesagnew@gmail.com> Date: Sat Aug 12 14:59:46 2017 -0400 Merge branch 'master' into hapi3_refactor commit 52388c11c17cf038591244548f2a592f6b655cee Author: James <jamesagnew@gmail.com> Date: Sat Aug 12 06:21:46 2017 -0400 Cleanup commit 209752cd638266b39574ae11c5989b624d5e85d3 Author: James <jamesagnew@gmail.com> Date: Thu Aug 10 11:18:19 2017 -0400 Fix tests commit 4543408dc8d63b5b9682a275e261d3168cdc2196 Author: James <jamesagnew@gmail.com> Date: Sat Aug 5 06:55:50 2017 -0400 Fix a potential deadlock commit ee360f537692672df473f94dae75c176b2287415 Author: James <jamesagnew@gmail.com> Date: Sat Aug 5 06:22:06 2017 -0400 Add R4 code to CLI commit 1a95ba3b6529afdaf81232b82cc303718c0187d6 Author: James Agnew <jamesagnew@gmail.com> Date: Thu Aug 3 06:14:01 2017 -0400 More cleanup commit f0d88026817296edaa65132accd67d0c8ad8088c Author: James <jamesagnew@gmail.com> Date: Wed Aug 2 11:27:43 2017 -0400 Tests are working! commit a4cbda357e8e7d024f24e3ee9a660b5366983ca1 Author: James Agnew <jamesagnew@gmail.com> Date: Wed Aug 2 10:42:04 2017 -0400 Connection handling cleanup for new tests commit 0e2cecfbd0d7a546444a66e8411600040fd9a17b Author: James Agnew <jamesagnew@gmail.com> Date: Wed Aug 2 10:16:28 2017 -0400 Clean up R4 JPA tests commit 40317a650d72c86e2529d5179cffe63399301de5 Author: James <jamesagnew@gmail.com> Date: Wed Aug 2 09:12:38 2017 -0400 Work on R4 for JPA server commit e7f8f8c30d72ed30d739979964db38d41c5baec1 Author: James <jamesagnew@gmail.com> Date: Tue Aug 1 20:43:47 2017 -0400 More work on porting tests commit 43c9003258696ab33e7bb335e882ab1c66fb61aa Author: James <jamesagnew@gmail.com> Date: Tue Aug 1 07:09:29 2017 -0400 Work on porting DSTU1 tests commit 602857f1e26a69a2284e176b5e44a860d9b828ff Author: James Agnew <jamesagnew@gmail.com> Date: Mon Jul 31 22:34:08 2017 -0400 More work on bring unit tests up to date commit e326a7b0cdb8368009119bba41886838a973e03e Author: James Agnew <jamesagnew@gmail.com> Date: Mon Jul 31 17:36:38 2017 -0400 Credit for #686 and forward port the fix to R4 validator commit 96543c3992adcb406df3c8899dab79cf4bd5b4b4 Merge: 3fb75aa61a 9901b802c4 Author: James Agnew <jamesagnew@gmail.com> Date: Mon Jul 31 17:12:33 2017 -0400 Merge branch 'master' into hapi3_refactor commit 3fb75aa61ad29d9f3876a1c30c912627486147af Author: James <jamesagnew@gmail.com> Date: Mon Jul 31 15:21:30 2017 -0400 More work on cleanup commit b02fbb6804127e77c61c4792eefd9fc0d23d63d0 Author: James Agnew <jamesagnew@gmail.com> Date: Sun Jul 30 22:11:07 2017 -0400 Work on porting STU1 tests commit 1ae37b0db3929ea4f37955adf8f026e33ccf43b2 Author: James Agnew <jamesagnew@gmail.com> Date: Sun Jul 30 20:56:10 2017 -0400 Try to get coverage report working commit 72b88849b30a94a9ff08d3a1ab50a05b2acbdfdd Author: James Agnew <jamesagnew@gmail.com> Date: Sun Jul 30 20:27:02 2017 -0400 Fix android tests commit e5f6c35aeab8bbc056870a038e1862181049a020 Author: James <jamesagnew@gmail.com> Date: Sun Jul 30 19:31:18 2017 -0400 More work on getting legacy code cleaned up commit 0b513b0845a082b5c20b0033dfab4e29f5e4a934 Author: James <jamesagnew@gmail.com> Date: Sun Jul 30 18:41:13 2017 -0400 Continue work on removing deprecated API commit defea69aa38a2e0f4137ed9c8527956872ff70bf Author: James Agnew <jamesagnew@gmail.com> Date: Sun Jul 30 17:10:01 2017 -0400 More cleanup of legacy code commit 9ae7295705cb58f5edcf7ee1259f023cbbe2fe51 Author: James <jamesagnew@gmail.com> Date: Sun Jul 30 07:11:45 2017 -0400 More cleanup of legacy code commit ebd3eeb5ee793cf5805cc726db353f3def35ab00 Author: James Agnew <jamesagnew@gmail.com> Date: Sun Jul 30 06:43:25 2017 -0400 More work on removing legacy code commit 92224c2532faf70171473d64429c3ceaf3e3406c Author: James <jamesagnew@gmail.com> Date: Sat Jul 29 18:44:06 2017 -0400 Remove DSTU1 Bundle commit c52cacf71bae3f5c02ffae03881c21de1f3aba22 Author: James <jamesagnew@gmail.com> Date: Sat Jul 29 14:27:42 2017 -0400 Now compiling commit b405e51773baf4ab3a3c387458cdc59541394cd1 Merge: c3ddf04e25 cb2cea54d7 Author: James Agnew <jamesagnew@gmail.com> Date: Fri Jul 28 06:21:02 2017 -0400 Merge branch 'master' into hapi3_refactor commit c3ddf04e2598b8d6214975ab0ae795f850396811 Author: James <jamesagnew@gmail.com> Date: Thu Jul 27 11:06:06 2017 -0400 Sync R4 releases in commit b13333c3c03ddb9a5061c3b22bf011f4592104f8 Author: James <jamesagnew@gmail.com> Date: Fri Jul 14 05:52:33 2017 -0400 JPA server is now able to handle placeholder IDs (e.g. urn:uuid:00....000) being used in Bundle.entry.request.url as a part of the conditional URL within transactions. commit 2e60ff7521b42890a32b97c2dda88ab233f5c91e Author: James Agnew <jamesagnew@gmail.com> Date: Thu Jul 13 20:02:46 2017 -0400 Fix imports commit a92ace2e0dac6e24f6dada53bf97d03861fd21a1 Merge: 3196db96d1 1a6b3ea867 Author: James Agnew <jamesagnew@gmail.com> Date: Thu Jul 13 12:02:27 2017 -0400 Merge branch 'master' into hapi3_refactor commit 3196db96d1c485310e746833df59c0e010b5b161 Author: James Agnew <jamesagnew@gmail.com> Date: Thu Jul 13 11:48:10 2017 -0400 Don't add false paging link to request commit bd4e1d338855a664045caa271d41616aed973a4d Author: James <jamesagnew@gmail.com> Date: Sun Jul 9 21:32:16 2017 -0400 Finally building correctly! commit 6464ce9304703cb3c5ecc58491282ddacc900853 Author: James <jamesagnew@gmail.com> Date: Sun Jul 9 16:38:28 2017 -0400 Work on refactor commit 0059f2e48e9d7c812c1d42a57c5b6059814f5155 Author: James <jamesagnew@gmail.com> Date: Sat Jul 8 07:16:20 2017 -0400 Keep working on refactor commit 6c2e87e8cc19863a811c11623d1c878c8b48f031 Author: James Agnew <jamesagnew@gmail.com> Date: Thu Jul 6 22:35:13 2017 -0400 Lots of work on refactor commit 11cab975047a0c28190e6533074fd3f11ddde240 Merge: 34ec6b8807 6c47bd4c51 Author: James Agnew <jamesagnew@gmail.com> Date: Thu Jul 6 21:43:57 2017 -0400 Merge branch 'master' into hapi3_refactor commit 34ec6b8807946aa6c97f0b5581dca9bd5f7b7a3e Merge: f8e647511b c520e60ac1 Author: James Agnew <jamesagnew@gmail.com> Date: Thu Jul 6 21:43:49 2017 -0400 Merge branch 'hapi3_refactor' of github.com:jamesagnew/hapi-fhir into hapi3_refactor commit f8e647511b4a82e7fde71a8850b8800e3d698b1f Author: James Agnew <jamesagnew@gmail.com> Date: Thu Jul 6 18:46:55 2017 -0400 Work on hapi3 changes commit c520e60ac1198f340cfb9090a7a33f91aa2d1e61 Author: James <jamesagnew@gmail.com> Date: Wed Jul 5 08:08:40 2017 -0400 Keep working on refactor commit f1d2ee90926f7db900a5b3b4ab9a8948d18e49f2 Author: James Agnew <jamesagnew@gmail.com> Date: Mon Jul 3 22:10:59 2017 -0400 Continue refactor for HAPI 3 commit 9281ccafc32354222932c5a9f5ee8b0f206ebc05 Merge: ea1264cd8e 294d080bd3 Author: James Agnew <jamesagnew@gmail.com> Date: Mon Jul 3 20:34:16 2017 -0400 Merge branch 'master' into hapi3_refactor commit ea1264cd8e9b8c5297d218e91cf14bd48d0a92c7 Author: James <jamesagnew@gmail.com> Date: Wed Jun 28 10:26:01 2017 -0400 Continue work on refactor commit fbe2f98a0238f3d4e065db4550dd2ef1b460c0d8 Merge: b2bef47100 0a4dcc32ec Author: James <jamesagnew@gmail.com> Date: Wed Jun 28 06:21:22 2017 -0400 Merge branch 'master' into hapi3_refactor commit b2bef47100370e1248834523d73a630950032d7a Author: James <jamesagnew@gmail.com> Date: Tue Jun 27 21:13:23 2017 -0400 Work on refactor commit 8f76e4e46385daa9ce3442e2d9342453ce373ba3 Author: James Agnew <jamesagnew@gmail.com> Date: Sun Jun 25 21:55:35 2017 -0400 Lots of work on refactoring
2017-08-13 14:39:47 -04:00
public boolean isPreResource() {
return false;
2014-12-01 08:13:32 -05:00
}
Merge in HAPI 3.0.0 working branch! Squashed commit of the following: commit 12f89a423a1691fdbc360706fd94a03bd9144d17 Author: James <jamesagnew@gmail.com> Date: Sun Aug 13 14:38:51 2017 -0400 Minimize validation resources commit f6868cce5c73b34d5ecd53bf1a220fdccd6b4e09 Merge: 3b80779fd3 1e158311d8 Author: James <jamesagnew@gmail.com> Date: Sun Aug 13 14:05:34 2017 -0400 Forward port fix for #710 Merge branch 'master' into hapi3_refactor commit 3b80779fd3905cbf5322e6973334eb0ecb3d8426 Merge: 1f534985e8 356d9acaf7 Author: James <jamesagnew@gmail.com> Date: Sun Aug 13 12:31:09 2017 -0400 Forward port #705, #708, and #710 Merge branch 'master' into hapi3_refactor commit 1f534985e8106347d9cc9da2dd8145fdd869547f Merge: 7c39a47852 dedd3d635b Author: James <jamesagnew@gmail.com> Date: Sun Aug 13 10:52:59 2017 -0400 Forward port #695 Merge branch 'master' into hapi3_refactor commit 7c39a47852142bee398101120678217ab0917c7e Merge: e0ffb84d21 6efafe62f1 Author: James <jamesagnew@gmail.com> Date: Sun Aug 13 09:53:17 2017 -0400 Forward port #688 Merge branch 'master' into hapi3_refactor commit e0ffb84d2129c209ccffc2611038592f37dddfd2 Merge: 52388c11c1 d19b00ff09 Author: James <jamesagnew@gmail.com> Date: Sat Aug 12 14:59:46 2017 -0400 Merge branch 'master' into hapi3_refactor commit 52388c11c17cf038591244548f2a592f6b655cee Author: James <jamesagnew@gmail.com> Date: Sat Aug 12 06:21:46 2017 -0400 Cleanup commit 209752cd638266b39574ae11c5989b624d5e85d3 Author: James <jamesagnew@gmail.com> Date: Thu Aug 10 11:18:19 2017 -0400 Fix tests commit 4543408dc8d63b5b9682a275e261d3168cdc2196 Author: James <jamesagnew@gmail.com> Date: Sat Aug 5 06:55:50 2017 -0400 Fix a potential deadlock commit ee360f537692672df473f94dae75c176b2287415 Author: James <jamesagnew@gmail.com> Date: Sat Aug 5 06:22:06 2017 -0400 Add R4 code to CLI commit 1a95ba3b6529afdaf81232b82cc303718c0187d6 Author: James Agnew <jamesagnew@gmail.com> Date: Thu Aug 3 06:14:01 2017 -0400 More cleanup commit f0d88026817296edaa65132accd67d0c8ad8088c Author: James <jamesagnew@gmail.com> Date: Wed Aug 2 11:27:43 2017 -0400 Tests are working! commit a4cbda357e8e7d024f24e3ee9a660b5366983ca1 Author: James Agnew <jamesagnew@gmail.com> Date: Wed Aug 2 10:42:04 2017 -0400 Connection handling cleanup for new tests commit 0e2cecfbd0d7a546444a66e8411600040fd9a17b Author: James Agnew <jamesagnew@gmail.com> Date: Wed Aug 2 10:16:28 2017 -0400 Clean up R4 JPA tests commit 40317a650d72c86e2529d5179cffe63399301de5 Author: James <jamesagnew@gmail.com> Date: Wed Aug 2 09:12:38 2017 -0400 Work on R4 for JPA server commit e7f8f8c30d72ed30d739979964db38d41c5baec1 Author: James <jamesagnew@gmail.com> Date: Tue Aug 1 20:43:47 2017 -0400 More work on porting tests commit 43c9003258696ab33e7bb335e882ab1c66fb61aa Author: James <jamesagnew@gmail.com> Date: Tue Aug 1 07:09:29 2017 -0400 Work on porting DSTU1 tests commit 602857f1e26a69a2284e176b5e44a860d9b828ff Author: James Agnew <jamesagnew@gmail.com> Date: Mon Jul 31 22:34:08 2017 -0400 More work on bring unit tests up to date commit e326a7b0cdb8368009119bba41886838a973e03e Author: James Agnew <jamesagnew@gmail.com> Date: Mon Jul 31 17:36:38 2017 -0400 Credit for #686 and forward port the fix to R4 validator commit 96543c3992adcb406df3c8899dab79cf4bd5b4b4 Merge: 3fb75aa61a 9901b802c4 Author: James Agnew <jamesagnew@gmail.com> Date: Mon Jul 31 17:12:33 2017 -0400 Merge branch 'master' into hapi3_refactor commit 3fb75aa61ad29d9f3876a1c30c912627486147af Author: James <jamesagnew@gmail.com> Date: Mon Jul 31 15:21:30 2017 -0400 More work on cleanup commit b02fbb6804127e77c61c4792eefd9fc0d23d63d0 Author: James Agnew <jamesagnew@gmail.com> Date: Sun Jul 30 22:11:07 2017 -0400 Work on porting STU1 tests commit 1ae37b0db3929ea4f37955adf8f026e33ccf43b2 Author: James Agnew <jamesagnew@gmail.com> Date: Sun Jul 30 20:56:10 2017 -0400 Try to get coverage report working commit 72b88849b30a94a9ff08d3a1ab50a05b2acbdfdd Author: James Agnew <jamesagnew@gmail.com> Date: Sun Jul 30 20:27:02 2017 -0400 Fix android tests commit e5f6c35aeab8bbc056870a038e1862181049a020 Author: James <jamesagnew@gmail.com> Date: Sun Jul 30 19:31:18 2017 -0400 More work on getting legacy code cleaned up commit 0b513b0845a082b5c20b0033dfab4e29f5e4a934 Author: James <jamesagnew@gmail.com> Date: Sun Jul 30 18:41:13 2017 -0400 Continue work on removing deprecated API commit defea69aa38a2e0f4137ed9c8527956872ff70bf Author: James Agnew <jamesagnew@gmail.com> Date: Sun Jul 30 17:10:01 2017 -0400 More cleanup of legacy code commit 9ae7295705cb58f5edcf7ee1259f023cbbe2fe51 Author: James <jamesagnew@gmail.com> Date: Sun Jul 30 07:11:45 2017 -0400 More cleanup of legacy code commit ebd3eeb5ee793cf5805cc726db353f3def35ab00 Author: James Agnew <jamesagnew@gmail.com> Date: Sun Jul 30 06:43:25 2017 -0400 More work on removing legacy code commit 92224c2532faf70171473d64429c3ceaf3e3406c Author: James <jamesagnew@gmail.com> Date: Sat Jul 29 18:44:06 2017 -0400 Remove DSTU1 Bundle commit c52cacf71bae3f5c02ffae03881c21de1f3aba22 Author: James <jamesagnew@gmail.com> Date: Sat Jul 29 14:27:42 2017 -0400 Now compiling commit b405e51773baf4ab3a3c387458cdc59541394cd1 Merge: c3ddf04e25 cb2cea54d7 Author: James Agnew <jamesagnew@gmail.com> Date: Fri Jul 28 06:21:02 2017 -0400 Merge branch 'master' into hapi3_refactor commit c3ddf04e2598b8d6214975ab0ae795f850396811 Author: James <jamesagnew@gmail.com> Date: Thu Jul 27 11:06:06 2017 -0400 Sync R4 releases in commit b13333c3c03ddb9a5061c3b22bf011f4592104f8 Author: James <jamesagnew@gmail.com> Date: Fri Jul 14 05:52:33 2017 -0400 JPA server is now able to handle placeholder IDs (e.g. urn:uuid:00....000) being used in Bundle.entry.request.url as a part of the conditional URL within transactions. commit 2e60ff7521b42890a32b97c2dda88ab233f5c91e Author: James Agnew <jamesagnew@gmail.com> Date: Thu Jul 13 20:02:46 2017 -0400 Fix imports commit a92ace2e0dac6e24f6dada53bf97d03861fd21a1 Merge: 3196db96d1 1a6b3ea867 Author: James Agnew <jamesagnew@gmail.com> Date: Thu Jul 13 12:02:27 2017 -0400 Merge branch 'master' into hapi3_refactor commit 3196db96d1c485310e746833df59c0e010b5b161 Author: James Agnew <jamesagnew@gmail.com> Date: Thu Jul 13 11:48:10 2017 -0400 Don't add false paging link to request commit bd4e1d338855a664045caa271d41616aed973a4d Author: James <jamesagnew@gmail.com> Date: Sun Jul 9 21:32:16 2017 -0400 Finally building correctly! commit 6464ce9304703cb3c5ecc58491282ddacc900853 Author: James <jamesagnew@gmail.com> Date: Sun Jul 9 16:38:28 2017 -0400 Work on refactor commit 0059f2e48e9d7c812c1d42a57c5b6059814f5155 Author: James <jamesagnew@gmail.com> Date: Sat Jul 8 07:16:20 2017 -0400 Keep working on refactor commit 6c2e87e8cc19863a811c11623d1c878c8b48f031 Author: James Agnew <jamesagnew@gmail.com> Date: Thu Jul 6 22:35:13 2017 -0400 Lots of work on refactor commit 11cab975047a0c28190e6533074fd3f11ddde240 Merge: 34ec6b8807 6c47bd4c51 Author: James Agnew <jamesagnew@gmail.com> Date: Thu Jul 6 21:43:57 2017 -0400 Merge branch 'master' into hapi3_refactor commit 34ec6b8807946aa6c97f0b5581dca9bd5f7b7a3e Merge: f8e647511b c520e60ac1 Author: James Agnew <jamesagnew@gmail.com> Date: Thu Jul 6 21:43:49 2017 -0400 Merge branch 'hapi3_refactor' of github.com:jamesagnew/hapi-fhir into hapi3_refactor commit f8e647511b4a82e7fde71a8850b8800e3d698b1f Author: James Agnew <jamesagnew@gmail.com> Date: Thu Jul 6 18:46:55 2017 -0400 Work on hapi3 changes commit c520e60ac1198f340cfb9090a7a33f91aa2d1e61 Author: James <jamesagnew@gmail.com> Date: Wed Jul 5 08:08:40 2017 -0400 Keep working on refactor commit f1d2ee90926f7db900a5b3b4ab9a8948d18e49f2 Author: James Agnew <jamesagnew@gmail.com> Date: Mon Jul 3 22:10:59 2017 -0400 Continue refactor for HAPI 3 commit 9281ccafc32354222932c5a9f5ee8b0f206ebc05 Merge: ea1264cd8e 294d080bd3 Author: James Agnew <jamesagnew@gmail.com> Date: Mon Jul 3 20:34:16 2017 -0400 Merge branch 'master' into hapi3_refactor commit ea1264cd8e9b8c5297d218e91cf14bd48d0a92c7 Author: James <jamesagnew@gmail.com> Date: Wed Jun 28 10:26:01 2017 -0400 Continue work on refactor commit fbe2f98a0238f3d4e065db4550dd2ef1b460c0d8 Merge: b2bef47100 0a4dcc32ec Author: James <jamesagnew@gmail.com> Date: Wed Jun 28 06:21:22 2017 -0400 Merge branch 'master' into hapi3_refactor commit b2bef47100370e1248834523d73a630950032d7a Author: James <jamesagnew@gmail.com> Date: Tue Jun 27 21:13:23 2017 -0400 Work on refactor commit 8f76e4e46385daa9ce3442e2d9342453ce373ba3 Author: James Agnew <jamesagnew@gmail.com> Date: Sun Jun 25 21:55:35 2017 -0400 Lots of work on refactoring
2017-08-13 14:39:47 -04:00
protected void logAndSwallowUnexpectedElement(String theLocalPart) {
myErrorHandler.unknownElement(null, theLocalPart);
push(new SwallowChildrenWholeState(getPreResourceState()));
}
2014-12-01 08:13:32 -05:00
Merge in HAPI 3.0.0 working branch! Squashed commit of the following: commit 12f89a423a1691fdbc360706fd94a03bd9144d17 Author: James <jamesagnew@gmail.com> Date: Sun Aug 13 14:38:51 2017 -0400 Minimize validation resources commit f6868cce5c73b34d5ecd53bf1a220fdccd6b4e09 Merge: 3b80779fd3 1e158311d8 Author: James <jamesagnew@gmail.com> Date: Sun Aug 13 14:05:34 2017 -0400 Forward port fix for #710 Merge branch 'master' into hapi3_refactor commit 3b80779fd3905cbf5322e6973334eb0ecb3d8426 Merge: 1f534985e8 356d9acaf7 Author: James <jamesagnew@gmail.com> Date: Sun Aug 13 12:31:09 2017 -0400 Forward port #705, #708, and #710 Merge branch 'master' into hapi3_refactor commit 1f534985e8106347d9cc9da2dd8145fdd869547f Merge: 7c39a47852 dedd3d635b Author: James <jamesagnew@gmail.com> Date: Sun Aug 13 10:52:59 2017 -0400 Forward port #695 Merge branch 'master' into hapi3_refactor commit 7c39a47852142bee398101120678217ab0917c7e Merge: e0ffb84d21 6efafe62f1 Author: James <jamesagnew@gmail.com> Date: Sun Aug 13 09:53:17 2017 -0400 Forward port #688 Merge branch 'master' into hapi3_refactor commit e0ffb84d2129c209ccffc2611038592f37dddfd2 Merge: 52388c11c1 d19b00ff09 Author: James <jamesagnew@gmail.com> Date: Sat Aug 12 14:59:46 2017 -0400 Merge branch 'master' into hapi3_refactor commit 52388c11c17cf038591244548f2a592f6b655cee Author: James <jamesagnew@gmail.com> Date: Sat Aug 12 06:21:46 2017 -0400 Cleanup commit 209752cd638266b39574ae11c5989b624d5e85d3 Author: James <jamesagnew@gmail.com> Date: Thu Aug 10 11:18:19 2017 -0400 Fix tests commit 4543408dc8d63b5b9682a275e261d3168cdc2196 Author: James <jamesagnew@gmail.com> Date: Sat Aug 5 06:55:50 2017 -0400 Fix a potential deadlock commit ee360f537692672df473f94dae75c176b2287415 Author: James <jamesagnew@gmail.com> Date: Sat Aug 5 06:22:06 2017 -0400 Add R4 code to CLI commit 1a95ba3b6529afdaf81232b82cc303718c0187d6 Author: James Agnew <jamesagnew@gmail.com> Date: Thu Aug 3 06:14:01 2017 -0400 More cleanup commit f0d88026817296edaa65132accd67d0c8ad8088c Author: James <jamesagnew@gmail.com> Date: Wed Aug 2 11:27:43 2017 -0400 Tests are working! commit a4cbda357e8e7d024f24e3ee9a660b5366983ca1 Author: James Agnew <jamesagnew@gmail.com> Date: Wed Aug 2 10:42:04 2017 -0400 Connection handling cleanup for new tests commit 0e2cecfbd0d7a546444a66e8411600040fd9a17b Author: James Agnew <jamesagnew@gmail.com> Date: Wed Aug 2 10:16:28 2017 -0400 Clean up R4 JPA tests commit 40317a650d72c86e2529d5179cffe63399301de5 Author: James <jamesagnew@gmail.com> Date: Wed Aug 2 09:12:38 2017 -0400 Work on R4 for JPA server commit e7f8f8c30d72ed30d739979964db38d41c5baec1 Author: James <jamesagnew@gmail.com> Date: Tue Aug 1 20:43:47 2017 -0400 More work on porting tests commit 43c9003258696ab33e7bb335e882ab1c66fb61aa Author: James <jamesagnew@gmail.com> Date: Tue Aug 1 07:09:29 2017 -0400 Work on porting DSTU1 tests commit 602857f1e26a69a2284e176b5e44a860d9b828ff Author: James Agnew <jamesagnew@gmail.com> Date: Mon Jul 31 22:34:08 2017 -0400 More work on bring unit tests up to date commit e326a7b0cdb8368009119bba41886838a973e03e Author: James Agnew <jamesagnew@gmail.com> Date: Mon Jul 31 17:36:38 2017 -0400 Credit for #686 and forward port the fix to R4 validator commit 96543c3992adcb406df3c8899dab79cf4bd5b4b4 Merge: 3fb75aa61a 9901b802c4 Author: James Agnew <jamesagnew@gmail.com> Date: Mon Jul 31 17:12:33 2017 -0400 Merge branch 'master' into hapi3_refactor commit 3fb75aa61ad29d9f3876a1c30c912627486147af Author: James <jamesagnew@gmail.com> Date: Mon Jul 31 15:21:30 2017 -0400 More work on cleanup commit b02fbb6804127e77c61c4792eefd9fc0d23d63d0 Author: James Agnew <jamesagnew@gmail.com> Date: Sun Jul 30 22:11:07 2017 -0400 Work on porting STU1 tests commit 1ae37b0db3929ea4f37955adf8f026e33ccf43b2 Author: James Agnew <jamesagnew@gmail.com> Date: Sun Jul 30 20:56:10 2017 -0400 Try to get coverage report working commit 72b88849b30a94a9ff08d3a1ab50a05b2acbdfdd Author: James Agnew <jamesagnew@gmail.com> Date: Sun Jul 30 20:27:02 2017 -0400 Fix android tests commit e5f6c35aeab8bbc056870a038e1862181049a020 Author: James <jamesagnew@gmail.com> Date: Sun Jul 30 19:31:18 2017 -0400 More work on getting legacy code cleaned up commit 0b513b0845a082b5c20b0033dfab4e29f5e4a934 Author: James <jamesagnew@gmail.com> Date: Sun Jul 30 18:41:13 2017 -0400 Continue work on removing deprecated API commit defea69aa38a2e0f4137ed9c8527956872ff70bf Author: James Agnew <jamesagnew@gmail.com> Date: Sun Jul 30 17:10:01 2017 -0400 More cleanup of legacy code commit 9ae7295705cb58f5edcf7ee1259f023cbbe2fe51 Author: James <jamesagnew@gmail.com> Date: Sun Jul 30 07:11:45 2017 -0400 More cleanup of legacy code commit ebd3eeb5ee793cf5805cc726db353f3def35ab00 Author: James Agnew <jamesagnew@gmail.com> Date: Sun Jul 30 06:43:25 2017 -0400 More work on removing legacy code commit 92224c2532faf70171473d64429c3ceaf3e3406c Author: James <jamesagnew@gmail.com> Date: Sat Jul 29 18:44:06 2017 -0400 Remove DSTU1 Bundle commit c52cacf71bae3f5c02ffae03881c21de1f3aba22 Author: James <jamesagnew@gmail.com> Date: Sat Jul 29 14:27:42 2017 -0400 Now compiling commit b405e51773baf4ab3a3c387458cdc59541394cd1 Merge: c3ddf04e25 cb2cea54d7 Author: James Agnew <jamesagnew@gmail.com> Date: Fri Jul 28 06:21:02 2017 -0400 Merge branch 'master' into hapi3_refactor commit c3ddf04e2598b8d6214975ab0ae795f850396811 Author: James <jamesagnew@gmail.com> Date: Thu Jul 27 11:06:06 2017 -0400 Sync R4 releases in commit b13333c3c03ddb9a5061c3b22bf011f4592104f8 Author: James <jamesagnew@gmail.com> Date: Fri Jul 14 05:52:33 2017 -0400 JPA server is now able to handle placeholder IDs (e.g. urn:uuid:00....000) being used in Bundle.entry.request.url as a part of the conditional URL within transactions. commit 2e60ff7521b42890a32b97c2dda88ab233f5c91e Author: James Agnew <jamesagnew@gmail.com> Date: Thu Jul 13 20:02:46 2017 -0400 Fix imports commit a92ace2e0dac6e24f6dada53bf97d03861fd21a1 Merge: 3196db96d1 1a6b3ea867 Author: James Agnew <jamesagnew@gmail.com> Date: Thu Jul 13 12:02:27 2017 -0400 Merge branch 'master' into hapi3_refactor commit 3196db96d1c485310e746833df59c0e010b5b161 Author: James Agnew <jamesagnew@gmail.com> Date: Thu Jul 13 11:48:10 2017 -0400 Don't add false paging link to request commit bd4e1d338855a664045caa271d41616aed973a4d Author: James <jamesagnew@gmail.com> Date: Sun Jul 9 21:32:16 2017 -0400 Finally building correctly! commit 6464ce9304703cb3c5ecc58491282ddacc900853 Author: James <jamesagnew@gmail.com> Date: Sun Jul 9 16:38:28 2017 -0400 Work on refactor commit 0059f2e48e9d7c812c1d42a57c5b6059814f5155 Author: James <jamesagnew@gmail.com> Date: Sat Jul 8 07:16:20 2017 -0400 Keep working on refactor commit 6c2e87e8cc19863a811c11623d1c878c8b48f031 Author: James Agnew <jamesagnew@gmail.com> Date: Thu Jul 6 22:35:13 2017 -0400 Lots of work on refactor commit 11cab975047a0c28190e6533074fd3f11ddde240 Merge: 34ec6b8807 6c47bd4c51 Author: James Agnew <jamesagnew@gmail.com> Date: Thu Jul 6 21:43:57 2017 -0400 Merge branch 'master' into hapi3_refactor commit 34ec6b8807946aa6c97f0b5581dca9bd5f7b7a3e Merge: f8e647511b c520e60ac1 Author: James Agnew <jamesagnew@gmail.com> Date: Thu Jul 6 21:43:49 2017 -0400 Merge branch 'hapi3_refactor' of github.com:jamesagnew/hapi-fhir into hapi3_refactor commit f8e647511b4a82e7fde71a8850b8800e3d698b1f Author: James Agnew <jamesagnew@gmail.com> Date: Thu Jul 6 18:46:55 2017 -0400 Work on hapi3 changes commit c520e60ac1198f340cfb9090a7a33f91aa2d1e61 Author: James <jamesagnew@gmail.com> Date: Wed Jul 5 08:08:40 2017 -0400 Keep working on refactor commit f1d2ee90926f7db900a5b3b4ab9a8948d18e49f2 Author: James Agnew <jamesagnew@gmail.com> Date: Mon Jul 3 22:10:59 2017 -0400 Continue refactor for HAPI 3 commit 9281ccafc32354222932c5a9f5ee8b0f206ebc05 Merge: ea1264cd8e 294d080bd3 Author: James Agnew <jamesagnew@gmail.com> Date: Mon Jul 3 20:34:16 2017 -0400 Merge branch 'master' into hapi3_refactor commit ea1264cd8e9b8c5297d218e91cf14bd48d0a92c7 Author: James <jamesagnew@gmail.com> Date: Wed Jun 28 10:26:01 2017 -0400 Continue work on refactor commit fbe2f98a0238f3d4e065db4550dd2ef1b460c0d8 Merge: b2bef47100 0a4dcc32ec Author: James <jamesagnew@gmail.com> Date: Wed Jun 28 06:21:22 2017 -0400 Merge branch 'master' into hapi3_refactor commit b2bef47100370e1248834523d73a630950032d7a Author: James <jamesagnew@gmail.com> Date: Tue Jun 27 21:13:23 2017 -0400 Work on refactor commit 8f76e4e46385daa9ce3442e2d9342453ce373ba3 Author: James Agnew <jamesagnew@gmail.com> Date: Sun Jun 25 21:55:35 2017 -0400 Lots of work on refactoring
2017-08-13 14:39:47 -04:00
public void setStack(BaseState theState) {
myStack = theState;
2014-12-01 08:13:32 -05:00
}
Merge in HAPI 3.0.0 working branch! Squashed commit of the following: commit 12f89a423a1691fdbc360706fd94a03bd9144d17 Author: James <jamesagnew@gmail.com> Date: Sun Aug 13 14:38:51 2017 -0400 Minimize validation resources commit f6868cce5c73b34d5ecd53bf1a220fdccd6b4e09 Merge: 3b80779fd3 1e158311d8 Author: James <jamesagnew@gmail.com> Date: Sun Aug 13 14:05:34 2017 -0400 Forward port fix for #710 Merge branch 'master' into hapi3_refactor commit 3b80779fd3905cbf5322e6973334eb0ecb3d8426 Merge: 1f534985e8 356d9acaf7 Author: James <jamesagnew@gmail.com> Date: Sun Aug 13 12:31:09 2017 -0400 Forward port #705, #708, and #710 Merge branch 'master' into hapi3_refactor commit 1f534985e8106347d9cc9da2dd8145fdd869547f Merge: 7c39a47852 dedd3d635b Author: James <jamesagnew@gmail.com> Date: Sun Aug 13 10:52:59 2017 -0400 Forward port #695 Merge branch 'master' into hapi3_refactor commit 7c39a47852142bee398101120678217ab0917c7e Merge: e0ffb84d21 6efafe62f1 Author: James <jamesagnew@gmail.com> Date: Sun Aug 13 09:53:17 2017 -0400 Forward port #688 Merge branch 'master' into hapi3_refactor commit e0ffb84d2129c209ccffc2611038592f37dddfd2 Merge: 52388c11c1 d19b00ff09 Author: James <jamesagnew@gmail.com> Date: Sat Aug 12 14:59:46 2017 -0400 Merge branch 'master' into hapi3_refactor commit 52388c11c17cf038591244548f2a592f6b655cee Author: James <jamesagnew@gmail.com> Date: Sat Aug 12 06:21:46 2017 -0400 Cleanup commit 209752cd638266b39574ae11c5989b624d5e85d3 Author: James <jamesagnew@gmail.com> Date: Thu Aug 10 11:18:19 2017 -0400 Fix tests commit 4543408dc8d63b5b9682a275e261d3168cdc2196 Author: James <jamesagnew@gmail.com> Date: Sat Aug 5 06:55:50 2017 -0400 Fix a potential deadlock commit ee360f537692672df473f94dae75c176b2287415 Author: James <jamesagnew@gmail.com> Date: Sat Aug 5 06:22:06 2017 -0400 Add R4 code to CLI commit 1a95ba3b6529afdaf81232b82cc303718c0187d6 Author: James Agnew <jamesagnew@gmail.com> Date: Thu Aug 3 06:14:01 2017 -0400 More cleanup commit f0d88026817296edaa65132accd67d0c8ad8088c Author: James <jamesagnew@gmail.com> Date: Wed Aug 2 11:27:43 2017 -0400 Tests are working! commit a4cbda357e8e7d024f24e3ee9a660b5366983ca1 Author: James Agnew <jamesagnew@gmail.com> Date: Wed Aug 2 10:42:04 2017 -0400 Connection handling cleanup for new tests commit 0e2cecfbd0d7a546444a66e8411600040fd9a17b Author: James Agnew <jamesagnew@gmail.com> Date: Wed Aug 2 10:16:28 2017 -0400 Clean up R4 JPA tests commit 40317a650d72c86e2529d5179cffe63399301de5 Author: James <jamesagnew@gmail.com> Date: Wed Aug 2 09:12:38 2017 -0400 Work on R4 for JPA server commit e7f8f8c30d72ed30d739979964db38d41c5baec1 Author: James <jamesagnew@gmail.com> Date: Tue Aug 1 20:43:47 2017 -0400 More work on porting tests commit 43c9003258696ab33e7bb335e882ab1c66fb61aa Author: James <jamesagnew@gmail.com> Date: Tue Aug 1 07:09:29 2017 -0400 Work on porting DSTU1 tests commit 602857f1e26a69a2284e176b5e44a860d9b828ff Author: James Agnew <jamesagnew@gmail.com> Date: Mon Jul 31 22:34:08 2017 -0400 More work on bring unit tests up to date commit e326a7b0cdb8368009119bba41886838a973e03e Author: James Agnew <jamesagnew@gmail.com> Date: Mon Jul 31 17:36:38 2017 -0400 Credit for #686 and forward port the fix to R4 validator commit 96543c3992adcb406df3c8899dab79cf4bd5b4b4 Merge: 3fb75aa61a 9901b802c4 Author: James Agnew <jamesagnew@gmail.com> Date: Mon Jul 31 17:12:33 2017 -0400 Merge branch 'master' into hapi3_refactor commit 3fb75aa61ad29d9f3876a1c30c912627486147af Author: James <jamesagnew@gmail.com> Date: Mon Jul 31 15:21:30 2017 -0400 More work on cleanup commit b02fbb6804127e77c61c4792eefd9fc0d23d63d0 Author: James Agnew <jamesagnew@gmail.com> Date: Sun Jul 30 22:11:07 2017 -0400 Work on porting STU1 tests commit 1ae37b0db3929ea4f37955adf8f026e33ccf43b2 Author: James Agnew <jamesagnew@gmail.com> Date: Sun Jul 30 20:56:10 2017 -0400 Try to get coverage report working commit 72b88849b30a94a9ff08d3a1ab50a05b2acbdfdd Author: James Agnew <jamesagnew@gmail.com> Date: Sun Jul 30 20:27:02 2017 -0400 Fix android tests commit e5f6c35aeab8bbc056870a038e1862181049a020 Author: James <jamesagnew@gmail.com> Date: Sun Jul 30 19:31:18 2017 -0400 More work on getting legacy code cleaned up commit 0b513b0845a082b5c20b0033dfab4e29f5e4a934 Author: James <jamesagnew@gmail.com> Date: Sun Jul 30 18:41:13 2017 -0400 Continue work on removing deprecated API commit defea69aa38a2e0f4137ed9c8527956872ff70bf Author: James Agnew <jamesagnew@gmail.com> Date: Sun Jul 30 17:10:01 2017 -0400 More cleanup of legacy code commit 9ae7295705cb58f5edcf7ee1259f023cbbe2fe51 Author: James <jamesagnew@gmail.com> Date: Sun Jul 30 07:11:45 2017 -0400 More cleanup of legacy code commit ebd3eeb5ee793cf5805cc726db353f3def35ab00 Author: James Agnew <jamesagnew@gmail.com> Date: Sun Jul 30 06:43:25 2017 -0400 More work on removing legacy code commit 92224c2532faf70171473d64429c3ceaf3e3406c Author: James <jamesagnew@gmail.com> Date: Sat Jul 29 18:44:06 2017 -0400 Remove DSTU1 Bundle commit c52cacf71bae3f5c02ffae03881c21de1f3aba22 Author: James <jamesagnew@gmail.com> Date: Sat Jul 29 14:27:42 2017 -0400 Now compiling commit b405e51773baf4ab3a3c387458cdc59541394cd1 Merge: c3ddf04e25 cb2cea54d7 Author: James Agnew <jamesagnew@gmail.com> Date: Fri Jul 28 06:21:02 2017 -0400 Merge branch 'master' into hapi3_refactor commit c3ddf04e2598b8d6214975ab0ae795f850396811 Author: James <jamesagnew@gmail.com> Date: Thu Jul 27 11:06:06 2017 -0400 Sync R4 releases in commit b13333c3c03ddb9a5061c3b22bf011f4592104f8 Author: James <jamesagnew@gmail.com> Date: Fri Jul 14 05:52:33 2017 -0400 JPA server is now able to handle placeholder IDs (e.g. urn:uuid:00....000) being used in Bundle.entry.request.url as a part of the conditional URL within transactions. commit 2e60ff7521b42890a32b97c2dda88ab233f5c91e Author: James Agnew <jamesagnew@gmail.com> Date: Thu Jul 13 20:02:46 2017 -0400 Fix imports commit a92ace2e0dac6e24f6dada53bf97d03861fd21a1 Merge: 3196db96d1 1a6b3ea867 Author: James Agnew <jamesagnew@gmail.com> Date: Thu Jul 13 12:02:27 2017 -0400 Merge branch 'master' into hapi3_refactor commit 3196db96d1c485310e746833df59c0e010b5b161 Author: James Agnew <jamesagnew@gmail.com> Date: Thu Jul 13 11:48:10 2017 -0400 Don't add false paging link to request commit bd4e1d338855a664045caa271d41616aed973a4d Author: James <jamesagnew@gmail.com> Date: Sun Jul 9 21:32:16 2017 -0400 Finally building correctly! commit 6464ce9304703cb3c5ecc58491282ddacc900853 Author: James <jamesagnew@gmail.com> Date: Sun Jul 9 16:38:28 2017 -0400 Work on refactor commit 0059f2e48e9d7c812c1d42a57c5b6059814f5155 Author: James <jamesagnew@gmail.com> Date: Sat Jul 8 07:16:20 2017 -0400 Keep working on refactor commit 6c2e87e8cc19863a811c11623d1c878c8b48f031 Author: James Agnew <jamesagnew@gmail.com> Date: Thu Jul 6 22:35:13 2017 -0400 Lots of work on refactor commit 11cab975047a0c28190e6533074fd3f11ddde240 Merge: 34ec6b8807 6c47bd4c51 Author: James Agnew <jamesagnew@gmail.com> Date: Thu Jul 6 21:43:57 2017 -0400 Merge branch 'master' into hapi3_refactor commit 34ec6b8807946aa6c97f0b5581dca9bd5f7b7a3e Merge: f8e647511b c520e60ac1 Author: James Agnew <jamesagnew@gmail.com> Date: Thu Jul 6 21:43:49 2017 -0400 Merge branch 'hapi3_refactor' of github.com:jamesagnew/hapi-fhir into hapi3_refactor commit f8e647511b4a82e7fde71a8850b8800e3d698b1f Author: James Agnew <jamesagnew@gmail.com> Date: Thu Jul 6 18:46:55 2017 -0400 Work on hapi3 changes commit c520e60ac1198f340cfb9090a7a33f91aa2d1e61 Author: James <jamesagnew@gmail.com> Date: Wed Jul 5 08:08:40 2017 -0400 Keep working on refactor commit f1d2ee90926f7db900a5b3b4ab9a8948d18e49f2 Author: James Agnew <jamesagnew@gmail.com> Date: Mon Jul 3 22:10:59 2017 -0400 Continue refactor for HAPI 3 commit 9281ccafc32354222932c5a9f5ee8b0f206ebc05 Merge: ea1264cd8e 294d080bd3 Author: James Agnew <jamesagnew@gmail.com> Date: Mon Jul 3 20:34:16 2017 -0400 Merge branch 'master' into hapi3_refactor commit ea1264cd8e9b8c5297d218e91cf14bd48d0a92c7 Author: James <jamesagnew@gmail.com> Date: Wed Jun 28 10:26:01 2017 -0400 Continue work on refactor commit fbe2f98a0238f3d4e065db4550dd2ef1b460c0d8 Merge: b2bef47100 0a4dcc32ec Author: James <jamesagnew@gmail.com> Date: Wed Jun 28 06:21:22 2017 -0400 Merge branch 'master' into hapi3_refactor commit b2bef47100370e1248834523d73a630950032d7a Author: James <jamesagnew@gmail.com> Date: Tue Jun 27 21:13:23 2017 -0400 Work on refactor commit 8f76e4e46385daa9ce3442e2d9342453ce373ba3 Author: James Agnew <jamesagnew@gmail.com> Date: Sun Jun 25 21:55:35 2017 -0400 Lots of work on refactoring
2017-08-13 14:39:47 -04:00
/**
* @param theData The string value
Merge in HAPI 3.0.0 working branch! Squashed commit of the following: commit 12f89a423a1691fdbc360706fd94a03bd9144d17 Author: James <jamesagnew@gmail.com> Date: Sun Aug 13 14:38:51 2017 -0400 Minimize validation resources commit f6868cce5c73b34d5ecd53bf1a220fdccd6b4e09 Merge: 3b80779fd3 1e158311d8 Author: James <jamesagnew@gmail.com> Date: Sun Aug 13 14:05:34 2017 -0400 Forward port fix for #710 Merge branch 'master' into hapi3_refactor commit 3b80779fd3905cbf5322e6973334eb0ecb3d8426 Merge: 1f534985e8 356d9acaf7 Author: James <jamesagnew@gmail.com> Date: Sun Aug 13 12:31:09 2017 -0400 Forward port #705, #708, and #710 Merge branch 'master' into hapi3_refactor commit 1f534985e8106347d9cc9da2dd8145fdd869547f Merge: 7c39a47852 dedd3d635b Author: James <jamesagnew@gmail.com> Date: Sun Aug 13 10:52:59 2017 -0400 Forward port #695 Merge branch 'master' into hapi3_refactor commit 7c39a47852142bee398101120678217ab0917c7e Merge: e0ffb84d21 6efafe62f1 Author: James <jamesagnew@gmail.com> Date: Sun Aug 13 09:53:17 2017 -0400 Forward port #688 Merge branch 'master' into hapi3_refactor commit e0ffb84d2129c209ccffc2611038592f37dddfd2 Merge: 52388c11c1 d19b00ff09 Author: James <jamesagnew@gmail.com> Date: Sat Aug 12 14:59:46 2017 -0400 Merge branch 'master' into hapi3_refactor commit 52388c11c17cf038591244548f2a592f6b655cee Author: James <jamesagnew@gmail.com> Date: Sat Aug 12 06:21:46 2017 -0400 Cleanup commit 209752cd638266b39574ae11c5989b624d5e85d3 Author: James <jamesagnew@gmail.com> Date: Thu Aug 10 11:18:19 2017 -0400 Fix tests commit 4543408dc8d63b5b9682a275e261d3168cdc2196 Author: James <jamesagnew@gmail.com> Date: Sat Aug 5 06:55:50 2017 -0400 Fix a potential deadlock commit ee360f537692672df473f94dae75c176b2287415 Author: James <jamesagnew@gmail.com> Date: Sat Aug 5 06:22:06 2017 -0400 Add R4 code to CLI commit 1a95ba3b6529afdaf81232b82cc303718c0187d6 Author: James Agnew <jamesagnew@gmail.com> Date: Thu Aug 3 06:14:01 2017 -0400 More cleanup commit f0d88026817296edaa65132accd67d0c8ad8088c Author: James <jamesagnew@gmail.com> Date: Wed Aug 2 11:27:43 2017 -0400 Tests are working! commit a4cbda357e8e7d024f24e3ee9a660b5366983ca1 Author: James Agnew <jamesagnew@gmail.com> Date: Wed Aug 2 10:42:04 2017 -0400 Connection handling cleanup for new tests commit 0e2cecfbd0d7a546444a66e8411600040fd9a17b Author: James Agnew <jamesagnew@gmail.com> Date: Wed Aug 2 10:16:28 2017 -0400 Clean up R4 JPA tests commit 40317a650d72c86e2529d5179cffe63399301de5 Author: James <jamesagnew@gmail.com> Date: Wed Aug 2 09:12:38 2017 -0400 Work on R4 for JPA server commit e7f8f8c30d72ed30d739979964db38d41c5baec1 Author: James <jamesagnew@gmail.com> Date: Tue Aug 1 20:43:47 2017 -0400 More work on porting tests commit 43c9003258696ab33e7bb335e882ab1c66fb61aa Author: James <jamesagnew@gmail.com> Date: Tue Aug 1 07:09:29 2017 -0400 Work on porting DSTU1 tests commit 602857f1e26a69a2284e176b5e44a860d9b828ff Author: James Agnew <jamesagnew@gmail.com> Date: Mon Jul 31 22:34:08 2017 -0400 More work on bring unit tests up to date commit e326a7b0cdb8368009119bba41886838a973e03e Author: James Agnew <jamesagnew@gmail.com> Date: Mon Jul 31 17:36:38 2017 -0400 Credit for #686 and forward port the fix to R4 validator commit 96543c3992adcb406df3c8899dab79cf4bd5b4b4 Merge: 3fb75aa61a 9901b802c4 Author: James Agnew <jamesagnew@gmail.com> Date: Mon Jul 31 17:12:33 2017 -0400 Merge branch 'master' into hapi3_refactor commit 3fb75aa61ad29d9f3876a1c30c912627486147af Author: James <jamesagnew@gmail.com> Date: Mon Jul 31 15:21:30 2017 -0400 More work on cleanup commit b02fbb6804127e77c61c4792eefd9fc0d23d63d0 Author: James Agnew <jamesagnew@gmail.com> Date: Sun Jul 30 22:11:07 2017 -0400 Work on porting STU1 tests commit 1ae37b0db3929ea4f37955adf8f026e33ccf43b2 Author: James Agnew <jamesagnew@gmail.com> Date: Sun Jul 30 20:56:10 2017 -0400 Try to get coverage report working commit 72b88849b30a94a9ff08d3a1ab50a05b2acbdfdd Author: James Agnew <jamesagnew@gmail.com> Date: Sun Jul 30 20:27:02 2017 -0400 Fix android tests commit e5f6c35aeab8bbc056870a038e1862181049a020 Author: James <jamesagnew@gmail.com> Date: Sun Jul 30 19:31:18 2017 -0400 More work on getting legacy code cleaned up commit 0b513b0845a082b5c20b0033dfab4e29f5e4a934 Author: James <jamesagnew@gmail.com> Date: Sun Jul 30 18:41:13 2017 -0400 Continue work on removing deprecated API commit defea69aa38a2e0f4137ed9c8527956872ff70bf Author: James Agnew <jamesagnew@gmail.com> Date: Sun Jul 30 17:10:01 2017 -0400 More cleanup of legacy code commit 9ae7295705cb58f5edcf7ee1259f023cbbe2fe51 Author: James <jamesagnew@gmail.com> Date: Sun Jul 30 07:11:45 2017 -0400 More cleanup of legacy code commit ebd3eeb5ee793cf5805cc726db353f3def35ab00 Author: James Agnew <jamesagnew@gmail.com> Date: Sun Jul 30 06:43:25 2017 -0400 More work on removing legacy code commit 92224c2532faf70171473d64429c3ceaf3e3406c Author: James <jamesagnew@gmail.com> Date: Sat Jul 29 18:44:06 2017 -0400 Remove DSTU1 Bundle commit c52cacf71bae3f5c02ffae03881c21de1f3aba22 Author: James <jamesagnew@gmail.com> Date: Sat Jul 29 14:27:42 2017 -0400 Now compiling commit b405e51773baf4ab3a3c387458cdc59541394cd1 Merge: c3ddf04e25 cb2cea54d7 Author: James Agnew <jamesagnew@gmail.com> Date: Fri Jul 28 06:21:02 2017 -0400 Merge branch 'master' into hapi3_refactor commit c3ddf04e2598b8d6214975ab0ae795f850396811 Author: James <jamesagnew@gmail.com> Date: Thu Jul 27 11:06:06 2017 -0400 Sync R4 releases in commit b13333c3c03ddb9a5061c3b22bf011f4592104f8 Author: James <jamesagnew@gmail.com> Date: Fri Jul 14 05:52:33 2017 -0400 JPA server is now able to handle placeholder IDs (e.g. urn:uuid:00....000) being used in Bundle.entry.request.url as a part of the conditional URL within transactions. commit 2e60ff7521b42890a32b97c2dda88ab233f5c91e Author: James Agnew <jamesagnew@gmail.com> Date: Thu Jul 13 20:02:46 2017 -0400 Fix imports commit a92ace2e0dac6e24f6dada53bf97d03861fd21a1 Merge: 3196db96d1 1a6b3ea867 Author: James Agnew <jamesagnew@gmail.com> Date: Thu Jul 13 12:02:27 2017 -0400 Merge branch 'master' into hapi3_refactor commit 3196db96d1c485310e746833df59c0e010b5b161 Author: James Agnew <jamesagnew@gmail.com> Date: Thu Jul 13 11:48:10 2017 -0400 Don't add false paging link to request commit bd4e1d338855a664045caa271d41616aed973a4d Author: James <jamesagnew@gmail.com> Date: Sun Jul 9 21:32:16 2017 -0400 Finally building correctly! commit 6464ce9304703cb3c5ecc58491282ddacc900853 Author: James <jamesagnew@gmail.com> Date: Sun Jul 9 16:38:28 2017 -0400 Work on refactor commit 0059f2e48e9d7c812c1d42a57c5b6059814f5155 Author: James <jamesagnew@gmail.com> Date: Sat Jul 8 07:16:20 2017 -0400 Keep working on refactor commit 6c2e87e8cc19863a811c11623d1c878c8b48f031 Author: James Agnew <jamesagnew@gmail.com> Date: Thu Jul 6 22:35:13 2017 -0400 Lots of work on refactor commit 11cab975047a0c28190e6533074fd3f11ddde240 Merge: 34ec6b8807 6c47bd4c51 Author: James Agnew <jamesagnew@gmail.com> Date: Thu Jul 6 21:43:57 2017 -0400 Merge branch 'master' into hapi3_refactor commit 34ec6b8807946aa6c97f0b5581dca9bd5f7b7a3e Merge: f8e647511b c520e60ac1 Author: James Agnew <jamesagnew@gmail.com> Date: Thu Jul 6 21:43:49 2017 -0400 Merge branch 'hapi3_refactor' of github.com:jamesagnew/hapi-fhir into hapi3_refactor commit f8e647511b4a82e7fde71a8850b8800e3d698b1f Author: James Agnew <jamesagnew@gmail.com> Date: Thu Jul 6 18:46:55 2017 -0400 Work on hapi3 changes commit c520e60ac1198f340cfb9090a7a33f91aa2d1e61 Author: James <jamesagnew@gmail.com> Date: Wed Jul 5 08:08:40 2017 -0400 Keep working on refactor commit f1d2ee90926f7db900a5b3b4ab9a8948d18e49f2 Author: James Agnew <jamesagnew@gmail.com> Date: Mon Jul 3 22:10:59 2017 -0400 Continue refactor for HAPI 3 commit 9281ccafc32354222932c5a9f5ee8b0f206ebc05 Merge: ea1264cd8e 294d080bd3 Author: James Agnew <jamesagnew@gmail.com> Date: Mon Jul 3 20:34:16 2017 -0400 Merge branch 'master' into hapi3_refactor commit ea1264cd8e9b8c5297d218e91cf14bd48d0a92c7 Author: James <jamesagnew@gmail.com> Date: Wed Jun 28 10:26:01 2017 -0400 Continue work on refactor commit fbe2f98a0238f3d4e065db4550dd2ef1b460c0d8 Merge: b2bef47100 0a4dcc32ec Author: James <jamesagnew@gmail.com> Date: Wed Jun 28 06:21:22 2017 -0400 Merge branch 'master' into hapi3_refactor commit b2bef47100370e1248834523d73a630950032d7a Author: James <jamesagnew@gmail.com> Date: Tue Jun 27 21:13:23 2017 -0400 Work on refactor commit 8f76e4e46385daa9ce3442e2d9342453ce373ba3 Author: James Agnew <jamesagnew@gmail.com> Date: Sun Jun 25 21:55:35 2017 -0400 Lots of work on refactoring
2017-08-13 14:39:47 -04:00
*/
public void string(String theData) {
// ignore by default
2014-12-01 08:13:32 -05:00
}
public void wereBack() {
Merge in HAPI 3.0.0 working branch! Squashed commit of the following: commit 12f89a423a1691fdbc360706fd94a03bd9144d17 Author: James <jamesagnew@gmail.com> Date: Sun Aug 13 14:38:51 2017 -0400 Minimize validation resources commit f6868cce5c73b34d5ecd53bf1a220fdccd6b4e09 Merge: 3b80779fd3 1e158311d8 Author: James <jamesagnew@gmail.com> Date: Sun Aug 13 14:05:34 2017 -0400 Forward port fix for #710 Merge branch 'master' into hapi3_refactor commit 3b80779fd3905cbf5322e6973334eb0ecb3d8426 Merge: 1f534985e8 356d9acaf7 Author: James <jamesagnew@gmail.com> Date: Sun Aug 13 12:31:09 2017 -0400 Forward port #705, #708, and #710 Merge branch 'master' into hapi3_refactor commit 1f534985e8106347d9cc9da2dd8145fdd869547f Merge: 7c39a47852 dedd3d635b Author: James <jamesagnew@gmail.com> Date: Sun Aug 13 10:52:59 2017 -0400 Forward port #695 Merge branch 'master' into hapi3_refactor commit 7c39a47852142bee398101120678217ab0917c7e Merge: e0ffb84d21 6efafe62f1 Author: James <jamesagnew@gmail.com> Date: Sun Aug 13 09:53:17 2017 -0400 Forward port #688 Merge branch 'master' into hapi3_refactor commit e0ffb84d2129c209ccffc2611038592f37dddfd2 Merge: 52388c11c1 d19b00ff09 Author: James <jamesagnew@gmail.com> Date: Sat Aug 12 14:59:46 2017 -0400 Merge branch 'master' into hapi3_refactor commit 52388c11c17cf038591244548f2a592f6b655cee Author: James <jamesagnew@gmail.com> Date: Sat Aug 12 06:21:46 2017 -0400 Cleanup commit 209752cd638266b39574ae11c5989b624d5e85d3 Author: James <jamesagnew@gmail.com> Date: Thu Aug 10 11:18:19 2017 -0400 Fix tests commit 4543408dc8d63b5b9682a275e261d3168cdc2196 Author: James <jamesagnew@gmail.com> Date: Sat Aug 5 06:55:50 2017 -0400 Fix a potential deadlock commit ee360f537692672df473f94dae75c176b2287415 Author: James <jamesagnew@gmail.com> Date: Sat Aug 5 06:22:06 2017 -0400 Add R4 code to CLI commit 1a95ba3b6529afdaf81232b82cc303718c0187d6 Author: James Agnew <jamesagnew@gmail.com> Date: Thu Aug 3 06:14:01 2017 -0400 More cleanup commit f0d88026817296edaa65132accd67d0c8ad8088c Author: James <jamesagnew@gmail.com> Date: Wed Aug 2 11:27:43 2017 -0400 Tests are working! commit a4cbda357e8e7d024f24e3ee9a660b5366983ca1 Author: James Agnew <jamesagnew@gmail.com> Date: Wed Aug 2 10:42:04 2017 -0400 Connection handling cleanup for new tests commit 0e2cecfbd0d7a546444a66e8411600040fd9a17b Author: James Agnew <jamesagnew@gmail.com> Date: Wed Aug 2 10:16:28 2017 -0400 Clean up R4 JPA tests commit 40317a650d72c86e2529d5179cffe63399301de5 Author: James <jamesagnew@gmail.com> Date: Wed Aug 2 09:12:38 2017 -0400 Work on R4 for JPA server commit e7f8f8c30d72ed30d739979964db38d41c5baec1 Author: James <jamesagnew@gmail.com> Date: Tue Aug 1 20:43:47 2017 -0400 More work on porting tests commit 43c9003258696ab33e7bb335e882ab1c66fb61aa Author: James <jamesagnew@gmail.com> Date: Tue Aug 1 07:09:29 2017 -0400 Work on porting DSTU1 tests commit 602857f1e26a69a2284e176b5e44a860d9b828ff Author: James Agnew <jamesagnew@gmail.com> Date: Mon Jul 31 22:34:08 2017 -0400 More work on bring unit tests up to date commit e326a7b0cdb8368009119bba41886838a973e03e Author: James Agnew <jamesagnew@gmail.com> Date: Mon Jul 31 17:36:38 2017 -0400 Credit for #686 and forward port the fix to R4 validator commit 96543c3992adcb406df3c8899dab79cf4bd5b4b4 Merge: 3fb75aa61a 9901b802c4 Author: James Agnew <jamesagnew@gmail.com> Date: Mon Jul 31 17:12:33 2017 -0400 Merge branch 'master' into hapi3_refactor commit 3fb75aa61ad29d9f3876a1c30c912627486147af Author: James <jamesagnew@gmail.com> Date: Mon Jul 31 15:21:30 2017 -0400 More work on cleanup commit b02fbb6804127e77c61c4792eefd9fc0d23d63d0 Author: James Agnew <jamesagnew@gmail.com> Date: Sun Jul 30 22:11:07 2017 -0400 Work on porting STU1 tests commit 1ae37b0db3929ea4f37955adf8f026e33ccf43b2 Author: James Agnew <jamesagnew@gmail.com> Date: Sun Jul 30 20:56:10 2017 -0400 Try to get coverage report working commit 72b88849b30a94a9ff08d3a1ab50a05b2acbdfdd Author: James Agnew <jamesagnew@gmail.com> Date: Sun Jul 30 20:27:02 2017 -0400 Fix android tests commit e5f6c35aeab8bbc056870a038e1862181049a020 Author: James <jamesagnew@gmail.com> Date: Sun Jul 30 19:31:18 2017 -0400 More work on getting legacy code cleaned up commit 0b513b0845a082b5c20b0033dfab4e29f5e4a934 Author: James <jamesagnew@gmail.com> Date: Sun Jul 30 18:41:13 2017 -0400 Continue work on removing deprecated API commit defea69aa38a2e0f4137ed9c8527956872ff70bf Author: James Agnew <jamesagnew@gmail.com> Date: Sun Jul 30 17:10:01 2017 -0400 More cleanup of legacy code commit 9ae7295705cb58f5edcf7ee1259f023cbbe2fe51 Author: James <jamesagnew@gmail.com> Date: Sun Jul 30 07:11:45 2017 -0400 More cleanup of legacy code commit ebd3eeb5ee793cf5805cc726db353f3def35ab00 Author: James Agnew <jamesagnew@gmail.com> Date: Sun Jul 30 06:43:25 2017 -0400 More work on removing legacy code commit 92224c2532faf70171473d64429c3ceaf3e3406c Author: James <jamesagnew@gmail.com> Date: Sat Jul 29 18:44:06 2017 -0400 Remove DSTU1 Bundle commit c52cacf71bae3f5c02ffae03881c21de1f3aba22 Author: James <jamesagnew@gmail.com> Date: Sat Jul 29 14:27:42 2017 -0400 Now compiling commit b405e51773baf4ab3a3c387458cdc59541394cd1 Merge: c3ddf04e25 cb2cea54d7 Author: James Agnew <jamesagnew@gmail.com> Date: Fri Jul 28 06:21:02 2017 -0400 Merge branch 'master' into hapi3_refactor commit c3ddf04e2598b8d6214975ab0ae795f850396811 Author: James <jamesagnew@gmail.com> Date: Thu Jul 27 11:06:06 2017 -0400 Sync R4 releases in commit b13333c3c03ddb9a5061c3b22bf011f4592104f8 Author: James <jamesagnew@gmail.com> Date: Fri Jul 14 05:52:33 2017 -0400 JPA server is now able to handle placeholder IDs (e.g. urn:uuid:00....000) being used in Bundle.entry.request.url as a part of the conditional URL within transactions. commit 2e60ff7521b42890a32b97c2dda88ab233f5c91e Author: James Agnew <jamesagnew@gmail.com> Date: Thu Jul 13 20:02:46 2017 -0400 Fix imports commit a92ace2e0dac6e24f6dada53bf97d03861fd21a1 Merge: 3196db96d1 1a6b3ea867 Author: James Agnew <jamesagnew@gmail.com> Date: Thu Jul 13 12:02:27 2017 -0400 Merge branch 'master' into hapi3_refactor commit 3196db96d1c485310e746833df59c0e010b5b161 Author: James Agnew <jamesagnew@gmail.com> Date: Thu Jul 13 11:48:10 2017 -0400 Don't add false paging link to request commit bd4e1d338855a664045caa271d41616aed973a4d Author: James <jamesagnew@gmail.com> Date: Sun Jul 9 21:32:16 2017 -0400 Finally building correctly! commit 6464ce9304703cb3c5ecc58491282ddacc900853 Author: James <jamesagnew@gmail.com> Date: Sun Jul 9 16:38:28 2017 -0400 Work on refactor commit 0059f2e48e9d7c812c1d42a57c5b6059814f5155 Author: James <jamesagnew@gmail.com> Date: Sat Jul 8 07:16:20 2017 -0400 Keep working on refactor commit 6c2e87e8cc19863a811c11623d1c878c8b48f031 Author: James Agnew <jamesagnew@gmail.com> Date: Thu Jul 6 22:35:13 2017 -0400 Lots of work on refactor commit 11cab975047a0c28190e6533074fd3f11ddde240 Merge: 34ec6b8807 6c47bd4c51 Author: James Agnew <jamesagnew@gmail.com> Date: Thu Jul 6 21:43:57 2017 -0400 Merge branch 'master' into hapi3_refactor commit 34ec6b8807946aa6c97f0b5581dca9bd5f7b7a3e Merge: f8e647511b c520e60ac1 Author: James Agnew <jamesagnew@gmail.com> Date: Thu Jul 6 21:43:49 2017 -0400 Merge branch 'hapi3_refactor' of github.com:jamesagnew/hapi-fhir into hapi3_refactor commit f8e647511b4a82e7fde71a8850b8800e3d698b1f Author: James Agnew <jamesagnew@gmail.com> Date: Thu Jul 6 18:46:55 2017 -0400 Work on hapi3 changes commit c520e60ac1198f340cfb9090a7a33f91aa2d1e61 Author: James <jamesagnew@gmail.com> Date: Wed Jul 5 08:08:40 2017 -0400 Keep working on refactor commit f1d2ee90926f7db900a5b3b4ab9a8948d18e49f2 Author: James Agnew <jamesagnew@gmail.com> Date: Mon Jul 3 22:10:59 2017 -0400 Continue refactor for HAPI 3 commit 9281ccafc32354222932c5a9f5ee8b0f206ebc05 Merge: ea1264cd8e 294d080bd3 Author: James Agnew <jamesagnew@gmail.com> Date: Mon Jul 3 20:34:16 2017 -0400 Merge branch 'master' into hapi3_refactor commit ea1264cd8e9b8c5297d218e91cf14bd48d0a92c7 Author: James <jamesagnew@gmail.com> Date: Wed Jun 28 10:26:01 2017 -0400 Continue work on refactor commit fbe2f98a0238f3d4e065db4550dd2ef1b460c0d8 Merge: b2bef47100 0a4dcc32ec Author: James <jamesagnew@gmail.com> Date: Wed Jun 28 06:21:22 2017 -0400 Merge branch 'master' into hapi3_refactor commit b2bef47100370e1248834523d73a630950032d7a Author: James <jamesagnew@gmail.com> Date: Tue Jun 27 21:13:23 2017 -0400 Work on refactor commit 8f76e4e46385daa9ce3442e2d9342453ce373ba3 Author: James Agnew <jamesagnew@gmail.com> Date: Sun Jun 25 21:55:35 2017 -0400 Lots of work on refactoring
2017-08-13 14:39:47 -04:00
// allow an implementor to override
}
Merge in HAPI 3.0.0 working branch! Squashed commit of the following: commit 12f89a423a1691fdbc360706fd94a03bd9144d17 Author: James <jamesagnew@gmail.com> Date: Sun Aug 13 14:38:51 2017 -0400 Minimize validation resources commit f6868cce5c73b34d5ecd53bf1a220fdccd6b4e09 Merge: 3b80779fd3 1e158311d8 Author: James <jamesagnew@gmail.com> Date: Sun Aug 13 14:05:34 2017 -0400 Forward port fix for #710 Merge branch 'master' into hapi3_refactor commit 3b80779fd3905cbf5322e6973334eb0ecb3d8426 Merge: 1f534985e8 356d9acaf7 Author: James <jamesagnew@gmail.com> Date: Sun Aug 13 12:31:09 2017 -0400 Forward port #705, #708, and #710 Merge branch 'master' into hapi3_refactor commit 1f534985e8106347d9cc9da2dd8145fdd869547f Merge: 7c39a47852 dedd3d635b Author: James <jamesagnew@gmail.com> Date: Sun Aug 13 10:52:59 2017 -0400 Forward port #695 Merge branch 'master' into hapi3_refactor commit 7c39a47852142bee398101120678217ab0917c7e Merge: e0ffb84d21 6efafe62f1 Author: James <jamesagnew@gmail.com> Date: Sun Aug 13 09:53:17 2017 -0400 Forward port #688 Merge branch 'master' into hapi3_refactor commit e0ffb84d2129c209ccffc2611038592f37dddfd2 Merge: 52388c11c1 d19b00ff09 Author: James <jamesagnew@gmail.com> Date: Sat Aug 12 14:59:46 2017 -0400 Merge branch 'master' into hapi3_refactor commit 52388c11c17cf038591244548f2a592f6b655cee Author: James <jamesagnew@gmail.com> Date: Sat Aug 12 06:21:46 2017 -0400 Cleanup commit 209752cd638266b39574ae11c5989b624d5e85d3 Author: James <jamesagnew@gmail.com> Date: Thu Aug 10 11:18:19 2017 -0400 Fix tests commit 4543408dc8d63b5b9682a275e261d3168cdc2196 Author: James <jamesagnew@gmail.com> Date: Sat Aug 5 06:55:50 2017 -0400 Fix a potential deadlock commit ee360f537692672df473f94dae75c176b2287415 Author: James <jamesagnew@gmail.com> Date: Sat Aug 5 06:22:06 2017 -0400 Add R4 code to CLI commit 1a95ba3b6529afdaf81232b82cc303718c0187d6 Author: James Agnew <jamesagnew@gmail.com> Date: Thu Aug 3 06:14:01 2017 -0400 More cleanup commit f0d88026817296edaa65132accd67d0c8ad8088c Author: James <jamesagnew@gmail.com> Date: Wed Aug 2 11:27:43 2017 -0400 Tests are working! commit a4cbda357e8e7d024f24e3ee9a660b5366983ca1 Author: James Agnew <jamesagnew@gmail.com> Date: Wed Aug 2 10:42:04 2017 -0400 Connection handling cleanup for new tests commit 0e2cecfbd0d7a546444a66e8411600040fd9a17b Author: James Agnew <jamesagnew@gmail.com> Date: Wed Aug 2 10:16:28 2017 -0400 Clean up R4 JPA tests commit 40317a650d72c86e2529d5179cffe63399301de5 Author: James <jamesagnew@gmail.com> Date: Wed Aug 2 09:12:38 2017 -0400 Work on R4 for JPA server commit e7f8f8c30d72ed30d739979964db38d41c5baec1 Author: James <jamesagnew@gmail.com> Date: Tue Aug 1 20:43:47 2017 -0400 More work on porting tests commit 43c9003258696ab33e7bb335e882ab1c66fb61aa Author: James <jamesagnew@gmail.com> Date: Tue Aug 1 07:09:29 2017 -0400 Work on porting DSTU1 tests commit 602857f1e26a69a2284e176b5e44a860d9b828ff Author: James Agnew <jamesagnew@gmail.com> Date: Mon Jul 31 22:34:08 2017 -0400 More work on bring unit tests up to date commit e326a7b0cdb8368009119bba41886838a973e03e Author: James Agnew <jamesagnew@gmail.com> Date: Mon Jul 31 17:36:38 2017 -0400 Credit for #686 and forward port the fix to R4 validator commit 96543c3992adcb406df3c8899dab79cf4bd5b4b4 Merge: 3fb75aa61a 9901b802c4 Author: James Agnew <jamesagnew@gmail.com> Date: Mon Jul 31 17:12:33 2017 -0400 Merge branch 'master' into hapi3_refactor commit 3fb75aa61ad29d9f3876a1c30c912627486147af Author: James <jamesagnew@gmail.com> Date: Mon Jul 31 15:21:30 2017 -0400 More work on cleanup commit b02fbb6804127e77c61c4792eefd9fc0d23d63d0 Author: James Agnew <jamesagnew@gmail.com> Date: Sun Jul 30 22:11:07 2017 -0400 Work on porting STU1 tests commit 1ae37b0db3929ea4f37955adf8f026e33ccf43b2 Author: James Agnew <jamesagnew@gmail.com> Date: Sun Jul 30 20:56:10 2017 -0400 Try to get coverage report working commit 72b88849b30a94a9ff08d3a1ab50a05b2acbdfdd Author: James Agnew <jamesagnew@gmail.com> Date: Sun Jul 30 20:27:02 2017 -0400 Fix android tests commit e5f6c35aeab8bbc056870a038e1862181049a020 Author: James <jamesagnew@gmail.com> Date: Sun Jul 30 19:31:18 2017 -0400 More work on getting legacy code cleaned up commit 0b513b0845a082b5c20b0033dfab4e29f5e4a934 Author: James <jamesagnew@gmail.com> Date: Sun Jul 30 18:41:13 2017 -0400 Continue work on removing deprecated API commit defea69aa38a2e0f4137ed9c8527956872ff70bf Author: James Agnew <jamesagnew@gmail.com> Date: Sun Jul 30 17:10:01 2017 -0400 More cleanup of legacy code commit 9ae7295705cb58f5edcf7ee1259f023cbbe2fe51 Author: James <jamesagnew@gmail.com> Date: Sun Jul 30 07:11:45 2017 -0400 More cleanup of legacy code commit ebd3eeb5ee793cf5805cc726db353f3def35ab00 Author: James Agnew <jamesagnew@gmail.com> Date: Sun Jul 30 06:43:25 2017 -0400 More work on removing legacy code commit 92224c2532faf70171473d64429c3ceaf3e3406c Author: James <jamesagnew@gmail.com> Date: Sat Jul 29 18:44:06 2017 -0400 Remove DSTU1 Bundle commit c52cacf71bae3f5c02ffae03881c21de1f3aba22 Author: James <jamesagnew@gmail.com> Date: Sat Jul 29 14:27:42 2017 -0400 Now compiling commit b405e51773baf4ab3a3c387458cdc59541394cd1 Merge: c3ddf04e25 cb2cea54d7 Author: James Agnew <jamesagnew@gmail.com> Date: Fri Jul 28 06:21:02 2017 -0400 Merge branch 'master' into hapi3_refactor commit c3ddf04e2598b8d6214975ab0ae795f850396811 Author: James <jamesagnew@gmail.com> Date: Thu Jul 27 11:06:06 2017 -0400 Sync R4 releases in commit b13333c3c03ddb9a5061c3b22bf011f4592104f8 Author: James <jamesagnew@gmail.com> Date: Fri Jul 14 05:52:33 2017 -0400 JPA server is now able to handle placeholder IDs (e.g. urn:uuid:00....000) being used in Bundle.entry.request.url as a part of the conditional URL within transactions. commit 2e60ff7521b42890a32b97c2dda88ab233f5c91e Author: James Agnew <jamesagnew@gmail.com> Date: Thu Jul 13 20:02:46 2017 -0400 Fix imports commit a92ace2e0dac6e24f6dada53bf97d03861fd21a1 Merge: 3196db96d1 1a6b3ea867 Author: James Agnew <jamesagnew@gmail.com> Date: Thu Jul 13 12:02:27 2017 -0400 Merge branch 'master' into hapi3_refactor commit 3196db96d1c485310e746833df59c0e010b5b161 Author: James Agnew <jamesagnew@gmail.com> Date: Thu Jul 13 11:48:10 2017 -0400 Don't add false paging link to request commit bd4e1d338855a664045caa271d41616aed973a4d Author: James <jamesagnew@gmail.com> Date: Sun Jul 9 21:32:16 2017 -0400 Finally building correctly! commit 6464ce9304703cb3c5ecc58491282ddacc900853 Author: James <jamesagnew@gmail.com> Date: Sun Jul 9 16:38:28 2017 -0400 Work on refactor commit 0059f2e48e9d7c812c1d42a57c5b6059814f5155 Author: James <jamesagnew@gmail.com> Date: Sat Jul 8 07:16:20 2017 -0400 Keep working on refactor commit 6c2e87e8cc19863a811c11623d1c878c8b48f031 Author: James Agnew <jamesagnew@gmail.com> Date: Thu Jul 6 22:35:13 2017 -0400 Lots of work on refactor commit 11cab975047a0c28190e6533074fd3f11ddde240 Merge: 34ec6b8807 6c47bd4c51 Author: James Agnew <jamesagnew@gmail.com> Date: Thu Jul 6 21:43:57 2017 -0400 Merge branch 'master' into hapi3_refactor commit 34ec6b8807946aa6c97f0b5581dca9bd5f7b7a3e Merge: f8e647511b c520e60ac1 Author: James Agnew <jamesagnew@gmail.com> Date: Thu Jul 6 21:43:49 2017 -0400 Merge branch 'hapi3_refactor' of github.com:jamesagnew/hapi-fhir into hapi3_refactor commit f8e647511b4a82e7fde71a8850b8800e3d698b1f Author: James Agnew <jamesagnew@gmail.com> Date: Thu Jul 6 18:46:55 2017 -0400 Work on hapi3 changes commit c520e60ac1198f340cfb9090a7a33f91aa2d1e61 Author: James <jamesagnew@gmail.com> Date: Wed Jul 5 08:08:40 2017 -0400 Keep working on refactor commit f1d2ee90926f7db900a5b3b4ab9a8948d18e49f2 Author: James Agnew <jamesagnew@gmail.com> Date: Mon Jul 3 22:10:59 2017 -0400 Continue refactor for HAPI 3 commit 9281ccafc32354222932c5a9f5ee8b0f206ebc05 Merge: ea1264cd8e 294d080bd3 Author: James Agnew <jamesagnew@gmail.com> Date: Mon Jul 3 20:34:16 2017 -0400 Merge branch 'master' into hapi3_refactor commit ea1264cd8e9b8c5297d218e91cf14bd48d0a92c7 Author: James <jamesagnew@gmail.com> Date: Wed Jun 28 10:26:01 2017 -0400 Continue work on refactor commit fbe2f98a0238f3d4e065db4550dd2ef1b460c0d8 Merge: b2bef47100 0a4dcc32ec Author: James <jamesagnew@gmail.com> Date: Wed Jun 28 06:21:22 2017 -0400 Merge branch 'master' into hapi3_refactor commit b2bef47100370e1248834523d73a630950032d7a Author: James <jamesagnew@gmail.com> Date: Tue Jun 27 21:13:23 2017 -0400 Work on refactor commit 8f76e4e46385daa9ce3442e2d9342453ce373ba3 Author: James Agnew <jamesagnew@gmail.com> Date: Sun Jun 25 21:55:35 2017 -0400 Lots of work on refactoring
2017-08-13 14:39:47 -04:00
/**
* @param theNextEvent The XML event
Merge in HAPI 3.0.0 working branch! Squashed commit of the following: commit 12f89a423a1691fdbc360706fd94a03bd9144d17 Author: James <jamesagnew@gmail.com> Date: Sun Aug 13 14:38:51 2017 -0400 Minimize validation resources commit f6868cce5c73b34d5ecd53bf1a220fdccd6b4e09 Merge: 3b80779fd3 1e158311d8 Author: James <jamesagnew@gmail.com> Date: Sun Aug 13 14:05:34 2017 -0400 Forward port fix for #710 Merge branch 'master' into hapi3_refactor commit 3b80779fd3905cbf5322e6973334eb0ecb3d8426 Merge: 1f534985e8 356d9acaf7 Author: James <jamesagnew@gmail.com> Date: Sun Aug 13 12:31:09 2017 -0400 Forward port #705, #708, and #710 Merge branch 'master' into hapi3_refactor commit 1f534985e8106347d9cc9da2dd8145fdd869547f Merge: 7c39a47852 dedd3d635b Author: James <jamesagnew@gmail.com> Date: Sun Aug 13 10:52:59 2017 -0400 Forward port #695 Merge branch 'master' into hapi3_refactor commit 7c39a47852142bee398101120678217ab0917c7e Merge: e0ffb84d21 6efafe62f1 Author: James <jamesagnew@gmail.com> Date: Sun Aug 13 09:53:17 2017 -0400 Forward port #688 Merge branch 'master' into hapi3_refactor commit e0ffb84d2129c209ccffc2611038592f37dddfd2 Merge: 52388c11c1 d19b00ff09 Author: James <jamesagnew@gmail.com> Date: Sat Aug 12 14:59:46 2017 -0400 Merge branch 'master' into hapi3_refactor commit 52388c11c17cf038591244548f2a592f6b655cee Author: James <jamesagnew@gmail.com> Date: Sat Aug 12 06:21:46 2017 -0400 Cleanup commit 209752cd638266b39574ae11c5989b624d5e85d3 Author: James <jamesagnew@gmail.com> Date: Thu Aug 10 11:18:19 2017 -0400 Fix tests commit 4543408dc8d63b5b9682a275e261d3168cdc2196 Author: James <jamesagnew@gmail.com> Date: Sat Aug 5 06:55:50 2017 -0400 Fix a potential deadlock commit ee360f537692672df473f94dae75c176b2287415 Author: James <jamesagnew@gmail.com> Date: Sat Aug 5 06:22:06 2017 -0400 Add R4 code to CLI commit 1a95ba3b6529afdaf81232b82cc303718c0187d6 Author: James Agnew <jamesagnew@gmail.com> Date: Thu Aug 3 06:14:01 2017 -0400 More cleanup commit f0d88026817296edaa65132accd67d0c8ad8088c Author: James <jamesagnew@gmail.com> Date: Wed Aug 2 11:27:43 2017 -0400 Tests are working! commit a4cbda357e8e7d024f24e3ee9a660b5366983ca1 Author: James Agnew <jamesagnew@gmail.com> Date: Wed Aug 2 10:42:04 2017 -0400 Connection handling cleanup for new tests commit 0e2cecfbd0d7a546444a66e8411600040fd9a17b Author: James Agnew <jamesagnew@gmail.com> Date: Wed Aug 2 10:16:28 2017 -0400 Clean up R4 JPA tests commit 40317a650d72c86e2529d5179cffe63399301de5 Author: James <jamesagnew@gmail.com> Date: Wed Aug 2 09:12:38 2017 -0400 Work on R4 for JPA server commit e7f8f8c30d72ed30d739979964db38d41c5baec1 Author: James <jamesagnew@gmail.com> Date: Tue Aug 1 20:43:47 2017 -0400 More work on porting tests commit 43c9003258696ab33e7bb335e882ab1c66fb61aa Author: James <jamesagnew@gmail.com> Date: Tue Aug 1 07:09:29 2017 -0400 Work on porting DSTU1 tests commit 602857f1e26a69a2284e176b5e44a860d9b828ff Author: James Agnew <jamesagnew@gmail.com> Date: Mon Jul 31 22:34:08 2017 -0400 More work on bring unit tests up to date commit e326a7b0cdb8368009119bba41886838a973e03e Author: James Agnew <jamesagnew@gmail.com> Date: Mon Jul 31 17:36:38 2017 -0400 Credit for #686 and forward port the fix to R4 validator commit 96543c3992adcb406df3c8899dab79cf4bd5b4b4 Merge: 3fb75aa61a 9901b802c4 Author: James Agnew <jamesagnew@gmail.com> Date: Mon Jul 31 17:12:33 2017 -0400 Merge branch 'master' into hapi3_refactor commit 3fb75aa61ad29d9f3876a1c30c912627486147af Author: James <jamesagnew@gmail.com> Date: Mon Jul 31 15:21:30 2017 -0400 More work on cleanup commit b02fbb6804127e77c61c4792eefd9fc0d23d63d0 Author: James Agnew <jamesagnew@gmail.com> Date: Sun Jul 30 22:11:07 2017 -0400 Work on porting STU1 tests commit 1ae37b0db3929ea4f37955adf8f026e33ccf43b2 Author: James Agnew <jamesagnew@gmail.com> Date: Sun Jul 30 20:56:10 2017 -0400 Try to get coverage report working commit 72b88849b30a94a9ff08d3a1ab50a05b2acbdfdd Author: James Agnew <jamesagnew@gmail.com> Date: Sun Jul 30 20:27:02 2017 -0400 Fix android tests commit e5f6c35aeab8bbc056870a038e1862181049a020 Author: James <jamesagnew@gmail.com> Date: Sun Jul 30 19:31:18 2017 -0400 More work on getting legacy code cleaned up commit 0b513b0845a082b5c20b0033dfab4e29f5e4a934 Author: James <jamesagnew@gmail.com> Date: Sun Jul 30 18:41:13 2017 -0400 Continue work on removing deprecated API commit defea69aa38a2e0f4137ed9c8527956872ff70bf Author: James Agnew <jamesagnew@gmail.com> Date: Sun Jul 30 17:10:01 2017 -0400 More cleanup of legacy code commit 9ae7295705cb58f5edcf7ee1259f023cbbe2fe51 Author: James <jamesagnew@gmail.com> Date: Sun Jul 30 07:11:45 2017 -0400 More cleanup of legacy code commit ebd3eeb5ee793cf5805cc726db353f3def35ab00 Author: James Agnew <jamesagnew@gmail.com> Date: Sun Jul 30 06:43:25 2017 -0400 More work on removing legacy code commit 92224c2532faf70171473d64429c3ceaf3e3406c Author: James <jamesagnew@gmail.com> Date: Sat Jul 29 18:44:06 2017 -0400 Remove DSTU1 Bundle commit c52cacf71bae3f5c02ffae03881c21de1f3aba22 Author: James <jamesagnew@gmail.com> Date: Sat Jul 29 14:27:42 2017 -0400 Now compiling commit b405e51773baf4ab3a3c387458cdc59541394cd1 Merge: c3ddf04e25 cb2cea54d7 Author: James Agnew <jamesagnew@gmail.com> Date: Fri Jul 28 06:21:02 2017 -0400 Merge branch 'master' into hapi3_refactor commit c3ddf04e2598b8d6214975ab0ae795f850396811 Author: James <jamesagnew@gmail.com> Date: Thu Jul 27 11:06:06 2017 -0400 Sync R4 releases in commit b13333c3c03ddb9a5061c3b22bf011f4592104f8 Author: James <jamesagnew@gmail.com> Date: Fri Jul 14 05:52:33 2017 -0400 JPA server is now able to handle placeholder IDs (e.g. urn:uuid:00....000) being used in Bundle.entry.request.url as a part of the conditional URL within transactions. commit 2e60ff7521b42890a32b97c2dda88ab233f5c91e Author: James Agnew <jamesagnew@gmail.com> Date: Thu Jul 13 20:02:46 2017 -0400 Fix imports commit a92ace2e0dac6e24f6dada53bf97d03861fd21a1 Merge: 3196db96d1 1a6b3ea867 Author: James Agnew <jamesagnew@gmail.com> Date: Thu Jul 13 12:02:27 2017 -0400 Merge branch 'master' into hapi3_refactor commit 3196db96d1c485310e746833df59c0e010b5b161 Author: James Agnew <jamesagnew@gmail.com> Date: Thu Jul 13 11:48:10 2017 -0400 Don't add false paging link to request commit bd4e1d338855a664045caa271d41616aed973a4d Author: James <jamesagnew@gmail.com> Date: Sun Jul 9 21:32:16 2017 -0400 Finally building correctly! commit 6464ce9304703cb3c5ecc58491282ddacc900853 Author: James <jamesagnew@gmail.com> Date: Sun Jul 9 16:38:28 2017 -0400 Work on refactor commit 0059f2e48e9d7c812c1d42a57c5b6059814f5155 Author: James <jamesagnew@gmail.com> Date: Sat Jul 8 07:16:20 2017 -0400 Keep working on refactor commit 6c2e87e8cc19863a811c11623d1c878c8b48f031 Author: James Agnew <jamesagnew@gmail.com> Date: Thu Jul 6 22:35:13 2017 -0400 Lots of work on refactor commit 11cab975047a0c28190e6533074fd3f11ddde240 Merge: 34ec6b8807 6c47bd4c51 Author: James Agnew <jamesagnew@gmail.com> Date: Thu Jul 6 21:43:57 2017 -0400 Merge branch 'master' into hapi3_refactor commit 34ec6b8807946aa6c97f0b5581dca9bd5f7b7a3e Merge: f8e647511b c520e60ac1 Author: James Agnew <jamesagnew@gmail.com> Date: Thu Jul 6 21:43:49 2017 -0400 Merge branch 'hapi3_refactor' of github.com:jamesagnew/hapi-fhir into hapi3_refactor commit f8e647511b4a82e7fde71a8850b8800e3d698b1f Author: James Agnew <jamesagnew@gmail.com> Date: Thu Jul 6 18:46:55 2017 -0400 Work on hapi3 changes commit c520e60ac1198f340cfb9090a7a33f91aa2d1e61 Author: James <jamesagnew@gmail.com> Date: Wed Jul 5 08:08:40 2017 -0400 Keep working on refactor commit f1d2ee90926f7db900a5b3b4ab9a8948d18e49f2 Author: James Agnew <jamesagnew@gmail.com> Date: Mon Jul 3 22:10:59 2017 -0400 Continue refactor for HAPI 3 commit 9281ccafc32354222932c5a9f5ee8b0f206ebc05 Merge: ea1264cd8e 294d080bd3 Author: James Agnew <jamesagnew@gmail.com> Date: Mon Jul 3 20:34:16 2017 -0400 Merge branch 'master' into hapi3_refactor commit ea1264cd8e9b8c5297d218e91cf14bd48d0a92c7 Author: James <jamesagnew@gmail.com> Date: Wed Jun 28 10:26:01 2017 -0400 Continue work on refactor commit fbe2f98a0238f3d4e065db4550dd2ef1b460c0d8 Merge: b2bef47100 0a4dcc32ec Author: James <jamesagnew@gmail.com> Date: Wed Jun 28 06:21:22 2017 -0400 Merge branch 'master' into hapi3_refactor commit b2bef47100370e1248834523d73a630950032d7a Author: James <jamesagnew@gmail.com> Date: Tue Jun 27 21:13:23 2017 -0400 Work on refactor commit 8f76e4e46385daa9ce3442e2d9342453ce373ba3 Author: James Agnew <jamesagnew@gmail.com> Date: Sun Jun 25 21:55:35 2017 -0400 Lots of work on refactoring
2017-08-13 14:39:47 -04:00
*/
public void xmlEvent(XMLEvent theNextEvent) {
// ignore
}
2014-12-01 08:13:32 -05:00
}
2015-02-16 11:33:46 -05:00
private class ContainedResourcesStateHapi extends PreResourceState {
2014-03-22 12:33:07 -04:00
2015-02-16 11:33:46 -05:00
public ContainedResourcesStateHapi(PreResourceState thePreResourcesState) {
super(thePreResourcesState, ((IResource) thePreResourcesState.myInstance).getStructureFhirVersionEnum());
}
@Override
public void endingElement() throws DataFormatException {
pop();
}
@Override
protected void populateTarget() {
// nothing
}
@Override
public void wereBack() {
super.wereBack();
2014-12-10 22:02:31 -05:00
IResource res = (IResource) getCurrentElement();
assert res != null;
2014-03-22 12:33:07 -04:00
if (res.getId() == null || res.getId().isEmpty()) {
// If there is no ID, we don't keep the resource because it's useless (contained resources
// need an ID to be referred to)
myErrorHandler.containedResourceWithNoId(null);
} else {
2014-10-15 14:34:14 -04:00
if (!res.getId().isLocal()) {
res.setId(new IdDt('#' + res.getId().getIdPart()));
}
getPreResourceState().getContainedResources().put(res.getId().getValueAsString(), res);
}
2014-12-10 22:02:31 -05:00
IResource preResCurrentElement = (IResource) getPreResourceState().getCurrentElement();
@SuppressWarnings("unchecked")
List<IResource> containedResources = (List<IResource>) preResCurrentElement.getContained().getContainedResources();
containedResources.add(res);
}
}
2015-04-13 08:32:49 -04:00
private class ContainedResourcesStateHl7Org extends PreResourceState {
public ContainedResourcesStateHl7Org(PreResourceState thePreResourcesState) {
2015-12-13 22:44:41 -05:00
super(thePreResourcesState, thePreResourcesState.myParentVersion);
2015-04-13 08:32:49 -04:00
}
@Override
public void endingElement() throws DataFormatException {
pop();
}
@Override
protected void populateTarget() {
// nothing
}
2015-04-13 08:32:49 -04:00
@Override
public void wereBack() {
super.wereBack();
2015-04-13 08:32:49 -04:00
IBaseResource res = getCurrentElement();
assert res != null;
2015-05-05 18:16:22 -04:00
if (res.getIdElement() == null || res.getIdElement().isEmpty()) {
// If there is no ID, we don't keep the resource because it's useless (contained resources
// need an ID to be referred to)
myErrorHandler.containedResourceWithNoId(null);
2015-04-13 08:32:49 -04:00
} else {
res.getIdElement().setValue('#' + res.getIdElement().getIdPart());
getPreResourceState().getContainedResources().put(res.getIdElement().getValue(), res);
2015-04-13 08:32:49 -04:00
}
2015-04-13 08:32:49 -04:00
IBaseResource preResCurrentElement = getPreResourceState().getCurrentElement();
RuntimeResourceDefinition def = myContext.getResourceDefinition(preResCurrentElement);
def.getChildByName("contained").getMutator().addValue(preResCurrentElement, res);
}
}
2014-02-26 17:13:49 -05:00
private class DeclaredExtensionState extends BaseState {
2014-12-10 22:02:31 -05:00
private IBase myChildInstance;
2014-02-26 17:13:49 -05:00
private RuntimeChildDeclaredExtensionDefinition myDefinition;
2014-12-10 22:02:31 -05:00
private IBase myParentInstance;
private PreResourceState myPreResourceState;
2014-02-26 17:13:49 -05:00
2014-12-10 22:02:31 -05:00
public DeclaredExtensionState(PreResourceState thePreResourceState, RuntimeChildDeclaredExtensionDefinition theDefinition, IBase theParentInstance) {
super(thePreResourceState);
2014-03-22 12:33:07 -04:00
myPreResourceState = thePreResourceState;
2014-02-26 17:13:49 -05:00
myDefinition = theDefinition;
myParentInstance = theParentInstance;
}
@Override
public void attributeValue(String theName, String theValue) throws DataFormatException {
if (theName.equals("url")) {
// This can be ignored
return;
}
super.attributeValue(theName, theValue);
}
2014-02-26 17:13:49 -05:00
@Override
public void endingElement() throws DataFormatException {
2014-02-26 17:13:49 -05:00
pop();
}
@Override
2015-06-24 12:26:40 -04:00
public void enteringNewElement(String theNamespaceUri, String theLocalPart) throws DataFormatException {
2014-02-26 17:13:49 -05:00
BaseRuntimeElementDefinition<?> target = myDefinition.getChildByName(theLocalPart);
if (target == null) {
myErrorHandler.unknownElement(null, theLocalPart);
push(new SwallowChildrenWholeState(getPreResourceState()));
return;
2014-02-26 17:13:49 -05:00
}
switch (target.getChildType()) {
case COMPOSITE_DATATYPE: {
BaseRuntimeElementCompositeDefinition<?> compositeTarget = (BaseRuntimeElementCompositeDefinition<?>) target;
ICompositeType newChildInstance = (ICompositeType) compositeTarget.newInstance(myDefinition.getInstanceConstructorArguments());
myDefinition.getMutator().addValue(myParentInstance, newChildInstance);
ElementCompositeState newState = new ElementCompositeState(myPreResourceState, theLocalPart, compositeTarget, newChildInstance);
push(newState);
return;
}
case ID_DATATYPE:
case PRIMITIVE_DATATYPE: {
RuntimePrimitiveDatatypeDefinition primitiveTarget = (RuntimePrimitiveDatatypeDefinition) target;
IPrimitiveType<?> newChildInstance = primitiveTarget.newInstance(myDefinition.getInstanceConstructorArguments());
myDefinition.getMutator().addValue(myParentInstance, newChildInstance);
PrimitiveState newState = new PrimitiveState(getPreResourceState(), newChildInstance);
push(newState);
return;
}
case PRIMITIVE_XHTML:
case RESOURCE:
case RESOURCE_BLOCK:
case UNDECL_EXT:
case EXTENSION_DECLARED:
default:
break;
2014-02-26 17:13:49 -05:00
}
}
@Override
public void enteringNewElementExtension(StartElement theElement, String theUrlAttr, boolean theIsModifier, final String baseServerUrl) {
2014-02-26 17:13:49 -05:00
RuntimeChildDeclaredExtensionDefinition declaredExtension = myDefinition.getChildExtensionForUrl(theUrlAttr);
if (declaredExtension != null) {
if (myChildInstance == null) {
myChildInstance = myDefinition.newInstance();
myDefinition.getMutator().addValue(myParentInstance, myChildInstance);
}
BaseState newState = new DeclaredExtensionState(getPreResourceState(), declaredExtension, myChildInstance);
2014-02-26 17:13:49 -05:00
push(newState);
} else {
super.enteringNewElementExtension(theElement, theUrlAttr, theIsModifier, baseServerUrl);
2014-02-26 17:13:49 -05:00
}
}
@Override
2014-12-10 22:02:31 -05:00
protected IBase getCurrentElement() {
2014-02-26 17:13:49 -05:00
return myParentInstance;
}
2014-02-20 12:13:05 -05:00
}
2014-02-19 11:59:12 -05:00
2015-03-11 09:11:36 -04:00
private class ElementCompositeState extends BaseState {
2014-02-19 11:59:12 -05:00
private BaseRuntimeElementCompositeDefinition<?> myDefinition;
2015-03-11 09:11:36 -04:00
private IBase myInstance;
2015-07-21 08:28:40 -04:00
private Set<String> myParsedNonRepeatableNames = new HashSet<String>();
private String myElementName;
2014-02-18 08:26:49 -05:00
public ElementCompositeState(PreResourceState thePreResourceState, String theElementName, BaseRuntimeElementCompositeDefinition<?> theDef, IBase theInstance) {
super(thePreResourceState);
2014-02-19 11:59:12 -05:00
myDefinition = theDef;
2014-02-18 08:26:49 -05:00
myInstance = theInstance;
myElementName = theElementName;
2014-02-18 08:26:49 -05:00
}
@Override
public void attributeValue(String theName, String theValue) throws DataFormatException {
if ("id".equals(theName)) {
2014-07-04 09:27:36 -04:00
if (myInstance instanceof IIdentifiableElement) {
((IIdentifiableElement) myInstance).setElementSpecificId((theValue));
2015-02-16 11:33:46 -05:00
} else if (myInstance instanceof IBaseElement) {
((IBaseElement) myInstance).setId(theValue);
2014-12-10 17:40:47 -05:00
} else if (myInstance instanceof IBaseResource) {
2014-12-10 22:02:31 -05:00
new IdDt(theValue).applyTo((IBaseResource) myInstance);
2014-07-04 09:27:36 -04:00
}
2014-05-28 16:07:53 -04:00
} else if ("url".equals(theName) && myInstance instanceof ExtensionDt) {
2014-07-04 09:27:36 -04:00
((ExtensionDt) myInstance).setUrl(theValue);
} else {
if (myJsonMode) {
myErrorHandler.incorrectJsonType(null, myElementName, ValueType.OBJECT, null, ValueType.SCALAR, ScalarType.STRING);
} else {
myErrorHandler.unknownAttribute(null, theName);
}
}
}
2016-12-19 14:03:11 -05:00
@Override
public boolean elementIsRepeating(String theChildName) {
BaseRuntimeChildDefinition child = myDefinition.getChildByName(theChildName);
if (child == null) {
2016-12-19 14:03:11 -05:00
return false;
}
return child.getMax() > 1 || child.getMax() == Child.MAX_UNLIMITED;
2016-12-19 14:03:11 -05:00
}
2014-02-18 08:26:49 -05:00
@Override
public void endingElement() {
2014-02-21 21:06:11 -05:00
pop();
}
Merge in HAPI 3.0.0 working branch! Squashed commit of the following: commit 12f89a423a1691fdbc360706fd94a03bd9144d17 Author: James <jamesagnew@gmail.com> Date: Sun Aug 13 14:38:51 2017 -0400 Minimize validation resources commit f6868cce5c73b34d5ecd53bf1a220fdccd6b4e09 Merge: 3b80779fd3 1e158311d8 Author: James <jamesagnew@gmail.com> Date: Sun Aug 13 14:05:34 2017 -0400 Forward port fix for #710 Merge branch 'master' into hapi3_refactor commit 3b80779fd3905cbf5322e6973334eb0ecb3d8426 Merge: 1f534985e8 356d9acaf7 Author: James <jamesagnew@gmail.com> Date: Sun Aug 13 12:31:09 2017 -0400 Forward port #705, #708, and #710 Merge branch 'master' into hapi3_refactor commit 1f534985e8106347d9cc9da2dd8145fdd869547f Merge: 7c39a47852 dedd3d635b Author: James <jamesagnew@gmail.com> Date: Sun Aug 13 10:52:59 2017 -0400 Forward port #695 Merge branch 'master' into hapi3_refactor commit 7c39a47852142bee398101120678217ab0917c7e Merge: e0ffb84d21 6efafe62f1 Author: James <jamesagnew@gmail.com> Date: Sun Aug 13 09:53:17 2017 -0400 Forward port #688 Merge branch 'master' into hapi3_refactor commit e0ffb84d2129c209ccffc2611038592f37dddfd2 Merge: 52388c11c1 d19b00ff09 Author: James <jamesagnew@gmail.com> Date: Sat Aug 12 14:59:46 2017 -0400 Merge branch 'master' into hapi3_refactor commit 52388c11c17cf038591244548f2a592f6b655cee Author: James <jamesagnew@gmail.com> Date: Sat Aug 12 06:21:46 2017 -0400 Cleanup commit 209752cd638266b39574ae11c5989b624d5e85d3 Author: James <jamesagnew@gmail.com> Date: Thu Aug 10 11:18:19 2017 -0400 Fix tests commit 4543408dc8d63b5b9682a275e261d3168cdc2196 Author: James <jamesagnew@gmail.com> Date: Sat Aug 5 06:55:50 2017 -0400 Fix a potential deadlock commit ee360f537692672df473f94dae75c176b2287415 Author: James <jamesagnew@gmail.com> Date: Sat Aug 5 06:22:06 2017 -0400 Add R4 code to CLI commit 1a95ba3b6529afdaf81232b82cc303718c0187d6 Author: James Agnew <jamesagnew@gmail.com> Date: Thu Aug 3 06:14:01 2017 -0400 More cleanup commit f0d88026817296edaa65132accd67d0c8ad8088c Author: James <jamesagnew@gmail.com> Date: Wed Aug 2 11:27:43 2017 -0400 Tests are working! commit a4cbda357e8e7d024f24e3ee9a660b5366983ca1 Author: James Agnew <jamesagnew@gmail.com> Date: Wed Aug 2 10:42:04 2017 -0400 Connection handling cleanup for new tests commit 0e2cecfbd0d7a546444a66e8411600040fd9a17b Author: James Agnew <jamesagnew@gmail.com> Date: Wed Aug 2 10:16:28 2017 -0400 Clean up R4 JPA tests commit 40317a650d72c86e2529d5179cffe63399301de5 Author: James <jamesagnew@gmail.com> Date: Wed Aug 2 09:12:38 2017 -0400 Work on R4 for JPA server commit e7f8f8c30d72ed30d739979964db38d41c5baec1 Author: James <jamesagnew@gmail.com> Date: Tue Aug 1 20:43:47 2017 -0400 More work on porting tests commit 43c9003258696ab33e7bb335e882ab1c66fb61aa Author: James <jamesagnew@gmail.com> Date: Tue Aug 1 07:09:29 2017 -0400 Work on porting DSTU1 tests commit 602857f1e26a69a2284e176b5e44a860d9b828ff Author: James Agnew <jamesagnew@gmail.com> Date: Mon Jul 31 22:34:08 2017 -0400 More work on bring unit tests up to date commit e326a7b0cdb8368009119bba41886838a973e03e Author: James Agnew <jamesagnew@gmail.com> Date: Mon Jul 31 17:36:38 2017 -0400 Credit for #686 and forward port the fix to R4 validator commit 96543c3992adcb406df3c8899dab79cf4bd5b4b4 Merge: 3fb75aa61a 9901b802c4 Author: James Agnew <jamesagnew@gmail.com> Date: Mon Jul 31 17:12:33 2017 -0400 Merge branch 'master' into hapi3_refactor commit 3fb75aa61ad29d9f3876a1c30c912627486147af Author: James <jamesagnew@gmail.com> Date: Mon Jul 31 15:21:30 2017 -0400 More work on cleanup commit b02fbb6804127e77c61c4792eefd9fc0d23d63d0 Author: James Agnew <jamesagnew@gmail.com> Date: Sun Jul 30 22:11:07 2017 -0400 Work on porting STU1 tests commit 1ae37b0db3929ea4f37955adf8f026e33ccf43b2 Author: James Agnew <jamesagnew@gmail.com> Date: Sun Jul 30 20:56:10 2017 -0400 Try to get coverage report working commit 72b88849b30a94a9ff08d3a1ab50a05b2acbdfdd Author: James Agnew <jamesagnew@gmail.com> Date: Sun Jul 30 20:27:02 2017 -0400 Fix android tests commit e5f6c35aeab8bbc056870a038e1862181049a020 Author: James <jamesagnew@gmail.com> Date: Sun Jul 30 19:31:18 2017 -0400 More work on getting legacy code cleaned up commit 0b513b0845a082b5c20b0033dfab4e29f5e4a934 Author: James <jamesagnew@gmail.com> Date: Sun Jul 30 18:41:13 2017 -0400 Continue work on removing deprecated API commit defea69aa38a2e0f4137ed9c8527956872ff70bf Author: James Agnew <jamesagnew@gmail.com> Date: Sun Jul 30 17:10:01 2017 -0400 More cleanup of legacy code commit 9ae7295705cb58f5edcf7ee1259f023cbbe2fe51 Author: James <jamesagnew@gmail.com> Date: Sun Jul 30 07:11:45 2017 -0400 More cleanup of legacy code commit ebd3eeb5ee793cf5805cc726db353f3def35ab00 Author: James Agnew <jamesagnew@gmail.com> Date: Sun Jul 30 06:43:25 2017 -0400 More work on removing legacy code commit 92224c2532faf70171473d64429c3ceaf3e3406c Author: James <jamesagnew@gmail.com> Date: Sat Jul 29 18:44:06 2017 -0400 Remove DSTU1 Bundle commit c52cacf71bae3f5c02ffae03881c21de1f3aba22 Author: James <jamesagnew@gmail.com> Date: Sat Jul 29 14:27:42 2017 -0400 Now compiling commit b405e51773baf4ab3a3c387458cdc59541394cd1 Merge: c3ddf04e25 cb2cea54d7 Author: James Agnew <jamesagnew@gmail.com> Date: Fri Jul 28 06:21:02 2017 -0400 Merge branch 'master' into hapi3_refactor commit c3ddf04e2598b8d6214975ab0ae795f850396811 Author: James <jamesagnew@gmail.com> Date: Thu Jul 27 11:06:06 2017 -0400 Sync R4 releases in commit b13333c3c03ddb9a5061c3b22bf011f4592104f8 Author: James <jamesagnew@gmail.com> Date: Fri Jul 14 05:52:33 2017 -0400 JPA server is now able to handle placeholder IDs (e.g. urn:uuid:00....000) being used in Bundle.entry.request.url as a part of the conditional URL within transactions. commit 2e60ff7521b42890a32b97c2dda88ab233f5c91e Author: James Agnew <jamesagnew@gmail.com> Date: Thu Jul 13 20:02:46 2017 -0400 Fix imports commit a92ace2e0dac6e24f6dada53bf97d03861fd21a1 Merge: 3196db96d1 1a6b3ea867 Author: James Agnew <jamesagnew@gmail.com> Date: Thu Jul 13 12:02:27 2017 -0400 Merge branch 'master' into hapi3_refactor commit 3196db96d1c485310e746833df59c0e010b5b161 Author: James Agnew <jamesagnew@gmail.com> Date: Thu Jul 13 11:48:10 2017 -0400 Don't add false paging link to request commit bd4e1d338855a664045caa271d41616aed973a4d Author: James <jamesagnew@gmail.com> Date: Sun Jul 9 21:32:16 2017 -0400 Finally building correctly! commit 6464ce9304703cb3c5ecc58491282ddacc900853 Author: James <jamesagnew@gmail.com> Date: Sun Jul 9 16:38:28 2017 -0400 Work on refactor commit 0059f2e48e9d7c812c1d42a57c5b6059814f5155 Author: James <jamesagnew@gmail.com> Date: Sat Jul 8 07:16:20 2017 -0400 Keep working on refactor commit 6c2e87e8cc19863a811c11623d1c878c8b48f031 Author: James Agnew <jamesagnew@gmail.com> Date: Thu Jul 6 22:35:13 2017 -0400 Lots of work on refactor commit 11cab975047a0c28190e6533074fd3f11ddde240 Merge: 34ec6b8807 6c47bd4c51 Author: James Agnew <jamesagnew@gmail.com> Date: Thu Jul 6 21:43:57 2017 -0400 Merge branch 'master' into hapi3_refactor commit 34ec6b8807946aa6c97f0b5581dca9bd5f7b7a3e Merge: f8e647511b c520e60ac1 Author: James Agnew <jamesagnew@gmail.com> Date: Thu Jul 6 21:43:49 2017 -0400 Merge branch 'hapi3_refactor' of github.com:jamesagnew/hapi-fhir into hapi3_refactor commit f8e647511b4a82e7fde71a8850b8800e3d698b1f Author: James Agnew <jamesagnew@gmail.com> Date: Thu Jul 6 18:46:55 2017 -0400 Work on hapi3 changes commit c520e60ac1198f340cfb9090a7a33f91aa2d1e61 Author: James <jamesagnew@gmail.com> Date: Wed Jul 5 08:08:40 2017 -0400 Keep working on refactor commit f1d2ee90926f7db900a5b3b4ab9a8948d18e49f2 Author: James Agnew <jamesagnew@gmail.com> Date: Mon Jul 3 22:10:59 2017 -0400 Continue refactor for HAPI 3 commit 9281ccafc32354222932c5a9f5ee8b0f206ebc05 Merge: ea1264cd8e 294d080bd3 Author: James Agnew <jamesagnew@gmail.com> Date: Mon Jul 3 20:34:16 2017 -0400 Merge branch 'master' into hapi3_refactor commit ea1264cd8e9b8c5297d218e91cf14bd48d0a92c7 Author: James <jamesagnew@gmail.com> Date: Wed Jun 28 10:26:01 2017 -0400 Continue work on refactor commit fbe2f98a0238f3d4e065db4550dd2ef1b460c0d8 Merge: b2bef47100 0a4dcc32ec Author: James <jamesagnew@gmail.com> Date: Wed Jun 28 06:21:22 2017 -0400 Merge branch 'master' into hapi3_refactor commit b2bef47100370e1248834523d73a630950032d7a Author: James <jamesagnew@gmail.com> Date: Tue Jun 27 21:13:23 2017 -0400 Work on refactor commit 8f76e4e46385daa9ce3442e2d9342453ce373ba3 Author: James Agnew <jamesagnew@gmail.com> Date: Sun Jun 25 21:55:35 2017 -0400 Lots of work on refactoring
2017-08-13 14:39:47 -04:00
2014-02-21 21:06:11 -05:00
@Override
2014-02-27 11:57:50 -05:00
public void enteringNewElement(String theNamespace, String theChildName) throws DataFormatException {
BaseRuntimeChildDefinition child = myDefinition.getChildByName(theChildName);
if (child == null) {
if (theChildName.equals("id")) {
if (getCurrentElement() instanceof IIdentifiableElement) {
push(new IdentifiableElementIdState(getPreResourceState(), (IIdentifiableElement) getCurrentElement()));
return;
}
}
2015-06-12 08:27:03 -04:00
/*
* This means we've found an element that doesn't exist on the structure. If the error handler doesn't throw
* an exception, swallow the element silently along with any child elements
*/
myErrorHandler.unknownElement(null, theChildName);
2014-03-28 17:11:56 -04:00
push(new SwallowChildrenWholeState(getPreResourceState()));
return;
}
if ((child.getMax() == 0 || child.getMax() == 1) && !myParsedNonRepeatableNames.add(theChildName)) {
2015-07-21 08:28:40 -04:00
myErrorHandler.unexpectedRepeatingElement(null, theChildName);
push(new SwallowChildrenWholeState(getPreResourceState()));
return;
}
2014-02-19 11:59:12 -05:00
BaseRuntimeElementDefinition<?> target = child.getChildByName(theChildName);
2014-02-26 09:03:43 -05:00
if (target == null) {
// This is a bug with the structures and shouldn't happen..
2014-02-26 09:03:43 -05:00
throw new DataFormatException("Found unexpected element '" + theChildName + "' in parent element '" + myDefinition.getName() + "'. Valid names are: " + child.getValidChildNames());
}
2014-02-26 17:13:49 -05:00
2014-02-19 11:59:12 -05:00
switch (target.getChildType()) {
case COMPOSITE_DATATYPE: {
BaseRuntimeElementCompositeDefinition<?> compositeTarget = (BaseRuntimeElementCompositeDefinition<?>) target;
ICompositeType newChildInstance = (ICompositeType) compositeTarget.newInstance(child.getInstanceConstructorArguments());
child.getMutator().addValue(myInstance, newChildInstance);
ParserState<T>.ElementCompositeState newState = new ElementCompositeState(getPreResourceState(), theChildName, compositeTarget, newChildInstance);
push(newState);
return;
2014-03-22 12:33:07 -04:00
}
case ID_DATATYPE:
case PRIMITIVE_DATATYPE: {
RuntimePrimitiveDatatypeDefinition primitiveTarget = (RuntimePrimitiveDatatypeDefinition) target;
IPrimitiveType<?> newChildInstance;
newChildInstance = primitiveTarget.newInstance(child.getInstanceConstructorArguments());
child.getMutator().addValue(myInstance, newChildInstance);
PrimitiveState newState = new PrimitiveState(getPreResourceState(), newChildInstance);
push(newState);
return;
}
case RESOURCE_BLOCK: {
RuntimeResourceBlockDefinition blockTarget = (RuntimeResourceBlockDefinition) target;
IBase newBlockInstance = blockTarget.newInstance();
child.getMutator().addValue(myInstance, newBlockInstance);
ElementCompositeState newState = new ElementCompositeState(getPreResourceState(), theChildName, blockTarget, newBlockInstance);
push(newState);
return;
}
case PRIMITIVE_XHTML: {
RuntimePrimitiveDatatypeNarrativeDefinition xhtmlTarget = (RuntimePrimitiveDatatypeNarrativeDefinition) target;
XhtmlDt newDt = xhtmlTarget.newInstance();
child.getMutator().addValue(myInstance, newDt);
XhtmlState state = new XhtmlState(getPreResourceState(), newDt, true);
push(state);
return;
}
case PRIMITIVE_XHTML_HL7ORG: {
RuntimePrimitiveDatatypeXhtmlHl7OrgDefinition xhtmlTarget = (RuntimePrimitiveDatatypeXhtmlHl7OrgDefinition) target;
IBaseXhtml newDt = xhtmlTarget.newInstance();
child.getMutator().addValue(myInstance, newDt);
XhtmlStateHl7Org state = new XhtmlStateHl7Org(getPreResourceState(), newDt);
push(state);
return;
}
case CONTAINED_RESOURCES: {
List<? extends IBase> values = child.getAccessor().getValues(myInstance);
Object newDt;
if (values == null || values.isEmpty() || values.get(0) == null) {
newDt = newContainedDt((IResource) getPreResourceState().myInstance);
child.getMutator().addValue(myInstance, (IBase) newDt);
} else {
newDt = values.get(0);
}
ContainedResourcesStateHapi state = new ContainedResourcesStateHapi(getPreResourceState());
push(state);
return;
}
case CONTAINED_RESOURCE_LIST: {
ContainedResourcesStateHl7Org state = new ContainedResourcesStateHl7Org(getPreResourceState());
push(state);
return;
}
case RESOURCE: {
if (myInstance instanceof IAnyResource || myInstance instanceof IBaseBackboneElement || myInstance instanceof IBaseElement) {
ParserState<T>.PreResourceStateHl7Org state = new PreResourceStateHl7Org(myInstance, child.getMutator(), null);
push(state);
} else {
ParserState<T>.PreResourceStateHapi state = new PreResourceStateHapi(myInstance, child.getMutator(), null);
push(state);
}
return;
}
case UNDECL_EXT:
case EXTENSION_DECLARED: {
// Throw an exception because this shouldn't happen here
break;
}
2014-02-22 15:33:02 -05:00
}
throw new DataFormatException("Illegal resource position: " + target.getChildType());
}
@Override
public void enteringNewElementExtension(StartElement theElement, String theUrlAttr, boolean theIsModifier, final String baseServerUrl) {
RuntimeChildDeclaredExtensionDefinition declaredExtension = myDefinition.getDeclaredExtension(theUrlAttr, baseServerUrl);
2014-02-26 17:13:49 -05:00
if (declaredExtension != null) {
BaseState newState = new DeclaredExtensionState(getPreResourceState(), declaredExtension, myInstance);
2014-02-26 17:13:49 -05:00
push(newState);
} else {
super.enteringNewElementExtension(theElement, theUrlAttr, theIsModifier, baseServerUrl);
2014-02-26 17:13:49 -05:00
}
2014-02-22 15:33:02 -05:00
}
2014-02-19 11:59:12 -05:00
2014-02-22 15:33:02 -05:00
@Override
2015-03-11 09:11:36 -04:00
protected IBase getCurrentElement() {
2014-02-22 15:33:02 -05:00
return myInstance;
}
}
public class ElementIdState extends BaseState {
private IBaseElement myElement;
public ElementIdState(ParserState<T>.PreResourceState thePreResourceState, IBaseElement theElement) {
super(thePreResourceState);
myElement = theElement;
}
@Override
public void attributeValue(String theName, String theValue) throws DataFormatException {
myElement.setId(theValue);
}
@Override
public void endingElement() {
pop();
}
}
2014-02-22 15:33:02 -05:00
private class ExtensionState extends BaseState {
2015-05-05 13:16:10 -04:00
private IBaseExtension<?, ?> myExtension;
2014-02-22 15:33:02 -05:00
2015-05-05 13:16:10 -04:00
public ExtensionState(PreResourceState thePreResourceState, IBaseExtension<?, ?> theExtension) {
super(thePreResourceState);
2014-02-22 15:33:02 -05:00
myExtension = theExtension;
}
@Override
public void attributeValue(String theName, String theValue) throws DataFormatException {
if ("url".equals(theName)) {
// The URL attribute is handles in the XML loop as a special case since it is "url" instead
// of "value" like every single other place
return;
}
if ("id".equals(theName)) {
if (getCurrentElement() instanceof IBaseElement) {
((IBaseElement) getCurrentElement()).setId(theValue);
return;
} else if (getCurrentElement() instanceof IIdentifiableElement) {
((IIdentifiableElement) getCurrentElement()).setElementSpecificId(theValue);
return;
}
}
super.attributeValue(theName, theValue);
}
2014-02-22 15:33:02 -05:00
@Override
public void endingElement() throws DataFormatException {
if (myExtension.getValue() != null && myExtension.getExtension().size() > 0) {
throw new DataFormatException("Extension (URL='" + myExtension.getUrl() + "') must not have both a value and other contained extensions");
2014-02-18 18:10:50 -05:00
}
2014-02-22 15:33:02 -05:00
pop();
}
@Override
2015-06-24 12:26:40 -04:00
public void enteringNewElement(String theNamespaceUri, String theLocalPart) throws DataFormatException {
if (theLocalPart.equals("id")) {
if (getCurrentElement() instanceof IBaseElement) {
Merge in HAPI 3.0.0 working branch! Squashed commit of the following: commit 12f89a423a1691fdbc360706fd94a03bd9144d17 Author: James <jamesagnew@gmail.com> Date: Sun Aug 13 14:38:51 2017 -0400 Minimize validation resources commit f6868cce5c73b34d5ecd53bf1a220fdccd6b4e09 Merge: 3b80779fd3 1e158311d8 Author: James <jamesagnew@gmail.com> Date: Sun Aug 13 14:05:34 2017 -0400 Forward port fix for #710 Merge branch 'master' into hapi3_refactor commit 3b80779fd3905cbf5322e6973334eb0ecb3d8426 Merge: 1f534985e8 356d9acaf7 Author: James <jamesagnew@gmail.com> Date: Sun Aug 13 12:31:09 2017 -0400 Forward port #705, #708, and #710 Merge branch 'master' into hapi3_refactor commit 1f534985e8106347d9cc9da2dd8145fdd869547f Merge: 7c39a47852 dedd3d635b Author: James <jamesagnew@gmail.com> Date: Sun Aug 13 10:52:59 2017 -0400 Forward port #695 Merge branch 'master' into hapi3_refactor commit 7c39a47852142bee398101120678217ab0917c7e Merge: e0ffb84d21 6efafe62f1 Author: James <jamesagnew@gmail.com> Date: Sun Aug 13 09:53:17 2017 -0400 Forward port #688 Merge branch 'master' into hapi3_refactor commit e0ffb84d2129c209ccffc2611038592f37dddfd2 Merge: 52388c11c1 d19b00ff09 Author: James <jamesagnew@gmail.com> Date: Sat Aug 12 14:59:46 2017 -0400 Merge branch 'master' into hapi3_refactor commit 52388c11c17cf038591244548f2a592f6b655cee Author: James <jamesagnew@gmail.com> Date: Sat Aug 12 06:21:46 2017 -0400 Cleanup commit 209752cd638266b39574ae11c5989b624d5e85d3 Author: James <jamesagnew@gmail.com> Date: Thu Aug 10 11:18:19 2017 -0400 Fix tests commit 4543408dc8d63b5b9682a275e261d3168cdc2196 Author: James <jamesagnew@gmail.com> Date: Sat Aug 5 06:55:50 2017 -0400 Fix a potential deadlock commit ee360f537692672df473f94dae75c176b2287415 Author: James <jamesagnew@gmail.com> Date: Sat Aug 5 06:22:06 2017 -0400 Add R4 code to CLI commit 1a95ba3b6529afdaf81232b82cc303718c0187d6 Author: James Agnew <jamesagnew@gmail.com> Date: Thu Aug 3 06:14:01 2017 -0400 More cleanup commit f0d88026817296edaa65132accd67d0c8ad8088c Author: James <jamesagnew@gmail.com> Date: Wed Aug 2 11:27:43 2017 -0400 Tests are working! commit a4cbda357e8e7d024f24e3ee9a660b5366983ca1 Author: James Agnew <jamesagnew@gmail.com> Date: Wed Aug 2 10:42:04 2017 -0400 Connection handling cleanup for new tests commit 0e2cecfbd0d7a546444a66e8411600040fd9a17b Author: James Agnew <jamesagnew@gmail.com> Date: Wed Aug 2 10:16:28 2017 -0400 Clean up R4 JPA tests commit 40317a650d72c86e2529d5179cffe63399301de5 Author: James <jamesagnew@gmail.com> Date: Wed Aug 2 09:12:38 2017 -0400 Work on R4 for JPA server commit e7f8f8c30d72ed30d739979964db38d41c5baec1 Author: James <jamesagnew@gmail.com> Date: Tue Aug 1 20:43:47 2017 -0400 More work on porting tests commit 43c9003258696ab33e7bb335e882ab1c66fb61aa Author: James <jamesagnew@gmail.com> Date: Tue Aug 1 07:09:29 2017 -0400 Work on porting DSTU1 tests commit 602857f1e26a69a2284e176b5e44a860d9b828ff Author: James Agnew <jamesagnew@gmail.com> Date: Mon Jul 31 22:34:08 2017 -0400 More work on bring unit tests up to date commit e326a7b0cdb8368009119bba41886838a973e03e Author: James Agnew <jamesagnew@gmail.com> Date: Mon Jul 31 17:36:38 2017 -0400 Credit for #686 and forward port the fix to R4 validator commit 96543c3992adcb406df3c8899dab79cf4bd5b4b4 Merge: 3fb75aa61a 9901b802c4 Author: James Agnew <jamesagnew@gmail.com> Date: Mon Jul 31 17:12:33 2017 -0400 Merge branch 'master' into hapi3_refactor commit 3fb75aa61ad29d9f3876a1c30c912627486147af Author: James <jamesagnew@gmail.com> Date: Mon Jul 31 15:21:30 2017 -0400 More work on cleanup commit b02fbb6804127e77c61c4792eefd9fc0d23d63d0 Author: James Agnew <jamesagnew@gmail.com> Date: Sun Jul 30 22:11:07 2017 -0400 Work on porting STU1 tests commit 1ae37b0db3929ea4f37955adf8f026e33ccf43b2 Author: James Agnew <jamesagnew@gmail.com> Date: Sun Jul 30 20:56:10 2017 -0400 Try to get coverage report working commit 72b88849b30a94a9ff08d3a1ab50a05b2acbdfdd Author: James Agnew <jamesagnew@gmail.com> Date: Sun Jul 30 20:27:02 2017 -0400 Fix android tests commit e5f6c35aeab8bbc056870a038e1862181049a020 Author: James <jamesagnew@gmail.com> Date: Sun Jul 30 19:31:18 2017 -0400 More work on getting legacy code cleaned up commit 0b513b0845a082b5c20b0033dfab4e29f5e4a934 Author: James <jamesagnew@gmail.com> Date: Sun Jul 30 18:41:13 2017 -0400 Continue work on removing deprecated API commit defea69aa38a2e0f4137ed9c8527956872ff70bf Author: James Agnew <jamesagnew@gmail.com> Date: Sun Jul 30 17:10:01 2017 -0400 More cleanup of legacy code commit 9ae7295705cb58f5edcf7ee1259f023cbbe2fe51 Author: James <jamesagnew@gmail.com> Date: Sun Jul 30 07:11:45 2017 -0400 More cleanup of legacy code commit ebd3eeb5ee793cf5805cc726db353f3def35ab00 Author: James Agnew <jamesagnew@gmail.com> Date: Sun Jul 30 06:43:25 2017 -0400 More work on removing legacy code commit 92224c2532faf70171473d64429c3ceaf3e3406c Author: James <jamesagnew@gmail.com> Date: Sat Jul 29 18:44:06 2017 -0400 Remove DSTU1 Bundle commit c52cacf71bae3f5c02ffae03881c21de1f3aba22 Author: James <jamesagnew@gmail.com> Date: Sat Jul 29 14:27:42 2017 -0400 Now compiling commit b405e51773baf4ab3a3c387458cdc59541394cd1 Merge: c3ddf04e25 cb2cea54d7 Author: James Agnew <jamesagnew@gmail.com> Date: Fri Jul 28 06:21:02 2017 -0400 Merge branch 'master' into hapi3_refactor commit c3ddf04e2598b8d6214975ab0ae795f850396811 Author: James <jamesagnew@gmail.com> Date: Thu Jul 27 11:06:06 2017 -0400 Sync R4 releases in commit b13333c3c03ddb9a5061c3b22bf011f4592104f8 Author: James <jamesagnew@gmail.com> Date: Fri Jul 14 05:52:33 2017 -0400 JPA server is now able to handle placeholder IDs (e.g. urn:uuid:00....000) being used in Bundle.entry.request.url as a part of the conditional URL within transactions. commit 2e60ff7521b42890a32b97c2dda88ab233f5c91e Author: James Agnew <jamesagnew@gmail.com> Date: Thu Jul 13 20:02:46 2017 -0400 Fix imports commit a92ace2e0dac6e24f6dada53bf97d03861fd21a1 Merge: 3196db96d1 1a6b3ea867 Author: James Agnew <jamesagnew@gmail.com> Date: Thu Jul 13 12:02:27 2017 -0400 Merge branch 'master' into hapi3_refactor commit 3196db96d1c485310e746833df59c0e010b5b161 Author: James Agnew <jamesagnew@gmail.com> Date: Thu Jul 13 11:48:10 2017 -0400 Don't add false paging link to request commit bd4e1d338855a664045caa271d41616aed973a4d Author: James <jamesagnew@gmail.com> Date: Sun Jul 9 21:32:16 2017 -0400 Finally building correctly! commit 6464ce9304703cb3c5ecc58491282ddacc900853 Author: James <jamesagnew@gmail.com> Date: Sun Jul 9 16:38:28 2017 -0400 Work on refactor commit 0059f2e48e9d7c812c1d42a57c5b6059814f5155 Author: James <jamesagnew@gmail.com> Date: Sat Jul 8 07:16:20 2017 -0400 Keep working on refactor commit 6c2e87e8cc19863a811c11623d1c878c8b48f031 Author: James Agnew <jamesagnew@gmail.com> Date: Thu Jul 6 22:35:13 2017 -0400 Lots of work on refactor commit 11cab975047a0c28190e6533074fd3f11ddde240 Merge: 34ec6b8807 6c47bd4c51 Author: James Agnew <jamesagnew@gmail.com> Date: Thu Jul 6 21:43:57 2017 -0400 Merge branch 'master' into hapi3_refactor commit 34ec6b8807946aa6c97f0b5581dca9bd5f7b7a3e Merge: f8e647511b c520e60ac1 Author: James Agnew <jamesagnew@gmail.com> Date: Thu Jul 6 21:43:49 2017 -0400 Merge branch 'hapi3_refactor' of github.com:jamesagnew/hapi-fhir into hapi3_refactor commit f8e647511b4a82e7fde71a8850b8800e3d698b1f Author: James Agnew <jamesagnew@gmail.com> Date: Thu Jul 6 18:46:55 2017 -0400 Work on hapi3 changes commit c520e60ac1198f340cfb9090a7a33f91aa2d1e61 Author: James <jamesagnew@gmail.com> Date: Wed Jul 5 08:08:40 2017 -0400 Keep working on refactor commit f1d2ee90926f7db900a5b3b4ab9a8948d18e49f2 Author: James Agnew <jamesagnew@gmail.com> Date: Mon Jul 3 22:10:59 2017 -0400 Continue refactor for HAPI 3 commit 9281ccafc32354222932c5a9f5ee8b0f206ebc05 Merge: ea1264cd8e 294d080bd3 Author: James Agnew <jamesagnew@gmail.com> Date: Mon Jul 3 20:34:16 2017 -0400 Merge branch 'master' into hapi3_refactor commit ea1264cd8e9b8c5297d218e91cf14bd48d0a92c7 Author: James <jamesagnew@gmail.com> Date: Wed Jun 28 10:26:01 2017 -0400 Continue work on refactor commit fbe2f98a0238f3d4e065db4550dd2ef1b460c0d8 Merge: b2bef47100 0a4dcc32ec Author: James <jamesagnew@gmail.com> Date: Wed Jun 28 06:21:22 2017 -0400 Merge branch 'master' into hapi3_refactor commit b2bef47100370e1248834523d73a630950032d7a Author: James <jamesagnew@gmail.com> Date: Tue Jun 27 21:13:23 2017 -0400 Work on refactor commit 8f76e4e46385daa9ce3442e2d9342453ce373ba3 Author: James Agnew <jamesagnew@gmail.com> Date: Sun Jun 25 21:55:35 2017 -0400 Lots of work on refactoring
2017-08-13 14:39:47 -04:00
push(new ElementIdState(getPreResourceState(), (IBaseElement) getCurrentElement()));
return;
} else if (getCurrentElement() instanceof IIdentifiableElement) {
Merge in HAPI 3.0.0 working branch! Squashed commit of the following: commit 12f89a423a1691fdbc360706fd94a03bd9144d17 Author: James <jamesagnew@gmail.com> Date: Sun Aug 13 14:38:51 2017 -0400 Minimize validation resources commit f6868cce5c73b34d5ecd53bf1a220fdccd6b4e09 Merge: 3b80779fd3 1e158311d8 Author: James <jamesagnew@gmail.com> Date: Sun Aug 13 14:05:34 2017 -0400 Forward port fix for #710 Merge branch 'master' into hapi3_refactor commit 3b80779fd3905cbf5322e6973334eb0ecb3d8426 Merge: 1f534985e8 356d9acaf7 Author: James <jamesagnew@gmail.com> Date: Sun Aug 13 12:31:09 2017 -0400 Forward port #705, #708, and #710 Merge branch 'master' into hapi3_refactor commit 1f534985e8106347d9cc9da2dd8145fdd869547f Merge: 7c39a47852 dedd3d635b Author: James <jamesagnew@gmail.com> Date: Sun Aug 13 10:52:59 2017 -0400 Forward port #695 Merge branch 'master' into hapi3_refactor commit 7c39a47852142bee398101120678217ab0917c7e Merge: e0ffb84d21 6efafe62f1 Author: James <jamesagnew@gmail.com> Date: Sun Aug 13 09:53:17 2017 -0400 Forward port #688 Merge branch 'master' into hapi3_refactor commit e0ffb84d2129c209ccffc2611038592f37dddfd2 Merge: 52388c11c1 d19b00ff09 Author: James <jamesagnew@gmail.com> Date: Sat Aug 12 14:59:46 2017 -0400 Merge branch 'master' into hapi3_refactor commit 52388c11c17cf038591244548f2a592f6b655cee Author: James <jamesagnew@gmail.com> Date: Sat Aug 12 06:21:46 2017 -0400 Cleanup commit 209752cd638266b39574ae11c5989b624d5e85d3 Author: James <jamesagnew@gmail.com> Date: Thu Aug 10 11:18:19 2017 -0400 Fix tests commit 4543408dc8d63b5b9682a275e261d3168cdc2196 Author: James <jamesagnew@gmail.com> Date: Sat Aug 5 06:55:50 2017 -0400 Fix a potential deadlock commit ee360f537692672df473f94dae75c176b2287415 Author: James <jamesagnew@gmail.com> Date: Sat Aug 5 06:22:06 2017 -0400 Add R4 code to CLI commit 1a95ba3b6529afdaf81232b82cc303718c0187d6 Author: James Agnew <jamesagnew@gmail.com> Date: Thu Aug 3 06:14:01 2017 -0400 More cleanup commit f0d88026817296edaa65132accd67d0c8ad8088c Author: James <jamesagnew@gmail.com> Date: Wed Aug 2 11:27:43 2017 -0400 Tests are working! commit a4cbda357e8e7d024f24e3ee9a660b5366983ca1 Author: James Agnew <jamesagnew@gmail.com> Date: Wed Aug 2 10:42:04 2017 -0400 Connection handling cleanup for new tests commit 0e2cecfbd0d7a546444a66e8411600040fd9a17b Author: James Agnew <jamesagnew@gmail.com> Date: Wed Aug 2 10:16:28 2017 -0400 Clean up R4 JPA tests commit 40317a650d72c86e2529d5179cffe63399301de5 Author: James <jamesagnew@gmail.com> Date: Wed Aug 2 09:12:38 2017 -0400 Work on R4 for JPA server commit e7f8f8c30d72ed30d739979964db38d41c5baec1 Author: James <jamesagnew@gmail.com> Date: Tue Aug 1 20:43:47 2017 -0400 More work on porting tests commit 43c9003258696ab33e7bb335e882ab1c66fb61aa Author: James <jamesagnew@gmail.com> Date: Tue Aug 1 07:09:29 2017 -0400 Work on porting DSTU1 tests commit 602857f1e26a69a2284e176b5e44a860d9b828ff Author: James Agnew <jamesagnew@gmail.com> Date: Mon Jul 31 22:34:08 2017 -0400 More work on bring unit tests up to date commit e326a7b0cdb8368009119bba41886838a973e03e Author: James Agnew <jamesagnew@gmail.com> Date: Mon Jul 31 17:36:38 2017 -0400 Credit for #686 and forward port the fix to R4 validator commit 96543c3992adcb406df3c8899dab79cf4bd5b4b4 Merge: 3fb75aa61a 9901b802c4 Author: James Agnew <jamesagnew@gmail.com> Date: Mon Jul 31 17:12:33 2017 -0400 Merge branch 'master' into hapi3_refactor commit 3fb75aa61ad29d9f3876a1c30c912627486147af Author: James <jamesagnew@gmail.com> Date: Mon Jul 31 15:21:30 2017 -0400 More work on cleanup commit b02fbb6804127e77c61c4792eefd9fc0d23d63d0 Author: James Agnew <jamesagnew@gmail.com> Date: Sun Jul 30 22:11:07 2017 -0400 Work on porting STU1 tests commit 1ae37b0db3929ea4f37955adf8f026e33ccf43b2 Author: James Agnew <jamesagnew@gmail.com> Date: Sun Jul 30 20:56:10 2017 -0400 Try to get coverage report working commit 72b88849b30a94a9ff08d3a1ab50a05b2acbdfdd Author: James Agnew <jamesagnew@gmail.com> Date: Sun Jul 30 20:27:02 2017 -0400 Fix android tests commit e5f6c35aeab8bbc056870a038e1862181049a020 Author: James <jamesagnew@gmail.com> Date: Sun Jul 30 19:31:18 2017 -0400 More work on getting legacy code cleaned up commit 0b513b0845a082b5c20b0033dfab4e29f5e4a934 Author: James <jamesagnew@gmail.com> Date: Sun Jul 30 18:41:13 2017 -0400 Continue work on removing deprecated API commit defea69aa38a2e0f4137ed9c8527956872ff70bf Author: James Agnew <jamesagnew@gmail.com> Date: Sun Jul 30 17:10:01 2017 -0400 More cleanup of legacy code commit 9ae7295705cb58f5edcf7ee1259f023cbbe2fe51 Author: James <jamesagnew@gmail.com> Date: Sun Jul 30 07:11:45 2017 -0400 More cleanup of legacy code commit ebd3eeb5ee793cf5805cc726db353f3def35ab00 Author: James Agnew <jamesagnew@gmail.com> Date: Sun Jul 30 06:43:25 2017 -0400 More work on removing legacy code commit 92224c2532faf70171473d64429c3ceaf3e3406c Author: James <jamesagnew@gmail.com> Date: Sat Jul 29 18:44:06 2017 -0400 Remove DSTU1 Bundle commit c52cacf71bae3f5c02ffae03881c21de1f3aba22 Author: James <jamesagnew@gmail.com> Date: Sat Jul 29 14:27:42 2017 -0400 Now compiling commit b405e51773baf4ab3a3c387458cdc59541394cd1 Merge: c3ddf04e25 cb2cea54d7 Author: James Agnew <jamesagnew@gmail.com> Date: Fri Jul 28 06:21:02 2017 -0400 Merge branch 'master' into hapi3_refactor commit c3ddf04e2598b8d6214975ab0ae795f850396811 Author: James <jamesagnew@gmail.com> Date: Thu Jul 27 11:06:06 2017 -0400 Sync R4 releases in commit b13333c3c03ddb9a5061c3b22bf011f4592104f8 Author: James <jamesagnew@gmail.com> Date: Fri Jul 14 05:52:33 2017 -0400 JPA server is now able to handle placeholder IDs (e.g. urn:uuid:00....000) being used in Bundle.entry.request.url as a part of the conditional URL within transactions. commit 2e60ff7521b42890a32b97c2dda88ab233f5c91e Author: James Agnew <jamesagnew@gmail.com> Date: Thu Jul 13 20:02:46 2017 -0400 Fix imports commit a92ace2e0dac6e24f6dada53bf97d03861fd21a1 Merge: 3196db96d1 1a6b3ea867 Author: James Agnew <jamesagnew@gmail.com> Date: Thu Jul 13 12:02:27 2017 -0400 Merge branch 'master' into hapi3_refactor commit 3196db96d1c485310e746833df59c0e010b5b161 Author: James Agnew <jamesagnew@gmail.com> Date: Thu Jul 13 11:48:10 2017 -0400 Don't add false paging link to request commit bd4e1d338855a664045caa271d41616aed973a4d Author: James <jamesagnew@gmail.com> Date: Sun Jul 9 21:32:16 2017 -0400 Finally building correctly! commit 6464ce9304703cb3c5ecc58491282ddacc900853 Author: James <jamesagnew@gmail.com> Date: Sun Jul 9 16:38:28 2017 -0400 Work on refactor commit 0059f2e48e9d7c812c1d42a57c5b6059814f5155 Author: James <jamesagnew@gmail.com> Date: Sat Jul 8 07:16:20 2017 -0400 Keep working on refactor commit 6c2e87e8cc19863a811c11623d1c878c8b48f031 Author: James Agnew <jamesagnew@gmail.com> Date: Thu Jul 6 22:35:13 2017 -0400 Lots of work on refactor commit 11cab975047a0c28190e6533074fd3f11ddde240 Merge: 34ec6b8807 6c47bd4c51 Author: James Agnew <jamesagnew@gmail.com> Date: Thu Jul 6 21:43:57 2017 -0400 Merge branch 'master' into hapi3_refactor commit 34ec6b8807946aa6c97f0b5581dca9bd5f7b7a3e Merge: f8e647511b c520e60ac1 Author: James Agnew <jamesagnew@gmail.com> Date: Thu Jul 6 21:43:49 2017 -0400 Merge branch 'hapi3_refactor' of github.com:jamesagnew/hapi-fhir into hapi3_refactor commit f8e647511b4a82e7fde71a8850b8800e3d698b1f Author: James Agnew <jamesagnew@gmail.com> Date: Thu Jul 6 18:46:55 2017 -0400 Work on hapi3 changes commit c520e60ac1198f340cfb9090a7a33f91aa2d1e61 Author: James <jamesagnew@gmail.com> Date: Wed Jul 5 08:08:40 2017 -0400 Keep working on refactor commit f1d2ee90926f7db900a5b3b4ab9a8948d18e49f2 Author: James Agnew <jamesagnew@gmail.com> Date: Mon Jul 3 22:10:59 2017 -0400 Continue refactor for HAPI 3 commit 9281ccafc32354222932c5a9f5ee8b0f206ebc05 Merge: ea1264cd8e 294d080bd3 Author: James Agnew <jamesagnew@gmail.com> Date: Mon Jul 3 20:34:16 2017 -0400 Merge branch 'master' into hapi3_refactor commit ea1264cd8e9b8c5297d218e91cf14bd48d0a92c7 Author: James <jamesagnew@gmail.com> Date: Wed Jun 28 10:26:01 2017 -0400 Continue work on refactor commit fbe2f98a0238f3d4e065db4550dd2ef1b460c0d8 Merge: b2bef47100 0a4dcc32ec Author: James <jamesagnew@gmail.com> Date: Wed Jun 28 06:21:22 2017 -0400 Merge branch 'master' into hapi3_refactor commit b2bef47100370e1248834523d73a630950032d7a Author: James <jamesagnew@gmail.com> Date: Tue Jun 27 21:13:23 2017 -0400 Work on refactor commit 8f76e4e46385daa9ce3442e2d9342453ce373ba3 Author: James Agnew <jamesagnew@gmail.com> Date: Sun Jun 25 21:55:35 2017 -0400 Lots of work on refactoring
2017-08-13 14:39:47 -04:00
push(new IdentifiableElementIdState(getPreResourceState(), (IIdentifiableElement) getCurrentElement()));
return;
}
}
Merge in HAPI 3.0.0 working branch! Squashed commit of the following: commit 12f89a423a1691fdbc360706fd94a03bd9144d17 Author: James <jamesagnew@gmail.com> Date: Sun Aug 13 14:38:51 2017 -0400 Minimize validation resources commit f6868cce5c73b34d5ecd53bf1a220fdccd6b4e09 Merge: 3b80779fd3 1e158311d8 Author: James <jamesagnew@gmail.com> Date: Sun Aug 13 14:05:34 2017 -0400 Forward port fix for #710 Merge branch 'master' into hapi3_refactor commit 3b80779fd3905cbf5322e6973334eb0ecb3d8426 Merge: 1f534985e8 356d9acaf7 Author: James <jamesagnew@gmail.com> Date: Sun Aug 13 12:31:09 2017 -0400 Forward port #705, #708, and #710 Merge branch 'master' into hapi3_refactor commit 1f534985e8106347d9cc9da2dd8145fdd869547f Merge: 7c39a47852 dedd3d635b Author: James <jamesagnew@gmail.com> Date: Sun Aug 13 10:52:59 2017 -0400 Forward port #695 Merge branch 'master' into hapi3_refactor commit 7c39a47852142bee398101120678217ab0917c7e Merge: e0ffb84d21 6efafe62f1 Author: James <jamesagnew@gmail.com> Date: Sun Aug 13 09:53:17 2017 -0400 Forward port #688 Merge branch 'master' into hapi3_refactor commit e0ffb84d2129c209ccffc2611038592f37dddfd2 Merge: 52388c11c1 d19b00ff09 Author: James <jamesagnew@gmail.com> Date: Sat Aug 12 14:59:46 2017 -0400 Merge branch 'master' into hapi3_refactor commit 52388c11c17cf038591244548f2a592f6b655cee Author: James <jamesagnew@gmail.com> Date: Sat Aug 12 06:21:46 2017 -0400 Cleanup commit 209752cd638266b39574ae11c5989b624d5e85d3 Author: James <jamesagnew@gmail.com> Date: Thu Aug 10 11:18:19 2017 -0400 Fix tests commit 4543408dc8d63b5b9682a275e261d3168cdc2196 Author: James <jamesagnew@gmail.com> Date: Sat Aug 5 06:55:50 2017 -0400 Fix a potential deadlock commit ee360f537692672df473f94dae75c176b2287415 Author: James <jamesagnew@gmail.com> Date: Sat Aug 5 06:22:06 2017 -0400 Add R4 code to CLI commit 1a95ba3b6529afdaf81232b82cc303718c0187d6 Author: James Agnew <jamesagnew@gmail.com> Date: Thu Aug 3 06:14:01 2017 -0400 More cleanup commit f0d88026817296edaa65132accd67d0c8ad8088c Author: James <jamesagnew@gmail.com> Date: Wed Aug 2 11:27:43 2017 -0400 Tests are working! commit a4cbda357e8e7d024f24e3ee9a660b5366983ca1 Author: James Agnew <jamesagnew@gmail.com> Date: Wed Aug 2 10:42:04 2017 -0400 Connection handling cleanup for new tests commit 0e2cecfbd0d7a546444a66e8411600040fd9a17b Author: James Agnew <jamesagnew@gmail.com> Date: Wed Aug 2 10:16:28 2017 -0400 Clean up R4 JPA tests commit 40317a650d72c86e2529d5179cffe63399301de5 Author: James <jamesagnew@gmail.com> Date: Wed Aug 2 09:12:38 2017 -0400 Work on R4 for JPA server commit e7f8f8c30d72ed30d739979964db38d41c5baec1 Author: James <jamesagnew@gmail.com> Date: Tue Aug 1 20:43:47 2017 -0400 More work on porting tests commit 43c9003258696ab33e7bb335e882ab1c66fb61aa Author: James <jamesagnew@gmail.com> Date: Tue Aug 1 07:09:29 2017 -0400 Work on porting DSTU1 tests commit 602857f1e26a69a2284e176b5e44a860d9b828ff Author: James Agnew <jamesagnew@gmail.com> Date: Mon Jul 31 22:34:08 2017 -0400 More work on bring unit tests up to date commit e326a7b0cdb8368009119bba41886838a973e03e Author: James Agnew <jamesagnew@gmail.com> Date: Mon Jul 31 17:36:38 2017 -0400 Credit for #686 and forward port the fix to R4 validator commit 96543c3992adcb406df3c8899dab79cf4bd5b4b4 Merge: 3fb75aa61a 9901b802c4 Author: James Agnew <jamesagnew@gmail.com> Date: Mon Jul 31 17:12:33 2017 -0400 Merge branch 'master' into hapi3_refactor commit 3fb75aa61ad29d9f3876a1c30c912627486147af Author: James <jamesagnew@gmail.com> Date: Mon Jul 31 15:21:30 2017 -0400 More work on cleanup commit b02fbb6804127e77c61c4792eefd9fc0d23d63d0 Author: James Agnew <jamesagnew@gmail.com> Date: Sun Jul 30 22:11:07 2017 -0400 Work on porting STU1 tests commit 1ae37b0db3929ea4f37955adf8f026e33ccf43b2 Author: James Agnew <jamesagnew@gmail.com> Date: Sun Jul 30 20:56:10 2017 -0400 Try to get coverage report working commit 72b88849b30a94a9ff08d3a1ab50a05b2acbdfdd Author: James Agnew <jamesagnew@gmail.com> Date: Sun Jul 30 20:27:02 2017 -0400 Fix android tests commit e5f6c35aeab8bbc056870a038e1862181049a020 Author: James <jamesagnew@gmail.com> Date: Sun Jul 30 19:31:18 2017 -0400 More work on getting legacy code cleaned up commit 0b513b0845a082b5c20b0033dfab4e29f5e4a934 Author: James <jamesagnew@gmail.com> Date: Sun Jul 30 18:41:13 2017 -0400 Continue work on removing deprecated API commit defea69aa38a2e0f4137ed9c8527956872ff70bf Author: James Agnew <jamesagnew@gmail.com> Date: Sun Jul 30 17:10:01 2017 -0400 More cleanup of legacy code commit 9ae7295705cb58f5edcf7ee1259f023cbbe2fe51 Author: James <jamesagnew@gmail.com> Date: Sun Jul 30 07:11:45 2017 -0400 More cleanup of legacy code commit ebd3eeb5ee793cf5805cc726db353f3def35ab00 Author: James Agnew <jamesagnew@gmail.com> Date: Sun Jul 30 06:43:25 2017 -0400 More work on removing legacy code commit 92224c2532faf70171473d64429c3ceaf3e3406c Author: James <jamesagnew@gmail.com> Date: Sat Jul 29 18:44:06 2017 -0400 Remove DSTU1 Bundle commit c52cacf71bae3f5c02ffae03881c21de1f3aba22 Author: James <jamesagnew@gmail.com> Date: Sat Jul 29 14:27:42 2017 -0400 Now compiling commit b405e51773baf4ab3a3c387458cdc59541394cd1 Merge: c3ddf04e25 cb2cea54d7 Author: James Agnew <jamesagnew@gmail.com> Date: Fri Jul 28 06:21:02 2017 -0400 Merge branch 'master' into hapi3_refactor commit c3ddf04e2598b8d6214975ab0ae795f850396811 Author: James <jamesagnew@gmail.com> Date: Thu Jul 27 11:06:06 2017 -0400 Sync R4 releases in commit b13333c3c03ddb9a5061c3b22bf011f4592104f8 Author: James <jamesagnew@gmail.com> Date: Fri Jul 14 05:52:33 2017 -0400 JPA server is now able to handle placeholder IDs (e.g. urn:uuid:00....000) being used in Bundle.entry.request.url as a part of the conditional URL within transactions. commit 2e60ff7521b42890a32b97c2dda88ab233f5c91e Author: James Agnew <jamesagnew@gmail.com> Date: Thu Jul 13 20:02:46 2017 -0400 Fix imports commit a92ace2e0dac6e24f6dada53bf97d03861fd21a1 Merge: 3196db96d1 1a6b3ea867 Author: James Agnew <jamesagnew@gmail.com> Date: Thu Jul 13 12:02:27 2017 -0400 Merge branch 'master' into hapi3_refactor commit 3196db96d1c485310e746833df59c0e010b5b161 Author: James Agnew <jamesagnew@gmail.com> Date: Thu Jul 13 11:48:10 2017 -0400 Don't add false paging link to request commit bd4e1d338855a664045caa271d41616aed973a4d Author: James <jamesagnew@gmail.com> Date: Sun Jul 9 21:32:16 2017 -0400 Finally building correctly! commit 6464ce9304703cb3c5ecc58491282ddacc900853 Author: James <jamesagnew@gmail.com> Date: Sun Jul 9 16:38:28 2017 -0400 Work on refactor commit 0059f2e48e9d7c812c1d42a57c5b6059814f5155 Author: James <jamesagnew@gmail.com> Date: Sat Jul 8 07:16:20 2017 -0400 Keep working on refactor commit 6c2e87e8cc19863a811c11623d1c878c8b48f031 Author: James Agnew <jamesagnew@gmail.com> Date: Thu Jul 6 22:35:13 2017 -0400 Lots of work on refactor commit 11cab975047a0c28190e6533074fd3f11ddde240 Merge: 34ec6b8807 6c47bd4c51 Author: James Agnew <jamesagnew@gmail.com> Date: Thu Jul 6 21:43:57 2017 -0400 Merge branch 'master' into hapi3_refactor commit 34ec6b8807946aa6c97f0b5581dca9bd5f7b7a3e Merge: f8e647511b c520e60ac1 Author: James Agnew <jamesagnew@gmail.com> Date: Thu Jul 6 21:43:49 2017 -0400 Merge branch 'hapi3_refactor' of github.com:jamesagnew/hapi-fhir into hapi3_refactor commit f8e647511b4a82e7fde71a8850b8800e3d698b1f Author: James Agnew <jamesagnew@gmail.com> Date: Thu Jul 6 18:46:55 2017 -0400 Work on hapi3 changes commit c520e60ac1198f340cfb9090a7a33f91aa2d1e61 Author: James <jamesagnew@gmail.com> Date: Wed Jul 5 08:08:40 2017 -0400 Keep working on refactor commit f1d2ee90926f7db900a5b3b4ab9a8948d18e49f2 Author: James Agnew <jamesagnew@gmail.com> Date: Mon Jul 3 22:10:59 2017 -0400 Continue refactor for HAPI 3 commit 9281ccafc32354222932c5a9f5ee8b0f206ebc05 Merge: ea1264cd8e 294d080bd3 Author: James Agnew <jamesagnew@gmail.com> Date: Mon Jul 3 20:34:16 2017 -0400 Merge branch 'master' into hapi3_refactor commit ea1264cd8e9b8c5297d218e91cf14bd48d0a92c7 Author: James <jamesagnew@gmail.com> Date: Wed Jun 28 10:26:01 2017 -0400 Continue work on refactor commit fbe2f98a0238f3d4e065db4550dd2ef1b460c0d8 Merge: b2bef47100 0a4dcc32ec Author: James <jamesagnew@gmail.com> Date: Wed Jun 28 06:21:22 2017 -0400 Merge branch 'master' into hapi3_refactor commit b2bef47100370e1248834523d73a630950032d7a Author: James <jamesagnew@gmail.com> Date: Tue Jun 27 21:13:23 2017 -0400 Work on refactor commit 8f76e4e46385daa9ce3442e2d9342453ce373ba3 Author: James Agnew <jamesagnew@gmail.com> Date: Sun Jun 25 21:55:35 2017 -0400 Lots of work on refactoring
2017-08-13 14:39:47 -04:00
2014-02-22 15:33:02 -05:00
BaseRuntimeElementDefinition<?> target = myContext.getRuntimeChildUndeclaredExtensionDefinition().getChildByName(theLocalPart);
Merge in HAPI 3.0.0 working branch! Squashed commit of the following: commit 12f89a423a1691fdbc360706fd94a03bd9144d17 Author: James <jamesagnew@gmail.com> Date: Sun Aug 13 14:38:51 2017 -0400 Minimize validation resources commit f6868cce5c73b34d5ecd53bf1a220fdccd6b4e09 Merge: 3b80779fd3 1e158311d8 Author: James <jamesagnew@gmail.com> Date: Sun Aug 13 14:05:34 2017 -0400 Forward port fix for #710 Merge branch 'master' into hapi3_refactor commit 3b80779fd3905cbf5322e6973334eb0ecb3d8426 Merge: 1f534985e8 356d9acaf7 Author: James <jamesagnew@gmail.com> Date: Sun Aug 13 12:31:09 2017 -0400 Forward port #705, #708, and #710 Merge branch 'master' into hapi3_refactor commit 1f534985e8106347d9cc9da2dd8145fdd869547f Merge: 7c39a47852 dedd3d635b Author: James <jamesagnew@gmail.com> Date: Sun Aug 13 10:52:59 2017 -0400 Forward port #695 Merge branch 'master' into hapi3_refactor commit 7c39a47852142bee398101120678217ab0917c7e Merge: e0ffb84d21 6efafe62f1 Author: James <jamesagnew@gmail.com> Date: Sun Aug 13 09:53:17 2017 -0400 Forward port #688 Merge branch 'master' into hapi3_refactor commit e0ffb84d2129c209ccffc2611038592f37dddfd2 Merge: 52388c11c1 d19b00ff09 Author: James <jamesagnew@gmail.com> Date: Sat Aug 12 14:59:46 2017 -0400 Merge branch 'master' into hapi3_refactor commit 52388c11c17cf038591244548f2a592f6b655cee Author: James <jamesagnew@gmail.com> Date: Sat Aug 12 06:21:46 2017 -0400 Cleanup commit 209752cd638266b39574ae11c5989b624d5e85d3 Author: James <jamesagnew@gmail.com> Date: Thu Aug 10 11:18:19 2017 -0400 Fix tests commit 4543408dc8d63b5b9682a275e261d3168cdc2196 Author: James <jamesagnew@gmail.com> Date: Sat Aug 5 06:55:50 2017 -0400 Fix a potential deadlock commit ee360f537692672df473f94dae75c176b2287415 Author: James <jamesagnew@gmail.com> Date: Sat Aug 5 06:22:06 2017 -0400 Add R4 code to CLI commit 1a95ba3b6529afdaf81232b82cc303718c0187d6 Author: James Agnew <jamesagnew@gmail.com> Date: Thu Aug 3 06:14:01 2017 -0400 More cleanup commit f0d88026817296edaa65132accd67d0c8ad8088c Author: James <jamesagnew@gmail.com> Date: Wed Aug 2 11:27:43 2017 -0400 Tests are working! commit a4cbda357e8e7d024f24e3ee9a660b5366983ca1 Author: James Agnew <jamesagnew@gmail.com> Date: Wed Aug 2 10:42:04 2017 -0400 Connection handling cleanup for new tests commit 0e2cecfbd0d7a546444a66e8411600040fd9a17b Author: James Agnew <jamesagnew@gmail.com> Date: Wed Aug 2 10:16:28 2017 -0400 Clean up R4 JPA tests commit 40317a650d72c86e2529d5179cffe63399301de5 Author: James <jamesagnew@gmail.com> Date: Wed Aug 2 09:12:38 2017 -0400 Work on R4 for JPA server commit e7f8f8c30d72ed30d739979964db38d41c5baec1 Author: James <jamesagnew@gmail.com> Date: Tue Aug 1 20:43:47 2017 -0400 More work on porting tests commit 43c9003258696ab33e7bb335e882ab1c66fb61aa Author: James <jamesagnew@gmail.com> Date: Tue Aug 1 07:09:29 2017 -0400 Work on porting DSTU1 tests commit 602857f1e26a69a2284e176b5e44a860d9b828ff Author: James Agnew <jamesagnew@gmail.com> Date: Mon Jul 31 22:34:08 2017 -0400 More work on bring unit tests up to date commit e326a7b0cdb8368009119bba41886838a973e03e Author: James Agnew <jamesagnew@gmail.com> Date: Mon Jul 31 17:36:38 2017 -0400 Credit for #686 and forward port the fix to R4 validator commit 96543c3992adcb406df3c8899dab79cf4bd5b4b4 Merge: 3fb75aa61a 9901b802c4 Author: James Agnew <jamesagnew@gmail.com> Date: Mon Jul 31 17:12:33 2017 -0400 Merge branch 'master' into hapi3_refactor commit 3fb75aa61ad29d9f3876a1c30c912627486147af Author: James <jamesagnew@gmail.com> Date: Mon Jul 31 15:21:30 2017 -0400 More work on cleanup commit b02fbb6804127e77c61c4792eefd9fc0d23d63d0 Author: James Agnew <jamesagnew@gmail.com> Date: Sun Jul 30 22:11:07 2017 -0400 Work on porting STU1 tests commit 1ae37b0db3929ea4f37955adf8f026e33ccf43b2 Author: James Agnew <jamesagnew@gmail.com> Date: Sun Jul 30 20:56:10 2017 -0400 Try to get coverage report working commit 72b88849b30a94a9ff08d3a1ab50a05b2acbdfdd Author: James Agnew <jamesagnew@gmail.com> Date: Sun Jul 30 20:27:02 2017 -0400 Fix android tests commit e5f6c35aeab8bbc056870a038e1862181049a020 Author: James <jamesagnew@gmail.com> Date: Sun Jul 30 19:31:18 2017 -0400 More work on getting legacy code cleaned up commit 0b513b0845a082b5c20b0033dfab4e29f5e4a934 Author: James <jamesagnew@gmail.com> Date: Sun Jul 30 18:41:13 2017 -0400 Continue work on removing deprecated API commit defea69aa38a2e0f4137ed9c8527956872ff70bf Author: James Agnew <jamesagnew@gmail.com> Date: Sun Jul 30 17:10:01 2017 -0400 More cleanup of legacy code commit 9ae7295705cb58f5edcf7ee1259f023cbbe2fe51 Author: James <jamesagnew@gmail.com> Date: Sun Jul 30 07:11:45 2017 -0400 More cleanup of legacy code commit ebd3eeb5ee793cf5805cc726db353f3def35ab00 Author: James Agnew <jamesagnew@gmail.com> Date: Sun Jul 30 06:43:25 2017 -0400 More work on removing legacy code commit 92224c2532faf70171473d64429c3ceaf3e3406c Author: James <jamesagnew@gmail.com> Date: Sat Jul 29 18:44:06 2017 -0400 Remove DSTU1 Bundle commit c52cacf71bae3f5c02ffae03881c21de1f3aba22 Author: James <jamesagnew@gmail.com> Date: Sat Jul 29 14:27:42 2017 -0400 Now compiling commit b405e51773baf4ab3a3c387458cdc59541394cd1 Merge: c3ddf04e25 cb2cea54d7 Author: James Agnew <jamesagnew@gmail.com> Date: Fri Jul 28 06:21:02 2017 -0400 Merge branch 'master' into hapi3_refactor commit c3ddf04e2598b8d6214975ab0ae795f850396811 Author: James <jamesagnew@gmail.com> Date: Thu Jul 27 11:06:06 2017 -0400 Sync R4 releases in commit b13333c3c03ddb9a5061c3b22bf011f4592104f8 Author: James <jamesagnew@gmail.com> Date: Fri Jul 14 05:52:33 2017 -0400 JPA server is now able to handle placeholder IDs (e.g. urn:uuid:00....000) being used in Bundle.entry.request.url as a part of the conditional URL within transactions. commit 2e60ff7521b42890a32b97c2dda88ab233f5c91e Author: James Agnew <jamesagnew@gmail.com> Date: Thu Jul 13 20:02:46 2017 -0400 Fix imports commit a92ace2e0dac6e24f6dada53bf97d03861fd21a1 Merge: 3196db96d1 1a6b3ea867 Author: James Agnew <jamesagnew@gmail.com> Date: Thu Jul 13 12:02:27 2017 -0400 Merge branch 'master' into hapi3_refactor commit 3196db96d1c485310e746833df59c0e010b5b161 Author: James Agnew <jamesagnew@gmail.com> Date: Thu Jul 13 11:48:10 2017 -0400 Don't add false paging link to request commit bd4e1d338855a664045caa271d41616aed973a4d Author: James <jamesagnew@gmail.com> Date: Sun Jul 9 21:32:16 2017 -0400 Finally building correctly! commit 6464ce9304703cb3c5ecc58491282ddacc900853 Author: James <jamesagnew@gmail.com> Date: Sun Jul 9 16:38:28 2017 -0400 Work on refactor commit 0059f2e48e9d7c812c1d42a57c5b6059814f5155 Author: James <jamesagnew@gmail.com> Date: Sat Jul 8 07:16:20 2017 -0400 Keep working on refactor commit 6c2e87e8cc19863a811c11623d1c878c8b48f031 Author: James Agnew <jamesagnew@gmail.com> Date: Thu Jul 6 22:35:13 2017 -0400 Lots of work on refactor commit 11cab975047a0c28190e6533074fd3f11ddde240 Merge: 34ec6b8807 6c47bd4c51 Author: James Agnew <jamesagnew@gmail.com> Date: Thu Jul 6 21:43:57 2017 -0400 Merge branch 'master' into hapi3_refactor commit 34ec6b8807946aa6c97f0b5581dca9bd5f7b7a3e Merge: f8e647511b c520e60ac1 Author: James Agnew <jamesagnew@gmail.com> Date: Thu Jul 6 21:43:49 2017 -0400 Merge branch 'hapi3_refactor' of github.com:jamesagnew/hapi-fhir into hapi3_refactor commit f8e647511b4a82e7fde71a8850b8800e3d698b1f Author: James Agnew <jamesagnew@gmail.com> Date: Thu Jul 6 18:46:55 2017 -0400 Work on hapi3 changes commit c520e60ac1198f340cfb9090a7a33f91aa2d1e61 Author: James <jamesagnew@gmail.com> Date: Wed Jul 5 08:08:40 2017 -0400 Keep working on refactor commit f1d2ee90926f7db900a5b3b4ab9a8948d18e49f2 Author: James Agnew <jamesagnew@gmail.com> Date: Mon Jul 3 22:10:59 2017 -0400 Continue refactor for HAPI 3 commit 9281ccafc32354222932c5a9f5ee8b0f206ebc05 Merge: ea1264cd8e 294d080bd3 Author: James Agnew <jamesagnew@gmail.com> Date: Mon Jul 3 20:34:16 2017 -0400 Merge branch 'master' into hapi3_refactor commit ea1264cd8e9b8c5297d218e91cf14bd48d0a92c7 Author: James <jamesagnew@gmail.com> Date: Wed Jun 28 10:26:01 2017 -0400 Continue work on refactor commit fbe2f98a0238f3d4e065db4550dd2ef1b460c0d8 Merge: b2bef47100 0a4dcc32ec Author: James <jamesagnew@gmail.com> Date: Wed Jun 28 06:21:22 2017 -0400 Merge branch 'master' into hapi3_refactor commit b2bef47100370e1248834523d73a630950032d7a Author: James <jamesagnew@gmail.com> Date: Tue Jun 27 21:13:23 2017 -0400 Work on refactor commit 8f76e4e46385daa9ce3442e2d9342453ce373ba3 Author: James Agnew <jamesagnew@gmail.com> Date: Sun Jun 25 21:55:35 2017 -0400 Lots of work on refactoring
2017-08-13 14:39:47 -04:00
if (target != null) {
switch (target.getChildType()) {
case COMPOSITE_DATATYPE: {
BaseRuntimeElementCompositeDefinition<?> compositeTarget = (BaseRuntimeElementCompositeDefinition<?>) target;
ICompositeType newChildInstance = (ICompositeType) compositeTarget.newInstance();
myExtension.setValue(newChildInstance);
ElementCompositeState newState = new ElementCompositeState(getPreResourceState(), theLocalPart, compositeTarget, newChildInstance);
push(newState);
return;
}
case ID_DATATYPE:
case PRIMITIVE_DATATYPE: {
RuntimePrimitiveDatatypeDefinition primitiveTarget = (RuntimePrimitiveDatatypeDefinition) target;
IPrimitiveType<?> newChildInstance = primitiveTarget.newInstance();
myExtension.setValue(newChildInstance);
PrimitiveState newState = new PrimitiveState(getPreResourceState(), newChildInstance);
push(newState);
return;
}
case CONTAINED_RESOURCES:
case CONTAINED_RESOURCE_LIST:
case EXTENSION_DECLARED:
case PRIMITIVE_XHTML:
case PRIMITIVE_XHTML_HL7ORG:
case RESOURCE:
case RESOURCE_BLOCK:
case UNDECL_EXT:
break;
}
2014-02-21 21:06:11 -05:00
}
// We hit an invalid type for the extension
myErrorHandler.unknownElement(null, theLocalPart);
push(new SwallowChildrenWholeState(getPreResourceState()));
return;
2014-02-22 15:33:02 -05:00
}
Merge in HAPI 3.0.0 working branch! Squashed commit of the following: commit 12f89a423a1691fdbc360706fd94a03bd9144d17 Author: James <jamesagnew@gmail.com> Date: Sun Aug 13 14:38:51 2017 -0400 Minimize validation resources commit f6868cce5c73b34d5ecd53bf1a220fdccd6b4e09 Merge: 3b80779fd3 1e158311d8 Author: James <jamesagnew@gmail.com> Date: Sun Aug 13 14:05:34 2017 -0400 Forward port fix for #710 Merge branch 'master' into hapi3_refactor commit 3b80779fd3905cbf5322e6973334eb0ecb3d8426 Merge: 1f534985e8 356d9acaf7 Author: James <jamesagnew@gmail.com> Date: Sun Aug 13 12:31:09 2017 -0400 Forward port #705, #708, and #710 Merge branch 'master' into hapi3_refactor commit 1f534985e8106347d9cc9da2dd8145fdd869547f Merge: 7c39a47852 dedd3d635b Author: James <jamesagnew@gmail.com> Date: Sun Aug 13 10:52:59 2017 -0400 Forward port #695 Merge branch 'master' into hapi3_refactor commit 7c39a47852142bee398101120678217ab0917c7e Merge: e0ffb84d21 6efafe62f1 Author: James <jamesagnew@gmail.com> Date: Sun Aug 13 09:53:17 2017 -0400 Forward port #688 Merge branch 'master' into hapi3_refactor commit e0ffb84d2129c209ccffc2611038592f37dddfd2 Merge: 52388c11c1 d19b00ff09 Author: James <jamesagnew@gmail.com> Date: Sat Aug 12 14:59:46 2017 -0400 Merge branch 'master' into hapi3_refactor commit 52388c11c17cf038591244548f2a592f6b655cee Author: James <jamesagnew@gmail.com> Date: Sat Aug 12 06:21:46 2017 -0400 Cleanup commit 209752cd638266b39574ae11c5989b624d5e85d3 Author: James <jamesagnew@gmail.com> Date: Thu Aug 10 11:18:19 2017 -0400 Fix tests commit 4543408dc8d63b5b9682a275e261d3168cdc2196 Author: James <jamesagnew@gmail.com> Date: Sat Aug 5 06:55:50 2017 -0400 Fix a potential deadlock commit ee360f537692672df473f94dae75c176b2287415 Author: James <jamesagnew@gmail.com> Date: Sat Aug 5 06:22:06 2017 -0400 Add R4 code to CLI commit 1a95ba3b6529afdaf81232b82cc303718c0187d6 Author: James Agnew <jamesagnew@gmail.com> Date: Thu Aug 3 06:14:01 2017 -0400 More cleanup commit f0d88026817296edaa65132accd67d0c8ad8088c Author: James <jamesagnew@gmail.com> Date: Wed Aug 2 11:27:43 2017 -0400 Tests are working! commit a4cbda357e8e7d024f24e3ee9a660b5366983ca1 Author: James Agnew <jamesagnew@gmail.com> Date: Wed Aug 2 10:42:04 2017 -0400 Connection handling cleanup for new tests commit 0e2cecfbd0d7a546444a66e8411600040fd9a17b Author: James Agnew <jamesagnew@gmail.com> Date: Wed Aug 2 10:16:28 2017 -0400 Clean up R4 JPA tests commit 40317a650d72c86e2529d5179cffe63399301de5 Author: James <jamesagnew@gmail.com> Date: Wed Aug 2 09:12:38 2017 -0400 Work on R4 for JPA server commit e7f8f8c30d72ed30d739979964db38d41c5baec1 Author: James <jamesagnew@gmail.com> Date: Tue Aug 1 20:43:47 2017 -0400 More work on porting tests commit 43c9003258696ab33e7bb335e882ab1c66fb61aa Author: James <jamesagnew@gmail.com> Date: Tue Aug 1 07:09:29 2017 -0400 Work on porting DSTU1 tests commit 602857f1e26a69a2284e176b5e44a860d9b828ff Author: James Agnew <jamesagnew@gmail.com> Date: Mon Jul 31 22:34:08 2017 -0400 More work on bring unit tests up to date commit e326a7b0cdb8368009119bba41886838a973e03e Author: James Agnew <jamesagnew@gmail.com> Date: Mon Jul 31 17:36:38 2017 -0400 Credit for #686 and forward port the fix to R4 validator commit 96543c3992adcb406df3c8899dab79cf4bd5b4b4 Merge: 3fb75aa61a 9901b802c4 Author: James Agnew <jamesagnew@gmail.com> Date: Mon Jul 31 17:12:33 2017 -0400 Merge branch 'master' into hapi3_refactor commit 3fb75aa61ad29d9f3876a1c30c912627486147af Author: James <jamesagnew@gmail.com> Date: Mon Jul 31 15:21:30 2017 -0400 More work on cleanup commit b02fbb6804127e77c61c4792eefd9fc0d23d63d0 Author: James Agnew <jamesagnew@gmail.com> Date: Sun Jul 30 22:11:07 2017 -0400 Work on porting STU1 tests commit 1ae37b0db3929ea4f37955adf8f026e33ccf43b2 Author: James Agnew <jamesagnew@gmail.com> Date: Sun Jul 30 20:56:10 2017 -0400 Try to get coverage report working commit 72b88849b30a94a9ff08d3a1ab50a05b2acbdfdd Author: James Agnew <jamesagnew@gmail.com> Date: Sun Jul 30 20:27:02 2017 -0400 Fix android tests commit e5f6c35aeab8bbc056870a038e1862181049a020 Author: James <jamesagnew@gmail.com> Date: Sun Jul 30 19:31:18 2017 -0400 More work on getting legacy code cleaned up commit 0b513b0845a082b5c20b0033dfab4e29f5e4a934 Author: James <jamesagnew@gmail.com> Date: Sun Jul 30 18:41:13 2017 -0400 Continue work on removing deprecated API commit defea69aa38a2e0f4137ed9c8527956872ff70bf Author: James Agnew <jamesagnew@gmail.com> Date: Sun Jul 30 17:10:01 2017 -0400 More cleanup of legacy code commit 9ae7295705cb58f5edcf7ee1259f023cbbe2fe51 Author: James <jamesagnew@gmail.com> Date: Sun Jul 30 07:11:45 2017 -0400 More cleanup of legacy code commit ebd3eeb5ee793cf5805cc726db353f3def35ab00 Author: James Agnew <jamesagnew@gmail.com> Date: Sun Jul 30 06:43:25 2017 -0400 More work on removing legacy code commit 92224c2532faf70171473d64429c3ceaf3e3406c Author: James <jamesagnew@gmail.com> Date: Sat Jul 29 18:44:06 2017 -0400 Remove DSTU1 Bundle commit c52cacf71bae3f5c02ffae03881c21de1f3aba22 Author: James <jamesagnew@gmail.com> Date: Sat Jul 29 14:27:42 2017 -0400 Now compiling commit b405e51773baf4ab3a3c387458cdc59541394cd1 Merge: c3ddf04e25 cb2cea54d7 Author: James Agnew <jamesagnew@gmail.com> Date: Fri Jul 28 06:21:02 2017 -0400 Merge branch 'master' into hapi3_refactor commit c3ddf04e2598b8d6214975ab0ae795f850396811 Author: James <jamesagnew@gmail.com> Date: Thu Jul 27 11:06:06 2017 -0400 Sync R4 releases in commit b13333c3c03ddb9a5061c3b22bf011f4592104f8 Author: James <jamesagnew@gmail.com> Date: Fri Jul 14 05:52:33 2017 -0400 JPA server is now able to handle placeholder IDs (e.g. urn:uuid:00....000) being used in Bundle.entry.request.url as a part of the conditional URL within transactions. commit 2e60ff7521b42890a32b97c2dda88ab233f5c91e Author: James Agnew <jamesagnew@gmail.com> Date: Thu Jul 13 20:02:46 2017 -0400 Fix imports commit a92ace2e0dac6e24f6dada53bf97d03861fd21a1 Merge: 3196db96d1 1a6b3ea867 Author: James Agnew <jamesagnew@gmail.com> Date: Thu Jul 13 12:02:27 2017 -0400 Merge branch 'master' into hapi3_refactor commit 3196db96d1c485310e746833df59c0e010b5b161 Author: James Agnew <jamesagnew@gmail.com> Date: Thu Jul 13 11:48:10 2017 -0400 Don't add false paging link to request commit bd4e1d338855a664045caa271d41616aed973a4d Author: James <jamesagnew@gmail.com> Date: Sun Jul 9 21:32:16 2017 -0400 Finally building correctly! commit 6464ce9304703cb3c5ecc58491282ddacc900853 Author: James <jamesagnew@gmail.com> Date: Sun Jul 9 16:38:28 2017 -0400 Work on refactor commit 0059f2e48e9d7c812c1d42a57c5b6059814f5155 Author: James <jamesagnew@gmail.com> Date: Sat Jul 8 07:16:20 2017 -0400 Keep working on refactor commit 6c2e87e8cc19863a811c11623d1c878c8b48f031 Author: James Agnew <jamesagnew@gmail.com> Date: Thu Jul 6 22:35:13 2017 -0400 Lots of work on refactor commit 11cab975047a0c28190e6533074fd3f11ddde240 Merge: 34ec6b8807 6c47bd4c51 Author: James Agnew <jamesagnew@gmail.com> Date: Thu Jul 6 21:43:57 2017 -0400 Merge branch 'master' into hapi3_refactor commit 34ec6b8807946aa6c97f0b5581dca9bd5f7b7a3e Merge: f8e647511b c520e60ac1 Author: James Agnew <jamesagnew@gmail.com> Date: Thu Jul 6 21:43:49 2017 -0400 Merge branch 'hapi3_refactor' of github.com:jamesagnew/hapi-fhir into hapi3_refactor commit f8e647511b4a82e7fde71a8850b8800e3d698b1f Author: James Agnew <jamesagnew@gmail.com> Date: Thu Jul 6 18:46:55 2017 -0400 Work on hapi3 changes commit c520e60ac1198f340cfb9090a7a33f91aa2d1e61 Author: James <jamesagnew@gmail.com> Date: Wed Jul 5 08:08:40 2017 -0400 Keep working on refactor commit f1d2ee90926f7db900a5b3b4ab9a8948d18e49f2 Author: James Agnew <jamesagnew@gmail.com> Date: Mon Jul 3 22:10:59 2017 -0400 Continue refactor for HAPI 3 commit 9281ccafc32354222932c5a9f5ee8b0f206ebc05 Merge: ea1264cd8e 294d080bd3 Author: James Agnew <jamesagnew@gmail.com> Date: Mon Jul 3 20:34:16 2017 -0400 Merge branch 'master' into hapi3_refactor commit ea1264cd8e9b8c5297d218e91cf14bd48d0a92c7 Author: James <jamesagnew@gmail.com> Date: Wed Jun 28 10:26:01 2017 -0400 Continue work on refactor commit fbe2f98a0238f3d4e065db4550dd2ef1b460c0d8 Merge: b2bef47100 0a4dcc32ec Author: James <jamesagnew@gmail.com> Date: Wed Jun 28 06:21:22 2017 -0400 Merge branch 'master' into hapi3_refactor commit b2bef47100370e1248834523d73a630950032d7a Author: James <jamesagnew@gmail.com> Date: Tue Jun 27 21:13:23 2017 -0400 Work on refactor commit 8f76e4e46385daa9ce3442e2d9342453ce373ba3 Author: James Agnew <jamesagnew@gmail.com> Date: Sun Jun 25 21:55:35 2017 -0400 Lots of work on refactoring
2017-08-13 14:39:47 -04:00
2014-02-26 17:13:49 -05:00
@Override
2015-05-05 13:16:10 -04:00
protected IBaseExtension<?, ?> getCurrentElement() {
2014-02-26 17:13:49 -05:00
return myExtension;
}
}
public class IdentifiableElementIdState extends BaseState {
private IIdentifiableElement myElement;
public IdentifiableElementIdState(ParserState<T>.PreResourceState thePreResourceState, IIdentifiableElement theElement) {
super(thePreResourceState);
myElement = theElement;
}
@Override
public void attributeValue(String theName, String theValue) throws DataFormatException {
myElement.setElementSpecificId(theValue);
}
@Override
public void endingElement() {
pop();
}
}
2014-12-01 08:13:32 -05:00
private class MetaElementState extends BaseState {
private ResourceMetadataMap myMap;
2014-02-27 16:51:43 -05:00
2014-12-01 08:13:32 -05:00
public MetaElementState(ParserState<T>.PreResourceState thePreResourceState, ResourceMetadataMap theMap) {
super(thePreResourceState);
myMap = theMap;
}
@Override
public void endingElement() throws DataFormatException {
pop();
}
@Override
2015-06-24 12:26:40 -04:00
public void enteringNewElement(String theNamespaceUri, String theLocalPart) throws DataFormatException {
2014-12-01 08:13:32 -05:00
if (theLocalPart.equals("versionId")) {
push(new MetaVersionElementState(getPreResourceState(), myMap));
// } else if (theLocalPart.equals("profile")) {
//
2014-12-01 08:13:32 -05:00
} else if (theLocalPart.equals("lastUpdated")) {
InstantDt updated = new InstantDt();
push(new PrimitiveState(getPreResourceState(), updated));
myMap.put(ResourceMetadataKeyEnum.UPDATED, updated);
} else if (theLocalPart.equals("security")) {
@SuppressWarnings("unchecked")
2015-12-13 22:44:41 -05:00
List<IBase> securityLabels = (List<IBase>) myMap.get(ResourceMetadataKeyEnum.SECURITY_LABELS);
if (securityLabels == null) {
securityLabels = new ArrayList<>();
myMap.put(ResourceMetadataKeyEnum.SECURITY_LABELS, securityLabels);
}
2015-12-13 22:44:41 -05:00
IBase securityLabel = myContext.getVersion().newCodingDt();
BaseRuntimeElementCompositeDefinition<?> codinfDef = (BaseRuntimeElementCompositeDefinition<?>) myContext.getElementDefinition(securityLabel.getClass());
push(new SecurityLabelElementStateHapi(getPreResourceState(), codinfDef, securityLabel));
securityLabels.add(securityLabel);
} else if (theLocalPart.equals("profile")) {
@SuppressWarnings("unchecked")
List<IdDt> profiles = (List<IdDt>) myMap.get(ResourceMetadataKeyEnum.PROFILES);
List<IdDt> newProfiles;
if (profiles != null) {
newProfiles = new ArrayList<IdDt>(profiles.size() + 1);
newProfiles.addAll(profiles);
} else {
newProfiles = new ArrayList<IdDt>(1);
}
IdDt profile = new IdDt();
push(new PrimitiveState(getPreResourceState(), profile));
newProfiles.add(profile);
myMap.put(ResourceMetadataKeyEnum.PROFILES, Collections.unmodifiableList(newProfiles));
} else if (theLocalPart.equals("tag")) {
TagList tagList = (TagList) myMap.get(ResourceMetadataKeyEnum.TAG_LIST);
if (tagList == null) {
tagList = new TagList();
myMap.put(ResourceMetadataKeyEnum.TAG_LIST, tagList);
}
push(new TagState(tagList));
2014-12-01 08:13:32 -05:00
} else {
myErrorHandler.unknownElement(null, theLocalPart);
push(new SwallowChildrenWholeState(getPreResourceState()));
return;
2014-12-01 08:13:32 -05:00
}
}
@Override
public void enteringNewElementExtension(StartElement theElem, String theUrlAttr, boolean theIsModifier, final String baseServerUrl) {
ResourceMetadataKeyEnum.ExtensionResourceMetadataKey resourceMetadataKeyEnum = new ResourceMetadataKeyEnum.ExtensionResourceMetadataKey(theUrlAttr);
Object metadataValue = myMap.get(resourceMetadataKeyEnum);
ExtensionDt newExtension;
if (metadataValue == null) {
newExtension = new ExtensionDt(theIsModifier);
} else if (metadataValue instanceof ExtensionDt) {
newExtension = (ExtensionDt) metadataValue;
} else {
throw new IllegalStateException("Expected ExtensionDt as custom resource metadata type, got: " + metadataValue.getClass().getSimpleName());
}
newExtension.setUrl(theUrlAttr);
myMap.put(resourceMetadataKeyEnum, newExtension);
ExtensionState newState = new ExtensionState(getPreResourceState(), newExtension);
push(newState);
}
2014-12-01 08:13:32 -05:00
}
private class MetaVersionElementState extends BaseState {
private ResourceMetadataMap myMap;
public MetaVersionElementState(ParserState<T>.PreResourceState thePreResourceState, ResourceMetadataMap theMap) {
super(thePreResourceState);
myMap = theMap;
}
@Override
public void attributeValue(String theName, String theValue) throws DataFormatException {
myMap.put(ResourceMetadataKeyEnum.VERSION, theValue);
}
@Override
public void endingElement() throws DataFormatException {
pop();
}
@Override
2015-06-24 12:26:40 -04:00
public void enteringNewElement(String theNamespaceUri, String theLocalPart) throws DataFormatException {
myErrorHandler.unknownElement(null, theLocalPart);
push(new SwallowChildrenWholeState(getPreResourceState()));
return;
2014-12-01 08:13:32 -05:00
}
}
2015-02-16 11:33:46 -05:00
private abstract class PreResourceState extends BaseState {
2014-02-27 16:51:43 -05:00
private Map<String, IBaseResource> myContainedResources;
2015-02-16 11:33:46 -05:00
private IBaseResource myInstance;
private FhirVersionEnum myParentVersion;
private boolean myRequireResourceType = true;
private Class<? extends IBaseResource> myResourceType;
2014-02-27 16:51:43 -05:00
2015-02-16 11:33:46 -05:00
public PreResourceState(Class<? extends IBaseResource> theResourceType) {
super(null);
myResourceType = theResourceType;
myContainedResources = new HashMap<String, IBaseResource>();
if (theResourceType != null) {
myParentVersion = myContext.getResourceDefinition(theResourceType).getStructureVersion();
} else {
myParentVersion = myContext.getVersion().getVersion();
}
}
public PreResourceState(PreResourceState thePreResourcesState, FhirVersionEnum theParentVersion) {
super(thePreResourcesState);
Validate.notNull(theParentVersion);
myParentVersion = theParentVersion;
myContainedResources = thePreResourcesState.getContainedResources();
2014-02-27 16:51:43 -05:00
}
2014-02-26 17:13:49 -05:00
@Override
public void endingElement() throws DataFormatException {
stitchBundleCrossReferences();
2014-02-27 16:51:43 -05:00
pop();
2014-02-26 17:13:49 -05:00
}
2014-07-04 09:27:36 -04:00
2014-02-26 17:13:49 -05:00
@Override
2015-06-24 12:26:40 -04:00
public void enteringNewElement(String theNamespaceUri, String theLocalPart) throws DataFormatException {
2014-03-07 16:23:49 -05:00
BaseRuntimeElementDefinition<?> definition;
if (myResourceType == null) {
definition = null;
if (myParser.getPreferTypes() != null) {
for (Class<? extends IBaseResource> next : myParser.getPreferTypes()) {
RuntimeResourceDefinition nextDef = myContext.getResourceDefinition(next);
if (nextDef.getName().equals(theLocalPart)) {
definition = nextDef;
}
}
}
if (definition == null) {
definition = myContext.getResourceDefinition(myParentVersion, theLocalPart);
}
2014-08-27 08:55:00 -04:00
if ((definition == null)) {
throw new DataFormatException("Element '" + theLocalPart + "' is not a known resource type, expected a resource at this position");
2014-03-07 16:23:49 -05:00
}
} else {
definition = myContext.getResourceDefinition(myResourceType);
2015-06-24 12:26:40 -04:00
if (!StringUtils.equals(theLocalPart, definition.getName())) {
if (myRequireResourceType) {
throw new DataFormatException(myContext.getLocalizer().getMessage(ParserState.class, "wrongResourceTypeFound", definition.getName(), theLocalPart));
}
2014-06-23 09:04:48 -04:00
definition = myContext.getResourceDefinition(theLocalPart);
if (!(definition instanceof RuntimeResourceDefinition)) {
throw new DataFormatException("Element '" + theLocalPart + "' is not a resource, expected a resource at this position");
}
2014-03-07 16:23:49 -05:00
}
2014-02-26 17:13:49 -05:00
}
RuntimeResourceDefinition def = (RuntimeResourceDefinition) definition;
if (!definition.getName().equals(theLocalPart) && definition.getName().equalsIgnoreCase(theLocalPart)) {
throw new DataFormatException("Unknown resource type '" + theLocalPart + "': Resource names are case sensitive, found similar name: '" + definition.getName() + "'");
}
2015-02-16 11:33:46 -05:00
myInstance = def.newInstance();
2014-02-26 17:13:49 -05:00
Merge in HAPI 3.0.0 working branch! Squashed commit of the following: commit 12f89a423a1691fdbc360706fd94a03bd9144d17 Author: James <jamesagnew@gmail.com> Date: Sun Aug 13 14:38:51 2017 -0400 Minimize validation resources commit f6868cce5c73b34d5ecd53bf1a220fdccd6b4e09 Merge: 3b80779fd3 1e158311d8 Author: James <jamesagnew@gmail.com> Date: Sun Aug 13 14:05:34 2017 -0400 Forward port fix for #710 Merge branch 'master' into hapi3_refactor commit 3b80779fd3905cbf5322e6973334eb0ecb3d8426 Merge: 1f534985e8 356d9acaf7 Author: James <jamesagnew@gmail.com> Date: Sun Aug 13 12:31:09 2017 -0400 Forward port #705, #708, and #710 Merge branch 'master' into hapi3_refactor commit 1f534985e8106347d9cc9da2dd8145fdd869547f Merge: 7c39a47852 dedd3d635b Author: James <jamesagnew@gmail.com> Date: Sun Aug 13 10:52:59 2017 -0400 Forward port #695 Merge branch 'master' into hapi3_refactor commit 7c39a47852142bee398101120678217ab0917c7e Merge: e0ffb84d21 6efafe62f1 Author: James <jamesagnew@gmail.com> Date: Sun Aug 13 09:53:17 2017 -0400 Forward port #688 Merge branch 'master' into hapi3_refactor commit e0ffb84d2129c209ccffc2611038592f37dddfd2 Merge: 52388c11c1 d19b00ff09 Author: James <jamesagnew@gmail.com> Date: Sat Aug 12 14:59:46 2017 -0400 Merge branch 'master' into hapi3_refactor commit 52388c11c17cf038591244548f2a592f6b655cee Author: James <jamesagnew@gmail.com> Date: Sat Aug 12 06:21:46 2017 -0400 Cleanup commit 209752cd638266b39574ae11c5989b624d5e85d3 Author: James <jamesagnew@gmail.com> Date: Thu Aug 10 11:18:19 2017 -0400 Fix tests commit 4543408dc8d63b5b9682a275e261d3168cdc2196 Author: James <jamesagnew@gmail.com> Date: Sat Aug 5 06:55:50 2017 -0400 Fix a potential deadlock commit ee360f537692672df473f94dae75c176b2287415 Author: James <jamesagnew@gmail.com> Date: Sat Aug 5 06:22:06 2017 -0400 Add R4 code to CLI commit 1a95ba3b6529afdaf81232b82cc303718c0187d6 Author: James Agnew <jamesagnew@gmail.com> Date: Thu Aug 3 06:14:01 2017 -0400 More cleanup commit f0d88026817296edaa65132accd67d0c8ad8088c Author: James <jamesagnew@gmail.com> Date: Wed Aug 2 11:27:43 2017 -0400 Tests are working! commit a4cbda357e8e7d024f24e3ee9a660b5366983ca1 Author: James Agnew <jamesagnew@gmail.com> Date: Wed Aug 2 10:42:04 2017 -0400 Connection handling cleanup for new tests commit 0e2cecfbd0d7a546444a66e8411600040fd9a17b Author: James Agnew <jamesagnew@gmail.com> Date: Wed Aug 2 10:16:28 2017 -0400 Clean up R4 JPA tests commit 40317a650d72c86e2529d5179cffe63399301de5 Author: James <jamesagnew@gmail.com> Date: Wed Aug 2 09:12:38 2017 -0400 Work on R4 for JPA server commit e7f8f8c30d72ed30d739979964db38d41c5baec1 Author: James <jamesagnew@gmail.com> Date: Tue Aug 1 20:43:47 2017 -0400 More work on porting tests commit 43c9003258696ab33e7bb335e882ab1c66fb61aa Author: James <jamesagnew@gmail.com> Date: Tue Aug 1 07:09:29 2017 -0400 Work on porting DSTU1 tests commit 602857f1e26a69a2284e176b5e44a860d9b828ff Author: James Agnew <jamesagnew@gmail.com> Date: Mon Jul 31 22:34:08 2017 -0400 More work on bring unit tests up to date commit e326a7b0cdb8368009119bba41886838a973e03e Author: James Agnew <jamesagnew@gmail.com> Date: Mon Jul 31 17:36:38 2017 -0400 Credit for #686 and forward port the fix to R4 validator commit 96543c3992adcb406df3c8899dab79cf4bd5b4b4 Merge: 3fb75aa61a 9901b802c4 Author: James Agnew <jamesagnew@gmail.com> Date: Mon Jul 31 17:12:33 2017 -0400 Merge branch 'master' into hapi3_refactor commit 3fb75aa61ad29d9f3876a1c30c912627486147af Author: James <jamesagnew@gmail.com> Date: Mon Jul 31 15:21:30 2017 -0400 More work on cleanup commit b02fbb6804127e77c61c4792eefd9fc0d23d63d0 Author: James Agnew <jamesagnew@gmail.com> Date: Sun Jul 30 22:11:07 2017 -0400 Work on porting STU1 tests commit 1ae37b0db3929ea4f37955adf8f026e33ccf43b2 Author: James Agnew <jamesagnew@gmail.com> Date: Sun Jul 30 20:56:10 2017 -0400 Try to get coverage report working commit 72b88849b30a94a9ff08d3a1ab50a05b2acbdfdd Author: James Agnew <jamesagnew@gmail.com> Date: Sun Jul 30 20:27:02 2017 -0400 Fix android tests commit e5f6c35aeab8bbc056870a038e1862181049a020 Author: James <jamesagnew@gmail.com> Date: Sun Jul 30 19:31:18 2017 -0400 More work on getting legacy code cleaned up commit 0b513b0845a082b5c20b0033dfab4e29f5e4a934 Author: James <jamesagnew@gmail.com> Date: Sun Jul 30 18:41:13 2017 -0400 Continue work on removing deprecated API commit defea69aa38a2e0f4137ed9c8527956872ff70bf Author: James Agnew <jamesagnew@gmail.com> Date: Sun Jul 30 17:10:01 2017 -0400 More cleanup of legacy code commit 9ae7295705cb58f5edcf7ee1259f023cbbe2fe51 Author: James <jamesagnew@gmail.com> Date: Sun Jul 30 07:11:45 2017 -0400 More cleanup of legacy code commit ebd3eeb5ee793cf5805cc726db353f3def35ab00 Author: James Agnew <jamesagnew@gmail.com> Date: Sun Jul 30 06:43:25 2017 -0400 More work on removing legacy code commit 92224c2532faf70171473d64429c3ceaf3e3406c Author: James <jamesagnew@gmail.com> Date: Sat Jul 29 18:44:06 2017 -0400 Remove DSTU1 Bundle commit c52cacf71bae3f5c02ffae03881c21de1f3aba22 Author: James <jamesagnew@gmail.com> Date: Sat Jul 29 14:27:42 2017 -0400 Now compiling commit b405e51773baf4ab3a3c387458cdc59541394cd1 Merge: c3ddf04e25 cb2cea54d7 Author: James Agnew <jamesagnew@gmail.com> Date: Fri Jul 28 06:21:02 2017 -0400 Merge branch 'master' into hapi3_refactor commit c3ddf04e2598b8d6214975ab0ae795f850396811 Author: James <jamesagnew@gmail.com> Date: Thu Jul 27 11:06:06 2017 -0400 Sync R4 releases in commit b13333c3c03ddb9a5061c3b22bf011f4592104f8 Author: James <jamesagnew@gmail.com> Date: Fri Jul 14 05:52:33 2017 -0400 JPA server is now able to handle placeholder IDs (e.g. urn:uuid:00....000) being used in Bundle.entry.request.url as a part of the conditional URL within transactions. commit 2e60ff7521b42890a32b97c2dda88ab233f5c91e Author: James Agnew <jamesagnew@gmail.com> Date: Thu Jul 13 20:02:46 2017 -0400 Fix imports commit a92ace2e0dac6e24f6dada53bf97d03861fd21a1 Merge: 3196db96d1 1a6b3ea867 Author: James Agnew <jamesagnew@gmail.com> Date: Thu Jul 13 12:02:27 2017 -0400 Merge branch 'master' into hapi3_refactor commit 3196db96d1c485310e746833df59c0e010b5b161 Author: James Agnew <jamesagnew@gmail.com> Date: Thu Jul 13 11:48:10 2017 -0400 Don't add false paging link to request commit bd4e1d338855a664045caa271d41616aed973a4d Author: James <jamesagnew@gmail.com> Date: Sun Jul 9 21:32:16 2017 -0400 Finally building correctly! commit 6464ce9304703cb3c5ecc58491282ddacc900853 Author: James <jamesagnew@gmail.com> Date: Sun Jul 9 16:38:28 2017 -0400 Work on refactor commit 0059f2e48e9d7c812c1d42a57c5b6059814f5155 Author: James <jamesagnew@gmail.com> Date: Sat Jul 8 07:16:20 2017 -0400 Keep working on refactor commit 6c2e87e8cc19863a811c11623d1c878c8b48f031 Author: James Agnew <jamesagnew@gmail.com> Date: Thu Jul 6 22:35:13 2017 -0400 Lots of work on refactor commit 11cab975047a0c28190e6533074fd3f11ddde240 Merge: 34ec6b8807 6c47bd4c51 Author: James Agnew <jamesagnew@gmail.com> Date: Thu Jul 6 21:43:57 2017 -0400 Merge branch 'master' into hapi3_refactor commit 34ec6b8807946aa6c97f0b5581dca9bd5f7b7a3e Merge: f8e647511b c520e60ac1 Author: James Agnew <jamesagnew@gmail.com> Date: Thu Jul 6 21:43:49 2017 -0400 Merge branch 'hapi3_refactor' of github.com:jamesagnew/hapi-fhir into hapi3_refactor commit f8e647511b4a82e7fde71a8850b8800e3d698b1f Author: James Agnew <jamesagnew@gmail.com> Date: Thu Jul 6 18:46:55 2017 -0400 Work on hapi3 changes commit c520e60ac1198f340cfb9090a7a33f91aa2d1e61 Author: James <jamesagnew@gmail.com> Date: Wed Jul 5 08:08:40 2017 -0400 Keep working on refactor commit f1d2ee90926f7db900a5b3b4ab9a8948d18e49f2 Author: James Agnew <jamesagnew@gmail.com> Date: Mon Jul 3 22:10:59 2017 -0400 Continue refactor for HAPI 3 commit 9281ccafc32354222932c5a9f5ee8b0f206ebc05 Merge: ea1264cd8e 294d080bd3 Author: James Agnew <jamesagnew@gmail.com> Date: Mon Jul 3 20:34:16 2017 -0400 Merge branch 'master' into hapi3_refactor commit ea1264cd8e9b8c5297d218e91cf14bd48d0a92c7 Author: James <jamesagnew@gmail.com> Date: Wed Jun 28 10:26:01 2017 -0400 Continue work on refactor commit fbe2f98a0238f3d4e065db4550dd2ef1b460c0d8 Merge: b2bef47100 0a4dcc32ec Author: James <jamesagnew@gmail.com> Date: Wed Jun 28 06:21:22 2017 -0400 Merge branch 'master' into hapi3_refactor commit b2bef47100370e1248834523d73a630950032d7a Author: James <jamesagnew@gmail.com> Date: Tue Jun 27 21:13:23 2017 -0400 Work on refactor commit 8f76e4e46385daa9ce3442e2d9342453ce373ba3 Author: James Agnew <jamesagnew@gmail.com> Date: Sun Jun 25 21:55:35 2017 -0400 Lots of work on refactoring
2017-08-13 14:39:47 -04:00
if (myInstance instanceof IResource) {
2015-02-16 11:33:46 -05:00
push(new ResourceStateHapi(getRootPreResourceState(), def, (IResource) myInstance));
2014-05-28 07:30:40 -04:00
} else {
2015-02-16 11:33:46 -05:00
push(new ResourceStateHl7Org(getRootPreResourceState(), def, myInstance));
2014-05-28 07:30:40 -04:00
}
}
Merge in HAPI 3.0.0 working branch! Squashed commit of the following: commit 12f89a423a1691fdbc360706fd94a03bd9144d17 Author: James <jamesagnew@gmail.com> Date: Sun Aug 13 14:38:51 2017 -0400 Minimize validation resources commit f6868cce5c73b34d5ecd53bf1a220fdccd6b4e09 Merge: 3b80779fd3 1e158311d8 Author: James <jamesagnew@gmail.com> Date: Sun Aug 13 14:05:34 2017 -0400 Forward port fix for #710 Merge branch 'master' into hapi3_refactor commit 3b80779fd3905cbf5322e6973334eb0ecb3d8426 Merge: 1f534985e8 356d9acaf7 Author: James <jamesagnew@gmail.com> Date: Sun Aug 13 12:31:09 2017 -0400 Forward port #705, #708, and #710 Merge branch 'master' into hapi3_refactor commit 1f534985e8106347d9cc9da2dd8145fdd869547f Merge: 7c39a47852 dedd3d635b Author: James <jamesagnew@gmail.com> Date: Sun Aug 13 10:52:59 2017 -0400 Forward port #695 Merge branch 'master' into hapi3_refactor commit 7c39a47852142bee398101120678217ab0917c7e Merge: e0ffb84d21 6efafe62f1 Author: James <jamesagnew@gmail.com> Date: Sun Aug 13 09:53:17 2017 -0400 Forward port #688 Merge branch 'master' into hapi3_refactor commit e0ffb84d2129c209ccffc2611038592f37dddfd2 Merge: 52388c11c1 d19b00ff09 Author: James <jamesagnew@gmail.com> Date: Sat Aug 12 14:59:46 2017 -0400 Merge branch 'master' into hapi3_refactor commit 52388c11c17cf038591244548f2a592f6b655cee Author: James <jamesagnew@gmail.com> Date: Sat Aug 12 06:21:46 2017 -0400 Cleanup commit 209752cd638266b39574ae11c5989b624d5e85d3 Author: James <jamesagnew@gmail.com> Date: Thu Aug 10 11:18:19 2017 -0400 Fix tests commit 4543408dc8d63b5b9682a275e261d3168cdc2196 Author: James <jamesagnew@gmail.com> Date: Sat Aug 5 06:55:50 2017 -0400 Fix a potential deadlock commit ee360f537692672df473f94dae75c176b2287415 Author: James <jamesagnew@gmail.com> Date: Sat Aug 5 06:22:06 2017 -0400 Add R4 code to CLI commit 1a95ba3b6529afdaf81232b82cc303718c0187d6 Author: James Agnew <jamesagnew@gmail.com> Date: Thu Aug 3 06:14:01 2017 -0400 More cleanup commit f0d88026817296edaa65132accd67d0c8ad8088c Author: James <jamesagnew@gmail.com> Date: Wed Aug 2 11:27:43 2017 -0400 Tests are working! commit a4cbda357e8e7d024f24e3ee9a660b5366983ca1 Author: James Agnew <jamesagnew@gmail.com> Date: Wed Aug 2 10:42:04 2017 -0400 Connection handling cleanup for new tests commit 0e2cecfbd0d7a546444a66e8411600040fd9a17b Author: James Agnew <jamesagnew@gmail.com> Date: Wed Aug 2 10:16:28 2017 -0400 Clean up R4 JPA tests commit 40317a650d72c86e2529d5179cffe63399301de5 Author: James <jamesagnew@gmail.com> Date: Wed Aug 2 09:12:38 2017 -0400 Work on R4 for JPA server commit e7f8f8c30d72ed30d739979964db38d41c5baec1 Author: James <jamesagnew@gmail.com> Date: Tue Aug 1 20:43:47 2017 -0400 More work on porting tests commit 43c9003258696ab33e7bb335e882ab1c66fb61aa Author: James <jamesagnew@gmail.com> Date: Tue Aug 1 07:09:29 2017 -0400 Work on porting DSTU1 tests commit 602857f1e26a69a2284e176b5e44a860d9b828ff Author: James Agnew <jamesagnew@gmail.com> Date: Mon Jul 31 22:34:08 2017 -0400 More work on bring unit tests up to date commit e326a7b0cdb8368009119bba41886838a973e03e Author: James Agnew <jamesagnew@gmail.com> Date: Mon Jul 31 17:36:38 2017 -0400 Credit for #686 and forward port the fix to R4 validator commit 96543c3992adcb406df3c8899dab79cf4bd5b4b4 Merge: 3fb75aa61a 9901b802c4 Author: James Agnew <jamesagnew@gmail.com> Date: Mon Jul 31 17:12:33 2017 -0400 Merge branch 'master' into hapi3_refactor commit 3fb75aa61ad29d9f3876a1c30c912627486147af Author: James <jamesagnew@gmail.com> Date: Mon Jul 31 15:21:30 2017 -0400 More work on cleanup commit b02fbb6804127e77c61c4792eefd9fc0d23d63d0 Author: James Agnew <jamesagnew@gmail.com> Date: Sun Jul 30 22:11:07 2017 -0400 Work on porting STU1 tests commit 1ae37b0db3929ea4f37955adf8f026e33ccf43b2 Author: James Agnew <jamesagnew@gmail.com> Date: Sun Jul 30 20:56:10 2017 -0400 Try to get coverage report working commit 72b88849b30a94a9ff08d3a1ab50a05b2acbdfdd Author: James Agnew <jamesagnew@gmail.com> Date: Sun Jul 30 20:27:02 2017 -0400 Fix android tests commit e5f6c35aeab8bbc056870a038e1862181049a020 Author: James <jamesagnew@gmail.com> Date: Sun Jul 30 19:31:18 2017 -0400 More work on getting legacy code cleaned up commit 0b513b0845a082b5c20b0033dfab4e29f5e4a934 Author: James <jamesagnew@gmail.com> Date: Sun Jul 30 18:41:13 2017 -0400 Continue work on removing deprecated API commit defea69aa38a2e0f4137ed9c8527956872ff70bf Author: James Agnew <jamesagnew@gmail.com> Date: Sun Jul 30 17:10:01 2017 -0400 More cleanup of legacy code commit 9ae7295705cb58f5edcf7ee1259f023cbbe2fe51 Author: James <jamesagnew@gmail.com> Date: Sun Jul 30 07:11:45 2017 -0400 More cleanup of legacy code commit ebd3eeb5ee793cf5805cc726db353f3def35ab00 Author: James Agnew <jamesagnew@gmail.com> Date: Sun Jul 30 06:43:25 2017 -0400 More work on removing legacy code commit 92224c2532faf70171473d64429c3ceaf3e3406c Author: James <jamesagnew@gmail.com> Date: Sat Jul 29 18:44:06 2017 -0400 Remove DSTU1 Bundle commit c52cacf71bae3f5c02ffae03881c21de1f3aba22 Author: James <jamesagnew@gmail.com> Date: Sat Jul 29 14:27:42 2017 -0400 Now compiling commit b405e51773baf4ab3a3c387458cdc59541394cd1 Merge: c3ddf04e25 cb2cea54d7 Author: James Agnew <jamesagnew@gmail.com> Date: Fri Jul 28 06:21:02 2017 -0400 Merge branch 'master' into hapi3_refactor commit c3ddf04e2598b8d6214975ab0ae795f850396811 Author: James <jamesagnew@gmail.com> Date: Thu Jul 27 11:06:06 2017 -0400 Sync R4 releases in commit b13333c3c03ddb9a5061c3b22bf011f4592104f8 Author: James <jamesagnew@gmail.com> Date: Fri Jul 14 05:52:33 2017 -0400 JPA server is now able to handle placeholder IDs (e.g. urn:uuid:00....000) being used in Bundle.entry.request.url as a part of the conditional URL within transactions. commit 2e60ff7521b42890a32b97c2dda88ab233f5c91e Author: James Agnew <jamesagnew@gmail.com> Date: Thu Jul 13 20:02:46 2017 -0400 Fix imports commit a92ace2e0dac6e24f6dada53bf97d03861fd21a1 Merge: 3196db96d1 1a6b3ea867 Author: James Agnew <jamesagnew@gmail.com> Date: Thu Jul 13 12:02:27 2017 -0400 Merge branch 'master' into hapi3_refactor commit 3196db96d1c485310e746833df59c0e010b5b161 Author: James Agnew <jamesagnew@gmail.com> Date: Thu Jul 13 11:48:10 2017 -0400 Don't add false paging link to request commit bd4e1d338855a664045caa271d41616aed973a4d Author: James <jamesagnew@gmail.com> Date: Sun Jul 9 21:32:16 2017 -0400 Finally building correctly! commit 6464ce9304703cb3c5ecc58491282ddacc900853 Author: James <jamesagnew@gmail.com> Date: Sun Jul 9 16:38:28 2017 -0400 Work on refactor commit 0059f2e48e9d7c812c1d42a57c5b6059814f5155 Author: James <jamesagnew@gmail.com> Date: Sat Jul 8 07:16:20 2017 -0400 Keep working on refactor commit 6c2e87e8cc19863a811c11623d1c878c8b48f031 Author: James Agnew <jamesagnew@gmail.com> Date: Thu Jul 6 22:35:13 2017 -0400 Lots of work on refactor commit 11cab975047a0c28190e6533074fd3f11ddde240 Merge: 34ec6b8807 6c47bd4c51 Author: James Agnew <jamesagnew@gmail.com> Date: Thu Jul 6 21:43:57 2017 -0400 Merge branch 'master' into hapi3_refactor commit 34ec6b8807946aa6c97f0b5581dca9bd5f7b7a3e Merge: f8e647511b c520e60ac1 Author: James Agnew <jamesagnew@gmail.com> Date: Thu Jul 6 21:43:49 2017 -0400 Merge branch 'hapi3_refactor' of github.com:jamesagnew/hapi-fhir into hapi3_refactor commit f8e647511b4a82e7fde71a8850b8800e3d698b1f Author: James Agnew <jamesagnew@gmail.com> Date: Thu Jul 6 18:46:55 2017 -0400 Work on hapi3 changes commit c520e60ac1198f340cfb9090a7a33f91aa2d1e61 Author: James <jamesagnew@gmail.com> Date: Wed Jul 5 08:08:40 2017 -0400 Keep working on refactor commit f1d2ee90926f7db900a5b3b4ab9a8948d18e49f2 Author: James Agnew <jamesagnew@gmail.com> Date: Mon Jul 3 22:10:59 2017 -0400 Continue refactor for HAPI 3 commit 9281ccafc32354222932c5a9f5ee8b0f206ebc05 Merge: ea1264cd8e 294d080bd3 Author: James Agnew <jamesagnew@gmail.com> Date: Mon Jul 3 20:34:16 2017 -0400 Merge branch 'master' into hapi3_refactor commit ea1264cd8e9b8c5297d218e91cf14bd48d0a92c7 Author: James <jamesagnew@gmail.com> Date: Wed Jun 28 10:26:01 2017 -0400 Continue work on refactor commit fbe2f98a0238f3d4e065db4550dd2ef1b460c0d8 Merge: b2bef47100 0a4dcc32ec Author: James <jamesagnew@gmail.com> Date: Wed Jun 28 06:21:22 2017 -0400 Merge branch 'master' into hapi3_refactor commit b2bef47100370e1248834523d73a630950032d7a Author: James <jamesagnew@gmail.com> Date: Tue Jun 27 21:13:23 2017 -0400 Work on refactor commit 8f76e4e46385daa9ce3442e2d9342453ce373ba3 Author: James Agnew <jamesagnew@gmail.com> Date: Sun Jun 25 21:55:35 2017 -0400 Lots of work on refactoring
2017-08-13 14:39:47 -04:00
2014-12-10 17:40:47 -05:00
public Map<String, IBaseResource> getContainedResources() {
return myContainedResources;
}
@Override
2014-12-10 17:40:47 -05:00
protected IBaseResource getCurrentElement() {
return myInstance;
}
private PreResourceState getRootPreResourceState() {
if (getPreResourceState() != null) {
return getPreResourceState();
}
return this;
}
@Override
public boolean isPreResource() {
return true;
}
protected abstract void populateTarget();
private void postProcess() {
if (myContext.hasDefaultTypeForProfile()) {
IBaseMetaType meta = myInstance.getMeta();
Class<? extends IBaseResource> wantedProfileType = null;
String usedProfile = null;
for (IPrimitiveType<String> next : meta.getProfile()) {
if (isNotBlank(next.getValue())) {
wantedProfileType = myContext.getDefaultTypeForProfile(next.getValue());
if (wantedProfileType != null) {
usedProfile = next.getValue();
break;
}
}
}
if (wantedProfileType != null && !wantedProfileType.equals(myInstance.getClass())) {
if (myResourceType == null || myResourceType.isAssignableFrom(wantedProfileType)) {
ourLog.debug("Converting resource of type {} to type defined for profile \"{}\": {}", new Object[]{myInstance.getClass().getName(), usedProfile, wantedProfileType});
/*
* This isn't the most efficient thing really.. If we want a specific
* type we just re-parse into that type. The problem is that we don't know
* until we've parsed the resource which type we want to use because the
* profile declarations are in the text of the resource itself.
*
* At some point it would be good to write code which can present a view
* of one type backed by another type and use that.
*/
IParser parser = myContext.newJsonParser();
String asString = parser.encodeResourceToString(myInstance);
myInstance = parser.parseResource(wantedProfileType, asString);
}
}
}
Merge in HAPI 3.0.0 working branch! Squashed commit of the following: commit 12f89a423a1691fdbc360706fd94a03bd9144d17 Author: James <jamesagnew@gmail.com> Date: Sun Aug 13 14:38:51 2017 -0400 Minimize validation resources commit f6868cce5c73b34d5ecd53bf1a220fdccd6b4e09 Merge: 3b80779fd3 1e158311d8 Author: James <jamesagnew@gmail.com> Date: Sun Aug 13 14:05:34 2017 -0400 Forward port fix for #710 Merge branch 'master' into hapi3_refactor commit 3b80779fd3905cbf5322e6973334eb0ecb3d8426 Merge: 1f534985e8 356d9acaf7 Author: James <jamesagnew@gmail.com> Date: Sun Aug 13 12:31:09 2017 -0400 Forward port #705, #708, and #710 Merge branch 'master' into hapi3_refactor commit 1f534985e8106347d9cc9da2dd8145fdd869547f Merge: 7c39a47852 dedd3d635b Author: James <jamesagnew@gmail.com> Date: Sun Aug 13 10:52:59 2017 -0400 Forward port #695 Merge branch 'master' into hapi3_refactor commit 7c39a47852142bee398101120678217ab0917c7e Merge: e0ffb84d21 6efafe62f1 Author: James <jamesagnew@gmail.com> Date: Sun Aug 13 09:53:17 2017 -0400 Forward port #688 Merge branch 'master' into hapi3_refactor commit e0ffb84d2129c209ccffc2611038592f37dddfd2 Merge: 52388c11c1 d19b00ff09 Author: James <jamesagnew@gmail.com> Date: Sat Aug 12 14:59:46 2017 -0400 Merge branch 'master' into hapi3_refactor commit 52388c11c17cf038591244548f2a592f6b655cee Author: James <jamesagnew@gmail.com> Date: Sat Aug 12 06:21:46 2017 -0400 Cleanup commit 209752cd638266b39574ae11c5989b624d5e85d3 Author: James <jamesagnew@gmail.com> Date: Thu Aug 10 11:18:19 2017 -0400 Fix tests commit 4543408dc8d63b5b9682a275e261d3168cdc2196 Author: James <jamesagnew@gmail.com> Date: Sat Aug 5 06:55:50 2017 -0400 Fix a potential deadlock commit ee360f537692672df473f94dae75c176b2287415 Author: James <jamesagnew@gmail.com> Date: Sat Aug 5 06:22:06 2017 -0400 Add R4 code to CLI commit 1a95ba3b6529afdaf81232b82cc303718c0187d6 Author: James Agnew <jamesagnew@gmail.com> Date: Thu Aug 3 06:14:01 2017 -0400 More cleanup commit f0d88026817296edaa65132accd67d0c8ad8088c Author: James <jamesagnew@gmail.com> Date: Wed Aug 2 11:27:43 2017 -0400 Tests are working! commit a4cbda357e8e7d024f24e3ee9a660b5366983ca1 Author: James Agnew <jamesagnew@gmail.com> Date: Wed Aug 2 10:42:04 2017 -0400 Connection handling cleanup for new tests commit 0e2cecfbd0d7a546444a66e8411600040fd9a17b Author: James Agnew <jamesagnew@gmail.com> Date: Wed Aug 2 10:16:28 2017 -0400 Clean up R4 JPA tests commit 40317a650d72c86e2529d5179cffe63399301de5 Author: James <jamesagnew@gmail.com> Date: Wed Aug 2 09:12:38 2017 -0400 Work on R4 for JPA server commit e7f8f8c30d72ed30d739979964db38d41c5baec1 Author: James <jamesagnew@gmail.com> Date: Tue Aug 1 20:43:47 2017 -0400 More work on porting tests commit 43c9003258696ab33e7bb335e882ab1c66fb61aa Author: James <jamesagnew@gmail.com> Date: Tue Aug 1 07:09:29 2017 -0400 Work on porting DSTU1 tests commit 602857f1e26a69a2284e176b5e44a860d9b828ff Author: James Agnew <jamesagnew@gmail.com> Date: Mon Jul 31 22:34:08 2017 -0400 More work on bring unit tests up to date commit e326a7b0cdb8368009119bba41886838a973e03e Author: James Agnew <jamesagnew@gmail.com> Date: Mon Jul 31 17:36:38 2017 -0400 Credit for #686 and forward port the fix to R4 validator commit 96543c3992adcb406df3c8899dab79cf4bd5b4b4 Merge: 3fb75aa61a 9901b802c4 Author: James Agnew <jamesagnew@gmail.com> Date: Mon Jul 31 17:12:33 2017 -0400 Merge branch 'master' into hapi3_refactor commit 3fb75aa61ad29d9f3876a1c30c912627486147af Author: James <jamesagnew@gmail.com> Date: Mon Jul 31 15:21:30 2017 -0400 More work on cleanup commit b02fbb6804127e77c61c4792eefd9fc0d23d63d0 Author: James Agnew <jamesagnew@gmail.com> Date: Sun Jul 30 22:11:07 2017 -0400 Work on porting STU1 tests commit 1ae37b0db3929ea4f37955adf8f026e33ccf43b2 Author: James Agnew <jamesagnew@gmail.com> Date: Sun Jul 30 20:56:10 2017 -0400 Try to get coverage report working commit 72b88849b30a94a9ff08d3a1ab50a05b2acbdfdd Author: James Agnew <jamesagnew@gmail.com> Date: Sun Jul 30 20:27:02 2017 -0400 Fix android tests commit e5f6c35aeab8bbc056870a038e1862181049a020 Author: James <jamesagnew@gmail.com> Date: Sun Jul 30 19:31:18 2017 -0400 More work on getting legacy code cleaned up commit 0b513b0845a082b5c20b0033dfab4e29f5e4a934 Author: James <jamesagnew@gmail.com> Date: Sun Jul 30 18:41:13 2017 -0400 Continue work on removing deprecated API commit defea69aa38a2e0f4137ed9c8527956872ff70bf Author: James Agnew <jamesagnew@gmail.com> Date: Sun Jul 30 17:10:01 2017 -0400 More cleanup of legacy code commit 9ae7295705cb58f5edcf7ee1259f023cbbe2fe51 Author: James <jamesagnew@gmail.com> Date: Sun Jul 30 07:11:45 2017 -0400 More cleanup of legacy code commit ebd3eeb5ee793cf5805cc726db353f3def35ab00 Author: James Agnew <jamesagnew@gmail.com> Date: Sun Jul 30 06:43:25 2017 -0400 More work on removing legacy code commit 92224c2532faf70171473d64429c3ceaf3e3406c Author: James <jamesagnew@gmail.com> Date: Sat Jul 29 18:44:06 2017 -0400 Remove DSTU1 Bundle commit c52cacf71bae3f5c02ffae03881c21de1f3aba22 Author: James <jamesagnew@gmail.com> Date: Sat Jul 29 14:27:42 2017 -0400 Now compiling commit b405e51773baf4ab3a3c387458cdc59541394cd1 Merge: c3ddf04e25 cb2cea54d7 Author: James Agnew <jamesagnew@gmail.com> Date: Fri Jul 28 06:21:02 2017 -0400 Merge branch 'master' into hapi3_refactor commit c3ddf04e2598b8d6214975ab0ae795f850396811 Author: James <jamesagnew@gmail.com> Date: Thu Jul 27 11:06:06 2017 -0400 Sync R4 releases in commit b13333c3c03ddb9a5061c3b22bf011f4592104f8 Author: James <jamesagnew@gmail.com> Date: Fri Jul 14 05:52:33 2017 -0400 JPA server is now able to handle placeholder IDs (e.g. urn:uuid:00....000) being used in Bundle.entry.request.url as a part of the conditional URL within transactions. commit 2e60ff7521b42890a32b97c2dda88ab233f5c91e Author: James Agnew <jamesagnew@gmail.com> Date: Thu Jul 13 20:02:46 2017 -0400 Fix imports commit a92ace2e0dac6e24f6dada53bf97d03861fd21a1 Merge: 3196db96d1 1a6b3ea867 Author: James Agnew <jamesagnew@gmail.com> Date: Thu Jul 13 12:02:27 2017 -0400 Merge branch 'master' into hapi3_refactor commit 3196db96d1c485310e746833df59c0e010b5b161 Author: James Agnew <jamesagnew@gmail.com> Date: Thu Jul 13 11:48:10 2017 -0400 Don't add false paging link to request commit bd4e1d338855a664045caa271d41616aed973a4d Author: James <jamesagnew@gmail.com> Date: Sun Jul 9 21:32:16 2017 -0400 Finally building correctly! commit 6464ce9304703cb3c5ecc58491282ddacc900853 Author: James <jamesagnew@gmail.com> Date: Sun Jul 9 16:38:28 2017 -0400 Work on refactor commit 0059f2e48e9d7c812c1d42a57c5b6059814f5155 Author: James <jamesagnew@gmail.com> Date: Sat Jul 8 07:16:20 2017 -0400 Keep working on refactor commit 6c2e87e8cc19863a811c11623d1c878c8b48f031 Author: James Agnew <jamesagnew@gmail.com> Date: Thu Jul 6 22:35:13 2017 -0400 Lots of work on refactor commit 11cab975047a0c28190e6533074fd3f11ddde240 Merge: 34ec6b8807 6c47bd4c51 Author: James Agnew <jamesagnew@gmail.com> Date: Thu Jul 6 21:43:57 2017 -0400 Merge branch 'master' into hapi3_refactor commit 34ec6b8807946aa6c97f0b5581dca9bd5f7b7a3e Merge: f8e647511b c520e60ac1 Author: James Agnew <jamesagnew@gmail.com> Date: Thu Jul 6 21:43:49 2017 -0400 Merge branch 'hapi3_refactor' of github.com:jamesagnew/hapi-fhir into hapi3_refactor commit f8e647511b4a82e7fde71a8850b8800e3d698b1f Author: James Agnew <jamesagnew@gmail.com> Date: Thu Jul 6 18:46:55 2017 -0400 Work on hapi3 changes commit c520e60ac1198f340cfb9090a7a33f91aa2d1e61 Author: James <jamesagnew@gmail.com> Date: Wed Jul 5 08:08:40 2017 -0400 Keep working on refactor commit f1d2ee90926f7db900a5b3b4ab9a8948d18e49f2 Author: James Agnew <jamesagnew@gmail.com> Date: Mon Jul 3 22:10:59 2017 -0400 Continue refactor for HAPI 3 commit 9281ccafc32354222932c5a9f5ee8b0f206ebc05 Merge: ea1264cd8e 294d080bd3 Author: James Agnew <jamesagnew@gmail.com> Date: Mon Jul 3 20:34:16 2017 -0400 Merge branch 'master' into hapi3_refactor commit ea1264cd8e9b8c5297d218e91cf14bd48d0a92c7 Author: James <jamesagnew@gmail.com> Date: Wed Jun 28 10:26:01 2017 -0400 Continue work on refactor commit fbe2f98a0238f3d4e065db4550dd2ef1b460c0d8 Merge: b2bef47100 0a4dcc32ec Author: James <jamesagnew@gmail.com> Date: Wed Jun 28 06:21:22 2017 -0400 Merge branch 'master' into hapi3_refactor commit b2bef47100370e1248834523d73a630950032d7a Author: James <jamesagnew@gmail.com> Date: Tue Jun 27 21:13:23 2017 -0400 Work on refactor commit 8f76e4e46385daa9ce3442e2d9342453ce373ba3 Author: James Agnew <jamesagnew@gmail.com> Date: Sun Jun 25 21:55:35 2017 -0400 Lots of work on refactoring
2017-08-13 14:39:47 -04:00
populateTarget();
2016-12-19 14:03:11 -05:00
}
private void stitchBundleCrossReferences() {
final boolean bundle = "Bundle".equals(myContext.getResourceDefinition(myInstance).getName());
if (bundle) {
FhirTerser t = myContext.newTerser();
Merge in HAPI 3.0.0 working branch! Squashed commit of the following: commit 12f89a423a1691fdbc360706fd94a03bd9144d17 Author: James <jamesagnew@gmail.com> Date: Sun Aug 13 14:38:51 2017 -0400 Minimize validation resources commit f6868cce5c73b34d5ecd53bf1a220fdccd6b4e09 Merge: 3b80779fd3 1e158311d8 Author: James <jamesagnew@gmail.com> Date: Sun Aug 13 14:05:34 2017 -0400 Forward port fix for #710 Merge branch 'master' into hapi3_refactor commit 3b80779fd3905cbf5322e6973334eb0ecb3d8426 Merge: 1f534985e8 356d9acaf7 Author: James <jamesagnew@gmail.com> Date: Sun Aug 13 12:31:09 2017 -0400 Forward port #705, #708, and #710 Merge branch 'master' into hapi3_refactor commit 1f534985e8106347d9cc9da2dd8145fdd869547f Merge: 7c39a47852 dedd3d635b Author: James <jamesagnew@gmail.com> Date: Sun Aug 13 10:52:59 2017 -0400 Forward port #695 Merge branch 'master' into hapi3_refactor commit 7c39a47852142bee398101120678217ab0917c7e Merge: e0ffb84d21 6efafe62f1 Author: James <jamesagnew@gmail.com> Date: Sun Aug 13 09:53:17 2017 -0400 Forward port #688 Merge branch 'master' into hapi3_refactor commit e0ffb84d2129c209ccffc2611038592f37dddfd2 Merge: 52388c11c1 d19b00ff09 Author: James <jamesagnew@gmail.com> Date: Sat Aug 12 14:59:46 2017 -0400 Merge branch 'master' into hapi3_refactor commit 52388c11c17cf038591244548f2a592f6b655cee Author: James <jamesagnew@gmail.com> Date: Sat Aug 12 06:21:46 2017 -0400 Cleanup commit 209752cd638266b39574ae11c5989b624d5e85d3 Author: James <jamesagnew@gmail.com> Date: Thu Aug 10 11:18:19 2017 -0400 Fix tests commit 4543408dc8d63b5b9682a275e261d3168cdc2196 Author: James <jamesagnew@gmail.com> Date: Sat Aug 5 06:55:50 2017 -0400 Fix a potential deadlock commit ee360f537692672df473f94dae75c176b2287415 Author: James <jamesagnew@gmail.com> Date: Sat Aug 5 06:22:06 2017 -0400 Add R4 code to CLI commit 1a95ba3b6529afdaf81232b82cc303718c0187d6 Author: James Agnew <jamesagnew@gmail.com> Date: Thu Aug 3 06:14:01 2017 -0400 More cleanup commit f0d88026817296edaa65132accd67d0c8ad8088c Author: James <jamesagnew@gmail.com> Date: Wed Aug 2 11:27:43 2017 -0400 Tests are working! commit a4cbda357e8e7d024f24e3ee9a660b5366983ca1 Author: James Agnew <jamesagnew@gmail.com> Date: Wed Aug 2 10:42:04 2017 -0400 Connection handling cleanup for new tests commit 0e2cecfbd0d7a546444a66e8411600040fd9a17b Author: James Agnew <jamesagnew@gmail.com> Date: Wed Aug 2 10:16:28 2017 -0400 Clean up R4 JPA tests commit 40317a650d72c86e2529d5179cffe63399301de5 Author: James <jamesagnew@gmail.com> Date: Wed Aug 2 09:12:38 2017 -0400 Work on R4 for JPA server commit e7f8f8c30d72ed30d739979964db38d41c5baec1 Author: James <jamesagnew@gmail.com> Date: Tue Aug 1 20:43:47 2017 -0400 More work on porting tests commit 43c9003258696ab33e7bb335e882ab1c66fb61aa Author: James <jamesagnew@gmail.com> Date: Tue Aug 1 07:09:29 2017 -0400 Work on porting DSTU1 tests commit 602857f1e26a69a2284e176b5e44a860d9b828ff Author: James Agnew <jamesagnew@gmail.com> Date: Mon Jul 31 22:34:08 2017 -0400 More work on bring unit tests up to date commit e326a7b0cdb8368009119bba41886838a973e03e Author: James Agnew <jamesagnew@gmail.com> Date: Mon Jul 31 17:36:38 2017 -0400 Credit for #686 and forward port the fix to R4 validator commit 96543c3992adcb406df3c8899dab79cf4bd5b4b4 Merge: 3fb75aa61a 9901b802c4 Author: James Agnew <jamesagnew@gmail.com> Date: Mon Jul 31 17:12:33 2017 -0400 Merge branch 'master' into hapi3_refactor commit 3fb75aa61ad29d9f3876a1c30c912627486147af Author: James <jamesagnew@gmail.com> Date: Mon Jul 31 15:21:30 2017 -0400 More work on cleanup commit b02fbb6804127e77c61c4792eefd9fc0d23d63d0 Author: James Agnew <jamesagnew@gmail.com> Date: Sun Jul 30 22:11:07 2017 -0400 Work on porting STU1 tests commit 1ae37b0db3929ea4f37955adf8f026e33ccf43b2 Author: James Agnew <jamesagnew@gmail.com> Date: Sun Jul 30 20:56:10 2017 -0400 Try to get coverage report working commit 72b88849b30a94a9ff08d3a1ab50a05b2acbdfdd Author: James Agnew <jamesagnew@gmail.com> Date: Sun Jul 30 20:27:02 2017 -0400 Fix android tests commit e5f6c35aeab8bbc056870a038e1862181049a020 Author: James <jamesagnew@gmail.com> Date: Sun Jul 30 19:31:18 2017 -0400 More work on getting legacy code cleaned up commit 0b513b0845a082b5c20b0033dfab4e29f5e4a934 Author: James <jamesagnew@gmail.com> Date: Sun Jul 30 18:41:13 2017 -0400 Continue work on removing deprecated API commit defea69aa38a2e0f4137ed9c8527956872ff70bf Author: James Agnew <jamesagnew@gmail.com> Date: Sun Jul 30 17:10:01 2017 -0400 More cleanup of legacy code commit 9ae7295705cb58f5edcf7ee1259f023cbbe2fe51 Author: James <jamesagnew@gmail.com> Date: Sun Jul 30 07:11:45 2017 -0400 More cleanup of legacy code commit ebd3eeb5ee793cf5805cc726db353f3def35ab00 Author: James Agnew <jamesagnew@gmail.com> Date: Sun Jul 30 06:43:25 2017 -0400 More work on removing legacy code commit 92224c2532faf70171473d64429c3ceaf3e3406c Author: James <jamesagnew@gmail.com> Date: Sat Jul 29 18:44:06 2017 -0400 Remove DSTU1 Bundle commit c52cacf71bae3f5c02ffae03881c21de1f3aba22 Author: James <jamesagnew@gmail.com> Date: Sat Jul 29 14:27:42 2017 -0400 Now compiling commit b405e51773baf4ab3a3c387458cdc59541394cd1 Merge: c3ddf04e25 cb2cea54d7 Author: James Agnew <jamesagnew@gmail.com> Date: Fri Jul 28 06:21:02 2017 -0400 Merge branch 'master' into hapi3_refactor commit c3ddf04e2598b8d6214975ab0ae795f850396811 Author: James <jamesagnew@gmail.com> Date: Thu Jul 27 11:06:06 2017 -0400 Sync R4 releases in commit b13333c3c03ddb9a5061c3b22bf011f4592104f8 Author: James <jamesagnew@gmail.com> Date: Fri Jul 14 05:52:33 2017 -0400 JPA server is now able to handle placeholder IDs (e.g. urn:uuid:00....000) being used in Bundle.entry.request.url as a part of the conditional URL within transactions. commit 2e60ff7521b42890a32b97c2dda88ab233f5c91e Author: James Agnew <jamesagnew@gmail.com> Date: Thu Jul 13 20:02:46 2017 -0400 Fix imports commit a92ace2e0dac6e24f6dada53bf97d03861fd21a1 Merge: 3196db96d1 1a6b3ea867 Author: James Agnew <jamesagnew@gmail.com> Date: Thu Jul 13 12:02:27 2017 -0400 Merge branch 'master' into hapi3_refactor commit 3196db96d1c485310e746833df59c0e010b5b161 Author: James Agnew <jamesagnew@gmail.com> Date: Thu Jul 13 11:48:10 2017 -0400 Don't add false paging link to request commit bd4e1d338855a664045caa271d41616aed973a4d Author: James <jamesagnew@gmail.com> Date: Sun Jul 9 21:32:16 2017 -0400 Finally building correctly! commit 6464ce9304703cb3c5ecc58491282ddacc900853 Author: James <jamesagnew@gmail.com> Date: Sun Jul 9 16:38:28 2017 -0400 Work on refactor commit 0059f2e48e9d7c812c1d42a57c5b6059814f5155 Author: James <jamesagnew@gmail.com> Date: Sat Jul 8 07:16:20 2017 -0400 Keep working on refactor commit 6c2e87e8cc19863a811c11623d1c878c8b48f031 Author: James Agnew <jamesagnew@gmail.com> Date: Thu Jul 6 22:35:13 2017 -0400 Lots of work on refactor commit 11cab975047a0c28190e6533074fd3f11ddde240 Merge: 34ec6b8807 6c47bd4c51 Author: James Agnew <jamesagnew@gmail.com> Date: Thu Jul 6 21:43:57 2017 -0400 Merge branch 'master' into hapi3_refactor commit 34ec6b8807946aa6c97f0b5581dca9bd5f7b7a3e Merge: f8e647511b c520e60ac1 Author: James Agnew <jamesagnew@gmail.com> Date: Thu Jul 6 21:43:49 2017 -0400 Merge branch 'hapi3_refactor' of github.com:jamesagnew/hapi-fhir into hapi3_refactor commit f8e647511b4a82e7fde71a8850b8800e3d698b1f Author: James Agnew <jamesagnew@gmail.com> Date: Thu Jul 6 18:46:55 2017 -0400 Work on hapi3 changes commit c520e60ac1198f340cfb9090a7a33f91aa2d1e61 Author: James <jamesagnew@gmail.com> Date: Wed Jul 5 08:08:40 2017 -0400 Keep working on refactor commit f1d2ee90926f7db900a5b3b4ab9a8948d18e49f2 Author: James Agnew <jamesagnew@gmail.com> Date: Mon Jul 3 22:10:59 2017 -0400 Continue refactor for HAPI 3 commit 9281ccafc32354222932c5a9f5ee8b0f206ebc05 Merge: ea1264cd8e 294d080bd3 Author: James Agnew <jamesagnew@gmail.com> Date: Mon Jul 3 20:34:16 2017 -0400 Merge branch 'master' into hapi3_refactor commit ea1264cd8e9b8c5297d218e91cf14bd48d0a92c7 Author: James <jamesagnew@gmail.com> Date: Wed Jun 28 10:26:01 2017 -0400 Continue work on refactor commit fbe2f98a0238f3d4e065db4550dd2ef1b460c0d8 Merge: b2bef47100 0a4dcc32ec Author: James <jamesagnew@gmail.com> Date: Wed Jun 28 06:21:22 2017 -0400 Merge branch 'master' into hapi3_refactor commit b2bef47100370e1248834523d73a630950032d7a Author: James <jamesagnew@gmail.com> Date: Tue Jun 27 21:13:23 2017 -0400 Work on refactor commit 8f76e4e46385daa9ce3442e2d9342453ce373ba3 Author: James Agnew <jamesagnew@gmail.com> Date: Sun Jun 25 21:55:35 2017 -0400 Lots of work on refactoring
2017-08-13 14:39:47 -04:00
Map<String, IBaseResource> idToResource = new HashMap<String, IBaseResource>();
Merge in HAPI 3.0.0 working branch! Squashed commit of the following: commit 12f89a423a1691fdbc360706fd94a03bd9144d17 Author: James <jamesagnew@gmail.com> Date: Sun Aug 13 14:38:51 2017 -0400 Minimize validation resources commit f6868cce5c73b34d5ecd53bf1a220fdccd6b4e09 Merge: 3b80779fd3 1e158311d8 Author: James <jamesagnew@gmail.com> Date: Sun Aug 13 14:05:34 2017 -0400 Forward port fix for #710 Merge branch 'master' into hapi3_refactor commit 3b80779fd3905cbf5322e6973334eb0ecb3d8426 Merge: 1f534985e8 356d9acaf7 Author: James <jamesagnew@gmail.com> Date: Sun Aug 13 12:31:09 2017 -0400 Forward port #705, #708, and #710 Merge branch 'master' into hapi3_refactor commit 1f534985e8106347d9cc9da2dd8145fdd869547f Merge: 7c39a47852 dedd3d635b Author: James <jamesagnew@gmail.com> Date: Sun Aug 13 10:52:59 2017 -0400 Forward port #695 Merge branch 'master' into hapi3_refactor commit 7c39a47852142bee398101120678217ab0917c7e Merge: e0ffb84d21 6efafe62f1 Author: James <jamesagnew@gmail.com> Date: Sun Aug 13 09:53:17 2017 -0400 Forward port #688 Merge branch 'master' into hapi3_refactor commit e0ffb84d2129c209ccffc2611038592f37dddfd2 Merge: 52388c11c1 d19b00ff09 Author: James <jamesagnew@gmail.com> Date: Sat Aug 12 14:59:46 2017 -0400 Merge branch 'master' into hapi3_refactor commit 52388c11c17cf038591244548f2a592f6b655cee Author: James <jamesagnew@gmail.com> Date: Sat Aug 12 06:21:46 2017 -0400 Cleanup commit 209752cd638266b39574ae11c5989b624d5e85d3 Author: James <jamesagnew@gmail.com> Date: Thu Aug 10 11:18:19 2017 -0400 Fix tests commit 4543408dc8d63b5b9682a275e261d3168cdc2196 Author: James <jamesagnew@gmail.com> Date: Sat Aug 5 06:55:50 2017 -0400 Fix a potential deadlock commit ee360f537692672df473f94dae75c176b2287415 Author: James <jamesagnew@gmail.com> Date: Sat Aug 5 06:22:06 2017 -0400 Add R4 code to CLI commit 1a95ba3b6529afdaf81232b82cc303718c0187d6 Author: James Agnew <jamesagnew@gmail.com> Date: Thu Aug 3 06:14:01 2017 -0400 More cleanup commit f0d88026817296edaa65132accd67d0c8ad8088c Author: James <jamesagnew@gmail.com> Date: Wed Aug 2 11:27:43 2017 -0400 Tests are working! commit a4cbda357e8e7d024f24e3ee9a660b5366983ca1 Author: James Agnew <jamesagnew@gmail.com> Date: Wed Aug 2 10:42:04 2017 -0400 Connection handling cleanup for new tests commit 0e2cecfbd0d7a546444a66e8411600040fd9a17b Author: James Agnew <jamesagnew@gmail.com> Date: Wed Aug 2 10:16:28 2017 -0400 Clean up R4 JPA tests commit 40317a650d72c86e2529d5179cffe63399301de5 Author: James <jamesagnew@gmail.com> Date: Wed Aug 2 09:12:38 2017 -0400 Work on R4 for JPA server commit e7f8f8c30d72ed30d739979964db38d41c5baec1 Author: James <jamesagnew@gmail.com> Date: Tue Aug 1 20:43:47 2017 -0400 More work on porting tests commit 43c9003258696ab33e7bb335e882ab1c66fb61aa Author: James <jamesagnew@gmail.com> Date: Tue Aug 1 07:09:29 2017 -0400 Work on porting DSTU1 tests commit 602857f1e26a69a2284e176b5e44a860d9b828ff Author: James Agnew <jamesagnew@gmail.com> Date: Mon Jul 31 22:34:08 2017 -0400 More work on bring unit tests up to date commit e326a7b0cdb8368009119bba41886838a973e03e Author: James Agnew <jamesagnew@gmail.com> Date: Mon Jul 31 17:36:38 2017 -0400 Credit for #686 and forward port the fix to R4 validator commit 96543c3992adcb406df3c8899dab79cf4bd5b4b4 Merge: 3fb75aa61a 9901b802c4 Author: James Agnew <jamesagnew@gmail.com> Date: Mon Jul 31 17:12:33 2017 -0400 Merge branch 'master' into hapi3_refactor commit 3fb75aa61ad29d9f3876a1c30c912627486147af Author: James <jamesagnew@gmail.com> Date: Mon Jul 31 15:21:30 2017 -0400 More work on cleanup commit b02fbb6804127e77c61c4792eefd9fc0d23d63d0 Author: James Agnew <jamesagnew@gmail.com> Date: Sun Jul 30 22:11:07 2017 -0400 Work on porting STU1 tests commit 1ae37b0db3929ea4f37955adf8f026e33ccf43b2 Author: James Agnew <jamesagnew@gmail.com> Date: Sun Jul 30 20:56:10 2017 -0400 Try to get coverage report working commit 72b88849b30a94a9ff08d3a1ab50a05b2acbdfdd Author: James Agnew <jamesagnew@gmail.com> Date: Sun Jul 30 20:27:02 2017 -0400 Fix android tests commit e5f6c35aeab8bbc056870a038e1862181049a020 Author: James <jamesagnew@gmail.com> Date: Sun Jul 30 19:31:18 2017 -0400 More work on getting legacy code cleaned up commit 0b513b0845a082b5c20b0033dfab4e29f5e4a934 Author: James <jamesagnew@gmail.com> Date: Sun Jul 30 18:41:13 2017 -0400 Continue work on removing deprecated API commit defea69aa38a2e0f4137ed9c8527956872ff70bf Author: James Agnew <jamesagnew@gmail.com> Date: Sun Jul 30 17:10:01 2017 -0400 More cleanup of legacy code commit 9ae7295705cb58f5edcf7ee1259f023cbbe2fe51 Author: James <jamesagnew@gmail.com> Date: Sun Jul 30 07:11:45 2017 -0400 More cleanup of legacy code commit ebd3eeb5ee793cf5805cc726db353f3def35ab00 Author: James Agnew <jamesagnew@gmail.com> Date: Sun Jul 30 06:43:25 2017 -0400 More work on removing legacy code commit 92224c2532faf70171473d64429c3ceaf3e3406c Author: James <jamesagnew@gmail.com> Date: Sat Jul 29 18:44:06 2017 -0400 Remove DSTU1 Bundle commit c52cacf71bae3f5c02ffae03881c21de1f3aba22 Author: James <jamesagnew@gmail.com> Date: Sat Jul 29 14:27:42 2017 -0400 Now compiling commit b405e51773baf4ab3a3c387458cdc59541394cd1 Merge: c3ddf04e25 cb2cea54d7 Author: James Agnew <jamesagnew@gmail.com> Date: Fri Jul 28 06:21:02 2017 -0400 Merge branch 'master' into hapi3_refactor commit c3ddf04e2598b8d6214975ab0ae795f850396811 Author: James <jamesagnew@gmail.com> Date: Thu Jul 27 11:06:06 2017 -0400 Sync R4 releases in commit b13333c3c03ddb9a5061c3b22bf011f4592104f8 Author: James <jamesagnew@gmail.com> Date: Fri Jul 14 05:52:33 2017 -0400 JPA server is now able to handle placeholder IDs (e.g. urn:uuid:00....000) being used in Bundle.entry.request.url as a part of the conditional URL within transactions. commit 2e60ff7521b42890a32b97c2dda88ab233f5c91e Author: James Agnew <jamesagnew@gmail.com> Date: Thu Jul 13 20:02:46 2017 -0400 Fix imports commit a92ace2e0dac6e24f6dada53bf97d03861fd21a1 Merge: 3196db96d1 1a6b3ea867 Author: James Agnew <jamesagnew@gmail.com> Date: Thu Jul 13 12:02:27 2017 -0400 Merge branch 'master' into hapi3_refactor commit 3196db96d1c485310e746833df59c0e010b5b161 Author: James Agnew <jamesagnew@gmail.com> Date: Thu Jul 13 11:48:10 2017 -0400 Don't add false paging link to request commit bd4e1d338855a664045caa271d41616aed973a4d Author: James <jamesagnew@gmail.com> Date: Sun Jul 9 21:32:16 2017 -0400 Finally building correctly! commit 6464ce9304703cb3c5ecc58491282ddacc900853 Author: James <jamesagnew@gmail.com> Date: Sun Jul 9 16:38:28 2017 -0400 Work on refactor commit 0059f2e48e9d7c812c1d42a57c5b6059814f5155 Author: James <jamesagnew@gmail.com> Date: Sat Jul 8 07:16:20 2017 -0400 Keep working on refactor commit 6c2e87e8cc19863a811c11623d1c878c8b48f031 Author: James Agnew <jamesagnew@gmail.com> Date: Thu Jul 6 22:35:13 2017 -0400 Lots of work on refactor commit 11cab975047a0c28190e6533074fd3f11ddde240 Merge: 34ec6b8807 6c47bd4c51 Author: James Agnew <jamesagnew@gmail.com> Date: Thu Jul 6 21:43:57 2017 -0400 Merge branch 'master' into hapi3_refactor commit 34ec6b8807946aa6c97f0b5581dca9bd5f7b7a3e Merge: f8e647511b c520e60ac1 Author: James Agnew <jamesagnew@gmail.com> Date: Thu Jul 6 21:43:49 2017 -0400 Merge branch 'hapi3_refactor' of github.com:jamesagnew/hapi-fhir into hapi3_refactor commit f8e647511b4a82e7fde71a8850b8800e3d698b1f Author: James Agnew <jamesagnew@gmail.com> Date: Thu Jul 6 18:46:55 2017 -0400 Work on hapi3 changes commit c520e60ac1198f340cfb9090a7a33f91aa2d1e61 Author: James <jamesagnew@gmail.com> Date: Wed Jul 5 08:08:40 2017 -0400 Keep working on refactor commit f1d2ee90926f7db900a5b3b4ab9a8948d18e49f2 Author: James Agnew <jamesagnew@gmail.com> Date: Mon Jul 3 22:10:59 2017 -0400 Continue refactor for HAPI 3 commit 9281ccafc32354222932c5a9f5ee8b0f206ebc05 Merge: ea1264cd8e 294d080bd3 Author: James Agnew <jamesagnew@gmail.com> Date: Mon Jul 3 20:34:16 2017 -0400 Merge branch 'master' into hapi3_refactor commit ea1264cd8e9b8c5297d218e91cf14bd48d0a92c7 Author: James <jamesagnew@gmail.com> Date: Wed Jun 28 10:26:01 2017 -0400 Continue work on refactor commit fbe2f98a0238f3d4e065db4550dd2ef1b460c0d8 Merge: b2bef47100 0a4dcc32ec Author: James <jamesagnew@gmail.com> Date: Wed Jun 28 06:21:22 2017 -0400 Merge branch 'master' into hapi3_refactor commit b2bef47100370e1248834523d73a630950032d7a Author: James <jamesagnew@gmail.com> Date: Tue Jun 27 21:13:23 2017 -0400 Work on refactor commit 8f76e4e46385daa9ce3442e2d9342453ce373ba3 Author: James Agnew <jamesagnew@gmail.com> Date: Sun Jun 25 21:55:35 2017 -0400 Lots of work on refactoring
2017-08-13 14:39:47 -04:00
List<IBase> entries = t.getValues(myInstance, "Bundle.entry", IBase.class);
for (IBase nextEntry : entries) {
IPrimitiveType<?> fullUrl = t.getSingleValueOrNull(nextEntry, "fullUrl", IPrimitiveType.class);
if (fullUrl != null && isNotBlank(fullUrl.getValueAsString())) {
IBaseResource resource = t.getSingleValueOrNull(nextEntry, "resource", IBaseResource.class);
if (resource != null) {
idToResource.put(fullUrl.getValueAsString(), resource);
}
}
}
Merge in HAPI 3.0.0 working branch! Squashed commit of the following: commit 12f89a423a1691fdbc360706fd94a03bd9144d17 Author: James <jamesagnew@gmail.com> Date: Sun Aug 13 14:38:51 2017 -0400 Minimize validation resources commit f6868cce5c73b34d5ecd53bf1a220fdccd6b4e09 Merge: 3b80779fd3 1e158311d8 Author: James <jamesagnew@gmail.com> Date: Sun Aug 13 14:05:34 2017 -0400 Forward port fix for #710 Merge branch 'master' into hapi3_refactor commit 3b80779fd3905cbf5322e6973334eb0ecb3d8426 Merge: 1f534985e8 356d9acaf7 Author: James <jamesagnew@gmail.com> Date: Sun Aug 13 12:31:09 2017 -0400 Forward port #705, #708, and #710 Merge branch 'master' into hapi3_refactor commit 1f534985e8106347d9cc9da2dd8145fdd869547f Merge: 7c39a47852 dedd3d635b Author: James <jamesagnew@gmail.com> Date: Sun Aug 13 10:52:59 2017 -0400 Forward port #695 Merge branch 'master' into hapi3_refactor commit 7c39a47852142bee398101120678217ab0917c7e Merge: e0ffb84d21 6efafe62f1 Author: James <jamesagnew@gmail.com> Date: Sun Aug 13 09:53:17 2017 -0400 Forward port #688 Merge branch 'master' into hapi3_refactor commit e0ffb84d2129c209ccffc2611038592f37dddfd2 Merge: 52388c11c1 d19b00ff09 Author: James <jamesagnew@gmail.com> Date: Sat Aug 12 14:59:46 2017 -0400 Merge branch 'master' into hapi3_refactor commit 52388c11c17cf038591244548f2a592f6b655cee Author: James <jamesagnew@gmail.com> Date: Sat Aug 12 06:21:46 2017 -0400 Cleanup commit 209752cd638266b39574ae11c5989b624d5e85d3 Author: James <jamesagnew@gmail.com> Date: Thu Aug 10 11:18:19 2017 -0400 Fix tests commit 4543408dc8d63b5b9682a275e261d3168cdc2196 Author: James <jamesagnew@gmail.com> Date: Sat Aug 5 06:55:50 2017 -0400 Fix a potential deadlock commit ee360f537692672df473f94dae75c176b2287415 Author: James <jamesagnew@gmail.com> Date: Sat Aug 5 06:22:06 2017 -0400 Add R4 code to CLI commit 1a95ba3b6529afdaf81232b82cc303718c0187d6 Author: James Agnew <jamesagnew@gmail.com> Date: Thu Aug 3 06:14:01 2017 -0400 More cleanup commit f0d88026817296edaa65132accd67d0c8ad8088c Author: James <jamesagnew@gmail.com> Date: Wed Aug 2 11:27:43 2017 -0400 Tests are working! commit a4cbda357e8e7d024f24e3ee9a660b5366983ca1 Author: James Agnew <jamesagnew@gmail.com> Date: Wed Aug 2 10:42:04 2017 -0400 Connection handling cleanup for new tests commit 0e2cecfbd0d7a546444a66e8411600040fd9a17b Author: James Agnew <jamesagnew@gmail.com> Date: Wed Aug 2 10:16:28 2017 -0400 Clean up R4 JPA tests commit 40317a650d72c86e2529d5179cffe63399301de5 Author: James <jamesagnew@gmail.com> Date: Wed Aug 2 09:12:38 2017 -0400 Work on R4 for JPA server commit e7f8f8c30d72ed30d739979964db38d41c5baec1 Author: James <jamesagnew@gmail.com> Date: Tue Aug 1 20:43:47 2017 -0400 More work on porting tests commit 43c9003258696ab33e7bb335e882ab1c66fb61aa Author: James <jamesagnew@gmail.com> Date: Tue Aug 1 07:09:29 2017 -0400 Work on porting DSTU1 tests commit 602857f1e26a69a2284e176b5e44a860d9b828ff Author: James Agnew <jamesagnew@gmail.com> Date: Mon Jul 31 22:34:08 2017 -0400 More work on bring unit tests up to date commit e326a7b0cdb8368009119bba41886838a973e03e Author: James Agnew <jamesagnew@gmail.com> Date: Mon Jul 31 17:36:38 2017 -0400 Credit for #686 and forward port the fix to R4 validator commit 96543c3992adcb406df3c8899dab79cf4bd5b4b4 Merge: 3fb75aa61a 9901b802c4 Author: James Agnew <jamesagnew@gmail.com> Date: Mon Jul 31 17:12:33 2017 -0400 Merge branch 'master' into hapi3_refactor commit 3fb75aa61ad29d9f3876a1c30c912627486147af Author: James <jamesagnew@gmail.com> Date: Mon Jul 31 15:21:30 2017 -0400 More work on cleanup commit b02fbb6804127e77c61c4792eefd9fc0d23d63d0 Author: James Agnew <jamesagnew@gmail.com> Date: Sun Jul 30 22:11:07 2017 -0400 Work on porting STU1 tests commit 1ae37b0db3929ea4f37955adf8f026e33ccf43b2 Author: James Agnew <jamesagnew@gmail.com> Date: Sun Jul 30 20:56:10 2017 -0400 Try to get coverage report working commit 72b88849b30a94a9ff08d3a1ab50a05b2acbdfdd Author: James Agnew <jamesagnew@gmail.com> Date: Sun Jul 30 20:27:02 2017 -0400 Fix android tests commit e5f6c35aeab8bbc056870a038e1862181049a020 Author: James <jamesagnew@gmail.com> Date: Sun Jul 30 19:31:18 2017 -0400 More work on getting legacy code cleaned up commit 0b513b0845a082b5c20b0033dfab4e29f5e4a934 Author: James <jamesagnew@gmail.com> Date: Sun Jul 30 18:41:13 2017 -0400 Continue work on removing deprecated API commit defea69aa38a2e0f4137ed9c8527956872ff70bf Author: James Agnew <jamesagnew@gmail.com> Date: Sun Jul 30 17:10:01 2017 -0400 More cleanup of legacy code commit 9ae7295705cb58f5edcf7ee1259f023cbbe2fe51 Author: James <jamesagnew@gmail.com> Date: Sun Jul 30 07:11:45 2017 -0400 More cleanup of legacy code commit ebd3eeb5ee793cf5805cc726db353f3def35ab00 Author: James Agnew <jamesagnew@gmail.com> Date: Sun Jul 30 06:43:25 2017 -0400 More work on removing legacy code commit 92224c2532faf70171473d64429c3ceaf3e3406c Author: James <jamesagnew@gmail.com> Date: Sat Jul 29 18:44:06 2017 -0400 Remove DSTU1 Bundle commit c52cacf71bae3f5c02ffae03881c21de1f3aba22 Author: James <jamesagnew@gmail.com> Date: Sat Jul 29 14:27:42 2017 -0400 Now compiling commit b405e51773baf4ab3a3c387458cdc59541394cd1 Merge: c3ddf04e25 cb2cea54d7 Author: James Agnew <jamesagnew@gmail.com> Date: Fri Jul 28 06:21:02 2017 -0400 Merge branch 'master' into hapi3_refactor commit c3ddf04e2598b8d6214975ab0ae795f850396811 Author: James <jamesagnew@gmail.com> Date: Thu Jul 27 11:06:06 2017 -0400 Sync R4 releases in commit b13333c3c03ddb9a5061c3b22bf011f4592104f8 Author: James <jamesagnew@gmail.com> Date: Fri Jul 14 05:52:33 2017 -0400 JPA server is now able to handle placeholder IDs (e.g. urn:uuid:00....000) being used in Bundle.entry.request.url as a part of the conditional URL within transactions. commit 2e60ff7521b42890a32b97c2dda88ab233f5c91e Author: James Agnew <jamesagnew@gmail.com> Date: Thu Jul 13 20:02:46 2017 -0400 Fix imports commit a92ace2e0dac6e24f6dada53bf97d03861fd21a1 Merge: 3196db96d1 1a6b3ea867 Author: James Agnew <jamesagnew@gmail.com> Date: Thu Jul 13 12:02:27 2017 -0400 Merge branch 'master' into hapi3_refactor commit 3196db96d1c485310e746833df59c0e010b5b161 Author: James Agnew <jamesagnew@gmail.com> Date: Thu Jul 13 11:48:10 2017 -0400 Don't add false paging link to request commit bd4e1d338855a664045caa271d41616aed973a4d Author: James <jamesagnew@gmail.com> Date: Sun Jul 9 21:32:16 2017 -0400 Finally building correctly! commit 6464ce9304703cb3c5ecc58491282ddacc900853 Author: James <jamesagnew@gmail.com> Date: Sun Jul 9 16:38:28 2017 -0400 Work on refactor commit 0059f2e48e9d7c812c1d42a57c5b6059814f5155 Author: James <jamesagnew@gmail.com> Date: Sat Jul 8 07:16:20 2017 -0400 Keep working on refactor commit 6c2e87e8cc19863a811c11623d1c878c8b48f031 Author: James Agnew <jamesagnew@gmail.com> Date: Thu Jul 6 22:35:13 2017 -0400 Lots of work on refactor commit 11cab975047a0c28190e6533074fd3f11ddde240 Merge: 34ec6b8807 6c47bd4c51 Author: James Agnew <jamesagnew@gmail.com> Date: Thu Jul 6 21:43:57 2017 -0400 Merge branch 'master' into hapi3_refactor commit 34ec6b8807946aa6c97f0b5581dca9bd5f7b7a3e Merge: f8e647511b c520e60ac1 Author: James Agnew <jamesagnew@gmail.com> Date: Thu Jul 6 21:43:49 2017 -0400 Merge branch 'hapi3_refactor' of github.com:jamesagnew/hapi-fhir into hapi3_refactor commit f8e647511b4a82e7fde71a8850b8800e3d698b1f Author: James Agnew <jamesagnew@gmail.com> Date: Thu Jul 6 18:46:55 2017 -0400 Work on hapi3 changes commit c520e60ac1198f340cfb9090a7a33f91aa2d1e61 Author: James <jamesagnew@gmail.com> Date: Wed Jul 5 08:08:40 2017 -0400 Keep working on refactor commit f1d2ee90926f7db900a5b3b4ab9a8948d18e49f2 Author: James Agnew <jamesagnew@gmail.com> Date: Mon Jul 3 22:10:59 2017 -0400 Continue refactor for HAPI 3 commit 9281ccafc32354222932c5a9f5ee8b0f206ebc05 Merge: ea1264cd8e 294d080bd3 Author: James Agnew <jamesagnew@gmail.com> Date: Mon Jul 3 20:34:16 2017 -0400 Merge branch 'master' into hapi3_refactor commit ea1264cd8e9b8c5297d218e91cf14bd48d0a92c7 Author: James <jamesagnew@gmail.com> Date: Wed Jun 28 10:26:01 2017 -0400 Continue work on refactor commit fbe2f98a0238f3d4e065db4550dd2ef1b460c0d8 Merge: b2bef47100 0a4dcc32ec Author: James <jamesagnew@gmail.com> Date: Wed Jun 28 06:21:22 2017 -0400 Merge branch 'master' into hapi3_refactor commit b2bef47100370e1248834523d73a630950032d7a Author: James <jamesagnew@gmail.com> Date: Tue Jun 27 21:13:23 2017 -0400 Work on refactor commit 8f76e4e46385daa9ce3442e2d9342453ce373ba3 Author: James Agnew <jamesagnew@gmail.com> Date: Sun Jun 25 21:55:35 2017 -0400 Lots of work on refactoring
2017-08-13 14:39:47 -04:00
/*
* Stitch together resource references
*/
List<IBaseResource> resources = t.getAllPopulatedChildElementsOfType(myInstance, IBaseResource.class);
for (IBaseResource next : resources) {
IIdType id = next.getIdElement();
if (id != null && id.isEmpty() == false) {
String resName = myContext.getResourceDefinition(next).getName();
IIdType idType = id.withResourceType(resName).toUnqualifiedVersionless();
idToResource.put(idType.getValueAsString(), next);
}
}
for (IBaseResource next : resources) {
List<IBaseReference> refs = myContext.newTerser().getAllPopulatedChildElementsOfType(next, IBaseReference.class);
for (IBaseReference nextRef : refs) {
if (nextRef.isEmpty() == false && nextRef.getReferenceElement() != null) {
IIdType unqualifiedVersionless = nextRef.getReferenceElement().toUnqualifiedVersionless();
IBaseResource target = idToResource.get(unqualifiedVersionless.getValueAsString());
if (target != null) {
nextRef.setResource(target);
}
}
}
}
/*
* Set resource IDs based on Bundle.entry.request.url
*/
List<Pair<String, IBaseResource>> urlsAndResources = BundleUtil.getBundleEntryUrlsAndResources(myContext, (IBaseBundle) myInstance);
for (Pair<String, IBaseResource> pair : urlsAndResources) {
if (pair.getRight() != null && isNotBlank(pair.getLeft()) && pair.getRight().getIdElement().isEmpty()) {
if (pair.getLeft().startsWith("urn:")) {
pair.getRight().setId(pair.getLeft());
}
}
}
}
2014-02-26 17:13:49 -05:00
}
2016-12-19 14:03:11 -05:00
protected void weaveContainedResources() {
FhirTerser terser = myContext.newTerser();
terser.visit(myInstance, new IModelVisitor() {
@Override
Merge in HAPI 3.0.0 working branch! Squashed commit of the following: commit 12f89a423a1691fdbc360706fd94a03bd9144d17 Author: James <jamesagnew@gmail.com> Date: Sun Aug 13 14:38:51 2017 -0400 Minimize validation resources commit f6868cce5c73b34d5ecd53bf1a220fdccd6b4e09 Merge: 3b80779fd3 1e158311d8 Author: James <jamesagnew@gmail.com> Date: Sun Aug 13 14:05:34 2017 -0400 Forward port fix for #710 Merge branch 'master' into hapi3_refactor commit 3b80779fd3905cbf5322e6973334eb0ecb3d8426 Merge: 1f534985e8 356d9acaf7 Author: James <jamesagnew@gmail.com> Date: Sun Aug 13 12:31:09 2017 -0400 Forward port #705, #708, and #710 Merge branch 'master' into hapi3_refactor commit 1f534985e8106347d9cc9da2dd8145fdd869547f Merge: 7c39a47852 dedd3d635b Author: James <jamesagnew@gmail.com> Date: Sun Aug 13 10:52:59 2017 -0400 Forward port #695 Merge branch 'master' into hapi3_refactor commit 7c39a47852142bee398101120678217ab0917c7e Merge: e0ffb84d21 6efafe62f1 Author: James <jamesagnew@gmail.com> Date: Sun Aug 13 09:53:17 2017 -0400 Forward port #688 Merge branch 'master' into hapi3_refactor commit e0ffb84d2129c209ccffc2611038592f37dddfd2 Merge: 52388c11c1 d19b00ff09 Author: James <jamesagnew@gmail.com> Date: Sat Aug 12 14:59:46 2017 -0400 Merge branch 'master' into hapi3_refactor commit 52388c11c17cf038591244548f2a592f6b655cee Author: James <jamesagnew@gmail.com> Date: Sat Aug 12 06:21:46 2017 -0400 Cleanup commit 209752cd638266b39574ae11c5989b624d5e85d3 Author: James <jamesagnew@gmail.com> Date: Thu Aug 10 11:18:19 2017 -0400 Fix tests commit 4543408dc8d63b5b9682a275e261d3168cdc2196 Author: James <jamesagnew@gmail.com> Date: Sat Aug 5 06:55:50 2017 -0400 Fix a potential deadlock commit ee360f537692672df473f94dae75c176b2287415 Author: James <jamesagnew@gmail.com> Date: Sat Aug 5 06:22:06 2017 -0400 Add R4 code to CLI commit 1a95ba3b6529afdaf81232b82cc303718c0187d6 Author: James Agnew <jamesagnew@gmail.com> Date: Thu Aug 3 06:14:01 2017 -0400 More cleanup commit f0d88026817296edaa65132accd67d0c8ad8088c Author: James <jamesagnew@gmail.com> Date: Wed Aug 2 11:27:43 2017 -0400 Tests are working! commit a4cbda357e8e7d024f24e3ee9a660b5366983ca1 Author: James Agnew <jamesagnew@gmail.com> Date: Wed Aug 2 10:42:04 2017 -0400 Connection handling cleanup for new tests commit 0e2cecfbd0d7a546444a66e8411600040fd9a17b Author: James Agnew <jamesagnew@gmail.com> Date: Wed Aug 2 10:16:28 2017 -0400 Clean up R4 JPA tests commit 40317a650d72c86e2529d5179cffe63399301de5 Author: James <jamesagnew@gmail.com> Date: Wed Aug 2 09:12:38 2017 -0400 Work on R4 for JPA server commit e7f8f8c30d72ed30d739979964db38d41c5baec1 Author: James <jamesagnew@gmail.com> Date: Tue Aug 1 20:43:47 2017 -0400 More work on porting tests commit 43c9003258696ab33e7bb335e882ab1c66fb61aa Author: James <jamesagnew@gmail.com> Date: Tue Aug 1 07:09:29 2017 -0400 Work on porting DSTU1 tests commit 602857f1e26a69a2284e176b5e44a860d9b828ff Author: James Agnew <jamesagnew@gmail.com> Date: Mon Jul 31 22:34:08 2017 -0400 More work on bring unit tests up to date commit e326a7b0cdb8368009119bba41886838a973e03e Author: James Agnew <jamesagnew@gmail.com> Date: Mon Jul 31 17:36:38 2017 -0400 Credit for #686 and forward port the fix to R4 validator commit 96543c3992adcb406df3c8899dab79cf4bd5b4b4 Merge: 3fb75aa61a 9901b802c4 Author: James Agnew <jamesagnew@gmail.com> Date: Mon Jul 31 17:12:33 2017 -0400 Merge branch 'master' into hapi3_refactor commit 3fb75aa61ad29d9f3876a1c30c912627486147af Author: James <jamesagnew@gmail.com> Date: Mon Jul 31 15:21:30 2017 -0400 More work on cleanup commit b02fbb6804127e77c61c4792eefd9fc0d23d63d0 Author: James Agnew <jamesagnew@gmail.com> Date: Sun Jul 30 22:11:07 2017 -0400 Work on porting STU1 tests commit 1ae37b0db3929ea4f37955adf8f026e33ccf43b2 Author: James Agnew <jamesagnew@gmail.com> Date: Sun Jul 30 20:56:10 2017 -0400 Try to get coverage report working commit 72b88849b30a94a9ff08d3a1ab50a05b2acbdfdd Author: James Agnew <jamesagnew@gmail.com> Date: Sun Jul 30 20:27:02 2017 -0400 Fix android tests commit e5f6c35aeab8bbc056870a038e1862181049a020 Author: James <jamesagnew@gmail.com> Date: Sun Jul 30 19:31:18 2017 -0400 More work on getting legacy code cleaned up commit 0b513b0845a082b5c20b0033dfab4e29f5e4a934 Author: James <jamesagnew@gmail.com> Date: Sun Jul 30 18:41:13 2017 -0400 Continue work on removing deprecated API commit defea69aa38a2e0f4137ed9c8527956872ff70bf Author: James Agnew <jamesagnew@gmail.com> Date: Sun Jul 30 17:10:01 2017 -0400 More cleanup of legacy code commit 9ae7295705cb58f5edcf7ee1259f023cbbe2fe51 Author: James <jamesagnew@gmail.com> Date: Sun Jul 30 07:11:45 2017 -0400 More cleanup of legacy code commit ebd3eeb5ee793cf5805cc726db353f3def35ab00 Author: James Agnew <jamesagnew@gmail.com> Date: Sun Jul 30 06:43:25 2017 -0400 More work on removing legacy code commit 92224c2532faf70171473d64429c3ceaf3e3406c Author: James <jamesagnew@gmail.com> Date: Sat Jul 29 18:44:06 2017 -0400 Remove DSTU1 Bundle commit c52cacf71bae3f5c02ffae03881c21de1f3aba22 Author: James <jamesagnew@gmail.com> Date: Sat Jul 29 14:27:42 2017 -0400 Now compiling commit b405e51773baf4ab3a3c387458cdc59541394cd1 Merge: c3ddf04e25 cb2cea54d7 Author: James Agnew <jamesagnew@gmail.com> Date: Fri Jul 28 06:21:02 2017 -0400 Merge branch 'master' into hapi3_refactor commit c3ddf04e2598b8d6214975ab0ae795f850396811 Author: James <jamesagnew@gmail.com> Date: Thu Jul 27 11:06:06 2017 -0400 Sync R4 releases in commit b13333c3c03ddb9a5061c3b22bf011f4592104f8 Author: James <jamesagnew@gmail.com> Date: Fri Jul 14 05:52:33 2017 -0400 JPA server is now able to handle placeholder IDs (e.g. urn:uuid:00....000) being used in Bundle.entry.request.url as a part of the conditional URL within transactions. commit 2e60ff7521b42890a32b97c2dda88ab233f5c91e Author: James Agnew <jamesagnew@gmail.com> Date: Thu Jul 13 20:02:46 2017 -0400 Fix imports commit a92ace2e0dac6e24f6dada53bf97d03861fd21a1 Merge: 3196db96d1 1a6b3ea867 Author: James Agnew <jamesagnew@gmail.com> Date: Thu Jul 13 12:02:27 2017 -0400 Merge branch 'master' into hapi3_refactor commit 3196db96d1c485310e746833df59c0e010b5b161 Author: James Agnew <jamesagnew@gmail.com> Date: Thu Jul 13 11:48:10 2017 -0400 Don't add false paging link to request commit bd4e1d338855a664045caa271d41616aed973a4d Author: James <jamesagnew@gmail.com> Date: Sun Jul 9 21:32:16 2017 -0400 Finally building correctly! commit 6464ce9304703cb3c5ecc58491282ddacc900853 Author: James <jamesagnew@gmail.com> Date: Sun Jul 9 16:38:28 2017 -0400 Work on refactor commit 0059f2e48e9d7c812c1d42a57c5b6059814f5155 Author: James <jamesagnew@gmail.com> Date: Sat Jul 8 07:16:20 2017 -0400 Keep working on refactor commit 6c2e87e8cc19863a811c11623d1c878c8b48f031 Author: James Agnew <jamesagnew@gmail.com> Date: Thu Jul 6 22:35:13 2017 -0400 Lots of work on refactor commit 11cab975047a0c28190e6533074fd3f11ddde240 Merge: 34ec6b8807 6c47bd4c51 Author: James Agnew <jamesagnew@gmail.com> Date: Thu Jul 6 21:43:57 2017 -0400 Merge branch 'master' into hapi3_refactor commit 34ec6b8807946aa6c97f0b5581dca9bd5f7b7a3e Merge: f8e647511b c520e60ac1 Author: James Agnew <jamesagnew@gmail.com> Date: Thu Jul 6 21:43:49 2017 -0400 Merge branch 'hapi3_refactor' of github.com:jamesagnew/hapi-fhir into hapi3_refactor commit f8e647511b4a82e7fde71a8850b8800e3d698b1f Author: James Agnew <jamesagnew@gmail.com> Date: Thu Jul 6 18:46:55 2017 -0400 Work on hapi3 changes commit c520e60ac1198f340cfb9090a7a33f91aa2d1e61 Author: James <jamesagnew@gmail.com> Date: Wed Jul 5 08:08:40 2017 -0400 Keep working on refactor commit f1d2ee90926f7db900a5b3b4ab9a8948d18e49f2 Author: James Agnew <jamesagnew@gmail.com> Date: Mon Jul 3 22:10:59 2017 -0400 Continue refactor for HAPI 3 commit 9281ccafc32354222932c5a9f5ee8b0f206ebc05 Merge: ea1264cd8e 294d080bd3 Author: James Agnew <jamesagnew@gmail.com> Date: Mon Jul 3 20:34:16 2017 -0400 Merge branch 'master' into hapi3_refactor commit ea1264cd8e9b8c5297d218e91cf14bd48d0a92c7 Author: James <jamesagnew@gmail.com> Date: Wed Jun 28 10:26:01 2017 -0400 Continue work on refactor commit fbe2f98a0238f3d4e065db4550dd2ef1b460c0d8 Merge: b2bef47100 0a4dcc32ec Author: James <jamesagnew@gmail.com> Date: Wed Jun 28 06:21:22 2017 -0400 Merge branch 'master' into hapi3_refactor commit b2bef47100370e1248834523d73a630950032d7a Author: James <jamesagnew@gmail.com> Date: Tue Jun 27 21:13:23 2017 -0400 Work on refactor commit 8f76e4e46385daa9ce3442e2d9342453ce373ba3 Author: James Agnew <jamesagnew@gmail.com> Date: Sun Jun 25 21:55:35 2017 -0400 Lots of work on refactoring
2017-08-13 14:39:47 -04:00
public void acceptElement(IBaseResource theResource, IBase theElement, List<String> thePathToElement, BaseRuntimeChildDefinition theChildDefinition,
BaseRuntimeElementDefinition<?> theDefinition) {
2016-12-19 14:03:11 -05:00
if (theElement instanceof BaseResourceReferenceDt) {
BaseResourceReferenceDt nextRef = (BaseResourceReferenceDt) theElement;
String ref = nextRef.getReference().getValue();
if (isNotBlank(ref)) {
if (ref.startsWith("#")) {
IResource target = (IResource) myContainedResources.get(ref);
if (target != null) {
ourLog.debug("Resource contains local ref {} in field {}", ref, thePathToElement);
nextRef.setResource(target);
} else {
myErrorHandler.unknownReference(null, ref);
}
}
}
} else if (theElement instanceof IBaseReference) {
IBaseReference nextRef = (IBaseReference) theElement;
String ref = nextRef.getReferenceElement().getValue();
if (isNotBlank(ref)) {
if (ref.startsWith("#")) {
IBaseResource target = myContainedResources.get(ref);
if (target != null) {
ourLog.debug("Resource contains local ref {} in field {}", ref, thePathToElement);
nextRef.setResource(target);
} else {
myErrorHandler.unknownReference(null, ref);
}
}
}
}
}
});
}
@Override
public void wereBack() {
postProcess();
}
2014-02-18 08:26:49 -05:00
}
private class PreResourceStateHapi extends PreResourceState {
private IMutator myMutator;
private IBase myTarget;
public PreResourceStateHapi(Class<? extends IBaseResource> theResourceType) {
super(theResourceType);
assert theResourceType == null || IResource.class.isAssignableFrom(theResourceType);
}
public PreResourceStateHapi(IBase theTarget, IMutator theMutator, Class<? extends IBaseResource> theResourceType) {
super(theResourceType);
myTarget = theTarget;
myMutator = theMutator;
assert theResourceType == null || IResource.class.isAssignableFrom(theResourceType);
}
// @Override
// public void enteringNewElement(String theNamespaceUri, String theLocalPart) throws DataFormatException {
// super.enteringNewElement(theNamespaceUri, theLocalPart);
// populateTarget();
// }
@Override
protected void populateTarget() {
weaveContainedResources();
if (myMutator != null) {
myMutator.setValue(myTarget, getCurrentElement());
}
}
@Override
public void wereBack() {
super.wereBack();
IResource nextResource = (IResource) getCurrentElement();
String version = ResourceMetadataKeyEnum.VERSION.get(nextResource);
String resourceName = myContext.getResourceDefinition(nextResource).getName();
String bundleIdPart = nextResource.getId().getIdPart();
if (isNotBlank(bundleIdPart)) {
// if (isNotBlank(entryBaseUrl)) {
// nextResource.setId(new IdDt(entryBaseUrl, resourceName, bundleIdPart, version));
// } else {
IdDt previousId = nextResource.getId();
nextResource.setId(new IdDt(null, resourceName, bundleIdPart, version));
// Copy extensions
if (!previousId.getAllUndeclaredExtensions().isEmpty()) {
for (final ExtensionDt ext : previousId.getAllUndeclaredExtensions()) {
nextResource.getId().addUndeclaredExtension(ext);
}
}
// }
}
}
}
private class PreResourceStateHl7Org extends PreResourceState {
private IMutator myMutator;
private IBase myTarget;
public PreResourceStateHl7Org(Class<? extends IBaseResource> theResourceType) {
super(theResourceType);
}
public PreResourceStateHl7Org(IBase theTarget, IMutator theMutator, Class<? extends IBaseResource> theResourceType) {
super(theResourceType);
myMutator = theMutator;
myTarget = theTarget;
}
@Override
protected void populateTarget() {
weaveContainedResources();
if (myMutator != null) {
myMutator.setValue(myTarget, getCurrentElement());
}
}
@Override
public void wereBack() {
super.wereBack();
if (getCurrentElement() instanceof IDomainResource) {
IDomainResource elem = (IDomainResource) getCurrentElement();
String resourceName = myContext.getResourceDefinition(elem).getName();
String versionId = elem.getMeta().getVersionId();
if (StringUtils.isBlank(elem.getIdElement().getIdPart())) {
// Resource has no ID
} else if (StringUtils.isNotBlank(versionId)) {
elem.getIdElement().setValue(resourceName + "/" + elem.getIdElement().getIdPart() + "/_history/" + versionId);
} else {
elem.getIdElement().setValue(resourceName + "/" + elem.getIdElement().getIdPart());
}
}
}
}
private class PreTagListState extends BaseState {
private TagList myTagList;
public PreTagListState() {
super(null);
myTagList = new TagList();
}
@Override
public void endingElement() throws DataFormatException {
pop();
}
@Override
2015-06-24 12:26:40 -04:00
public void enteringNewElement(String theNamespaceUri, String theLocalPart) throws DataFormatException {
if (!TagList.ELEMENT_NAME_LC.equals(theLocalPart.toLowerCase())) {
throw new DataFormatException("resourceType does not appear to be 'TagList', found: " + theLocalPart);
}
push(new TagListState(myTagList));
}
@Override
protected IBase getCurrentElement() {
return myTagList;
}
@Override
public boolean isPreResource() {
return true;
}
}
2014-02-19 11:59:12 -05:00
private class PrimitiveState extends BaseState {
2014-12-10 22:02:31 -05:00
private IPrimitiveType<?> myInstance;
2014-02-19 11:59:12 -05:00
2014-12-10 22:02:31 -05:00
public PrimitiveState(PreResourceState thePreResourceState, IPrimitiveType<?> theInstance) {
super(thePreResourceState);
2014-02-19 11:59:12 -05:00
myInstance = theInstance;
}
@Override
2014-02-27 16:51:43 -05:00
public void attributeValue(String theName, String theValue) throws DataFormatException {
if ("value".equals(theName)) {
if ("".equals(theValue)) {
myErrorHandler.invalidValue(null, theValue, "Attribute values must not be empty (\"\")");
} else {
try {
myInstance.setValueAsString(theValue);
Squashed commit of the following: commit df641506885e09e63f80efc6c658d01a1a3a8142 Author: James Agnew <jamesagnew@gmail.com> Date: Sat Sep 29 13:47:22 2018 -0400 Shrink validation resources commit 4c1550eafa26f4235b4b8804741aecc03276b5c6 Author: James Agnew <jamesagnew@gmail.com> Date: Fri Sep 28 22:45:28 2018 -0400 Updates to get R4 working commit 8332f15291006691ed9b07ead3e3524b0fc85510 Author: jamesagnew <jamesagnew@gmail.com> Date: Fri Sep 28 09:02:13 2018 -0400 Ongoing work on gettign R4 working commit f7146cab7aed937bb625a8aec95744d76db00041 Author: James Agnew <jamesagnew@gmail.com> Date: Fri Sep 28 05:21:01 2018 -0400 More work on sync commit f48de4a10b1bab2584fee813017d9b27b237bfa9 Merge: 9e4f3cc722 aacb78b779 Author: James Agnew <jamesagnew@gmail.com> Date: Thu Sep 27 20:11:29 2018 -0400 Merge branch 'sync_r4' of github.com:jamesagnew/hapi-fhir into sync_r4 commit 9e4f3cc722668aae31a77b19bf9b032af3ae01b0 Author: James Agnew <jamesagnew@gmail.com> Date: Thu Sep 27 20:11:19 2018 -0400 Fix compile error commit 7ec29e0ceda8f9013cbabb95767cbe15b4b81303 Merge: 23f7517325 002c4b3ff7 Author: James Agnew <jamesagnew@gmail.com> Date: Thu Sep 27 20:04:23 2018 -0400 Merge branch 'master' into sync_r4 commit aacb78b7793ab2c71e0a2a774240ee2b5d3f9e7f Author: jamesagnew <jamesagnew@gmail.com> Date: Thu Sep 27 20:01:42 2018 -0400 Keep working on getting R4 building commit 4950de46d99897e74d41dfdb10d3d8a3435cb0c9 Author: jamesagnew <jamesagnew@gmail.com> Date: Tue Sep 25 13:11:27 2018 -0400 Ongoing work to get R4 working commit 819d69c20e112dd3c72569ec50114ddb8263c300 Author: jamesagnew <jamesagnew@gmail.com> Date: Thu Sep 20 08:15:36 2018 -0400 Work on getting build working commit 2c61b6cd1205ced5d7b822cf10942c69272ea078 Merge: 16b5bb06c8 dfb4de86f1 Author: jamesagnew <jamesagnew@gmail.com> Date: Thu Sep 20 05:16:53 2018 -0400 Merge branch 'master' into sync_r4 commit 16b5bb06c8cdaf8d67c3b80f5aa9be9fccd99aef Author: jamesagnew <jamesagnew@gmail.com> Date: Mon Sep 17 05:30:39 2018 -0400 Work on R4 sync commit 23f7517325a14dd2ca1eb5641296ead2776634ae Author: James Agnew <jamesagnew@gmail.com> Date: Sun Sep 16 10:19:00 2018 -0400 Work on sync commit 6cc413c1f1dea538295aa4c16c21a5677494ac4c Author: James Agnew <jamesagnew@gmail.com> Date: Fri Sep 14 17:28:28 2018 -0400 Work on R$ sync commit df6f6ad2ce783b07ccc383134705d874bc5d2cf1 Author: jamesagnew <jamesagnew@gmail.com> Date: Fri Sep 14 08:33:07 2018 -0400 Work on R4
2018-09-29 13:48:35 -04:00
} catch (DataFormatException | IllegalArgumentException e) {
myErrorHandler.invalidValue(null, theValue, e.getMessage());
}
}
2014-03-22 12:33:07 -04:00
} else if ("id".equals(theName)) {
2014-07-04 09:27:36 -04:00
if (myInstance instanceof IIdentifiableElement) {
((IIdentifiableElement) myInstance).setElementSpecificId(theValue);
2015-02-16 11:33:46 -05:00
} else if (myInstance instanceof IBaseElement) {
((IBaseElement) myInstance).setId(theValue);
2014-12-10 17:40:47 -05:00
} else if (myInstance instanceof IBaseResource) {
2015-05-05 13:16:10 -04:00
new IdDt(theValue).applyTo((org.hl7.fhir.instance.model.api.IBaseResource) myInstance);
} else {
myErrorHandler.unknownAttribute(null, theName);
2014-07-04 09:27:36 -04:00
}
} else {
myErrorHandler.unknownAttribute(null, theName);
2014-02-27 16:51:43 -05:00
}
2014-02-19 11:59:12 -05:00
}
@Override
public void endingElement() {
2014-02-21 21:06:11 -05:00
pop();
2014-02-19 11:59:12 -05:00
}
2014-03-06 17:12:05 -05:00
// @Override
// public void enteringNewElementExtension(StartElement theElement,
// String theUrlAttr) {
2014-03-06 17:12:05 -05:00
// if (myInstance instanceof ISupportsUndeclaredExtensions) {
// UndeclaredExtension ext = new UndeclaredExtension(theUrlAttr);
// ((ISupportsUndeclaredExtensions)
// myInstance).getUndeclaredExtensions().add(ext);
2014-03-06 17:12:05 -05:00
// push(new ExtensionState(ext));
// }
// }
2014-02-28 13:27:35 -05:00
2014-02-19 11:59:12 -05:00
@Override
2015-06-24 12:26:40 -04:00
public void enteringNewElement(String theNamespaceUri, String theLocalPart) throws DataFormatException {
myErrorHandler.unknownElement(null, theLocalPart);
2014-12-21 18:13:37 -05:00
push(new SwallowChildrenWholeState(getPreResourceState()));
return;
2014-02-19 11:59:12 -05:00
}
2014-02-22 15:33:02 -05:00
@Override
2014-12-10 22:02:31 -05:00
protected IBase getCurrentElement() {
2014-02-26 17:13:49 -05:00
return myInstance;
2014-02-22 15:33:02 -05:00
}
2014-02-19 11:59:12 -05:00
}
2015-03-11 09:11:36 -04:00
private class ResourceStateHapi extends ElementCompositeState {
private IResource myInstance;
2015-02-16 11:33:46 -05:00
public ResourceStateHapi(PreResourceState thePreResourceState, BaseRuntimeElementCompositeDefinition<?> theDef, IResource theInstance) {
super(thePreResourceState, theDef.getName(), theDef, theInstance);
2015-03-11 09:11:36 -04:00
myInstance = theInstance;
}
@Override
public void enteringNewElement(String theNamespace, String theChildName) throws DataFormatException {
if ("id".equals(theChildName)) {
2015-03-11 09:11:36 -04:00
push(new PrimitiveState(getPreResourceState(), myInstance.getId()));
} else if ("meta".equals(theChildName)) {
2015-03-11 09:11:36 -04:00
push(new MetaElementState(getPreResourceState(), myInstance.getResourceMetadata()));
} else {
super.enteringNewElement(theNamespace, theChildName);
}
}
}
2015-03-11 09:11:36 -04:00
private class ResourceStateHl7Org extends ElementCompositeState {
2015-02-16 11:33:46 -05:00
public ResourceStateHl7Org(PreResourceState thePreResourceState, BaseRuntimeElementCompositeDefinition<?> theDef, IBaseResource theInstance) {
super(thePreResourceState, theDef.getName(), theDef, theInstance);
2015-02-16 11:33:46 -05:00
}
}
private class SecurityLabelElementStateHapi extends ElementCompositeState {
public SecurityLabelElementStateHapi(ParserState<T>.PreResourceState thePreResourceState, BaseRuntimeElementCompositeDefinition<?> theDef, IBase codingDt) {
super(thePreResourceState, theDef.getName(), theDef, codingDt);
}
@Override
public void endingElement() throws DataFormatException {
pop();
}
}
private class SwallowChildrenWholeState extends BaseState {
private int myDepth;
public SwallowChildrenWholeState(PreResourceState thePreResourceState) {
super(thePreResourceState);
}
@Override
public void attributeValue(String theName, String theValue) throws DataFormatException {
// ignore
}
@Override
public void endingElement() throws DataFormatException {
myDepth--;
if (myDepth < 0) {
pop();
}
}
2014-10-24 15:43:35 -04:00
@Override
2015-06-24 12:26:40 -04:00
public void enteringNewElement(String theNamespaceUri, String theLocalPart) throws DataFormatException {
2014-10-24 15:43:35 -04:00
myDepth++;
}
@Override
public void enteringNewElementExtension(StartElement theElement, String theUrlAttr, boolean theIsModifier, final String baseServerUrl) {
myDepth++;
}
}
private class TagListState extends BaseState {
private TagList myTagList;
public TagListState(TagList theTagList) {
super(null);
myTagList = theTagList;
}
@Override
public void endingElement() throws DataFormatException {
pop();
}
@Override
2015-06-24 12:26:40 -04:00
public void enteringNewElement(String theNamespaceUri, String theLocalPart) throws DataFormatException {
if (TagList.ATTR_CATEGORY.equals(theLocalPart)) {
push(new TagState(myTagList));
} else {
throw new DataFormatException("Unexpected element: " + theLocalPart);
}
}
@Override
protected IBase getCurrentElement() {
return myTagList;
}
}
private class TagState extends BaseState {
private static final int LABEL = 2;
private static final int NONE = 0;
private static final int SCHEME = 3;
private static final int TERM = 1;
private String myLabel;
private String myScheme;
private int mySubState = 0;
private TagList myTagList;
private String myTerm;
public TagState(TagList theTagList) {
super(null);
myTagList = theTagList;
}
@Override
public void attributeValue(String theName, String theValue) throws DataFormatException {
String value = defaultIfBlank(theValue, null);
switch (mySubState) {
case TERM:
myTerm = (value);
break;
case LABEL:
myLabel = (value);
break;
case SCHEME:
myScheme = (value);
break;
case NONE:
// This handles JSON encoding, which is a bit weird
enteringNewElement(null, theName);
attributeValue(null, value);
endingElement();
break;
}
}
@Override
public void endingElement() throws DataFormatException {
if (mySubState != NONE) {
mySubState = NONE;
} else {
if (isNotEmpty(myScheme) || isNotBlank(myTerm) || isNotBlank(myLabel)) {
myTagList.addTag(myScheme, myTerm, myLabel);
}
pop();
}
}
@Override
2015-06-24 12:26:40 -04:00
public void enteringNewElement(String theNamespaceUri, String theLocalPart) throws DataFormatException {
/*
* We allow for both the DSTU1 and DSTU2 names here
*/
if (Tag.ATTR_TERM.equals(theLocalPart) || "code".equals(theLocalPart)) {
mySubState = TERM;
} else if (Tag.ATTR_SCHEME.equals(theLocalPart) || "system".equals(theLocalPart)) {
mySubState = SCHEME;
} else if (Tag.ATTR_LABEL.equals(theLocalPart) || "display".equals(theLocalPart)) {
mySubState = LABEL;
} else {
throw new DataFormatException("Unexpected element: " + theLocalPart);
}
}
}
2014-02-21 21:06:11 -05:00
private class XhtmlState extends BaseState {
2014-02-22 15:33:02 -05:00
private int myDepth;
private XhtmlDt myDt;
private List<XMLEvent> myEvents = new ArrayList<XMLEvent>();
2014-02-27 16:51:43 -05:00
private boolean myIncludeOuterEvent;
2014-02-22 15:33:02 -05:00
private XhtmlState(PreResourceState thePreResourceState, XhtmlDt theXhtmlDt, boolean theIncludeOuterEvent) throws DataFormatException {
super(thePreResourceState);
2014-02-27 16:51:43 -05:00
myDepth = 0;
2014-02-22 15:33:02 -05:00
myDt = theXhtmlDt;
2014-02-27 16:51:43 -05:00
myIncludeOuterEvent = theIncludeOuterEvent;
2014-02-21 21:06:11 -05:00
}
2014-03-22 12:33:07 -04:00
@Override
public void attributeValue(String theName, String theValue) throws DataFormatException {
if (myJsonMode) {
myDt.setValueAsString(theValue);
Merge in HAPI 3.0.0 working branch! Squashed commit of the following: commit 12f89a423a1691fdbc360706fd94a03bd9144d17 Author: James <jamesagnew@gmail.com> Date: Sun Aug 13 14:38:51 2017 -0400 Minimize validation resources commit f6868cce5c73b34d5ecd53bf1a220fdccd6b4e09 Merge: 3b80779fd3 1e158311d8 Author: James <jamesagnew@gmail.com> Date: Sun Aug 13 14:05:34 2017 -0400 Forward port fix for #710 Merge branch 'master' into hapi3_refactor commit 3b80779fd3905cbf5322e6973334eb0ecb3d8426 Merge: 1f534985e8 356d9acaf7 Author: James <jamesagnew@gmail.com> Date: Sun Aug 13 12:31:09 2017 -0400 Forward port #705, #708, and #710 Merge branch 'master' into hapi3_refactor commit 1f534985e8106347d9cc9da2dd8145fdd869547f Merge: 7c39a47852 dedd3d635b Author: James <jamesagnew@gmail.com> Date: Sun Aug 13 10:52:59 2017 -0400 Forward port #695 Merge branch 'master' into hapi3_refactor commit 7c39a47852142bee398101120678217ab0917c7e Merge: e0ffb84d21 6efafe62f1 Author: James <jamesagnew@gmail.com> Date: Sun Aug 13 09:53:17 2017 -0400 Forward port #688 Merge branch 'master' into hapi3_refactor commit e0ffb84d2129c209ccffc2611038592f37dddfd2 Merge: 52388c11c1 d19b00ff09 Author: James <jamesagnew@gmail.com> Date: Sat Aug 12 14:59:46 2017 -0400 Merge branch 'master' into hapi3_refactor commit 52388c11c17cf038591244548f2a592f6b655cee Author: James <jamesagnew@gmail.com> Date: Sat Aug 12 06:21:46 2017 -0400 Cleanup commit 209752cd638266b39574ae11c5989b624d5e85d3 Author: James <jamesagnew@gmail.com> Date: Thu Aug 10 11:18:19 2017 -0400 Fix tests commit 4543408dc8d63b5b9682a275e261d3168cdc2196 Author: James <jamesagnew@gmail.com> Date: Sat Aug 5 06:55:50 2017 -0400 Fix a potential deadlock commit ee360f537692672df473f94dae75c176b2287415 Author: James <jamesagnew@gmail.com> Date: Sat Aug 5 06:22:06 2017 -0400 Add R4 code to CLI commit 1a95ba3b6529afdaf81232b82cc303718c0187d6 Author: James Agnew <jamesagnew@gmail.com> Date: Thu Aug 3 06:14:01 2017 -0400 More cleanup commit f0d88026817296edaa65132accd67d0c8ad8088c Author: James <jamesagnew@gmail.com> Date: Wed Aug 2 11:27:43 2017 -0400 Tests are working! commit a4cbda357e8e7d024f24e3ee9a660b5366983ca1 Author: James Agnew <jamesagnew@gmail.com> Date: Wed Aug 2 10:42:04 2017 -0400 Connection handling cleanup for new tests commit 0e2cecfbd0d7a546444a66e8411600040fd9a17b Author: James Agnew <jamesagnew@gmail.com> Date: Wed Aug 2 10:16:28 2017 -0400 Clean up R4 JPA tests commit 40317a650d72c86e2529d5179cffe63399301de5 Author: James <jamesagnew@gmail.com> Date: Wed Aug 2 09:12:38 2017 -0400 Work on R4 for JPA server commit e7f8f8c30d72ed30d739979964db38d41c5baec1 Author: James <jamesagnew@gmail.com> Date: Tue Aug 1 20:43:47 2017 -0400 More work on porting tests commit 43c9003258696ab33e7bb335e882ab1c66fb61aa Author: James <jamesagnew@gmail.com> Date: Tue Aug 1 07:09:29 2017 -0400 Work on porting DSTU1 tests commit 602857f1e26a69a2284e176b5e44a860d9b828ff Author: James Agnew <jamesagnew@gmail.com> Date: Mon Jul 31 22:34:08 2017 -0400 More work on bring unit tests up to date commit e326a7b0cdb8368009119bba41886838a973e03e Author: James Agnew <jamesagnew@gmail.com> Date: Mon Jul 31 17:36:38 2017 -0400 Credit for #686 and forward port the fix to R4 validator commit 96543c3992adcb406df3c8899dab79cf4bd5b4b4 Merge: 3fb75aa61a 9901b802c4 Author: James Agnew <jamesagnew@gmail.com> Date: Mon Jul 31 17:12:33 2017 -0400 Merge branch 'master' into hapi3_refactor commit 3fb75aa61ad29d9f3876a1c30c912627486147af Author: James <jamesagnew@gmail.com> Date: Mon Jul 31 15:21:30 2017 -0400 More work on cleanup commit b02fbb6804127e77c61c4792eefd9fc0d23d63d0 Author: James Agnew <jamesagnew@gmail.com> Date: Sun Jul 30 22:11:07 2017 -0400 Work on porting STU1 tests commit 1ae37b0db3929ea4f37955adf8f026e33ccf43b2 Author: James Agnew <jamesagnew@gmail.com> Date: Sun Jul 30 20:56:10 2017 -0400 Try to get coverage report working commit 72b88849b30a94a9ff08d3a1ab50a05b2acbdfdd Author: James Agnew <jamesagnew@gmail.com> Date: Sun Jul 30 20:27:02 2017 -0400 Fix android tests commit e5f6c35aeab8bbc056870a038e1862181049a020 Author: James <jamesagnew@gmail.com> Date: Sun Jul 30 19:31:18 2017 -0400 More work on getting legacy code cleaned up commit 0b513b0845a082b5c20b0033dfab4e29f5e4a934 Author: James <jamesagnew@gmail.com> Date: Sun Jul 30 18:41:13 2017 -0400 Continue work on removing deprecated API commit defea69aa38a2e0f4137ed9c8527956872ff70bf Author: James Agnew <jamesagnew@gmail.com> Date: Sun Jul 30 17:10:01 2017 -0400 More cleanup of legacy code commit 9ae7295705cb58f5edcf7ee1259f023cbbe2fe51 Author: James <jamesagnew@gmail.com> Date: Sun Jul 30 07:11:45 2017 -0400 More cleanup of legacy code commit ebd3eeb5ee793cf5805cc726db353f3def35ab00 Author: James Agnew <jamesagnew@gmail.com> Date: Sun Jul 30 06:43:25 2017 -0400 More work on removing legacy code commit 92224c2532faf70171473d64429c3ceaf3e3406c Author: James <jamesagnew@gmail.com> Date: Sat Jul 29 18:44:06 2017 -0400 Remove DSTU1 Bundle commit c52cacf71bae3f5c02ffae03881c21de1f3aba22 Author: James <jamesagnew@gmail.com> Date: Sat Jul 29 14:27:42 2017 -0400 Now compiling commit b405e51773baf4ab3a3c387458cdc59541394cd1 Merge: c3ddf04e25 cb2cea54d7 Author: James Agnew <jamesagnew@gmail.com> Date: Fri Jul 28 06:21:02 2017 -0400 Merge branch 'master' into hapi3_refactor commit c3ddf04e2598b8d6214975ab0ae795f850396811 Author: James <jamesagnew@gmail.com> Date: Thu Jul 27 11:06:06 2017 -0400 Sync R4 releases in commit b13333c3c03ddb9a5061c3b22bf011f4592104f8 Author: James <jamesagnew@gmail.com> Date: Fri Jul 14 05:52:33 2017 -0400 JPA server is now able to handle placeholder IDs (e.g. urn:uuid:00....000) being used in Bundle.entry.request.url as a part of the conditional URL within transactions. commit 2e60ff7521b42890a32b97c2dda88ab233f5c91e Author: James Agnew <jamesagnew@gmail.com> Date: Thu Jul 13 20:02:46 2017 -0400 Fix imports commit a92ace2e0dac6e24f6dada53bf97d03861fd21a1 Merge: 3196db96d1 1a6b3ea867 Author: James Agnew <jamesagnew@gmail.com> Date: Thu Jul 13 12:02:27 2017 -0400 Merge branch 'master' into hapi3_refactor commit 3196db96d1c485310e746833df59c0e010b5b161 Author: James Agnew <jamesagnew@gmail.com> Date: Thu Jul 13 11:48:10 2017 -0400 Don't add false paging link to request commit bd4e1d338855a664045caa271d41616aed973a4d Author: James <jamesagnew@gmail.com> Date: Sun Jul 9 21:32:16 2017 -0400 Finally building correctly! commit 6464ce9304703cb3c5ecc58491282ddacc900853 Author: James <jamesagnew@gmail.com> Date: Sun Jul 9 16:38:28 2017 -0400 Work on refactor commit 0059f2e48e9d7c812c1d42a57c5b6059814f5155 Author: James <jamesagnew@gmail.com> Date: Sat Jul 8 07:16:20 2017 -0400 Keep working on refactor commit 6c2e87e8cc19863a811c11623d1c878c8b48f031 Author: James Agnew <jamesagnew@gmail.com> Date: Thu Jul 6 22:35:13 2017 -0400 Lots of work on refactor commit 11cab975047a0c28190e6533074fd3f11ddde240 Merge: 34ec6b8807 6c47bd4c51 Author: James Agnew <jamesagnew@gmail.com> Date: Thu Jul 6 21:43:57 2017 -0400 Merge branch 'master' into hapi3_refactor commit 34ec6b8807946aa6c97f0b5581dca9bd5f7b7a3e Merge: f8e647511b c520e60ac1 Author: James Agnew <jamesagnew@gmail.com> Date: Thu Jul 6 21:43:49 2017 -0400 Merge branch 'hapi3_refactor' of github.com:jamesagnew/hapi-fhir into hapi3_refactor commit f8e647511b4a82e7fde71a8850b8800e3d698b1f Author: James Agnew <jamesagnew@gmail.com> Date: Thu Jul 6 18:46:55 2017 -0400 Work on hapi3 changes commit c520e60ac1198f340cfb9090a7a33f91aa2d1e61 Author: James <jamesagnew@gmail.com> Date: Wed Jul 5 08:08:40 2017 -0400 Keep working on refactor commit f1d2ee90926f7db900a5b3b4ab9a8948d18e49f2 Author: James Agnew <jamesagnew@gmail.com> Date: Mon Jul 3 22:10:59 2017 -0400 Continue refactor for HAPI 3 commit 9281ccafc32354222932c5a9f5ee8b0f206ebc05 Merge: ea1264cd8e 294d080bd3 Author: James Agnew <jamesagnew@gmail.com> Date: Mon Jul 3 20:34:16 2017 -0400 Merge branch 'master' into hapi3_refactor commit ea1264cd8e9b8c5297d218e91cf14bd48d0a92c7 Author: James <jamesagnew@gmail.com> Date: Wed Jun 28 10:26:01 2017 -0400 Continue work on refactor commit fbe2f98a0238f3d4e065db4550dd2ef1b460c0d8 Merge: b2bef47100 0a4dcc32ec Author: James <jamesagnew@gmail.com> Date: Wed Jun 28 06:21:22 2017 -0400 Merge branch 'master' into hapi3_refactor commit b2bef47100370e1248834523d73a630950032d7a Author: James <jamesagnew@gmail.com> Date: Tue Jun 27 21:13:23 2017 -0400 Work on refactor commit 8f76e4e46385daa9ce3442e2d9342453ce373ba3 Author: James Agnew <jamesagnew@gmail.com> Date: Sun Jun 25 21:55:35 2017 -0400 Lots of work on refactoring
2017-08-13 14:39:47 -04:00
} else {
2015-06-12 08:27:03 -04:00
// IGNORE - don't handle this as an error, we process these as XML events
2014-03-22 12:33:07 -04:00
}
}
2015-04-13 08:32:49 -04:00
protected void doPop() {
pop();
}
2014-03-22 12:33:07 -04:00
@Override
public void endingElement() throws DataFormatException {
2014-03-22 12:33:07 -04:00
if (myJsonMode) {
2015-04-13 08:32:49 -04:00
doPop();
2014-03-22 12:33:07 -04:00
return;
}
super.endingElement();
2014-03-22 12:33:07 -04:00
}
@Override
public void enteringNewElement(String theNamespaceUri, String theLocalPart) throws DataFormatException {
// IGNORE - don't handle this as an error, we process these as XML events
}
@Override
protected IElement getCurrentElement() {
return myDt;
}
public XhtmlDt getDt() {
return myDt;
}
2014-02-21 21:06:11 -05:00
@Override
2014-02-27 11:57:50 -05:00
public void xmlEvent(XMLEvent theEvent) {
2014-02-27 16:51:43 -05:00
if (theEvent.isEndElement()) {
myDepth--;
}
if (myIncludeOuterEvent || myDepth > 0) {
myEvents.add(theEvent);
}
2014-02-22 15:33:02 -05:00
2014-02-27 11:57:50 -05:00
if (theEvent.isStartElement()) {
myDepth++;
}
2014-03-06 17:12:05 -05:00
2014-02-27 11:57:50 -05:00
if (theEvent.isEndElement()) {
if (myDepth == 0) {
String eventsAsString = XmlUtil.encode(myEvents);
myDt.setValue(eventsAsString);
2015-04-13 08:32:49 -04:00
doPop();
2014-02-27 11:57:50 -05:00
}
2014-02-21 21:06:11 -05:00
}
}
2014-02-19 11:59:12 -05:00
}
private class XhtmlStateHl7Org extends XhtmlState {
private IBaseXhtml myHl7OrgDatatype;
private XhtmlStateHl7Org(PreResourceState thePreResourceState, IBaseXhtml theHl7OrgDatatype) {
super(thePreResourceState, new XhtmlDt(), true);
myHl7OrgDatatype = theHl7OrgDatatype;
}
@Override
public void doPop() {
// TODO: this is not very efficient
String value = getDt().getValueAsString();
myHl7OrgDatatype.setValueAsString(value);
super.doPop();
}
}
/**
* @param theResourceType May be null
*/
static <T extends IBaseResource> ParserState<T> getPreResourceInstance(IParser theParser, Class<T> theResourceType, FhirContext theContext, boolean theJsonMode, IParserErrorHandler theErrorHandler)
throws DataFormatException {
ParserState<T> retVal = new ParserState<T>(theParser, theContext, theJsonMode, theErrorHandler);
if (theResourceType == null) {
if (theContext.getVersion().getVersion().isRi()) {
retVal.push(retVal.new PreResourceStateHl7Org(theResourceType));
} else {
retVal.push(retVal.new PreResourceStateHapi(theResourceType));
}
} else {
if (IResource.class.isAssignableFrom(theResourceType)) {
retVal.push(retVal.new PreResourceStateHapi(theResourceType));
} else {
retVal.push(retVal.new PreResourceStateHl7Org(theResourceType));
}
}
return retVal;
}
static ParserState<TagList> getPreTagListInstance(IParser theParser, FhirContext theContext, boolean theJsonMode, IParserErrorHandler theErrorHandler) {
ParserState<TagList> retVal = new ParserState<TagList>(theParser, theContext, theJsonMode, theErrorHandler);
retVal.push(retVal.new PreTagListState());
return retVal;
}
2014-02-18 08:26:49 -05:00
}