honeymoose
/
hapi-fhir
mirror of https://github.com/hapifhir/hapi-fhir.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Roll back one dependency

This commit is contained in:
James Agnew 2019-07-07 11:02:08 -04:00
parent d23046b8ea
commit 4bd60a8447
4 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
hapi-fhir-jpaserver-base/src/test/java/ca/uhn/fhir/jpa/config/TestR4Config.java
View File

@ -5,6 +5,7 @@ import ca.uhn.fhir.jpa.util.CurrentThreadCaptureQueriesListener;
import ca.uhn.fhir.rest.server.interceptor.RequestValidatingInterceptor;
import ca.uhn.fhir.validation.ResultSeverityEnum;
import net.ttddyy.dsproxy.listener.SingleQueryCountHolder;
import net.ttddyy.dsproxy.listener.logging.SLF4JLogLevel;
import net.ttddyy.dsproxy.support.ProxyDataSourceBuilder;
import org.apache.commons.dbcp2.BasicDataSource;
import org.springframework.context.annotation.Bean;
@ -103,7 +104,7 @@ public class TestR4Config extends BaseJavaConfigR4 {
DataSource dataSource = ProxyDataSourceBuilder
.create(retVal)
// .logQueryBySlf4j(SLF4JLogLevel.INFO, "SQL")
.logQueryBySlf4j(SLF4JLogLevel.INFO, "SQL")
// .logSlowQueryBySlf4j(10, TimeUnit.SECONDS)
// .countQuery(new ThreadQueryCountHolder())
.beforeQuery(new BlockLargeNumbersOfParamsListener())

2
hapi-fhir-jpaserver-model/src/main/java/ca/uhn/fhir/jpa/model/entity/BaseResourceIndexedSearchParam.java
View File

@ -55,7 +55,7 @@ public abstract class BaseResourceIndexedSearchParam extends BaseResourceIndex {
@Column(name = "SP_NAME", length = MAX_SP_NAME, nullable = false)
private String myParamName;
@ManyToOne(optional = false, fetch = FetchType.LAZY)
@ManyToOne(optional = false, fetch = FetchType.LAZY, cascade = {})
@JoinColumn(name = "RES_ID", referencedColumnName = "RES_ID")
@ContainedIn
private ResourceTable myResource;

3
pom.xml
View File

@ -592,7 +592,8 @@
<servicemix_xmlresolver_version>1.2_5</servicemix_xmlresolver_version>
<slf4j_version>1.7.25</slf4j_version>
<spring_version>5.1.8.RELEASE</spring_version>
<spring_data_version>2.1.9.RELEASE</spring_data_version>
<!-- FYI: Spring Data JPA 2.1.9 causes test failures due to unexpected cascading deletes -->
<spring_data_version>2.1.8.RELEASE</spring_data_version>
<spring_boot_version>2.1.1.RELEASE</spring_boot_version>
<spring_retry_version>1.2.2.RELEASE</spring_retry_version>

2
src/changes/changes.xml
View File

@ -16,7 +16,7 @@
<li>Apache HTTPClient (Client): 4.5.3 -&gt; 4.5.9</li>
<li>Apache HTTPCore (Client>: 4.4.6 -&gt; 4.4.11</li>
<li>Spring (JPA): 5.1.6.RELEASE -&gt; 5.1.8.RELEASE</li>
<li>Spring-Data (JPA): 2.1.6.RELEASE -&gt; 2.1.9.RELEASE</li>
<li>Spring-Data (JPA): 2.1.6.RELEASE -&gt; 2.1.8.RELEASE</li>
<!-- <li>Derby (CLI and JPA Examples): 10.14.2.0 -&gt; 10.15.1.3</li>-->
<li>JANSI (CLI): 1.17.1 -&gt; 1.18</li>
<li>json-patch (JPA): 1.10 -&gt; 1.15 (see changelog entry about this change)</li>