Version bumps

mrhaki · Jun 3, 2018 · 9876794 · 9876794
1 parent e36bc38
commit 9876794
Show file tree

Hide file tree

Showing 11 changed files with 1,485 additions and 1,366 deletions.
diff --git a/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/dao/ISearchBuilder.java b/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/dao/ISearchBuilder.java
@@ -9,9 +9,9 @@
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
- *
+ * 
  *      http://www.apache.org/licenses/LICENSE-2.0
- *
+ * 
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

diff --git a/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/dao/SearchBuilder.java b/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/dao/SearchBuilder.java
@@ -9,9 +9,9 @@
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
- *
+ * 
  * http://www.apache.org/licenses/LICENSE-2.0
- *
+ * 
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

diff --git a/hapi-fhir-spring-boot/pom.xml b/hapi-fhir-spring-boot/pom.xml
@@ -1,34 +1,46 @@
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	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>
-
-	<parent>
-		<groupId>ca.uhn.hapi.fhir</groupId>
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+			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>
+
+	<parent>
+		<groupId>ca.uhn.hapi.fhir</groupId>
 		<artifactId>hapi-fhir</artifactId>
-		<version>3.5.0-SNAPSHOT</version>
-		<relativePath>../pom.xml</relativePath>
-	</parent>
-
-	<artifactId>hapi-fhir-spring-boot</artifactId>
-	<packaging>pom</packaging>
-
-	<modules>
-		<module>hapi-fhir-spring-boot-autoconfigure</module>
-		<module>hapi-fhir-spring-boot-starter</module>
-		<module>hapi-fhir-spring-boot-samples</module>
-	</modules>
+		<version>3.5.0-SNAPSHOT</version>
+		<relativePath>../pom.xml</relativePath>
+	</parent>
+
+	<artifactId>hapi-fhir-spring-boot</artifactId>
+	<packaging>pom</packaging>
+
+	<modules>
+		<module>hapi-fhir-spring-boot-autoconfigure</module>
+		<module>hapi-fhir-spring-boot-starter</module>
+		<module>hapi-fhir-spring-boot-samples</module>
+	</modules>
+
+	<dependencyManagement>
+		<dependencies>
+			<dependency>
+				<groupId>org.springframework.boot</groupId>
+				<artifactId>spring-boot-dependencies</artifactId>
+				<version>${spring-boot.version}</version>
+				<type>pom</type>
+				<scope>import</scope>
+			</dependency>
+		</dependencies>
+	</dependencyManagement>
 
 	<build>
 		<plugins>
-         <plugin>
-            <groupId>org.apache.maven.plugins</groupId>
-            <artifactId>maven-deploy-plugin</artifactId>
-            <configuration>
-               <skip>true</skip>
-            </configuration>
-         </plugin>
+			<plugin>
+				<groupId>org.apache.maven.plugins</groupId>
+				<artifactId>maven-deploy-plugin</artifactId>
+				<configuration>
+					<skip>true</skip>
+				</configuration>
+			</plugin>
 		</plugins>
 	</build>
-
+
 </project>
 
diff --git a/....1/src/main/java/org/hl7/fhir/dstu2016may/hapi/rest/server/ServerConformanceProvider.java b/....1/src/main/java/org/hl7/fhir/dstu2016may/hapi/rest/server/ServerConformanceProvider.java
@@ -24,10 +24,12 @@
 
 import java.util.*;
 import java.util.Map.Entry;
+import java.util.concurrent.Callable;
 
 import javax.servlet.ServletContext;
 import javax.servlet.http.HttpServletRequest;
 
+import ca.uhn.fhir.rest.server.exceptions.InternalErrorException;
 import org.apache.commons.lang3.StringUtils;
 import org.hl7.fhir.dstu2016may.model.*;
 import org.hl7.fhir.dstu2016may.model.Conformance.*;
@@ -64,21 +66,27 @@ public class ServerConformanceProvider implements IServerConformanceProvider<Con
 	private IdentityHashMap<OperationMethodBinding, String> myOperationBindingToName;
 	private HashMap<String, List<OperationMethodBinding>> myOperationNameToBindings;
 	private String myPublisher = "Not provided";
-	private RestulfulServerConfiguration myServerConfiguration;
+	private Callable<RestulfulServerConfiguration> myServerConfiguration;
 
-	/*
-	 * Add a no-arg constructor and seetter so that the ServerConfirmanceProvider can be Spring-wired with the RestfulService avoiding the potential reference cycle that would happen.
+	/**
+	 * No-arg constructor and seetter so that the ServerConfirmanceProvider can be Spring-wired with the RestfulService avoiding the potential reference cycle that would happen.
 	 */
 	public ServerConformanceProvider() {
 		super();
 	}
 
+	/**
+	 * Constructor
+	 */
 	public ServerConformanceProvider(RestfulServer theRestfulServer) {
-		this.myServerConfiguration = theRestfulServer.createConfiguration();
+		this.myServerConfiguration = theRestfulServer::createConfiguration;
 	}
 
+	/**
+	 * Constructor
+	 */
 	public ServerConformanceProvider(RestulfulServerConfiguration theServerConfiguration) {
-		this.myServerConfiguration = theServerConfiguration;
+		this.myServerConfiguration = () -> theServerConfiguration;
 	}
 
 	private void checkBindingForSystemOps(ConformanceRestComponent rest, Set<SystemRestfulInteraction> systemOps, BaseMethodBinding<?> nextMethodBinding) {
@@ -103,28 +111,28 @@ private void checkBindingForSystemOps(ConformanceRestComponent rest, Set<SystemR
 	}
 
 	private Map<String, List<BaseMethodBinding<?>>> collectMethodBindings() {
-		Map<String, List<BaseMethodBinding<?>>> resourceToMethods = new TreeMap<String, List<BaseMethodBinding<?>>>();
-		for (ResourceBinding next : myServerConfiguration.getResourceBindings()) {
+		Map<String, List<BaseMethodBinding<?>>> resourceToMethods = new TreeMap<>();
+		for (ResourceBinding next : getServerConfiguration().getResourceBindings()) {
 			String resourceName = next.getResourceName();
 			for (BaseMethodBinding<?> nextMethodBinding : next.getMethodBindings()) {
 				if (resourceToMethods.containsKey(resourceName) == false) {
-					resourceToMethods.put(resourceName, new ArrayList<BaseMethodBinding<?>>());
+					resourceToMethods.put(resourceName, new ArrayList<>());
 				}
 				resourceToMethods.get(resourceName).add(nextMethodBinding);
 			}
 		}
-		for (BaseMethodBinding<?> nextMethodBinding : myServerConfiguration.getServerBindings()) {
+		for (BaseMethodBinding<?> nextMethodBinding : getServerConfiguration().getServerBindings()) {
 			String resourceName = "";
 			if (resourceToMethods.containsKey(resourceName) == false) {
-				resourceToMethods.put(resourceName, new ArrayList<BaseMethodBinding<?>>());
+				resourceToMethods.put(resourceName, new ArrayList<>());
 			}
 			resourceToMethods.get(resourceName).add(nextMethodBinding);
 		}
 		return resourceToMethods;
 	}
 
 	private DateTimeType conformanceDate() {
-		String buildDate = myServerConfiguration.getConformanceDate();
+		String buildDate = getServerConfiguration().getConformanceDate();
 		if (buildDate != null) {
 			try {
 				return new DateTimeType(buildDate);
@@ -181,33 +189,33 @@ public Conformance getServerConformance(HttpServletRequest theRequest) {
 		// needs to be modified to actually allow it
 
 		ServletContext servletContext = (ServletContext) (theRequest == null ? null : theRequest.getAttribute(RestfulServer.SERVLET_CONTEXT_ATTRIBUTE));
-		String serverBase = myServerConfiguration.getServerAddressStrategy().determineServerBase(servletContext, theRequest);
+		String serverBase = getServerConfiguration().getServerAddressStrategy().determineServerBase(servletContext, theRequest);
 		retVal
 			.getImplementation()
 			.setUrl(serverBase)
-			.setDescription(myServerConfiguration.getImplementationDescription());
+			.setDescription(getServerConfiguration().getImplementationDescription());
 
 		retVal.setKind(ConformanceStatementKind.INSTANCE);
-		retVal.getSoftware().setName(myServerConfiguration.getServerName());
-		retVal.getSoftware().setVersion(myServerConfiguration.getServerVersion());
+		retVal.getSoftware().setName(getServerConfiguration().getServerName());
+		retVal.getSoftware().setVersion(getServerConfiguration().getServerVersion());
 		retVal.addFormat(Constants.CT_FHIR_XML);
 		retVal.addFormat(Constants.CT_FHIR_JSON);
 		retVal.setStatus(ConformanceResourceStatus.ACTIVE);
 
 		ConformanceRestComponent rest = retVal.addRest();
 		rest.setMode(RestfulConformanceMode.SERVER);
 
-		Set<SystemRestfulInteraction> systemOps = new HashSet<SystemRestfulInteraction>();
-		Set<String> operationNames = new HashSet<String>();
+		Set<SystemRestfulInteraction> systemOps = new HashSet<>();
+		Set<String> operationNames = new HashSet<>();
 
 		Map<String, List<BaseMethodBinding<?>>> resourceToMethods = collectMethodBindings();
 		for (Entry<String, List<BaseMethodBinding<?>>> nextEntry : resourceToMethods.entrySet()) {
 
 			if (nextEntry.getKey().isEmpty() == false) {
-				Set<TypeRestfulInteraction> resourceOps = new HashSet<TypeRestfulInteraction>();
+				Set<TypeRestfulInteraction> resourceOps = new HashSet<>();
 				ConformanceRestResourceComponent resource = rest.addResource();
 				String resourceName = nextEntry.getKey();
-				RuntimeResourceDefinition def = myServerConfiguration.getFhirContext().getResourceDefinition(resourceName);
+				RuntimeResourceDefinition def = getServerConfiguration().getFhirContext().getResourceDefinition(resourceName);
 				resource.getTypeElement().setValue(def.getName());
 				resource.getProfile().setReference((def.getResourceProfile(serverBase)));
 
@@ -432,7 +440,7 @@ private void handleSearchMethodBinding(ConformanceRestComponent rest, Conformanc
 					param.getTypeElement().setValueAsString(nextParameter.getParamType().getCode());
 				}
 				for (Class<? extends IBaseResource> nextTarget : nextParameter.getDeclaredTypes()) {
-					RuntimeResourceDefinition targetDef = myServerConfiguration.getFhirContext().getResourceDefinition(nextTarget);
+					RuntimeResourceDefinition targetDef = getServerConfiguration().getFhirContext().getResourceDefinition(nextTarget);
 					if (targetDef != null) {
 						ResourceType code;
 						try {
@@ -594,11 +602,15 @@ public void setPublisher(String thePublisher) {
 
 	@Override
 	public void setRestfulServer(RestfulServer theRestfulServer) {
-		myServerConfiguration = theRestfulServer.createConfiguration();
+		myServerConfiguration = theRestfulServer::createConfiguration;
 	}
 
 	RestulfulServerConfiguration getServerConfiguration() {
-		return myServerConfiguration;
+		try {
+			return myServerConfiguration.call();
+		} catch (Exception e) {
+			throw new InternalErrorException(e);
+		}
 	}
 
 	private void sortRuntimeSearchParameters(List<RuntimeSearchParam> searchParameters) {