From 3aa4b95470cf1caa8ef1c451a8cdeff09e2b9e5d Mon Sep 17 00:00:00 2001 From: Tuna Aksoy Date: Mon, 16 Jul 2018 08:56:44 +0100 Subject: [PATCH 1/3] RM-6141: RM_support_for_the_Insight_Engine (cherry picked from commit 8858f8fd188e70d1175cf3134cda2af80cf967fc) --- .../capability/RMAfterInvocationProvider.java | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/capability/RMAfterInvocationProvider.java b/rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/capability/RMAfterInvocationProvider.java index 264915f9c6..bfd09e8ef9 100644 --- a/rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/capability/RMAfterInvocationProvider.java +++ b/rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/capability/RMAfterInvocationProvider.java @@ -49,6 +49,7 @@ import org.alfresco.module.org_alfresco_module_rm.model.RecordsManagementModel; import org.alfresco.repo.search.SimpleResultSetMetaData; import org.alfresco.repo.search.impl.lucene.PagingLuceneResultSet; import org.alfresco.repo.search.impl.querymodel.QueryEngineResults; +import org.alfresco.repo.search.impl.solr.SolrSQLJSONResultSet; import org.alfresco.repo.security.authentication.AuthenticationUtil; import org.alfresco.repo.security.permissions.PermissionCheckCollection; import org.alfresco.repo.security.permissions.PermissionCheckValue; @@ -421,6 +422,12 @@ public class RMAfterInvocationProvider extends RMSecurityCommon return null; } + // FIXME + if (returnedObject.getResultSetMetaData().getSearchParameters().getLanguage().equalsIgnoreCase("solr-sql")) + { + return returnedObject; + } + class RMFilteringResultSet extends FilteringResultSet { private long numberFound; From 95220d099b1bd01302956d6c37bd141f4f8a02ec Mon Sep 17 00:00:00 2001 From: Ross Gale Date: Tue, 2 Jul 2019 12:21:00 +0100 Subject: [PATCH 2/3] RM-6564 adding documentation --- .../capability/RMAfterInvocationProvider.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/capability/RMAfterInvocationProvider.java b/rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/capability/RMAfterInvocationProvider.java index bfd09e8ef9..5d9a3d25ff 100644 --- a/rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/capability/RMAfterInvocationProvider.java +++ b/rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/capability/RMAfterInvocationProvider.java @@ -422,7 +422,7 @@ public class RMAfterInvocationProvider extends RMSecurityCommon return null; } - // FIXME + // FIXME see: RM-6895 if (returnedObject.getResultSetMetaData().getSearchParameters().getLanguage().equalsIgnoreCase("solr-sql")) { return returnedObject; From 91534ac7df2d6262e2e083c70063180c629a237a Mon Sep 17 00:00:00 2001 From: cagache Date: Thu, 4 Jul 2019 11:28:35 +0300 Subject: [PATCH 3/3] code review comments --- .../capability/RMAfterInvocationProvider.java | 1 - 1 file changed, 1 deletion(-) diff --git a/rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/capability/RMAfterInvocationProvider.java b/rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/capability/RMAfterInvocationProvider.java index 45f00e856b..44d168b8f1 100644 --- a/rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/capability/RMAfterInvocationProvider.java +++ b/rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/capability/RMAfterInvocationProvider.java @@ -49,7 +49,6 @@ import org.alfresco.module.org_alfresco_module_rm.model.RecordsManagementModel; import org.alfresco.repo.search.SimpleResultSetMetaData; import org.alfresco.repo.search.impl.lucene.PagingLuceneResultSet; import org.alfresco.repo.search.impl.querymodel.QueryEngineResults; -import org.alfresco.repo.search.impl.solr.SolrSQLJSONResultSet; import org.alfresco.repo.security.authentication.AuthenticationUtil; import org.alfresco.repo.security.permissions.PermissionCheckCollection; import org.alfresco.repo.security.permissions.PermissionCheckValue;