Made synchronization interfaces more dynamic

(no static parts of OpenMRS).
opensrp · Feb 6, 2019 · 91af303 · 91af303
1 parent 3dddf84
commit 91af303
Showing 1 changed file with 3 additions and 3 deletions.
diff --git a/fhir/src/main/java/org/dhis2/fhir/adapter/fhir/server/FhirServerSyncController.java b/fhir/src/main/java/org/dhis2/fhir/adapter/fhir/server/FhirServerSyncController.java
@@ -79,7 +79,7 @@ public FhirServerSyncController( @Nonnull FhirServerResourceRepository resourceR
         this.fhirResourceRepository = fhirResourceRepository;
     }
 
-    @RequestMapping( path = "/{fhirServerId}/ws/fhir/{resourceType}/{resourceId}", method = RequestMethod.DELETE )
+    @RequestMapping( path = "/{fhirServerId}/**/{resourceType}/{resourceId}", method = RequestMethod.DELETE )
     public ResponseEntity<byte[]> delete(
         @PathVariable( "fhirServerId" ) UUID fhirServerId, @PathVariable( "resourceType" ) String resourceType, @PathVariable( "resourceId" ) String resourceId,
         @RequestHeader( value = "Authorization", required = false ) String authorization )
@@ -95,7 +95,7 @@ public ResponseEntity<byte[]> delete(
         return new ResponseEntity<>( HttpStatus.NO_CONTENT );
     }
 
-    @RequestMapping( path = "/{fhirServerId}/ws/fhir/{resourceType}/{resourceId}", method = RequestMethod.GET )
+    @RequestMapping( path = "/{fhirServerId}/**/{resourceType}/{resourceId}", method = RequestMethod.GET )
     public ResponseEntity<byte[]> getRemoteResource( @PathVariable( "fhirServerId" ) UUID fhirServerId,
         @PathVariable( "resourceType" ) String resourceType, @PathVariable( "resourceId" ) String resourceId,
         @RequestHeader( value = "Authorization", required = false ) String authorization )
@@ -132,7 +132,7 @@ public ResponseEntity<byte[]> getRemoteResource( @PathVariable( "fhirServerId" )
         return new ResponseEntity<>( fhirResource.getBytes( Objects.requireNonNull( FHIR_JSON_MEDIA_TYPE.getCharset() ) ), headers, HttpStatus.OK );
     }
 
-    @RequestMapping( path = "/{fhirServerId}/ws/fhir/{resourceType}/{resourceId}", method = { RequestMethod.POST, RequestMethod.PUT } )
+    @RequestMapping( path = "/{fhirServerId}/**/{resourceType}/{resourceId}", method = { RequestMethod.POST, RequestMethod.PUT } )
     public ResponseEntity<byte[]> receiveWithPayload(
         @PathVariable( "fhirServerId" ) UUID fhirServerId, @PathVariable( "resourceType" ) String resourceType, @PathVariable( "resourceId" ) String resourceId,
         @RequestHeader( value = "Authorization", required = false ) String authorization, @Nonnull HttpEntity<byte[]> requestEntity )