From e7d5d09829acacee2023f9cc0cb6a65e5efdb213 Mon Sep 17 00:00:00 2001
From: Sara Aspery <sara.aspery@alfresco.com>
Date: Wed, 10 May 2017 07:50:33 +0100
Subject: [PATCH] RM-5115 Changes following review

---
 .../rm/rest/api/impl/SearchTypesFactory.java        | 11 -----------
 .../RecordCategoryChildrenRelation.java             | 13 ++++---------
 2 files changed, 4 insertions(+), 20 deletions(-)

diff --git a/rm-community/rm-community-repo/source/java/org/alfresco/rm/rest/api/impl/SearchTypesFactory.java b/rm-community/rm-community-repo/source/java/org/alfresco/rm/rest/api/impl/SearchTypesFactory.java
index f45b4a85b9..cbaee33f3b 100644
--- a/rm-community/rm-community-repo/source/java/org/alfresco/rm/rest/api/impl/SearchTypesFactory.java
+++ b/rm-community/rm-community-repo/source/java/org/alfresco/rm/rest/api/impl/SearchTypesFactory.java
@@ -29,7 +29,6 @@ package org.alfresco.rm.rest.api.impl;
 
 import java.security.InvalidParameterException;
 import java.util.Collection;
-import java.util.Collections;
 import java.util.HashSet;
 import java.util.Set;
 
@@ -252,16 +251,6 @@ public class SearchTypesFactory
         return searchTypeQNames;
     }
 
-    /**
-     * Helper method to build association types for categories endpoint
-     * @return
-     */
-    public Set<QName> buildAssocTypesCategoriesEndpoint()
-    {
-        Set<QName> assocTypeQNames = Collections.singleton(ContentModel.ASSOC_CONTAINS);
-        return assocTypeQNames;
-    }
-
     /**
      * Helper method to build search types for transfer containers endpoint
      * @return
diff --git a/rm-community/rm-community-repo/source/java/org/alfresco/rm/rest/api/recordcategories/RecordCategoryChildrenRelation.java b/rm-community/rm-community-repo/source/java/org/alfresco/rm/rest/api/recordcategories/RecordCategoryChildrenRelation.java
index 992605e605..084fc1f0ff 100644
--- a/rm-community/rm-community-repo/source/java/org/alfresco/rm/rest/api/recordcategories/RecordCategoryChildrenRelation.java
+++ b/rm-community/rm-community-repo/source/java/org/alfresco/rm/rest/api/recordcategories/RecordCategoryChildrenRelation.java
@@ -30,15 +30,10 @@ package org.alfresco.rm.rest.api.recordcategories;
 import static org.alfresco.module.org_alfresco_module_rm.util.RMParameterCheck.checkNotBlank;
 import static org.alfresco.util.ParameterCheck.mandatory;
 
-import java.util.AbstractList;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.HashMap;
-import java.util.HashSet;
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
+import java.util.*;
+import java.util.Collections;
 
+import org.alfresco.model.ContentModel;
 import org.alfresco.module.org_alfresco_module_rm.model.RecordsManagementModel;
 import org.alfresco.query.PagingResults;
 import org.alfresco.repo.node.getchildren.FilterProp;
@@ -114,7 +109,7 @@ public class RecordCategoryChildrenRelation implements RelationshipResourceActio
 
         // list record categories and record folders
         Set<QName> searchTypeQNames = searchTypesFactory.buildSearchTypesCategoriesEndpoint(parameters, LIST_RECORD_CATEGORY_CHILDREN_EQUALS_QUERY_PROPERTIES);
-        Set<QName> assocTypeQNames = searchTypesFactory.buildAssocTypesCategoriesEndpoint();
+        Set<QName> assocTypeQNames = Collections.singleton(ContentModel.ASSOC_CONTAINS);
         List<FilterProp> filterProps = apiUtils.getListChildrenFilterProps(parameters, LIST_RECORD_CATEGORY_CHILDREN_EQUALS_QUERY_PROPERTIES);
 
         final PagingResults<FileInfo> pagingResults = fileFolderService.list(parentNodeRef,