From 61757929f9ec47c02df3b3a3a6723b5159c339bb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Timo=20Westk=C3=A4mper?= Date: Wed, 24 Sep 2014 21:24:36 +0300 Subject: [PATCH] More javadoc fixes --- .travis.yml | 2 +- .../mysema/query/jdo/AbstractJDOQuery.java | 29 +++++-------------- .../java/com/mysema/query/jdo/JDOQLQuery.java | 5 ++-- .../java/com/mysema/query/jdo/JDOQuery.java | 2 -- .../query/jpa/impl/AbstractJPAQuery.java | 23 ++++++--------- 5 files changed, 20 insertions(+), 41 deletions(-) diff --git a/.travis.yml b/.travis.yml index 4fc434625..cb7987c2e 100644 --- a/.travis.yml +++ b/.travis.yml @@ -7,7 +7,7 @@ services: addons: postgresql: "9.3" install: - - sh -c 'cd querydsl-root && mvn -B -q install -Dmaven.javadoc.skip=true -DskipTests=true' + - sh -c 'cd querydsl-root && mvn -B -q install -DskipTests=true' before_script: - mysql -u root -e "source travis/mysql.sql" - psql -U postgres -f travis/postgresql.sql diff --git a/querydsl-jdo/src/main/java/com/mysema/query/jdo/AbstractJDOQuery.java b/querydsl-jdo/src/main/java/com/mysema/query/jdo/AbstractJDOQuery.java index 9c3165210..9e3133b8f 100644 --- a/querydsl-jdo/src/main/java/com/mysema/query/jdo/AbstractJDOQuery.java +++ b/querydsl-jdo/src/main/java/com/mysema/query/jdo/AbstractJDOQuery.java @@ -13,36 +13,23 @@ */ package com.mysema.query.jdo; -import java.io.Closeable; -import java.io.IOException; -import java.util.ArrayList; -import java.util.Collection; -import java.util.Collections; -import java.util.HashSet; -import java.util.List; -import java.util.Set; - import javax.annotation.Nullable; import javax.jdo.PersistenceManager; import javax.jdo.Query; - -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; +import java.io.Closeable; +import java.io.IOException; +import java.util.*; import com.google.common.collect.Lists; import com.mysema.commons.lang.CloseableIterator; import com.mysema.commons.lang.IteratorAdapter; -import com.mysema.query.DefaultQueryMetadata; -import com.mysema.query.NonUniqueResultException; -import com.mysema.query.QueryException; -import com.mysema.query.QueryMetadata; -import com.mysema.query.QueryModifiers; -import com.mysema.query.SearchResults; -import com.mysema.query.Tuple; +import com.mysema.query.*; import com.mysema.query.support.ProjectableQuery; import com.mysema.query.types.EntityPath; import com.mysema.query.types.Expression; import com.mysema.query.types.FactoryExpression; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; /** * Abstract base class for custom implementations of the JDOCommonQuery interface. @@ -100,7 +87,7 @@ public abstract class AbstractJDOQuery> extends Pr /** * Add the fetch group to the set of active fetch groups. * - * @param string + * @param fetchGroupName * @return */ @Override @@ -300,7 +287,7 @@ public abstract class AbstractJDOQuery> extends Pr * A positive integer will result in that number of references from the * initial object to be fetched. * - * @param maxFetchDepth + * @param depth * @return */ @Override diff --git a/querydsl-jdo/src/main/java/com/mysema/query/jdo/JDOQLQuery.java b/querydsl-jdo/src/main/java/com/mysema/query/jdo/JDOQLQuery.java index 09e4bda98..5c515fdbd 100644 --- a/querydsl-jdo/src/main/java/com/mysema/query/jdo/JDOQLQuery.java +++ b/querydsl-jdo/src/main/java/com/mysema/query/jdo/JDOQLQuery.java @@ -13,9 +13,8 @@ */ package com.mysema.query.jdo; -import java.io.Closeable; - import javax.jdo.PersistenceManager; +import java.io.Closeable; import com.mysema.query.Projectable; @@ -38,7 +37,7 @@ public interface JDOQLQuery extends JDOCommonQuery, Projectable, Clo /** * Add the fetch group to the set of active fetch groups. * - * @param string + * @param fetchGroupName * @return */ JDOQLQuery addFetchGroup(String fetchGroupName); diff --git a/querydsl-jdo/src/main/java/com/mysema/query/jdo/JDOQuery.java b/querydsl-jdo/src/main/java/com/mysema/query/jdo/JDOQuery.java index bccabc6ad..cd08e6a8d 100644 --- a/querydsl-jdo/src/main/java/com/mysema/query/jdo/JDOQuery.java +++ b/querydsl-jdo/src/main/java/com/mysema/query/jdo/JDOQuery.java @@ -23,7 +23,6 @@ import com.mysema.query.QueryMetadata; * * @author tiwe * - * @param */ public class JDOQuery extends AbstractJDOQuery { @@ -31,7 +30,6 @@ public class JDOQuery extends AbstractJDOQuery { * Create a detached JDOQuery instance * The query can be attached via the clone method * - * @param persistenceManager */ public JDOQuery() { super(null, JDOQLTemplates.DEFAULT, new DefaultQueryMetadata(), false); diff --git a/querydsl-jpa/src/main/java/com/mysema/query/jpa/impl/AbstractJPAQuery.java b/querydsl-jpa/src/main/java/com/mysema/query/jpa/impl/AbstractJPAQuery.java index d499c6288..a6e453f9c 100644 --- a/querydsl-jpa/src/main/java/com/mysema/query/jpa/impl/AbstractJPAQuery.java +++ b/querydsl-jpa/src/main/java/com/mysema/query/jpa/impl/AbstractJPAQuery.java @@ -13,28 +13,19 @@ */ package com.mysema.query.jpa.impl; -import java.util.ArrayList; -import java.util.List; -import java.util.Map; - import javax.annotation.Nullable; import javax.persistence.EntityManager; import javax.persistence.FlushModeType; import javax.persistence.LockModeType; import javax.persistence.Query; - -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; +import java.util.ArrayList; +import java.util.List; +import java.util.Map; import com.google.common.collect.HashMultimap; import com.google.common.collect.Multimap; import com.mysema.commons.lang.CloseableIterator; -import com.mysema.query.DefaultQueryMetadata; -import com.mysema.query.NonUniqueResultException; -import com.mysema.query.QueryMetadata; -import com.mysema.query.QueryModifiers; -import com.mysema.query.SearchResults; -import com.mysema.query.Tuple; +import com.mysema.query.*; import com.mysema.query.jpa.JPAQueryBase; import com.mysema.query.jpa.JPQLSerializer; import com.mysema.query.jpa.JPQLTemplates; @@ -42,6 +33,8 @@ import com.mysema.query.jpa.QueryHandler; import com.mysema.query.types.Expression; import com.mysema.query.types.FactoryExpression; import com.mysema.query.types.FactoryExpressionUtils; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; /** * Abstract base class for JPA API based implementations of the JPQLQuery interface @@ -100,7 +93,9 @@ public abstract class AbstractJPAQuery> extends JP /** * Expose the original JPA query for the given projection * - * @param expr + * @param expr1 + * @param expr2 + * @param rest * @return */ public Query createQuery(Expression expr1, Expression expr2, Expression... rest) {