Merge "Make CategoryParameter.getOptions() unmodifiable"

diff --cc vid-app-common/src/test/java/org/onap/vid/services/CategoryParameterServiceImplTest.java
index 7a4263c,7992cbb..3492a75
--- 1/vid-app-common/src/test/java/org/onap/vid/services/CategoryParameterServiceImplTest.java
--- 2/vid-app-common/src/test/java/org/onap/vid/services/CategoryParameterServiceImplTest.java
+++ b/vid-app-common/src/test/java/org/onap/vid/services/CategoryParameterServiceImplTest.java
@@@ -155,12 -158,13 +156,13 @@@ public class CategoryParameterServiceIm
      @Test
      public void deleteCategoryOption_happyPath() {
          CategoryParameter categoryParameter = createCategoryParameter(CATEGORY_NAME, true);
+         CategoryParameter anotherCategoryParameter = createCategoryParameter(CATEGORY_NAME, true);
          CategoryParameterOption categoryParameterOption =
-             new CategoryParameterOption(APP_ID_VID, OPTION_NAME, categoryParameter);
-         categoryParameter.getOptions().add(categoryParameterOption);
+             new CategoryParameterOption(APP_ID_VID, OPTION_NAME, anotherCategoryParameter);
+         categoryParameter.addOption(categoryParameterOption);
          List<CategoryParameter> aList = createCategoryParametersList(categoryParameter);
  
 -        doReturn(aList).when(dataAccessService).getList(anyObject(), anyString(), anyString(), anyObject());
 +        doReturn(aList).when(dataAccessService).getList(any(), anyString(), any(), any());
  
          testSubject.deleteCategoryOption(CATEGORY_NAME, categoryParameterOption);
  
@@@ -171,12 -175,13 +173,13 @@@
      @Test
      public void getCategoryParametersTest() {
          CategoryParameter categoryParameter = createCategoryParameter(CATEGORY_NAME, true);
+         CategoryParameter anotherCategoryParameter = createCategoryParameter(CATEGORY_NAME, true);
          CategoryParameterOption categoryParameterOption =
-             new CategoryParameterOption(APP_ID_VID, OPTION_NAME, categoryParameter);
-         categoryParameter.getOptions().add(categoryParameterOption);
+             new CategoryParameterOption(APP_ID_VID, OPTION_NAME, anotherCategoryParameter);
+         categoryParameter.addOption(categoryParameterOption);
          List<CategoryParameter> aList = createCategoryParametersList(categoryParameter);
  
 -        doReturn(aList).when(dataAccessService).getList(anyObject(), anyString(), anyString(), anyObject());
 +        doReturn(aList).when(dataAccessService).getList(any(), anyString(), any(), any());
  
          CategoryParametersResponse response = testSubject.getCategoryParameters(Family.PARAMETER_STANDARDIZATION);