Mentions légales du service

Skip to content
Snippets Groups Projects
Commit 03635944 authored by Alexandre Pocinho's avatar Alexandre Pocinho
Browse files

SonarLint correction for quality gate

parent 0b5ae3c1
No related branches found
No related tags found
3 merge requests!10Remove hardcoded mandatory targetSytem + upgrade HAPI FHIR version,!9Implements ITI-104 transaction + external validation,!8Implements ITI-104 features with external validation process
Hide whitespace changes
Inline Side-by-side
Showing
with 35 additions and 56 deletions
matchbox-client/src/main/java/net/ihe/gazelle/matchbox/client/interlay/validation/CustomPatientValidationService.java
+ 10
− 5
View file @ 03635944
......@@ -57,15 +57,20 @@ public class CustomPatientValidationService implements ValidationService {
OperationOutcome operationOutcome = convertStringIntoFhirResource(OperationOutcome.class, response);
validationReport.setOverallResult(ValidationTestResult.PASSED);
for (OperationOutcome.OperationOutcomeIssueComponent issue : operationOutcome.getIssue()) {
switch (issue.getSeverity()) {
case FATAL, ERROR, NULL -> {
validationReport.setOverallResult(ValidationTestResult.FAILED);
return;
}
if (isErrorOrFatal(issue.getSeverity())) {
validationReport.setOverallResult(ValidationTestResult.FAILED);
return;
}
}
}
private boolean isErrorOrFatal(OperationOutcome.IssueSeverity severity) {
return switch (severity) {
case FATAL, ERROR, NULL -> true;
default -> false;
};
}
public List<ValidationProfile> getValidationProfiles() {
return new ArrayList<>();
}
......
pixm-connector-service/src/main/java/net/ihe/gazelle/application/ConfigurationAdapter.java
+ 1
− 8
View file @ 03635944
......@@ -2,17 +2,10 @@ package net.ihe.gazelle.application;
public class ConfigurationAdapter {
public ConfigurationAdapter() {
}
public String getProfileIdCreateUpdateDeleteIti104() {
return System.getenv("PROFILE_ID_CREATE_UPDATE_DELETE_ITI_104");
}
public String getProfileIdCreateUpdateDeleteIti104() { return System.getenv("PROFILE_ID_CREATE_UPDATE_DELETE_ITI_104"); }
public String getProfileIdPostIti83() {
return System.getenv("PROFILE_ID_POST_ITI_83");
}
public String getProfileIdGetIti83() {
return System.getenv("PROFILE_ID_GET_ITI_83");
}
......
pixm-connector-service/src/main/java/net/ihe/gazelle/application/PatientRegistryFeedClient.java
+ 12
− 10
View file @ 03635944
......@@ -3,6 +3,8 @@ package net.ihe.gazelle.application;
import ca.uhn.fhir.rest.server.exceptions.InternalErrorException;
import ca.uhn.fhir.rest.server.exceptions.InvalidRequestException;
import ca.uhn.fhir.rest.server.exceptions.ResourceGoneException;
import jakarta.inject.Named;
import jakarta.xml.ws.WebServiceException;
import net.ihe.gazelle.adapter.connector.ConversionException;
import net.ihe.gazelle.adapter.connector.FhirToGazelleRegistryConverter;
import net.ihe.gazelle.adapter.connector.GazelleRegistryToFhirConverter;
......@@ -25,8 +27,6 @@ import org.hl7.fhir.r4.model.Bundle;
import org.hl7.fhir.r4.model.Identifier;
import org.hl7.fhir.r4.model.Patient;
import jakarta.inject.Named;
import jakarta.xml.ws.WebServiceException;
import java.net.InetAddress;
import java.net.MalformedURLException;
import java.net.URL;
......@@ -42,6 +42,8 @@ public class PatientRegistryFeedClient {
public static final String MANDATORY_FIELD_ARE_MISSING = "Mandatory fields are missing: family name, Date of Birth or Gender";
private static final String UUID = "PatientPIXmFeed";
private static final GazelleLogger logger = GazelleLoggerFactory.getInstance().getLogger(PatientRegistryFeedClient.class);
public static final String UUID_CANNOT_BE_NULL_OR_EMPTY = "The uuid cannot be null or empty";
public static final String CANNOT_PROCEED_TO_DELETE = "Cannot proceed to delete";
private String serverUrl;
private OperationalPreferencesService operationalPreferencesService;
private PatientFeedClient client;
......@@ -263,10 +265,10 @@ public class PatientRegistryFeedClient {
}
} catch (PatientFeedException exception) {
switch (exception.getCause().getMessage()) {
case "The uuid cannot be null or empty" ->
throw new InternalErrorException("The uuid cannot be null or empty", exception);
case "Cannot proceed to delete" ->
throw new InternalErrorException("Cannot proceed to delete", exception);
case UUID_CANNOT_BE_NULL_OR_EMPTY ->
throw new InternalErrorException(UUID_CANNOT_BE_NULL_OR_EMPTY, exception);
case CANNOT_PROCEED_TO_DELETE ->
throw new InternalErrorException(CANNOT_PROCEED_TO_DELETE, exception);
default -> treatClientBaseErrors(exception);
}
}
......@@ -289,10 +291,10 @@ public class PatientRegistryFeedClient {
}
} catch (PatientFeedException exception) {
switch (exception.getCause().getMessage()) {
case "The uuid cannot be null or empty" ->
throw new InternalErrorException("The uuid cannot be null or empty", exception);
case "Cannot proceed to delete" ->
throw new InternalErrorException("Cannot proceed to delete", exception);
case UUID_CANNOT_BE_NULL_OR_EMPTY ->
throw new InternalErrorException(UUID_CANNOT_BE_NULL_OR_EMPTY, exception);
case CANNOT_PROCEED_TO_DELETE ->
throw new InternalErrorException(CANNOT_PROCEED_TO_DELETE, exception);
default -> treatClientBaseErrors(exception);
}
}
......
pixm-connector-service/src/main/java/net/ihe/gazelle/business/provider/IhePatientResourceProvider.java
+ 1
− 1
View file @ 03635944
......@@ -246,7 +246,7 @@ public class IhePatientResourceProvider implements IResourceProvider {
}
private EntityIdentifier createEntityIdentifierFromConditional(String conditional){
String identifier = conditional.indexOf("=") > 0 ? conditional.substring(conditional.indexOf("=")+1) : null;
String identifier = conditional.contains("=") ? conditional.substring(conditional.indexOf("=")+1) : null;
//clear urn:oid: if present (need to be improved so this action handled by the UI)
if(identifier != null) {
identifier = identifier.replace(URN_OID, "");
......
pixm-connector-service/src/test/java/net/ihe/gazelle/adapter/validation/CustomPatientValidationServiceTest.java deleted 100644 → 0
+ 0
− 14
View file @ 0b5ae3c1
package net.ihe.gazelle.adapter.validation;
import org.junit.jupiter.api.Test;
class CustomPatientValidationServiceTest {
@Test
void validate() {
}
@Test
void getValidationProfiles() {
}
}
\ No newline at end of file
pixm-connector-service/src/test/java/net/ihe/gazelle/adapter/validation/mock/CustomPatientValidationServiceMock.java deleted 100644 → 0
+ 0
− 9
View file @ 0b5ae3c1
package net.ihe.gazelle.adapter.validation.mock;
import net.ihe.gazelle.matchbox.client.interlay.validation.CustomPatientValidationService;
public class CustomPatientValidationServiceMock extends CustomPatientValidationService {
}
pixm-connector-service/src/test/java/net/ihe/gazelle/application/PatientRegistrySearchClientTest.java
+ 11
− 9
View file @ 03635944
......@@ -4,6 +4,7 @@ import ca.uhn.fhir.rest.server.exceptions.InternalErrorException;
import ca.uhn.fhir.rest.server.exceptions.InvalidRequestException;
import ca.uhn.fhir.rest.server.exceptions.ResourceNotFoundException;
import io.qameta.allure.*;
import jakarta.xml.ws.WebServiceException;
import net.ihe.gazelle.app.patientregistryapi.business.Patient;
import net.ihe.gazelle.app.patientregistryapi.business.PatientSearchCriterionKey;
import net.ihe.gazelle.app.patientregistryapi.business.PersonName;
......@@ -16,13 +17,13 @@ import net.ihe.gazelle.lib.searchmodelapi.business.exception.SearchException;
import net.ihe.gazelle.lib.searchmodelapi.business.searchcriterion.SearchCriterion;
import net.ihe.gazelle.lib.searchmodelapi.business.searchcriterion.StringSearchCriterion;
import org.junit.jupiter.api.BeforeAll;
import org.junit.jupiter.api.Disabled;
import org.junit.jupiter.api.Test;
import org.junit.jupiter.api.extension.ExtendWith;
import org.mockito.Mock;
import org.mockito.Mockito;
import org.mockito.junit.jupiter.MockitoExtension;
import jakarta.xml.ws.WebServiceException;
import java.util.ArrayList;
import java.util.List;
......@@ -35,7 +36,7 @@ import static org.mockito.Mockito.doAnswer;
@Feature("PatientSearchClientTest")
@ExtendWith(MockitoExtension.class)
public class PatientRegistrySearchClientTest {
/*
private static final String TEST_UUID = "123e4567-e89b-12d3-a456-426614174000";
private static final String MALFORMED_UUID = "123e4567-e89b-12d3-a456-42661417400000000000000000000000000";
......@@ -52,7 +53,8 @@ public class PatientRegistrySearchClientTest {
operationalPreferencesService = Mockito.mock(OperationalPreferencesService.class);
}
@Test
@Test //TODO correct this test
@Disabled
@Description("Test on initialization, when a namespace exception is thrown")
@Severity(SeverityLevel.CRITICAL)
@Story("initialization")
......@@ -71,7 +73,8 @@ public class PatientRegistrySearchClientTest {
() -> patientRegistrySearchClient.searchPatient(searchCriterion.getValue()));
}
@Test
@Test //TODO correct this test
@Disabled
@Description("Test on initialization, when a preference exception is thrown")
@Severity(SeverityLevel.CRITICAL)
@Story("initialization")
......@@ -90,7 +93,8 @@ public class PatientRegistrySearchClientTest {
() -> patientRegistrySearchClient.searchPatient(searchCriterion.getValue()));
}
@Test
@Test //TODO correct this test
@Disabled
@Description("Test on initialization, when the url of the server is malformed")
@Severity(SeverityLevel.CRITICAL)
@Story("initialization")
......@@ -109,7 +113,8 @@ public class PatientRegistrySearchClientTest {
() -> patientRegistrySearchClient.searchPatient(searchCriterion.getValue()));
}
@Test
@Test //TODO correct this test
@Disabled
@Description("Test on initialization, when a web service exception is thrown")
@Severity(SeverityLevel.CRITICAL)
@Story("initialization")
......@@ -309,7 +314,4 @@ public class PatientRegistrySearchClientTest {
}
*/
}
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment