-
Notifications
You must be signed in to change notification settings - Fork 1.3k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
commit df64150 Author: James Agnew <jamesagnew@gmail.com> Date: Sat Sep 29 13:47:22 2018 -0400 Shrink validation resources commit 4c1550e Author: James Agnew <jamesagnew@gmail.com> Date: Fri Sep 28 22:45:28 2018 -0400 Updates to get R4 working commit 8332f15 Author: jamesagnew <jamesagnew@gmail.com> Date: Fri Sep 28 09:02:13 2018 -0400 Ongoing work on gettign R4 working commit f7146ca Author: James Agnew <jamesagnew@gmail.com> Date: Fri Sep 28 05:21:01 2018 -0400 More work on sync commit f48de4a Merge: 9e4f3cc aacb78b 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 9e4f3cc Author: James Agnew <jamesagnew@gmail.com> Date: Thu Sep 27 20:11:19 2018 -0400 Fix compile error commit 7ec29e0 Merge: 23f7517 002c4b3 Author: James Agnew <jamesagnew@gmail.com> Date: Thu Sep 27 20:04:23 2018 -0400 Merge branch 'master' into sync_r4 commit aacb78b Author: jamesagnew <jamesagnew@gmail.com> Date: Thu Sep 27 20:01:42 2018 -0400 Keep working on getting R4 building commit 4950de4 Author: jamesagnew <jamesagnew@gmail.com> Date: Tue Sep 25 13:11:27 2018 -0400 Ongoing work to get R4 working commit 819d69c Author: jamesagnew <jamesagnew@gmail.com> Date: Thu Sep 20 08:15:36 2018 -0400 Work on getting build working commit 2c61b6c Merge: 16b5bb0 dfb4de8 Author: jamesagnew <jamesagnew@gmail.com> Date: Thu Sep 20 05:16:53 2018 -0400 Merge branch 'master' into sync_r4 commit 16b5bb0 Author: jamesagnew <jamesagnew@gmail.com> Date: Mon Sep 17 05:30:39 2018 -0400 Work on R4 sync commit 23f7517 Author: James Agnew <jamesagnew@gmail.com> Date: Sun Sep 16 10:19:00 2018 -0400 Work on sync commit 6cc413c Author: James Agnew <jamesagnew@gmail.com> Date: Fri Sep 14 17:28:28 2018 -0400 Work on R$ sync commit df6f6ad Author: jamesagnew <jamesagnew@gmail.com> Date: Fri Sep 14 08:33:07 2018 -0400 Work on R4
- Loading branch information
1 parent
002c4b3
commit 3e445fa
Showing
2,063 changed files
with
1,839,186 additions
and
1,643,813 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
46 changes: 46 additions & 0 deletions
46
hapi-fhir-base/src/main/java/ca/uhn/fhir/rest/gclient/SpecialClientParam.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,46 @@ | ||
| package ca.uhn.fhir.rest.gclient; | ||
|
|
||
| /* | ||
| * #%L | ||
| * HAPI FHIR - Core Library | ||
| * %% | ||
| * Copyright (C) 2014 - 2018 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.rest.api.Constants; | ||
| import org.hl7.fhir.instance.model.api.IPrimitiveType; | ||
|
|
||
| import java.util.Arrays; | ||
| import java.util.List; | ||
|
|
||
| /** | ||
| * | ||
| */ | ||
| public class SpecialClientParam extends BaseClientParam implements IParam { | ||
|
|
||
| private final String myParamName; | ||
|
|
||
| public SpecialClientParam(String theParamName) { | ||
| myParamName = theParamName; | ||
| } | ||
|
|
||
| @Override | ||
| public String getParamName() { | ||
| return myParamName; | ||
| } | ||
|
|
||
|
|
||
| } |
40 changes: 40 additions & 0 deletions
40
hapi-fhir-base/src/main/java/ca/uhn/fhir/rest/param/SpecialAndListParam.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,40 @@ | ||
| package ca.uhn.fhir.rest.param; | ||
|
|
||
| import ca.uhn.fhir.util.CoverageIgnore; | ||
|
|
||
| /* | ||
| * #%L | ||
| * HAPI FHIR - Core Library | ||
| * %% | ||
| * Copyright (C) 2014 - 2018 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% | ||
| */ | ||
|
|
||
|
|
||
| public class SpecialAndListParam extends BaseAndListParam<SpecialOrListParam> { | ||
|
|
||
| @Override | ||
| SpecialOrListParam newInstance() { | ||
| return new SpecialOrListParam(); | ||
| } | ||
|
|
||
| @CoverageIgnore | ||
| @Override | ||
| public SpecialAndListParam addAnd(SpecialOrListParam theValue) { | ||
| addValue(theValue); | ||
| return this; | ||
| } | ||
|
|
||
| } |
41 changes: 41 additions & 0 deletions
41
hapi-fhir-base/src/main/java/ca/uhn/fhir/rest/param/SpecialOrListParam.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,41 @@ | ||
| package ca.uhn.fhir.rest.param; | ||
|
|
||
| import ca.uhn.fhir.util.CoverageIgnore; | ||
|
|
||
| /* | ||
| * #%L | ||
| * HAPI FHIR - Core Library | ||
| * %% | ||
| * Copyright (C) 2014 - 2018 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% | ||
| */ | ||
|
|
||
|
|
||
| public class SpecialOrListParam extends BaseOrListParam<SpecialOrListParam, SpecialParam> { | ||
|
|
||
| @CoverageIgnore | ||
| @Override | ||
| SpecialParam newInstance() { | ||
| return new SpecialParam(); | ||
| } | ||
|
|
||
| @CoverageIgnore | ||
| @Override | ||
| public SpecialOrListParam addOr(SpecialParam theParameter) { | ||
| add(theParameter); | ||
| return this; | ||
| } | ||
|
|
||
| } |
99 changes: 99 additions & 0 deletions
99
hapi-fhir-base/src/main/java/ca/uhn/fhir/rest/param/SpecialParam.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,99 @@ | ||
| package ca.uhn.fhir.rest.param; | ||
|
|
||
| /* | ||
| * #%L | ||
| * HAPI FHIR - Core Library | ||
| * %% | ||
| * Copyright (C) 2014 - 2018 University Health Network | ||
| * %% | ||
| * Licensed under the Apache License, Version 2.0 (the "License"); | ||
| * you may not use this file except in compliance with the License. | ||
| * You may obtain a copy of the License at | ||
| * | ||
| * http://www.apache.org/licenses/LICENSE-2.0 | ||
| * | ||
| * Unless required by applicable law or agreed to in writing, software | ||
| * distributed under the License is distributed on an "AS IS" BASIS, | ||
| * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
| * See the License for the specific language governing permissions and | ||
| * limitations under the License. | ||
| * #L% | ||
| */ | ||
|
|
||
| import ca.uhn.fhir.context.FhirContext; | ||
| import ca.uhn.fhir.model.primitive.UriDt; | ||
| import org.apache.commons.lang3.StringUtils; | ||
| import org.apache.commons.lang3.builder.ToStringBuilder; | ||
| import org.apache.commons.lang3.builder.ToStringStyle; | ||
|
|
||
| import static org.apache.commons.lang3.StringUtils.defaultString; | ||
|
|
||
| public class SpecialParam extends BaseParam /*implements IQueryParameterType*/ { | ||
|
|
||
| private String myValue; | ||
|
|
||
| /** | ||
| * Constructor | ||
| */ | ||
| public SpecialParam() { | ||
| super(); | ||
| } | ||
|
|
||
| @Override | ||
| String doGetQueryParameterQualifier() { | ||
| return null; | ||
| } | ||
|
|
||
| /** | ||
| * {@inheritDoc} | ||
| */ | ||
| @Override | ||
| String doGetValueAsQueryToken(FhirContext theContext) { | ||
| return ParameterUtil.escape(getValue()); | ||
| } | ||
|
|
||
| /** | ||
| * {@inheritDoc} | ||
| */ | ||
| @Override | ||
| void doSetValueAsQueryToken(FhirContext theContext, String theParamName, String theQualifier, String theParameter) { | ||
| setValue(ParameterUtil.unescape(theParameter)); | ||
| } | ||
|
|
||
| /** | ||
| * Returns the value for the token (generally the value to the right of the | ||
| * vertical bar on the URL) | ||
| */ | ||
| public String getValue() { | ||
| return myValue; | ||
| } | ||
|
|
||
| public String getValueNotNull() { | ||
| return defaultString(myValue); | ||
| } | ||
|
|
||
| public boolean isEmpty() { | ||
| return StringUtils.isEmpty(myValue); | ||
| } | ||
|
|
||
|
|
||
| public SpecialParam setValue(String theValue) { | ||
| myValue = theValue; | ||
| return this; | ||
| } | ||
|
|
||
| @Override | ||
| public String toString() { | ||
| ToStringBuilder builder = new ToStringBuilder(this, ToStringStyle.SHORT_PREFIX_STYLE); | ||
| builder.append("value", getValue()); | ||
| if (getMissing() != null) { | ||
| builder.append(":missing", getMissing()); | ||
| } | ||
| return builder.toString(); | ||
| } | ||
|
|
||
| private static String toSystemValue(UriDt theSystem) { | ||
| return theSystem.getValueAsString(); | ||
| } | ||
|
|
||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.