CodeCow/querydsl
1
0
Fork 0
mirror of https://github.com/querydsl/querydsl.git synced 2026-06-04 21:01:21 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Explicitly declare NonUniqueResultException for fetchOne

Browse Source 
Fetchable.fetchOne() declares in it's javadoc that it throws
NonUniqueResultException. It should therefore be explicitly declared in
the method signature as well.
All implementations must also declare in their signature that they throw.

This also has the desirable side-effect of the javadoc of all of the
implementors inheriting the @throws section from the javadoc of the
interface as well.

Fixes #2232
This commit is contained in:
Zoltán Reegn 2018-01-16 14:00:17 +01:00
parent 7afba09756
commit 3a74aaeabc
18 changed files with 27 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
querydsl-collections/src/main/java/com/querydsl/collections/AbstractCollQuery.java
View File

@ -196,7 +196,7 @@ public abstract class AbstractCollQuery<T, Q extends AbstractCollQuery<T, Q>> ex
}
@Override
public T fetchOne() {
public T fetchOne() throws NonUniqueResultException {
queryMixin.setUnique(true);
if (queryMixin.getMetadata().getModifiers().getLimit() == null) {
limit(2L);

2
querydsl-core/src/main/java/com/querydsl/core/Fetchable.java
View File

@ -46,7 +46,7 @@ public interface Fetchable<T> {
* @throws NonUniqueResultException if there is more than one matching result
* @return first result or null
*/
T fetchOne();
T fetchOne() throws NonUniqueResultException;
/**
* Get the projection as a typed closeable Iterator

2
querydsl-core/src/test/java/com/querydsl/core/support/DummyFetchable.java
View File

@ -37,7 +37,7 @@ public class DummyFetchable<T> implements Fetchable<T> {
@Nullable
@Override
public T fetchOne() {
public T fetchOne() throws NonUniqueResultException {
if (results.size() > 1) {
throw new NonUniqueResultException();
} else if (results.isEmpty()) {

4
querydsl-hibernate-search/src/main/java/com/querydsl/hibernate/search/AbstractSearchQuery.java
View File

@ -152,11 +152,11 @@ public abstract class AbstractSearchQuery<T, Q extends AbstractSearchQuery<T,Q>>
@SuppressWarnings("unchecked")
@Override
public T fetchOne() {
public T fetchOne() throws NonUniqueResultException {
try {
return (T) createQuery(false).uniqueResult();
} catch (org.hibernate.NonUniqueResultException e) {
throw new NonUniqueResultException();
throw new NonUniqueResultException(e);
}
}

2
querydsl-jdo/src/main/java/com/querydsl/jdo/AbstractJDOQuery.java
View File

@ -307,7 +307,7 @@ public abstract class AbstractJDOQuery<T, Q extends AbstractJDOQuery<T, Q>> exte
@Nullable
@Override
public T fetchOne() {
public T fetchOne() throws NonUniqueResultException {
if (getMetadata().getModifiers().getLimit() == null) {
limit(2);
}

2
querydsl-jdo/src/main/java/com/querydsl/jdo/sql/AbstractSQLQuery.java
View File

@ -222,7 +222,7 @@ public abstract class AbstractSQLQuery<T, Q extends AbstractSQLQuery<T, Q>> exte
@SuppressWarnings("unchecked")
@Override
@Nullable
public T fetchOne() {
public T fetchOne() throws NonUniqueResultException {
if (getMetadata().getModifiers().getLimit() == null) {
limit(2);
}

3
querydsl-jpa/src/main/java/com/querydsl/jpa/JPASubQuery.java
View File

@ -15,6 +15,7 @@ package com.querydsl.jpa;
import com.mysema.commons.lang.CloseableIterator;
import com.querydsl.core.DefaultQueryMetadata;
import com.querydsl.core.NonUniqueResultException;
import com.querydsl.core.QueryMetadata;
import com.querydsl.core.QueryResults;
import com.querydsl.core.Tuple;
@ -62,7 +63,7 @@ class JPASubQuery<T> extends JPAQueryBase<T, JPASubQuery<T>> {
}
@Override
public T fetchOne() {
public T fetchOne() throws NonUniqueResultException {
throw new UnsupportedOperationException();
}

4
querydsl-jpa/src/main/java/com/querydsl/jpa/hibernate/AbstractHibernateQuery.java
View File

@ -322,14 +322,14 @@ public abstract class AbstractHibernateQuery<T, Q extends AbstractHibernateQuery
@SuppressWarnings("unchecked")
@Override
public T fetchOne() {
public T fetchOne() throws NonUniqueResultException {
try {
QueryModifiers modifiers = getMetadata().getModifiers();
Query query = createQuery(modifiers, false);
try {
return (T) query.uniqueResult();
} catch (org.hibernate.NonUniqueResultException e) {
throw new NonUniqueResultException();
throw new NonUniqueResultException(e);
}
} finally {
reset();

4
querydsl-jpa/src/main/java/com/querydsl/jpa/hibernate/sql/AbstractHibernateSQLQuery.java
View File

@ -211,7 +211,7 @@ public abstract class AbstractHibernateSQLQuery<T, Q extends AbstractHibernateSQ
@SuppressWarnings("unchecked")
@Override
public T fetchOne() {
public T fetchOne() throws NonUniqueResultException {
try {
Query query = createQuery();
return (T) uniqueResult(query);
@ -225,7 +225,7 @@ public abstract class AbstractHibernateSQLQuery<T, Q extends AbstractHibernateSQ
try {
return query.uniqueResult();
} catch (org.hibernate.NonUniqueResultException e) {
throw new NonUniqueResultException();
throw new NonUniqueResultException(e);
}
}

4
querydsl-jpa/src/main/java/com/querydsl/jpa/impl/AbstractJPAQuery.java
View File

@ -247,7 +247,7 @@ public abstract class AbstractJPAQuery<T, Q extends AbstractJPAQuery<T, Q>> exte
@Nullable
@SuppressWarnings("unchecked")
@Override
public T fetchOne() {
public T fetchOne() throws NonUniqueResultException {
try {
Query query = createQuery(getMetadata().getModifiers(), false);
return (T) getSingleResult(query);
@ -255,7 +255,7 @@ public abstract class AbstractJPAQuery<T, Q extends AbstractJPAQuery<T, Q>> exte
logger.trace(e.getMessage(),e);
return null;
} catch (javax.persistence.NonUniqueResultException e) {
throw new NonUniqueResultException();
throw new NonUniqueResultException(e);
} finally {
reset();
}

4
querydsl-jpa/src/main/java/com/querydsl/jpa/sql/AbstractJPASQLQuery.java
View File

@ -292,7 +292,7 @@ public abstract class AbstractJPASQLQuery<T, Q extends AbstractJPASQLQuery<T, Q>
@Override
@SuppressWarnings("unchecked")
public T fetchOne() {
public T fetchOne() throws NonUniqueResultException {
Query query = createQuery();
return (T) uniqueResult(query);
}
@ -305,7 +305,7 @@ public abstract class AbstractJPASQLQuery<T, Q extends AbstractJPASQLQuery<T, Q>
logger.trace(e.getMessage(),e);
return null;
} catch (javax.persistence.NonUniqueResultException e) {
throw new NonUniqueResultException();
throw new NonUniqueResultException(e);
} finally {
reset();
}

3
querydsl-jpa/src/test/java/com/querydsl/jpa/QueryHelper.java
View File

@ -26,6 +26,7 @@ import org.slf4j.LoggerFactory;
import com.mysema.commons.lang.CloseableIterator;
import com.querydsl.core.DefaultQueryMetadata;
import com.querydsl.core.NonUniqueResultException;
import com.querydsl.core.QueryMetadata;
import com.querydsl.core.QueryResults;
import com.querydsl.core.Tuple;
@ -86,7 +87,7 @@ class QueryHelper<T> extends JPAQueryBase<T, QueryHelper<T>> {
}
@Override
public T fetchOne() {
public T fetchOne() throws NonUniqueResultException {
throw new UnsupportedOperationException();
}

2
querydsl-lucene3/src/main/java/com/querydsl/lucene3/AbstractLuceneQuery.java
View File

@ -330,7 +330,7 @@ public abstract class AbstractLuceneQuery<T,Q extends AbstractLuceneQuery<T,Q>>
}
@Override
public T fetchOne() {
public T fetchOne() throws NonUniqueResultException {
return oneResult(true);
}

2
querydsl-lucene4/src/main/java/com/querydsl/lucene4/AbstractLuceneQuery.java
View File

@ -332,7 +332,7 @@ public abstract class AbstractLuceneQuery<T,Q extends AbstractLuceneQuery<T,Q>>
}
@Override
public T fetchOne() {
public T fetchOne() throws NonUniqueResultException {
return oneResult(true);
}

2
querydsl-lucene5/src/main/java/com/querydsl/lucene5/AbstractLuceneQuery.java
View File

@ -372,7 +372,7 @@ public abstract class AbstractLuceneQuery<T, Q extends AbstractLuceneQuery<T, Q>
}
@Override
public T fetchOne() {
public T fetchOne() throws NonUniqueResultException {
return oneResult(true);
}

2
querydsl-mongodb/src/main/java/com/querydsl/mongodb/AbstractMongodbQuery.java
View File

@ -338,7 +338,7 @@ public abstract class AbstractMongodbQuery<K, Q extends AbstractMongodbQuery<K,
}
@Override
public K fetchOne() {
public K fetchOne() throws NonUniqueResultException {
try {
Long limit = queryMixin.getMetadata().getModifiers().getLimit();
if (limit == null) {

3
querydsl-sql/src/main/java/com/querydsl/sql/ProjectableSQLQuery.java
View File

@ -25,6 +25,7 @@ import com.google.common.collect.Sets;
import com.mysema.commons.lang.CloseableIterator;
import com.querydsl.core.FetchableQuery;
import com.querydsl.core.JoinFlag;
import com.querydsl.core.NonUniqueResultException;
import com.querydsl.core.Query;
import com.querydsl.core.QueryFlag;
import com.querydsl.core.QueryFlag.Position;
@ -391,7 +392,7 @@ public abstract class ProjectableSQLQuery<T, Q extends ProjectableSQLQuery<T, Q>
}
@Override
public T fetchOne() {
public T fetchOne() throws NonUniqueResultException {
if (getMetadata().getModifiers().getLimit() == null
&& !queryMixin.getMetadata().getProjection().toString().contains("count(")) {
limit(2);

3
querydsl-sql/src/main/java/com/querydsl/sql/UnionImpl.java
View File

@ -18,6 +18,7 @@ import java.util.List;
import javax.annotation.Nullable;
import com.mysema.commons.lang.CloseableIterator;
import com.querydsl.core.NonUniqueResultException;
import com.querydsl.core.Query;
import com.querydsl.core.QueryMetadata;
import com.querydsl.core.QueryResults;
@ -55,7 +56,7 @@ public class UnionImpl<T, Q extends ProjectableSQLQuery<T, Q> & Query<Q>> imple
}
@Override
public T fetchOne() {
public T fetchOne() throws NonUniqueResultException {
return query.fetchOne();
}