0045809: POS2 should use POS2 as appName in requests. This AppName should be used to avoid initial validations execution

diff --git a/src/org/openbravo/pos2/login/POS2InitialValidations.java b/src/org/openbravo/pos2/login/POS2InitialValidations.java
index 5dd378f0..7418003d 100644
--- a/src/org/openbravo/pos2/login/POS2InitialValidations.java
+++ b/src/org/openbravo/pos2/login/POS2InitialValidations.java
@@ -1,44 +1,56 @@
 /************************************************************************************
- * Copyright (C) 2020 Openbravo S.L.U.
+ * Copyright (C) 2020-2021 Openbravo S.L.U.
  * Licensed under the Openbravo Commercial License version 1.0
  * You may obtain a copy of the License at http://www.openbravo.com/legal/obcl.html
  * or in the legal folder of this module distribution.
  ************************************************************************************/
 package org.openbravo.pos2.login;
 
-import java.util.List;
-
 import org.codehaus.jettison.json.JSONException;
 import org.openbravo.dal.service.OBDal;
-import org.openbravo.dal.service.OBQuery;
 import org.openbravo.erpCommon.utility.OBMessageUtils;
-import org.openbravo.erpCommon.utility.PropertyException;
 import org.openbravo.model.common.enterprise.Organization;
 import org.openbravo.pos2.OBPOS2OrgSchema;
 import org.openbravo.retail.posterminal.CustomInitialValidation;
 import org.openbravo.retail.posterminal.OBPOSApplications;
 
+/**
+ * This is a customInitialValidation which is executed as part of the login process of POS2
+ */
 public class POS2InitialValidations extends CustomInitialValidation {
 
   @Override
   public void validation(OBPOSApplications posTerminal) throws JSONException {
-    final Organization currentOrganization = posTerminal.getObposTerminaltype().getOrganization();
-
-    try {
-      String whereClauseOrgSchemas = " as os where os.organization=:organization and "
-          + " os.active=true and os.schema.active=true";
-      OBQuery<OBPOS2OrgSchema> queryOrgSchemas = OBDal.getInstance()
-          .createQuery(OBPOS2OrgSchema.class, whereClauseOrgSchemas);
-      queryOrgSchemas.setNamedParameter("organization", currentOrganization);
-      List<OBPOS2OrgSchema> lstConfiguredSchemasInOrganization = queryOrgSchemas.list();
-
-      if (lstConfiguredSchemasInOrganization.size() == 0) {
-        throw new PropertyException();
-      }
-    } catch (PropertyException e) {
+    validateSchemaIsPresent(posTerminal);
+  }
+
+  private void validateSchemaIsPresent(OBPOSApplications posTerminal) throws JSONException {
+    Organization currentOrganization = posTerminal.getObposTerminaltype().getOrganization();
+
+    // @formatter:off
+    String whereClauseOrgSchemas = " as os"
+        + " where os.organization = :organization"
+        + "   and os.active = true"
+        + "   and os.schema.active = true";
+    // @formatter:on
+
+    int orgSchemasCount = OBDal.getInstance()
+        .createQuery(OBPOS2OrgSchema.class, whereClauseOrgSchemas)
+        .setNamedParameter("organization", currentOrganization)
+        .count();
+
+    if (orgSchemasCount == 0) {
       String[] i18nMessageParams = { currentOrganization.getIdentifier() };
       throw new JSONException(
           OBMessageUtils.getI18NMessage("OBPOS2_SchemaConfigurationIsRequired", i18nMessageParams));
     }
   }
+
+  @Override
+  public boolean executeForApplication(String appName) {
+    if (appName == "POS2") {
+      return true;
+    }
+    return false;
+  }
 }
diff --git a/src/org/openbravo/pos2/login/POS2LoginUtilsServlet.java b/src/org/openbravo/pos2/login/POS2LoginUtilsServlet.java
index cf0db5bf..7280fbab 100644
--- a/src/org/openbravo/pos2/login/POS2LoginUtilsServlet.java
+++ b/src/org/openbravo/pos2/login/POS2LoginUtilsServlet.java
@@ -8,6 +8,10 @@
  */
 package org.openbravo.pos2.login;
 
+import java.util.List;
+
+import javax.servlet.http.HttpServletRequest;
+
 import org.codehaus.jettison.json.JSONException;
 import org.codehaus.jettison.json.JSONObject;
 import org.hibernate.criterion.Restrictions;
@@ -20,18 +24,16 @@ import org.openbravo.dal.service.OBCriteria;
 import org.openbravo.dal.service.OBDal;
 import org.openbravo.erpCommon.utility.OBMessageUtils;
 import org.openbravo.model.ad.access.User;
+import org.openbravo.pos2.POS2Constants;
 import org.openbravo.retail.posterminal.OBPOSApplications;
 
-import javax.servlet.http.HttpServletRequest;
-import java.util.List;
-
 /**
  * This is the login utils servlet for the POS2 module. It allows to consider just the relevant
  * information for the POS2 application when retrieving the login data.
  */
 @SuppressWarnings("serial")
 public class POS2LoginUtilsServlet extends Core2LoginUtilsServlet {
-  private static final String AD_MODULE_ID = "922CA8A8DC6B41FA820ED32269012E3B";
+  private static final String AD_MODULE_ID = POS2Constants.MODULE_ID;
 
   @Override
   protected JSONObject getPrerrenderData(HttpServletRequest request) throws JSONException {
diff --git a/web-jspack/org.openbravo.pos2/ob-config.json b/web-jspack/org.openbravo.pos2/ob-config.json
index a33542d1..46bfa2b2 100644
--- a/web-jspack/org.openbravo.pos2/ob-config.json
+++ b/web-jspack/org.openbravo.pos2/ob-config.json
@@ -1,5 +1,5 @@
 {
-  "appName": "POS",
+  "appName": "POS2",
   "componentProviderApp": "WebPOS_BusinessLogic",
   "appModuleId": "FF808181326CC34901326D53DBCF0018",
   "loginHandler": "../../org.openbravo.retail.posterminal/POSLoginHandler",

diff --git a/src/org/openbravo/retail/posterminal/CustomInitialValidation.java b/src/org/openbravo/retail/posterminal/CustomInitialValidation.java
index a71736441..dd68b6baa 100644
--- a/src/org/openbravo/retail/posterminal/CustomInitialValidation.java
+++ b/src/org/openbravo/retail/posterminal/CustomInitialValidation.java
@@ -14,4 +14,8 @@ import org.codehaus.jettison.json.JSONException;
 public abstract class CustomInitialValidation {
 
   public abstract void validation(OBPOSApplications posTerminal) throws JSONException;
+
+  public boolean executeForApplication(String appName) throws JSONException {
+    return true;
+  }
 }
diff --git a/src/org/openbravo/retail/posterminal/InitialValidations.java b/src/org/openbravo/retail/posterminal/InitialValidations.java
index bac7d649a..b7f6c6776 100644
--- a/src/org/openbravo/retail/posterminal/InitialValidations.java
+++ b/src/org/openbravo/retail/posterminal/InitialValidations.java
@@ -34,7 +34,8 @@ public class InitialValidations {
   public static void validateTerminal(OBPOSApplications posTerminal, JSONObject jsonsent)
       throws JSONException {
 
-    validateTerminal(posTerminal);
+    final String appName = jsonsent.getJSONObject("parameters").optString("appName");
+    validateTerminal(posTerminal, appName);
 
     // Check POS Cache Cash up is processed
     final JSONObject jsonCashUp = jsonsent.getJSONObject("parameters").optJSONObject("cashUpId");
@@ -48,6 +49,11 @@ public class InitialValidations {
   }
 
   public static void validateTerminal(OBPOSApplications posTerminal) throws JSONException {
+    validateTerminal(posTerminal, "");
+  }
+
+  public static void validateTerminal(OBPOSApplications posTerminal, String appName)
+      throws JSONException {
 
     if (posTerminal == null || null == POSUtils.getTerminal(posTerminal.getSearchKey())) {
       throw new JSONException("OBPOS_TerminalNotFound");
@@ -282,7 +288,9 @@ public class InitialValidations {
     }
 
     for (CustomInitialValidation customInitialValidation : getCustomInitialValidations()) {
-      customInitialValidation.validation(posTerminal);
+      if (appName.isBlank() || customInitialValidation.executeForApplication(appName)) {
+        customInitialValidation.validation(posTerminal);
+      }
     }
 
   }