Commit dfd1a72b authored by Marco Descher's avatar Marco Descher

[14705] [10739] Update productive target, handle sonar blocker issues

parent 1f177e70
Pipeline #7347 passed with stages
in 2 minutes
......@@ -69,6 +69,7 @@ public class IntegrationPostHandler {
break;
case Level.WARN_INT:
sbBody.append(":warning: ");
break;
default:
break;
}
......
......@@ -110,7 +110,7 @@ public class ObservationResourceProvider implements IFhirResourceProvider {
// laboratory
if (categoryCode == null || ObservationCategory.LABORATORY.name()
.equalsIgnoreCase(CodeTypeUtil.getCode(categoryCode).orElse(""))) {
List<Observation> intermediateRet = new ArrayList<Observation>();
List<Observation> intermediateRet = new ArrayList<>();
IQuery<ILabResult> resultQuery = modelService.getQuery(ILabResult.class);
resultQuery.and(ModelPackage.Literals.ILAB_RESULT__PATIENT,
COMPARATOR.EQUALS, patient.get());
......
......@@ -117,6 +117,7 @@ public class PatientResourceProvider implements IFhirResourceProvider {
case Patient.SP_GIVEN:
query.orderBy(ModelPackage.Literals.ICONTACT__DESCRIPTION2,
QueryUtil.sortOrderEnumToLocal(order));
break;
default:
logger.info("sortParamName [{}] not supported.", param);
break;
......
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<?pde?>
<!-- generated with https://github.com/eclipse-cbi/targetplatform-dsl -->
<target name="Elexis-Server" sequenceNumber="1543410155">
<target name="Elexis-Server" sequenceNumber="1543415715">
<locations>
<location includeMode="slicer" includeAllPlatforms="true" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
<unit id="org.eclipse.equinox.sdk.feature.group" version="3.13.4.v20180322-2228"/>
......@@ -75,7 +75,7 @@
<unit id="com.eclipsesource.jaxrs.provider.swagger.feature.feature.group" version="1.1.1.201803161213"/>
<unit id="com.eclipsesource.jaxrs.provider.multipart.feature.feature.group" version="2.2.0.201803161213"/>
<unit id="ch.rgw.utility" version="3.7.0.20181116-1152"/>
<unit id="ch.elexis.core" version="3.7.0.20181128-1057"/>
<unit id="ch.elexis.core" version="3.7.0.20181128-1404"/>
<unit id="ch.elexis.core.l10n" version="3.7.0.20181001-0902"/>
<unit id="ch.elexis.core.importer.div" version="3.2.0.20181024-1142"/>
<unit id="ch.elexis.core.hl7.v2x" version="3.2.0.20181024-1607"/>
......
......@@ -121,7 +121,7 @@ public class SetupTest {
@Test
public void _02_1_setValidTestDatabaseConnection()
throws IOException, SQLException, InterruptedException{
throws IOException, SQLException {
DBConnection dbc = AllTests.getTestDatabaseConnection();
String dbcJson = new Gson().toJson(dbc);
RequestBody body = RequestBody.create(JSON, dbcJson);
......
Markdown is supported
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