Renamed DataFileCategoryService to DataFileCategoryServiceBean for co…

…nsistency - #8461
IQSS · Mar 18, 2022 · 5cac8bc · 5cac8bc
1 parent 231845b
commit 5cac8bc
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 12 deletions.
diff --git a/...iq/dataverse/DataFileCategoryService.java → ...ataverse/DataFileCategoryServiceBean.java b/...iq/dataverse/DataFileCategoryService.java → ...ataverse/DataFileCategoryServiceBean.java
@@ -19,7 +19,7 @@
  * @author adaybujeda
  */
 @Stateless
-public class DataFileCategoryService {
+public class DataFileCategoryServiceBean {
 
     public static final String FILE_CATEGORIES_KEY = ":FileCategories";
 

diff --git a/src/main/java/edu/harvard/iq/dataverse/DatasetPage.java b/src/main/java/edu/harvard/iq/dataverse/DatasetPage.java
@@ -246,7 +246,7 @@ public enum DisplayMode {
     @Inject
     LicenseServiceBean licenseServiceBean;
     @Inject
-    DataFileCategoryService dataFileCategoryService;
+    DataFileCategoryServiceBean dataFileCategoryService;
 
     private Dataset dataset = new Dataset();
 

diff --git a/src/main/java/edu/harvard/iq/dataverse/EditDatafilesPage.java b/src/main/java/edu/harvard/iq/dataverse/EditDatafilesPage.java
@@ -139,7 +139,7 @@ public enum Referrer {
     @Inject
     LicenseServiceBean licenseServiceBean;
     @Inject
-    DataFileCategoryService dataFileCategoryService;
+    DataFileCategoryServiceBean dataFileCategoryService;
 
     private Dataset dataset = new Dataset();
 

diff --git a/...ataverse/DataFileCategoryServiceTest.java → ...erse/DataFileCategoryServiceBeanTest.java b/...ataverse/DataFileCategoryServiceTest.java → ...erse/DataFileCategoryServiceBeanTest.java
@@ -20,16 +20,16 @@
  * @author adaybujeda
  */
 @RunWith(MockitoJUnitRunner.class)
-public class DataFileCategoryServiceTest {
+public class DataFileCategoryServiceBeanTest {
 
     @Mock
     private SettingsServiceBean settingsServiceBean;
     @InjectMocks
-    private DataFileCategoryService target;
+    private DataFileCategoryServiceBean target;
 
     @Test
     public void getFileCategories_should_return_default_file_categories_in_expected_order_when_no_override_configured() {
-        Mockito.when(settingsServiceBean.get(DataFileCategoryService.FILE_CATEGORIES_KEY)).thenReturn(null);
+        Mockito.when(settingsServiceBean.get(DataFileCategoryServiceBean.FILE_CATEGORIES_KEY)).thenReturn(null);
 
         List<String> result = target.getFileCategories();
 
@@ -41,7 +41,7 @@ public void getFileCategories_should_return_default_file_categories_in_expected_
 
     @Test
     public void getFileCategories_should_return_default_file_categories_in_expected_order_when_empty_override_is_configured() {
-        Mockito.when(settingsServiceBean.get(DataFileCategoryService.FILE_CATEGORIES_KEY)).thenReturn("  ");
+        Mockito.when(settingsServiceBean.get(DataFileCategoryServiceBean.FILE_CATEGORIES_KEY)).thenReturn("  ");
 
         List<String> result = target.getFileCategories();
 
@@ -87,7 +87,7 @@ public void getFileCategories_should_ignore_empty_override_values() {
 
     @Test
     public void mergeDatasetFileCategories_should_handle_null_datafile_categories() {
-        Mockito.when(settingsServiceBean.get(DataFileCategoryService.FILE_CATEGORIES_KEY)).thenReturn(null);
+        Mockito.when(settingsServiceBean.get(DataFileCategoryServiceBean.FILE_CATEGORIES_KEY)).thenReturn(null);
 
         List<String> result = target.mergeDatasetFileCategories(null);
 
@@ -99,7 +99,7 @@ public void mergeDatasetFileCategories_should_handle_null_datafile_categories()
 
     @Test
     public void mergeDatasetFileCategories_should_add_dataset_values_first_then_default_categories() {
-        Mockito.when(settingsServiceBean.get(DataFileCategoryService.FILE_CATEGORIES_KEY)).thenReturn(null);
+        Mockito.when(settingsServiceBean.get(DataFileCategoryServiceBean.FILE_CATEGORIES_KEY)).thenReturn(null);
 
         List<String> result = target.mergeDatasetFileCategories(setup_data_file_categories("dataset01", "dataset02"));
 
@@ -126,7 +126,7 @@ public void mergeDatasetFileCategories_should_add_dataset_values_first_then_over
 
     @Test
     public void mergeDatasetFileCategories_should_ignore_duplicates() {
-        Mockito.when(settingsServiceBean.get(DataFileCategoryService.FILE_CATEGORIES_KEY)).thenReturn(null);
+        Mockito.when(settingsServiceBean.get(DataFileCategoryServiceBean.FILE_CATEGORIES_KEY)).thenReturn(null);
 
         List<String> result = target.mergeDatasetFileCategories(setup_data_file_categories("Code", "Data", "Custom"));
 
@@ -140,8 +140,8 @@ public void mergeDatasetFileCategories_should_ignore_duplicates() {
     private void setup_override(String overrideValue) {
         String currentLang = BundleUtil.getCurrentLocale().getLanguage();
 
-        Mockito.when(settingsServiceBean.get(DataFileCategoryService.FILE_CATEGORIES_KEY)).thenReturn(overrideValue);
-        Mockito.when(settingsServiceBean.get(DataFileCategoryService.FILE_CATEGORIES_KEY, currentLang, overrideValue)).thenReturn(overrideValue);
+        Mockito.when(settingsServiceBean.get(DataFileCategoryServiceBean.FILE_CATEGORIES_KEY)).thenReturn(overrideValue);
+        Mockito.when(settingsServiceBean.get(DataFileCategoryServiceBean.FILE_CATEGORIES_KEY, currentLang, overrideValue)).thenReturn(overrideValue);
     }
 
     private List<DataFileCategory> setup_data_file_categories(String... names) {