ExternalVendorCode/HIRS
1
0
Fork 0
mirror of https://github.com/nsacyber/HIRS.git synced 2025-02-06 11:10:15 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

[#61] Remove Magic String Usage from PersistenceConfiguration (#116)

Browse Source
This commit is contained in:
apldev3 2019-03-28 09:53:50 -04:00 committed by GitHub
parent bc717c9241
commit 267001226e
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 9 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
HIRS_Utils/src/main/java/hirs/persist/DeviceHealthManagerImpl.java
View File

@ -34,7 +34,7 @@ public class DeviceHealthManagerImpl implements DeviceHealthManager {
private AlertManager alertManager; private AlertManager alertManager;
@Autowired @Autowired
@Qualifier("general_db_man_bean") @Qualifier(PersistenceConfiguration.DEVICE_STATE_MANAGER_BEAN_NAME)
private DeviceStateManager deviceStateManager; private DeviceStateManager deviceStateManager;
@Autowired @Autowired

8
HIRS_Utils/src/main/java/hirs/persist/PersistenceConfiguration.java
View File

@ -18,6 +18,12 @@ import org.springframework.orm.hibernate4.LocalSessionFactoryBean;
@Configuration @Configuration
@Import({ HibernateConfiguration.class }) @Import({ HibernateConfiguration.class })
public class PersistenceConfiguration { public class PersistenceConfiguration {
/**
* The bean name to retrieve the default/general implementation of {@link DeviceStateManager}.
*/
public static final String DEVICE_STATE_MANAGER_BEAN_NAME = "general_db_man_bean";
@Autowired @Autowired
private LocalSessionFactoryBean sessionFactory; private LocalSessionFactoryBean sessionFactory;
@ -140,7 +146,7 @@ public class PersistenceConfiguration {
* *
* @return {@link DeviceStateManager} * @return {@link DeviceStateManager}
*/ */
@Bean(name = "general_db_man_bean") @Bean(name = DEVICE_STATE_MANAGER_BEAN_NAME)
public DeviceStateManager generalDeviceStateManager() { public DeviceStateManager generalDeviceStateManager() {
DBDeviceStateManager manager = new DBDeviceStateManager(sessionFactory.getObject()); DBDeviceStateManager manager = new DBDeviceStateManager(sessionFactory.getObject());
setDbManagerRetrySettings(manager); setDbManagerRetrySettings(manager);

2
HIRS_Utils/src/test/java/hirs/persist/DeviceHealthManagerImplTest.java
View File

@ -46,7 +46,7 @@ public class DeviceHealthManagerImplTest {
private AlertManager alertManager; private AlertManager alertManager;
@Mock @Mock
@Qualifier("general_db_man_bean") @Qualifier(PersistenceConfiguration.DEVICE_STATE_MANAGER_BEAN_NAME)
private DeviceStateManager deviceStateManager; private DeviceStateManager deviceStateManager;
@Mock @Mock