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

Merge branch 'fix/SEARCH-2252_NonIndexedFields' into 'master'

Browse Source 
Fix/search 2252 non indexed fields

See merge request search_discovery/insightengine!526
This commit is contained in:
Angel Borroy
2020-05-20 15:32:40 +01:00
parent 3b3cf34059 05962b1cd6
commit 9723fd81b3
4 changed files with 223 additions and 73 deletions
Download Patch File Download Diff File Expand all files Collapse all files
e2e-test/src/main/resources/model/indexing-disabled-content-model.xml
+31
View File
@@ -0,0 +1,31 @@
<?xml version="1.0" encoding="UTF-8"?>
<model name="index:contentModel" xmlns="http://www.alfresco.org/model/dictionary/1.0">
<description>Indexed and Non Indexed field comparison</description>
<imports>
<import uri="http://www.alfresco.org/model/dictionary/1.0" prefix="d"/>
<import uri="http://www.alfresco.org/model/content/1.0" prefix="cm"/>
</imports>
<namespaces>
<namespace uri="http://www.alfresco.org/model/index/1.0" prefix="index"/>
</namespaces>
<types>
<type name="index:sample">
<title>Sample</title>
<parent>cm:content</parent>
<properties>
<property name="index:indexed">
<type>d:text</type>
</property>
<property name="index:nonIndexed">
<type>d:text</type>
<index enabled="false" />
</property>
</properties>
</type>
</types>
</model>
e2e-test/src/test/java/org/alfresco/test/search/functional/searchServices/search/SearchNonIndexedFields.java
+138
View File
@@ -0,0 +1,138 @@
/*
* #%L
* Alfresco Search Services E2E Test
* %%
* Copyright (C) 2005 - 2020 Alfresco Software Limited
* %%
* This file is part of the Alfresco software.
* If the software was purchased under a paid Alfresco license, the terms of
* the paid license agreement will prevail. Otherwise, the software is
* provided under the following open source license terms:
*
* Alfresco is free software: you can redistribute it and/or modify
* it under the terms of the GNU Lesser General Public License as published by
* the Free Software Foundation, either version 3 of the License, or
* (at your option) any later version.
*
* Alfresco is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU Lesser General Public License for more details.
*
* You should have received a copy of the GNU Lesser General Public License
* along with Alfresco. If not, see <http://www.gnu.org/licenses/>.
* #L%
*/
package org.alfresco.test.search.functional.searchServices.search;
import java.util.HashMap;
import java.util.Map;
import org.alfresco.rest.core.RestRequest;
import org.alfresco.rest.model.RestTextResponse;
import org.alfresco.rest.search.SearchResponse;
import org.alfresco.test.search.functional.AbstractE2EFunctionalTest;
import org.alfresco.utility.constants.UserRole;
import org.alfresco.utility.model.FileModel;
import org.alfresco.utility.model.FileType;
import org.alfresco.utility.model.FolderModel;
import org.apache.chemistry.opencmis.commons.PropertyIds;
import org.apache.chemistry.opencmis.commons.enums.VersioningState;
import org.springframework.http.HttpMethod;
import org.springframework.http.HttpStatus;
import org.testng.Assert;
import org.testng.annotations.BeforeClass;
import org.testng.annotations.Test;
import io.restassured.RestAssured;
/**
* Testing that fields declared as non indexed (index="true" in Alfresco Content Model)
* are not created in SOLR Schema and that are not stored in SOLR Index.
*
* @author aborroy
*
*/
public class SearchNonIndexedFields extends AbstractE2EFunctionalTest
{
@BeforeClass(alwaysRun = true)
public void dataPreparation() throws Exception
{
serverHealth.assertServerIsOnline();
deployCustomModel("model/indexing-disabled-content-model.xml");
dataUser.addUserToSite(testUser, testSite, UserRole.SiteContributor);
FolderModel testFolder = dataContent.usingSite(testSite).usingUser(testUser).createFolder();
FileModel sampleFile = FileModel.getRandomFileModel(FileType.TEXT_PLAIN, "Sample");
sampleFile.setName("in1-" + sampleFile.getName());
// One field indexed and one field not indexed
Map<String, Object> properties = new HashMap<>();
properties.put(PropertyIds.OBJECT_TYPE_ID, "D:index:sample");
properties.put(PropertyIds.NAME, sampleFile.getName());
properties.put("index:indexed", "Indexed");
properties.put("index:nonIndexed", "Not indexed");
cmisApi.authenticateUser(testUser).usingSite(testSite).usingResource(testFolder).createFile(sampleFile, properties, VersioningState.MAJOR)
.assertThat().existsInRepo();
sampleFile = FileModel.getRandomFileModel(FileType.TEXT_PLAIN, "Sample");
sampleFile.setName("in2-" + sampleFile.getName());
// Only one field not indexed
properties = new HashMap<>();
properties.put(PropertyIds.OBJECT_TYPE_ID, "D:index:sample");
properties.put(PropertyIds.NAME, sampleFile.getName());
properties.put("index:nonIndexed", "Not indexed");
cmisApi.authenticateUser(testUser).usingSite(testSite).usingResource(testFolder).createFile(sampleFile, properties, VersioningState.MAJOR)
.assertThat().existsInRepo();
waitForIndexing(sampleFile.getName(), true);
}
/**
* Test that non indexed fields are not stored in SOLR Index
*/
@Test(priority = 1)
public void testIndexedAndNonIndexedField()
{
SearchResponse response = queryAsUser(testUser, "index_indexed:[* TO *]");
restClient.assertStatusCodeIs(HttpStatus.OK);
Assert.assertEquals(response.getPagination().getCount(), 1);
response = queryAsUser(testUser, "index_nonIndexed:[* TO *]");
restClient.assertStatusCodeIs(HttpStatus.OK);
Assert.assertEquals(response.getPagination().getCount(), 0);
}
/**
* Test that non indexed fields are not created in SOLR Schema
*/
@Test(priority = 2)
public void testNonIndexedDoesNotExist()
{
RestAssured.basePath = "solr/alfresco";
restClient.configureSolrEndPoint();
restClient.configureRequestSpec().setBasePath(RestAssured.basePath);
RestRequest request = RestRequest.simpleRequest(HttpMethod.GET, "admin/luke");
RestTextResponse response = restClient.processTextResponse(request);
String bodyResponse = response.getResponse().getBody().print();
Assert.assertTrue(bodyResponse.contains("{http://www.alfresco.org/model/index/1.0}indexed"),
"Expecting index:indexed field to be present in SOLR Schema");
Assert.assertFalse(bodyResponse.contains("{http://www.alfresco.org/model/index/1.0}nonIndexed"),
"Expecting index:nonIndexed field NOT to be present in SOLR Schema");
}
}
search-services/alfresco-search/src/main/java/org/alfresco/solr/SolrInformationServer.java
+54 -39
View File
@@ -2300,56 +2300,71 @@ public class SolrInformationServer implements InformationServer
for (Entry<QName, PropertyValue> property : properties.entrySet())
{
QName propertyQName = property.getKey();
document.addField(FIELD_PROPERTIES, propertyQName.toString());
document.addField(FIELD_PROPERTIES, propertyQName.getPrefixString());
PropertyValue value = property.getValue();
if(value != null)
PropertyDefinition propertyDefinition = dataModel.getPropertyDefinition(propertyQName);
// Skip adding Alfresco Fields declared as indexed="false" to SOLR Schema
if (propertyDefinition != null && propertyDefinition.isIndexed())
{
if (value instanceof StringPropertyValue)
document.addField(FIELD_PROPERTIES, propertyQName.toString());
document.addField(FIELD_PROPERTIES, propertyQName.getPrefixString());
PropertyValue value = property.getValue();
if(value != null)
{
stringProperty(propertyQName, (StringPropertyValue) value, properties.get(ContentModel.PROP_LOCALE), setAndCollect);
}
else if (value instanceof MLTextPropertyValue)
{
mltextProperty(propertyQName,(MLTextPropertyValue) value, setAndCollect);
}
else if (value instanceof ContentPropertyValue)
{
addContentProperty(setAndCollect, document, propertyQName, (ContentPropertyValue) value, contentIndexingIsEnabled);
}
else if (value instanceof MultiPropertyValue)
{
MultiPropertyValue typedValue = (MultiPropertyValue) value;
AlfrescoSolrDataModel dataModel = AlfrescoSolrDataModel.getInstance();
clearFields(
document,
dataModel.getIndexedFieldNamesForProperty(propertyQName).getFields()
.stream()
.map(FieldInstance::getField)
.collect(Collectors.toList()));
for (PropertyValue singleValue : typedValue.getValues())
if (value instanceof StringPropertyValue)
{
if (singleValue instanceof StringPropertyValue)
stringProperty(propertyQName, (StringPropertyValue) value, properties.get(ContentModel.PROP_LOCALE), setAndCollect);
}
else if (value instanceof MLTextPropertyValue)
{
mltextProperty(propertyQName,(MLTextPropertyValue) value, setAndCollect);
}
else if (value instanceof ContentPropertyValue)
{
addContentProperty(setAndCollect, document, propertyQName, (ContentPropertyValue) value, contentIndexingIsEnabled);
}
else if (value instanceof MultiPropertyValue)
{
MultiPropertyValue typedValue = (MultiPropertyValue) value;
AlfrescoSolrDataModel dataModel = AlfrescoSolrDataModel.getInstance();
clearFields(
document,
dataModel.getIndexedFieldNamesForProperty(propertyQName).getFields()
.stream()
.map(FieldInstance::getField)
.collect(Collectors.toList()));
for (PropertyValue singleValue : typedValue.getValues())
{
stringProperty(propertyQName, (StringPropertyValue) singleValue, properties.get(ContentModel.PROP_LOCALE), addAndCollect);
}
else if (singleValue instanceof MLTextPropertyValue)
{
mltextProperty(propertyQName,(MLTextPropertyValue) singleValue, addAndCollect);
}
else if (singleValue instanceof ContentPropertyValue)
{
addContentProperty(addAndCollect, document, propertyQName, (ContentPropertyValue) singleValue, contentIndexingIsEnabled);
if (singleValue instanceof StringPropertyValue)
{
stringProperty(propertyQName, (StringPropertyValue) singleValue, properties.get(ContentModel.PROP_LOCALE), addAndCollect);
}
else if (singleValue instanceof MLTextPropertyValue)
{
mltextProperty(propertyQName,(MLTextPropertyValue) singleValue, addAndCollect);
}
else if (singleValue instanceof ContentPropertyValue)
{
addContentProperty(addAndCollect, document, propertyQName, (ContentPropertyValue) singleValue, contentIndexingIsEnabled);
}
}
}
}
else
{
document.addField(FIELD_NULLPROPERTIES, propertyQName.toString());
}
}
else
{
document.addField(FIELD_NULLPROPERTIES, propertyQName.toString());
LOGGER.debug("Field '" + propertyQName + "' has not been indexed "
+ (propertyDefinition != null ? "as property definition is not found."
: "as it has been declared as not indexable in the Content Model."));
}
}
}
search-services/alfresco-search/src/test/java/org/alfresco/solr/DynamicCopyFieldsIT.java
-34
View File
@@ -387,40 +387,6 @@ public class DynamicCopyFieldsIT extends AbstractAlfrescoDistributedIT {
DynamicFieldType.SORT), dynamicFieldsTypes);
}
/**
* Test correct fields are generated:
* Properties (mltext):
* index=disable
*/
@Test
@Ignore("index enable=false is ignored")
public void mltextNoneGeneratedFieldsTest()
{
HashSet<String> fieldModifiers = fieldMap.get(MLTEXT_NONE);
assertAllMultiValue(fieldModifiers);
Set<DynamicFieldType> dynamicFieldsTypes = fieldModifiers.stream()
.map(this::modifierToDynamicFieldType)
.collect(Collectors.toSet());
Assert.assertEquals(Set.of(DynamicFieldType.STORED), dynamicFieldsTypes);
}
/**
* Test correct fields are generated:
* Properties (text):
* index=disable
*/
@Test
@Ignore("index enable=false is ignored")
public void textNoneGeneratedFieldsTest()
{
HashSet<String> fieldModifiers = fieldMap.get(TEXT_NONE);
assertAllSingleValue(fieldModifiers);
Set<DynamicFieldType> dynamicFieldsTypes = fieldModifiers.stream()
.map(this::modifierToDynamicFieldType)
.collect(Collectors.toSet());
Assert.assertEquals(Set.of(DynamicFieldType.STORED), dynamicFieldsTypes);
}
/**
* Test correct fields are generated:
* Properties (text):