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-2407: Skip Content Model Validation in Search Services side

Browse Source 
Cherry picked from fe81236
This commit is contained in:
Angel Borroy
2020-11-25 18:52:16 +01:00
parent 10d848ec98
commit b9e47cd4b9
1 changed files with 4 additions and 40 deletions
Download Patch File Download Diff File Expand all files Collapse all files
search-services/alfresco-search/src/main/java/org/alfresco/solr/AlfrescoSolrDataModel.java
+4 -40
View File
@@ -1363,22 +1363,9 @@ public class AlfrescoSolrDataModel implements QueryConstants
public boolean putModel(M2Model model) public boolean putModel(M2Model model)
{ {
Set<String> errors = validateModel(model); modelErrors.remove(model.getName());
if(errors.isEmpty()) dictionaryDAO.putModelIgnoringConstraints(model);
{ return true;
modelErrors.remove(model.getName());
dictionaryDAO.putModelIgnoringConstraints(model);
return true;
}
else
{
if(!modelErrors.containsKey(model.getName()))
{
modelErrors.put(model.getName(), errors);
log.warn(errors.iterator().next());
}
return false;
}
} }
public void removeModel(QName modelQName) public void removeModel(QName modelQName)
@@ -1902,27 +1889,4 @@ public class AlfrescoSolrDataModel implements QueryConstants
return solrSortField; return solrSortField;
} }
private Set<String> validateModel(M2Model model) }
{
try
{
dictionaryDAO.getCompiledModel(QName.createQName(model.getName(), namespaceDAO));
}
catch (DictionaryException | NamespaceException exception)
{
// No model to diff
return Collections.emptySet();
}
// namespace unknown - no model
List<M2ModelDiff> modelDiffs = dictionaryDAO.diffModelIgnoringConstraints(model);
return modelDiffs.stream()
.filter(diff -> diff.getDiffType().equals(M2ModelDiff.DIFF_UPDATED))
.map(diff ->
String.format("Model not updated: %s Failed to validate model update - found non-incrementally updated %s '%s'",
model.getName(),
diff.getElementType(),
diff.getElementName()))
.collect(Collectors.toSet());
}
}