Refine binary storage conditional beans

Author: Ubuntu

src/main/java/ca/uhn/fhir/jpa/starter/common/FhirServerConfigCommon.java

@@ -1,7 +1,6 @@
 package ca.uhn.fhir.jpa.starter.common;
 
 import ca.uhn.fhir.jpa.api.config.JpaStorageSettings;
-import ca.uhn.fhir.jpa.binary.api.IBinaryStorageSvc;
 import ca.uhn.fhir.jpa.binstore.DatabaseBinaryContentStorageSvcImpl;
 import ca.uhn.fhir.jpa.binstore.FilesystemBinaryStorageSvcImpl;
 import ca.uhn.fhir.jpa.config.HibernatePropertiesProvider;
@@ -20,7 +19,7 @@
 import org.hl7.fhir.r4.model.Bundle.BundleType;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
-import org.springframework.beans.factory.ObjectProvider;
+import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
 import org.springframework.boot.env.YamlPropertySourceLoader;
 import org.springframework.context.annotation.*;
 import org.springframework.orm.jpa.LocalContainerEntityManagerFactoryBean;
@@ -344,21 +343,8 @@ public HibernatePropertiesProvider jpaStarterDialectProvider(
 		return new JpaHibernatePropertiesProvider(myEntityManagerFactory);
 	}
 
-	@Lazy
-	@Primary
-	@Bean
-	public IBinaryStorageSvc binaryStorageSvc(
-			AppProperties appProperties,
-			ObjectProvider<DatabaseBinaryContentStorageSvcImpl> databaseBinaryStorageSvcProvider,
-			ObjectProvider<FilesystemBinaryStorageSvcImpl> filesystemBinaryStorageSvcProvider) {
-		if (appProperties.getBinary_storage_mode() == AppProperties.BinaryStorageMode.FILESYSTEM) {
-			return filesystemBinaryStorageSvcProvider.getObject();
-		}
-		return databaseBinaryStorageSvcProvider.getObject();
-	}
-
-	@Lazy
 	@Bean
+	@ConditionalOnProperty(prefix = "hapi.fhir", name = "binary_storage_mode", havingValue = "FILESYSTEM")
 	public FilesystemBinaryStorageSvcImpl filesystemBinaryStorageSvc(AppProperties appProperties) {
 		String baseDirectory = appProperties.getBinary_storage_filesystem_base_directory();
 		Assert.hasText(
@@ -379,8 +365,12 @@ public FilesystemBinaryStorageSvcImpl filesystemBinaryStorageSvc(AppProperties a
 		return filesystemSvc;
 	}
 
-	@Lazy
 	@Bean
+	@ConditionalOnProperty(
+			prefix = "hapi.fhir",
+			name = "binary_storage_mode",
+			havingValue = "DATABASE",
+			matchIfMissing = true)
 	public DatabaseBinaryContentStorageSvcImpl databaseBinaryStorageSvc(AppProperties appProperties) {
 		DatabaseBinaryContentStorageSvcImpl databaseSvc = new DatabaseBinaryContentStorageSvcImpl();
 		Integer maxBinarySize = appProperties.getMax_binary_size();

src/test/java/ca/uhn/fhir/jpa/starter/common/FhirServerConfigCommonBinaryStorageTest.java

@@ -2,14 +2,13 @@
 
 import ca.uhn.fhir.jpa.binstore.DatabaseBinaryContentStorageSvcImpl;
 import ca.uhn.fhir.jpa.binstore.FilesystemBinaryStorageSvcImpl;
+import ca.uhn.fhir.jpa.binary.api.IBinaryStorageSvc;
 import ca.uhn.fhir.jpa.starter.AppProperties;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.io.TempDir;
-import org.springframework.beans.factory.ObjectProvider;
 
 import java.nio.file.Files;
 import java.nio.file.Path;
-import java.util.function.Supplier;
 
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.assertj.core.api.Assertions.assertThatThrownBy;
@@ -27,7 +26,7 @@ private FhirServerConfigCommon newConfig() {
 	void defaultsToDatabaseImplementation() {
 		AppProperties props = new AppProperties();
 
-		Object svc = binaryStorageSvc(props);
+		IBinaryStorageSvc svc = binaryStorageSvc(props);
 
 		assertThat(svc).isInstanceOf(DatabaseBinaryContentStorageSvcImpl.class);
 	}
@@ -83,39 +82,15 @@ void filesystemModeRequiresBaseDirectory() {
 				.hasMessageContaining("binary_storage_filesystem_base_directory");
 	}
 
-	private Object binaryStorageSvc(AppProperties props) {
+	private IBinaryStorageSvc binaryStorageSvc(AppProperties props) {
 		FhirServerConfigCommon config = newConfig();
-		return config.binaryStorageSvc(
-				props,
-				provider(() -> config.databaseBinaryStorageSvc(props)),
-				provider(() -> config.filesystemBinaryStorageSvc(props)));
+		if (props.getBinary_storage_mode() == AppProperties.BinaryStorageMode.FILESYSTEM) {
+			return config.filesystemBinaryStorageSvc(props);
+		}
+		return config.databaseBinaryStorageSvc(props);
 	}
 
 	private FilesystemBinaryStorageSvcImpl filesystemBinaryStorageSvc(AppProperties props) {
 		return (FilesystemBinaryStorageSvcImpl) binaryStorageSvc(props);
 	}
-
-	private static <T> ObjectProvider<T> provider(Supplier<T> supplier) {
-		return new ObjectProvider<>() {
-			@Override
-			public T getObject(Object... args) {
-				return supplier.get();
-			}
-
-			@Override
-			public T getObject() {
-				return supplier.get();
-			}
-
-			@Override
-			public T getIfAvailable() {
-				return supplier.get();
-			}
-
-			@Override
-			public T getIfUnique() {
-				return supplier.get();
-			}
-		};
-	}
 }