Repository: deltaspike Updated Branches: refs/heads/master f4ee6a955 -> 910164208
DELTASPIKE-1154 [perf] use EntityVerifier in a static way Project: http://git-wip-us.apache.org/repos/asf/deltaspike/repo Commit: http://git-wip-us.apache.org/repos/asf/deltaspike/commit/91016420 Tree: http://git-wip-us.apache.org/repos/asf/deltaspike/tree/91016420 Diff: http://git-wip-us.apache.org/repos/asf/deltaspike/diff/91016420 Branch: refs/heads/master Commit: 910164208771df86710079a157422ce722c38aca Parents: f4ee6a9 Author: Thomas Andraschko <[email protected]> Authored: Mon May 23 21:50:18 2016 +0200 Committer: Thomas Andraschko <[email protected]> Committed: Mon May 23 21:50:18 2016 +0200 ---------------------------------------------------------------------- .../impl/meta/extractor/AnnotationMetadataExtractor.java | 10 +--------- .../data/impl/meta/verifier/EntityVerifier.java | 1 + .../org/apache/deltaspike/data/impl/util/EntityUtils.java | 2 +- 3 files changed, 3 insertions(+), 10 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/deltaspike/blob/91016420/deltaspike/modules/data/impl/src/main/java/org/apache/deltaspike/data/impl/meta/extractor/AnnotationMetadataExtractor.java ---------------------------------------------------------------------- diff --git a/deltaspike/modules/data/impl/src/main/java/org/apache/deltaspike/data/impl/meta/extractor/AnnotationMetadataExtractor.java b/deltaspike/modules/data/impl/src/main/java/org/apache/deltaspike/data/impl/meta/extractor/AnnotationMetadataExtractor.java index 4542190..0801ea9 100644 --- a/deltaspike/modules/data/impl/src/main/java/org/apache/deltaspike/data/impl/meta/extractor/AnnotationMetadataExtractor.java +++ b/deltaspike/modules/data/impl/src/main/java/org/apache/deltaspike/data/impl/meta/extractor/AnnotationMetadataExtractor.java @@ -21,25 +21,17 @@ package org.apache.deltaspike.data.impl.meta.extractor; import org.apache.deltaspike.data.api.Repository; import org.apache.deltaspike.data.impl.meta.RepositoryEntity; import org.apache.deltaspike.data.impl.meta.verifier.EntityVerifier; -import org.apache.deltaspike.data.impl.meta.verifier.Verifier; import org.apache.deltaspike.data.impl.util.EntityUtils; public class AnnotationMetadataExtractor implements MetadataExtractor { - private final Verifier<Class<?>> verifier; - - public AnnotationMetadataExtractor() - { - this.verifier = new EntityVerifier(); - } - @Override public RepositoryEntity extract(Class<?> repoClass) { Repository repo = repoClass.getAnnotation(Repository.class); Class<?> repoEntity = repo.forEntity(); - boolean isEntityClass = !Object.class.equals(repoEntity) && verifier.verify(repoEntity); + boolean isEntityClass = !Object.class.equals(repoEntity) && EntityVerifier.INSTANCE.verify(repoEntity); if (isEntityClass) { return new RepositoryEntity(repoEntity, EntityUtils.primaryKeyClass(repoEntity)); http://git-wip-us.apache.org/repos/asf/deltaspike/blob/91016420/deltaspike/modules/data/impl/src/main/java/org/apache/deltaspike/data/impl/meta/verifier/EntityVerifier.java ---------------------------------------------------------------------- diff --git a/deltaspike/modules/data/impl/src/main/java/org/apache/deltaspike/data/impl/meta/verifier/EntityVerifier.java b/deltaspike/modules/data/impl/src/main/java/org/apache/deltaspike/data/impl/meta/verifier/EntityVerifier.java index ada5776..5ef310a 100644 --- a/deltaspike/modules/data/impl/src/main/java/org/apache/deltaspike/data/impl/meta/verifier/EntityVerifier.java +++ b/deltaspike/modules/data/impl/src/main/java/org/apache/deltaspike/data/impl/meta/verifier/EntityVerifier.java @@ -23,6 +23,7 @@ import org.apache.deltaspike.jpa.spi.descriptor.xml.PersistenceUnitDescriptorPro public class EntityVerifier implements Verifier<Class<?>> { + public static final EntityVerifier INSTANCE = new EntityVerifier(); @Override public boolean verify(Class<?> entity) http://git-wip-us.apache.org/repos/asf/deltaspike/blob/91016420/deltaspike/modules/data/impl/src/main/java/org/apache/deltaspike/data/impl/util/EntityUtils.java ---------------------------------------------------------------------- diff --git a/deltaspike/modules/data/impl/src/main/java/org/apache/deltaspike/data/impl/util/EntityUtils.java b/deltaspike/modules/data/impl/src/main/java/org/apache/deltaspike/data/impl/util/EntityUtils.java index 736452f..38ecc8a 100755 --- a/deltaspike/modules/data/impl/src/main/java/org/apache/deltaspike/data/impl/util/EntityUtils.java +++ b/deltaspike/modules/data/impl/src/main/java/org/apache/deltaspike/data/impl/util/EntityUtils.java @@ -104,7 +104,7 @@ public final class EntityUtils public static boolean isEntityClass(Class<?> entityClass) { - return new EntityVerifier().verify(entityClass); + return EntityVerifier.INSTANCE.verify(entityClass); } public static Property<Serializable> primaryKeyProperty(Class<?> entityClass)
