Personal-Twin/hapi-fhir-jpaserver-starter
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Re-throwing handled exception as configuration exceptions

Browse Source
This commit is contained in:
Sean McIlvenna
2019-02-06 22:38:59 -08:00
parent 7a96e96996
commit 19c22e0a0d
2 changed files with 6 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
src/main/java/ca/uhn/fhir/jpa/demo/FhirServerConfig.java
View File

@@ -7,6 +7,7 @@ import java.util.Properties;
import javax.persistence.EntityManagerFactory; import javax.persistence.EntityManagerFactory;
import javax.sql.DataSource; import javax.sql.DataSource;
import ca.uhn.fhir.context.ConfigurationException;
import ca.uhn.fhir.jpa.search.DatabaseBackedPagingProvider; import ca.uhn.fhir.jpa.search.DatabaseBackedPagingProvider;
import ca.uhn.fhir.jpa.search.LuceneSearchMappingFactory; import ca.uhn.fhir.jpa.search.LuceneSearchMappingFactory;
import ca.uhn.fhir.jpa.util.DerbyTenSevenHapiFhirDialect; import ca.uhn.fhir.jpa.util.DerbyTenSevenHapiFhirDialect;
@@ -82,16 +83,8 @@ public class FhirServerConfig extends BaseJavaConfigDstu3 {
try { try {
retVal.setDataSource(dataSource()); retVal.setDataSource(dataSource());
} catch (ClassNotFoundException e) { } catch (Exception e) {
e.printStackTrace(); throw new ConfigurationException("Could not set the data source due to a configuration issue", e);
} catch (NoSuchMethodException e) {
e.printStackTrace();
} catch (IllegalAccessException e) {
e.printStackTrace();
} catch (InvocationTargetException e) {
e.printStackTrace();
} catch (InstantiationException e) {
e.printStackTrace();
} }
retVal.setJpaProperties(jpaProperties()); retVal.setJpaProperties(jpaProperties());

7
src/main/java/ca/uhn/fhir/jpa/demo/HapiProperties.java
View File

@@ -1,5 +1,6 @@
package ca.uhn.fhir.jpa.demo; package ca.uhn.fhir.jpa.demo;
import ca.uhn.fhir.context.ConfigurationException;
import ca.uhn.fhir.context.FhirVersionEnum; import ca.uhn.fhir.context.FhirVersionEnum;
import ca.uhn.fhir.rest.api.EncodingEnum; import ca.uhn.fhir.rest.api.EncodingEnum;
import ca.uhn.fhir.rest.server.ETagSupportEnum; import ca.uhn.fhir.rest.server.ETagSupportEnum;
@@ -45,10 +46,8 @@ public class HapiProperties {
HapiProperties.properties = new Properties(); HapiProperties.properties = new Properties();
HapiProperties.properties.load(in); HapiProperties.properties.load(in);
in.close(); in.close();
} catch (FileNotFoundException e) { } catch (Exception e) {
e.printStackTrace(); throw new ConfigurationException("Could not load HAPI properties", e);
} catch (IOException e) {
e.printStackTrace();
} }
} }