details: https://code.openbravo.com/erp/devel/pi/rev/1a95cbaaf724 changeset: 33697:1a95cbaaf724 user: Asier Lostalé <asier.lostale <at> openbravo.com> date: Fri Mar 16 09:04:39 2018 +0100 summary: related to bug 38135: auto formatting after last changes
details: https://code.openbravo.com/erp/devel/pi/rev/305d3e3c2b9a changeset: 33698:305d3e3c2b9a user: Asier Lostalé <asier.lostale <at> openbravo.com> date: Fri Mar 16 09:13:27 2018 +0100 summary: related to bug 38135: minor changes - don't name parameter as clientId if it receives a client object - don't oversize param maps as size is fixed and known diffstat: src/org/openbravo/dal/core/OBContext.java | 41 +++++++++++++++--------------- 1 files changed, 20 insertions(+), 21 deletions(-) diffs (93 lines): diff -r a171f2d86f3d -r 305d3e3c2b9a src/org/openbravo/dal/core/OBContext.java --- a/src/org/openbravo/dal/core/OBContext.java Fri Mar 16 09:13:02 2018 +0100 +++ b/src/org/openbravo/dal/core/OBContext.java Fri Mar 16 09:13:27 2018 +0100 @@ -659,8 +659,8 @@ "select o.id from " + Organization.class.getName() + " o, " + RoleOrganization.class.getName() + " roa where o." + Organization.PROPERTY_ID + "=roa." + RoleOrganization.PROPERTY_ORGANIZATION + "." + Organization.PROPERTY_ID - + " and roa." + RoleOrganization.PROPERTY_ROLE + "." + Organization.PROPERTY_ID + "= :targetRoleId" - + " and roa." + RoleOrganization.PROPERTY_ACTIVE + "='Y' and o." + + " and roa." + RoleOrganization.PROPERTY_ROLE + "." + Organization.PROPERTY_ID + + "= :targetRoleId" + " and roa." + RoleOrganization.PROPERTY_ACTIVE + "='Y' and o." + Organization.PROPERTY_ACTIVE + "= :active"); qry.setString("targetRoleId", targetRole.getId()); qry.setString("active", propertyActive); @@ -681,8 +681,9 @@ private List<String> getOrganizations(Client client) { final Query qry = SessionHandler.getInstance().createQuery( "select o.id from " + Organization.class.getName() + " o where " + "o." - + Organization.PROPERTY_CLIENT + "=:clientId and o." + Organization.PROPERTY_ACTIVE + "='Y'"); - qry.setParameter("clientId", client); + + Organization.PROPERTY_CLIENT + "=:client and o." + Organization.PROPERTY_ACTIVE + + "='Y'"); + qry.setParameter("client", client); organizationList = qry.list(); return organizationList; } @@ -888,7 +889,7 @@ // to be // selected. if (roleId != null) { - Map<String, String> params = new HashMap<>(); + Map<String, String> params = new HashMap<>(1); params.put("roleId", roleId); final Role r = getOne(Role.class, "select r from " + Role.class.getName() + " r where " + " r." + Role.PROPERTY_ID + "=:roleId", params, true); @@ -896,8 +897,7 @@ } else if (getUser().getDefaultRole() != null && getUser().getDefaultRole().isActive()) { setRole(getUser().getDefaultRole()); } else { - - Map<String, String> params = new HashMap<>(); + Map<String, String> params = new HashMap<>(1); params.put("userId", u.getId()); final UserRoles ur = getOne(UserRoles.class, "select ur from " + UserRoles.class.getName() + " ur where " + " ur." + UserRoles.PROPERTY_USERCONTACT + "." + User.PROPERTY_ID @@ -915,26 +915,25 @@ Check.isNotNull(getRole(), "Role may not be null"); if (orgId != null) { - Map<String, String> params = new HashMap<>(); + Map<String, String> params = new HashMap<>(1); params.put("orgId", orgId); - final Organization o = getOne(Organization.class, "select r from " - + Organization.class.getName() + " r where " + " r." + Organization.PROPERTY_ID + "=:orgId", - params, true); + final Organization o = getOne(Organization.class, + "select r from " + Organization.class.getName() + " r where " + " r." + + Organization.PROPERTY_ID + "=:orgId", params, true); setCurrentOrganization(o); } else if (getUser().getDefaultOrganization() != null && getUser().getDefaultOrganization().isActive()) { setCurrentOrganization(getUser().getDefaultOrganization()); } else { - Map<String, String> params = new HashMap<>(); + Map<String, String> params = new HashMap<>(1); params.put("roleId", getRole().getId()); - final RoleOrganization roa = getOne(RoleOrganization.class, - "select roa from " + RoleOrganization.class.getName() + " roa where roa." - + RoleOrganization.PROPERTY_ROLE + "." + Organization.PROPERTY_ID + "=:roleId and roa." - + RoleOrganization.PROPERTY_ACTIVE + "='Y' and roa." - + RoleOrganization.PROPERTY_ORGANIZATION + "." + Organization.PROPERTY_ACTIVE - + "='Y' order by roa." + RoleOrganization.PROPERTY_ORGANIZATION + "." - + Organization.PROPERTY_ID + " desc", - params, false); + final RoleOrganization roa = getOne(RoleOrganization.class, "select roa from " + + RoleOrganization.class.getName() + " roa where roa." + RoleOrganization.PROPERTY_ROLE + + "." + Organization.PROPERTY_ID + "=:roleId and roa." + + RoleOrganization.PROPERTY_ACTIVE + "='Y' and roa." + + RoleOrganization.PROPERTY_ORGANIZATION + "." + Organization.PROPERTY_ACTIVE + + "='Y' order by roa." + RoleOrganization.PROPERTY_ORGANIZATION + "." + + Organization.PROPERTY_ID + " desc", params, false); Hibernate.initialize(roa.getOrganization()); setCurrentOrganization(roa.getOrganization()); @@ -961,7 +960,7 @@ } if (localClientId != null) { - Map<String, String> params = new HashMap<>(); + Map<String, String> params = new HashMap<>(1); params.put("clientId", localClientId); final Client c = getOne(Client.class, "select r from " + Client.class.getName() + " r where " + " r." + Client.PROPERTY_ID + "=:clientId", params, true); ------------------------------------------------------------------------------ Check out the vibrant tech community on one of the world's most engaging tech sites, Slashdot.org! http://sdm.link/slashdot _______________________________________________ Openbravo-commits mailing list Openbravo-commits@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/openbravo-commits
