From 5cac8bcac48747e265d0caf1d906cc9189a8a8d1 Mon Sep 17 00:00:00 2001 From: Aday Bujeda Date: Fri, 18 Mar 2022 16:25:06 +0000 Subject: [PATCH] Renamed DataFileCategoryService to DataFileCategoryServiceBean for consistency - #8461 --- ...e.java => DataFileCategoryServiceBean.java} | 2 +- .../edu/harvard/iq/dataverse/DatasetPage.java | 2 +- .../iq/dataverse/EditDatafilesPage.java | 2 +- ...va => DataFileCategoryServiceBeanTest.java} | 18 +++++++++--------- 4 files changed, 12 insertions(+), 12 deletions(-) rename src/main/java/edu/harvard/iq/dataverse/{DataFileCategoryService.java => DataFileCategoryServiceBean.java} (98%) rename src/test/java/edu/harvard/iq/dataverse/{DataFileCategoryServiceTest.java => DataFileCategoryServiceBeanTest.java} (92%) diff --git a/src/main/java/edu/harvard/iq/dataverse/DataFileCategoryService.java b/src/main/java/edu/harvard/iq/dataverse/DataFileCategoryServiceBean.java similarity index 98% rename from src/main/java/edu/harvard/iq/dataverse/DataFileCategoryService.java rename to src/main/java/edu/harvard/iq/dataverse/DataFileCategoryServiceBean.java index c4100fc6d9f..3fa4691a6dd 100644 --- a/src/main/java/edu/harvard/iq/dataverse/DataFileCategoryService.java +++ b/src/main/java/edu/harvard/iq/dataverse/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 index 7778ccedd49..51544aa4246 100644 --- 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 index 085cf078f61..393aa870bc8 100644 --- 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/src/test/java/edu/harvard/iq/dataverse/DataFileCategoryServiceTest.java b/src/test/java/edu/harvard/iq/dataverse/DataFileCategoryServiceBeanTest.java similarity index 92% rename from src/test/java/edu/harvard/iq/dataverse/DataFileCategoryServiceTest.java rename to src/test/java/edu/harvard/iq/dataverse/DataFileCategoryServiceBeanTest.java index 5cd02f7a3b6..edeeea288bf 100644 --- a/src/test/java/edu/harvard/iq/dataverse/DataFileCategoryServiceTest.java +++ b/src/test/java/edu/harvard/iq/dataverse/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 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 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 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 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 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 setup_data_file_categories(String... names) {