Combined rebased (#28)

* Invalid url check (#2)

* Fixed issue of notifications not being sent to Lab

* Reverted the changes to the Lab order format

* Auto update version number in  mediator registration info to module version

* Added check for invalid URLs before registering a subscription

* bug fix: removed extra brace

---------

Co-authored-by: moshonk <[email protected]>

* Check for existing subscription (#3)

* Fixed issue of notifications not being sent to Lab

* Reverted the changes to the Lab order format

* Auto update version number in  mediator registration info to module version

* Check for existing subscription

Added check for an existing subsription during registration to prevent duplicates

* Bug fix: missing semi-colon

---------

Co-authored-by: moshonk <[email protected]>

* Squashed commit of the following:

commit b632477
Author: moshonk <[email protected]>
Date:   Wed Sep 2 02:51:47 2020 +0300

    bug fix logging mesage

commit 6025cca
Author: moshonk <[email protected]>
Date:   Wed Sep 2 02:42:15 2020 +0300

    Catch subscriptions processing error

    Catch error that prevents processing of subsequent subscriptions when one of them fails

commit 596c555
Merge: eeae53d 5b3d87a
Author: moshonk <[email protected]>
Date:   Wed Sep 2 02:21:14 2020 +0300

    Merge branch 'check-for-existing-subscription' into HEAD

commit 5b3d87a
Author: moshonk <[email protected]>
Date:   Wed Sep 2 02:10:05 2020 +0300

    Bug fix: missing semi-colon

commit eeae53d
Merge: 7d37581 576b646
Author: moshonk <[email protected]>
Date:   Wed Sep 2 02:07:09 2020 +0300

    Merge branch 'check-for-existing-subscription'

commit 576b646
Author: moshonk <[email protected]>
Date:   Wed Sep 2 02:00:47 2020 +0300

    Check for existing subscription

    Added check for an existing subsription during registration to prevent duplicates

commit 7d37581
Author: moshonk <[email protected]>
Date:   Wed Sep 2 01:41:14 2020 +0300

    bug fix: removed extra brace

commit 612e938
Author: moshonk <[email protected]>
Date:   Wed Sep 2 01:15:51 2020 +0300

    Added check for invalid URLs before registering a subscription

commit d556d7c
Author: moshonk <[email protected]>
Date:   Thu Jun 25 23:38:51 2020 +0300

    Auto update version number in  mediator registration info to module version

commit 10ecdb0
Author: moshonk <[email protected]>
Date:   Thu Jun 25 23:03:36 2020 +0300

    Reverted the changes to the Lab order format

commit ed4f69e
Author: moshonk <[email protected]>
Date:   Thu Jun 25 00:23:32 2020 +0300

    Fixed issue of notifications not being sent to Lab

* parent 2cf1b87 (#7)

author moshonk <[email protected]> 1593033812 +0300
committer Piotr Mankowski <[email protected]> 1680641638 -0700

Fixed issue of notifications not being sent to Lab

Reverted the changes to the Lab order format

Added check for invalid URLs before registering a subscription

Bug fix: missing semi-colon

bug fix logging mesage

Updated the mediator to fix the IsantePlus-LNSP workflow issues

Co-authored-by: moshonk <[email protected]>

* Compilation fixes

* fix result

* update to isLabresult to work correctly

* Fixing newline encoding

* Server updates

* add build info

---------

Co-authored-by: moshonk <[email protected]>
Co-authored-by: Christina White <[email protected]>

docker-compose.yaml

@@ -4,6 +4,8 @@ services:
     container_name: xds-mediator
     hostname: xds-mediator
     image: ghcr.io/isanteplus/openhim-mediator-xds:local
+    build:
+      context: .
     ports:
       - "8050:8050"
       - "1044:1044"

pom.xml

@@ -80,6 +80,16 @@
       </executions>
     </plugin>
   </plugins>
+  <resources>
+    <resource>
+      <directory>src/main/resources-filtered</directory>
+      <filtering>true</filtering>
+    </resource>
+    <resource>
+      <directory>src/main/resources</directory>
+      <filtering>false</filtering>
+    </resource>
+  </resources>
 </build>
 <dependencies>
   <dependency>