2014-03-03 18:22:14 -05:00
|
|
|
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
|
2022-10-03 22:40:09 -04:00
|
|
|
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
|
2014-02-20 16:32:04 -05:00
|
|
|
<modelVersion>4.0.0</modelVersion>
|
|
|
|
|
|
|
|
<parent>
|
|
|
|
<groupId>ca.uhn.hapi.fhir</groupId>
|
|
|
|
<artifactId>hapi-fhir</artifactId>
|
6486 implement patient merge (#6568)
* begin with failing test
* wpi merge operation provider
* wip code resolve references and some refactoring
* respect status code set in providers
* more validation and code to update resources after refs are updated
* added source-delete parameter and some validation tests on result-patient
* update test
* update test
* return target patient as output parameter, do not add replacedby link to target if src is to be deleted
* output definition
* ignore identifiers in ref, more unit tests, return target in preview mode
* output definition
* return input parameters in the merge operation output
* copy identifiers from source to target (no duplicate check)
* add shared identifier
* add shared identifier
* moar asserts
* moar asserts
* fixing result patient
* fixing result patient
* fixing result patient
* add duplicate check when copying source identifiers to target
* copy result-patient before passing it to service
* add preview to test
* update preview asserts
* move IReplaceReferencesSvc to storage-package, and call replaceReference in patient merge
* moar tests
* cleanup
* add task test
* add replace references test
* kebab-case replace references
* add sync -> async switch
* test
* test
* start migrating to stream
* validate result-patient does not have link to source if delete-source is true
* add update count to msg in preview mode
* spotless
* change page size -> batch size and create new default max in storage settings
* spotless
* switched to patch transaction
* switched to patch transaction
* switched to patch transaction
* switched to patch transaction
* strip version from returned task
* spotless
* spotless
* async replace references test passes
* align tests
* test small batch size
* do src and target updates in trx, add validation src is not already replaced
* start building batch 2
improve dao
* start building batch 2
improve dao
* start building batch 2
improve dao
* move test setup out to helper
* move replace references tests out
* switch helper to use dao
* incresed unit test coverage
* build out batch
* build out batch
* update test to add link to result-patient only if the source is not to be deleted
* batch passes test
* batch passes test
* batch passes test
* made patient-merge return the Task returned from replace references
* batch passes test
* batch passes test
* consolidate async and sync supporting methods into a single storage service
* consolidate async and sync supporting methods into a single storage service
* add merge batch job
* add merge batch job
* added FIXMES for ED
* added FIXMES for ED
* update test to not validate task in preview mode
* mark identfier copied from source to target as old
* copyright headers
* runMaintenancePass before checking merge task status, and renamed test method for merge
* fix test
* fix test
* default
* invoke async merge job in merge service
* starting work on new docs
* starting work on new docs
* document $replace-references
* separate default from max
* fixme
* moar fixme
* moar fixme
* ken last fixme
* return 202 status on async merge, update MergeBatchTest to do more validations
* async success message, inject mergeservice, add async merge unit tests
* make validatePatchResultBundle static again
* added test for adding reference while merge in progress, and merge error handler
* fixed
* fixed
* added error handler to replace references job
* review
* javadoc
* organize imports
* make ValidationResult immutable
* make ValidationResult immutable
* rename ReplaceReferencesRequest
* rename ReplaceReferencesRequest
* rename MergeResourceHelper
* rename MergeResourceHelper
* javadoc
* split merge validation service out from merge service
* split merge validation service out from merge service
* split merge validation service out from merge service
* review feedback
* review feedback
* rename param constants
* rename param constants
* remove IdentifierUtil for visibility
* remove IdentifierUtil for visibility
* final review of hapi side
* review feedback
* review feedback
* fix checkstyle errors, rename MergeOperationInputParameters and add Msg.code
* fix replace reference parameter type, and some copyright headers
* review feedback
* review feedback
* review feedback
* review feedback
* review feedback
* review feedback
* review feedback
* review feedback
* move $merge into JPA R4
* move $merge into JPA R4
* still need to return 412
* still need to return 412
* return 412
* moar tests
* moar tests
* fix async batch size
* fix async batch size
* fix async batch size
* exception code
* exception code
* fix bean wiring
* fix bean wiring
* fix test
* fix test
* fix test
* fix test
* fix test
* bump pom versions
---------
Co-authored-by: Ken Stevens <ken@smiledigitalhealth.com>
2024-12-24 17:47:48 -05:00
|
|
|
<version>7.7.16-SNAPSHOT</version>
|
2023-04-02 11:50:20 -04:00
|
|
|
|
2014-02-20 16:32:04 -05:00
|
|
|
<relativePath>../pom.xml</relativePath>
|
|
|
|
</parent>
|
|
|
|
|
2014-02-26 17:13:49 -05:00
|
|
|
<artifactId>hapi-tinder-plugin</artifactId>
|
2014-03-03 18:22:14 -05:00
|
|
|
<packaging>maven-plugin</packaging>
|
2014-02-20 16:32:04 -05:00
|
|
|
|
2014-03-03 18:22:14 -05:00
|
|
|
<name>HAPI Tinder Plugin</name>
|
2014-02-20 16:32:04 -05:00
|
|
|
|
2022-10-03 22:40:09 -04:00
|
|
|
<properties>
|
2024-12-11 07:51:50 -08:00
|
|
|
<previous_hapi_fhir_version>7.6.0</previous_hapi_fhir_version>
|
2022-10-03 22:40:09 -04:00
|
|
|
</properties>
|
|
|
|
|
2014-02-20 16:32:04 -05:00
|
|
|
<dependencies>
|
|
|
|
<dependency>
|
2014-03-03 18:22:14 -05:00
|
|
|
<groupId>ca.uhn.hapi.fhir</groupId>
|
|
|
|
<artifactId>hapi-fhir-base</artifactId>
|
2017-01-29 19:22:28 +01:00
|
|
|
<version>${project.version}</version>
|
2014-02-23 18:13:59 -05:00
|
|
|
</dependency>
|
2017-08-13 14:39:47 -04:00
|
|
|
<dependency>
|
|
|
|
<groupId>ca.uhn.hapi.fhir</groupId>
|
|
|
|
<artifactId>hapi-fhir-server</artifactId>
|
|
|
|
<version>${project.version}</version>
|
|
|
|
</dependency>
|
2023-12-03 11:15:37 -05:00
|
|
|
<dependency>
|
|
|
|
<groupId>ca.uhn.hapi.fhir</groupId>
|
|
|
|
<artifactId>hapi-fhir-jpa</artifactId>
|
|
|
|
<version>${project.version}</version>
|
|
|
|
</dependency>
|
|
|
|
<!--
|
2015-03-16 17:02:44 -04:00
|
|
|
Because Tinder is a part of the HAPI FHIR build process (it generates
|
2024-12-09 22:44:20 -08:00
|
|
|
a bunch of the actual HAPI structure code), but also uses HAPI FHIR
|
2015-03-16 17:02:44 -04:00
|
|
|
in order to run (e.g. to load ValueSet resources), we keep the dependencies
|
|
|
|
for the structures
|
2024-12-09 22:44:20 -08:00
|
|
|
a version behind the main library. This is weird, but it works.
|
2015-03-16 17:02:44 -04:00
|
|
|
-->
|
2014-12-18 08:21:07 -05:00
|
|
|
<dependency>
|
|
|
|
<groupId>ca.uhn.hapi.fhir</groupId>
|
2015-03-16 17:02:44 -04:00
|
|
|
<artifactId>hapi-fhir-structures-dstu2</artifactId>
|
2022-10-03 22:40:09 -04:00
|
|
|
<version>${previous_hapi_fhir_version}</version>
|
2017-01-29 19:22:28 +01:00
|
|
|
<exclusions>
|
|
|
|
<exclusion>
|
|
|
|
<groupId>ca.uhn.hapi.fhir</groupId>
|
|
|
|
<artifactId>hapi-fhir-base</artifactId>
|
|
|
|
</exclusion>
|
|
|
|
</exclusions>
|
2015-11-29 11:43:09 -05:00
|
|
|
</dependency>
|
2016-12-11 17:39:05 -05:00
|
|
|
<dependency>
|
|
|
|
<groupId>ca.uhn.hapi.fhir</groupId>
|
|
|
|
<artifactId>hapi-fhir-structures-dstu2.1</artifactId>
|
2022-10-03 22:40:09 -04:00
|
|
|
<version>${previous_hapi_fhir_version}</version>
|
2017-01-29 19:22:28 +01:00
|
|
|
<exclusions>
|
|
|
|
<exclusion>
|
|
|
|
<groupId>ca.uhn.hapi.fhir</groupId>
|
|
|
|
<artifactId>hapi-fhir-base</artifactId>
|
|
|
|
</exclusion>
|
|
|
|
</exclusions>
|
2016-12-11 17:39:05 -05:00
|
|
|
</dependency>
|
2015-11-29 11:43:09 -05:00
|
|
|
<dependency>
|
|
|
|
<groupId>ca.uhn.hapi.fhir</groupId>
|
2016-02-01 08:55:58 -05:00
|
|
|
<artifactId>hapi-fhir-structures-dstu3</artifactId>
|
2022-11-07 13:42:39 -05:00
|
|
|
<version>${project.version}</version>
|
2015-07-25 11:56:47 -04:00
|
|
|
</dependency>
|
|
|
|
<dependency>
|
|
|
|
<groupId>ca.uhn.hapi.fhir</groupId>
|
|
|
|
<artifactId>hapi-fhir-structures-hl7org-dstu2</artifactId>
|
2022-11-07 13:42:39 -05:00
|
|
|
<version>${project.version}</version>
|
2018-05-12 19:35:42 -04:00
|
|
|
</dependency>
|
|
|
|
<dependency>
|
|
|
|
<groupId>ca.uhn.hapi.fhir</groupId>
|
|
|
|
<artifactId>hapi-fhir-structures-r4</artifactId>
|
2022-11-07 13:42:39 -05:00
|
|
|
<version>${project.version}</version>
|
2022-10-20 16:57:06 -04:00
|
|
|
</dependency>
|
|
|
|
<dependency>
|
|
|
|
<groupId>ca.uhn.hapi.fhir</groupId>
|
|
|
|
<artifactId>hapi-fhir-structures-r4b</artifactId>
|
2022-11-07 13:42:39 -05:00
|
|
|
<version>${project.version}</version>
|
2015-09-30 16:35:51 -04:00
|
|
|
</dependency>
|
2019-08-06 17:30:31 -04:00
|
|
|
<dependency>
|
|
|
|
<groupId>ca.uhn.hapi.fhir</groupId>
|
|
|
|
<artifactId>hapi-fhir-structures-r5</artifactId>
|
2022-11-07 13:42:39 -05:00
|
|
|
<version>${project.version}</version>
|
2019-08-06 17:30:31 -04:00
|
|
|
</dependency>
|
2015-09-30 16:35:51 -04:00
|
|
|
<dependency>
|
|
|
|
<groupId>ca.uhn.hapi.fhir</groupId>
|
|
|
|
<artifactId>hapi-fhir-validation-resources-dstu2</artifactId>
|
2022-11-07 13:42:39 -05:00
|
|
|
<version>${project.version}</version>
|
2015-11-29 11:43:09 -05:00
|
|
|
</dependency>
|
|
|
|
<dependency>
|
|
|
|
<groupId>ca.uhn.hapi.fhir</groupId>
|
2016-02-01 08:55:58 -05:00
|
|
|
<artifactId>hapi-fhir-validation-resources-dstu3</artifactId>
|
2022-11-07 13:42:39 -05:00
|
|
|
<version>${project.version}</version>
|
2018-01-12 18:59:43 -05:00
|
|
|
</dependency>
|
|
|
|
<dependency>
|
|
|
|
<groupId>ca.uhn.hapi.fhir</groupId>
|
|
|
|
<artifactId>hapi-fhir-validation-resources-r4</artifactId>
|
2022-11-07 13:42:39 -05:00
|
|
|
<version>${project.version}</version>
|
2014-10-16 13:41:57 -04:00
|
|
|
</dependency>
|
2022-10-24 15:42:29 -07:00
|
|
|
<dependency>
|
|
|
|
<groupId>ca.uhn.hapi.fhir</groupId>
|
|
|
|
<artifactId>hapi-fhir-validation-resources-r5</artifactId>
|
2022-11-07 13:42:39 -05:00
|
|
|
<version>${project.version}</version>
|
2022-10-24 15:42:29 -07:00
|
|
|
</dependency>
|
2014-02-20 16:32:04 -05:00
|
|
|
<dependency>
|
|
|
|
<groupId>org.apache.velocity</groupId>
|
2021-05-01 17:16:15 -04:00
|
|
|
<artifactId>velocity-engine-core</artifactId>
|
2017-01-29 19:22:28 +01:00
|
|
|
</dependency>
|
|
|
|
<dependency>
|
|
|
|
<artifactId>commons-lang</artifactId>
|
|
|
|
<groupId>commons-lang</groupId>
|
2021-05-02 12:14:32 -04:00
|
|
|
<version>2.6</version>
|
2014-02-20 16:32:04 -05:00
|
|
|
</dependency>
|
|
|
|
|
2014-08-25 09:11:28 -04:00
|
|
|
<dependency>
|
2014-10-16 13:41:57 -04:00
|
|
|
<groupId>com.google.guava</groupId>
|
|
|
|
<artifactId>guava</artifactId>
|
2014-08-25 09:11:28 -04:00
|
|
|
</dependency>
|
2014-02-20 16:32:04 -05:00
|
|
|
|
|
|
|
<!-- General -->
|
|
|
|
<dependency>
|
|
|
|
<groupId>org.apache.commons</groupId>
|
|
|
|
<artifactId>commons-lang3</artifactId>
|
|
|
|
</dependency>
|
2014-03-03 18:22:14 -05:00
|
|
|
<dependency>
|
|
|
|
<groupId>commons-io</groupId>
|
|
|
|
<artifactId>commons-io</artifactId>
|
|
|
|
</dependency>
|
2014-03-13 17:33:12 -04:00
|
|
|
|
2015-12-13 22:44:41 -05:00
|
|
|
<dependency>
|
|
|
|
<groupId>org.springframework</groupId>
|
|
|
|
<artifactId>spring-context</artifactId>
|
2017-01-29 19:22:28 +01:00
|
|
|
<exclusions>
|
|
|
|
<exclusion>
|
|
|
|
<groupId>commons-logging</groupId>
|
|
|
|
<artifactId>commons-logging</artifactId>
|
|
|
|
</exclusion>
|
|
|
|
</exclusions>
|
2015-12-13 22:44:41 -05:00
|
|
|
</dependency>
|
|
|
|
|
2014-02-20 16:32:04 -05:00
|
|
|
<!-- Logging -->
|
|
|
|
<dependency>
|
|
|
|
<groupId>org.slf4j</groupId>
|
|
|
|
<artifactId>slf4j-api</artifactId>
|
|
|
|
</dependency>
|
|
|
|
<dependency>
|
|
|
|
<groupId>ch.qos.logback</groupId>
|
|
|
|
<artifactId>logback-classic</artifactId>
|
|
|
|
<optional>true</optional>
|
|
|
|
</dependency>
|
|
|
|
|
|
|
|
<!-- Maven -->
|
|
|
|
<dependency>
|
|
|
|
<groupId>org.apache.maven</groupId>
|
2024-12-09 22:44:20 -08:00
|
|
|
<artifactId>maven-core</artifactId>
|
|
|
|
<version>3.9.9</version>
|
2014-02-20 16:32:04 -05:00
|
|
|
</dependency>
|
|
|
|
<dependency>
|
|
|
|
<groupId>org.apache.maven</groupId>
|
|
|
|
<artifactId>maven-plugin-api</artifactId>
|
2023-12-21 11:54:33 -05:00
|
|
|
<scope>provided</scope>
|
2014-02-24 13:55:44 -05:00
|
|
|
</dependency>
|
|
|
|
<dependency>
|
2014-03-03 18:22:14 -05:00
|
|
|
<groupId>org.apache.maven.plugin-tools</groupId>
|
|
|
|
<artifactId>maven-plugin-annotations</artifactId>
|
|
|
|
<scope>provided</scope>
|
2014-02-24 13:55:44 -05:00
|
|
|
</dependency>
|
2016-03-24 13:16:52 -07:00
|
|
|
|
|
|
|
<!-- Ant tasks -->
|
|
|
|
<dependency>
|
|
|
|
<groupId>org.apache.ant</groupId>
|
|
|
|
<artifactId>ant</artifactId>
|
2022-02-07 07:56:25 -05:00
|
|
|
<version>1.10.11</version>
|
2016-03-24 13:16:52 -07:00
|
|
|
</dependency>
|
2022-10-03 22:40:09 -04:00
|
|
|
|
2015-04-01 16:03:54 -04:00
|
|
|
<!-- This is just used for -->
|
|
|
|
<dependency>
|
|
|
|
<groupId>org.ini4j</groupId>
|
|
|
|
<artifactId>ini4j</artifactId>
|
|
|
|
<version>0.5.4</version>
|
|
|
|
<scope>test</scope>
|
|
|
|
</dependency>
|
|
|
|
|
2017-05-25 15:24:47 -04:00
|
|
|
<dependency>
|
|
|
|
<groupId>commons-codec</groupId>
|
|
|
|
<artifactId>commons-codec</artifactId>
|
2021-05-02 12:14:32 -04:00
|
|
|
<version>1.15</version>
|
2017-05-25 15:24:47 -04:00
|
|
|
</dependency>
|
|
|
|
|
2023-12-03 11:15:37 -05:00
|
|
|
<!-- Hibernate deps -->
|
|
|
|
<dependency>
|
|
|
|
<groupId>org.hibernate.orm</groupId>
|
|
|
|
<artifactId>hibernate-core</artifactId>
|
|
|
|
</dependency>
|
|
|
|
<dependency>
|
|
|
|
<groupId>org.hibernate.orm</groupId>
|
|
|
|
<artifactId>hibernate-ant</artifactId>
|
|
|
|
</dependency>
|
|
|
|
<dependency>
|
|
|
|
<groupId>org.springframework</groupId>
|
|
|
|
<artifactId>spring-orm</artifactId>
|
|
|
|
</dependency>
|
|
|
|
<dependency>
|
|
|
|
<groupId>com.h2database</groupId>
|
|
|
|
<artifactId>h2</artifactId>
|
|
|
|
</dependency>
|
2017-05-25 15:24:47 -04:00
|
|
|
|
2014-02-20 16:32:04 -05:00
|
|
|
</dependencies>
|
|
|
|
|
2014-03-13 17:33:12 -04:00
|
|
|
<reporting>
|
|
|
|
<plugins>
|
|
|
|
<plugin>
|
|
|
|
<groupId>org.apache.maven.plugins</groupId>
|
|
|
|
<artifactId>maven-plugin-plugin</artifactId>
|
|
|
|
<reportSets>
|
|
|
|
<reportSet>
|
|
|
|
<reports>
|
|
|
|
<report>report</report>
|
|
|
|
</reports>
|
|
|
|
</reportSet>
|
|
|
|
</reportSets>
|
|
|
|
</plugin>
|
|
|
|
</plugins>
|
|
|
|
</reporting>
|
|
|
|
|
2014-02-20 16:32:04 -05:00
|
|
|
<build>
|
|
|
|
<plugins>
|
2014-03-13 17:33:12 -04:00
|
|
|
<plugin>
|
|
|
|
<groupId>org.apache.maven.plugins</groupId>
|
|
|
|
<artifactId>maven-plugin-plugin</artifactId>
|
|
|
|
<configuration>
|
|
|
|
<!-- see http://jira.codehaus.org/browse/MNG-5346 -->
|
|
|
|
<skipErrorNoDescriptorsFound>true</skipErrorNoDescriptorsFound>
|
2024-11-10 09:21:24 -05:00
|
|
|
<goalPrefix>hapi-tinder</goalPrefix>
|
2014-03-13 17:33:12 -04:00
|
|
|
</configuration>
|
|
|
|
|
|
|
|
<executions>
|
|
|
|
<execution>
|
|
|
|
<id>mojo-descriptor</id>
|
|
|
|
<goals>
|
|
|
|
<goal>descriptor</goal>
|
|
|
|
</goals>
|
|
|
|
</execution>
|
|
|
|
</executions>
|
|
|
|
</plugin>
|
2014-02-20 16:32:04 -05:00
|
|
|
</plugins>
|
|
|
|
</build>
|
|
|
|
|
|
|
|
</project>
|
2014-03-03 18:22:14 -05:00
|
|
|
|