fix: conditionally load service, mark one as primary when profile is …

…activated

src/main/java/biblivre/circulation/user/IndexableUserDAO.java

@@ -18,15 +18,17 @@
 import java.util.function.Function;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
-import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
+import org.springframework.context.annotation.Primary;
+import org.springframework.context.annotation.Profile;
 import org.springframework.data.domain.PageRequest;
 import org.springframework.data.elasticsearch.client.elc.NativeQuery;
 import org.springframework.data.elasticsearch.core.ElasticsearchOperations;
 import org.springframework.data.elasticsearch.core.SearchHits;
 import org.springframework.stereotype.Service;
 
 @Service
-@ConditionalOnProperty(value = "elasticsearch.server.url")
+@Profile("elasticsearch")
+@Primary
 public class IndexableUserDAO extends UserDAOImpl {
     @Autowired private IndexableUserRepository indexableUserRepository;
 

src/main/java/biblivre/circulation/user/UserDAOImpl.java

@@ -37,9 +37,11 @@
 import org.apache.commons.lang3.StringUtils;
 import org.apache.commons.lang3.time.DateUtils;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
 
 @Slf4j
-public abstract class UserDAOImpl extends AbstractDAO implements UserDAO {
+@Service
+public class UserDAOImpl extends AbstractDAO implements UserDAO {
 
     @Override
     public Map<Integer, UserDTO> map(Collection<Integer> ids) {

src/main/java/biblivre/search/ElasticsearchClientConfiguration.java

@@ -8,11 +8,11 @@
 
 @Configuration
 public class ElasticsearchClientConfiguration extends ElasticsearchConfiguration {
-    @Value("${elasticsearch.server.url}")
-    String serverUrl;
+    @Value("${elasticsearch.server.url:}")
+    private String serverUrl;
 
-    @Value("${elasticsearch.api.key}")
-    String apiKey;
+    @Value("${elasticsearch.api.key:}")
+    private String apiKey;
 
     @Override
     public ClientConfiguration clientConfiguration() {

src/main/java/biblivre/search/user/IndexableUserRepository.java

@@ -1,7 +1,11 @@
 package biblivre.search.user;
 
+import org.springframework.context.annotation.Profile;
 import org.springframework.data.elasticsearch.repository.ElasticsearchRepository;
+import org.springframework.stereotype.Repository;
 
+@Repository
+@Profile("elasticsearch")
 public interface IndexableUserRepository extends ElasticsearchRepository<IndexableUser, Integer> {
     void deleteBySchemaAndTenant(String schema, String tenant);
 }