Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Changes based on suggestions in #2193 for searchbuilder #3115

Open
wants to merge 3 commits into
base: master
Choose a base branch
from
Open

Changes based on suggestions in #2193 for searchbuilder #3115

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
956e674
Changed the type of myEntityManagerFactory from HapiFhirLocalContaine…
ddpardo Oct 27, 2021
b2648ec
Merge branch 'master' into 2193
ddpardo Oct 27, 2021
31e3554
cleanup imports
ddpardo Oct 27, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 2 additions & 3 deletions hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/search/builder/SearchBuilder.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,13 +33,11 @@
import ca.uhn.fhir.jpa.api.dao.DaoRegistry;
import ca.uhn.fhir.jpa.api.dao.IDao;
import ca.uhn.fhir.jpa.api.dao.IFhirResourceDao;
import ca.uhn.fhir.jpa.config.HapiFhirLocalContainerEntityManagerFactoryBean;
import ca.uhn.fhir.jpa.config.HibernatePropertiesProvider;
import ca.uhn.fhir.jpa.dao.BaseStorageDao;
import ca.uhn.fhir.jpa.dao.IFulltextSearchSvc;
import ca.uhn.fhir.jpa.dao.IResultIterator;
import ca.uhn.fhir.jpa.dao.ISearchBuilder;
import ca.uhn.fhir.jpa.dao.data.IResourceLinkDao;
import ca.uhn.fhir.jpa.dao.data.IResourceSearchViewDao;
import ca.uhn.fhir.jpa.dao.data.IResourceTagDao;
import ca.uhn.fhir.jpa.dao.index.IdHelperService;
Expand Down Expand Up @@ -102,6 +100,7 @@
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.jdbc.core.JdbcTemplate;
import org.springframework.jdbc.core.SingleColumnRowMapper;
import org.springframework.orm.jpa.LocalContainerEntityManagerFactoryBean;
import org.springframework.transaction.support.TransactionSynchronizationManager;

import javax.annotation.Nonnull;
Expand Down Expand Up @@ -183,7 +182,7 @@ public class SearchBuilder implements ISearchBuilder {
@Autowired
private PartitionSettings myPartitionSettings;
@Autowired
private HapiFhirLocalContainerEntityManagerFactoryBean myEntityManagerFactory;
private LocalContainerEntityManagerFactoryBean myEntityManagerFactory;
@Autowired
private SqlObjectFactory mySqlBuilderFactory;
@Autowired
Expand Down