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

Update to Spring 5

This commit is contained in:
James 2017-10-19 07:40:43 -04:00
parent ca52588491
commit b79dd75fce
7 changed files with 29 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
hapi-deployable-pom/pom.xml
View File

@ -111,6 +111,10 @@
<groupId>org.jscience</groupId> <groupId>org.jscience</groupId>
<artifactId>jscience</artifactId> <artifactId>jscience</artifactId>
</dependency> </dependency>
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-jcl</artifactId>
</dependency>
</ignoredDependencies> </ignoredDependencies>
<ignoredResources> <ignoredResources>
<ignoredResource>changelog.txt</ignoredResource> <ignoredResource>changelog.txt</ignoredResource>

2
hapi-fhir-jpaserver-base/pom.xml
View File

@ -105,10 +105,12 @@
<version>${project.version}</version> <version>${project.version}</version>
</dependency> </dependency>
<!--
<dependency> <dependency>
<groupId>org.slf4j</groupId> <groupId>org.slf4j</groupId>
<artifactId>jcl-over-slf4j</artifactId> <artifactId>jcl-over-slf4j</artifactId>
</dependency> </dependency>
-->
<dependency> <dependency>
<groupId>ch.qos.logback</groupId> <groupId>ch.qos.logback</groupId>

3
hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/provider/r4/JpaSystemProviderR4.java
View File

@ -45,7 +45,7 @@ public class JpaSystemProviderR4 extends BaseJpaSystemProviderDstu2Plus<Bundle,
@Qualifier("mySystemDaoR4") @Qualifier("mySystemDaoR4")
private IFhirSystemDao<Bundle, Meta> mySystemDao; private IFhirSystemDao<Bundle, Meta> mySystemDao;
@Autowired @Autowired(required = false)
private IFulltextSearchSvc mySearchDao; private IFulltextSearchSvc mySearchDao;
//@formatter:off //@formatter:off
@ -175,6 +175,7 @@ public class JpaSystemProviderR4 extends BaseJpaSystemProviderDstu2Plus<Bundle,
@OperationParam(name="searchParam", min=1, max=1) String theSearchParam, @OperationParam(name="searchParam", min=1, max=1) String theSearchParam,
@OperationParam(name="text", min=1, max=1) String theText @OperationParam(name="text", min=1, max=1) String theText
) { ) {
ca.uhn.fhir.jpa.provider.dstu3.JpaSystemProviderDstu3.validateFulltextSearchEnabled(mySearchDao);
if (isBlank(theContext)) { if (isBlank(theContext)) {
throw new InvalidRequestException("Parameter 'context' must be provided"); throw new InvalidRequestException("Parameter 'context' must be provided");

4
hapi-fhir-jpaserver-base/src/test/java/ca/uhn/fhir/jpa/provider/r4/ResourceProviderR4Test.java
View File

@ -3150,7 +3150,7 @@ public class ResourceProviderR4Test extends BaseResourceProviderR4Test {
@Test @Test
public void testSearchWithCountSearchResultsUpTo20() throws Exception { public void testSearchWithCountSearchResultsUpTo20() throws Exception {
mySearchCoordinatorSvcRaw.setSyncSizeForUnitTests(1); mySearchCoordinatorSvcRaw.setSyncSizeForUnitTests(1);
mySearchCoordinatorSvcRaw.setLoadingThrottleForUnitTests(100); mySearchCoordinatorSvcRaw.setLoadingThrottleForUnitTests(200);
myDaoConfig.setCountSearchResultsUpTo(20); myDaoConfig.setCountSearchResultsUpTo(20);
for (int i =0; i < 10; i++) { for (int i =0; i < 10; i++) {
@ -3174,7 +3174,7 @@ public class ResourceProviderR4Test extends BaseResourceProviderR4Test {
@Test @Test
public void testSearchWithCountSearchResultsUpTo5() throws Exception { public void testSearchWithCountSearchResultsUpTo5() throws Exception {
mySearchCoordinatorSvcRaw.setSyncSizeForUnitTests(1); mySearchCoordinatorSvcRaw.setSyncSizeForUnitTests(1);
mySearchCoordinatorSvcRaw.setLoadingThrottleForUnitTests(100); mySearchCoordinatorSvcRaw.setLoadingThrottleForUnitTests(200);
myDaoConfig.setCountSearchResultsUpTo(5); myDaoConfig.setCountSearchResultsUpTo(5);
for (int i =0; i < 10; i++) { for (int i =0; i < 10; i++) {

7
hapi-fhir-structures-dstu3/pom.xml
View File

@ -1,4 +1,4 @@
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" <project xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://maven.apache.org/POM/4.0.0"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>
@ -120,9 +120,8 @@
--> -->
<dependency> <dependency>
<groupId>javax.servlet</groupId> <groupId>javax.servlet</groupId>
<artifactId>servlet-api</artifactId> <artifactId>javax.servlet-api</artifactId>
<version>2.5</version> <version>3.0.1</version>
<optional>true</optional>
</dependency> </dependency>
<!-- <!--

7
hapi-fhir-testpage-overlay/src/main/java/ca/uhn/fhir/to/mvc/ToBindingInitializer.java
View File

@ -7,8 +7,13 @@ import org.springframework.web.context.request.WebRequest;
public class ToBindingInitializer implements WebBindingInitializer { public class ToBindingInitializer implements WebBindingInitializer {
@Override @Override
public void initBinder(WebDataBinder theBinder, WebRequest theRequest) { public void initBinder(WebDataBinder theBinder) {
theBinder.setFieldMarkerPrefix("__"); theBinder.setFieldMarkerPrefix("__");
} }
@Override
public void initBinder(WebDataBinder theBinder, WebRequest theRequest) {
// nothing
}
} }

10
src/changes/changes.xml
View File

@ -7,6 +7,16 @@
</properties> </properties>
<body> <body>
<release version="3.1.0" date="TBD"> <release version="3.1.0" date="TBD">
<action type="add">
The version of a few dependencies have been bumped to the
latest versions (dependent HAPI modules listed in brackets):
<![CDATA[
<ul>
<li>Spring (JPA): 4.3.10 -&gt; 5.0.0</li>
</ul>
]]>
</action>
<action type="fix"> <action type="fix">
The Android client module has been restored to working order, and no longer The Android client module has been restored to working order, and no longer
requires a special classifier or an XML parser to be present in order to requires a special classifier or an XML parser to be present in order to