inteligr8/SearchServices
1
0
Fork 0
mirror of https://github.com/Alfresco/SearchServices.git synced 2026-09-16 18:12:56 +00:00
Code Issues Packages Projects Releases Wiki Activity

SEARCH-2202 Simplify code in SolrInformationServer.

Browse Source 
Sonar complains about fall-through switch statements, but this logic can be much shorter anyway.
This commit is contained in:
Tom Page
2020-04-27 12:07:47 +01:00
parent 3943ee4192
commit 4b79c4b452
1 changed files with 6 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
search-services/alfresco-search/src/main/java/org/alfresco/solr/SolrInformationServer.java
+6 -10
View File
@@ -69,6 +69,9 @@ import static org.alfresco.repo.search.adaptor.lucene.QueryConstants.FIELD_TXCOM
import static org.alfresco.repo.search.adaptor.lucene.QueryConstants.FIELD_TXID; import static org.alfresco.repo.search.adaptor.lucene.QueryConstants.FIELD_TXID;
import static org.alfresco.repo.search.adaptor.lucene.QueryConstants.FIELD_TYPE; import static org.alfresco.repo.search.adaptor.lucene.QueryConstants.FIELD_TYPE;
import static org.alfresco.repo.search.adaptor.lucene.QueryConstants.FIELD_VERSION; import static org.alfresco.repo.search.adaptor.lucene.QueryConstants.FIELD_VERSION;
import static org.alfresco.service.cmr.security.AuthorityType.EVERYONE;
import static org.alfresco.service.cmr.security.AuthorityType.GROUP;
import static org.alfresco.service.cmr.security.AuthorityType.GUEST;
import static org.alfresco.solr.utils.Utils.notNullOrEmpty; import static org.alfresco.solr.utils.Utils.notNullOrEmpty;
import java.io.File; import java.io.File;
@@ -3216,17 +3219,10 @@ public class SolrInformationServer implements InformationServer
*/ */
private String addTenantToAuthority(String authority, String tenant) private String addTenantToAuthority(String authority, String tenant)
{ {
switch (AuthorityType.getAuthorityType(authority)) AuthorityType authorityType = AuthorityType.getAuthorityType(authority);
if ((authorityType == GROUP || authorityType == EVERYONE || authorityType == GUEST) && !tenant.isEmpty())
{ {
case GROUP: return authority + "@" + tenant;
case EVERYONE:
case GUEST:
if (tenant.length() != 0)
{
return authority + "@" + tenant;
}
default:
break;
} }
return authority; return authority;
} }