Repository: deltaspike Updated Branches: refs/heads/master b6c14b6e1 -> 7c48cb825
DELTASPIKE-1048 fixed compiler warnings in Data module Project: http://git-wip-us.apache.org/repos/asf/deltaspike/repo Commit: http://git-wip-us.apache.org/repos/asf/deltaspike/commit/7c48cb82 Tree: http://git-wip-us.apache.org/repos/asf/deltaspike/tree/7c48cb82 Diff: http://git-wip-us.apache.org/repos/asf/deltaspike/diff/7c48cb82 Branch: refs/heads/master Commit: 7c48cb825f6a3f8cd7cecbb92105dd7c11b4822d Parents: b6c14b6 Author: Harald Wellmann <[email protected]> Authored: Sun Dec 20 20:25:56 2015 +0100 Committer: Harald Wellmann <[email protected]> Committed: Sun Dec 20 20:25:56 2015 +0100 ---------------------------------------------------------------------- .../data/api/mapping/QueryInOutMapper.java | 2 +- .../api/mapping/SimpleQueryInOutMapperBase.java | 2 + .../data/impl/builder/QueryBuilderFactory.java | 2 + .../builder/result/QueryProcessorFactory.java | 1 + .../data/impl/criteria/processor/OrderBy.java | 3 +- .../impl/handler/EntityRepositoryHandler.java | 4 ++ .../data/impl/meta/RepositoryMethod.java | 6 +-- .../impl/meta/unit/EntityDescriptorReader.java | 42 ++++++++++---------- .../impl/tx/ThreadLocalEntityManagerHolder.java | 2 + .../jpa/OpenJpaPersistenceUnitUtilDelegate.java | 4 +- .../impl/audit/AuditEntityListenerTest.java | 1 - .../QualifiedEntityManagerTestProducer.java | 1 + .../service/ExtendedRepositoryAbstract.java | 1 - 13 files changed, 41 insertions(+), 30 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/deltaspike/blob/7c48cb82/deltaspike/modules/data/api/src/main/java/org/apache/deltaspike/data/api/mapping/QueryInOutMapper.java ---------------------------------------------------------------------- diff --git a/deltaspike/modules/data/api/src/main/java/org/apache/deltaspike/data/api/mapping/QueryInOutMapper.java b/deltaspike/modules/data/api/src/main/java/org/apache/deltaspike/data/api/mapping/QueryInOutMapper.java index afded50..7d74c2d 100644 --- a/deltaspike/modules/data/api/src/main/java/org/apache/deltaspike/data/api/mapping/QueryInOutMapper.java +++ b/deltaspike/modules/data/api/src/main/java/org/apache/deltaspike/data/api/mapping/QueryInOutMapper.java @@ -21,7 +21,7 @@ package org.apache.deltaspike.data.api.mapping; import java.util.List; /** - * Handels concrete mapping of query results and + * Handles concrete mapping of query results and * query input parameters. */ public interface QueryInOutMapper<E> http://git-wip-us.apache.org/repos/asf/deltaspike/blob/7c48cb82/deltaspike/modules/data/api/src/main/java/org/apache/deltaspike/data/api/mapping/SimpleQueryInOutMapperBase.java ---------------------------------------------------------------------- diff --git a/deltaspike/modules/data/api/src/main/java/org/apache/deltaspike/data/api/mapping/SimpleQueryInOutMapperBase.java b/deltaspike/modules/data/api/src/main/java/org/apache/deltaspike/data/api/mapping/SimpleQueryInOutMapperBase.java index ce8be8e..874e535 100644 --- a/deltaspike/modules/data/api/src/main/java/org/apache/deltaspike/data/api/mapping/SimpleQueryInOutMapperBase.java +++ b/deltaspike/modules/data/api/src/main/java/org/apache/deltaspike/data/api/mapping/SimpleQueryInOutMapperBase.java @@ -108,6 +108,7 @@ public abstract class SimpleQueryInOutMapperBase<Entity, Dto> implements QueryIn return toEntity(newEntity(), dto); } + @SuppressWarnings("unchecked") protected Entity newEntity() { try @@ -123,6 +124,7 @@ public abstract class SimpleQueryInOutMapperBase<Entity, Dto> implements QueryIn } } + @SuppressWarnings("unchecked") protected Entity findEntity(Object primaryKey) { return (Entity) context.getEntityManager().find(context.getEntityClass(), primaryKey); http://git-wip-us.apache.org/repos/asf/deltaspike/blob/7c48cb82/deltaspike/modules/data/impl/src/main/java/org/apache/deltaspike/data/impl/builder/QueryBuilderFactory.java ---------------------------------------------------------------------- diff --git a/deltaspike/modules/data/impl/src/main/java/org/apache/deltaspike/data/impl/builder/QueryBuilderFactory.java b/deltaspike/modules/data/impl/src/main/java/org/apache/deltaspike/data/impl/builder/QueryBuilderFactory.java index 56ecbeb..ab081bf 100644 --- a/deltaspike/modules/data/impl/src/main/java/org/apache/deltaspike/data/impl/builder/QueryBuilderFactory.java +++ b/deltaspike/modules/data/impl/src/main/java/org/apache/deltaspike/data/impl/builder/QueryBuilderFactory.java @@ -43,6 +43,8 @@ public class QueryBuilderFactory implements Serializable private static final Map<MethodType, QueryInvocationLiteral> LITERALS = new HashMap<MethodType, QueryInvocationLiteral>() { + private static final long serialVersionUID = 1L; + { put(ANNOTATED, new QueryInvocationLiteral(ANNOTATED)); put(DELEGATE, new QueryInvocationLiteral(DELEGATE)); http://git-wip-us.apache.org/repos/asf/deltaspike/blob/7c48cb82/deltaspike/modules/data/impl/src/main/java/org/apache/deltaspike/data/impl/builder/result/QueryProcessorFactory.java ---------------------------------------------------------------------- diff --git a/deltaspike/modules/data/impl/src/main/java/org/apache/deltaspike/data/impl/builder/result/QueryProcessorFactory.java b/deltaspike/modules/data/impl/src/main/java/org/apache/deltaspike/data/impl/builder/result/QueryProcessorFactory.java index e623133..10052f1 100644 --- a/deltaspike/modules/data/impl/src/main/java/org/apache/deltaspike/data/impl/builder/result/QueryProcessorFactory.java +++ b/deltaspike/modules/data/impl/src/main/java/org/apache/deltaspike/data/impl/builder/result/QueryProcessorFactory.java @@ -126,6 +126,7 @@ public final class QueryProcessorFactory return null; } default: + @SuppressWarnings("unchecked") List<Object> queryResult = query.getResultList(); return queryResult.size() > 0 ? queryResult.get(0) : null; } http://git-wip-us.apache.org/repos/asf/deltaspike/blob/7c48cb82/deltaspike/modules/data/impl/src/main/java/org/apache/deltaspike/data/impl/criteria/processor/OrderBy.java ---------------------------------------------------------------------- diff --git a/deltaspike/modules/data/impl/src/main/java/org/apache/deltaspike/data/impl/criteria/processor/OrderBy.java b/deltaspike/modules/data/impl/src/main/java/org/apache/deltaspike/data/impl/criteria/processor/OrderBy.java index 2840c76..6ae8538 100644 --- a/deltaspike/modules/data/impl/src/main/java/org/apache/deltaspike/data/impl/criteria/processor/OrderBy.java +++ b/deltaspike/modules/data/impl/src/main/java/org/apache/deltaspike/data/impl/criteria/processor/OrderBy.java @@ -88,11 +88,12 @@ public class OrderBy<P, V> implements QueryProcessor<P> { return true; } - if (o == null || getClass() != o.getClass()) + if (getClass() != o.getClass()) { return false; } + @SuppressWarnings("unchecked") OrderByDefinition that = (OrderByDefinition) o; if (att != null ? !att.equals(that.att) : that.att != null) http://git-wip-us.apache.org/repos/asf/deltaspike/blob/7c48cb82/deltaspike/modules/data/impl/src/main/java/org/apache/deltaspike/data/impl/handler/EntityRepositoryHandler.java ---------------------------------------------------------------------- diff --git a/deltaspike/modules/data/impl/src/main/java/org/apache/deltaspike/data/impl/handler/EntityRepositoryHandler.java b/deltaspike/modules/data/impl/src/main/java/org/apache/deltaspike/data/impl/handler/EntityRepositoryHandler.java index fabddec..abd9842 100755 --- a/deltaspike/modules/data/impl/src/main/java/org/apache/deltaspike/data/impl/handler/EntityRepositoryHandler.java +++ b/deltaspike/modules/data/impl/src/main/java/org/apache/deltaspike/data/impl/handler/EntityRepositoryHandler.java @@ -38,6 +38,7 @@ import javax.persistence.TypedQuery; import javax.persistence.criteria.CriteriaQuery; import javax.persistence.metamodel.EntityType; import javax.persistence.metamodel.SingularAttribute; + import java.io.Serializable; import java.util.ArrayList; import java.util.Iterator; @@ -130,12 +131,14 @@ public class EntityRepositoryHandler<E, PK extends Serializable> return executeExampleQuery(example, start, max, true, attributes); } + @SuppressWarnings("unchecked") @Override public List<E> findAll() { return context.applyRestrictions(entityManager().createQuery(allQuery(), entityClass())).getResultList(); } + @SuppressWarnings("unchecked") @Override public List<E> findAll(int start, int max) { @@ -170,6 +173,7 @@ public class EntityRepositoryHandler<E, PK extends Serializable> return executeCountQuery(example, true, attributes); } + @SuppressWarnings("unchecked") @Override public PK getPrimaryKey(E entity) { http://git-wip-us.apache.org/repos/asf/deltaspike/blob/7c48cb82/deltaspike/modules/data/impl/src/main/java/org/apache/deltaspike/data/impl/meta/RepositoryMethod.java ---------------------------------------------------------------------- diff --git a/deltaspike/modules/data/impl/src/main/java/org/apache/deltaspike/data/impl/meta/RepositoryMethod.java b/deltaspike/modules/data/impl/src/main/java/org/apache/deltaspike/data/impl/meta/RepositoryMethod.java index a98efb8..611f7b5 100644 --- a/deltaspike/modules/data/impl/src/main/java/org/apache/deltaspike/data/impl/meta/RepositoryMethod.java +++ b/deltaspike/modules/data/impl/src/main/java/org/apache/deltaspike/data/impl/meta/RepositoryMethod.java @@ -62,7 +62,7 @@ public class RepositoryMethod private final RepositoryComponent repo; private final QueryRoot queryRoot; private final QueryProcessor queryProcessor; - private final Class<? extends QueryInOutMapper> mapper; + private final Class<? extends QueryInOutMapper<?>> mapper; private volatile Boolean queryInOutMapperIsNormalScope; @@ -92,7 +92,7 @@ public class RepositoryMethod lazyInit(); if (!queryInOutMapperIsNormalScope) { - final DependentProvider<? extends QueryInOutMapper> mappedProvider = BeanProvider.getDependent(mapper); + final DependentProvider<? extends QueryInOutMapper<?>> mappedProvider = BeanProvider.getDependent(mapper); result = mappedProvider.get(); context.addDestroyable(new DependentProviderDestroyable(mappedProvider)); } @@ -157,7 +157,7 @@ public class RepositoryMethod } } - private Class<? extends QueryInOutMapper> extractMapper(Method queryMethod, RepositoryComponent repoComponent) + private Class<? extends QueryInOutMapper<?>> extractMapper(Method queryMethod, RepositoryComponent repoComponent) { if (queryMethod.isAnnotationPresent(MappingConfig.class)) { http://git-wip-us.apache.org/repos/asf/deltaspike/blob/7c48cb82/deltaspike/modules/data/impl/src/main/java/org/apache/deltaspike/data/impl/meta/unit/EntityDescriptorReader.java ---------------------------------------------------------------------- diff --git a/deltaspike/modules/data/impl/src/main/java/org/apache/deltaspike/data/impl/meta/unit/EntityDescriptorReader.java b/deltaspike/modules/data/impl/src/main/java/org/apache/deltaspike/data/impl/meta/unit/EntityDescriptorReader.java index 6b60a20..0b85e70 100644 --- a/deltaspike/modules/data/impl/src/main/java/org/apache/deltaspike/data/impl/meta/unit/EntityDescriptorReader.java +++ b/deltaspike/modules/data/impl/src/main/java/org/apache/deltaspike/data/impl/meta/unit/EntityDescriptorReader.java @@ -52,7 +52,7 @@ public class EntityDescriptorReader extends DescriptorReader public MappingFile readFromDocument(Document doc) { - List<EntityDescriptor> entities = new EntityBuilder<EntityDescriptor>() + EntityBuilder<EntityDescriptor> entityDescriptorBuilder = new EntityBuilder<EntityDescriptor>() { @Override protected EntityDescriptor instance(String name, String packageName, String className, @@ -66,25 +66,25 @@ public class EntityDescriptorReader extends DescriptorReader { return "entity"; } - } - .build(doc); - List<MappedSuperclassDescriptor> superClasses = new MappedSuperClassBuilder<MappedSuperclassDescriptor>() - { - @Override - protected MappedSuperclassDescriptor instance(String name, String packageName, String className, - String idClass, String id, String version) - { - return new MappedSuperclassDescriptor(name, packageName, className, idClass, id, version); - } - - @Override - protected String tagName() + }; + + MappedSuperClassBuilder<MappedSuperclassDescriptor> superClassBuilder = + new MappedSuperClassBuilder<MappedSuperclassDescriptor>() { - return "mapped-superclass"; - } - } - .build(doc); - return new MappingFile(entities, superClasses); + @Override + protected MappedSuperclassDescriptor instance(String name, String packageName, String className, + String idClass, String id, String version) + { + return new MappedSuperclassDescriptor(name, packageName, className, idClass, id, version); + } + + @Override + protected String tagName() + { + return "mapped-superclass"; + } + }; + return new MappingFile(entityDescriptorBuilder.build(doc), superClassBuilder.build(doc)); } private String extractNodeAttribute(Element element, String childName, String attribute) @@ -177,7 +177,7 @@ public class EntityDescriptorReader extends DescriptorReader protected abstract void addFields(Element element); } - private abstract class MappedSuperClassBuilder<T extends PersistentClassDescriptor> extends PersistenceBuilder + private abstract class MappedSuperClassBuilder<T extends PersistentClassDescriptor> extends PersistenceBuilder<T> { protected abstract T instance(String name, String packageName, String className, String idClass, String id, String version); @@ -197,7 +197,7 @@ public class EntityDescriptorReader extends DescriptorReader } } - private abstract class EntityBuilder<T extends PersistentClassDescriptor> extends PersistenceBuilder + private abstract class EntityBuilder<T extends PersistentClassDescriptor> extends PersistenceBuilder<T> { protected String tableName; http://git-wip-us.apache.org/repos/asf/deltaspike/blob/7c48cb82/deltaspike/modules/data/impl/src/main/java/org/apache/deltaspike/data/impl/tx/ThreadLocalEntityManagerHolder.java ---------------------------------------------------------------------- diff --git a/deltaspike/modules/data/impl/src/main/java/org/apache/deltaspike/data/impl/tx/ThreadLocalEntityManagerHolder.java b/deltaspike/modules/data/impl/src/main/java/org/apache/deltaspike/data/impl/tx/ThreadLocalEntityManagerHolder.java index 959040d..bc809ec 100644 --- a/deltaspike/modules/data/impl/src/main/java/org/apache/deltaspike/data/impl/tx/ThreadLocalEntityManagerHolder.java +++ b/deltaspike/modules/data/impl/src/main/java/org/apache/deltaspike/data/impl/tx/ThreadLocalEntityManagerHolder.java @@ -29,6 +29,8 @@ import org.apache.deltaspike.jpa.impl.entitymanager.DefaultEntityManagerHolder; public class ThreadLocalEntityManagerHolder extends DefaultEntityManagerHolder { + private static final long serialVersionUID = 1L; + private final ThreadLocal<EntityManager> holder = new ThreadLocal<EntityManager>(); @Override http://git-wip-us.apache.org/repos/asf/deltaspike/blob/7c48cb82/deltaspike/modules/data/impl/src/main/java/org/apache/deltaspike/data/impl/util/jpa/OpenJpaPersistenceUnitUtilDelegate.java ---------------------------------------------------------------------- diff --git a/deltaspike/modules/data/impl/src/main/java/org/apache/deltaspike/data/impl/util/jpa/OpenJpaPersistenceUnitUtilDelegate.java b/deltaspike/modules/data/impl/src/main/java/org/apache/deltaspike/data/impl/util/jpa/OpenJpaPersistenceUnitUtilDelegate.java index 8dd1e1d..6928e9a 100644 --- a/deltaspike/modules/data/impl/src/main/java/org/apache/deltaspike/data/impl/util/jpa/OpenJpaPersistenceUnitUtilDelegate.java +++ b/deltaspike/modules/data/impl/src/main/java/org/apache/deltaspike/data/impl/util/jpa/OpenJpaPersistenceUnitUtilDelegate.java @@ -63,8 +63,8 @@ public class OpenJpaPersistenceUnitUtilDelegate implements PersistenceUnitUtil { final Method method; - method = identifier.getClass().getMethod(methodName, null); - return method.invoke(identifier, null); + method = identifier.getClass().getMethod(methodName); + return method.invoke(identifier); } } catch (NoSuchMethodException e) http://git-wip-us.apache.org/repos/asf/deltaspike/blob/7c48cb82/deltaspike/modules/data/impl/src/test/java/org/apache/deltaspike/data/impl/audit/AuditEntityListenerTest.java ---------------------------------------------------------------------- diff --git a/deltaspike/modules/data/impl/src/test/java/org/apache/deltaspike/data/impl/audit/AuditEntityListenerTest.java b/deltaspike/modules/data/impl/src/test/java/org/apache/deltaspike/data/impl/audit/AuditEntityListenerTest.java index 81296df..74f021a 100644 --- a/deltaspike/modules/data/impl/src/test/java/org/apache/deltaspike/data/impl/audit/AuditEntityListenerTest.java +++ b/deltaspike/modules/data/impl/src/test/java/org/apache/deltaspike/data/impl/audit/AuditEntityListenerTest.java @@ -33,7 +33,6 @@ import org.apache.deltaspike.data.test.domain.Principal; import org.apache.deltaspike.test.category.WebProfileCategory; import org.jboss.arquillian.container.test.api.Deployment; import org.jboss.shrinkwrap.api.Archive; -import org.jboss.shrinkwrap.api.ArchivePaths; import org.junit.Test; import org.junit.experimental.categories.Category; http://git-wip-us.apache.org/repos/asf/deltaspike/blob/7c48cb82/deltaspike/modules/data/impl/src/test/java/org/apache/deltaspike/data/impl/handler/QualifiedEntityManagerTestProducer.java ---------------------------------------------------------------------- diff --git a/deltaspike/modules/data/impl/src/test/java/org/apache/deltaspike/data/impl/handler/QualifiedEntityManagerTestProducer.java b/deltaspike/modules/data/impl/src/test/java/org/apache/deltaspike/data/impl/handler/QualifiedEntityManagerTestProducer.java index 4a80299..62f8b36 100644 --- a/deltaspike/modules/data/impl/src/test/java/org/apache/deltaspike/data/impl/handler/QualifiedEntityManagerTestProducer.java +++ b/deltaspike/modules/data/impl/src/test/java/org/apache/deltaspike/data/impl/handler/QualifiedEntityManagerTestProducer.java @@ -240,6 +240,7 @@ public class QualifiedEntityManagerTestProducer throw new UnsupportedOperationException(); } + @SuppressWarnings("rawtypes") @Override public Query createNativeQuery(String arg0, Class arg1) { http://git-wip-us.apache.org/repos/asf/deltaspike/blob/7c48cb82/deltaspike/modules/data/impl/src/test/java/org/apache/deltaspike/data/test/service/ExtendedRepositoryAbstract.java ---------------------------------------------------------------------- diff --git a/deltaspike/modules/data/impl/src/test/java/org/apache/deltaspike/data/test/service/ExtendedRepositoryAbstract.java b/deltaspike/modules/data/impl/src/test/java/org/apache/deltaspike/data/test/service/ExtendedRepositoryAbstract.java index 88cb6a4..f578ef9 100755 --- a/deltaspike/modules/data/impl/src/test/java/org/apache/deltaspike/data/test/service/ExtendedRepositoryAbstract.java +++ b/deltaspike/modules/data/impl/src/test/java/org/apache/deltaspike/data/test/service/ExtendedRepositoryAbstract.java @@ -19,7 +19,6 @@ package org.apache.deltaspike.data.test.service; import org.apache.deltaspike.data.api.AbstractEntityRepository; -import org.apache.deltaspike.data.api.EntityManagerDelegate; import org.apache.deltaspike.data.api.Repository; import org.apache.deltaspike.data.test.domain.Simple;
