Merge remote-tracking branch

'origin/issues/94_Stub_Implementation_Warnings' into develop

Author: hhund

codex-process-data-transfer/src/main/java/de/netzwerk_universitaetsmedizin/codex/processes/data_transfer/client/FttpClientFactory.java

@@ -35,6 +35,7 @@ private static final class FttpClientStub implements FttpClient
 	{
 		private static final Logger logger = LoggerFactory.getLogger(FttpClientStub.class);
 
+		private static final String DIC_PSEUDONYM = "source2/original2";
 		private static final Pattern DIC_PSEUDONYM_PATTERN = Pattern.compile(PSEUDONYM_PATTERN_STRING);
 
 		@Override
@@ -64,8 +65,9 @@ public Optional<String> getCrrPseudonym(String dicSourceAndPseudonym)
 		@Override
 		public Optional<String> getDicPseudonym(String bloomFilter)
 		{
-			logger.info("Requesting DIC pseudonym for bloom filter {} ", bloomFilter);
-			return Optional.of("source2/original2");
+			logger.warn("Returning simulated DIC pseudonym '{}' for bloom filter '{}', fTTP connection not configured.",
+					DIC_PSEUDONYM, bloomFilter);
+			return Optional.of(DIC_PSEUDONYM);
 		}
 
 		@Override

codex-process-data-transfer/src/main/java/de/netzwerk_universitaetsmedizin/codex/processes/data_transfer/client/fhir/GeccoFhirClientStub.java

@@ -57,7 +57,9 @@ public void storeBundle(Bundle bundle)
 	@Override
 	public PatientReferenceList getPatientReferencesWithNewData(DateWithPrecision exportFrom, Date exportTo)
 	{
-		logger.warn("Returning demo pseudonyms for {}", geccoClient.getLocalIdentifierValue());
+		logger.warn(
+				"Returning four simulated patient references for {}, connection to GECCO FHIR server not configured",
+				geccoClient.getLocalIdentifierValue());
 
 		PatientReference reference1 = PatientReference
 				.from(new Identifier().setSystem(NAMING_SYSTEM_NUM_CODEX_DIC_PSEUDONYM).setValue("dic_foo/bar"));
@@ -79,7 +81,9 @@ public PatientReferenceList getPatientReferencesWithNewData(DateWithPrecision ex
 	@Override
 	public Stream<DomainResource> getNewData(String pseudonym, DateWithPrecision exportFrom, Date exportTo)
 	{
-		logger.warn("Returning demo resources for {}", pseudonym);
+		logger.warn(
+				"Returning simulated GECCO FHIR resources (Patient, Condition, Observation) for {}, connection to GECCO FHIR server not configured",
+				pseudonym);
 
 		Patient p = geccoClient.getFhirContext().newJsonParser().parseResource(Patient.class, patient);
 		p.setIdElement(new IdType(UUID.randomUUID().toString()));
@@ -102,6 +106,9 @@ public Stream<DomainResource> getNewData(String pseudonym, DateWithPrecision exp
 	@Override
 	public Optional<Patient> getPatient(String reference)
 	{
+		logger.warn("Returning simulated patient resource for {}, connection to GECCO FHIR server not configured",
+				reference);
+
 		Patient p = geccoClient.getFhirContext().newJsonParser().parseResource(Patient.class, patient);
 		p.addIdentifier().setSystem(ConstantsDataTransfer.NAMING_SYSTEM_NUM_CODEX_BLOOM_FILTER).setValue(
 				"J75gYl+RiKSsxeu33tixBEEtFGCZwIEsWIKgvESaluvpSGBte/SBNZilz+sLSZdHSDKTL2J2d1yZsakqjtV5U2SMMJZ5IF3gEk1MT3sCRkxXEo1aJWKpnqndUTR+fvtSeMFj0y/O5yqrLV9zU79CNiTfZN5t1/6XGxZUXq2DovfCRrrpRxWjFwjKIDo0OkRANf7Mqp+Fsu0Un53JF57p/p1RLpWcJkC3xO+UslGbDo3mjgczdvxz0aLmWNA7/NIhk+Q50gxCX3B4QrntPfLLlBkrmIpsKRcLFVuYZik7pYZ9prd0qCLQ9tc8qiw1ry5kMfIvLnIS/FV36w==")
@@ -116,5 +123,7 @@ public Optional<Patient> getPatient(String reference)
 	public void updatePatient(Patient patient)
 	{
 		// Nothing to do in stub client
+		logger.info(
+				"Not updating patient resource in GECCO FHIR server, connection to GECCO FHIR server not configured");
 	}
 }