From fff1ac39a36ced2890e4b84f72ea09dea09df21f Mon Sep 17 00:00:00 2001 From: Tadgh Date: Wed, 6 Jan 2021 22:02:45 -0500 Subject: [PATCH] fix props file --- src/main/java/ca/uhn/fhir/jpa/starter/EnvironmentHelper.java | 3 ++- src/main/resources/application.yaml | 4 ++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/src/main/java/ca/uhn/fhir/jpa/starter/EnvironmentHelper.java b/src/main/java/ca/uhn/fhir/jpa/starter/EnvironmentHelper.java index 95bfc3e..2f68a2e 100644 --- a/src/main/java/ca/uhn/fhir/jpa/starter/EnvironmentHelper.java +++ b/src/main/java/ca/uhn/fhir/jpa/starter/EnvironmentHelper.java @@ -2,6 +2,7 @@ package ca.uhn.fhir.jpa.starter; import ca.uhn.fhir.jpa.search.HapiLuceneAnalysisConfigurer; import ca.uhn.fhir.jpa.search.elastic.ElasticsearchHibernatePropertiesBuilder; +import org.apache.commons.lang3.StringUtils; import org.elasticsearch.action.admin.indices.stats.IndexStats; import org.hibernate.search.backend.elasticsearch.index.IndexStatus; import org.hibernate.search.backend.lucene.cfg.LuceneBackendSettings; @@ -45,7 +46,7 @@ public class EnvironmentHelper { properties.put(HibernateOrmMapperSettings.ENABLED, environment.getProperty("spring.jpa.properties.hibernate.search.enabled", "false")); } else { - Arrays.asList(environment.getProperty("spring.jpa.properties", String.class).split(" ")).stream().forEach(s -> + Arrays.asList(environment.getProperty("spring.jpa.properties", String.class).split(" ")).stream().filter(s -> !StringUtils.isEmpty(s)).forEach(s -> { String[] values = s.split("="); properties.put(values[0], values[1]); diff --git a/src/main/resources/application.yaml b/src/main/resources/application.yaml index 63a230d..4b5e9b0 100644 --- a/src/main/resources/application.yaml +++ b/src/main/resources/application.yaml @@ -6,8 +6,8 @@ spring: password: null driverClassName: org.h2.Driver max-active: 15 - jpa: - properties: +# jpa: +# properties: # hibernate.dialect: org.hibernate.dialect.h2dialect # hibernate.search.model_mapping: ca.uhn.fhir.jpa.search.lucenesearchmappingfactory # hibernate.format_sql: false