From b9e47cd4b93fb767faef548cc9aa68edea1f332a Mon Sep 17 00:00:00 2001
From: Angel Borroy <angel.borroy@alfresco.com>
Date: Wed, 25 Nov 2020 18:52:16 +0100
Subject: [PATCH] SEARCH-2407: Skip Content Model Validation in Search Services
 side Cherry picked from fe81236

---
 .../alfresco/solr/AlfrescoSolrDataModel.java  | 44 ++-----------------
 1 file changed, 4 insertions(+), 40 deletions(-)

diff --git a/search-services/alfresco-search/src/main/java/org/alfresco/solr/AlfrescoSolrDataModel.java b/search-services/alfresco-search/src/main/java/org/alfresco/solr/AlfrescoSolrDataModel.java
index 919fe2fa0..5c9028550 100644
--- a/search-services/alfresco-search/src/main/java/org/alfresco/solr/AlfrescoSolrDataModel.java
+++ b/search-services/alfresco-search/src/main/java/org/alfresco/solr/AlfrescoSolrDataModel.java
@@ -1363,22 +1363,9 @@ public class AlfrescoSolrDataModel implements QueryConstants
 
     public boolean putModel(M2Model model)
     {
-        Set<String> errors = validateModel(model);
-        if(errors.isEmpty())
-        {
-            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;
-        }
+        modelErrors.remove(model.getName());
+        dictionaryDAO.putModelIgnoringConstraints(model);
+        return true;
     }
 
     public void removeModel(QName modelQName)
@@ -1902,27 +1889,4 @@ public class AlfrescoSolrDataModel implements QueryConstants
         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());
-    }
-}
\ No newline at end of file
+ }
\ No newline at end of file