More javadoc fixes

This commit is contained in:
Timo Westkämper 2014-09-24 21:24:36 +03:00
parent d5663faaac
commit 61757929f9
5 changed files with 20 additions and 41 deletions

View File

@ -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

View File

@ -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<Q extends AbstractJDOQuery<Q>> 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<Q extends AbstractJDOQuery<Q>> 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

View File

@ -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<JDOQLQuery>, Projectable, Clo
/**
* Add the fetch group to the set of active fetch groups.
*
* @param string
* @param fetchGroupName
* @return
*/
JDOQLQuery addFetchGroup(String fetchGroupName);

View File

@ -23,7 +23,6 @@ import com.mysema.query.QueryMetadata;
*
* @author tiwe
*
* @param <A>
*/
public class JDOQuery extends AbstractJDOQuery<JDOQuery> {
@ -31,7 +30,6 @@ public class JDOQuery extends AbstractJDOQuery<JDOQuery> {
* 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);

View File

@ -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<Q extends AbstractJPAQuery<Q>> 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) {