Author: bdaw Date: 2009-11-03 09:33:23 -0500 (Tue, 03 Nov 2009) New Revision: 904 Modified: idm/trunk/idm-hibernate/src/main/java/org/jboss/identity/idm/impl/model/hibernate/HibernateIdentityObject.java idm/trunk/idm-hibernate/src/main/java/org/jboss/identity/idm/impl/model/hibernate/HibernateIdentityObjectRelationshipName.java idm/trunk/idm-hibernate/src/main/java/org/jboss/identity/idm/impl/store/hibernate/HibernateIdentityStoreImpl.java Log: - reduce number of getRealm() calls Modified: idm/trunk/idm-hibernate/src/main/java/org/jboss/identity/idm/impl/model/hibernate/HibernateIdentityObject.java =================================================================== --- idm/trunk/idm-hibernate/src/main/java/org/jboss/identity/idm/impl/model/hibernate/HibernateIdentityObject.java 2009-11-03 13:44:56 UTC (rev 903) +++ idm/trunk/idm-hibernate/src/main/java/org/jboss/identity/idm/impl/model/hibernate/HibernateIdentityObject.java 2009-11-03 14:33:23 UTC (rev 904) @@ -62,21 +62,21 @@ public class HibernateIdentityObject implements IdentityObject { public static final String findIdentityObjectByNameAndType = - "select o from HibernateIdentityObject o where o.realm = :realm and o.name = :name and o.identityType.name = :typeName"; + "select o from HibernateIdentityObject o where o.realm.name = :realmName and o.name = :name and o.identityType.name = :typeName"; public static final String findIdentityObjectsByType = - "select o from HibernateIdentityObject o where o.name like :nameFilter and o.realm = :realm and o.identityType.name = :typeName"; + "select o from HibernateIdentityObject o where o.name like :nameFilter and o.realm.name = :realmName and o.identityType.name = :typeName"; public static final String findIdentityObjectsByTypeOrderedByNameAsc = - "select o from HibernateIdentityObject o where o.name like :nameFilter and o.realm = :realm and o.identityType.name = :typeName " + + "select o from HibernateIdentityObject o where o.name like :nameFilter and o.realm.name = :realmName and o.identityType.name = :typeName " + "order by o.name asc"; public static final String findIdentityObjectsByTypeOrderedByNameDesc = - "select o from HibernateIdentityObject o where o.name like :nameFilter and o.realm = :realm and o.identityType.name = :typeName " + + "select o from HibernateIdentityObject o where o.name like :nameFilter and o.realm.name = :realmName and o.identityType.name = :typeName " + "order by o.name desc"; public static final String countIdentityObjectsByType = - "select count(o.id) from HibernateIdentityObject o where o.realm = :realm and o.identityType.name = :typeName"; + "select count(o.id) from HibernateIdentityObject o where o.realm.name = :realmName and o.identityType.name = :typeName"; @Id Modified: idm/trunk/idm-hibernate/src/main/java/org/jboss/identity/idm/impl/model/hibernate/HibernateIdentityObjectRelationshipName.java =================================================================== --- idm/trunk/idm-hibernate/src/main/java/org/jboss/identity/idm/impl/model/hibernate/HibernateIdentityObjectRelationshipName.java 2009-11-03 13:44:56 UTC (rev 903) +++ idm/trunk/idm-hibernate/src/main/java/org/jboss/identity/idm/impl/model/hibernate/HibernateIdentityObjectRelationshipName.java 2009-11-03 14:33:23 UTC (rev 904) @@ -51,17 +51,17 @@ { public static final String findIdentityObjectRelationshipNameByName = - "select rn from HibernateIdentityObjectRelationshipName rn where rn.name like :name and rn.realm = :realm"; + "select rn from HibernateIdentityObjectRelationshipName rn where rn.name like :name and rn.realm.name = :realmName"; public static final String findIdentityObjectRelationshipNames = - "select rn.name from HibernateIdentityObjectRelationshipName rn where rn.name like :nameFilter and rn.realm = :realm"; + "select rn.name from HibernateIdentityObjectRelationshipName rn where rn.name like :nameFilter and rn.realm.name = :realmName"; public static final String findIdentityObjectRelationshipNamesOrderedByNameAsc = - "select rn.name from HibernateIdentityObjectRelationshipName rn where rn.name like :nameFilter and rn.realm = :realm " + + "select rn.name from HibernateIdentityObjectRelationshipName rn where rn.name like :nameFilter and rn.realm.name = :realmName " + "order by rn.name asc"; public static final String findIdentityObjectRelationshipNamesOrderedByNameDesc = - "select rn.name from HibernateIdentityObjectRelationshipName rn where rn.name like :nameFilter and rn.realm = :realm " + + "select rn.name from HibernateIdentityObjectRelationshipName rn where rn.name like :nameFilter and rn.realm.name = :realmName " + "order by rn.name desc"; public static final String findIdentityObjectRelationshipNamesForIdentityObject = Modified: idm/trunk/idm-hibernate/src/main/java/org/jboss/identity/idm/impl/store/hibernate/HibernateIdentityStoreImpl.java =================================================================== --- idm/trunk/idm-hibernate/src/main/java/org/jboss/identity/idm/impl/store/hibernate/HibernateIdentityStoreImpl.java 2009-11-03 13:44:56 UTC (rev 903) +++ idm/trunk/idm-hibernate/src/main/java/org/jboss/identity/idm/impl/store/hibernate/HibernateIdentityStoreImpl.java 2009-11-03 14:33:23 UTC (rev 904) @@ -511,7 +511,7 @@ // Check if object with a given name and type is not present already List<?> results = session.createQuery(HibernateIdentityObject.findIdentityObjectByNameAndType) - .setParameter("realm", realm) + .setParameter("realmName", realm.getName()) .setParameter("name", name) .setParameter("typeName", identityObjectType.getName()) .list(); @@ -601,7 +601,7 @@ count = ((Number)hibernateSession .createQuery(HibernateIdentityObject.countIdentityObjectsByType) .setParameter("typeName", jpaType.getName()) - .setParameter("realm", getRealm(hibernateSession, ctx)) + .setParameter("realmName", getRealmName(ctx)) .uniqueResult()).intValue(); } catch (Exception e) @@ -632,7 +632,7 @@ { hibernateObject = (HibernateIdentityObject)getHibernateSession(ctx). createQuery(HibernateIdentityObject.findIdentityObjectByNameAndType) - .setParameter("realm", getRealm(hibernateSession, ctx)) + .setParameter("realmName", getRealmName(ctx)) .setParameter("name", name) .setParameter("typeName", hibernateType.getName()) .uniqueResult(); @@ -712,7 +712,7 @@ } - q.setParameter("realm", getRealm(hibernateSession, ctx)) + q.setParameter("realmName", getRealmName(ctx)) .setParameter("typeName", hibernateType.getName()); if (criteria != null && criteria.getFilter() != null) @@ -1149,8 +1149,8 @@ try { - HibernateIdentityObjectRelationshipName hiorn = (HibernateIdentityObjectRelationshipName)hibernateSession.createCriteria(HibernateIdentityObjectRelationshipName.class) - .add(Restrictions.eq("name", name)).add(Restrictions.eq("realm", realm)).uniqueResult(); + HibernateIdentityObjectRelationshipName hiorn = (HibernateIdentityObjectRelationshipName)hibernateSession.createQuery(HibernateIdentityObjectRelationshipName.findIdentityObjectRelationshipNameByName) + .setParameter("name", name).setParameter("realmName", realm.getName()).uniqueResult(); if (hiorn != null) { @@ -1185,8 +1185,8 @@ try { - HibernateIdentityObjectRelationshipName hiorn = (HibernateIdentityObjectRelationshipName)hibernateSession.createCriteria(HibernateIdentityObjectRelationshipName.class) - .add(Restrictions.eq("name", name)).add(Restrictions.eq("realm", getRealm(hibernateSession, ctx))).setCacheable(true).uniqueResult(); + HibernateIdentityObjectRelationshipName hiorn = (HibernateIdentityObjectRelationshipName)hibernateSession.createQuery(HibernateIdentityObjectRelationshipName.findIdentityObjectRelationshipNameByName) + .setParameter("name", name).setParameter("realmName", getRealmName(ctx)).uniqueResult(); if (hiorn == null) { @@ -1243,7 +1243,7 @@ q = hibernateSession.createQuery(HibernateIdentityObjectRelationshipName.findIdentityObjectRelationshipNames).setCacheable(true);; } - q.setParameter("realm", getRealm(hibernateSession, ctx)); + q.setParameter("realmName", getRealmName(ctx)); if (criteria != null && criteria.getFilter() != null) { @@ -1352,8 +1352,8 @@ try { - HibernateIdentityObjectRelationshipName hiorn = (HibernateIdentityObjectRelationshipName)hibernateSession.createCriteria(HibernateIdentityObjectRelationshipName.class) - .add(Restrictions.eq("name", name)).add(Restrictions.eq("realm", getRealm(hibernateSession, ctx))).setCacheable(true).uniqueResult(); + HibernateIdentityObjectRelationshipName hiorn = (HibernateIdentityObjectRelationshipName)hibernateSession.createQuery(HibernateIdentityObjectRelationshipName.findIdentityObjectRelationshipNameByName) + .setParameter("name", name).setParameter("realmName", getRealmName(ctx)).uniqueResult(); if (hiorn == null) { @@ -1381,8 +1381,8 @@ try { - HibernateIdentityObjectRelationshipName hiorn = (HibernateIdentityObjectRelationshipName)hibernateSession.createCriteria(HibernateIdentityObjectRelationshipName.class) - .add(Restrictions.eq("name", name)).add(Restrictions.eq("realm", getRealm(hibernateSession, ctx))).setCacheable(true).uniqueResult(); + HibernateIdentityObjectRelationshipName hiorn = (HibernateIdentityObjectRelationshipName)hibernateSession.createQuery(HibernateIdentityObjectRelationshipName.findIdentityObjectRelationshipNameByName) + .setParameter("name", name).setParameter("realmName", getRealmName(ctx)).uniqueResult(); if (hiorn == null) { @@ -1410,8 +1410,8 @@ try { - HibernateIdentityObjectRelationshipName hiorn = (HibernateIdentityObjectRelationshipName)hibernateSession.createCriteria(HibernateIdentityObjectRelationshipName.class) - .add(Restrictions.eq("name", name)).add(Restrictions.eq("realm", getRealm(hibernateSession, ctx))).setCacheable(true).uniqueResult(); + HibernateIdentityObjectRelationshipName hiorn = (HibernateIdentityObjectRelationshipName)hibernateSession.createQuery(HibernateIdentityObjectRelationshipName.findIdentityObjectRelationshipNameByName) + .setParameter("name", name).setParameter("realmName", getRealmName(ctx)).uniqueResult(); if (hiorn == null) { @@ -2323,7 +2323,7 @@ hibernateObject = (HibernateIdentityObject)hibernateSession.createQuery(HibernateIdentityObject.findIdentityObjectByNameAndType) .setParameter("name", io.getName()) .setParameter("typeName", io.getIdentityType().getName()) - .setParameter("realm", getRealm(hibernateSession, ctx)) + .setParameter("realmName", getRealmName(ctx)) .setCacheable(true) .uniqueResult(); } @@ -2460,7 +2460,7 @@ private HibernateRealm getRealm(Session hibernateSession, IdentityStoreInvocationContext ctx) throws IdentityException { - if (ctx.getRealmId() == null) + if (getRealmName(ctx) == null) { throw new IllegalStateException("Realm Id not present"); } @@ -2482,12 +2482,12 @@ else { realm = (HibernateRealm)hibernateSession. - createCriteria(HibernateRealm.class).add(Restrictions.eq("name", ctx.getRealmId())).setCacheable(true).uniqueResult(); + createCriteria(HibernateRealm.class).add(Restrictions.eq("name", getRealmName(ctx))).setCacheable(true).uniqueResult(); // TODO: other way to not lazy initialize realm? special method called on every new session creation if (realm == null) { - HibernateRealm newRealm = new HibernateRealm(ctx.getRealmId()); + HibernateRealm newRealm = new HibernateRealm(getRealmName(ctx)); hibernateSession.persist(newRealm); return newRealm; } @@ -2497,6 +2497,18 @@ return realm; } + + private String getRealmName(IdentityStoreInvocationContext ctx) + { + if (isRealmAware()) + { + return ctx.getRealmId(); + } + else + { + return DEFAULT_REALM_NAME; + } + } private boolean isRealmAware() {