diff --git a/src/org/openbravo/retail/storeserver/synchronization/IgnoreVersionCheckPreferenceEventHandler.java b/src/org/openbravo/retail/storeserver/synchronization/IgnoreVersionCheckPreferenceEventHandler.java --- a/src/org/openbravo/retail/storeserver/synchronization/IgnoreVersionCheckPreferenceEventHandler.java +++ b/src/org/openbravo/retail/storeserver/synchronization/IgnoreVersionCheckPreferenceEventHandler.java @@ -23,7 +23,6 @@ import javax.enterprise.event.Observes; import org.apache.log4j.Logger; -import org.hibernate.resource.transaction.spi.TransactionStatus; import org.openbravo.base.exception.OBException; import org.openbravo.base.model.Entity; import org.openbravo.base.model.ModelProvider; @@ -96,9 +95,10 @@ public void transactionCompleted(@Observes TransactionCompletedEvent event) { final boolean doReset = null != resetVersion.get() && resetVersion.get(); resetVersion.set(null); - // recompute the version status if applicable - if (doReset && event.getTransaction().getStatus() == TransactionStatus.COMMITTED - && MobileServerController.getInstance().isThisAStoreServer()) { + // recompute the version status if applicable, always recompute also + // if transaction is not committed, transaction is almost always commited anyway + // and only if the preference changes is the recompute done which is practically never + if (doReset && MobileServerController.getInstance().isThisAStoreServer()) { StoreServerVersionHandler.getInstance().resetCachedInformation(); } } diff --git a/src/org/openbravo/retail/storeserver/synchronization/StoreServerVersionHandler.java b/src/org/openbravo/retail/storeserver/synchronization/StoreServerVersionHandler.java --- a/src/org/openbravo/retail/storeserver/synchronization/StoreServerVersionHandler.java +++ b/src/org/openbravo/retail/storeserver/synchronization/StoreServerVersionHandler.java @@ -22,13 +22,14 @@ import java.sql.PreparedStatement; import java.sql.ResultSet; import java.util.HashMap; +import java.util.List; import java.util.Map; -import org.hibernate.query.Query; import org.openbravo.base.exception.OBException; import org.openbravo.base.provider.OBProvider; import org.openbravo.dal.core.OBContext; import org.openbravo.dal.service.OBDal; +import org.openbravo.dal.service.OBQuery; import org.openbravo.database.ConnectionProvider; import org.openbravo.erpCommon.businessUtility.Preferences; import org.openbravo.mobile.core.MobileServerDefinition; @@ -42,38 +43,33 @@ import org.slf4j.LoggerFactory; /** - * Class which manages store server versions and version checks to prevent servers in different - * versions to exchange information. + * Class which manages store server versions and version checks to prevent servers in different versions to exchange information. * - * Some background information: - when a server starts the system checks if modules have been - * installed/updated - if this is the case then the server will regenerate the modules-by-server - * table for this server and compute - a new version number - the list of modules by server are - * replicated, from a store to central, and for the central server (so the modules of the central - * server) to all stores. + * Some background information: - when a server starts the system checks if modules have been installed/updated - if this is the + * case then the server will regenerate the modules-by-server table for this server and compute - a new version number - the list + * of modules by server are replicated, from a store to central, and for the central server (so the modules of the central server) + * to all stores. * * For the central and store server there are different consequences. * - * If the central server modules change then the new module list is replicated to all store servers. - * The {@link VersionCacheResetWriterFilterAdapter} class runs in the store server and listens to - * this replication. If the central server modules change then automatically the store server - * version information is recomputed/checked against the new central server version. If the store - * and central server have different versions for the same modules then the store server will move - * to offline and to the Different-From-Central version status. + * If the central server modules change then the new module list is replicated to all store servers. The + * {@link VersionCacheResetWriterFilterAdapter} class runs in the store server and listens to this replication. If the central + * server modules change then automatically the store server version information is recomputed/checked against the new central + * server version. If the store and central server have different versions for the same modules then the store server will move to + * offline and to the Different-From-Central version status. * - * If the store server modules change then the store server will recompute its version and replicate - * its modules-by-server to the central server. + * If the store server modules change then the store server will recompute its version and replicate its modules-by-server to the + * central server. * - * There is also a writer adapter {@link PreferenceWriterFilterAdapter} which listens to replication - * of the writer filter adapter from the central to the store server. If the ignore-version-check - * preference changes then the store servers version status is recomputed also. + * There is also a writer adapter {@link PreferenceWriterFilterAdapter} which listens to replication of the writer filter adapter + * from the central to the store server. If the ignore-version-check preference changes then the store servers version status is + * recomputed also. * - * When the store server is incompatible with the central server then the - * {@link StoreServerIncomingSynchronizationPreventer} will prevent data to be replicated from - * central to the store. + * When the store server is incompatible with the central server then the {@link StoreServerIncomingSynchronizationPreventer} will + * prevent data to be replicated from central to the store. * - * The {@link RetailSynchronizationRequestHandler} plays a role in preventing a webpos which is not - * loaded from the store server to connect to the store server if the store/central server have - * different versions and ss is offline. + * The {@link RetailSynchronizationRequestHandler} plays a role in preventing a webpos which is not loaded from the store server + * to connect to the store server if the store/central server have different versions and ss is offline. * * @author mtaal */ @@ -119,9 +115,8 @@ } /** - * Returns true if the caller should take into account if the store and central server have - * different versions. Returns false in other cases, for example if the ignore version differences - * preference is set. + * Returns true if the caller should take into account if the store and central server have different versions. Returns false in + * other cases, for example if the ignore version differences preference is set. */ public boolean doVersionCheck() { if (doResetCachedInformation || ignoreVersionCheck == null) { @@ -229,8 +224,7 @@ } /** - * Creates the entries in the modules by server table. Only does this if the version of the - * modules changed. + * Creates the entries in the modules by server table. Only does this if the version of the modules changed. */ public void recomputeCurrentServerVersions() { // read the modules and add the version @@ -256,14 +250,28 @@ private void clearCurrentServerVersions() { log.info("Removing version info from " + MobileServerController.getInstance().getMobileServerKey()); - OBDal - .getInstance() - .getSession() - .createQuery( - "delete from " + MobileServerDefinitionModule.ENTITY_NAME + " where " - + MobileServerDefinitionModule.PROPERTY_OBMOBCSERVERDEFINITION + ".id=:serverId") - .setParameter("serverId", MobileServerController.getInstance().getThisServerDefinitionId()) - .executeUpdate(); + + PreparedStatement st = null; + ConnectionProvider cp = null; + try { + cp = new DalConnectionProvider(); + st = cp + .getPreparedStatement("delete from obstsyn_server_module where obstsyn_server_module_id=?"); + st.setString(1, MobileServerController.getInstance().getThisServerDefinitionId()); + st.executeUpdate(); + } catch (Throwable t) { + log.error(t.getMessage(), t); + throw new OBException(t.getMessage(), t); + } finally { + try { + if (cp != null) { + cp.releasePreparedStatement(st); + } + } catch (Exception e) { + log.error("Error while releasing a prepared statement", e); + } + } + } private void recomputeCurrentServerVersionsInternal() { @@ -277,22 +285,22 @@ return; } - final Query moduleQry = OBDal - .getInstance() - .getSession() - .createQuery( - "select " + Module.PROPERTY_ID + "," + Module.PROPERTY_VERSION + "," - + Module.PROPERTY_NAME + " from " + Module.ENTITY_NAME, Object[].class); + OBQuery obQuery = OBDal.getInstance().createQuery(Module.class, null); + obQuery.setFilterOnActive(false); + obQuery.setFilterOnReadableClients(false); + obQuery.setFilterOnReadableOrganization(false); + List modules = obQuery.list(); + long version1 = 0; long version2 = 0; long version3 = 0; - for (Object[] os : moduleQry.list()) { - final String modVersion = (String) os[1]; + for (Module mod : modules) { + final String modVersion = mod.getVersion(); try { final String[] versionSegments = modVersion.split("\\."); if (versionSegments.length != 3) { log.error("Version number of module is not parseable, ignoring it for version checking " - + modVersion + " " + os[0] + " " + os[2]); + + modVersion + " " + mod.getName()); continue; } version1 += Long.parseLong(versionSegments[0]); @@ -300,7 +308,7 @@ version3 += Long.parseLong(versionSegments[2]); } catch (Exception e) { log.error("Version number of module is not parseable, ignoring it for version checking " - + modVersion + " " + os[0] + " " + os[2], e); + + modVersion + " " + mod.getName(), e); } } final String serverVersion = version1 + "." + version2 + "." + version3; @@ -308,24 +316,16 @@ // regenerate the server module version table // read the current version modules - final Query serverModuleQry = OBDal - .getInstance() - .getSession() - .createQuery( - "from " + MobileServerDefinitionModule.ENTITY_NAME + " where " - + MobileServerDefinitionModule.PROPERTY_OBMOBCSERVERDEFINITION + ".id=:id", - MobileServerDefinitionModule.class); - serverModuleQry.setParameter("id", thisServer.getId()); final Map serverModules = new HashMap<>(); - for (MobileServerDefinitionModule mdd : serverModuleQry.list()) { + OBDal.getInstance().getSession().refresh(thisServer.getOBSTSYNSERVERMODULEList()); + for (MobileServerDefinitionModule mdd : thisServer.getOBSTSYNSERVERMODULEList()) { serverModules.put(mdd.getModule(), mdd); } // and then for each module check if a new version should be created - for (Object o : moduleQry.list()) { - final Object[] os = (Object[]) o; - final String module = (String) os[0]; - final String version = (String) os[1]; + for (Module moduleObj : modules) { + final String module = moduleObj.getId(); + final String version = moduleObj.getVersion(); if (serverModules.containsKey(module)) { final MobileServerDefinitionModule mdd = serverModules.get(module); @@ -342,9 +342,9 @@ serverModule.setClient(thisServer.getClient()); serverModule.setOrganization(thisServer.getOrganization()); serverModule.setObmobcServerDefinition(thisServer); - serverModule.setModule((String) os[0]); - serverModule.setVersion((String) os[1]); - serverModule.setName((String) os[2]); + serverModule.setModule(moduleObj.getId()); + serverModule.setVersion(moduleObj.getVersion()); + serverModule.setName(moduleObj.getName()); OBDal.getInstance().save(serverModule); } @@ -442,18 +442,15 @@ private boolean areModuleVersionsCompatible() { // read all the store server modules - final Query moduleQry = OBDal - .getInstance() - .getSession() - .createQuery( - "select " + Module.PROPERTY_ID + "," + Module.PROPERTY_VERSION + " from " - + Module.ENTITY_NAME, Object[].class); + + OBQuery obQuery = OBDal.getInstance().createQuery(Module.class, null); + obQuery.setFilterOnActive(false); + obQuery.setFilterOnReadableClients(false); + obQuery.setFilterOnReadableOrganization(false); + List modules = obQuery.list(); final Map storeServerVersionsByModule = new HashMap<>(); - for (Object[] os : moduleQry.list()) { - final String moduleId = (String) os[0]; - final String moduleVersion = (String) os[1]; - - storeServerVersionsByModule.put(moduleId, moduleVersion); + for (Module module : modules) { + storeServerVersionsByModule.put(module.getId(), module.getVersion()); } if (storeServerVersionsByModule.isEmpty()) { @@ -461,23 +458,21 @@ } // read all the central server modules - final Query centralModuleQry = OBDal - .getInstance() - .getSession() - .createQuery( - "select " + MobileServerDefinitionModule.PROPERTY_MODULE + "," - + MobileServerDefinitionModule.PROPERTY_VERSION + "," - + MobileServerDefinitionModule.PROPERTY_NAME + " from " - + MobileServerDefinitionModule.ENTITY_NAME + " where " - + MobileServerDefinitionModule.PROPERTY_OBMOBCSERVERDEFINITION - + ".id=:centralServerId", Object[].class); - centralModuleQry.setParameter("centralServerId", MobileServerController.getInstance() + OBQuery serverModulesQry = OBDal.getInstance().createQuery( + MobileServerDefinitionModule.class, + MobileServerDefinitionModule.PROPERTY_OBMOBCSERVERDEFINITION + ".id=:centralServerId"); + serverModulesQry.setFilterOnActive(false); + serverModulesQry.setFilterOnReadableClients(false); + serverModulesQry.setFilterOnReadableOrganization(false); + serverModulesQry.setNamedParameter("centralServerId", MobileServerController.getInstance() .getCentralServer().getId()); + List serverModules = serverModulesQry.list(); + differences = ""; - for (Object[] os : centralModuleQry.list()) { - final String moduleId = (String) os[0]; - final String centralServerModuleVersion = (String) os[1]; - final String moduleName = (String) os[2]; + for (MobileServerDefinitionModule sm : serverModules) { + final String moduleId = sm.getModule(); + final String centralServerModuleVersion = sm.getVersion(); + final String moduleName = sm.getName(); final String storeServerModuleVersion = storeServerVersionsByModule.get(moduleId); if (storeServerModuleVersion != null && !centralServerModuleVersion.equals(storeServerModuleVersion)) { @@ -496,8 +491,7 @@ } /** - * Return true if the store and central versions are the same or if no version differences should - * be checked. + * Return true if the store and central versions are the same or if no version differences should be checked. * * @return */ diff --git a/src/org/openbravo/retail/storeserver/synchronization/eventhandler/AutoRouteAndPushGenericEventHandler.java b/src/org/openbravo/retail/storeserver/synchronization/eventhandler/AutoRouteAndPushGenericEventHandler.java --- a/src/org/openbravo/retail/storeserver/synchronization/eventhandler/AutoRouteAndPushGenericEventHandler.java +++ b/src/org/openbravo/retail/storeserver/synchronization/eventhandler/AutoRouteAndPushGenericEventHandler.java @@ -25,7 +25,6 @@ import javax.enterprise.event.Observes; -import org.hibernate.resource.transaction.spi.TransactionStatus; import org.openbravo.client.kernel.event.EntityPersistenceEventObserver; import org.openbravo.client.kernel.event.TransactionBeginEvent; import org.openbravo.client.kernel.event.TransactionCompletedEvent; @@ -52,8 +51,7 @@ public final void onTransactionCompleted(@Observes TransactionCompletedEvent event) { String mobileServerKey = mobileServerKeyPerThread.get(); mobileServerKeyPerThread.set(null); - if ((mobileServerKey == null) - || event.getTransaction().getStatus() == TransactionStatus.ROLLED_BACK) { + if (mobileServerKey == null) { return; } Set mobileServersToPushData = new HashSet<>(); diff --git a/src/org/openbravo/retail/storeserver/synchronization/process/BusinessPartnerAndRelatedTablesSynchronizer.java b/src/org/openbravo/retail/storeserver/synchronization/process/BusinessPartnerAndRelatedTablesSynchronizer.java --- a/src/org/openbravo/retail/storeserver/synchronization/process/BusinessPartnerAndRelatedTablesSynchronizer.java +++ b/src/org/openbravo/retail/storeserver/synchronization/process/BusinessPartnerAndRelatedTablesSynchronizer.java @@ -22,13 +22,14 @@ import java.sql.Connection; import java.sql.PreparedStatement; +import java.sql.ResultSet; import java.util.HashSet; import java.util.Iterator; import java.util.List; import java.util.Set; import org.hibernate.criterion.Restrictions; -import org.hibernate.query.Query; +import org.openbravo.base.exception.OBException; import org.openbravo.base.model.Entity; import org.openbravo.base.model.ModelProvider; import org.openbravo.base.model.Property; @@ -36,9 +37,11 @@ import org.openbravo.dal.core.OBContext; import org.openbravo.dal.service.OBCriteria; import org.openbravo.dal.service.OBDal; +import org.openbravo.database.ConnectionProvider; import org.openbravo.model.ad.datamodel.Column; import org.openbravo.model.ad.datamodel.Table; import org.openbravo.retail.storeserver.synchronization.OBSTSYN_BusinessPartnerRelatedTable; +import org.openbravo.service.db.DalConnectionProvider; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -145,16 +148,33 @@ * returns the values of the given foreign key column for the rows whose id is one of the provided */ private Set getForeignKeyValues(Table table, Column foreignKeyColumn, Set ids) { - Entity entity = ModelProvider.getInstance().getEntityByTableId(table.getId()); - Property property = entity.getPropertyByColumnName(foreignKeyColumn.getDBColumnName()); StringBuilder updatedIdsQueryString = new StringBuilder(); - updatedIdsQueryString.append("select " + property.getName() + ".id "); - updatedIdsQueryString.append("from " + entity.getName() + " "); - updatedIdsQueryString.append("where id in (:ids)"); - Query updatedIdsQuery = OBDal.getInstance().getSession() - .createQuery(updatedIdsQueryString.toString(), String.class); - updatedIdsQuery.setParameterList("ids", ids); - return new HashSet(updatedIdsQuery.list()); + updatedIdsQueryString.append("select " + foreignKeyColumn.getDBColumnName() + ".id "); + updatedIdsQueryString.append("from " + table.getDBTableName() + " "); + updatedIdsQueryString.append("where id in ?"); + + PreparedStatement st = null; + ConnectionProvider cp = null; + Set result = new HashSet(); + try { + cp = new DalConnectionProvider(); + st = cp.getPreparedStatement(updatedIdsQueryString.toString()); + st.setObject(1, ids.toArray(new String[ids.size()])); + ResultSet rs = st.executeQuery(); + while (rs.next()) { + result.add(rs.getString(1)); + } + rs.close(); + return result; + } catch (Exception ex) { + throw new OBException(ex.toString(), ex); + } finally { + try { + cp.releasePreparedStatement(st); + } catch (Exception e) { + log.error("Error while releasing a prepared statement", e); + } + } } /** @@ -239,13 +259,31 @@ } StringBuilder updatedIdsQueryString = new StringBuilder(); updatedIdsQueryString.append("select id "); - updatedIdsQueryString.append("from " + entity.getName() + " "); - updatedIdsQueryString.append("where " + property.getName() + ".id "); + updatedIdsQueryString.append("from " + entity.getTableName() + " "); + updatedIdsQueryString.append("where " + property.getColumnName() + ".id "); updatedIdsQueryString.append(" in (:ids)"); - Query updatedIdsQuery = OBDal.getInstance().getSession() - .createQuery(updatedIdsQueryString.toString(), String.class); - updatedIdsQuery.setParameterList("ids", idSet); - Set newIdsOfUpdatedRows = new HashSet(updatedIdsQuery.list()); - return newIdsOfUpdatedRows; + + PreparedStatement st = null; + ConnectionProvider cp = null; + Set result = new HashSet(); + try { + cp = new DalConnectionProvider(); + st = cp.getPreparedStatement(updatedIdsQueryString.toString()); + st.setObject(1, idSet.toArray(new String[idSet.size()])); + ResultSet rs = st.executeQuery(); + while (rs.next()) { + result.add(rs.getString(1)); + } + rs.close(); + return result; + } catch (Exception ex) { + throw new OBException(ex.toString(), ex); + } finally { + try { + cp.releasePreparedStatement(st); + } catch (Exception e) { + log.error("Error while releasing a prepared statement", e); + } + } } } diff --git a/src/org/openbravo/retail/storeserver/synchronization/router/AssortmentRouter.java b/src/org/openbravo/retail/storeserver/synchronization/router/AssortmentRouter.java --- a/src/org/openbravo/retail/storeserver/synchronization/router/AssortmentRouter.java +++ b/src/org/openbravo/retail/storeserver/synchronization/router/AssortmentRouter.java @@ -20,24 +20,23 @@ package org.openbravo.retail.storeserver.synchronization.router; +import java.sql.PreparedStatement; +import java.sql.ResultSet; import java.util.HashSet; -import java.util.List; import java.util.Set; import javax.enterprise.context.ApplicationScoped; -import org.hibernate.query.NativeQuery; -import org.hibernate.query.Query; import org.jumpmind.symmetric.model.DataMetaData; import org.jumpmind.symmetric.model.Node; import org.jumpmind.symmetric.model.TriggerRouter; import org.jumpmind.symmetric.route.SimpleRouterContext; import org.openbravo.base.exception.OBException; import org.openbravo.dal.core.OBContext; -import org.openbravo.dal.service.OBDal; -import org.openbravo.model.common.enterprise.Organization; +import org.openbravo.database.ConnectionProvider; import org.openbravo.replication.symmetricds.extensions.AbstractClientFilteredRouter; import org.openbravo.replication.symmetricds.util.MobileServerProvider; +import org.openbravo.service.db.DalConnectionProvider; /** * Router that routes entries from OBRETCO_ProductList and OBRETCO_Prol_Product. Changes done to an @@ -60,30 +59,55 @@ String assortmentId = getColumnValue(ASSORTMENT_ID, dataMetaData); // find all the organizations using this assortment - final Query qry = OBDal - .getInstance() - .getSession() - .createQuery( - "select id from " + Organization.ENTITY_NAME + " where " - + Organization.PROPERTY_OBRETCOPRODUCTLIST + "=:assortmentId", String.class); - qry.setParameter("assortmentId", assortmentId); - final List list = qry.list(); - - // and send the assortment to all the related nodes Set allNodes = new HashSet(); - for (String orgId : list) { - allNodes.addAll(MobileServerProvider.getInstance().getNodeIdsForOrganization(orgId)); + PreparedStatement st = null; + ConnectionProvider cp = null; + Set result = new HashSet(); + try { + cp = new DalConnectionProvider(); + st = cp + .getPreparedStatement("select ad_org_id from ad_org where em_obretco_productlist_id=?"); + st.setString(1, assortmentId); + ResultSet rs = st.executeQuery(); + // and send the assortment to all the related nodes + while (rs.next()) { + result.add(rs.getString(1)); + allNodes.addAll(MobileServerProvider.getInstance().getNodeIdsForOrganization( + rs.getString(1))); + } + rs.close(); + } catch (Exception ex) { + throw new OBException(ex.toString(), ex); + } finally { + try { + cp.releasePreparedStatement(st); + } catch (Exception e) { + log.error("Error while releasing a prepared statement", e); + } } // only send to nodes which are valid for the product org if (dataMetaData.getTable().getName().toLowerCase().equals("obretco_prol_product")) { - @SuppressWarnings("rawtypes") - final NativeQuery sqlQry = OBDal.getInstance().getSession() - .createNativeQuery("select ad_org_id from m_product where m_product_id=:productId"); - sqlQry.setParameter("productId", getColumnValue("m_product_id", dataMetaData)); - String productOrgId = (String) sqlQry.uniqueResult(); - allNodes.retainAll(MobileServerProvider.getInstance().getNodeIdsForOrganization( - productOrgId)); + try { + cp = new DalConnectionProvider(); + st = cp.getPreparedStatement("select ad_org_id from m_product where m_product_id=?"); + st.setString(1, assortmentId); + st.setMaxRows(1); + ResultSet rs = st.executeQuery(); + rs.next(); + String productOrgId = rs.getString(1); + allNodes.retainAll(MobileServerProvider.getInstance().getNodeIdsForOrganization( + productOrgId)); + rs.close(); + } catch (Exception ex) { + throw new OBException(ex.toString(), ex); + } finally { + try { + cp.releasePreparedStatement(st); + } catch (Exception e) { + log.error("Error while releasing a prepared statement", e); + } + } } // - the location belongs to a business partner that is part of the store diff --git a/src/org/openbravo/retail/storeserver/synchronization/router/LocationRouter.java b/src/org/openbravo/retail/storeserver/synchronization/router/LocationRouter.java --- a/src/org/openbravo/retail/storeserver/synchronization/router/LocationRouter.java +++ b/src/org/openbravo/retail/storeserver/synchronization/router/LocationRouter.java @@ -20,6 +20,8 @@ package org.openbravo.retail.storeserver.synchronization.router; +import java.sql.PreparedStatement; +import java.sql.ResultSet; import java.util.HashSet; import java.util.List; import java.util.Set; @@ -27,16 +29,19 @@ import javax.enterprise.context.ApplicationScoped; import org.hibernate.criterion.Restrictions; -import org.hibernate.query.Query; import org.jumpmind.symmetric.io.data.DataEventType; import org.jumpmind.symmetric.model.DataMetaData; import org.jumpmind.symmetric.model.Node; import org.jumpmind.symmetric.model.TriggerRouter; import org.jumpmind.symmetric.route.SimpleRouterContext; import org.openbravo.base.exception.OBException; +import org.openbravo.base.model.Entity; +import org.openbravo.base.model.ModelProvider; +import org.openbravo.base.model.Property; import org.openbravo.dal.core.OBContext; import org.openbravo.dal.service.OBCriteria; import org.openbravo.dal.service.OBDal; +import org.openbravo.database.ConnectionProvider; import org.openbravo.mobile.core.MobileServerDefinition; import org.openbravo.model.common.businesspartner.BusinessPartner; import org.openbravo.model.common.enterprise.OrganizationInformation; @@ -45,6 +50,7 @@ import org.openbravo.replication.symmetricds.extensions.AbstractClientFilteredRouter; import org.openbravo.replication.symmetricds.util.MobileServerProvider; import org.openbravo.retail.storeserver.synchronization.OBSTSYN_Server_BPartner; +import org.openbravo.service.db.DalConnectionProvider; /** * Router that routes entries from c_location. Changes done to a location will be synchronized to @@ -185,15 +191,30 @@ private boolean locationBelongsTo(String entityName, String locationPropertyName, Location location) { - Query qry = OBDal - .getInstance() - .getSession() - .createQuery( - "select 1 from " + entityName + " where " + locationPropertyName + ".id=:locationId", - Object.class); - qry.setParameter("locationId", location.getId()); - qry.setMaxResults(1); - return qry.list().size() > 0; + Entity entity = ModelProvider.getInstance().getEntity(entityName); + Property property = entity.getProperty(locationPropertyName); + + PreparedStatement st = null; + ConnectionProvider cp = null; + try { + cp = new DalConnectionProvider(); + st = cp.getPreparedStatement("select 1 from " + entity.getTableName() + " where " + + property.getColumnName() + "=?"); + st.setString(1, location.getId()); + st.setMaxRows(1); + ResultSet rs = st.executeQuery(); + final boolean result = rs.next(); + rs.close(); + return result; + } catch (Exception ex) { + throw new OBException(ex.toString(), ex); + } finally { + try { + cp.releasePreparedStatement(st); + } catch (Exception e) { + log.error("Error while releasing a prepared statement", e); + } + } } @Override diff --git a/src/org/openbravo/retail/storeserver/synchronization/router/ProductPriceRouter.java b/src/org/openbravo/retail/storeserver/synchronization/router/ProductPriceRouter.java --- a/src/org/openbravo/retail/storeserver/synchronization/router/ProductPriceRouter.java +++ b/src/org/openbravo/retail/storeserver/synchronization/router/ProductPriceRouter.java @@ -20,24 +20,25 @@ package org.openbravo.retail.storeserver.synchronization.router; +import java.sql.PreparedStatement; +import java.sql.ResultSet; import java.util.Set; import javax.enterprise.context.ApplicationScoped; -import org.hibernate.query.NativeQuery; import org.jumpmind.symmetric.model.DataMetaData; import org.jumpmind.symmetric.model.Node; import org.jumpmind.symmetric.model.TriggerRouter; import org.jumpmind.symmetric.route.SimpleRouterContext; import org.openbravo.base.exception.OBException; import org.openbravo.dal.core.OBContext; -import org.openbravo.dal.service.OBDal; +import org.openbravo.database.ConnectionProvider; import org.openbravo.replication.symmetricds.extensions.AbstractOrganizationBasedRouter; import org.openbravo.replication.symmetricds.util.MobileServerProvider; +import org.openbravo.service.db.DalConnectionProvider; /** - * Router that routes product price list entries taking into account the product price list and - * product orgs. + * Router that routes product price list entries taking into account the product price list and product orgs. */ @ApplicationScoped public class ProductPriceRouter extends AbstractOrganizationBasedRouter { @@ -49,13 +50,18 @@ // initial set of of nodes based on product price org Set nodeIds = toNodeIds(nodes, null); + OBContext.setAdminMode(); + + PreparedStatement st = null; + ConnectionProvider cp = null; try { - OBContext.setAdminMode(); - @SuppressWarnings("rawtypes") - final NativeQuery sqlQry = OBDal.getInstance().getSession() - .createNativeQuery("select ad_org_id from m_product where m_product_id=:productId"); - sqlQry.setParameter("productId", getColumnValue("m_product_id", dataMetaData)); - String productOrgId = (String) sqlQry.uniqueResult(); + cp = new DalConnectionProvider(); + st = cp.getPreparedStatement("select ad_org_id from m_product where m_product_id=?"); + st.setString(1, getColumnValue("m_product_id", dataMetaData)); + st.setMaxRows(1); + ResultSet rs = st.executeQuery(); + rs.next(); + String productOrgId = rs.getString(1); if (productOrgId != null) { nodeIds.retainAll(MobileServerProvider.getInstance() .getNodeIdsForOrganization(productOrgId)); @@ -63,13 +69,19 @@ // the deletion will be sent to all stores, it is safe as if it the deleted record does not // exist, the change will be ignored } - } catch (Exception e) { + rs.close(); + return nodeIds; + } catch (Exception ex) { throw new OBException("Error while routing a product price " - + dataMetaData.getData().getExternalData(), e, true); + + dataMetaData.getData().getExternalData(), ex, true); } finally { + try { + cp.releasePreparedStatement(st); + } catch (Exception e) { + log.error("Error while releasing a prepared statement", e); + } OBContext.restorePreviousMode(); } - return nodeIds; } @Override diff --git a/src/org/openbravo/retail/storeserver/synchronization/router/UserTerminalAccessRouter.java b/src/org/openbravo/retail/storeserver/synchronization/router/UserTerminalAccessRouter.java --- a/src/org/openbravo/retail/storeserver/synchronization/router/UserTerminalAccessRouter.java +++ b/src/org/openbravo/retail/storeserver/synchronization/router/UserTerminalAccessRouter.java @@ -20,23 +20,25 @@ package org.openbravo.retail.storeserver.synchronization.router; +import java.sql.PreparedStatement; +import java.sql.ResultSet; import java.util.HashSet; -import java.util.List; import java.util.Map; import java.util.Set; import javax.enterprise.context.ApplicationScoped; -import org.hibernate.query.NativeQuery; import org.jumpmind.symmetric.model.DataMetaData; import org.jumpmind.symmetric.model.Node; import org.jumpmind.symmetric.model.TriggerRouter; import org.jumpmind.symmetric.route.SimpleRouterContext; +import org.openbravo.base.exception.OBException; import org.openbravo.dal.core.OBContext; -import org.openbravo.dal.service.OBDal; +import org.openbravo.database.ConnectionProvider; import org.openbravo.replication.symmetricds.extensions.AbstractOrganizationBasedRouter; import org.openbravo.retail.posterminal.OBPOSApplications; import org.openbravo.retail.posterminal.TerminalAccess; +import org.openbravo.service.db.DalConnectionProvider; /** * {@link TerminalAccess} records are sometimes accidentally created in the * organization. This @@ -60,23 +62,37 @@ String accessOrgId = dataMap.get("ad_org_id"); String terminalId = dataMap.get("obpos_applications_id"); - @SuppressWarnings("rawtypes") - final NativeQuery qry = OBDal - .getInstance() - .getSession() - .createNativeQuery( - "select ad_org_id from obpos_applications where obpos_applications_id=:terminalId"); - qry.setParameter("terminalId", terminalId); - List list = qry.list(); - if (list.isEmpty()) { - // the POS Terminal has been deleted, it is safe to synchronize the deletion to all servers - return toNodeIds(nodes, null); - } - String terminalOrgId = list.get(0); - if (accessOrgId.equals(terminalOrgId)) { - nodeIds = toNodeIds(nodes, null); - } else { - nodeIds = new HashSet<>(); + PreparedStatement st = null; + ConnectionProvider cp = null; + try { + cp = new DalConnectionProvider(); + st = cp + .getPreparedStatement("select ad_org_id from obpos_applications where obpos_applications_id=?"); + st.setString(1, terminalId); + st.setMaxRows(1); + ResultSet rs = st.executeQuery(); + if (!rs.next()) { + // the POS Terminal has been deleted, it is safe to synchronize the deletion to all servers + return toNodeIds(nodes, null); + } + + String terminalOrgId = rs.getString(1); + if (accessOrgId.equals(terminalOrgId)) { + nodeIds = toNodeIds(nodes, null); + } else { + nodeIds = new HashSet<>(); + } + rs.close(); + } catch (Exception ex) { + throw new OBException("Error while routing a product price " + + dataMetaData.getData().getExternalData(), ex, true); + } finally { + try { + cp.releasePreparedStatement(st); + } catch (Exception e) { + log.error("Error while releasing a prepared statement", e); + } + OBContext.restorePreviousMode(); } } finally { OBContext.restorePreviousMode();