Merge branch 'feature-2.6/MNT-19080_RMSearchParameters_remove_converter' into 'release/V2.6'

MNT-19080_RMSearchParameters deactivates audit of searches

See merge request records-management/records-management!1097
This commit is contained in:
Rodica Sutu
2018-08-21 12:54:57 +01:00

View File

@@ -36,10 +36,6 @@ import java.util.Map;
import org.alfresco.api.AlfrescoPublicApi;
import org.alfresco.error.AlfrescoRuntimeException;
import org.alfresco.model.ContentModel;
import org.alfresco.service.cmr.repository.datatype.DefaultTypeConverter;
import org.alfresco.service.cmr.repository.datatype.TypeConversionException;
import org.alfresco.service.cmr.repository.datatype.TypeConverter;
import org.alfresco.service.cmr.search.SearchParameters;
import org.alfresco.service.namespace.NamespaceService;
import org.alfresco.service.namespace.QName;
import org.json.JSONArray;
@@ -381,20 +377,5 @@ public class RecordsManagementSearchParameters
{
return includedContainerTypes;
}
// This code needs to be removed once MNT-14795 (Search does not work when RM is installed) has been fixed.
static
{
DefaultTypeConverter.INSTANCE.addConverter(
SearchParameters.class,
String.class,
new TypeConverter.Converter<SearchParameters, String>()
{
public String convert(SearchParameters source)
{
throw new TypeConversionException("Dummy converter! Should throw a TypeConversionException");
}
}
);
}
}