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

Merge branch 'master' into documentOperation

This commit is contained in:
patrick-werner 2018-06-06 12:12:51 +02:00
parent 49bdff1862 eb1742f44a
commit 26b2ee9aa4
4 changed files with 26 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
hapi-fhir-base/src/main/java/ca/uhn/fhir/rest/api/Constants.java
View File

@ -274,6 +274,7 @@ public class Constants {
corsAllowedHeaders.add("Content-Type");
corsAllowedHeaders.add("Origin");
corsAllowedHeaders.add("Prefer");
corsAllowedHeaders.add("X-FHIR-Starter");
corsAllowedHeaders.add("X-Requested-With");
CORS_ALLOWED_HEADERS = Collections.unmodifiableSet(corsAllowedHeaders);

26
hapi-fhir-cli/hapi-fhir-cli-api/src/test/resources/import-csv-to-conceptmap-command-test-input.csv
View File

@ -1,13 +1,13 @@
SOURCE_CODE_SYSTEM,SOURCE_CODE_SYSTEM_VERSION,TARGET_CODE_SYSTEM,TARGET_CODE_SYSTEM_VERSION,SOURCE_CODE,SOURCE_DISPLAY,TARGET_CODE,TARGET_DISPLAY,EQUIVALENCE,COMMENT
http://example.com/codesystem/1,Version 1s,http://example.com/codesystem/2,Version 2t,Code 1a,Display 1a,Code 2a,Display 2a,equal,2a This is a comment.
http://example.com/codesystem/1,Version 1s,http://example.com/codesystem/2,Version 2t,Code 1b,Display 1b,Code 2b,Display 2b,equal,2b This is a comment.
http://example.com/codesystem/1,Version 1s,http://example.com/codesystem/2,Version 2t,Code 1c,Display 1c,Code 2c,Display 2c,equal,2c This is a comment.
http://example.com/codesystem/1,Version 1s,http://example.com/codesystem/2,Version 2t,Code 1d,Display 1d,Code 2d,Display 2d,equal,2d This is a comment.
http://example.com/codesystem/1,Version 1s,http://example.com/codesystem/3,Version 3t,Code 1a,Display 1a,Code 3a,Display 3a,equal,3a This is a comment.
http://example.com/codesystem/1,Version 1s,http://example.com/codesystem/3,Version 3t,Code 1b,Display 1b,Code 3b,Display 3b,equal,3b This is a comment.
http://example.com/codesystem/1,Version 1s,http://example.com/codesystem/3,Version 3t,Code 1c,Display 1c,Code 3c,Display 3c,equal,3c This is a comment.
http://example.com/codesystem/1,Version 1s,http://example.com/codesystem/3,Version 3t,Code 1d,Display 1d,Code 3d,Display 3d,equal,3d This is a comment.
http://example.com/codesystem/2,Version 2s,http://example.com/codesystem/3,Version 3t,Code 2a,Display 2a,Code 3a,Display 3a,equal,3a This is a comment.
http://example.com/codesystem/2,Version 2s,http://example.com/codesystem/3,Version 3t,Code 2b,Display 2b,Code 3b,Display 3b,equal,3b This is a comment.
http://example.com/codesystem/2,Version 2s,http://example.com/codesystem/3,Version 3t,Code 2c,Display 2c,Code 3c,Display 3c,equal,3c This is a comment.
http://example.com/codesystem/2,Version 2s,http://example.com/codesystem/3,Version 3t,Code 2d,Display 2d,Code 3d,Display 3d,equal,3d This is a comment.
"SOURCE_CODE_SYSTEM","SOURCE_CODE_SYSTEM_VERSION","TARGET_CODE_SYSTEM","TARGET_CODE_SYSTEM_VERSION","SOURCE_CODE","SOURCE_DISPLAY","TARGET_CODE","TARGET_DISPLAY","EQUIVALENCE","COMMENT"
"http://example.com/codesystem/1","Version 1s","http://example.com/codesystem/2","Version 2t","Code 1a","Display 1a","Code 2a","Display 2a","equal","2a This is a comment."
"http://example.com/codesystem/1","Version 1s","http://example.com/codesystem/2","Version 2t","Code 1b","Display 1b","Code 2b","Display 2b","equal","2b This is a comment."
"http://example.com/codesystem/1","Version 1s","http://example.com/codesystem/2","Version 2t","Code 1c","Display 1c","Code 2c","Display 2c","equal","2c This is a comment."
"http://example.com/codesystem/1","Version 1s","http://example.com/codesystem/2","Version 2t","Code 1d","Display 1d","Code 2d","Display 2d","equal","2d This is a comment."
"http://example.com/codesystem/1","Version 1s","http://example.com/codesystem/3","Version 3t","Code 1a","Display 1a","Code 3a","Display 3a","equal","3a This is a comment."
"http://example.com/codesystem/1","Version 1s","http://example.com/codesystem/3","Version 3t","Code 1b","Display 1b","Code 3b","Display 3b","equal","3b This is a comment."
"http://example.com/codesystem/1","Version 1s","http://example.com/codesystem/3","Version 3t","Code 1c","Display 1c","Code 3c","Display 3c","equal","3c This is a comment."
"http://example.com/codesystem/1","Version 1s","http://example.com/codesystem/3","Version 3t","Code 1d","Display 1d","Code 3d","Display 3d","equal","3d This is a comment."
"http://example.com/codesystem/2","Version 2s","http://example.com/codesystem/3","Version 3t","Code 2a","Display 2a","Code 3a","Display 3a","equal","3a This is a comment."
"http://example.com/codesystem/2","Version 2s","http://example.com/codesystem/3","Version 3t","Code 2b","Display 2b","Code 3b","Display 3b","equal","3b This is a comment."
"http://example.com/codesystem/2","Version 2s","http://example.com/codesystem/3","Version 3t","Code 2c","Display 2c","Code 3c","Display 3c","equal","3c This is a comment."
"http://example.com/codesystem/2","Version 2s","http://example.com/codesystem/3","Version 3t","Code 2d","Display 2d","Code 3d","Display 3d","equal","3d This is a comment."

1 SOURCE_CODE_SYSTEM SOURCE_CODE_SYSTEM_VERSION TARGET_CODE_SYSTEM TARGET_CODE_SYSTEM_VERSION SOURCE_CODE SOURCE_DISPLAY TARGET_CODE TARGET_DISPLAY EQUIVALENCE COMMENT
2 http://example.com/codesystem/1 Version 1s http://example.com/codesystem/2 Version 2t Code 1a Display 1a Code 2a Display 2a equal 2a This is a comment.
3 http://example.com/codesystem/1 Version 1s http://example.com/codesystem/2 Version 2t Code 1b Display 1b Code 2b Display 2b equal 2b This is a comment.
4 http://example.com/codesystem/1 Version 1s http://example.com/codesystem/2 Version 2t Code 1c Display 1c Code 2c Display 2c equal 2c This is a comment.
5 http://example.com/codesystem/1 Version 1s http://example.com/codesystem/2 Version 2t Code 1d Display 1d Code 2d Display 2d equal 2d This is a comment.
6 http://example.com/codesystem/1 Version 1s http://example.com/codesystem/3 Version 3t Code 1a Display 1a Code 3a Display 3a equal 3a This is a comment.
7 http://example.com/codesystem/1 Version 1s http://example.com/codesystem/3 Version 3t Code 1b Display 1b Code 3b Display 3b equal 3b This is a comment.
8 http://example.com/codesystem/1 Version 1s http://example.com/codesystem/3 Version 3t Code 1c Display 1c Code 3c Display 3c equal 3c This is a comment.
9 http://example.com/codesystem/1 Version 1s http://example.com/codesystem/3 Version 3t Code 1d Display 1d Code 3d Display 3d equal 3d This is a comment.
10 http://example.com/codesystem/2 Version 2s http://example.com/codesystem/3 Version 3t Code 2a Display 2a Code 3a Display 3a equal 3a This is a comment.
11 http://example.com/codesystem/2 Version 2s http://example.com/codesystem/3 Version 3t Code 2b Display 2b Code 3b Display 3b equal 3b This is a comment.
12 http://example.com/codesystem/2 Version 2s http://example.com/codesystem/3 Version 3t Code 2c Display 2c Code 3c Display 3c equal 3c This is a comment.
13 http://example.com/codesystem/2 Version 2s http://example.com/codesystem/3 Version 3t Code 2d Display 2d Code 3d Display 3d equal 3d This is a comment.

2
hapi-fhir-jpaserver-example/src/main/webapp/WEB-INF/web.xml
View File

@ -76,7 +76,7 @@
<init-param>
<description>A comma separated list of allowed headers when making a non simple CORS request.</description>
<param-name>cors.allowed.headers</param-name>
<param-value>X-FHIR-Starter,Origin,Accept,X-Requested-With,Content-Type,Access-Control-Request-Method,Access-Control-Request-Headers,Prefer</param-value>
<param-value>Accept,Access-Control-Request-Headers,Access-Control-Request-Method,Cache-Control,Content-Type,Origin,Prefer,X-FHIR-Starter,X-Requested-With</param-value>
</init-param>
<init-param>
<description>A comma separated list non-standard response headers that will be exposed to XHR2 object.</description>

14
pom.xml
View File

@ -60,8 +60,6 @@
<enabled>false</enabled>
</snapshots>
</repository>
<!--
Snapshots should generally not be needed
<repository>
<id>oss-snapshot</id>
<url>https://oss.sonatype.org/content/repositories/snapshots/</url>
@ -69,7 +67,6 @@
<enabled>true</enabled>
</snapshots>
</repository>
-->
</repositories>
<dependencies>
@ -1214,6 +1211,17 @@
</dependencies>
</dependencyManagement>
<pluginRepositories>
<pluginRepository>
<id>ossrh</id>
<name>Sonatype</name>
<url>https://oss.sonatype.org/content/repositories/snapshots</url>
<snapshots>
<enabled>true</enabled>
</snapshots>
</pluginRepository>
</pluginRepositories>
<build>
<pluginManagement>
<plugins>