Author: adamw Date: 2008-11-12 06:03:15 -0500 (Wed, 12 Nov 2008) New Revision: 15550 Added: core/trunk/envers/src/main/java/org/hibernate/envers/query/criteria/RevisionTypeAuditExpression.java Modified: core/trunk/envers/src/main/java/org/hibernate/envers/query/RevisionProperty.java core/trunk/envers/src/main/java/org/hibernate/envers/query/RevisionTypeProperty.java core/trunk/envers/src/main/java/org/hibernate/envers/synchronization/AuditSyncManager.java core/trunk/envers/src/test/java/org/hibernate/envers/test/integration/query/RevisionConstraintQuery.java Log: HHH-3598: revision type property can be used as query restriction Modified: core/trunk/envers/src/main/java/org/hibernate/envers/query/RevisionProperty.java =================================================================== --- core/trunk/envers/src/main/java/org/hibernate/envers/query/RevisionProperty.java 2008-11-11 20:16:10 UTC (rev 15549) +++ core/trunk/envers/src/main/java/org/hibernate/envers/query/RevisionProperty.java 2008-11-12 11:03:15 UTC (rev 15550) @@ -40,6 +40,20 @@ private RevisionProperty() { } /** + * Apply a "equal" constraint on the revision number + */ + public static AuditCriterion eq(Integer revision) { + return new RevisionAuditExpression(revision, "="); + } + + /** + * Apply a "not equal" constraint on the revision number + */ + public static AuditCriterion ne(Integer revision) { + return new RevisionAuditExpression(revision, "<>"); + } + + /** * Apply a "greater than" constraint on the revision number */ public static AuditCriterion gt(Integer revision) { Modified: core/trunk/envers/src/main/java/org/hibernate/envers/query/RevisionTypeProperty.java =================================================================== --- core/trunk/envers/src/main/java/org/hibernate/envers/query/RevisionTypeProperty.java 2008-11-11 20:16:10 UTC (rev 15549) +++ core/trunk/envers/src/main/java/org/hibernate/envers/query/RevisionTypeProperty.java 2008-11-12 11:03:15 UTC (rev 15550) @@ -25,7 +25,10 @@ import org.hibernate.envers.configuration.AuditConfiguration; import org.hibernate.envers.query.projection.AuditProjection; +import org.hibernate.envers.query.criteria.AuditCriterion; +import org.hibernate.envers.query.criteria.RevisionTypeAuditExpression; import org.hibernate.envers.tools.Triple; +import org.hibernate.envers.RevisionType; /** * @author Adam Warski (adam at warski dot org) @@ -35,6 +38,20 @@ private RevisionTypeProperty() { } /** + * Apply a "equal" constraint on the revision type + */ + public static AuditCriterion eq(RevisionType type) { + return new RevisionTypeAuditExpression(type, "="); + } + + /** + * Apply a "not equal" constraint on the revision type + */ + public static AuditCriterion ne(RevisionType type) { + return new RevisionTypeAuditExpression(type, "<>"); + } + + /** * Projection on the revision type */ public static AuditProjection revisionType() { Copied: core/trunk/envers/src/main/java/org/hibernate/envers/query/criteria/RevisionTypeAuditExpression.java (from rev 15549, core/trunk/envers/src/main/java/org/hibernate/envers/query/criteria/RevisionAuditExpression.java) =================================================================== --- core/trunk/envers/src/main/java/org/hibernate/envers/query/criteria/RevisionTypeAuditExpression.java (rev 0) +++ core/trunk/envers/src/main/java/org/hibernate/envers/query/criteria/RevisionTypeAuditExpression.java 2008-11-12 11:03:15 UTC (rev 15550) @@ -0,0 +1,46 @@ +/* + * Hibernate, Relational Persistence for Idiomatic Java + * + * Copyright (c) 2008, Red Hat Middleware LLC or third-party contributors as + * indicated by the @author tags or express copyright attribution + * statements applied by the authors. All third-party contributions are + * distributed under license by Red Hat Middleware LLC. + * + * This copyrighted material is made available to anyone wishing to use, modify, + * copy, or redistribute it subject to the terms and conditions of the GNU + * Lesser General Public License, as published by the Free Software Foundation. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY + * or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License + * for more details. + * + * You should have received a copy of the GNU Lesser General Public License + * along with this distribution; if not, write to: + * Free Software Foundation, Inc. + * 51 Franklin Street, Fifth Floor + * Boston, MA 02110-1301 USA + */ + +package org.hibernate.envers.query.criteria; + +import org.hibernate.envers.configuration.AuditConfiguration; +import org.hibernate.envers.tools.query.Parameters; +import org.hibernate.envers.tools.query.QueryBuilder; + +/** + * @author Adam Warski (adam at warski dot org) + */ +public class RevisionTypeAuditExpression implements AuditCriterion { + private Object value; + private String op; + + public RevisionTypeAuditExpression(Object value, String op) { + this.value = value; + this.op = op; + } + + public void addToQuery(AuditConfiguration verCfg, String entityName, QueryBuilder qb, Parameters parameters) { + parameters.addWhereWithParam(verCfg.getAuditEntCfg().getRevisionTypePropName(), op, value); + } +} \ No newline at end of file Property changes on: core/trunk/envers/src/main/java/org/hibernate/envers/query/criteria/RevisionTypeAuditExpression.java ___________________________________________________________________ Name: svn:mergeinfo + Modified: core/trunk/envers/src/main/java/org/hibernate/envers/synchronization/AuditSyncManager.java =================================================================== --- core/trunk/envers/src/main/java/org/hibernate/envers/synchronization/AuditSyncManager.java 2008-11-11 20:16:10 UTC (rev 15549) +++ core/trunk/envers/src/main/java/org/hibernate/envers/synchronization/AuditSyncManager.java 2008-11-12 11:03:15 UTC (rev 15550) @@ -24,9 +24,9 @@ package org.hibernate.envers.synchronization; import java.util.Map; +import java.util.concurrent.ConcurrentHashMap; import org.hibernate.envers.revisioninfo.RevisionInfoGenerator; -import org.hibernate.envers.tools.ConcurrentReferenceHashMap; import org.hibernate.Transaction; import org.hibernate.event.EventSource; @@ -35,13 +35,11 @@ * @author Adam Warski (adam at warski dot org) */ public class AuditSyncManager { - private final Map<Transaction, AuditSync> versionsSyncs; + private final Map<Transaction, AuditSync> auditSyncs; private final RevisionInfoGenerator revisionInfoGenerator; public AuditSyncManager(RevisionInfoGenerator revisionInfoGenerator) { - versionsSyncs = new ConcurrentReferenceHashMap<Transaction, AuditSync>(10, - ConcurrentReferenceHashMap.ReferenceType.WEAK, - ConcurrentReferenceHashMap.ReferenceType.STRONG); + auditSyncs = new ConcurrentHashMap<Transaction, AuditSync>(); this.revisionInfoGenerator = revisionInfoGenerator; } @@ -49,10 +47,11 @@ public AuditSync get(EventSource session) { Transaction transaction = session.getTransaction(); - AuditSync verSync = versionsSyncs.get(transaction); + AuditSync verSync = auditSyncs.get(transaction); if (verSync == null) { + // No worries about registering a transaction twice - a transaction is single thread verSync = new AuditSync(this, session, revisionInfoGenerator); - versionsSyncs.put(transaction, verSync); + auditSyncs.put(transaction, verSync); transaction.registerSynchronization(verSync); } @@ -61,6 +60,6 @@ } public void remove(Transaction transaction) { - versionsSyncs.remove(transaction); + auditSyncs.remove(transaction); } } Modified: core/trunk/envers/src/test/java/org/hibernate/envers/test/integration/query/RevisionConstraintQuery.java =================================================================== --- core/trunk/envers/src/test/java/org/hibernate/envers/test/integration/query/RevisionConstraintQuery.java 2008-11-11 20:16:10 UTC (rev 15549) +++ core/trunk/envers/src/test/java/org/hibernate/envers/test/integration/query/RevisionConstraintQuery.java 2008-11-12 11:03:15 UTC (rev 15550) @@ -29,8 +29,10 @@ import org.hibernate.envers.query.RevisionProperty; import org.hibernate.envers.query.AuditRestrictions; +import org.hibernate.envers.query.RevisionTypeProperty; import org.hibernate.envers.test.AbstractEntityTest; import org.hibernate.envers.test.entities.StrIntTestEntity; +import org.hibernate.envers.RevisionType; import org.testng.annotations.BeforeClass; import org.testng.annotations.Test; @@ -184,4 +186,32 @@ assert (Long) result == 4; } + + @Test + public void testRevisionTypeEqQuery() { + // The query shouldn't be ordered as always, otherwise - we get an exception. + List results = getAuditReader().createQuery() + .forRevisionsOfEntity(StrIntTestEntity.class, true, true) + .add(AuditRestrictions.idEq(id1)) + .add(RevisionTypeProperty.eq(RevisionType.MOD)) + .getResultList(); + + assert results.size() == 3; + assert results.get(0).equals(new StrIntTestEntity("d", 10, id1)); + assert results.get(1).equals(new StrIntTestEntity("d", 1, id1)); + assert results.get(2).equals(new StrIntTestEntity("d", 5, id1)); + } + + @Test + public void testRevisionTypeNeQuery() { + // The query shouldn't be ordered as always, otherwise - we get an exception. + List results = getAuditReader().createQuery() + .forRevisionsOfEntity(StrIntTestEntity.class, true, true) + .add(AuditRestrictions.idEq(id1)) + .add(RevisionTypeProperty.ne(RevisionType.MOD)) + .getResultList(); + + assert results.size() == 1; + assert results.get(0).equals(new StrIntTestEntity("a", 10, id1)); + } } \ No newline at end of file