Revert on multilocale not being properly handled

Author: jordannroussel

README.md

@@ -16,10 +16,6 @@ Name of the action : verifyIntegrityOfSiteContent
 
 Example of URL to call : http://localhost:8080/cms/render/default/en/sites/mySite/home.verifyIntegrityOfSiteContent.do
 
-Parameters of the action :
-- performMultiLocaleVerification : true by default. Allow to perform check on only the main site's locale if needed, by
-setting it to false
-
 The action will then log detected node in errors with a message specifying the issue
 It will also return JSON result for automation. You can check for those keys in the result :
 - siteContentIsValid : "true" or "false" value, depending on the result of the verification

src/main/java/org/jahia/modules/verifyintegrity/actions/VerifyIntegrityOfSiteContent.java

@@ -1,12 +1,12 @@
 package org.jahia.modules.verifyintegrity.actions;
 
 
-import org.jahia.api.Constants;
 import org.jahia.bin.Action;
 import org.jahia.bin.ActionResult;
 import org.jahia.modules.verifyintegrity.exceptions.CompositeIntegrityViolationException;
 import org.jahia.modules.verifyintegrity.services.VerifyIntegrityService;
-import org.jahia.services.content.*;
+import org.jahia.services.content.JCRNodeWrapper;
+import org.jahia.services.content.JCRSessionWrapper;
 import org.jahia.services.content.decorator.JCRSiteNode;
 import org.jahia.services.query.QueryResultWrapper;
 import org.jahia.services.render.RenderContext;
@@ -19,7 +19,9 @@
 import javax.jcr.RepositoryException;
 import javax.jcr.query.Query;
 import javax.servlet.http.HttpServletRequest;
-import java.util.*;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
 
 /**
  * Jahia action to be called on a site to check integrity of its content
@@ -28,8 +30,6 @@ public class VerifyIntegrityOfSiteContent extends Action {
 
 	private static Logger LOGGER = org.slf4j.LoggerFactory.getLogger(VerifyIntegrityOfSiteContent.class);
 
-	private static final String PARAM_MULTI_LOCALE_CHECK = "performMultiLocaleVerification";
-
 	private VerifyIntegrityService verifyIntegrityService;
 
 	public void setVerifyIntegrityService(VerifyIntegrityService verifyIntegrityService) {
@@ -40,54 +40,20 @@ public void setVerifyIntegrityService(VerifyIntegrityService verifyIntegrityServ
 	public ActionResult doExecute(HttpServletRequest req, RenderContext renderContext, Resource resource, JCRSessionWrapper session, Map<String, List<String>> parameters, URLResolver urlResolver) throws Exception {
 		final JCRSiteNode siteNode = renderContext.getSite();
 
-		LOGGER.debug("VerifyIntegrityOfSiteContent action has been called on site : " + siteNode.getName());
 
-		CompositeIntegrityViolationException cive = new CompositeIntegrityViolationException();
+		LOGGER.debug("VerifyIntegrityOfSiteContent action has been called on site : " + siteNode.getName());
 
-		boolean performMultiLocaleVerification = Boolean.parseBoolean(getParameter(parameters,
-				PARAM_MULTI_LOCALE_CHECK, "true"));
-		List<Locale> localesToCheck;
-		if (performMultiLocaleVerification) {
-			localesToCheck = siteNode.getLanguagesAsLocales();
-		}
-		else {
-			localesToCheck = new ArrayList();
-			localesToCheck.add(session.getLocale());
-		}
+		CompositeIntegrityViolationException cive = null;
 
-		for (Locale locale : localesToCheck) {
-			CompositeIntegrityViolationException civeForThisLocale = (((CompositeIntegrityViolationException)
-					JCRTemplate.getInstance()
-					.doExecuteWithSystemSession
-					(null,
-					Constants.EDIT_WORKSPACE, locale, new JCRCallback
-					() {
-				@Override
-				public CompositeIntegrityViolationException doInJCR(JCRSessionWrapper sessionTemp) throws
-						RepositoryException {
-					LOGGER.debug("Locale : " + sessionTemp.getLocale());
-
-					CompositeIntegrityViolationException civeTemp = null;
-
-					try {
-						Query query = sessionTemp.getWorkspace().getQueryManager().createQuery("SELECT * FROM [jnt:content] WHERE " +
-								"ISDESCENDANTNODE('" + siteNode.getPath() + "')", Query.JCR_SQL2);
-						QueryResultWrapper queryResult = (QueryResultWrapper) query.execute();
-						for (Node node : queryResult.getNodes()) {
-							civeTemp = verifyIntegrityService.validateNodeIntegrity((JCRNodeWrapper) node, sessionTemp,
-									civeTemp);
-						}
-					} catch (RepositoryException e) {
-						e.printStackTrace();
-					}
-
-					return civeTemp;
-				}
-			})));
-
-			if ((civeForThisLocale != null) && (civeForThisLocale.getErrors() != null)) {
-				cive.addExceptions(civeForThisLocale.getErrors());
+		try {
+			Query query = session.getWorkspace().getQueryManager().createQuery("SELECT * FROM [jnt:content] WHERE " +
+					"ISDESCENDANTNODE('" + siteNode.getPath() + "')", Query.JCR_SQL2);
+			QueryResultWrapper queryResult = (QueryResultWrapper) query.execute();
+			for (Node node : queryResult.getNodes()) {
+				cive = verifyIntegrityService.validateNodeIntegrity((JCRNodeWrapper) node, session, cive);
 			}
+		} catch (RepositoryException e) {
+			e.printStackTrace();
 		}
 
 		Map<String, String> resultAsMap = new HashMap();